@openrewrite/recipes-nodejs 0.37.0-20260104-170507 → 0.37.0-20260106-083133

package/dist/security/remove-redundant-overrides.js

@@ -0,0 +1,379 @@
+"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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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.RemoveRedundantOverrides = void 0;
+const rewrite_1 = require("@openrewrite/rewrite");
+const json_1 = require("@openrewrite/rewrite/json");
+const javascript_1 = require("@openrewrite/rewrite/javascript");
+const semver = __importStar(require("semver"));
+const npm_utils_1 = require("./npm-utils");
+class RemoveRedundantOverrides extends rewrite_1.ScanningRecipe {
+    constructor(options) {
+        var _a;
+        super();
+        this.name = "org.openrewrite.node.security.remove-redundant-overrides";
+        this.displayName = "Remove redundant dependency overrides";
+        this.description = "Removes overrides/resolutions from package.json that are redundant " +
+            "because the dependency tree already resolves to the overridden version or higher.";
+        this.dryRun = (_a = options === null || options === void 0 ? void 0 : options.dryRun) !== null && _a !== void 0 ? _a : false;
+    }
+    initialValue(_ctx) {
+        return {
+            projects: new Map(),
+            redundantOverrides: new Map(),
+            analysisComplete: false
+        };
+    }
+    scanner(acc) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const recipe = this;
+            return new class extends rewrite_1.TreeVisitor {
+                accept(tree, _ctx) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        var _a, _b;
+                        if (!(0, json_1.isJson)(tree) || tree.kind !== json_1.Json.Kind.Document) {
+                            return tree;
+                        }
+                        const doc = tree;
+                        if (!doc.sourcePath.endsWith('package.json')) {
+                            return doc;
+                        }
+                        const marker = (0, javascript_1.findNodeResolutionResult)(doc);
+                        if (!marker) {
+                            return doc;
+                        }
+                        const pm = (_a = marker.packageManager) !== null && _a !== void 0 ? _a : "Npm";
+                        const content = yield rewrite_1.TreePrinters.print(doc);
+                        let packageJson;
+                        try {
+                            packageJson = JSON.parse(content);
+                        }
+                        catch (_c) {
+                            return doc;
+                        }
+                        const overrides = recipe.extractOverrides(packageJson, pm);
+                        if (overrides.length === 0) {
+                            return doc;
+                        }
+                        const configFiles = {};
+                        const projectNpmrc = (_b = marker.npmrcConfigs) === null || _b === void 0 ? void 0 : _b.find(c => c.scope === "Project");
+                        if (projectNpmrc) {
+                            const lines = Object.entries(projectNpmrc.properties)
+                                .map(([key, value]) => `${key}=${value}`);
+                            configFiles['.npmrc'] = lines.join('\n');
+                        }
+                        acc.projects.set(doc.sourcePath, {
+                            packageJsonPath: doc.sourcePath,
+                            originalPackageJson: content,
+                            packageManager: pm,
+                            overrides,
+                            configFiles: Object.keys(configFiles).length > 0 ? configFiles : undefined
+                        });
+                        return doc;
+                    });
+                }
+            };
+        });
+    }
+    editorWithData(acc) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const recipe = this;
+            if (!acc.analysisComplete) {
+                for (const [projectPath, project] of acc.projects) {
+                    const redundant = yield recipe.findRedundantOverrides(project);
+                    if (redundant.size > 0) {
+                        acc.redundantOverrides.set(projectPath, redundant);
+                    }
+                }
+                acc.analysisComplete = true;
+            }
+            if (recipe.dryRun) {
+                return new class extends rewrite_1.TreeVisitor {
+                    accept(tree, _ctx) {
+                        return __awaiter(this, void 0, void 0, function* () {
+                            return tree;
+                        });
+                    }
+                };
+            }
+            return new class extends json_1.JsonVisitor {
+                visitDocument(doc, _ctx) {
+                    return __awaiter(this, void 0, void 0, function* () {
+                        if (!doc.sourcePath.endsWith('package.json')) {
+                            return doc;
+                        }
+                        const redundant = acc.redundantOverrides.get(doc.sourcePath);
+                        if (!redundant || redundant.size === 0) {
+                            return doc;
+                        }
+                        const project = acc.projects.get(doc.sourcePath);
+                        if (!project) {
+                            return doc;
+                        }
+                        const modifiedContent = recipe.removeOverrides(project.originalPackageJson, project.packageManager, redundant);
+                        const parsed = yield new json_1.JsonParser({}).parseOne({
+                            text: modifiedContent,
+                            sourcePath: doc.sourcePath
+                        });
+                        return Object.assign(Object.assign({}, doc), { value: parsed.value, eof: parsed.eof });
+                    });
+                }
+            };
+        });
+    }
+    extractOverrides(packageJson, pm) {
+        var _a;
+        const overrides = [];
+        let overrideObj;
+        switch (pm) {
+            case "Npm":
+            case "Bun":
+                overrideObj = packageJson.overrides;
+                break;
+            case "Pnpm":
+                overrideObj = (_a = packageJson.pnpm) === null || _a === void 0 ? void 0 : _a.overrides;
+                break;
+            case "YarnClassic":
+            case "YarnBerry":
+                overrideObj = packageJson.resolutions;
+                break;
+        }
+        if (!overrideObj) {
+            return overrides;
+        }
+        for (const [key, value] of Object.entries(overrideObj)) {
+            if (typeof value !== 'string') {
+                continue;
+            }
+            const atIndex = key.lastIndexOf('@');
+            let packageName;
+            let versionRange;
+            let isVersionSpecific = false;
+            if (atIndex > 0 && !key.startsWith('@')) {
+                packageName = key.substring(0, atIndex);
+                versionRange = key.substring(atIndex + 1);
+                isVersionSpecific = true;
+            }
+            else if (atIndex > 0 && key.startsWith('@')) {
+                const secondAtIndex = key.indexOf('@', 1);
+                if (secondAtIndex > 0 && secondAtIndex !== atIndex) {
+                    packageName = key.substring(0, secondAtIndex);
+                    versionRange = key.substring(secondAtIndex + 1);
+                    isVersionSpecific = true;
+                }
+                else {
+                    packageName = key;
+                }
+            }
+            else {
+                packageName = key;
+            }
+            overrides.push({
+                key,
+                packageName,
+                version: value,
+                isVersionSpecific,
+                versionRange
+            });
+        }
+        return overrides;
+    }
+    findRedundantOverrides(project) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const redundant = new Set();
+            if (project.overrides.length === 0) {
+                return redundant;
+            }
+            try {
+                const packageJson = JSON.parse(project.originalPackageJson);
+                for (const override of project.overrides) {
+                    this.removeOverrideFromObject(packageJson, project.packageManager, override.key);
+                }
+                const modifiedPackageJson = JSON.stringify(packageJson, null, 2);
+                const result = yield (0, javascript_1.runInstallInTempDir)(project.packageManager, modifiedPackageJson, {
+                    configFiles: project.configFiles,
+                    lockOnly: true
+                });
+                if (!result.success || !result.lockFileContent) {
+                    return redundant;
+                }
+                for (const override of project.overrides) {
+                    const isRedundant = this.isOverrideRedundantForLockFile(override, result.lockFileContent, project.packageManager);
+                    if (isRedundant) {
+                        redundant.add(override.key);
+                    }
+                }
+            }
+            catch (_a) {
+            }
+            return redundant;
+        });
+    }
+    isOverrideRedundantForLockFile(override, lockFileContent, packageManager) {
+        const resolvedVersion = (0, npm_utils_1.extractVersionFromLockFile)(lockFileContent, override.packageName, packageManager);
+        if (!resolvedVersion) {
+            return true;
+        }
+        try {
+            if (semver.gte(resolvedVersion, override.version)) {
+                return true;
+            }
+            if (semver.satisfies(resolvedVersion, `>=${override.version}`)) {
+                return true;
+            }
+        }
+        catch (_a) {
+            return false;
+        }
+        return false;
+    }
+    removeOverrideFromObject(packageJson, pm, key) {
+        var _a;
+        switch (pm) {
+            case "Npm":
+            case "Bun":
+                if (packageJson.overrides) {
+                    delete packageJson.overrides[key];
+                    if (Object.keys(packageJson.overrides).length === 0) {
+                        delete packageJson.overrides;
+                    }
+                }
+                break;
+            case "Pnpm":
+                if ((_a = packageJson.pnpm) === null || _a === void 0 ? void 0 : _a.overrides) {
+                    delete packageJson.pnpm.overrides[key];
+                    if (Object.keys(packageJson.pnpm.overrides).length === 0) {
+                        delete packageJson.pnpm.overrides;
+                    }
+                    if (Object.keys(packageJson.pnpm).length === 0) {
+                        delete packageJson.pnpm;
+                    }
+                }
+                break;
+            case "YarnClassic":
+            case "YarnBerry":
+                if (packageJson.resolutions) {
+                    delete packageJson.resolutions[key];
+                    if (Object.keys(packageJson.resolutions).length === 0) {
+                        delete packageJson.resolutions;
+                    }
+                }
+                break;
+        }
+    }
+    removeOverrides(originalContent, pm, keysToRemove) {
+        var _a;
+        const packageJson = JSON.parse(originalContent);
+        let overrideField;
+        let commentField;
+        switch (pm) {
+            case "Npm":
+            case "Bun":
+                overrideField = 'overrides';
+                commentField = '//overrides';
+                break;
+            case "Pnpm":
+                overrideField = 'pnpm';
+                commentField = '//pnpm.overrides';
+                break;
+            case "YarnClassic":
+            case "YarnBerry":
+                overrideField = 'resolutions';
+                commentField = '//resolutions';
+                break;
+            default:
+                return originalContent;
+        }
+        if (pm === "Pnpm") {
+            if ((_a = packageJson.pnpm) === null || _a === void 0 ? void 0 : _a.overrides) {
+                for (const key of keysToRemove) {
+                    delete packageJson.pnpm.overrides[key];
+                }
+                if (Object.keys(packageJson.pnpm.overrides).length === 0) {
+                    delete packageJson.pnpm.overrides;
+                }
+                if (Object.keys(packageJson.pnpm).length === 0) {
+                    delete packageJson.pnpm;
+                }
+            }
+        }
+        else {
+            if (packageJson[overrideField]) {
+                for (const key of keysToRemove) {
+                    delete packageJson[overrideField][key];
+                }
+                if (Object.keys(packageJson[overrideField]).length === 0) {
+                    delete packageJson[overrideField];
+                }
+            }
+        }
+        if (packageJson[commentField]) {
+            for (const key of keysToRemove) {
+                delete packageJson[commentField][key];
+            }
+            if (Object.keys(packageJson[commentField]).length === 0) {
+                delete packageJson[commentField];
+            }
+        }
+        const indentMatch = originalContent.match(/^(\s+)"/m);
+        const indent = indentMatch ? indentMatch[1].length : 2;
+        return JSON.stringify(packageJson, null, indent);
+    }
+}
+exports.RemoveRedundantOverrides = RemoveRedundantOverrides;
+__decorate([
+    (0, rewrite_1.Option)({
+        displayName: "Dry run",
+        description: "If true, only report which overrides are redundant without removing them.",
+        required: false,
+        example: "true"
+    })
+], RemoveRedundantOverrides.prototype, "dryRun", void 0);
+//# sourceMappingURL=remove-redundant-overrides.js.map

