wip

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

Hide file tree

Showing 4 changed files with 244 additions and 257 deletions.
diff --git a/packages/cli/src/helper/languages/javascript/cleanup.ts b/packages/cli/src/helper/languages/javascript/cleanup.ts
@@ -251,8 +251,7 @@ export function cleanupUnusedJavascriptImports(
     if (
       importSpecifierToRemove.length ===
         depImport.importSpecifierIdentifiers.length &&
-      (removeDefaultImport || !depImport.importIdentifier) &&
-      (removeNameSpaceImport || !depImport.namespaceImport)
+      (removeDefaultImport || removeNameSpaceImport)
     ) {
       indexesToRemove.push({
         startIndex: depImport.node.startIndex,
@@ -265,20 +264,6 @@ 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
@@ -56,53 +56,53 @@ import * as test from './test';
     expect(imports[1].importSpecifierIdentifiers.length).toBe(0);
   });
 
-  it("Should work with require import", () => {
-    const parser = new Parser();
-    parser.setLanguage(Javascript);
-
-    const tree = parser.parse(`
-const { test1, test2 } = require('@nestjs/common');
-const test = require('./test');
-`);
-
-    const imports = getJavascriptImports(parser, tree.rootNode);
-
-    expect(imports.length).toBe(2);
-
-    expect(imports[0].source).toBe("@nestjs/common");
-    expect(imports[0].importIdentifier).toBe(undefined);
-    expect(imports[0].importSpecifierIdentifiers.length).toBe(2);
-    expect(imports[0].importSpecifierIdentifiers[0].text).toBe("test1");
-    expect(imports[0].importSpecifierIdentifiers[1].text).toBe("test2");
-
-    expect(imports[1].source).toBe("./test");
-    expect(imports[1].importIdentifier).not.toBe(undefined);
-    expect(imports[1].importIdentifier?.text).toBe("test");
-    expect(imports[1].importSpecifierIdentifiers.length).toBe(0);
-  });
-
-  it("Should work with dynamic import", () => {
-    const parser = new Parser();
-    parser.setLanguage(Javascript);
-
-    const tree = parser.parse(`
-const { test1, test2 } = import('@nestjs/common');
-const test = import('./test');
-`);
-
-    const imports = getJavascriptImports(parser, tree.rootNode);
-
-    expect(imports.length).toBe(2);
-
-    expect(imports[0].source).toBe("@nestjs/common");
-    expect(imports[0].importIdentifier).toBe(undefined);
-    expect(imports[0].importSpecifierIdentifiers.length).toBe(2);
-    expect(imports[0].importSpecifierIdentifiers[0].text).toBe("test1");
-    expect(imports[0].importSpecifierIdentifiers[1].text).toBe("test2");
-
-    expect(imports[1].source).toBe("./test");
-    expect(imports[1].importIdentifier).not.toBe(undefined);
-    expect(imports[1].importIdentifier?.text).toBe("test");
-    expect(imports[1].importSpecifierIdentifiers.length).toBe(0);
-  });
+  //   it("Should work with require import", () => {
+  //     const parser = new Parser();
+  //     parser.setLanguage(Javascript);
+
+  //     const tree = parser.parse(`
+  // const { test1, test2 } = require('@nestjs/common');
+  // const test = require('./test');
+  // `);
+
+  //     const imports = getJavascriptImports(parser, tree.rootNode);
+
+  //     expect(imports.length).toBe(2);
+
+  //     expect(imports[0].source).toBe("@nestjs/common");
+  //     expect(imports[0].importIdentifier).toBe(undefined);
+  //     expect(imports[0].importSpecifierIdentifiers.length).toBe(2);
+  //     expect(imports[0].importSpecifierIdentifiers[0].text).toBe("test1");
+  //     expect(imports[0].importSpecifierIdentifiers[1].text).toBe("test2");
+
+  //     expect(imports[1].source).toBe("./test");
+  //     expect(imports[1].importIdentifier).not.toBe(undefined);
+  //     expect(imports[1].importIdentifier?.text).toBe("test");
+  //     expect(imports[1].importSpecifierIdentifiers.length).toBe(0);
+  //   });
+
+  //   it("Should work with dynamic import", () => {
+  //     const parser = new Parser();
+  //     parser.setLanguage(Javascript);
+
+  //     const tree = parser.parse(`
+  // const { test1, test2 } = import('@nestjs/common');
+  // const test = import('./test');
+  // `);
+
+  //     const imports = getJavascriptImports(parser, tree.rootNode);
+
+  //     expect(imports.length).toBe(2);
+
+  //     expect(imports[0].source).toBe("@nestjs/common");
+  //     expect(imports[0].importIdentifier).toBe(undefined);
+  //     expect(imports[0].importSpecifierIdentifiers.length).toBe(2);
+  //     expect(imports[0].importSpecifierIdentifiers[0].text).toBe("test1");
+  //     expect(imports[0].importSpecifierIdentifiers[1].text).toBe("test2");
+
+  //     expect(imports[1].source).toBe("./test");
+  //     expect(imports[1].importIdentifier).not.toBe(undefined);
+  //     expect(imports[1].importIdentifier?.text).toBe("test");
+  //     expect(imports[1].importSpecifierIdentifiers.length).toBe(0);
+  //   });
 });