@openrewrite/rewrite 8.70.0-20251222-160244 → 8.70.0-20251222-222208

package/dist/javascript/format/format.js

@@ -28,7 +28,7 @@ exports.prettierFormat = exports.BlankLinesVisitor = exports.WrappingAndBracesVi
 const tree_1 = require("../tree");
 const visitor_1 = require("../visitor");
 const java_1 = require("../../java");
-const immer_1 = require("immer");
+const mutative_1 = require("mutative");
 const tree_2 = require("../../tree");
 const style_1 = require("../style");
 const visitor_2 = require("../../visitor");
@@ -132,7 +132,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitAlias.call(this, alias, p);
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 draft.propertyName.after.whitespace = " ";
             });
         });
@@ -143,7 +143,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitArrayAccess.call(this, arrayAccess, p);
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 // Preserve newlines - only modify if no newlines present
                 if (!draft.dimension.index.element.prefix.whitespace.includes("\n")) {
                     draft.dimension.index.element.prefix.whitespace = this.style.within.arrayBrackets ? " " : "";
@@ -160,7 +160,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitAssignment.call(this, assignment, p);
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 // Preserve newlines - only modify if no newlines present
                 if (!draft.assignment.before.whitespace.includes("\n")) {
                     draft.assignment.before.whitespace = this.style.aroundOperators.assignment ? " " : "";
@@ -215,7 +215,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
                 default:
                     throw new Error("Unsupported operator type " + ret.operator.element.valueOf());
             }
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 // Preserve newlines - only modify if no newlines present
                 if (!draft.operator.before.whitespace.includes("\n")) {
                     draft.operator.before.whitespace = property ? " " : "";
@@ -232,7 +232,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitCase.call(this, aCase, p);
-            return ret && (0, immer_1.produce)(ret, draft => {
+            return ret && (0, mutative_1.create)(ret, draft => {
                 if (draft.caseLabels.elements[0].element.kind != java_1.J.Kind.Identifier || draft.caseLabels.elements[0].element.simpleName != "default") {
                     // Preserve newlines - only set to space if no newline exists
                     if (!draft.caseLabels.before.whitespace.includes("\n")) {
@@ -250,7 +250,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
             const ret = yield _super.visitClassDeclaration.call(this, classDecl, p);
             // TODO typeParameters - IntelliJ doesn't seem to provide a setting for angleBrackets spacing for Typescript (while it does for Java),
             // thus we either introduce our own setting or just enforce the natural spacing with no setting
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 draft.body.prefix.whitespace = this.style.beforeLeftBrace.classInterfaceModuleLeftBrace ? " " : "";
             });
         });
@@ -261,7 +261,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitContainer.call(this, container, p);
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 var _a, _b, _c, _d;
                 if (draft.elements.length > 0) {
                     // Apply beforeComma rule to all elements except the last
@@ -297,7 +297,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitExportDeclaration.call(this, exportDeclaration, p);
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 if (draft.exportClause) {
                     draft.exportClause.prefix.whitespace = " ";
                     if (draft.exportClause.kind == tree_1.JS.Kind.NamedExports) {
@@ -345,18 +345,19 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
                         }
                     }
                     oneInit.after.whitespace = "";
-                    return yield this.spaceBeforeRightPaddedElement(oneInit, index === 0 ? this.style.within.forParentheses : true);
+                    this.spaceBeforeRightPaddedElementDraft(oneInit, index === 0 ? this.style.within.forParentheses : true);
+                    return oneInit;
                 })));
                 if (draft.control.condition) {
                     draft.control.condition.element.prefix.whitespace = " ";
                     draft.control.condition.after.whitespace = this.style.other.beforeForSemicolon ? " " : "";
                 }
-                draft.control.update = yield Promise.all(draft.control.update.map((oneUpdate, index) => __awaiter(this, void 0, void 0, function* () {
+                draft.control.update.forEach((oneUpdate, index) => {
                     oneUpdate.element.prefix.whitespace = " ";
                     oneUpdate.after.whitespace = (index === draft.control.update.length - 1 ? this.style.within.forParentheses : this.style.other.beforeForSemicolon) ? " " : "";
-                    return oneUpdate;
-                })));
-                draft.body = yield this.spaceAfterRightPadded(yield this.spaceBeforeRightPaddedElement(ret.body, this.style.beforeLeftBrace.forLeftBrace), false);
+                });
+                this.spaceBeforeRightPaddedElementDraft(draft.body, this.style.beforeLeftBrace.forLeftBrace);
+                this.spaceAfterRightPaddedDraft(draft.body, false);
             }));
         });
     }
