Useful changes from my setup which I think may be beneficial to others

README.md

@@ -117,6 +117,18 @@ Save this file in the root folder of your project (e.g. where the package.json
 file is found). You can also save it to the user home directory if you want to
 share a global config between different projects.
 
+If you have a project inside a project with both containing a `package.json` file,
+you can specify that the subproject is not root like this:
+```json
+{
+  "name": "some-name",
+  "import-js": {
+    "isRoot": false
+  }
+}
+```
+Note: the default is `isRoot: true`
+
 The following configuration options are supported.
 
 - [`aliases`](#aliases)

lib/ExportsStorage.js

@@ -1,5 +1,4 @@
 import sqlite3 from 'sqlite3';
-
 import lastUpdate from './lastUpdate';
 
 const MAX_CHUNK_SIZE = 100;

lib/ImportStatement.js

@@ -148,11 +148,8 @@ export default class ImportStatement {
   /**
    * @return {Array} an array that can be used in `sort` and `uniq`
    */
-  toNormalized(): Array<string> {
-    if (!this.defaultImport && !this.hasNamedImports() && this.hasSideEffects) {
-      return [this.path];
-    }
-    return [this.defaultImport || '', ...this.localNames()];
+  toNormalized(): Array<any> {
+    return [this.defaultImport !== 'React', this.path];
   }
 
   localNames(): Array<string> {

lib/ImportStatements.js

@@ -243,14 +243,15 @@ export default class ImportStatements {
       importsArray,
       (importStatement: ImportStatement): boolean =>
         !importStatement.isParsedAndUntouched(),
-    );
+    ).reverse();
+
     result = flattenDeep(result);
 
     if (this.config.get('sortImports')) {
-      result = sortBy(result, (is: ImportStatement): Array<string> => is.toNormalized());
+      result = sortBy(result, (is: ImportStatement): Array<any> => is.toNormalized());
     }
 
-    result = uniqBy(result, (is: ImportStatement): Array<string> =>
+    result = uniqBy(result, (is: ImportStatement): Array<any> =>
       is.toNormalized());
 
     if (!this.config.get('groupImports')) {

lib/Watcher.js

@@ -68,6 +68,7 @@ export default class Watcher {
 
         const added = [];
         const removed = [];
+
         resp.files.forEach((file: Object) => {
           const normalizedPath = normalizePath(
             file.name,
@@ -88,6 +89,7 @@ export default class Watcher {
             removed.push({ path: normalizedPath });
           }
         });
+
         if (added.length) {
           this.onFilesAdded(added);
         }

lib/__tests__/Importer-test.js

@@ -496,10 +496,10 @@ foo
           `.trim();
 
           expect(subject()).toEqual(`
-import foo from './bar/foo';
 import bar from './bar';
 
 import baz from './bar/baz';
+import foo from './bar/foo';
 
 foo
           `.trim());
@@ -516,11 +516,11 @@ foo
           `.trim();
 
           expect(subject()).toEqual(`
-import foo from './bar/foo';
 import bar from './bar';
 
 // Comment
 import baz from './bar/baz';
+import foo from './bar/foo';
 
 foo
           `.trim());
@@ -543,9 +543,9 @@ foo
 // Comment A
 
 // Comment B
-import foo from './bar/foo';
 import bar from './bar';
 import baz from './bar/baz';
+import foo from './bar/foo';
 
 foo
           `.trim());
@@ -563,12 +563,12 @@ foo
           `.trim();
 
           expect(subject()).toEqual(`
-import foo from './bar/foo';
 import bar from './bar';
 
 // Comment A
 // Comment B
 import baz from './bar/baz';
+import foo from './bar/foo';
 
 foo
           `.trim());
@@ -585,11 +585,11 @@ foo
           `.trim();
 
           expect(subject()).toEqual(`
-import foo from './bar/foo';
 import bar from './bar';
 
 /* Comment */
 import baz from './bar/baz';
+import foo from './bar/foo';
 
 foo
           `.trim());
@@ -608,13 +608,13 @@ foo
           `.trim();
 
           expect(subject()).toEqual(`
-import foo from './bar/foo';
 import bar from './bar';
 
 /* Comment
  * 123
  */
 import baz from './bar/baz';
+import foo from './bar/foo';
 
 foo
           `.trim());
@@ -829,8 +829,8 @@ foo
 
         it('adds the import and sorts the entire list', () => {
           expect(subject()).toEqual(`
-import bar from './foo/bar';
 import foo from './bar/foo';
+import bar from './foo/bar';
 import zoo from './foo/zoo';
 
 foo
@@ -852,10 +852,10 @@ foo
 
           it('adds the import and sorts the entire list with groups', () => {
             expect(subject()).toEqual(`
-import bar from './foo/bar';
 import foo from './bar/foo';
-import * as starBar from './star/bar';
+import bar from './foo/bar';
 import zoo from './foo/zoo'
+import * as starBar from './star/bar';
 
 const sko = customImportFunction('./sko');
 
@@ -870,11 +870,11 @@ foo
 
             it('adds the import and sorts all of them', () => {
               expect(subject()).toEqual(`
-import bar from './foo/bar';
 import foo from './bar/foo';
+import bar from './foo/bar';
+import zoo from './foo/zoo'
 const sko = customImportFunction('./sko');
 import * as starBar from './star/bar';
-import zoo from './foo/zoo'
 
 foo
               `.trim());
@@ -975,8 +975,8 @@ foo
 
         it('adds the import, compacts, and sorts the entire list', () => {
           expect(subject()).toEqual(`
-import bar from './foo/bar';
 import foo from './bar/foo';
+import bar from './foo/bar';
 import zoo from './foo/zoo';
 
 foo
@@ -1002,9 +1002,9 @@ foo
 
           it('compacts the list', () => {
             expect(subject()).toEqual(`
-import bar from './foo/bar';
 import foo from './bar/foo';
 import frodo from './bar/frodo';
+import bar from './foo/bar';
 import zoo from './foo/zoo';
 
 foo
@@ -1578,8 +1578,8 @@ memoize
               expect(subject()).toEqual(`
 const bar = require('foo/bar');
 
-var { memoize } = require('underscore');
 var { xyz } = require('alphabet');
+var { memoize } = require('underscore');
 
 memoize
               `.trim());
@@ -1700,8 +1700,8 @@ memoize
 
             it('places the import at the right place', () => {
               expect(subject()).toEqual(`
-import { memoize } from 'underscore';
 import { xyz } from 'alphabet';
+import { memoize } from 'underscore';
 
 import bar from 'foo/bar';
 
@@ -2976,8 +2976,8 @@ bar
 
         it('sorts imports', () => {
           expect(subject()).toEqual(`
-import bar, { foo } from 'bar';
 import baz from '../baz';
+import bar, { foo } from 'bar';
 
 bar
           `.trim());

lib/__tests__/findProjectRoot-test.js

@@ -15,6 +15,14 @@ it('finds the right folders', () => {
     .toEqual(path.join(path.resolve('/'), 'foo', 'bar'));
 });
 
+it('isRoot specification should work', () => {
+  // FileUtils.__setFile(path.join(process.cwd(), '.importjs.js'), {
+  fs.__setFile(path.join(path.resolve('/'), 'foo', 'package.json'));
+  fs.__setFile(path.join(path.resolve('/'), 'foo', 'bar', 'package.json'), '{ "import-js": { "isRoot": false } }');
+  expect(findProjectRoot(path.join(path.resolve('/'), 'foo', 'bar', 'baz.js')))
+    .toEqual(path.join(path.resolve('/'), 'foo'));
+});
+
 it('treats package folders as roots', () => {
   fs.__setFile(path.join(path.resolve('/'), 'foo', 'package.json'));
   fs.__setFile(path.join(path.resolve('/'), 'foo', 'node_modules', 'bar', 'package.json'));

lib/__tests__/findUndefinedIdentifiers-test.js

@@ -58,6 +58,13 @@ it('knows about dynamic keys', () => {
   `))).toEqual(new Set(['bar']));
 });
 
+it('knows about aliases in destructured objects', () => {
+  expect(findUndefinedIdentifiers(parse(`
+  const foo = { 'theValueOfMyConst': 123 };
+  const { [MY_CONST]: someAlias } = foo;
+  `))).toEqual(new Set(['MY_CONST']));
+});
+
 it('knows about jsx', () => {
   expect(findUndefinedIdentifiers(parse(`
     export default <FooBar foo={bar} />;

lib/findProjectRoot.js

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import path from 'path';
+import FileUtils from './FileUtils';
 
 const isWinDriveRoot = /^[A-Z]:\\$/;
 
@@ -11,7 +12,12 @@ function findRecursive(directory) {
   const pathToPackageJson = path.join(directory, 'package.json');
 
   if (fs.existsSync(pathToPackageJson)) {
-    return directory;
+    const packageDescription = FileUtils.readJsonFile(pathToPackageJson);
+    const { isRoot = true } = Object(packageDescription)['import-js'] || {};
+
+    if (isRoot) {
+      return directory;
+    }
   }
 
   return findRecursive(path.dirname(directory));

lib/visitIdentifierNodes.js

@@ -1,5 +1,4 @@
 const KEYS_USED_FOR_ASSIGNMENT = new Set(['id', 'imported', 'local', 'params']);
-const KEYS_USED_IN_REFERENCE_TO_OBJECTS = new Set(['property']);
 
 function normalizeNode(node, context) {
   const { key, parent } = context;
@@ -54,7 +53,7 @@ function normalizeNode(node, context) {
   }
 
   const isAssignment = KEYS_USED_FOR_ASSIGNMENT.has(key) ||
-    (key === 'key' && parent.parent.type === 'ObjectPattern') ||
+    (key === 'key' && !parent.computed && parent.parent.type === 'ObjectPattern') ||
     (key === 'left' && parent.type === 'AssignmentPattern') ||
     (key === 'elements' && parent.type === 'ArrayPattern') ||
     (key === 'value' &&
@@ -64,7 +63,7 @@ function normalizeNode(node, context) {
     context.definedInScope.add(node.name);
   }
 
-  const isReference = KEYS_USED_IN_REFERENCE_TO_OBJECTS.has(key) ||
+  const isReference = (key === 'property' && !parent.computed && parent.parent.type !== 'ObjectPattern') ||
     (key === 'key' && !parent.computed && parent.parent.type !== 'ObjectPattern');
 
   return {