@openrewrite/rewrite 8.69.0-20251205-160300 → 8.69.0-20251205-210445

package/dist/javascript/tabs-and-indents-visitor.d.ts

@@ -0,0 +1,25 @@
+import { JavaScriptVisitor } from "./visitor";
+import { J } from "../java";
+import { Cursor, Tree } from "../tree";
+import { TabsAndIndentsStyle } from "./style";
+export declare class TabsAndIndentsVisitor<P> extends JavaScriptVisitor<P> {
+    private readonly tabsAndIndentsStyle;
+    private stopAfter?;
+    private readonly singleIndent;
+    constructor(tabsAndIndentsStyle: TabsAndIndentsStyle, stopAfter?: Tree | undefined);
+    protected preVisit(tree: J, _p: P): Promise<J | undefined>;
+    private setupCursorMessagesForTree;
+    private getParentIndentContext;
+    private computeMyIndent;
+    private computeIndentKind;
+    postVisit(tree: J, _p: P): Promise<J | undefined>;
+    private normalizeBlockEnd;
+    private normalizeJsxTagEnd;
+    visitContainer<T extends J>(container: J.Container<T>, p: P): Promise<J.Container<T>>;
+    visitLeftPadded<T extends J | J.Space | number | string | boolean>(left: J.LeftPadded<T>, p: P): Promise<J.LeftPadded<T> | undefined>;
+    visit<R extends J>(tree: Tree, p: P, parent?: Cursor): Promise<R | undefined>;
+    private setupAncestorIndents;
+    private isActualJNode;
+    private combineIndent;
+}
+//# sourceMappingURL=tabs-and-indents-visitor.d.ts.map

package/dist/javascript/tabs-and-indents-visitor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tabs-and-indents-visitor.d.ts","sourceRoot":"","sources":["../../src/javascript/tabs-and-indents-visitor.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAS,CAAC,EAAwC,MAAM,SAAS,CAAC;AAEzE,OAAO,EAAC,MAAM,EAAW,IAAI,EAAC,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAC,mBAAmB,EAAC,MAAM,SAAS,CAAC;AAG5C,qBAAa,qBAAqB,CAAC,CAAC,CAAE,SAAQ,iBAAiB,CAAC,CAAC,CAAC;IAGlD,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAAuB,OAAO,CAAC,SAAS,CAAC;IAFzF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAET,mBAAmB,EAAE,mBAAmB,EAAU,SAAS,CAAC,EAAE,IAAI,YAAA;cAU/E,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKhE,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,sBAAsB;IAW9B,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,iBAAiB;IAYV,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IA0BhE,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,kBAAkB;IAcb,cAAc,CAAC,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAgCrF,eAAe,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,EAC1E,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EACrB,CAAC,EAAE,CAAC,GACL,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAWjC,KAAK,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAanF,OAAO,CAAC,oBAAoB;IA8C5B,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,aAAa;CAIxB"}

package/dist/javascript/tabs-and-indents-visitor.js

