@openrewrite/rewrite 8.70.2 → 8.70.4

package/dist/path-utils.js

@@ -0,0 +1,210 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+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.DEFAULT_DIR_EXCLUSIONS = void 0;
+exports.isGitIgnored = isGitIgnored;
+exports.isInGitRepo = isInGitRepo;
+exports.walkDirs = walkDirs;
+exports.getGitTrackedFiles = getGitTrackedFiles;
+/*
+ * 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 fs = __importStar(require("fs"));
+const fsp = __importStar(require("fs/promises"));
+const path = __importStar(require("path"));
+const child_process_1 = require("child_process");
+/**
+ * Default directory exclusions for file/directory discovery.
+ */
+exports.DEFAULT_DIR_EXCLUSIONS = new Set([
+    "node_modules",
+    ".git",
+    ".svn",
+    ".hg",
+    "dist",
+    "build",
+    "out",
+    "coverage",
+    ".next",
+    ".nuxt",
+    ".output"
+]);
+/**
+ * Checks if a path is ignored by Git.
+ * Returns true if the path is ignored, false otherwise.
+ * Falls back to false if not in a git repository.
+ */
+function isGitIgnored(filePath, cwd) {
+    const result = (0, child_process_1.spawnSync)("git", ["check-ignore", "-q", filePath], {
+        cwd: cwd || path.dirname(filePath),
+        encoding: "utf8"
+    });
+    // Exit code 0 means the file IS ignored
+    // Exit code 1 means the file is NOT ignored
+    // Other exit codes indicate git errors (not a repo, etc.)
+    return result.status === 0;
+}
+/**
+ * Checks if we're in a git repository.
+ */
+function isInGitRepo(dir) {
+    const result = (0, child_process_1.spawnSync)("git", ["rev-parse", "--git-dir"], {
+        cwd: dir,
+        encoding: "utf8"
+    });
+    return result.status === 0;
+}
+/**
+ * Recursively walks directories starting from a given path.
+ * Returns all subdirectory paths (not including the root).
+ */
+function walkDirs(rootDir_1) {
+    return __awaiter(this, arguments, void 0, function* (rootDir, options = {}) {
+        const { maxDepth, excludeDirs = exports.DEFAULT_DIR_EXCLUSIONS, respectGitIgnore = false, mustContainFile } = options;
+        const results = [];
+        const inGitRepo = respectGitIgnore && isInGitRepo(rootDir);
+        function walk(dir, depth) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (maxDepth !== undefined && depth > maxDepth) {
+                    return;
+                }
+                let entries;
+                try {
+                    entries = yield fsp.readdir(dir, { withFileTypes: true });
+                }
+                catch (_a) {
+                    return;
+                }
+                for (const entry of entries) {
+                    if (!entry.isDirectory()) {
+                        continue;
+                    }
+                    // Skip excluded directories
+                    if (excludeDirs.has(entry.name)) {
+                        continue;
+                    }
+                    // Skip hidden directories
+                    if (entry.name.startsWith('.')) {
+                        continue;
+                    }
+                    const fullPath = path.join(dir, entry.name);
+                    // Check git ignore if enabled
+                    if (inGitRepo && isGitIgnored(fullPath, rootDir)) {
+                        continue;
+                    }
+                    // Check for required file if specified
+                    if (mustContainFile) {
+                        const requiredFile = path.join(fullPath, mustContainFile);
+                        if (fs.existsSync(requiredFile)) {
+                            results.push(fullPath);
+                        }
+                    }
+                    else {
+                        results.push(fullPath);
+                    }
+                    // Recurse into subdirectory
+                    yield walk(fullPath, depth + 1);
+                }
+            });
+        }
+        yield walk(rootDir, 0);
+        return results;
+    });
+}
+/**
+ * Gets files tracked by git (and untracked but not ignored files).
+ * Falls back to empty array if not in a git repository.
+ */
+function getGitTrackedFiles(dir) {
+    const files = [];
+    // Get tracked files
+    const tracked = (0, child_process_1.spawnSync)("git", ["ls-files"], {
+        cwd: dir,
+        encoding: "utf8"
+    });
+    if (tracked.status !== 0 || tracked.error) {
+        return [];
+    }
+    if (tracked.stdout) {
+        for (const line of tracked.stdout.split("\n")) {
+            const trimmed = line.trim();
+            if (trimmed) {
+                const fullPath = path.join(dir, trimmed);
+                if (fs.existsSync(fullPath)) {
+                    files.push(fullPath);
+                }
+            }
+        }
+    }
+    // Get untracked but not ignored files
+    const untracked = (0, child_process_1.spawnSync)("git", ["ls-files", "--others", "--exclude-standard"], {
+        cwd: dir,
+        encoding: "utf8"
+    });
+    if (untracked.stdout) {
+        for (const line of untracked.stdout.split("\n")) {
+            const trimmed = line.trim();
+            if (trimmed) {
+                const fullPath = path.join(dir, trimmed);
+                if (fs.existsSync(fullPath)) {
+                    files.push(fullPath);
+                }
+            }
+        }
+    }
+    return files;
+}
+//# sourceMappingURL=path-utils.js.map

