nx 22.0.1 → 22.1.0-beta.1

package/src/utils/consume-messages-from-socket.js

@@ -1,21 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MESSAGE_END_SEQ = void 0;
 exports.consumeMessagesFromSocket = consumeMessagesFromSocket;
+exports.isJsonMessage = isJsonMessage;
+exports.MESSAGE_END_SEQ = 'NX_MSG_END' + String.fromCharCode(4);
 function consumeMessagesFromSocket(callback) {
     let message = '';
     return (data) => {
         const chunk = data.toString();
-        if (chunk.codePointAt(chunk.length - 1) === 4) {
-            message += chunk.substring(0, chunk.length - 1);
-            // Server may send multiple messages in one chunk, so splitting by 0x4
-            const messages = message.split('');
+        message += chunk;
+        // Check if accumulated message ends with MESSAGE_END_SEQ (not just the chunk)
+        // This handles TCP packet fragmentation where MESSAGE_END_SEQ may be split across packets
+        if (message.endsWith(exports.MESSAGE_END_SEQ)) {
+            // Remove the trailing MESSAGE_END_SEQ
+            const fullMessage = message.substring(0, message.length - exports.MESSAGE_END_SEQ.length);
+            // Server may send multiple messages in one chunk, so splitting by MESSAGE_END_SEQ
+            const messages = fullMessage.split(exports.MESSAGE_END_SEQ);
             for (const splitMessage of messages) {
-                callback(splitMessage);
+                if (splitMessage) {
+                    callback(splitMessage);
+                }
             }
             message = '';
         }
-        else {
-            message += chunk;
-        }
+        // If message doesn't end with MESSAGE_END_SEQ, keep accumulating chunks
     };
 }
+function isJsonMessage(message) {
+    return (
+    // json objects
+    ['[', '{'].some((prefix) => message.startsWith(prefix)) ||
+        // booleans
+        message === 'true' ||
+        message === 'false' ||
+        // strings
+        (message.startsWith('"') && message.endsWith('"')) ||
+        // numbers
+        /^[0-9]+(\.?[0-9]+)?$/.test(message));
+}

package/src/utils/exit-codes.d.ts

@@ -2,7 +2,7 @@
  * Translates NodeJS signals to numeric exit code
  * @param signal
  */
-export declare function signalToCode(signal: NodeJS.Signals): number;
+export declare function signalToCode(signal: NodeJS.Signals | null): number;
 /**
  * Translates numeric exit codes to NodeJS signals
  */

package/src/utils/exit-codes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exit-codes.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/exit-codes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,MAAM,CAW3D;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO,CAWzD"}
+{"version":3,"file":"exit-codes.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/exit-codes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,GAAG,MAAM,CAWlE;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO,CAWzD"}

package/src/utils/package-json.js

@@ -303,7 +303,7 @@ function getDependencyVersionFromPackageJsonFromFileSystem(packageName, root = w
     // Resolve catalog reference if needed
     const manager = (0, catalog_1.getCatalogManager)(root);
     if (version && manager?.isCatalogReference(version)) {
-        version = manager.resolveCatalogReference(packageName, version, root);
+        version = manager.resolveCatalogReference(root, packageName, version);
     }
     return version;
 }

package/src/utils/package-manager.js

@@ -370,7 +370,7 @@ async function resolvePackageVersionUsingRegistry(packageName, version) {
         let resolvedVersion = version;
         const manager = (0, catalog_1.getCatalogManager)(workspace_root_1.workspaceRoot);
         if (manager?.isCatalogReference(version)) {
-            resolvedVersion = manager.resolveCatalogReference(packageName, version, workspace_root_1.workspaceRoot);
+            resolvedVersion = manager.resolveCatalogReference(workspace_root_1.workspaceRoot, packageName, version);
             if (!resolvedVersion) {
                 throw new Error(`Unable to resolve catalog reference ${packageName}@${version}.`);
             }
@@ -412,7 +412,7 @@ async function resolvePackageVersionUsingInstallation(packageName, version) {
         let resolvedVersion = version;
         const manager = (0, catalog_1.getCatalogManager)(workspace_root_1.workspaceRoot);
         if (manager.isCatalogReference(version)) {
-            resolvedVersion = manager.resolveCatalogReference(packageName, version, workspace_root_1.workspaceRoot);
+            resolvedVersion = manager.resolveCatalogReference(workspace_root_1.workspaceRoot, packageName, version);
             if (!resolvedVersion) {
                 throw new Error(`Unable to resolve catalog reference ${packageName}@${version}.`);
             }