@aiready/context-analyzer 0.5.3 → 0.6.0

package/dist/cli.js

@@ -36,7 +36,7 @@ function buildDependencyGraph(files) {
   const edges = /* @__PURE__ */ new Map();
   for (const { file, content } of files) {
     const imports = extractImportsFromContent(content);
-    const exports2 = extractExports(content);
+    const exports2 = extractExportsWithAST(content, file);
     const tokenCost = (0, import_core.estimateTokens)(content);
     const linesOfCode = content.split("\n").length;
     nodes.set(file, {
@@ -151,26 +151,7 @@ function detectCircularDependencies(graph) {
   return cycles;
 }
 function calculateCohesion(exports2, filePath) {
-  if (exports2.length === 0) return 1;
-  if (exports2.length === 1) return 1;
-  if (filePath && isTestFile(filePath)) {
-    return 1;
-  }
-  const domains = exports2.map((e) => e.inferredDomain || "unknown");
-  const domainCounts = /* @__PURE__ */ new Map();
-  for (const domain of domains) {
-    domainCounts.set(domain, (domainCounts.get(domain) || 0) + 1);
-  }
-  const total = domains.length;
-  let entropy = 0;
-  for (const count of domainCounts.values()) {
-    const p = count / total;
-    if (p > 0) {
-      entropy -= p * Math.log2(p);
-    }
-  }
-  const maxEntropy = Math.log2(total);
-  return maxEntropy > 0 ? 1 - entropy / maxEntropy : 1;
+  return calculateEnhancedCohesion(exports2, filePath);
 }
 function isTestFile(filePath) {
   const lower = filePath.toLowerCase();
@@ -315,6 +296,78 @@ function generateConsolidationPlan(domain, files, targetFiles) {
   );
   return plan;
 }
+function extractExportsWithAST(content, filePath) {
+  try {
+    const { exports: astExports } = (0, import_core.parseFileExports)(content, filePath);
+    return astExports.map((exp) => ({
+      name: exp.name,
+      type: exp.type,
+      inferredDomain: inferDomain(exp.name),
+      imports: exp.imports,
+      dependencies: exp.dependencies
+    }));
+  } catch (error) {
+    return extractExports(content);
+  }
+}
+function calculateEnhancedCohesion(exports2, filePath) {
+  if (exports2.length === 0) return 1;
+  if (exports2.length === 1) return 1;
+  if (filePath && isTestFile(filePath)) {
+    return 1;
+  }
+  const domainCohesion = calculateDomainCohesion(exports2);
+  const hasImportData = exports2.some((e) => e.imports && e.imports.length > 0);
+  if (!hasImportData) {
+    return domainCohesion;
+  }
+  const importCohesion = calculateImportBasedCohesion(exports2);
+  return importCohesion * 0.6 + domainCohesion * 0.4;
+}
+function calculateImportBasedCohesion(exports2) {
+  const exportsWithImports = exports2.filter((e) => e.imports && e.imports.length > 0);
+  if (exportsWithImports.length < 2) {
+    return 1;
+  }
+  let totalSimilarity = 0;
+  let comparisons = 0;
+  for (let i = 0; i < exportsWithImports.length; i++) {
+    for (let j = i + 1; j < exportsWithImports.length; j++) {
+      const exp1 = exportsWithImports[i];
+      const exp2 = exportsWithImports[j];
+      const similarity = calculateJaccardSimilarity(exp1.imports, exp2.imports);
+      totalSimilarity += similarity;
+      comparisons++;
+    }
+  }
+  return comparisons > 0 ? totalSimilarity / comparisons : 1;
+}
+function calculateJaccardSimilarity(arr1, arr2) {
+  if (arr1.length === 0 && arr2.length === 0) return 1;
+  if (arr1.length === 0 || arr2.length === 0) return 0;
+  const set1 = new Set(arr1);
+  const set2 = new Set(arr2);
+  const intersection = new Set([...set1].filter((x) => set2.has(x)));
+  const union = /* @__PURE__ */ new Set([...set1, ...set2]);
+  return intersection.size / union.size;
+}
+function calculateDomainCohesion(exports2) {
+  const domains = exports2.map((e) => e.inferredDomain || "unknown");
+  const domainCounts = /* @__PURE__ */ new Map();
+  for (const domain of domains) {
+    domainCounts.set(domain, (domainCounts.get(domain) || 0) + 1);
+  }
+  const total = domains.length;
+  let entropy = 0;
+  for (const count of domainCounts.values()) {
+    const p = count / total;
+    if (p > 0) {
+      entropy -= p * Math.log2(p);
+    }
+  }
+  const maxEntropy = Math.log2(total);
+  return maxEntropy > 0 ? 1 - entropy / maxEntropy : 1;
+}
 
 // src/index.ts
 async function analyzeContext(options) {

package/dist/cli.mjs

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

package/dist/index.js

@@ -34,7 +34,7 @@ function buildDependencyGraph(files) {
   const edges = /* @__PURE__ */ new Map();
   for (const { file, content } of files) {
     const imports = extractImportsFromContent(content);
-    const exports2 = extractExports(content);
+    const exports2 = extractExportsWithAST(content, file);
     const tokenCost = (0, import_core.estimateTokens)(content);
     const linesOfCode = content.split("\n").length;
     nodes.set(file, {
@@ -149,26 +149,7 @@ function detectCircularDependencies(graph) {
   return cycles;
 }
 function calculateCohesion(exports2, filePath) {
-  if (exports2.length === 0) return 1;
-  if (exports2.length === 1) return 1;
-  if (filePath && isTestFile(filePath)) {
-    return 1;
-  }
-  const domains = exports2.map((e) => e.inferredDomain || "unknown");
-  const domainCounts = /* @__PURE__ */ new Map();
-  for (const domain of domains) {
-    domainCounts.set(domain, (domainCounts.get(domain) || 0) + 1);
-  }
-  const total = domains.length;
-  let entropy = 0;
-  for (const count of domainCounts.values()) {
-    const p = count / total;
-    if (p > 0) {
-      entropy -= p * Math.log2(p);
-    }
-  }
-  const maxEntropy = Math.log2(total);
-  return maxEntropy > 0 ? 1 - entropy / maxEntropy : 1;
+  return calculateEnhancedCohesion(exports2, filePath);
 }
 function isTestFile(filePath) {
   const lower = filePath.toLowerCase();
@@ -313,6 +294,78 @@ function generateConsolidationPlan(domain, files, targetFiles) {
   );
   return plan;
 }
+function extractExportsWithAST(content, filePath) {
+  try {
+    const { exports: astExports } = (0, import_core.parseFileExports)(content, filePath);
+    return astExports.map((exp) => ({
+      name: exp.name,
+      type: exp.type,
+      inferredDomain: inferDomain(exp.name),
+      imports: exp.imports,
+      dependencies: exp.dependencies
+    }));
+  } catch (error) {
+    return extractExports(content);
+  }
+}
+function calculateEnhancedCohesion(exports2, filePath) {
+  if (exports2.length === 0) return 1;
+  if (exports2.length === 1) return 1;
+  if (filePath && isTestFile(filePath)) {
+    return 1;
+  }
+  const domainCohesion = calculateDomainCohesion(exports2);
+  const hasImportData = exports2.some((e) => e.imports && e.imports.length > 0);
+  if (!hasImportData) {
+    return domainCohesion;
+  }
+  const importCohesion = calculateImportBasedCohesion(exports2);
+  return importCohesion * 0.6 + domainCohesion * 0.4;
+}
+function calculateImportBasedCohesion(exports2) {
+  const exportsWithImports = exports2.filter((e) => e.imports && e.imports.length > 0);
+  if (exportsWithImports.length < 2) {
+    return 1;
+  }
+  let totalSimilarity = 0;
+  let comparisons = 0;
+  for (let i = 0; i < exportsWithImports.length; i++) {
+    for (let j = i + 1; j < exportsWithImports.length; j++) {
+      const exp1 = exportsWithImports[i];
+      const exp2 = exportsWithImports[j];
+      const similarity = calculateJaccardSimilarity(exp1.imports, exp2.imports);
+      totalSimilarity += similarity;
+      comparisons++;
+    }
+  }
+  return comparisons > 0 ? totalSimilarity / comparisons : 1;
+}
+function calculateJaccardSimilarity(arr1, arr2) {
+  if (arr1.length === 0 && arr2.length === 0) return 1;
+  if (arr1.length === 0 || arr2.length === 0) return 0;
+  const set1 = new Set(arr1);
+  const set2 = new Set(arr2);
+  const intersection = new Set([...set1].filter((x) => set2.has(x)));
+  const union = /* @__PURE__ */ new Set([...set1, ...set2]);
+  return intersection.size / union.size;
+}
+function calculateDomainCohesion(exports2) {
+  const domains = exports2.map((e) => e.inferredDomain || "unknown");
+  const domainCounts = /* @__PURE__ */ new Map();
+  for (const domain of domains) {
+    domainCounts.set(domain, (domainCounts.get(domain) || 0) + 1);
+  }
+  const total = domains.length;
+  let entropy = 0;
+  for (const count of domainCounts.values()) {
+    const p = count / total;
+    if (p > 0) {
+      entropy -= p * Math.log2(p);
+    }
+  }
+  const maxEntropy = Math.log2(total);
+  return maxEntropy > 0 ? 1 - entropy / maxEntropy : 1;
+}
 
 // src/index.ts
 async function getSmartDefaults(directory, userOptions) {

package/dist/index.mjs

@@ -2,7 +2,7 @@ import {
   analyzeContext,
   generateSummary,
   getSmartDefaults
-} from "./chunk-EX7HCWAO.mjs";
+} from "./chunk-DD7UVNE3.mjs";
 export {
   analyzeContext,
   generateSummary,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiready/context-analyzer",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "AI context window cost analysis - detect fragmented code, deep import chains, and expensive context budgets",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -50,7 +50,7 @@
     "commander": "^12.1.0",
     "chalk": "^5.3.0",
     "prompts": "^2.4.2",
-    "@aiready/core": "0.5.6"
+    "@aiready/core": "0.6.0"
   },
   "devDependencies": {
     "@types/node": "^22.10.2",

package/src/__tests__/enhanced-cohesion.test.ts

@@ -0,0 +1,126 @@
+import { describe, it, expect } from 'vitest';
+import { calculateCohesion } from '../analyzer';
+import type { ExportInfo } from '../types';
+
+describe('Enhanced Cohesion Calculation', () => {
+  it('should use domain-based cohesion when no import data available', () => {
+    const exports: ExportInfo[] = [
+      { name: 'getUserData', type: 'function', inferredDomain: 'user' },
+      { name: 'getProductData', type: 'function', inferredDomain: 'product' },
+    ];
+
+    const cohesion = calculateCohesion(exports);
+    
+    // With mixed domains (user, product) and no import data, should use domain-based calculation
+    // Domain entropy for 2 different domains = low cohesion
+    expect(cohesion).toBeLessThan(0.5);
+  });
+
+  it('should use import-based cohesion when import data available', () => {
+    const exports: ExportInfo[] = [
+      {
+        name: 'getUserData',
+        type: 'function',
+        inferredDomain: 'user',
+        imports: ['react', 'axios', 'lodash'],
+      },
+      {
+        name: 'getProductData',
+        type: 'function',
+        inferredDomain: 'product',
+        imports: ['react', 'axios', 'lodash'], // Same imports!
+      },
+    ];
+
+    const cohesion = calculateCohesion(exports);
+    
+    // Even though domains differ, imports are identical (Jaccard = 1.0)
+    // Enhanced cohesion = 0.6 * 1.0 + 0.4 * 0.0 (different domains) = 0.6
+    // Should be >= 0.6 (import-based weight)
+    expect(cohesion).toBeGreaterThanOrEqual(0.6);
+  });
+
+  it('should weight import-based similarity higher than domain-based', () => {
+    const exportsWithSharedImports: ExportInfo[] = [
+      {
+        name: 'getUserData',
+        type: 'function',
+        inferredDomain: 'user',
+        imports: ['react', 'axios'],
+      },
+      {
+        name: 'getProductData',
+        type: 'function',
+        inferredDomain: 'product',
+        imports: ['react', 'axios'],
+      },
+    ];
+
+    const exportsWithoutSharedImports: ExportInfo[] = [
+      {
+        name: 'getUserData',
+        type: 'function',
+        inferredDomain: 'user',
+        imports: ['react', 'axios'],
+      },
+      {
+        name: 'getProductData',
+        type: 'function',
+        inferredDomain: 'product',
+        imports: ['lodash', 'moment'],
+      },
+    ];
+
+    const cohesionWithShared = calculateCohesion(exportsWithSharedImports);
+    const cohesionWithoutShared = calculateCohesion(exportsWithoutSharedImports);
+    
+    // Shared imports should result in higher cohesion
+    expect(cohesionWithShared).toBeGreaterThan(cohesionWithoutShared);
+  });
+
+  it('should handle mixed case: some exports with imports, some without', () => {
+    const exports: ExportInfo[] = [
+      {
+        name: 'getUserData',
+        type: 'function',
+        inferredDomain: 'user',
+        imports: ['react', 'axios'],
+      },
+      {
+        name: 'getProductData',
+        type: 'function',
+        inferredDomain: 'product',
+        // No imports field
+      },
+    ];
+
+    const cohesion = calculateCohesion(exports);
+    
+    // Should fall back to domain-based when not all exports have import data
+    expect(cohesion).toBeGreaterThan(0);
+    expect(cohesion).toBeLessThan(1);
+  });
+
+  it('should return 1 for single export', () => {
+    const exports: ExportInfo[] = [
+      {
+        name: 'getUserData',
+        type: 'function',
+        inferredDomain: 'user',
+        imports: ['react'],
+      },
+    ];
+
+    expect(calculateCohesion(exports)).toBe(1);
+  });
+
+  it('should return 1 for test files regardless of domains or imports', () => {
+    const exports: ExportInfo[] = [
+      { name: 'testUserLogin', type: 'function', inferredDomain: 'user', imports: ['react'] },
+      { name: 'testProductView', type: 'function', inferredDomain: 'product', imports: [] },
+    ];
+
+    const cohesion = calculateCohesion(exports, 'src/utils/test-helpers.ts');
+    expect(cohesion).toBe(1);
+  });
+});

package/src/analyzer.ts

@@ -1,4 +1,4 @@
-import { estimateTokens } from '@aiready/core';
+import { estimateTokens, parseFileExports, calculateImportSimilarity, type ExportWithImports } from '@aiready/core';
 import type {
   ContextAnalysisResult,
   DependencyGraph,
@@ -24,7 +24,10 @@ export function buildDependencyGraph(
   // First pass: Create nodes
   for (const { file, content } of files) {
     const imports = extractImportsFromContent(content);
-    const exports = extractExports(content);
+    
+    // Use AST-based extraction for better accuracy, fallback to regex
+    const exports = extractExportsWithAST(content, file);
+    
     const tokenCost = estimateTokens(content);
     const linesOfCode = content.split('\n').length;
 
@@ -199,41 +202,12 @@ export function detectCircularDependencies(
 
 /**
  * Calculate cohesion score (how related are exports in a file)
- * Uses entropy: low entropy = high cohesion
+ * Uses enhanced calculation combining domain-based and import-based analysis
  * @param exports - Array of export information
  * @param filePath - Optional file path for context-aware scoring
  */
 export function calculateCohesion(exports: ExportInfo[], filePath?: string): number {
-  if (exports.length === 0) return 1;
-  if (exports.length === 1) return 1; // Single export = perfect cohesion
-
-  // Special case: Test/mock/fixture files are expected to have multi-domain exports
-  // They serve a single purpose (testing) even if they mock different domains
-  if (filePath && isTestFile(filePath)) {
-    return 1; // Test utilities are inherently cohesive despite mixed domains
-  }
-
-  const domains = exports.map((e) => e.inferredDomain || 'unknown');
-  const domainCounts = new Map<string, number>();
-
-  for (const domain of domains) {
-    domainCounts.set(domain, (domainCounts.get(domain) || 0) + 1);
-  }
-
-  // Calculate Shannon entropy
-  const total = domains.length;
-  let entropy = 0;
-
-  for (const count of domainCounts.values()) {
-    const p = count / total;
-    if (p > 0) {
-      entropy -= p * Math.log2(p);
-    }
-  }
-
-  // Normalize to 0-1 (higher = better cohesion)
-  const maxEntropy = Math.log2(total);
-  return maxEntropy > 0 ? 1 - entropy / maxEntropy : 1;
+  return calculateEnhancedCohesion(exports, filePath);
 }
 
 /**
@@ -460,3 +434,131 @@ function generateConsolidationPlan(
 
   return plan;
 }
+
+/**
+ * Extract exports using AST parsing (enhanced version)
+ * Falls back to regex if AST parsing fails
+ */
+export function extractExportsWithAST(content: string, filePath: string): ExportInfo[] {
+  try {
+    const { exports: astExports } = parseFileExports(content, filePath);
+    
+    return astExports.map(exp => ({
+      name: exp.name,
+      type: exp.type,
+      inferredDomain: inferDomain(exp.name),
+      imports: exp.imports,
+      dependencies: exp.dependencies,
+    }));
+  } catch (error) {
+    // Fallback to regex-based extraction
+    return extractExports(content);
+  }
+}
+
+/**
+ * Calculate enhanced cohesion score using both domain inference and import similarity
+ * 
+ * This combines:
+ * 1. Domain-based cohesion (entropy of inferred domains)
+ * 2. Import-based cohesion (Jaccard similarity of shared imports)
+ * 
+ * Weight: 60% import-based, 40% domain-based (import analysis is more reliable)
+ */
+export function calculateEnhancedCohesion(
+  exports: ExportInfo[],
+  filePath?: string
+): number {
+  if (exports.length === 0) return 1;
+  if (exports.length === 1) return 1;
+
+  // Special case for test files
+  if (filePath && isTestFile(filePath)) {
+    return 1;
+  }
+
+  // Calculate domain-based cohesion (existing method)
+  const domainCohesion = calculateDomainCohesion(exports);
+
+  // Calculate import-based cohesion if imports are available
+  const hasImportData = exports.some(e => e.imports && e.imports.length > 0);
+  
+  if (!hasImportData) {
+    // No import data available, use domain-based only
+    return domainCohesion;
+  }
+
+  const importCohesion = calculateImportBasedCohesion(exports);
+
+  // Weighted combination: 60% import-based, 40% domain-based
+  return importCohesion * 0.6 + domainCohesion * 0.4;
+}
+
+/**
+ * Calculate cohesion based on shared imports (Jaccard similarity)
+ */
+function calculateImportBasedCohesion(exports: ExportInfo[]): number {
+  const exportsWithImports = exports.filter(e => e.imports && e.imports.length > 0);
+  
+  if (exportsWithImports.length < 2) {
+    return 1; // Not enough data
+  }
+
+  // Calculate pairwise import similarity
+  let totalSimilarity = 0;
+  let comparisons = 0;
+
+  for (let i = 0; i < exportsWithImports.length; i++) {
+    for (let j = i + 1; j < exportsWithImports.length; j++) {
+      const exp1 = exportsWithImports[i] as ExportInfo & { imports: string[] };
+      const exp2 = exportsWithImports[j] as ExportInfo & { imports: string[] };
+      
+      const similarity = calculateJaccardSimilarity(exp1.imports, exp2.imports);
+      totalSimilarity += similarity;
+      comparisons++;
+    }
+  }
+
+  return comparisons > 0 ? totalSimilarity / comparisons : 1;
+}
+
+/**
+ * Calculate Jaccard similarity between two arrays
+ */
+function calculateJaccardSimilarity(arr1: string[], arr2: string[]): number {
+  if (arr1.length === 0 && arr2.length === 0) return 1;
+  if (arr1.length === 0 || arr2.length === 0) return 0;
+
+  const set1 = new Set(arr1);
+  const set2 = new Set(arr2);
+  
+  const intersection = new Set([...set1].filter(x => set2.has(x)));
+  const union = new Set([...set1, ...set2]);
+  
+  return intersection.size / union.size;
+}
+
+/**
+ * Calculate domain-based cohesion (existing entropy method)
+ */
+function calculateDomainCohesion(exports: ExportInfo[]): number {
+  const domains = exports.map((e) => e.inferredDomain || 'unknown');
+  const domainCounts = new Map<string, number>();
+
+  for (const domain of domains) {
+    domainCounts.set(domain, (domainCounts.get(domain) || 0) + 1);
+  }
+
+  const total = domains.length;
+  let entropy = 0;
+
+  for (const count of domainCounts.values()) {
+    const p = count / total;
+    if (p > 0) {
+      entropy -= p * Math.log2(p);
+    }
+  }
+
+  const maxEntropy = Math.log2(total);
+  return maxEntropy > 0 ? 1 - entropy / maxEntropy : 1;
+}

package/src/types.ts

@@ -101,4 +101,7 @@ export interface ExportInfo {
   name: string;
   type: 'function' | 'class' | 'const' | 'type' | 'interface' | 'default';
   inferredDomain?: string; // Inferred from name/usage
+  imports?: string[]; // Imports used by this export (for import-based cohesion)
+  dependencies?: string[]; // Other exports from same file this depends on
 }
+