@codeyam/codeyam-cli 0.1.0-staging.323686 → 0.1.0-staging.483fdc2

package/analyzer-template/packages/analyze/src/lib/files/scenarios/propagateArrayItemSchemas.ts

@@ -0,0 +1,474 @@
+import { splitOutsideParenthesesAndArrays } from '~codeyam/ai';
+import { DataStructure } from '~codeyam/types';
+
+// Safety limits to prevent combinatorial explosion
+const MAX_SCHEMA_PATHS = 15000; // Don't propagate if schema already has this many paths
+const MAX_PATHS_TO_ADD = 5000; // Stop adding paths after this many new paths
+const MAX_ARRAY_NESTING_DEPTH = 3; // Don't propagate paths with more than this many [] levels
+
+/**
+ * Count the number of array levels in a path.
+ * e.g., "entities[].analyses[].scenarios[]" has 3 levels
+ */
+function countArrayLevels(path: string): number {
+  return (path.match(/\[\]/g) || []).length;
+}
+
+/**
+ * Check if appending suffix to prefix would create a recursive path.
+ * A path is recursive if it contains the same array name twice.
+ * e.g., "entities[].analyses[].scenarios[].analyses[]" has "analyses" twice.
+ */
+function wouldCreateRecursivePath(prefix: string, suffix: string): boolean {
+  // Extract array names from prefix (names that appear before [])
+  const prefixArrayNames = new Set<string>();
+  const prefixMatches = prefix.matchAll(/\.?([a-zA-Z_][a-zA-Z0-9_]*)\[\]/g);
+  for (const match of prefixMatches) {
+    prefixArrayNames.add(match[1].toLowerCase());
+  }
+
+  // Check if any array name in suffix already exists in prefix
+  const suffixMatches = suffix.matchAll(/\.?([a-zA-Z_][a-zA-Z0-9_]*)\[\]/g);
+  for (const match of suffixMatches) {
+    if (prefixArrayNames.has(match[1].toLowerCase())) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * Propagates array item schemas between arrays that likely have the same type.
+ *
+ * When the Rust analyzer traces property accesses, it may trace item properties for
+ * one array but not another, even though they have the same TypeScript type. This
+ * happens when:
+ * - One array is accessed directly in code (e.g., `entities.forEach(e => e.name)`)
+ * - Another array is only used as a fallback in an OR expression
+ *   (e.g., `const displayEntities = currentlyExecuting?.entities || currentEntities`)
+ *
+ * In this case, `entities` gets `entities[]`, `entities[].name`, etc. traced,
+ * but `currentEntities` only gets `currentEntities: "array"` with no item schema.
+ *
+ * This function finds arrays without item schemas and copies item schemas from
+ * other arrays that appear to have the same type based on naming conventions.
+ *
+ * Heuristics for matching arrays:
+ * 1. Same suffix (e.g., `currentEntities` matches `entities`, `queueJobs[].entities` matches `entities`)
+ * 2. One name is a plural/singular form of the other
+ */
+export default function propagateArrayItemSchemas(
+  dependencySchemas: DataStructure['dependencySchemas'],
+): void {
+  if (!dependencySchemas) {
+    console.log('[PROPAGATE] No dependencySchemas provided');
+    return;
+  }
+
+  // Log what we're working with
+  const packages = Object.keys(dependencySchemas);
+  console.log('[PROPAGATE] Processing packages:', packages);
+
+  // PHASE 1: Run per-entity propagation (original behavior)
+  // This propagates array item schemas within each entity's own schema.
+  console.log('[PROPAGATE] === PHASE 1: Per-entity propagation ===');
+  for (const filePath in dependencySchemas) {
+    for (const entityName in dependencySchemas[filePath]) {
+      const schema = dependencySchemas[filePath][entityName]?.returnValueSchema;
+      if (!schema) {
+        continue;
+      }
+      const beforeCount = Object.keys(schema).length;
+
+      propagateArrayItemSchemasInSchema(schema);
+
+      const afterCount = Object.keys(schema).length;
+
+      if (beforeCount !== afterCount) {
+        console.log(
+          `[PROPAGATE] PHASE1 ${filePath}/${entityName}: ${beforeCount} -> ${afterCount} paths`,
+        );
+      }
+    }
+  }
+
+  // PHASE 2: Cross-entity propagation within the same package
+  // When we have call-specific entities like `useLoaderData<typeof loader>()`,
+  // they may be missing array item paths that exist in the base entity `useLoaderData`.
+  // Copy array item paths from base entities to call-specific entities.
+  console.log('[PROPAGATE] === PHASE 2: Cross-entity propagation ===');
+  for (const filePath in dependencySchemas) {
+    const entities = dependencySchemas[filePath];
+    const entityNames = Object.keys(entities);
+
+    for (const entityName of entityNames) {
+      // Check if this is a call-specific entity (ends with function call syntax)
+      if (!entityName.includes('(')) {
+        continue;
+      }
+
+      // Find the base entity name (e.g., "useLoaderData<typeof loader>()" -> "useLoaderData")
+      const baseEntityName = entityName.split(/[(<]/)[0];
+
+      if (!baseEntityName || !entities[baseEntityName]) {
+        console.log(
+          `[PROPAGATE] PHASE2: No base entity '${baseEntityName}' for '${entityName}'`,
+        );
+        continue;
+      }
+
+      const callSpecificSchema = entities[entityName]?.returnValueSchema;
+      const baseSchema = entities[baseEntityName]?.returnValueSchema;
+
+      if (!callSpecificSchema || !baseSchema) {
+        continue;
+      }
+
+      console.log(
+        `[PROPAGATE] PHASE2: Copying from '${baseEntityName}' (${Object.keys(baseSchema).length} paths) to '${entityName}' (${Object.keys(callSpecificSchema).length} paths)`,
+      );
+
+      // Check what paths exist in base but not in call-specific
+      const baseHasEntitiesFilePath = Object.keys(baseSchema).some((p) =>
+        p.includes('currentlyExecuting.entities[].filePath'),
+      );
+      const callSpecificHasEntitiesFilePath = Object.keys(
+        callSpecificSchema,
+      ).some((p) => p.includes('currentlyExecuting.entities[].filePath'));
+
+      console.log(
+        `[PROPAGATE] PHASE2: base has currentlyExecuting.entities[].filePath: ${baseHasEntitiesFilePath}`,
+      );
+      console.log(
+        `[PROPAGATE] PHASE2: callSpecific has currentlyExecuting.entities[].filePath: ${callSpecificHasEntitiesFilePath}`,
+      );
+
+      // Copy any array item paths from base schema to call-specific schema
+      // that are missing in the call-specific schema
+      let copiedCount = 0;
+      const copiedPaths: string[] = [];
+      for (const path in baseSchema) {
+        // Only copy paths that include array element notation
+        if (!path.includes('[]')) continue;
+        // Only copy if not already present
+        if (callSpecificSchema[path]) continue;
+
+        callSpecificSchema[path] = baseSchema[path];
+        copiedCount++;
+
+        // Track specific paths we care about
+        if (path.includes('currentlyExecuting.entities[]')) {
+          copiedPaths.push(path);
+        }
+      }
+
+      console.log(`[PROPAGATE] PHASE2: Copied ${copiedCount} paths`);
+      if (copiedPaths.length > 0) {
+        console.log(
+          '[PROPAGATE] PHASE2: Copied currentlyExecuting.entities paths:',
+          copiedPaths,
+        );
+      }
+
+      // Verify after copy
+      const afterHasEntitiesFilePath = Object.keys(callSpecificSchema).some(
+        (p) => p.includes('currentlyExecuting.entities[].filePath'),
+      );
+      console.log(
+        `[PROPAGATE] PHASE2: AFTER copy, callSpecific has currentlyExecuting.entities[].filePath: ${afterHasEntitiesFilePath}`,
+      );
+    }
+  }
+
+  console.log('[PROPAGATE] === DONE ===');
+}
+
+/**
+ * Helper to extract the "base name" from an array path for matching purposes.
+ * e.g., "currentEntities" -> "entities"
+ * e.g., "validCurrentEntities" -> "entities"
+ * e.g., "queueJobs[].entities" -> "entities"
+ * e.g., "entities" -> "entities"
+ */
+function extractArrayBaseName(path: string): string {
+  // Get the last segment of the path (after the last dot, if any)
+  const parts = splitOutsideParenthesesAndArrays(path);
+  const lastPart = parts[parts.length - 1] || path;
+
+  // Remove trailing [] if present
+  const name = lastPart.replace(/\[\]$/, '');
+
+  // Common prefixes that can be stripped for matching
+  const prefixes = [
+    'current',
+    'valid',
+    'filtered',
+    'all',
+    'new',
+    'old',
+    'display',
+    'active',
+    'selected',
+    'loaded',
+    'fetched',
+  ];
+
+  // Keep stripping prefixes until no more match
+  let baseName = name;
+  let changed = true;
+  while (changed) {
+    changed = false;
+    for (const prefix of prefixes) {
+      if (
+        baseName.toLowerCase().startsWith(prefix) &&
+        baseName.length > prefix.length
+      ) {
+        // Remove prefix and lowercase the first char
+        baseName = baseName.slice(prefix.length);
+        baseName = baseName.charAt(0).toLowerCase() + baseName.slice(1);
+        changed = true;
+        break;
+      }
+    }
+  }
+
+  return baseName.toLowerCase();
+}
+
+/**
+ * Check if two array names likely refer to the same type.
+ */
+function arrayNamesMatch(name1: string, name2: string): boolean {
+  const base1 = extractArrayBaseName(name1);
+  const base2 = extractArrayBaseName(name2);
+
+  if (base1 === base2) return true;
+
+  // Check singular/plural relationships
+  if (base1 + 's' === base2 || base2 + 's' === base1) return true;
+  if (base1 + 'es' === base2 || base2 + 'es' === base1) return true;
+
+  // Handle "ies" plural (e.g., entity -> entities)
+  if (base1.endsWith('ies') && base1.slice(0, -3) + 'y' === base2) return true;
+  if (base2.endsWith('ies') && base2.slice(0, -3) + 'y' === base1) return true;
+
+  return false;
+}
+
+/**
+ * Count the number of item properties an array has in the schema.
+ */
+function countArrayItemProperties(
+  schema: Record<string, string>,
+  arrayPath: string,
+): number {
+  const elementPrefix = arrayPath + '[]';
+  let count = 0;
+  for (const path in schema) {
+    if (path.startsWith(elementPrefix)) {
+      count++;
+    }
+  }
+  return count;
+}
+
+function propagateArrayItemSchemasInSchema(
+  schema: Record<string, string>,
+): void {
+  // Safety check: Don't propagate if schema is already very large
+  const initialPathCount = Object.keys(schema).length;
+  if (initialPathCount > MAX_SCHEMA_PATHS) {
+    console.log(
+      `[PROPAGATE] SKIPPING: Schema already has ${initialPathCount} paths (limit: ${MAX_SCHEMA_PATHS})`,
+    );
+    return;
+  }
+
+  let totalPathsAdded = 0;
+
+  // Find all array paths and categorize them
+  const arraysWithItemSchema: string[] = [];
+  const arraysWithoutItemSchema: string[] = [];
+
+  for (const path in schema) {
+    const type = schema[path];
+
+    // Check if this is an array type (including "array | undefined", etc.)
+    if (!type.startsWith('array')) continue;
+
+    // Check if this is an array element path (ends with [])
+    if (path.endsWith('[]')) continue;
+
+    // This is an array declaration, not an element. Check if it has item schema.
+    const elementPath = path + '[]';
+    if (schema[elementPath]) {
+      arraysWithItemSchema.push(path);
+    } else {
+      arraysWithoutItemSchema.push(path);
+    }
+  }
+
+  // For each array without item schema, try to find a matching array with schema
+  for (const emptyArrayPath of arraysWithoutItemSchema) {
+    let bestMatch: string | null = null;
+    let bestMatchScore = 0;
+
+    for (const richArrayPath of arraysWithItemSchema) {
+      if (!arrayNamesMatch(emptyArrayPath, richArrayPath)) continue;
+
+      // Score the match - prefer shorter paths (less nested) as they're more likely primary
+      // and prefer paths that are more similar in structure
+      const emptyDepth = emptyArrayPath.split('.').length;
+      const richDepth = richArrayPath.split('.').length;
+      const depthDiff = Math.abs(emptyDepth - richDepth);
+      const score = 100 - depthDiff * 10 - richDepth;
+
+      if (score > bestMatchScore) {
+        bestMatchScore = score;
+        bestMatch = richArrayPath;
+      }
+    }
+
+    if (bestMatch) {
+      // Safety check: Stop if we've added too many paths
+      if (totalPathsAdded >= MAX_PATHS_TO_ADD) {
+        console.log(
+          `[PROPAGATE] STOPPING FIRST PASS: Already added ${totalPathsAdded} paths (limit: ${MAX_PATHS_TO_ADD})`,
+        );
+        break;
+      }
+
+      // Copy item schema from the rich array to the empty array
+      const richElementPrefix = bestMatch + '[]';
+      const emptyElementPrefix = emptyArrayPath + '[]';
+
+      // Find all paths that start with the rich array's element path
+      const pathsToCheck = Object.keys(schema);
+
+      for (const path of pathsToCheck) {
+        if (path.startsWith(richElementPrefix)) {
+          const suffix = path.slice(richElementPrefix.length);
+          const newPath = emptyElementPrefix + suffix;
+
+          // Skip if this would create a recursive path (suffix contains array names that are already in the prefix)
+          if (wouldCreateRecursivePath(emptyElementPrefix, suffix)) {
+            continue;
+          }
+
+          // Skip if the new path would have too many array levels
+          if (countArrayLevels(newPath) > MAX_ARRAY_NESTING_DEPTH) {
+            continue;
+          }
+
+          // Safety check: Stop if we've added too many paths
+          if (totalPathsAdded >= MAX_PATHS_TO_ADD) {
+            break;
+          }
+
+          // Only add if the path doesn't already exist
+          if (!schema[newPath]) {
+            schema[newPath] = schema[path];
+            totalPathsAdded++;
+          }
+        }
+      }
+    }
+  }
+
+  // SECOND PASS: For arrays that have PARTIAL item schemas (some but not all properties),
+  // propagate missing properties from matching arrays with more complete schemas.
+  // This handles the case where e.g. currentlyExecuting.entities has sha traced
+  // but is missing filePath, name, etc. that entities[] has.
+
+  // Safety check: Skip second pass if we've already hit the limit
+  if (totalPathsAdded >= MAX_PATHS_TO_ADD) {
+    console.log(
+      `[PROPAGATE] SKIPPING SECOND PASS: Already added ${totalPathsAdded} paths`,
+    );
+    return;
+  }
+
+  for (const partialArrayPath of arraysWithItemSchema) {
+    // Safety check: Stop if we've added too many paths
+    if (totalPathsAdded >= MAX_PATHS_TO_ADD) {
+      console.log(
+        `[PROPAGATE] STOPPING SECOND PASS: Already added ${totalPathsAdded} paths (limit: ${MAX_PATHS_TO_ADD})`,
+      );
+      break;
+    }
+
+    const partialCount = countArrayItemProperties(schema, partialArrayPath);
+
+    // Find the best matching array with MORE properties
+    let bestMatch: string | null = null;
+    let bestMatchScore = 0;
+    let bestMatchCount = partialCount;
+
+    for (const richArrayPath of arraysWithItemSchema) {
+      if (richArrayPath === partialArrayPath) continue;
+      if (!arrayNamesMatch(partialArrayPath, richArrayPath)) continue;
+
+      const richCount = countArrayItemProperties(schema, richArrayPath);
+
+      // Only consider arrays with MORE properties
+      if (richCount <= partialCount) continue;
+
+      // Score the match - prefer arrays with more properties and shallower depth
+      const partialDepth = partialArrayPath.split('.').length;
+      const richDepth = richArrayPath.split('.').length;
+      const depthDiff = Math.abs(partialDepth - richDepth);
+      const score = richCount * 10 - depthDiff * 5 - richDepth;
+
+      if (score > bestMatchScore || richCount > bestMatchCount) {
+        bestMatchScore = score;
+        bestMatch = richArrayPath;
+        bestMatchCount = richCount;
+      }
+    }
+
+    if (bestMatch) {
+      // Copy MISSING item properties from the rich array to the partial array
+      const richElementPrefix = bestMatch + '[]';
+      const partialElementPrefix = partialArrayPath + '[]';
+
+      const pathsToCheck = Object.keys(schema);
+
+      for (const path of pathsToCheck) {
+        if (path.startsWith(richElementPrefix)) {
+          const suffix = path.slice(richElementPrefix.length);
+          const newPath = partialElementPrefix + suffix;
+
+          // Skip if this would create a recursive path
+          if (wouldCreateRecursivePath(partialElementPrefix, suffix)) {
+            continue;
+          }
+
+          // Skip if the new path would have too many array levels
+          if (countArrayLevels(newPath) > MAX_ARRAY_NESTING_DEPTH) {
+            continue;
+          }
+
+          // Safety check: Stop if we've added too many paths
+          if (totalPathsAdded >= MAX_PATHS_TO_ADD) {
+            break;
+          }
+
+          // Only add if the path doesn't already exist (don't overwrite)
+          if (!schema[newPath]) {
+            schema[newPath] = schema[path];
+            totalPathsAdded++;
+          }
+        }
+      }
+    }
+  }
+
+  // Log final stats
+  if (totalPathsAdded > 0) {
+    const finalPathCount = Object.keys(schema).length;
+    console.log(
+      `[PROPAGATE] Added ${totalPathsAdded} paths (${initialPathCount} -> ${finalPathCount})`,
+    );
+  }
+}

package/analyzer-template/packages/analyze/src/lib/files/setImportedExports.ts

@@ -1,5 +1,6 @@
 import { Commit, Entity, File } from '~codeyam/types';
 import { ProjectAnalyzer } from '../ProjectAnalyzer';
+import { getFileByPathSafe } from '../utils/getFileByPath';
 import getImportedExports from './getImportedExports';
 import { getFrameworkForFile, isFrameworkRoute } from '~codeyam/utils';
 import findOrCreateEntity from './analyze/findOrCreateEntity';
@@ -149,7 +150,7 @@ export default async function setImportedExports({
             // Use fileStore for O(1) lookup when available, fallback to O(n) find
             const relevantFile =
               fileStore?.getByPath(resolvedFilePath) ??
-              project.files.find((f) => f.path === resolvedFilePath);
+              getFileByPathSafe(projectAnalyzer, resolvedFilePath);
 
             if (relevantFile) {
               const relevantFileAnalyzer =

package/analyzer-template/packages/analyze/src/lib/utils/getFileByPath.ts

@@ -0,0 +1,19 @@
+import { File } from '~codeyam/types';
+import { ProjectAnalyzer } from '../ProjectAnalyzer';
+
+export function getFileByPathSafe(
+  projectAnalyzer: ProjectAnalyzer,
+  filePath: string,
+): File | undefined {
+  const maybeGetFileByPath = (projectAnalyzer as any).getFileByPath;
+  if (typeof maybeGetFileByPath === 'function') {
+    return maybeGetFileByPath.call(projectAnalyzer, filePath);
+  }
+
+  const projectFiles = (projectAnalyzer as any).project?.files;
+  if (Array.isArray(projectFiles)) {
+    return projectFiles.find((file: File) => file.path === filePath);
+  }
+
+  return undefined;
+}

package/analyzer-template/packages/aws/package.json

@@ -12,7 +12,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws-sdk/client-codebuild": "^3.948.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.966.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.980.0",
     "@aws-sdk/client-dynamodb": "^3.956.0",
     "@aws-sdk/client-ecr": "^3.948.0",
     "@aws-sdk/client-ecs": "^3.956.0",

package/analyzer-template/packages/github/dist/types/src/types/ScenariosDataStructure.d.ts

@@ -14,8 +14,8 @@ export interface ConditionalUsage {
     conditionType: 'truthiness' | 'comparison' | 'switch';
     /** For comparison conditions, the literal values being compared against */
     comparedValues?: string[];
-    /** Where this conditional usage occurs */
-    location: 'if' | 'ternary' | 'logical-and' | 'switch';
+    /** Where this conditional usage occurs. 'unconditional' is for always-rendered children with data props. */
+    location: 'if' | 'ternary' | 'logical-and' | 'switch' | 'unconditional';
     /** Source location information for this conditional usage */
     sourceLocation?: {
         /** Line number (1-based) */
@@ -91,8 +91,8 @@ export interface CompoundConditional {
         /** Required value for this condition to be true */
         requiredValue?: string | boolean;
     }[];
-    /** Where this compound conditional occurs */
-    location: 'if' | 'ternary' | 'logical-and' | 'switch';
+    /** Where this compound conditional occurs. 'unconditional' is for always-rendered children. */
+    location: 'if' | 'ternary' | 'logical-and' | 'switch' | 'unconditional';
     /** Source location for the entire compound expression */
     sourceLocation: {
         lineNumber: number;
@@ -175,7 +175,7 @@ export interface DataStructure {
         [key: string]: string;
     };
     equivalentSignatureVariables: {
-        [key: string]: string;
+        [key: string]: string | string[];
     };
     usageEquivalencies?: {
         [key: string]: {

package/analyzer-template/packages/github/dist/types/src/types/ScenariosDataStructure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScenariosDataStructure.d.ts","sourceRoot":"","sources":["../../../../../types/src/types/ScenariosDataStructure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,kBAAkB,CAAC;CACnC;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,sDAAsD;IACtD,aAAa,EAAE,YAAY,GAAG,YAAY,GAAG,QAAQ,CAAC;IACtD,2EAA2E;IAC3E,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,0CAA0C;IAC1C,QAAQ,EAAE,IAAI,GAAG,SAAS,GAAG,aAAa,GAAG,QAAQ,CAAC;IACtD,6DAA6D;IAC7D,cAAc,CAAC,EAAE;QACf,4BAA4B;QAC5B,UAAU,EAAE,MAAM,CAAC;QACnB,8BAA8B;QAC9B,MAAM,EAAE,MAAM,CAAC;QACf,mDAAmD;QACnD,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,gGAAgG;IAChG,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,2CAA2C;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,+CAA+C;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qDAAqD;IACrD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B;;;;;;;;OAQG;IACH,WAAW,CAAC,EAAE;QACZ,4DAA4D;QAC5D,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,6CAA6C;QAC7C,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;QACvB,+CAA+C;QAC/C,SAAS,EACL,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,WAAW,GACX,IAAI,GACJ,KAAK,GACL,eAAe,GACf,WAAW,GACX,YAAY,GACZ,aAAa,CAAC;QAClB,6DAA6D;QAC7D,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;IAEF;;;;;;;;;;OAUG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAC;IAChB,mFAAmF;IACnF,UAAU,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,UAAU,EAAE;QACV,IAAI,EAAE,MAAM,CAAC;QACb,aAAa,EAAE,YAAY,GAAG,YAAY,GAAG,QAAQ,CAAC;QACtD,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAC1B,SAAS,EAAE,OAAO,CAAC;QACnB,mDAAmD;QACnD,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;KAClC,EAAE,CAAC;IACJ,6CAA6C;IAC7C,QAAQ,EAAE,IAAI,GAAG,SAAS,GAAG,aAAa,GAAG,QAAQ,CAAC;IACtD,yDAAyD;IACzD,cAAc,EAAE;QACd,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,SAAS,CAAC,EAAE;QACV,oDAAoD;QACpD,IAAI,EAAE,MAAM,CAAC;QACb,8BAA8B;QAC9B,aAAa,EAAE,YAAY,GAAG,YAAY,GAAG,QAAQ,CAAC;QACtD,4DAA4D;QAC5D,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAC1B,kDAAkD;QAClD,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC;KACjC,CAAC;IAEF;;;OAGG;IACH,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,6BAA6B;QAC7B,IAAI,EAAE,MAAM,CAAC;QACb,8BAA8B;QAC9B,aAAa,EAAE,YAAY,GAAG,YAAY,GAAG,QAAQ,CAAC;QACtD,oCAAoC;QACpC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAC1B,uDAAuD;QACvD,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC;KACjC,CAAC,CAAC;IAEH;;OAEG;IACH,MAAM,EAAE;QACN,oEAAoE;QACpE,IAAI,EAAE,QAAQ,CAAC;QACf,iFAAiF;QACjF,aAAa,EAAE,MAAM,CAAC;QACtB,sDAAsD;QACtD,UAAU,EAAE,MAAM,CAAC;QACnB,uDAAuD;QACvD,KAAK,EAAE,MAAM,CAAC;QACd,kCAAkC;QAClC,SAAS,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;KACjE,CAAC;IAEF;;OAEG;IACH,cAAc,CAAC,EAAE;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,MAAM,WAAW,aAAa;IAC5B,eAAe,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC3C,iBAAiB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,4BAA4B,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACxD,kBAAkB,CAAC,EAAE;QACnB,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,aAAa,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAChE,CAAC;IACF,mBAAmB,CAAC,EAAE;QACpB,CAAC,GAAG,EAAE,MAAM,GAAG;YAAE,aAAa,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAChE,CAAC;IACF,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE;QACjB,CAAC,kBAAkB,EAAE,MAAM,GAAG;YAC5B,CAAC,oBAAoB,EAAE,MAAM,GAAG;gBAC9B,eAAe,EAAE;oBAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;iBAAE,CAAC;gBAC3C,iBAAiB,EAAE;oBAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;iBAAE,CAAC;gBAC7C,kBAAkB,CAAC,EAAE;oBACnB,CAAC,GAAG,EAAE,MAAM,GAAG;wBAAE,aAAa,EAAE,MAAM,CAAC;wBAAC,UAAU,EAAE,MAAM,CAAA;qBAAE,EAAE,CAAC;iBAChE,CAAC;gBACF,mBAAmB,CAAC,EAAE;oBACpB,CAAC,GAAG,EAAE,MAAM,GAAG;wBAAE,aAAa,EAAE,MAAM,CAAC;wBAAC,UAAU,EAAE,MAAM,CAAA;qBAAE,EAAE,CAAC;iBAChE,CAAC;aACH,CAAC;SACH,CAAC;KACH,CAAC;IACF,0EAA0E;IAC1E,iBAAiB,CAAC,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;KAAE,CAAC;IACpE,oFAAoF;IACpF,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAC7C,gFAAgF;IAChF,kBAAkB,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACzC,iIAAiI;IACjI,6BAA6B,CAAC,EAAE;QAC9B,CAAC,kBAAkB,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAC;KAClD,CAAC;IACF,wFAAwF;IACxF,kBAAkB,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACzC,+IAA+I;IAC/I,gBAAgB,CAAC,EAAE;QACjB,CAAC,YAAY,EAAE,MAAM,GAAG;YACtB,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;YACvB,SAAS,EACL,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,WAAW,GACX,IAAI,GACJ,KAAK,GACL,eAAe,GACf,WAAW,GACX,YAAY,GACZ,aAAa,CAAC;YAClB,aAAa,CAAC,EAAE,MAAM,CAAC;SACxB,CAAC;KACH,CAAC;IACF,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,kBAAkB,CAAC,EAAE,GAAG,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAiB;IAChC,gFAAgF;IAChF,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,aAAa,EAAE,WAAW,GAAG,oBAAoB,CAAC;IAClD,oDAAoD;IACpD,SAAS,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC;IAC3C,kCAAkC;IAClC,cAAc,CAAC,EAAE;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH"}
+{"version":3,"file":"ScenariosDataStructure.d.ts","sourceRoot":"","sources":["../../../../../types/src/types/ScenariosDataStructure.ts"],"names":[],"mappings":"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"}

package/analyzer-template/packages/github/dist/types/src/types/ScopeAnalysis.d.ts

@@ -4,8 +4,13 @@ export interface ScopeAnalysis {
     isolatedStructure: {
         [key: string]: string;
     };
+    /**
+     * Maps variable names to their equivalent paths.
+     * Supports multiple equivalencies per key (e.g., for OR expressions like `x = a || b`
+     * where x is equivalent to both a and b).
+     */
     isolatedEquivalentVariables: {
-        [key: string]: string;
+        [key: string]: string | string[];
     };
     llmCalls: LlmCall[];
     environmentVariables: string[];

package/analyzer-template/packages/github/dist/types/src/types/ScopeAnalysis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScopeAnalysis.d.ts","sourceRoot":"","sources":["../../../../../types/src/types/ScopeAnalysis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,WAAW,aAAa;IAC5B,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,iBAAiB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,2BAA2B,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACvD,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC"}
+{"version":3,"file":"ScopeAnalysis.d.ts","sourceRoot":"","sources":["../../../../../types/src/types/ScopeAnalysis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,WAAW,aAAa;IAC5B,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,iBAAiB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C;;;;OAIG;IACH,2BAA2B,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;IAClE,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC"}

package/analyzer-template/packages/github/package.json

@@ -16,6 +16,6 @@
     "@octokit/rest": "^22.0.0"
   },
   "devDependencies": {
-    "@octokit/types": "^15.0.0"
+    "@octokit/types": "^16.0.0"
   }
 }

package/analyzer-template/packages/types/src/types/ScenariosDataStructure.ts

@@ -16,8 +16,8 @@ export interface ConditionalUsage {
   conditionType: 'truthiness' | 'comparison' | 'switch';
   /** For comparison conditions, the literal values being compared against */
   comparedValues?: string[];
-  /** Where this conditional usage occurs */
-  location: 'if' | 'ternary' | 'logical-and' | 'switch';
+  /** Where this conditional usage occurs. 'unconditional' is for always-rendered children with data props. */
+  location: 'if' | 'ternary' | 'logical-and' | 'switch' | 'unconditional';
   /** Source location information for this conditional usage */
   sourceLocation?: {
     /** Line number (1-based) */
@@ -106,8 +106,8 @@ export interface CompoundConditional {
     /** Required value for this condition to be true */
     requiredValue?: string | boolean;
   }[];
-  /** Where this compound conditional occurs */
-  location: 'if' | 'ternary' | 'logical-and' | 'switch';
+  /** Where this compound conditional occurs. 'unconditional' is for always-rendered children. */
+  location: 'if' | 'ternary' | 'logical-and' | 'switch' | 'unconditional';
   /** Source location for the entire compound expression */
   sourceLocation: {
     lineNumber: number;
@@ -190,7 +190,8 @@ export interface ConditionalEffect {
 export interface DataStructure {
   signatureSchema: { [key: string]: string };
   returnValueSchema: { [key: string]: string };
-  equivalentSignatureVariables: { [key: string]: string };
+  // Values can be arrays for OR expressions where a variable maps to multiple sources
+  equivalentSignatureVariables: { [key: string]: string | string[] };
   usageEquivalencies?: {
     [key: string]: { scopeNodeName: string; schemaPath: string }[];
   };

package/analyzer-template/packages/types/src/types/ScopeAnalysis.ts

@@ -3,7 +3,12 @@ import { LlmCall } from './LlmCall';
 export interface ScopeAnalysis {
   instantiatedVariables: string[];
   isolatedStructure: { [key: string]: string };
-  isolatedEquivalentVariables: { [key: string]: string };
+  /**
+   * Maps variable names to their equivalent paths.
+   * Supports multiple equivalencies per key (e.g., for OR expressions like `x = a || b`
+   * where x is equivalent to both a and b).
+   */
+  isolatedEquivalentVariables: { [key: string]: string | string[] };
   llmCalls: LlmCall[];
   environmentVariables: string[];
 }