@@ -367,9 +368,11 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitIf.call(this, iff, p);
             return (0, visitor_2.produceAsync)(ret, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.ifCondition = yield this.spaceBefore(draft.ifCondition, this.style.beforeParentheses.ifParentheses);
-                draft.ifCondition.tree = yield this.spaceAfterRightPadded(yield this.spaceBeforeRightPaddedElement(draft.ifCondition.tree, this.style.within.ifParentheses), this.style.within.ifParentheses);
-                draft.thenPart = yield this.spaceAfterRightPadded(yield this.spaceBeforeRightPaddedElement(ret.thenPart, this.style.beforeLeftBrace.ifLeftBrace), false);
+                this.spaceBeforeDraft(draft.ifCondition, this.style.beforeParentheses.ifParentheses);
+                this.spaceBeforeRightPaddedElementDraft(draft.ifCondition.tree, this.style.within.ifParentheses);
+                this.spaceAfterRightPaddedDraft(draft.ifCondition.tree, this.style.within.ifParentheses);
+                this.spaceBeforeRightPaddedElementDraft(draft.thenPart, this.style.beforeLeftBrace.ifLeftBrace);
+                this.spaceAfterRightPaddedDraft(draft.thenPart, false);
             }));
         });
     }
@@ -379,7 +382,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitImportDeclaration.call(this, jsImport, p);
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 if (draft.importClause) {
                     // Space after 'import' keyword:
                     // - If there's a default import (name), space goes in importClause.prefix
@@ -430,7 +433,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitIndexSignatureDeclaration.call(this, indexSignatureDeclaration, p);
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 draft.typeExpression.before.whitespace = this.style.other.beforeTypeReferenceColon ? " " : "";
                 draft.typeExpression.element.prefix.whitespace = this.style.other.afterTypeReferenceColon ? " " : "";
             });
