@openrewrite/rewrite 8.67.0-20251111-082857 → 8.67.0-20251111-123004

package/dist/javascript/comparator.d.ts

@@ -1195,6 +1195,58 @@ export declare class JavaScriptSemanticComparatorVisitor extends JavaScriptCompa
      * @param lenientTypeMatching If true, allows matching between nodes with and without type annotations
      */
     constructor(lenientTypeMatching?: boolean);
+    /**
+     * Unwraps parentheses from a tree node recursively.
+     * This allows comparing expressions with and without redundant parentheses.
+     *
+     * @param tree The tree to unwrap
+     * @returns The unwrapped tree
+     */
+    protected unwrap(tree: Tree | undefined): Tree | undefined;
+    visit<R extends J>(j: Tree, p: J, parent?: Cursor): Promise<R | undefined>;
+    /**
+     * Override visitArrowFunction to allow semantic equivalence between expression body
+     * and block with single return statement forms.
+     *
+     * Examples:
+     * - `x => x + 1` matches `x => { return x + 1; }`
+     * - `(x, y) => x + y` matches `(x, y) => { return x + y; }`
+     */
+    visitArrowFunction(arrowFunction: JS.ArrowFunction, other: J): Promise<J | undefined>;
+    /**
+     * Override visitLambdaParameters to allow semantic equivalence between
+     * arrow functions with and without parentheses around single parameters.
+     *
+     * Examples:
+     * - `x => x + 1` matches `(x) => x + 1`
+     */
+    visitLambdaParameters(parameters: J.Lambda.Parameters, other: J): Promise<J | undefined>;
+    /**
+     * Override visitPropertyAssignment to allow semantic equivalence between
+     * object property shorthand and longhand forms.
+     *
+     * Examples:
+     * - `{ x }` matches `{ x: x }`
+     * - `{ x: x, y: y }` matches `{ x, y }`
+     */
+    visitPropertyAssignment(propertyAssignment: JS.PropertyAssignment, other: J): Promise<J | undefined>;
+    /**
+     * Extracts the property name from a PropertyAssignment.
+     * Returns the simple name if the property is an identifier, undefined otherwise.
+     */
+    private getPropertyName;
+    /**
+     * Checks if an expression is an identifier with the given name.
+     */
+    private isIdentifierWithName;
+    /**
+     * Extracts the expression from an arrow function body.
+     * Returns the expression if:
+     * - body is already an Expression, OR
+     * - body is a Block with exactly one Return statement
+     * Otherwise returns undefined.
+     */
+    private extractExpression;
     /**
      * Override visitProperty to allow lenient type matching.
      * When lenientTypeMatching is enabled, null vs Type comparisons are allowed
@@ -1214,7 +1266,9 @@ export declare class JavaScriptSemanticComparatorVisitor extends JavaScriptCompa
      */
     visitMethodInvocation(method: J.MethodInvocation, other: J): Promise<J | undefined>;
     /**
-     * Override identifier comparison to include type checking for field access.
+     * Override identifier comparison to include:
+     * 1. Type checking for field access
+     * 2. Semantic equivalence between `undefined` identifier and void expressions
      */
     visitIdentifier(identifier: J.Identifier, other: J): Promise<J | undefined>;
     /**
@@ -1229,5 +1283,27 @@ export declare class JavaScriptSemanticComparatorVisitor extends JavaScriptCompa
      * code with returnTypeExpression.
      */
     visitMethodDeclaration(methodDeclaration: J.MethodDeclaration, other: J): Promise<J | undefined>;
+    /**
+     * Override visitVoid to allow semantic equivalence with undefined identifier.
+     * This handles the reverse case where the pattern is a void expression
+     * and the source is the undefined identifier.
+     *
+     * Examples:
+     * - `void 0` matches `undefined`
+     * - `void(0)` matches `undefined`
+     * - `void 1` matches `undefined`
+     */
+    visitVoid(voidExpr: JS.Void, other: J): Promise<J | undefined>;
+    /**
+     * Override visitLiteral to allow semantic equivalence between
+     * different numeric literal formats.
+     *
+     * Examples:
+     * - `255` matches `0xFF`
+     * - `255` matches `0o377`
+     * - `255` matches `0b11111111`
+     * - `1000` matches `1e3`
+     */
+    visitLiteral(literal: J.Literal, other: J): Promise<J | undefined>;
 }
 //# sourceMappingURL=comparator.d.ts.map

