nx 19.5.0-canary.20240705-653cad2 → 19.5.0-canary.20240709-92e09d9

package/src/tasks-runner/utils.js

@@ -1,7 +1,6 @@
 "use strict";
 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");
+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.normalizeTargetDependencyWithStringProjects = exports.getOutputs = exports.readProjectAndTargetFromTargetString = exports.expandWildcardTargetConfiguration = exports.expandDependencyConfigSyntaxSugar = exports.normalizeDependencyConfigProjects = exports.normalizeDependencyConfigDefinition = exports.getDependencyConfigs = void 0;
 const path_1 = require("path");
 const posix_1 = require("path/posix");
 const workspace_root_1 = require("../utils/workspace-root");
@@ -11,28 +10,35 @@ const serialize_overrides_into_command_line_1 = require("../utils/serialize-over
 const split_target_1 = require("../utils/split-target");
 const executor_utils_1 = require("../command-line/run/executor-utils");
 const project_graph_1 = require("../project-graph/project-graph");
-function getDependencyConfigs({ project, target }, extraTargetDependencies, projectGraph) {
+const find_matching_projects_1 = require("../utils/find-matching-projects");
+const minimatch_1 = require("minimatch");
+function getDependencyConfigs({ project, target }, extraTargetDependencies, projectGraph, allTargetNames) {
     const dependencyConfigs = (projectGraph.nodes[project].data?.targets[target]?.dependsOn ??
         // This is passed into `run-command` from programmatic invocations
         extraTargetDependencies[target] ??
-        []).map((config) => typeof config === 'string'
-        ? expandDependencyConfigSyntaxSugar(config, projectGraph)
-        : config);
-    for (const dependencyConfig of dependencyConfigs) {
-        if (dependencyConfig.projects && dependencyConfig.dependencies) {
-            output_1.output.error({
-                title: `dependsOn is improperly configured for ${project}:${target}`,
-                bodyLines: [
-                    `dependsOn.projects and dependsOn.dependencies cannot be used together.`,
-                ],
-            });
-            process.exit(1);
-        }
-    }
+        []).flatMap((config) => normalizeDependencyConfigDefinition(config, project, projectGraph, allTargetNames));
     return dependencyConfigs;
 }
 exports.getDependencyConfigs = getDependencyConfigs;
+function normalizeDependencyConfigDefinition(definition, currentProject, graph, allTargetNames) {
+    return expandWildcardTargetConfiguration(normalizeDependencyConfigProjects(expandDependencyConfigSyntaxSugar(definition, graph), currentProject, graph), allTargetNames);
+}
+exports.normalizeDependencyConfigDefinition = normalizeDependencyConfigDefinition;
+function normalizeDependencyConfigProjects(dependencyConfig, currentProject, graph) {
+    const noStringConfig = normalizeTargetDependencyWithStringProjects(dependencyConfig);
+    if (noStringConfig.projects) {
+        dependencyConfig.projects = (0, find_matching_projects_1.findMatchingProjects)(noStringConfig.projects, graph.nodes);
+    }
+    else if (!noStringConfig.dependencies) {
+        dependencyConfig.projects = [currentProject];
+    }
+    return dependencyConfig;
+}
+exports.normalizeDependencyConfigProjects = normalizeDependencyConfigProjects;
 function expandDependencyConfigSyntaxSugar(dependencyConfigString, graph) {
+    if (typeof dependencyConfigString !== 'string') {
+        return dependencyConfigString;
+    }
     const [dependencies, targetString] = dependencyConfigString.startsWith('^')
         ? [true, dependencyConfigString.substring(1)]
         : [false, dependencyConfigString];
@@ -44,26 +50,84 @@ function expandDependencyConfigSyntaxSugar(dependencyConfigString, graph) {
             dependencies: true,
         };
     }
+    const { projects, target } = readProjectAndTargetFromTargetString(targetString, graph.nodes);
+    return projects ? { projects, target } : { target };
+}
+exports.expandDependencyConfigSyntaxSugar = expandDependencyConfigSyntaxSugar;
+// Weakmap let's the cache get cleared by garbage collector if allTargetNames is no longer used
+const patternResultCache = new WeakMap();
+function expandWildcardTargetConfiguration(dependencyConfig, allTargetNames) {
+    if (!find_matching_projects_1.GLOB_CHARACTERS.some((char) => dependencyConfig.target.includes(char))) {
+        return [dependencyConfig];
+    }
+    let cache = patternResultCache.get(allTargetNames);
+    if (!cache) {
+        cache = new Map();
+        patternResultCache.set(allTargetNames, cache);
+    }
+    const cachedResult = cache.get(dependencyConfig.target);
+    if (cachedResult) {
+        return cachedResult;
+    }
+    const matcher = minimatch_1.minimatch.filter(dependencyConfig.target);
+    const matchingTargets = allTargetNames.filter((t) => matcher(t));
+    const result = matchingTargets.map((t) => ({
+        ...dependencyConfig,
+        target: t,
+    }));
+    cache.set(dependencyConfig.target, result);
+    return result;
+}
+exports.expandWildcardTargetConfiguration = expandWildcardTargetConfiguration;
+function readProjectAndTargetFromTargetString(targetString, projects) {
     // Support for both `project:target` and `target:with:colons` syntax
     const [maybeProject, ...segments] = (0, split_target_1.splitByColons)(targetString);
-    // if no additional segments are provided, then the string references
-    // a target of the same project
     if (!segments.length) {
+        // if no additional segments are provided, then the string references
+        // a target of the same project
         return { target: maybeProject };
     }
-    return {
+    else if (maybeProject in projects) {
         // Only the first segment could be a project. If it is, the rest is a target.
         // If its not, then the whole targetString was a target with colons in its name.
-        target: maybeProject in graph.nodes ? segments.join(':') : targetString,
+        return { projects: [maybeProject], target: segments.join(':') };
+    }
+    else {
         // If the first segment is a project, then we have a specific project. Otherwise, we don't.
-        projects: maybeProject in graph.nodes ? [maybeProject] : undefined,
-    };
+        return { target: targetString };
+    }
 }