@@ -443,20 +446,22 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitMethodDeclaration.call(this, methodDecl, p);
             return (0, visitor_2.produceAsync)(ret, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.body = ret.body && (yield this.spaceBefore(ret.body, this.style.beforeLeftBrace.functionLeftBrace));
+                if (draft.body) {
+                    this.spaceBeforeDraft(draft.body, this.style.beforeLeftBrace.functionLeftBrace);
+                }
                 if (draft.parameters.elements.length > 0 && draft.parameters.elements[0].element.kind != java_1.J.Kind.Empty) {
-                    draft.parameters.elements = yield Promise.all(draft.parameters.elements.map((param, index) => __awaiter(this, void 0, void 0, function* () {
-                        param = yield this.spaceAfterRightPadded(param, index === draft.parameters.elements.length - 1 ? this.style.within.functionDeclarationParentheses : this.style.other.beforeComma);
-                        param.element = yield this.spaceBefore(param.element, index === 0 ? this.style.within.functionDeclarationParentheses : this.style.other.afterComma);
+                    draft.parameters.elements.forEach((param, index) => {
+                        this.spaceAfterRightPaddedDraft(param, index === draft.parameters.elements.length - 1 ? this.style.within.functionDeclarationParentheses : this.style.other.beforeComma);
+                        this.spaceBeforeDraft(param.element, index === 0 ? this.style.within.functionDeclarationParentheses : this.style.other.afterComma);
                         param.element.variables[0].element.name.prefix.whitespace = "";
                         param.element.variables[0].after.whitespace = "";
-                        return param;
-                    })));
+                    });
                 }
                 else if (draft.parameters.elements.length == 1) {
-                    draft.parameters.elements[0] = yield this.spaceAfterRightPadded(yield this.spaceBeforeRightPaddedElement(draft.parameters.elements[0], this.style.within.functionDeclarationParentheses), false);
+                    this.spaceBeforeRightPaddedElementDraft(draft.parameters.elements[0], this.style.within.functionDeclarationParentheses);
+                    this.spaceAfterRightPaddedDraft(draft.parameters.elements[0], false);
                 }
-                draft.parameters = yield this.spaceBeforeContainer(draft.parameters, this.style.beforeParentheses.functionDeclarationParentheses);
+                this.spaceBeforeContainerDraft(draft.parameters, this.style.beforeParentheses.functionDeclarationParentheses);
                 // Handle generator asterisk spacing
                 // - space before * is in the Generator marker's prefix
                 // - space after * is in the method name's prefix
@@ -478,17 +483,17 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
             const ret = yield _super.visitMethodInvocation.call(this, methodInv, p);
             return (0, visitor_2.produceAsync)(ret, (draft) => __awaiter(this, void 0, void 0, function* () {
                 if (draft.select) {
-                    draft.arguments = yield this.spaceBeforeContainer(draft.arguments, this.style.beforeParentheses.functionCallParentheses);
+                    this.spaceBeforeContainerDraft(draft.arguments, this.style.beforeParentheses.functionCallParentheses);
                 }
                 if (ret.arguments.elements.length > 0 && ret.arguments.elements[0].element.kind != java_1.J.Kind.Empty) {
-                    draft.arguments.elements = yield Promise.all(draft.arguments.elements.map((arg, index) => __awaiter(this, void 0, void 0, function* () {
-                        arg = yield this.spaceAfterRightPadded(arg, index === draft.arguments.elements.length - 1 ? this.style.within.functionCallParentheses : this.style.other.beforeComma);
-                        arg.element = yield this.spaceBefore(arg.element, index === 0 ? this.style.within.functionCallParentheses : this.style.other.afterComma);
-                        return arg;
-                    })));
+                    draft.arguments.elements.forEach((arg, index) => {
+                        this.spaceAfterRightPaddedDraft(arg, index === draft.arguments.elements.length - 1 ? this.style.within.functionCallParentheses : this.style.other.beforeComma);
+                        this.spaceBeforeDraft(arg.element, index === 0 ? this.style.within.functionCallParentheses : this.style.other.afterComma);
+                    });
                 }
                 else if (ret.arguments.elements.length == 1) {
-                    draft.arguments.elements[0] = yield this.spaceAfterRightPadded(yield this.spaceBeforeRightPaddedElement(draft.arguments.elements[0], this.style.within.functionCallParentheses), false);
+                    this.spaceBeforeRightPaddedElementDraft(draft.arguments.elements[0], this.style.within.functionCallParentheses);
+                    this.spaceAfterRightPaddedDraft(draft.arguments.elements[0], false);
                 }
                 // TODO typeParameters handling - see visitClassDeclaration
             }));
@@ -516,9 +521,10 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitSwitch.call(this, switchNode, p);
             return (0, visitor_2.produceAsync)(ret, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.selector = yield this.spaceBefore(draft.selector, this.style.beforeParentheses.switchParentheses);
-                draft.selector.tree = yield this.spaceAfterRightPadded(yield this.spaceBeforeRightPaddedElement(draft.selector.tree, this.style.within.switchParentheses), this.style.within.switchParentheses);
-                draft.cases = yield this.spaceBefore(draft.cases, this.style.beforeLeftBrace.switchLeftBrace);
+                this.spaceBeforeDraft(draft.selector, this.style.beforeParentheses.switchParentheses);
+                this.spaceBeforeRightPaddedElementDraft(draft.selector.tree, this.style.within.switchParentheses);
+                this.spaceAfterRightPaddedDraft(draft.selector.tree, this.style.within.switchParentheses);
+                this.spaceBeforeDraft(draft.cases, this.style.beforeLeftBrace.switchLeftBrace);
                 for (const case_ of draft.cases.statements) {
                     if (case_.element.kind === java_1.J.Kind.Case) {
                         case_.element.caseLabels.elements[0].after.whitespace = "";
@@ -534,8 +540,8 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitTernary.call(this, ternary, p);
             return (0, visitor_2.produceAsync)(ret, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.truePart = yield this.spaceBeforeLeftPaddedElement(draft.truePart, this.style.ternaryOperator.beforeQuestionMark, this.style.ternaryOperator.afterQuestionMark);
-                draft.falsePart = yield this.spaceBeforeLeftPaddedElement(draft.falsePart, this.style.ternaryOperator.beforeColon, this.style.ternaryOperator.afterColon);
+                this.spaceBeforeLeftPaddedElementDraft(draft.truePart, this.style.ternaryOperator.beforeQuestionMark, this.style.ternaryOperator.afterQuestionMark);
+                this.spaceBeforeLeftPaddedElementDraft(draft.falsePart, this.style.ternaryOperator.beforeColon, this.style.ternaryOperator.afterColon);
             }));
         });
     }
