nx 22.7.8 → 22.7.10

package/dist/src/utils/shell-quoting.d.ts

@@ -8,3 +8,18 @@ export declare function needsShellQuoting(str: string): boolean;
  * Check if a string is already wrapped in matching quotes (single or double).
  */
 export declare function isAlreadyQuoted(str: string): boolean;
+/**
+ * Quote a string so it survives being interpolated into a shell command line
+ * as a single argument.
+ *
+ * On Windows the safety boundary is one unbroken double-quoted run: it keeps
+ * `^`, `&`, `|`, `<` and `>` literal through cmd.exe's parse and a `.cmd`
+ * shim's re-parse of `%*`, but not `%`, which cmd.exe expands inside double
+ * quotes too.
+ *
+ * @throws on Windows when the argument contains a double quote, which ends that
+ * run, since cmd.exe recognizes no backslash escape. Carrying one means
+ * caret-escaping every metacharacter instead, doubled for a `.cmd` shim, which
+ * this path does not implement.
+ */
+export declare function quoteShellArg(arg: string): string;

package/dist/src/utils/shell-quoting.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.needsShellQuoting = needsShellQuoting;
 exports.isAlreadyQuoted = isAlreadyQuoted;
+exports.quoteShellArg = quoteShellArg;
 /**
  * Shell metacharacters that have special meaning and require quoting.
  *
@@ -39,3 +40,37 @@ function isAlreadyQuoted(str) {
         ((str[0] === "'" && str[str.length - 1] === "'") ||
             (str[0] === '"' && str[str.length - 1] === '"')));
 }
+/**
+ * Quote a string so it survives being interpolated into a shell command line
+ * as a single argument.
+ *
+ * On Windows the safety boundary is one unbroken double-quoted run: it keeps
+ * `^`, `&`, `|`, `<` and `>` literal through cmd.exe's parse and a `.cmd`
+ * shim's re-parse of `%*`, but not `%`, which cmd.exe expands inside double
+ * quotes too.
+ *
+ * @throws on Windows when the argument contains a double quote, which ends that
+ * run, since cmd.exe recognizes no backslash escape. Carrying one means
+ * caret-escaping every metacharacter instead, doubled for a `.cmd` shim, which
+ * this path does not implement.
+ */
+function quoteShellArg(arg) {
+    const isWindows = process.platform === 'win32';
+    if (isWindows && arg.includes('"')) {
+        throw new Error(`Cannot safely pass ${arg} to cmd.exe as a single argument: a double quote inside it would end the quoting and leave the rest of the argument to be read as commands. Remove the double quote and run the command again.`);
+    }
+    if (arg === '') {
+        // an unquoted empty string would vanish when joined into a command line
+        return isWindows ? '""' : "''";
+    }
+    // `^` is cmd.exe syntax rather than shell syntax, so it earns quoting only
+    // where cmd.exe parses the command line.
+    if (!needsShellQuoting(arg) && !(isWindows && arg.includes('^'))) {
+        return arg;
+    }
+    return isWindows
+        ? // MSVCRT reads the backslashes that precede the closing quote as escapes,
+            // so they have to be doubled to survive as themselves.
+            `"${arg.replace(/(\\+)$/, '$1$1')}"`
+        : `'${arg.replace(/'/g, `'\\''`)}'`;
+}

package/dist/src/utils/wait-for-socket-connection.d.ts

@@ -12,4 +12,15 @@ export declare function waitForSocketConnection(socketPath: string | (() => stri
     signal?: AbortSignal;
     maxAttempts?: number;
     delayMs?: number;
+    /**
+     * Called with the errno of each failed connect and the path it was made
+     * against. Return `true` to stop polling: a permission refusal does not
+     * heal by retrying, and without a way out the caller waits the full budget
+     * and then cannot say why.
+     *
+     * The path is passed rather than left to the caller to recompute — with a
+     * resolver it can differ per attempt, and the caller that reports the
+     * refusal may no longer be able to resolve one at all.
+     */
+    onConnectError?: (error: NodeJS.ErrnoException, socketPath: string) => boolean | void;
 }): Promise<Socket | null>;

package/dist/src/utils/wait-for-socket-connection.js

@@ -26,9 +26,15 @@ async function waitForSocketConnection(socketPath, options) {
             return null;
         const path = typeof socketPath === 'function' ? socketPath() : socketPath;
         if (path) {
-            const socket = await tryConnect(path);
-            if (socket) {
-                return socket;
+            const result = await tryConnect(path);
+            if (result.socket) {
+                return result.socket;
+            }
+            // The caller may need the errno this attempt produced — a refused
+            // connection is reported very differently from a socket that is not
+            // there yet, and polling past it only delays the same answer.
+            if (result.error && options?.onConnectError?.(result.error, path)) {
+                return null;
             }
         }
         attempts++;
@@ -39,15 +45,15 @@ function tryConnect(socketPath) {
     return new Promise((resolve) => {
         try {
             const socket = (0, net_1.connect)(socketPath, () => {
-                resolve(socket);
+                resolve({ socket });
             });
-            socket.once('error', () => {
+            socket.once('error', (error) => {
                 socket.destroy();
-                resolve(null);
+                resolve({ error });
             });
         }
-        catch {
-            resolve(null);
+        catch (error) {
+            resolve({ error: error });
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.7.8",
+  "version": "22.7.10",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
@@ -175,16 +175,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.7.8",
-    "@nx/nx-darwin-x64": "22.7.8",
-    "@nx/nx-freebsd-x64": "22.7.8",
-    "@nx/nx-linux-arm-gnueabihf": "22.7.8",
-    "@nx/nx-linux-arm64-gnu": "22.7.8",
-    "@nx/nx-linux-arm64-musl": "22.7.8",
-    "@nx/nx-linux-x64-gnu": "22.7.8",
-    "@nx/nx-linux-x64-musl": "22.7.8",
-    "@nx/nx-win32-arm64-msvc": "22.7.8",
-    "@nx/nx-win32-x64-msvc": "22.7.8"
+    "@nx/nx-darwin-arm64": "22.7.10",
+    "@nx/nx-darwin-x64": "22.7.10",
+    "@nx/nx-freebsd-x64": "22.7.10",
+    "@nx/nx-linux-arm-gnueabihf": "22.7.10",
+    "@nx/nx-linux-arm64-gnu": "22.7.10",
+    "@nx/nx-linux-arm64-musl": "22.7.10",
+    "@nx/nx-linux-x64-gnu": "22.7.10",
+    "@nx/nx-linux-x64-musl": "22.7.10",
+    "@nx/nx-win32-arm64-msvc": "22.7.10",
+    "@nx/nx-win32-x64-msvc": "22.7.10"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",