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

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

@@ -49,91 +49,202 @@ function preprocessSchemaForMocks(schema) {
     }
     return result;
 }
-export default function gatherDataForMocks(importedExports, dependencySchemas) {
-    return importedExports.reduce((acc, importedExport) => {
-        if (!importedExport.isMocked)
-            return acc;
-        const functionNames = [];
-        const isFunctionNameWithoutFunction = (path, functionName) => {
-            // Check if path starts with functionName but isn't a function call
-            // Must also handle generics: useLoaderData<typeof loader>() should NOT
-            // be filtered when functionName is 'useLoaderData'
-            return (path.startsWith(functionName) &&
-                !path.startsWith(functionName + '(') &&
-                !path.startsWith(functionName + '.(') &&
-                !path.startsWith(functionName + '<') // Handle generics
-            );
-        };
-        const rawSchema = dependencySchemas?.[importedExport.filePath]?.[importedExport.name]
-            ?.returnValueSchema ?? {};
-        // Preprocess to filter signatures and extract functionCallReturnValue
-        let preprocessedSchema = preprocessSchemaForMocks(rawSchema);
-        // Merge non-generic variants into generic variants
-        // e.g., if callName is "useFetcher<T>()", also include paths from "useFetcher()"
-        const callName = importedExport.calls?.[0] ?? importedExport.name;
-        if (callName.includes('<') && callName.includes('(')) {
-            // Extract the base function name without generics
-            const baseFunctionName = cleanFunctionName(callName.split('(')[0]);
-            const nonGenericCall = baseFunctionName + '()';
-            const genericCallPrefix = callName.endsWith(')')
+/**
+ * Processes a single call (with optional variable name) and returns the mock data entry.
+ * Returns null if no valid schema is found.
+ *
+ * @param importedExport - The imported export to process
+ * @param dependencySchemas - The dependency schemas
+ * @param callIndex - The index of the call to process
+ * @param variableNameOccurrence - When a variable name is reused, this is the occurrence index
+ *                                  (e.g., first 'data' = 0, second 'data' = 1)
+ *                                  Used to disambiguate keys when the same variable is reused.
+ */
+function processCall(importedExport, dependencySchemas, callIndex, variableNameOccurrence) {
+    const callName = importedExport.calls?.[callIndex] ?? importedExport.name;
+    const variableName = importedExport.callVariableNames?.[callIndex];
+    // Build the schema lookup key - use variable-qualified key if available
+    const schemaLookupKey = variableName
+        ? `${importedExport.name}::${variableName}`
+        : importedExport.name;
+    const rawSchema = dependencySchemas?.[importedExport.filePath]?.[schemaLookupKey]
+        ?.returnValueSchema ?? {};
+    // If no schema found with variable-qualified key, fall back to base name
+    const fallbackSchema = Object.keys(rawSchema).length === 0
+        ? (dependencySchemas?.[importedExport.filePath]?.[importedExport.name]
+            ?.returnValueSchema ?? {})
+        : rawSchema;
+    // Preprocess to filter signatures and extract functionCallReturnValue
+    let preprocessedSchema = preprocessSchemaForMocks(fallbackSchema);
+    const functionNames = [];
+    const isFunctionNameWithoutFunction = (path, functionName) => {
+        // Check if path starts with functionName but isn't a function call
+        // Must also handle generics: useLoaderData<typeof loader>() should NOT
+        // be filtered when functionName is 'useLoaderData'
+        return (path.startsWith(functionName) &&
+            !path.startsWith(functionName + '(') &&
+            !path.startsWith(functionName + '.(') &&
+            !path.startsWith(functionName + '<') // Handle generics
+        );
+    };
+    // For variable-qualified schemas, the paths also include the variable qualifier
+    // e.g., "useFetcher()::entityDiffFetcher.functionCallReturnValue.data"
+    // We need to handle both qualified and non-qualified paths
+    // Merge non-generic variants into generic variants
+    // e.g., if callName is "useFetcher<T>()", also include paths from "useFetcher()"
+    if (callName.includes('<') && callName.includes('(')) {
+        // Extract the base function name without generics
+        const baseFunctionName = cleanFunctionName(callName.split('(')[0]);
+        const nonGenericCall = variableName
+            ? `${baseFunctionName}()::${variableName}`
+            : baseFunctionName + '()';
+        const genericCallPrefix = variableName
+            ? `${callName.endsWith(')') ? callName : callName + '()'}::${variableName}`
+            : callName.endsWith(')')
                 ? callName
                 : callName + '()';
-            // If we have a generic call, merge paths from non-generic variant
-            const mergedSchema = { ...preprocessedSchema };
+        // If we have a generic call, merge paths from non-generic variant
+        const mergedSchema = { ...preprocessedSchema };
+        for (const path of Object.keys(preprocessedSchema)) {
+            if (path.startsWith(nonGenericCall)) {
+                // Create corresponding generic path
+                const genericPath = genericCallPrefix + path.slice(nonGenericCall.length);
+                // Only add if the generic path doesn't already exist
+                if (!mergedSchema[genericPath]) {
+                    mergedSchema[genericPath] = preprocessedSchema[path];
+                }
+            }
+        }
+        preprocessedSchema = mergedSchema;
+    }
+    // Merge generic call (e.g., "foo()") data into specific argument calls (e.g., "foo(arg1, arg2)")
+    // This handles the case where the generic schema has richer nested data than the specific call
+    if (callName.includes('(') && !callName.includes('<')) {
+        // Extract the base function name and create generic call
+        const baseFunctionName = callName.split('(')[0];
+        // For path matching, use non-qualified call names since schema paths don't include
+        // variable qualifiers. Variable qualifiers are only for schema lookup, not path matching.
+        const genericCallForMatching = baseFunctionName + '()';
+        const specificCallForMatching = callName;
+        // Only merge if the callName has arguments (not just empty parens)
+        if (specificCallForMatching !== genericCallForMatching) {
+            const mergedSchema = {
+                ...preprocessedSchema,
+            };
             for (const path of Object.keys(preprocessedSchema)) {
-                if (path.startsWith(nonGenericCall)) {
-                    // Create corresponding generic path
-                    const genericPath = genericCallPrefix + path.slice(nonGenericCall.length);
-                    // Only add if the generic path doesn't already exist
-                    if (!mergedSchema[genericPath]) {
-                        mergedSchema[genericPath] = preprocessedSchema[path];
+                if (path.startsWith(genericCallForMatching)) {
+                    // Create corresponding specific path
+                    const specificPath = specificCallForMatching + path.slice(genericCallForMatching.length);
+                    // Add if the specific path doesn't exist, OR if it exists but is "unknown"
+                    // The generic call's schema often has more precise type info than the specific call
+                    if (!mergedSchema[specificPath] ||
+                        mergedSchema[specificPath] === 'unknown') {
+                        mergedSchema[specificPath] = preprocessedSchema[path];
                     }
                 }
             }
             preprocessedSchema = mergedSchema;
         }
-        const relevantMergedDependencySchema = Object.keys(preprocessedSchema).reduce((acc, path) => {
-            if (path.endsWith(')')) {
-                const pathParts = splitOutsideParenthesesAndArrays(path);
-                const functionName = joinParenthesesAndArrays([
-                    ...pathParts.slice(0, -1),
-                    pathParts[pathParts.length - 1].split('(')[0],
-                ]);
-                functionNames.push(functionName);
-                for (const existingPath in acc) {
-                    if (isFunctionNameWithoutFunction(existingPath, functionName)) {
-                        delete acc[existingPath];
-                    }
+    }
+    const relevantMergedDependencySchema = Object.keys(preprocessedSchema).reduce((acc, path) => {
+        if (path.endsWith(')')) {
+            const pathParts = splitOutsideParenthesesAndArrays(path);
+            const functionName = joinParenthesesAndArrays([
+                ...pathParts.slice(0, -1),
+                pathParts[pathParts.length - 1].split('(')[0],
+            ]);
+            functionNames.push(functionName);
+            for (const existingPath in acc) {
+                if (isFunctionNameWithoutFunction(existingPath, functionName)) {
+                    delete acc[existingPath];
                 }
             }
-            if (functionNames.some((fn) => isFunctionNameWithoutFunction(path, fn))) {
-                return acc;
-            }
-            acc[path] = preprocessedSchema[path];
+        }
+        if (functionNames.some((fn) => isFunctionNameWithoutFunction(path, fn))) {
             return acc;
-        }, {});
-        const schema = convertDotNotation(fillInDirectSchemaGapsAndUnknowns({
-            scopeName: importedExport.name,
-            schema: relevantMergedDependencySchema,
-        }));
-        // Determine if this is an object-style or hook-style dependency:
-        // - Hook-style: calls = ['useAuth()'] - call starts with name + '('
-        // - Object-style: calls = ['supabase.from(...)'] - call starts with name + '.'
-        //
-        // After convertDotNotation:
-        // - Hook-style schema has the callName as top-level key: schema['useAuth()']
-        // - Object-style schema has the import name as top-level key: schema['supabase']
-        // Note: callName is already defined above for generic/non-generic merging
-        const isObjectStyle = callName.startsWith(importedExport.name + '.') ||
-            (!callName.includes('(') && callName === importedExport.name);
-        const schemaKey = isObjectStyle ? importedExport.name : callName;
-        const outputKey = isObjectStyle ? importedExport.name : callName;
-        const returnValue = schema[schemaKey] ?? schema['returnValue'];
-        if (!returnValue) {
+        }
+        acc[path] = preprocessedSchema[path];
+        return acc;
+    }, {});
+    const schema = convertDotNotation(fillInDirectSchemaGapsAndUnknowns({
+        scopeName: importedExport.name,
+        schema: relevantMergedDependencySchema,
+    }));
+    // Determine if this is an object-style or hook-style dependency:
+    // - Hook-style: calls = ['useAuth()'] - call starts with name + '('
+    // - Object-style: calls = ['supabase.from(...)'] - call starts with name + '.'
+    const isObjectStyle = callName.startsWith(importedExport.name + '.') ||
+        (!callName.includes('(') && callName === importedExport.name);
+    // Build schema key with variable qualifier if present
+    const baseSchemaKey = isObjectStyle ? importedExport.name : callName;
+    const schemaKey = variableName
+        ? `${baseSchemaKey}::${variableName}`
+        : baseSchemaKey;
+    // Build output key - for variable-qualified, use "variableName <- functionName" format
+    // This reads naturally as "variableName receives from functionName"
+    // When a variable name is reused (variableNameOccurrence > 0), disambiguate with index
+    let outputKey;
+    if (variableName) {
+        // When the same variable name is used multiple times, append the occurrence index
+        // to create unique keys: "data[0] <- useFetch", "data[1] <- useFetch"
+        const disambiguator = variableNameOccurrence !== undefined && variableNameOccurrence > 0
+            ? `[${variableNameOccurrence}]`
+            : '';
+        outputKey = `${variableName}${disambiguator} <- ${importedExport.name}`;
+    }
+    else if (isObjectStyle) {
+        outputKey = importedExport.name;
+    }
+    else {
+        outputKey = callName;
+    }
+    // Try to find return value - check with variable qualifier first, then without
+    let returnValue = schema[schemaKey];
+    if (!returnValue && variableName) {
+        returnValue = schema[baseSchemaKey];
+    }
+    if (!returnValue) {
+        returnValue = schema['returnValue'];
+    }
+    if (!returnValue) {
+        return null;
+    }
+    return { key: outputKey, value: returnValue };
+}
+export default function gatherDataForMocks(importedExports, dependencySchemas) {
+    const result = importedExports.reduce((acc, importedExport) => {
+        if (!importedExport.isMocked)
             return acc;
+        // Check if we have multiple calls with variable names
+        const hasMultipleCalls = importedExport.calls &&
+            importedExport.calls.length > 1 &&
+            importedExport.callVariableNames &&
+            importedExport.callVariableNames.length === importedExport.calls.length;
+        if (hasMultipleCalls) {
+            // Track how many times each variable name has been seen
+            // to disambiguate keys when the same variable is reused
+            const variableNameCounts = {};
+            // Process each call separately with its variable name
+            for (let i = 0; i < importedExport.calls.length; i++) {
+                const varName = importedExport.callVariableNames[i];
+                // Calculate the occurrence index for this variable name
+                const occurrence = variableNameCounts[varName] ?? 0;
+                variableNameCounts[varName] = occurrence + 1;
+                const processResult = processCall(importedExport, dependencySchemas, i, occurrence);
+                if (processResult) {
+                    acc[processResult.key] = processResult.value;
+                }
+            }
+        }
+        else {
+            // Original behavior for single calls or calls without variable names
+            const processResult = processCall(importedExport, dependencySchemas, 0);
+            if (processResult) {
+                acc[processResult.key] = processResult.value;
+            }
         }
-        acc[outputKey] = returnValue;
         return acc;
     }, {});
+    return result;
 }
 //# sourceMappingURL=gatherDataForMocks.js.map

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

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

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

@@ -2,6 +2,7 @@ import { convertDotNotation, fillInDirectSchemaGapsAndUnknowns, deduplicateFunct
 import mergeInDependentDataStructure from "./mergeInDependentDataStructure.js";
 import { awsLog } from "../../../../../../packages/utils/index.js";
 import gatherDataForMocks from "./gatherDataForMocks.js";
+import enrichArrayTypesFromChildSignatures from "./enrichArrayTypesFromChildSignatures.js";
 export default function generateDataStructure({ entity, dependentAnalyses, analysis, }) {
     try {
         if (!['visual', 'library'].includes(entity.entityType))
@@ -9,12 +10,6 @@ export default function generateDataStructure({ entity, dependentAnalyses, analy
         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 = [
             ...(entity.metadata.importedExports ?? []),
@@ -23,6 +18,45 @@ export default function generateDataStructure({ entity, dependentAnalyses, analy
                 ...imported,
             }))),
         ];
+        // 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 = allImportedExports.reduce((acc, importedExport) => {
             var _a;
             if (importedExport.isMocked)
@@ -75,6 +109,160 @@ export default function generateDataStructure({ entity, dependentAnalyses, analy
                 relevantDependencyAnalysis;
             return acc;
         }, {});
+        // 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.
+        // Helper function to add mocked imports from an entity to allImportedExports
+        const addMockedImportsFromEntity = (childEntity) => {
+            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();
+        const traverseDependencyTree = (analyses) => {
+            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);
+                    // Recursively process this child's non-mocked children
+                    // via their mergedDataStructure's nested dependentAnalyses
+                    const childMergedDataStructure = childAnalysis?.metadata?.mergedDataStructure;
+                    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 = {};
+                        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] = {});
+                                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(
@@ -141,6 +329,10 @@ export default function generateDataStructure({ entity, dependentAnalyses, analy
         }
         analysis.metadata || (analysis.metadata = {});
         analysis.metadata.mergedDataStructure = mergedDataStructure;
+        // 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);
         const dataForMocks = gatherDataForMocks(allImportedExports, mergedDataStructure.dependencySchemas);
         // console.info(
         //   'CODEYAM DEBUG: dataForMocks',
@@ -154,6 +346,16 @@ export default function generateDataStructure({ entity, dependentAnalyses, analy
         //     2,
         //   ),
         // );
+        // Log union types in signatureSchema before processing
+        const unionTypeEntries = Object.entries(mergedDataStructure.signatureSchema).filter(([_, value]) => typeof value === 'string' &&
+            value.includes("'") &&
+            value.includes(' | '));
+        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 },
         });

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

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

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

@@ -43,9 +43,10 @@ export default async function generateKeyAttributes({ entity, analysis, dependen
     if (!analysis.metadata.keyAttributes) {
         const { result: { keyAttributes, llmCall: keyAttributesLLMCall }, } = await measureAndReportExecutionTime(() => generateEntityKeyAttributes({
             entity,
+            mergedDataStructure: analysis.metadata.mergedDataStructure,
             model,
         }), `Generating entity key attributes`, updateProgress);
-        const relevantDependentKeyAttributes = gatherRelevantDependentKeyAttributes(entity, dependentAnalyses);
+        const relevantDependentKeyAttributes = gatherRelevantDependentKeyAttributes(entity, analysis.metadata.mergedDataStructure, dependentAnalyses);
         analysis.metadata.keyAttributes = [
             ...keyAttributes,
             ...relevantDependentKeyAttributes.map((ka) => ({
@@ -53,6 +54,10 @@ export default async function generateKeyAttributes({ entity, analysis, dependen
                 // 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 })),
+                }),
             })),
         ].filter((ka, index, self) => self.findIndex((k) => k.internalPath === ka.internalPath) === index);
         if (keyAttributesLLMCall) {