From c735a1d2158f10af212f6154cc58e92f4f1d7cbf Mon Sep 17 00:00:00 2001 From: pushkine Date: Mon, 4 Jan 2021 21:03:49 +0100 Subject: [PATCH 1/8] init --- packages/svelte2tsx/test/helpers.js | 71 + packages/svelte2tsx/test/htmlx2jsx/index.js | 26 +- packages/svelte2tsx/test/htmlxparser/index.js | 26 +- .../svelte2tsx/test/htmlxparser/large.svelte | 2273 ----------------- packages/svelte2tsx/test/svelte2tsx/index.js | 46 +- packages/svelte2tsx/test/test.js | 13 +- 6 files changed, 104 insertions(+), 2351 deletions(-) delete mode 100644 packages/svelte2tsx/test/htmlxparser/large.svelte diff --git a/packages/svelte2tsx/test/helpers.js b/packages/svelte2tsx/test/helpers.js index e69de29bb..f0ee92573 100644 --- a/packages/svelte2tsx/test/helpers.js +++ b/packages/svelte2tsx/test/helpers.js @@ -0,0 +1,71 @@ +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, { allow, require = allow }) { + if (allow !== require) allow = [...require, ...allow]; + const unchecked = new Set(require); + const unknown = new Set(); + a: for (const fileName of fs.readdirSync(path)) { + for (const name of unchecked) + if (name === fileName || (name.startsWith("*") && fileName.endsWith(name.slice(1)))) { + unchecked.delete(name); + continue a; + } + if (!allow.includes(fileName)) unknown.add(fileName); + } + + if (unknown.size) { + after(() => { + for (const f of unknown) { + const file = `${path.split("/").slice(-1)}/${f}` + if (process.env.CI) throw new Error(`Unexpected file ${file}`); + console.info(`Ignored file ${file}`); + } + }); + } + if (unchecked.size) { + 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, { + require: ["*.svelte"], + allow: ["expected.js", `expected.${tsx}`], + }); + (skip ? it.skip : solo ? it.only : it)(testName, function () { + const fileName = fs.readdirSync(path).find((f) => f.endsWith(".svelte")); + const output = transform( + readFileSync(`${path}/${fileName}`), + 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); + } + }); + } +} +module.exports = { benchmark, test_samples }; diff --git a/packages/svelte2tsx/test/htmlx2jsx/index.js b/packages/svelte2tsx/test/htmlx2jsx/index.js index 982bf4ef3..618f8d242 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/index.js +++ b/packages/svelte2tsx/test/htmlx2jsx/index.js @@ -1,26 +1,6 @@ -let converter = require('../build/htmlxtojsx') -let fs = require('fs') -let assert = require('assert') +const {htmlx2jsx} = require('../build/htmlxtojsx') +const { test_samples } = require('../helpers'); describe('htmlx2jsx', () => { - fs.readdirSync(`${__dirname}/samples`).forEach(dir => { - if (dir[0] === '.') return; - - // add .solo to a sample directory name to only run that test - const solo = /\.solo$/.test(dir); - - if (solo && process.env.CI) { - throw new Error( - `Forgot to remove '.solo' from test parser/samples/${dir}` - ); - } - - (solo ? it.only : it)(dir, () => { - const input = fs.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, 'utf-8').replace(/\s+$/, '').replace(/\r\n/g, "\n"); - const expectedOutput = fs.readFileSync(`${__dirname}/samples/${dir}/expected.jsx`, 'utf-8').replace(/\s+$/, '').replace(/\r\n/g, "\n"); - - const { map, code} = converter.htmlx2jsx(input); - assert.equal(code, expectedOutput); - }); - }); + test_samples(__dirname, htmlx2jsx, "jsx"); }); \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlxparser/index.js b/packages/svelte2tsx/test/htmlxparser/index.js index a0d296ec3..4fb99df99 100644 --- a/packages/svelte2tsx/test/htmlxparser/index.js +++ b/packages/svelte2tsx/test/htmlxparser/index.js @@ -1,15 +1,15 @@ -let converter = require('../build/htmlxtojsx') -let fs = require('fs') -let assert = require('assert') +const {htmlx2jsx} = require("../build/htmlxtojsx"); +const assert = require("assert"); +const { benchmark } = require("../helpers"); -describe('htmlxparser', () => { - let content = fs.readFileSync(`${__dirname}/large.svelte`, {encoding: 'utf8'}); - - it('parses in a reasonable time', () => { - const start = new Date(); - converter.htmlx2jsx(content); - const elapsed = new Date() - start; - assert(elapsed <= 1000, `Parsing took ${elapsed} ms, which was longer than 1000ms`); - }) - +describe("htmlxparser", () => { + it("parses in a reasonable time", () => { + let random = ""; + let str = ""; + let i = 0; + while (17 !== i++) random += Math.random().toString(26).slice(2); + while (1150 !== i++) str += `${random} - line\t${i - 17}\n`; + const duration = benchmark(htmlx2jsx.bind(null, `` + ``)); + assert(duration <= 1000, `Parsing took ${duration} ms, which was longer than 1000ms`); + }); }); \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlxparser/large.svelte b/packages/svelte2tsx/test/htmlxparser/large.svelte deleted file mode 100644 index b00d72b7c..000000000 --- a/packages/svelte2tsx/test/htmlxparser/large.svelte +++ /dev/null @@ -1,2273 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/index.js b/packages/svelte2tsx/test/svelte2tsx/index.js index 999f269af..ab0ec0e08 100644 --- a/packages/svelte2tsx/test/svelte2tsx/index.js +++ b/packages/svelte2tsx/test/svelte2tsx/index.js @@ -1,36 +1,12 @@ -let svelte2tsx = require('../build/index') -let fs = require('fs') -let assert = require('assert') - -describe('svelte2tsx', () => { - fs.readdirSync(`${__dirname}/samples`).forEach(dir => { - if (dir[0] === '.') return; - - // add .solo to a sample directory name to only run that test - const solo = /\.solo$/.test(dir); - - if (solo && process.env.CI) { - throw new Error( - `Forgot to remove '.solo' from test parser/samples/${dir}` - ); - } - - (solo ? it.only : it)(dir, () => { - const path = `${__dirname}/samples/${dir}`; - const svelteFileName = `${path}/${fs.readdirSync(path).find(p => p.endsWith('.svelte'))}`; - const input = fs.readFileSync(svelteFileName, 'utf-8').replace(/\s+$/, '').replace(/\r\n/g, "\n"); - const expectedOutput = fs.readFileSync(`${path}/expected.tsx`, 'utf-8').replace(/\s+$/, '').replace(/\r\n/g, "\n"); - const expecterOtherOutput = fs.existsSync(`${path}/expected.js`) && require(`${path}/expected`); - - const output = svelte2tsx(input, { - strictMode: dir.includes('strictMode'), - isTsFile: dir.startsWith('ts-'), - filename: svelteFileName - }); - assert.equal(output.code, expectedOutput); - if (expecterOtherOutput) { - expecterOtherOutput(output); - } - }); - }); +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/test.js b/packages/svelte2tsx/test/test.js index 8d5ca9e46..c22d1b6d5 100644 --- a/packages/svelte2tsx/test/test.js +++ b/packages/svelte2tsx/test/test.js @@ -2,18 +2,17 @@ const glob = require('tiny-glob/sync.js'); require('source-map-support').install(); - -require('./helpers'); - //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 solo_folders = test_folders.filter(folder => /\.solo/.test(folder)); +const solo_folders = test_folders.filter(folder => /\.solo$/.test(folder)); if (solo_folders.length) { - if (process.env.CI) { - throw new Error('Forgot to remove `.solo` from test'); - } solo_folders.forEach(name => require('./' + name)); } else { test_folders.forEach(name => require('./' + name)); From e36a7ab0aa6c9cb7244307b3c0b3e28b90fa2533 Mon Sep 17 00:00:00 2001 From: pushkine Date: Mon, 4 Jan 2021 21:30:06 +0100 Subject: [PATCH 2/8] glob --- packages/svelte2tsx/test/test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/svelte2tsx/test/test.js b/packages/svelte2tsx/test/test.js index c22d1b6d5..88074210a 100644 --- a/packages/svelte2tsx/test/test.js +++ b/packages/svelte2tsx/test/test.js @@ -5,7 +5,7 @@ require('source-map-support').install(); //console.clear(); if (process.env.CI) { - const arr = glob('*.solo', { cwd: 'test' }) + const arr = glob('**/*.solo', { cwd: 'test' }) if (arr.length) throw new Error(`Forgot to remove ".solo" from test(s) ${arr}`); } From f427decda9505203f34caa94d38d23df31fc8dcd Mon Sep 17 00:00:00 2001 From: pushkine Date: Thu, 7 Jan 2021 18:23:36 +0100 Subject: [PATCH 3/8] fix --- .prettierignore | 1 - packages/svelte2tsx/test/helpers.js | 126 +++++++++--------- packages/svelte2tsx/test/htmlx2jsx/index.js | 6 +- packages/svelte2tsx/test/htmlxparser/index.js | 29 ++-- packages/svelte2tsx/test/svelte2tsx/index.js | 24 ++-- packages/svelte2tsx/test/test.js | 12 +- 6 files changed, 102 insertions(+), 96 deletions(-) diff --git a/.prettierignore b/.prettierignore index 16aedf503..b3a05b7db 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,4 @@ packages/svelte2tsx/*.d.ts -packages/svelte2tsx/test/** packages/language-server/test/**/*.svelte packages/svelte-vscode/syntaxes/*.yaml .github/** \ No newline at end of file diff --git a/packages/svelte2tsx/test/helpers.js b/packages/svelte2tsx/test/helpers.js index f0ee92573..3d37e5054 100644 --- a/packages/svelte2tsx/test/helpers.js +++ b/packages/svelte2tsx/test/helpers.js @@ -1,71 +1,73 @@ -const fs = require("fs"); -const assert = require("assert"); +const fs = require('fs'); +const assert = require('assert'); function benchmark(fn) { - return -Date.now() + (fn(), Date.now()); + 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; + return fs.existsSync(path) + ? fs.readFileSync(path, 'utf-8').replace(/\r\n/g, '\n').replace(/\s+$/, '') + : null; } -function check_dir(path, { allow, require = allow }) { - if (allow !== require) allow = [...require, ...allow]; - const unchecked = new Set(require); - const unknown = new Set(); - a: for (const fileName of fs.readdirSync(path)) { - for (const name of unchecked) - if (name === fileName || (name.startsWith("*") && fileName.endsWith(name.slice(1)))) { - unchecked.delete(name); - continue a; - } - if (!allow.includes(fileName)) unknown.add(fileName); - } - - if (unknown.size) { - after(() => { - for (const f of unknown) { - const file = `${path.split("/").slice(-1)}/${f}` - if (process.env.CI) throw new Error(`Unexpected file ${file}`); - console.info(`Ignored file ${file}`); - } - }); - } - if (unchecked.size) { - throw new Error(`Expected file(s) ${[...unchecked].map((str) => `"${str}"`).join(", ")} in ${path}`); - } +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 (0 !== unknown.length) { + 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 (0 !== unchecked.size) { + 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, { - require: ["*.svelte"], - allow: ["expected.js", `expected.${tsx}`], - }); - (skip ? it.skip : solo ? it.only : it)(testName, function () { - const fileName = fs.readdirSync(path).find((f) => f.endsWith(".svelte")); - const output = transform( - readFileSync(`${path}/${fileName}`), - 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); - } - }); - } + 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}`] + }); + (skip ? it.skip : solo ? it.only : it)(testName, function () { + const fileName = fs.readdirSync(path).find((f) => f.endsWith('.svelte')); + const output = transform(readFileSync(`${path}/${fileName}`), 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); + } + }); + } } module.exports = { benchmark, test_samples }; diff --git a/packages/svelte2tsx/test/htmlx2jsx/index.js b/packages/svelte2tsx/test/htmlx2jsx/index.js index 618f8d242..2c7037c0f 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/index.js +++ b/packages/svelte2tsx/test/htmlx2jsx/index.js @@ -1,6 +1,6 @@ -const {htmlx2jsx} = require('../build/htmlxtojsx') +const { htmlx2jsx } = require('../build/htmlxtojsx'); const { test_samples } = require('../helpers'); describe('htmlx2jsx', () => { - test_samples(__dirname, htmlx2jsx, "jsx"); -}); \ No newline at end of file + test_samples(__dirname, htmlx2jsx, 'jsx'); +}); diff --git a/packages/svelte2tsx/test/htmlxparser/index.js b/packages/svelte2tsx/test/htmlxparser/index.js index 4fb99df99..7a75c41eb 100644 --- a/packages/svelte2tsx/test/htmlxparser/index.js +++ b/packages/svelte2tsx/test/htmlxparser/index.js @@ -1,15 +1,16 @@ -const {htmlx2jsx} = require("../build/htmlxtojsx"); -const assert = require("assert"); -const { benchmark } = require("../helpers"); +const { htmlx2jsx } = require('../build/htmlxtojsx'); +const assert = require('assert'); +const { benchmark } = require('../helpers'); -describe("htmlxparser", () => { - it("parses in a reasonable time", () => { - let random = ""; - let str = ""; - let i = 0; - while (17 !== i++) random += Math.random().toString(26).slice(2); - while (1150 !== i++) str += `${random} - line\t${i - 17}\n`; - const duration = benchmark(htmlx2jsx.bind(null, `` + ``)); - assert(duration <= 1000, `Parsing took ${duration} ms, which was longer than 1000ms`); - }); -}); \ No newline at end of file +describe('htmlxparser', () => { + it('parses in a reasonable time', () => { + let random = ''; + let str = ''; + for (let i = 0; i !== 17; i++) random += Math.random().toString(26).slice(2); + for (let i = 0; i !== 1137; i++) str += `${random} - line\t${l}\n`; + const duration = benchmark( + htmlx2jsx.bind(null, `` + ``) + ); + assert(duration <= 1000, `Parsing took ${duration} ms, which was longer than 1000ms`); + }); +}); diff --git a/packages/svelte2tsx/test/svelte2tsx/index.js b/packages/svelte2tsx/test/svelte2tsx/index.js index ab0ec0e08..7f98d51e0 100644 --- a/packages/svelte2tsx/test/svelte2tsx/index.js +++ b/packages/svelte2tsx/test/svelte2tsx/index.js @@ -1,12 +1,16 @@ -const svelte2tsx = require("../build/index"); -const { test_samples } = require("../helpers"); +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") +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/test.js b/packages/svelte2tsx/test/test.js index 88074210a..092c6b432 100644 --- a/packages/svelte2tsx/test/test.js +++ b/packages/svelte2tsx/test/test.js @@ -5,15 +5,15 @@ 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 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 solo_folders = test_folders.filter(folder => /\.solo$/.test(folder)); +const solo_folders = test_folders.filter((folder) => /\.solo$/.test(folder)); if (solo_folders.length) { - solo_folders.forEach(name => require('./' + name)); + solo_folders.forEach((name) => require('./' + name)); } else { - test_folders.forEach(name => require('./' + name)); -} \ No newline at end of file + test_folders.forEach((name) => require('./' + name)); +} From bccf5ca6af7567f5d4657a22805d5e143154cce1 Mon Sep 17 00:00:00 2001 From: pushkine Date: Thu, 7 Jan 2021 18:34:53 +0100 Subject: [PATCH 4/8] missed variable --- packages/svelte2tsx/test/htmlxparser/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/svelte2tsx/test/htmlxparser/index.js b/packages/svelte2tsx/test/htmlxparser/index.js index 7a75c41eb..e9efcb316 100644 --- a/packages/svelte2tsx/test/htmlxparser/index.js +++ b/packages/svelte2tsx/test/htmlxparser/index.js @@ -7,7 +7,7 @@ describe('htmlxparser', () => { let random = ''; let str = ''; for (let i = 0; i !== 17; i++) random += Math.random().toString(26).slice(2); - for (let i = 0; i !== 1137; i++) str += `${random} - line\t${l}\n`; + for (let i = 0; i !== 1137; i++) str += `${random} - line\t${i}\n`; const duration = benchmark( htmlx2jsx.bind(null, `` + ``) ); From 100d1037fc60ae21bb8c819b51962f7eb588c7fb Mon Sep 17 00:00:00 2001 From: pushkine Date: Thu, 7 Jan 2021 18:42:44 +0100 Subject: [PATCH 5/8] empty line between functions --- packages/svelte2tsx/test/helpers.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/svelte2tsx/test/helpers.js b/packages/svelte2tsx/test/helpers.js index 3d37e5054..045952c55 100644 --- a/packages/svelte2tsx/test/helpers.js +++ b/packages/svelte2tsx/test/helpers.js @@ -1,13 +1,16 @@ 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 = []; @@ -70,4 +73,5 @@ function test_samples(dir, transform, tsx) { }); } } + module.exports = { benchmark, test_samples }; From 5b6de2754c9620e5c18a9e9801b381099836c5a1 Mon Sep 17 00:00:00 2001 From: pushkine Date: Thu, 7 Jan 2021 19:21:06 +0100 Subject: [PATCH 6/8] ignore jsx/tsx --- .prettierignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.prettierignore b/.prettierignore index b3a05b7db..2c91757a6 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,5 @@ packages/svelte2tsx/*.d.ts +packages/svelte2tsx/test/*/samples/*/*sx packages/language-server/test/**/*.svelte packages/svelte-vscode/syntaxes/*.yaml .github/** \ No newline at end of file From 21914686dfc23d5d44cf54e3eba7755935268d65 Mon Sep 17 00:00:00 2001 From: Simon H <5968653+dummdidumm@users.noreply.github.com> Date: Fri, 8 Jan 2021 11:04:06 +0100 Subject: [PATCH 7/8] remove yoda conditions --- packages/svelte2tsx/test/helpers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/svelte2tsx/test/helpers.js b/packages/svelte2tsx/test/helpers.js index 045952c55..ce22585de 100644 --- a/packages/svelte2tsx/test/helpers.js +++ b/packages/svelte2tsx/test/helpers.js @@ -27,7 +27,7 @@ function check_dir(path, { allowed = [], required = allowed }) { } unknown.push(fileName); } - if (0 !== unknown.length) { + if (unknown.length !== 0) { after(() => { for (const name of unknown) { const msg = `Unexpected file ${path.split('/').slice(-1)}/${name}`; @@ -36,7 +36,7 @@ function check_dir(path, { allowed = [], required = allowed }) { } }); } - if (0 !== unchecked.size) { + if (unchecked.size !== 0) { throw new Error( `Expected file(s) ${[...unchecked].map((str) => `"${str}"`).join(', ')} in ${path}` ); From d91e415f41267195ee53f4b0ff1ff45bf8c2e958 Mon Sep 17 00:00:00 2001 From: Simon H <5968653+dummdidumm@users.noreply.github.com> Date: Fri, 8 Jan 2021 11:06:31 +0100 Subject: [PATCH 8/8] code style --- packages/svelte2tsx/test/helpers.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/svelte2tsx/test/helpers.js b/packages/svelte2tsx/test/helpers.js index ce22585de..a905bedc6 100644 --- a/packages/svelte2tsx/test/helpers.js +++ b/packages/svelte2tsx/test/helpers.js @@ -22,8 +22,9 @@ function check_dir(path, { allowed = [], required = allowed }) { } } for (const name of allowed) { - if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) + if ('*' === name[0] ? fileName.endsWith(name.slice(1)) : name === fileName) { continue loop; + } } unknown.push(fileName); } @@ -31,8 +32,11 @@ function check_dir(path, { allowed = [], required = allowed }) { 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 (process.env.CI) { + throw new Error(msg); + } else { + console.info(msg); + } } }); }