@pnpm/lockfile.merger 1.0.0

package/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2016 Rico Sta. Cruz and other contributors
+Copyright (c) 2016-2024 Zoltan Kochan and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,13 @@
+# @pnpm/lockfile.merger
+
+> Merges lockfiles. Can automatically fix merge conflicts
+
+## Install
+
+```
+pnpm add @pnpm/lockfile.merger
+```
+
+## License
+
+[MIT](LICENSE)

package/lib/index.d.ts

@@ -0,0 +1,2 @@
+import { type Lockfile } from '@pnpm/lockfile.types';
+export declare function mergeLockfileChanges(ours: Lockfile, theirs: Lockfile): Lockfile;

package/lib/index.js

@@ -0,0 +1,86 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeLockfileChanges = void 0;
+const comver_to_semver_1 = __importDefault(require("comver-to-semver"));
+const semver_1 = __importDefault(require("semver"));
+function mergeLockfileChanges(ours, theirs) {
+    const newLockfile = {
+        importers: {},
+        lockfileVersion: semver_1.default.gt((0, comver_to_semver_1.default)(theirs.lockfileVersion.toString()), (0, comver_to_semver_1.default)(ours.lockfileVersion.toString()))
+            ? theirs.lockfileVersion
+            : ours.lockfileVersion,
+    };
+    const pnpmfileChecksum = ours.pnpmfileChecksum ?? theirs.pnpmfileChecksum; // Install should automatically detect change later
+    if (pnpmfileChecksum) {
+        newLockfile.pnpmfileChecksum = pnpmfileChecksum;
+    }
+    const ignoredOptionalDependencies = [...new Set([
+            ...ours.ignoredOptionalDependencies ?? [],
+            ...theirs.ignoredOptionalDependencies ?? [],
+        ])];
+    if (ignoredOptionalDependencies.length) {
+        newLockfile.ignoredOptionalDependencies = ignoredOptionalDependencies;
+    }
+    for (const importerId of Array.from(new Set([...Object.keys(ours.importers), ...Object.keys(theirs.importers)]))) {
+        newLockfile.importers[importerId] = {
+            specifiers: {},
+        };
+        for (const key of ['dependencies', 'devDependencies', 'optionalDependencies']) {
+            newLockfile.importers[importerId][key] = mergeDict(ours.importers[importerId]?.[key] ?? {}, theirs.importers[importerId]?.[key] ?? {}, mergeVersions);
+            if (Object.keys(newLockfile.importers[importerId][key] ?? {}).length === 0) {
+                delete newLockfile.importers[importerId][key];
+            }
+        }
+        newLockfile.importers[importerId].specifiers = mergeDict(ours.importers[importerId]?.specifiers ?? {}, theirs.importers[importerId]?.specifiers ?? {}, takeChangedValue);
+    }
+    const packages = {};
+    for (const depPath of (Array.from(new Set([...Object.keys(ours.packages ?? {}), ...Object.keys(theirs.packages ?? {})])))) {
+        const ourPkg = ours.packages?.[depPath];
+        const theirPkg = theirs.packages?.[depPath];
+        const pkg = {
+            ...ourPkg,
+            ...theirPkg,
+        };
+        for (const key of ['dependencies', 'optionalDependencies']) {
+            pkg[key] = mergeDict(ourPkg?.[key] ?? {}, theirPkg?.[key] ?? {}, mergeVersions);
+            if (Object.keys(pkg[key] ?? {}).length === 0) {
+                delete pkg[key];
+            }
+        }
+        packages[depPath] = pkg;
+    }
+    newLockfile.packages = packages;
+    return newLockfile;
+}
+exports.mergeLockfileChanges = mergeLockfileChanges;
+function mergeDict(ourDict, theirDict, valueMerger) {
+    const newDict = {};
+    for (const key of Object.keys(ourDict).concat(Object.keys(theirDict))) {
+        const changedValue = valueMerger(ourDict[key], theirDict[key]);
+        if (changedValue) {
+            newDict[key] = changedValue;
+        }
+    }
+    return newDict;
+}
+function takeChangedValue(ourValue, theirValue) {
+    if (ourValue === theirValue || theirValue == null)
+        return ourValue;
+    return theirValue;
+}
+function mergeVersions(ourValue, theirValue) {
+    if (ourValue === theirValue || !theirValue)
+        return ourValue;
+    if (!ourValue)
+        return theirValue;
+    const [ourVersion] = ourValue.split('(');
+    const [theirVersion] = theirValue.split('(');
+    if (semver_1.default.gt(ourVersion, theirVersion)) {
+        return ourValue;
+    }
+    return theirValue;
+}
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAEA,wEAA6C;AAC7C,oDAA2B;AAE3B,SAAgB,oBAAoB,CAAE,IAAc,EAAE,MAAgB;IACpE,MAAM,WAAW,GAAa;QAC5B,SAAS,EAAE,EAAE;QACb,eAAe,EAAE,gBAAM,CAAC,EAAE,CAAC,IAAA,0BAAc,EAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAA,0BAAc,EAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5H,CAAC,CAAC,MAAM,CAAC,eAAe;YACxB,CAAC,CAAC,IAAI,CAAC,eAAe;KACzB,CAAA;IACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,IAAI,MAAM,CAAC,gBAAgB,CAAA,CAAC,mDAAmD;IAC7H,IAAI,gBAAgB,EAAE,CAAC;QACrB,WAAW,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;IACjD,CAAC;IAED,MAAM,2BAA2B,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC;YAC9C,GAAG,IAAI,CAAC,2BAA2B,IAAI,EAAE;YACzC,GAAG,MAAM,CAAC,2BAA2B,IAAI,EAAE;SAC5C,CAAC,CAAC,CAAA;IACH,IAAI,2BAA2B,CAAC,MAAM,EAAE,CAAC;QACvC,WAAW,CAAC,2BAA2B,GAAG,2BAA2B,CAAA;IACvE,CAAC;IAED,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAgB,CAAC,CAAC,EAAE,CAAC;QAChI,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG;YAClC,UAAU,EAAE,EAAE;SACf,CAAA;QACD,KAAK,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,iBAAiB,EAAE,sBAAsB,CAAU,EAAE,CAAC;YACvF,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS,CAChD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,EACvC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,EACzC,aAAa,CACd,CAAA;YACD,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3E,OAAO,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;QACD,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,UAAU,GAAG,SAAS,CACtD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,UAAU,IAAI,EAAE,EAC5C,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,UAAU,IAAI,EAAE,EAC9C,gBAAgB,CACjB,CAAA;IACH,CAAC;IAED,MAAM,QAAQ,GAAqB,EAAE,CAAA;IACrC,KAAK,MAAM,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAc,EAAE,CAAC;QACvI,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAA;QACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAA;QAC3C,MAAM,GAAG,GAAG;YACV,GAAG,MAAM;YACT,GAAG,QAAQ;SACZ,CAAA;QACD,KAAK,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,sBAAsB,CAAU,EAAE,CAAC;YACpE,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAClB,MAAM,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,EACnB,QAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,EACrB,aAAa,CACd,CAAA;YACD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7C,OAAO,GAAG,CAAC,GAAG,CAAC,CAAA;YACjB,CAAC;QACH,CAAC;QACD,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAsB,CAAA;IAC5C,CAAC;IACD,WAAW,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAE/B,OAAO,WAAW,CAAA;AACpB,CAAC;AAhED,oDAgEC;AAID,SAAS,SAAS,CAChB,OAA0B,EAC1B,SAA4B,EAC5B,WAA2B;IAE3B,MAAM,OAAO,GAAsB,EAAE,CAAA;IACrC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QACtE,MAAM,YAAY,GAAG,WAAW,CAC9B,OAAO,CAAC,GAAG,CAAC,EACZ,SAAS,CAAC,GAAG,CAAC,CACf,CAAA;QACD,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,CAAC,GAAG,YAAY,CAAA;QAC7B,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,SAAS,gBAAgB,CAAK,QAAW,EAAE,UAAa;IACtD,IAAI,QAAQ,KAAK,UAAU,IAAI,UAAU,IAAI,IAAI;QAAE,OAAO,QAAQ,CAAA;IAClE,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,SAAS,aAAa,CAAE,QAAgB,EAAE,UAAkB;IAC1D,IAAI,QAAQ,KAAK,UAAU,IAAI,CAAC,UAAU;QAAE,OAAO,QAAQ,CAAA;IAC3D,IAAI,CAAC,QAAQ;QAAE,OAAO,UAAU,CAAA;IAChC,MAAM,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACxC,MAAM,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC5C,IAAI,gBAAM,CAAC,EAAE,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE,CAAC;QACxC,OAAO,QAAQ,CAAA;IACjB,CAAC;IACD,OAAO,UAAU,CAAA;AACnB,CAAC"}

