@pnpm/lockfile.fs 1001.1.2 → 1001.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/sortLockfileKeys.js +17 -36
- package/lib/sortLockfileKeys.js.map +1 -1
- package/package.json +8 -9
package/lib/sortLockfileKeys.js
CHANGED
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.sortLockfileKeys = sortLockfileKeys;
|
|
7
|
-
const
|
|
8
|
-
const sort_keys_1 = __importDefault(require("sort-keys"));
|
|
4
|
+
const object_key_sorting_1 = require("@pnpm/object.key-sorting");
|
|
9
5
|
const ORDERED_KEYS = {
|
|
10
6
|
resolution: 1,
|
|
11
7
|
id: 2,
|
|
@@ -40,60 +36,45 @@ const ROOT_KEYS = [
|
|
|
40
36
|
'packages',
|
|
41
37
|
];
|
|
42
38
|
const ROOT_KEYS_ORDER = Object.fromEntries(ROOT_KEYS.map((key, index) => [key, index]));
|
|
43
|
-
function compareWithPriority(priority, left, right) {
|
|
44
|
-
const leftPriority = priority[left];
|
|
45
|
-
const rightPriority = priority[right];
|
|
46
|
-
if (leftPriority != null && rightPriority != null)
|
|
47
|
-
return leftPriority - rightPriority;
|
|
48
|
-
if (leftPriority != null)
|
|
49
|
-
return -1;
|
|
50
|
-
if (rightPriority != null)
|
|
51
|
-
return 1;
|
|
52
|
-
return (0, util_lex_comparator_1.lexCompare)(left, right);
|
|
53
|
-
}
|
|
54
39
|
function sortLockfileKeys(lockfile) {
|
|
55
|
-
const compareRootKeys = compareWithPriority.bind(null, ROOT_KEYS_ORDER);
|
|
56
40
|
if (lockfile.importers != null) {
|
|
57
|
-
lockfile.importers = (0,
|
|
41
|
+
lockfile.importers = (0, object_key_sorting_1.sortDirectKeys)(lockfile.importers);
|
|
58
42
|
for (const [importerId, importer] of Object.entries(lockfile.importers)) {
|
|
59
|
-
lockfile.importers[importerId] = (0,
|
|
60
|
-
|
|
43
|
+
lockfile.importers[importerId] = (0, object_key_sorting_1.sortKeysByPriority)({
|
|
44
|
+
priority: ROOT_KEYS_ORDER,
|
|
61
45
|
deep: true,
|
|
62
|
-
});
|
|
46
|
+
}, importer);
|
|
63
47
|
}
|
|
64
48
|
}
|
|
65
49
|
if (lockfile.packages != null) {
|
|
66
|
-
lockfile.packages = (0,
|
|
50
|
+
lockfile.packages = (0, object_key_sorting_1.sortDirectKeys)(lockfile.packages);
|
|
67
51
|
for (const [pkgId, pkg] of Object.entries(lockfile.packages)) {
|
|
68
|
-
lockfile.packages[pkgId] = (0,
|
|
69
|
-
|
|
52
|
+
lockfile.packages[pkgId] = (0, object_key_sorting_1.sortKeysByPriority)({
|
|
53
|
+
priority: ORDERED_KEYS,
|
|
70
54
|
deep: true,
|
|
71
|
-
});
|
|
55
|
+
}, pkg);
|
|
72
56
|
}
|
|
73
57
|
}
|
|
74
58
|
if (lockfile.snapshots != null) {
|
|
75
|
-
lockfile.snapshots = (0,
|
|
59
|
+
lockfile.snapshots = (0, object_key_sorting_1.sortDirectKeys)(lockfile.snapshots);
|
|
76
60
|
for (const [pkgId, pkg] of Object.entries(lockfile.snapshots)) {
|
|
77
|
-
lockfile.snapshots[pkgId] = (0,
|
|
78
|
-
|
|
61
|
+
lockfile.snapshots[pkgId] = (0, object_key_sorting_1.sortKeysByPriority)({
|
|
62
|
+
priority: ORDERED_KEYS,
|
|
79
63
|
deep: true,
|
|
80
|
-
});
|
|
64
|
+
}, pkg);
|
|
81
65
|
}
|
|
82
66
|
}
|
|
83
67
|
if (lockfile.catalogs != null) {
|
|
84
|
-
lockfile.catalogs = (0,
|
|
68
|
+
lockfile.catalogs = (0, object_key_sorting_1.sortDirectKeys)(lockfile.catalogs);
|
|
85
69
|
for (const [catalogName, catalog] of Object.entries(lockfile.catalogs)) {
|
|
86
|
-
lockfile.catalogs[catalogName] = (0,
|
|
87
|
-
compare: util_lex_comparator_1.lexCompare,
|
|
88
|
-
deep: true,
|
|
89
|
-
});
|
|
70
|
+
lockfile.catalogs[catalogName] = (0, object_key_sorting_1.sortDeepKeys)(catalog);
|
|
90
71
|
}
|
|
91
72
|
}
|
|
92
73
|
for (const key of ['time', 'patchedDependencies']) {
|
|
93
74
|
if (!lockfile[key])
|
|
94
75
|
continue;
|
|
95
|
-
lockfile[key] = (0,
|
|
76
|
+
lockfile[key] = (0, object_key_sorting_1.sortDirectKeys)(lockfile[key]); // eslint-disable-line @typescript-eslint/no-explicit-any
|
|
96
77
|
}
|
|
97
|
-
return (0,
|
|
78
|
+
return (0, object_key_sorting_1.sortKeysByPriority)({ priority: ROOT_KEYS_ORDER }, lockfile);
|
|
98
79
|
}
|
|
99
80
|
//# sourceMappingURL=sortLockfileKeys.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sortLockfileKeys.js","sourceRoot":"","sources":["../src/sortLockfileKeys.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sortLockfileKeys.js","sourceRoot":"","sources":["../src/sortLockfileKeys.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/lockfile.fs",
|
|
3
|
-
"version": "1001.1.
|
|
3
|
+
"version": "1001.1.4",
|
|
4
4
|
"description": "Read/write pnpm-lock.yaml files",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -35,28 +35,27 @@
|
|
|
35
35
|
"tempy": "^1.0.1",
|
|
36
36
|
"write-yaml-file": "^5.0.0",
|
|
37
37
|
"yaml-tag": "1.1.0",
|
|
38
|
-
"@pnpm/lockfile.fs": "1001.1.
|
|
38
|
+
"@pnpm/lockfile.fs": "1001.1.4",
|
|
39
39
|
"@pnpm/logger": "1000.0.0"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@pnpm/util.lex-comparator": "3.0.0",
|
|
43
42
|
"@zkochan/rimraf": "^3.0.2",
|
|
44
43
|
"comver-to-semver": "^1.0.0",
|
|
45
44
|
"js-yaml": "npm:@zkochan/js-yaml@0.0.7",
|
|
46
45
|
"normalize-path": "^3.0.0",
|
|
47
46
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
48
47
|
"semver": "^7.6.2",
|
|
49
|
-
"sort-keys": "^4.2.0",
|
|
50
48
|
"strip-bom": "^4.0.0",
|
|
51
49
|
"write-file-atomic": "^5.0.1",
|
|
52
50
|
"@pnpm/constants": "1001.1.0",
|
|
53
|
-
"@pnpm/
|
|
51
|
+
"@pnpm/lockfile.merger": "1001.0.3",
|
|
54
52
|
"@pnpm/error": "1000.0.2",
|
|
53
|
+
"@pnpm/dependency-path": "1000.0.3",
|
|
54
|
+
"@pnpm/lockfile.types": "1001.0.3",
|
|
55
55
|
"@pnpm/git-utils": "1000.0.0",
|
|
56
|
-
"@pnpm/lockfile.
|
|
57
|
-
"@pnpm/
|
|
58
|
-
"@pnpm/
|
|
59
|
-
"@pnpm/types": "1000.1.1"
|
|
56
|
+
"@pnpm/lockfile.utils": "1001.0.3",
|
|
57
|
+
"@pnpm/object.key-sorting": "1000.0.0",
|
|
58
|
+
"@pnpm/types": "1000.2.0"
|
|
60
59
|
},
|
|
61
60
|
"funding": "https://opencollective.com/pnpm",
|
|
62
61
|
"exports": {
|