@@ -547,17 +553,19 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
             const ret = yield _super.visitTry.call(this, try_, p);
             return (0, visitor_2.produceAsync)(ret, (draft) => __awaiter(this, void 0, void 0, function* () {
                 draft.body.prefix.whitespace = this.style.beforeLeftBrace.tryLeftBrace ? " " : "";
-                draft.catches = yield Promise.all(draft.catches.map((catch_, index) => __awaiter(this, void 0, void 0, function* () {
-                    catch_ = yield this.spaceBefore(catch_, this.style.beforeKeywords.catchKeyword);
+                draft.catches.forEach(catch_ => {
+                    this.spaceBeforeDraft(catch_, this.style.beforeKeywords.catchKeyword);
                     catch_.parameter.prefix.whitespace = this.style.beforeParentheses.catchParentheses ? " " : "";
-                    catch_.parameter.tree = yield this.spaceAfterRightPadded(yield this.spaceBeforeRightPaddedElement(catch_.parameter.tree, this.style.within.catchParentheses), this.style.within.catchParentheses);
+                    this.spaceBeforeRightPaddedElementDraft(catch_.parameter.tree, this.style.within.catchParentheses);
+                    this.spaceAfterRightPaddedDraft(catch_.parameter.tree, this.style.within.catchParentheses);
                     if (catch_.parameter.tree.element.variables.length > 0) {
                         catch_.parameter.tree.element.variables[catch_.parameter.tree.element.variables.length - 1].after.whitespace = "";
                     }
                     catch_.body.prefix.whitespace = this.style.beforeLeftBrace.catchLeftBrace ? " " : "";
-                    return catch_;
-                })));
-                draft.finally = draft.finally && (yield this.spaceBeforeLeftPaddedElement(draft.finally, this.style.beforeKeywords.finallyKeyword, this.style.beforeLeftBrace.finallyLeftBrace));
+                });
+                if (draft.finally) {
+                    this.spaceBeforeLeftPaddedElementDraft(draft.finally, this.style.beforeKeywords.finallyKeyword, this.style.beforeLeftBrace.finallyLeftBrace);
+                }
             }));
         });
     }
@@ -567,7 +575,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitTypeDeclaration.call(this, typeDeclaration, p);
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 if (draft.modifiers.length > 0) {
                     draft.name.before.whitespace = " ";
                 }
@@ -590,7 +598,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
             const ret = yield _super.visitTypeInfo.call(this, typeInfo, p);
             return (0, visitor_2.produceAsync)(ret, (draft) => __awaiter(this, void 0, void 0, function* () {
                 draft.prefix.whitespace = this.style.other.beforeTypeReferenceColon ? " " : "";
-                draft.typeIdentifier = yield this.spaceBefore(draft.typeIdentifier, this.style.other.afterTypeReferenceColon);
+                this.spaceBeforeDraft(draft.typeIdentifier, this.style.other.afterTypeReferenceColon);
             }));
         });
     }
