@codeyam/codeyam-cli 0.1.0-staging.1 → 0.1.0-staging.596f0eb

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

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

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

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

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

@@ -49,90 +49,200 @@ 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) {
+    return 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 result = processCall(importedExport, dependencySchemas, i, occurrence);
+                if (result) {
+                    acc[result.key] = result.value;
+                }
+            }
+        }
+        else {
+            // Original behavior for single calls or calls without variable names
+            const result = processCall(importedExport, dependencySchemas, 0);
+            if (result) {
+                acc[result.key] = result.value;
+            }
         }
-        acc[outputKey] = returnValue;
         return acc;
     }, {});
 }

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

@@ -9,12 +9,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,11 +17,85 @@ 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)
                 return acc;
-            const relevantDependencyAnalysis = dependentAnalyses[importedExport.filePath]?.[importedExport.name];
+            // Use resolvedFilePath when available (for re-exports from index files)
+            // to find the actual analysis of the component
+            const lookupPath = ('resolvedFilePath' in importedExport &&
+                importedExport.resolvedFilePath) ||
+                importedExport.filePath;
+            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',
@@ -99,6 +167,22 @@ export default function generateDataStructure({ entity, dependentAnalyses, analy
             },
             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 || [];
         // console.info(
@@ -137,6 +221,17 @@ export default function generateDataStructure({ entity, dependentAnalyses, analy
         analysis.metadata || (analysis.metadata = {});
         analysis.metadata.mergedDataStructure = mergedDataStructure;
         const dataForMocks = gatherDataForMocks(allImportedExports, mergedDataStructure.dependencySchemas);
+        // 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));
+                }
+            }
+        }
         // console.info(
         //   'CODEYAM DEBUG: dataForMocks',
         //   JSON.stringify(
@@ -149,6 +244,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 },
         });