@codeyam/codeyam-cli 0.1.0-staging.6e699e5 → 0.1.0-staging.7481014

package/background/src/lib/virtualized/project/writeScenarioComponents.js

@@ -685,8 +685,17 @@ function addMockToContent(fileContent, importedExport, fileAnalyses, rootAnalysi
                 // e.g., useFetcher() -> useFetcher_reportFetcher()
                 // Escape special regex characters in the call signature
                 const escapedCallSignature = callSignature.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-                // Create regex that matches the call (with optional whitespace variations)
-                const callRegex = new RegExp(escapedCallSignature.replace(/\s+/g, '\\s*'), 'g');
+                // Create regex that matches the call (with optional whitespace variations).
+                // TypeScript formatters commonly break type parameters across lines, e.g.:
+                //   useLoaderData<
+                //     typeof loader
+                //   >()
+                // So we allow optional whitespace around < and > delimiters, not just
+                // where whitespace already exists in the call signature string.
+                const callRegex = new RegExp(escapedCallSignature
+                    .replace(/\s+/g, '\\s*')
+                    .replace(/</g, '\\s*<\\s*')
+                    .replace(/>/g, '\\s*>\\s*'), 'gs');
                 fileContent = fileContent.replace(callRegex, `${mockFunctionName}()`);
             }
         }
