@openrewrite/rewrite 0.32.0 → 0.33.0

package/dist/src/javascript/format/normalizeSpaces.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NormalizeFormatVisitor = void 0;
+const __1 = require("..");
+const core_1 = require("../../core");
+const java_1 = require("../../java");
+class NormalizeFormatVisitor extends __1.JavaScriptVisitor {
+    constructor() {
+        super();
+        this.cursor = new core_1.Cursor(null, core_1.Cursor.ROOT_VALUE);
+    }
+    visitScopedVariableDeclarations(scopedVariableDeclarations, p) {
+        let vd = super.visitScopedVariableDeclarations(scopedVariableDeclarations, p);
+        if (vd.padding.scope) {
+            vd = concatenatePrefix(vd, vd.padding.scope.before);
+            if (vd.padding.scope) {
+                vd = vd.padding.withScope(vd.padding.scope.withBefore(java_1.Space.EMPTY));
+            }
+        }
+        return vd;
+    }
+}
+exports.NormalizeFormatVisitor = NormalizeFormatVisitor;
+function concatenatePrefix(j, prefix) {
+    var _a, _b, _c;
+    const shift = commonMargin(null, (_a = j.prefix.whitespace) !== null && _a !== void 0 ? _a : "");
+    const comments = [
+        ...j.prefix.comments,
+        ...prefix.comments.map((comment) => {
+            let c = comment;
+            if (shift === "") {
+                return c;
+            }
+            if (c instanceof java_1.TextComment) {
+                const textComment = c;
+                c = textComment.withText(textComment.text.replace("\n", "\n" + shift));
+            }
+            if (c.suffix.includes("\n")) {
+                c = c.withSuffix(c.suffix.replace("\n", "\n" + shift));
+            }
+            return c;
+        })
+    ];
+    return j.withPrefix(j.prefix.withWhitespace(((_b = j.prefix.whitespace) !== null && _b !== void 0 ? _b : "") + ((_c = prefix.whitespace) !== null && _c !== void 0 ? _c : ""))
+        .withComments(comments));
+}
+function commonMargin(s1, s2) {
+    if (s1 === null) {
+        const s = s2.toString();
+        return s.substring(s.lastIndexOf('\n') + 1);
+    }
+    for (let i = 0; i < s1.length && i < s2.length; i++) {
+        if (s1.charAt(i) !== s2.charAt(i) || !/\s/.test(s1.charAt(i))) {
+            return s1.substring(0, i);
+        }
+    }
+    return s2.length < s1.length ? s2 : s1;
+}
+//# sourceMappingURL=normalizeSpaces.js.map

package/dist/src/javascript/format/normalizeSpaces.js.map

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

package/dist/src/javascript/parser.d.ts.map

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

package/dist/src/javascript/parser.js

