nx 19.0.0-canary.20240502-5ded713 → 19.0.0-canary.20240503-dbad02a

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeTarget = exports.readTargetDefaultsForTarget = exports.resolveNxTokensInOptions = exports.isCompatibleTarget = exports.mergeTargetConfigurations = exports.readProjectConfigurationsFromRootMap = exports.createProjectConfigurations = exports.mergeMetadata = exports.mergeProjectConfigurationIntoRootMap = void 0;
+exports.normalizeTarget = exports.readTargetDefaultsForTarget = exports.resolveNxTokensInOptions = exports.isCompatibleTarget = exports.mergeTargetConfigurations = exports.validateProject = exports.readProjectConfigurationsFromRootMap = exports.createProjectConfigurations = exports.mergeMetadata = exports.mergeProjectConfigurationIntoRootMap = void 0;
 const logger_1 = require("../../utils/logger");
 const fileutils_1 = require("../../utils/fileutils");
 const workspace_root_1 = require("../../utils/workspace-root");
@@ -131,7 +131,7 @@ skipTargetNormalization) {
             }
             const normalizedTarget = skipTargetNormalization
                 ? target
-                : normalizeTarget(target, project);
+                : resolveCommandSyntacticSugar(target, project.root);
             const mergedTarget = mergeTargetConfigurations(normalizedTarget, matchingProject.targets?.[targetName], sourceMap, sourceInformation, `targets.${targetName}`);
             // We don't want the symbol to live on past the merge process
             if (mergedTarget?.[symbols_1.ONLY_MODIFIES_EXISTING_TARGET])
