@pnpm/deps.graph-builder 1002.2.1 → 1002.2.3

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.
@@ -10,6 +10,7 @@ export interface DependenciesGraphNode {
10
10
  modules: string;
11
11
  name: string;
12
12
  fetching?: () => Promise<PkgRequestFetchResult>;
13
+ forceImportPackage?: boolean;
13
14
  dir: string;
14
15
  children: Record<string, string>;
15
16
  optionalDependencies: Set<string>;
@@ -65,4 +66,13 @@ export interface LockfileToDepGraphResult {
65
66
  prevGraph?: DependenciesGraph;
66
67
  pkgLocationsByDepPath?: Record<string, string[]>;
67
68
  }
69
+ /**
70
+ * Generate a dependency graph from lockfiles.
71
+ *
72
+ * If a current lockfile is provided, this function only includes new or changed
73
+ * packages in the graph. In other words, the graph returned will be a set
74
+ * subtraction of the packages in the wanted lockfile minus the current
75
+ * lockfile. This behavior can be configured with the `includeUnchangedDeps`
76
+ * option.
77
+ */
68
78
  export declare function lockfileToDepGraph(lockfile: LockfileObject, currentLockfile: LockfileObject | null, opts: LockfileToDepGraphOptions): Promise<LockfileToDepGraphResult>;
@@ -40,6 +40,15 @@ const equals_1 = __importDefault(require("ramda/src/equals"));
40
40
  const isEmpty_1 = __importDefault(require("ramda/src/isEmpty"));
41
41
  const iteratePkgsForVirtualStore_1 = require("./iteratePkgsForVirtualStore");
42
42
  const brokenModulesLogger = (0, logger_1.logger)('_broken_node_modules');
43
+ /**
44
+ * Generate a dependency graph from lockfiles.
45
+ *
46
+ * If a current lockfile is provided, this function only includes new or changed
47
+ * packages in the graph. In other words, the graph returned will be a set
48
+ * subtraction of the packages in the wanted lockfile minus the current
49
+ * lockfile. This behavior can be configured with the `includeUnchangedDeps`
50
+ * option.
51
+ */
43
52
  async function lockfileToDepGraph(lockfile, currentLockfile, opts) {
44
53
  const { graph, locationByDepPath, } = await buildGraphFromPackages(lockfile, currentLockfile, opts);
45
54
  const _getChildrenPaths = getChildrenPaths.bind(null, {
@@ -110,11 +119,13 @@ async function buildGraphFromPackages(lockfile, currentLockfile, opts) {
110
119
  const depIsPresent = !('directory' in pkgSnapshot.resolution && pkgSnapshot.resolution.directory != null) &&
111
120
  currentPackages[depPath] &&
112
121
  (0, equals_1.default)(currentPackages[depPath].dependencies, pkgSnapshot.dependencies);
122
+ const depIntegrityIsUnchanged = isIntegrityEqual(pkgSnapshot.resolution, currentPackages[depPath]?.resolution);
113
123
  const modules = path_1.default.join(opts.virtualStoreDir, dirNameInVirtualStore, 'node_modules');
114
124
  const dir = path_1.default.join(modules, pkgName);
115
125
  locationByDepPath[depPath] = dir;
116
126
  let dirExists;
117
127
  if (depIsPresent &&
128
+ depIntegrityIsUnchanged &&
118
129
  (0, isEmpty_1.default)(currentPackages[depPath].optionalDependencies ?? {}) &&
119
130
  (0, isEmpty_1.default)(pkgSnapshot.optionalDependencies ?? {}) &&
120
131
  !opts.includeUnchangedDeps) {
@@ -124,7 +135,7 @@ async function buildGraphFromPackages(lockfile, currentLockfile, opts) {
124
135
  brokenModulesLogger.debug({ missing: dir });
125
136
  }
126
137
  let fetchResponse;
127
- if (depIsPresent && (0, equals_1.default)(currentPackages[depPath].optionalDependencies, pkgSnapshot.optionalDependencies)) {
138
+ if (depIsPresent && depIntegrityIsUnchanged && (0, equals_1.default)(currentPackages[depPath].optionalDependencies, pkgSnapshot.optionalDependencies)) {
128
139
  if (dirExists ?? await (0, path_exists_1.default)(dir)) {
129
140
  fetchResponse = {};
130
141
  }
@@ -140,8 +151,8 @@ async function buildGraphFromPackages(lockfile, currentLockfile, opts) {
140
151
  force: false,
141
152
  lockfileDir: opts.lockfileDir,
142
153
  ignoreScripts: opts.ignoreScripts,
143
- pkg: { id: packageId, resolution },
144
- expectedPkg: { name: pkgName, version: pkgVersion },
154
+ pkg: { name: pkgName, version: pkgVersion, id: packageId, resolution },
155
+ supportedArchitectures: opts.supportedArchitectures,
145
156
  });
146
157
  }
147
158
  catch (err) {
@@ -158,6 +169,7 @@ async function buildGraphFromPackages(lockfile, currentLockfile, opts) {
158
169
  dir,
159
170
  fetching: fetchResponse.fetching,
160
171
  filesIndexFile: fetchResponse.filesIndexFile,
172
+ forceImportPackage: !depIntegrityIsUnchanged,
161
173
  hasBin: pkgSnapshot.hasBin === true,
162
174
  hasBundledDependencies: pkgSnapshot.bundledDependencies != null,
163
175
  modules,
@@ -195,4 +207,12 @@ function getChildrenPaths(ctx, allDeps, peerDeps, importerId) {
195
207
  }
196
208
  return children;
197
209
  }
210
+ function isIntegrityEqual(resolutionA, resolutionB) {
211
+ // The LockfileResolution type is a union, but it doesn't have a "tag"
212
+ // field to perform a discriminant match on. Using a type assertion is
213
+ // required to get the integrity field.
214
+ const integrityA = resolutionA?.integrity;
215
+ const integrityB = resolutionB?.integrity;
216
+ return integrityA === integrityB;
217
+ }
198
218
  //# sourceMappingURL=lockfileToDepGraph.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"lockfileToDepGraph.js","sourceRoot":"","sources":["../src/lockfileToDepGraph.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lockfileToDepGraph.js","sourceRoot":"","sources":["../src/lockfileToDepGraph.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pnpm/deps.graph-builder",
3
- "version": "1002.2.1",
3
+ "version": "1002.2.3",
4
4
  "description": "A package for building a dependency graph from a lockfile",
5
5
  "keywords": [
6
6
  "pnpm",
@@ -13,6 +13,7 @@
13
13
  "bugs": {
14
14
  "url": "https://github.com/pnpm/pnpm/issues"
15
15
  },
16
+ "type": "commonjs",
16
17
  "main": "lib/index.js",
17
18
  "types": "lib/index.d.ts",
18
19
  "exports": {
@@ -25,25 +26,25 @@
25
26
  "dependencies": {
26
27
  "path-exists": "^4.0.0",
27
28
  "ramda": "npm:@pnpm/ramda@0.28.1",
28
- "@pnpm/calc-dep-state": "1002.0.2",
29
- "@pnpm/constants": "1001.1.0",
30
- "@pnpm/core-loggers": "1001.0.1",
31
- "@pnpm/dependency-path": "1001.0.1",
32
- "@pnpm/lockfile.fs": "1001.1.15",
33
- "@pnpm/lockfile.utils": "1002.0.1",
34
- "@pnpm/modules-yaml": "1000.3.3",
35
- "@pnpm/package-is-installable": "1000.0.10",
36
- "@pnpm/patching.config": "1001.0.5",
37
- "@pnpm/store-controller-types": "1003.0.3",
38
- "@pnpm/types": "1000.6.0",
39
- "@pnpm/patching.types": "1000.1.0"
29
+ "@pnpm/calc-dep-state": "1002.0.4",
30
+ "@pnpm/constants": "1001.3.0",
31
+ "@pnpm/dependency-path": "1001.1.0",
32
+ "@pnpm/core-loggers": "1001.0.2",
33
+ "@pnpm/lockfile.fs": "1001.1.17",
34
+ "@pnpm/lockfile.utils": "1003.0.0",
35
+ "@pnpm/package-is-installable": "1000.0.12",
36
+ "@pnpm/patching.config": "1001.0.7",
37
+ "@pnpm/patching.types": "1000.1.0",
38
+ "@pnpm/modules-yaml": "1000.3.4",
39
+ "@pnpm/store-controller-types": "1004.0.1",
40
+ "@pnpm/types": "1000.7.0"
40
41
  },
41
42
  "peerDependencies": {
42
43
  "@pnpm/logger": ">=1001.0.0 <1002.0.0"
43
44
  },
44
45
  "devDependencies": {
45
46
  "@types/ramda": "0.29.12",
46
- "@pnpm/deps.graph-builder": "1002.2.1",
47
+ "@pnpm/deps.graph-builder": "1002.2.3",
47
48
  "@pnpm/logger": "1001.0.0"
48
49
  },
49
50
  "engines": {