@@ -527,57 +527,61 @@ class JavaScriptParserVisitor {
         return new J.Annotation((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, annotationType, _arguments);
     }
     visitPropertySignature(node) {
+        const prefix = this.prefix(node);
         if (node.questionToken) {
-            return new JS.JSVariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], this.mapModifiers(node), this.mapTypeInfo(node), null, [this.rightPadded(new JS.JSVariableDeclarations.JSNamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, this.getOptionalUnary(node), [], null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
+            return new JS.JSVariableDeclarations((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, [], this.mapModifiers(node), this.mapTypeInfo(node), null, [this.rightPadded(new JS.JSVariableDeclarations.JSNamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, this.getOptionalUnary(node), [], null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
         }
         const nameExpression = this.visit(node.name);
         if (nameExpression instanceof J.Identifier) {
-            return new J.VariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], this.mapModifiers(node), this.mapTypeInfo(node), null, [], [this.rightPadded(new J.VariableDeclarations.NamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, nameExpression, [], null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
+            return new J.VariableDeclarations((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, [], this.mapModifiers(node), this.mapTypeInfo(node), null, [], [this.rightPadded(new J.VariableDeclarations.NamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, nameExpression, [], null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
         }
         else {
-            return new JS.JSVariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], this.mapModifiers(node), this.mapTypeInfo(node), null, [this.rightPadded(new JS.JSVariableDeclarations.JSNamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, nameExpression, [], null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
+            return new JS.JSVariableDeclarations((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, [], this.mapModifiers(node), this.mapTypeInfo(node), null, [this.rightPadded(new JS.JSVariableDeclarations.JSNamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, nameExpression, [], null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
         }
     }
     visitPropertyDeclaration(node) {
+        const prefix = this.prefix(node);
         if (node.questionToken) {
-            return new JS.JSVariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeInfo(node), null, [this.rightPadded(new JS.JSVariableDeclarations.JSNamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, this.getOptionalUnary(node), [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildren().indexOf(node.initializer) - 1)), this.visit(node.initializer)) : null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
+            return new JS.JSVariableDeclarations((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeInfo(node), null, [this.rightPadded(new JS.JSVariableDeclarations.JSNamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, this.getOptionalUnary(node), [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildren().indexOf(node.initializer) - 1)), this.visit(node.initializer)) : null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
         }
         if (node.exclamationToken) {
-            return new JS.JSVariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeInfo(node), null, [this.rightPadded(new JS.JSVariableDeclarations.JSNamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, new JS.Unary((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, this.leftPadded(this.suffix(node.name), JS.Unary.Type.Exclamation), this.visit(node.name), this.mapType(node)), [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildren().indexOf(node.initializer) - 1)), this.visit(node.initializer)) : null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
+            return new JS.JSVariableDeclarations((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeInfo(node), null, [this.rightPadded(new JS.JSVariableDeclarations.JSNamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, new JS.Unary((0, core_1.randomId)(), java_1.Space.EMPTY, core_1.Markers.EMPTY, this.leftPadded(this.suffix(node.name), JS.Unary.Type.Exclamation), this.visit(node.name), this.mapType(node)), [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildren().indexOf(node.initializer) - 1)), this.visit(node.initializer)) : null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
         }
         const nameExpression = this.visit(node.name);
         if (nameExpression instanceof J.Identifier) {
-            return new J.VariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeInfo(node), null, [], [this.rightPadded(new J.VariableDeclarations.NamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, nameExpression, [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildren().indexOf(node.initializer) - 1)), this.visit(node.initializer)) : null, this.mapVariableType(node)), this.suffix(node.name))]);
+            return new J.VariableDeclarations((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeInfo(node), null, [], [this.rightPadded(new J.VariableDeclarations.NamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, nameExpression, [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildren().indexOf(node.initializer) - 1)), this.visit(node.initializer)) : null, this.mapVariableType(node)), this.suffix(node.name))]);
         }
-        return new JS.JSVariableDeclarations((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeInfo(node), null, [this.rightPadded(new JS.JSVariableDeclarations.JSNamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, nameExpression, [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildren().indexOf(node.initializer) - 1)), this.visit(node.initializer)) : null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
+        return new JS.JSVariableDeclarations((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeInfo(node), null, [this.rightPadded(new JS.JSVariableDeclarations.JSNamedVariable((0, core_1.randomId)(), this.prefix(node.name), core_1.Markers.EMPTY, nameExpression, [], node.initializer ? this.leftPadded(this.prefix(node.getChildAt(node.getChildren().indexOf(node.initializer) - 1)), this.visit(node.initializer)) : null, this.mapVariableType(node)), java_1.Space.EMPTY)]);
     }
     visitMethodSignature(node) {
+        const prefix = this.prefix(node);
         if (node.questionToken) {
-            return new JS.JSMethodDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], [], this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), this.getOptionalUnary(node), this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, null, null, this.mapMethodType(node));
+            return new JS.JSMethodDeclaration((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, [], [], this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), this.getOptionalUnary(node), this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, null, null, this.mapMethodType(node));
         }
         if (ts.isComputedPropertyName(node.name)) {
-            return new JS.JSMethodDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], [], this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), this.convert(node.name), this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, null, null, this.mapMethodType(node));
+            return new JS.JSMethodDeclaration((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, [], [], this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), this.convert(node.name), this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, null, null, this.mapMethodType(node));
         }
         const name = !node.name
             ? this.mapIdentifier(node, "")
             : ts.isStringLiteral(node.name)
                 ? this.mapIdentifier(node.name, node.name.getText())
                 : this.visit(node.name);
-        return new J.MethodDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, [], [], this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), new J.MethodDeclaration.IdentifierWithAnnotations(name, []), this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, null, null, this.mapMethodType(node));
+        return new J.MethodDeclaration((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, [], [], this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), new J.MethodDeclaration.IdentifierWithAnnotations(name, []), this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, null, null, this.mapMethodType(node));
     }
     visitMethodDeclaration(node) {
+        const prefix = this.prefix(node);
         if (node.questionToken || node.asteriskToken) {
             let methodName = node.questionToken ? this.getOptionalUnary(node) : this.visit(node.name);
             if (node.asteriskToken) {
                 methodName = new JS.Unary((0, core_1.randomId)(), this.prefix(node.asteriskToken), core_1.Markers.EMPTY, this.leftPadded(this.prefix(node.name), JS.Unary.Type.Asterisk), methodName, this.mapType(node));
             }
-            return new JS.JSMethodDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), methodName, this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, node.body ? this.convert(node.body) : null, null, this.mapMethodType(node));
+            return new JS.JSMethodDeclaration((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), methodName, this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, node.body ? this.convert(node.body) : null, null, this.mapMethodType(node));
         }
         const name = node.name ? this.visit(node.name) : this.mapIdentifier(node, "");
         if (!(name instanceof J.Identifier)) {
-            return new JS.JSMethodDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), name, this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, node.body ? this.convert(node.body) : null, null, this.mapMethodType(node));
+            return new JS.JSMethodDeclaration((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), name, this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, node.body ? this.convert(node.body) : null, null, this.mapMethodType(node));
         }
-        return new J.MethodDeclaration((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), new J.MethodDeclaration.IdentifierWithAnnotations(name, []), this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, node.body ? this.convert(node.body) : null, null, this.mapMethodType(node));
+        return new J.MethodDeclaration((0, core_1.randomId)(), prefix, core_1.Markers.EMPTY, this.mapDecorators(node), this.mapModifiers(node), this.mapTypeParametersAsObject(node), this.mapTypeInfo(node), new J.MethodDeclaration.IdentifierWithAnnotations(name, []), this.mapCommaSeparatedList(this.getParameterListNodes(node)), null, node.body ? this.convert(node.body) : null, null, this.mapMethodType(node));
     }
     mapTypeInfo(node) {
         return node.type ? new JS.TypeInfo((0, core_1.randomId)(), this.prefix(node.getChildAt(node.getChildren().indexOf(node.type) - 1)), core_1.Markers.EMPTY, this.visit(node.type)) : null;
@@ -1062,9 +1066,7 @@ class JavaScriptParserVisitor {
     }
     visitExpressionStatement(node) {
         const expression = this.visit(node.expression);
-        if (expression instanceof J.MethodInvocation || expression instanceof J.NewClass || expression instanceof J.Unknown ||
-            expression instanceof J.AssignmentOperation || expression instanceof J.Ternary || expression instanceof J.Empty ||
-            expression instanceof JS.ExpressionStatement || expression instanceof J.Assignment || expression instanceof J.FieldAccess) {
+        if ((0, parserUtils_1.isStatement)(expression)) {
             return expression;
         }
         return new JS.ExpressionStatement((0, core_1.randomId)(), expression);
@@ -1087,7 +1089,7 @@ class JavaScriptParserVisitor {
         var _a;
         return new J.ForLoop((0, core_1.randomId)(), this.prefix(node), core_1.Markers.EMPTY, new J.ForLoop.Control((0, core_1.randomId)(), this.prefix(this.findChildNode(node, ts.SyntaxKind.OpenParenToken)), core_1.Markers.EMPTY, [node.initializer ?
                 (ts.isVariableDeclarationList(node.initializer) ? this.rightPadded(this.visit(node.initializer), java_1.Space.EMPTY) :
-                    this.rightPadded(new _1.ExpressionStatement((0, core_1.randomId)(), this.visit(node.initializer)), this.suffix(node.initializer))) :
+                    this.rightPadded(ts.isStatement(node.initializer) ? this.visit(node.initializer) : new _1.ExpressionStatement((0, core_1.randomId)(), this.visit(node.initializer)), this.suffix(node.initializer))) :
                 this.rightPadded(this.newJEmpty(), this.suffix(this.findChildNode(node, ts.SyntaxKind.OpenParenToken)))], node.condition ? this.rightPadded(this.visit(node.condition), this.suffix(node.condition)) :
             this.rightPadded(this.newJEmpty(), this.suffix(this.findChildNode(node, ts.SyntaxKind.SemicolonToken))), [node.incrementor ? this.rightPadded(ts.isStatement(node.incrementor) ? this.visit(node.incrementor) : new _1.ExpressionStatement((0, core_1.randomId)(), this.visit(node.incrementor)), this.suffix(node.incrementor)) :
                 this.rightPadded(this.newJEmpty(this.prefix(this.findChildNode(node, ts.SyntaxKind.CloseParenToken))), java_1.Space.EMPTY)]), this.rightPadded(this.convert(node.statement), this.semicolonPrefix(node.statement), ((_a = node.statement.getChildAt(node.statement.getChildCount() - 1)) === null || _a === void 0 ? void 0 : _a.kind) == ts.SyntaxKind.SemicolonToken ? core_1.Markers.build([new java_1.Semicolon((0, core_1.randomId)())]) : core_1.Markers.EMPTY));