package/dist/javascript/comparator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comparator.d.ts","sourceRoot":"","sources":["../../src/javascript/comparator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"comparator.d.ts","sourceRoot":"","sources":["../../src/javascript/comparator.ts"],"names":[],"mappings":"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"}

package/dist/javascript/comparator.js

@@ -27,7 +27,8 @@ exports.JavaScriptSemanticComparatorVisitor = exports.JavaScriptComparatorVisito
  */
 const visitor_1 = require("./visitor");
 const java_1 = require("../java");
-const tree_1 = require("../tree");
+const tree_1 = require("./tree");
+const tree_2 = require("../tree");
 /**
  * A visitor that compares two AST trees in lock step.
  * It takes another `J` instance as context and visits both trees simultaneously.
@@ -56,7 +57,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             // Initialize targetCursor with parent if provided, otherwise undefined (will be set by visit())
             this.targetCursor = parentCursor2;
             // Initialize this.cursor (pattern cursor) with parent if provided
-            this.cursor = parentCursor1 || new tree_1.Cursor(undefined, undefined);
+            this.cursor = parentCursor1 || new tree_2.Cursor(undefined, undefined);
             yield this.visit(tree1, tree2);
             return this.match;
         });
@@ -190,7 +191,7 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             // Update targetCursor to track the target node in parallel with the pattern cursor
             // (Can be overridden by subclasses if they need cursor access before calling super)
             const savedTargetCursor = this.targetCursor;
-            this.targetCursor = new tree_1.Cursor(p, this.targetCursor);
+            this.targetCursor = new tree_2.Cursor(p, this.targetCursor);
             try {
                 // Continue with normal visitation, passing the other node as context
                 return yield _super.visit.call(this, j, p);
@@ -218,8 +219,8 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             // Push wrappers onto both cursors, then compare only the elements, not markers or spacing
             const savedCursor = this.cursor;
             const savedTargetCursor = this.targetCursor;
-            this.cursor = new tree_1.Cursor(right, this.cursor);
-            this.targetCursor = otherWrapper ? new tree_1.Cursor(otherWrapper, this.targetCursor) : this.targetCursor;
+            this.cursor = new tree_2.Cursor(right, this.cursor);
+            this.targetCursor = otherWrapper ? new tree_2.Cursor(otherWrapper, this.targetCursor) : this.targetCursor;
             try {
                 yield this.visitProperty(right.element, otherElement);
             }
@@ -248,8 +249,8 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             // Push wrappers onto both cursors, then compare only the elements, not markers or spacing
             const savedCursor = this.cursor;
             const savedTargetCursor = this.targetCursor;
-            this.cursor = new tree_1.Cursor(left, this.cursor);
-            this.targetCursor = otherWrapper ? new tree_1.Cursor(otherWrapper, this.targetCursor) : this.targetCursor;
+            this.cursor = new tree_2.Cursor(left, this.cursor);
+            this.targetCursor = otherWrapper ? new tree_2.Cursor(otherWrapper, this.targetCursor) : this.targetCursor;
             try {
                 yield this.visitProperty(left.element, otherElement);
             }
@@ -282,8 +283,8 @@ class JavaScriptComparatorVisitor extends visitor_1.JavaScriptVisitor {
             // Push wrappers onto both cursors, then compare each element
             const savedCursor = this.cursor;
             const savedTargetCursor = this.targetCursor;
-            this.cursor = new tree_1.Cursor(container, this.cursor);
-            this.targetCursor = otherContainer ? new tree_1.Cursor(otherContainer, this.targetCursor) : this.targetCursor;
+            this.cursor = new tree_2.Cursor(container, this.cursor);
+            this.targetCursor = otherContainer ? new tree_2.Cursor(otherContainer, this.targetCursor) : this.targetCursor;
             try {
                 for (let i = 0; i < container.elements.length; i++) {
                     yield this.visitProperty(container.elements[i], otherElements[i]);
@@ -1961,6 +1962,253 @@ class JavaScriptSemanticComparatorVisitor extends JavaScriptComparatorVisitor {
         super();
         this.lenientTypeMatching = lenientTypeMatching;
     }
+    /**
+     * Unwraps parentheses from a tree node recursively.
+     * This allows comparing expressions with and without redundant parentheses.
+     *
+     * @param tree The tree to unwrap
+     * @returns The unwrapped tree
+     */
+    unwrap(tree) {
+        if (!tree) {
+            return tree;
+        }
+        // Unwrap J.Parentheses nodes recursively
+        if (tree.kind === java_1.J.Kind.Parentheses) {
+            const parens = tree;
+            return this.unwrap(parens.tree.element);
+        }
+        // Unwrap J.ControlParentheses nodes recursively
+        if (tree.kind === java_1.J.Kind.ControlParentheses) {
+            const controlParens = tree;
+            return this.unwrap(controlParens.tree.element);
+        }
+        return tree;
+    }
+    visit(j, p, parent) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // If we've already found a mismatch, abort further processing
+            if (!this.match) {
+                return j;
+            }
+            // Unwrap parentheses from both trees before comparing
+            const unwrappedJ = this.unwrap(j) || j;
+            const unwrappedP = this.unwrap(p) || p;
+            // Skip the kind check that the base class does - semantic matching allows different kinds
+            // (e.g., undefined identifier matching void expression)
+            // Update targetCursor to track the target node in parallel with the pattern cursor
+            const savedTargetCursor = this.targetCursor;
+            this.targetCursor = new tree_2.Cursor(unwrappedP, this.targetCursor);
+            try {
+                // Call the grandparent's visit to do actual visitation without the kind check
+                return yield visitor_1.JavaScriptVisitor.prototype.visit.call(this, unwrappedJ, unwrappedP);
+            }
+            finally {
+                this.targetCursor = savedTargetCursor;
+            }
+        });
+    }
+    /**
+     * Override visitArrowFunction to allow semantic equivalence between expression body
+     * and block with single return statement forms.
+     *
+     * Examples:
+     * - `x => x + 1` matches `x => { return x + 1; }`
+     * - `(x, y) => x + y` matches `(x, y) => { return x + y; }`
+     */
+    visitArrowFunction(arrowFunction, other) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.match) {
+                return arrowFunction;
+            }
+            if (other.kind !== tree_1.JS.Kind.ArrowFunction) {
+                return this.abort(arrowFunction);
+            }
+            const otherArrow = other;
+            // Compare all properties reflectively except lambda (handled specially below)
+            for (const key of Object.keys(arrowFunction)) {
+                if (key.startsWith('_') || key === 'id' || key === 'markers' || key === 'lambda') {
+                    continue;
+                }
+                const jValue = arrowFunction[key];
+                const otherValue = otherArrow[key];
+                // Handle arrays
+                if (Array.isArray(jValue)) {
+                    if (!Array.isArray(otherValue) || jValue.length !== otherValue.length) {
+                        return this.abort(arrowFunction);
+                    }
+                    for (let i = 0; i < jValue.length; i++) {
+                        yield this.visitProperty(jValue[i], otherValue[i]);
+                        if (!this.match)
+                            return arrowFunction;
+                    }
+                }
+                else {
+                    yield this.visitProperty(jValue, otherValue);
+                    if (!this.match)
+                        return arrowFunction;
+                }
+            }
+            // Compare lambda parameters
+            const params1 = arrowFunction.lambda.parameters.parameters;
+            const params2 = otherArrow.lambda.parameters.parameters;
+            if (params1.length !== params2.length) {
+                return this.abort(arrowFunction);
+            }
+            for (let i = 0; i < params1.length; i++) {
+                yield this.visitProperty(params1[i], params2[i]);
+                if (!this.match)
+                    return arrowFunction;
+            }
+            // Handle semantic equivalence for lambda bodies
+            const body1 = arrowFunction.lambda.body;
+            const body2 = otherArrow.lambda.body;
+            // Try to extract the expression from each body
+            const expr1 = this.extractExpression(body1);
+            const expr2 = this.extractExpression(body2);
+            if (expr1 && expr2) {
+                // Both have extractable expressions - compare them
+                yield this.visit(expr1, expr2);
+            }
+            else {
+                // At least one is not a simple expression or block-with-return
+                // Fall back to exact comparison
+                yield this.visit(body1, body2);
+            }
+            return arrowFunction;
+        });
+    }
+    /**
+     * Override visitLambdaParameters to allow semantic equivalence between
+     * arrow functions with and without parentheses around single parameters.
+     *
+     * Examples:
+     * - `x => x + 1` matches `(x) => x + 1`
+     */
+    visitLambdaParameters(parameters, other) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.match) {
+                return parameters;
+            }
+            if (other.kind !== java_1.J.Kind.LambdaParameters) {
+                return this.abort(parameters);
+            }
+            const otherParams = other;
+            // Compare all properties except 'parenthesized' using reflection
+            for (const key of Object.keys(parameters)) {
+                if (key.startsWith('_') || key === 'id' || key === 'markers' || key === 'parenthesized') {
+                    continue;
+                }
+                const jValue = parameters[key];
+                const otherValue = otherParams[key];
+                // Handle arrays
+                if (Array.isArray(jValue)) {
+                    if (!Array.isArray(otherValue) || jValue.length !== otherValue.length) {
+                        return this.abort(parameters);
+                    }
+                    for (let i = 0; i < jValue.length; i++) {
+                        yield this.visitProperty(jValue[i], otherValue[i]);
+                        if (!this.match)
+                            return parameters;
+                    }
+                }
+                else {
+                    yield this.visitProperty(jValue, otherValue);
+                    if (!this.match)
+                        return parameters;
+                }
+            }
+            return parameters;
+        });
+    }
+    /**
+     * Override visitPropertyAssignment to allow semantic equivalence between
+     * object property shorthand and longhand forms.
+     *
+     * Examples:
+     * - `{ x }` matches `{ x: x }`
+     * - `{ x: x, y: y }` matches `{ x, y }`
+     */
+    visitPropertyAssignment(propertyAssignment, other) {
+        const _super = Object.create(null, {
+            visitPropertyAssignment: { get: () => super.visitPropertyAssignment }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.match) {
+                return propertyAssignment;
+            }
+            if (other.kind !== tree_1.JS.Kind.PropertyAssignment) {
+                return this.abort(propertyAssignment);
+            }
+            const otherProp = other;
+            // Extract property names for semantic comparison
+            const propName = this.getPropertyName(propertyAssignment);
+            const otherPropName = this.getPropertyName(otherProp);
+            // Names must match
+            if (!propName || !otherPropName || propName !== otherPropName) {
+                // Can't do semantic comparison without identifiers, fall back to exact comparison
+                return yield _super.visitPropertyAssignment.call(this, propertyAssignment, other);
+            }
+            // Detect shorthand (no initializer) vs longhand (has initializer)
+            const isShorthand1 = !propertyAssignment.initializer;
+            const isShorthand2 = !otherProp.initializer;
+            if (isShorthand1 === isShorthand2) {
+                // Both shorthand or both longhand - use base comparison
+                return yield _super.visitPropertyAssignment.call(this, propertyAssignment, other);
+            }
+            // One is shorthand, one is longhand - check semantic equivalence
+            const longhandProp = isShorthand1 ? otherProp : propertyAssignment;
+            // Check if the longhand's initializer is an identifier with the same name as the property
+            if (this.isIdentifierWithName(longhandProp.initializer, propName)) {
+                // Semantically equivalent!
+                return propertyAssignment;
+            }
+            else {
+                // Not equivalent (e.g., { x: y })
+                return this.abort(propertyAssignment);
+            }
+        });
+    }
+    /**
+     * Extracts the property name from a PropertyAssignment.
+     * Returns the simple name if the property is an identifier, undefined otherwise.
+     */
+    getPropertyName(prop) {
+        const nameExpr = prop.name.element;
+        return (0, java_1.isIdentifier)(nameExpr) ? nameExpr.simpleName : undefined;
+    }
+    /**
+     * Checks if an expression is an identifier with the given name.
+     */
+    isIdentifierWithName(expr, name) {
+        return expr && (0, java_1.isIdentifier)(expr) && expr.simpleName === name;
+    }
+    /**
+     * Extracts the expression from an arrow function body.
+     * Returns the expression if:
+     * - body is already an Expression, OR
+     * - body is a Block with exactly one Return statement
+     * Otherwise returns undefined.
+     */
+    extractExpression(body) {
+        // If it's already an expression, return it
+        if (body.kind !== java_1.J.Kind.Block) {
+            return body;
+        }
+        // It's a block - check if it contains exactly one return statement
+        const block = body;
+        if (block.statements.length !== 1) {
+            return undefined;
+        }
+        // Unwrap the RightPadded wrapper from the statement
+        const stmtWrapper = block.statements[0];
+        const stmt = stmtWrapper.element;
+        if (stmt.kind !== java_1.J.Kind.Return) {
+            return undefined;
+        }
+        const returnStmt = stmt;
+        return returnStmt.expression;
+    }
     /**
      * Override visitProperty to allow lenient type matching.
      * When lenientTypeMatching is enabled, null vs Type comparisons are allowed
@@ -2178,13 +2426,20 @@ class JavaScriptSemanticComparatorVisitor extends JavaScriptComparatorVisitor {
         });
     }
     /**
-     * Override identifier comparison to include type checking for field access.
+     * Override identifier comparison to include:
+     * 1. Type checking for field access
+     * 2. Semantic equivalence between `undefined` identifier and void expressions
      */
     visitIdentifier(identifier, other) {
         const _super = Object.create(null, {
             visitIdentifier: { get: () => super.visitIdentifier }
         });
         return __awaiter(this, void 0, void 0, function* () {
+            // Check if this identifier is "undefined" and the other is a void expression
+            if (identifier.simpleName === 'undefined' && other.kind === tree_1.JS.Kind.Void) {
+                // Both evaluate to undefined, so they match
+                return identifier;
+            }
             if (other.kind !== java_1.J.Kind.Identifier) {
                 return this.abort(identifier);
             }
@@ -2354,6 +2609,68 @@ class JavaScriptSemanticComparatorVisitor extends JavaScriptComparatorVisitor {
             return methodDeclaration;
         });
     }
+    /**
+     * Override visitVoid to allow semantic equivalence with undefined identifier.
+     * This handles the reverse case where the pattern is a void expression
+     * and the source is the undefined identifier.
+     *
+     * Examples:
+     * - `void 0` matches `undefined`
+     * - `void(0)` matches `undefined`
+     * - `void 1` matches `undefined`
+     */
+    visitVoid(voidExpr, other) {
+        const _super = Object.create(null, {
+            visitVoid: { get: () => super.visitVoid }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.match) {
+                return voidExpr;
+            }
+            // Check if the other is an undefined identifier
+            if (other.kind === java_1.J.Kind.Identifier) {
+                const identifier = other;
+                if (identifier.simpleName === 'undefined') {
+                    // Both evaluate to undefined, so they match
+                    return voidExpr;
+                }
+            }
+            // Otherwise delegate to parent
+            return _super.visitVoid.call(this, voidExpr, other);
+        });
+    }
+    /**
+     * Override visitLiteral to allow semantic equivalence between
+     * different numeric literal formats.
+     *
+     * Examples:
+     * - `255` matches `0xFF`
+     * - `255` matches `0o377`
+     * - `255` matches `0b11111111`
+     * - `1000` matches `1e3`
+     */
+    visitLiteral(literal, other) {
+        const _super = Object.create(null, {
+            visitLiteral: { get: () => super.visitLiteral }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.match) {
+                return literal;
+            }
+            if (other.kind !== java_1.J.Kind.Literal) {
+                return yield _super.visitLiteral.call(this, literal, other);
+            }
+            const otherLiteral = other;
+            // Only compare value and type, ignoring valueSource (text representation) and unicodeEscapes
+            yield this.visitProperty(literal.value, otherLiteral.value);
+            if (!this.match)
+                return literal;
+            yield this.visitProperty(literal.type, otherLiteral.type);
+            if (!this.match)
+                return literal;
+            return literal;
+        });
+    }
 }
 exports.JavaScriptSemanticComparatorVisitor = JavaScriptSemanticComparatorVisitor;
 //# sourceMappingURL=comparator.js.map