nx 18.4.0-canary.20240418-e549ea2 → 19.0.0-beta.1

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,
+                    },
                 };
             }
         },

package/src/project-graph/plugins/loader.js

@@ -14,10 +14,11 @@ const find_project_for_path_1 = require("../utils/find-project-for-path");
 const path_1 = require("../../utils/path");
 const logger_1 = require("../../utils/logger");
 const node_path_1 = require("node:path");
-const path = require("node:path/posix");
 const retrieve_workspace_files_1 = require("../utils/retrieve-workspace-files");
 const utils_1 = require("./utils");
 const internal_api_1 = require("./internal-api");
+const error_types_1 = require("../error-types");
+const path = require("node:path/posix");
 function readPluginPackageJson(pluginName, projects, paths = (0, installation_directory_1.getNxRequirePaths)()) {
     try {
         const result = (0, package_json_1.readModulePackageJsonWithoutFallbacks)(pluginName, paths);
@@ -174,26 +175,29 @@ function loadNxPlugin(plugin, root) {
 }
 exports.loadNxPlugin = loadNxPlugin;
 async function loadNxPluginAsync(pluginConfiguration, paths, root) {
-    try {
-        require.resolve(typeof pluginConfiguration === 'string'
-            ? pluginConfiguration
-            : pluginConfiguration.plugin);
-    }
-    catch {
-        // If a plugin cannot be resolved, we will need projects to resolve it
-        projectsWithoutInference ??=
-            await (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
-    }
     const moduleName = typeof pluginConfiguration === 'string'
         ? pluginConfiguration
         : pluginConfiguration.plugin;
-    performance.mark(`Load Nx Plugin: ${moduleName} - start`);
-    let { pluginPath, name } = await getPluginPathAndName(moduleName, paths, projectsWithoutInference, root);
-    const plugin = (0, utils_1.normalizeNxPlugin)(await importPluginModule(pluginPath));
-    plugin.name ??= name;
-    performance.mark(`Load Nx Plugin: ${moduleName} - end`);
-    performance.measure(`Load Nx Plugin: ${moduleName}`, `Load Nx Plugin: ${moduleName} - start`, `Load Nx Plugin: ${moduleName} - end`);
-    return new internal_api_1.LoadedNxPlugin(plugin, pluginConfiguration);
+    try {
+        try {
+            require.resolve(moduleName);
+        }
+        catch {
+            // If a plugin cannot be resolved, we will need projects to resolve it
+            projectsWithoutInference ??=
+                await (0, retrieve_workspace_files_1.retrieveProjectConfigurationsWithoutPluginInference)(root);
+        }
+        performance.mark(`Load Nx Plugin: ${moduleName} - start`);
+        let { pluginPath, name } = await getPluginPathAndName(moduleName, paths, projectsWithoutInference, root);
+        const plugin = (0, utils_1.normalizeNxPlugin)(await importPluginModule(pluginPath));
+        plugin.name ??= name;
+        performance.mark(`Load Nx Plugin: ${moduleName} - end`);
+        performance.measure(`Load Nx Plugin: ${moduleName}`, `Load Nx Plugin: ${moduleName} - start`, `Load Nx Plugin: ${moduleName} - end`);
+        return new internal_api_1.LoadedNxPlugin(plugin, pluginConfiguration);
+    }
+    catch (e) {
+        throw new error_types_1.LoadPluginError(moduleName, e);
+    }
 }
 exports.loadNxPluginAsync = loadNxPluginAsync;
 async function importPluginModule(pluginPath) {

package/src/tasks-runner/task-orchestrator.js

@@ -214,37 +214,55 @@ class TaskOrchestrator {
             if (process.env.NX_RUN_COMMANDS_DIRECTLY !== 'false' &&
                 targetConfiguration.executor === 'nx:run-commands' &&
                 !shouldPrefix) {
-                const { schema } = (0, utils_1.getExecutorForTask)(task, this.projectGraph);
-                const isRunOne = this.initiatingProject != null;
-                const combinedOptions = (0, params_1.combineOptionsForExecutor)(task.overrides, task.target.configuration ?? targetConfiguration.defaultConfiguration, targetConfiguration, schema, task.target.project, (0, path_1.relative)(task.projectRoot ?? workspace_root_1.workspaceRoot, process.cwd()), process.env.NX_VERBOSE_LOGGING === 'true');
-                if (combinedOptions.env) {
-                    env = {
-                        ...env,
-                        ...combinedOptions.env,
-                    };
-                }
-                if (streamOutput) {
-                    const args = (0, utils_1.getPrintableCommandArgsForTask)(task);
-                    output_1.output.logCommand(args.join(' '));
+                try {
+                    const { schema } = (0, utils_1.getExecutorForTask)(task, this.projectGraph);
+                    const isRunOne = this.initiatingProject != null;
+                    const combinedOptions = (0, params_1.combineOptionsForExecutor)(task.overrides, task.target.configuration ??
+                        targetConfiguration.defaultConfiguration, targetConfiguration, schema, task.target.project, (0, path_1.relative)(task.projectRoot ?? workspace_root_1.workspaceRoot, process.cwd()), process.env.NX_VERBOSE_LOGGING === 'true');
+                    if (combinedOptions.env) {
+                        env = {
+                            ...env,
+                            ...combinedOptions.env,
+                        };
+                    }
+                    if (streamOutput) {
+                        const args = (0, utils_1.getPrintableCommandArgsForTask)(task);
+                        output_1.output.logCommand(args.join(' '));
+                    }
+                    const { success, terminalOutput } = await (0, run_commands_impl_1.default)({
+                        ...combinedOptions,
+                        env,
+                        usePty: isRunOne && !this.tasksSchedule.hasTasks(),
+                        streamOutput,
+                    }, {
+                        root: workspace_root_1.workspaceRoot, // only root is needed in runCommandsImpl
+                    });
+                    const status = success ? 'success' : 'failure';
+                    if (!streamOutput) {
+                        this.options.lifeCycle.printTaskTerminalOutput(task, status, terminalOutput);
+                    }
+                    (0, fs_1.writeFileSync)(temporaryOutputPath, terminalOutput);
+                    results.push({
+                        task,
+                        status,
+                        terminalOutput,
+                    });
                 }
-                const { success, terminalOutput } = await (0, run_commands_impl_1.default)({
-                    ...combinedOptions,
-                    env,
-                    usePty: isRunOne && !this.tasksSchedule.hasTasks(),
-                    streamOutput,
-                }, {
-                    root: workspace_root_1.workspaceRoot, // only root is needed in runCommandsImpl
-                });
-                const status = success ? 'success' : 'failure';
-                if (!streamOutput) {
-                    this.options.lifeCycle.printTaskTerminalOutput(task, status, terminalOutput);
+                catch (e) {
+                    if (process.env.NX_VERBOSE_LOGGING === 'true') {
+                        console.error(e);
+                    }
+                    else {
+                        console.error(e.message);
+                    }
+                    const terminalOutput = e.stack ?? e.message ?? '';
+                    (0, fs_1.writeFileSync)(temporaryOutputPath, terminalOutput);
+                    results.push({
+                        task,
+                        status: 'failure',
+                        terminalOutput,
+                    });
                 }
-                (0, fs_1.writeFileSync)(temporaryOutputPath, terminalOutput);
-                results.push({
-                    task,
-                    status,
-                    terminalOutput,
-                });
             }
             else {
                 // cache prep

package/src/utils/params.js

@@ -176,26 +176,29 @@ function validateObject(opts, schema, definitions) {
         }
     }
     if (schema.oneOf) {
-        for (const s of schema.oneOf) {
-            const errors = [];
-            for (const s of schema.oneOf) {
-                try {
-                    validateObject(opts, s, definitions);
-                }
-                catch (e) {
-                    errors.push(e);
-                }
-            }
-            if (errors.length === schema.oneOf.length) {
-                throw new Error(`Options did not match schema. Please fix 1 of the following errors:\n${errors
-                    .map((e) => ' - ' + e.message)
-                    .join('\n')}`);
+        const matches = [];
+        const errors = [];
+        for (const propertyDescription of schema.oneOf) {
+            try {
+                validateObject(opts, propertyDescription, definitions);
+                matches.push(propertyDescription);
             }
-            if (errors.length < schema.oneOf.length - 1) {
-                // TODO: This error could be better.
-                throw new Error(`Options did not match schema.`);
+            catch (error) {
+                errors.push(error);
             }
         }
+        // If the options matched none of the oneOf property descriptions
+        if (matches.length === 0) {
+            throw new Error(`Options did not match schema: ${JSON.stringify(opts, null, 2)}.\nPlease fix 1 of the following errors:\n${errors
+                .map((e) => ' - ' + e.message)
+                .join('\n')}`);
+        }
+        // If the options matched none of the oneOf property descriptions
+        if (matches.length > 1) {
+            throw new Error(`Options did not match schema: ${JSON.stringify(opts, null, 2)}.\nShould only match one of \n${matches
+                .map((m) => ' - ' + JSON.stringify(m))
+                .join('\n')}`);
+        }
     }
     (schema.required ?? []).forEach((p) => {
         if (opts[p] === undefined) {

package/src/utils/serializable-error.d.ts

@@ -0,0 +1,4 @@
+/**
+ * This function transforms an error into an object which can be properly serialized and deserialized to be sent between processes.
+ */
+export declare function createSerializableError<T extends Error>(error: T): T;

package/src/utils/serializable-error.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSerializableError = void 0;
+/**
+ * This function transforms an error into an object which can be properly serialized and deserialized to be sent between processes.
+ */
+function createSerializableError(error) {
+    const res = {};
+    Object.getOwnPropertyNames(error).forEach((k) => {
+        let value = error[k];
+        // If an error has an error as a property such as cause, it will be transformed into a serializable error
+        if (typeof value === 'object' && value instanceof Error) {
+            value = createSerializableError(value);
+        }
+        // If an error has an array of errors as a property, they will be transformed into serializable errors
+        if (Array.isArray(value)) {
+            value = value.map((v) => {
+                if (typeof v === 'object' && v instanceof Error) {
+                    return createSerializableError(v);
+                }
+                return v;
+            });
+        }
+        res[k] = value;
+    });
+    return res;
+}
+exports.createSerializableError = createSerializableError;