@codeyam/codeyam-cli 0.1.0-staging.1669d45 → 0.1.0-staging.25a2014

package/analyzer-template/packages/ai/src/lib/astScopes/astScopeAnalyzer.ts

@@ -102,13 +102,14 @@ import { ThrowStatementHandler } from './patterns/throwStatementHandler';
  */
 export class ASTScopeAnalyzer {
   private structure: Record<string, string> = {};
-  private equivalentVariables: Record<string, string> = {};
+  private equivalentVariables: Record<string, string | string[]> = {};
   private environmentVariables: string[] = [];
   private conditionalUsages: Record<string, ConditionalUsage[]> = {};
   private compoundConditionals: CompoundConditional[] = [];
   private conditionalEffects: import('./types').ConditionalEffect[] = [];
   private childBoundaryGatingConditions: Record<string, ConditionalUsage[]> =
     {};
+  private jsxRenderingUsages: import('./types').JsxRenderingUsage[] = [];
   /**
    * Tracks derived boolean variables and their source expressions.
    * Maps variable name to derivation info.
@@ -219,6 +220,7 @@ export class ASTScopeAnalyzer {
       conditionalEffects: this.conditionalEffects,
       derivedVariables: this.derivedVariables,
       childBoundaryGatingConditions: this.childBoundaryGatingConditions,
+      jsxRenderingUsages: this.jsxRenderingUsages,
       isComplete:
         completeness.equivalences === 'full' &&
         completeness.structures === 'full',
@@ -233,6 +235,8 @@ export class ASTScopeAnalyzer {
       typeChecker: this.fileAnalyzer.typeChecker,
       addEquivalence: (leftSide, rightSide) =>
         this.addEquivalence(leftSide, rightSide),
+      addMultipleEquivalencies: (leftSide, rightSides) =>
+        this.addMultipleEquivalencies(leftSide, rightSides),
       addType: (path, type) => this.addType(path, type),
       addEnvironmentVariable: (variablePath) =>
         this.addEnvironmentVariable(variablePath),
@@ -273,6 +277,8 @@ export class ASTScopeAnalyzer {
       updateSchemaType: (path, newType) => this.updateSchemaType(path, newType),
       addConditionalEffect: (effect) => this.addConditionalEffect(effect),
       getConditionalEffects: () => this.conditionalEffects,
+      addJsxRenderingUsage: (usage) => this.addJsxRenderingUsage(usage),
+      getJsxRenderingUsages: () => this.jsxRenderingUsages,
     };
     return context;
   }
@@ -588,7 +594,9 @@ export class ASTScopeAnalyzer {
   }
 
   /**
-   * Adds an equivalence relationship between two variable paths
+   * Adds an equivalence relationship between two variable paths.
+   * Uses overwrite semantics - if an equivalence already exists, the new value replaces it
+   * (unless the new value is 'undefined' or 'null').
    */
   private addEquivalence(
     leftSide: StructuredPath,
@@ -603,10 +611,59 @@ export class ASTScopeAnalyzer {
     const rightSideStr = rightSide?.toRightHandSideString();
 
     if (leftSideStr && rightSideStr && leftSideStr !== rightSideStr) {
+      const existingValue = this.equivalentVariables[leftSideStr];
+      // Don't overwrite a meaningful value with 'undefined' or 'null'.
+      // This is critical for ternary conditionals like `const x = cond ? func() : undefined`
+      // or `const x = items.find(...) || null` where we want to preserve
+      // the equivalency to the more meaningful value (func()'s return value, items[]).
+      if (
+        existingValue &&
+        (rightSideStr === 'undefined' || rightSideStr === 'null')
+      ) {
+        return;
+      }
       this.equivalentVariables[leftSideStr] = rightSideStr;
     }
   }
 
+  /**
+   * Adds multiple equivalence relationships for a single variable path.
+   * Used for OR expressions like `x = a || b` where x is equivalent to both a and b.
+   * The values are stored as an array to track all possible sources.
+   */
+  private addMultipleEquivalencies(
+    leftSide: StructuredPath,
+    rightSides: StructuredPath[],
+  ): void {
+    if (leftSide?.isLiteral()) {
+      return;
+    }
+
+    const leftSideStr = leftSide?.toLeftHandSideString();
+    if (!leftSideStr) return;
+
+    // Filter out invalid paths and convert to strings
+    const validRightSides = rightSides
+      .map((r) => r?.toRightHandSideString())
+      .filter((r): r is string => !!r && r !== leftSideStr);
+
+    // Remove duplicates while preserving order
+    const uniqueRightSides = [...new Set(validRightSides)];
+
+    // Filter out 'undefined' and 'null' unless they're the only values
+    const meaningfulValues = uniqueRightSides.filter(
+      (v) => v !== 'undefined' && v !== 'null',
+    );
+    const finalValues =
+      meaningfulValues.length > 0 ? meaningfulValues : uniqueRightSides;
+
+    if (finalValues.length === 0) return;
+
+    // Store as single value if only one, otherwise as array
+    this.equivalentVariables[leftSideStr] =
+      finalValues.length === 1 ? finalValues[0] : finalValues;
+  }
+
   /**
    * Adds a type for a variable path
    */
@@ -734,6 +791,22 @@ export class ASTScopeAnalyzer {
     this.conditionalEffects.push(effect);
   }
 
+  /**
+   * Add a JSX rendering usage (array.map() or text interpolation)
+   * Deduplicates by path and rendering type
+   */
+  private addJsxRenderingUsage(
+    usage: import('./types').JsxRenderingUsage,
+  ): void {
+    // Deduplicate: don't add if we already have the same path + renderingType
+    const exists = this.jsxRenderingUsages.some(
+      (u) => u.path === usage.path && u.renderingType === usage.renderingType,
+    );
+    if (!exists) {
+      this.jsxRenderingUsages.push(usage);
+    }
+  }
+
   /**
    * Updates the schema type for a path, typically used when switch statements
    * reveal the valid values for a parameter (creating a union type like "'a' | 'b' | 'c'")
@@ -754,22 +827,38 @@ export class ASTScopeAnalyzer {
     // Update the type for the given path
     this.structure[pathStr] = newType;
 
-    // Also update the type for any equivalent path
+    // Also update the type for any equivalent path(s)
     // e.g., if "state" -> "signature[0]", update "signature[0]" as well
-    const equivalentPath = this.equivalentVariables[pathStr];
-    if (equivalentPath) {
-      this.structure[equivalentPath] = newType;
+    const rawEquivalentPath = this.equivalentVariables[pathStr];
+    const equivalentPaths = Array.isArray(rawEquivalentPath)
+      ? rawEquivalentPath
+      : rawEquivalentPath
+        ? [rawEquivalentPath]
+        : [];
+    for (const equivalentPath of equivalentPaths) {
+      if (typeof equivalentPath === 'string') {
+        this.structure[equivalentPath] = newType;
+      }
     }
 
     // For property paths like "data.status", check if the base has an equivalence
     // e.g., if "data" -> "signature[0]", transform "data.status" to "signature[0].status"
-    for (const [varPath, equivalence] of Object.entries(
+    for (const [varPath, rawEquivalence] of Object.entries(
       this.equivalentVariables,
     )) {
       if (pathStr.startsWith(varPath + '.')) {
+        const equivalences = Array.isArray(rawEquivalence)
+          ? rawEquivalence
+          : rawEquivalence
+            ? [rawEquivalence]
+            : [];
         const suffix = pathStr.slice(varPath.length);
-        const transformedPath = equivalence + suffix;
-        this.structure[transformedPath] = newType;
+        for (const equivalence of equivalences) {
+          if (typeof equivalence === 'string') {
+            const transformedPath = equivalence + suffix;
+            this.structure[transformedPath] = newType;
+          }
+        }
       }
     }
   }
@@ -820,11 +909,42 @@ export class ASTScopeAnalyzer {
     if (tsType.flags & ts.TypeFlags.Union) {
       const unionType = tsType as ts.UnionType;
 
-      // Check if it's a string literal union
-      const isAllStringLiterals = unionType.types.every(
+      // Check if it's a string literal union (optionally with null/undefined).
+      // Preserve literal values so the LLM knows which values are valid when
+      // generating mock data. Without this, types like
+      // 'suggestion' | 'warning' | 'achievement' | 'tip' become just 'string'
+      // and the LLM generates invalid values (e.g. "Motivational").
+      const stringLiterals = unionType.types.filter(
         (t) => (t.flags & ts.TypeFlags.StringLiteral) !== 0,
       );
-      if (isAllStringLiterals) return 'string';
+      const nullishTypes = unionType.types.filter(
+        (t) =>
+          (t.flags & ts.TypeFlags.Undefined) !== 0 ||
+          (t.flags & ts.TypeFlags.Null) !== 0,
+      );
+
+      if (
+        stringLiterals.length > 0 &&
+        stringLiterals.length + nullishTypes.length === unionType.types.length
+      ) {
+        const literalValues = stringLiterals.map(
+          (t) => `'${(t as ts.LiteralType).value}'`,
+        );
+        const literalUnion = literalValues.join(' | ');
+
+        if (nullishTypes.length > 0) {
+          const nullishParts: string[] = [];
+          if (nullishTypes.some((t) => (t.flags & ts.TypeFlags.Null) !== 0))
+            nullishParts.push('null');
+          if (
+            nullishTypes.some((t) => (t.flags & ts.TypeFlags.Undefined) !== 0)
+          )
+            nullishParts.push('undefined');
+          return `${literalUnion} | ${nullishParts.join(' | ')}`;
+        }
+
+        return literalUnion;
+      }
 
       // Check if it's a number literal union
       const isAllNumberLiterals = unionType.types.every(

package/analyzer-template/packages/ai/src/lib/astScopes/methodSemantics.ts

@@ -139,6 +139,96 @@ export class ArrayFilterSemantics implements MethodSemantics {
   }
 }
 
+/**
+ * Array some method semantics
+ *
+ * some() returns true if at least one element passes the test, false otherwise
+ * The callback receives array elements to test
+ */
+export class ArraySomeSemantics implements MethodSemantics {
+  getReturnType(): string {
+    return 'boolean';
+  }
+
+  addEquivalences(
+    methodCallPath: StructuredPath,
+    sourcePath: StructuredPath,
+    context: AnalysisContext,
+  ): void {
+    // Mark source as array
+    context.addType(sourcePath, 'array');
+
+    // Mark return as boolean
+    context.addType(methodCallPath, 'boolean');
+
+    // Get the last function call segment to access the arguments
+    const lastFunctionCallSegment = methodCallPath.getLastFunctionCallSegment();
+
+    if (lastFunctionCallSegment && lastFunctionCallSegment.args.length > 0) {
+      // The first argument is the callback
+      const callbackPath = lastFunctionCallSegment.args[0];
+
+      // Add the callback to the structure
+      context.addType(callbackPath, 'function');
+
+      // Mark that the callback's first parameter receives array elements
+      context.addEquivalence(
+        callbackPath.withParameter(0),
+        sourcePath.withElement('*'),
+      );
+    }
+  }
+
+  isComplete(): boolean {
+    return true;
+  }
+}
+
+/**
+ * Array every method semantics
+ *
+ * every() returns true if all elements pass the test, false otherwise
+ * The callback receives array elements to test
+ */
+export class ArrayEverySemantics implements MethodSemantics {
+  getReturnType(): string {
+    return 'boolean';
+  }
+
+  addEquivalences(
+    methodCallPath: StructuredPath,
+    sourcePath: StructuredPath,
+    context: AnalysisContext,
+  ): void {
+    // Mark source as array
+    context.addType(sourcePath, 'array');
+
+    // Mark return as boolean
+    context.addType(methodCallPath, 'boolean');
+
+    // Get the last function call segment to access the arguments
+    const lastFunctionCallSegment = methodCallPath.getLastFunctionCallSegment();
+
+    if (lastFunctionCallSegment && lastFunctionCallSegment.args.length > 0) {
+      // The first argument is the callback
+      const callbackPath = lastFunctionCallSegment.args[0];
+
+      // Add the callback to the structure
+      context.addType(callbackPath, 'function');
+
+      // Mark that the callback's first parameter receives array elements
+      context.addEquivalence(
+        callbackPath.withParameter(0),
+        sourcePath.withElement('*'),
+      );
+    }
+  }
+
+  isComplete(): boolean {
+    return true;
+  }
+}
+
 /**
  * Array find method semantics
  *
@@ -173,12 +263,12 @@ export class ArrayFindSemantics implements MethodSemantics {
         sourcePath.withElement('*'),
       );
 
-      // THIS IS PRODUCING STRANGE RESULTS SUCH AS
-      // 'people.filter(cyScope2()).find(cyScope3())': 'people.filter(cyScope2()).functionCallReturnValue[]',
-      // 'personWithHome.places.find(cyScope5())': 'personWithHome.places[]'
-      // WHICH DO NOT MAKES SENSE
-      // REMOVING BUT LEAVING IN PLACE IN CASE THERE IS A VALID USE CASE
-      // The result is an element from the array that matches the callback condition
+      // NOTE: We intentionally do NOT create an equivalency from the find result
+      // to the array element here. While semantically correct (find returns an element),
+      // doing so causes type inference issues where the array element gets typed as
+      // 'function' instead of 'object'. The tracing back to source arrays happens
+      // through the || operator processing and null guard in addEquivalence.
+      // See: analyzeScopeNoAI1.test.ts for tests that break if this is uncommented.
       // context.addEquivalence(methodCallPath, sourcePath.withElement('*'));
     }
   }
@@ -239,11 +329,17 @@ export class ArrayReduceSemantics implements MethodSemantics {
 /**
  * Array concat method semantics
  *
- * concat() returns a new array combining the original array and additional items
+ * concat() returns a new array/string combining the original and additional items
+ *
+ * NOTE: We intentionally do NOT type the source as 'array' here because
+ * .concat() exists on both arrays AND strings. Typing the source prematurely
+ * causes type contamination when the source is equivalent to other paths
+ * via ?? chains. Type inference happens later in checkIfKnownType() based
+ * on accumulated evidence from all methods called on a path.
  */
 export class ArrayConcatSemantics implements MethodSemantics {
   getReturnType(): string {
-    return 'array';
+    return 'unknown'; // Could be array or string depending on source
   }
 
   addEquivalences(
@@ -251,23 +347,24 @@ export class ArrayConcatSemantics implements MethodSemantics {
     sourcePath: StructuredPath,
     context: AnalysisContext,
   ): void {
-    // Mark source as array
-    context.addType(sourcePath, 'array');
+    // NOTE: We use 'unknown' instead of 'array' for the source because .concat()
+    // exists on both arrays AND strings. Using 'array' causes type contamination
+    // when the source is equivalent to other paths via ?? chains.
+    context.addType(sourcePath, 'unknown');
 
-    // Any arguments are also added to the array
+    // Any arguments are also added to the result
     const functionCallSegment = methodCallPath.getLastFunctionCallSegment();
 
     if (functionCallSegment) {
       // Each argument could be an array or single element
       functionCallSegment.args.forEach((argPath) => {
         // No need to guess the type - we'll discover it through normal processing
-        // But we can indicate that these elements will be in the result array
+        // But we can indicate that these elements will be in the result
         context.addEquivalence(methodCallPath, argPath);
       });
     }
 
-    // The original array elements are also in the result
-    context.addType(methodCallPath, 'array');
+    // The original elements are also in the result
     context.addEquivalence(methodCallPath, sourcePath.withElement('*'));
   }
 
@@ -279,11 +376,17 @@ export class ArrayConcatSemantics implements MethodSemantics {
 /**
  * Array slice method semantics
  *
- * slice() returns a shallow copy of a portion of an array
+ * slice() returns a shallow copy of a portion of an array (or string)
+ *
+ * NOTE: We intentionally do NOT type the source as 'array' here because
+ * .slice() exists on both arrays AND strings. Typing the source prematurely
+ * causes type contamination when the source is equivalent to other paths
+ * via ?? chains. Type inference happens later in checkIfKnownType() based
+ * on accumulated evidence from all methods called on a path.
  */
 export class ArraySliceSemantics implements MethodSemantics {
   getReturnType(): string {
-    return 'array';
+    return 'unknown'; // Could be array or string depending on source
   }
 
   addEquivalences(
@@ -291,12 +394,15 @@ export class ArraySliceSemantics implements MethodSemantics {
     sourcePath: StructuredPath,
     context: AnalysisContext,
   ): void {
-    // Mark source as array
-    context.addType(sourcePath, 'array');
+    // NOTE: We use 'unknown' instead of 'array' for the source because .slice()
+    // exists on both arrays AND strings. Using 'array' causes type contamination
+    // when the source is equivalent to other paths via ?? chains.
+    // Type inference happens later in checkIfKnownType() based on accumulated evidence.
+    context.addType(sourcePath, 'unknown');
 
-    // The elements in the result are the same type as the source array
+    // Still track the return value type for data structure tracking
     const methodCallPathWithReturnValues = methodCallPath.withReturnValues();
-    context.addType(methodCallPathWithReturnValues, 'array');
+    context.addType(methodCallPathWithReturnValues, 'unknown');
   }
 
   isComplete(): boolean {
@@ -518,6 +624,12 @@ export class ArrayFlatMapSemantics implements MethodSemantics {
  * Array at method semantics
  *
  * at() returns the element at the given index, supporting negative indices
+ *
+ * NOTE: We intentionally do NOT type the source as 'array' here because
+ * .at() exists on both arrays AND strings. Typing the source prematurely
+ * causes type contamination when the source is equivalent to other paths
+ * via ?? chains. Type inference happens later in checkIfKnownType() based
+ * on accumulated evidence from all methods called on a path.
  */
 export class ArrayAtSemantics implements MethodSemantics {
   getReturnType(): string {
@@ -529,10 +641,12 @@ export class ArrayAtSemantics implements MethodSemantics {
     sourcePath: StructuredPath,
     context: AnalysisContext,
   ): void {
-    // Mark source as array
-    context.addType(sourcePath, 'array');
+    // NOTE: We use 'unknown' instead of 'array' for the source because .at()
+    // exists on both arrays AND strings. Using 'array' causes type contamination
+    // when the source is equivalent to other paths via ?? chains.
+    context.addType(sourcePath, 'unknown');
 
-    // The return value is equivalent to an array element
+    // The return value is equivalent to an element
     context.addEquivalence(
       methodCallPath.withReturnValues(),
       sourcePath.withElement('*'),
@@ -800,6 +914,8 @@ export function createMethodRegistry(): MethodSemanticsRegistry {
   registry.register('slice', new ArraySliceSemantics(), 'Array');
   registry.register('splice', new ArraySpliceSemantics(), 'Array');
   registry.register('push', new ArrayPushSemantics(), 'Array');
+  registry.register('some', new ArraySomeSemantics(), 'Array');
+  registry.register('every', new ArrayEverySemantics(), 'Array');
 
   // Register Object methods
   registry.register('fromEntries', new ObjectFromEntriesSemantics(), 'Object');

package/analyzer-template/packages/ai/src/lib/astScopes/patterns/forInStatementHandler.ts

@@ -22,11 +22,8 @@ export class ForInStatementHandler implements PatternHandler {
     // Process the expression being iterated over first (e.g., object)
     context.processExpression(node.expression);
 
-    // Get the path of the object being iterated
-    const expressionPath = context.getStructuralPath(node.expression);
-
-    // If the initializer is a variable declaration with an identifier, establish equivalence
-    // to indicate it's iterating over the keys of the expression
+    // If the initializer is a variable declaration with an identifier,
+    // type it as 'string' since for-in keys are always strings
     if (ts.isVariableDeclarationList(node.initializer)) {
       const declarations = node.initializer.declarations;
       if (
@@ -36,25 +33,21 @@ export class ForInStatementHandler implements PatternHandler {
       ) {
         const variableName = StructuredPath.fromBase(declarations[0].name.text);
 
-        // Add type for the key variable (string for object keys)
+        // Type the key variable as 'string' — for-in keys are always strings.
+        // Note: We intentionally do NOT equivalence the key variable to
+        // expressionPath[*key*]. The key variable is the KEY (a string),
+        // while [*key*] in the schema represents the VALUE at a dynamic key.
+        // Creating that equivalence would cause the 'string' type to propagate
+        // to the value path. The value access (e.g., obj[key]) is handled
+        // correctly by the element access handler in processExpression.
         context.addType(variableName, 'string');
-
-        if (expressionPath) {
-          // For for...in loops, the variable is equivalent to the keys of the object
-          // We represent this with a *key* suffix to indicate it's a key, not a value
-          context.addEquivalence(variableName, expressionPath.withKey('key'));
-        }
       }
     } else if (ts.isIdentifier(node.initializer)) {
       // If the initializer is directly an identifier (rare but possible)
       const variableName = StructuredPath.fromBase(node.initializer.text);
 
-      // Add type for the key variable
+      // See comment above — type as string but don't equivalence to value path
       context.addType(variableName, 'string');
-
-      if (expressionPath) {
-        context.addEquivalence(variableName, expressionPath.withKey('key'));
-      }
     } else {
       context.processExpression(node.initializer);
     }

package/analyzer-template/packages/ai/src/lib/astScopes/patterns/variableDeclarationHandler.ts

@@ -3,131 +3,10 @@ import { AnalysisContext } from '../types';
 import { PatternHandler } from './patternHandler';
 import { StructuredPath } from '../paths';
 import { processBindingPattern } from '../processBindings';
-
-/**
- * Extracts a simple path string from an expression.
- * Returns the path for identifiers and property access chains.
- */
-function getSimplePath(node: ts.Expression): string | null {
-  if (ts.isIdentifier(node)) {
-    return node.text;
-  }
-  if (ts.isPropertyAccessExpression(node)) {
-    const objectPath = getSimplePath(node.expression);
-    if (objectPath) {
-      return `${objectPath}.${node.name.text}`;
-    }
-  }
-  // Handle optional chaining: a?.b
-  if (ts.isNonNullExpression(node)) {
-    return getSimplePath(node.expression);
-  }
-  return null;
-}
-
-/** Array methods that return boolean predicates */
-const ARRAY_PREDICATE_METHODS = ['includes', 'some', 'every'] as const;
-type ArrayPredicateMethod = (typeof ARRAY_PREDICATE_METHODS)[number];
-
-/**
- * Maps array method names to derivation operation names
- */
-function getArrayPredicateOperation(
-  methodName: string,
-): 'arrayIncludes' | 'arraySome' | 'arrayEvery' | null {
-  switch (methodName) {
-    case 'includes':
-      return 'arrayIncludes';
-    case 'some':
-      return 'arraySome';
-    case 'every':
-      return 'arrayEvery';
-    default:
-      return null;
-  }
-}
-
-/**
- * Detects if an expression is an array predicate call and extracts the array path.
- * Patterns detected:
- * - arr.includes(x) → { sourcePath: 'arr', operation: 'arrayIncludes' }
- * - arr?.includes(x) → { sourcePath: 'arr', operation: 'arrayIncludes' }
- * - arr.some(fn) → { sourcePath: 'arr', operation: 'arraySome' }
- * - arr.every(fn) → { sourcePath: 'arr', operation: 'arrayEvery' }
- * - Boolean(x && arr?.includes(y)) → { sourcePath: 'arr', operation: 'arrayIncludes' }
- */
-function detectArrayPredicatePattern(expr: ts.Expression): {
-  sourcePath: string;
-  operation: 'arrayIncludes' | 'arraySome' | 'arrayEvery';
-} | null {
-  // Unwrap Boolean() calls: Boolean(x) → x
-  if (
-    ts.isCallExpression(expr) &&
-    ts.isIdentifier(expr.expression) &&
-    expr.expression.text === 'Boolean' &&
-    expr.arguments.length === 1
-  ) {
-    return detectArrayPredicatePattern(expr.arguments[0]);
-  }
-
-  // Handle logical AND: a && b - check both sides for array predicates
-  if (
-    ts.isBinaryExpression(expr) &&
-    expr.operatorToken.kind === ts.SyntaxKind.AmpersandAmpersandToken
-  ) {
-    // Try the right side first (more likely to have the predicate)
-    const rightResult = detectArrayPredicatePattern(expr.right);
-    if (rightResult) return rightResult;
-    // Try the left side
-    const leftResult = detectArrayPredicatePattern(expr.left);
-    if (leftResult) return leftResult;
-    return null;
-  }
-
-  // Handle parenthesized expressions
-  if (ts.isParenthesizedExpression(expr)) {
-    return detectArrayPredicatePattern(expr.expression);
-  }
-
-  if (!ts.isCallExpression(expr)) {
-    return null;
-  }
-
-  const callExpr = expr.expression;
-
-  // Handle both regular property access (arr.includes) and optional chaining (arr?.includes)
-  let objectExpr: ts.Expression | null = null;
-  let methodName: string | null = null;
-
-  if (ts.isPropertyAccessExpression(callExpr)) {
-    objectExpr = callExpr.expression;
-    methodName = callExpr.name.text;
-  } else if (
-    ts.isElementAccessExpression(callExpr) &&
-    ts.isStringLiteral(callExpr.argumentExpression)
-  ) {
-    // Handle arr["includes"]() syntax (rare but possible)
-    objectExpr = callExpr.expression;
-    methodName = callExpr.argumentExpression.text;
-  }
-
-  if (!objectExpr || !methodName) {
-    return null;
-  }
-
-  const operation = getArrayPredicateOperation(methodName);
-  if (!operation) {
-    return null;
-  }
-
-  // Get the source path for the array
-  const sourcePath = getSimplePath(objectExpr);
-  if (!sourcePath) {
-    return null;
-  }
-
-  return { sourcePath, operation };
-}
+import {
+  getSimplePath,
+  detectArrayPredicatePattern,
+} from '../arrayDerivationDetector';
 
 /**
  * Detects if an expression is a boolean derivation pattern and extracts the info.
@@ -154,7 +33,8 @@ function detectDerivationPattern(expr: ts.Expression): {
     | 'and'
     | 'arrayIncludes'
     | 'arraySome'
-    | 'arrayEvery';
+    | 'arrayEvery'
+    | 'arrayLength';
   comparedValue?: string;
 } | null {
   // Check for array predicate methods first