@@ -606,7 +614,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
                 const isSingleLine = !ret.members.end.whitespace.includes("\n") &&
                     stmts.every(s => !s.element.prefix.whitespace.includes("\n"));
                 if (isSingleLine) {
-                    return (0, immer_1.produce)(ret, draft => {
+                    return (0, mutative_1.create)(ret, draft => {
                         const space = this.style.within.objectLiteralTypeBraces ? " " : "";
                         draft.members.statements[0].element.prefix.whitespace = space;
                         // For type literals, the space before } is in members.end, not in last statement's after
@@ -623,7 +631,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitUnary.call(this, unary, p);
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 const spacing = this.style.aroundOperators.unary;
                 switch (draft.operator.element) {
                     case java_1.J.Unary.Type.Not:
@@ -675,9 +683,11 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitWhileLoop.call(this, whileLoop, p);
             return (0, visitor_2.produceAsync)(ret, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.body = yield this.spaceAfterRightPadded(yield this.spaceBeforeRightPaddedElement(ret.body, this.style.beforeLeftBrace.whileLeftBrace), false);
-                draft.condition = yield this.spaceBefore(draft.condition, this.style.beforeParentheses.whileParentheses);
-                draft.condition.tree = yield this.spaceAfterRightPadded(yield this.spaceBeforeRightPaddedElement(draft.condition.tree, this.style.within.whileParentheses), this.style.within.whileParentheses);
+                this.spaceBeforeRightPaddedElementDraft(draft.body, this.style.beforeLeftBrace.whileLeftBrace);
+                this.spaceAfterRightPaddedDraft(draft.body, false);
+                this.spaceBeforeDraft(draft.condition, this.style.beforeParentheses.whileParentheses);
+                this.spaceBeforeRightPaddedElementDraft(draft.condition.tree, this.style.within.whileParentheses);
+                this.spaceAfterRightPaddedDraft(draft.condition.tree, this.style.within.whileParentheses);
             }));
         });
     }
@@ -687,7 +697,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const ret = yield _super.visitTypeParameter.call(this, typeParam, p);
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 if (draft.bounds && draft.bounds.elements.length >= 2) {
                     const constraintType = draft.bounds.elements[0];
                     const defaultType = draft.bounds.elements[1];
@@ -709,104 +719,85 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
             });
         });
     }
-    spaceAfterRightPadded(right, spaceAfter) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (right.after.comments.length > 0) {
-                // Perform the space rule for the suffix of the last comment only. Same as IntelliJ.
-                const comments = SpacesVisitor.spaceLastCommentSuffix(right.after.comments, spaceAfter);
-                return Object.assign(Object.assign({}, right), { after: Object.assign(Object.assign({}, right.after), { comments }) });
-            }
-            if (spaceAfter && SpacesVisitor.isNotSingleSpace(right.after.whitespace)) {
-                return Object.assign(Object.assign({}, right), { after: Object.assign(Object.assign({}, right.after), { whitespace: " " }) });
-            }
-            else if (!spaceAfter && SpacesVisitor.isOnlySpacesAndNotEmpty(right.after.whitespace)) {
-                return Object.assign(Object.assign({}, right), { after: Object.assign(Object.assign({}, right.after), { whitespace: "" }) });
-            }
-            else {
-                return right;
-            }
-        });
-    }
-    spaceBeforeLeftPaddedElement(left, spaceBeforePadding, spaceBeforeElement) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield (0, visitor_2.produceAsync)(left, (draft) => __awaiter(this, void 0, void 0, function* () {
-                if (draft.before.comments.length == 0) {
-                    // Preserve newlines - only modify if no newlines present
-                    if (!draft.before.whitespace.includes("\n")) {
-                        draft.before.whitespace = spaceBeforePadding ? " " : "";
-                    }
-                }
-                draft.element = (yield this.spaceBefore(left.element, spaceBeforeElement));
-            })));
-        });
-    }
-    spaceBeforeRightPaddedElement(right, spaceBefore) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield (0, visitor_2.produceAsync)(right, (draft) => __awaiter(this, void 0, void 0, function* () {
-                draft.element = (yield this.spaceBefore(right.element, spaceBefore));
-            })));
-        });
+    /**
+     * Modifies the after space of a RightPadded draft in place.
+     */
+    spaceAfterRightPaddedDraft(draft, spaceAfter) {
+        if (draft.after.comments.length > 0) {
+            // Perform the space rule for the suffix of the last comment only. Same as IntelliJ.
+            SpacesVisitor.spaceLastCommentSuffixDraft(draft.after.comments, spaceAfter);
+            return;
+        }
+        if (spaceAfter && SpacesVisitor.isNotSingleSpace(draft.after.whitespace)) {
+            draft.after.whitespace = " ";
+        }
+        else if (!spaceAfter && SpacesVisitor.isOnlySpacesAndNotEmpty(draft.after.whitespace)) {
+            draft.after.whitespace = "";
+        }
     }