-exports.expandDependencyConfigSyntaxSugar = expandDependencyConfigSyntaxSugar;
+exports.readProjectAndTargetFromTargetString = readProjectAndTargetFromTargetString;
 function getOutputs(p, target, overrides) {
     return getOutputsForTargetAndConfiguration(target, overrides, p[target.project]);
 }
 exports.getOutputs = getOutputs;
+function normalizeTargetDependencyWithStringProjects(dependencyConfig) {
+    if (typeof dependencyConfig.projects === 'string') {
+        /** LERNA SUPPORT START - Remove in v20 */
+        // Lerna uses `dependencies` in `prepNxOptions`, so we need to maintain
+        // support for it until lerna can be updated to use the syntax.
+        //
+        // This should have been removed in v17, but the updates to lerna had not
+        // been made yet.
+        //
+        // TODO(@agentender): Remove this part in v20
+        if (dependencyConfig.projects === 'self') {
+            delete dependencyConfig.projects;
+        }
+        else if (dependencyConfig.projects === 'dependencies') {
+            dependencyConfig.dependencies = true;
+            delete dependencyConfig.projects;
+            return;
+            /** LERNA SUPPORT END - Remove in v20 */
+        }
+        else {
+            dependencyConfig.projects = [dependencyConfig.projects];
+        }
+    }
+    return dependencyConfig;
+}
+exports.normalizeTargetDependencyWithStringProjects = normalizeTargetDependencyWithStringProjects;
 class InvalidOutputsError extends Error {
     constructor(outputs, invalidOutputs) {
         super(InvalidOutputsError.createMessage(invalidOutputs));

package/src/utils/find-matching-projects.d.ts

@@ -1,4 +1,8 @@
 import type { ProjectGraphProjectNode } from '../config/project-graph';
+/**
+ * The presence of these characters in a string indicates that it might be a glob pattern.
+ */
+export declare const GLOB_CHARACTERS: string[];
 /**
  * Find matching project names given a list of potential project names or globs.
  *

package/src/utils/find-matching-projects.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMatchingStringsWithCache = exports.findMatchingProjects = void 0;
+exports.getMatchingStringsWithCache = exports.findMatchingProjects = exports.GLOB_CHARACTERS = void 0;
 const minimatch_1 = require("minimatch");
 const validPatternTypes = [
     'name', // Pattern is based on the project's name
@@ -8,7 +8,10 @@ const validPatternTypes = [
     'directory', // Pattern is based on the project's root directory
     'unlabeled', // Pattern was passed without specifying a type
 ];
-const globCharacters = ['*', '|', '{', '}', '(', ')'];
+/**
+ * The presence of these characters in a string indicates that it might be a glob pattern.
+ */
+exports.GLOB_CHARACTERS = ['*', '|', '{', '}', '(', ')'];
 /**
  * Find matching project names given a list of potential project names or globs.
  *
@@ -110,7 +113,7 @@ function addMatchingProjectsByName(projectNames, projects, pattern, matchedProje
         }
         return;
     }
-    if (!globCharacters.some((c) => pattern.value.includes(c))) {
+    if (!exports.GLOB_CHARACTERS.some((c) => pattern.value.includes(c))) {
         return;
     }
     const matchedProjectNames = (0, exports.getMatchingStringsWithCache)(pattern.value, projectNames);
@@ -135,7 +138,7 @@ function addMatchingProjectsByTag(projectNames, projects, pattern, matchedProjec
             }
             continue;
         }
-        if (!globCharacters.some((c) => pattern.value.includes(c))) {
+        if (!exports.GLOB_CHARACTERS.some((c) => pattern.value.includes(c))) {
             continue;
         }
         if ((0, exports.getMatchingStringsWithCache)(pattern.value, tags).length) {

package/src/utils/serializable-error.js

@@ -17,6 +17,12 @@ function createSerializableError(error) {
             value = value.map((v) => {
                 if (typeof v === 'object' && v instanceof Error) {
                     return createSerializableError(v);
+                    // Support for AggregateCreateNodesError
+                }
+                else if (Array.isArray(v) &&
+                    v.length === 2 &&
+                    v[1] instanceof Error) {
+                    return [v[0], createSerializableError(v[1])];
                 }
                 return v;
             });