@codeyam/codeyam-cli 0.1.0-staging.dd216e0 → 0.1.0-staging.e2d4438

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

@@ -2,11 +2,64 @@ import measureAndReportExecutionTime from "../../utils/measureAndReportExecution
 import { generateEntityScenarioData, mergeJsonTypeDefinitions, } from "../../../../../../packages/ai/index.js";
 import findScenarioData from "../findScenarioData.js";
 import { awsLog } from "../../../../../../packages/utils/index.js";
-export function gatherDataForMocks(analysis, dependentAnalyses) {
+/**
+ * Consolidates dataForMocks from the current analysis and all dependent analyses.
+ *
+ * Keys are preserved as original call signatures (e.g., 'useFetcher<UserData>()',
+ * 'db.select(usersQuery)'). When the same call signature appears from multiple
+ * analyses, schemas are merged.
+ */
+export function gatherDataForMocks(analysis, dependentAnalyses, _rootEntityName) {
     const dataForMocks = {};
     const analysesGathered = new Set();
+    /**
+     * Helper to merge schemas (only works for objects, otherwise just returns new value)
+     */
+    const mergeSchemas = (existing, incoming) => {
+        // Only merge if both are objects (not arrays, not primitives)
+        if (typeof existing === 'object' &&
+            existing !== null &&
+            !Array.isArray(existing) &&
+            typeof incoming === 'object' &&
+            incoming !== null &&
+            !Array.isArray(incoming)) {
+            return mergeJsonTypeDefinitions(existing, incoming);
+        }
+        // For primitives/arrays, just use the incoming value
+        return incoming;
+    };
+    /**
+     * Add mock data, preserving original call signature as key.
+     * Merges schemas when the same key appears from multiple sources.
+     */
+    const addMockData = (key, schema) => {
+        // Skip if schema is empty object
+        if (typeof schema === 'object' &&
+            schema !== null &&
+            !Array.isArray(schema) &&
+            Object.keys(schema).length === 0) {
+            return;
+        }
+        // Skip null/undefined
+        if (schema === null || schema === undefined) {
+            return;
+        }
+        // Preserve original key (call signature), merge if exists
+        if (dataForMocks[key]) {
+            dataForMocks[key] = mergeSchemas(dataForMocks[key], schema);
+        }
+        else {
+            dataForMocks[key] = schema;
+        }
+    };
     // inner recursive function to gather data for mocks
     const gatherDataForMocksRecursive = (activeAnalysis) => {
+        // First, process ALL keys from this analysis's dataForMocks
+        const localDataForMocks = activeAnalysis.metadata?.scenariosDataStructure?.dataForMocks ?? {};
+        for (const [key, schema] of Object.entries(localDataForMocks)) {
+            addMockData(key, schema);
+        }
+        // Then, recurse into dependent analyses based on imports
         const allImportedExports = [
             ...(activeAnalysis.entity?.metadata.importedExports ?? []),
             ...Object.keys(activeAnalysis.entity?.metadata.nodeModuleImports ?? {}).flatMap((moduleName) => (activeAnalysis.entity?.metadata.nodeModuleImports?.[moduleName] || []).map((imported) => ({
@@ -14,56 +67,7 @@ export function gatherDataForMocks(analysis, dependentAnalyses) {
                 ...imported,
             }))),
         ];
-        // console.info('CODEYAM DEBUG: gatherDataForMocksRecursive START', {
-        //   filePath: activeAnalysis.filePath,
-        //   analysisEntityName: activeAnalysis.entityName,
-        //   analysisId: activeAnalysis.id,
-        //   entity: !!activeAnalysis.entity,
-        //   entityName: activeAnalysis.entity?.name,
-        //   allImportedExports: allImportedExports.map((ie) => ({
-        //     filePath: ie.filePath,
-        //     name: ie.name,
-        //   })),
-        // });
         for (const importedExport of allImportedExports) {
-            const localDataForMocks = activeAnalysis.metadata?.scenariosDataStructure?.dataForMocks ?? {};
-            // Find relevant keys - handle both old format (starts with name)
-            // and new variable-qualified format ("varName <- functionName")
-            const relevantKeys = Object.keys(localDataForMocks).filter((key) => key.startsWith(importedExport.name) ||
-                key.endsWith(` <- ${importedExport.name}`));
-            // console.info('CODEYAM DEBUG: Processing import', {
-            //   importedExportName: importedExport.name,
-            //   importedExportFilePath: importedExport.filePath,
-            //   relevantKeys,
-            //   hasLocalDataForMocks: Object.keys(localDataForMocks).length > 0,
-            //   localDataForMocksKeys: Object.keys(localDataForMocks),
-            // });
-            // First, if we have local data for this mock, add it
-            for (const relevantKey of relevantKeys) {
-                const localDataForMock = localDataForMocks[relevantKey];
-                // console.info('CODEYAM DEBUG: Found relevantKey', {
-                //   relevantKey,
-                //   localDataForMockType: typeof localDataForMock,
-                //   localDataForMockValue: localDataForMock,
-                //   isObject: typeof localDataForMock === 'object',
-                //   objectKeysLength:
-                //     typeof localDataForMock === 'object' && localDataForMock !== null
-                //       ? Object.keys(localDataForMock).length
-                //       : 'N/A',
-                // });
-                if (Object.keys(localDataForMock).length > 0) {
-                    if (dataForMocks[relevantKey]) {
-                        dataForMocks[relevantKey] = mergeJsonTypeDefinitions(dataForMocks[relevantKey], localDataForMock);
-                    }
-                    else {
-                        dataForMocks[relevantKey] = localDataForMock;
-                    }
-                }
-            }
-            // ALWAYS check for dependent analysis to gather nested dependencies,
-            // regardless of whether we found a relevantKey above.
-            // This ensures transitive dependencies are included.
-            // For example: Activity -> CurrentActivityTab -> useLastLogLine
             // Use resolvedFilePath when available (for re-exports from index files)
             const lookupPath = ('resolvedFilePath' in importedExport &&
                 importedExport.resolvedFilePath) ||
@@ -74,26 +78,8 @@ export function gatherDataForMocks(analysis, dependentAnalyses) {
                 gatherDataForMocksRecursive(dependentAnalysis);
             }
         }
-        // console.info('CODEYAM DEBUG: gatherDataForMocksRecursive END', {
-        //   filePath: activeAnalysis.filePath,
-        //   entityName: activeAnalysis.entityName,
-        //   currentDataForMocksKeys: Object.keys(dataForMocks),
-        // });
     };
     gatherDataForMocksRecursive(analysis);
-    // console.info(
-    //   'CODEYAM DEBUG: gatherDataForMocks FINAL RESULT',
-    //   JSON.stringify(
-    //     {
-    //       filePath: analysis.filePath,
-    //       entityName: analysis.entityName,
-    //       dataForMocksKeys: Object.keys(dataForMocks),
-    //       dataForMocks,
-    //     },
-    //     null,
-    //     2,
-    //   ),
-    // );
     return dataForMocks;
 }
 export default async function generateScenarioData({ entity, analysis, dependentAnalyses, model, updateProgress, }) {
@@ -102,7 +88,7 @@ export default async function generateScenarioData({ entity, analysis, dependent
         return;
     const structure = {
         arguments: analysis.metadata.scenariosDataStructure?.arguments ?? [],
-        dataForMocks: gatherDataForMocks(analysis, dependentAnalyses),
+        dataForMocks: gatherDataForMocks(analysis, dependentAnalyses, entity.name),
     };
     const scenarios = analysis.scenarios;
     awsLog('CodeYam: Generating scenario data for', JSON.stringify({
@@ -121,6 +107,7 @@ export default async function generateScenarioData({ entity, analysis, dependent
         entity,
         structure,
         scenarios,
+        executionFlows: analysis.metadata.executionFlows,
         analysis,
         model,
     }), 'Getting data to scenario', updateProgress);

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

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

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

@@ -7,13 +7,10 @@ export default async function generateScenarios({ entity, analysis, dependentAna
     var _a;
     if (!['visual', 'library'].includes(entity.entityType))
         return;
-    // Merge direct dataForMocks with recursively gathered data from dependencies
+    // Gather all mock data, consolidated under the root entity name
     const structure = {
         arguments: analysis.metadata.scenariosDataStructure?.arguments ?? [],
-        dataForMocks: {
-            ...(analysis.metadata.scenariosDataStructure?.dataForMocks ?? {}),
-            ...gatherDataForMocks(analysis, dependentAnalyses),
-        },
+        dataForMocks: gatherDataForMocks(analysis, dependentAnalyses, entity.name),
     };
     awsLog(`🔮 Generating ${error ? 'error ' : ''}scenarios for`, {
         filePath: entity.filePath,
@@ -33,7 +30,7 @@ export default async function generateScenarios({ entity, analysis, dependentAna
                     description: 'The only external state the component can be in.',
                     metadata: {
                         testName: 'it("renders correctly")',
-                        keyAttributeInstructions: {},
+                        coveredFlows: [],
                     },
                 },
             ];
@@ -42,8 +39,7 @@ export default async function generateScenarios({ entity, analysis, dependentAna
     }
     const { result: { scenarios, llmCall: scenariosLLMCall }, } = await measureAndReportExecutionTime(() => generateEntityScenarios({
         entity,
-        keyAttributes: analysis.metadata.keyAttributes,
-        dependentAnalyses,
+        executionFlows: analysis.metadata.executionFlows,
         analysis,
         error,
         model,

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

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