npm - @codeyam/codeyam-cli - Versions diffs - 0.1.0-staging.bbe4da9 → 0.1.0-staging.d0ad4ae - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1873) hide show

package/packages/ai/src/lib/generateEntityScenarios.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generateEntityScenarios.js","sourceRoot":"","sources":["../../../../../../packages/ai/src/lib/generateEntityScenarios.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,gCAAgC,MAAM,qDAAqD,CAAC;~~AASnG~~,+DAA+D;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAM,oBAAoB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;~~AAoCtE~~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~~;;;4CAGQ~~,qBAAqB~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAiDhD~~,qBAAqB~~;;;;;;;;;;;;;;;;;;;CAmBrC~~,CAAC;AACF,CAAC;AAED,MAAM,cAAc,GAAG,qBAAqB,EAAE,CAAC;AAE/C,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmD5B,CAAC"}
1	+ {"version":3,"file":"generateEntityScenarios.js","sourceRoot":"","sources":["../../../../../../packages/ai/src/lib/generateEntityScenarios.ts"],"names":[],"mappings":"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"}

package/packages/ai/src/lib/generateStatementAnalysis.js CHANGED Viewed

@@ -3,7 +3,7 @@ import { saveLlmCall } from "../../../../packages/aws/dynamodb/index.js";
 import generateEntityPropsStructureGenerator from "./promptGenerators/generateEntityPropsStructureGenerator.js";
 import identifyReserved, { ReservedFeature } from "./identifyReserved.js";
 import splitOutsideParentheses from "./splitOutsideParentheses.js";
-import { generateSha, loadStatement, saveStatement } from "../../../../packages/supabase/index.js";
+import { generateSha, loadStatement, saveStatement } from "../../../../packages/database/index.js";
 import { parseJsonSafe } from "../../../../packages/ai/index.js";
 export default async function generateStatementAnalysis({ entity, scope, issues, model, }) {
     const sha = generateSha(scope.text);

package/packages/ai/src/lib/getConditionalUsagesFromCode.js CHANGED Viewed

@@ -13,17 +13,38 @@ export default function getConditionalUsagesFromCode(code) {
     const conditionalUsages = {};
     // Create a source file from the code
     const sourceFile = ts.createSourceFile('temp.tsx', code, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);
-    function addUsage(usage) {
+    /**
+     * Helper to get source location from an AST node
+     */
+    function getSourceLocation(node) {
+        const start = node.getStart(sourceFile);
+        const { line, character } = sourceFile.getLineAndCharacterOfPosition(start);
+        const codeSnippet = node.getText(sourceFile);
+        return {
+            lineNumber: line + 1, // Convert to 1-based
+            column: character,
+            codeSnippet: codeSnippet.length > 100
+                ? codeSnippet.slice(0, 100) + '...'
+                : codeSnippet,
+        };
+    }
+    function addUsage(usage, node) {
+        const fullUsage = {
+            ...usage,
+            sourceLocation: getSourceLocation(node),
+        };
         if (!conditionalUsages[usage.path]) {
             conditionalUsages[usage.path] = [];
         }
-        // Avoid duplicates
-        const exists = conditionalUsages[usage.path].some((existing) => existing.location === usage.location &&
-            existing.conditionType === usage.conditionType &&
+        // Avoid duplicates (but allow different source locations)
+        const exists = conditionalUsages[usage.path].some((existing) => existing.location === fullUsage.location &&
+            existing.conditionType === fullUsage.conditionType &&
+            existing.sourceLocation?.lineNumber ===
+                fullUsage.sourceLocation?.lineNumber &&
             JSON.stringify(existing.comparedValues) ===
-                JSON.stringify(usage.comparedValues));
+                JSON.stringify(fullUsage.comparedValues));
         if (!exists) {
-            conditionalUsages[usage.path].push(usage);
+            conditionalUsages[usage.path].push(fullUsage);
         }
     }
     function extractFromCondition(condition, location) {
@@ -61,7 +82,7 @@ export default function getConditionalUsagesFromCode(code) {
                     conditionType: 'comparison',
                     comparedValues: literalValue !== undefined ? [literalValue] : undefined,
                     location,
-                });
+                }, unwrapped);
                 return;
             }
             if (rightPath && isLiteralExpression(unwrapped.left)) {
@@ -71,14 +92,14 @@ export default function getConditionalUsagesFromCode(code) {
                     conditionType: 'comparison',
                     comparedValues: literalValue !== undefined ? [literalValue] : undefined,
                     location,
-                });
+                }, unwrapped);
                 return;
             }
             if (leftPath) {
-                addUsage({ path: leftPath, conditionType: 'comparison', location });
+                addUsage({ path: leftPath, conditionType: 'comparison', location }, unwrapped);
             }
             if (rightPath) {
-                addUsage({ path: rightPath, conditionType: 'comparison', location });
+                addUsage({ path: rightPath, conditionType: 'comparison', location }, unwrapped);
             }
             return;
         }