@@ -0,0 +1,257 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TabsAndIndentsVisitor = void 0;
+/*
+ * Copyright 2025 the original author or authors.
+ * <p>
+ * Licensed under the Moderne Source Available License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://docs.moderne.io/licensing/moderne-source-available-license
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * 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 immer_1 = require("immer");
+const tree_2 = require("../tree");
+class TabsAndIndentsVisitor extends visitor_1.JavaScriptVisitor {
+    constructor(tabsAndIndentsStyle, stopAfter) {
+        super();
+        this.tabsAndIndentsStyle = tabsAndIndentsStyle;
+        this.stopAfter = stopAfter;
+        if (this.tabsAndIndentsStyle.useTabCharacter) {
+            this.singleIndent = "\t";
+        }
+        else {
+            this.singleIndent = " ".repeat(this.tabsAndIndentsStyle.indentSize);
+        }
+    }
+    preVisit(tree, _p) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.setupCursorMessagesForTree(this.cursor, tree);
+            return tree;
+        });
+    }
+    setupCursorMessagesForTree(cursor, tree) {
+        const [parentMyIndent, parentIndentKind] = this.getParentIndentContext(cursor);
+        const myIndent = this.computeMyIndent(tree, parentMyIndent, parentIndentKind);
+        cursor.messages.set("myIndent", myIndent);
+        cursor.messages.set("indentKind", this.computeIndentKind(tree));
+    }
+    getParentIndentContext(cursor) {
+        var _a;
+        for (let c = cursor.parent; c != null; c = c.parent) {
+            const indent = c.messages.get("myIndent");
+            if (indent !== undefined) {
+                const kind = (_a = c.messages.get("indentKind")) !== null && _a !== void 0 ? _a : 'continuation';
+                return [indent, kind];
+            }
+        }
+        return ["", 'continuation'];
+    }
+    computeMyIndent(tree, parentMyIndent, parentIndentKind) {
+        var _a, _b, _c, _d;
+        if (tree.kind === java_1.J.Kind.IfElse || parentIndentKind === 'align') {
+            return parentMyIndent;
+        }
+        if (parentIndentKind === 'block') {
+            return parentMyIndent + this.singleIndent;
+        }
+        const hasNewline = ((_b = (_a = tree.prefix) === null || _a === void 0 ? void 0 : _a.whitespace) === null || _b === void 0 ? void 0 : _b.includes("\n")) ||
+            ((_d = (_c = tree.prefix) === null || _c === void 0 ? void 0 : _c.comments) === null || _d === void 0 ? void 0 : _d.some(c => c.suffix.includes("\n")));
+        return hasNewline ? parentMyIndent + this.singleIndent : parentMyIndent;
+    }
+    computeIndentKind(tree) {
+        switch (tree.kind) {
+            case java_1.J.Kind.Block:
+            case java_1.J.Kind.Case:
+                return 'block';
+            case tree_1.JS.Kind.CompilationUnit:
+                return 'align';
+            default:
+                return 'continuation';
+        }
+    }
+    postVisit(tree, _p) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
+            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);
+            }
+            const myIndent = this.cursor.messages.get("myIndent");
+            if (myIndent === undefined) {
+                return tree;
+            }
+            let result = tree;
+            if ((_c = (_b = result.prefix) === null || _b === void 0 ? void 0 : _b.whitespace) === null || _c === void 0 ? void 0 : _c.includes("\n")) {
+                result = (0, immer_1.produce)(result, draft => {
+                    draft.prefix.whitespace = this.combineIndent(draft.prefix.whitespace, myIndent);
+                });
+            }
+            if (result.kind === java_1.J.Kind.Block) {
+                result = this.normalizeBlockEnd(result, myIndent);
+            }
+            else if (result.kind === tree_1.JS.Kind.JsxTag) {
+                result = this.normalizeJsxTagEnd(result, myIndent);
+            }
+            return result;
+        });
+    }
+    normalizeBlockEnd(block, myIndent) {
+        const effectiveLastWs = (0, java_1.lastWhitespace)(block.end);
+        if (!effectiveLastWs.includes("\n")) {
+            return block;
+        }
+        return (0, immer_1.produce)(block, draft => {
+            draft.end = (0, java_1.replaceLastWhitespace)(draft.end, ws => this.combineIndent(ws, myIndent));
+        });
+    }
+    normalizeJsxTagEnd(tag, myIndent) {
+        if (!tag.children || tag.children.length === 0) {
+            return tag;
+        }
+        const lastChild = tag.children[tag.children.length - 1];
+        if (lastChild.kind !== java_1.J.Kind.Literal || !lastChild.prefix.whitespace.includes("\n")) {
+            return tag;
+        }
+        return (0, immer_1.produce)(tag, draft => {
+            const lastChildDraft = draft.children[draft.children.length - 1];
+            lastChildDraft.prefix.whitespace = this.combineIndent(lastChildDraft.prefix.whitespace, myIndent);
+        });
+    }
+    visitContainer(container, p) {
+        const _super = Object.create(null, {
+            visitContainer: { get: () => super.visitContainer }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const parentIndent = (_a = this.cursor.messages.get("myIndent")) !== null && _a !== void 0 ? _a : "";
+            const elementsIndent = container.before.whitespace.includes("\n")
+                ? parentIndent + this.singleIndent
+                : parentIndent;
+            const savedMyIndent = this.cursor.messages.get("myIndent");
+            this.cursor.messages.set("myIndent", elementsIndent);
+            let ret = yield _super.visitContainer.call(this, container, p);
+            if (savedMyIndent !== undefined) {
+                this.cursor.messages.set("myIndent", savedMyIndent);
+            }
+            if (ret.before.whitespace.includes("\n")) {
+                ret = (0, immer_1.produce)(ret, draft => {
+                    draft.before.whitespace = this.combineIndent(draft.before.whitespace, elementsIndent);
+                });
+            }
+            if (ret.elements.length > 0) {
+                const effectiveLastWs = (0, java_1.lastWhitespace)(ret.elements[ret.elements.length - 1].after);
+                if (effectiveLastWs.includes("\n")) {
+                    ret = (0, immer_1.produce)(ret, draft => {
+                        const lastDraft = draft.elements[draft.elements.length - 1];
+                        lastDraft.after = (0, java_1.replaceLastWhitespace)(lastDraft.after, ws => this.combineIndent(ws, parentIndent));
+                    });
+                }
+            }
+            return ret;
+        });
+    }
+    visitLeftPadded(left, p) {
+        const _super = Object.create(null, {
+            visitLeftPadded: { get: () => super.visitLeftPadded }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const ret = yield _super.visitLeftPadded.call(this, left, p);
+            if (ret === undefined || !ret.before.whitespace.includes("\n")) {
+                return ret;
+            }
+            const parentIndent = (_a = this.cursor.messages.get("myIndent")) !== null && _a !== void 0 ? _a : "";
+            return (0, immer_1.produce)(ret, draft => {
+                draft.before.whitespace = this.combineIndent(draft.before.whitespace, parentIndent + this.singleIndent);
+            });
+        });
+    }
+    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;
+            }
+            if (parent) {
+                this.cursor = new tree_2.Cursor(tree, parent);
+                this.setupAncestorIndents();
+            }
+            return yield _super.visit.call(this, tree, p);
+        });
+    }
+    setupAncestorIndents() {
+        const path = [];
+        let anchorCursor;
+        let anchorIndent = "";
+        for (let c = this.cursor.parent; c; c = c.parent) {
+            path.push(c);
+            const v = c.value;
+            if (this.isActualJNode(v) && !anchorCursor && v.prefix) {
+                const ws = (0, java_1.lastWhitespace)(v.prefix);
+                const idx = ws.lastIndexOf('\n');
+                if (idx !== -1) {
+                    anchorCursor = c;
+                    anchorIndent = ws.substring(idx + 1);
+                }
+            }
+            if (v.kind === tree_1.JS.Kind.CompilationUnit) {
+                if (!anchorCursor) {
+                    anchorCursor = c;
+                    anchorIndent = "";
+                }
+                break;
+            }
+        }
+        if (path.length === 0)
+            return;
+        path.reverse();
+        for (const c of path) {
+            const v = c.value;
+            if (!this.isActualJNode(v))
+                continue;
+            const savedCursor = this.cursor;
+            this.cursor = c;
+            if (c === anchorCursor) {
+                c.messages.set("myIndent", anchorIndent);
+                c.messages.set("indentKind", this.computeIndentKind(v));
+            }
+            else {
+                this.setupCursorMessagesForTree(c, v);
+            }
+            this.cursor = savedCursor;
+        }
+    }
+    isActualJNode(v) {
+        return ((0, java_1.isJava)(v) || (0, tree_1.isJavaScript)(v)) &&
+            v.kind !== java_1.J.Kind.Container &&
+            v.kind !== java_1.J.Kind.LeftPadded &&
+            v.kind !== java_1.J.Kind.RightPadded;
+    }
+    combineIndent(oldWs, newIndent) {
+        const lastNewline = oldWs.lastIndexOf("\n");
+        return oldWs.substring(0, lastNewline + 1) + newIndent;
+    }
+}
+exports.TabsAndIndentsVisitor = TabsAndIndentsVisitor;
+//# sourceMappingURL=tabs-and-indents-visitor.js.map

package/dist/javascript/tabs-and-indents-visitor.js.map

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

package/dist/version.txt

@@ -1 +1 @@
-8.69.0-20251205-160300
+8.69.0-20251205-210445

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openrewrite/rewrite",
-  "version": "8.69.0-20251205-160300",
+  "version": "8.69.0-20251205-210445",
   "license": "Moderne Source Available License",
   "description": "OpenRewrite JavaScript.",
   "homepage": "https://github.com/openrewrite/rewrite",

package/src/cli/cli-utils.ts

@@ -452,15 +452,20 @@ export function isAcceptedFile(filePath: string): boolean {
     return false;
 }
 
+export type ProgressCallback = (current: number, total: number, filePath: string) => void;
+
 /**
  * Parse source files using appropriate parsers
  */
 export async function parseFiles(
     filePaths: string[],
     projectRoot: string,
-    verbose: boolean = false
+    verbose: boolean = false,
+    onProgress?: ProgressCallback
 ): Promise<SourceFile[]> {
     const parsed: SourceFile[] = [];
+    const total = filePaths.length;
+    let current = 0;
 
     // Group files by type
     const jsFiles: string[] = [];
@@ -487,6 +492,8 @@ export async function parseFiles(
         }
         const jsParser = new JavaScriptParser({relativeTo: projectRoot});
         for await (const sf of jsParser.parse(...jsFiles)) {
+            current++;
+            onProgress?.(current, total, sf.sourcePath);
             parsed.push(sf);
         }
     }
