@codeyam/codeyam-cli 0.1.0-staging.e38f7bd → 0.1.0-staging.f777668

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

@@ -9,11 +9,15 @@ 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';
+import enrichUnknownTypesFromSourceEquivalencies from './enrichUnknownTypesFromSourceEquivalencies';
+import { transformationTracer } from './TransformationTracer';
+// import propagateArrayItemSchemas from './propagateArrayItemSchemas';
 export interface GenerateDataStructureArgs {
   entity: Entity;
   dependentAnalyses: ReadonlyAnalysisMap;
@@ -26,7 +30,9 @@ export default function generateDataStructure({
   analysis,
 }: GenerateDataStructureArgs) {
   try {
-    if (!['visual', 'library'].includes(entity.entityType)) return analysis;
+    if (!['visual', 'library'].includes(entity.entityType)) {
+      return analysis;
+    }
 
     awsLog('CodeYam: Generating data structure for', {
       filePath: entity.filePath,
@@ -109,55 +115,6 @@ export default function generateDataStructure({
         const relevantDependencyAnalysis =
           dependentAnalyses[lookupPath]?.[importedExport.name];
 
-        // DEBUG: Track buildBranchFileMap and fileComparisons
-        if (
-          importedExport.name === 'buildBranchFileMap' ||
-          entity.name === 'GitView'
-        ) {
-          console.log('🔍 DEBUG generateDataStructure:', {
-            entityName: entity.name,
-            importedExportName: importedExport.name,
-            lookupPath,
-            hasAnalysis: !!relevantDependencyAnalysis,
-            signatureSchema:
-              relevantDependencyAnalysis?.metadata?.mergedDataStructure
-                ?.signatureSchema,
-            dependencySchemas: relevantDependencyAnalysis?.metadata
-              ?.mergedDataStructure?.dependencySchemas
-              ? Object.keys(
-                  relevantDependencyAnalysis.metadata.mergedDataStructure
-                    .dependencySchemas,
-                )
-              : null,
-          });
-          if (
-            relevantDependencyAnalysis?.metadata?.mergedDataStructure
-              ?.signatureSchema
-          ) {
-            const sig =
-              relevantDependencyAnalysis.metadata.mergedDataStructure
-                .signatureSchema;
-            console.log(
-              '🔍 DEBUG buildBranchFileMap signature keys:',
-              Object.keys(sig),
-            );
-            // Look for fileComparisons in the signature
-            for (const key of Object.keys(sig)) {
-              if (
-                key.includes('fileComparisons') ||
-                key.includes('entityDiff')
-              ) {
-                console.log(
-                  '🔍 DEBUG Found relevant key:',
-                  key,
-                  '=',
-                  JSON.stringify(sig[key], null, 2),
-                );
-              }
-            }
-          }
-        }
-
         if (!relevantDependencyAnalysis) {
           // console.info(
           //   'CodeYam Warn: No relevant dependency analysis found for importedExport',
@@ -207,6 +164,285 @@ export default function generateDataStructure({
         return acc;
       }, {} as ReadonlyAnalysisMap);
 
+    // Include same-file child components in nonMockedDependentAnalyses.
+    // Same-file components (e.g., AgentCard defined in the same file as AgentTranscriptsPage)
+    // are NOT in importedExports, so the reduce above never includes them.
+    // But they ARE in dependentAnalyses and their full signatureSchema (with all prop fields)
+    // needs to be merged into the parent's dependencySchemas for array enrichment to work.
+
+    const sameFileAnalyses = dependentAnalyses[entity.filePath];
+    if (sameFileAnalyses) {
+      for (const name in sameFileAnalyses) {
+        if (name === entity.name) continue;
+        if (nonMockedDependentAnalyses[entity.filePath]?.[name]) continue;
+        const childAnalysis = sameFileAnalyses[name];
+        if (childAnalysis?.entityType === 'visual') {
+          nonMockedDependentAnalyses[entity.filePath] ||= {};
+          nonMockedDependentAnalyses[entity.filePath][name] = childAnalysis;
+        }
+      }
+    }
+
+    // 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 calls from child into existing import
+            // Note: Check length > 0 because empty array [] is truthy but has no variable names
+            if (imported.callVariableNames?.length && imported.calls) {
+              // Case 1: Both calls and callVariableNames are set - merge as pairs
+              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 if (imported.calls) {
+              // Case 2: Only calls are set (no callVariableNames) - common with tRPC
+              // where destructuring like `const { data, isLoading } = trpc.xxx.useQuery()`
+              // doesn't create a variable name for the hook call itself
+              existingImport.calls = existingImport.calls || [];
+
+              // Add each call that doesn't already exist
+              for (const call of imported.calls) {
+                if (!existingImport.calls.includes(call)) {
+                  existingImport.calls.push(call);
+                }
+              }
+            }
+          } 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 },
+                  };
+                }
+              }
+            }
+          }
+
+          // Also collect the child's OWN signatureSchema for enrichment.
+          // This allows enrichArrayTypesFromChildSignatures to find what fields
+          // non-mocked child components expect on their props (e.g., SurveyCard
+          // expecting survey.createdAt, survey.updatedAt, etc.)
+          if (childMergedDataStructure?.signatureSchema) {
+            childDependencySchemas[filePath] ||= {};
+            const existingSchema = childDependencySchemas[filePath][name];
+            if (existingSchema) {
+              childDependencySchemas[filePath][name] = {
+                signatureSchema: {
+                  ...existingSchema.signatureSchema,
+                  ...childMergedDataStructure.signatureSchema,
+                },
+                returnValueSchema: existingSchema.returnValueSchema,
+              };
+            } else {
+              childDependencySchemas[filePath][name] = {
+                signatureSchema: {
+                  ...childMergedDataStructure.signatureSchema,
+                },
+                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(
@@ -225,6 +461,29 @@ export default function generateDataStructure({
 
     const { isolatedDataStructure } = entity.metadata;
 
+    if (!isolatedDataStructure) {
+      awsLog(
+        'CodeYam: Skipping data structure generation — isolatedDataStructure is undefined (scope analysis may have failed)',
+        {
+          entityName: entity.name,
+          filePath: entity.filePath,
+        },
+      );
+      return analysis;
+    }
+
+    // Transformation tracing: start entity and capture isolated data structure
+    transformationTracer.startEntity({
+      name: entity.name,
+      entityType: entity.entityType,
+      filePath: entity.filePath,
+    });
+    transformationTracer.snapshot(entity.name, 'isolated', {
+      signatureSchema: isolatedDataStructure.signatureSchema,
+      returnValueSchema: isolatedDataStructure.returnValueSchema,
+      dependencySchemas: isolatedDataStructure.dependencySchemas,
+    });
+
     const mergedDataStructure = mergeInDependentDataStructure({
       importedExports: allImportedExports,
       dependentAnalyses: nonMockedDependentAnalyses,
@@ -239,41 +498,75 @@ export default function generateDataStructure({
       dependencySchemas: isolatedDataStructure?.dependencySchemas || {},
     });
 
-    // DEBUG: Check merged result for GitView
-    if (entity.name === 'GitView') {
-      console.log(
-        '🔍 DEBUG GitView mergedDataStructure dependency schemas:',
-        Object.keys(mergedDataStructure.dependencySchemas || {}),
-      );
-      for (const filePath of Object.keys(
-        mergedDataStructure.dependencySchemas || {},
-      )) {
-        for (const depName of Object.keys(
-          mergedDataStructure.dependencySchemas[filePath] || {},
-        )) {
-          const depSchema =
-            mergedDataStructure.dependencySchemas[filePath][depName];
-          console.log(
-            `🔍 DEBUG Merged dep ${filePath}/${depName} signature keys:`,
-            Object.keys(depSchema.signatureSchema || {}),
-          );
-          // Look for fileComparisons
-          for (const key of Object.keys(depSchema.signatureSchema || {})) {
-            if (key.includes('fileComparisons') || key.includes('entityDiff')) {
-              console.log(
-                '🔍 DEBUG MERGED Found relevant key:',
-                key,
-                '=',
-                JSON.stringify(depSchema.signatureSchema[key], null, 2),
-              );
+    mergedDataStructure.environmentVariables =
+      isolatedDataStructure.environmentVariables || [];
+
+    // Transformation tracing: capture merged data structure
+    transformationTracer.snapshot(entity.name, 'merged', {
+      signatureSchema: mergedDataStructure.signatureSchema,
+      returnValueSchema: mergedDataStructure.returnValueSchema,
+      dependencySchemas: mergedDataStructure.dependencySchemas,
+    });
+
+    // 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
+          // But prefer more specific types (without | undefined) when both exist
+          const mergedSignatureSchema = { ...existingSchema.signatureSchema };
+          for (const path in childSchema.signatureSchema) {
+            const existingType = mergedSignatureSchema[path];
+            const childType = childSchema.signatureSchema[path];
+            if (!existingType) {
+              mergedSignatureSchema[path] = childType;
+            } else {
+              // Prefer the more specific (narrower) type
+              const existingIsOptional =
+                existingType.includes('| undefined') ||
+                existingType.includes('| null');
+              const childIsOptional =
+                childType.includes('| undefined') ||
+                childType.includes('| null');
+              if (childIsOptional && !existingIsOptional) {
+                // Keep existing - it's more specific
+              } else if (!childIsOptional && existingIsOptional) {
+                // Use child - it's more specific
+                mergedSignatureSchema[path] = childType;
+              } else {
+                // Same specificity - use child (original behavior)
+                mergedSignatureSchema[path] = childType;
+              }
             }
           }
+          mergedDataStructure.dependencySchemas[schemaFilePath][schemaName] = {
+            signatureSchema: mergedSignatureSchema,
+            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;
         }
       }
     }
 
-    mergedDataStructure.environmentVariables =
-      isolatedDataStructure.environmentVariables || [];
+    // Transformation tracing: capture after child schemas merged
+    transformationTracer.snapshot(entity.name, 'childSchemasMerged', {
+      signatureSchema: mergedDataStructure.signatureSchema,
+      returnValueSchema: mergedDataStructure.returnValueSchema,
+      dependencySchemas: mergedDataStructure.dependencySchemas,
+    });
 
     // console.info(
     //   'CODEYAM DEBUG: end merge',
@@ -297,98 +590,295 @@ export default function generateDataStructure({
 
     // Deduplicate function schemas in the merged data structure
     // The merge process might introduce duplicates even if individual schemas were clean
+    // Trace deduplication of signatureSchema
+    const sigBefore = { ...mergedDataStructure.signatureSchema };
     mergedDataStructure.signatureSchema = deduplicateFunctionSchemas(
       mergedDataStructure.signatureSchema,
     );
+    transformationTracer.traceSchemaTransformResult(
+      entity.name,
+      'deduplicateFunctionSchemas',
+      sigBefore,
+      mergedDataStructure.signatureSchema,
+      { schemaType: 'signature' },
+    );
+
+    // Trace deduplication of returnValueSchema
+    const rvBefore = { ...mergedDataStructure.returnValueSchema };
     mergedDataStructure.returnValueSchema = deduplicateFunctionSchemas(
       mergedDataStructure.returnValueSchema,
     );
+    transformationTracer.traceSchemaTransformResult(
+      entity.name,
+      'deduplicateFunctionSchemas',
+      rvBefore,
+      mergedDataStructure.returnValueSchema,
+      { schemaType: 'returnValue' },
+    );
 
-    // Also deduplicate dependency schemas
+    // Also deduplicate dependency schemas and clear known attributes
     for (const filePath in mergedDataStructure.dependencySchemas) {
-      for (const entityName in mergedDataStructure.dependencySchemas[
+      for (const depEntityName in mergedDataStructure.dependencySchemas[
         filePath
       ]) {
         const depSchema =
-          mergedDataStructure.dependencySchemas[filePath][entityName];
+          mergedDataStructure.dependencySchemas[filePath][depEntityName];
+
+        // Trace deduplication of dependency signatureSchema
+        const depSigBefore = { ...depSchema.signatureSchema };
         depSchema.signatureSchema = deduplicateFunctionSchemas(
           depSchema.signatureSchema,
         );
+        transformationTracer.traceSchemaTransformResult(
+          entity.name,
+          'deduplicateFunctionSchemas',
+          depSigBefore,
+          depSchema.signatureSchema,
+          { filePath, dependencyName: depEntityName, schemaType: 'signature' },
+        );
+
+        // Trace deduplication of dependency returnValueSchema
+        const depRvBefore = { ...depSchema.returnValueSchema };
         depSchema.returnValueSchema = deduplicateFunctionSchemas(
           depSchema.returnValueSchema,
         );
+        transformationTracer.traceSchemaTransformResult(
+          entity.name,
+          'deduplicateFunctionSchemas',
+          depRvBefore,
+          depSchema.returnValueSchema,
+          {
+            filePath,
+            dependencyName: depEntityName,
+            schemaType: 'returnValue',
+          },
+        );
+
+        // Infer function types from child component usage BEFORE fillInSchemaGapsAndUnknowns.
+        // When a hook returns a property with type 'unknown' that is passed to a child
+        // component which calls it as a function (e.g., isEntityPending(entity)),
+        // promote it to 'function'. Without this, name heuristics like isLikelyBoolean
+        // would mistype "isEntityPending" as boolean because of the "is" prefix.
+        //
+        // sourceEquivalencies are in isolatedDataStructure.dependencySchemas (not in
+        // mergedDataStructure.dependencySchemas — they're dropped during the merge).
+        // The child's signatureSchema (with function call evidence) IS in the merged schemas.
+        {
+          const isolatedDepSchemas =
+            entity.metadata.isolatedDataStructure?.dependencySchemas;
+          if (isolatedDepSchemas) {
+            for (const childFilePath in isolatedDepSchemas) {
+              const childIsolated = isolatedDepSchemas[childFilePath];
+              for (const childName in childIsolated) {
+                const sourceEq = childIsolated[childName]?.sourceEquivalencies;
+                if (!sourceEq) continue;
+
+                // Get the child's signatureSchema from the MERGED schemas (richer)
+                const mergedChildSchema =
+                  mergedDataStructure.dependencySchemas[childFilePath]?.[
+                    childName
+                  ];
+                const sigSchema = mergedChildSchema?.signatureSchema;
+                if (!sigSchema) continue;
+
+                for (const childPath in sourceEq) {
+                  for (const source of sourceEq[childPath]) {
+                    const fcrvSuffix = '.functionCallReturnValue.';
+                    const fcrvIndex = source.schemaPath.indexOf(fcrvSuffix);
+                    if (fcrvIndex === -1) continue;
+
+                    const propName = source.schemaPath.slice(
+                      fcrvIndex + fcrvSuffix.length,
+                    );
+
+                    // Find the corresponding child signature path
+                    const entityCallPrefix = childName + '().';
+                    const sigPathBase = childPath.startsWith(entityCallPrefix)
+                      ? childPath.slice(entityCallPrefix.length)
+                      : childPath;
+
+                    // Check if the child's signatureSchema has a function call version
+                    let isFunction = false;
+                    for (const sigKey in sigSchema) {
+                      if (
+                        sigKey.startsWith(sigPathBase + '(') &&
+                        sigSchema[sigKey] === 'function'
+                      ) {
+                        isFunction = true;
+                        break;
+                      }
+                    }
+
+                    if (isFunction) {
+                      for (const rvKey in depSchema.returnValueSchema) {
+                        if (
+                          rvKey.endsWith('.' + propName) &&
+                          depSchema.returnValueSchema[rvKey] === 'unknown'
+                        ) {
+                          depSchema.returnValueSchema[rvKey] = 'function';
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        // Fill in type gaps BEFORE clearing attributes, so evidence like .includes()
+        // is used for type inference before being deleted
+
+        depSchema.signatureSchema = fillInDirectSchemaGapsAndUnknowns({
+          schema: depSchema.signatureSchema,
+        });
+
+        depSchema.returnValueSchema = fillInDirectSchemaGapsAndUnknowns({
+          schema: depSchema.returnValueSchema,
+        });
+
+        // Trace clearAttributesFromMapping on dependency schemas
+        transformationTracer.traceSchemaTransform(
+          entity.name,
+          'clearAttributesFromMapping',
+          depSchema.signatureSchema,
+          clearAttributesFromMapping,
+          { filePath, dependencyName: depEntityName, schemaType: 'signature' },
+        );
 
-        clearAttributesFromMapping(depSchema.signatureSchema);
-        clearAttributesFromMapping(depSchema.returnValueSchema);
+        transformationTracer.traceSchemaTransform(
+          entity.name,
+          'clearAttributesFromMapping',
+          depSchema.returnValueSchema,
+          clearAttributesFromMapping,
+          {
+            filePath,
+            dependencyName: depEntityName,
+            schemaType: 'returnValue',
+          },
+        );
       }
     }
 
+    // Transformation tracing: capture after deduplication
+    transformationTracer.snapshot(entity.name, 'deduplicated', {
+      signatureSchema: mergedDataStructure.signatureSchema,
+      returnValueSchema: mergedDataStructure.returnValueSchema,
+      dependencySchemas: mergedDataStructure.dependencySchemas,
+    });
+
     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.
+    // Uses usageEquivalencies to trace data flow and only enrich arrays with fields
+    // from children that actually receive elements from that specific array.
+    transformationTracer.traceDependencySchemaChanges(
+      entity.name,
+      'enrichArrayTypesFromChildSignatures',
+      mergedDataStructure.dependencySchemas,
+      () =>
+        enrichArrayTypesFromChildSignatures(
+          allImportedExports,
+          mergedDataStructure.dependencySchemas,
+          mergedDataStructure.usageEquivalencies,
+        ),
+    );
+
+    // Transformation tracing: capture after array types enriched
+    transformationTracer.snapshot(entity.name, 'arrayTypesEnriched', {
+      signatureSchema: mergedDataStructure.signatureSchema,
+      returnValueSchema: mergedDataStructure.returnValueSchema,
+      dependencySchemas: mergedDataStructure.dependencySchemas,
+    });
+
+    // Enrich mocked dependency unknown types using sourceEquivalencies
+    // When a mocked dependency returns unknown, but that data flows to a child component
+    // with a known type, propagate the type back to the mocked dependency.
+    // This prevents fillInDirectSchemaGapsAndUnknowns from guessing incorrectly
+    // (e.g., 'data' becoming 'number' because pluralize thinks it's plural)
+    transformationTracer.traceDependencySchemaChanges(
+      entity.name,
+      'enrichUnknownTypesFromSourceEquivalencies',
+      mergedDataStructure.dependencySchemas,
+      () =>
+        enrichUnknownTypesFromSourceEquivalencies(
+          isolatedDataStructure.dependencySchemas || {},
+          mergedDataStructure.dependencySchemas,
+          allImportedExports,
+        ),
+    );
+
+    // Transformation tracing: capture after unknown types enriched
+    transformationTracer.snapshot(entity.name, 'unknownTypesEnriched', {
+      signatureSchema: mergedDataStructure.signatureSchema,
+      returnValueSchema: mergedDataStructure.returnValueSchema,
+      dependencySchemas: mergedDataStructure.dependencySchemas,
+    });
+
+    // DISABLED: Testing if ternary fix eliminates the need for this heuristic
+    // Propagate array item schemas between arrays that likely have the same type.
+    // When one array (e.g., entities) has item schema traced but another similar array
+    // (e.g., currentEntities) doesn't (because it's only used in an OR expression fallback),
+    // copy the item schema from the rich array to the empty one.
+    // propagateArrayItemSchemas(mergedDataStructure.dependencySchemas);
+
+    let dataForMocks = gatherDataForMocks(
       allImportedExports,
       mergedDataStructure.dependencySchemas,
+      { entityName: entity.name },
     );
 
-    // DEBUG: Check dataForMocks for GitView
-    if (entity.name === 'GitView') {
-      console.log(
-        '🔍 DEBUG GitView dataForMocks keys:',
-        Object.keys(dataForMocks),
-      );
-      for (const key of Object.keys(dataForMocks)) {
-        if (
-          key.includes('buildBranchFileMap') ||
-          key.includes('fileComparisons') ||
-          key.includes('entityDiff')
-        ) {
-          console.log(
-            '🔍 DEBUG dataForMocks relevant key:',
-            key,
-            '=',
-            JSON.stringify(dataForMocks[key], null, 2),
-          );
+    // Transformation tracing: capture after dataForMocks gathered
+    transformationTracer.snapshot(entity.name, 'dataForMocksGathered', {
+      signatureSchema: mergedDataStructure.signatureSchema,
+      returnValueSchema: mergedDataStructure.returnValueSchema,
+      dependencySchemas: mergedDataStructure.dependencySchemas,
+      dataForMocks,
+    });
+
+    // Merge dataForMocks from non-mocked child analyses to include transitive dependency data.
+    // This handles cases where grandchild trpc calls aren't in allImportedExports because
+    // the grandchild's analysis wasn't in dependentAnalyses.
+    //
+    // Issue 19 fix: The child's dataForMocks already contains merged data from its
+    // dependencies (including grandchildren). By merging the child's dataForMocks,
+    // we transitively include all nested dependency data.
+    for (const filePath in nonMockedDependentAnalyses) {
+      for (const name in nonMockedDependentAnalyses[filePath]) {
+        const childAnalysis = nonMockedDependentAnalyses[filePath][name];
+        const childDataForMocks =
+          childAnalysis?.metadata?.scenariosDataStructure?.dataForMocks;
+        if (childDataForMocks && Object.keys(childDataForMocks).length > 0) {
+          dataForMocks = mergeJsonTypeDefinitions(
+            dataForMocks as Record<string, unknown>,
+            childDataForMocks as Record<string, unknown>,
+          ) as { [importAlias: string]: JsonTypeDefinition };
         }
       }
     }
 
-    // console.info(
-    //   'CODEYAM DEBUG: dataForMocks',
-    //   JSON.stringify(
-    //     {
-    //       filePath: entity.filePath,
-    //       entityName: entity.name,
-    //       dataForMocks,
-    //     },
-    //     null,
-    //     2,
-    //   ),
-    // );
+    const finalizedArgumentsSchema = { ...mergedDataStructure.signatureSchema };
 
-    // Log union types in signatureSchema before processing
-    const unionTypeEntries = Object.entries(
-      mergedDataStructure.signatureSchema,
-    ).filter(
-      ([_, value]) =>
-        typeof value === 'string' &&
-        value.includes("'") &&
-        value.includes(' | '),
+    // Trace fillInDirectSchemaGapsAndUnknowns
+    transformationTracer.traceSchemaTransform(
+      entity.name,
+      'fillInDirectSchemaGapsAndUnknowns',
+      finalizedArgumentsSchema,
+      (schema) => fillInDirectSchemaGapsAndUnknowns({ schema }),
+      { stage: 'finalization' },
     );
-    if (unionTypeEntries.length > 0) {
-      console.log(
-        `[UNION-TYPE] generateDataStructure for ${entity.name}: Found union types in signatureSchema:`,
-      );
-      unionTypeEntries.forEach(([key, value]) => {
-        console.log(`[UNION-TYPE]   "${key}": ${value}`);
-      });
-    }
-
-    const finalizedArgumentsSchema = fillInDirectSchemaGapsAndUnknowns({
-      schema: { ...mergedDataStructure.signatureSchema },
-    });
 
-    clearAttributesFromMapping(finalizedArgumentsSchema);
+    // Trace clearAttributesFromMapping
+    transformationTracer.traceSchemaTransform(
+      entity.name,
+      'clearAttributesFromMapping',
+      finalizedArgumentsSchema,
+      clearAttributesFromMapping,
+      { stage: 'finalization' },
+    );
 
     const argumentsSchema = convertDotNotation(finalizedArgumentsSchema)
       .signature as JsonTypeDefinition[];
@@ -398,6 +888,12 @@ export default function generateDataStructure({
       dataForMocks,
     };
 
+    // Transformation tracing: capture final scenariosDataStructure
+    transformationTracer.snapshot(entity.name, 'finalized', {
+      signatureSchema: finalizedArgumentsSchema,
+      dataForMocks,
+    });
+
     return analysis;
   } catch (e) {
     awsLog('CodeYam Error: Error generating data structure', {