@codeyam/codeyam-cli 0.1.0-staging.28f73cf → 0.1.0-staging.76566f9

package/analyzer-template/packages/analyze/src/lib/files/scenarios/generateChangesScenarioData.ts

@@ -38,7 +38,7 @@ export default async function generateChangesScenarioData({
   const fullStructure = analysis.metadata.scenariosDataStructure;
   const structure: Analysis['metadata']['scenariosDataStructure'] = {
     arguments: fullStructure.arguments ?? [],
-    dataForMocks: gatherDataForMocks(analysis, dependentAnalyses),
+    dataForMocks: gatherDataForMocks(analysis, dependentAnalyses, entity.name),
   };
 
   for (const key in fullStructure.dataForMocks) {

package/analyzer-template/packages/analyze/src/lib/files/scenarios/generateDataStructure.ts

@@ -9,10 +9,12 @@ import {
   fillInDirectSchemaGapsAndUnknowns,
   deduplicateFunctionSchemas,
   clearAttributesFromMapping,
+  mergeJsonTypeDefinitions,
 } from '~codeyam/ai';
 import mergeInDependentDataStructure from './mergeInDependentDataStructure';
 import { awsLog } from '~codeyam/utils';
 import gatherDataForMocks from './gatherDataForMocks';
+import enrichArrayTypesFromChildSignatures from './enrichArrayTypesFromChildSignatures';
 
 export interface GenerateDataStructureArgs {
   entity: Entity;
@@ -31,12 +33,6 @@ export default function generateDataStructure({
     awsLog('CodeYam: Generating data structure for', {
       filePath: entity.filePath,
       entityName: entity.name,
-      // dependentAnalyses: Object.keys(dependentAnalyses).flatMap((path) =>
-      //   Object.keys(dependentAnalyses[path]).flatMap((entityName) => ({
-      //     path,
-      //     entityName,
-      //   })),
-      // ),
     });
 
     const allImportedExports = [
@@ -51,6 +47,58 @@ export default function generateDataStructure({
           ),
       ),
     ];
+
+    // For implicit dependencies (like root.tsx layouts), include their mocked nodeModuleImports
+    // This ensures layout file dependencies (like useLoaderData in root.tsx) are included in dataForMocks
+    // when simulating routes that are wrapped by those layout files
+    for (const importedExport of entity.metadata.importedExports ?? []) {
+      if (
+        !('isImplicitDependency' in importedExport) ||
+        !importedExport.isImplicitDependency
+      ) {
+        continue;
+      }
+
+      // Look up the implicit dependency's analysis
+      const implicitDepAnalysis =
+        dependentAnalyses[importedExport.filePath]?.[importedExport.name];
+
+      // Access nodeModuleImports from the entity attached to the analysis
+      const nodeModuleImports =
+        implicitDepAnalysis?.entity?.metadata?.nodeModuleImports;
+      if (!nodeModuleImports) {
+        continue;
+      }
+
+      // Add the implicit dependency's mocked nodeModuleImports to allImportedExports
+      for (const moduleName of Object.keys(nodeModuleImports)) {
+        const moduleImports = nodeModuleImports[moduleName] || [];
+        for (const imported of moduleImports) {
+          if (!imported.isMocked) continue;
+
+          // Only add if not already present (avoid duplicates)
+          const alreadyExists = allImportedExports.some(
+            (existing) =>
+              existing.filePath === moduleName &&
+              existing.name === imported.name,
+          );
+
+          if (!alreadyExists) {
+            allImportedExports.push({
+              filePath: moduleName,
+              name: imported.name,
+              isDefault: imported.isDefault,
+              isMocked: imported.isMocked,
+              calls: imported.calls ? [...imported.calls] : undefined,
+              callVariableNames: imported.callVariableNames
+                ? [...imported.callVariableNames]
+                : undefined,
+            });
+          }
+        }
+      }
+    }
+
     const nonMockedDependentAnalyses: ReadonlyAnalysisMap =
       allImportedExports.reduce((acc, importedExport) => {
         if (importedExport.isMocked) return acc;
@@ -112,6 +160,227 @@ export default function generateDataStructure({
         return acc;
       }, {} as ReadonlyAnalysisMap);
 
+    // For non-mocked child components (like visual components), include their mocked
+    // dependencies in allImportedExports. This ensures that when a parent component
+    // renders a child that uses the same hook with different destructure patterns,
+    // both patterns get separate mock data keys.
+    //
+    // Example: DashboardPage uses QuotesTableCompact (child, not mocked).
+    // Both use useFlags hook but destructure different properties:
+    // - DashboardPage: const { enableNewAdminDashboard } = useFlags()
+    // - QuotesTableCompact: const { flagShowReferenceIdOnQuoteTable } = useFlags()
+    // We need mock data keys for BOTH destructure patterns.
+    //
+    // We need to traverse the ENTIRE dependency tree recursively because nested
+    // child components (e.g., QuotesTableCompact inside AdminDashboard inside
+    // DashboardPage) also have mocked dependencies that need mock data keys.
+
+    // Collect child dependency schemas to merge after mergeInDependentDataStructure
+    // This ensures that when we look up schemas for child imports in gatherDataForMocks,
+    // the child's schemas are available in mergedDataStructure.dependencySchemas.
+    type DependencySchemas = NonNullable<
+      Analysis['metadata']['mergedDataStructure']
+    >['dependencySchemas'];
+    const childDependencySchemas: DependencySchemas = {};
+
+    // Helper function to add mocked imports from an entity to allImportedExports
+    const addMockedImportsFromEntity = (childEntity: Entity | undefined) => {
+      if (!childEntity?.metadata) return;
+
+      // Add child's mocked nodeModuleImports
+      const childNodeModuleImports = childEntity.metadata.nodeModuleImports;
+      if (childNodeModuleImports) {
+        for (const moduleName of Object.keys(childNodeModuleImports)) {
+          const moduleImports = childNodeModuleImports[moduleName] || [];
+          for (const imported of moduleImports) {
+            if (!imported.isMocked) continue;
+
+            // Check if this import already exists in allImportedExports
+            const existingImport = allImportedExports.find(
+              (existing) =>
+                existing.filePath === moduleName &&
+                existing.name === imported.name,
+            );
+
+            if (existingImport) {
+              // Merge callVariableNames if the same dependency exists with different patterns
+              if (imported.callVariableNames && imported.calls) {
+                existingImport.calls = existingImport.calls || [];
+                existingImport.callVariableNames =
+                  existingImport.callVariableNames || [];
+
+                // Add each call/variable pair that doesn't already exist
+                for (let i = 0; i < imported.calls.length; i++) {
+                  const call = imported.calls[i];
+                  const varName = imported.callVariableNames[i];
+                  if (!varName) continue;
+
+                  // Check if this specific callVariableName already exists
+                  if (!existingImport.callVariableNames.includes(varName)) {
+                    existingImport.calls.push(call);
+                    existingImport.callVariableNames.push(varName);
+                  }
+                }
+              }
+            } else {
+              // Add new import
+              allImportedExports.push({
+                filePath: moduleName,
+                name: imported.name,
+                isDefault: imported.isDefault,
+                isMocked: imported.isMocked,
+                calls: imported.calls ? [...imported.calls] : undefined,
+                callVariableNames: imported.callVariableNames
+                  ? [...imported.callVariableNames]
+                  : undefined,
+              });
+            }
+          }
+        }
+      }
+
+      // Add child's mocked importedExports
+      const childImportedExports = childEntity.metadata.importedExports;
+      if (childImportedExports) {
+        for (const imported of childImportedExports) {
+          if (!imported.isMocked) continue;
+
+          // Check if this import already exists in allImportedExports
+          const existingImport = allImportedExports.find(
+            (existing) =>
+              existing.filePath === imported.filePath &&
+              existing.name === imported.name,
+          );
+
+          if (existingImport) {
+            // Merge callVariableNames if the same dependency exists with different patterns
+            if (imported.callVariableNames && imported.calls) {
+              existingImport.calls = existingImport.calls || [];
+              existingImport.callVariableNames =
+                existingImport.callVariableNames || [];
+
+              // Add each call/variable pair that doesn't already exist
+              for (let i = 0; i < imported.calls.length; i++) {
+                const call = imported.calls[i];
+                const varName = imported.callVariableNames[i];
+                if (!varName) continue;
+
+                // Check if this specific callVariableName already exists
+                if (!existingImport.callVariableNames.includes(varName)) {
+                  existingImport.calls.push(call);
+                  existingImport.callVariableNames.push(varName);
+                }
+              }
+            }
+          } else {
+            // Add new import
+            allImportedExports.push({
+              filePath: imported.filePath,
+              name: imported.name,
+              isDefault: imported.isDefault,
+              isMocked: imported.isMocked,
+              calls: imported.calls ? [...imported.calls] : undefined,
+              callVariableNames: imported.callVariableNames
+                ? [...imported.callVariableNames]
+                : undefined,
+            });
+          }
+        }
+      }
+    };
+
+    // Recursive function to traverse the dependency tree
+    const processedAnalyses = new Set<string>();
+    const traverseDependencyTree = (analyses: ReadonlyAnalysisMap) => {
+      for (const filePath in analyses) {
+        for (const name in analyses[filePath]) {
+          const analysisKey = `${filePath}:${name}`;
+          if (processedAnalyses.has(analysisKey)) continue;
+          processedAnalyses.add(analysisKey);
+
+          const childAnalysis = analyses[filePath][name];
+          const childEntity = childAnalysis?.entity;
+
+          // Add mocked imports from this child entity
+          addMockedImportsFromEntity(childEntity as Entity | undefined);
+
+          // Recursively process this child's non-mocked children
+          // via their mergedDataStructure's nested dependentAnalyses
+          const childMergedDataStructure =
+            childAnalysis?.metadata?.mergedDataStructure;
+
+          // Collect the child's dependency schemas for merging later.
+          // This ensures schemas for child imports are available in gatherDataForMocks.
+          if (childMergedDataStructure?.dependencySchemas) {
+            for (const schemaFilePath in childMergedDataStructure.dependencySchemas) {
+              for (const schemaName in childMergedDataStructure
+                .dependencySchemas[schemaFilePath]) {
+                childDependencySchemas[schemaFilePath] ||= {};
+                const existingSchema =
+                  childDependencySchemas[schemaFilePath][schemaName];
+                const newSchema =
+                  childMergedDataStructure.dependencySchemas[schemaFilePath][
+                    schemaName
+                  ];
+
+                if (existingSchema) {
+                  // Merge schemas if the same dependency exists from multiple children
+                  childDependencySchemas[schemaFilePath][schemaName] = {
+                    signatureSchema: {
+                      ...existingSchema.signatureSchema,
+                      ...newSchema.signatureSchema,
+                    },
+                    returnValueSchema: mergeJsonTypeDefinitions(
+                      existingSchema.returnValueSchema as Record<
+                        string,
+                        unknown
+                      >,
+                      newSchema.returnValueSchema as Record<string, unknown>,
+                    ) as Record<string, string>,
+                  };
+                } else {
+                  childDependencySchemas[schemaFilePath][schemaName] = {
+                    signatureSchema: { ...newSchema.signatureSchema },
+                    returnValueSchema: { ...newSchema.returnValueSchema },
+                  };
+                }
+              }
+            }
+          }
+
+          if (childMergedDataStructure?.dependencySchemas) {
+            // We need to find non-mocked child components in the dependency tree
+            // These would be in the child's importedExports that are NOT mocked
+            const childImportedExports =
+              childEntity?.metadata?.importedExports ?? [];
+            const nonMockedChildDeps: ReadonlyAnalysisMap = {};
+
+            for (const dep of childImportedExports) {
+              if (dep.isMocked) continue;
+              if (dep.entityType !== 'visual') continue;
+
+              // Try to find this dependency in dependentAnalyses
+              const depFilePath = dep.resolvedFilePath ?? dep.filePath;
+              const depName = dep.resolvedName ?? dep.name;
+
+              if (dependentAnalyses[depFilePath]?.[depName]) {
+                nonMockedChildDeps[depFilePath] ||= {};
+                nonMockedChildDeps[depFilePath][depName] =
+                  dependentAnalyses[depFilePath][depName];
+              }
+            }
+
+            if (Object.keys(nonMockedChildDeps).length > 0) {
+              traverseDependencyTree(nonMockedChildDeps);
+            }
+          }
+        }
+      }
+    };
+
+    // Start traversal from direct non-mocked children
+    traverseDependencyTree(nonMockedDependentAnalyses);
+
     // console.info(
     //   'CODEYAM DEBUG: start merge',
     //   JSON.stringify(
@@ -129,6 +398,7 @@ export default function generateDataStructure({
     // );
 
     const { isolatedDataStructure } = entity.metadata;
+
     const mergedDataStructure = mergeInDependentDataStructure({
       importedExports: allImportedExports,
       dependentAnalyses: nonMockedDependentAnalyses,
@@ -146,6 +416,36 @@ export default function generateDataStructure({
     mergedDataStructure.environmentVariables =
       isolatedDataStructure.environmentVariables || [];
 
+    // Merge collected child dependency schemas into mergedDataStructure.
+    // This ensures that when gatherDataForMocks looks up schemas for child imports,
+    // the child's schemas are available.
+    for (const schemaFilePath in childDependencySchemas) {
+      for (const schemaName in childDependencySchemas[schemaFilePath]) {
+        mergedDataStructure.dependencySchemas[schemaFilePath] ||= {};
+        const existingSchema =
+          mergedDataStructure.dependencySchemas[schemaFilePath][schemaName];
+        const childSchema = childDependencySchemas[schemaFilePath][schemaName];
+
+        if (existingSchema) {
+          // Merge schemas - child schemas add to parent schemas
+          mergedDataStructure.dependencySchemas[schemaFilePath][schemaName] = {
+            signatureSchema: {
+              ...existingSchema.signatureSchema,
+              ...childSchema.signatureSchema,
+            },
+            returnValueSchema: mergeJsonTypeDefinitions(
+              existingSchema.returnValueSchema as Record<string, unknown>,
+              childSchema.returnValueSchema as Record<string, unknown>,
+            ) as Record<string, string>,
+          };
+        } else {
+          // No existing schema - just add the child's schema
+          mergedDataStructure.dependencySchemas[schemaFilePath][schemaName] =
+            childSchema;
+        }
+      }
+    }
+
     // console.info(
     //   'CODEYAM DEBUG: end merge',
     //   JSON.stringify(
@@ -197,23 +497,19 @@ export default function generateDataStructure({
     analysis.metadata ||= {};
     analysis.metadata.mergedDataStructure = mergedDataStructure;
 
-    const dataForMocks = gatherDataForMocks(
+    // Enrich mocked dependency array types with fields from child component signatures
+    // This ensures that when getSurveysAction returns { data: array }, and SurveyCard
+    // expects survey.updatedAt, the array element type includes updatedAt
+    enrichArrayTypesFromChildSignatures(
       allImportedExports,
       mergedDataStructure.dependencySchemas,
     );
 
-    // console.info(
-    //   'CODEYAM DEBUG: dataForMocks',
-    //   JSON.stringify(
-    //     {
-    //       filePath: entity.filePath,
-    //       entityName: entity.name,
-    //       dataForMocks,
-    //     },
-    //     null,
-    //     2,
-    //   ),
-    // );
+    const dataForMocks = gatherDataForMocks(
+      allImportedExports,
+      mergedDataStructure.dependencySchemas,
+      { entityName: entity.name },
+    );
 
     const finalizedArgumentsSchema = fillInDirectSchemaGapsAndUnknowns({
       schema: { ...mergedDataStructure.signatureSchema },

package/analyzer-template/packages/analyze/src/lib/files/scenarios/generateKeyAttributes.ts

@@ -29,13 +29,10 @@ export default async function generateKeyAttributes({
 }: GenerateEntityKeyAttributesArgs): Promise<void> {
   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`, {
@@ -74,6 +71,7 @@ export default async function generateKeyAttributes({
       () =>
         generateEntityKeyAttributes({
           entity,
+          mergedDataStructure: analysis.metadata.mergedDataStructure,
           model,
         }),
       `Generating entity key attributes`,
@@ -82,6 +80,7 @@ export default async function generateKeyAttributes({
 
     const relevantDependentKeyAttributes = gatherRelevantDependentKeyAttributes(
       entity,
+      analysis.metadata.mergedDataStructure,
       dependentAnalyses,
     );
 
@@ -92,6 +91,18 @@ export default async function generateKeyAttributes({
         // Spread to convert readonly arrays to mutable arrays (with fallback for undefined)
         validValueOptions: [...(ka.validValueOptions ?? [])],
         errorValueOptions: [...(ka.errorValueOptions ?? [])],
+        // Convert readonly dependencies array to mutable if present
+        ...(ka.dependencies && {
+          dependencies: ka.dependencies.map((dep) => ({ ...dep })),
+        }),
+        // Convert readonly sourceLocations array to mutable if present
+        ...(ka.sourceLocations && {
+          sourceLocations: ka.sourceLocations.map((loc) => ({ ...loc })),
+        }),
+        // Convert readonly compoundConditionalIds array to mutable if present
+        ...(ka.compoundConditionalIds && {
+          compoundConditionalIds: [...ka.compoundConditionalIds],
+        }),
       })),
     ].filter(
       (ka, index, self) =>

package/analyzer-template/packages/analyze/src/lib/files/scenarios/generateScenarioData.ts

@@ -1,6 +1,7 @@
 import {
   Analysis,
   Entity,
+  JsonTypeDefinition,
   ReadonlyAnalysis,
   ReadonlyAnalysisMap,
 } from '~codeyam/types';
@@ -21,17 +22,91 @@ export interface GenerateScenarioDataArgs {
   updateProgress?: (detail: string) => void;
 }
 
+/**
+ * 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: ReadonlyAnalysis,
   dependentAnalyses: ReadonlyAnalysisMap,
+  _rootEntityName?: string, // Kept for API compatibility but no longer used for key transformation
 ): Analysis['metadata']['scenariosDataStructure']['dataForMocks'] {
-  const dataForMocks = {};
+  const dataForMocks: Analysis['metadata']['scenariosDataStructure']['dataForMocks'] =
+    {};
   const analysesGathered = new Set<string>();
 
+  /**
+   * Helper to merge schemas (only works for objects, otherwise just returns new value)
+   */
+  const mergeSchemas = (
+    existing: JsonTypeDefinition[keyof JsonTypeDefinition],
+    incoming: JsonTypeDefinition[keyof JsonTypeDefinition],
+  ): JsonTypeDefinition[keyof JsonTypeDefinition] => {
+    // 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 as JsonTypeDefinition,
+        incoming as JsonTypeDefinition,
+      );
+    }
+    // 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: string,
+    schema: JsonTypeDefinition[keyof JsonTypeDefinition],
+  ): void => {
+    // 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: ReadonlyAnalysis,
   ): void => {
+    // 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 as JsonTypeDefinition[keyof JsonTypeDefinition]);
+    }
+
+    // Then, recurse into dependent analyses based on imports
     const allImportedExports = [
       ...(activeAnalysis.entity?.metadata.importedExports ?? []),
       ...Object.keys(
@@ -46,64 +121,7 @@ export function gatherDataForMocks(
       ),
     ];
 
-    // 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 ?? {};
-      const relevantKey = Object.keys(localDataForMocks).find((key) =>
-        key.startsWith(importedExport.name),
-      );
-
-      // console.info('CODEYAM DEBUG: Processing import', {
-      //   importedExportName: importedExport.name,
-      //   importedExportFilePath: importedExport.filePath,
-      //   relevantKey,
-      //   hasLocalDataForMocks: Object.keys(localDataForMocks).length > 0,
-      //   localDataForMocksKeys: Object.keys(localDataForMocks),
-      // });
-
-      // First, if we have local data for this mock, add it
-      if (relevantKey) {
-        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 as any)[relevantKey]) {
-            (dataForMocks as any)[relevantKey] = mergeJsonTypeDefinitions(
-              (dataForMocks as any)[relevantKey],
-              localDataForMock,
-            );
-          } else {
-            (dataForMocks as any)[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 &&
@@ -117,30 +135,10 @@ export function gatherDataForMocks(
         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;
 }
 
@@ -155,7 +153,7 @@ export default async function generateScenarioData({
 
   const structure: Analysis['metadata']['scenariosDataStructure'] = {
     arguments: analysis.metadata.scenariosDataStructure?.arguments ?? [],
-    dataForMocks: gatherDataForMocks(analysis, dependentAnalyses),
+    dataForMocks: gatherDataForMocks(analysis, dependentAnalyses, entity.name),
   };
 
   const scenarios = analysis.scenarios;

package/analyzer-template/packages/analyze/src/lib/files/scenarios/generateScenarios.ts

@@ -28,13 +28,10 @@ export default async function generateScenarios({
 }: GenerateScenariosArgs): Promise<void> {
   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`, {