nx 21.3.0-canary.20250715-cf994df → 21.3.0-canary.20250717-8b4b3e9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.3.0-canary.20250715-cf994df",
+  "version": "21.3.0-canary.20250717-8b4b3e9",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "21.3.0-canary.20250715-cf994df",
-    "@nx/nx-darwin-x64": "21.3.0-canary.20250715-cf994df",
-    "@nx/nx-freebsd-x64": "21.3.0-canary.20250715-cf994df",
-    "@nx/nx-linux-arm-gnueabihf": "21.3.0-canary.20250715-cf994df",
-    "@nx/nx-linux-arm64-gnu": "21.3.0-canary.20250715-cf994df",
-    "@nx/nx-linux-arm64-musl": "21.3.0-canary.20250715-cf994df",
-    "@nx/nx-linux-x64-gnu": "21.3.0-canary.20250715-cf994df",
-    "@nx/nx-linux-x64-musl": "21.3.0-canary.20250715-cf994df",
-    "@nx/nx-win32-arm64-msvc": "21.3.0-canary.20250715-cf994df",
-    "@nx/nx-win32-x64-msvc": "21.3.0-canary.20250715-cf994df"
+    "@nx/nx-darwin-arm64": "21.3.0-canary.20250717-8b4b3e9",
+    "@nx/nx-darwin-x64": "21.3.0-canary.20250717-8b4b3e9",
+    "@nx/nx-freebsd-x64": "21.3.0-canary.20250717-8b4b3e9",
+    "@nx/nx-linux-arm-gnueabihf": "21.3.0-canary.20250717-8b4b3e9",
+    "@nx/nx-linux-arm64-gnu": "21.3.0-canary.20250717-8b4b3e9",
+    "@nx/nx-linux-arm64-musl": "21.3.0-canary.20250717-8b4b3e9",
+    "@nx/nx-linux-x64-gnu": "21.3.0-canary.20250717-8b4b3e9",
+    "@nx/nx-linux-x64-musl": "21.3.0-canary.20250717-8b4b3e9",
+    "@nx/nx-win32-arm64-msvc": "21.3.0-canary.20250717-8b4b3e9",
+    "@nx/nx-win32-x64-msvc": "21.3.0-canary.20250717-8b4b3e9"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/executors/run-commands/run-commands.impl.js

@@ -121,19 +121,26 @@ function normalizeOptions(options) {
     return options;
 }
 function interpolateArgsIntoCommand(command, opts, forwardAllArgs) {
+    if (command.indexOf('{args.') > -1 && command.indexOf('{args}') > -1) {
+        throw new Error('Command should not contain both {args} and {args.*} values. Please choose one to use.');
+    }
     if (command.indexOf('{args.') > -1) {
         const regex = /{args\.([^}]+)}/g;
         return command.replace(regex, (_, group) => opts.parsedArgs[group] !== undefined ? opts.parsedArgs[group] : '');
     }
+    else if (command.indexOf('{args}') > -1) {
+        const regex = /{args}/g;
+        const args = [
+            ...unknownOptionsToArgsArray(opts),
+            ...unparsedOptionsToArgsArray(opts),
+        ];
+        const argsString = `${args.join(' ')} ${opts.args ?? ''}`;
+        return command.replace(regex, argsString);
+    }
     else if (forwardAllArgs) {
         let args = '';
         if (Object.keys(opts.unknownOptions ?? {}).length > 0) {
-            const unknownOptionsArgs = Object.keys(opts.unknownOptions)
-                .filter((k) => typeof opts.unknownOptions[k] !== 'object' &&
-                opts.parsedArgs[k] === opts.unknownOptions[k])
-                .map((k) => `--${k}=${opts.unknownOptions[k]}`)
-                .map(wrapArgIntoQuotesIfNeeded)
-                .join(' ');
+            const unknownOptionsArgs = unknownOptionsToArgsArray(opts).join(' ');
             if (unknownOptionsArgs) {
                 args += ` ${unknownOptionsArgs}`;
             }
@@ -142,11 +149,9 @@ function interpolateArgsIntoCommand(command, opts, forwardAllArgs) {
             args += ` ${opts.args}`;
         }
         if (opts.__unparsed__?.length > 0) {
-            const filteredParsedOptions = filterPropKeysFromUnParsedOptions(opts.__unparsed__, opts.parsedArgs);
+            const filteredParsedOptions = unparsedOptionsToArgsArray(opts);
             if (filteredParsedOptions.length > 0) {
-                args += ` ${filteredParsedOptions
-                    .map(wrapArgIntoQuotesIfNeeded)
-                    .join(' ')}`;
+                args += ` ${filteredParsedOptions.join(' ')}`;
             }
         }
         return `${command}${args}`;
@@ -155,6 +160,20 @@ function interpolateArgsIntoCommand(command, opts, forwardAllArgs) {
         return command;
     }
 }
+function unknownOptionsToArgsArray(opts) {
+    return Object.keys(opts.unknownOptions ?? {})
+        .filter((k) => typeof opts.unknownOptions[k] !== 'object' &&
+        opts.parsedArgs[k] === opts.unknownOptions[k])
+        .map((k) => `--${k}=${opts.unknownOptions[k]}`)
+        .map(wrapArgIntoQuotesIfNeeded);
+}
+function unparsedOptionsToArgsArray(opts) {
+    const filteredParsedOptions = filterPropKeysFromUnParsedOptions(opts.__unparsed__, opts.parsedArgs);
+    if (filteredParsedOptions.length > 0) {
+        return filteredParsedOptions.map(wrapArgIntoQuotesIfNeeded);
+    }
+    return [];
+}
 function parseArgs(unparsedCommandArgs, unknownOptions, args) {
     if (!args) {
         return { ...unknownOptions, ...unparsedCommandArgs };