nx 22.1.0-canary.20251110-73ecb30 → 22.1.0-canary.20251111-647d751

package/src/executors/noop/schema.json

@@ -1,10 +1,10 @@
 {
-  "version": 2,
-  "title": "Noop",
-  "description": "An executor that does nothing.",
-  "type": "object",
-  "cli": "nx",
-  "outputCapture": "pipe",
-  "properties": {},
-  "additionalProperties": true
+    "version": 2,
+    "title": "Noop",
+    "description": "An executor that does nothing.",
+    "type": "object",
+    "cli": "nx",
+    "outputCapture": "pipe",
+    "properties": {},
+    "additionalProperties": true
 }

package/src/executors/run-commands/schema.json

@@ -1,198 +1,198 @@
 {
-  "version": 2,
-  "title": "Run Commands",
-  "description": "Run any custom commands with Nx.",
-  "type": "object",
-  "cli": "nx",
-  "outputCapture": "pipe",
-  "presets": [
-    {
-      "name": "Arguments forwarding",
-      "keys": ["commands"]
-    },
-    {
-      "name": "Custom done conditions",
-      "keys": ["commands", "readyWhen"]
-    },
-    {
-      "name": "Setting the cwd",
-      "keys": ["commands", "cwd"]
-    }
-  ],
-  "properties": {
-    "commands": {
-      "type": "array",
-      "description": "Commands to run in child process.",
-      "items": {
-        "oneOf": [
-          {
-            "type": "object",
-            "properties": {
-              "command": {
-                "type": "string",
-                "description": "Command to run in child process."
-              },
-              "forwardAllArgs": {
-                "type": "boolean",
-                "description": "Whether arguments should be forwarded when interpolation is not present."
-              },
-              "prefix": {
-                "type": "string",
-                "description": "Prefix in front of every line out of the output"
-              },
-              "prefixColor": {
-                "type": "string",
-                "description": "Color of the prefix",
-                "enum": [
-                  "black",
-                  "red",
-                  "green",
-                  "yellow",
-                  "blue",
-                  "magenta",
-                  "cyan",
-                  "white"
-                ]
-              },
-              "color": {
-                "type": "string",
-                "description": "Color of the output",
-                "enum": [
-                  "black",
-                  "red",
-                  "green",
-                  "yellow",
-                  "blue",
-                  "magenta",
-                  "cyan",
-                  "white"
-                ]
-              },
-              "bgColor": {
-                "type": "string",
-                "description": "Background color of the output",
-                "enum": [
-                  "bgBlack",
-                  "bgRed",
-                  "bgGreen",
-                  "bgYellow",
-                  "bgBlue",
-                  "bgMagenta",
-                  "bgCyan",
-                  "bgWhite"
-                ]
-              },
-              "description": {
-                "type": "string",
-                "description": "An optional description useful for inline documentation purposes. It is not used as part of the execution of the command."
-              }
-            },
-            "additionalProperties": false,
-            "required": ["command"]
-          },
-          {
-            "type": "string"
-          }
-        ]
-      },
-      "x-priority": "important"
-    },
-    "command": {
-      "oneOf": [
+    "version": 2,
+    "title": "Run Commands",
+    "description": "Run any custom commands with Nx.",
+    "type": "object",
+    "cli": "nx",
+    "outputCapture": "pipe",
+    "presets": [
+        {
+            "name": "Arguments forwarding",
+            "keys": ["commands"]
+        },
         {
-          "type": "array",
-          "description": "Command to run in child process, but divided into parts.",
-          "items": {
-            "type": "string"
-          },
-          "x-priority": "important"
+            "name": "Custom done conditions",
+            "keys": ["commands", "readyWhen"]
         },
         {
-          "type": "string",
-          "description": "Command to run in child process."
+            "name": "Setting the cwd",
+            "keys": ["commands", "cwd"]
+        }
+    ],
+    "properties": {
+        "commands": {
+            "type": "array",
+            "description": "Commands to run in child process.",
+            "items": {
+                "oneOf": [
+                    {
+                        "type": "object",
+                        "properties": {
+                            "command": {
+                                "type": "string",
+                                "description": "Command to run in child process."
+                            },
+                            "forwardAllArgs": {
+                                "type": "boolean",
+                                "description": "Whether arguments should be forwarded when interpolation is not present."
+                            },
+                            "prefix": {
+                                "type": "string",
+                                "description": "Prefix in front of every line out of the output"
+                            },
+                            "prefixColor": {
+                                "type": "string",
+                                "description": "Color of the prefix",
+                                "enum": [
+                                    "black",
+                                    "red",
+                                    "green",
+                                    "yellow",
+                                    "blue",
+                                    "magenta",
+                                    "cyan",
+                                    "white"
+                                ]
+                            },
+                            "color": {
+                                "type": "string",
+                                "description": "Color of the output",
+                                "enum": [
+                                    "black",
+                                    "red",
+                                    "green",
+                                    "yellow",
+                                    "blue",
+                                    "magenta",
+                                    "cyan",
+                                    "white"
+                                ]
+                            },
+                            "bgColor": {
+                                "type": "string",
+                                "description": "Background color of the output",
+                                "enum": [
+                                    "bgBlack",
+                                    "bgRed",
+                                    "bgGreen",
+                                    "bgYellow",
+                                    "bgBlue",
+                                    "bgMagenta",
+                                    "bgCyan",
+                                    "bgWhite"
+                                ]
+                            },
+                            "description": {
+                                "type": "string",
+                                "description": "An optional description useful for inline documentation purposes. It is not used as part of the execution of the command."
+                            }
+                        },
+                        "additionalProperties": false,
+                        "required": ["command"]
+                    },
+                    {
+                        "type": "string"
+                    }
+                ]
+            },
+            "x-priority": "important"
+        },
+        "command": {
+            "oneOf": [
+                {
+                    "type": "array",
+                    "description": "Command to run in child process, but divided into parts.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "x-priority": "important"
+                },
+                {
+                    "type": "string",
+                    "description": "Command to run in child process."
+                }
+            ],
+            "type": "string",
+            "description": "Command to run in child process.",
+            "x-priority": "important"
+        },
+        "parallel": {
+            "type": "boolean",
+            "description": "Run commands in parallel.",
+            "default": true,
+            "x-priority": "important"
+        },
+        "readyWhen": {
+            "description": "String or array of strings to appear in `stdout` or `stderr` that indicate that the task is done. When running multiple commands, this option can only be used when `parallel` is set to `true`. If not specified, the task is done when all the child processes complete.",
+            "oneOf": [
+                { "type": "string" },
+                { "type": "array", "items": { "type": "string" } }
+            ]
+        },
+        "args": {
+            "oneOf": [
+                {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                {
+                    "type": "string"
+                }
+            ],
+            "description": "Extra arguments. You can pass them as follows: nx run project:target --args='--wait=100'. You can then use {args.wait} syntax to interpolate them in the workspace config file. See example [above](#chaining-commands-interpolating-args-and-setting-the-cwd)"
+        },
+        "envFile": {
+            "type": "string",
+            "description": "You may specify a custom .env file path."
+        },
+        "color": {
+            "type": "boolean",
+            "description": "Use colors when showing output of command.",
+            "default": false
+        },
+        "cwd": {
+            "type": "string",
+            "description": "Current working directory of the commands. If it's not specified the commands will run in the workspace root, if a relative path is specified the commands will run in that path relative to the workspace root and if it's an absolute path the commands will run in that path."
+        },
+        "env": {
+            "type": "object",
+            "description": "Environment variables that will be made available to the commands. This property has priority over the `.env` files.",
+            "additionalProperties": {
+                "type": "string"
+            }
+        },
+        "__unparsed__": {
+            "hidden": true,
+            "type": "array",
+            "items": {
+                "type": "string"
+            },
+            "$default": {
+                "$source": "unparsed"
+            },
+            "x-priority": "internal"
+        },
+        "forwardAllArgs": {
+            "type": "boolean",
+            "description": "Whether arguments should be forwarded when interpolation is not present.",
+            "default": true
+        },
+        "tty": {
+            "type": "boolean",
+            "description": "Whether commands should be run with a tty terminal",
+            "hidden": true
         }
-      ],
-      "type": "string",
-      "description": "Command to run in child process.",
-      "x-priority": "important"
-    },
-    "parallel": {
-      "type": "boolean",
-      "description": "Run commands in parallel.",
-      "default": true,
-      "x-priority": "important"
-    },
-    "readyWhen": {
-      "description": "String or array of strings to appear in `stdout` or `stderr` that indicate that the task is done. When running multiple commands, this option can only be used when `parallel` is set to `true`. If not specified, the task is done when all the child processes complete.",
-      "oneOf": [
-        { "type": "string" },
-        { "type": "array", "items": { "type": "string" } }
-      ]
     },
-    "args": {
-      "oneOf": [
+    "additionalProperties": true,
+    "oneOf": [
         {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
+            "required": ["commands"]
         },
         {
-          "type": "string"
+            "required": ["command"]
         }
-      ],
-      "description": "Extra arguments. You can pass them as follows: nx run project:target --args='--wait=100'. You can then use {args.wait} syntax to interpolate them in the workspace config file. See example [above](#chaining-commands-interpolating-args-and-setting-the-cwd)"
-    },
-    "envFile": {
-      "type": "string",
-      "description": "You may specify a custom .env file path."
-    },
-    "color": {
-      "type": "boolean",
-      "description": "Use colors when showing output of command.",
-      "default": false
-    },
-    "cwd": {
-      "type": "string",
-      "description": "Current working directory of the commands. If it's not specified the commands will run in the workspace root, if a relative path is specified the commands will run in that path relative to the workspace root and if it's an absolute path the commands will run in that path."
-    },
-    "env": {
-      "type": "object",
-      "description": "Environment variables that will be made available to the commands. This property has priority over the `.env` files.",
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "__unparsed__": {
-      "hidden": true,
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "$default": {
-        "$source": "unparsed"
-      },
-      "x-priority": "internal"
-    },
-    "forwardAllArgs": {
-      "type": "boolean",
-      "description": "Whether arguments should be forwarded when interpolation is not present.",
-      "default": true
-    },
-    "tty": {
-      "type": "boolean",
-      "description": "Whether commands should be run with a tty terminal",
-      "hidden": true
-    }
-  },
-  "additionalProperties": true,
-  "oneOf": [
-    {
-      "required": ["commands"]
-    },
-    {
-      "required": ["command"]
-    }
-  ],
-  "examplesFile": "../../../docs/run-commands-examples.md"
+    ],
+    "examplesFile": "../../../docs/run-commands-examples.md"
 }

package/src/executors/run-script/schema.json

@@ -1,28 +1,28 @@
 {
-  "version": 2,
-  "title": "Run Script",
-  "description": "Run any NPM script of a project in the project's root directory.",
-  "type": "object",
-  "cli": "nx",
-  "outputCapture": "pipe",
-  "properties": {
-    "script": {
-      "type": "string",
-      "description": "An npm script name in the `package.json` file of the project (e.g., `build`)."
+    "version": 2,
+    "title": "Run Script",
+    "description": "Run any NPM script of a project in the project's root directory.",
+    "type": "object",
+    "cli": "nx",
+    "outputCapture": "pipe",
+    "properties": {
+        "script": {
+            "type": "string",
+            "description": "An npm script name in the `package.json` file of the project (e.g., `build`)."
+        },
+        "__unparsed__": {
+            "hidden": true,
+            "type": "array",
+            "items": {
+                "type": "string"
+            },
+            "$default": {
+                "$source": "unparsed"
+            },
+            "x-priority": "internal"
+        }
     },
-    "__unparsed__": {
-      "hidden": true,
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "$default": {
-        "$source": "unparsed"
-      },
-      "x-priority": "internal"
-    }
-  },
-  "additionalProperties": true,
-  "required": ["script"],
-  "examplesFile": "../../../docs/run-script-examples.md"
+    "additionalProperties": true,
+    "required": ["script"],
+    "examplesFile": "../../../docs/run-script-examples.md"
 }

package/src/nx-cloud/generators/connect-to-nx-cloud/schema.json

@@ -1,41 +1,41 @@
 {
-  "$schema": "https://json-schema.org/schema",
-  "id": "NxCloudInit",
-  "title": "Add Nx Cloud Configuration to the workspace",
-  "description": "Connect a workspace to Nx Cloud.",
-  "type": "object",
-  "cli": "nx",
-  "properties": {
-    "analytics": {
-      "type": "boolean",
-      "description": "Anonymously store hashed machine ID for task runs",
-      "default": false
+    "$schema": "https://json-schema.org/schema",
+    "id": "NxCloudInit",
+    "title": "Add Nx Cloud Configuration to the workspace",
+    "description": "Connect a workspace to Nx Cloud.",
+    "type": "object",
+    "cli": "nx",
+    "properties": {
+        "analytics": {
+            "type": "boolean",
+            "description": "Anonymously store hashed machine ID for task runs",
+            "default": false
+        },
+        "installationSource": {
+            "type": "string",
+            "description": "Name of Nx Cloud installation invoker (ex. user, add-nx-to-monorepo, create-nx-workspace, nx-upgrade",
+            "default": "user"
+        },
+        "hideFormatLogs": {
+            "type": "boolean",
+            "description": "Hide formatting logs",
+            "x-priority": "internal"
+        },
+        "generateToken": {
+            "type": "boolean",
+            "description": "Explicitly asks for a token to be created, do not override existing tokens from Nx Cloud"
+        },
+        "github": {
+            "type": "boolean",
+            "description": "If the user will be using GitHub as their git hosting provider",
+            "default": false
+        },
+        "directory": {
+            "type": "string",
+            "description": "The directory where the workspace is located",
+            "x-priority": "internal"
+        }
     },
-    "installationSource": {
-      "type": "string",
-      "description": "Name of Nx Cloud installation invoker (ex. user, add-nx-to-monorepo, create-nx-workspace, nx-upgrade",
-      "default": "user"
-    },
-    "hideFormatLogs": {
-      "type": "boolean",
-      "description": "Hide formatting logs",
-      "x-priority": "internal"
-    },
-    "generateToken": {
-      "type": "boolean",
-      "description": "Explicitly asks for a token to be created, do not override existing tokens from Nx Cloud"
-    },
-    "github": {
-      "type": "boolean",
-      "description": "If the user will be using GitHub as their git hosting provider",
-      "default": false
-    },
-    "directory": {
-      "type": "string",
-      "description": "The directory where the workspace is located",
-      "x-priority": "internal"
-    }
-  },
-  "additionalProperties": false,
-  "required": []
+    "additionalProperties": false,
+    "required": []
 }

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