@aiready/context-analyzer 0.19.15 → 0.19.17

package/dist/cli.js

@@ -476,6 +476,9 @@ function singularize(word) {
 function extractExportsWithAST(content, filePath, domainOptions, fileImports) {
   try {
     const { exports: astExports } = (0, import_core.parseFileExports)(content, filePath);
+    if (astExports.length === 0 && !isTestFile(filePath)) {
+      return extractExports(content, filePath, domainOptions, fileImports);
+    }
     return astExports.map((exp) => ({
       name: exp.name,
       type: exp.type,
@@ -490,7 +493,6 @@ function extractExportsWithAST(content, filePath, domainOptions, fileImports) {
       typeReferences: exp.typeReferences
     }));
   } catch (error) {
-    void error;
     return extractExports(content, filePath, domainOptions, fileImports);
   }
 }
@@ -661,17 +663,24 @@ function buildDependencyGraph(files, options) {
   const edges = /* @__PURE__ */ new Map();
   const autoDetectedKeywords = options?.domainKeywords ?? extractDomainKeywordsFromPaths(files);
   for (const { file, content } of files) {
-    const imports = extractImportsFromContent(content, file);
+    const { imports: astImports } = (0, import_core3.parseFileExports)(content, file);
+    const importSources = astImports.map((i) => i.source);
     const exports2 = extractExportsWithAST(
       content,
       file,
       { domainKeywords: autoDetectedKeywords },
-      imports
+      importSources
     );
     const tokenCost = (0, import_core3.estimateTokens)(content);
     const linesOfCode = content.split("\n").length;
-    nodes.set(file, { file, imports, exports: exports2, tokenCost, linesOfCode });
-    edges.set(file, new Set(imports));
+    nodes.set(file, {
+      file,
+      imports: importSources,
+      exports: exports2,
+      tokenCost,
+      linesOfCode
+    });
+    edges.set(file, new Set(importSources));
   }
   const graph = { nodes, edges };
   const coUsageMatrix = buildCoUsageMatrix(graph);
@@ -696,42 +705,6 @@ function buildDependencyGraph(files, options) {
   }
   return graph;
 }
-function extractImportsFromContent(content, filePath) {
-  const imports = [];
-  const isPython = filePath?.toLowerCase().endsWith(".py");
-  if (isPython) {
-    const pythonPatterns = [
-      /^\s*import\s+([a-zA-Z0-9_., ]+)/gm,
-      /^\s*from\s+([a-zA-Z0-9_.]+)\s+import/gm
-    ];
-    for (const pattern of pythonPatterns) {
-      let match;
-      while ((match = pattern.exec(content)) !== null) {
-        const importPath = match[1];
-        if (importPath) {
-          const parts = importPath.split(",").map((p) => p.trim().split(/\s+as\s+/)[0]);
-          imports.push(...parts);
-        }
-      }
-    }
-  } else {
-    const patterns = [
-      /import\s+.*?\s+from\s+['"](.+?)['"]/g,
-      /import\s+['"](.+?)['"]/g,
-      /require\(['"](.+?)['"]\)/g
-    ];
-    for (const pattern of patterns) {
-      let match;
-      while ((match = pattern.exec(content)) !== null) {
-        const importPath = match[1];
-        if (importPath && !importPath.startsWith("node:")) {
-          imports.push(importPath);
-        }
-      }
-    }
-  }
-  return [...new Set(imports)];
-}
 function calculateImportDepth(file, graph, visited = /* @__PURE__ */ new Set(), depth = 0) {
   if (visited.has(file)) return depth;
   const dependencies = graph.edges.get(file);

package/dist/cli.mjs

@@ -2,7 +2,7 @@
 import {
   analyzeContext,
   generateSummary
-} from "./chunk-K2WFOBAZ.mjs";
+} from "./chunk-PVVMK56C.mjs";
 
 // src/cli.ts
 import { Command } from "commander";

package/dist/index.d.mts

@@ -142,10 +142,6 @@ declare function extractDomainKeywordsFromPaths(files: FileContent[]): string[];
 declare function buildDependencyGraph(files: FileContent[], options?: {
     domainKeywords?: string[];
 }): DependencyGraph;
-/**
- * Extract imports from file content
- */
-declare function extractImportsFromContent(content: string, filePath?: string): string[];
 /**
  * Calculate the maximum depth of import tree for a file
  */
@@ -360,4 +356,4 @@ declare function findConsolidationCandidates(graph: DependencyGraph, coUsageMatr
  */
 declare function analyzeContext(options: ContextAnalyzerOptions): Promise<ContextAnalysisResult[]>;
 
-export { type CoUsageData, type ContextAnalysisResult, type ContextAnalyzerOptions, ContextAnalyzerProvider, type ContextSummary, type DependencyGraph, type DependencyNode, type DomainAssignment, type DomainSignals, type ExportInfo, type FileClassification, type ModuleCluster, type TypeDependency, adjustCohesionForClassification, adjustFragmentationForClassification, analyzeContext, analyzeIssues, buildCoUsageMatrix, buildDependencyGraph, buildTypeGraph, calculateCohesion, calculateContextBudget, calculateContextScore, calculateDirectoryDistance, calculateDomainConfidence, calculateEnhancedCohesion, calculateFragmentation, calculateImportDepth, calculatePathEntropy, calculateStructuralCohesionFromCoUsage, classifyFile, detectCircularDependencies, detectModuleClusters, extractDomainKeywordsFromPaths, extractExports, extractImportsFromContent, findConsolidationCandidates, findSemanticClusters, generateSummary, getClassificationRecommendations, getCoUsageData, getGeneralRecommendations, getSmartDefaults, getTransitiveDependencies, inferDomain, inferDomainFromSemantics, isBarrelExport, isConfigFile, isEmailTemplate, isLambdaHandler, isNextJsPage, isParserFile, isServiceFile, isSessionFile, isTypeDefinition, isUtilityModule, mapScoreToRating };
+export { type CoUsageData, type ContextAnalysisResult, type ContextAnalyzerOptions, ContextAnalyzerProvider, type ContextSummary, type DependencyGraph, type DependencyNode, type DomainAssignment, type DomainSignals, type ExportInfo, type FileClassification, type ModuleCluster, type TypeDependency, adjustCohesionForClassification, adjustFragmentationForClassification, analyzeContext, analyzeIssues, buildCoUsageMatrix, buildDependencyGraph, buildTypeGraph, calculateCohesion, calculateContextBudget, calculateContextScore, calculateDirectoryDistance, calculateDomainConfidence, calculateEnhancedCohesion, calculateFragmentation, calculateImportDepth, calculatePathEntropy, calculateStructuralCohesionFromCoUsage, classifyFile, detectCircularDependencies, detectModuleClusters, extractDomainKeywordsFromPaths, extractExports, findConsolidationCandidates, findSemanticClusters, generateSummary, getClassificationRecommendations, getCoUsageData, getGeneralRecommendations, getSmartDefaults, getTransitiveDependencies, inferDomain, inferDomainFromSemantics, isBarrelExport, isConfigFile, isEmailTemplate, isLambdaHandler, isNextJsPage, isParserFile, isServiceFile, isSessionFile, isTypeDefinition, isUtilityModule, mapScoreToRating };

package/dist/index.d.ts

@@ -142,10 +142,6 @@ declare function extractDomainKeywordsFromPaths(files: FileContent[]): string[];
 declare function buildDependencyGraph(files: FileContent[], options?: {
     domainKeywords?: string[];
 }): DependencyGraph;
-/**
- * Extract imports from file content
- */
-declare function extractImportsFromContent(content: string, filePath?: string): string[];
 /**
  * Calculate the maximum depth of import tree for a file
  */
@@ -360,4 +356,4 @@ declare function findConsolidationCandidates(graph: DependencyGraph, coUsageMatr
  */
 declare function analyzeContext(options: ContextAnalyzerOptions): Promise<ContextAnalysisResult[]>;
 
-export { type CoUsageData, type ContextAnalysisResult, type ContextAnalyzerOptions, ContextAnalyzerProvider, type ContextSummary, type DependencyGraph, type DependencyNode, type DomainAssignment, type DomainSignals, type ExportInfo, type FileClassification, type ModuleCluster, type TypeDependency, adjustCohesionForClassification, adjustFragmentationForClassification, analyzeContext, analyzeIssues, buildCoUsageMatrix, buildDependencyGraph, buildTypeGraph, calculateCohesion, calculateContextBudget, calculateContextScore, calculateDirectoryDistance, calculateDomainConfidence, calculateEnhancedCohesion, calculateFragmentation, calculateImportDepth, calculatePathEntropy, calculateStructuralCohesionFromCoUsage, classifyFile, detectCircularDependencies, detectModuleClusters, extractDomainKeywordsFromPaths, extractExports, extractImportsFromContent, findConsolidationCandidates, findSemanticClusters, generateSummary, getClassificationRecommendations, getCoUsageData, getGeneralRecommendations, getSmartDefaults, getTransitiveDependencies, inferDomain, inferDomainFromSemantics, isBarrelExport, isConfigFile, isEmailTemplate, isLambdaHandler, isNextJsPage, isParserFile, isServiceFile, isSessionFile, isTypeDefinition, isUtilityModule, mapScoreToRating };
+export { type CoUsageData, type ContextAnalysisResult, type ContextAnalyzerOptions, ContextAnalyzerProvider, type ContextSummary, type DependencyGraph, type DependencyNode, type DomainAssignment, type DomainSignals, type ExportInfo, type FileClassification, type ModuleCluster, type TypeDependency, adjustCohesionForClassification, adjustFragmentationForClassification, analyzeContext, analyzeIssues, buildCoUsageMatrix, buildDependencyGraph, buildTypeGraph, calculateCohesion, calculateContextBudget, calculateContextScore, calculateDirectoryDistance, calculateDomainConfidence, calculateEnhancedCohesion, calculateFragmentation, calculateImportDepth, calculatePathEntropy, calculateStructuralCohesionFromCoUsage, classifyFile, detectCircularDependencies, detectModuleClusters, extractDomainKeywordsFromPaths, extractExports, findConsolidationCandidates, findSemanticClusters, generateSummary, getClassificationRecommendations, getCoUsageData, getGeneralRecommendations, getSmartDefaults, getTransitiveDependencies, inferDomain, inferDomainFromSemantics, isBarrelExport, isConfigFile, isEmailTemplate, isLambdaHandler, isNextJsPage, isParserFile, isServiceFile, isSessionFile, isTypeDefinition, isUtilityModule, mapScoreToRating };

package/dist/index.js

@@ -267,7 +267,6 @@ __export(index_exports, {
   detectModuleClusters: () => detectModuleClusters,
   extractDomainKeywordsFromPaths: () => extractDomainKeywordsFromPaths,
   extractExports: () => extractExports,
-  extractImportsFromContent: () => extractImportsFromContent,
   findConsolidationCandidates: () => findConsolidationCandidates,
   findSemanticClusters: () => findSemanticClusters,
   generateSummary: () => generateSummary,
@@ -573,6 +572,9 @@ function findConsolidationCandidates(graph, coUsageMatrix, typeGraph, minCoUsage
 function extractExportsWithAST(content, filePath, domainOptions, fileImports) {
   try {
     const { exports: astExports } = (0, import_core.parseFileExports)(content, filePath);
+    if (astExports.length === 0 && !isTestFile(filePath)) {
+      return extractExports(content, filePath, domainOptions, fileImports);
+    }
     return astExports.map((exp) => ({
       name: exp.name,
       type: exp.type,
@@ -587,7 +589,6 @@ function extractExportsWithAST(content, filePath, domainOptions, fileImports) {
       typeReferences: exp.typeReferences
     }));
   } catch (error) {
-    void error;
     return extractExports(content, filePath, domainOptions, fileImports);
   }
 }
@@ -777,17 +778,24 @@ function buildDependencyGraph(files, options) {
   const edges = /* @__PURE__ */ new Map();
   const autoDetectedKeywords = options?.domainKeywords ?? extractDomainKeywordsFromPaths(files);
   for (const { file, content } of files) {
-    const imports = extractImportsFromContent(content, file);
+    const { imports: astImports } = (0, import_core3.parseFileExports)(content, file);
+    const importSources = astImports.map((i) => i.source);
     const exports2 = extractExportsWithAST(
       content,
       file,
       { domainKeywords: autoDetectedKeywords },
-      imports
+      importSources
     );
     const tokenCost = (0, import_core3.estimateTokens)(content);
     const linesOfCode = content.split("\n").length;
-    nodes.set(file, { file, imports, exports: exports2, tokenCost, linesOfCode });
-    edges.set(file, new Set(imports));
+    nodes.set(file, {
+      file,
+      imports: importSources,
+      exports: exports2,
+      tokenCost,
+      linesOfCode
+    });
+    edges.set(file, new Set(importSources));
   }
   const graph = { nodes, edges };
   const coUsageMatrix = buildCoUsageMatrix(graph);
@@ -812,42 +820,6 @@ function buildDependencyGraph(files, options) {
   }
   return graph;
 }
-function extractImportsFromContent(content, filePath) {
-  const imports = [];
-  const isPython = filePath?.toLowerCase().endsWith(".py");
-  if (isPython) {
-    const pythonPatterns = [
-      /^\s*import\s+([a-zA-Z0-9_., ]+)/gm,
-      /^\s*from\s+([a-zA-Z0-9_.]+)\s+import/gm
-    ];
-    for (const pattern of pythonPatterns) {
-      let match;
-      while ((match = pattern.exec(content)) !== null) {
-        const importPath = match[1];
-        if (importPath) {
-          const parts = importPath.split(",").map((p) => p.trim().split(/\s+as\s+/)[0]);
-          imports.push(...parts);
-        }
-      }
-    }
-  } else {
-    const patterns = [
-      /import\s+.*?\s+from\s+['"](.+?)['"]/g,
-      /import\s+['"](.+?)['"]/g,
-      /require\(['"](.+?)['"]\)/g
-    ];
-    for (const pattern of patterns) {
-      let match;
-      while ((match = pattern.exec(content)) !== null) {
-        const importPath = match[1];
-        if (importPath && !importPath.startsWith("node:")) {
-          imports.push(importPath);
-        }
-      }
-    }
-  }
-  return [...new Set(imports)];
-}
 function calculateImportDepth(file, graph, visited = /* @__PURE__ */ new Set(), depth = 0) {
   if (visited.has(file)) return depth;
   const dependencies = graph.edges.get(file);
@@ -2079,7 +2051,6 @@ async function analyzeContext(options) {
   detectModuleClusters,
   extractDomainKeywordsFromPaths,
   extractExports,
-  extractImportsFromContent,
   findConsolidationCandidates,
   findSemanticClusters,
   generateSummary,

package/dist/index.mjs

@@ -22,7 +22,6 @@ import {
   detectModuleClusters,
   extractDomainKeywordsFromPaths,
   extractExports,
-  extractImportsFromContent,
   findConsolidationCandidates,
   findSemanticClusters,
   generateSummary,
@@ -44,7 +43,7 @@ import {
   isTypeDefinition,
   isUtilityModule,
   mapScoreToRating
-} from "./chunk-K2WFOBAZ.mjs";
+} from "./chunk-PVVMK56C.mjs";
 export {
   ContextAnalyzerProvider,
   adjustCohesionForClassification,
@@ -69,7 +68,6 @@ export {
   detectModuleClusters,
   extractDomainKeywordsFromPaths,
   extractExports,
-  extractImportsFromContent,
   findConsolidationCandidates,
   findSemanticClusters,
   generateSummary,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiready/context-analyzer",
-  "version": "0.19.15",
+  "version": "0.19.17",
   "description": "AI context window cost analysis - detect fragmented code, deep import chains, and expensive context budgets",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -49,7 +49,7 @@
     "commander": "^14.0.0",
     "chalk": "^5.3.0",
     "prompts": "^2.4.2",
-    "@aiready/core": "0.21.15"
+    "@aiready/core": "0.21.17"
   },
   "devDependencies": {
     "@types/node": "^24.0.0",

package/src/ast-utils.ts

@@ -3,7 +3,7 @@ import type { ExportInfo, DependencyNode, FileClassification } from './types';
 import { inferDomain, extractExports } from './semantic-analysis';
 
 /**
- * Extract exports using AST parsing with fallback to regex
+ * Extract exports using high-fidelity AST parsing across 5+ languages
  */
 export function extractExportsWithAST(
   content: string,
@@ -14,6 +14,12 @@ export function extractExportsWithAST(
   try {
     const { exports: astExports } = parseFileExports(content, filePath);
 
+    if (astExports.length === 0 && !isTestFile(filePath)) {
+      // If AST fails to find anything, we still use regex as a last resort
+      // ONLY for unknown file types or very complex macros
+      return extractExports(content, filePath, domainOptions, fileImports);
+    }
+
     return astExports.map((exp) => ({
       name: exp.name,
       type: exp.type as any,
@@ -28,8 +34,7 @@ export function extractExportsWithAST(
       typeReferences: (exp as any).typeReferences,
     }));
   } catch (error) {
-    void error;
-    // Fallback to regex-based extraction
+    // Ultimate fallback
     return extractExports(content, filePath, domainOptions, fileImports);
   }
 }

package/src/graph-builder.ts

@@ -1,4 +1,4 @@
-import { estimateTokens } from '@aiready/core';
+import { estimateTokens, parseFileExports } from '@aiready/core';
 import type { DependencyGraph, DependencyNode } from './types';
 import {
   buildCoUsageMatrix,
@@ -89,19 +89,29 @@ export function buildDependencyGraph(
     options?.domainKeywords ?? extractDomainKeywordsFromPaths(files);
 
   for (const { file, content } of files) {
-    const imports = extractImportsFromContent(content, file);
+    // 1. Get high-fidelity AST-based imports & exports
+    const { imports: astImports } = parseFileExports(content, file);
+    const importSources = astImports.map((i) => i.source);
+
+    // 2. Wrap with platform-specific metadata (v0.11+)
     const exports = extractExportsWithAST(
       content,
       file,
       { domainKeywords: autoDetectedKeywords },
-      imports
+      importSources
     );
 
     const tokenCost = estimateTokens(content);
     const linesOfCode = content.split('\n').length;
 
-    nodes.set(file, { file, imports, exports, tokenCost, linesOfCode });
-    edges.set(file, new Set(imports));
+    nodes.set(file, {
+      file,
+      imports: importSources,
+      exports,
+      tokenCost,
+      linesOfCode,
+    });
+    edges.set(file, new Set(importSources));
   }
 
   const graph: DependencyGraph = { nodes, edges };
@@ -131,56 +141,6 @@ export function buildDependencyGraph(
   return graph;
 }
 
-/**
- * Extract imports from file content
- */
-export function extractImportsFromContent(
-  content: string,
-  filePath?: string
-): string[] {
-  const imports: string[] = [];
-  const isPython = filePath?.toLowerCase().endsWith('.py');
-
-  if (isPython) {
-    const pythonPatterns = [
-      /^\s*import\s+([a-zA-Z0-9_., ]+)/gm,
-      /^\s*from\s+([a-zA-Z0-9_.]+)\s+import/gm,
-    ];
-
-    for (const pattern of pythonPatterns) {
-      let match;
-      while ((match = pattern.exec(content)) !== null) {
-        const importPath = match[1];
-        if (importPath) {
-          // Handle multiple imports in one line: import os, sys
-          const parts = importPath
-            .split(',')
-            .map((p) => p.trim().split(/\s+as\s+/)[0]);
-          imports.push(...parts);
-        }
-      }
-    }
-  } else {
-    const patterns = [
-      /import\s+.*?\s+from\s+['"](.+?)['"]/g,
-      /import\s+['"](.+?)['"]/g,
-      /require\(['"](.+?)['"]\)/g,
-    ];
-
-    for (const pattern of patterns) {
-      let match;
-      while ((match = pattern.exec(content)) !== null) {
-        const importPath = match[1];
-        if (importPath && !importPath.startsWith('node:')) {
-          imports.push(importPath);
-        }
-      }
-    }
-  }
-
-  return [...new Set(imports)];
-}
-
 /**
  * Calculate the maximum depth of import tree for a file
  */