@codeyam/codeyam-cli 0.1.0-staging.28f73cf → 0.1.0-staging.323686

package/packages/analyze/src/lib/files/analyzeInitial.js

@@ -4,9 +4,9 @@ import generateScenarios from "./scenarios/generateScenarios.js";
 import { Step } from "./enums/steps.js";
 import recordStep from "./recordStep.js";
 import { DEFAULT_SCENARIO_NAME, } from "../../../../../packages/types/index.js";
-import { upsertAnalysesWithScenarios } from "../../../../../packages/supabase/index.js";
+import { upsertAnalysesWithScenarios } from "../../../../../packages/database/index.js";
 import { awsLog, awsLogDebugLevel, pushAnalysisError, } from "../../../../../packages/utils/index.js";
-import generateKeyAttributes from "./scenarios/generateKeyAttributes.js";
+import generateExecutionFlows from "./scenarios/generateExecutionFlows.js";
 export default async function analyzeInitial({ analysis, entity, analyzeAsDependency, dependentAnalyses, steps, updateProgress, model, structureSemaphore, }) {
     analysis.entity = entity;
     awsLog('CodeYam: Analyzing initial entity', {
@@ -38,22 +38,22 @@ export default async function analyzeInitial({ analysis, entity, analyzeAsDepend
                 }
             }
         }
-        // Short-circuit for test mocking: only generate data structure, skip key attributes and scenarios
+        // Short-circuit for test mocking: only generate data structure, skip execution flows and scenarios
         if (process.env.ONLY_DATA_STRUCTURE === 'true') {
-            awsLog('CodeYam: Skipping key attributes and scenario generation (ONLY_DATA_STRUCTURE=true)');
+            awsLog('CodeYam: Skipping execution flows and scenario generation (ONLY_DATA_STRUCTURE=true)');
             return { analysis };
         }
-        // KeyAttributes phase: I/O-bound LLM call, can run in parallel with other entities' Structure
-        if (!steps || steps.includes(Step.KeyAttributes)) {
-            awsLogDebugLevel(1, `Determining key attributes for ${entity.name}...`);
-            const { step: dataStructureStep } = await recordStep('generateKeyAttributes', () => generateKeyAttributes({
+        // ExecutionFlows phase: I/O-bound LLM call, can run in parallel with other entities' Structure
+        if (!steps || steps.includes(Step.ExecutionFlows)) {
+            awsLogDebugLevel(1, `Generating execution flows for ${entity.name}...`);
+            const { step: executionFlowsStep } = await recordStep('generateExecutionFlows', () => generateExecutionFlows({
                 entity,
                 analysis,
-                dependentAnalyses,
                 model,
                 updateProgress,
+                dependentAnalyses,
             }));
-            analysis.status.steps.push(dataStructureStep);
+            analysis.status.steps.push(executionFlowsStep);
         }
         if (analyzeAsDependency) {
             return { analysis };
@@ -104,7 +104,6 @@ export default async function analyzeInitial({ analysis, entity, analyzeAsDepend
         }
     }
     catch (error) {
-        console.log(error);
         pushAnalysisError({
             status: analysis.status,
             error,

package/packages/analyze/src/lib/files/analyzeInitial.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyzeInitial.js","sourceRoot":"","sources":["../../../../../../../packages/analyze/src/lib/files/analyzeInitial.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analyzeInitial.js","sourceRoot":"","sources":["../../../../../../../packages/analyze/src/lib/files/analyzeInitial.ts"],"names":[],"mappings":"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"}

package/packages/analyze/src/lib/files/analyzeNextRoute.js

@@ -1,4 +1,4 @@
-import { generateSha } from "../../../../../packages/supabase/index.js";
+import { generateSha } from "../../../../../packages/database/index.js";
 import { isNextRoute } from "../../../../../packages/utils/index.js";
 export default function analyzeNextRoute(file, projectAnalyzer, entity, framework) {
     if (!isNextRoute(file, entity, framework))

package/packages/analyze/src/lib/files/analyzeRemixRoute.js

@@ -1,4 +1,4 @@
-import { generateSha } from "../../../../../packages/supabase/index.js";
+import { generateSha } from "../../../../../packages/database/index.js";
 import { isRemixRoute } from "../../../../../packages/utils/index.js";
 export default function analyzeRemixRoute(file, projectAnalyzer, entity, framework) {
     if (!isRemixRoute(file, entity, framework))
@@ -38,20 +38,16 @@ export default function analyzeRemixRoute(file, projectAnalyzer, entity, framewo
         try {
             const implicitRouteFileAnalyzer = projectAnalyzer.getFileAnalyzer(implicitRoute);
             const exports = implicitRouteFileAnalyzer.getAllExports();
-            const defaultExport = Object.values(exports).find((e) => e.isDefaultExport);
-            // Ensure entities array exists before trying to use it
-            if (!implicitRoute.entities) {
-                console.log(`CodeYam Warning: implicitRoute.entities not populated for ${implicitRoute.path}, skipping implicit dependency`);
-                return;
-            }
-            const defaultEntity = implicitRoute.entities.find((e) => implicitRouteFileAnalyzer.isDefaultExport(e.name));
-            if (!defaultExport || !defaultEntity)
+            // Find the default export entry - the key is the entity name
+            const defaultExportEntry = Object.entries(exports).find(([, e]) => e.isDefaultExport);
+            if (!defaultExportEntry)
                 return;
+            const [entityName, defaultExport] = defaultExportEntry;
             const code = defaultExport.code;
             return {
                 code: code,
                 // sha: generateSha(implicitRoute.path, 'default', code),
-                name: defaultEntity.name,
+                name: entityName,
                 filePath: implicitRoute.path,
                 projectId: entity.projectId,
                 entityType: 'visual',
@@ -76,20 +72,19 @@ export default function analyzeRemixRoute(file, projectAnalyzer, entity, framewo
         try {
             const rootFileAnalyzer = projectAnalyzer.getFileAnalyzer(rootFile);
             const exports = rootFileAnalyzer.getAllExports();
-            const defaultExport = Object.values(exports).find((e) => e.isDefaultExport);
-            if (defaultExport && rootFile.entities) {
-                const defaultEntity = rootFile.entities.find((e) => rootFileAnalyzer.isDefaultExport(e.name));
-                if (defaultEntity) {
-                    rootDependencies.push({
-                        code: defaultExport.code,
-                        name: defaultEntity.name,
-                        filePath: rootFile.path,
-                        entityType: 'visual',
-                        isDefault: true,
-                        isImplicitDependency: true,
-                        isMocked: false,
-                    });
-                }
+            // Find the default export entry - the key is the entity name
+            const defaultExportEntry = Object.entries(exports).find(([, e]) => e.isDefaultExport);
+            if (defaultExportEntry) {
+                const [entityName, defaultExport] = defaultExportEntry;
+                rootDependencies.push({
+                    code: defaultExport.code,
+                    name: entityName,
+                    filePath: rootFile.path,
+                    entityType: 'visual',
+                    isDefault: true,
+                    isImplicitDependency: true,
+                    isMocked: false,
+                });
             }
         }
         catch (e) {

package/packages/analyze/src/lib/files/analyzeRemixRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyzeRemixRoute.js","sourceRoot":"","sources":["../../../../../../../packages/analyze/src/lib/files/analyzeRemixRoute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analyzeRemixRoute.js","sourceRoot":"","sources":["../../../../../../../packages/analyze/src/lib/files/analyzeRemixRoute.ts"],"names":[],"mappings":"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"}

package/packages/analyze/src/lib/files/enums/steps.js

@@ -13,6 +13,6 @@ export var Step;
     // CodeQuality = 'codeQuality',
     Step["Embed"] = "embed";
     Step["CodeExplanation"] = "codeExplanation";
-    Step["KeyAttributes"] = "keyAttributes";
+    Step["ExecutionFlows"] = "executionFlows";
 })(Step || (Step = {}));
 //# sourceMappingURL=steps.js.map

package/packages/analyze/src/lib/files/enums/steps.js.map

@@ -1 +1 @@
-{"version":3,"file":"steps.js","sourceRoot":"","sources":["../../../../../../../../packages/analyze/src/lib/files/enums/steps.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,IAeX;AAfD,WAAY,IAAI;IACd,2BAAmB,CAAA;IACnB,2BAAmB,CAAA;IACnB,uBAAe,CAAA;IACf,2BAAmB,CAAA;IACnB,uBAAe,CAAA;IACf,+BAAuB,CAAA;IACvB,+BAAuB,CAAA;IACvB,yCAAiC,CAAA;IACjC,qBAAa,CAAA;IACb,6BAAqB,CAAA;IACrB,+BAA+B;IAC/B,uBAAe,CAAA;IACf,2CAAmC,CAAA;IACnC,uCAA+B,CAAA;AACjC,CAAC,EAfW,IAAI,KAAJ,IAAI,QAef"}
+{"version":3,"file":"steps.js","sourceRoot":"","sources":["../../../../../../../../packages/analyze/src/lib/files/enums/steps.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,IAeX;AAfD,WAAY,IAAI;IACd,2BAAmB,CAAA;IACnB,2BAAmB,CAAA;IACnB,uBAAe,CAAA;IACf,2BAAmB,CAAA;IACnB,uBAAe,CAAA;IACf,+BAAuB,CAAA;IACvB,+BAAuB,CAAA;IACvB,yCAAiC,CAAA;IACjC,qBAAa,CAAA;IACb,6BAAqB,CAAA;IACrB,+BAA+B;IAC/B,uBAAe,CAAA;IACf,2CAAmC,CAAA;IACnC,yCAAiC,CAAA;AACnC,CAAC,EAfW,IAAI,KAAJ,IAAI,QAef"}

package/packages/analyze/src/lib/files/getImportedExports.js

@@ -1,4 +1,4 @@
-// import { generateSha } from "../../../../../packages/supabase/index.js";
+// import { generateSha } from "../../../../../packages/database/index.js";
 export default function getImportedExports(file, functionName, fileAnalyzer, projectAnalyzer, project, resolvedImports) {
     let relevantLocalEntities;
     try {
@@ -40,10 +40,85 @@ export default function getImportedExports(file, functionName, fileAnalyzer, pro
             const searchPath = importedExportInfo.resolvedPath ??
                 imports[filePath].resolvedPath ??
                 filePath;
-            const importedExportFile = project.files.find((f) => f.path === searchPath);
+            let importedExportFile = project.files.find((f) => f.path === searchPath);
+            // Track the actual path we found (may differ from searchPath after dist->src mapping)
+            let actualResolvedPath = imports[filePath].resolvedPath;
+            // Workspace packages often resolve to dist/ paths (from package.json "types" or "main"),
+            // but our project.files contains source files in src/. Try mapping dist -> src.
+            if (!importedExportFile && searchPath.includes('/dist/')) {
+                // Some build tools create nested structures like dist/packageName/src/file.d.ts
+                // when the source is at packages/packageName/src/file.ts
+                // Pattern: packages/X/dist/X/src/Y -> packages/X/src/Y
+                const nestedDistMatch = searchPath.match(/^(packages\/[^/]+)\/dist\/[^/]+\/src\/(.+)$/);
+                if (nestedDistMatch) {
+                    const [, packagePath, relativePath] = nestedDistMatch;
+                    const srcPath = `${packagePath}/src/${relativePath}`
+                        .replace(/\.d\.ts$/, '.ts')
+                        .replace(/\.js$/, '.ts');
+                    importedExportFile = project.files.find((f) => f.path === srcPath);
+                    if (importedExportFile) {
+                        actualResolvedPath = srcPath;
+                        console.log(`CodeYam: Mapped nested dist->src path: ${searchPath} -> ${srcPath}`);
+                    }
+                }
+                // Try simple dist -> src replacement if nested pattern didn't match
+                if (!importedExportFile) {
+                    const srcPath = searchPath.replace('/dist/', '/src/');
+                    // Try exact match first
+                    importedExportFile = project.files.find((f) => f.path === srcPath);
+                    if (importedExportFile) {
+                        actualResolvedPath = srcPath;
+                        console.log(`CodeYam: Mapped dist->src path: ${searchPath} -> ${srcPath}`);
+                    }
+                }
+                // If not found, the dist file might be index.d.ts but src might be index.ts
+                // or the export might be re-exported from another file
+                if (!importedExportFile) {
+                    const srcPath = searchPath.replace('/dist/', '/src/');
+                    // Try removing .d.ts extension and finding any matching src file
+                    const basePath = srcPath
+                        .replace(/\.d\.ts$/, '')
+                        .replace(/\.js$/, '');
+                    importedExportFile = project.files.find((f) => f.path === basePath + '.ts' ||
+                        f.path === basePath + '.tsx' ||
+                        (f.path.startsWith(basePath.replace('/index', '/')) &&
+                            !f.path.includes('/dist/')));
+                    if (importedExportFile) {
+                        actualResolvedPath = importedExportFile.path;
+                        console.log(`CodeYam: Mapped dist->src path (extension): ${searchPath} -> ${importedExportFile.path}`);
+                    }
+                }
+            }
             if (!importedExportFile) {
-                console.log('CodeYam Error: File not found for imported export', file.path, filePath, importedExportInfo, imports[filePath]);
-                return;
+                // Check if this looks like a path alias (starts with @/ or similar patterns)
+                // Path aliases should resolve to project files - if they don't, it's a config issue
+                // Also check for ~packageName/ patterns like ~codeyam/supabase
+                const isPathAlias = filePath.startsWith('@/') ||
+                    filePath.startsWith('~/') ||
+                    filePath.startsWith('#/') ||
+                    /^~[a-zA-Z]/.test(filePath); // ~packageName patterns like ~codeyam/
+                const name = importedExportInfo.importName ?? importedExportInfo.importAlias;
+                if (isPathAlias) {
+                    // Path aliases should resolve - if they don't, it's a configuration issue
+                    // Don't treat as node module, just log and skip
+                    console.log('CodeYam Warning: Path alias import not resolved (file may be missing or path alias misconfigured):', file.path, filePath, importedExportInfo);
+                    return;
+                }
+                // If still not found, track as unresolved import
+                // Don't set isMocked here - let later processing determine based on mockedDependencies
+                // This ensures the import is tracked (not dropped) while deferring the mocking decision
+                if (!importedExportFile) {
+                    const name = importedExportInfo.importName ?? importedExportInfo.importAlias;
+                    console.log(`CodeYam: Tracking unresolved import (mocking decision deferred): ${filePath} -> ${name}`);
+                    return {
+                        filePath,
+                        name,
+                        isDefault: importedExportInfo.isImportDefault,
+                        // isMocked intentionally undefined - will be determined later by prepareDataStructures
+                        // based on mockedDependencies analysis
+                        entityType: 'library',
+                    };
+                }
             }
             try {
                 const importedExportFileAnalyzer = projectAnalyzer.getFileAnalyzer(importedExportFile);
@@ -54,17 +129,33 @@ export default function getImportedExports(file, functionName, fileAnalyzer, pro
                 // const sha = generateSha(importedExportFile.path, exportName, code);
                 const entityType = importedExportFileAnalyzer.getEntityType(exportName);
                 const name = importedExportInfo.importName ?? importedExportInfo.importAlias;
-                const resolvedFilePath = importedExportInfo.resolvedPath;
+                // Map nested dist paths in resolvedPath to src paths
+                // Pattern: packages/X/dist/X/src/Y -> packages/X/src/Y
+                let resolvedFilePath = importedExportInfo.resolvedPath;
+                if (resolvedFilePath) {
+                    const nestedDistMatch = resolvedFilePath.match(/^(packages\/[^/]+)\/dist\/[^/]+\/src\/(.+)$/);
+                    if (nestedDistMatch) {
+                        const [, packagePath, relativePath] = nestedDistMatch;
+                        resolvedFilePath = `${packagePath}/src/${relativePath}`
+                            .replace(/\.d\.ts$/, '.ts')
+                            .replace(/\.js$/, '.ts');
+                    }
+                }
                 const resolvedName = importedExportInfo.exportName;
+                // When a default export is re-exported as named (e.g., `export { default as X }`),
+                // isExportDefault will be false (it's exported as named from the barrel),
+                // but resolvedName will be 'default'. In this case, we need resolvedIsDefault
+                // to be true so that writeScenarioComponents adds the named re-export.
+                const resolvedIsDefault = importedExportInfo.isExportDefault || resolvedName === 'default';
                 return {
                     fileId: importedExportFile.id,
-                    filePath: imports[filePath].resolvedPath,
+                    filePath: actualResolvedPath,
                     isDefault: importedExportInfo.isImportDefault,
-                    resolvedFilePath: resolvedFilePath === imports[filePath].resolvedPath
+                    resolvedFilePath: resolvedFilePath === actualResolvedPath
                         ? undefined
                         : resolvedFilePath,
                     resolvedName: resolvedName === name ? undefined : resolvedName,
-                    resolvedIsDefault: importedExportInfo.isExportDefault,
+                    resolvedIsDefault,
                     entityType,
                     name,
                     code,

package/packages/analyze/src/lib/files/getImportedExports.js.map

@@ -1 +1 @@
-{"version":3,"file":"getImportedExports.js","sourceRoot":"","sources":["../../../../../../../packages/analyze/src/lib/files/getImportedExports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getImportedExports.js","sourceRoot":"","sources":["../../../../../../../packages/analyze/src/lib/files/getImportedExports.ts"],"names":[],"mappings":"AAIA,mDAAmD;AAEnD,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,IAAU,EACV,YAAoB,EACpB,YAA0B,EAC1B,eAAgC,EAChC,OAAgB,EAChB,eAAyC;IAEzC,IAAI,qBAAqB,CAAC;IAC1B,IAAI,CAAC;QACH,qBAAqB,GAAG,YAAY;aACjC,8BAA8B,CAAC,YAAY,CAAC;aAC5C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACd,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;YACzB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;YACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;YAC3B,MAAM,UAAU,GAAG,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACpD,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YACrD,OAAO;gBACL,QAAQ;gBACR,IAAI;gBACJ,IAAI;gBACJ,UAAU;gBACV,SAAS;aACV,CAAC;QACJ,CAAC,CAAC;aACD,MAAM,CACL,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,CAChE,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CACT,oEAAoE,EACpE;YACE,QAAQ,EAAE,IAAI,CAAC,IAAI;YACnB,YAAY;YACZ,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB,CACF,CAAC;QACF,MAAM,KAAK,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GACX,eAAe;QACf,YAAY,CAAC,wCAAwC,CAAC,YAAY,CAAC,CAAC;IAEtE,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SACzC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAChB,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,eAAe;YAAE,OAAO;QAE9C,MAAM,mBAAmB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC;QAE1D,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC,kBAAkB,EAAE,EAAE;YACpD,MAAM,UAAU,GACd,kBAAkB,CAAC,YAAY;gBAC/B,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY;gBAC9B,QAAQ,CAAC;YAEX,IAAI,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAC7B,CAAC;YAEF,sFAAsF;YACtF,IAAI,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC;YAExD,yFAAyF;YACzF,gFAAgF;YAChF,IAAI,CAAC,kBAAkB,IAAI,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACzD,gFAAgF;gBAChF,yDAAyD;gBACzD,uDAAuD;gBACvD,MAAM,eAAe,GAAG,UAAU,CAAC,KAAK,CACtC,6CAA6C,CAC9C,CAAC;gBACF,IAAI,eAAe,EAAE,CAAC;oBACpB,MAAM,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,GAAG,eAAe,CAAC;oBACtD,MAAM,OAAO,GAAG,GAAG,WAAW,QAAQ,YAAY,EAAE;yBACjD,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;yBAC1B,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;oBAC3B,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;oBACnE,IAAI,kBAAkB,EAAE,CAAC;wBACvB,kBAAkB,GAAG,OAAO,CAAC;wBAC7B,OAAO,CAAC,GAAG,CACT,0CAA0C,UAAU,OAAO,OAAO,EAAE,CACrE,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,oEAAoE;gBACpE,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACxB,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;oBACtD,wBAAwB;oBACxB,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;oBACnE,IAAI,kBAAkB,EAAE,CAAC;wBACvB,kBAAkB,GAAG,OAAO,CAAC;wBAC7B,OAAO,CAAC,GAAG,CACT,mCAAmC,UAAU,OAAO,OAAO,EAAE,CAC9D,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,4EAA4E;gBAC5E,uDAAuD;gBACvD,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACxB,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;oBACtD,iEAAiE;oBACjE,MAAM,QAAQ,GAAG,OAAO;yBACrB,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;yBACvB,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;oBACxB,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CACrC,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,QAAQ,GAAG,KAAK;wBAC3B,CAAC,CAAC,IAAI,KAAK,QAAQ,GAAG,MAAM;wBAC5B,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;4BACjD,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAChC,CAAC;oBACF,IAAI,kBAAkB,EAAE,CAAC;wBACvB,kBAAkB,GAAG,kBAAkB,CAAC,IAAI,CAAC;wBAC7C,OAAO,CAAC,GAAG,CACT,+CAA+C,UAAU,OAAO,kBAAkB,CAAC,IAAI,EAAE,CAC1F,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,6EAA6E;gBAC7E,oFAAoF;gBACpF,+DAA+D;gBAC/D,MAAM,WAAW,GACf,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC;oBACzB,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC;oBACzB,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC;oBACzB,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,uCAAuC;gBAEtE,MAAM,IAAI,GACR,kBAAkB,CAAC,UAAU,IAAI,kBAAkB,CAAC,WAAW,CAAC;gBAElE,IAAI,WAAW,EAAE,CAAC;oBAChB,0EAA0E;oBAC1E,gDAAgD;oBAChD,OAAO,CAAC,GAAG,CACT,oGAAoG,EACpG,IAAI,CAAC,IAAI,EACT,QAAQ,EACR,kBAAkB,CACnB,CAAC;oBACF,OAAO;gBACT,CAAC;gBAED,iDAAiD;gBACjD,uFAAuF;gBACvF,wFAAwF;gBACxF,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACxB,MAAM,IAAI,GACR,kBAAkB,CAAC,UAAU,IAAI,kBAAkB,CAAC,WAAW,CAAC;oBAClE,OAAO,CAAC,GAAG,CACT,oEAAoE,QAAQ,OAAO,IAAI,EAAE,CAC1F,CAAC;oBACF,OAAO;wBACL,QAAQ;wBACR,IAAI;wBACJ,SAAS,EAAE,kBAAkB,CAAC,eAAe;wBAC7C,uFAAuF;wBACvF,uCAAuC;wBACvC,UAAU,EAAE,SAAkB;qBAC/B,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,0BAA0B,GAC9B,eAAe,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;gBACtD,MAAM,UAAU,GAAG,kBAAkB,CAAC,eAAe;oBACnD,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC;gBAClC,MAAM,IAAI,GAAG,0BAA0B,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;gBAClE,sEAAsE;gBACtE,MAAM,UAAU,GACd,0BAA0B,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;gBACvD,MAAM,IAAI,GACR,kBAAkB,CAAC,UAAU,IAAI,kBAAkB,CAAC,WAAW,CAAC;gBAElE,qDAAqD;gBACrD,uDAAuD;gBACvD,IAAI,gBAAgB,GAAG,kBAAkB,CAAC,YAAY,CAAC;gBACvD,IAAI,gBAAgB,EAAE,CAAC;oBACrB,MAAM,eAAe,GAAG,gBAAgB,CAAC,KAAK,CAC5C,6CAA6C,CAC9C,CAAC;oBACF,IAAI,eAAe,EAAE,CAAC;wBACpB,MAAM,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,GAAG,eAAe,CAAC;wBACtD,gBAAgB,GAAG,GAAG,WAAW,QAAQ,YAAY,EAAE;6BACpD,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;6BAC1B,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;oBAC7B,CAAC;gBACH,CAAC;gBACD,MAAM,YAAY,GAAG,kBAAkB,CAAC,UAAU,CAAC;gBAEnD,mFAAmF;gBACnF,0EAA0E;gBAC1E,8EAA8E;gBAC9E,uEAAuE;gBACvE,MAAM,iBAAiB,GACrB,kBAAkB,CAAC,eAAe,IAAI,YAAY,KAAK,SAAS,CAAC;gBAEnE,OAAO;oBACL,MAAM,EAAE,kBAAkB,CAAC,EAAE;oBAC7B,QAAQ,EAAE,kBAAkB;oBAC5B,SAAS,EAAE,kBAAkB,CAAC,eAAe;oBAC7C,gBAAgB,EACd,gBAAgB,KAAK,kBAAkB;wBACrC,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC,gBAAgB;oBACtB,YAAY,EAAE,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY;oBAC9D,iBAAiB;oBACjB,UAAU;oBACV,IAAI;oBACJ,IAAI;iBACL,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,iCAAiC,CAAC,EAAE,CAAC;oBAC1D,eAAe;oBACf,+DAA+D;oBAC/D,MAAM;oBACN,2BAA2B;oBAC3B,gCAAgC;oBAChC,0DAA0D;oBAC1D,0BAA0B;oBAC1B,OAAO;oBACP,KAAK;oBACL,OAAO;gBACT,CAAC;gBAED,OAAO,CAAC,GAAG,CACT,+CAA+C,EAC/C,IAAI,CAAC,SAAS,CACZ;oBACE,QAAQ,EAAE,IAAI,CAAC,IAAI;oBACnB,cAAc,EAAE,QAAQ;oBACxB,mBAAmB,EAAE,kBAAkB,CAAC,OAAO;oBAC/C,kBAAkB;iBACnB,EACD,IAAI,EACJ,CAAC,CACF,EACD,CAAC,CACF,CAAC;gBACF,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;SACD,IAAI,EAAE;SACN,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnB,OAAO,CAAC,GAAG,qBAAqB,EAAE,GAAG,eAAe,CAAC,CAAC;AACxD,CAAC"}

package/packages/analyze/src/lib/files/scenarios/enrichArrayTypesFromChildSignatures.js

@@ -0,0 +1,209 @@
+/**
+ * Enriches mocked dependency array types with fields from child component signatures.
+ *
+ * When a mocked dependency (e.g., getSurveysAction) returns an array, and elements
+ * from that array are passed to child components (e.g., SurveyCard), the child's
+ * signatureSchema specifies required fields (e.g., survey.updatedAt). This function
+ * enriches the mocked dependency's returnValueSchema so the LLM knows what fields
+ * to generate for array elements.
+ *
+ * Uses usageEquivalencies to trace data flow and ONLY enrich arrays with fields
+ * from children that actually receive elements from that array.
+ *
+ * Example:
+ * - getSurveysAction returns { data: array }
+ * - usageEquivalencies shows: surveys[] -> SurveyCard().signature[0].survey
+ * - SurveyCard expects signature[0].survey.updatedAt: date
+ * - After enrichment: getSurveysAction().data[]: object, data[].updatedAt: date
+ */
+export default function enrichArrayTypesFromChildSignatures(importedExports, dependencySchemas, usageEquivalencies) {
+    // Find all mocked dependencies with array return types
+    const mockedArrayPaths = [];
+    for (const importedExport of importedExports) {
+        if (!importedExport.isMocked || !importedExport.filePath)
+            continue;
+        const schema = dependencySchemas?.[importedExport.filePath]?.[importedExport.name]
+            ?.returnValueSchema;
+        if (!schema)
+            continue;
+        // Find paths that are top-level data arrays (not deeply nested, not direct returns)
+        // We only want to enrich arrays that likely contain objects passed to children
+        // e.g., getSurveysAction().data but NOT:
+        //   - wrapThrows().data.createdBy (deeply nested)
+        //   - getStatusOptions().functionCallReturnValue (direct array return - usually options/primitives)
+        for (const [path, type] of Object.entries(schema)) {
+            // Check if type is array (including nullable/optional variants like 'array | undefined')
+            if (!type.startsWith('array'))
+                continue;
+            // Skip paths with computed property patterns like [key], [i], [0], etc.
+            // These represent dynamic access patterns, not simple data arrays
+            // We only match brackets with content (not empty [] which indicates array element type)
+            if (/\[[^\]]+\]/.test(path)) {
+                continue;
+            }
+            // Skip direct array returns (e.g., getStatusOptions().functionCallReturnValue)
+            // These are typically specialized arrays like [{label, value}], not entity arrays
+            if (path.endsWith('.functionCallReturnValue')) {
+                continue;
+            }
+            // Check if this is a top-level array (at most one property after functionCallReturnValue)
+            // e.g., "foo().functionCallReturnValue.data" is top-level
+            // e.g., "foo().functionCallReturnValue.data.createdBy" is nested (skip)
+            const returnValueMatch = path.match(/\.functionCallReturnValue\.(.+)$/);
+            if (returnValueMatch) {
+                const afterReturnValue = returnValueMatch[1];
+                // If there's more than one property access, it's nested
+                const propertyCount = afterReturnValue.split('.').length;
+                if (propertyCount > 1) {
+                    continue; // Skip deeply nested arrays
+                }
+            }
+            mockedArrayPaths.push({
+                filePath: importedExport.filePath,
+                entityName: importedExport.name,
+                arrayPath: path,
+            });
+        }
+    }
+    if (mockedArrayPaths.length === 0)
+        return;
+    // Build a map from child component signature paths to their prop fields
+    // e.g., "SurveyCard().signature[0].survey" -> { "id": "string", "updatedAt": "date" }
+    const childSignatureFieldsByPath = new Map();
+    // Helper to extract prop name and fields from a signature schema
+    const extractSignatureInfo = (entityName, schema) => {
+        // Group by prop name (e.g., signature[0].survey.id, signature[0].survey.name -> "survey")
+        const propGroups = {};
+        for (const [path, type] of Object.entries(schema)) {
+            // Match signature[0].propName.field or signature[0].propName[].field patterns
+            // The (?:\[\])? makes array props optional, handling both:
+            // - signature[0].survey.updatedAt (object prop)
+            // - signature[0].questionAnswers[].question.questionText (array prop)
+            const match = path.match(/^signature\[0\]\.(\w+)(?:\[\])?\.(.+)$/);
+            if (match) {
+                const [, propName, fieldPath] = match;
+                propGroups[propName] || (propGroups[propName] = {});
+                propGroups[propName][fieldPath] = type;
+            }
+        }
+        // Store with the full signature path as key
+        for (const [propName, fields] of Object.entries(propGroups)) {
+            if (Object.keys(fields).length > 0) {
+                const signaturePath = `${entityName}().signature[0].${propName}`;
+                childSignatureFieldsByPath.set(signaturePath, { propName, fields });
+            }
+        }
+    };
+    // Process all schemas in dependencySchemas
+    if (dependencySchemas) {
+        for (const [, entities] of Object.entries(dependencySchemas)) {
+            for (const [entityName, schemas] of Object.entries(entities)) {
+                const signatureSchema = schemas?.signatureSchema;
+                if (signatureSchema) {
+                    extractSignatureInfo(entityName, signatureSchema);
+                }
+            }
+        }
+    }
+    if (childSignatureFieldsByPath.size === 0)
+        return;
+    // Helper to check if a local variable name could be derived from a mocked function name
+    // e.g., "getSurveys" -> "surveys", "fetchUsers" -> "users", "loadData" -> "data"
+    // e.g., "getSurveysAction" -> "surveys" (removes "Action" suffix too)
+    const couldBeDerivedFrom = (localVarName, mockedFunctionName) => {
+        const normalizedVar = localVarName.toLowerCase().replace(/\[\]$/, '');
+        let normalizedFunc = mockedFunctionName.toLowerCase();
+        // Direct match (e.g., "surveys" from function "surveys")
+        if (normalizedFunc === normalizedVar)
+            return true;
+        // Remove common prefixes like "get", "fetch", "load", "use"
+        const prefixPattern = /^(get|fetch|load|use)/i;
+        normalizedFunc = normalizedFunc.replace(prefixPattern, '');
+        // Remove common suffixes like "Action", "Query", "Mutation", "Handler"
+        const suffixPattern = /(action|query|mutation|handler)$/i;
+        normalizedFunc = normalizedFunc.replace(suffixPattern, '');
+        // Check if function name (without prefix/suffix) matches the variable name
+        if (normalizedFunc === normalizedVar)
+            return true;
+        // Check for singular/plural relationship
+        // e.g., "survey" from "getSurveys" or "surveys" from "getSurvey"
+        if (normalizedFunc.endsWith('s') &&
+            normalizedFunc.slice(0, -1) === normalizedVar)
+            return true;
+        if (normalizedVar.endsWith('s') &&
+            normalizedVar.slice(0, -1) === normalizedFunc)
+            return true;
+        // Check if the array property name (like "data") is in the variable
+        // This handles cases like "const { data: surveys } = getSurveys()" where
+        // the local var might be the renamed destructured property
+        // Skip this for now as it's too loose
+        return false;
+    };
+    // For each mocked array, find which child signatures it flows to via usageEquivalencies
+    for (const { filePath, entityName, arrayPath } of mockedArrayPaths) {
+        const schema = dependencySchemas[filePath][entityName].returnValueSchema;
+        // Check if this array already has element type definitions
+        // If so, skip it - it's likely a specialized array like [null] for refs
+        const elementPathPrefix = `${arrayPath}[`;
+        const hasExistingElementType = Object.keys(schema).some((path) => path.startsWith(elementPathPrefix));
+        if (hasExistingElementType) {
+            // Array already has element type info (e.g., useAutoAnimate()[0]: null)
+            // Don't override it with child signature fields
+            continue;
+        }
+        // Find matching child signatures via usageEquivalencies
+        // Look for equivalencies where this array (or local variables derived from it)
+        // flows to a child component's signature
+        const matchedFields = {};
+        if (usageEquivalencies) {
+            // Check all equivalency entries for paths that could be derived from this array
+            for (const [sourcePath, targets] of Object.entries(usageEquivalencies)) {
+                // Check if this source path relates to our mocked array
+                // Direct match: "getSurveysAction().functionCallReturnValue.data[]"
+                // Indirect match: local variable like "surveys[]" that comes from the array
+                if (!sourcePath.endsWith('[]'))
+                    continue;
+                // Get the local variable name from the source path (e.g., "surveys[]" -> "surveys")
+                const localVarName = sourcePath.replace(/\[\]$/, '');
+                // Check if this local variable could have come from this mocked function
+                // Use heuristics: name matching (getSurveys -> surveys, getUsers -> users)
+                if (!couldBeDerivedFrom(localVarName, entityName)) {
+                    continue;
+                }
+                for (const target of targets) {
+                    // Target should be something like "SurveyCard().signature[0].survey"
+                    // or "SurveyCard().signature[0].surveys[]"
+                    const { schemaPath } = target;
+                    // Look for signature fields that match this target
+                    // Handle both singular (survey) and plural (surveys[]) forms
+                    const normalizedTarget = schemaPath.replace(/\[\]$/, '');
+                    for (const [signaturePath, info] of childSignatureFieldsByPath) {
+                        if (normalizedTarget === signaturePath) {
+                            // Found a match! Add all fields from this child signature
+                            for (const [fieldPath, type] of Object.entries(info.fields)) {
+                                if (!matchedFields[fieldPath]) {
+                                    matchedFields[fieldPath] = type;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        // If no equivalencies matched, skip this array entirely
+        // This prevents the bug where ALL child signatures get merged into ALL arrays
+        if (Object.keys(matchedFields).length === 0) {
+            continue;
+        }
+        // Add array element type and matched fields
+        const elementPath = `${arrayPath}[]`;
+        schema[elementPath] = 'object';
+        for (const [fieldPath, type] of Object.entries(matchedFields)) {
+            const fullPath = `${elementPath}.${fieldPath}`;
+            if (!schema[fullPath]) {
+                schema[fullPath] = type;
+            }
+        }
+    }
+}
+//# sourceMappingURL=enrichArrayTypesFromChildSignatures.js.map

package/packages/analyze/src/lib/files/scenarios/enrichArrayTypesFromChildSignatures.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"enrichArrayTypesFromChildSignatures.js","sourceRoot":"","sources":["../../../../../../../../packages/analyze/src/lib/files/scenarios/enrichArrayTypesFromChildSignatures.ts"],"names":[],"mappings":"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"}