-    spaceBefore(j, spaceBefore) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (j.prefix.comments.length > 0) {
-                return j;
-            }
-            if (spaceBefore && SpacesVisitor.isNotSingleSpace(j.prefix.whitespace)) {
-                return (0, immer_1.produce)(j, draft => {
-                    draft.prefix.whitespace = " ";
-                });
-            }
-            else if (!spaceBefore && SpacesVisitor.isOnlySpacesAndNotEmpty(j.prefix.whitespace)) {
-                return (0, immer_1.produce)(j, draft => {
-                    draft.prefix.whitespace = "";
-                });
-            }
-            else {
-                return j;
+    /**
+     * Modifies the before space of a LeftPadded draft and the element's prefix in place.
+     */
+    spaceBeforeLeftPaddedElementDraft(draft, spaceBeforePadding, spaceBeforeElement) {
+        if (draft.before.comments.length == 0) {
+            // Preserve newlines - only modify if no newlines present
+            if (!draft.before.whitespace.includes("\n")) {
+                draft.before.whitespace = spaceBeforePadding ? " " : "";
             }
-        });
+        }
+        this.spaceBeforeDraft(draft.element, spaceBeforeElement);
     }
-    spaceBeforeContainer(container, spaceBefore) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (container.before.comments.length > 0) {
-                // Perform the space rule for the suffix of the last comment only. Same as IntelliJ.
-                return (0, immer_1.produce)(container, draft => {
-                    draft.before.comments = SpacesVisitor.spaceLastCommentSuffix(container.before.comments, spaceBefore);
-                });
-            }
-            if (spaceBefore && SpacesVisitor.isNotSingleSpace(container.before.whitespace)) {
-                return (0, immer_1.produce)(container, draft => {
-                    draft.before.whitespace = " ";
-                });
-            }
-            else if (!spaceBefore && SpacesVisitor.isOnlySpacesAndNotEmpty(container.before.whitespace)) {
-                return (0, immer_1.produce)(container, draft => {
-                    draft.before.whitespace = "";
-                });
-            }
-            else {
-                return container;
-            }
-        });
+    /**
+     * Modifies the element's prefix of a RightPadded draft in place.
+     */
+    spaceBeforeRightPaddedElementDraft(draft, spaceBefore) {
+        this.spaceBeforeDraft(draft.element, spaceBefore);
     }