@@ -91,7 +112,7 @@ export default function getConditionalUsagesFromCode(code) {
         // Handle simple identifiers or property accesses (truthiness checks)
         const path = getPathFromNode(unwrapped, sourceFile);
         if (path) {
-            addUsage({ path, conditionType: 'truthiness', location });
+            addUsage({ path, conditionType: 'truthiness', location }, unwrapped);
         }
     }
     function visitNode(node) {
@@ -126,7 +147,7 @@ export default function getConditionalUsagesFromCode(code) {
                     conditionType: 'switch',
                     comparedValues: caseValues.length > 0 ? caseValues : undefined,
                     location: 'switch',
-                });
+                }, node);
             }
         }
         // Continue traversing
@@ -189,9 +210,10 @@ function getLiteralValue(expr) {
     }
     return undefined;
 }
-export function formatConditionalUsagesForPrompt(conditionalUsages) {
+export function formatConditionalUsagesForPrompt(conditionalUsages, compoundConditionals) {
     const entries = Object.entries(conditionalUsages);
-    if (entries.length === 0) {
+    if (entries.length === 0 &&
+        (!compoundConditionals || compoundConditionals.length === 0)) {
         return '';
     }
     const lines = [
@@ -229,8 +251,56 @@ export function formatConditionalUsagesForPrompt(conditionalUsages) {
         else {
             description += 'Used in truthiness check (presence/absence matters)';
         }
+        // Include source locations if available (show up to 3 examples)
+        const usagesWithLocation = usages.filter((u) => u.sourceLocation);
+        if (usagesWithLocation.length > 0) {
+            description += '\n    - Locations:';
+            for (const usage of usagesWithLocation.slice(0, 3)) {
+                const loc = usage.sourceLocation;
+                const snippet = loc.codeSnippet.length > 60
+                    ? loc.codeSnippet.slice(0, 60) + '...'
+                    : loc.codeSnippet;
+                description += `\n      - Line ${loc.lineNumber}: \`${snippet}\``;
+            }
+            if (usagesWithLocation.length > 3) {
+                description += `\n      - ... and ${usagesWithLocation.length - 3} more`;
+            }
+        }
         lines.push(description);
     }
+    // Add compound conditionals section if present
+    if (compoundConditionals && compoundConditionals.length > 0) {
+        lines.push('');
+        lines.push('### Compound Conditionals (ALL conditions must be true together)');
+        lines.push('');
+        lines.push('These conditions are combined with && and must ALL be satisfied together for a code path to execute.');
+        lines.push('IMPORTANT: Ensure at least one scenario satisfies ALL conditions in each compound conditional simultaneously.');
+        lines.push('');
+        for (const compound of compoundConditionals) {
+            lines.push(`- Chain at line ${compound.sourceLocation.lineNumber}:`);
+            lines.push(`    - Expression: \`${compound.expression}\``);
+            lines.push(`    - All these conditions must be TRUE together:`);
+            for (const condition of compound.conditions) {
+                let conditionDesc = `      - \`${condition.path}\``;
+                if (condition.conditionType === 'comparison' &&
+                    condition.comparedValues?.length) {
+                    const op = condition.isNegated ? '!== ' : '=== ';
+                    conditionDesc += ` ${op}${condition.comparedValues.map((v) => `"${v}"`).join(' or ')}`;
+                }
+                else if (condition.conditionType === 'truthiness') {
+                    conditionDesc += condition.isNegated
+                        ? ' must be falsy (false, null, undefined, 0, "")'
+                        : ' must be truthy';
+                }
+                if (condition.requiredValue !== undefined) {
+                    conditionDesc += ` (required: ${JSON.stringify(condition.requiredValue)})`;
+                }
+                lines.push(conditionDesc);
+            }
+        }
+        lines.push('');
+        lines.push('When key attributes are part of compound conditionals, list the other conditions as dependencies.');
+    }
     lines.push('');
     lines.push('Consider these attributes as candidates for key attributes, especially those with specific comparison values.');
     lines.push('When a local variable derives from a data source, the data source is the key attribute.');

package/packages/ai/src/lib/getConditionalUsagesFromCode.js.map CHANGED Viewed

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

package/packages/ai/src/lib/guessScenarioDataFromDescription.js CHANGED Viewed

@@ -4,7 +4,7 @@ import guessNewScenarioDataFromDescriptionGenerator from "./promptGenerators/gue
 import guessEditScenarioDataFromDescriptionGenerator from "./promptGenerators/guessEditScenarioDataFromDescriptionGenerator.js";
 import { DEFAULT_LARGER_MODEL } from "../../../../packages/ai/index.js";
 import { parseJsonSafe } from "./parsers/parseJsonSafe.js";
-export default async function generateEntityScenarios({ description, editingMockName, editingMockData, existingScenarios, scenariosDataStructure, model, }) {
+export default async function generateEntityScenarios({ description, editingMockName, editingMockData, existingScenarios, scenariosDataStructure, keyAttributeSelections, model, }) {
     const prompt = editingMockName
         ? guessEditScenarioDataFromDescriptionGenerator({
             description,
@@ -17,6 +17,7 @@ export default async function generateEntityScenarios({ description, editingMock
             description,
             existingScenarios,
             scenariosDataStructure,
+            keyAttributeSelections,
         });
     const response = await completionCall({
         type: 'guessScenarioDataFromDescription',

package/packages/ai/src/lib/guessScenarioDataFromDescription.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"guessScenarioDataFromDescription.js","sourceRoot":"","sources":["../../../../../../packages/ai/src/lib/guessScenarioDataFromDescription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;~~AAGpD~~,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,~~4CAA4C~~,MAAM,iEAAiE,CAAC;~~AAC3H~~,OAAO,6CAA6C,MAAM,kEAAkE,CAAC;AAC7H,OAAO,EAAM,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;~~AAWxD~~,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,uBAAuB,CAAC,EACpD,WAAW,EACX,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,sBAAsB,EACtB,KAAK,GACgC;IAGrC,MAAM,MAAM,GAAG,eAAe;QAC5B,CAAC,CAAC,6CAA6C,CAAC;YAC5C,WAAW;YACX,eAAe;YACf,eAAe;YACf,iBAAiB;YACjB,sBAAsB;SACvB,CAAC;QACJ,CAAC,CAAC,4CAA4C,CAAC;YAC3C,WAAW;YACX,iBAAiB;YACjB,sBAAsB;SACvB,CAAC,CAAC;IAEP,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC;QACpC,IAAI,EAAE,kCAAkC;QACxC,aAAa,EAAE,eAAe;YAC5B,CAAC,CAAC,iBAAiB,CAAC,eAAe,CAAC;YACpC,CAAC,CAAC,kBAAkB;QACtB,MAAM;QACN,KAAK,EAAE,KAAK,IAAI,oBAAoB;KACrC,CAAC,CAAC;IAEH,MAAM,WAAW,CAAC;QAChB,WAAW,EAAE,kCAAkC;QAC/C,SAAS,EAAE,KAAK;QAChB,SAAS,EAAE;YACT,WAAW;YACX,eAAe;YACf,eAAe;YACf,iBAAiB;YACjB,sBAAsB;YACtB,KAAK;SACN;QACD,GAAG,QAAQ,CAAC,KAAK;KAClB,CAAC,CAAC;IAEH,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,QAAQ,CAAC;IAEpD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,aAAa,CAAC,kBAAkB,CAAiC,CAAC;AAC3E,CAAC;AAED,MAAM,kBAAkB,GAAG;;;;;;;;;;;;;;;;;;;CAmB1B,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,eAA4C,EAAE,EAAE,CAAC;;;;EAK1E,eAAe;IACb,CAAC,CAAC;yMACmM;IACrM,CAAC,CAAC,EACN;;;;;;;;;;;;;CAaC,CAAC"}
1	+ {"version":3,"file":"guessScenarioDataFromDescription.js","sourceRoot":"","sources":["../../../../../../packages/ai/src/lib/guessScenarioDataFromDescription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,4CAEN,MAAM,iEAAiE,CAAC;AACzE,OAAO,6CAA6C,MAAM,kEAAkE,CAAC;AAC7H,OAAO,EAAM,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAcxD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,uBAAuB,CAAC,EACpD,WAAW,EACX,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,sBAAsB,EACtB,sBAAsB,EACtB,KAAK,GACgC;IAGrC,MAAM,MAAM,GAAG,eAAe;QAC5B,CAAC,CAAC,6CAA6C,CAAC;YAC5C,WAAW;YACX,eAAe;YACf,eAAe;YACf,iBAAiB;YACjB,sBAAsB;SACvB,CAAC;QACJ,CAAC,CAAC,4CAA4C,CAAC;YAC3C,WAAW;YACX,iBAAiB;YACjB,sBAAsB;YACtB,sBAAsB;SACvB,CAAC,CAAC;IAEP,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC;QACpC,IAAI,EAAE,kCAAkC;QACxC,aAAa,EAAE,eAAe;YAC5B,CAAC,CAAC,iBAAiB,CAAC,eAAe,CAAC;YACpC,CAAC,CAAC,kBAAkB;QACtB,MAAM;QACN,KAAK,EAAE,KAAK,IAAI,oBAAoB;KACrC,CAAC,CAAC;IAEH,MAAM,WAAW,CAAC;QAChB,WAAW,EAAE,kCAAkC;QAC/C,SAAS,EAAE,KAAK;QAChB,SAAS,EAAE;YACT,WAAW;YACX,eAAe;YACf,eAAe;YACf,iBAAiB;YACjB,sBAAsB;YACtB,KAAK;SACN;QACD,GAAG,QAAQ,CAAC,KAAK;KAClB,CAAC,CAAC;IAEH,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,QAAQ,CAAC;IAEpD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,aAAa,CAAC,kBAAkB,CAAiC,CAAC;AAC3E,CAAC;AAED,MAAM,kBAAkB,GAAG;;;;;;;;;;;;;;;;;;;CAmB1B,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,eAA4C,EAAE,EAAE,CAAC;;;;EAK1E,eAAe;IACb,CAAC,CAAC;yMACmM;IACrM,CAAC,CAAC,EACN;;;;;;;;;;;;;CAaC,CAAC"}

package/packages/ai/src/lib/mergeStatements.js CHANGED Viewed

@@ -1,6 +1,28 @@
 import cleanOutBoundary from "./cleanOutBoundary.js";
 import { joinParenthesesAndArrays, splitOutsideParenthesesAndArrays, } from "./splitOutsideParentheses.js";
 export default function mergeStatements(statements) {
+    // Debug: Log input statements to understand what we're merging
+    const hasStateStructure = statements.some((s) => Object.keys(s.structure || {}).some((k) => k === 'state' || k.includes('state')));
+    const hasStateEquiv = statements.some((s) => Object.keys(s.equivalentVariables || {}).some((k) => k === 'state' || k.includes('state')));
+    if (hasStateStructure || hasStateEquiv) {
+        console.log(`[UNION-TYPE] mergeStatements INPUT: ${statements.length} statements`);
+        statements.forEach((s, i) => {
+            const stateInStructure = Object.entries(s.structure || {}).filter(([k]) => k === 'state' || k.includes('state'));
+            const stateInEquiv = Object.entries(s.equivalentVariables || {}).filter(([k]) => k === 'state' || k.includes('state'));
+            const sigInEquiv = Object.entries(s.equivalentVariables || {}).filter(([k, v]) => k === 'state' || v === 'signature[0]');
+            if (stateInStructure.length > 0 ||
+                stateInEquiv.length > 0 ||
+                sigInEquiv.length > 0) {
+                console.log(`[UNION-TYPE]   Statement ${i}:`);
+                if (stateInStructure.length > 0)
+                    console.log(`[UNION-TYPE]     structure: ${JSON.stringify(Object.fromEntries(stateInStructure))}`);
+                if (stateInEquiv.length > 0)
+                    console.log(`[UNION-TYPE]     equivalentVariables (state): ${JSON.stringify(Object.fromEntries(stateInEquiv))}`);
+                if (sigInEquiv.length > 0)
+                    console.log(`[UNION-TYPE]     equivalentVariables (sig): ${JSON.stringify(Object.fromEntries(sigInEquiv))}`);
+            }
+        });
+    }
     // This should be handled by the AST Analyzer but it currently has a bug
     const ensureFunctionCallReturnValue = (path, value) => {
         if (path.endsWith(')') && value !== 'function') {
@@ -45,6 +67,13 @@ export default function mergeStatements(statements) {
     const checkStructureKey = (key, value, mapping) => {
         if (!mapping[key] || mapping[key] === 'unknown') {
             mapping[key] = value;
+            return;
+        }
+        // Prefer union types (containing ' | ') over generic types like "string"
+        const existingIsGeneric = mapping[key] === 'string' || mapping[key] === 'unknown';
+        const newIsUnion = value.includes("'") && value.includes(' | ');
+        if (existingIsGeneric && newIsUnion) {
+            mapping[key] = value;
         }
     };
     const structure = statements.reduce((acc, result) => {
@@ -117,6 +146,33 @@ export default function mergeStatements(statements) {
         return acc;
     }, {});
     const llmCalls = statements.map((result) => result.llmCall).filter(Boolean);
+    // Propagate more specific types through equivalentVariables
+    // If we have equivalentVariables[A] = B, and structure[A] is more specific than structure[B],
+    // then update structure[B] to match structure[A]
+    // This handles cases like: "state" -> "signature[0]" where "state" has a union type
+    // Debug: Log union types in merged structure
+    const unionTypesInStructure = Object.entries(structure).filter(([_, v]) => typeof v === 'string' && v.includes("'") && v.includes(' | '));
+    if (unionTypesInStructure.length > 0) {
+        console.log(`[UNION-TYPE] mergeStatements: Found ${unionTypesInStructure.length} union types in merged structure`);
+        unionTypesInStructure.forEach(([k, v]) => console.log(`[UNION-TYPE]   structure["${k}"] = ${v}`));
+        console.log(`[UNION-TYPE] mergeStatements: equivalentVariables = ${JSON.stringify(equivalentVariables)}`);
+    }
+    for (const [source, target] of Object.entries(equivalentVariables)) {
+        const sourceType = structure[source];
+        const targetType = structure[target];
+        // Check if source has a more specific type (union type vs generic type)
+        if (sourceType) {
+            const sourceIsUnion = sourceType.includes("'") && sourceType.includes(' | ');
+            if (sourceIsUnion) {
+                // Target doesn't exist or is generic - propagate the union type
+                const targetIsGeneric = !targetType || targetType === 'string' || targetType === 'unknown';
+                if (targetIsGeneric) {
+                    console.log(`[UNION-TYPE] mergeStatements: Propagating "${source}" (${sourceType}) -> "${target}"`);
+                    structure[target] = sourceType;
+                }
+            }
+        }
+    }
     return { structure, equivalentVariables, llmCalls };
 }
 //# sourceMappingURL=mergeStatements.js.map

package/packages/ai/src/lib/mergeStatements.js.map CHANGED Viewed

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

package/packages/ai/src/lib/promptGenerators/gatherAttributesMap.js CHANGED Viewed

@@ -47,15 +47,57 @@ function validAttribute(attribute) {
     }
     return true;
 }
-export function gatherAttributesMap(entity, reverse = false) {
+/**
+ * Gathers attributes from data structures for use in prompts.
+ *
+ * @param isolatedDataStructure - The entity's own data structure (determines which paths to include)
+ * @param mergedDataStructureOrEquivalentVars - Either the merged data structure (with richer types from
+ *   dependent analyses) OR equivalentSignatureVariables for backwards compatibility
+ * @param equivalentSignatureVariablesOrReverse - Either equivalentSignatureVariables OR reverse flag
+ * @param reverseArg - The reverse flag (only used when all 4 args provided)
+ */
+export function gatherAttributesMap(isolatedDataStructure, mergedDataStructureOrEquivalentVars, equivalentSignatureVariablesOrReverse, reverseArg) {
+    // Handle backwards compatibility: detect if called with old signature
+    // Old: (mergedDataStructure, equivalentSignatureVariables?, reverse?)
+    // New: (isolatedDataStructure, mergedDataStructure, equivalentSignatureVariables?, reverse?)
+    let mergedDataStructure;
+    let equivalentSignatureVariables;
+    let reverse;
+    if (mergedDataStructureOrEquivalentVars &&
+        typeof mergedDataStructureOrEquivalentVars === 'object' &&
+        'dependencySchemas' in mergedDataStructureOrEquivalentVars) {
+        // New signature: (isolated, merged, equivalentVars?, reverse?)
+        mergedDataStructure = mergedDataStructureOrEquivalentVars;
+        equivalentSignatureVariables =
+            equivalentSignatureVariablesOrReverse ??
+                {};
+        reverse = reverseArg ?? false;
+    }
+    else {
+        // Old signature: (merged, equivalentVars?, reverse?)
+        // Use isolatedDataStructure as both isolated and merged for backwards compatibility
+        mergedDataStructure = null; // Will use isolatedDataStructure for types
+        equivalentSignatureVariables =
+            mergedDataStructureOrEquivalentVars ??
+                {};
+        reverse =
+            equivalentSignatureVariablesOrReverse ?? false;
+    }
     const attributesMap = {};
     const associationMap = {};
     // Maps internalPath -> full data structure path (e.g., "useDiffModal().diffView")
     const dataStructurePathMap = {};
-    const { signatureSchema, equivalentSignatureVariables, dependencySchemas } = entity.metadata.isolatedDataStructure;
-    for (const key in signatureSchema) {
+    // Use isolatedDataStructure for paths, but look up types in mergedDataStructure when available
+    const isolatedSignatureSchema = isolatedDataStructure.signatureSchema;
+    const mergedSignatureSchema = mergedDataStructure?.signatureSchema ?? isolatedSignatureSchema;
+    const isolatedDependencySchemas = isolatedDataStructure.dependencySchemas;
+    const mergedDependencySchemas = mergedDataStructure?.dependencySchemas ?? isolatedDependencySchemas;
+    // Process signature schema - use isolatedDataStructure keys, but merged types
+    for (const key in isolatedSignatureSchema) {
         const keyParts = splitOutsideParenthesesAndArrays(key);
         if (keyParts[0].startsWith('signature')) {
+            // Use merged type if available, otherwise fall back to isolated type
+            const typeValue = mergedSignatureSchema[key] ?? isolatedSignatureSchema[key];
             const equivalentSignatureVariable = equivalentSignatureVariables[keyParts[0]];
             const equivalentSignatureVariableParts = splitOutsideParenthesesAndArrays(equivalentSignatureVariable);
             if (equivalentSignatureVariable &&
@@ -65,7 +107,7 @@ export function gatherAttributesMap(entity, reverse = false) {
                     equivalentKey,
                     ...keyParts.slice(1),
                 ]);
-                attributesMap[equivalentPath] = signatureSchema[key];
+                attributesMap[equivalentPath] = typeValue;
                 associationMap[reverse ? equivalentPath : key] = reverse
                     ? key
                     : equivalentPath;
@@ -74,7 +116,7 @@ export function gatherAttributesMap(entity, reverse = false) {
             }
             else {
                 const relativePath = joinParenthesesAndArrays(keyParts.slice(1));
-                attributesMap[relativePath] = signatureSchema[key];
+                attributesMap[relativePath] = typeValue;
                 associationMap[reverse ? relativePath : key] = reverse
                     ? key
                     : relativePath;
@@ -83,22 +125,35 @@ export function gatherAttributesMap(entity, reverse = false) {
             }
         }
     }
-    for (const filePath in dependencySchemas) {
-        for (const entityName in dependencySchemas[filePath]) {
-            const returnValueDataStructure = dependencySchemas[filePath][entityName].returnValueSchema ?? {};
-            // First pass: collect all function paths
+    // Process dependency schemas - iterate through isolatedDependencySchemas (for which paths to include)
+    // but use mergedDependencySchemas for types (richer type information)
+    for (const filePath in isolatedDependencySchemas) {
+        for (const entityName in isolatedDependencySchemas[filePath]) {
+            // Get the isolated return value schema (determines which paths exist)
+            const isolatedReturnValueSchema = isolatedDependencySchemas[filePath][entityName].returnValueSchema ?? {};
+            // Get the merged return value schema (for richer types)
+            const mergedReturnValueSchema = mergedDependencySchemas?.[filePath]?.[entityName]?.returnValueSchema ??
+                isolatedReturnValueSchema;
+            // First pass: collect all function paths from merged schema (for broader coverage)
             const functionPaths = [];
-            for (const path in returnValueDataStructure) {
-                if (returnValueDataStructure[path] === 'function') {
+            for (const path in mergedReturnValueSchema) {
+                if (mergedReturnValueSchema[path] === 'function') {
                     functionPaths.push(path);
                 }
             }
-            // Second pass: process all paths
-            for (const path in returnValueDataStructure) {
+            // Second pass: process paths from merged schema, but only include paths that
+            // are rooted in an isolated path (i.e., isolatedDataStructure knows about this dependency)
+            for (const path in mergedReturnValueSchema) {
                 const pathParts = splitOutsideParenthesesAndArrays(path);
                 if (pathParts.length < 2)
                     continue;
-                if (returnValueDataStructure[path] === 'function') {
+                // Filter out paths that contain signature[N] anywhere
+                // These represent function input parameters, not data from data sources
+                // Key attributes must reference data sources, not function inputs
+                if (pathParts.some((part) => part.startsWith('signature['))) {
+                    continue;
+                }
+                if (mergedReturnValueSchema[path] === 'function') {
                     continue;
                 }
                 // Check if this path is inside a function (but not a function return value we care about)
@@ -137,7 +192,7 @@ export function gatherAttributesMap(entity, reverse = false) {
                             const relativePath = path;
                             if (!validAttribute(relativePath))
                                 continue;
-                            attributesMap[relativePath] = returnValueDataStructure[path];
+                            attributesMap[relativePath] = mergedReturnValueSchema[path];
                             associationMap[reverse ? relativePath : path] = reverse
                                 ? path
                                 : relativePath;
@@ -153,7 +208,8 @@ export function gatherAttributesMap(entity, reverse = false) {
                     continue;
                 // Normalize the path for internal use (e.g., ['*'] -> '*')
                 const relativePath = normalizePathForInternalUse(rawRelativePath);
-                attributesMap[relativePath] = returnValueDataStructure[path];
+                // Use the type from mergedReturnValueSchema
+                attributesMap[relativePath] = mergedReturnValueSchema[path];
                 associationMap[reverse ? relativePath : path] = reverse
                     ? path
                     : relativePath;

package/packages/ai/src/lib/promptGenerators/gatherAttributesMap.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"gatherAttributesMap.js","sourceRoot":"","sources":["../../../../../../../packages/ai/src/lib/promptGenerators/gatherAttributesMap.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,qBAAqB,CAAC;AACnD,OAAO,EACL,wBAAwB,EACxB,gCAAgC,GACjC,MAAM,4BAA4B,CAAC;AAEpC;;;;GAIG;AACH,SAAS,uBAAuB,CAAC,SAAiB;IAChD,0CAA0C;IAC1C,OAAO,sBAAsB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAChD,CAAC;AAED;;;GAGG;AACH,SAAS,uBAAuB,CAAC,SAAiB;IAChD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACxD,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACjC,CAAC;AAED;;;;GAIG;AACH,SAAS,2BAA2B,CAAC,IAAY;IAC/C,MAAM,SAAS,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAChD,OAAO,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;AAC/C,CAAC;AAED,SAAS,cAAc,CAAC,SAAiB;IACvC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAEvD,4DAA4D;IAC5D,oEAAoE;IACpE,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9B,OAAO,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,cAAc,GAAG,gCAAgC,CAAC,SAAS,CAAC,CAAC;IACnE,IACE,cAAc,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC3B,gBAAgB,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAC/D,EACD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,2EAA2E;IAC3E,kEAAkE;IAClE,yCAAyC;IACzC,IACE,cAAc,CAAC,MAAM,GAAG,CAAC;QACzB,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,EACrE,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,~~MAAgC~~,~~EAChC~~,OAAO,GAAG,KAAK;~~IAEf~~,MAAM,aAAa,GAA2B,EAAE,CAAC;IACjD,MAAM,cAAc,GAA2B,EAAE,CAAC;IAClD,kFAAkF;IAClF,MAAM,oBAAoB,GAA2B,EAAE,CAAC;~~IACxD~~,MAAM,~~EAAE~~,eAAe,~~EAAE~~,~~4BAA4B~~,~~EAAE~~,~~iBAAiB~~,EAAE,~~GACxE~~,MAAM,CAAC,~~QAAQ~~,CAAC,~~qBAAqB~~,CAAC;~~IACxC~~,KAAK,MAAM,GAAG,IAAI,~~eAAe~~,EAAE,CAAC;~~QAClC~~,MAAM,QAAQ,GAAG,gCAAgC,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACxC,MAAM,2BAA2B,GAC/B,4BAA4B,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,MAAM,gCAAgC,GAAG,gCAAgC,CACvE,2BAA2B,CAC5B,CAAC;YACF,IACE,2BAA2B;gBAC3B,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAClD,CAAC;gBACD,MAAM,aAAa,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChE,MAAM,cAAc,GAAG,wBAAwB,CAAC;oBAC9C,aAAa;oBACb,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;iBACrB,CAAC,CAAC;gBACH,aAAa,CAAC,cAAc,CAAC,GAAG,~~eAAe~~,CAAC~~,GAAG,CAAC,CAAC~~;~~gBACrD~~,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO;oBACtD,CAAC,CAAC,GAAG;oBACL,CAAC,CAAC,cAAc,CAAC;gBACnB,+EAA+E;gBAC/E,oBAAoB,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC;YACxD,CAAC;iBAAM,CAAC;gBACN,MAAM,YAAY,GAAG,wBAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjE,aAAa,CAAC,YAAY,CAAC,GAAG,~~eAAe~~,CAAC~~,GAAG,CAAC,CAAC~~;~~gBACnD~~,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO;oBACpD,CAAC,CAAC,GAAG;oBACL,CAAC,CAAC,YAAY,CAAC;gBACjB,+EAA+E;gBAC/E,oBAAoB,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;YACpD,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,~~iBAAiB~~,EAAE,CAAC;~~QACzC~~,KAAK,MAAM,UAAU,IAAI,~~iBAAiB~~,CAAC,QAAQ,CAAC,EAAE,CAAC;~~YACrD~~,MAAM,~~wBAAwB~~,~~GAC5B~~,~~iBAAiB~~,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC,iBAAiB,IAAI,EAAE,CAAC;~~YAElE~~,~~yCAAyC~~;~~YACzC~~,MAAM,aAAa,GAAa,EAAE,CAAC;YACnC,KAAK,MAAM,IAAI,IAAI,~~wBAAwB~~,EAAE,CAAC;~~gBAC5C~~,IAAI,~~wBAAwB~~,CAAC,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;~~oBAClD~~,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC;YAED,~~iCAAiC~~;~~YACjC~~,KAAK,MAAM,IAAI,IAAI,~~wBAAwB~~,EAAE,CAAC;~~gBAC5C~~,MAAM,SAAS,GAAG,gCAAgC,CAAC,IAAI,CAAC,CAAC;gBACzD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;oBAAE,SAAS;gBAEnC,IAAI,~~wBAAwB~~,CAAC,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;~~oBAClD~~,SAAS;gBACX,CAAC;gBAED,0FAA0F;gBAC1F,0DAA0D;gBAC1D,MAAM,oBAAoB,GAAG,aAAa;qBACvC,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;qBACvD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1C,IAAI,oBAAoB,EAAE,CAAC;oBACzB,6DAA6D;oBAC7D,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;oBAElE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE,CAAC;wBAC1D,6EAA6E;wBAC7E,UAAU;wBACV,SAAS;oBACX,CAAC;oBAED,gEAAgE;oBAChE,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAAC;oBAChE,IAAI,aAAa,EAAE,CAAC;wBAClB,sFAAsF;wBACtF,uEAAuE;wBACvE,MAAM,iBAAiB,GACrB,gCAAgC,CAAC,oBAAoB,CAAC,CAAC;wBACzD,MAAM,gBAAgB,GACpB,iBAAiB,CAAC,MAAM,GAAG,CAAC;4BAC1B,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;4BACjD,CAAC,CAAC,IAAI,CAAC;wBACX,MAAM,qBAAqB,GACzB,iBAAiB,CAAC,MAAM,GAAG,CAAC;4BAC1B,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;4BACjD,CAAC,CAAC,IAAI,CAAC;wBAEX,gFAAgF;wBAChF,yCAAyC;wBACzC,MAAM,sBAAsB,GAC1B,gBAAgB;4BAChB,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC;4BAChC,qBAAqB;4BACrB,qBAAqB,KAAK,yBAAyB,CAAC;wBAEtD,IAAI,sBAAsB,EAAE,CAAC;4BAC3B,wDAAwD;4BACxD,MAAM,YAAY,GAAG,IAAI,CAAC;4BAC1B,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC;gCAAE,SAAS;4BAE5C,aAAa,CAAC,YAAY,CAAC,GAAG,~~wBAAwB~~,CAAC,IAAI,CAAC,CAAC;~~4BAC7D~~,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO;gCACrD,CAAC,CAAC,IAAI;gCACN,CAAC,CAAC,YAAY,CAAC;4BACjB,6EAA6E;4BAC7E,oBAAoB,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;4BAClD,SAAS;wBACX,CAAC;oBACH,CAAC;oBACD,sEAAsE;gBACxE,CAAC;gBAED,MAAM,eAAe,GAAG,wBAAwB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACrE,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC;oBAAE,SAAS;gBAE/C,2DAA2D;gBAC3D,MAAM,YAAY,GAAG,2BAA2B,CAAC,eAAe,CAAC,CAAC;gBAElE,aAAa,CAAC,YAAY,CAAC,GAAG,~~wBAAwB~~,CAAC,IAAI,CAAC,CAAC;~~gBAC7D~~,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO;oBACrD,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC,YAAY,CAAC;gBAEjB,2DAA2D;gBAC3D,sEAAsE;gBACtE,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,6DAA6D;gBACnG,MAAM,iBAAiB,GAAG,GAAG,eAAe,IAAI,YAAY,EAAE,CAAC;gBAC/D,oBAAoB,CAAC,YAAY,CAAC,GAAG,iBAAiB,CAAC;YACzD,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE,CAAC;QACtC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,OAAO,aAAa,CAAC,SAAS,CAAC,CAAC;YAChC,OAAO,oBAAoB,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,oBAAoB,EAAE,CAAC;AACjE,CAAC"}
1	+ {"version":3,"file":"gatherAttributesMap.js","sourceRoot":"","sources":["../../../../../../../packages/ai/src/lib/promptGenerators/gatherAttributesMap.ts"],"names":[],"mappings":"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"}