nx 19.2.0-canary.20240528-7f11a1d → 19.2.0-canary.20240531-2cb7ecb

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

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCreateNodesInParallel = exports.normalizeNxPlugin = exports.isNxPluginV1 = exports.isNxPluginV2 = void 0;
+exports.createNodesFromFiles = exports.normalizeNxPlugin = exports.isNxPluginV1 = exports.isNxPluginV2 = void 0;
 const node_path_1 = require("node:path");
 const to_project_name_1 = require("../../config/to-project-name");
 const globs_1 = require("../../utils/globs");
 const error_types_1 = require("../error-types");
-const perf_hooks_1 = require("perf_hooks");
 function isNxPluginV2(plugin) {
     return 'createNodes' in plugin || 'createDependencies' in plugin;
 }
@@ -40,36 +39,24 @@ function normalizeNxPlugin(plugin) {
     return plugin;
 }
 exports.normalizeNxPlugin = normalizeNxPlugin;
-async function runCreateNodesInParallel(configFiles, plugin, options, context) {
-    perf_hooks_1.performance.mark(`${plugin.name}:createNodes - start`);
-    const errors = [];
+async function createNodesFromFiles(createNodes, configFiles, options, context) {
     const results = [];
-    const promises = configFiles.map(async (file) => {
+    const errors = [];
+    await Promise.all(configFiles.map(async (file) => {
         try {
-            const value = await plugin.createNodes[1](file, options, context);
-            if (value) {
-                results.push({
-                    ...value,
-                    file,
-                    pluginName: plugin.name,
-                });
-            }
+            const value = await createNodes(file, options, {
+                ...context,
+                configFiles,
+            });
+            results.push([file, value]);
         }
         catch (e) {
-            errors.push(new error_types_1.CreateNodesError({
-                error: e,
-                pluginName: plugin.name,
-                file,
-            }));
+            errors.push([file, e]);
         }
-    });
-    await Promise.all(promises).then(() => {
-        perf_hooks_1.performance.mark(`${plugin.name}:createNodes - end`);
-        perf_hooks_1.performance.measure(`${plugin.name}:createNodes`, `${plugin.name}:createNodes - start`, `${plugin.name}:createNodes - end`);
-    });
+    }));
     if (errors.length > 0) {
-        throw new error_types_1.AggregateCreateNodesError(plugin.name, errors, results);
+        throw new error_types_1.AggregateCreateNodesError(errors, results);
     }
     return results;
 }
-exports.runCreateNodesInParallel = runCreateNodesInParallel;
+exports.createNodesFromFiles = createNodesFromFiles;

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

@@ -227,92 +227,35 @@ plugins) {
     const results = [];
     const errors = [];
     // We iterate over plugins first - this ensures that plugins specified first take precedence.
-    for (const { name: pluginName, createNodes: createNodesTuple, include, exclude, } of plugins) {
+    for (const { createNodes: createNodesTuple, include, exclude, name: pluginName, } of plugins) {
         const [pattern, createNodes] = createNodesTuple ?? [];
         if (!pattern) {
             continue;
         }
-        const matchingConfigFiles = [];
-        for (const file of projectFiles) {
-            if ((0, minimatch_1.minimatch)(file, pattern, { dot: true })) {
-                if (include) {
-                    const included = include.some((includedPattern) => (0, minimatch_1.minimatch)(file, includedPattern, { dot: true }));
-                    if (!included) {
-                        continue;
-                    }
-                }
-                if (exclude) {
-                    const excluded = exclude.some((excludedPattern) => (0, minimatch_1.minimatch)(file, excludedPattern, { dot: true }));
-                    if (excluded) {
-                        continue;
-                    }
-                }
-                matchingConfigFiles.push(file);
-            }
-        }
+        const matchingConfigFiles = findMatchingConfigFiles(projectFiles, pattern, include, exclude);
         let r = createNodes(matchingConfigFiles, {
             nxJsonConfiguration: nxJson,
             workspaceRoot: root,
-            configFiles: matchingConfigFiles,
         }).catch((e) => {
-            if ((0, error_types_1.isAggregateCreateNodesError)(e)) {
-                errors.push(...e.errors);
-                return e.partialResults;
-            }
-            else {
-                throw e;
-            }
+            const errorBodyLines = [
+                `An error occurred while processing files for the ${pluginName} plugin.`,
+            ];
+            const error = (0, error_types_1.isAggregateCreateNodesError)(e)
+                ? // This is an expected error if something goes wrong while processing files.
+                    e
+                : // This represents a single plugin erroring out with a hard error.
+                    new error_types_1.AggregateCreateNodesError([[null, e]], []);
+            errorBodyLines.push(...error.errors.map(([file, e]) => `  - ${file}: ${e.message}`));
+            error.message = errorBodyLines.join('\n');
+            // This represents a single plugin erroring out with a hard error.
+            errors.push(error);
+            // The plugin didn't return partial results, so we return an empty array.
+            return error.partialResults.map((r) => [pluginName, r[0], r[1]]);
         });
         results.push(r);
     }
     return Promise.all(results).then((results) => {
-        perf_hooks_1.performance.mark('createNodes:merge - start');
-        const projectRootMap = {};
-        const externalNodes = {};
-        const configurationSourceMaps = {};
-        for (const result of results.flat()) {
-            const { projects: projectNodes, externalNodes: pluginExternalNodes, file, pluginName, } = result;
-            const sourceInfo = [file, pluginName];
-            if (result[symbols_1.OVERRIDE_SOURCE_FILE]) {
-                sourceInfo[0] = result[symbols_1.OVERRIDE_SOURCE_FILE];
-            }
-            for (const node in projectNodes) {
-                // Handles `{projects: {'libs/foo': undefined}}`.
-                if (!projectNodes[node]) {
-                    continue;
-                }
-                const project = {
-                    root: node,
-                    ...projectNodes[node],
-                };
-                try {
-                    mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInfo);
-                }
-                catch (error) {
-                    errors.push(new error_types_1.MergeNodesError({
-                        file,
-                        pluginName,
-                        error,
-                    }));
-                }
-            }
-            Object.assign(externalNodes, pluginExternalNodes);
-        }
-        try {
-            validateAndNormalizeProjectRootMap(projectRootMap);
-        }
-        catch (e) {
-            if ((0, error_types_1.isProjectsWithNoNameError)(e) ||
-                (0, error_types_1.isMultipleProjectsWithSameNameError)(e)) {
-                errors.push(e);
-            }
-            else {
-                throw e;
-            }
-        }
-        const rootMap = createRootMap(projectRootMap);
-        perf_hooks_1.performance.mark('createNodes:merge - end');
-        perf_hooks_1.performance.measure('createNodes:merge', 'createNodes:merge - start', 'createNodes:merge - end');
+        const { projectRootMap, externalNodes, rootMap, configurationSourceMaps } = mergeCreateNodesResults(results, errors);
         perf_hooks_1.performance.mark('build-project-configs:end');
         perf_hooks_1.performance.measure('build-project-configs', 'build-project-configs:start', 'build-project-configs:end');
         if (errors.length === 0) {
@@ -336,6 +279,78 @@ plugins) {
     });
 }
 exports.createProjectConfigurations = createProjectConfigurations;
+function mergeCreateNodesResults(results, errors) {
+    perf_hooks_1.performance.mark('createNodes:merge - start');
+    const projectRootMap = {};
+    const externalNodes = {};
+    const configurationSourceMaps = {};
+    for (const result of results.flat()) {
+        const [file, pluginName, nodes] = result;
+        const { projects: projectNodes, externalNodes: pluginExternalNodes } = nodes;
+        const sourceInfo = [file, pluginName];
+        if (result[symbols_1.OVERRIDE_SOURCE_FILE]) {
+            sourceInfo[0] = result[symbols_1.OVERRIDE_SOURCE_FILE];
+        }
+        for (const node in projectNodes) {
+            // Handles `{projects: {'libs/foo': undefined}}`.
+            if (!projectNodes[node]) {
+                continue;
+            }
+            const project = {
+                root: node,
+                ...projectNodes[node],
+            };
+            try {
+                mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInfo);
+            }
+            catch (error) {
+                errors.push(new error_types_1.MergeNodesError({
+                    file,
+                    pluginName,
+                    error,
+                }));
+            }
+        }
+        Object.assign(externalNodes, pluginExternalNodes);
+    }
+    try {
+        validateAndNormalizeProjectRootMap(projectRootMap);
+    }
+    catch (e) {
+        if ((0, error_types_1.isProjectsWithNoNameError)(e) ||
+            (0, error_types_1.isMultipleProjectsWithSameNameError)(e)) {
+            errors.push(e);
+        }
+        else {
+            throw e;
+        }
+    }
+    const rootMap = createRootMap(projectRootMap);
+    perf_hooks_1.performance.mark('createNodes:merge - end');
+    perf_hooks_1.performance.measure('createNodes:merge', 'createNodes:merge - start', 'createNodes:merge - end');
+    return { projectRootMap, externalNodes, rootMap, configurationSourceMaps };
+}
+function findMatchingConfigFiles(projectFiles, pattern, include, exclude) {
+    const matchingConfigFiles = [];
+    for (const file of projectFiles) {
+        if ((0, minimatch_1.minimatch)(file, pattern, { dot: true })) {
+            if (include) {
+                const included = include.some((includedPattern) => (0, minimatch_1.minimatch)(file, includedPattern, { dot: true }));
+                if (!included) {
+                    continue;
+                }
+            }
+            if (exclude) {
+                const excluded = exclude.some((excludedPattern) => (0, minimatch_1.minimatch)(file, excludedPattern, { dot: true }));
+                if (excluded) {
+                    continue;
+                }
+            }
+            matchingConfigFiles.push(file);
+        }
+    }
+    return matchingConfigFiles;
+}
 function readProjectConfigurationsFromRootMap(projectRootMap) {
     const projects = {};
     // If there are projects that have the same name, that is an error.

package/src/tasks-runner/utils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.unparse = exports.isCacheableTask = exports.shouldStreamOutput = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getCliPath = exports.calculateReverseDeps = exports.removeIdsFromGraph = exports.removeTasksFromTaskGraph = exports.getCustomHasher = exports.getExecutorForTask = exports.getExecutorNameForTask = exports.getTargetConfigurationForTask = exports.interpolate = exports.getOutputsForTargetAndConfiguration = exports.transformLegacyOutputs = exports.validateOutputs = exports.getOutputs = exports.expandDependencyConfigSyntaxSugar = exports.getDependencyConfigs = void 0;
 const output_1 = require("../utils/output");
 const path_1 = require("path");
+const posix_1 = require("path/posix");
 const workspace_root_1 = require("../utils/workspace-root");
 const path_2 = require("../utils/path");
 const fileutils_1 = require("../utils/fileutils");
@@ -166,18 +167,32 @@ function getOutputsForTargetAndConfiguration(taskTargetOrTask, overridesOrNode,
     }
 }
 exports.getOutputsForTargetAndConfiguration = getOutputsForTargetAndConfiguration;