@@ -295,16 +295,11 @@ plugins) {
             Object.assign(externalNodes, pluginExternalNodes);
         }
         try {
-            // We still call this just to assert that the root map
-            // only contains valid project names. This is a safety check.
-            //
-            // The signature itself can't be changed as we need it to return
-            // project configurations for use in devkit.
-            readProjectConfigurationsFromRootMap(projectRootMap);
+            validateAndNormalizeProjectRootMap(projectRootMap);
         }
         catch (e) {
             if ((0, error_types_1.isProjectsWithNoNameError)(e) ||
-                (0, error_types_1.isProjectsWithConflictingNamesError)(e)) {
+                (0, error_types_1.isMultipleProjectsWithSameNameError)(e)) {
                 errors.push(e);
             }
             else {
@@ -345,34 +340,33 @@ function readProjectConfigurationsFromRootMap(projectRootMap) {
     const conflicts = new Map();
     const projectRootsWithNoName = [];
     for (const root in projectRootMap) {
-        const configuration = projectRootMap[root];
+        const project = projectRootMap[root];
         // We're setting `// targets` as a comment `targets` is empty due to Project Crystal.
         // Strip it before returning configuration for usage.
-        if (configuration['// targets'])
-            delete configuration['// targets'];
-        if (!configuration.name) {
-            try {
-                const { name } = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
-                configuration.name = name;
+        if (project['// targets'])
+            delete project['// targets'];
+        try {
+            validateProject(project, projects);
+            projects[project.name] = project;
+        }
+        catch (e) {
+            if ((0, error_types_1.isProjectWithNoNameError)(e)) {
+                projectRootsWithNoName.push(e.projectRoot);
             }
-            catch {
-                projectRootsWithNoName.push(root);
+            else if ((0, error_types_1.isProjectWithExistingNameError)(e)) {
+                const rootErrors = conflicts.get(e.projectName) ?? [
+                    projects[e.projectName].root,
+                ];
+                rootErrors.push(e.projectRoot);
+                conflicts.set(e.projectName, rootErrors);
+            }
+            else {
+                throw e;
             }
-        }
-        if (configuration.name in projects) {
-            let rootErrors = conflicts.get(configuration.name) ?? [
-                projects[configuration.name].root,
-            ];
-            rootErrors.push(root);
-            conflicts.set(configuration.name, rootErrors);
-            projects[configuration.name] = configuration;
-        }
-        else {
-            projects[configuration.name] = configuration;
         }
     }
     if (conflicts.size > 0) {
-        throw new error_types_1.ProjectsWithConflictingNamesError(conflicts, projects);
+        throw new error_types_1.MultipleProjectsWithSameNameError(conflicts, projects);
     }
     if (projectRootsWithNoName.length > 0) {
         throw new error_types_1.ProjectsWithNoNameError(projectRootsWithNoName, projects);
@@ -380,6 +374,76 @@ function readProjectConfigurationsFromRootMap(projectRootMap) {
     return projects;
 }
 exports.readProjectConfigurationsFromRootMap = readProjectConfigurationsFromRootMap;
+function validateAndNormalizeProjectRootMap(projectRootMap) {
+    // Name -> Project, used to validate that all projects have unique names
+    const projects = {};
+    // If there are projects that have the same name, that is an error.
+    // This object tracks name -> (all roots of projects with that name)
+    // to provide better error messaging.
+    const conflicts = new Map();
+    const projectRootsWithNoName = [];
+    for (const root in projectRootMap) {
+        const project = projectRootMap[root];
+        // We're setting `// targets` as a comment `targets` is empty due to Project Crystal.
+        // Strip it before returning configuration for usage.
+        if (project['// targets'])
+            delete project['// targets'];
+        try {
+            validateProject(project, projects);
+            projects[project.name] = project;
+        }
+        catch (e) {
+            if ((0, error_types_1.isProjectWithNoNameError)(e)) {
+                projectRootsWithNoName.push(e.projectRoot);
+            }
+            else if ((0, error_types_1.isProjectWithExistingNameError)(e)) {
+                const rootErrors = conflicts.get(e.projectName) ?? [
+                    projects[e.projectName].root,
+                ];
+                rootErrors.push(e.projectRoot);
+                conflicts.set(e.projectName, rootErrors);
+            }
+            else {
+                throw e;
+            }
+        }
+        for (const targetName in project.targets) {
+            project.targets[targetName] = normalizeTarget(project.targets[targetName], project);
+            if (!project.targets[targetName].executor &&
+                !project.targets[targetName].command) {
+                delete project.targets[targetName];
+            }
+        }
+    }
+    if (conflicts.size > 0) {
+        throw new error_types_1.MultipleProjectsWithSameNameError(conflicts, projects);
+    }
+    if (projectRootsWithNoName.length > 0) {
+        throw new error_types_1.ProjectsWithNoNameError(projectRootsWithNoName, projects);
+    }
+    return projectRootMap;
+}
+function validateProject(project, 
+// name -> project
+knownProjects) {
+    if (!project.name) {
+        try {
+            const { name } = (0, fileutils_1.readJsonFile)((0, path_1.join)(project.root, 'package.json'));
+            if (!name) {
+                throw new Error(`Project at ${project.root} has no name provided.`);
+            }
+            project.name = name;
+        }
+        catch {
+            throw new error_types_1.ProjectWithNoNameError(project.root);
+        }
+    }
+    else if (knownProjects[project.name] &&
+        knownProjects[project.name].root !== project.root) {
+        throw new error_types_1.ProjectWithExistingNameError(project.name, project.root);
+    }
+}
+exports.validateProject = validateProject;
 /**
  * Merges two targets.
  *

package/src/utils/assert-workspace-validity.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertWorkspaceValidity = void 0;
 const find_matching_projects_1 = require("./find-matching-projects");
 const output_1 = require("./output");
+const devkit_internals_1 = require("../devkit-internals");
 function assertWorkspaceValidity(projects, nxJson) {
     const projectNames = Object.keys(projects);
     const projectGraphNodes = projectNames.reduce((graph, project) => {
@@ -67,7 +68,7 @@ function assertWorkspaceValidity(projects, nxJson) {
         })
             .join('\n\n');
     }
-    throw new Error(`Configuration Error\n${message}`);
+    throw new devkit_internals_1.WorkspaceValidityError(message);
 }
 exports.assertWorkspaceValidity = assertWorkspaceValidity;
 function detectAndSetInvalidProjectGlobValues(map, sourceName, desiredImplicitDeps, projectConfigurations, projects) {