From 09ba3333ca8d819b38461fba5dd7b15e518386a8 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Mon, 18 Jan 2021 11:22:19 +0100
Subject: [PATCH 01/26] init

---
 .../svelte-vscode/package-json-schema.json    |   9 ++
 packages/svelte-vscode/package.json           |  20 ++++
 .../prettier-options-schema.json              | 106 ++++++++++++++++++
 3 files changed, 135 insertions(+)
 create mode 100644 packages/svelte-vscode/package-json-schema.json
 create mode 100644 packages/svelte-vscode/prettier-options-schema.json

diff --git a/packages/svelte-vscode/package-json-schema.json b/packages/svelte-vscode/package-json-schema.json
new file mode 100644
index 000000000..3db9f6af0
--- /dev/null
+++ b/packages/svelte-vscode/package-json-schema.json
@@ -0,0 +1,9 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "properties": {
+        "prettier": {
+            "description": "Prettier-Plugin-Svelte configuration",
+            "$ref": "./prettier-options.json"
+        }
+    }
+}
diff --git a/packages/svelte-vscode/package.json b/packages/svelte-vscode/package.json
index d81499578..8c585988d 100644
--- a/packages/svelte-vscode/package.json
+++ b/packages/svelte-vscode/package.json
@@ -300,6 +300,26 @@
                     ".svelte"
                 ],
                 "configuration": "./language-configuration.json"