@@ -498,6 +505,8 @@ export async function parseFiles(
         }
         const pkgParser = new PackageJsonParser({relativeTo: projectRoot});
         for await (const sf of pkgParser.parse(...packageJsonFiles)) {
+            current++;
+            onProgress?.(current, total, sf.sourcePath);
             parsed.push(sf);
         }
     }
@@ -509,6 +518,8 @@ export async function parseFiles(
         }
         const jsonParser = new JsonParser({relativeTo: projectRoot});
         for await (const sf of jsonParser.parse(...jsonFiles)) {
+            current++;
+            onProgress?.(current, total, sf.sourcePath);
             parsed.push(sf);
         }
     }

package/src/cli/rewrite.ts

@@ -34,6 +34,44 @@ import {
     parseRecipeSpec
 } from './cli-utils';
 
+const isTTY = process.stdout.isTTY ?? false;
+const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+
+class Spinner {
+    private frameIndex = 0;
+    private interval: NodeJS.Timeout | null = null;
+    private message = '';
+
+    start(message: string): void {
+        if (!isTTY) return;
+        this.message = message;
+        this.render();
+        this.interval = setInterval(() => this.render(), 80);
+    }
+
+    update(message: string): void {
+        this.message = message;
+        if (!isTTY) return;
+        this.render();
+    }
+
+    private render(): void {
+        const frame = SPINNER_FRAMES[this.frameIndex];
+        this.frameIndex = (this.frameIndex + 1) % SPINNER_FRAMES.length;
+        process.stdout.write(`\r\x1b[K${frame} ${this.message}`);
+    }
+
+    stop(): void {
+        if (this.interval) {
+            clearInterval(this.interval);
+            this.interval = null;
+        }
+        if (isTTY) {
+            process.stdout.write('\r\x1b[K');
+        }
+    }
+}
+
 // Import language modules to register printers
 import '../text';
 import '../json';
