From c1f24a730d56aaec949f71c56469f90bedbdef4c Mon Sep 17 00:00:00 2001 From: Joe Lencioni Date: Sun, 26 Feb 2017 06:04:37 -0800 Subject: [PATCH] Fix remaining ESLint errors Most of these are very basic. Nicely, ESLint found a function that could be moved off of the Importer class, so I moved it up to the module level. --- bin/importjs.js | 1 + bin/importjsd.js | 1 + lib/Configuration.js | 2 +- lib/FileUtils.js | 3 +- lib/Importer.js | 58 ++++++++++++++-------------- lib/__tests__/ExportsStorage-test.js | 2 +- lib/__tests__/Importer-test.js | 4 +- 7 files changed, 37 insertions(+), 34 deletions(-) diff --git a/bin/importjs.js b/bin/importjs.js index 24438d12..58e2d32f 100755 --- a/bin/importjs.js +++ b/bin/importjs.js @@ -1,3 +1,4 @@ #!/usr/bin/env node +// eslint-disable-next-line import/no-unresolved require('../build/importjs.js')(process.argv); diff --git a/bin/importjsd.js b/bin/importjsd.js index b39fa5b0..e193baa0 100755 --- a/bin/importjsd.js +++ b/bin/importjsd.js @@ -2,4 +2,5 @@ // The `importjsd` command is deprecated and will be removed in a future // version. `importjs` should be used instead. +// eslint-disable-next-line import/no-unresolved require('../build/importjs.js')(process.argv); diff --git a/lib/Configuration.js b/lib/Configuration.js index 978aa1c8..9d9169e4 100644 --- a/lib/Configuration.js +++ b/lib/Configuration.js @@ -137,7 +137,7 @@ function mergedValue( options: Object, ): any { let mergedResult; - for (let i = 0; i < values.length; i++) { + for (let i = 0; i < values.length; i += 1) { let value = values[i]; if (typeof value === 'function') { value = value(options); diff --git a/lib/FileUtils.js b/lib/FileUtils.js index ffa8bdd1..3e676914 100644 --- a/lib/FileUtils.js +++ b/lib/FileUtils.js @@ -24,6 +24,7 @@ export default { // Clear the require cache so that the file is read every time. delete require.cache[absoluteFilePath]; - return require(absoluteFilePath); // eslint-disable-line global-require + // eslint-disable-next-line global-require, import/no-dynamic-require + return require(absoluteFilePath); }, }; diff --git a/lib/Importer.js b/lib/Importer.js index 0ebaffda..2a242344 100644 --- a/lib/Importer.js +++ b/lib/Importer.js @@ -14,6 +14,33 @@ import findUndefinedIdentifiers from './findUndefinedIdentifiers'; import findUsedIdentifiers from './findUsedIdentifiers'; import parse from './parse'; +function fixImportsMessage( + removedItems: Set, + addedItems: Set, +): ?string { + const messageParts = []; + + const firstAdded = addedItems.values().next().value; + const firstRemoved = removedItems.values().next().value; + + if (addedItems.size === 1 && firstAdded) { + messageParts.push(`Imported \`${firstAdded}\`.`); + } else if (addedItems.size) { + messageParts.push(`Added ${addedItems.size} imports.`); + } + + if (removedItems.size === 1 && firstRemoved) { + messageParts.push(`Removed \`${firstRemoved}\`.`); + } else if (removedItems.size) { + messageParts.push(`Removed ${removedItems.size} imports.`); + } + + if (messageParts.length === 0) { + return undefined; + } + return messageParts.join(' '); +} + export default class Importer { ast: Object; config: Configuration; @@ -166,7 +193,7 @@ export default class Importer { this.replaceImports(oldImports.range, newImports); - const message = this.fixImportsMessage( + const message = fixImportsMessage( unusedImportVariables, addedItems); if (message) { this.message(message); @@ -295,7 +322,7 @@ export default class Importer { } // Delete old imports, then add the modified list back in. - for (let i = oldImportsRange.end - 1; i >= oldImportsRange.start; i--) { + for (let i = oldImportsRange.end - 1; i >= oldImportsRange.start; i -= 1) { this.editor.remove(i); } @@ -403,33 +430,6 @@ export default class Importer { return matchedModule; } - fixImportsMessage( - removedItems: Set, - addedItems: Set, - ): ?string { - const messageParts = []; - - const firstAdded = addedItems.values().next().value; - const firstRemoved = removedItems.values().next().value; - - if (addedItems.size === 1 && firstAdded) { - messageParts.push(`Imported \`${firstAdded}\`.`); - } else if (addedItems.size) { - messageParts.push(`Added ${addedItems.size} imports.`); - } - - if (removedItems.size === 1 && firstRemoved) { - messageParts.push(`Removed \`${firstRemoved}\`.`); - } else if (removedItems.size) { - messageParts.push(`Removed ${removedItems.size} imports.`); - } - - if (messageParts.length === 0) { - return undefined; - } - return messageParts.join(' '); - } - injectSideEffectImports(importStatements: ImportStatements): Array { const addedImports = []; this.config.get('moduleSideEffectImports').forEach((path: string) => { diff --git a/lib/__tests__/ExportsStorage-test.js b/lib/__tests__/ExportsStorage-test.js index b14abb02..c8f414ef 100644 --- a/lib/__tests__/ExportsStorage-test.js +++ b/lib/__tests__/ExportsStorage-test.js @@ -99,7 +99,7 @@ it('removes old entries on update', () => it('can check a lot of files if they need updating', () => { const files = []; - for (let i = 0; i < 1000; i++) { + for (let i = 0; i < 1000; i += 1) { files.push({ path: `./foo-${i}.js`, mtime: i }); } return subject.needsUpdate(files).then((needsUpdate) => { diff --git a/lib/__tests__/Importer-test.js b/lib/__tests__/Importer-test.js index cad9a37a..4b21d3e8 100644 --- a/lib/__tests__/Importer-test.js +++ b/lib/__tests__/Importer-test.js @@ -71,7 +71,7 @@ describe('Importer', () => { return packageJsonContent[file]; } - for (let i = 0; i < packageDependencies.length; i++) { + for (let i = 0; i < packageDependencies.length; i += 1) { const dep = packageDependencies[i]; if (file.indexOf(dep) !== -1) { return { main: `${dep}-main.jsx` }; @@ -963,7 +963,7 @@ foo it('wraps them and indents with a tab', () => { expect(subject()).toEqual(` import foo from - './fiz/bar/biz/baz/fiz/buz/boz/foo'; +\t'./fiz/bar/biz/baz/fiz/buz/boz/foo'; foo `.trim());