+/**
+ * Matches portions of a string which need to be interpolated.
+ * Matches anything within curly braces, excluding the braces.
+ */
+const replacementRegex = /{([\s\S]+?)}/g;
 function interpolate(template, data) {
+    // Path is absolute or doesn't need interpolation
+    if (template.startsWith('/') || !replacementRegex.test(template)) {
+        return template;
+    }
     if (template.includes('{workspaceRoot}', 1)) {
         throw new Error(`Output '${template}' is invalid. {workspaceRoot} can only be used at the beginning of the expression.`);
     }
     if (data.projectRoot == '.' && template.includes('{projectRoot}', 1)) {
         throw new Error(`Output '${template}' is invalid. When {projectRoot} is '.', it can only be used at the beginning of the expression.`);
     }
-    let res = template.replace('{workspaceRoot}/', '');
+    const parts = template.split('/').map((s) => _interpolate(s, data));
+    return (0, posix_1.join)(...parts).replace('{workspaceRoot}/', '');
+}
+exports.interpolate = interpolate;
+function _interpolate(template, data) {
+    let res = template;
     if (data.projectRoot == '.') {
-        res = res.replace('{projectRoot}/', '');
+        res = res.replace('{projectRoot}', '');
     }
-    return res.replace(/{([\s\S]+?)}/g, (match) => {
+    return res.replace(replacementRegex, (match) => {
         let value = data;
         let path = match.slice(1, -1).trim().split('.');
         for (let idx = 0; idx < path.length; idx++) {
@@ -189,7 +204,6 @@ function interpolate(template, data) {
         return value;
     });
 }
-exports.interpolate = interpolate;
 function getTargetConfigurationForTask(task, projectGraph) {
     const project = projectGraph.nodes[task.target.project].data;
     return project.targets[task.target.target];

package/src/utils/print-help.js

@@ -226,7 +226,7 @@ function generateLinkOutput({ pluginName, name, type, }) {
         !pluginName.startsWith(nrwlPackagePrefix)) {
         return '';
     }
-    const link = `https://nx.dev/packages/${pluginName.substring(pluginName.startsWith(nxPackagePrefix)
+    const link = `https://nx.dev/nx-api/${pluginName.substring(pluginName.startsWith(nxPackagePrefix)
         ? nxPackagePrefix.length
         : nrwlPackagePrefix.length)}/${type}/${name}`;
     return `\n\n${chalk.dim('Find more information and examples at:')} ${chalk.bold(link)}`;