+            },
+            {
+                "id": "json",
+                "filenames": [
+                    ".prettierrc"
+                ]
+            }
+        ],
+        "jsonValidation": [
+            {
+                "fileMatch": ".prettierrc",
+                "url": "./prettier-options-schema.json"
+            },
+            {
+                "fileMatch": ".prettierrc.json",
+                "url": "./prettier-options-schema.json"
+            },
+            {
+                "fileMatch": "package.json",
+                "url": "./package-json-schema.json"
             }
         ],
         "grammars": [
diff --git a/packages/svelte-vscode/prettier-options-schema.json b/packages/svelte-vscode/prettier-options-schema.json
new file mode 100644
index 000000000..7963befa9
--- /dev/null
+++ b/packages/svelte-vscode/prettier-options-schema.json
@@ -0,0 +1,106 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "Prettier-plugin-svelte schema for .prettierrc",
+    "definitions": {
+        "optionsDefinition": {
+            "type": "object",
+            "properties": {
+                "svelteSortOrder": {
+                    "description": "Sort order for <svelte:options>, scripts, markup, and styles.",
+                    "default": "options-scripts-markup-styles",
+                    "enum": [
+                        "options-scripts-markup-styles",
+                        "options-scripts-styles-markup",
+                        "options-markup-scripts-styles",
+                        "options-markup-styles-scripts",
+                        "options-styles-scripts-markup",
+                        "options-styles-markup-scripts",
+                        "scripts-options-markup-styles",
+                        "scripts-options-styles-markup",
+                        "scripts-markup-options-styles",
+                        "scripts-markup-styles-options",
+                        "scripts-styles-options-markup",
+                        "scripts-styles-markup-options",
+                        "markup-options-scripts-styles",
+                        "markup-options-styles-scripts",
+                        "markup-scripts-options-styles",
+                        "markup-scripts-styles-options",
+                        "markup-styles-options-scripts",
+                        "markup-styles-scripts-options",
+                        "styles-options-scripts-markup",
+                        "styles-options-markup-scripts",
+                        "styles-scripts-options-markup",
+                        "styles-scripts-markup-options",
+                        "styles-markup-options-scripts",
+                        "styles-markup-scripts-options"
+                    ]
+                },
+                "svelteStrictMode": {
+                    "description": "More strict HTML syntax: less self-closed tags, quotes in attributes, no attribute shorthand (overrules svelteAllowShorthand).",
+                    "default": true,
+                    "type": "boolean"
+                },
+                "svelteBracketNewLine": {
+                    "description": "Put the > of a multiline element on a new line. Roughly the Svelte equivalent of the jsxBracketSameLine rule.",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "svelteAllowShorthand": {
+                    "description": "Option to enable/disable component attribute shorthand if attribute name and expression are same.",
+                    "default": false,
+                    "type": "boolean"
+                },
+                "svelteIndentScriptAndStyle": {
+                    "description": "Whether or not to indent the code inside <script> and <style> tags in Svelte files. This saves an indentation level, but might break code folding in your editor.",
+                    "default": false,
+                    "type": "boolean"
+                }
+            }
+        },
+        "overridesDefinition": {
+            "type": "object",
+            "properties": {
+                "overrides": {
+                    "type": "array",
+                    "description": "Provide a list of patterns to override prettier configuration.",
+                    "items": {
+                        "type": "object",
+                        "required": ["files"],
+                        "properties": {
+                            "files": {
+                                "description": "Include these files in this override.",
+                                "oneOf": [
+                                    { "type": "string" },
+                                    { "type": "array", "items": { "type": "string" } }
+                                ]
+                            },
+                            "excludeFiles": {
+                                "description": "Exclude these files from this override.",
+                                "oneOf": [
+                                    { "type": "string" },
+                                    { "type": "array", "items": { "type": "string" } }
+                                ]
+                            },
+                            "options": {
+                                "type": "object",
+                                "description": "The options to apply for this override.",
+                                "$ref": "#/definitions/optionsDefinition"
+                            }
+                        },
+                        "additionalProperties": false
+                    }
+                }
+            }
+        }
+    },
+    "oneOf": [
+        {
+            "type": "object",
+            "allOf": [
+                { "$ref": "#/definitions/optionsDefinition" },
+                { "$ref": "#/definitions/overridesDefinition" }
+            ]
+        },
+        { "type": "string" }
+    ]
+}

From 8d23f649b27ff39238d8fc4a7dbc20179087ce53 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Thu, 25 Feb 2021 10:50:40 +0100
Subject: [PATCH 02/26] init

---
 packages/svelte2tsx/mocha.opts                |   1 -
 packages/svelte2tsx/package.json              |  11 +-
 packages/svelte2tsx/test/helpers.js           |  98 ------------
 packages/svelte2tsx/test/helpers.ts           | 147 ++++++++++++++++++
 packages/svelte2tsx/test/htmlx2jsx/index.js   |   6 -
 packages/svelte2tsx/test/htmlx2jsx/index.ts   |  12 ++
 .../editing-mustache/expected.error.json      |  16 ++
 .../samples/editing-mustache/test.js          |  26 ----
 .../test/htmlxparser/{index.js => index.ts}   |   6 +-
 .../test/sourcemaps/{index.js => index.ts}    |  14 +-
 packages/svelte2tsx/test/svelte2tsx/index.js  |  16 --
 packages/svelte2tsx/test/svelte2tsx/index.ts  |  17 ++
 .../editing-mustache/expected.error.json      |  16 ++
 .../samples/editing-mustache/test.js          |  29 ----
 packages/svelte2tsx/test/{test.js => test.ts} |   6 +-
 packages/svelte2tsx/test/tsconfig.json        |  10 ++
 16 files changed, 236 insertions(+), 195 deletions(-)
 delete mode 100644 packages/svelte2tsx/mocha.opts
 delete mode 100644 packages/svelte2tsx/test/helpers.js
 create mode 100644 packages/svelte2tsx/test/helpers.ts
 delete mode 100644 packages/svelte2tsx/test/htmlx2jsx/index.js
 create mode 100644 packages/svelte2tsx/test/htmlx2jsx/index.ts
 create mode 100644 packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json
 delete mode 100644 packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/test.js
 rename packages/svelte2tsx/test/htmlxparser/{index.js => index.ts} (80%)
 rename packages/svelte2tsx/test/sourcemaps/{index.js => index.ts} (95%)
 delete mode 100644 packages/svelte2tsx/test/svelte2tsx/index.js
 create mode 100644 packages/svelte2tsx/test/svelte2tsx/index.ts
 create mode 100644 packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json
 delete mode 100644 packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/test.js
 rename packages/svelte2tsx/test/{test.js => test.ts} (78%)
 create mode 100644 packages/svelte2tsx/test/tsconfig.json

diff --git a/packages/svelte2tsx/mocha.opts b/packages/svelte2tsx/mocha.opts
deleted file mode 100644
index 427b02975..000000000
--- a/packages/svelte2tsx/mocha.opts
+++ /dev/null
@@ -1 +0,0 @@
-test/test.js
\ No newline at end of file
diff --git a/packages/svelte2tsx/package.json b/packages/svelte2tsx/package.json
index 085eda340..c3a778c71 100644
--- a/packages/svelte2tsx/package.json
+++ b/packages/svelte2tsx/package.json
@@ -17,6 +17,10 @@
     "main": "index.js",
     "types": "index.d.ts",
     "devDependencies": {
+        "@rollup/plugin-commonjs": "^15.0.0",
+        "@rollup/plugin-json": "^4.0.0",
+        "@rollup/plugin-node-resolve": "^9.0.0",
+        "@rollup/plugin-typescript": "^6.0.0",
         "@types/mocha": "^5.2.7",
         "@types/node": "^8.10.53",
         "@types/unist": "^2.0.3",
@@ -25,13 +29,10 @@
         "mocha": "^6.2.2",
         "periscopic": "^2.0.2",
         "rollup": "^2.28.0",
-        "@rollup/plugin-commonjs": "^15.0.0",
         "rollup-plugin-delete": "^2.0.0",
-        "@rollup/plugin-json": "^4.0.0",
-        "@rollup/plugin-node-resolve": "^9.0.0",
-        "@rollup/plugin-typescript": "^6.0.0",
         "source-map": "^0.6.1",
         "source-map-support": "^0.5.16",
+        "sucrase": "^3.17.1",
         "svelte": "~3.32.1",
         "tiny-glob": "^0.2.6",
         "tslib": "^1.10.0",
@@ -45,7 +46,7 @@
         "build": "rollup -c",
         "prepublishOnly": "npm run build",
         "dev": "rollup -c -w",
-        "test": "mocha --opts mocha.opts",
+        "test": "mocha -r sucrase/register test/test.ts",
         "pretest": "rollup -c rollup.config.test.js"
     },
     "files": [
diff --git a/packages/svelte2tsx/test/helpers.js b/packages/svelte2tsx/test/helpers.js
deleted file mode 100644
index 9d5b81b72..000000000
--- a/packages/svelte2tsx/test/helpers.js
+++ /dev/null
@@ -1,98 +0,0 @@
-const fs = require('fs');
-const assert = require('assert');
-
-function benchmark(fn) {
-    return -Date.now() + (fn(), Date.now());
-}
-
-function readFileSync(path) {
-    return fs.existsSync(path)
-        ? fs.readFileSync(path, 'utf-8').replace(/\r\n/g, '\n').replace(/\s+$/, '')
-        : null;
-}
-
-function check_dir(path, { allowed = [], required = allowed }) {
-    const unchecked = new Set(required);
-    const unknown = [];
-    loop: for (const fileName of fs.readdirSync(path)) {
-        for (const name of unchecked) {
-            if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
-                unchecked.delete(name);
-                continue loop;
-            }
-        }
-        for (const name of allowed) {
-            if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
-                continue loop;
-            }
-        }
-        unknown.push(fileName);
-    }
-    if (unknown.length !== 0) {
-        after(() => {
-            for (const name of unknown) {
-                const msg = `Unexpected file ${path.split('/').slice(-1)}/${name}`;
-                if (process.env.CI) {
-                    throw new Error(msg);
-                } else {
-                    console.info(msg);
-                }
-            }
-        });
-    }
-    if (unchecked.size !== 0) {
-        throw new Error(
-            `Expected file(s) ${[...unchecked].map((str) => `"${str}"`).join(', ')} in ${path}`
-        );
-    }
-}
-
-function test_samples(dir, transform, tsx) {
-    for (const testName of fs.readdirSync(`${dir}/samples`)) {
-        const path = `${dir}/samples/${testName}`;
-        const expected_path = `${path}/expected.${tsx}`;
-        const has_expected = fs.existsSync(expected_path);
-        const solo = testName.endsWith('.solo');
-        const skip = testName.startsWith('.');
-        check_dir(path, {
-            required: ['*.svelte'],
-            allowed: ['expected.js', `expected.${tsx}`, 'test.js']
-        });
-        (skip ? it.skip : solo ? it.only : it)(testName, function () {
-            const testJsPath = `${path}/test.js`;
-            if (fs.existsSync(testJsPath)) {
-                const test = require(testJsPath);
-                test();
-                return;
-            }
-
-            const { filename, content } = get_input_content(path);
-            const output = transform(content, testName, filename);
-            if (!has_expected) {
-                after(() => {
-                    fs.writeFileSync(expected_path, output.code);
-                    console.info(`Generated ${testName}/expected.${tsx}`);
-                });
-                this.skip();
-            } else {
-                assert.strictEqual(output.code, readFileSync(expected_path));
-            }
-            if (fs.existsSync(`${path}/expected.js`)) {
-                const run = require(`${path}/expected.js`);
-                run(output);
-            }
-        });
-    }
-}
-
-/**
- *
- * @param {string} dirPath
- */
-function get_input_content(dirPath) {
-    const filename = fs.readdirSync(dirPath).find((f) => f.endsWith('.svelte'));
-    const content = readFileSync(`${dirPath}/${filename}`);
-    return { filename, content };
-}
-
-module.exports = { benchmark, test_samples, get_input_content, readFileSync };
diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
new file mode 100644
index 000000000..a2fb174d1
--- /dev/null
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -0,0 +1,147 @@
+import assert from 'assert';
+import fs from 'fs';
+import type { htmlx2jsx as htmlx2jsxFn } from '../src/htmlxtojsx/index';
+import type { svelte2tsx as svelte2tsxFn } from '../src/svelte2tsx/index';
+export function benchmark(fn: () => void) {
+    return -Date.now() + (fn(), Date.now());
+}
+
+function readFileSync(path: string) {
+    if (!fs.existsSync(path)) return undefined;
+    return fs.readFileSync(path, 'utf-8').replace(/\r\n/g, '\n').replace(/\s+$/, '');
+}
+
+function check_dir(
+    dirPath: string,
+    fileNames: string[],
+    dir_config: { allowed: string[]; required?: string[] }
+) {
+    const unchecked = new Set(dir_config.required ?? dir_config.allowed);
+    const unknown = [];
+    loop: for (const fileName of fileNames) {
+        for (const name of unchecked) {
+            if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
+                unchecked.delete(name);
+                continue loop;
+            }
+        }
+        for (const name of dir_config.allowed) {
+            if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
+                continue loop;
+            }
+        }
+        unknown.push(fileName);
+    }
+    if (unknown.length !== 0) {
+        after(function () {
+            for (const name of unknown) {
+                const msg = `Unexpected file ${dirPath.split('/').slice(-1)}/${name}`;
+                if (process.env.CI) {
+                    throw new Error(msg);
+                } else {
+                    console.info(msg);
+                }
+            }
+        });
+    }
+    if (unchecked.size !== 0) {
+        throw new Error(
+            `Expected file(s) ${[...unchecked].map((str) => `"${str}"`).join(', ')} in ${dirPath}`
+        );
+    }
+}
+type TransformFn = typeof htmlx2jsxFn | typeof svelte2tsxFn;
+type TransformedFile = ReturnType<TransformFn>;
+type TransformSampleFn = (config: {
+    sampleName: string;
+    fileName: string;
+    input: string;
+    emitOnTemplateError: boolean;
+}) => TransformedFile;
+
+function generateExpected(context: Mocha.Context, path: string, code: string) {
+    if (process.env.CI) {
+        throw new Error(`Forgot to generate expected output at "${path}"`);
+    }
+    after(() => {
+        fs.writeFileSync(path, code);
+        const name = path.slice(path.lastIndexOf('/', path.lastIndexOf('/')) + 1);
+        console.info(`Generated ${name}`);
+    });
+    context.skip();
+}
+
+export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'jsx' | 'tsx') {
+    for (const sampleName of fs.readdirSync(`${dir}/samples`)) {
+        const sampleDirectory = `${dir}/samples/${sampleName}`;
+        const folder = fs.readdirSync(sampleDirectory);
+        const fileName = folder.find((f) => f.endsWith('.svelte'));
+
+        check_dir(sampleDirectory, folder, {
+            required: ['*.svelte'],
+            allowed: ['expected.js', `expected.${jsx}`, 'expected.error.json']
+        });
+
+        const sveltePath = `${sampleDirectory}/${fileName}`;
+        const expectedPath = `${sampleDirectory}/expected.${jsx}`;
+        const errorPath = `${sampleDirectory}/expected.error.json`;
+
+        const hasCustomTest = folder.includes('expected.js');
+        const expectsError = folder.includes('expected.error.json');
+        const shouldGenerateExpected = !folder.includes(`expected.${jsx}`);
+        const shouldGenerateError = expectsError && !readFileSync(errorPath);
+
+        // generates "expected.tsx" when it's missing
+        // generates "expected.error.json" content if file exists but is empty
+
+        const solo = sampleName.endsWith('.solo');
+        const skip = sampleName.startsWith('.');
+        (skip ? it.skip : solo ? it.only : it)(sampleName, function () {
+            const config = {
+                sampleName,
+                fileName,
+                input: readFileSync(sveltePath),
+                emitOnTemplateError: false
+            };
+
+            if (expectsError) {
+                let hadError = false;
+                try {
+                    transform(config);
+                } catch (error) {
+                    hadError = true;
+                    if (shouldGenerateError) {
+                        generateExpected(this, errorPath, JSON.stringify(error, void 0, '\t'));
+                    } else if (expectsError) {
+                        assert.deepEqual(
+                            JSON.parse(readFileSync(errorPath)),
+                            JSON.parse(JSON.stringify(error))
+                        );
+                    } else {
+                        throw error;
+                    }
+                    config.emitOnTemplateError = true;
+                }
+                if (!hadError) {
+                    throw new Error(
+                        `Sample "${sampleName}" expected an error but got none.\n\n\tcmd click: ${errorPath}`
+                    );
+                }
+            }
+
+            const output = transform(config);
+
+            if (shouldGenerateExpected) {
+                generateExpected(this, expectedPath, output.code);
+            } else {
+                assert.strictEqual(output.code, readFileSync(expectedPath));
+            }
+
+            if (hasCustomTest) {
+                // see example at "svelte2tsx\samples\component-events-interface\expected.js"
+                const fn = require(`${sampleDirectory}/expected.js`);
+                fn(output);
+            }
+        });
+    }
+}
diff --git a/packages/svelte2tsx/test/htmlx2jsx/index.js b/packages/svelte2tsx/test/htmlx2jsx/index.js
deleted file mode 100644
index 2c7037c0f..000000000
--- a/packages/svelte2tsx/test/htmlx2jsx/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const { htmlx2jsx } = require('../build/htmlxtojsx');
-const { test_samples } = require('../helpers');
-
-describe('htmlx2jsx', () => {
-    test_samples(__dirname, htmlx2jsx, 'jsx');
-});
diff --git a/packages/svelte2tsx/test/htmlx2jsx/index.ts b/packages/svelte2tsx/test/htmlx2jsx/index.ts
new file mode 100644
index 000000000..3faf2e31f
--- /dev/null
+++ b/packages/svelte2tsx/test/htmlx2jsx/index.ts
@@ -0,0 +1,12 @@
+import { htmlx2jsx } from '../build/htmlxtojsx';
+import { test_samples } from '../helpers';
+
+describe('htmlx2jsx', function () {
+    test_samples(
+        __dirname,
+        function ({ input, emitOnTemplateError }) {
+            return htmlx2jsx(input, { emitOnTemplateError });
+        },
+        'jsx'
+    );
+});
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json
new file mode 100644
index 000000000..ab8f67454
--- /dev/null
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json
@@ -0,0 +1,16 @@
+{
+	"name": "ParseError",
+	"code": "parse-error",
+	"start": {
+		"line": 1,
+		"column": 8,
+		"character": 8
+	},
+	"end": {
+		"line": 1,
+		"column": 8,
+		"character": 8
+	},
+	"pos": 8,
+	"frame": "1: {abc.   }\n           ^\n2: {abc?. }\n3: {abc ?}"
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/test.js b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/test.js
deleted file mode 100644
index 970b8e422..000000000
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const assert = require('assert');
-const { htmlx2jsx } = require('../../../build/htmlxtojsx');
-const { get_input_content, readFileSync } = require('../../../helpers');
-
-module.exports = function () {
-    const input = get_input_content(__dirname);
-
-    assert.throws(
-        () => {
-            htmlx2jsx(input.content);
-        },
-        {
-            name: 'ParseError',
-            code: 'parse-error',
-            start: { line: 1, column: 8, character: 8 },
-            end: { line: 1, column: 8, character: 8 },
-            frame: '1: {abc.   }\n           ^\n2: {abc?. }\n3: {abc ?}'
-        }
-    );
-
-    const expected_path = `${__dirname}/expected.jsx`;
-    assert.strictEqual(
-        htmlx2jsx(input.content, { emitOnTemplateError: true }).code,
-        readFileSync(expected_path).toString()
-    );
-};
diff --git a/packages/svelte2tsx/test/htmlxparser/index.js b/packages/svelte2tsx/test/htmlxparser/index.ts
similarity index 80%
rename from packages/svelte2tsx/test/htmlxparser/index.js
rename to packages/svelte2tsx/test/htmlxparser/index.ts
index e9efcb316..491838753 100644
--- a/packages/svelte2tsx/test/htmlxparser/index.js
+++ b/packages/svelte2tsx/test/htmlxparser/index.ts
@@ -1,6 +1,6 @@
-const { htmlx2jsx } = require('../build/htmlxtojsx');
-const assert = require('assert');
-const { benchmark } = require('../helpers');
+import assert from 'assert';
+import { htmlx2jsx } from '../build/htmlxtojsx';
+import { benchmark } from '../helpers';
 
 describe('htmlxparser', () => {
     it('parses in a reasonable time', () => {
diff --git a/packages/svelte2tsx/test/sourcemaps/index.js b/packages/svelte2tsx/test/sourcemaps/index.ts
similarity index 95%
rename from packages/svelte2tsx/test/sourcemaps/index.js
rename to packages/svelte2tsx/test/sourcemaps/index.ts
index 0d45d13d6..166c7f837 100644
--- a/packages/svelte2tsx/test/sourcemaps/index.js
+++ b/packages/svelte2tsx/test/sourcemaps/index.ts
@@ -1,8 +1,8 @@
-let svelte2tsx = require('../build/index');
-let converter = require('../build/htmlxtojsx');
-let fs = require('fs');
-let assert = require('assert');
-let sm = require('source-map');
+import assert from 'assert';
+import fs from 'fs';
+import { SourceMapConsumer } from 'source-map';
+import svelte2tsx from '../build';
+import { htmlx2jsx } from '../build/htmlxtojsx';
 
 describe('sourcemap', () => {
     /**
@@ -95,7 +95,7 @@ describe('sourcemap', () => {
             // but assert that the source it generates matches our input source.
             //console.log(expected.source)
             const { map, code } = dir.endsWith('.htmlx.html')
-                ? converter.htmlx2jsx(expected.source)
+                ? htmlx2jsx(expected.source)
                 : svelte2tsx(expected.source);
             assert.equal(
                 showWhitespace(code),
@@ -103,7 +103,7 @@ describe('sourcemap', () => {
                 "Couldn't generate input source map for test"
             );
 
-            let decoder = new sm.SourceMapConsumer(map);
+            let decoder = new SourceMapConsumer(map);
 
             for (let [id, span] of input.locations.entries()) {
                 let expectedSpan = expected.locations.get(id);
diff --git a/packages/svelte2tsx/test/svelte2tsx/index.js b/packages/svelte2tsx/test/svelte2tsx/index.js
deleted file mode 100644
index 7f98d51e0..000000000
--- a/packages/svelte2tsx/test/svelte2tsx/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const svelte2tsx = require('../build/index');
-const { test_samples } = require('../helpers');
-
-describe('svelte2tsx', () => {
-    test_samples(
-        __dirname,
-        (input, testName, filename) => {
-            return svelte2tsx(input, {
-                strictMode: testName.includes('strictMode'),
-                isTsFile: testName.startsWith('ts-'),
-                filename
-            });
-        },
-        'tsx'
-    );
-});
diff --git a/packages/svelte2tsx/test/svelte2tsx/index.ts b/packages/svelte2tsx/test/svelte2tsx/index.ts
new file mode 100644
index 000000000..b98eced69
--- /dev/null
+++ b/packages/svelte2tsx/test/svelte2tsx/index.ts
@@ -0,0 +1,17 @@
+import svelte2tsx from '../build';
+import { test_samples } from '../helpers';
+
+describe('svelte2tsx', function () {
+    test_samples(
+        __dirname,
+        function ({ input, sampleName, fileName, emitOnTemplateError }) {
+            return svelte2tsx(input, {
+                strictMode: sampleName.includes('strictMode'),
+                isTsFile: sampleName.startsWith('ts-'),
+                filename: fileName,
+                emitOnTemplateError
+            });
+        },
+        'tsx'
+    );
+});
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json
new file mode 100644
index 000000000..6b078694e
--- /dev/null
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json
@@ -0,0 +1,16 @@
+{
+	"name": "ParseError",
+	"code": "parse-error",
+	"start": {
+		"line": 1,
+		"column": 4,
+		"character": 4
+	},
+	"end": {
+		"line": 1,
+		"column": 4,
+		"character": 4
+	},
+	"pos": 4,
+	"frame": "1: {a?.}\n       ^"
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/test.js b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/test.js
deleted file mode 100644
index 429136706..000000000
--- a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const assert = require('assert');
-const svelte2tsx = require('../../../build/index');
-const { get_input_content, readFileSync } = require('../../../helpers');
-
-module.exports = function () {
-    const input = get_input_content(__dirname);
-
-    assert.throws(
-        () => {
-            svelte2tsx(input.content);
-        },
-        {
-            name: 'ParseError',
-            code: 'parse-error',
-            start: { line: 1, column: 4, character: 4 },
-            end: { line: 1, column: 4, character: 4 },
-            frame: '1: {a?.}\n       ^'
-        }
-    );
-
-    const expected_path = `${__dirname}/expected.tsx`;
-    assert.strictEqual(
-        svelte2tsx(input.content, {
-            emitOnTemplateError: true,
-            filename: input.filename
-        }).code,
-        readFileSync(expected_path).toString()
-    );
-};
diff --git a/packages/svelte2tsx/test/test.js b/packages/svelte2tsx/test/test.ts
similarity index 78%
rename from packages/svelte2tsx/test/test.js
rename to packages/svelte2tsx/test/test.ts
index 092c6b432..32b6a3b39 100644
--- a/packages/svelte2tsx/test/test.js
+++ b/packages/svelte2tsx/test/test.ts
@@ -1,15 +1,13 @@
-const glob = require('tiny-glob/sync.js');
+import glob from 'tiny-glob/sync';
 
 require('source-map-support').install();
 
-//console.clear();
-
 if (process.env.CI) {
     const arr = glob('**/*.solo', { cwd: 'test' });
     if (arr.length) throw new Error(`Forgot to remove ".solo" from test(s) ${arr}`);
 }
 
-const test_folders = glob('*/index.js', { cwd: 'test' });
+const test_folders: string[] = glob('*/index.ts', { cwd: 'test' });
 const solo_folders = test_folders.filter((folder) => /\.solo$/.test(folder));
 
 if (solo_folders.length) {
diff --git a/packages/svelte2tsx/test/tsconfig.json b/packages/svelte2tsx/test/tsconfig.json
new file mode 100644
index 000000000..f98942f9f
--- /dev/null
+++ b/packages/svelte2tsx/test/tsconfig.json
@@ -0,0 +1,10 @@
+{
+    "include": ["*.ts", "build/*"],
+    "compilerOptions": {
+        "types": ["@types/node", "@types/mocha"],
+        "target": "esnext",
+        "moduleResolution": "node",
+        "allowSyntheticDefaultImports": true,
+        "allowJs": true
+    }
+}

From 1d4a307e9db0f2b436b6033f20304bfc2842d976 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Thu, 25 Feb 2021 11:20:55 +0100
Subject: [PATCH 03/26] indent using spaces

---
 packages/svelte2tsx/test/helpers.ts           |  2 +-
 .../editing-mustache/expected.error.json      | 28 +++++++++----------
 .../editing-mustache/expected.error.json      | 28 +++++++++----------
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index a2fb174d1..be4b42bab 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -111,7 +111,7 @@ export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'js
                 } catch (error) {
                     hadError = true;
                     if (shouldGenerateError) {
-                        generateExpected(this, errorPath, JSON.stringify(error, void 0, '\t'));
+                        generateExpected(this, errorPath, JSON.stringify(error, void 0, '    '));
                     } else if (expectsError) {
                         assert.deepEqual(
                             JSON.parse(readFileSync(errorPath)),
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json
index ab8f67454..e80bd919c 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json
@@ -1,16 +1,16 @@
 {
-	"name": "ParseError",
-	"code": "parse-error",
-	"start": {
-		"line": 1,
-		"column": 8,
-		"character": 8
-	},
-	"end": {
-		"line": 1,
-		"column": 8,
-		"character": 8
-	},
-	"pos": 8,
-	"frame": "1: {abc.   }\n           ^\n2: {abc?. }\n3: {abc ?}"
+    "name": "ParseError",
+    "code": "parse-error",
+    "start": {
+        "line": 1,
+        "column": 8,
+        "character": 8
+    },
+    "end": {
+        "line": 1,
+        "column": 8,
+        "character": 8
+    },
+    "pos": 8,
+    "frame": "1: {abc.   }\n           ^\n2: {abc?. }\n3: {abc ?}"
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json
index 6b078694e..d97c1944a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json
@@ -1,16 +1,16 @@
 {
-	"name": "ParseError",
-	"code": "parse-error",
-	"start": {
-		"line": 1,
-		"column": 4,
-		"character": 4
-	},
-	"end": {
-		"line": 1,
-		"column": 4,
-		"character": 4
-	},
-	"pos": 4,
-	"frame": "1: {a?.}\n       ^"
+    "name": "ParseError",
+    "code": "parse-error",
+    "start": {
+        "line": 1,
+        "column": 4,
+        "character": 4
+    },
+    "end": {
+        "line": 1,
+        "column": 4,
+        "character": 4
+    },
+    "pos": 4,
+    "frame": "1: {a?.}\n       ^"
 }
\ No newline at end of file

From 2a62d01787e8a9014209adbc3b7add3ed7099831 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Thu, 25 Feb 2021 11:24:54 +0100
Subject: [PATCH 04/26] end with breakline

---
 packages/svelte2tsx/test/helpers.ts                         | 6 +++++-
 .../htmlx2jsx/samples/editing-mustache/expected.error.json  | 2 +-
 .../svelte2tsx/samples/editing-mustache/expected.error.json | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index be4b42bab..62cac607d 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -111,7 +111,11 @@ export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'js
                 } catch (error) {
                     hadError = true;
                     if (shouldGenerateError) {
-                        generateExpected(this, errorPath, JSON.stringify(error, void 0, '    '));
+                        generateExpected(
+                            this,
+                            errorPath,
+                            JSON.stringify(error, void 0, '    ') + '\n'
+                        );
                     } else if (expectsError) {
                         assert.deepEqual(
                             JSON.parse(readFileSync(errorPath)),
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json
index e80bd919c..afb677f97 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json
@@ -13,4 +13,4 @@
     },
     "pos": 8,
     "frame": "1: {abc.   }\n           ^\n2: {abc?. }\n3: {abc ?}"
-}
\ No newline at end of file
+}
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json
index d97c1944a..95cf71155 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json
@@ -13,4 +13,4 @@
     },
     "pos": 4,
     "frame": "1: {a?.}\n       ^"
-}
\ No newline at end of file
+}

From bd8c1bfec25799054d0c72523a0cccef9198529c Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Thu, 25 Feb 2021 12:13:46 +0100
Subject: [PATCH 05/26] yarn lock

---
 yarn.lock | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 8f441c8e3..3b7b7c64b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -484,6 +484,11 @@ ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
+
 anymatch@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
@@ -671,6 +676,11 @@ colorette@^1.1.0:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
   integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
 
+commander@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -1258,7 +1268,7 @@ glob@7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.3, glob@^7.1.6:
+glob@7.1.6, glob@^7.1.3, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -1825,6 +1835,15 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+mz@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -1865,6 +1884,11 @@ node-environment-flags@1.0.6:
     object.getownpropertydescriptors "^2.0.3"
     semver "^5.7.0"
 
+node-modules-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
+
 normalize-package-data@^2.3.2:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -1880,6 +1904,11 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
+object-assign@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
 object-inspect@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
@@ -2096,6 +2125,13 @@ pify@^2.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
+pirates@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
+  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
+  dependencies:
+    node-modules-regexp "^1.0.0"
+
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -2467,6 +2503,18 @@ strip-json-comments@^3.1.0:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+sucrase@^3.17.1:
+  version "3.17.1"
+  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.17.1.tgz#b5e35ca7d99db2cc82b3e942934c3746b41ff8e2"
+  integrity sha512-04cNLFAhS4NBG2Z/MTkLY6HdoBsqErv3wCncymFlfFtnpMthurlWYML2RlID4M2BbiJSu1eZdQnE8Lcz4PCe2g==
+  dependencies:
+    commander "^4.0.0"
+    glob "7.1.6"
+    lines-and-columns "^1.1.6"
+    mz "^2.7.0"
+    pirates "^4.0.1"
+    ts-interface-checker "^0.1.9"
+
 supports-color@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
@@ -2528,6 +2576,20 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
+  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
+  dependencies:
+    any-promise "^1.0.0"
+
 tiny-glob@^0.2.6:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.6.tgz#9e056e169d9788fe8a734dfa1ff02e9b92ed7eda"
@@ -2543,6 +2605,11 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
+ts-interface-checker@^0.1.9:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
+  integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
+
 ts-node@^8.6.2:
   version "8.10.2"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d"

From 386074155120d13f0ce5f5579fb8a98a5fa7a8e2 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Mon, 8 Mar 2021 18:34:05 +0100
Subject: [PATCH 06/26] init

---
 packages/svelte2tsx/mocha.opts                              | 1 -
 packages/svelte2tsx/package.json                            | 4 ++--
 packages/svelte2tsx/test/{helpers.js => helpers.ts}         | 0
 packages/svelte2tsx/test/htmlx2jsx/{index.js => index.ts}   | 0
 packages/svelte2tsx/test/htmlxparser/{index.js => index.ts} | 0
 packages/svelte2tsx/test/sourcemaps/{index.js => index.ts}  | 0
 packages/svelte2tsx/test/svelte2tsx/{index.js => index.ts}  | 0
 packages/svelte2tsx/test/{test.js => test.ts}               | 2 +-
 8 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 packages/svelte2tsx/mocha.opts
 rename packages/svelte2tsx/test/{helpers.js => helpers.ts} (100%)
 rename packages/svelte2tsx/test/htmlx2jsx/{index.js => index.ts} (100%)
 rename packages/svelte2tsx/test/htmlxparser/{index.js => index.ts} (100%)
 rename packages/svelte2tsx/test/sourcemaps/{index.js => index.ts} (100%)
 rename packages/svelte2tsx/test/svelte2tsx/{index.js => index.ts} (100%)
 rename packages/svelte2tsx/test/{test.js => test.ts} (89%)

diff --git a/packages/svelte2tsx/mocha.opts b/packages/svelte2tsx/mocha.opts
deleted file mode 100644
index 427b02975..000000000
--- a/packages/svelte2tsx/mocha.opts
+++ /dev/null
@@ -1 +0,0 @@
-test/test.js
\ No newline at end of file
diff --git a/packages/svelte2tsx/package.json b/packages/svelte2tsx/package.json
index dcd5ad31a..3ea962f54 100644
--- a/packages/svelte2tsx/package.json
+++ b/packages/svelte2tsx/package.json
@@ -45,8 +45,8 @@
         "build": "rollup -c",
         "prepublishOnly": "npm run build",
         "dev": "rollup -c -w",
-        "test": "mocha --opts mocha.opts",
-        "pretest": "rollup -c rollup.config.test.js"
+        "test": "mocha -r ts-node/register/transpile-only test/test.ts",
+        "epretest": "rollup -c rollup.config.test.js"
     },
     "files": [
         "index.mjs",
diff --git a/packages/svelte2tsx/test/helpers.js b/packages/svelte2tsx/test/helpers.ts
similarity index 100%
rename from packages/svelte2tsx/test/helpers.js
rename to packages/svelte2tsx/test/helpers.ts
diff --git a/packages/svelte2tsx/test/htmlx2jsx/index.js b/packages/svelte2tsx/test/htmlx2jsx/index.ts
similarity index 100%
rename from packages/svelte2tsx/test/htmlx2jsx/index.js
rename to packages/svelte2tsx/test/htmlx2jsx/index.ts
diff --git a/packages/svelte2tsx/test/htmlxparser/index.js b/packages/svelte2tsx/test/htmlxparser/index.ts
similarity index 100%
rename from packages/svelte2tsx/test/htmlxparser/index.js
rename to packages/svelte2tsx/test/htmlxparser/index.ts
diff --git a/packages/svelte2tsx/test/sourcemaps/index.js b/packages/svelte2tsx/test/sourcemaps/index.ts
similarity index 100%
rename from packages/svelte2tsx/test/sourcemaps/index.js
rename to packages/svelte2tsx/test/sourcemaps/index.ts
diff --git a/packages/svelte2tsx/test/svelte2tsx/index.js b/packages/svelte2tsx/test/svelte2tsx/index.ts
similarity index 100%
rename from packages/svelte2tsx/test/svelte2tsx/index.js
rename to packages/svelte2tsx/test/svelte2tsx/index.ts
diff --git a/packages/svelte2tsx/test/test.js b/packages/svelte2tsx/test/test.ts
similarity index 89%
rename from packages/svelte2tsx/test/test.js
rename to packages/svelte2tsx/test/test.ts
index 092c6b432..151309665 100644
--- a/packages/svelte2tsx/test/test.js
+++ b/packages/svelte2tsx/test/test.ts
@@ -9,7 +9,7 @@ if (process.env.CI) {
     if (arr.length) throw new Error(`Forgot to remove ".solo" from test(s) ${arr}`);
 }
 
-const test_folders = glob('*/index.js', { cwd: 'test' });
+const test_folders = glob('*/index.ts', { cwd: 'test' });
 const solo_folders = test_folders.filter((folder) => /\.solo$/.test(folder));
 
 if (solo_folders.length) {

From dc56d3729ddfa348c3c088fd4677333dc8f33983 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Mon, 8 Mar 2021 18:36:59 +0100
Subject: [PATCH 07/26] fix

---
 packages/svelte2tsx/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/svelte2tsx/package.json b/packages/svelte2tsx/package.json
index 3ea962f54..eb50b67c0 100644
--- a/packages/svelte2tsx/package.json
+++ b/packages/svelte2tsx/package.json
@@ -46,7 +46,7 @@
         "prepublishOnly": "npm run build",
         "dev": "rollup -c -w",
         "test": "mocha -r ts-node/register/transpile-only test/test.ts",
-        "epretest": "rollup -c rollup.config.test.js"
+        "pretest": "rollup -c rollup.config.test.js"
     },
     "files": [
         "index.mjs",

From 37328553a49cc3d82916a0caa447c1452e39d4ba Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Mon, 8 Mar 2021 19:26:34 +0100
Subject: [PATCH 08/26] esm

---
 packages/svelte2tsx/test/helpers.ts           | 14 ++++++--------
 packages/svelte2tsx/test/htmlx2jsx/index.ts   |  4 ++--
 packages/svelte2tsx/test/htmlxparser/index.ts |  6 +++---
 packages/svelte2tsx/test/sourcemaps/index.ts  | 10 +++++-----
 packages/svelte2tsx/test/svelte2tsx/index.ts  |  4 ++--
 packages/svelte2tsx/test/test.ts              |  2 +-
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index 9d5b81b72..a39b37dde 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -1,11 +1,11 @@
-const fs = require('fs');
-const assert = require('assert');
+import fs from 'fs';
+import assert from 'assert';
 
-function benchmark(fn) {
+export function benchmark(fn) {
     return -Date.now() + (fn(), Date.now());
 }
 
-function readFileSync(path) {
+export function readFileSync(path) {
     return fs.existsSync(path)
         ? fs.readFileSync(path, 'utf-8').replace(/\r\n/g, '\n').replace(/\s+$/, '')
         : null;
@@ -47,7 +47,7 @@ function check_dir(path, { allowed = [], required = allowed }) {
     }
 }
 
-function test_samples(dir, transform, tsx) {
+export function test_samples(dir, transform, tsx) {
     for (const testName of fs.readdirSync(`${dir}/samples`)) {
         const path = `${dir}/samples/${testName}`;
         const expected_path = `${path}/expected.${tsx}`;
@@ -89,10 +89,8 @@ function test_samples(dir, transform, tsx) {
  *
  * @param {string} dirPath
  */
-function get_input_content(dirPath) {
+export function get_input_content(dirPath) {
     const filename = fs.readdirSync(dirPath).find((f) => f.endsWith('.svelte'));
     const content = readFileSync(`${dirPath}/${filename}`);
     return { filename, content };
 }
-
-module.exports = { benchmark, test_samples, get_input_content, readFileSync };
diff --git a/packages/svelte2tsx/test/htmlx2jsx/index.ts b/packages/svelte2tsx/test/htmlx2jsx/index.ts
index 2c7037c0f..64b4aa6eb 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/index.ts
+++ b/packages/svelte2tsx/test/htmlx2jsx/index.ts
@@ -1,5 +1,5 @@
-const { htmlx2jsx } = require('../build/htmlxtojsx');
-const { test_samples } = require('../helpers');
+import { htmlx2jsx } from '../build/htmlxtojsx';
+import { test_samples } from '../helpers';
 
 describe('htmlx2jsx', () => {
     test_samples(__dirname, htmlx2jsx, 'jsx');
diff --git a/packages/svelte2tsx/test/htmlxparser/index.ts b/packages/svelte2tsx/test/htmlxparser/index.ts
index e9efcb316..0f98ba1ac 100644
--- a/packages/svelte2tsx/test/htmlxparser/index.ts
+++ b/packages/svelte2tsx/test/htmlxparser/index.ts
@@ -1,6 +1,6 @@
-const { htmlx2jsx } = require('../build/htmlxtojsx');
-const assert = require('assert');
-const { benchmark } = require('../helpers');
+import { htmlx2jsx } from '../build/htmlxtojsx';
+import assert from 'assert';
+import { benchmark } from '../helpers';
 
 describe('htmlxparser', () => {
     it('parses in a reasonable time', () => {
diff --git a/packages/svelte2tsx/test/sourcemaps/index.ts b/packages/svelte2tsx/test/sourcemaps/index.ts
index 0d45d13d6..5aa0c07a5 100644
--- a/packages/svelte2tsx/test/sourcemaps/index.ts
+++ b/packages/svelte2tsx/test/sourcemaps/index.ts
@@ -1,8 +1,8 @@
-let svelte2tsx = require('../build/index');
-let converter = require('../build/htmlxtojsx');
-let fs = require('fs');
-let assert = require('assert');
-let sm = require('source-map');
+import svelte2tsx from '../build/index';
+import converter from '../build/htmlxtojsx';
+import fs from 'fs';
+import assert from 'assert';
+import sm from 'source-map';
 
 describe('sourcemap', () => {
     /**
diff --git a/packages/svelte2tsx/test/svelte2tsx/index.ts b/packages/svelte2tsx/test/svelte2tsx/index.ts
index 7f98d51e0..fcbc59788 100644
--- a/packages/svelte2tsx/test/svelte2tsx/index.ts
+++ b/packages/svelte2tsx/test/svelte2tsx/index.ts
@@ -1,5 +1,5 @@
-const svelte2tsx = require('../build/index');
-const { test_samples } = require('../helpers');
+import svelte2tsx from '../build/index';
+import { test_samples } from '../helpers';
 
 describe('svelte2tsx', () => {
     test_samples(
diff --git a/packages/svelte2tsx/test/test.ts b/packages/svelte2tsx/test/test.ts
index 151309665..2388a0725 100644
--- a/packages/svelte2tsx/test/test.ts
+++ b/packages/svelte2tsx/test/test.ts
@@ -1,4 +1,4 @@
-const glob = require('tiny-glob/sync.js');
+import glob from 'tiny-glob/sync.js';
 
 require('source-map-support').install();
 

From 6b3cd1a55181872cd159d90695be7a91e25f5235 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 15:35:40 +0100
Subject: [PATCH 09/26] fix

---
 packages/svelte2tsx/package.json             |  2 +-
 packages/svelte2tsx/test/sourcemaps/index.ts |  4 ++--
 packages/svelte2tsx/test/test.ts             |  7 +++++--
 packages/svelte2tsx/test/tsconfig.json       | 10 ++++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 packages/svelte2tsx/test/tsconfig.json

diff --git a/packages/svelte2tsx/package.json b/packages/svelte2tsx/package.json
index eb50b67c0..c1cf66794 100644
--- a/packages/svelte2tsx/package.json
+++ b/packages/svelte2tsx/package.json
@@ -45,7 +45,7 @@
         "build": "rollup -c",
         "prepublishOnly": "npm run build",
         "dev": "rollup -c -w",
-        "test": "mocha -r ts-node/register/transpile-only test/test.ts",
+        "test": "mocha test/test.ts",
         "pretest": "rollup -c rollup.config.test.js"
     },
     "files": [
diff --git a/packages/svelte2tsx/test/sourcemaps/index.ts b/packages/svelte2tsx/test/sourcemaps/index.ts
index 5aa0c07a5..323199161 100644
--- a/packages/svelte2tsx/test/sourcemaps/index.ts
+++ b/packages/svelte2tsx/test/sourcemaps/index.ts
@@ -1,5 +1,5 @@
 import svelte2tsx from '../build/index';
-import converter from '../build/htmlxtojsx';
+import { htmlx2jsx } from '../build/htmlxtojsx';
 import fs from 'fs';
 import assert from 'assert';
 import sm from 'source-map';
@@ -95,7 +95,7 @@ describe('sourcemap', () => {
             // but assert that the source it generates matches our input source.
             //console.log(expected.source)
             const { map, code } = dir.endsWith('.htmlx.html')
-                ? converter.htmlx2jsx(expected.source)
+                ? htmlx2jsx(expected.source)
                 : svelte2tsx(expected.source);
             assert.equal(
                 showWhitespace(code),
diff --git a/packages/svelte2tsx/test/test.ts b/packages/svelte2tsx/test/test.ts
index 2388a0725..df10cacbf 100644
--- a/packages/svelte2tsx/test/test.ts
+++ b/packages/svelte2tsx/test/test.ts
@@ -1,6 +1,9 @@
-import glob from 'tiny-glob/sync.js';
-
+require('ts-node').register({
+    project: 'test/tsconfig.json',
+    transpileOnly: true
+});
 require('source-map-support').install();
+const glob = require('tiny-glob/sync');
 
 //console.clear();
 
diff --git a/packages/svelte2tsx/test/tsconfig.json b/packages/svelte2tsx/test/tsconfig.json
new file mode 100644
index 000000000..5358bf42a
--- /dev/null
+++ b/packages/svelte2tsx/test/tsconfig.json
@@ -0,0 +1,10 @@
+{
+    "compilerOptions": {
+        "target": "esnext",
+        "module": "commonjs",
+        "moduleResolution": "node",
+        "esModuleInterop": true
+    },
+    "exclude": ["samples/**"],
+    "include": ["*.ts"]
+}

From fa4862ecce92d48f4438c210d48f2212d630d2cb Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 16:05:27 +0100
Subject: [PATCH 10/26] Update yarn.lock

---
 yarn.lock | 69 +------------------------------------------------------
 1 file changed, 1 insertion(+), 68 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 506602602..deb51db2c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -484,11 +484,6 @@ ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
-any-promise@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
-
 anymatch@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
@@ -676,11 +671,6 @@ colorette@^1.1.0:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
   integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
 
-commander@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
-  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -1268,7 +1258,7 @@ glob@7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.6, glob@^7.1.3, glob@^7.1.6:
+glob@^7.1.3, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -1835,15 +1825,6 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-mz@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
-  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
-  dependencies:
-    any-promise "^1.0.0"
-    object-assign "^4.0.1"
-    thenify-all "^1.0.0"
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -1884,11 +1865,6 @@ node-environment-flags@1.0.6:
     object.getownpropertydescriptors "^2.0.3"
     semver "^5.7.0"
 
-node-modules-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
-  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
-
 normalize-package-data@^2.3.2:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -1904,11 +1880,6 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-object-assign@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
 object-inspect@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
@@ -2125,13 +2096,6 @@ pify@^2.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
-pirates@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
-  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
-  dependencies:
-    node-modules-regexp "^1.0.0"
-
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -2503,18 +2467,6 @@ strip-json-comments@^3.1.0:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-sucrase@^3.17.1:
-  version "3.17.1"
-  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.17.1.tgz#b5e35ca7d99db2cc82b3e942934c3746b41ff8e2"
-  integrity sha512-04cNLFAhS4NBG2Z/MTkLY6HdoBsqErv3wCncymFlfFtnpMthurlWYML2RlID4M2BbiJSu1eZdQnE8Lcz4PCe2g==
-  dependencies:
-    commander "^4.0.0"
-    glob "7.1.6"
-    lines-and-columns "^1.1.6"
-    mz "^2.7.0"
-    pirates "^4.0.1"
-    ts-interface-checker "^0.1.9"
-
 supports-color@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
@@ -2576,20 +2528,6 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-thenify-all@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
-  integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
-  dependencies:
-    thenify ">= 3.1.0 < 4"
-
-"thenify@>= 3.1.0 < 4":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
-  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
-  dependencies:
-    any-promise "^1.0.0"
-
 tiny-glob@^0.2.6:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.6.tgz#9e056e169d9788fe8a734dfa1ff02e9b92ed7eda"
@@ -2605,11 +2543,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-ts-interface-checker@^0.1.9:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
-  integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
-
 ts-node@^8.6.2:
   version "8.10.2"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d"

From 349f64dae653765d6256283ec8326b6dbb62b6fb Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 18:17:24 +0100
Subject: [PATCH 11/26] Update rollup.config.test.js

---
 packages/svelte2tsx/rollup.config.test.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/svelte2tsx/rollup.config.test.js b/packages/svelte2tsx/rollup.config.test.js
index 2da91e0a5..6ee7628e3 100644
--- a/packages/svelte2tsx/rollup.config.test.js
+++ b/packages/svelte2tsx/rollup.config.test.js
@@ -4,6 +4,17 @@ import resolve from '@rollup/plugin-node-resolve';
 import json from '@rollup/plugin-json';
 import del from 'rollup-plugin-delete';
 import builtins from 'builtin-modules';
+import fs from 'fs';
+
+function generateFile(file, x) {
+    return {
+        writeBundle() {
+            if (!process.env.CI) {
+                fs.writeFileSync(file, x);
+            }
+        }
+    };
+}
 
 export default [
     {
@@ -18,7 +29,8 @@ export default [
             resolve({ browser: false, preferBuiltins: true }),
             commonjs(),
             json(),
-            typescript({ include: ['src/**/*'] })
+            typescript({ include: ['src/**/*'] }),
+            generateFile(`test/build/index.d.ts`, `export { default } from '../../index';`)
         ],
         external: [...builtins, 'typescript', 'svelte', 'svelte/compiler', 'magic-string']
     },
@@ -34,7 +46,8 @@ export default [
             resolve({ browser: false, preferBuiltins: true }),
             commonjs(),
             json(),
-            typescript({ include: ['src/**/*'] })
+            typescript({ include: ['src/**/*'] }),
+            generateFile(`test/build/htmlxtojsx.d.ts`, `export * from '../../src/htmlxtojsx/index';`)
         ],
         external: [...builtins, 'typescript', 'svelte', 'svelte/compiler', 'magic-string']
     }

From 6a5267469469e563e464358b2eec8de859cceb1e Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 18:22:01 +0100
Subject: [PATCH 12/26] Update rollup.config.test.js

---
 packages/svelte2tsx/rollup.config.test.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/svelte2tsx/rollup.config.test.js b/packages/svelte2tsx/rollup.config.test.js
index 6ee7628e3..e0ead87cf 100644
--- a/packages/svelte2tsx/rollup.config.test.js
+++ b/packages/svelte2tsx/rollup.config.test.js
@@ -47,7 +47,10 @@ export default [
             commonjs(),
             json(),
             typescript({ include: ['src/**/*'] }),
-            generateFile(`test/build/htmlxtojsx.d.ts`, `export * from '../../src/htmlxtojsx/index';`)
+            generateFile(
+                `test/build/htmlxtojsx.d.ts`,
+                `export * from '../../src/htmlxtojsx/index';`
+            )
         ],
         external: [...builtins, 'typescript', 'svelte', 'svelte/compiler', 'magic-string']
     }

From 7196cc7d97e10875d0c96e38d4a885d04be6706c Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 18:24:48 +0100
Subject: [PATCH 13/26] Update rollup.config.test.js

---
 packages/svelte2tsx/rollup.config.test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/svelte2tsx/rollup.config.test.js b/packages/svelte2tsx/rollup.config.test.js
index e0ead87cf..71040a212 100644
--- a/packages/svelte2tsx/rollup.config.test.js
+++ b/packages/svelte2tsx/rollup.config.test.js
@@ -30,7 +30,7 @@ export default [
             commonjs(),
             json(),
             typescript({ include: ['src/**/*'] }),
-            generateFile(`test/build/index.d.ts`, `export { default } from '../../index';`)
+            generateFile('test/build/index.d.ts', "export { default } from '../../index';")
         ],
         external: [...builtins, 'typescript', 'svelte', 'svelte/compiler', 'magic-string']
     },
@@ -48,8 +48,8 @@ export default [
             json(),
             typescript({ include: ['src/**/*'] }),
             generateFile(
-                `test/build/htmlxtojsx.d.ts`,
-                `export * from '../../src/htmlxtojsx/index';`
+                'test/build/htmlxtojsx.d.ts',
+                "export * from '../../src/htmlxtojsx/index';"
             )
         ],
         external: [...builtins, 'typescript', 'svelte', 'svelte/compiler', 'magic-string']

From 74c6c42c58f2c6a73b0b3096d3ca56f631a67334 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 21:10:54 +0100
Subject: [PATCH 14/26] update

---
 packages/svelte2tsx/test/helpers.ts          | 233 ++++++++++---------
 packages/svelte2tsx/test/htmlx2jsx/index.ts  |   2 +-
 packages/svelte2tsx/test/svelte2tsx/index.ts |  11 +-
 3 files changed, 134 insertions(+), 112 deletions(-)

diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index 62cac607d..8b8582f00 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -1,151 +1,172 @@
 import assert from 'assert';
 import fs from 'fs';
-import type { htmlx2jsx as htmlx2jsxFn } from '../src/htmlxtojsx/index';
-import type { svelte2tsx as svelte2tsxFn } from '../src/svelte2tsx/index';
+import { TestFunction } from 'mocha';
+import svelte2tsx from '../build/index';
+import { htmlx2jsx } from '../build/htmlxtojsx';
+
 export function benchmark(fn: () => void) {
     return -Date.now() + (fn(), Date.now());
 }
 
 function readFileSync(path: string) {
-    if (!fs.existsSync(path)) return undefined;
-    return fs.readFileSync(path, 'utf-8').replace(/\r\n/g, '\n').replace(/\s+$/, '');
-}
-
-function check_dir(
-    dirPath: string,
-    fileNames: string[],
-    dir_config: { allowed: string[]; required?: string[] }
-) {
-    const unchecked = new Set(dir_config.required ?? dir_config.allowed);
-    const unknown = [];
-    loop: for (const fileName of fileNames) {
-        for (const name of unchecked) {
-            if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
-                unchecked.delete(name);
-                continue loop;
-            }
-        }
-        for (const name of dir_config.allowed) {
-            if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
-                continue loop;
-            }
-        }
-        unknown.push(fileName);
-    }
-    if (unknown.length !== 0) {
-        after(function () {
-            for (const name of unknown) {
-                const msg = `Unexpected file ${dirPath.split('/').slice(-1)}/${name}`;
-                if (process.env.CI) {
-                    throw new Error(msg);
-                } else {
-                    console.info(msg);
-                }
-            }
-        });
-    }
-    if (unchecked.size !== 0) {
-        throw new Error(
-            `Expected file(s) ${[...unchecked].map((str) => `"${str}"`).join(', ')} in ${dirPath}`
-        );
-    }
+    return fs.existsSync(path)
+        ? fs.readFileSync(path, 'utf-8').replace(/\r\n/g, '\n').replace(/\s+$/, '')
+        : null;
 }
-type TransformFn = typeof htmlx2jsxFn | typeof svelte2tsxFn;
+type TransformFn = typeof htmlx2jsx | typeof svelte2tsx;
 type TransformedFile = ReturnType<TransformFn>;
-type TransformSampleFn = (config: {
-    sampleName: string;
-    fileName: string;
-    input: string;
-    emitOnTemplateError: boolean;
-}) => TransformedFile;
-
-function generateExpected(context: Mocha.Context, path: string, code: string) {
-    if (process.env.CI) {
-        throw new Error(`Forgot to generate expected output at "${path}"`);
+type TransformSampleFn = (
+    input: string,
+    config: {
+        sampleName: string;
+        fileName: string;
+        emitOnTemplateError: boolean;
     }
-    after(() => {
-        fs.writeFileSync(path, code);
-        const name = path.slice(path.lastIndexOf('/', path.lastIndexOf('/')) + 1);
-        console.info(`Generated ${name}`);
-    });
-    context.skip();
-}
+) => TransformedFile;
 
 export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'jsx' | 'tsx') {
-    for (const sampleName of fs.readdirSync(`${dir}/samples`)) {
-        const sampleDirectory = `${dir}/samples/${sampleName}`;
-        const folder = fs.readdirSync(sampleDirectory);
-        const fileName = folder.find((f) => f.endsWith('.svelte'));
+    for (const sample of each_sample(dir)) {
+        const svelteFile = sample.folder.find((f) => f.endsWith('.svelte'));
 
-        check_dir(sampleDirectory, folder, {
+        sample.check({
             required: ['*.svelte'],
             allowed: ['expected.js', `expected.${jsx}`, 'expected.error.json']
         });
 
-        const sveltePath = `${sampleDirectory}/${fileName}`;
-        const expectedPath = `${sampleDirectory}/expected.${jsx}`;
-        const errorPath = `${sampleDirectory}/expected.error.json`;
-
-        const hasCustomTest = folder.includes('expected.js');
-        const expectsError = folder.includes('expected.error.json');
-        const shouldGenerateExpected = !folder.includes(`expected.${jsx}`);
-        const shouldGenerateError = expectsError && !readFileSync(errorPath);
-
-        // generates "expected.tsx" when it's missing
-        // generates "expected.error.json" content if file exists but is empty
+        const shouldGenerateExpected = !sample.has(`expected.${jsx}`);
+        const shouldGenerateError = sample.get('expected.error.json') === '';
 
-        const solo = sampleName.endsWith('.solo');
-        const skip = sampleName.startsWith('.');
-        (skip ? it.skip : solo ? it.only : it)(sampleName, function () {
+        sample.it(function () {
+            const input = sample.get(svelteFile);
             const config = {
-                sampleName,
-                fileName,
-                input: readFileSync(sveltePath),
+                fileName: svelteFile,
+                sampleName: sample.name,
                 emitOnTemplateError: false
             };
 
-            if (expectsError) {
+            if (sample.has('expected.error.json')) {
                 let hadError = false;
                 try {
-                    transform(config);
+                    transform(input, config);
                 } catch (error) {
                     hadError = true;
                     if (shouldGenerateError) {
-                        generateExpected(
-                            this,
-                            errorPath,
+                        sample.generate(
+                            'expected.error.json',
                             JSON.stringify(error, void 0, '    ') + '\n'
                         );
-                    } else if (expectsError) {
+                    } else {
                         assert.deepEqual(
-                            JSON.parse(readFileSync(errorPath)),
+                            JSON.parse(sample.get('expected.error.json')),
                             JSON.parse(JSON.stringify(error))
                         );
-                    } else {
-                        throw error;
                     }
-                    config.emitOnTemplateError = true;
-                }
-                if (!hadError) {
-                    throw new Error(
-                        `Sample "${sampleName}" expected an error but got none.\n\n\tcmd click: ${errorPath}`
-                    );
                 }
+                config.emitOnTemplateError = true;
+                assert(hadError, `Expected a template error but got none`);
             }
 
-            const output = transform(config);
+            const output = transform(input, config);
 
             if (shouldGenerateExpected) {
-                generateExpected(this, expectedPath, output.code);
+                sample.generate(`expected.${jsx}`, output.code);
             } else {
-                assert.strictEqual(output.code, readFileSync(expectedPath));
+                assert.strictEqual(output.code, sample.get(`expected.${jsx}`));
             }
 
-            if (hasCustomTest) {
-                // see example at "svelte2tsx\samples\component-events-interface\expected.js"
-                const fn = require(`${sampleDirectory}/expected.js`);
-                fn(output);
+            if (sample.has('expected.js')) {
+                sample.eval('expected.js', output);
+            }
+        });
+    }
+}
+class Sample {
+    readonly folder: string[];
+    readonly directory: string;
+    constructor(dir: string, readonly name: string) {
+        this.directory = `${dir}/samples/${name}`;
+        this.folder = fs.readdirSync(this.directory);
+    }
+    it(fn: () => void) {
+        let _it = it;
+        if (this.name.startsWith('.')) {
+            _it = it.skip as TestFunction;
+        } else if (this.name.endsWith('.solo')) {
+            _it = it.only as TestFunction;
+        }
+        const sample = this;
+        _it(this.name, function () {
+            try {
+                fn();
+                if (sample.skipped) this.skip();
+            } catch (err) {
+                if (sample.skipped) this.skip();
+                throw err;
             }
         });
     }
+    has(file: string) {
+        return this.folder.includes(file);
+    }
+    get(file: string) {
+        return readFileSync(`${this.directory}/${file}`);
+    }
+    private skipped = false;
+    generate(fileName: string, content: string) {
+        const path = `${this.directory}/${fileName}`;
+        if (process.env.CI) {
+            throw new Error(`Forgot to generate expected sample result at "${path}"`);
+        }
+        after(() => {
+            fs.writeFileSync(path, content);
+            console.info(`(generated) ${this.name}/${fileName}`);
+        });
+        this.skipped = true;
+    }
+    eval(fileName: string, ...args: any[]) {
+        const fn = require(`${this.directory}/${fileName}`);
+        fn(...args);
+    }
+    check({ required = [], allowed = required }: { allowed?: string[]; required?: string[] }) {
+        const unchecked = new Set(required);
+        const unknown = [];
+        loop: for (const fileName of this.folder) {
+            for (const name of unchecked) {
+                if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
+                    unchecked.delete(name);
+                    continue loop;
+                }
+            }
+            for (const name of allowed) {
+                if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
+                    continue loop;
+                }
+            }
+            unknown.push(fileName);
+        }
+        if (unknown.length) {
+            const errors =
+                unknown.map((name) => `Unexpected file "${name}"`).join('\n') +
+                `\nat ${this.directory}`;
+            if (process.env.CI) {
+                throw new Error('\n' + errors);
+            } else {
+                after(() => {
+                    console.log(errors);
+                });
+            }
+        }
+        if (unchecked.size) {
+            throw new Error(
+                `Expected file${unchecked.size === 1 ? '' : 's'} ${[...unchecked]
+                    .map((str) => `"${str}"`)
+                    .join(', ')} in "${this.directory}"`
+            );
+        }
+    }
+}
+export function* each_sample(dir: string) {
+    for (const name of fs.readdirSync(`${dir}/samples`)) {
+        yield new Sample(dir, name);
+    }
 }
diff --git a/packages/svelte2tsx/test/htmlx2jsx/index.ts b/packages/svelte2tsx/test/htmlx2jsx/index.ts
index 3faf2e31f..e6255321d 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/index.ts
+++ b/packages/svelte2tsx/test/htmlx2jsx/index.ts
@@ -4,7 +4,7 @@ import { test_samples } from '../helpers';
 describe('htmlx2jsx', function () {
     test_samples(
         __dirname,
-        function ({ input, emitOnTemplateError }) {
+        function (input, { emitOnTemplateError }) {
             return htmlx2jsx(input, { emitOnTemplateError });
         },
         'jsx'
diff --git a/packages/svelte2tsx/test/svelte2tsx/index.ts b/packages/svelte2tsx/test/svelte2tsx/index.ts
index fcbc59788..290bcd033 100644
--- a/packages/svelte2tsx/test/svelte2tsx/index.ts
+++ b/packages/svelte2tsx/test/svelte2tsx/index.ts
@@ -1,14 +1,15 @@
 import svelte2tsx from '../build/index';
 import { test_samples } from '../helpers';
 
-describe('svelte2tsx', () => {
+describe('svelte2tsx', function () {
     test_samples(
         __dirname,
-        (input, testName, filename) => {
+        function (input, { sampleName, fileName, emitOnTemplateError }) {
             return svelte2tsx(input, {
-                strictMode: testName.includes('strictMode'),
-                isTsFile: testName.startsWith('ts-'),
-                filename
+                strictMode: sampleName.includes('strictMode'),
+                isTsFile: sampleName.startsWith('ts-'),
+                filename: fileName,
+                emitOnTemplateError
             });
         },
         'tsx'

From 2a6e1c0d64881f13355b0fad9e7f6e8de81f67f5 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 21:13:55 +0100
Subject: [PATCH 15/26] Update package.json

---
 packages/svelte2tsx/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/svelte2tsx/package.json b/packages/svelte2tsx/package.json
index 827a18f7d..c1cf66794 100644
--- a/packages/svelte2tsx/package.json
+++ b/packages/svelte2tsx/package.json
@@ -17,10 +17,6 @@
     "main": "index.js",
     "types": "index.d.ts",
     "devDependencies": {
-        "@rollup/plugin-commonjs": "^15.0.0",
-        "@rollup/plugin-json": "^4.0.0",
-        "@rollup/plugin-node-resolve": "^9.0.0",
-        "@rollup/plugin-typescript": "^6.0.0",
         "@types/mocha": "^5.2.7",
         "@types/node": "^8.10.53",
         "@types/unist": "^2.0.3",
@@ -29,7 +25,11 @@
         "mocha": "^6.2.2",
         "periscopic": "^2.0.2",
         "rollup": "^2.28.0",
+        "@rollup/plugin-commonjs": "^15.0.0",
         "rollup-plugin-delete": "^2.0.0",
+        "@rollup/plugin-json": "^4.0.0",
+        "@rollup/plugin-node-resolve": "^9.0.0",
+        "@rollup/plugin-typescript": "^6.0.0",
         "source-map": "^0.6.1",
         "source-map-support": "^0.5.16",
         "svelte": "~3.35.0",

From ea48a964424fd5424441a16b0b0b37cb065c3ab7 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 21:17:32 +0100
Subject: [PATCH 16/26] Update index.ts

---
 packages/svelte2tsx/test/htmlxparser/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/svelte2tsx/test/htmlxparser/index.ts b/packages/svelte2tsx/test/htmlxparser/index.ts
index 491838753..0f98ba1ac 100644
--- a/packages/svelte2tsx/test/htmlxparser/index.ts
+++ b/packages/svelte2tsx/test/htmlxparser/index.ts
@@ -1,5 +1,5 @@
-import assert from 'assert';
 import { htmlx2jsx } from '../build/htmlxtojsx';
+import assert from 'assert';
 import { benchmark } from '../helpers';
 
 describe('htmlxparser', () => {

From 3233908abc5da5f64e7985914866e65cc1114093 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 21:23:17 +0100
Subject: [PATCH 17/26] Update helpers.ts

---
 packages/svelte2tsx/test/helpers.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index 8b8582f00..92f163af3 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -1,8 +1,8 @@
 import assert from 'assert';
 import fs from 'fs';
 import { TestFunction } from 'mocha';
-import svelte2tsx from '../build/index';
-import { htmlx2jsx } from '../build/htmlxtojsx';
+import svelte2tsx from './build/index';
+import { htmlx2jsx } from './build/htmlxtojsx';
 
 export function benchmark(fn: () => void) {
     return -Date.now() + (fn(), Date.now());
@@ -13,16 +13,14 @@ function readFileSync(path: string) {
         ? fs.readFileSync(path, 'utf-8').replace(/\r\n/g, '\n').replace(/\s+$/, '')
         : null;
 }
-type TransformFn = typeof htmlx2jsx | typeof svelte2tsx;
-type TransformedFile = ReturnType<TransformFn>;
 type TransformSampleFn = (
     input: string,
     config: {
-        sampleName: string;
         fileName: string;
+        sampleName: string;
         emitOnTemplateError: boolean;
     }
-) => TransformedFile;
+) => ReturnType<typeof htmlx2jsx | typeof svelte2tsx>;
 
 export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'jsx' | 'tsx') {
     for (const sample of each_sample(dir)) {

From abacc06e253116fd718a462fe9752cbb5866bd96 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 21:31:59 +0100
Subject: [PATCH 18/26] init

---
 packages/svelte2tsx/test/helpers.ts           | 42 ++++++++-----------
 .../editing-mustache/expected.error.json      | 16 -------
 .../samples/editing-mustache/test.js          | 26 ++++++++++++
 .../editing-mustache/expected.error.json      | 16 -------
 .../samples/editing-mustache/test.js          | 29 +++++++++++++
 5 files changed, 72 insertions(+), 57 deletions(-)
 delete mode 100644 packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json
 create mode 100644 packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/test.js
 delete mode 100644 packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json
 create mode 100644 packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/test.js

diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index 92f163af3..0b650b5f1 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -8,7 +8,7 @@ export function benchmark(fn: () => void) {
     return -Date.now() + (fn(), Date.now());
 }
 
-function readFileSync(path: string) {
+export function readFileSync(path: string) {
     return fs.existsSync(path)
         ? fs.readFileSync(path, 'utf-8').replace(/\r\n/g, '\n').replace(/\s+$/, '')
         : null;
@@ -28,11 +28,15 @@ export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'js
 
         sample.check({
             required: ['*.svelte'],
-            allowed: ['expected.js', `expected.${jsx}`, 'expected.error.json']
+            allowed: ['test.js', 'expected.js', `expected.${jsx}`, 'expected.error.json']
         });
 
         const shouldGenerateExpected = !sample.has(`expected.${jsx}`);
-        const shouldGenerateError = sample.get('expected.error.json') === '';
+
+        if (sample.has('test.js')) {
+            sample.eval('test.js');
+            return;
+        }
 
         sample.it(function () {
             const input = sample.get(svelteFile);
@@ -42,28 +46,6 @@ export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'js
                 emitOnTemplateError: false
             };
 
-            if (sample.has('expected.error.json')) {
-                let hadError = false;
-                try {
-                    transform(input, config);
-                } catch (error) {
-                    hadError = true;
-                    if (shouldGenerateError) {
-                        sample.generate(
-                            'expected.error.json',
-                            JSON.stringify(error, void 0, '    ') + '\n'
-                        );
-                    } else {
-                        assert.deepEqual(
-                            JSON.parse(sample.get('expected.error.json')),
-                            JSON.parse(JSON.stringify(error))
-                        );
-                    }
-                }
-                config.emitOnTemplateError = true;
-                assert(hadError, `Expected a template error but got none`);
-            }
-
             const output = transform(input, config);
 
             if (shouldGenerateExpected) {
@@ -168,3 +150,13 @@ export function* each_sample(dir: string) {
         yield new Sample(dir, name);
     }
 }
+
+/**
+ *
+ * @param {string} dirPath
+ */
+export function get_input_content(dirPath) {
+    const filename = fs.readdirSync(dirPath).find((f) => f.endsWith('.svelte'));
+    const content = readFileSync(`${dirPath}/${filename}`);
+    return { filename, content };
+}
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json
deleted file mode 100644
index afb677f97..000000000
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expected.error.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "name": "ParseError",
-    "code": "parse-error",
-    "start": {
-        "line": 1,
-        "column": 8,
-        "character": 8
-    },
-    "end": {
-        "line": 1,
-        "column": 8,
-        "character": 8
-    },
-    "pos": 8,
-    "frame": "1: {abc.   }\n           ^\n2: {abc?. }\n3: {abc ?}"
-}
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/test.js b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/test.js
new file mode 100644
index 000000000..05df3c937
--- /dev/null
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/test.js
@@ -0,0 +1,26 @@
+const assert = require('assert');
+const { htmlx2jsx } = require('../../../build/htmlxtojsx');
+const { get_input_content, readFileSync } = require('../../../helpers');
+
+module.exports = function () {
+    const input = get_input_content(__dirname);
+
+    assert.throws(
+        () => {
+            htmlx2jsx(input.content);
+        },
+        {
+            name: 'ParseError',
+            code: 'parse-error',
+            start: { line: 1, column: 8, character: 8 },
+            end: { line: 1, column: 8, character: 8 },
+            frame: '1: {abc.   }\n           ^\n2: {abc?. }\n3: {abc ?}'
+        }
+    );
+
+    const expected_path = `${__dirname}/expected.jsx`;
+    assert.strictEqual(
+        htmlx2jsx(input.content, { emitOnTemplateError: true }).code,
+        readFileSync(expected_path).toString()
+    );
+};
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json
deleted file mode 100644
index 95cf71155..000000000
--- a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.error.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "name": "ParseError",
-    "code": "parse-error",
-    "start": {
-        "line": 1,
-        "column": 4,
-        "character": 4
-    },
-    "end": {
-        "line": 1,
-        "column": 4,
-        "character": 4
-    },
-    "pos": 4,
-    "frame": "1: {a?.}\n       ^"
-}
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/test.js b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/test.js
new file mode 100644
index 000000000..50007ad5e
--- /dev/null
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/test.js
@@ -0,0 +1,29 @@
+const assert = require('assert');
+const svelte2tsx = require('../../../build/index');
+const { get_input_content, readFileSync } = require('../../../helpers');
+
+module.exports = function () {
+    const input = get_input_content(__dirname);
+
+    assert.throws(
+        () => {
+            svelte2tsx(input.content);
+        },
+        {
+            name: 'ParseError',
+            code: 'parse-error',
+            start: { line: 1, column: 4, character: 4 },
+            end: { line: 1, column: 4, character: 4 },
+            frame: '1: {a?.}\n       ^'
+        }
+    );
+
+    const expected_path = `${__dirname}/expected.tsx`;
+    assert.strictEqual(
+        svelte2tsx(input.content, {
+            emitOnTemplateError: true,
+            filename: input.filename
+        }).code,
+        readFileSync(expected_path).toString()
+    );
+};
\ No newline at end of file

From 047d94fb6a19ced748e843a676e2669a74d0d8a0 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 21:36:59 +0100
Subject: [PATCH 19/26] Update helpers.ts

---
 packages/svelte2tsx/test/helpers.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index 0b650b5f1..ef276ec74 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -33,12 +33,11 @@ export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'js
 
         const shouldGenerateExpected = !sample.has(`expected.${jsx}`);
 
-        if (sample.has('test.js')) {
-            sample.eval('test.js');
-            return;
-        }
-
         sample.it(function () {
+            if (sample.has('test.js')) {
+                sample.eval('test.js');
+                return;
+            }
             const input = sample.get(svelteFile);
             const config = {
                 fileName: svelteFile,

From 397c56d5bb445568943f07a7ae2319fdc31380fe Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 21:49:15 +0100
Subject: [PATCH 20/26] Revert "Merge branch 'master' into share-sample-logic"

This reverts commit 8db7186c624c43478350d4db8cc2e9cd5a98b39f, reversing
changes made to 047d94fb6a19ced748e843a676e2669a74d0d8a0.
---
 packages/svelte-vscode/package-json-schema.json     | 2 +-
 packages/svelte-vscode/prettier-options-schema.json | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/svelte-vscode/package-json-schema.json b/packages/svelte-vscode/package-json-schema.json
index 3db9f6af0..713c292bb 100644
--- a/packages/svelte-vscode/package-json-schema.json
+++ b/packages/svelte-vscode/package-json-schema.json
@@ -3,7 +3,7 @@
     "properties": {
         "prettier": {
             "description": "Prettier-Plugin-Svelte configuration",
-            "$ref": "./prettier-options.json"
+            "$ref": "./prettier-options-schema.json"
         }
     }
 }
diff --git a/packages/svelte-vscode/prettier-options-schema.json b/packages/svelte-vscode/prettier-options-schema.json
index 7963befa9..9df51ad56 100644
--- a/packages/svelte-vscode/prettier-options-schema.json
+++ b/packages/svelte-vscode/prettier-options-schema.json
@@ -32,7 +32,13 @@
                         "styles-scripts-options-markup",
                         "styles-scripts-markup-options",
                         "styles-markup-options-scripts",
-                        "styles-markup-scripts-options"
+                        "styles-markup-scripts-options",
+                        "scripts-markup-styles",
+                        "scripts-styles-markup",
+                        "markup-styles-scripts",
+                        "markup-scripts-styles",
+                        "styles-markup-scripts",
+                        "styles-scripts-markup"
                     ]
                 },
                 "svelteStrictMode": {

From 93e794f99abfc9027fffd33087de5aaac684bf68 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 21:56:59 +0100
Subject: [PATCH 21/26] update

---
 packages/svelte2tsx/test/helpers.ts           | 94 ++++++++++---------
 packages/svelte2tsx/test/htmlx2jsx/index.ts   | 12 +--
 .../samples/editing-mustache/test.js          |  2 +-
 packages/svelte2tsx/test/svelte2tsx/index.ts  |  4 +-
 .../samples/editing-mustache/test.js          |  2 +-
 5 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index ef276ec74..1b962ffe4 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -1,5 +1,5 @@
-import assert from 'assert';
 import fs from 'fs';
+import assert from 'assert';
 import { TestFunction } from 'mocha';
 import svelte2tsx from './build/index';
 import { htmlx2jsx } from './build/htmlxtojsx';
@@ -13,52 +13,7 @@ export function readFileSync(path: string) {
         ? fs.readFileSync(path, 'utf-8').replace(/\r\n/g, '\n').replace(/\s+$/, '')
         : null;
 }
-type TransformSampleFn = (
-    input: string,
-    config: {
-        fileName: string;
-        sampleName: string;
-        emitOnTemplateError: boolean;
-    }
-) => ReturnType<typeof htmlx2jsx | typeof svelte2tsx>;
-
-export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'jsx' | 'tsx') {
-    for (const sample of each_sample(dir)) {
-        const svelteFile = sample.folder.find((f) => f.endsWith('.svelte'));
-
-        sample.check({
-            required: ['*.svelte'],
-            allowed: ['test.js', 'expected.js', `expected.${jsx}`, 'expected.error.json']
-        });
-
-        const shouldGenerateExpected = !sample.has(`expected.${jsx}`);
 
-        sample.it(function () {
-            if (sample.has('test.js')) {
-                sample.eval('test.js');
-                return;
-            }
-            const input = sample.get(svelteFile);
-            const config = {
-                fileName: svelteFile,
-                sampleName: sample.name,
-                emitOnTemplateError: false
-            };
-
-            const output = transform(input, config);
-
-            if (shouldGenerateExpected) {
-                sample.generate(`expected.${jsx}`, output.code);
-            } else {
-                assert.strictEqual(output.code, sample.get(`expected.${jsx}`));
-            }
-
-            if (sample.has('expected.js')) {
-                sample.eval('expected.js', output);
-            }
-        });
-    }
-}
 class Sample {
     readonly folder: string[];
     readonly directory: string;
@@ -144,6 +99,53 @@ class Sample {
         }
     }
 }
+type TransformSampleFn = (
+    input: string,
+    config: {
+        fileName: string;
+        sampleName: string;
+        emitOnTemplateError: boolean;
+    }
+) => ReturnType<typeof htmlx2jsx | typeof svelte2tsx>;
+
+export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'jsx' | 'tsx') {
+    for (const sample of each_sample(dir)) {
+        const svelteFile = sample.folder.find((f) => f.endsWith('.svelte'));
+
+        sample.check({
+            required: ['*.svelte'],
+            allowed: ['test.js', 'expected.js', `expected.${jsx}`, 'expected.error.json']
+        });
+
+        const shouldGenerateExpected = !sample.has(`expected.${jsx}`);
+
+        sample.it(function () {
+            if (sample.has('test.js')) {
+                sample.eval('test.js');
+                return;
+            }
+            const input = sample.get(svelteFile);
+            const config = {
+                fileName: svelteFile,
+                sampleName: sample.name,
+                emitOnTemplateError: false
+            };
+
+            const output = transform(input, config);
+
+            if (shouldGenerateExpected) {
+                sample.generate(`expected.${jsx}`, output.code);
+            } else {
+                assert.strictEqual(output.code, sample.get(`expected.${jsx}`));
+            }
+
+            if (sample.has('expected.js')) {
+                sample.eval('expected.js', output);
+            }
+        });
+    }
+}
+
 export function* each_sample(dir: string) {
     for (const name of fs.readdirSync(`${dir}/samples`)) {
         yield new Sample(dir, name);
diff --git a/packages/svelte2tsx/test/htmlx2jsx/index.ts b/packages/svelte2tsx/test/htmlx2jsx/index.ts
index e6255321d..6ab9243c5 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/index.ts
+++ b/packages/svelte2tsx/test/htmlx2jsx/index.ts
@@ -1,12 +1,6 @@
 import { htmlx2jsx } from '../build/htmlxtojsx';
 import { test_samples } from '../helpers';
 
-describe('htmlx2jsx', function () {
-    test_samples(
-        __dirname,
-        function (input, { emitOnTemplateError }) {
-            return htmlx2jsx(input, { emitOnTemplateError });
-        },
-        'jsx'
-    );
-});
+describe('htmlx2jsx', () => {
+	test_samples(__dirname, htmlx2jsx, 'jsx');
+});
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/test.js b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/test.js
index 05df3c937..970b8e422 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/test.js
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/test.js
@@ -23,4 +23,4 @@ module.exports = function () {
         htmlx2jsx(input.content, { emitOnTemplateError: true }).code,
         readFileSync(expected_path).toString()
     );
-};
\ No newline at end of file
+};
diff --git a/packages/svelte2tsx/test/svelte2tsx/index.ts b/packages/svelte2tsx/test/svelte2tsx/index.ts
index 290bcd033..b0677dd41 100644
--- a/packages/svelte2tsx/test/svelte2tsx/index.ts
+++ b/packages/svelte2tsx/test/svelte2tsx/index.ts
@@ -1,10 +1,10 @@
 import svelte2tsx from '../build/index';
 import { test_samples } from '../helpers';
 
-describe('svelte2tsx', function () {
+describe('svelte2tsx', () => {
     test_samples(
         __dirname,
-        function (input, { sampleName, fileName, emitOnTemplateError }) {
+        (input, { sampleName, fileName, emitOnTemplateError }) => {
             return svelte2tsx(input, {
                 strictMode: sampleName.includes('strictMode'),
                 isTsFile: sampleName.startsWith('ts-'),
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/test.js b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/test.js
index 50007ad5e..429136706 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/test.js
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/test.js
@@ -26,4 +26,4 @@ module.exports = function () {
         }).code,
         readFileSync(expected_path).toString()
     );
-};
\ No newline at end of file
+};

From afdb5f0d3301003d8f2312128ccd79d9ad708a22 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 21:58:26 +0100
Subject: [PATCH 22/26] Update helpers.ts

---
 packages/svelte2tsx/test/helpers.ts | 76 ++++++++++++++---------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index 1b962ffe4..16a99ab59 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -15,6 +15,43 @@ export function readFileSync(path: string) {
 }
 
 class Sample {
+    check_dir({ required = [], allowed = required }: { allowed?: string[]; required?: string[] }) {
+        const unchecked = new Set(required);
+        const unknown = [];
+        loop: for (const fileName of this.folder) {
+            for (const name of unchecked) {
+                if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
+                    unchecked.delete(name);
+                    continue loop;
+                }
+            }
+            for (const name of allowed) {
+                if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
+                    continue loop;
+                }
+            }
+            unknown.push(fileName);
+        }
+        if (unknown.length) {
+            const errors =
+                unknown.map((name) => `Unexpected file "${name}"`).join('\n') +
+                `\nat ${this.directory}`;
+            if (process.env.CI) {
+                throw new Error('\n' + errors);
+            } else {
+                after(() => {
+                    console.log(errors);
+                });
+            }
+        }
+        if (unchecked.size) {
+            throw new Error(
+                `Expected file${unchecked.size === 1 ? '' : 's'} ${[...unchecked]
+                    .map((str) => `"${str}"`)
+                    .join(', ')} in "${this.directory}"`
+            );
+        }
+    }
     readonly folder: string[];
     readonly directory: string;
     constructor(dir: string, readonly name: string) {
@@ -61,43 +98,6 @@ class Sample {
         const fn = require(`${this.directory}/${fileName}`);
         fn(...args);
     }
-    check({ required = [], allowed = required }: { allowed?: string[]; required?: string[] }) {
-        const unchecked = new Set(required);
-        const unknown = [];
-        loop: for (const fileName of this.folder) {
-            for (const name of unchecked) {
-                if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
-                    unchecked.delete(name);
-                    continue loop;
-                }
-            }
-            for (const name of allowed) {
-                if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
-                    continue loop;
-                }
-            }
-            unknown.push(fileName);
-        }
-        if (unknown.length) {
-            const errors =
-                unknown.map((name) => `Unexpected file "${name}"`).join('\n') +
-                `\nat ${this.directory}`;
-            if (process.env.CI) {
-                throw new Error('\n' + errors);
-            } else {
-                after(() => {
-                    console.log(errors);
-                });
-            }
-        }
-        if (unchecked.size) {
-            throw new Error(
-                `Expected file${unchecked.size === 1 ? '' : 's'} ${[...unchecked]
-                    .map((str) => `"${str}"`)
-                    .join(', ')} in "${this.directory}"`
-            );
-        }
-    }
 }
 type TransformSampleFn = (
     input: string,
@@ -112,7 +112,7 @@ export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'js
     for (const sample of each_sample(dir)) {
         const svelteFile = sample.folder.find((f) => f.endsWith('.svelte'));
 
-        sample.check({
+        sample.check_dir({
             required: ['*.svelte'],
             allowed: ['test.js', 'expected.js', `expected.${jsx}`, 'expected.error.json']
         });

From 5027748923188731899f987ef847a84a1a732be0 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 22:00:58 +0100
Subject: [PATCH 23/26] Update helpers.ts

---
 packages/svelte2tsx/test/helpers.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index 16a99ab59..cfc8d8f69 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -108,16 +108,16 @@ type TransformSampleFn = (
     }
 ) => ReturnType<typeof htmlx2jsx | typeof svelte2tsx>;
 
-export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'jsx' | 'tsx') {
+export function test_samples(dir: string, transform: TransformSampleFn, tsx: 'jsx' | 'tsx') {
     for (const sample of each_sample(dir)) {
         const svelteFile = sample.folder.find((f) => f.endsWith('.svelte'));
 
         sample.check_dir({
             required: ['*.svelte'],
-            allowed: ['test.js', 'expected.js', `expected.${jsx}`, 'expected.error.json']
+            allowed: ['expected.js', `expected.${tsx}`, 'test.js']
         });
 
-        const shouldGenerateExpected = !sample.has(`expected.${jsx}`);
+        const shouldGenerateExpected = !sample.has(`expected.${tsx}`);
 
         sample.it(function () {
             if (sample.has('test.js')) {
@@ -134,9 +134,9 @@ export function test_samples(dir: string, transform: TransformSampleFn, jsx: 'js
             const output = transform(input, config);
 
             if (shouldGenerateExpected) {
-                sample.generate(`expected.${jsx}`, output.code);
+                sample.generate(`expected.${tsx}`, output.code);
             } else {
-                assert.strictEqual(output.code, sample.get(`expected.${jsx}`));
+                assert.strictEqual(output.code, sample.get(`expected.${tsx}`));
             }
 
             if (sample.has('expected.js')) {

From 68fa7c28f4b6e83fd421e461dacbc86e639c36e7 Mon Sep 17 00:00:00 2001
From: pushkine <pushkine.github@gmail.com>
Date: Tue, 9 Mar 2021 22:01:56 +0100
Subject: [PATCH 24/26] Update index.ts

---
 packages/svelte2tsx/test/htmlx2jsx/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/svelte2tsx/test/htmlx2jsx/index.ts b/packages/svelte2tsx/test/htmlx2jsx/index.ts
index 6ab9243c5..64b4aa6eb 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/index.ts
+++ b/packages/svelte2tsx/test/htmlx2jsx/index.ts
@@ -2,5 +2,5 @@ import { htmlx2jsx } from '../build/htmlxtojsx';
 import { test_samples } from '../helpers';
 
 describe('htmlx2jsx', () => {
-	test_samples(__dirname, htmlx2jsx, 'jsx');
-});
\ No newline at end of file
+    test_samples(__dirname, htmlx2jsx, 'jsx');
+});

From 440266c16470991a43717708676818aa4d059c78 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 10 Mar 2021 08:32:43 +0100
Subject: [PATCH 25/26] cleanup

---
 packages/svelte2tsx/test/helpers.ts | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index cfc8d8f69..24ecee63c 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -15,9 +15,19 @@ export function readFileSync(path: string) {
 }
 
 class Sample {
+    readonly folder: string[];
+    readonly directory: string;
+    private skipped = false;
+
+    constructor(dir: string, readonly name: string) {
+        this.directory = `${dir}/samples/${name}`;
+        this.folder = fs.readdirSync(this.directory);
+    }
+
     check_dir({ required = [], allowed = required }: { allowed?: string[]; required?: string[] }) {
         const unchecked = new Set(required);
         const unknown = [];
+
         loop: for (const fileName of this.folder) {
             for (const name of unchecked) {
                 if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) {
@@ -32,6 +42,7 @@ class Sample {
             }
             unknown.push(fileName);
         }
+
         if (unknown.length) {
             const errors =
                 unknown.map((name) => `Unexpected file "${name}"`).join('\n') +
@@ -44,6 +55,7 @@ class Sample {
                 });
             }
         }
+
         if (unchecked.size) {
             throw new Error(
                 `Expected file${unchecked.size === 1 ? '' : 's'} ${[...unchecked]
@@ -52,20 +64,18 @@ class Sample {
             );
         }
     }
-    readonly folder: string[];
-    readonly directory: string;
-    constructor(dir: string, readonly name: string) {
-        this.directory = `${dir}/samples/${name}`;
-        this.folder = fs.readdirSync(this.directory);
-    }
+    
     it(fn: () => void) {
         let _it = it;
+
         if (this.name.startsWith('.')) {
             _it = it.skip as TestFunction;
         } else if (this.name.endsWith('.solo')) {
             _it = it.only as TestFunction;
         }
+
         const sample = this;
+
         _it(this.name, function () {
             try {
                 fn();
@@ -76,13 +86,15 @@ class Sample {
             }
         });
     }
+
     has(file: string) {
         return this.folder.includes(file);
     }
+
     get(file: string) {
         return readFileSync(`${this.directory}/${file}`);
     }
-    private skipped = false;
+
     generate(fileName: string, content: string) {
         const path = `${this.directory}/${fileName}`;
         if (process.env.CI) {
@@ -94,11 +106,13 @@ class Sample {
         });
         this.skipped = true;
     }
+
     eval(fileName: string, ...args: any[]) {
         const fn = require(`${this.directory}/${fileName}`);
         fn(...args);
     }
 }
+
 type TransformSampleFn = (
     input: string,
     config: {

From df10340b522162e2704522a1cdfb04bcbd7f5a68 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 10 Mar 2021 08:40:03 +0100
Subject: [PATCH 26/26] lint

---
 packages/svelte2tsx/test/helpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index 24ecee63c..15f0c0bf9 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -64,7 +64,7 @@ class Sample {
             );
         }
     }
-    
+
     it(fn: () => void) {
         let _it = it;