@codeyam/codeyam-cli 0.1.0-staging.483fdc2 → 0.1.0-staging.57cd50f

package/analyzer-template/project/writeMockDataTsx.ts

@@ -8,6 +8,7 @@ import type { AnyNode } from 'domhandler';
 import { safeFileName } from '~codeyam/utils';
 import { cleanOutBoundary } from '~codeyam/ai';
 import { reconcileMockDataKeys } from './reconcileMockDataKeys';
+import coerceObjectsToPrimitivesBySchema from '~codeyam/ai/src/lib/dataStructure/helpers/coerceObjectsToPrimitivesBySchema';
 
 /**
  * Normalize useParams mock data by fixing the React Router splat param (*).
@@ -192,6 +193,36 @@ const safeString = (s: string, level: number) => {
   return s?.replace ? s.replace(/"/g, "'").replace(/\n/g, '\\n') : s;
 };
 
+/**
+ * Clean up malformed LLM-generated function values.
+ * The LLM sometimes generates function values with an invalid "(function)" prefix like:
+ * - "(function)() => {}"
+ * - "(function)(event) => {}"
+ * - "(function)(id) => {}"
+ *
+ * This strips the prefix and adds TypeScript `any` type annotations to parameters.
+ * Returns null if the value doesn't match the malformed pattern.
+ */
+const cleanMalformedFunctionValue = (value: string): string | null => {
+  // Match "(function)" followed by optional params in parens, then "=>"
+  const match = value.match(/^\(function\)(\([^)]*\))\s*=>\s*(.*)$/);
+  if (!match) return null;
+
+  const [, paramsWithParens, body] = match;
+
+  // Extract parameter names and add `: any` type annotation
+  // e.g., "(event)" -> "(event: any)", "()" -> "()"
+  const params = paramsWithParens.slice(1, -1).trim(); // Remove outer parens
+  const typedParams = params
+    ? params
+        .split(',')
+        .map((p) => `${p.trim()}: any`)
+        .join(', ')
+    : '';
+
+  return `(${typedParams}) => ${body}`;
+};
+
 /**
  * Check if a mock key's schema indicates it should be instantiated as a Map.
  * A Map is indicated by:
@@ -310,6 +341,38 @@ function extractAllKeys(obj: JsonTypeDefinition | undefined): string[] {
  */
 const BARE_TYPE_MARKERS = ['function', 'async-function'];
 
