wip

Author: florianbgt

packages/cli/src/helper/cleanup.ts

@@ -4,7 +4,7 @@ import {
   cleanupJavascriptInvalidImports,
   cleanupUnusedJavascriptImports,
 } from "./languages/javascript/cleanup";
-import { extractJavascriptFileImports } from "./languages/javascript/imports";
+import { getJavascriptImports } from "./languages/javascript/imports";
 
 import { resolveFilePath } from "./file";
 import { Group } from "./types";
@@ -127,15 +127,15 @@ export function cleanupUnusedFiles(
       parser.setLanguage(language);
 
       if (["javascript", "typescript"].includes(language.name)) {
-        let dependencies = extractJavascriptFileImports(
+        let dependencies = getJavascriptImports(
           parser,
-          file.sourceCode,
+          parser.parse(file.sourceCode).rootNode,
         );
         // Only keep files dependencies
-        dependencies = dependencies.filter((dep) => dep.startsWith("."));
+        dependencies = dependencies.filter((dep) => dep.source.startsWith("."));
 
         dependencies.forEach((dep) => {
-          const resolvedPath = resolveFilePath(dep, file.path);
+          const resolvedPath = resolveFilePath(dep.source, file.path);
           if (resolvedPath) {
             filesToKeep.add(resolvedPath);
           }

packages/cli/src/helper/dependencyTree.ts

@@ -1,13 +1,13 @@
 import fs from "fs";
 import Parser from "tree-sitter";
-import { extractJavascriptFileImports } from "./languages/javascript/imports";
 
 import { resolveFilePath } from "./file";
 import { DependencyTree, Group } from "./types";
 import { Endpoint } from "./types";
 import { getParserLanguageFromFile } from "./treeSitter";
 import { parseNanoApiAnnotation } from "./annotations";
 import { getAnnotationNodes } from "./languages/javascript/annotations";
+import { getJavascriptImports } from "./languages/javascript/imports";
 
 export function getDependencyTree(filePath: string): DependencyTree {
   const sourceCode = fs.readFileSync(filePath, "utf8");
@@ -24,10 +24,14 @@ export function getDependencyTree(filePath: string): DependencyTree {
   parser.setLanguage(language);
 
   if (["javascript", "typescript"].includes(language.name)) {
-    const imports = extractJavascriptFileImports(parser, sourceCode);
+    let imports = getJavascriptImports(
+      parser,
+      parser.parse(sourceCode).rootNode,
+    );
+    imports = imports.filter((importPath) => importPath.source.startsWith("."));
 
     imports.forEach((importPath) => {
-      const resolvedPath = resolveFilePath(importPath, filePath);
+      const resolvedPath = resolveFilePath(importPath.source, filePath);
       if (resolvedPath && fs.existsSync(resolvedPath)) {
         dependencyTree.children.push(getDependencyTree(resolvedPath));
       }