fix namespace imports

nanoapi-io · Nov 9, 2024 · a891f5b · a891f5b
1 parent a725bc2
commit a891f5b
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 35 deletions.
diff --git a/packages/cli/src/helper/cleanup.ts b/packages/cli/src/helper/cleanup.ts
@@ -156,6 +156,7 @@ export function cleanupUnusedFiles(
         source: string;
         importSpecifierIdentifiers: Parser.SyntaxNode[];
         importIdentifier?: Parser.SyntaxNode;
+        namespaceImport?: Parser.SyntaxNode;
       }[];
       if (language.name === "javascript") {
         dependencies = getJavascriptImports(parser, tree.rootNode);

diff --git a/packages/cli/src/helper/dependencyTree.ts b/packages/cli/src/helper/dependencyTree.ts
@@ -31,6 +31,7 @@ export function getDependencyTree(filePath: string): DependencyTree {
     source: string;
     importSpecifierIdentifiers: Parser.SyntaxNode[];
     importIdentifier?: Parser.SyntaxNode;
+    namespaceImport?: Parser.SyntaxNode;
   }[];
   if (language.name === "javascript") {
     imports = getJavascriptImports(parser, tree.rootNode);

diff --git a/packages/cli/src/helper/languages/javascript/cleanup.ts b/packages/cli/src/helper/languages/javascript/cleanup.ts
@@ -227,10 +227,32 @@ export function cleanupUnusedJavascriptImports(
       }
     }
 
+    let removeNameSpaceImport = false;
+    if (depImport.namespaceImport) {
+      let usages = isTypescript
+        ? getTypescriptImportIdentifierUsage(
+            parser,
+            tree.rootNode,
+            depImport.namespaceImport,
+          )
+        : getJavascriptImportIdentifierUsage(
+            parser,
+            tree.rootNode,
+            depImport.namespaceImport,
+          );
+      usages = usages.filter((usage) => {
+        return usage.id !== depImport.importIdentifier?.id;
+      });
+      if (usages.length === 0) {
+        removeNameSpaceImport = true;
+      }
+    }
+
     if (
       importSpecifierToRemove.length ===
         depImport.importSpecifierIdentifiers.length &&
-      (removeDefaultImport || !depImport.importIdentifier)
+      (removeDefaultImport || !depImport.importIdentifier) &&
+      (removeNameSpaceImport || !depImport.namespaceImport)
     ) {
       indexesToRemove.push({
         startIndex: depImport.node.startIndex,
@@ -243,6 +265,20 @@ export function cleanupUnusedJavascriptImports(
           endIndex: importSpecifier.endIndex,
         });
       });
+
+      if (removeDefaultImport && depImport.importIdentifier) {
+        indexesToRemove.push({
+          startIndex: depImport.importIdentifier.startIndex,
+          endIndex: depImport.importIdentifier.endIndex,
+        });
+      }
+
+      if (removeNameSpaceImport && depImport.namespaceImport) {
+        indexesToRemove.push({
+          startIndex: depImport.namespaceImport.startIndex,
+          endIndex: depImport.namespaceImport.endIndex,
+        });
+      }
     }
   });
 

diff --git a/packages/cli/src/helper/languages/javascript/imports.test.ts b/packages/cli/src/helper/languages/javascript/imports.test.ts
@@ -30,7 +30,7 @@ import { test1, test2 } from './test';
     expect(imports[1].importSpecifierIdentifiers[1].text).toBe("test2");
   });
 