@@ -127,9 +165,13 @@ async function main() {
         console.log(`Running recipe: ${recipe.name}`);
     }
 
-    // Discover source files
+    const spinner = new Spinner();
     const projectRoot = process.cwd();
+
+    // Discover source files
+    spinner.start('Discovering source files...');
     const sourceFiles = await discoverFiles(projectRoot, opts.verbose);
+    spinner.stop();
 
     if (sourceFiles.length === 0) {
         console.log('No source files found to process.');
@@ -141,7 +183,11 @@ async function main() {
     }
 
     // Parse all source files
-    const parsedFiles = await parseFiles(sourceFiles, projectRoot, opts.verbose);
+    spinner.start(`Parsing ${sourceFiles.length} files...`);
+    const parsedFiles = await parseFiles(sourceFiles, projectRoot, opts.verbose, (current, total, filePath) => {
+        spinner.update(`Parsing [${current}/${total}] ${filePath}`);
+    });
+    spinner.stop();
 
     if (parsedFiles.length === 0) {
         console.log('No files could be parsed.');
@@ -151,8 +197,18 @@ async function main() {
     // Run the recipe with streaming output
     const ctx = new ExecutionContext();
     let changeCount = 0;
+    let processedCount = 0;
+    const totalFiles = parsedFiles.length;
+
+    spinner.start(`Running recipe on ${totalFiles} files...`);
 
     for await (const result of scheduleRunStreaming(recipe, parsedFiles, ctx)) {
+        processedCount++;
+        const currentPath = result.after?.sourcePath ?? result.before?.sourcePath ?? '';
+        spinner.update(`Processing [${processedCount}/${totalFiles}] ${currentPath}`);
+
+        const statusMsg = `Processing [${processedCount}/${totalFiles}] ${currentPath}`;
+
         if (opts.dryRun) {
             // Print colorized diff immediately (skip empty diffs)
             const diff = await result.diff();
@@ -162,7 +218,9 @@ async function main() {
             );
             if (hasChanges) {
                 changeCount++;
+                spinner.stop();
                 console.log(colorizeDiff(diff));
+                spinner.start(statusMsg);
             }
         } else {
             // Apply changes immediately
@@ -175,20 +233,26 @@ async function main() {
                 await fsp.writeFile(filePath, content);
 
                 changeCount++;
+                spinner.stop();
                 if (result.before) {
                     console.log(`  Modified: ${result.after.sourcePath}`);
                 } else {
                     console.log(`  Created: ${result.after.sourcePath}`);
                 }
+                spinner.start(statusMsg);
             } else if (result.before) {
                 const filePath = path.join(projectRoot, result.before.sourcePath);
                 await fsp.unlink(filePath);
                 changeCount++;
+                spinner.stop();
                 console.log(`  Deleted: ${result.before.sourcePath}`);
+                spinner.start(statusMsg);
             }
         }
     }
 
+    spinner.stop();
+
     if (changeCount === 0) {
         console.log('No changes to make.');
     } else if (opts.dryRun) {

package/src/java/formatting-utils.ts

@@ -17,6 +17,37 @@
 import {J} from "../java";
 import {produce} from "immer";
 
+/**
+ * Gets the effective last whitespace from a Space.
+ * When there are comments, the last whitespace is the suffix of the last comment.
+ * When there are no comments, it's the whitespace property.
+ */
+export function lastWhitespace(space: J.Space): string {
+    if (space.comments.length > 0) {
+        return space.comments[space.comments.length - 1].suffix;
+    }
+    return space.whitespace;
+}
+
+/**
+ * Replaces the effective last whitespace in a Space using a transform function.
+ * When there are comments, updates the suffix of the last comment.
+ * When there are no comments, updates the whitespace property.
+ *
+ * @param space The Space to modify (Immer draft)
+ * @param transform Function that receives the current last whitespace and returns the new value
+ */
+export function replaceLastWhitespace(space: J.Space, transform: (ws: string) => string): J.Space {
+    return produce(space, draft => {
+        if (draft.comments.length > 0) {
+            const lastComment = draft.comments[draft.comments.length - 1];
+            lastComment.suffix = transform(lastComment.suffix);
+        } else {
+            draft.whitespace = transform(draft.whitespace);
+        }
+    });
+}
+
 /**
  * Handles element removal from lists while preserving LST formatting.
  * Automatically applies prefixes from removed elements to the next kept element,

package/src/java/index.ts

@@ -18,5 +18,6 @@ export * from "./tree";
 export * from "./markers";
 export * from "./visitor";
 export * from "./type-visitor";
+export * from "./formatting-utils";
 
 import "./print";