nx 22.2.0-canary.20251121-9a6c7ad → 22.2.0-canary.20251125-7e00ec4

package/src/daemon/cache.d.ts

@@ -1,10 +1,11 @@
 export interface DaemonProcessJson {
     processId: number;
+    socketPath: string;
+    nxVersion: string;
 }
 export declare const serverProcessJsonPath: string;
 export declare function readDaemonProcessJsonCache(): DaemonProcessJson | null;
 export declare function deleteDaemonJsonProcessCache(): void;
 export declare function writeDaemonJsonProcessCache(daemonJson: DaemonProcessJson): Promise<void>;
-export declare function waitForDaemonToExitAndCleanupProcessJson(): Promise<void>;
 export declare function getDaemonProcessIdSync(): number | null;
 //# sourceMappingURL=cache.d.ts.map

package/src/daemon/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/cache.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,qBAAqB,QAGjC,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,iBAAiB,GAAG,IAAI,CAKrE;AAED,wBAAgB,4BAA4B,IAAI,IAAI,CAMnD;AAED,wBAAsB,2BAA2B,CAC/C,UAAU,EAAE,iBAAiB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAsB,wCAAwC,IAAI,OAAO,CAAC,IAAI,CAAC,CAuB9E;AAGD,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,IAAI,CAUtD"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/cache.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,qBAAqB,QAGjC,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,iBAAiB,GAAG,IAAI,CAWrE;AAED,wBAAgB,4BAA4B,IAAI,IAAI,CAMnD;AAED,wBAAsB,2BAA2B,CAC/C,UAAU,EAAE,iBAAiB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAIf;AAGD,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,IAAI,CAUtD"}

package/src/daemon/cache.js

@@ -4,18 +4,25 @@ exports.serverProcessJsonPath = void 0;
 exports.readDaemonProcessJsonCache = readDaemonProcessJsonCache;
 exports.deleteDaemonJsonProcessCache = deleteDaemonJsonProcessCache;
 exports.writeDaemonJsonProcessCache = writeDaemonJsonProcessCache;
-exports.waitForDaemonToExitAndCleanupProcessJson = waitForDaemonToExitAndCleanupProcessJson;
 exports.getDaemonProcessIdSync = getDaemonProcessIdSync;
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const tmp_dir_1 = require("./tmp-dir");
 const fileutils_1 = require("../utils/fileutils");
