@codeyam/codeyam-cli 0.1.0-staging.28f73cf → 0.1.0-staging.323686

package/packages/ai/src/lib/astScopes/patterns/variableDeclarationHandler.js

@@ -1,6 +1,131 @@
 import ts from 'typescript';
 import { StructuredPath } from "../paths.js";
 import { processBindingPattern } from "../processBindings.js";
+import { getSimplePath, detectArrayPredicatePattern, } from "../arrayDerivationDetector.js";
+/**
+ * Detects if an expression is a boolean derivation pattern and extracts the info.
+ * Patterns detected:
+ * - x !== null / x != null → { sourcePath: 'x', operation: 'notNull' }
+ * - x === null / x == null → { sourcePath: 'x', operation: 'isNull' }
+ * - x === 'value' → { sourcePath: 'x', operation: 'equals', comparedValue: 'value' }
+ * - x !== 'value' → { sourcePath: 'x', operation: 'notEquals', comparedValue: 'value' }
+ * - a || b → { operation: 'or', sourcePaths: ['a', 'b'] }
+ * - a && b → { operation: 'and', sourcePaths: ['a', 'b'] }
+ * - arr.includes(x) → { sourcePath: 'arr', operation: 'arrayIncludes' }
+ * - arr.some(fn) → { sourcePath: 'arr', operation: 'arraySome' }
+ * - arr.every(fn) → { sourcePath: 'arr', operation: 'arrayEvery' }
+ */
+function detectDerivationPattern(expr) {
+    // Check for array predicate methods first
+    const arrayPredicate = detectArrayPredicatePattern(expr);
+    if (arrayPredicate) {
+        return arrayPredicate;
+    }
+    // Binary expressions: a !== null, a === 'value', a || b, a && b
+    if (ts.isBinaryExpression(expr)) {
+        const left = expr.left;
+        const right = expr.right;
+        const op = expr.operatorToken.kind;
+        // Check for null comparisons: x !== null, x === null
+        if (op === ts.SyntaxKind.ExclamationEqualsEqualsToken ||
+            op === ts.SyntaxKind.ExclamationEqualsToken) {
+            // x !== null or x != null
+            if (right.kind === ts.SyntaxKind.NullKeyword ||
+                (ts.isIdentifier(right) && right.text === 'undefined')) {
+                const sourcePath = getSimplePath(left);
+                if (sourcePath) {
+                    return { sourcePath, operation: 'notNull' };
+                }
+            }
+            // null !== x or null != x
+            if (left.kind === ts.SyntaxKind.NullKeyword ||
+                (ts.isIdentifier(left) && left.text === 'undefined')) {
+                const sourcePath = getSimplePath(right);
+                if (sourcePath) {
+                    return { sourcePath, operation: 'notNull' };
+                }
+            }
+            // x !== 'value'
+            if (ts.isStringLiteral(right)) {
+                const sourcePath = getSimplePath(left);
+                if (sourcePath) {
+                    return {
+                        sourcePath,
+                        operation: 'notEquals',
+                        comparedValue: right.text,
+                    };
+                }
+            }
+        }
+        if (op === ts.SyntaxKind.EqualsEqualsEqualsToken ||
+            op === ts.SyntaxKind.EqualsEqualsToken) {
+            // x === null or x == null
+            if (right.kind === ts.SyntaxKind.NullKeyword ||
+                (ts.isIdentifier(right) && right.text === 'undefined')) {
+                const sourcePath = getSimplePath(left);
+                if (sourcePath) {
+                    return { sourcePath, operation: 'isNull' };
+                }
+            }
+            // null === x or null == x
+            if (left.kind === ts.SyntaxKind.NullKeyword ||
+                (ts.isIdentifier(left) && left.text === 'undefined')) {
+                const sourcePath = getSimplePath(right);
+                if (sourcePath) {
+                    return { sourcePath, operation: 'isNull' };
+                }
+            }
+            // x === 'value'
+            if (ts.isStringLiteral(right)) {
+                const sourcePath = getSimplePath(left);
+                if (sourcePath) {
+                    return { sourcePath, operation: 'equals', comparedValue: right.text };
+                }
+            }
+        }
+        // a || b
+        if (op === ts.SyntaxKind.BarBarToken) {
+            const leftPath = getSimplePath(left);
+            const rightPath = getSimplePath(right);
+            if (leftPath && rightPath) {
+                return { operation: 'or', sourcePaths: [leftPath, rightPath] };
+            }
+            // Handle chained OR: (a || b) || c
+            const leftDerivation = detectDerivationPattern(left);
+            if (leftDerivation?.operation === 'or' &&
+                leftDerivation.sourcePaths &&
+                rightPath) {
+                return {
+                    operation: 'or',
+                    sourcePaths: [...leftDerivation.sourcePaths, rightPath],
+                };
+            }
+        }
+        // a && b
+        if (op === ts.SyntaxKind.AmpersandAmpersandToken) {
+            const leftPath = getSimplePath(left);
+            const rightPath = getSimplePath(right);
+            if (leftPath && rightPath) {
+                return { operation: 'and', sourcePaths: [leftPath, rightPath] };
+            }
+            // Handle chained AND: (a && b) && c
+            const leftDerivation = detectDerivationPattern(left);
+            if (leftDerivation?.operation === 'and' &&
+                leftDerivation.sourcePaths &&
+                rightPath) {
+                return {
+                    operation: 'and',
+                    sourcePaths: [...leftDerivation.sourcePaths, rightPath],
+                };
+            }
+        }
+    }
+    // Parenthesized expressions: unwrap and recurse
+    if (ts.isParenthesizedExpression(expr)) {
+        return detectDerivationPattern(expr.expression);
+    }
+    return null;
+}
 /**
  * Handler for variable declarations
  *
@@ -9,6 +134,11 @@ import { processBindingPattern } from "../processBindings.js";
  * - const x = obj.prop;
  * - const { a, b } = obj;
  * - const [a, b] = arr;
+ *
+ * Also detects derived boolean variables like:
+ * - const hasAnalysis = analysis !== null
+ * - const isLoading = status === 'loading'
+ * - const isBusy = isRunning || isQueued
  */
 export class VariableDeclarationHandler {
     canHandle(node) {
@@ -39,8 +169,15 @@ export class VariableDeclarationHandler {
         }
         // Regular variable declaration with a single identifier
         else if (ts.isIdentifier(declaration.name)) {
+            const variableName = declaration.name.text;
             // Create structured path for the variable
-            const variablePath = StructuredPath.fromBase(declaration.name.text);
+            const variablePath = StructuredPath.fromBase(variableName);
+            // Check if this is a derived boolean variable (e.g., const hasX = x !== null)
+            // Record the derivation info so we can trace back when this variable is used in conditionals
+            const derivationInfo = detectDerivationPattern(declaration.initializer);
+            if (derivationInfo) {
+                context.addDerivedVariable(variableName, derivationInfo);
+            }
             // Capture equivalencies to child boundaries as they will otherwise be skipped
             if (context.isChildBoundary(declaration.initializer)) {
                 context.addChildBoundaryEquivalence(variablePath, declaration.initializer);

package/packages/ai/src/lib/astScopes/patterns/variableDeclarationHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"variableDeclarationHandler.js","sourceRoot":"","sources":["../../../../../../../../packages/ai/src/lib/astScopes/patterns/variableDeclarationHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAG5B,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D;;;;;;;;GAQG;AACH,MAAM,OAAO,0BAA0B;IACrC,SAAS,CAAC,IAAa;QACrB,OAAO,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,CAAC,IAAa,EAAE,OAAwB;QAC7C,IAAI,CAAC,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC;QAElD,MAAM,WAAW,GAAG,IAA8B,CAAC;QACnD,IAAI,CAAC,WAAW,CAAC,WAAW;YAAE,OAAO,IAAI,CAAC,CAAC,gCAAgC;QAE3E,sCAAsC;QACtC,IACE,EAAE,CAAC,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAAC;YAC3C,EAAE,CAAC,qBAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,EAC1C,CAAC;YACD,8DAA8D;YAC9D,+CAA+C;YAC/C,MAAM,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAClD,WAAW,CAAC,WAAW,CACxB,CAAC;YAEF,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,uCAAuC;YACvC,MAAM,cAAc,GAAG,cAAc,CAAC,QAAQ,CAC5C,WAAW,CAAC,WAAW,EACvB,OAAO,CAAC,UAAU,CACnB,CAAC;YAEF,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,gDAAgD;YAChD,OAAO,qBAAqB,CAAC,WAAW,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QAC1E,CAAC;QACD,wDAAwD;aACnD,IAAI,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3C,0CAA0C;YAC1C,MAAM,YAAY,GAAG,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEpE,8EAA8E;YAC9E,IAAI,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;gBACrD,OAAO,CAAC,2BAA2B,CACjC,YAAY,EACZ,WAAW,CAAC,WAAW,CACxB,CAAC;YACJ,CAAC;YAED,0DAA0D;YAC1D,6DAA6D;YAC7D,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CACvC,WAAW,CAAC,WAAW,EACvB,YAAY,CACb,CAAC;YAEF,yEAAyE;YACzE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;YAC3C,CAAC;YAED,OAAO,OAAO,CAAC;QACjB,CAAC;aAAM,CAAC;YACN,gCAAgC;YAChC,OAAO,CAAC,eAAe,CACrB,WAAW,CAAC,IAAI,EAChB,+BAA+B,EAC/B,KAAK,CACN,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"variableDeclarationHandler.js","sourceRoot":"","sources":["../../../../../../../../packages/ai/src/lib/astScopes/patterns/variableDeclarationHandler.ts"],"names":[],"mappings":"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"}