@@ -704,15 +713,28 @@ function addMockToContent(fileContent, importedExport, fileAnalyses, rootAnalysi
             // For single variable assignments, use the call signature directly from dataForMocks
             const dataForMocks = rootAnalysis.metadata?.scenariosDataStructure?.dataForMocks;
             // Find matching call signature key in dataForMocks
+            // IMPORTANT: First try exact match with type parameters (e.g., "useLoaderData<LoaderData>()")
+            // to avoid picking the wrong variant (e.g., "useLoaderData<typeof loader>()" which may
+            // have different properties). Fall back to base name matching only if exact match fails.
             const hookBaseName = importedExport.name.split(/[<(]/)[0];
-            const callSignatureKey = dataForMocks
-                ? Object.keys(dataForMocks).find((key) => {
-                    // Split on ., <, or ( to get the true base name
-                    // This handles both "useFlags()" -> "useFlags" and "trpc.useUtils()" -> "trpc"
-                    const keyBaseName = key.split(/[.<(]/)[0];
-                    return keyBaseName === hookBaseName;
-                })
-                : undefined;
+            const expectedKey = importedExport.calls?.[0];
+            let callSignatureKey;
+            if (dataForMocks) {
+                const keys = Object.keys(dataForMocks);
+                // First try exact match with the expected call signature
+                if (expectedKey && keys.includes(expectedKey)) {
+                    callSignatureKey = expectedKey;
+                }
+                else {
+                    // Fall back to base name matching
+                    callSignatureKey = keys.find((key) => {
+                        // Split on ., <, or ( to get the true base name
+                        // This handles both "useFlags()" -> "useFlags" and "trpc.useUtils()" -> "trpc"
+                        const keyBaseName = key.split(/[.<(]/)[0];
+                        return keyBaseName === hookBaseName;
+                    });
+                }
+            }
             // Use the call signature if found, otherwise construct it
             const dataKey = callSignatureKey ??
                 importedExport.calls?.[0] ??
@@ -721,10 +743,15 @@ function addMockToContent(fileContent, importedExport, fileAnalyses, rootAnalysi
             // use the base name (e.g., "trpc") when calling constructMockCode. This ensures
             // constructMockCode generates a complete nested mock from the schema without
             // referencing __cyOriginal variables.
+            // NOTE: Only check for dots BEFORE the first open paren. Function calls with
+            // dotted arguments like "getSurveyWithMetadata(params.surveyId)" have dots
+            // INSIDE parens — these are NOT method chains and should keep the full signature.
             const dataKeyBaseName = dataKey.split(/[.<(]/)[0];
+            const firstParenIndex = dataKey.indexOf('(');
+            const partBeforeFirstParen = firstParenIndex >= 0 ? dataKey.substring(0, firstParenIndex) : dataKey;
             const isMethodChainDataKey = dataKeyBaseName === importedExport.name &&
                 dataKey !== importedExport.name &&
-                dataKey.includes('.');
+                partBeforeFirstParen.includes('.');
             const mockNameToUse = isMethodChainDataKey
                 ? importedExport.name
                 : dataKey;
@@ -741,18 +768,34 @@ function addMockToContent(fileContent, importedExport, fileAnalyses, rootAnalysi
             // IMPORTANT: We inline scenarios().data() inside the function rather than
             // storing in a const - see comment in constructMockCode.ts for why.
             if (!mockCode) {
-                mockCode = `function ${importedExport.name}(...args) {
-  return scenarios().data()?.["${dataKey}"];
+                mockCode = `// PATCHED: memoize to return stable reference (prevents infinite useEffect re-triggers)
+const _${importedExport.name}Ref = {
+  current: null,
+};
+function ${importedExport.name}(...args) {
+  if (!_${importedExport.name}Ref.current) {
+    _${importedExport.name}Ref.current = scenarios().data()?.["${dataKey}"];
+  }
+  return _${importedExport.name}Ref.current;
 }`;
             }
         }
         else {
             // Helper to find matching call signature key from dataForMocks
+            // IMPORTANT: First try exact match with type parameters (e.g., "useLoaderData<LoaderData>()")
+            // to avoid picking the wrong variant. Fall back to base name matching only if needed.
             const hookBaseName = importedExport.name.split(/[<(]/)[0];
+            const expectedKey = importedExport.calls?.[0];
             const findMatchingKey = (dataForMocks) => {
                 if (!dataForMocks)
                     return undefined;
-                return Object.keys(dataForMocks).find((key) => {
+                const keys = Object.keys(dataForMocks);
+                // First try exact match with the expected call signature
+                if (expectedKey && keys.includes(expectedKey)) {
+                    return expectedKey;
+                }
+                // Fall back to base name matching
+                return keys.find((key) => {
                     // Split on ., <, or ( to get the true base name
                     // This handles both "useFlags()" -> "useFlags" and "trpc.useUtils()" -> "trpc"
                     const keyBaseName = key.split(/[.<(]/)[0];
@@ -778,11 +821,18 @@ function addMockToContent(fileContent, importedExport, fileAnalyses, rootAnalysi
             // referencing __cyOriginal variables. The __cyOriginal pattern is only needed
             // for partial mocking where we preserve some original methods, not for complete
             // method-chain mocks where we provide all implementations.
+            // NOTE: Only check for dots BEFORE the first open paren. Function calls with
+            // dotted arguments like "getSurveyWithMetadata(params.surveyId)" have dots
+            // INSIDE parens — these are NOT method chains and should keep the full signature.
             const dataKeyBaseName = dataKey?.split(/[.<(]/)[0];
+            const elseFirstParenIndex = dataKey?.indexOf('(') ?? -1;
+            const elsePartBeforeFirstParen = dataKey && elseFirstParenIndex >= 0
+                ? dataKey.substring(0, elseFirstParenIndex)
+                : dataKey;
             const isMethodChainDataKey = dataKey &&
                 dataKeyBaseName === importedExport.name &&
                 dataKey !== importedExport.name &&
-                dataKey.includes('.');
+                (elsePartBeforeFirstParen?.includes('.') ?? false);
             const mockNameToUse = isMethodChainDataKey
                 ? importedExport.name
                 : (dataKey ?? importedExport.calls?.[0] ?? `${importedExport.name}()`);
@@ -796,8 +846,15 @@ function addMockToContent(fileContent, importedExport, fileAnalyses, rootAnalysi
             // IMPORTANT: We inline scenarios().data() inside the function rather than
             // storing in a const - see comment in constructMockCode.ts for why.
             if (!mockCode && dataKey) {
-                mockCode = `function ${importedExport.name}(...args) {
-  return scenarios().data()?.["${dataKey}"];
+                mockCode = `// PATCHED: memoize to return stable reference (prevents infinite useEffect re-triggers)
+const _${importedExport.name}Ref = {
+  current: null,
+};
+function ${importedExport.name}(...args) {
+  if (!_${importedExport.name}Ref.current) {
+    _${importedExport.name}Ref.current = scenarios().data()?.["${dataKey}"];
+  }
+  return _${importedExport.name}Ref.current;
 }`;
             }
         }
@@ -847,6 +904,14 @@ function addMockToContent(fileContent, importedExport, fileAnalyses, rootAnalysi
             else {
                 fileContent = fileContent.replace(importRegExp, '$1$2');
             }
+            // Also handle namespace imports (import * as foo from '...')
+            // These need to be renamed to foo__cyOriginal when the mock code spreads from the original.
+            // Note: We match any path (not just escapedImportPath) because the import path may have
+            // been rewritten by transitive import handling before this code runs.
+            if (shouldRenameToOriginal) {
+                const namespaceImportRegExp = new RegExp(`(import\\s+\\*\\s+as\\s+)${escapeRegExp(firstPart)}(\\s+from\\s+['"][^'"]*['"])`, 'm');
+                fileContent = fileContent.replace(namespaceImportRegExp, `$1${firstPart}__cyOriginal$2`);
+            }
             // Remove empty imports entirely to avoid partial commenting issues with multiline imports
             // This handles both single-line and multiline empty imports
             fileContent = fileContent.replace(/import\s*\{\s*\}\s*from\s+['"][^'"]*['"];?\s*\n?/g, '');
@@ -1316,6 +1381,12 @@ export default async function writeScenarioComponents({ project, file, entity, r
                             // Strip server-only imports - these break when imported by client components
                             dataFileContent = stripServerOnlyImport(dataFileContent);
                             dataFileContent = applyServerOnlyMocks(dataFileContent);
+                            // Process transitive imports: if the data entity file imports from files
+                            // that have `import "server-only"`, rewrite those imports to transitive
+                            // copies with server-only stripped. Without this, data entity files that
+                            // end up in a client bundle (e.g., via a stripped "use server" boundary)
+                            // would pull in server-only code and cause build failures.
+                            dataFileContent = await processTransitiveImportsRecursively(dataFileContent, fileNotMocked.path, dataScenarioPath);
                             // Write the transformed data entity file
                             await writeFile(dataScenarioPath, dataFileContent);
                             scenarioComponentPaths.push(dataScenarioPath);
@@ -1332,9 +1403,9 @@ export default async function writeScenarioComponents({ project, file, entity, r
                             writtenScenarioComponents[importedExportFilePath] = [];
                         }
                         writtenScenarioComponents[importedExportFilePath].push(importedExport.name);
-                        // Don't recurse - data entities don't need their dependencies processed
-                        // The import rewriting will happen later in this same loop iteration
-                        // (at lines ~1590-1702) to point imports to this transformed file
+                        // Don't recurse into full writeScenarioComponents - data entities don't
+                        // need mock generation for their dependencies. Transitive server-only
+                        // import processing is already handled above via processTransitiveImportsRecursively.
                     }
                     else {
                         // For visual/library entities, recurse to process their dependencies
@@ -1387,13 +1458,22 @@ export default async function writeScenarioComponents({ project, file, entity, r
             // Data and type entities should be preserved - they're not callable and may have methods
             // that stubbing would break (e.g., Zod schemas with .superRefine())
             const isDataEntity = entityType === 'data' || entityType === 'type';
-            // Heuristic: Zod schemas are often misclassified as 'library' but should be preserved
-            // Detect by: name starts with Z + uppercase letter, AND has Zod method calls
-            const looksLikeZodSchema = entityType === 'library' &&
-                /^Z[A-Z]/.test(importedExport.name) &&
-                importedExport.calls?.some((call) => /\.(superRefine|refine|transform|default|optional|nullable|array|object|string|number|boolean|parse|safeParse)\s*\(/.test(call));
-            // Callable entities can be safely stubbed (but not Zod schemas)
-            const isCallable = !isDataEntity && !looksLikeZodSchema && entityType !== undefined;
+            // If calls data shows the entity is only accessed via properties/methods
+            // (e.g., formValidator.validate(), schema.superRefine()) and never directly
+            // invoked (e.g., getInitialProps()), it's used as an object and should be
+            // preserved rather than replaced with a Proxy stub.
+            const onlyPropertyAccessed = importedExport.calls?.length > 0 &&
+                !importedExport.calls.some((call) => {
+                    const afterName = call.slice(importedExport.name.length);
+                    return afterName.startsWith('(') || afterName.startsWith('<');
+                });
+            // Callable entities can be safely stubbed. Entities that are only
+            // property-accessed should be preserved (their methods need to work).
+            // 'other' entities are unknown types — safer to preserve than stub.
+            const isCallable = !isDataEntity &&
+                !onlyPropertyAccessed &&
+                entityType !== undefined &&
+                entityType !== 'other';
             // Determine what action to take
             const shouldStripAndReplace = hasMock;
             const shouldStripAndStub = !hasMock && importedExport.isMocked && isCallable;
@@ -1885,6 +1965,16 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
     for (const importPath of remainingImportPaths) {
         remainingImportIndex++;
         debugLog(`[REMAINING LOOP] import ${remainingImportIndex}/${remainingImportPaths.length}: ${importPath}`);
+        // Skip imports that point to generated CodeYam files (same skip logic as
+        // rewriteRelativeModuleImports). Without this, MockData files from earlier
+        // captures that get discovered by the TypeScript compiler would be treated as
+        // regular imports, creating transitive copies with stale content.
+        const scenarioFilePattern = /[a-f0-9]{64}_\w+_[A-Z]\w*$/;
+        const mockDataPattern = /__codeyamMocks__\//;
+        if (scenarioFilePattern.test(importPath) ||
+            mockDataPattern.test(importPath)) {
+            continue;
+        }
         // Resolve the import path to a project file path
         const resolvedFilePath = resolveImportPath(importPath, file.path, project);
         if (!resolvedFilePath) {
@@ -2047,6 +2137,57 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
 // Entity: ${rootAnalysis.entitySha} ${rootAnalysis.entityName}
 // Scenario: ${scenario.id} - ${scenario.name}
 `;
+    // Final pass: Rename any namespace imports (import * as X from '...') that have
+    // corresponding mock code using ...X__cyOriginal spread pattern.
+    // This handles cases where:
+    // 1. The import path was rewritten by transitive import handling
+    // 2. The import wasn't caught by the earlier renaming logic
+    // We scan for all __cyOriginal references in the mock code and ensure the imports are renamed.
+    const cyOriginalReferences = fileContent.match(/\.\.\.(\w+)__cyOriginal/g);
+    if (cyOriginalReferences) {
+        const uniqueNames = [
+            ...new Set(cyOriginalReferences.map((ref) => ref.replace('...', '').replace('__cyOriginal', ''))),
+        ];
+        for (const name of uniqueNames) {
+            // Match namespace imports for this name that haven't been renamed yet
+            const namespaceImportRegex = new RegExp(`(import\\s+\\*\\s+as\\s+)${escapeRegExp(name)}(\\s+from\\s+['"][^'"]*['"])`, 'g');
+            fileContent = fileContent.replace(namespaceImportRegex, `$1${name}__cyOriginal$2`);
+        }
+    }
+    // For route components (page.tsx, layout.tsx), the component IS the Next.js page.
+    // There's no wrapper page to inject argumentsData as props (unlike non-route components
+    // which get a scenarioComponent wrapper). We need to wrap the default export so that
+    // the scenario's argumentsData is passed as props to the component.
+    if (isFrameworkRoute(file, entity, framework, file === rootFile) &&
+        rootAnalysis.metadata?.scenariosDataStructure?.arguments?.length > 0) {
+        const positionalArguments = rootAnalysis.metadata.scenariosDataStructure.arguments;
+        const hasNamedArgs = positionalArguments.length === 1 &&
+            typeof positionalArguments[0] === 'object';
+        if (hasNamedArgs) {
+            // Match: export default function Name(
+            // Also: export default async function Name(
+            const defaultExportMatch = fileContent.match(/export\s+default\s+(async\s+)?function\s+(\w+)\s*\(/);
+            if (defaultExportMatch) {
+                const funcName = defaultExportMatch[2];
+                // Remove "export default" from the original function declaration
+                fileContent = fileContent.replace(/export\s+default\s+(async\s+)?function\s+(\w+)\s*\(/, '$1function $2(');
+                // Ensure scenarios import is present
+                const mockDataPath = `${relativeMocksDir}/MockData_${safeFileName(scenario.name)}`;
+                if (fileContent.indexOf('import { scenarios } from') === -1) {
+                    fileContent = `import { scenarios } from "${mockDataPath}";\n\n${fileContent}`;
+                }
+                // Add wrapper default export that injects argumentsData as props.
+                // Filter null values: the LLM uses null to mean "don't pass this prop"
+                // but spreading { prop: null } explicitly passes null, which differs from
+                // undefined (absent) and crashes components that check `prop !== undefined`.
+                fileContent += `\n\nexport default function _CYRouteWrapper(props: any) {
+  const _cyArgs = scenarios().data()?.['arguments']?.[0] ?? {};
+  const _cyCleanArgs = Object.fromEntries(Object.entries(_cyArgs).filter(([_, v]) => v !== null));
+  return <${funcName} {...props} {..._cyCleanArgs} />;
+}\n`;
+            }
+        }
+    }
     // Use the directive that was extracted at the beginning of processing
     // This ensures it stays at the very top even after imports are prepended
     // NOTE: We only preserve "use client" directives, NOT "use server" directives.