+const versions_1 = require("../utils/versions");
 exports.serverProcessJsonPath = (0, path_1.join)(tmp_dir_1.DAEMON_DIR_FOR_CURRENT_WORKSPACE, 'server-process.json');
 function readDaemonProcessJsonCache() {
-    if (!(0, node_fs_1.existsSync)(exports.serverProcessJsonPath)) {
+    try {
+        const daemonJson = (0, fileutils_1.readJsonFile)(exports.serverProcessJsonPath);
+        // If the daemon version doesn't match the client version, treat it as stale
+        if (daemonJson.nxVersion !== versions_1.nxVersion) {
+            return null;
+        }
+        return daemonJson;
+    }
+    catch {
         return null;
     }
-    return (0, fileutils_1.readJsonFile)(exports.serverProcessJsonPath);
 }
 function deleteDaemonJsonProcessCache() {
     try {
@@ -30,29 +37,6 @@ async function writeDaemonJsonProcessCache(daemonJson) {
         appendNewLine: true,
     });
 }
-async function waitForDaemonToExitAndCleanupProcessJson() {
-    const daemonProcessJson = readDaemonProcessJsonCache();
-    if (daemonProcessJson && daemonProcessJson.processId) {
-        await new Promise((resolve, reject) => {
-            let count = 0;
-            const interval = setInterval(() => {
-                try {
-                    // sending a signal 0 to a process checks if the process is running instead of actually killing it
-                    process.kill(daemonProcessJson.processId, 0);
-                }
-                catch (e) {
-                    clearInterval(interval);
-                    resolve();
-                }
-                if ((count += 1) > 200) {
-                    clearInterval(interval);
-                    reject(`Daemon process ${daemonProcessJson.processId} didn't exit after 2 seconds.`);
-                }
-            }, 10);
-        });
-        deleteDaemonJsonProcessCache();
-    }
-}
 // Must be sync for the help output use case
 function getDaemonProcessIdSync() {
     if (!(0, node_fs_1.existsSync)(exports.serverProcessJsonPath)) {

package/src/daemon/client/client.d.ts

@@ -28,6 +28,7 @@ export declare class DaemonClient {
     private _err;
     enabled(): boolean;
     reset(): void;
+    private getSocketPath;
     requestShutdown(): Promise<void>;
     getProjectGraphAndSourceMaps(): Promise<{
         projectGraph: ProjectGraph;
@@ -73,6 +74,7 @@ export declare class DaemonClient {
     getNxConsoleStatus(): Promise<NxConsoleStatusResponse>;
     setNxConsolePreferenceAndInstall(preference: boolean): Promise<SetNxConsolePreferenceAndInstallResponse>;
     isServerAvailable(): Promise<boolean>;
+    private startDaemonIfNecessary;
     private sendToDaemonViaQueue;
     private setUpConnection;
     private sendMessageToDaemon;

package/src/daemon/client/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/client/client.ts"],"names":[],"mappings":"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"}

package/src/daemon/client/client.js

@@ -10,7 +10,6 @@ const net_1 = require("net");
 const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
 const output_1 = require("../../utils/output");
-const socket_utils_1 = require("../socket-utils");
 const tmp_dir_1 = require("../tmp-dir");
 const is_ci_1 = require("../../utils/is-ci");
 const nx_json_1 = require("../../config/nx-json");
@@ -18,6 +17,7 @@ const configuration_1 = require("../../config/configuration");
 const promised_based_queue_1 = require("../../utils/promised-based-queue");
 const daemon_socket_messenger_1 = require("./daemon-socket-messenger");
 const cache_1 = require("../cache");
+const is_nx_version_mismatch_1 = require("../is-nx-version-mismatch");
 const error_types_1 = require("../../project-graph/error-types");
 const native_1 = require("../../native");
 const get_nx_workspace_files_1 = require("../message-types/get-nx-workspace-files");
@@ -82,7 +82,9 @@ class DaemonClient {
             // docker=true,env=false => no daemon
             // docker=true,env=true => daemon
             // WASM => no daemon because file watching does not work
-            if ((((0, is_ci_1.isCI)() || isDocker()) && env !== 'true') ||
+            // version mismatch => no daemon because the installed nx version differs from the running one
+            if ((0, is_nx_version_mismatch_1.isNxVersionMismatch)() ||
+                (((0, is_ci_1.isCI)() || isDocker()) && env !== 'true') ||
                 (0, tmp_dir_1.isDaemonDisabled)() ||
                 nxJsonIsNotPresent() ||
                 (useDaemonProcessOption === undefined && env === 'false') ||
@@ -118,6 +120,15 @@ class DaemonClient {
         this._daemonStatus = DaemonStatus.DISCONNECTED;
         this._waitForDaemonReady = new Promise((resolve) => (this._daemonReady = resolve));
     }
+    getSocketPath() {
+        const daemonProcessJson = (0, cache_1.readDaemonProcessJsonCache)();
+        if (daemonProcessJson?.socketPath) {
+            return daemonProcessJson.socketPath;
+        }
+        else {
+            throw daemonProcessException('Unable to connect to daemon: no socket path available');
+        }
+    }
     async requestShutdown() {
         return this.sendToDaemonViaQueue({ type: 'REQUEST_SHUTDOWN' });
     }
@@ -174,8 +185,10 @@ class DaemonClient {
             }
         }
         let messenger;
-        await this.queue.sendToQueue(() => {
-            messenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)((0, socket_utils_1.getFullOsSocketPath)())).listen((message) => {
+        await this.queue.sendToQueue(async () => {
+            await this.startDaemonIfNecessary();
+            const socketPath = this.getSocketPath();
+            messenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)(socketPath)).listen((message) => {
                 try {
                     const parsedMessage = (0, consume_messages_from_socket_1.isJsonMessage)(message)
                         ? JSON.parse(message)
@@ -196,8 +209,10 @@ class DaemonClient {
     }
     async registerProjectGraphRecomputationListener(callback) {
         let messenger;
-        await this.queue.sendToQueue(() => {
-            messenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)((0, socket_utils_1.getFullOsSocketPath)())).listen((message) => {
+        await this.queue.sendToQueue(async () => {
+            await this.startDaemonIfNecessary();
+            const socketPath = this.getSocketPath();
+            messenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)(socketPath)).listen((message) => {
                 try {
                     const parsedMessage = (0, consume_messages_from_socket_1.isJsonMessage)(message)
                         ? JSON.parse(message)
@@ -376,7 +391,12 @@ class DaemonClient {
     async isServerAvailable() {
         return new Promise((resolve) => {
             try {
-                const socket = (0, net_1.connect)((0, socket_utils_1.getFullOsSocketPath)(), () => {
+                const socketPath = this.getSocketPath();
+                if (!socketPath) {
+                    resolve(false);
+                    return;
+                }
+                const socket = (0, net_1.connect)(socketPath, () => {
                     socket.destroy();
                     resolve(true);
                 });
@@ -389,11 +409,35 @@ class DaemonClient {
             }
         });
     }
+    async startDaemonIfNecessary() {
+        if (this._daemonStatus == DaemonStatus.CONNECTED) {
+            return;
+        }
+        // Ensure daemon is running and socket path is available
+        if (this._daemonStatus == DaemonStatus.DISCONNECTED) {
+            this._daemonStatus = DaemonStatus.CONNECTING;
+            let daemonPid = null;
+            if (!(await this.isServerAvailable())) {
+                daemonPid = await this.startInBackground();
+            }
+            this.setUpConnection();
+            this._daemonStatus = DaemonStatus.CONNECTED;
+            this._daemonReady();
+            daemonPid ??= (0, cache_1.getDaemonProcessIdSync)();
+            await this.registerDaemonProcessWithMetricsService(daemonPid);
+        }
+        else if (this._daemonStatus == DaemonStatus.CONNECTING) {
+            await this._waitForDaemonReady;
+            const daemonPid = (0, cache_1.getDaemonProcessIdSync)();
+            await this.registerDaemonProcessWithMetricsService(daemonPid);
+        }
+    }
     async sendToDaemonViaQueue(messageToDaemon, force) {
         return this.queue.sendToQueue(() => this.sendMessageToDaemon(messageToDaemon, force));
     }
     setUpConnection() {
-        this.socketMessenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)((0, socket_utils_1.getFullOsSocketPath)())).listen((message) => this.handleMessage(message), () => {
+        const socketPath = this.getSocketPath();
+        this.socketMessenger = new daemon_socket_messenger_1.DaemonSocketMessenger((0, net_1.connect)(socketPath)).listen((message) => this.handleMessage(message), () => {
             // it's ok for the daemon to terminate if the client doesn't wait on
             // any messages from the daemon
             if (this.queue.isEmpty()) {
@@ -421,7 +465,6 @@ class DaemonClient {
             }
             else if (err.message.startsWith('connect ECONNREFUSED')) {
                 error = daemonProcessException(`A server instance had not been fully shut down. Please try running the command again.`);
-                (0, socket_utils_1.killSocketOrPath)();
             }
             else if (err.message.startsWith('read ECONNRESET')) {
                 error = daemonProcessException(`Unable to connect to the daemon process.`);
@@ -433,23 +476,7 @@ class DaemonClient {
         });
     }
     async sendMessageToDaemon(message, force) {
-        if (this._daemonStatus == DaemonStatus.DISCONNECTED) {
-            this._daemonStatus = DaemonStatus.CONNECTING;
-            let daemonPid = null;
-            if (!(await this.isServerAvailable())) {
-                daemonPid = await this.startInBackground();
-            }
-            this.setUpConnection();
-            this._daemonStatus = DaemonStatus.CONNECTED;
-            this._daemonReady();
-            daemonPid ??= (0, cache_1.getDaemonProcessIdSync)();
-            await this.registerDaemonProcessWithMetricsService(daemonPid);
-        }
-        else if (this._daemonStatus == DaemonStatus.CONNECTING) {
-            await this._waitForDaemonReady;
-            const daemonPid = (0, cache_1.getDaemonProcessIdSync)();
-            await this.registerDaemonProcessWithMetricsService(daemonPid);
-        }
+        await this.startDaemonIfNecessary();
         // An open promise isn't enough to keep the event loop
         // alive, so we set a timeout here and clear it when we hear
         // back

package/src/daemon/is-nx-version-mismatch.d.ts

@@ -0,0 +1,3 @@
+export declare function getInstalledNxVersion(): string | null;
+export declare function isNxVersionMismatch(): boolean;
+//# sourceMappingURL=is-nx-version-mismatch.d.ts.map

package/src/daemon/is-nx-version-mismatch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-nx-version-mismatch.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/is-nx-version-mismatch.ts"],"names":[],"mappings":"AAMA,wBAAgB,qBAAqB,IAAI,MAAM,GAAG,IAAI,CAWrD;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C"}

package/src/daemon/is-nx-version-mismatch.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInstalledNxVersion = getInstalledNxVersion;
+exports.isNxVersionMismatch = isNxVersionMismatch;
+const fileutils_1 = require("../utils/fileutils");
+const versions_1 = require("../utils/versions");
+const workspace_root_1 = require("../utils/workspace-root");
+const installation_directory_1 = require("../utils/installation-directory");
+function getInstalledNxVersion() {
+    try {
+        const nxPackageJsonPath = require.resolve('nx/package.json', {
+            paths: (0, installation_directory_1.getNxRequirePaths)(workspace_root_1.workspaceRoot),
+        });
+        const { version } = (0, fileutils_1.readJsonFile)(nxPackageJsonPath);
+        return version;
+    }
+    catch {
+        // node modules are absent
+        return null;
+    }
+}
+function isNxVersionMismatch() {
+    return getInstalledNxVersion() !== versions_1.nxVersion;
+}

package/src/daemon/server/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAgKnD,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACtC,CAAC;AAGF,eAAO,MAAM,WAAW,EAAE,GAAG,CAAC,MAAM,CAAa,CAAC;AA8RlD,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,EAClC,IAAI,EAAE,MAAM,GAAG,IAAI,iBA6BpB;AAoMD,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAqEnD"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AA+JnD,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACtC,CAAC;AAGF,eAAO,MAAM,WAAW,EAAE,GAAG,CAAC,MAAM,CAAa,CAAC;AA8RlD,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,EAClC,IAAI,EAAE,MAAM,GAAG,IAAI,iBA6BpB;AAoLD,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAyEnD"}

package/src/daemon/server/server.js

@@ -10,11 +10,11 @@ const perf_hooks_1 = require("perf_hooks");
 const file_hasher_1 = require("../../hasher/file-hasher");
 const native_1 = require("../../native");
 const consume_messages_from_socket_1 = require("../../utils/consume-messages-from-socket");
-const fileutils_1 = require("../../utils/fileutils");
 const versions_1 = require("../../utils/versions");
 const workspace_context_1 = require("../../utils/workspace-context");
 const workspace_root_1 = require("../../utils/workspace-root");
 const cache_1 = require("../cache");
+const is_nx_version_mismatch_1 = require("../is-nx-version-mismatch");
 const socket_utils_1 = require("../socket-utils");
 const file_watcher_sockets_1 = require("./file-watching/file-watcher-sockets");
 const project_graph_listener_sockets_1 = require("./project-graph-listener-sockets");
@@ -265,7 +265,7 @@ function registerProcessTerminationListeners() {
 }
 let existingLockHash;
 function daemonIsOutdated() {
-    if (nxVersionChanged()) {
+    if ((0, is_nx_version_mismatch_1.isNxVersionMismatch)()) {
         return 'NX_VERSION_CHANGED';
     }
     else if (lockFileHashChanged()) {
@@ -273,20 +273,6 @@ function daemonIsOutdated() {
     }
     return null;
 }
-function nxVersionChanged() {
-    return versions_1.nxVersion !== getInstalledNxVersion();
-}
-const nxPackageJsonPath = require.resolve('nx/package.json');
-function getInstalledNxVersion() {
-    try {
-        const { version } = (0, fileutils_1.readJsonFile)(nxPackageJsonPath);
-        return version;
-    }
-    catch (e) {
-        // node modules are absent, so we can return null, which would shut down the daemon
-        return null;
-    }
-}
 function lockFileHashChanged() {
     const lockHashes = [
         (0, path_1.join)(workspace_root_1.workspaceRoot, 'package-lock.json'),
@@ -393,9 +379,12 @@ const handleOutputsChanges = async (err, changeEvents) => {
 };
 async function startServer() {
     (0, workspace_context_1.setupWorkspaceContext)(workspace_root_1.workspaceRoot);
+    const socketPath = (0, socket_utils_1.getFullOsSocketPath)();
     // Persist metadata about the background process so that it can be cleaned up later if needed
     await (0, cache_1.writeDaemonJsonProcessCache)({
         processId: process.pid,
+        socketPath,
+        nxVersion: versions_1.nxVersion,
     });
     // See notes in socket-command-line-utils.ts on OS differences regarding clean up of existings connections.
     if (!socket_utils_1.isWindows) {
@@ -412,9 +401,9 @@ async function startServer() {
     }, 20).unref();
     return new Promise(async (resolve, reject) => {
         try {
-            server.listen((0, socket_utils_1.getFullOsSocketPath)(), async () => {
+            server.listen(socketPath, async () => {
                 try {
-                    logger_1.serverLogger.log(`Started listening on: ${(0, socket_utils_1.getFullOsSocketPath)()}`);
+                    logger_1.serverLogger.log(`Started listening on: ${socketPath}`);
                     // this triggers the storage of the lock file hash
                     daemonIsOutdated();
                     if (!(0, shutdown_utils_1.getWatcherInstance)()) {

package/src/daemon/tmp-dir.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tmp-dir.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/tmp-dir.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,gCAAgC,QAG5C,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAGlC,CAAC;AAEF,eAAO,MAAM,kBAAkB,cAK5B,CAAC;AAEJ,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,UAI7C;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,QAElD;AAED,wBAAgB,gBAAgB,YAO/B;AASD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,aAAa,UAAQ,UAYjD;AAED,wBAAgB,eAAe,SAI9B"}
+{"version":3,"file":"tmp-dir.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/daemon/tmp-dir.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,gCAAgC,QAG5C,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAGlC,CAAC;AAEF,eAAO,MAAM,kBAAkB,cAK5B,CAAC;AAEJ,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,UAI7C;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,QAElD;AAED,wBAAgB,gBAAgB,YAO/B;AAUD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,aAAa,UAAQ,UAYjD;AAED,wBAAgB,eAAe,SAI9B"}

package/src/daemon/tmp-dir.js

@@ -43,6 +43,7 @@ function isDaemonDisabled() {
 function socketDirName() {
     const hasher = (0, crypto_1.createHash)('sha256');
     hasher.update(workspace_root_1.workspaceRoot.toLowerCase());
+    hasher.update(String(process.pid));
     const unique = hasher.digest('hex').substring(0, 20);
     return (0, path_1.join)(tmp_1.tmpdir, unique);
 }

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
 }