package/dist/security/remove-redundant-overrides.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openrewrite/recipes-nodejs",
-  "version": "0.37.0-20260104-170507",
+  "version": "0.37.0-20260106-083133",
   "license": "Moderne Source Available License",
   "description": "OpenRewrite recipes for Node.js library migrations.",
   "homepage": "https://github.com/moderneinc/rewrite-node",
@@ -17,13 +17,15 @@
     "access": "public"
   },
   "scripts": {
-    "build": "rm -rf ./dist tsconfig.build.tsbuildinfo && tsc --build tsconfig.build.json && cp -rL resources dist/",
+    "prebuild": "bun -e \"require('fs').rmSync('dist',{recursive:true,force:true})\"",
+    "build": "tsc --build tsconfig.build.json",
+    "postbuild": "bun -e \"const fse=require('fs-extra'); fse.existsSync('resources') && fse.copySync('resources','dist/resources',{dereference:true})\"",
     "dev": "tsc --watch -p tsconfig.json",
     "test": "npm run build && jest",
     "ci:test": "jest"
   },
   "dependencies": {
-    "@openrewrite/rewrite": "^8.70.4",
+    "@openrewrite/rewrite": "next",
     "immer": "^11.0.1",
     "semver": "^7.7.3"
   },
@@ -31,6 +33,8 @@
     "@types/jest": "^29.5.13",
     "@types/node": "^22.5.4",
     "@types/semver": "^7.7.1",
+    "bun": "^1.3.5",
+    "fs-extra": "^11.3.3",
     "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
     "tmp-promise": "^3.0.3",

package/src/index.ts

@@ -21,7 +21,7 @@ import {ReplaceStreamInternalModules} from "./migrate/stream-internal-modules";
 import {RemoveNetSetSimultaneousAccepts} from "./migrate/net-set-simultaneous-accepts";
 import {UpgradeNode22} from "./migrate/upgrade-node-22";
 import {UpgradeNode24} from "./migrate/upgrade-node-24";
-import {DependencyVulnerabilityCheck} from "./security";
+import {DependencyVulnerabilityCheck, RemoveRedundantOverrides} from "./security";
 
 export const NodeJS: CategoryDescriptor[] = [{displayName: "Node.js"}];
 export const Migrate: CategoryDescriptor[] = [...NodeJS, {displayName: "Migrate"}];
@@ -52,4 +52,5 @@ export async function activate(marketplace: RecipeMarketplace): Promise<void> {
     await marketplace.install(UpgradeNode24, Migrate);
 
     await marketplace.install(DependencyVulnerabilityCheck, Security);
+    await marketplace.install(RemoveRedundantOverrides, Security);
 }