-    static spaceLastCommentSuffix(comments, spaceSuffix) {
-        comments[comments.length - 1] = this.spaceSuffix(comments[comments.length - 1], spaceSuffix);
-        return comments;
+    /**
+     * Modifies the prefix whitespace of a J draft in place.
+     */
+    spaceBeforeDraft(draft, spaceBefore) {
+        if (draft.prefix.comments.length > 0) {
+            return;
+        }
+        if (spaceBefore && SpacesVisitor.isNotSingleSpace(draft.prefix.whitespace)) {
+            draft.prefix.whitespace = " ";
+        }
+        else if (!spaceBefore && SpacesVisitor.isOnlySpacesAndNotEmpty(draft.prefix.whitespace)) {
+            draft.prefix.whitespace = "";
+        }
     }
-    static spaceSuffix(comment, spaceSuffix) {
-        if (spaceSuffix && this.isNotSingleSpace(comment.suffix)) {
-            return (0, immer_1.produce)(comment, draft => {
-                draft.suffix = " ";
-            });
+    /**
+     * Modifies the before space of a Container draft in place.
+     */
+    spaceBeforeContainerDraft(draft, spaceBefore) {
+        if (draft.before.comments.length > 0) {
+            // Perform the space rule for the suffix of the last comment only. Same as IntelliJ.
+            SpacesVisitor.spaceLastCommentSuffixDraft(draft.before.comments, spaceBefore);
+            return;
         }
-        else if (!spaceSuffix && this.isOnlySpacesAndNotEmpty(comment.suffix)) {
-            return (0, immer_1.produce)(comment, draft => {
-                draft.suffix = "";
-            });
+        if (spaceBefore && SpacesVisitor.isNotSingleSpace(draft.before.whitespace)) {
+            draft.before.whitespace = " ";
         }
-        else {
-            return comment;
+        else if (!spaceBefore && SpacesVisitor.isOnlySpacesAndNotEmpty(draft.before.whitespace)) {
+            draft.before.whitespace = "";
+        }
+    }
+    /**
+     * Modifies the suffix of the last comment in an array of draft comments in place.
+     */
+    static spaceLastCommentSuffixDraft(comments, spaceSuffix) {
+        this.spaceSuffixDraft(comments[comments.length - 1], spaceSuffix);
+    }
+    /**
+     * Modifies the suffix of a Comment draft in place.
+     */
+    static spaceSuffixDraft(draft, spaceSuffix) {
+        if (spaceSuffix && this.isNotSingleSpace(draft.suffix)) {
+            draft.suffix = " ";
+        }
+        else if (!spaceSuffix && this.isOnlySpacesAndNotEmpty(draft.suffix)) {
+            draft.suffix = "";
         }
     }
     static isOnlySpaces(str) {
@@ -830,7 +821,7 @@ class SpacesVisitor extends visitor_1.JavaScriptVisitor {
             }
             // Handle object literal brace spacing: { foo: 1 } vs {foo: 1}
             if (ret.body && ret.body.statements.length > 0) {
-                return (0, immer_1.produce)(ret, draft => {
+                return (0, mutative_1.create)(ret, draft => {
                     const stmts = draft.body.statements;
                     // Check if this is a multi-line object literal
                     const isMultiLine = stmts.some(s => s.element.prefix.whitespace.includes("\n")) ||
@@ -887,7 +878,7 @@ class WrappingAndBracesVisitor extends visitor_1.JavaScriptVisitor {
             const v = yield _super.visitVariableDeclarations.call(this, multiVariable, p);
             const parent = (_a = this.cursor.parentTree()) === null || _a === void 0 ? void 0 : _a.value;
             if ((parent === null || parent === void 0 ? void 0 : parent.kind) === java_1.J.Kind.Block) {
-                return (0, immer_1.produce)(v, draft => {
+                return (0, mutative_1.create)(v, draft => {
                     draft.leadingAnnotations = this.withNewlines(draft.leadingAnnotations);
                     if (draft.leadingAnnotations.length > 0) {
                         if (draft.modifiers.length > 0) {
@@ -908,7 +899,7 @@ class WrappingAndBracesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const m = yield _super.visitMethodDeclaration.call(this, method, p);
-            return (0, immer_1.produce)(m, draft => {
+            return (0, mutative_1.create)(m, draft => {
                 draft.leadingAnnotations = this.withNewlines(draft.leadingAnnotations);
                 if (draft.leadingAnnotations.length > 0) {
                     if (draft.modifiers.length > 0) {
@@ -934,7 +925,7 @@ class WrappingAndBracesVisitor extends visitor_1.JavaScriptVisitor {
         return __awaiter(this, void 0, void 0, function* () {
             const e = yield _super.visitElse.call(this, elsePart, p);
             const hasBody = e.body.element.kind === java_1.J.Kind.Block || e.body.element.kind === java_1.J.Kind.If;
-            return (0, immer_1.produce)(e, draft => {
+            return (0, mutative_1.create)(e, draft => {
                 if (hasBody) {
                     const shouldHaveNewline = this.style.ifStatement.elseOnNewLine;
                     const hasNewline = draft.prefix.whitespace.includes("\n");
@@ -954,7 +945,7 @@ class WrappingAndBracesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const j = yield _super.visitClassDeclaration.call(this, classDecl, p);
-            return (0, immer_1.produce)(j, draft => {
+            return (0, mutative_1.create)(j, draft => {
                 draft.leadingAnnotations = this.withNewlines(draft.leadingAnnotations);
                 if (draft.leadingAnnotations.length > 0) {
                     if (draft.modifiers.length > 0) {
@@ -976,7 +967,7 @@ class WrappingAndBracesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const b = yield _super.visitBlock.call(this, block, p);
-            return (0, immer_1.produce)(b, draft => {
+            return (0, mutative_1.create)(b, draft => {
                 var _a;
                 const parentKind = (_a = this.cursor.parent) === null || _a === void 0 ? void 0 : _a.value.kind;
                 // Check if this is a "simple" block (empty or contains only a single J.Empty)
@@ -1042,7 +1033,7 @@ class WrappingAndBracesVisitor extends visitor_1.JavaScriptVisitor {
     withNewlines(list) {
         return list.map((a, index) => {
             if (index > 0 && !a.prefix.whitespace.includes("\n")) {
-                return (0, immer_1.produce)(a, draft => {
+                return (0, mutative_1.create)(a, draft => {
                     draft.prefix.whitespace = "\n" + draft.prefix.whitespace;
                 });
             }
@@ -1051,7 +1042,7 @@ class WrappingAndBracesVisitor extends visitor_1.JavaScriptVisitor {
     }
     withNewlineSpace(space) {
         if (space.comments.length === 0) {
-            space = (0, immer_1.produce)(space, draft => {
+            space = (0, mutative_1.create)(space, draft => {
                 draft.whitespace = "\n" + space.whitespace;
             });
         }
@@ -1068,7 +1059,7 @@ class WrappingAndBracesVisitor extends visitor_1.JavaScriptVisitor {
         const first = modifiers[0];
         if (!first.prefix.whitespace.includes("\n")) {
             return [
-                (0, immer_1.produce)(first, draft => {
+                (0, mutative_1.create)(first, draft => {
                     draft.prefix.whitespace = "\n" + draft.prefix.whitespace;
                 }),
                 ...modifiers.slice(1),
@@ -1092,7 +1083,7 @@ class BlankLinesVisitor extends visitor_1.JavaScriptVisitor {
             var _a, _b, _c;
             let ret = yield _super.preVisit.call(this, tree, p);
             if (ret.kind === tree_1.JS.Kind.CompilationUnit) {
-                ret = (0, immer_1.produce)(ret, draft => {
+                ret = (0, mutative_1.create)(ret, draft => {
                     if (draft.prefix.comments.length == 0) {
                         draft.prefix.whitespace = "";
                     }
@@ -1100,7 +1091,7 @@ class BlankLinesVisitor extends visitor_1.JavaScriptVisitor {
             }
             if (ret.kind === java_1.J.Kind.MethodDeclaration
                 && ((_c = (_b = (_a = this.cursor.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.parent) === null || _c === void 0 ? void 0 : _c.value.kind) === java_1.J.Kind.ClassDeclaration) {
-                ret = (0, immer_1.produce)(ret, draft => {
+                ret = (0, mutative_1.create)(ret, draft => {
                     this.ensurePrefixHasNewLine(draft);
                 });
             }
@@ -1127,7 +1118,7 @@ class BlankLinesVisitor extends visitor_1.JavaScriptVisitor {
             let ret = yield _super.visitClassDeclaration.call(this, classDecl, p);
             if (!ret.body)
                 return ret;
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 var _a, _b, _c;
                 const statements = draft.body.statements;
                 if (statements.length > 0) {
@@ -1176,7 +1167,7 @@ class BlankLinesVisitor extends visitor_1.JavaScriptVisitor {
             const ret = yield _super.visitStatement.call(this, statement, p);
             const parent = (_a = this.cursor.parentTree()) === null || _a === void 0 ? void 0 : _a.value;
             const grandparent = (_c = (_b = this.cursor.parentTree()) === null || _b === void 0 ? void 0 : _b.parent) === null || _c === void 0 ? void 0 : _c.value;
-            return (0, immer_1.produce)(ret, draft => {
+            return (0, mutative_1.create)(ret, draft => {
                 var _a, _b;
                 if ((grandparent === null || grandparent === void 0 ? void 0 : grandparent.kind) === java_1.J.Kind.ClassDeclaration && (parent === null || parent === void 0 ? void 0 : parent.kind) === java_1.J.Kind.Block) {
                     const classDecl = grandparent;
@@ -1220,7 +1211,7 @@ class BlankLinesVisitor extends visitor_1.JavaScriptVisitor {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const b = yield _super.visitBlock.call(this, block, p);
-            return (0, immer_1.produce)(b, draft => {
+            return (0, mutative_1.create)(b, draft => {
                 var _a;
                 const parentKind = (_a = this.cursor.parent) === null || _a === void 0 ? void 0 : _a.value.kind;
                 // Skip newline for object literals (NewClass) and type literals (TypeLiteral)