@openrewrite/rewrite 8.70.0-20251218-163048 → 8.70.0-20251219-160440

package/dist/javascript/{format.js → format/format.js}

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlankLinesVisitor = exports.MinimumViableSpacingVisitor = exports.WrappingAndBracesVisitor = exports.SpacesVisitor = exports.NormalizeWhitespaceVisitor = exports.AutoformatVisitor = exports.autoFormat = exports.maybeAutoFormat = exports.TabsAndIndentsVisitor = void 0;
+exports.prettierFormat = exports.BlankLinesVisitor = exports.WrappingAndBracesVisitor = exports.SpacesVisitor = exports.AutoformatVisitor = exports.autoFormat = exports.maybeAutoFormat = exports.MinimumViableSpacingVisitor = exports.NormalizeWhitespaceVisitor = exports.TabsAndIndentsVisitor = void 0;
 /*
  * Copyright 2025 the original author or authors.
  * <p>
@@ -25,17 +25,23 @@ exports.BlankLinesVisitor = exports.MinimumViableSpacingVisitor = exports.Wrappi
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const tree_1 = require("./tree");
-const visitor_1 = require("./visitor");
-const java_1 = require("../java");
+const tree_1 = require("../tree");
+const visitor_1 = require("../visitor");
+const java_1 = require("../../java");
 const immer_1 = require("immer");
-const tree_2 = require("../tree");
-const style_1 = require("./style");
-const visitor_2 = require("../visitor");
-const markers_1 = require("../markers");
+const tree_2 = require("../../tree");
+const style_1 = require("../style");
+const visitor_2 = require("../../visitor");
 const tabs_and_indents_visitor_1 = require("./tabs-and-indents-visitor");
+const normalize_whitespace_visitor_1 = require("./normalize-whitespace-visitor");
+const minimum_viable_spacing_visitor_1 = require("./minimum-viable-spacing-visitor");
+const prettier_format_1 = require("./prettier-format");
 var tabs_and_indents_visitor_2 = require("./tabs-and-indents-visitor");
 Object.defineProperty(exports, "TabsAndIndentsVisitor", { enumerable: true, get: function () { return tabs_and_indents_visitor_2.TabsAndIndentsVisitor; } });
+var normalize_whitespace_visitor_2 = require("./normalize-whitespace-visitor");
+Object.defineProperty(exports, "NormalizeWhitespaceVisitor", { enumerable: true, get: function () { return normalize_whitespace_visitor_2.NormalizeWhitespaceVisitor; } });
+var minimum_viable_spacing_visitor_2 = require("./minimum-viable-spacing-visitor");
+Object.defineProperty(exports, "MinimumViableSpacingVisitor", { enumerable: true, get: function () { return minimum_viable_spacing_visitor_2.MinimumViableSpacingVisitor; } });
 const maybeAutoFormat = (before, after, p, stopAfter, parent) => __awaiter(void 0, void 0, void 0, function* () {
     if (before !== after) {
         return (0, exports.autoFormat)(after, p, stopAfter, parent);
@@ -52,6 +58,9 @@ exports.autoFormat = autoFormat;
  * 1. Styles passed to the constructor
  * 2. Styles from source file markers (NamedStyles)
  * 3. IntelliJ defaults
+ *
+ * When a PrettierStyle is present (either in the styles array or as a marker on the source file),
+ * Prettier is used for formatting. Otherwise, built-in formatting visitors are used.
  */
 class AutoformatVisitor extends visitor_1.JavaScriptVisitor {
     constructor(stopAfter, styles) {
@@ -61,9 +70,15 @@ class AutoformatVisitor extends visitor_1.JavaScriptVisitor {
     }
     visit(tree, p, cursor) {
         return __awaiter(this, void 0, void 0, function* () {
+            // Check for PrettierStyle in styles array or as marker on source file
+            // If found, delegate entirely to Prettier (skip other formatting visitors)
+            const prettierStyle = (0, prettier_format_1.getPrettierStyle)(tree, cursor, this.styles);
+            if (prettierStyle) {
+                return (0, prettier_format_1.applyPrettierFormatting)(tree, prettierStyle, p, cursor, this.stopAfter);
+            }
             const visitors = [
-                new NormalizeWhitespaceVisitor(this.stopAfter),
-                new MinimumViableSpacingVisitor(this.stopAfter),
+                new normalize_whitespace_visitor_1.NormalizeWhitespaceVisitor(this.stopAfter),
+                new minimum_viable_spacing_visitor_1.MinimumViableSpacingVisitor(this.stopAfter),
                 new BlankLinesVisitor((0, style_1.getStyle)(style_1.StyleKind.BlankLinesStyle, tree, this.styles), this.stopAfter),
                 new WrappingAndBracesVisitor((0, style_1.getStyle)(style_1.StyleKind.WrappingAndBracesStyle, tree, this.styles), this.stopAfter),
                 new SpacesVisitor((0, style_1.getStyle)(style_1.StyleKind.SpacesStyle, tree, this.styles), this.stopAfter),
@@ -81,39 +96,6 @@ class AutoformatVisitor extends visitor_1.JavaScriptVisitor {
     }
 }
 exports.AutoformatVisitor = AutoformatVisitor;
-class NormalizeWhitespaceVisitor extends visitor_1.JavaScriptVisitor {
-    // called NormalizeFormat in Java
-    // Ensures that whitespace is on the outermost AST element possible
-    constructor(stopAfter) {
-        super();
-        this.stopAfter = stopAfter;
-    }
-    visit(tree, p, parent) {
-        const _super = Object.create(null, {
-            visit: { get: () => super.visit }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (((_a = this.cursor) === null || _a === void 0 ? void 0 : _a.getNearestMessage("stop")) != null) {
-                return tree;
-            }
-            return _super.visit.call(this, tree, p, parent);
-        });
-    }
-    postVisit(tree, p) {
-        const _super = Object.create(null, {
-            postVisit: { get: () => super.postVisit }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (this.stopAfter != null && (0, tree_2.isScope)(this.stopAfter, tree)) {
-                (_a = this.cursor) === null || _a === void 0 ? void 0 : _a.root.messages.set("stop", true);
-            }
-            return _super.postVisit.call(this, tree, p);
-        });
-    }
-}
-exports.NormalizeWhitespaceVisitor = NormalizeWhitespaceVisitor;
 class SpacesVisitor extends visitor_1.JavaScriptVisitor {
     constructor(style, stopAfter) {
         super();
@@ -1096,276 +1078,6 @@ class WrappingAndBracesVisitor extends visitor_1.JavaScriptVisitor {
     }
 }
 exports.WrappingAndBracesVisitor = WrappingAndBracesVisitor;
-class MinimumViableSpacingVisitor extends visitor_1.JavaScriptVisitor {
-    constructor(stopAfter) {
-        super();
-        this.stopAfter = stopAfter;
-    }
-    visit(tree, p, parent) {
-        const _super = Object.create(null, {
-            visit: { get: () => super.visit }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (((_a = this.cursor) === null || _a === void 0 ? void 0 : _a.getNearestMessage("stop")) != null) {
-                return tree;
-            }
-            return _super.visit.call(this, tree, p, parent);
-        });
-    }
-    postVisit(tree, p) {
-        const _super = Object.create(null, {
-            postVisit: { get: () => super.postVisit }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (this.stopAfter != null && (0, tree_2.isScope)(this.stopAfter, tree)) {
-                (_a = this.cursor) === null || _a === void 0 ? void 0 : _a.root.messages.set("stop", true);
-            }
-            return _super.postVisit.call(this, tree, p);
-        });
-    }
-    visitAwait(await_, p) {
-        const _super = Object.create(null, {
-            visitAwait: { get: () => super.visitAwait }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const ret = yield _super.visitAwait.call(this, await_, p);
-            return (0, immer_1.produce)(ret, draft => {
-                this.ensureSpace(draft.expression.prefix);
-            });
-        });
-    }
-    visitClassDeclaration(classDecl, p) {
-        const _super = Object.create(null, {
-            visitClassDeclaration: { get: () => super.visitClassDeclaration }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            let c = yield _super.visitClassDeclaration.call(this, classDecl, p);
-            let first = c.leadingAnnotations.length === 0;
-            if (c.modifiers.length > 0) {
-                if (!first && c.modifiers[0].prefix.whitespace === "") {
-                    c = (0, immer_1.produce)(c, draft => {
-                        this.ensureSpace(draft.modifiers[0].prefix);
-                    });
-                }
-                c = (0, immer_1.produce)(c, draft => {
-                    for (let i = 1; i < draft.modifiers.length; i++) {
-                        this.ensureSpace(draft.modifiers[i].prefix);
-                    }
-                });
-                first = false;
-            }
-            if (c.classKind.prefix.whitespace === "" && !first) {
-                c = (0, immer_1.produce)(c, draft => {
-                    this.ensureSpace(draft.classKind.prefix);
-                });
-                first = false;
-            }
-            // anonymous classes have an empty name
-            if (c.name.simpleName !== "") {
-                c = (0, immer_1.produce)(c, draft => {
-                    this.ensureSpace(draft.name.prefix);
-                });
-            }
-            // Note: typeParameters should NOT have space before them - they immediately follow the class name
-            // e.g., "class DataTable<Row>" not "class DataTable <Row>"
-            if (c.extends && c.extends.before.whitespace === "") {
-                c = (0, immer_1.produce)(c, draft => {
-                    this.ensureSpace(draft.extends.before);
-                });
-            }
-            if (c.implements && c.implements.before.whitespace === "") {
-                c = (0, immer_1.produce)(c, draft => {
-                    this.ensureSpace(draft.implements.before);
-                    if (draft.implements != undefined && draft.implements.elements.length > 0) {
-                        this.ensureSpace(draft.implements.elements[0].element.prefix);
-                    }
-                });
-            }
-            c = (0, immer_1.produce)(c, draft => {
-                draft.body.prefix.whitespace = "";
-            });
-            return c;
-        });
-    }
-    visitMethodDeclaration(method, p) {
-        const _super = Object.create(null, {
-            visitMethodDeclaration: { get: () => super.visitMethodDeclaration }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            let m = yield _super.visitMethodDeclaration.call(this, method, p);
-            let first = m.leadingAnnotations.length === 0;
-            if (m.modifiers.length > 0) {
-                if (!first && m.modifiers[0].prefix.whitespace === "") {
-                    m = (0, immer_1.produce)(m, draft => {
-                        this.ensureSpace(draft.modifiers[0].prefix);
-                    });
-                }
-                m = (0, immer_1.produce)(m, draft => {
-                    for (let i = 1; i < draft.modifiers.length; i++) {
-                        this.ensureSpace(draft.modifiers[i].prefix);
-                    }
-                });
-                first = false;
-            }
-            // FunctionDeclaration marker check must come AFTER modifiers processing
-            // to avoid adding unwanted space before the first modifier (e.g., 'async')
-            if ((0, markers_1.findMarker)(method, tree_1.JS.Markers.FunctionDeclaration)) {
-                first = false;
-            }
-            if (!first && m.name.prefix.whitespace === "") {
-                m = (0, immer_1.produce)(m, draft => {
-                    this.ensureSpace(draft.name.prefix);
-                });
-            }
-            if (m.throws && m.throws.before.whitespace === "") {
-                m = (0, immer_1.produce)(m, draft => {
-                    this.ensureSpace(draft.throws.before);
-                });
-            }
-            return m;
-        });
-    }
-    visitNamespaceDeclaration(namespaceDeclaration, p) {
-        const _super = Object.create(null, {
-            visitNamespaceDeclaration: { get: () => super.visitNamespaceDeclaration }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const ret = yield _super.visitNamespaceDeclaration.call(this, namespaceDeclaration, p);
-            return (0, immer_1.produce)(ret, draft => {
-                if (draft.modifiers.length > 0) {
-                    draft.keywordType.before.whitespace = " ";
-                }
-                this.ensureSpace(draft.name.element.prefix);
-            });
-        });
-    }
-    visitNewClass(newClass, p) {
-        const _super = Object.create(null, {
-            visitNewClass: { get: () => super.visitNewClass }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const ret = yield _super.visitNewClass.call(this, newClass, p);
-            return (0, immer_1.produce)(ret, draft => {
-                if (draft.class) {
-                    if (draft.class.kind == java_1.J.Kind.Identifier) {
-                        this.ensureSpace(draft.class.prefix);
-                    }
-                }
-            });
-        });
-    }
-    visitReturn(returnNode, p) {
-        const _super = Object.create(null, {
-            visitReturn: { get: () => super.visitReturn }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const r = yield _super.visitReturn.call(this, returnNode, p);
-            if (r.expression && r.expression.prefix.whitespace === "" &&
-                !r.markers.markers.find(m => m.id === "org.openrewrite.java.marker.ImplicitReturn")) {
-                return (0, immer_1.produce)(r, draft => {
-                    this.ensureSpace(draft.expression.prefix);
-                });
-            }
-            return r;
-        });
-    }
-    visitThrow(thrown, p) {
-        const _super = Object.create(null, {
-            visitThrow: { get: () => super.visitThrow }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const ret = yield _super.visitThrow.call(this, thrown, p);
-            return ret && (0, immer_1.produce)(ret, draft => {
-                this.ensureSpace(draft.exception.prefix);
-            });
-        });
-    }
-    visitTypeDeclaration(typeDeclaration, p) {
-        const _super = Object.create(null, {
-            visitTypeDeclaration: { get: () => super.visitTypeDeclaration }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const ret = yield _super.visitTypeDeclaration.call(this, typeDeclaration, p);
-            return (0, immer_1.produce)(ret, draft => {
-                if (draft.modifiers.length > 0) {
-                    this.ensureSpace(draft.name.before);
-                }
-                this.ensureSpace(draft.name.element.prefix);
-            });
-        });
-    }
-    visitTypeOf(typeOf, p) {
-        const _super = Object.create(null, {
-            visitTypeOf: { get: () => super.visitTypeOf }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const ret = yield _super.visitTypeOf.call(this, typeOf, p);
-            return (0, immer_1.produce)(ret, draft => {
-                this.ensureSpace(draft.expression.prefix);
-            });
-        });
-    }
-    visitTypeParameter(typeParam, p) {
-        const _super = Object.create(null, {
-            visitTypeParameter: { get: () => super.visitTypeParameter }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const ret = yield _super.visitTypeParameter.call(this, typeParam, p);
-            return (0, immer_1.produce)(ret, draft => {
-                if (draft.bounds && draft.bounds.elements.length > 0) {
-                    this.ensureSpace(draft.bounds.before);
-                    this.ensureSpace(draft.bounds.elements[0].element.prefix);
-                }
-            });
-        });
-    }
-    visitVariableDeclarations(v, p) {
-        const _super = Object.create(null, {
-            visitVariableDeclarations: { get: () => super.visitVariableDeclarations }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            let ret = yield _super.visitVariableDeclarations.call(this, v, p);
-            let first = ret.leadingAnnotations.length === 0;
-            if (first && ret.modifiers.length > 0) {
-                ret = (0, immer_1.produce)(ret, draft => {
-                    for (let i = 1; i < draft.modifiers.length; i++) {
-                        this.ensureSpace(draft.modifiers[i].prefix);
-                    }
-                });
-                first = false;
-            }
-            if (!first) {
-                ret = (0, immer_1.produce)(ret, draft => {
-                    this.ensureSpace(draft.variables[0].element.prefix);
-                });
-            }
-            return ret;
-        });
-    }
-    visitCase(caseNode, p) {
-        const _super = Object.create(null, {
-            visitCase: { get: () => super.visitCase }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const c = yield _super.visitCase.call(this, caseNode, p);
-            if (c.guard && c.caseLabels.elements.length > 0 && c.caseLabels.elements[c.caseLabels.elements.length - 1].after.whitespace === "") {
-                return (0, immer_1.produce)(c, draft => {
-                    const last = draft.caseLabels.elements.length - 1;
-                    draft.caseLabels.elements[last].after.whitespace = " ";
-                });
-            }
-            return c;
-        });
-    }
-    ensureSpace(spaceDraft) {
-        if (spaceDraft.whitespace.length === 0 && spaceDraft.comments.length === 0) {
-            spaceDraft.whitespace = " ";
-        }
-    }
-}
-exports.MinimumViableSpacingVisitor = MinimumViableSpacingVisitor;
 class BlankLinesVisitor extends visitor_1.JavaScriptVisitor {
     constructor(style, stopAfter) {
         super();
@@ -1597,4 +1309,7 @@ class BlankLinesVisitor extends visitor_1.JavaScriptVisitor {
     }
 }
 exports.BlankLinesVisitor = BlankLinesVisitor;
+// Re-export prettier formatting utilities
+var prettier_format_2 = require("./prettier-format");
+Object.defineProperty(exports, "prettierFormat", { enumerable: true, get: function () { return prettier_format_2.prettierFormat; } });
 //# sourceMappingURL=format.js.map