@rayburst/cli 0.2.9 → 0.3.1

package/dist/{chunk-7HEX7KJS.js → chunk-GOIOC2VJ.js}

@@ -297,6 +297,109 @@ function extractComponentPathsFromImports(sourceFile, projectPath) {
   }
   return componentPaths;
 }
+function extractComponentsFromRouteFile(sourceFile, projectPath) {
+  const componentPaths = [];
+  try {
+    const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression);
+    for (const callExpr of callExpressions) {
+      const expr = callExpr.getExpression();
+      const functionName = expr.getText();
+      if (!functionName.includes("createFileRoute") && !functionName.includes("createRootRoute")) {
+        continue;
+      }
+      const args = callExpr.getArguments();
+      if (args.length === 0) continue;
+      let configObject;
+      const parent = callExpr.getParent();
+      if (Node.isCallExpression(parent)) {
+        const parentArgs = parent.getArguments();
+        if (parentArgs.length > 0 && Node.isObjectLiteralExpression(parentArgs[0])) {
+          configObject = parentArgs[0];
+        }
+      }
+      if (!configObject && Node.isObjectLiteralExpression(args[0])) {
+        configObject = args[0];
+      }
+      if (!configObject) continue;
+      const properties = extractObjectLiteralProperties(configObject);
+      const componentValue = properties.get("component");
+      if (!componentValue) continue;
+      if (isIdentifier(componentValue)) {
+        const componentName = componentValue.getText();
+        const decl = traceIdentifierToDeclaration(componentValue);
+        if (decl) {
+          const importDecl = decl.getFirstAncestorByKind(SyntaxKind.ImportDeclaration);
+          if (importDecl) {
+            const importedSourceFile = getImportSourceFile(importDecl);
+            if (importedSourceFile) {
+              const filePath = importedSourceFile.getFilePath();
+              const relativePath = filePath.replace(projectPath + "/", "");
+              if (!relativePath.includes("node_modules")) {
+                componentPaths.push(relativePath);
+              }
+            }
+          } else {
+            const localComponentPaths = findNodesInFile(
+              sourceFile.getFilePath().replace(projectPath + "/", ""),
+              /* @__PURE__ */ new Map()
+              // This won't work without nodeMap, but we'll handle it differently
+            );
+          }
+        }
+      } else if (Node.isArrowFunction(componentValue) || Node.isFunctionExpression(componentValue)) {
+        const jsxElements = componentValue.getDescendantsOfKind(SyntaxKind.JsxElement);
+        const jsxSelfClosing = componentValue.getDescendantsOfKind(SyntaxKind.JsxSelfClosingElement);
+        for (const jsxElement of jsxElements) {
+          const tagName = jsxElement.getOpeningElement().getTagNameNode().getText();
+          const importSource = resolveImportSource(sourceFile, tagName);
+          if (importSource && !importSource.startsWith(".") && !importSource.startsWith("/")) {
+            continue;
+          }
+          const importDecls = sourceFile.getImportDeclarations();
+          for (const importDecl of importDecls) {
+            const namedImports = importDecl.getNamedImports();
+            const defaultImport = importDecl.getDefaultImport();
+            if (namedImports.some((ni) => ni.getName() === tagName) || defaultImport?.getText() === tagName) {
+              const importedSourceFile = getImportSourceFile(importDecl);
+              if (importedSourceFile) {
+                const filePath = importedSourceFile.getFilePath();
+                const relativePath = filePath.replace(projectPath + "/", "");
+                if (!relativePath.includes("node_modules")) {
+                  componentPaths.push(relativePath);
+                }
+              }
+            }
+          }
+        }
+        for (const jsxElement of jsxSelfClosing) {
+          const tagName = jsxElement.getTagNameNode().getText();
+          const importSource = resolveImportSource(sourceFile, tagName);
+          if (importSource && !importSource.startsWith(".") && !importSource.startsWith("/")) {
+            continue;
+          }
+          const importDecls = sourceFile.getImportDeclarations();
+          for (const importDecl of importDecls) {
+            const namedImports = importDecl.getNamedImports();
+            const defaultImport = importDecl.getDefaultImport();
+            if (namedImports.some((ni) => ni.getName() === tagName) || defaultImport?.getText() === tagName) {
+              const importedSourceFile = getImportSourceFile(importDecl);
+              if (importedSourceFile) {
+                const filePath = importedSourceFile.getFilePath();
+                const relativePath = filePath.replace(projectPath + "/", "");
+                if (!relativePath.includes("node_modules")) {
+                  componentPaths.push(relativePath);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  } catch (error) {
+    console.error("[extractComponentsFromRouteFile] Error:", error);
+  }
+  return componentPaths;
+}
 function findNodesInFile(filePath, nodeMap) {
   const nodes = [];
   for (const [nodeId, node] of nodeMap.entries()) {
@@ -331,7 +434,7 @@ function createConfigBasedEdges(sourceNode, targetFilePaths, nodeMap, edges, edg
   }
   return edgesCreated;
 }
-function analyzeJsxPropsForComponents(jsxElement, propName, projectPath) {
+function analyzeJsxPropsForComponents(jsxElement, propName, projectPath, project) {
   const componentPaths = [];
   try {
     const jsxAttributes = jsxElement.getChildrenOfKind(SyntaxKind.JsxAttributes)[0];
@@ -369,7 +472,7 @@ function analyzeJsxPropsForComponents(jsxElement, propName, projectPath) {
       const commonPropNames = ["routeTree", "routes", "children", "components"];
       for (const commonPropName of commonPropNames) {
         console.log(`[DEBUG analyzeJsxProps] Checking config property: ${commonPropName}`);
-        const paths = traceConfigToComponentPaths(configArg, commonPropName, projectPath);
+        const paths = traceConfigToComponentPaths(configArg, commonPropName, projectPath, project);
         console.log(`[DEBUG analyzeJsxProps] Paths found for ${commonPropName}: ${paths.length}`);
         if (paths.length > 0) {
           return paths;
@@ -381,16 +484,67 @@ function analyzeJsxPropsForComponents(jsxElement, propName, projectPath) {
   }
   return componentPaths;
 }
-function traceConfigToComponentPaths(configObject, propertyName, projectPath) {
+function traceConfigToComponentPaths(configObject, propertyName, projectPath, project) {
   try {
     const propertyNode = traceConfigProperty(configObject, propertyName);
+    console.log(`[DEBUG traceConfigToComponentPaths] Property node for "${propertyName}": ${propertyNode ? propertyNode.getKindName() : "NULL"}`);
     if (!propertyNode) {
       return [];
     }
+    if (propertyNode.getKind() === SyntaxKind.ShorthandPropertyAssignment) {
+      console.log(`[DEBUG traceConfigToComponentPaths] Shorthand property found, tracing identifier`);
+      const identifier = propertyNode.getChildrenOfKind(SyntaxKind.Identifier)[0];
+      if (identifier) {
+        const declaration = traceIdentifierToDeclaration(identifier);
+        if (declaration) {
+          const importDecl = declaration.getFirstAncestorByKind(SyntaxKind.ImportDeclaration);
+          if (importDecl) {
+            const sourceFile = getImportSourceFile(importDecl);
+            if (sourceFile) {
+              const filePath = sourceFile.getFilePath();
+              const relativePath = filePath.replace(projectPath + "/", "");
+              console.log(`[DEBUG traceConfigToComponentPaths] Found routeTree file: ${relativePath}`);
+              const routeFilePaths = extractComponentPathsFromImports(sourceFile, projectPath);
+              console.log(`[DEBUG traceConfigToComponentPaths] Found ${routeFilePaths.length} route files`);
+              const allComponentPaths = [];
+              for (const routePath of routeFilePaths) {
+                const routeSourceFile = project.getSourceFile(projectPath + "/" + routePath);
+                if (!routeSourceFile) {
+                  console.log(`[DEBUG traceConfigToComponentPaths] Could not load route file: ${routePath}`);
+                  continue;
+                }
+                console.log(`[DEBUG traceConfigToComponentPaths] Extracting components from route: ${routePath}`);
+                const componentPaths = extractComponentsFromRouteFile(routeSourceFile, projectPath);
+                console.log(`[DEBUG traceConfigToComponentPaths] Found ${componentPaths.length} components in ${routePath}`);
+                allComponentPaths.push(...componentPaths);
+              }
+              return [...routeFilePaths, ...allComponentPaths];
+            }
+          }
+        }
+      }
+    }
     if (isImportDeclaration(propertyNode)) {
       const sourceFile = getImportSourceFile(propertyNode);
       if (sourceFile) {
-        return extractComponentPathsFromImports(sourceFile, projectPath);
+        const filePath = sourceFile.getFilePath();
+        const relativePath = filePath.replace(projectPath + "/", "");
+        console.log(`[DEBUG traceConfigToComponentPaths] Found routeTree file: ${relativePath}`);
+        const routeFilePaths = extractComponentPathsFromImports(sourceFile, projectPath);
+        console.log(`[DEBUG traceConfigToComponentPaths] Found ${routeFilePaths.length} route files`);
+        const allComponentPaths = [];
+        for (const routePath of routeFilePaths) {
+          const routeSourceFile = project.getSourceFile(projectPath + "/" + routePath);
+          if (!routeSourceFile) {
+            console.log(`[DEBUG traceConfigToComponentPaths] Could not load route file: ${routePath}`);
+            continue;
+          }
+          console.log(`[DEBUG traceConfigToComponentPaths] Extracting components from route: ${routePath}`);
+          const componentPaths = extractComponentsFromRouteFile(routeSourceFile, projectPath);
+          console.log(`[DEBUG traceConfigToComponentPaths] Found ${componentPaths.length} components in ${routePath}`);
+          allComponentPaths.push(...componentPaths);
+        }
+        return [...routeFilePaths, ...allComponentPaths];
       }
     }
     if (isObjectLiteralExpression(propertyNode)) {
@@ -415,7 +569,7 @@ function traceConfigToComponentPaths(configObject, propertyName, projectPath) {
   }
   return [];
 }
-function detectConfigBasedComponents(sourceFile, nodeMap, edges, projectPath) {
+function detectConfigBasedComponents(sourceFile, nodeMap, edges, projectPath, project) {
   let totalEdgesCreated = 0;
   try {
     const jsxElements = sourceFile.getDescendantsOfKind(SyntaxKind.JsxSelfClosingElement);
@@ -454,7 +608,7 @@ function detectConfigBasedComponents(sourceFile, nodeMap, edges, projectPath) {
       const commonPropNames = ["router", "config", "routes", "navigation"];
       for (const propName of commonPropNames) {
         console.log(`[DEBUG] Checking prop: ${propName}`);
-        const componentPaths = analyzeJsxPropsForComponents(jsxElement, propName, projectPath);
+        const componentPaths = analyzeJsxPropsForComponents(jsxElement, propName, projectPath, project);
         console.log(`[DEBUG] Component paths found: ${componentPaths.length}`);
         if (componentPaths.length > 0) {
           console.log(`[DEBUG] Creating edges for ${componentPaths.length} components`);
@@ -540,7 +694,7 @@ async function analyzeProject(projectPath, projectId, onLog) {
     log(`  Analyzing config-based components...`);
     let totalConfigEdges = 0;
     for (const sourceFile of sourceFiles) {
-      const configEdges = detectConfigBasedComponents(sourceFile, nodeMap, edges, projectPath);
+      const configEdges = detectConfigBasedComponents(sourceFile, nodeMap, edges, projectPath, project);
       totalConfigEdges += configEdges;
     }
     if (totalConfigEdges > 0) {

package/dist/index.js

@@ -9,7 +9,7 @@ import {
   readLocalMeta,
   writeLocalAnalysis,
   writeLocalMeta
-} from "./chunk-7HEX7KJS.js";
+} from "./chunk-GOIOC2VJ.js";
 export {
   addGitignoreEntry,
   analyzeProject,

package/dist/vite-plugin.js

@@ -1,6 +1,6 @@
 import {
   rayburstPlugin
-} from "./chunk-7HEX7KJS.js";
+} from "./chunk-GOIOC2VJ.js";
 export {
   rayburstPlugin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rayburst/cli",
-  "version": "0.2.9",
+  "version": "0.3.1",
   "description": "Rayburst - Automatic code analysis for TypeScript/JavaScript projects via Vite plugin",
   "type": "module",
   "main": "./dist/index.js",