package/dist/path-utils.js.map

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

package/dist/rpc/request/parse-project.d.ts

@@ -19,7 +19,19 @@ export interface ParseProjectResponseItem {
 export declare class ParseProject {
     private readonly projectPath;
     private readonly exclusions?;
-    constructor(projectPath: string, exclusions?: string[] | undefined);
+    /**
+     * Optional path to make source file paths relative to.
+     * If not specified, paths are relative to projectPath.
+     * Use this when parsing a subdirectory but wanting paths relative to the repository root.
+     */
+    private readonly relativeTo?;
+    constructor(projectPath: string, exclusions?: string[] | undefined, 
+    /**
+     * Optional path to make source file paths relative to.
+     * If not specified, paths are relative to projectPath.
+     * Use this when parsing a subdirectory but wanting paths relative to the repository root.
+     */
+    relativeTo?: string | undefined);
     static handle(connection: rpc.MessageConnection, localObjects: Map<string, ((input: string) => any) | any>, metricsCsv?: string): void;
 }
 //# sourceMappingURL=parse-project.d.ts.map

package/dist/rpc/request/parse-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-project.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/parse-project.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,EAAW,IAAI,EAAC,MAAM,YAAY,CAAC;AAO1C;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACrC,EAAE,EAAE,IAAI,CAAC;IACT,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,qBAAa,YAAY;IAEjB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBADX,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,EAAE,YAAA;IAG1C,MAAM,CAAC,MAAM,CACT,UAAU,EAAE,GAAG,CAAC,iBAAiB,EACjC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC,GAAG,GAAG,CAAC,EACzD,UAAU,CAAC,EAAE,MAAM,GACpB,IAAI;CA0NV"}
+{"version":3,"file":"parse-project.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/parse-project.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,EAAW,IAAI,EAAC,MAAM,YAAY,CAAC;AAO1C;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACrC,EAAE,EAAE,IAAI,CAAC;IACT,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,qBAAa,YAAY;IAEjB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAC5B;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAPX,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,EAAE,YAAA;IACtC;;;;OAIG;IACc,UAAU,CAAC,EAAE,MAAM,YAAA;IAGxC,MAAM,CAAC,MAAM,CACT,UAAU,EAAE,GAAG,CAAC,iBAAiB,EACjC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC,GAAG,GAAG,CAAC,EACzD,UAAU,CAAC,EAAE,MAAM,GACpB,IAAI;CA4NV"}

package/dist/rpc/request/parse-project.js

@@ -83,9 +83,16 @@ const markers_1 = require("../../markers");
  * Uses ProjectParser for file discovery and Prettier detection.
  */
 class ParseProject {
-    constructor(projectPath, exclusions) {
+    constructor(projectPath, exclusions, 
+    /**
+     * Optional path to make source file paths relative to.
+     * If not specified, paths are relative to projectPath.
+     * Use this when parsing a subdirectory but wanting paths relative to the repository root.
+     */
+    relativeTo) {
         this.projectPath = projectPath;
         this.exclusions = exclusions;
+        this.relativeTo = relativeTo;
     }
     static handle(connection, localObjects, metricsCsv) {
         connection.onRequest(new rpc.RequestType("ParseProject"), (0, metrics_1.withMetrics)("ParseProject", metricsCsv, (context) => (request) => __awaiter(this, void 0, void 0, function* () {
@@ -94,6 +101,8 @@ class ParseProject {
             context.target = request.projectPath;
             const projectPath = path.resolve(request.projectPath);
             const exclusions = (_d = request.exclusions) !== null && _d !== void 0 ? _d : javascript_1.DEFAULT_EXCLUSIONS;
+            // Use relativeTo if specified, otherwise default to projectPath
+            const relativeTo = request.relativeTo ? path.resolve(request.relativeTo) : projectPath;
             // Use ProjectParser for file discovery and Prettier detection
             const projectParser = new javascript_1.ProjectParser(projectPath, { exclusions });
             const discovered = yield projectParser.discoverFiles();
@@ -104,7 +113,7 @@ class ParseProject {
             if (discovered.packageJsonFiles.length > 0) {
                 const parser = parser_1.Parsers.createParser("packageJson", {
                     ctx,
-                    relativeTo: projectPath
+                    relativeTo
                 });
                 const generator = parser.parse(...discovered.packageJsonFiles);
                 for (const _ of discovered.packageJsonFiles) {
@@ -121,7 +130,7 @@ class ParseProject {
             }
             // Parse JSON lock files
             if (discovered.lockFiles.json.length > 0) {
-                const parser = parser_1.Parsers.createParser("json", { ctx, relativeTo: projectPath });
+                const parser = parser_1.Parsers.createParser("json", { ctx, relativeTo });
                 const generator = parser.parse(...discovered.lockFiles.json);
                 for (const _ of discovered.lockFiles.json) {
                     const id = (0, uuid_1.randomId)();
@@ -137,7 +146,7 @@ class ParseProject {
             }
             // Parse YAML lock files
             if (discovered.lockFiles.yaml.length > 0) {
-                const parser = parser_1.Parsers.createParser("yaml", { ctx, relativeTo: projectPath });
+                const parser = parser_1.Parsers.createParser("yaml", { ctx, relativeTo });
                 const generator = parser.parse(...discovered.lockFiles.yaml);
                 for (const _ of discovered.lockFiles.yaml) {
                     const id = (0, uuid_1.randomId)();
@@ -153,7 +162,7 @@ class ParseProject {
             }
             // Parse text lock files (yarn.lock Classic)
             if (discovered.lockFiles.text.length > 0) {
-                const parser = parser_1.Parsers.createParser("plainText", { ctx, relativeTo: projectPath });
+                const parser = parser_1.Parsers.createParser("plainText", { ctx, relativeTo });
                 const generator = parser.parse(...discovered.lockFiles.text);
                 for (const _ of discovered.lockFiles.text) {
                     const id = (0, uuid_1.randomId)();
@@ -171,7 +180,7 @@ class ParseProject {
             if (discovered.jsFiles.length > 0) {
                 const parser = parser_1.Parsers.createParser("javascript", {
                     ctx,
-                    relativeTo: projectPath
+                    relativeTo
                 });
                 // Check if Prettier is available
                 const detection = yield prettierLoader.detectPrettier();
@@ -230,7 +239,7 @@ class ParseProject {
             }
             // Parse other YAML files
             if (discovered.yamlFiles.length > 0) {
-                const parser = parser_1.Parsers.createParser("yaml", { ctx, relativeTo: projectPath });
+                const parser = parser_1.Parsers.createParser("yaml", { ctx, relativeTo });
                 const generator = parser.parse(...discovered.yamlFiles);
                 for (const _ of discovered.yamlFiles) {
                     const id = (0, uuid_1.randomId)();
@@ -246,7 +255,7 @@ class ParseProject {
             }
             // Parse other JSON files
             if (discovered.jsonFiles.length > 0) {
-                const parser = parser_1.Parsers.createParser("json", { ctx, relativeTo: projectPath });
+                const parser = parser_1.Parsers.createParser("json", { ctx, relativeTo });
                 const generator = parser.parse(...discovered.jsonFiles);
                 for (const _ of discovered.jsonFiles) {
                     const id = (0, uuid_1.randomId)();
@@ -262,7 +271,7 @@ class ParseProject {
             }
             // Parse text config files (.prettierignore, .gitignore, etc.)
             if (discovered.textFiles.length > 0) {
-                const parser = parser_1.Parsers.createParser("plainText", { ctx, relativeTo: projectPath });
+                const parser = parser_1.Parsers.createParser("plainText", { ctx, relativeTo });
                 const generator = parser.parse(...discovered.textFiles);
                 for (const _ of discovered.textFiles) {
                     const id = (0, uuid_1.randomId)();

package/dist/rpc/request/parse-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-project.js","sourceRoot":"","sources":["../../../src/rpc/request/parse-project.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parse-project.js","sourceRoot":"","sources":["../../../src/rpc/request/parse-project.ts"],"names":[],"mappings":"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"}

package/dist/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAa,UAAU,EAAC,MAAM,QAAQ,CAAC;AAG9C,OAAO,EAAC,MAAM,EAAiB,MAAM,UAAU,CAAC;AAEhD,MAAM,WAAW,SAAS;IACtB,SAAS,EAAE,MAAM,EAAE,CAAA;CACtB;AAED,qBAAa,MAAM;aACa,MAAM,CAAC,EAAE,UAAU;aAAkB,KAAK,CAAC,EAAE,UAAU;gBAAvD,MAAM,CAAC,EAAE,UAAU,YAAA,EAAkB,KAAK,CAAC,EAAE,UAAU,YAAA;IAG7E,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;CAWhC;AA0BD,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,CAMjH;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,GAAG,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;AAE1I;;;;;;;;;;;;GAYG;AACH,wBAAuB,oBAAoB,CACvC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC,UAAU,CAAC,EAChD,GAAG,EAAE,gBAAgB,EACrB,UAAU,CAAC,EAAE,gBAAgB,GAC9B,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAiEzC"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAeA,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAa,UAAU,EAAC,MAAM,QAAQ,CAAC;AAG9C,OAAO,EAAC,MAAM,EAAiB,MAAM,UAAU,CAAC;AAEhD,MAAM,WAAW,SAAS;IACtB,SAAS,EAAE,MAAM,EAAE,CAAA;CACtB;AAED,qBAAa,MAAM;aACa,MAAM,CAAC,EAAE,UAAU;aAAkB,KAAK,CAAC,EAAE,UAAU;gBAAvD,MAAM,CAAC,EAAE,UAAU,YAAA,EAAkB,KAAK,CAAC,EAAE,UAAU,YAAA;IAG7E,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;CAWhC;AA0BD,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,CAMjH;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,GAAG,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;AAE1I;;;;;;;;;;;;GAYG;AACH,wBAAuB,oBAAoB,CACvC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC,UAAU,CAAC,EAChD,GAAG,EAAE,gBAAgB,EACrB,UAAU,CAAC,EAAE,gBAAgB,GAC9B,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAqEzC"}

package/dist/run.js

@@ -178,11 +178,15 @@ function scheduleRunStreaming(recipe, before, ctx, onProgress) {
         else {
             // For non-scanning recipes, process files immediately as they come in
             const iterable = Array.isArray(before) ? before : before;
+            const knownTotal = Array.isArray(before) ? before.length : -1; // -1 = unknown total
+            let processCount = 0;
             try {
                 for (var _h = true, iterable_2 = __asyncValues(iterable), iterable_2_1; iterable_2_1 = yield __await(iterable_2.next()), _d = iterable_2_1.done, !_d; _h = true) {
                     _f = iterable_2_1.value;
                     _h = false;
                     const b = _f;
+                    processCount++;
+                    onProgress === null || onProgress === void 0 ? void 0 : onProgress('processing', processCount, knownTotal, b.sourcePath);
                     const editedB = yield __await(recurseRecipeList(recipe, b, (recipe, b2) => __awaiter(this, void 0, void 0, function* () { return (yield recipe.editor()).visit(b2, ctx, cursor); })));
                     // Always yield a result so the caller knows when each file is processed
                     yield yield __await(new Result(b, editedB !== b ? editedB : b));

package/dist/run.js.map

@@ -1 +1 @@
-{"version":3,"file":"run.js","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkEA,kCAMC;AAiBD,oDA0EC;AAnJD,iCAA8C;AAC9C,+BAAyC;AACzC,mCAAqC;AACrC,qCAAgD;AAMhD,MAAa,MAAM;IACf,YAA4B,MAAmB,EAAkB,KAAkB;QAAvD,WAAM,GAAN,MAAM,CAAa;QAAkB,UAAK,GAAL,KAAK,CAAa;IACnF,CAAC;IAEK,IAAI;;;YACN,OAAO,IAAA,0BAAmB,EACtB,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,UAAU,mCAAI,EAAE,EAC7B,MAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,UAAU,mCAAI,EAAE,EAC5B,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,oBAAY,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,EACxD,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,oBAAY,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EACtD,EAAE,EACF,EAAE,EACF,EAAC,OAAO,EAAE,CAAC,EAAC,CACf,CAAC;QACN,CAAC;KAAA;CACJ;AAfD,wBAeC;AAED,SAAe,iBAAiB,CAAC,MAAc;;QAC3C,IAAI,MAAM,YAAY,uBAAc;YAAE,OAAO,IAAI,CAAC;QAClD,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;YAC7C,IAAI,MAAM,iBAAiB,CAAC,IAAI,CAAC;gBAAE,OAAO,IAAI,CAAC;QACnD,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CAAA;AAED,SAAe,iBAAiB,CAAI,MAAc,EAAE,OAAU,EAAE,EAAoD;;QAChH,IAAI,CAAC,GAAkB,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACjD,KAAK,MAAM,SAAS,IAAI,MAAM,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;YAChD,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBAClB,OAAO,SAAS,CAAC;YACrB,CAAC;YACD,CAAC,GAAG,MAAM,iBAAiB,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;CAAA;AAED,SAAe,mBAAmB,CAAC,MAAc,EAAE,GAAqB;;QACpE,MAAM,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAC1E,CAAC;CAAA;AAED,SAAsB,WAAW,CAAC,MAAc,EAAE,MAAoB,EAAE,GAAqB;;;QACzF,MAAM,SAAS,GAAa,EAAE,CAAC;;YAC/B,KAA2B,eAAA,KAAA,cAAA,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAA,IAAA,sDAAE,CAAC;gBAA5C,cAAyC;gBAAzC,WAAyC;gBAAzD,MAAM,MAAM,KAAA,CAAA;gBACnB,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC;;;;;;;;;QACD,OAAO,EAAE,SAAS,EAAE,CAAC;IACzB,CAAC;CAAA;AAID;;;;;;;;;;;;GAYG;AACH,SAAuB,oBAAoB,CACvC,MAAc,EACd,MAAgD,EAChD,GAAqB,EACrB,UAA6B;;;QAE7B,MAAM,MAAM,GAAG,IAAA,iBAAU,GAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,cAAM,iBAAiB,CAAC,MAAM,CAAC,CAAA,CAAC;QAEnD,IAAI,UAAU,EAAE,CAAC;YACb,iFAAiF;YACjF,6CAA6C;YAC7C,MAAM,KAAK,GAAiB,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;YACzD,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB;YAEpF,+DAA+D;YAC/D,IAAI,SAAS,GAAG,CAAC,CAAC;;gBAClB,KAAsB,eAAA,aAAA,cAAA,QAAQ,CAAA,cAAA,2FAAE,CAAC;oBAAX,wBAAQ;oBAAR,WAAQ;oBAAnB,MAAM,CAAC,KAAA,CAAA;oBACd,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACd,SAAS,EAAE,CAAC;oBACZ,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;oBAE9D,6BAA6B;oBAC7B,cAAM,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,CAAO,MAAM,EAAE,EAAE,EAAE,EAAE;wBACpD,IAAI,MAAM,YAAY,uBAAc,EAAE,CAAC;4BACnC,OAAO,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA;wBACzF,CAAC;oBACL,CAAC,CAAA,CAAC,CAAA,CAAC;gBACP,CAAC;;;;;;;;;YAED,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;YAEhC,mCAAmC;YACnC,MAAM,SAAS,GAAG,CAAC,cAAM,iBAAiB,CAAC,MAAM,EAAE,EAAkB,EAAE,CAAO,MAAM,EAAE,SAAS,EAAE,EAAE;gBAC/F,IAAI,MAAM,YAAY,uBAAc,EAAE,CAAC;oBACnC,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACnF,CAAC;gBACD,OAAO,SAAS,CAAC;YACrB,CAAC,CAAA,CAAC,CAAA,CAAE,CAAC;YAEL,6DAA6D;YAC7D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACpC,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACnB,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;gBAC5D,MAAM,OAAO,GAAG,cAAM,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,CAAO,MAAM,EAAE,EAAE,EAAE,EAAE,gDAAC,OAAA,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA,GAAA,CAAC,CAAA,CAAC;gBACzH,wEAAwE;gBACxE,oBAAM,IAAI,MAAM,CAAC,CAAC,EAAE,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC;gBACjD,6DAA6D;gBAC5D,KAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YAC7B,CAAC;YAED,kDAAkD;YAClD,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;gBACxB,MAAM,OAAO,GAAG,cAAM,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,CAAO,MAAM,EAAE,EAAE,EAAE,EAAE,gDAAC,OAAA,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA,GAAA,CAAC,CAAA,CAAC;gBACzH,IAAI,OAAO,EAAE,CAAC;oBACV,oBAAM,IAAI,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA,CAAC;gBACzC,CAAC;YACL,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,sEAAsE;YACtE,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;YACzD,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB;YACpF,IAAI,YAAY,GAAG,CAAC,CAAC;;gBACrB,KAAsB,eAAA,aAAA,cAAA,QAAQ,CAAA,cAAA,2FAAE,CAAC;oBAAX,wBAAQ;oBAAR,WAAQ;oBAAnB,MAAM,CAAC,KAAA,CAAA;oBACd,YAAY,EAAE,CAAC;oBACf,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;oBACnE,MAAM,OAAO,GAAG,cAAM,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,CAAO,MAAM,EAAE,EAAE,EAAE,EAAE,gDAAC,OAAA,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA,GAAA,CAAC,CAAA,CAAC;oBACzH,wEAAwE;oBACxE,oBAAM,IAAI,MAAM,CAAC,CAAC,EAAE,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,CAAC;gBACrD,CAAC;;;;;;;;;QACL,CAAC;QAED,cAAM,mBAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA,CAAC;IAC3C,CAAC;CAAA"}

package/dist/version.txt

@@ -1 +1 @@
-8.70.2
+8.70.4

package/package.json

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

package/src/javascript/add-import.ts

@@ -39,6 +39,11 @@ export interface AddImportOptions {
      * Cannot be combined with `member`, `alias`, or `onlyIfReferenced`. */
     sideEffectOnly?: boolean;
 
+    /** If true, adds a type-only import (e.g., `import type { Foo } from 'module'`).
+     * Type-only imports are erased at compile time and do not generate runtime code.
+     * Cannot be combined with `sideEffectOnly`. */
+    typeOnly?: boolean;
+
     /** Optional import style to use. If not specified, auto-detects from file and existing imports */
     style?: ImportStyle;
 }
@@ -77,7 +82,8 @@ export function maybeAddImport(
             v.module === options.module &&
             v.member === options.member &&
             v.alias === options.alias &&
-            v.sideEffectOnly === (options.sideEffectOnly ?? false)) {
+            v.sideEffectOnly === (options.sideEffectOnly ?? false) &&
+            v.typeOnly === (options.typeOnly ?? false)) {
             return;
         }
     }
@@ -90,6 +96,7 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
     readonly alias?: string;
     readonly onlyIfReferenced: boolean;
     readonly sideEffectOnly: boolean;
+    readonly typeOnly: boolean;
     readonly style?: ImportStyle;
 
     constructor(options: AddImportOptions) {
@@ -116,6 +123,9 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
             if (options.onlyIfReferenced !== undefined) {
                 throw new Error("Cannot combine sideEffectOnly with onlyIfReferenced");
             }
+            if (options.typeOnly) {
+                throw new Error("Cannot combine sideEffectOnly with typeOnly");
+            }
         }
 
         this.module = options.module;
@@ -123,6 +133,7 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
         this.alias = options.alias;
         this.onlyIfReferenced = options.onlyIfReferenced ?? true;
         this.sideEffectOnly = options.sideEffectOnly ?? false;
+        this.typeOnly = options.typeOnly ?? false;
         this.style = options.style;
     }
 
@@ -444,6 +455,11 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
                     continue;
                 }
 
+                // Only merge into imports with matching typeOnly - don't mix type and value imports
+                if (importClause.typeOnly !== this.typeOnly) {
+                    continue;
+                }
+
                 // Case 1: Existing import has named bindings - merge into them
                 if (importClause.namedBindings) {
                     // Only merge into NamedImports, not namespace imports
@@ -631,6 +647,11 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
             return false;
         }
 
+        // Check if the typeOnly flag matches - type-only and value imports are separate
+        if (importClause.typeOnly !== this.typeOnly) {
+            return false;
+        }
+
         // Check if the specific member or default import already exists
         if (this.member === '*') {
             // We're adding a namespace import, check if one exists
@@ -1053,9 +1074,9 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
             importClause = {
                 id: randomId(),
                 kind: JS.Kind.ImportClause,
-                prefix: emptySpace,
+                prefix: this.typeOnly ? singleSpace : emptySpace,
                 markers: emptyMarkers,
-                typeOnly: false,
+                typeOnly: this.typeOnly,
                 name: undefined,
                 namedBindings: namespaceBinding
             };
@@ -1076,9 +1097,9 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
             importClause = {
                 id: randomId(),
                 kind: JS.Kind.ImportClause,
-                prefix: emptySpace,
+                prefix: this.typeOnly ? singleSpace : emptySpace,
                 markers: emptyMarkers,
-                typeOnly: false,
+                typeOnly: this.typeOnly,
                 name: rightPadded(defaultName, emptySpace),
                 namedBindings: undefined
             };
@@ -1110,9 +1131,9 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
             importClause = {
                 id: randomId(),
                 kind: JS.Kind.ImportClause,
-                prefix: emptySpace,
+                prefix: this.typeOnly ? singleSpace : emptySpace,
                 markers: emptyMarkers,
-                typeOnly: false,
+                typeOnly: this.typeOnly,
                 name: undefined,
                 namedBindings: namedImports
             };

package/src/javascript/assertions.ts

@@ -55,9 +55,14 @@ export async function* npm(relativeTo: string, ...sourceSpecs: SourceSpec<any>[]
         );
     }
 
-    // Write non-JS/TS files to disk FIRST so Prettier config detection can find them
+    // Write non-JS/TS/JSON files to disk FIRST so Prettier config detection can find them
+    // Exclude all package.json files (root and workspace members) - they're handled separately
     for (const spec of sourceSpecs) {
-        if (spec.path !== 'package.json' && spec.path !== 'package-lock.json' && spec.kind !== JS.Kind.CompilationUnit) {
+        const isPackageJson = spec.path?.endsWith('package.json');
+        const isPackageLock = spec.path === 'package-lock.json';
+        const isJsTs = spec.kind === JS.Kind.CompilationUnit;
+
+        if (!isPackageJson && !isPackageLock && !isJsTs) {
             if (spec.before && spec.path) {
                 const filePath = path.join(relativeTo, spec.path);
                 const dir = path.dirname(filePath);
@@ -69,22 +74,37 @@ export async function* npm(relativeTo: string, ...sourceSpecs: SourceSpec<any>[]
         }
     }
 
+    // Collect all package.json specs (root and workspace members)
+    const allPackageJsonSpecs = sourceSpecs.filter(spec => spec.path?.endsWith('package.json'));
+
     // Yield package.json FIRST so its PackageJsonParser is used for all JSON specs
     // (The test framework uses the first spec's parser for all specs of the same kind)
     if (packageJsonSpec) {
-        // Parse package.json to check if there are dependencies
+        // Parse package.json to check if there are dependencies or workspaces
         const packageJsonContent = JSON.parse(packageJsonSpec.before!);
         const hasDependencies = Object.keys({
             ...packageJsonContent.dependencies,
             ...packageJsonContent.devDependencies
         }).length > 0;
+        const hasWorkspaces = Array.isArray(packageJsonContent.workspaces) && packageJsonContent.workspaces.length > 0;
 
         // Get or create cached workspace with node_modules
         // If packageLockSpec is provided, use it for deterministic installs with npm ci
-        if (hasDependencies) {
+        // For workspaces, include all workspace member package.json files
+        if (hasDependencies || hasWorkspaces) {
+            // Build workspace packages map for DependencyWorkspace
+            const workspacePackages: Record<string, string> | undefined = hasWorkspaces
+                ? Object.fromEntries(
+                    allPackageJsonSpecs
+                        .filter(spec => spec.path !== 'package.json' && spec.before)
+                        .map(spec => [spec.path!, spec.before!])
+                )
+                : undefined;
+
             const cachedWorkspace = await DependencyWorkspace.getOrCreateWorkspace({
                 packageJsonContent: packageJsonSpec.before!,
-                packageLockContent: packageLockSpec?.before ?? undefined
+                packageLockContent: packageLockSpec?.before ?? undefined,
+                workspacePackages
             });
 
             // Symlink node_modules from cached workspace to test directory
@@ -113,6 +133,26 @@ export async function* npm(relativeTo: string, ...sourceSpecs: SourceSpec<any>[]
         };
     }
 
+    // Write and yield workspace member package.json files with PackageJsonParser
+    for (const spec of allPackageJsonSpecs) {
+        if (spec.path !== 'package.json') {
+            // Write workspace member package.json to disk
+            if (spec.before && spec.path) {
+                const filePath = path.join(relativeTo, spec.path);
+                const dir = path.dirname(filePath);
+                if (!fs.existsSync(dir)) {
+                    fs.mkdirSync(dir, { recursive: true });
+                }
+                fs.writeFileSync(filePath, spec.before);
+            }
+
+            yield {
+                ...spec,
+                parser: () => new PackageJsonParser({relativeTo})
+            };
+        }
+    }
+
     // Yield package-lock.json after package.json (so PackageJsonParser is used as the group parser)
     if (packageLockSpec) {
         yield packageLockSpec;
@@ -150,7 +190,9 @@ export async function* npm(relativeTo: string, ...sourceSpecs: SourceSpec<any>[]
     }
 
     for (const spec of sourceSpecs) {
-        if (spec.path !== 'package.json' && spec.path !== 'package-lock.json') {
+        const isPackageJson = spec.path?.endsWith('package.json');
+        const isPackageLock = spec.path === 'package-lock.json';
+        if (!isPackageJson && !isPackageLock) {
             if (spec.kind === JS.Kind.CompilationUnit) {
                 // For JS/TS files, use a parser that adds style marker if available
                 // spec.path may be undefined, so generate a reasonable path from the extension