nx 18.3.2 → 18.3.4

package/src/daemon/server/project-graph-incremental-recomputation.js

@@ -142,22 +142,22 @@ async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
         logger_1.serverLogger.requestLog([...deletedFiles]);
         const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
         global.NX_GRAPH_CREATION = true;
-        let graphNodes;
+        let projectConfigurationsResult;
         let projectConfigurationsError;
         try {
-            graphNodes = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(plugins, workspace_root_1.workspaceRoot, nxJson);
+            projectConfigurationsResult = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(plugins, workspace_root_1.workspaceRoot, nxJson);
         }
         catch (e) {
             if (e instanceof error_types_1.ProjectConfigurationsError) {
-                graphNodes = e.partialProjectConfigurationsResult;
+                projectConfigurationsResult = e.partialProjectConfigurationsResult;
                 projectConfigurationsError = e;
             }
             else {
                 throw e;
             }
         }
-        await processCollectedUpdatedAndDeletedFiles(graphNodes, updatedFileHashes, deletedFiles);
-        const g = await createAndSerializeProjectGraph(graphNodes);
+        await processCollectedUpdatedAndDeletedFiles(projectConfigurationsResult, updatedFileHashes, deletedFiles);
+        const g = await createAndSerializeProjectGraph(projectConfigurationsResult);
         delete global.NX_GRAPH_CREATION;
         const errors = [...(projectConfigurationsError?.errors ?? [])];
         if (g.error) {
@@ -179,7 +179,7 @@ async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
         }
         if (errors.length > 0) {
             return {
-                error: new error_types_1.DaemonProjectGraphError(errors, g.projectGraph, graphNodes.sourceMaps),
+                error: new error_types_1.DaemonProjectGraphError(errors, g.projectGraph, projectConfigurationsResult.sourceMaps),
                 projectGraph: null,
                 projectFileMapCache: null,
                 fileMap: null,

package/src/daemon/server/server.js

@@ -60,10 +60,7 @@ async function handleMessage(socket, data) {
         await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `File watcher error in the workspace '${workspace_root_1.workspaceRoot}'.`, workspaceWatcherError);
     }
     if (daemonIsOutdated()) {
-        await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Lock files changed`, {
-            name: '',
-            message: 'LOCK-FILES-CHANGED',
-        });
+        await (0, shutdown_utils_1.respondWithErrorAndExit)(socket, `Lock files changed`, new Error('LOCK-FILES-CHANGED'));
     }
     (0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
     const unparsedPayload = data;

package/src/daemon/socket-utils.js

@@ -5,7 +5,7 @@ const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
 const tmp_dir_1 = require("./tmp-dir");
-const error_types_1 = require("../project-graph/error-types");
+const serializable_error_1 = require("../utils/serializable-error");
 exports.isWindows = (0, os_1.platform)() === 'win32';
 /**
  * For IPC with the daemon server we use unix sockets or windows named pipes, depending on the user's operating system.
@@ -28,21 +28,9 @@ function killSocketOrPath() {
     catch { }
 }
 exports.killSocketOrPath = killSocketOrPath;
-// Include the original stack trace within the serialized error so that the client can show it to the user.
-function serializeError(error) {
-    if (!error) {
-        return null;
-    }
-    if (error instanceof error_types_1.DaemonProjectGraphError) {
-        error.errors = error.errors.map((e) => JSON.parse(serializeError(e)));
-    }
-    return `{${Object.getOwnPropertyNames(error)
-        .map((k) => `"${k}": ${JSON.stringify(error[k])}`)
-        .join(',')}}`;
-}
 // Prepare a serialized project graph result for sending over IPC from the server to the client
 function serializeResult(error, serializedProjectGraph, serializedSourceMaps) {
     // We do not want to repeat work `JSON.stringify`ing an object containing the potentially large project graph so merge as strings
-    return `{ "error": ${serializeError(error)}, "projectGraph": ${serializedProjectGraph}, "sourceMaps": ${serializedSourceMaps} }`;
+    return `{ "error": ${JSON.stringify(error ? (0, serializable_error_1.createSerializableError)(error) : error)}, "projectGraph": ${serializedProjectGraph}, "sourceMaps": ${serializedSourceMaps} }`;
 }
 exports.serializeResult = serializeResult;

package/src/devkit-internals.d.ts

@@ -8,6 +8,7 @@ export { getExecutorInformation } from './command-line/run/executor-utils';
 export { readNxJson as readNxJsonFromDisk } from './config/nx-json';
 export { calculateDefaultProjectName } from './config/calculate-default-project-name';
 export { retrieveProjectConfigurationsWithAngularProjects } from './project-graph/utils/retrieve-workspace-files';
+export { readProjectConfigurationsFromRootMap } from './project-graph/utils/project-configuration-utils';
 export { splitTarget } from './utils/split-target';
 export { combineOptionsForExecutor } from './utils/params';
 export { sortObjectByKeys } from './utils/object-sort';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.readProjectConfigurationsFromRootMap = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -17,6 +17,8 @@ var calculate_default_project_name_1 = require("./config/calculate-default-proje
 Object.defineProperty(exports, "calculateDefaultProjectName", { enumerable: true, get: function () { return calculate_default_project_name_1.calculateDefaultProjectName; } });
 var retrieve_workspace_files_1 = require("./project-graph/utils/retrieve-workspace-files");
 Object.defineProperty(exports, "retrieveProjectConfigurationsWithAngularProjects", { enumerable: true, get: function () { return retrieve_workspace_files_1.retrieveProjectConfigurationsWithAngularProjects; } });
+var project_configuration_utils_1 = require("./project-graph/utils/project-configuration-utils");
+Object.defineProperty(exports, "readProjectConfigurationsFromRootMap", { enumerable: true, get: function () { return project_configuration_utils_1.readProjectConfigurationsFromRootMap; } });
 var split_target_1 = require("./utils/split-target");
 Object.defineProperty(exports, "splitTarget", { enumerable: true, get: function () { return split_target_1.splitTarget; } });
 var params_1 = require("./utils/params");

package/src/executors/run-commands/run-commands.impl.d.ts

@@ -22,6 +22,7 @@ export interface RunCommandsOptions extends Json {
     readyWhen?: string;
     cwd?: string;
     env?: Record<string, string>;
+    forwardAllArgs?: boolean;
     args?: string | string[];
     envFile?: string;
     __unparsed__: string[];

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

@@ -7,7 +7,10 @@ const yargsParser = require("yargs-parser");
 const npm_run_path_1 = require("npm-run-path");
 const chalk = require("chalk");
 const pseudo_terminal_1 = require("../../tasks-runner/pseudo-terminal");
+const exit_codes_1 = require("../../utils/exit-codes");
 exports.LARGE_BUFFER = 1024 * 1000000;
+let pseudoTerminal;
+const childProcesses = new Set();
 async function loadEnvVars(path) {
     if (path) {
         const result = (await Promise.resolve().then(() => require('dotenv'))).config({ path });
@@ -36,8 +39,10 @@ const propKeys = [
     'usePty',
     'streamOutput',
     'verbose',
+    'forwardAllArgs',
 ];
 async function default_1(options, context) {
+    registerProcessListener();
     await loadEnvVars(options.envFile);
     const normalized = normalizeOptions(options);
     if (options.readyWhen && !options.parallel) {
@@ -131,14 +136,12 @@ function normalizeOptions(options) {
     options.parsedArgs = parseArgs(unparsedCommandArgs, options.unknownOptions, options.args);
     options.unparsedCommandArgs = unparsedCommandArgs;
     options.commands.forEach((c) => {
-        c.command = interpolateArgsIntoCommand(c.command, options, c.forwardAllArgs ?? true);
+        c.command = interpolateArgsIntoCommand(c.command, options, c.forwardAllArgs ?? options.forwardAllArgs ?? true);
     });
     return options;
 }
 async function runSerially(options, context) {
-    const pseudoTerminal = pseudo_terminal_1.PseudoTerminal.isSupported()
-        ? (0, pseudo_terminal_1.getPseudoTerminal)()
-        : null;
+    pseudoTerminal ??= pseudo_terminal_1.PseudoTerminal.isSupported() ? (0, pseudo_terminal_1.getPseudoTerminal)() : null;
     let terminalOutput = '';
     for (const c of options.commands) {
         const result = await createProcess(pseudoTerminal, c, undefined, options.color, calculateCwd(options.cwd, context), options.env ?? {}, false, options.usePty, options.streamOutput);
@@ -172,6 +175,7 @@ async function createProcess(pseudoTerminal, commandConfig, readyWhen, color, cw
             jsEnv: env,
             quiet: !streamOutput,
         });
+        childProcesses.add(cp);
         return new Promise((res) => {
             cp.onOutput((output) => {
                 terminalOutput += output;
@@ -202,14 +206,7 @@ function nodeProcess(commandConfig, cwd, env, readyWhen, streamOutput = true) {
             env,
             cwd,
         });
-        /**
-         * Ensure the child process is killed when the parent exits
-         */
-        const processExitListener = (signal) => childProcess.kill(signal);
-        process.on('exit', processExitListener);
-        process.on('SIGTERM', processExitListener);
-        process.on('SIGINT', processExitListener);
-        process.on('SIGQUIT', processExitListener);
+        childProcesses.add(childProcess);
         childProcess.stdout.on('data', (data) => {
             const output = addColorAndPrefix(data, commandConfig);
             terminalOutput += output;
@@ -239,6 +236,7 @@ function nodeProcess(commandConfig, cwd, env, readyWhen, streamOutput = true) {
             res({ success: false, terminalOutput });
         });
         childProcess.on('exit', (code) => {
+            childProcesses.delete(childProcess);
             if (!readyWhen) {
                 res({ success: code === 0, terminalOutput });
             }
@@ -361,3 +359,57 @@ function filterPropKeysFromUnParsedOptions(__unparsed__, unparsedCommandArgs = {
     }
     return parsedOptions;
 }
+let registered = false;
+function registerProcessListener() {
+    if (registered) {
+        return;
+    }
+    registered = true;
+    // When the nx process gets a message, it will be sent into the task's process
+    process.on('message', (message) => {
+        // this.publisher.publish(message.toString());
+        if (pseudoTerminal) {
+            pseudoTerminal.sendMessageToChildren(message);
+        }
+        childProcesses.forEach((p) => {
+            if ('connected' in p && p.connected) {
+                p.send(message);
+            }
+        });
+    });
+    // Terminate any task processes on exit
+    process.on('exit', () => {
+        childProcesses.forEach((p) => {
+            if ('connected' in p ? p.connected : p.isAlive) {
+                p.kill();
+            }
+        });
+    });
+    process.on('SIGINT', () => {
+        childProcesses.forEach((p) => {
+            if ('connected' in p ? p.connected : p.isAlive) {
+                p.kill('SIGTERM');
+            }
+        });
+        // we exit here because we don't need to write anything to cache.
+        process.exit((0, exit_codes_1.signalToCode)('SIGINT'));
+    });
+    process.on('SIGTERM', () => {
+        childProcesses.forEach((p) => {
+            if ('connected' in p ? p.connected : p.isAlive) {
+                p.kill('SIGTERM');
+            }
+        });
+        // no exit here because we expect child processes to terminate which
+        // will store results to the cache and will terminate this process
+    });
+    process.on('SIGHUP', () => {
+        childProcesses.forEach((p) => {
+            if ('connected' in p ? p.connected : p.isAlive) {
+                p.kill('SIGTERM');
+            }
+        });
+        // no exit here because we expect child processes to terminate which
+        // will store results to the cache and will terminate this process
+    });
+}

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

@@ -135,6 +135,11 @@
         "$source": "unparsed"
       },
       "x-priority": "internal"
+    },
+    "forwardAllArgs": {
+      "type": "boolean",
+      "description": "Whether arguments should be forwarded when interpolation is not present.",
+      "default": true
     }
   },
   "additionalProperties": true,

package/src/executors/utils/convert-nx-executor.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxExecutor = void 0;
 const nx_json_1 = require("../../config/nx-json");
 const retrieve_workspace_files_1 = require("../../project-graph/utils/retrieve-workspace-files");
+const project_configuration_utils_1 = require("../../project-graph/utils/project-configuration-utils");
 const internal_api_1 = require("../../project-graph/plugins/internal-api");
 /**
  * Convert an Nx Executor into an Angular Devkit Builder
@@ -19,7 +20,7 @@ function convertNxExecutor(executor) {
             const [plugins, cleanup] = await (0, internal_api_1.loadNxPlugins)(nxJsonConfiguration.plugins, builderContext.workspaceRoot);
             const projectsConfigurations = {
                 version: 2,
-                projects: (await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(plugins, builderContext.workspaceRoot, nxJsonConfiguration)).projects,
+                projects: (0, project_configuration_utils_1.readProjectConfigurationsFromRootMap)((await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(plugins, builderContext.workspaceRoot, nxJsonConfiguration)).projects),
             };
             cleanup();
             const context = {

package/src/generators/utils/project-configuration.js

@@ -143,7 +143,7 @@ function readAndCombineAllProjectConfigurations(tree) {
     const createdFiles = findCreatedProjectFiles(tree, patterns);
     const deletedFiles = findDeletedProjectFiles(tree, patterns);
     const projectFiles = [...globbedFiles, ...createdFiles].filter((r) => deletedFiles.indexOf(r) === -1);
-    const rootMap = new Map();
+    const rootMap = {};
     for (const projectFile of projectFiles) {
         if ((0, path_1.basename)(projectFile) === 'project.json') {
             const json = (0, json_1.readJson)(tree, projectFile);
@@ -153,7 +153,7 @@ function readAndCombineAllProjectConfigurations(tree) {
         else if ((0, path_1.basename)(projectFile) === 'package.json') {
             const packageJson = (0, json_1.readJson)(tree, projectFile);
             const config = (0, package_json_workspaces_1.buildProjectConfigurationFromPackageJson)(packageJson, projectFile, (0, nx_json_1.readNxJson)(tree));
-            if (!rootMap.has(config.root)) {
+            if (!rootMap[config.root]) {
                 (0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, 
                 // Inferred targets, tags, etc don't show up when running generators
                 // This is to help avoid running into issues when trying to update the workspace

package/src/project-graph/build-project-graph.d.ts

@@ -9,7 +9,7 @@ export declare function getFileMap(): {
     allWorkspaceFiles: FileData[];
     rustReferences: NxWorkspaceFilesExternals | null;
 };
-export declare function buildProjectGraphUsingProjectFileMap(projects: Record<string, ProjectConfiguration>, externalNodes: Record<string, ProjectGraphExternalNode>, fileMap: FileMap, allWorkspaceFiles: FileData[], rustReferences: NxWorkspaceFilesExternals, fileMapCache: FileMapCache | null, plugins: LoadedNxPlugin[]): Promise<{
+export declare function buildProjectGraphUsingProjectFileMap(projectRootMap: Record<string, ProjectConfiguration>, externalNodes: Record<string, ProjectGraphExternalNode>, fileMap: FileMap, allWorkspaceFiles: FileData[], rustReferences: NxWorkspaceFilesExternals, fileMapCache: FileMapCache | null, plugins: LoadedNxPlugin[]): Promise<{
     projectGraph: ProjectGraph;
     projectFileMapCache: FileMapCache;
 }>;

package/src/project-graph/build-project-graph.js

@@ -38,10 +38,15 @@ function getFileMap() {
     }
 }
 exports.getFileMap = getFileMap;
-async function buildProjectGraphUsingProjectFileMap(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, fileMapCache, plugins) {
+async function buildProjectGraphUsingProjectFileMap(projectRootMap, externalNodes, fileMap, allWorkspaceFiles, rustReferences, fileMapCache, plugins) {
     storedFileMap = fileMap;
     storedAllWorkspaceFiles = allWorkspaceFiles;
     storedRustReferences = rustReferences;
+    const projects = {};
+    for (const root in projectRootMap) {
+        const project = projectRootMap[root];
+        projects[project.name] = project;
+    }
     const nxJson = (0, configuration_1.readNxJson)();
     const projectGraphVersion = '6.0';
     (0, assert_workspace_validity_1.assertWorkspaceValidity)(projects, nxJson);
@@ -138,15 +143,9 @@ async function buildProjectGraphUsingContext(knownExternalNodes, ctx, cachedFile
     }
 }
 function createContext(projects, nxJson, externalNodes, fileMap, filesToProcess) {
-    const clonedProjects = Object.keys(projects).reduce((map, projectName) => {
-        map[projectName] = {
-            ...projects[projectName],
-        };
-        return map;
-    }, {});
     return {
         nxJsonConfiguration: nxJson,
-        projects: clonedProjects,
+        projects,
         externalNodes,
         workspaceRoot: workspace_root_1.workspaceRoot,
         fileMap,

package/src/project-graph/error-types.d.ts

@@ -19,7 +19,7 @@ export declare class ProjectGraphError extends Error {
      */
     getPartialProjectGraph(): ProjectGraph;
     getPartialSourcemaps(): ConfigurationSourceMaps;
-    getErrors(): (CreateNodesError | MergeNodesError | ProjectsWithNoNameError | ProjectsWithConflictingNamesError | ProcessDependenciesError | ProcessProjectGraphError)[];
+    getErrors(): (ProcessDependenciesError | ProcessProjectGraphError | CreateNodesError | MergeNodesError | ProjectsWithNoNameError | ProjectsWithConflictingNamesError)[];
 }
 export declare class ProjectsWithConflictingNamesError extends Error {
     projects: Record<string, ProjectConfiguration>;
@@ -69,3 +69,7 @@ export declare class DaemonProjectGraphError extends Error {
     readonly sourceMaps: ConfigurationSourceMaps;
     constructor(errors: any[], projectGraph: ProjectGraph, sourceMaps: ConfigurationSourceMaps);
 }
+export declare class LoadPluginError extends Error {
+    plugin: string;
+    constructor(plugin: string, cause: Error);
+}

package/src/project-graph/error-types.js

@@ -1,7 +1,7 @@
 "use strict";
 var _ProjectGraphError_errors, _ProjectGraphError_partialProjectGraph, _ProjectGraphError_partialSourceMaps;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DaemonProjectGraphError = exports.isMergeNodesError = exports.isAggregateCreateNodesError = exports.isCreateNodesError = exports.MergeNodesError = exports.AggregateCreateNodesError = exports.CreateNodesError = exports.ProjectConfigurationsError = exports.isProjectsWithNoNameError = exports.ProjectsWithNoNameError = exports.isProjectsWithConflictingNamesError = exports.ProjectsWithConflictingNamesError = exports.ProjectGraphError = void 0;
+exports.LoadPluginError = exports.DaemonProjectGraphError = exports.isMergeNodesError = exports.isAggregateCreateNodesError = exports.isCreateNodesError = exports.MergeNodesError = exports.AggregateCreateNodesError = exports.CreateNodesError = exports.ProjectConfigurationsError = exports.isProjectsWithNoNameError = exports.ProjectsWithNoNameError = exports.isProjectsWithConflictingNamesError = exports.ProjectsWithConflictingNamesError = exports.ProjectGraphError = void 0;
 const tslib_1 = require("tslib");
 class ProjectGraphError extends Error {
     constructor(errors, partialProjectGraph, partialSourceMaps) {
@@ -145,3 +145,13 @@ class DaemonProjectGraphError extends Error {
     }
 }
 exports.DaemonProjectGraphError = DaemonProjectGraphError;
+class LoadPluginError extends Error {
+    constructor(plugin, cause) {
+        super(`Could not load plugin ${plugin}`, {
+            cause,
+        });
+        this.plugin = plugin;
+        this.name = this.constructor.name;
+    }
+}
+exports.LoadPluginError = LoadPluginError;

package/src/project-graph/file-utils.js

@@ -152,7 +152,7 @@ function getProjectsSyncNoInference(root, nxJson) {
         package_json_next_to_project_json_1.PackageJsonProjectsNextToProjectJsonPlugin,
         ...(0, nx_plugin_deprecated_1.getDefaultPluginsSync)(root),
     ];
-    const projectRootMap = new Map();
+    const projectRootMap = {};
     // We iterate over plugins first - this ensures that plugins specified first take precedence.
     for (const plugin of plugins) {
         const [pattern, createNodes] = plugin.createNodes ?? [];

package/src/project-graph/plugins/isolation/messaging.d.ts

@@ -1,7 +1,9 @@
+/// <reference types="node" />
 import { ProjectGraph, ProjectGraphProcessorContext } from '../../../config/project-graph';
 import { PluginConfiguration } from '../../../config/nx-json';
 import { CreateDependenciesContext, CreateNodesContext } from '../public-api';
 import { LoadedNxPlugin } from '../internal-api';
+import { Serializable } from 'child_process';
 export interface PluginWorkerLoadMessage {
     type: 'load';
     payload: {
@@ -19,7 +21,7 @@ export interface PluginWorkerLoadResult {
         success: true;
     } | {
         success: false;
-        error: string;
+        error: Error;
     };
 }
 export interface PluginWorkerCreateNodesMessage {
@@ -38,7 +40,7 @@ export interface PluginWorkerCreateNodesResult {
         tx: string;
     } | {
         success: false;
-        error: string;
+        error: Error;
         tx: string;
     };
 }
@@ -57,7 +59,7 @@ export interface PluginCreateDependenciesResult {
         tx: string;
     } | {
         success: false;
-        error: string;
+        error: Error;
         tx: string;
     };
 }
@@ -77,18 +79,19 @@ export interface PluginWorkerProcessProjectGraphResult {
         tx: string;
     } | {
         success: false;
-        error: string;
+        error: Error;
         tx: string;
     };
 }
 export type PluginWorkerMessage = PluginWorkerLoadMessage | PluginWorkerCreateNodesMessage | PluginCreateDependenciesMessage | PluginWorkerProcessProjectGraphMessage;
 export type PluginWorkerResult = PluginWorkerLoadResult | PluginWorkerCreateNodesResult | PluginCreateDependenciesResult | PluginWorkerProcessProjectGraphResult;
+export declare function isPluginWorkerMessage(message: Serializable): message is PluginWorkerMessage;
+export declare function isPluginWorkerResult(message: Serializable): message is PluginWorkerResult;
 type MaybePromise<T> = T | Promise<T>;
 type MessageHandlerReturn<T extends PluginWorkerMessage | PluginWorkerResult> = T extends PluginWorkerResult ? MaybePromise<PluginWorkerMessage | void> : MaybePromise<PluginWorkerResult | void>;
-export declare function consumeMessage<T extends PluginWorkerMessage | PluginWorkerResult>(raw: string | T, handlers: {
+export declare function consumeMessage<T extends PluginWorkerMessage | PluginWorkerResult>(raw: T, handlers: {
     [K in T['type']]: (payload: Extract<T, {
         type: K;
     }>['payload']) => MessageHandlerReturn<T>;
 }): Promise<void>;
-export declare function createMessage(message: PluginWorkerMessage | PluginWorkerResult): string;
 export {};

package/src/project-graph/plugins/isolation/messaging.js

@@ -1,23 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMessage = exports.consumeMessage = void 0;
+exports.consumeMessage = exports.isPluginWorkerResult = exports.isPluginWorkerMessage = void 0;
+function isPluginWorkerMessage(message) {
+    return (typeof message === 'object' &&
+        'type' in message &&
+        typeof message.type === 'string' &&
+        [
+            'load',
+            'createNodes',
+            'createDependencies',
+            'processProjectGraph',
+        ].includes(message.type));
+}
+exports.isPluginWorkerMessage = isPluginWorkerMessage;
+function isPluginWorkerResult(message) {
+    return (typeof message === 'object' &&
+        'type' in message &&
+        typeof message.type === 'string' &&
+        [
+            'load-result',
+            'createNodesResult',
+            'createDependenciesResult',
+            'processProjectGraphResult',
+        ].includes(message.type));
+}
+exports.isPluginWorkerResult = isPluginWorkerResult;
 // Takes a message and a map of handlers and calls the appropriate handler
 // type safe and requires all handlers to be handled
 async function consumeMessage(raw, handlers) {
-    const message = typeof raw === 'string' ? JSON.parse(raw) : raw;
+    const message = raw;
     const handler = handlers[message.type];
     if (handler) {
         const response = await handler(message.payload);
         if (response) {
-            process.send(createMessage(response));
+            process.send(response);
         }
     }
-    else {
-        throw new Error(`Unhandled message type: ${message.type}`);
-    }
 }
 exports.consumeMessage = consumeMessage;
-function createMessage(message) {
-    return JSON.stringify(message);
-}
-exports.createMessage = createMessage;

package/src/project-graph/plugins/isolation/plugin-pool.js

@@ -32,7 +32,7 @@ function loadRemoteNxPlugin(plugin, root) {
             ...(isWorkerTypescript ? ['-r', 'ts-node/register'] : []),
         ],
     });
-    worker.send((0, messaging_1.createMessage)({ type: 'load', payload: { plugin, root } }));
+    worker.send({ type: 'load', payload: { plugin, root } });
     // logger.verbose(`[plugin-worker] started worker: ${worker.pid}`);
     const pendingPromises = new Map();
     const exitHandler = createWorkerExitHandler(worker, pendingPromises);
@@ -67,13 +67,10 @@ async function shutdownPluginWorker(worker, pendingPromises) {
 function createWorkerHandler(worker, pending, onload, onloadError) {
     let pluginName;
     return function (message) {
-        const parsed = JSON.parse(message);
-        // logger.verbose(
-        //   `[plugin-pool] received message: ${parsed.type} from ${
-        //     pluginName ?? worker.pid
-        //   }`
-        // );
-        (0, messaging_1.consumeMessage)(parsed, {
+        if (!(0, messaging_1.isPluginWorkerResult)(message)) {
+            return;
+        }
+        return (0, messaging_1.consumeMessage)(message, {
             'load-result': (result) => {
                 if (result.success) {
                     const { name, createNodesPattern } = result;
@@ -87,10 +84,10 @@ function createWorkerHandler(worker, pending, onload, onloadError) {
                                 (configFiles, ctx) => {
                                     const tx = pluginName + ':createNodes:' + performance.now();
                                     return registerPendingPromise(tx, pending, () => {
-                                        worker.send((0, messaging_1.createMessage)({
+                                        worker.send({
                                             type: 'createNodes',
                                             payload: { configFiles, context: ctx, tx },
-                                        }));
+                                        });
                                     });
                                 },
                             ]
@@ -99,10 +96,10 @@ function createWorkerHandler(worker, pending, onload, onloadError) {
                             ? (ctx) => {
                                 const tx = pluginName + ':createDependencies:' + performance.now();
                                 return registerPendingPromise(tx, pending, () => {
-                                    worker.send((0, messaging_1.createMessage)({
+                                    worker.send({
                                         type: 'createDependencies',
                                         payload: { context: ctx, tx },
-                                    }));
+                                    });
                                 });
                             }
                             : undefined,
@@ -110,10 +107,10 @@ function createWorkerHandler(worker, pending, onload, onloadError) {
                             ? (graph, ctx) => {
                                 const tx = pluginName + ':processProjectGraph:' + performance.now();
                                 return registerPendingPromise(tx, pending, () => {
-                                    worker.send((0, messaging_1.createMessage)({
+                                    worker.send({
                                         type: 'processProjectGraph',
                                         payload: { graph, ctx, tx },
-                                    }));
+                                    });
                                 });
                             }
                             : undefined,

package/src/project-graph/plugins/isolation/plugin-worker.js

@@ -2,10 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const messaging_1 = require("./messaging");
 const loader_1 = require("../loader");
+const serializable_error_1 = require("../../../utils/serializable-error");
 global.NX_GRAPH_CREATION = true;
 let plugin;
 process.on('message', async (message) => {
-    (0, messaging_1.consumeMessage)(message, {
+    if (!(0, messaging_1.isPluginWorkerMessage)(message)) {
+        return;
+    }
+    return (0, messaging_1.consumeMessage)(message, {
         load: async ({ plugin: pluginConfiguration, root }) => {
             process.chdir(root);
             try {
@@ -27,7 +31,7 @@ process.on('message', async (message) => {
                     type: 'load-result',
                     payload: {
                         success: false,
-                        error: `Could not load plugin ${plugin} \n ${e instanceof Error ? e.stack : ''}`,
+                        error: (0, serializable_error_1.createSerializableError)(e),
                     },
                 };
             }
@@ -43,7 +47,11 @@ process.on('message', async (message) => {
             catch (e) {
                 return {
                     type: 'createNodesResult',
-                    payload: { success: false, error: e.stack, tx },
+                    payload: {
+                        success: false,
+                        error: (0, serializable_error_1.createSerializableError)(e),
+                        tx,
+                    },
                 };
             }
         },
@@ -58,7 +66,11 @@ process.on('message', async (message) => {
             catch (e) {
                 return {
                     type: 'createDependenciesResult',
-                    payload: { success: false, error: e.stack, tx },
+                    payload: {
+                        success: false,
+                        error: (0, serializable_error_1.createSerializableError)(e),
+                        tx,
+                    },
                 };
             }
         },
@@ -73,7 +85,11 @@ process.on('message', async (message) => {
             catch (e) {
                 return {
                     type: 'processProjectGraphResult',
-                    payload: { success: false, error: e.stack, tx },
+                    payload: {
+                        success: false,
+                        error: (0, serializable_error_1.createSerializableError)(e),
+                        tx,
+                    },
                 };
             }
         },