package/package.json

@@ -0,0 +1,48 @@
+{
+  "name": "@pnpm/lockfile.merger",
+  "version": "1.0.0",
+  "description": "Merges lockfiles. Can automatically fix merge conflicts",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "engines": {
+    "node": ">=18.12"
+  },
+  "files": [
+    "lib",
+    "!*.map"
+  ],
+  "repository": "https://github.com/pnpm/pnpm/blob/main/lockfile/merger",
+  "keywords": [
+    "pnpm9",
+    "pnpm",
+    "shrinkwrap",
+    "lockfile"
+  ],
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/pnpm/pnpm/issues"
+  },
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/merger#readme",
+  "dependencies": {
+    "comver-to-semver": "^1.0.0",
+    "ramda": "npm:@pnpm/ramda@0.28.1",
+    "semver": "^7.6.2",
+    "@pnpm/lockfile.types": "1.0.0",
+    "@pnpm/types": "11.1.0"
+  },
+  "funding": "https://opencollective.com/pnpm",
+  "devDependencies": {
+    "@types/ramda": "0.29.12",
+    "@types/semver": "7.5.3",
+    "@pnpm/lockfile.merger": "1.0.0"
+  },
+  "exports": {
+    ".": "./lib/index.js"
+  },
+  "scripts": {
+    "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
+    "_test": "jest",
+    "test": "pnpm run compile && pnpm run _test",
+    "compile": "tsc --build && pnpm run lint --fix"
+  }
+}