@pnpm/deps.graph-builder 0.2.10 → 1.0.1
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.
|
@@ -50,7 +50,7 @@ async function lockfileToDepGraph(lockfile, currentLockfile, opts) {
|
|
|
50
50
|
// TODO: optimize. This info can be already returned by pkgSnapshotToResolution()
|
|
51
51
|
const { name: pkgName, version: pkgVersion } = (0, lockfile_utils_1.nameVerFromPkgSnapshot)(depPath, pkgSnapshot);
|
|
52
52
|
const modules = path_1.default.join(opts.virtualStoreDir, dp.depPathToFilename(depPath), 'node_modules');
|
|
53
|
-
const packageId = (0, lockfile_utils_1.packageIdFromSnapshot)(depPath, pkgSnapshot
|
|
53
|
+
const packageId = (0, lockfile_utils_1.packageIdFromSnapshot)(depPath, pkgSnapshot);
|
|
54
54
|
const pkg = {
|
|
55
55
|
name: pkgName,
|
|
56
56
|
version: pkgVersion,
|
|
@@ -65,14 +65,13 @@ async function lockfileToDepGraph(lockfile, currentLockfile, opts) {
|
|
|
65
65
|
lockfileDir: opts.lockfileDir,
|
|
66
66
|
nodeVersion: opts.nodeVersion,
|
|
67
67
|
optional: pkgSnapshot.optional === true,
|
|
68
|
-
pnpmVersion: opts.pnpmVersion,
|
|
69
68
|
supportedArchitectures: opts.supportedArchitectures,
|
|
70
69
|
}) === false) {
|
|
71
70
|
opts.skipped.add(depPath);
|
|
72
71
|
return;
|
|
73
72
|
}
|
|
74
73
|
const dir = path_1.default.join(modules, pkgName);
|
|
75
|
-
const depIsPresent = !(
|
|
74
|
+
const depIsPresent = !('directory' in pkgSnapshot.resolution && pkgSnapshot.resolution.directory != null) &&
|
|
76
75
|
currentPackages[depPath] && (0, equals_1.default)(currentPackages[depPath].dependencies, lockfile.packages[depPath].dependencies);
|
|
77
76
|
let dirExists;
|
|
78
77
|
if (depIsPresent && (0, isEmpty_1.default)(currentPackages[depPath].optionalDependencies ?? {}) &&
|
|
@@ -120,7 +119,7 @@ async function lockfileToDepGraph(lockfile, currentLockfile, opts) {
|
|
|
120
119
|
if (fetchResponse instanceof Promise)
|
|
121
120
|
fetchResponse = await fetchResponse;
|
|
122
121
|
}
|
|
123
|
-
catch (err) {
|
|
122
|
+
catch (err) {
|
|
124
123
|
if (pkgSnapshot.optional)
|
|
125
124
|
return;
|
|
126
125
|
throw err;
|
|
@@ -138,8 +137,6 @@ async function lockfileToDepGraph(lockfile, currentLockfile, opts) {
|
|
|
138
137
|
name: pkgName,
|
|
139
138
|
optional: !!pkgSnapshot.optional,
|
|
140
139
|
optionalDependencies: new Set(Object.keys(pkgSnapshot.optionalDependencies ?? {})),
|
|
141
|
-
prepare: pkgSnapshot.prepare === true,
|
|
142
|
-
requiresBuild: pkgSnapshot.requiresBuild === true,
|
|
143
140
|
patchFile: opts.patchedDependencies?.[`${pkgName}@${pkgVersion}`],
|
|
144
141
|
};
|
|
145
142
|
pkgSnapshotByLocation[dir] = pkgSnapshot;
|
|
@@ -181,7 +178,7 @@ exports.lockfileToDepGraph = lockfileToDepGraph;
|
|
|
181
178
|
function getChildrenPaths(ctx, allDeps, peerDeps, importerId) {
|
|
182
179
|
const children = {};
|
|
183
180
|
for (const [alias, ref] of Object.entries(allDeps)) {
|
|
184
|
-
const childDepPath = dp.
|
|
181
|
+
const childDepPath = dp.refToRelative(ref, alias);
|
|
185
182
|
if (childDepPath === null) {
|
|
186
183
|
children[alias] = path_1.default.resolve(ctx.lockfileDir, importerId, ref.slice(5));
|
|
187
184
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lockfileToDepGraph.js","sourceRoot":"","sources":["../src/lockfileToDepGraph.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAuB;AACvB,+CAAiD;AACjD,qDAE2B;AAK3B,
|
|
1
|
+
{"version":3,"file":"lockfileToDepGraph.js","sourceRoot":"","sources":["../src/lockfileToDepGraph.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/deps.graph-builder",
|
|
3
3
|
"description": "A package for building a dependency graph from a lockfile",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "1.0.1",
|
|
5
5
|
"bugs": {
|
|
6
6
|
"url": "https://github.com/pnpm/pnpm/issues"
|
|
7
7
|
},
|
|
@@ -19,31 +19,31 @@
|
|
|
19
19
|
"@pnpm/logger": "^5.0.0"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
|
-
"@types/ramda": "0.
|
|
23
|
-
"@pnpm/deps.graph-builder": "0.
|
|
22
|
+
"@types/ramda": "0.29.12",
|
|
23
|
+
"@pnpm/deps.graph-builder": "1.0.1"
|
|
24
24
|
},
|
|
25
25
|
"homepage": "https://github.com/pnpm/pnpm/blob/main/deps/graph-builder#readme",
|
|
26
26
|
"keywords": [
|
|
27
|
-
"
|
|
27
|
+
"pnpm9",
|
|
28
28
|
"pnpm"
|
|
29
29
|
],
|
|
30
30
|
"license": "MIT",
|
|
31
31
|
"engines": {
|
|
32
|
-
"node": ">=
|
|
32
|
+
"node": ">=18.12"
|
|
33
33
|
},
|
|
34
34
|
"repository": "https://github.com/pnpm/pnpm/blob/main/deps/graph-builder",
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"path-exists": "^4.0.0",
|
|
37
37
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
38
|
-
"@pnpm/
|
|
39
|
-
"@pnpm/
|
|
40
|
-
"@pnpm/
|
|
41
|
-
"@pnpm/
|
|
42
|
-
"@pnpm/
|
|
43
|
-
"@pnpm/
|
|
44
|
-
"@pnpm/
|
|
45
|
-
"@pnpm/store-controller-types": "
|
|
46
|
-
"@pnpm/types": "
|
|
38
|
+
"@pnpm/core-loggers": "10.0.0",
|
|
39
|
+
"@pnpm/constants": "8.0.0",
|
|
40
|
+
"@pnpm/lockfile-file": "9.0.0",
|
|
41
|
+
"@pnpm/dependency-path": "3.0.0",
|
|
42
|
+
"@pnpm/lockfile-utils": "10.0.0",
|
|
43
|
+
"@pnpm/modules-yaml": "13.0.0",
|
|
44
|
+
"@pnpm/package-is-installable": "9.0.0",
|
|
45
|
+
"@pnpm/store-controller-types": "18.0.0",
|
|
46
|
+
"@pnpm/types": "10.0.0"
|
|
47
47
|
},
|
|
48
48
|
"scripts": {
|
|
49
49
|
"lint": "eslint \"src/**/*.ts\"",
|