+/**
+ * Check if a string is a TypeScript arrow function type annotation rather than
+ * a valid JavaScript arrow function expression.
+ *
+ * TypeScript arrow types look like function expressions (they contain '=>') but
+ * their "body" is a type name, not a JS expression:
+ * - "() => void"
+ * - "(event: MouseEvent) => void"
+ * - "() => string"
+ * - "() => Promise<void>"
+ * - "(id: string, name: string) => boolean"
+ *
+ * Valid JS arrow functions have actual expression bodies:
+ * - "() => {}"
+ * - "() => 'hello'"
+ * - "(x) => x + 1"
+ * - "() => { console.log('hi'); }"
+ */
+const ARROW_TYPE_RETURN_TYPES =
+  /^(void|string|number|boolean|any|unknown|never|null|undefined|object|Date|Promise<\w+>)$/i;
+
+const isArrowFunctionTypeAnnotation = (value: string): boolean => {
+  const arrowIndex = value.indexOf('=>');
+  if (arrowIndex === -1) return false;
+
+  const body = value.slice(arrowIndex + 2).trim();
+
+  // A real JS function would have {}, an expression, a string literal, etc.
+  // A type annotation has a bare type keyword as the "body".
+  return ARROW_TYPE_RETURN_TYPES.test(body);
+};
+
 /**
  * Check if a value is a bare function type marker that should be filtered out.
  * These markers indicate the LLM detected a function but couldn't generate meaningful mock data.
@@ -811,22 +874,49 @@ const jsonToCode = (
                 `CodeYam: Nested func transform (string->function): "${key}" -> "${funcName}": () => {}`,
               );
             } else if (looksLikeFunction) {
-              // Handle newlines in function expressions:
-              // - Newlines inside string literals must be escaped to avoid
-              //   "unterminated string literal" errors
-              // - Structural newlines (between statements) should be kept as-is
-              //   to produce valid multi-line JavaScript
-              //
-              // We escape ONLY newlines that appear inside string literals (single,
-              // double, or template quotes). Structural newlines are preserved.
-              if (hasNewlines) {
-                outputValue = escapeNewlinesInStringLiterals(stringValue);
+              // Check for "[native code]" in function body — this is what
+              // Function.prototype.toString() returns for built-in functions.
+              // The LLM sometimes generates "function () { [native code] }" which
+              // is not valid JavaScript (the "[" is parsed as array destructuring).
+              if (stringValue.includes('[native code]')) {
+                outputValue = '() => {}';
+                console.log(
+                  `CodeYam: Nested func transform (native-code->noop): "${key}" -> "${funcName}": () => {}`,
+                );
+              } else if (cleanMalformedFunctionValue(stringValue)) {
+                // Check for malformed LLM-generated function values like "(function)() => {}"
+                // These have an invalid "(function)" prefix that must be stripped
+                outputValue = cleanMalformedFunctionValue(stringValue)!;
+                console.log(
+                  `CodeYam: Nested func transform (malformed->clean): "${key}" -> "${funcName}": ${outputValue}`,
+                );
+              } else if (isArrowFunctionTypeAnnotation(stringValue)) {
+                // TypeScript arrow function type annotations like "() => void",
+                // "(event: MouseEvent) => void", "() => Promise<void>" contain '=>'
+                // so they pass the looksLikeFunction check, but they are TYPE syntax,
+                // not valid JavaScript expressions. Convert to a no-op function.
+                outputValue = '() => {}';
+                console.log(
+                  `CodeYam: Nested func transform (type-annotation->function): "${key}" -> "${funcName}": () => {}`,
+                );
               } else {
-                outputValue = stringValue;
+                // Handle newlines in function expressions:
+                // - Newlines inside string literals must be escaped to avoid
+                //   "unterminated string literal" errors
+                // - Structural newlines (between statements) should be kept as-is
+                //   to produce valid multi-line JavaScript
+                //
+                // We escape ONLY newlines that appear inside string literals (single,
+                // double, or template quotes). Structural newlines are preserved.
+                if (hasNewlines) {
+                  outputValue = escapeNewlinesInStringLiterals(stringValue);
+                } else {
+                  outputValue = stringValue;
+                }
+                console.log(
+                  `CodeYam: Nested func transform (string): "${key}" -> "${funcName}": ${stringValue.substring(0, 30)}...`,
+                );
               }
-              console.log(
-                `CodeYam: Nested func transform (string): "${key}" -> "${funcName}": ${stringValue.substring(0, 30)}...`,
-              );
             } else {
               // Plain string value - must be quoted
               outputValue = `"${safeString(stringValue, level)}"`;
@@ -854,9 +944,22 @@ const jsonToCode = (
             if (isBareTypeMarker(stringValue)) {
               continue;
             }
-            keyStrings.push(
-              `${levelSpacing}"${safeString(key, level)}": "${safeString(stringValue, level)}"`,
-            );
+            // Check for malformed LLM-generated function values like "(function)(id) => {}"
+            // These can appear on plain keys (e.g., "closeToast") and need to be output as
+            // actual functions, not quoted strings
+            const cleanedPlainKeyFn = cleanMalformedFunctionValue(stringValue);
+            if (cleanedPlainKeyFn) {
+              keyStrings.push(
+                `${levelSpacing}"${safeString(key, level)}": ${cleanedPlainKeyFn}`,
+              );
+              console.log(
+                `CodeYam: Plain key func transform (malformed->clean): "${key}": ${cleanedPlainKeyFn}`,
+              );
+            } else {
+              keyStrings.push(
+                `${levelSpacing}"${safeString(key, level)}": "${safeString(stringValue, level)}"`,
+              );
+            }
           }
         } else {
           // Skip plain keys that have function-call versions (at the same nesting level where
@@ -927,6 +1030,14 @@ export default async function writeMockDataTsx(
     expectedKeys,
   );
 
+  // Coerce objects/arrays to primitives when the schema expects a primitive type.
+  // Defense-in-depth: the generation pipeline already runs this coercion, but
+  // data in the DB may have wrong types from older code versions or edge cases.
+  // This prevents runtime errors like "TypeError: body.match is not a function".
+  if (dataForMocks) {
+    coerceObjectsToPrimitivesBySchema(reconciledMockData, dataForMocks);
+  }
+
   // Convert comma-separated strings to arrays for fields that should be arrays
   // This handles cases where LLM generates "color,size" instead of ["color", "size"]
   const defaultMockData =
@@ -974,6 +1085,14 @@ import React from 'react';
       expectedKeys,
     );
 
+    // Coerce objects/arrays to primitives for non-default scenario data too
+    if (dataForMocks) {
+      coerceObjectsToPrimitivesBySchema(
+        reconciledScenarioMockData,
+        dataForMocks,
+      );
+    }
+
     // Convert comma-separated strings to arrays for scenario data
     const scenarioMockData = convertCommaSeparatedStringsToArrays(
       reconciledScenarioMockData,

package/analyzer-template/project/writeScenarioComponents.ts

@@ -987,10 +987,19 @@ function addMockToContent(
           /[.*+?^${}()|[\]\\]/g,
           '\\$&',
         );
-        // Create regex that matches the call (with optional whitespace variations)
+        // 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*'),
-          'g',
+          escapedCallSignature
+            .replace(/\s+/g, '\\s*')
+            .replace(/</g, '\\s*<\\s*')
+            .replace(/>/g, '\\s*>\\s*'),
+          'gs',
         );
         fileContent = fileContent.replace(callRegex, `${mockFunctionName}()`);
       }
@@ -1012,15 +1021,29 @@ function addMockToContent(
         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) => {
+      const expectedKey = importedExport.calls?.[0];
+      let callSignatureKey: string | undefined;
+
+      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;
-          })
-        : undefined;
+          });
+        }
+      }
 
       // Use the call signature if found, otherwise construct it
       const dataKey =
@@ -1032,11 +1055,17 @@ function addMockToContent(
       // 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;
@@ -1061,18 +1090,36 @@ function addMockToContent(
       // 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: Record<string, unknown> | undefined,
       ): string | undefined => {
         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];
@@ -1104,12 +1151,20 @@ function addMockToContent(
       // 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}()`);
@@ -1131,8 +1186,15 @@ function addMockToContent(
       // 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;
 }`;
       }
     }
@@ -1872,6 +1934,17 @@ export default async function writeScenarioComponents({
               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);
@@ -1897,9 +1970,9 @@ export default async function writeScenarioComponents({
               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
 
@@ -1972,20 +2045,25 @@ export default async function writeScenarioComponents({
       // 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: string) =>
-          /\.(superRefine|refine|transform|default|optional|nullable|array|object|string|number|boolean|parse|safeParse)\s*\(/.test(
-            call,
-          ),
-        );
+      // 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: string) => {
+          const afterName = call.slice(importedExport.name.length);
+          return afterName.startsWith('(') || afterName.startsWith('<');
+        });
 
-      // Callable entities can be safely stubbed (but not Zod schemas)
+      // 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 && !looksLikeZodSchema && entityType !== undefined;
+        !isDataEntity &&
+        !onlyPropertyAccessed &&
+        entityType !== undefined &&
+        entityType !== 'other';
 
       // Determine what action to take
       const shouldStripAndReplace = hasMock;
@@ -2685,6 +2763,20 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
     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);
 
@@ -2959,6 +3051,55 @@ ${exportKeyword}const ${functionName} = new Proxy(() => scenarios().data()?.["${
     }
   }
 
+  // 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.

package/analyzer-template/project/writeSimpleRoot.ts

@@ -277,16 +277,17 @@ export default async function writeSimpleRoot(
               let mockKey: string | undefined;
 
               if (matchingKeys.length > 1) {
-                // Parse root.tsx to find how this hook is used
-                // Look for patterns like: const { prop1, prop2 } = useLoaderData()
-                // or: const result = useLoaderData()
+                // Parse root.tsx to find how this hook is used, INCLUDING type parameters
+                // Look for patterns like: const { prop1, prop2 } = useLoaderData<LoaderData>()
+                // or: const result = useLoaderData<typeof loader>()
                 const hookUsageRegex = new RegExp(
-                  `(?:const|let|var)\\s+(?:\\{([^}]+)\\}|([a-zA-Z_][a-zA-Z0-9_]*))\\s*=\\s*${entityName}(?:<[^>]*>)?\\s*\\(`,
+                  `(?:const|let|var)\\s+(?:\\{([^}]+)\\}|([a-zA-Z_][a-zA-Z0-9_]*))\\s*=\\s*${entityName}(<[^>]+>)?\\s*\\(`,
                   'g',
                 );
 
                 const matches = [...newContent.matchAll(hookUsageRegex)];
                 const rootPropertyNames: string[] = [];
+                const typeParamsUsed: Set<string> = new Set();
 
                 for (const match of matches) {
                   if (match[1]) {
@@ -300,17 +301,26 @@ export default async function writeSimpleRoot(
                     // Simple assignment: const result = ...
                     rootPropertyNames.push(match[2]);
                   }
+                  // Capture type parameters used (e.g., "<LoaderData>", "<typeof loader>")
+                  if (match[3]) {
+                    typeParamsUsed.add(match[3]);
+                  }
                 }
 
-                // Find a key that matches by call signature
-                // For call signature format (e.g., "useLoaderData()"), just use the first match
-                mockKey = matchingKeys[0];
+                // First, try to find a key that matches the exact type parameters used in the source
+                // e.g., if source has useLoaderData<LoaderData>(), prefer "useLoaderData<LoaderData>()" key
+                if (typeParamsUsed.size > 0) {
+                  for (const typeParam of typeParamsUsed) {
+                    const exactKey = `${entityName}${typeParam}()`;
+                    if (matchingKeys.includes(exactKey)) {
+                      mockKey = exactKey;
+                      break;
+                    }
+                  }
+                }
 
-                // Fallback: if no match found but there are multiple keys,
-                // exclude the route's key (which we can identify from mockedImports variable names)
+                // Fallback: if no exact type parameter match, use the first match
                 if (!mockKey) {
-                  // The route's variable names would be in its own analysis
-                  // For simplicity, just use the first key that's different from the most common pattern
                   mockKey = matchingKeys[0];
                 }
               } else if (matchingKeys.length === 1) {

package/analyzer-template/tsconfig.json

@@ -15,6 +15,18 @@
       "~codeyam/*": ["./packages/*"]
     },
     "sourceMap": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "types": [
+      "node",
+      "jest",
+      "jsdom",
+      "better-sqlite3",
+      "yargs",
+      "pg",
+      "ws",
+      "react",
+      "react-dom",
+      "react-resizable"
+    ]
   }
 }

package/background/src/lib/local/createLocalAnalyzer.js

@@ -16,7 +16,7 @@ export async function createAnalyzerTemplate(absoluteCodeyamRootPath) {
         await copyFolderToArchive({
             source: folder,
             destination: `${absoluteCodeyamRootPath}/${folderName}`,
-            exclude: ['__tests__'],
+            exclude: ['__tests__', 'node_modules'],
             recursive: true,
         });
     }

package/background/src/lib/local/createLocalAnalyzer.js.map

@@ -1 +1 @@
-{"version":3,"file":"createLocalAnalyzer.js","sourceRoot":"","sources":["../../../../../../background/src/lib/local/createLocalAnalyzer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createLocalAnalyzer.js","sourceRoot":"","sources":["../../../../../../background/src/lib/local/createLocalAnalyzer.ts"],"names":[],"mappings":"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"}