@openrewrite/rewrite 8.70.3 → 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/version.txt

@@ -1 +1 @@
-8.70.3
+8.70.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openrewrite/rewrite",
-  "version": "8.70.3",
+  "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

package/src/javascript/dependency-workspace.ts

@@ -49,6 +49,11 @@ interface PackageJsonWorkspaceOptions extends BaseWorkspaceOptions {
      * - `npm ci` is used instead of `npm install` (faster, deterministic)
      */
     packageLockContent?: string;
+    /**
+     * Optional workspace member package.json files.
+     * Keys are relative paths (e.g., "packages/foo/package.json"), values are content.
+     */
+    workspacePackages?: Record<string, string>;
 }
 
 /**
@@ -77,20 +82,44 @@ export class DependencyWorkspace {
         // Extract dependencies from package.json content if provided
         let dependencies: Record<string, string> | undefined = options.dependencies;
         let parsedPackageJson: Record<string, any> | undefined;
+        let workspacePackages: Record<string, string> | undefined;
+
         if (options.packageJsonContent) {
             parsedPackageJson = JSON.parse(options.packageJsonContent);
             dependencies = {
                 ...parsedPackageJson?.dependencies,
                 ...parsedPackageJson?.devDependencies
             };
+            workspacePackages = options.workspacePackages;
+
+            // For workspaces, also collect dependencies from workspace members
+            if (workspacePackages) {
+                for (const content of Object.values(workspacePackages)) {
+                    const memberPkg = JSON.parse(content);
+                    dependencies = {
+                        ...dependencies,
+                        ...memberPkg?.dependencies,
+                        ...memberPkg?.devDependencies
+                    };
+                }
+            }
         }
 
-        if (!dependencies || Object.keys(dependencies).length === 0) {
+        // For workspaces without explicit dependencies in root, we still need to run install
+        const hasWorkspaces = parsedPackageJson?.workspaces && Array.isArray(parsedPackageJson.workspaces);
+        if ((!dependencies || Object.keys(dependencies).length === 0) && !hasWorkspaces) {
             throw new Error('No dependencies provided');
         }
 
         // Use the refactored internal method
-        return this.createWorkspace(dependencies, parsedPackageJson, options.packageJsonContent, options.packageLockContent, options.targetDir);
+        return this.createWorkspace(
+            dependencies || {},
+            parsedPackageJson,
+            options.packageJsonContent,
+            options.packageLockContent,
+            options.targetDir,
+            workspacePackages
+        );
     }
 
     /**
@@ -101,14 +130,23 @@ export class DependencyWorkspace {
         parsedPackageJson: Record<string, any> | undefined,
         packageJsonContent: string | undefined,
         packageLockContent: string | undefined,
-        targetDir: string | undefined
+        targetDir: string | undefined,
+        workspacePackages?: Record<string, string>
     ): Promise<string> {
         // Determine hash based on lock file (most precise) or dependencies
         // Note: We always hash dependencies (not packageJsonContent) because whitespace/formatting
         // differences in package.json shouldn't create different workspaces
-        const hash = packageLockContent
-            ? this.hashContent(packageLockContent)
-            : this.hashDependencies(dependencies);
+        // For workspaces, include workspace package paths in the hash
+        let hash: string;
+        if (packageLockContent) {
+            hash = this.hashContent(packageLockContent);
+        } else if (workspacePackages) {
+            // Include workspace package paths in hash for workspace setups
+            const workspacePaths = Object.keys(workspacePackages).sort().join(',');
+            hash = this.hashContent(this.hashDependencies(dependencies) + ':' + workspacePaths);
+        } else {
+            hash = this.hashDependencies(dependencies);
+        }
 
         // Determine npm command: use `npm ci` when lock file is provided (faster, deterministic)
         const npmCommand = packageLockContent ? 'npm ci --silent' : 'npm install --silent';
@@ -134,11 +172,26 @@ export class DependencyWorkspace {
             if (packageLockContent) {
                 fs.writeFileSync(path.join(dir, 'package-lock.json'), packageLockContent);
             }
+
+            // Write workspace member package.json files
+            if (workspacePackages) {
+                for (const [relativePath, content] of Object.entries(workspacePackages)) {
+                    const fullPath = path.join(dir, relativePath);
+                    const memberDir = path.dirname(fullPath);
+                    if (!fs.existsSync(memberDir)) {
+                        fs.mkdirSync(memberDir, {recursive: true});
+                    }
+                    fs.writeFileSync(fullPath, content);
+                }
+            }
         };
 
+        // For workspaces, skip dependency validation (combined deps don't match root package.json)
+        const depsForValidation = workspacePackages ? undefined : dependencies;
+
         if (targetDir) {
             // Use provided directory - check if it's already valid
-            if (this.isWorkspaceValid(targetDir, dependencies)) {
+            if (this.isWorkspaceValid(targetDir, depsForValidation)) {
                 return targetDir;
             }
 
@@ -149,7 +202,7 @@ export class DependencyWorkspace {
             const cachedWorkspaceDir = path.join(this.WORKSPACE_BASE, hash);
             const cachedNodeModules = path.join(cachedWorkspaceDir, 'node_modules');
 
-            if (fs.existsSync(cachedNodeModules) && this.isWorkspaceValid(cachedWorkspaceDir, dependencies)) {
+            if (fs.existsSync(cachedNodeModules) && this.isWorkspaceValid(cachedWorkspaceDir, depsForValidation)) {
                 // Symlink node_modules from cached workspace
                 try {
                     const targetNodeModules = path.join(targetDir, 'node_modules');
@@ -190,7 +243,7 @@ export class DependencyWorkspace {
 
         // Check cache
         const cached = this.cache.get(hash);
-        if (cached && fs.existsSync(cached) && this.isWorkspaceValid(cached, dependencies)) {
+        if (cached && fs.existsSync(cached) && this.isWorkspaceValid(cached, depsForValidation)) {
             return cached;
         }
 
@@ -198,7 +251,7 @@ export class DependencyWorkspace {
         const workspaceDir = path.join(this.WORKSPACE_BASE, hash);
 
         // Check if valid workspace already exists on disk (cross-VM reuse)
-        if (fs.existsSync(workspaceDir) && this.isWorkspaceValid(workspaceDir, dependencies)) {
+        if (fs.existsSync(workspaceDir) && this.isWorkspaceValid(workspaceDir, depsForValidation)) {
             this.cache.set(hash, workspaceDir);
             return workspaceDir;
         }
@@ -241,7 +294,7 @@ export class DependencyWorkspace {
                     if (error.code === 'EEXIST' || error.code === 'ENOTEMPTY' || error.code === 'EISDIR' ||
                         (error.code === 'EPERM' && fs.existsSync(workspaceDir))) {
                         // Target exists - check if it's valid
-                        if (this.isWorkspaceValid(workspaceDir, dependencies)) {
+                        if (this.isWorkspaceValid(workspaceDir, depsForValidation)) {
                             // Another process created a valid workspace - use theirs
                             moved = true; // Don't try again
                         } else {
@@ -261,7 +314,7 @@ export class DependencyWorkspace {
                             moved = true;
                         } catch (copyError) {
                             // Check if another process created it while we were copying
-                            if (this.isWorkspaceValid(workspaceDir, dependencies)) {
+                            if (this.isWorkspaceValid(workspaceDir, depsForValidation)) {
                                 moved = true;
                             } else {
                                 throw error;
@@ -284,7 +337,7 @@ export class DependencyWorkspace {
             }
 
             // Verify final workspace is valid (might be from another process)
-            if (!this.isWorkspaceValid(workspaceDir, dependencies)) {
+            if (!this.isWorkspaceValid(workspaceDir, depsForValidation)) {
                 throw new Error('Failed to create valid workspace due to concurrent modifications');
             }