nx 22.1.0-beta.6 → 22.1.0-beta.8

package/src/plugins/js/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/plugins/js/index.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,kBAAkB,EAIlB,aAAa,EACd,MAAM,6BAA6B,CAAC;AAkBrC,eAAO,MAAM,IAAI,oCAAoC,CAAC;AAKtD,eAAO,MAAM,aAAa,EAAE,aAK3B,CAAC;AAkDF,eAAO,MAAM,kBAAkB,EAAE,kBAgDhC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/plugins/js/index.ts"],"names":[],"mappings":"AASA,OAAO,EACL,kBAAkB,EAIlB,aAAa,EACd,MAAM,6BAA6B,CAAC;AAkBrC,eAAO,MAAM,IAAI,oCAAoC,CAAC;AAMtD,eAAO,MAAM,aAAa,EAAE,aAK3B,CAAC;AAoDF,eAAO,MAAM,kBAAkB,EAAE,kBAiDhC,CAAC"}

package/src/plugins/js/index.js

@@ -18,6 +18,7 @@ const config_1 = require("./utils/config");
 exports.name = 'nx/js/dependencies-and-lockfile';
 // Separate in-memory caches
 let cachedExternalNodes;
+let cachedKeyMap;
 exports.createNodesV2 = [
     (0, globs_1.combineGlobPatterns)(lock_file_1.LOCKFILES),
     (files, _, context) => {
@@ -40,15 +41,17 @@ function internalCreateNodes(lockFile, _, context) {
         : (0, bun_parser_1.readBunLockFile)(lockFilePath);
     const lockFileHash = getLockFileHash(lockFileContents);
     if (!lockFileNeedsReprocessing(lockFileHash, externalNodesHashFile)) {
-        const nodes = readCachedExternalNodes();
+        const { nodes, keyMap } = readCachedExternalNodes();
         cachedExternalNodes = nodes;
+        cachedKeyMap = keyMap;
         return {
             externalNodes: nodes,
         };
     }
-    const externalNodes = (0, lock_file_1.getLockFileNodes)(packageManager, lockFileContents, lockFileHash, context);
+    const { nodes: externalNodes, keyMap } = (0, lock_file_1.getLockFileNodes)(packageManager, lockFileContents, lockFileHash, context);
     cachedExternalNodes = externalNodes;
-    writeExternalNodesCache(lockFileHash, externalNodes);
+    cachedKeyMap = keyMap;
+    writeExternalNodesCache(lockFileHash, externalNodes, keyMap);
     return {
         externalNodes,
     };
@@ -70,7 +73,7 @@ const createDependencies = (_, ctx) => {
             lockfileDependencies = readCachedDependencies();
         }
         else {
-            lockfileDependencies = (0, lock_file_1.getLockFileDependencies)(packageManager, lockFileContents, lockFileHash, ctx);
+            lockfileDependencies = (0, lock_file_1.getLockFileDependencies)(packageManager, lockFileContents, lockFileHash, ctx, cachedKeyMap);
             writeDependenciesCache(lockFileHash, lockfileDependencies);
         }
     }
@@ -84,6 +87,48 @@ exports.createDependencies = createDependencies;
 function getLockFileHash(lockFileContents) {
     return (0, file_hasher_1.hashArray)([versions_1.nxVersion, lockFileContents]);
 }
+// Serialize keyMap to JSON-friendly format
+function serializeKeyMap(keyMap) {
+    const serialized = {};
+    for (const [key, value] of keyMap.entries()) {
+        if (value instanceof Set) {
+            // pnpm: Map<string, Set<ProjectGraphExternalNode>>
+            serialized[key] = Array.from(value).map((node) => node.name);
+        }
+        else if (value && typeof value === 'object' && 'name' in value) {
+            // npm/yarn: Map<string, ProjectGraphExternalNode>
+            serialized[key] = value.name;
+        }
+        else {
+            serialized[key] = value;
+        }
+    }
+    return serialized;
+}
+// Deserialize keyMap from JSON format using ctx.externalNodes
+function deserializeKeyMap(serialized, externalNodes) {
+    const keyMap = new Map();
+    for (const [key, value] of Object.entries(serialized)) {
+        if (Array.isArray(value)) {
+            // pnpm: reconstruct Set<ProjectGraphExternalNode>
+            const nodes = value
+                .map((nodeName) => externalNodes[nodeName])
+                .filter(Boolean);
+            keyMap.set(key, new Set(nodes));
+        }
+        else if (typeof value === 'string') {
+            // npm/yarn: reconstruct ProjectGraphExternalNode
+            const node = externalNodes[value];
+            if (node) {
+                keyMap.set(key, node);
+            }
+        }
+        else {
+            keyMap.set(key, value);
+        }
+    }
+    return keyMap;
+}
 function lockFileNeedsReprocessing(lockHash, hashFilePath) {
     try {
         return (0, fs_1.readFileSync)(hashFilePath).toString() !== lockHash;
@@ -93,13 +138,16 @@ function lockFileNeedsReprocessing(lockHash, hashFilePath) {
     }
 }
 // External nodes cache functions
-function writeExternalNodesCache(hash, nodes) {
+function writeExternalNodesCache(hash, nodes, keyMap) {
     (0, fs_1.mkdirSync)((0, path_1.dirname)(externalNodesHashFile), { recursive: true });
-    (0, fs_1.writeFileSync)(externalNodesCache, JSON.stringify(nodes, null, 2));
+    const serializedKeyMap = serializeKeyMap(keyMap);
+    const cacheData = { nodes, keyMap: serializedKeyMap };
+    (0, fs_1.writeFileSync)(externalNodesCache, JSON.stringify(cacheData, null, 2));
     (0, fs_1.writeFileSync)(externalNodesHashFile, hash);
 }
 function readCachedExternalNodes() {
-    return JSON.parse((0, fs_1.readFileSync)(externalNodesCache).toString());
+    const { nodes, keyMap } = JSON.parse((0, fs_1.readFileSync)(externalNodesCache, 'utf-8'));
+    return { nodes, keyMap: deserializeKeyMap(keyMap, nodes) };
 }
 // Dependencies cache functions
 function writeDependenciesCache(hash, dependencies) {

package/src/plugins/js/lock-file/lock-file.d.ts

@@ -11,11 +11,14 @@ export declare const LOCKFILES: string[];
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
  */
-export declare function getLockFileNodes(packageManager: PackageManager, contents: string, lockFileHash: string, context: CreateNodesContextV2): Record<string, ProjectGraphExternalNode>;
+export declare function getLockFileNodes(packageManager: PackageManager, contents: string, lockFileHash: string, context: CreateNodesContextV2): {
+    nodes: Record<string, ProjectGraphExternalNode>;
+    keyMap: Map<string, any>;
+};
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
  */
-export declare function getLockFileDependencies(packageManager: PackageManager, contents: string, lockFileHash: string, context: CreateDependenciesContext): RawProjectGraphDependency[];
+export declare function getLockFileDependencies(packageManager: PackageManager, contents: string, lockFileHash: string, context: CreateDependenciesContext, keyMap: Map<string, any>): RawProjectGraphDependency[];
 export declare function lockFileExists(packageManager: PackageManager): boolean;
 /**
  * Returns lock file name based on the detected package manager in the root

package/src/plugins/js/lock-file/lock-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lock-file.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/lock-file.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EACL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AAGzF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,cAAc,EACf,MAAM,gCAAgC,CAAC;AA8BxC,eAAO,MAAM,SAAS,UAMrB,CAAC;AAQF;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,oBAAoB,GAC5B,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAqC1C;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,yBAAyB,GACjC,yBAAyB,EAAE,CA8B7B;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAgBtE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAiBtE;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAgCtE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,YAAY,EACnB,cAAc,GAAE,cAAoD,GACnE,MAAM,CAmDR"}
+{"version":3,"file":"lock-file.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/lock-file.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EACL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EACrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AAGzF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAEL,cAAc,EACf,MAAM,gCAAgC,CAAC;AA8BxC,eAAO,MAAM,SAAS,UAMrB,CAAC;AAQF;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,oBAAoB,GAC5B;IACD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAChD,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC1B,CAsCA;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,yBAAyB,EAClC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GACvB,yBAAyB,EAAE,CAmD7B;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAgBtE;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAiBtE;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,cAAc,GAAG,MAAM,CAgCtE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,YAAY,EACnB,cAAc,GAAE,cAAoD,GACnE,MAAM,CAmDR"}

package/src/plugins/js/lock-file/lock-file.js

@@ -59,7 +59,8 @@ function getLockFileNodes(packageManager, contents, lockFileHash, context) {
             const lockFilePath = getLockFilePath(packageManager);
             if (lockFilePath.endsWith(bun_parser_1.BUN_TEXT_LOCK_FILE)) {
                 // Use new text-based parser
-                return (0, bun_parser_1.getBunTextLockfileNodes)(contents, lockFileHash);
+                const nodes = (0, bun_parser_1.getBunTextLockfileNodes)(contents, lockFileHash);
+                return { nodes, keyMap: new Map() };
             }
             else {
                 // Fallback to yarn parser for binary format
@@ -82,25 +83,26 @@ function getLockFileNodes(packageManager, contents, lockFileHash, context) {
 /**
  * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
  */
-function getLockFileDependencies(packageManager, contents, lockFileHash, context) {
+function getLockFileDependencies(packageManager, contents, lockFileHash, context, keyMap) {
     try {
         if (packageManager === 'yarn') {
-            return (0, yarn_parser_1.getYarnLockfileDependencies)(contents, lockFileHash, context);
+            return (0, yarn_parser_1.getYarnLockfileDependencies)(contents, lockFileHash, context, keyMap);
         }
         if (packageManager === 'pnpm') {
-            return (0, pnpm_parser_1.getPnpmLockfileDependencies)(contents, lockFileHash, context);
+            return (0, pnpm_parser_1.getPnpmLockfileDependencies)(contents, lockFileHash, context, keyMap);
         }
         if (packageManager === 'npm') {
-            return (0, npm_parser_1.getNpmLockfileDependencies)(contents, lockFileHash, context);
+            return (0, npm_parser_1.getNpmLockfileDependencies)(contents, lockFileHash, context, keyMap);
         }
         if (packageManager === 'bun') {
             const lockFilePath = getLockFilePath(packageManager);
             if (lockFilePath.endsWith(bun_parser_1.BUN_TEXT_LOCK_FILE)) {
+                // Bun parser doesn't use keyMap
                 return (0, bun_parser_1.getBunTextLockfileDependencies)(contents, lockFileHash, context);
             }
             else {
                 // Fallback to yarn parser for binary format
-                return (0, yarn_parser_1.getYarnLockfileDependencies)(contents, lockFileHash, context);
+                return (0, yarn_parser_1.getYarnLockfileDependencies)(contents, lockFileHash, context, keyMap);
             }
         }
     }

package/src/plugins/js/lock-file/npm-parser.d.ts

@@ -2,7 +2,10 @@ import { NormalizedPackageJson } from './utils/package-json';
 import { RawProjectGraphDependency } from '../../../project-graph/project-graph-builder';
 import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-graph';
 import { CreateDependenciesContext } from '../../../project-graph/plugins';
-export declare function getNpmLockfileNodes(lockFileContent: string, lockFileHash: string): Record<string, ProjectGraphExternalNode>;
-export declare function getNpmLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
+export declare function getNpmLockfileNodes(lockFileContent: string, lockFileHash: string): {
+    nodes: Record<string, ProjectGraphExternalNode>;
+    keyMap: Map<string, ProjectGraphExternalNode>;
+};
+export declare function getNpmLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext, keyMap: Map<string, ProjectGraphExternalNode>): RawProjectGraphDependency[];
 export declare function stringifyNpmLockfile(graph: ProjectGraph, rootLockFileContent: string, packageJson: NormalizedPackageJson): string;
 //# sourceMappingURL=npm-parser.d.ts.map

package/src/plugins/js/lock-file/npm-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"npm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/npm-parser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EAEzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA6D3E,wBAAgB,mBAAmB,CACjC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,4CASrB;AAED,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAQ/B;AAuSD,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,GACjC,MAAM,CA8BR"}
+{"version":3,"file":"npm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/npm-parser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EAEzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAyD3E,wBAAgB,mBAAmB,CACjC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB;IACD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAChD,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;CAC/C,CAOA;AAED,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,EAC9B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,+BAQ9C;AAwSD,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,GACjC,MAAM,CA8BR"}

package/src/plugins/js/lock-file/npm-parser.js

@@ -11,15 +11,12 @@ const project_graph_builder_1 = require("../../../project-graph/project-graph-bu
 const project_graph_1 = require("../../../config/project-graph");
 const file_hasher_1 = require("../../../hasher/file-hasher");
 const get_workspace_packages_from_graph_1 = require("../utils/get-workspace-packages-from-graph");
-// we use key => node map to avoid duplicate work when parsing keys
-let keyMap = new Map();
 let currentLockFileHash;
 let parsedLockFile;
 function parsePackageLockFile(lockFileContent, lockFileHash) {
     if (lockFileHash === currentLockFileHash) {
         return parsedLockFile;
     }
-    keyMap.clear();
     const results = JSON.parse(lockFileContent);
     parsedLockFile = results;
     currentLockFileHash = lockFileHash;
@@ -27,14 +24,14 @@ function parsePackageLockFile(lockFileContent, lockFileHash) {
 }
 function getNpmLockfileNodes(lockFileContent, lockFileHash) {
     const data = parsePackageLockFile(lockFileContent, lockFileHash);
-    // we use key => node map to avoid duplicate work when parsing keys
-    return getNodes(data, keyMap);
+    return getNodes(data);
 }
-function getNpmLockfileDependencies(lockFileContent, lockFileHash, ctx) {
+function getNpmLockfileDependencies(lockFileContent, lockFileHash, ctx, keyMap) {
     const data = parsePackageLockFile(lockFileContent, lockFileHash);
     return getDependencies(data, keyMap, ctx);
 }
-function getNodes(data, keyMap) {
+function getNodes(data) {
+    const keyMap = new Map();
     const nodes = new Map();
     if (data.lockfileVersion > 1) {
         Object.entries(data.packages).forEach(([path, snapshot]) => {
@@ -77,7 +74,7 @@ function getNodes(data, keyMap) {
             results[node.name] = node;
         });
     }
-    return results;
+    return { nodes: results, keyMap };
 }
 function addV1Node(packageName, snapshot, path, nodes, keyMap) {
     createNode(packageName, snapshot.version, path, nodes, keyMap, snapshot);

package/src/plugins/js/lock-file/pnpm-parser.d.ts

@@ -2,7 +2,10 @@ import { NormalizedPackageJson } from './utils/package-json';
 import { RawProjectGraphDependency } from '../../../project-graph/project-graph-builder';
 import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-graph';
 import { CreateDependenciesContext } from '../../../project-graph/plugins';
-export declare function getPnpmLockfileNodes(lockFileContent: string, lockFileHash: string): Record<string, ProjectGraphExternalNode>;
-export declare function getPnpmLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
+export declare function getPnpmLockfileNodes(lockFileContent: string, lockFileHash: string): {
+    nodes: Record<string, ProjectGraphExternalNode>;
+    keyMap: Map<string, Set<ProjectGraphExternalNode>>;
+};
+export declare function getPnpmLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext, keyMap: Map<string, Set<ProjectGraphExternalNode>>): RawProjectGraphDependency[];
 export declare function stringifyPnpmLockfile(graph: ProjectGraph, rootLockFileContent: string, packageJson: NormalizedPackageJson, workspaceRoot: string): string;
 //# sourceMappingURL=pnpm-parser.d.ts.map

package/src/plugins/js/lock-file/pnpm-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA2B3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAS1C;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAU/B;AAkUD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,MAAM,CAuCR"}
+{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAuB3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB;IACD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAChD,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC;CACpD,CASA;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,EAC9B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC,+BAUnD;AAqUD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,MAAM,CAuCR"}

package/src/plugins/js/lock-file/pnpm-parser.js

@@ -13,15 +13,12 @@ const catalog_1 = require("../../../utils/catalog");
 const project_graph_pruning_1 = require("./project-graph-pruning");
 const path_1 = require("path");
 const get_workspace_packages_from_graph_1 = require("../utils/get-workspace-packages-from-graph");
-// we use key => node map to avoid duplicate work when parsing keys
-let keyMap = new Map();
 let currentLockFileHash;
 let parsedLockFile;
 function parsePnpmLockFile(lockFileContent, lockFileHash) {
     if (lockFileHash === currentLockFileHash) {
         return parsedLockFile;
     }
-    keyMap.clear();
     const results = (0, pnpm_normalizer_1.parseAndNormalizePnpmLockfile)(lockFileContent);
     parsedLockFile = results;
     currentLockFileHash = lockFileHash;
@@ -33,9 +30,9 @@ function getPnpmLockfileNodes(lockFileContent, lockFileHash) {
         console.warn('Nx was tested only with pnpm lockfile version 5-9. If you encounter any issues, please report them and downgrade to older version of pnpm.');
     }
     const isV5 = (0, pnpm_normalizer_1.isV5Syntax)(data);
-    return getNodes(data, keyMap, isV5);
+    return getNodes(data, isV5);
 }
-function getPnpmLockfileDependencies(lockFileContent, lockFileHash, ctx) {
+function getPnpmLockfileDependencies(lockFileContent, lockFileHash, ctx, keyMap) {
     const data = parsePnpmLockFile(lockFileContent, lockFileHash);
     if (+data.lockfileVersion.toString() >= 10) {
         console.warn('Nx was tested only with pnpm lockfile version 5-9. If you encounter any issues, please report them and downgrade to older version of pnpm.');
@@ -71,7 +68,8 @@ function createHashFromSnapshot(snapshot) {
 function isAliasVersion(depVersion) {
     return depVersion.startsWith('/') || depVersion.includes('@');
 }
-function getNodes(data, keyMap, isV5) {
+function getNodes(data, isV5) {
+    const keyMap = new Map();
     const nodes = new Map();
     const maybeAliasedPackageVersions = new Map(); // <version, alias>
     if (data.importers['.'].optionalDependencies) {
@@ -232,7 +230,7 @@ function getNodes(data, keyMap, isV5) {
             results[node.name] = node;
         });
     }
-    return results;
+    return { nodes: results, keyMap };
 }
 function getHoistedVersion(hoistedDependencies, packageName, isV5) {
     let version = (0, package_json_1.getHoistedPackageVersion)(packageName);

package/src/plugins/js/lock-file/yarn-parser.d.ts

@@ -2,7 +2,10 @@ import { NormalizedPackageJson } from './utils/package-json';
 import { RawProjectGraphDependency } from '../../../project-graph/project-graph-builder';
 import { ProjectGraph, ProjectGraphExternalNode } from '../../../config/project-graph';
 import { CreateDependenciesContext } from '../../../project-graph/plugins';
-export declare function getYarnLockfileNodes(lockFileContent: string, lockFileHash: string, packageJson: NormalizedPackageJson): Record<string, ProjectGraphExternalNode>;
-export declare function getYarnLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext): RawProjectGraphDependency[];
+export declare function getYarnLockfileNodes(lockFileContent: string, lockFileHash: string, packageJson: NormalizedPackageJson): {
+    nodes: Record<string, ProjectGraphExternalNode>;
+    keyMap: Map<string, ProjectGraphExternalNode>;
+};
+export declare function getYarnLockfileDependencies(lockFileContent: string, lockFileHash: string, ctx: CreateDependenciesContext, keyMap: Map<string, ProjectGraphExternalNode>): RawProjectGraphDependency[];
 export declare function stringifyYarnLockfile(graph: ProjectGraph, rootLockFileContent: string, packageJson: NormalizedPackageJson): string;
 //# sourceMappingURL=yarn-parser.d.ts.map

package/src/plugins/js/lock-file/yarn-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"yarn-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/yarn-parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AAEtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EAEzB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA8C3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,qBAAqB,4CAanC;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAa/B;AAiQD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,GACjC,MAAM,CA8BR"}
+{"version":3,"file":"yarn-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/yarn-parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AAEtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EAEzB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA0C3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,qBAAqB,GACjC;IACD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAChD,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;CAC/C,CAYA;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,EAC9B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,+BAa9C;AAsQD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,GACjC,MAAM,CA8BR"}

package/src/plugins/js/lock-file/yarn-parser.js

@@ -12,14 +12,11 @@ const object_sort_1 = require("../../../utils/object-sort");
 const get_workspace_packages_from_graph_1 = require("../utils/get-workspace-packages-from-graph");
 let currentLockFileHash;
 let cachedParsedLockFile;
-// we use key => node map to avoid duplicate work when parsing keys
-let keyMap = new Map();
 function parseLockFile(lockFileContent, lockFileHash) {
     if (currentLockFileHash === lockFileHash) {
         return cachedParsedLockFile;
     }
     const { parseSyml } = require('@yarnpkg/parsers');
-    keyMap.clear();
     const result = parseSyml(lockFileContent);
     cachedParsedLockFile = result;
     currentLockFileHash = lockFileHash;
@@ -32,12 +29,12 @@ function getYarnLockfileNodes(lockFileContent, lockFileHash, packageJson) {
     const groupedDependencies = groupDependencies(dependencies, isBerry);
     return getNodes(groupedDependencies, packageJson, isBerry);
 }
-function getYarnLockfileDependencies(lockFileContent, lockFileHash, ctx) {
+function getYarnLockfileDependencies(lockFileContent, lockFileHash, ctx, keyMap) {
     const { __metadata, ...dependencies } = parseLockFile(lockFileContent, lockFileHash);
     const isBerry = !!__metadata;
     // yarn classic splits keys when parsing so we need to stich them back together
     const groupedDependencies = groupDependencies(dependencies, isBerry);
-    return getDependencies(groupedDependencies, ctx);
+    return getDependencies(groupedDependencies, ctx, keyMap);
 }
 function getPackageNameKeyPairs(keys) {
     const result = new Map();
@@ -53,6 +50,7 @@ function getPackageNameKeyPairs(keys) {
     return result;
 }
 function getNodes(dependencies, packageJson, isBerry) {
+    const keyMap = new Map();
     const nodes = new Map();
     const combinedDeps = {
         ...packageJson.dependencies,
@@ -115,7 +113,7 @@ function getNodes(dependencies, packageJson, isBerry) {
             externalNodes[node.name] = node;
         });
     }
-    return externalNodes;
+    return { nodes: externalNodes, keyMap };
 }
 function findHoistedNode(packageName, versionMap, combinedDeps) {
     const hoistedVersion = getHoistedVersion(packageName);
@@ -194,7 +192,7 @@ function getHoistedVersion(packageName) {
         return version;
     }
 }
-function getDependencies(dependencies, ctx) {
+function getDependencies(dependencies, ctx, keyMap) {
     const projectGraphDependencies = [];
     Object.keys(dependencies).forEach((keys) => {
         const snapshot = dependencies[keys];