-  it("Should extract import identifier", () => {
+  it("Should extract import identifier and namespace import", () => {
     const parser = new Parser();
     parser.setLanguage(Javascript);
 
@@ -44,18 +44,16 @@ import * as test from './test';
     expect(imports.length).toBe(2);
 
     expect(imports[0].source).toBe("@nestjs/common");
-
     expect(imports[0].importIdentifier).not.toBe(undefined);
     expect(imports[0].importIdentifier?.text).toBe("common");
-
+    expect(imports[0].namespaceImport).toBe(undefined);
     expect(imports[0].importSpecifierIdentifiers.length).toBe(0);
 
     expect(imports[1].source).toBe("./test");
-
-    expect(imports[1].importIdentifier).not.toBe(undefined);
-    expect(imports[1].importIdentifier?.text).toBe("test");
-
-    expect(imports[0].importSpecifierIdentifiers.length).toBe(0);
+    expect(imports[1].importIdentifier).toBe(undefined);
+    expect(imports[1].namespaceImport).not.toBe(undefined);
+    expect(imports[1].namespaceImport?.text).toBe("test");
+    expect(imports[1].importSpecifierIdentifiers.length).toBe(0);
   });
 
   it("Should work with require import", () => {

diff --git a/packages/cli/src/helper/languages/javascript/imports.ts b/packages/cli/src/helper/languages/javascript/imports.ts
@@ -1,11 +1,12 @@
 import Parser from "tree-sitter";
 
-function getFromImportStatements(parser: Parser, node: Parser.SyntaxNode) {
+function getImportStatements(parser: Parser, node: Parser.SyntaxNode) {
   const imports: {
     node: Parser.SyntaxNode;
     source: string;
     importSpecifierIdentifiers: Parser.SyntaxNode[];
     importIdentifier?: Parser.SyntaxNode;
+    namespaceImport?: Parser.SyntaxNode;
   }[] = [];
 
   const importStatementQuery = new Parser.Query(
@@ -53,16 +54,9 @@ function getFromImportStatements(parser: Parser, node: Parser.SyntaxNode) {
     const importClauseIdentifierQuery = new Parser.Query(
       parser.getLanguage(),
       `
-        ([
-          (import_clause
-            (identifier) @identifier
-          )
-          (import_clause
-            (namespace_import
-              (identifier) @identifier
-            )
-          )
-        ])
+        (import_clause
+          (identifier) @identifier
+        )
       `,
     );
     const importClauseIdentifierCaptures = importClauseIdentifierQuery.captures(
@@ -75,26 +69,44 @@ function getFromImportStatements(parser: Parser, node: Parser.SyntaxNode) {
       ? importClauseIdentifierCaptures[0].node
       : undefined;
 
+    const nameSpaceimportClauseIdentifierQuery = new Parser.Query(
+      parser.getLanguage(),
+      `
+        (import_clause
+          (namespace_import
+            (identifier) @identifier
+          )
+        )
+        `,
+    );
+    const nameSpaceimportClauseIdentifierCaptures =
+      nameSpaceimportClauseIdentifierQuery.captures(capture.node);
+    if (nameSpaceimportClauseIdentifierCaptures.length > 1) {
+      throw new Error("Found multiple namespace import clause identifier");
+    }
+    const namespaceImport = nameSpaceimportClauseIdentifierCaptures.length
+      ? nameSpaceimportClauseIdentifierCaptures[0].node
+      : undefined;
+
     imports.push({
       node: capture.node,
       source,
       importSpecifierIdentifiers,
       importIdentifier,
+      namespaceImport,
     });
   });
 
   return imports;
 }
 
-function getFromRequireAndDynamicImports(
-  parser: Parser,
-  node: Parser.SyntaxNode,
-) {
+function getRequireAndDynamicImports(parser: Parser, node: Parser.SyntaxNode) {
   const imports: {
     node: Parser.SyntaxNode;
     source: string;
     importSpecifierIdentifiers: Parser.SyntaxNode[];
     importIdentifier?: Parser.SyntaxNode;
+    namespaceImport?: undefined;
   }[] = [];
 
   const requireStatementQuery = new Parser.Query(
@@ -230,15 +242,16 @@ function getFromRequireAndDynamicImports(
       source,
       importSpecifierIdentifiers,
       importIdentifier,
+      namespaceImport: undefined,
     });
   });
 
   return imports;
 }
 
 export function getJavascriptImports(parser: Parser, node: Parser.SyntaxNode) {
-  const imports = getFromImportStatements(parser, node);
-  imports.push(...getFromRequireAndDynamicImports(parser, node));
+  const imports = getImportStatements(parser, node);
+  imports.push(...getRequireAndDynamicImports(parser, node));
 
   return imports;
 }
@@ -255,7 +268,10 @@ export function getJavascriptImportIdentifierUsage(
     isTypescript
       ? `
       (
-        ([(identifier) (type_identifier)]) @identifier
+        ([
+          (identifier)
+          (type_identifier)
+        ]) @identifier
         (#eq? @identifier "${identifier.text}")
       )
     `
@@ -278,6 +294,14 @@ export function getJavascriptImportIdentifierUsage(
       if (targetNode.parent && targetNode.parent.type === "array") {
         break;
       }
+
+      if (
+        targetNode.parent &&
+        targetNode.parent.type === "expression_statement"
+      ) {
+        break;
+      }
+
       // TODO: add more cases as we encounter them
 
       if (!targetNode.parent) {

diff --git a/packages/cli/src/helper/languages/typescript/imports.test.ts b/packages/cli/src/helper/languages/typescript/imports.test.ts
@@ -44,18 +44,16 @@ import * as test from './test';
     expect(imports.length).toBe(2);
 
     expect(imports[0].source).toBe("@nestjs/common");
-
     expect(imports[0].importIdentifier).not.toBe(undefined);
     expect(imports[0].importIdentifier?.text).toBe("common");
-
+    expect(imports[0].namespaceImport).toBe(undefined);
     expect(imports[0].importSpecifierIdentifiers.length).toBe(0);
 
     expect(imports[1].source).toBe("./test");
-
-    expect(imports[1].importIdentifier).not.toBe(undefined);
-    expect(imports[1].importIdentifier?.text).toBe("test");
-
-    expect(imports[0].importSpecifierIdentifiers.length).toBe(0);
+    expect(imports[1].importIdentifier).toBe(undefined);
+    expect(imports[1].namespaceImport).not.toBe(undefined);
+    expect(imports[1].namespaceImport?.text).toBe("test");
+    expect(imports[1].importSpecifierIdentifiers.length).toBe(0);
   });
 
   it("Should work with require import", () => {

diff --git a/packages/cli/src/helper/split.ts b/packages/cli/src/helper/split.ts
@@ -82,7 +82,6 @@ export async function createSplit(
     outputDirectory,
     groupMapIndex.toString(),
   );
-
   files.forEach((file) => {
     const relativeFileNamePath = path.relative(targetDir, file.path);
     const destinationPath = path.join(