fix palantir#4338 (palantir#4374)

ovr · Dec 12, 2018 · f6044a5 · f6044a5
1 parent 412604b
commit f6044a5
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 15 deletions.
diff --git a/src/rules/orderedImportsRule.ts b/src/rules/orderedImportsRule.ts
@@ -247,9 +247,7 @@ class Walker extends Lint.AbstractWalker<Options> {
             return;
         }
 
-        const source = this.options.importSourcesOrderTransform(
-            removeQuotes(node.moduleSpecifier.text),
-        );
+        const source = removeQuotes(node.moduleSpecifier.text);
         this.checkSource(source, node);
 
         const { importClause } = node;
@@ -277,14 +275,16 @@ class Walker extends Lint.AbstractWalker<Options> {
             return;
         }
 
-        const source = this.options.importSourcesOrderTransform(removeQuotes(expression.text));
+        const source = removeQuotes(expression.text);
         this.checkSource(source, node);
     }
 
-    private checkSource(source: string, node: ImportDeclaration["node"]) {
+    private checkSource(originalSource: string, node: ImportDeclaration["node"]) {
+        const type = getImportType(originalSource);
+        const source = this.options.importSourcesOrderTransform(originalSource);
         const currentSource = this.options.moduleSourcePath(source);
         const previousSource = this.currentImportsBlock.getLastImportSource();
-        this.currentImportsBlock.addImportDeclaration(this.sourceFile, node, currentSource);
+        this.currentImportsBlock.addImportDeclaration(this.sourceFile, node, currentSource, type);
 
         if (previousSource !== null && compare(currentSource, previousSource) === -1) {
             this.lastFix = [];
@@ -454,11 +454,11 @@ class ImportsBlock {
         sourceFile: ts.SourceFile,
         node: ImportDeclaration["node"],
         sourcePath: string,
+        type: ImportType,
     ) {
         const start = this.getStartOffset(node);
         const end = this.getEndOffset(sourceFile, node);
         const text = sourceFile.text.substring(start, end);
-        const type = this.getImportType(sourcePath);
 
         if (start > node.getStart() || end === 0) {
             // skip block if any statements don't end with a newline to simplify implementation
@@ -532,17 +532,17 @@ class ImportsBlock {
     private getLastImportDeclaration(): ImportDeclaration | undefined {
         return this.importDeclarations[this.importDeclarations.length - 1];
     }
+}
 
-    private getImportType(sourcePath: string): ImportType {
-        if (sourcePath.charAt(0) === ".") {
-            if (sourcePath.charAt(1) === ".") {
-                return ImportType.PARENT_DIRECTORY_IMPORT;
-            } else {
-                return ImportType.CURRENT_DIRECTORY_IMPORT;
-            }
+function getImportType(sourcePath: string): ImportType {
+    if (sourcePath.charAt(0) === ".") {
+        if (sourcePath.charAt(1) === ".") {
+            return ImportType.PARENT_DIRECTORY_IMPORT;
         } else {
-            return ImportType.LIBRARY_IMPORT;
+            return ImportType.CURRENT_DIRECTORY_IMPORT;
         }
+    } else {
+        return ImportType.LIBRARY_IMPORT;
     }
 }
 

diff --git a/...ed-imports/import-sources-any/test.ts.fix → ...ts/import-sources-any/default/test.ts.fix b/...ed-imports/import-sources-any/test.ts.fix → ...ts/import-sources-any/default/test.ts.fix
diff --git a/...d-imports/import-sources-any/test.ts.lint → ...s/import-sources-any/default/test.ts.lint b/...d-imports/import-sources-any/test.ts.lint → ...s/import-sources-any/default/test.ts.lint
diff --git a/...ed-imports/import-sources-any/tslint.json → ...ts/import-sources-any/default/tslint.json b/...ed-imports/import-sources-any/tslint.json → ...ts/import-sources-any/default/tslint.json
diff --git a/test/rules/ordered-imports/import-sources-any/grouped-imports/test.ts.fix b/test/rules/ordered-imports/import-sources-any/grouped-imports/test.ts.fix
@@ -0,0 +1,5 @@
+import { getOr } from 'lodash/fp'
+import { Request } from 'express'
+
+import { getStatusCode } from './errors'
+
diff --git a/test/rules/ordered-imports/import-sources-any/grouped-imports/test.ts.lint b/test/rules/ordered-imports/import-sources-any/grouped-imports/test.ts.lint
@@ -0,0 +1,7 @@
+import { getOr } from 'lodash/fp'
+
+import { Request } from 'express'
+import { getStatusCode } from './errors'
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [grouped-imports]
+
+[grouped-imports]: Import sources of different groups must be sorted by: libraries, parent directories, current directory.
diff --git a/test/rules/ordered-imports/import-sources-any/grouped-imports/tslint.json b/test/rules/ordered-imports/import-sources-any/grouped-imports/tslint.json
@@ -0,0 +1,5 @@
+{
+    "rules": {
+      "ordered-imports": [true, {"import-sources-order": "any", "grouped-imports": true}]
+    }
+  }