@codeyam/codeyam-cli 0.1.0-staging.b8a55ba → 0.1.0-staging.d0ad4ae

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

@@ -63,27 +63,38 @@ export default function enrichArrayTypesFromChildSignatures(importedExports, dep
     if (mockedArrayPaths.length === 0)
         return;
     // Find all non-mocked child components and extract their signature fields
+    // We check both direct imports AND all schemas in dependencySchemas because
+    // transitive dependencies (e.g., SurveyCard imported by SurveysList imported by SurveysPage)
+    // may have signature schemas that we need to use for enrichment.
     const childSignatureFields = [];
-    for (const importedExport of importedExports) {
-        // Skip mocked dependencies - we want child components
-        if (importedExport.isMocked || !importedExport.filePath)
-            continue;
-        const schema = dependencySchemas?.[importedExport.filePath]?.[importedExport.name]
-            ?.signatureSchema;
-        if (!schema)
-            continue;
-        // Extract signature[0].* fields (first prop of child component)
+    // Helper to extract prop fields from a signature schema
+    const extractPropFields = (schema) => {
         const propFields = {};
         for (const [path, type] of Object.entries(schema)) {
             // Match signature[0].propName.field patterns
             const match = path.match(/^signature\[0\]\.(\w+)\.(.+)$/);
             if (match) {
-                const [, propName, fieldPath] = match;
+                const [, , fieldPath] = match;
                 // Store as "fieldPath" without the prop name prefix
                 // e.g., signature[0].survey.updatedAt -> updatedAt
                 propFields[fieldPath] = type;
             }
         }
+        return propFields;
+    };
+    // First, check direct imports (non-mocked)
+    const processedSchemas = new Set();
+    for (const importedExport of importedExports) {
+        // Skip mocked dependencies - we want child components
+        if (importedExport.isMocked || !importedExport.filePath)
+            continue;
+        const schemaKey = `${importedExport.filePath}::${importedExport.name}`;
+        processedSchemas.add(schemaKey);
+        const schema = dependencySchemas?.[importedExport.filePath]?.[importedExport.name]
+            ?.signatureSchema;
+        if (!schema)
+            continue;
+        const propFields = extractPropFields(schema);
         if (Object.keys(propFields).length > 0) {
             childSignatureFields.push({
                 filePath: importedExport.filePath,
@@ -92,6 +103,29 @@ export default function enrichArrayTypesFromChildSignatures(importedExports, dep
             });
         }
     }
+    // Also check all schemas in dependencySchemas for transitive child components
+    // that may not be in importedExports but have signature schemas with prop fields
+    if (dependencySchemas) {
+        for (const [filePath, entities] of Object.entries(dependencySchemas)) {
+            for (const [entityName, schemas] of Object.entries(entities)) {
+                const schemaKey = `${filePath}::${entityName}`;
+                // Skip already processed schemas
+                if (processedSchemas.has(schemaKey))
+                    continue;
+                const signatureSchema = schemas?.signatureSchema;
+                if (!signatureSchema)
+                    continue;
+                const propFields = extractPropFields(signatureSchema);
+                if (Object.keys(propFields).length > 0) {
+                    childSignatureFields.push({
+                        filePath,
+                        entityName,
+                        propFields,
+                    });
+                }
+            }
+        }
+    }
     if (childSignatureFields.length === 0)
         return;
     // Enrich mocked dependency arrays with child signature fields

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

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

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

@@ -0,0 +1,85 @@
+/**
+ * Enriches mocked dependency return value types using sourceEquivalencies.
+ *
+ * When a mocked dependency returns a value with an `unknown` type, and that value
+ * is passed to a child component, we can infer the type from the child's signature.
+ * The sourceEquivalencies track this data flow.
+ *
+ * Example:
+ * - trpc.quote.getQuoteQuestionAnswers.useQuery().functionCallReturnValue.data is `unknown`
+ * - sourceEquivalencies shows this data flows to QuoteHeaderExcel().signature[0].questionAnswers
+ * - QuoteHeaderExcel's signatureSchema says signature[0].questionAnswers is `array | undefined`
+ * - Therefore, data should be `array | undefined`
+ *
+ * Without this enrichment, fillInDirectSchemaGapsAndUnknowns will guess the type
+ * based on the property name, often incorrectly (e.g., 'data' becomes 'number'
+ * because pluralize.isPlural('data') returns true).
+ */
+export default function enrichUnknownTypesFromSourceEquivalencies(isolatedDependencySchemas, mergedDependencySchemas, mockedImports) {
+    // Build a map of mocked dependency schemas for quick lookup
+    const mockedSchemas = new Map();
+    for (const imp of mockedImports) {
+        if (!imp.isMocked || !imp.filePath)
+            continue;
+        const schema = mergedDependencySchemas?.[imp.filePath]?.[imp.name]?.returnValueSchema;
+        if (schema) {
+            mockedSchemas.set(`${imp.filePath}:${imp.name}`, schema);
+        }
+    }
+    if (mockedSchemas.size === 0)
+        return;
+    // Iterate over all sourceEquivalencies in all dependency schemas
+    for (const filePath in isolatedDependencySchemas) {
+        for (const entityName in isolatedDependencySchemas[filePath]) {
+            const depSchema = isolatedDependencySchemas[filePath][entityName];
+            const sourceEquivs = depSchema.sourceEquivalencies;
+            if (!sourceEquivs)
+                continue;
+            // For each sourceEquivalency: key is destination, value contains sources
+            for (const [destinationPath, sources] of Object.entries(sourceEquivs)) {
+                // Parse the destination to get the child entity name and signature path
+                // e.g., "QuoteHeaderExcel().signature[0].questionAnswers" ->
+                //   entityName: "QuoteHeaderExcel", sigPath: "signature[0].questionAnswers"
+                const destMatch = destinationPath.match(/^(\w+)\(\)\.(.+)$/);
+                if (!destMatch)
+                    continue;
+                const [, destEntityName, destSigPath] = destMatch;
+                // Find the child's signatureSchema to get the destination type
+                let destType;
+                for (const depFilePath in mergedDependencySchemas) {
+                    const childSchema = mergedDependencySchemas[depFilePath][destEntityName];
+                    if (childSchema?.signatureSchema?.[destSigPath]) {
+                        destType = childSchema.signatureSchema[destSigPath];
+                        break;
+                    }
+                }
+                if (!destType || destType === 'unknown')
+                    continue;
+                // Now check each source to see if it's a mocked dependency with unknown type
+                for (const source of sources) {
+                    const { scopeNodeName, schemaPath } = source;
+                    // Find which mocked dependency this belongs to
+                    for (const [key, schema] of mockedSchemas) {
+                        const [mockedFilePath, mockedName] = key.split(':');
+                        // Check if this source path is in the mocked dependency's schema
+                        // The schemaPath contains the full path like:
+                        // "trpc.quote.getQuoteQuestionAnswers.useQuery(...).functionCallReturnValue.data"
+                        // We need to find it in the returnValueSchema
+                        if (schema[schemaPath] === 'unknown') {
+                            // Found an unknown type that flows to a known type!
+                            schema[schemaPath] = destType;
+                        }
+                        // Also check without the functionCallReturnValue part
+                        // (some schemas might have the transformed path)
+                        const transformedPath = schemaPath.replace(/\.functionCallReturnValue/g, '');
+                        if (transformedPath !== schemaPath &&
+                            schema[transformedPath] === 'unknown') {
+                            schema[transformedPath] = destType;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+//# sourceMappingURL=enrichUnknownTypesFromSourceEquivalencies.js.map

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

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

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

@@ -1,5 +1,5 @@
 // import { writeFile } from 'fs/promises';
-import { convertDotNotation, fillInDirectSchemaGapsAndUnknowns, joinParenthesesAndArrays, splitOutsideParenthesesAndArrays, } from "../../../../../../packages/ai/index.js";
+import { convertDotNotation, fillInDirectSchemaGapsAndUnknowns, joinParenthesesAndArrays, mergeJsonTypeDefinitions, splitOutsideParenthesesAndArrays, } from "../../../../../../packages/ai/index.js";
 /**
  * Strips generic type parameters from a function name.
  * e.g., "useFetcher<BranchEntityDiffResult>" -> "useFetcher"
@@ -7,6 +7,61 @@ import { convertDotNotation, fillInDirectSchemaGapsAndUnknowns, joinParenthesesA
 function cleanFunctionName(name) {
     return name?.split('<')[0];
 }
+/**
+ * Escapes special regex characters in a string.
+ */
+function escapeRegExp(str) {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+/**
+ * Counts only DIRECT function calls, excluding method chains on return values.
+ *
+ * When a hook returns an object with methods that are later called, the analysis
+ * tracks those as call signatures like 'useAuth().functionCallReturnValue.signOut()'.
+ * These are NOT separate calls to useAuth - they're method invocations on the return value.
+ *
+ * This function filters out such method chains to get the true count of direct calls.
+ *
+ * @example
+ * // One direct call, one method on return value
+ * countDirectCalls(['useAuth()', 'useAuth().functionCallReturnValue.signOut()']) // => 1
+ *
+ * // Two direct calls
+ * countDirectCalls(['useFetcher()', 'useFetcher()']) // => 2
+ */
+function countDirectCalls(calls) {
+    return calls.filter((sig) => !sig.includes('.functionCallReturnValue.'))
+        .length;
+}
+/**
+ * Checks if all direct calls (non-method-chain calls) are identical.
+ * This happens when destructuring a hook call:
+ *   const { authLoading, signOut } = useAuth();
+ * produces calls: ['useAuth()', 'useAuth()'] (same signature repeated)
+ *
+ * In this case, we should use the full unqualified schema since there's
+ * really only ONE function call, not multiple different calls.
+ *
+ * @example
+ * // Same call repeated (from destructuring)
+ * allDirectCallsIdentical(['useAuth()', 'useAuth()']) // => true
+ *
+ * // Different calls
+ * allDirectCallsIdentical(['useFetcher<User>()', 'useFetcher<Report>()']) // => false
+ *
+ * // Single call
+ * allDirectCallsIdentical(['useAuth()']) // => true
+ *
+ * // With method chain (method chain is ignored)
+ * allDirectCallsIdentical(['useAuth()', 'useAuth().functionCallReturnValue.signOut()']) // => true
+ */
+function allDirectCallsIdentical(calls) {
+    const directCalls = calls.filter((sig) => !sig.includes('.functionCallReturnValue.'));
+    if (directCalls.length === 0)
+        return true;
+    const firstCall = directCalls[0];
+    return directCalls.every((call) => call === firstCall);
+}
 /**
  * Preprocesses the schema to:
  * 1. Filter out all signature paths
@@ -66,15 +121,19 @@ function processCall(importedExport, dependencySchemas, callIndex, variableNameO
     const callName = importedExport.calls?.[callIndex] ?? importedExport.name;
     // Determine if we should use variable-qualified schema or base schema.
     // Use variable-qualified schema when:
-    // 1. variableNameOccurrence is defined (we're processing multiple calls with matching variable names), OR
-    // 2. calls.length equals callVariableNames.length (single call with single variable name)
+    // 1. variableNameOccurrence is defined (we're processing multiple DISTINCT calls), OR
+    // 2. Single call with single variable name (directCallCount === 1 && varNamesLength === 1)
     // Use base schema when:
-    // - calls.length !== callVariableNames.length (rest spread or method chain case)
+    // - Multiple calls that are all identical (destructuring case: const { a, b } = useHook())
+    // - directCallCount !== varNamesLength (rest spread or method chain case)
     // This is important for rest spread destructuring like: const { x, y, ...data } = useLoaderData()
     // where data.queueState.jobs should come from the base schema, not from a variable-qualified schema.
-    const callsLength = importedExport.calls?.length ?? 0;
+    // Also important: method chains like useAuth().functionCallReturnValue.signOut() should NOT count
+    // as separate calls - only direct hook calls count.
+    const directCallCount = countDirectCalls(importedExport.calls ?? []);
     const varNamesLength = importedExport.callVariableNames?.length ?? 0;
-    const shouldUseVariableQualifiedSchema = variableNameOccurrence !== undefined || callsLength === varNamesLength;
+    const shouldUseVariableQualifiedSchema = variableNameOccurrence !== undefined ||
+        (directCallCount === 1 && varNamesLength === 1);
     const variableName = shouldUseVariableQualifiedSchema
         ? importedExport.callVariableNames?.[callIndex]
         : undefined;
@@ -86,12 +145,26 @@ function processCall(importedExport, dependencySchemas, callIndex, variableNameO
         variableNameOccurrence > 0
         ? `${variableName}[${variableNameOccurrence}]`
         : variableName;
-    const schemaLookupKey = indexedVariableName
-        ? `${importedExport.name}::${indexedVariableName}`
-        : importedExport.name;
-    let rawSchema = dependencySchemas?.[importedExport.filePath]?.[schemaLookupKey]
-        ?.returnValueSchema ?? {};
-    // If no schema found with indexed key, try without the index as fallback
+    // Schema lookup order (most specific to least specific):
+    // 1. Call signature (e.g., 'useLoaderData<typeof loader>()')
+    // 2. Variable-qualified key with index (e.g., 'useFetcher::fetcher[1]')
+    // 3. Variable-qualified key without index (e.g., 'useFetcher::fetcher')
+    // 4. Base name (e.g., 'useLoaderData')
+    let rawSchema = {};
+    // 1. Try call signature first (most specific - new format)
+    if (callName !== importedExport.name) {
+        rawSchema =
+            dependencySchemas?.[importedExport.filePath]?.[callName]
+                ?.returnValueSchema ?? {};
+    }
+    // 2. Try variable-qualified key with index
+    if (Object.keys(rawSchema).length === 0 && indexedVariableName) {
+        const indexedKey = `${importedExport.name}::${indexedVariableName}`;
+        rawSchema =
+            dependencySchemas?.[importedExport.filePath]?.[indexedKey]
+                ?.returnValueSchema ?? {};
+    }
+    // 3. Try variable-qualified key without index (fallback for indexed lookup)
     if (Object.keys(rawSchema).length === 0 &&
         variableNameOccurrence !== undefined &&
         variableNameOccurrence > 0 &&
@@ -101,13 +174,44 @@ function processCall(importedExport, dependencySchemas, callIndex, variableNameO
             dependencySchemas?.[importedExport.filePath]?.[nonIndexedKey]
                 ?.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;
+    // 4. Get base name schema and merge with call-specific schema
+    // The base schema often has more complete array element details that the
+    // call-specific schema might be missing. Instead of using as fallback only
+    // when empty, MERGE both schemas so we get the most complete picture.
+    //
+    // HOWEVER: For type-parameterized calls where the base schema contains paths
+    // from MULTIPLE DIFFERENT type parameters, DON'T merge to avoid contamination.
+    // The call-specific schema (rawSchema) is already isolated and complete.
+    const baseSchema = dependencySchemas?.[importedExport.filePath]?.[importedExport.name]
+        ?.returnValueSchema ?? {};
+    // Check if this is a type-parameterized call with a call-specific schema
+    const hasTypeParams = callName.includes('<') && callName.includes('>');
+    const hasCallSpecificSchema = Object.keys(rawSchema).length > 0;
+    // Check if the base schema has multiple DIFFERENT type parameter variants
+    // If so, merging would bring in wrong fields from other variants
+    let baseHasMultipleTypeParamVariants = false;
+    if (hasTypeParams && hasCallSpecificSchema) {
+        const baseFunctionName = cleanFunctionName(callName.split('(')[0]);
+        const typeParamVariantsInBase = new Set();
+        for (const path of Object.keys(baseSchema)) {
+            // Look for paths like "useFetcher<TypeA>(...)" or "useFetcher<TypeB>(...)"
+            const match = path.match(new RegExp(`^${escapeRegExp(baseFunctionName)}<([^>]+)>\\(`));
+            if (match) {
+                typeParamVariantsInBase.add(match[1]);
+            }
+        }
+        baseHasMultipleTypeParamVariants = typeParamVariantsInBase.size > 1;
+    }
+    // For type-parameterized calls where the base schema has MULTIPLE different type
+    // parameter variants, use ONLY the call-specific schema to avoid contamination.
+    // Otherwise, merge with base schema for complete coverage (e.g., array element details).
+    const mergedSchema = hasCallSpecificSchema && hasTypeParams && baseHasMultipleTypeParamVariants
+        ? rawSchema // Use ONLY the call-specific schema when base has mixed type params
+        : Object.keys(rawSchema).length === 0
+            ? baseSchema
+            : { ...baseSchema, ...rawSchema };
     // Preprocess to filter signatures and extract functionCallReturnValue
-    let preprocessedSchema = preprocessSchemaForMocks(fallbackSchema);
+    let preprocessedSchema = preprocessSchemaForMocks(mergedSchema);
     const functionNames = [];
     const isFunctionNameWithoutFunction = (path, functionName) => {
         // Check if path starts with functionName but isn't a function call
@@ -212,31 +316,11 @@ function processCall(importedExport, dependencySchemas, callIndex, variableNameO
     const schemaKey = variableName
         ? `${baseSchemaKey}::${variableName}`
         : baseSchemaKey;
-    // Build output key
-    // When entityName is provided, use canonical key format for consistency across scenarios
-    // Otherwise, use the variable-based format for backward compatibility
-    let outputKey;
-    if (options?.entityName) {
-        // Canonical key format: EntityName::hookName::index
-        // This ensures consistent keys regardless of variable names chosen during analysis
-        const hookName = cleanFunctionName(importedExport.name);
-        outputKey = `${options.entityName}::${hookName}::${hookCallIndex}`;
-    }
-    else if (variableName) {
-        // Legacy format: "variableName <- functionName"
-        // This reads naturally as "variableName receives from functionName"
-        // When a variable name is reused (variableNameOccurrence > 0), disambiguate with index
-        const disambiguator = variableNameOccurrence !== undefined && variableNameOccurrence > 0
-            ? `[${variableNameOccurrence}]`
-            : '';
-        outputKey = `${variableName}${disambiguator} <- ${importedExport.name}`;
-    }
-    else if (isObjectStyle) {
-        outputKey = importedExport.name;
-    }
-    else {
-        outputKey = callName;
-    }
+    // Build output key - use the ORIGINAL CALL SIGNATURE from the code
+    // This makes it clear to the LLM exactly which call needs which data.
+    // Example: useFetcher<{ data: UserData }>() vs useFetcher<{ data: ReportData }>()
+    // Example: db.select(usersQuery) vs db.select(postsQuery)
+    const outputKey = callName;
     // Try to find return value - check with variable qualifier first, then without
     let returnValue = schema[schemaKey];
     if (!returnValue && variableName) {
@@ -249,11 +333,51 @@ function processCall(importedExport, dependencySchemas, callIndex, variableNameO
     if (!returnValue) {
         returnValue = schema['functionCallReturnValue'];
     }
+    // Handle method-chain style calls (e.g., createClient().from("workouts").select("*") or db.select(query))
+    // After convertDotNotation, the schema is nested: { "createClient()": { "from(...)": { ... } } }
+    // We need to navigate the nested structure using the call signature parts.
+    // For object-style dependencies (isObjectStyle=true), the baseSchemaKey is just the object name (e.g., "db"),
+    // so returnValue might be the parent object, not the actual return value of the method chain.
+    // We should always try method-chain navigation for calls with dots and parens.
+    if (callName.includes('.') && callName.includes('(')) {
+        const callParts = splitOutsideParenthesesAndArrays(callName);
+        let current = schema;
+        for (const part of callParts) {
+            if (current &&
+                typeof current === 'object' &&
+                !Array.isArray(current) &&
+                part in current) {
+                current = current[part];
+            }
+            else {
+                current = undefined;
+                break;
+            }
+        }
+        // Use method-chain result if found, otherwise keep previous returnValue
+        if (current !== undefined) {
+            returnValue = current;
+        }
+    }
     if (!returnValue) {
         return null;
     }
     return { key: outputKey, value: returnValue };
 }
+/**
+ * Adds a result to the accumulator, merging schemas if the key already exists.
+ * This handles the case where the same call signature appears multiple times
+ * (e.g., two calls to useFetcher() with the same generic type).
+ */
+function addResultToAccumulator(acc, key, value) {
+    if (acc[key]) {
+        // Key already exists - merge the schemas
+        acc[key] = mergeJsonTypeDefinitions(acc[key], value);
+    }
+    else {
+        acc[key] = value;
+    }
+}
 export default function gatherDataForMocks(importedExports, dependencySchemas, options) {
     // Track the global index for each hook name across all imports
     // This enables canonical keys like EntityName::useLoaderData::0, EntityName::useFetcher::0, etc.
@@ -263,12 +387,94 @@ export default function gatherDataForMocks(importedExports, dependencySchemas, o
             return acc;
         // Get the clean hook name for indexing
         const hookName = cleanFunctionName(importedExport.name);
-        // Check if we have multiple calls with variable names
-        const hasMultipleCalls = importedExport.calls &&
-            importedExport.calls.length > 1 &&
+        // Check if we have multiple DISTINCT direct calls with variable names.
+        // Important: Only count direct calls to the function, not method chains on its return value.
+        // For example, ['useAuth()', 'useAuth().functionCallReturnValue.signOut()'] has only 1 direct call.
+        //
+        // ALSO: If all direct calls are IDENTICAL (same signature repeated), this is from
+        // destructuring like `const { a, b } = useHook()` and we should use the FULL unqualified
+        // schema, not iterate through partial variable-qualified schemas.
+        const directCallCount = countDirectCalls(importedExport.calls ?? []);
+        const hasMultipleDistinctCalls = directCallCount > 1 &&
             importedExport.callVariableNames &&
-            importedExport.callVariableNames.length === importedExport.calls.length;
-        if (hasMultipleCalls) {
+            importedExport.callVariableNames.length === directCallCount &&
+            !allDirectCallsIdentical(importedExport.calls ?? []);
+        // Check for multiple distinct method-chain calls WITHOUT callVariableNames.
+        // This pattern is common with tRPC, Supabase, etc. where a single import
+        // (e.g., `trpc`) is used with multiple different method chains (e.g.,
+        // `trpc.useUtils()`, `trpc.quote.getQuotesByOrg.useQuery()`).
+        // These should each get their own entry in dataForMocks.
+        //
+        // IMPORTANT: This is DIFFERENT from the rest spread pattern where a function
+        // like useLoaderData is called directly, and other calls are method chains
+        // on its return value (e.g., `useLoaderData<typeof loader>()` with
+        // `useLoaderData<typeof loader>().uncommittedEntitiesList.filter(...)`).
+        // In that case, all the additional calls start with the base function call.
+        const directCalls = (importedExport.calls ?? []).filter((sig) => !sig.includes('.functionCallReturnValue.'));
+        const uniqueDirectCalls = [...new Set(directCalls)];
+        // Check if any call is a direct invocation of the import (e.g., `useLoaderData<typeof loader>()`)
+        // as opposed to all being property accesses (e.g., `trpc.useUtils()`, `trpc.quote.xxx()`).
+        // If there's a direct function call, the other calls are likely method chains on its result.
+        const baseName = importedExport.name;
+        const hasDirectFunctionCall = directCalls.some((sig) => {
+            // Pattern: baseName() or baseName<...>()
+            // This matches "useLoaderData()", "useLoaderData<typeof loader>()", etc.
+            // but NOT "trpc.useUtils()" which has a dot before the parens
+            const baseCallPattern = new RegExp(`^${baseName}(<[^>]*>)?\\(`);
+            return baseCallPattern.test(sig);
+        });
+        const hasMultipleDistinctMethodChains = !hasMultipleDistinctCalls &&
+            uniqueDirectCalls.length > 1 &&
+            !allDirectCallsIdentical(directCalls) &&
+            !hasDirectFunctionCall; // Exclude rest spread patterns
+        if (hasMultipleDistinctMethodChains) {
+            // For multiple method-chain calls on the same import, create a NESTED structure
+            // under the base import name. This allows constructMockCode to generate a
+            // combined mock object with all method chains.
+            //
+            // Example: For calls ['trpc.useUtils()', 'trpc.quote.getQuotesByOrg.useQuery()'],
+            // create: { "trpc": { "useUtils()": {...}, "quote": { "getQuotesByOrg": { "useQuery()": {...} } } } }
+            const nestedResult = {};
+            for (let i = 0; i < uniqueDirectCalls.length; i++) {
+                // Find the index of this call in the original calls array
+                const callIndex = (importedExport.calls ?? []).indexOf(uniqueDirectCalls[i]);
+                if (callIndex === -1)
+                    continue;
+                const hookCallIndex = hookCallIndices[hookName] ?? 0;
+                hookCallIndices[hookName] = hookCallIndex + 1;
+                const processResult = processCall(importedExport, dependencySchemas, callIndex, undefined, options, hookCallIndex);
+                if (processResult) {
+                    // The key is like "trpc.useUtils()" or "trpc.quote.getQuotesByOrg.useQuery()"
+                    // We need to nest the value at the path AFTER the base name
+                    const callSignature = processResult.key;
+                    // Split the call signature into path parts, handling parens
+                    // e.g., "trpc.useUtils()" -> ["trpc", "useUtils()"]
+                    // e.g., "trpc.quote.getQuotesByOrg.useQuery()" -> ["trpc", "quote", "getQuotesByOrg", "useQuery()"]
+                    const pathParts = splitOutsideParenthesesAndArrays(callSignature);
+                    // Skip the base name (first part) and nest the value at the remaining path
+                    if (pathParts.length > 1 && pathParts[0] === baseName) {
+                        const nestedPath = pathParts.slice(1);
+                        // Set the value at the nested path, merging with existing structure
+                        let current = nestedResult;
+                        for (let j = 0; j < nestedPath.length - 1; j++) {
+                            const part = nestedPath[j];
+                            if (!(part in current)) {
+                                current[part] = {};
+                            }
+                            current = current[part];
+                        }
+                        // Set the leaf value
+                        const leafKey = nestedPath[nestedPath.length - 1];
+                        current[leafKey] = processResult.value;
+                    }
+                }
+            }
+            // Add the nested result under the base import name
+            if (Object.keys(nestedResult).length > 0) {
+                addResultToAccumulator(acc, baseName, nestedResult);
+            }
+        }
+        else if (hasMultipleDistinctCalls) {
             // Track how many times each variable name has been seen
             // to disambiguate keys when the same variable is reused
             const variableNameCounts = {};
@@ -283,18 +489,74 @@ export default function gatherDataForMocks(importedExports, dependencySchemas, o
                 hookCallIndices[hookName] = hookCallIndex + 1;
                 const processResult = processCall(importedExport, dependencySchemas, i, occurrence, options, hookCallIndex);
                 if (processResult) {
-                    acc[processResult.key] = processResult.value;
+                    addResultToAccumulator(acc, processResult.key, processResult.value);
                 }
             }
         }
         else {
-            // Original behavior for single calls or calls without variable names
+            // Single calls, or multiple identical calls (from destructuring)
             // Get the current hook call index and increment for next call
             const hookCallIndex = hookCallIndices[hookName] ?? 0;
             hookCallIndices[hookName] = hookCallIndex + 1;
+            // First, try to get result from unqualified schema
             const processResult = processCall(importedExport, dependencySchemas, 0, undefined, options, hookCallIndex);
-            if (processResult) {
-                acc[processResult.key] = processResult.value;
+            // Check if we got a meaningful result (not empty object or null)
+            // Arrays are always meaningful (even empty ones represent valid data structure)
+            const hasUnqualifiedResult = processResult &&
+                processResult.value !== null &&
+                (typeof processResult.value !== 'object' ||
+                    Array.isArray(processResult.value) ||
+                    Object.keys(processResult.value).length > 0);
+            // Check if we have multiple callVariableNames that are DIFFERENT
+            // (e.g., from parent + child components using the same hook differently)
+            // In this case, we should also merge in variable-qualified schemas
+            // to capture all destructured properties from both parent and child.
+            const uniqueCallVarNames = new Set(importedExport.callVariableNames ?? []);
+            const hasDifferentVarNames = importedExport.callVariableNames &&
+                importedExport.callVariableNames.length > 1 &&
+                uniqueCallVarNames.size > 1 &&
+                // Only merge variable-qualified schemas when calls are all identical
+                // (e.g., useFlags() repeated). Don't do this for method chains
+                // or rest spread cases where calls.length !== callVariableNames.length
+                allDirectCallsIdentical(importedExport.calls ?? []);
+            if (hasUnqualifiedResult) {
+                let finalValue = processResult.value;
+                // If we have different variable names (e.g., from parent and child components),
+                // also merge in variable-qualified schemas to ensure we capture all properties.
+                // This handles the case where parent uses useFlags().enableNewAdminDashboard
+                // and child uses useFlags().flagShowReferenceIdOnQuoteTable.
+                if (hasDifferentVarNames) {
+                    let mergedValue = processResult.value;
+                    for (let i = 0; i < importedExport.callVariableNames.length; i++) {
+                        const varQualifiedResult = processCall(importedExport, dependencySchemas, i, 0, // Use 0 to trigger variable-qualified lookup
+                        options, hookCallIndex);
+                        if (varQualifiedResult && varQualifiedResult.value) {
+                            mergedValue = mergeJsonTypeDefinitions(mergedValue, varQualifiedResult.value);
+                        }
+                    }
+                    finalValue = mergedValue;
+                }
+                addResultToAccumulator(acc, processResult.key, finalValue);
+            }
+            else if (directCallCount > 1 &&
+                allDirectCallsIdentical(importedExport.calls ?? []) &&
+                importedExport.callVariableNames &&
+                importedExport.callVariableNames.length > 0) {
+                // No unqualified schema exists, but we have multiple identical calls with variable names
+                // Merge all the variable-qualified schemas together
+                const callSignature = importedExport.calls?.[0] ?? `${importedExport.name}()`;
+                let mergedValue = {};
+                for (let i = 0; i < importedExport.callVariableNames.length; i++) {
+                    const varQualifiedResult = processCall(importedExport, dependencySchemas, i, 0, // Use 0 to trigger variable-qualified lookup
+                    options, hookCallIndex);
+                    if (varQualifiedResult && varQualifiedResult.value) {
+                        // Deep merge the value into the accumulated result
+                        mergedValue = mergeJsonTypeDefinitions(mergedValue, varQualifiedResult.value);
+                    }
+                }
+                if (Object.keys(mergedValue).length > 0) {
+                    addResultToAccumulator(acc, callSignature, mergedValue);
+                }
             }
         }
         return acc;