nx 19.0.0-beta.3 → 19.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.0.0-beta.3",
+  "version": "19.0.0-beta.4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.0.0-beta.3"
+    "@nrwl/tao": "19.0.0-beta.4"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.0.0-beta.3",
-    "@nx/nx-darwin-arm64": "19.0.0-beta.3",
-    "@nx/nx-linux-x64-gnu": "19.0.0-beta.3",
-    "@nx/nx-linux-x64-musl": "19.0.0-beta.3",
-    "@nx/nx-win32-x64-msvc": "19.0.0-beta.3",
-    "@nx/nx-linux-arm64-gnu": "19.0.0-beta.3",
-    "@nx/nx-linux-arm64-musl": "19.0.0-beta.3",
-    "@nx/nx-linux-arm-gnueabihf": "19.0.0-beta.3",
-    "@nx/nx-win32-arm64-msvc": "19.0.0-beta.3",
-    "@nx/nx-freebsd-x64": "19.0.0-beta.3"
+    "@nx/nx-darwin-x64": "19.0.0-beta.4",
+    "@nx/nx-darwin-arm64": "19.0.0-beta.4",
+    "@nx/nx-linux-x64-gnu": "19.0.0-beta.4",
+    "@nx/nx-linux-x64-musl": "19.0.0-beta.4",
+    "@nx/nx-win32-x64-msvc": "19.0.0-beta.4",
+    "@nx/nx-linux-arm64-gnu": "19.0.0-beta.4",
+    "@nx/nx-linux-arm64-musl": "19.0.0-beta.4",
+    "@nx/nx-linux-arm-gnueabihf": "19.0.0-beta.4",
+    "@nx/nx-win32-arm64-msvc": "19.0.0-beta.4",
+    "@nx/nx-freebsd-x64": "19.0.0-beta.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -142,26 +142,26 @@ 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) {
-            if (g.error instanceof build_project_graph_1.CreateDependenciesError) {
+            if ((0, error_types_1.isAggregateProjectGraphError)(g.error)) {
                 errors.push(...g.error.errors);
             }
             else {
@@ -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,
@@ -226,7 +226,7 @@ async function createAndSerializeProjectGraph({ projects, sourceMaps, }) {
         const fileMap = copyFileMap(exports.fileMapWithFiles.fileMap);
         const allWorkspaceFiles = copyFileData(exports.fileMapWithFiles.allWorkspaceFiles);
         const rustReferences = exports.fileMapWithFiles.rustReferences;
-        const { projectGraph, projectFileMapCache } = await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, knownExternalNodes, fileMap, allWorkspaceFiles, rustReferences, exports.currentProjectFileMapCache || (0, nx_deps_cache_1.readFileMapCache)(), await (0, plugins_1.getPlugins)());
+        const { projectGraph, projectFileMapCache } = await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, knownExternalNodes, fileMap, allWorkspaceFiles, rustReferences, exports.currentProjectFileMapCache || (0, nx_deps_cache_1.readFileMapCache)(), await (0, plugins_1.getPlugins)(), sourceMaps);
         exports.currentProjectFileMapCache = projectFileMapCache;
         exports.currentProjectGraph = projectGraph;
         perf_hooks_1.performance.mark('create-project-graph-end');

package/src/devkit-exports.d.ts

@@ -19,7 +19,7 @@ export type { Generator, GeneratorCallback, Executor, ExecutorContext, TaskGraph
  */
 export { Workspaces } from './config/workspaces';
 export { workspaceLayout } from './config/configuration';
-export type { NxPlugin, NxPluginV2, CreateNodes, CreateNodesFunction, CreateNodesResult, CreateNodesContext, CreateDependencies, CreateDependenciesContext, } from './project-graph/plugins';
+export type { NxPlugin, NxPluginV2, CreateNodes, CreateNodesFunction, CreateNodesResult, CreateNodesContext, CreateDependencies, CreateDependenciesContext, CreateMetadata, CreateMetadataContext, ProjectsMetadata, } from './project-graph/plugins';
 export type { NxPluginV1, ProjectTargetConfigurator, } from './utils/nx-plugin.deprecated';
 /**
  * @category Workspace

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/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

@@ -1,32 +1,22 @@
 import { FileData } from './file-utils';
 import { FileMapCache } from './nx-deps-cache';
 import { LoadedNxPlugin } from './plugins/internal-api';
+import { CreateMetadataContext } from './plugins';
 import { FileMap, ProjectGraph, ProjectGraphExternalNode } from '../config/project-graph';
 import { ProjectConfiguration } from '../config/workspace-json-project-json';
 import { NxWorkspaceFilesExternals } from '../native';
+import { CreateMetadataError } from './error-types';
+import { ConfigurationSourceMaps } from './utils/project-configuration-utils';
 export declare function getFileMap(): {
     fileMap: FileMap;
     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[], sourceMap: ConfigurationSourceMaps): Promise<{
     projectGraph: ProjectGraph;
     projectFileMapCache: FileMapCache;
 }>;
-export declare class ProcessDependenciesError extends Error {
-    readonly pluginName: string;
-    constructor(pluginName: string, { cause }: {
-        cause: any;
-    });
-}
-export declare class ProcessProjectGraphError extends Error {
-    readonly pluginName: string;
-    constructor(pluginName: string, { cause }: {
-        cause: any;
-    });
-}
-export declare class CreateDependenciesError extends Error {
-    readonly errors: Array<ProcessDependenciesError | ProcessProjectGraphError>;
-    readonly partialProjectGraph: ProjectGraph;
-    constructor(errors: Array<ProcessDependenciesError | ProcessProjectGraphError>, partialProjectGraph: ProjectGraph);
-}
+export declare function applyProjectMetadata(graph: ProjectGraph, plugins: LoadedNxPlugin[], context: CreateMetadataContext, sourceMap: ConfigurationSourceMaps): Promise<{
+    graph: ProjectGraph;
+    errors?: CreateMetadataError[];
+}>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateDependenciesError = exports.ProcessProjectGraphError = exports.ProcessDependenciesError = exports.buildProjectGraphUsingProjectFileMap = exports.getFileMap = void 0;
+exports.applyProjectMetadata = exports.buildProjectGraphUsingProjectFileMap = exports.getFileMap = void 0;
 const workspace_root_1 = require("../utils/workspace-root");
 const path_1 = require("path");
 const perf_hooks_1 = require("perf_hooks");
@@ -15,6 +15,8 @@ const project_graph_builder_1 = require("./project-graph-builder");
 const configuration_1 = require("../config/configuration");
 const fs_1 = require("fs");
 const output_1 = require("../utils/output");
+const error_types_1 = require("./error-types");
+const project_configuration_utils_1 = require("./utils/project-configuration-utils");
 let storedFileMap = null;
 let storedAllWorkspaceFiles = null;
 let storedRustReferences = null;
@@ -38,10 +40,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, sourceMap) {
     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);
@@ -64,7 +71,7 @@ async function buildProjectGraphUsingProjectFileMap(projects, externalNodes, fil
         };
     }
     const context = createContext(projects, nxJson, externalNodes, fileMap, filesToProcess);
-    let projectGraph = await buildProjectGraphUsingContext(externalNodes, context, cachedFileData, projectGraphVersion, plugins);
+    let projectGraph = await buildProjectGraphUsingContext(externalNodes, context, cachedFileData, projectGraphVersion, plugins, sourceMap);
     const projectFileMapCache = (0, nx_deps_cache_1.createProjectFileMapCache)(nxJson, packageJsonDeps, fileMap, rootTsConfig);
     return {
         projectGraph,
@@ -88,7 +95,7 @@ function readCombinedDeps() {
         ...installationPackageJson.devDependencies,
     };
 }
-async function buildProjectGraphUsingContext(knownExternalNodes, ctx, cachedFileData, projectGraphVersion, plugins) {
+async function buildProjectGraphUsingContext(knownExternalNodes, ctx, cachedFileData, projectGraphVersion, plugins, sourceMap) {
     perf_hooks_1.performance.mark('build project graph:start');
     const builder = new project_graph_builder_1.ProjectGraphBuilder(null, ctx.fileMap.projectFileMap);
     builder.setVersion(projectGraphVersion);
@@ -100,10 +107,10 @@ async function buildProjectGraphUsingContext(knownExternalNodes, ctx, cachedFile
     let updatedGraph;
     let error;
     try {
-        updatedGraph = await updateProjectGraphWithPlugins(ctx, initProjectGraph, plugins);
+        updatedGraph = await updateProjectGraphWithPlugins(ctx, initProjectGraph, plugins, sourceMap);
     }
     catch (e) {
-        if (e instanceof CreateDependenciesError) {
+        if ((0, error_types_1.isAggregateProjectGraphError)(e)) {
             updatedGraph = e.partialProjectGraph;
             error = e;
         }
@@ -134,26 +141,20 @@ async function buildProjectGraphUsingContext(knownExternalNodes, ctx, cachedFile
         return finalGraph;
     }
     else {
-        throw new CreateDependenciesError(error.errors, finalGraph);
+        throw new error_types_1.AggregateProjectGraphError(error.errors, finalGraph);
     }
 }
 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,
         filesToProcess,
     };
 }
-async function updateProjectGraphWithPlugins(context, initProjectGraph, plugins) {
+async function updateProjectGraphWithPlugins(context, initProjectGraph, plugins, sourceMap) {
     let graph = initProjectGraph;
     const errors = [];
     for (const plugin of plugins) {
@@ -187,7 +188,7 @@ async function updateProjectGraphWithPlugins(context, initProjectGraph, plugins)
             }
         }
         catch (e) {
-            errors.push(new ProcessProjectGraphError(plugin.name, {
+            errors.push(new error_types_1.ProcessProjectGraphError(plugin.name, {
                 cause: e,
             }));
         }
@@ -205,52 +206,24 @@ async function updateProjectGraphWithPlugins(context, initProjectGraph, plugins)
             }
         }
         catch (cause) {
-            errors.push(new ProcessDependenciesError(plugin.name, {
+            errors.push(new error_types_1.ProcessDependenciesError(plugin.name, {
                 cause,
             }));
         }
         perf_hooks_1.performance.mark(`${plugin.name}:createDependencies - end`);
         perf_hooks_1.performance.measure(`${plugin.name}:createDependencies`, `${plugin.name}:createDependencies - start`, `${plugin.name}:createDependencies - end`);
     }));
-    const result = builder.getUpdatedProjectGraph();
-    if (errors.length === 0) {
-        return result;
-    }
-    else {
-        throw new CreateDependenciesError(errors, result);
-    }
-}
-class ProcessDependenciesError extends Error {
-    constructor(pluginName, { cause }) {
-        super(`The "${pluginName}" plugin threw an error while creating dependencies:`, {
-            cause,
-        });
-        this.pluginName = pluginName;
-        this.name = this.constructor.name;
-        this.stack = `${this.message}\n  ${cause.stack.split('\n').join('\n  ')}`;
-    }
-}
-exports.ProcessDependenciesError = ProcessDependenciesError;
-class ProcessProjectGraphError extends Error {
-    constructor(pluginName, { cause }) {
-        super(`The "${pluginName}" plugin threw an error while processing the project graph:`, {
-            cause,
-        });
-        this.pluginName = pluginName;
-        this.name = this.constructor.name;
-        this.stack = `${this.message}\n  ${cause.stack.split('\n').join('\n  ')}`;
-    }
-}
-exports.ProcessProjectGraphError = ProcessProjectGraphError;
-class CreateDependenciesError extends Error {
-    constructor(errors, partialProjectGraph) {
-        super('Failed to create dependencies. See above for errors');
-        this.errors = errors;
-        this.partialProjectGraph = partialProjectGraph;
-        this.name = this.constructor.name;
+    const graphWithDeps = builder.getUpdatedProjectGraph();
+    const { errors: metadataErrors, graph: updatedGraph } = await applyProjectMetadata(graphWithDeps, plugins, {
+        nxJsonConfiguration: context.nxJsonConfiguration,
+        workspaceRoot: workspace_root_1.workspaceRoot,
+    }, sourceMap);
+    errors.push(...metadataErrors);
+    if (errors.length > 0) {
+        throw new error_types_1.AggregateProjectGraphError(errors, updatedGraph);
     }
+    return updatedGraph;
 }
-exports.CreateDependenciesError = CreateDependenciesError;
 function readRootTsConfig() {
     try {
         const tsConfigPath = (0, typescript_1.getRootTsConfigPath)();
@@ -262,3 +235,34 @@ function readRootTsConfig() {
         return {};
     }
 }
+async function applyProjectMetadata(graph, plugins, context, sourceMap) {
+    const results = [];
+    const errors = [];
+    const promises = plugins.map(async (plugin) => {
+        if ((0, utils_1.isNxPluginV2)(plugin) && plugin.createMetadata) {
+            perf_hooks_1.performance.mark(`${plugin.name}:createMetadata - start`);
+            try {
+                const metadata = await plugin.createMetadata(graph, undefined, context);
+                results.push({ metadata, pluginName: plugin.name });
+            }
+            catch (e) {
+                errors.push(new error_types_1.CreateMetadataError(e, plugin.name));
+            }
+            finally {
+                perf_hooks_1.performance.mark(`${plugin.name}:createMetadata - end`);
+                perf_hooks_1.performance.measure(`${plugin.name}:createMetadata`, `${plugin.name}:createMetadata - start`, `${plugin.name}:createMetadata - end`);
+            }
+        }
+    });
+    await Promise.all(promises);
+    for (const { metadata: projectsMetadata, pluginName } of results) {
+        for (const project in projectsMetadata) {
+            const projectConfiguration = graph.nodes[project]?.data;
+            if (projectConfiguration) {
+                projectConfiguration.metadata = (0, project_configuration_utils_1.mergeMetadata)(sourceMap[project], [null, pluginName], 'metadata', projectsMetadata[project].metadata, projectConfiguration.metadata);
+            }
+        }
+    }
+    return { errors, graph };
+}
+exports.applyProjectMetadata = applyProjectMetadata;

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

@@ -1,11 +1,10 @@
 import { CreateNodesResultWithContext } from './plugins/internal-api';
 import { ConfigurationResult, ConfigurationSourceMaps } from './utils/project-configuration-utils';
 import { ProjectConfiguration } from '../config/workspace-json-project-json';
-import { ProcessDependenciesError, ProcessProjectGraphError } from './build-project-graph';
 import { ProjectGraph } from '../config/project-graph';
 export declare class ProjectGraphError extends Error {
     #private;
-    constructor(errors: Array<CreateNodesError | MergeNodesError | ProjectsWithNoNameError | ProjectsWithConflictingNamesError | ProcessDependenciesError | ProcessProjectGraphError>, partialProjectGraph: ProjectGraph, partialSourceMaps: ConfigurationSourceMaps);
+    constructor(errors: Array<CreateNodesError | MergeNodesError | ProjectsWithNoNameError | ProjectsWithConflictingNamesError | ProcessDependenciesError | ProcessProjectGraphError | CreateMetadataError>, partialProjectGraph: ProjectGraph, partialSourceMaps: ConfigurationSourceMaps);
     /**
      * The daemon cannot throw errors which contain methods as they are not serializable.
      *
@@ -19,7 +18,7 @@ export declare class ProjectGraphError extends Error {
      */
     getPartialProjectGraph(): ProjectGraph;
     getPartialSourcemaps(): ConfigurationSourceMaps;
-    getErrors(): (ProcessDependenciesError | ProcessProjectGraphError | CreateNodesError | MergeNodesError | ProjectsWithNoNameError | ProjectsWithConflictingNamesError)[];
+    getErrors(): (CreateNodesError | MergeNodesError | CreateMetadataError | ProjectsWithNoNameError | ProjectsWithConflictingNamesError | ProcessDependenciesError | ProcessProjectGraphError)[];
 }
 export declare class ProjectsWithConflictingNamesError extends Error {
     projects: Record<string, ProjectConfiguration>;
@@ -60,6 +59,30 @@ export declare class MergeNodesError extends Error {
         error: Error;
     });
 }
+export declare class CreateMetadataError extends Error {
+    readonly error: Error;
+    readonly plugin: string;
+    constructor(error: Error, plugin: string);
+}
+export declare class ProcessDependenciesError extends Error {
+    readonly pluginName: string;
+    constructor(pluginName: string, { cause }: {
+        cause: any;
+    });
+}
+export declare class ProcessProjectGraphError extends Error {
+    readonly pluginName: string;
+    constructor(pluginName: string, { cause }: {
+        cause: any;
+    });
+}
+export declare class AggregateProjectGraphError extends Error {
+    readonly errors: Array<CreateMetadataError | ProcessDependenciesError | ProcessProjectGraphError>;
+    readonly partialProjectGraph: ProjectGraph;
+    constructor(errors: Array<CreateMetadataError | ProcessDependenciesError | ProcessProjectGraphError>, partialProjectGraph: ProjectGraph);
+}
+export declare function isAggregateProjectGraphError(e: unknown): e is AggregateProjectGraphError;
+export declare function isCreateMetadataError(e: unknown): e is CreateMetadataError;
 export declare function isCreateNodesError(e: unknown): e is CreateNodesError;
 export declare function isAggregateCreateNodesError(e: unknown): e is AggregateCreateNodesError;
 export declare function isMergeNodesError(e: unknown): e is MergeNodesError;

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.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;
+exports.LoadPluginError = exports.DaemonProjectGraphError = exports.isMergeNodesError = exports.isAggregateCreateNodesError = exports.isCreateNodesError = exports.isCreateMetadataError = exports.isAggregateProjectGraphError = exports.AggregateProjectGraphError = exports.ProcessProjectGraphError = exports.ProcessDependenciesError = exports.CreateMetadataError = 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) {
@@ -118,6 +118,62 @@ class MergeNodesError extends Error {
     }
 }
 exports.MergeNodesError = MergeNodesError;
+class CreateMetadataError extends Error {
+    constructor(error, plugin) {
+        super(`The "${plugin}" plugin threw an error while creating metadata:`, {
+            cause: error,
+        });
+        this.error = error;
+        this.plugin = plugin;
+        this.name = this.constructor.name;
+    }
+}
+exports.CreateMetadataError = CreateMetadataError;
+class ProcessDependenciesError extends Error {
+    constructor(pluginName, { cause }) {
+        super(`The "${pluginName}" plugin threw an error while creating dependencies:`, {
+            cause,
+        });
+        this.pluginName = pluginName;
+        this.name = this.constructor.name;
+        this.stack = `${this.message}\n  ${cause.stack.split('\n').join('\n  ')}`;
+    }
+}
+exports.ProcessDependenciesError = ProcessDependenciesError;
+class ProcessProjectGraphError extends Error {
+    constructor(pluginName, { cause }) {
+        super(`The "${pluginName}" plugin threw an error while processing the project graph:`, {
+            cause,
+        });
+        this.pluginName = pluginName;
+        this.name = this.constructor.name;
+        this.stack = `${this.message}\n  ${cause.stack.split('\n').join('\n  ')}`;
+    }
+}
+exports.ProcessProjectGraphError = ProcessProjectGraphError;
+class AggregateProjectGraphError extends Error {
+    constructor(errors, partialProjectGraph) {
+        super('Failed to create project graph. See above for errors');
+        this.errors = errors;
+        this.partialProjectGraph = partialProjectGraph;
+        this.name = this.constructor.name;
+    }
+}
+exports.AggregateProjectGraphError = AggregateProjectGraphError;
+function isAggregateProjectGraphError(e) {
+    return (e instanceof AggregateProjectGraphError ||
+        (typeof e === 'object' &&
+            'name' in e &&
+            e?.name === AggregateProjectGraphError.prototype.name));
+}
+exports.isAggregateProjectGraphError = isAggregateProjectGraphError;
+function isCreateMetadataError(e) {
+    return (e instanceof CreateMetadataError ||
+        (typeof e === 'object' &&
+            'name' in e &&
+            e?.name === CreateMetadataError.prototype.name));
+}
+exports.isCreateMetadataError = isCreateMetadataError;
 function isCreateNodesError(e) {
     return (e instanceof CreateNodesError ||
         (typeof e === 'object' && 'name' in e && e?.name === CreateNodesError.name));

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/internal-api.d.ts

@@ -1,7 +1,7 @@
 import { PluginConfiguration } from '../../config/nx-json';
 import { NxPluginV1 } from '../../utils/nx-plugin.deprecated';
-import { CreateDependencies, CreateDependenciesContext, CreateNodesContext, CreateNodesResult, NxPluginV2 } from './public-api';
-import { ProjectGraphProcessor } from '../../config/project-graph';
+import { CreateDependencies, CreateDependenciesContext, CreateMetadata, CreateMetadataContext, CreateNodesContext, CreateNodesResult, NxPluginV2 } from './public-api';
+import { ProjectGraph, ProjectGraphProcessor } from '../../config/project-graph';
 export declare class LoadedNxPlugin {
     readonly name: string;
     readonly createNodes?: [
@@ -9,6 +9,7 @@ export declare class LoadedNxPlugin {
         fn: (matchedFiles: string[], context: CreateNodesContext) => Promise<CreateNodesResultWithContext[]>
     ];
     readonly createDependencies?: (context: CreateDependenciesContext) => ReturnType<CreateDependencies>;
+    readonly createMetadata?: (graph: ProjectGraph, context: CreateMetadataContext) => ReturnType<CreateMetadata>;
     readonly processProjectGraph?: ProjectGraphProcessor;
     readonly options?: unknown;
     readonly include?: string[];

package/src/project-graph/plugins/internal-api.js

@@ -26,6 +26,9 @@ class LoadedNxPlugin {
         if (plugin.createDependencies) {
             this.createDependencies = (context) => plugin.createDependencies(this.options, context);
         }
+        if (plugin.createMetadata) {
+            this.createMetadata = (graph, context) => plugin.createMetadata(graph, this.options, context);
+        }
         this.processProjectGraph = plugin.processProjectGraph;
     }
 }

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { ProjectGraph, ProjectGraphProcessorContext } from '../../../config/project-graph';
 import { PluginConfiguration } from '../../../config/nx-json';
-import { CreateDependenciesContext, CreateNodesContext } from '../public-api';
+import { CreateDependenciesContext, CreateMetadataContext, CreateNodesContext } from '../public-api';
 import { LoadedNxPlugin } from '../internal-api';
 import { Serializable } from 'child_process';
 export interface PluginWorkerLoadMessage {
@@ -18,6 +18,7 @@ export interface PluginWorkerLoadResult {
         createNodesPattern: string;
         hasCreateDependencies: boolean;
         hasProcessProjectGraph: boolean;
+        hasCreateMetadata: boolean;
         success: true;
     } | {
         success: false;
@@ -51,6 +52,14 @@ export interface PluginCreateDependenciesMessage {
         tx: string;
     };
 }
+export interface PluginCreateMetadataMessage {
+    type: 'createMetadata';
+    payload: {
+        graph: ProjectGraph;
+        context: CreateMetadataContext;
+        tx: string;
+    };
+}
 export interface PluginCreateDependenciesResult {
     type: 'createDependenciesResult';
     payload: {
@@ -63,6 +72,18 @@ export interface PluginCreateDependenciesResult {
         tx: string;
     };
 }
+export interface PluginCreateMetadataResult {
+    type: 'createMetadataResult';
+    payload: {
+        metadata: ReturnType<LoadedNxPlugin['createMetadata']>;
+        success: true;
+        tx: string;
+    } | {
+        success: false;
+        error: string;
+        tx: string;
+    };
+}
 export interface PluginWorkerProcessProjectGraphMessage {
     type: 'processProjectGraph';
     payload: {
@@ -83,8 +104,8 @@ export interface PluginWorkerProcessProjectGraphResult {
         tx: string;
     };
 }
-export type PluginWorkerMessage = PluginWorkerLoadMessage | PluginWorkerCreateNodesMessage | PluginCreateDependenciesMessage | PluginWorkerProcessProjectGraphMessage;
-export type PluginWorkerResult = PluginWorkerLoadResult | PluginWorkerCreateNodesResult | PluginCreateDependenciesResult | PluginWorkerProcessProjectGraphResult;
+export type PluginWorkerMessage = PluginWorkerLoadMessage | PluginWorkerCreateNodesMessage | PluginCreateDependenciesMessage | PluginWorkerProcessProjectGraphMessage | PluginCreateMetadataMessage;
+export type PluginWorkerResult = PluginWorkerLoadResult | PluginWorkerCreateNodesResult | PluginCreateDependenciesResult | PluginWorkerProcessProjectGraphResult | PluginCreateMetadataResult;
 export declare function isPluginWorkerMessage(message: Serializable): message is PluginWorkerMessage;
 export declare function isPluginWorkerResult(message: Serializable): message is PluginWorkerResult;
 type MaybePromise<T> = T | Promise<T>;

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

@@ -114,6 +114,17 @@ function createWorkerHandler(worker, pending, onload, onloadError) {
                                 });
                             }
                             : undefined,
+                        createMetadata: result.hasCreateMetadata
+                            ? (graph, ctx) => {
+                                const tx = pluginName + ':createMetadata:' + performance.now();
+                                return registerPendingPromise(tx, pending, () => {
+                                    worker.send({
+                                        type: 'createMetadata',
+                                        payload: { graph, context: ctx, tx },
+                                    });
+                                });
+                            }
+                            : undefined,
                     });
                 }
                 else if (result.success === false) {
@@ -147,6 +158,15 @@ function createWorkerHandler(worker, pending, onload, onloadError) {
                     rejector(result.error);
                 }
             },
+            createMetadataResult: ({ tx, ...result }) => {
+                const { resolver, rejector } = pending.get(tx);
+                if (result.success) {
+                    resolver(result.metadata);
+                }
+                else if (result.success === false) {
+                    rejector(result.error);
+                }
+            },
         });
     };
 }

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

@@ -22,6 +22,7 @@ process.on('message', async (message) => {
                         createNodesPattern: plugin.createNodes?.[0],
                         hasCreateDependencies: 'createDependencies' in plugin && !!plugin.createDependencies,
                         hasProcessProjectGraph: 'processProjectGraph' in plugin && !!plugin.processProjectGraph,
+                        hasCreateMetadata: 'createMetadata' in plugin && !!plugin.createMetadata,
                         success: true,
                     },
                 };
@@ -93,5 +94,20 @@ process.on('message', async (message) => {
                 };
             }
         },
+        createMetadata: async ({ graph, context, tx }) => {
+            try {
+                const result = await plugin.createMetadata(graph, context);
+                return {
+                    type: 'createMetadataResult',
+                    payload: { metadata: result, success: true, tx },
+                };
+            }
+            catch (e) {
+                return {
+                    type: 'createMetadataResult',
+                    payload: { success: false, error: e.stack, tx },
+                };
+            }
+        },
     });
 });

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

@@ -32,6 +32,9 @@ function readPluginPackageJson(pluginName, projects, paths = (0, installation_di
             const localPluginPath = resolveLocalNxPlugin(pluginName, projects);
             if (localPluginPath) {
                 const localPluginPackageJson = path.join(localPluginPath.path, 'package.json');
+                if (!exports.unregisterPluginTSTranspiler) {
+                    registerPluginTSTranspiler();
+                }
                 return {
                     path: localPluginPackageJson,
                     json: (0, fileutils_1.readJsonFile)(localPluginPackageJson),
@@ -77,22 +80,27 @@ function registerPluginTSTranspiler() {
 }
 exports.registerPluginTSTranspiler = registerPluginTSTranspiler;
 function lookupLocalPlugin(importPath, projects, root = workspace_root_1.workspaceRoot) {
-    const plugin = findNxProjectForImportPath(importPath, projects, root);
-    if (!plugin) {
+    const projectConfig = findNxProjectForImportPath(importPath, projects, root);
+    if (!projectConfig) {
         return null;
     }
-    const projectConfig = projects[plugin];
     return { path: path.join(root, projectConfig.root), projectConfig };
 }
 function findNxProjectForImportPath(importPath, projects, root = workspace_root_1.workspaceRoot) {
     const tsConfigPaths = readTsConfigPaths(root);
     const possiblePaths = tsConfigPaths[importPath]?.map((p) => (0, path_1.normalizePath)(path.relative(root, path.join(root, p))));
     if (possiblePaths?.length) {
-        const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappingsFromProjectConfigurations)(projects);
+        const projectRootMappings = new Map();
+        const projectNameMap = new Map();
+        for (const projectRoot in projects) {
+            const project = projects[projectRoot];
+            projectRootMappings.set(project.root, project.name);
+            projectNameMap.set(project.name, project);
+        }
         for (const tsConfigPath of possiblePaths) {
             const nxProject = (0, find_project_for_path_1.findProjectForPath)(tsConfigPath, projectRootMappings);
             if (nxProject) {
-                return nxProject;
+                return projectNameMap.get(nxProject);
             }
         }
         logger_1.logger.verbose('Unable to find local plugin', possiblePaths, projectRootMappings);

package/src/project-graph/plugins/public-api.d.ts

@@ -68,6 +68,12 @@ export interface CreateDependenciesContext {
  * Use {@link validateDependency} to validate dependencies
  */
 export type CreateDependencies<T = unknown> = (options: T | undefined, context: CreateDependenciesContext) => RawProjectGraphDependency[] | Promise<RawProjectGraphDependency[]>;
+export type CreateMetadataContext = {
+    readonly nxJsonConfiguration: NxJsonConfiguration;
+    readonly workspaceRoot: string;
+};
+export type ProjectsMetadata = Record<string, Pick<ProjectConfiguration, 'metadata'>>;
+export type CreateMetadata<T = unknown> = (graph: ProjectGraph, options: T | undefined, context: CreateMetadataContext) => ProjectsMetadata | Promise<ProjectsMetadata>;
 /**
  * A plugin for Nx which creates nodes and dependencies for the {@link ProjectGraph}
  */
@@ -82,6 +88,10 @@ export type NxPluginV2<TOptions = unknown> = {
      * Provides a function to analyze files to create dependencies for the {@link ProjectGraph}
      */
     createDependencies?: CreateDependencies<TOptions>;
+    /**
+     * Provides a function to create metadata for the {@link ProjectGraph}
+     */
+    createMetadata?: CreateMetadata<TOptions>;
 };
 /**
  * A plugin for Nx

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

@@ -10,8 +10,8 @@ const output_1 = require("../utils/output");
 const strip_indents_1 = require("../utils/strip-indents");
 const workspace_root_1 = require("../utils/workspace-root");
 const build_project_graph_1 = require("./build-project-graph");
-const nx_deps_cache_1 = require("./nx-deps-cache");
 const error_types_1 = require("./error-types");
+const nx_deps_cache_1 = require("./nx-deps-cache");
 const internal_api_1 = require("./plugins/internal-api");
 const retrieve_workspace_files_1 = require("./utils/retrieve-workspace-files");
 /**
@@ -92,18 +92,18 @@ async function buildProjectGraphAndSourceMapsWithoutDaemon() {
     perf_hooks_1.performance.mark('retrieve-workspace-files:end');
     const cacheEnabled = process.env.NX_CACHE_PROJECT_GRAPH !== 'false';
     perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:start');
-    let createDependenciesError;
+    let projectGraphError;
     let projectGraphResult;
     try {
-        projectGraphResult = await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, cacheEnabled ? (0, nx_deps_cache_1.readFileMapCache)() : null, plugins);
+        projectGraphResult = await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, cacheEnabled ? (0, nx_deps_cache_1.readFileMapCache)() : null, plugins, sourceMaps);
     }
     catch (e) {
-        if (e instanceof build_project_graph_1.CreateDependenciesError) {
+        if ((0, error_types_1.isAggregateProjectGraphError)(e)) {
             projectGraphResult = {
                 projectGraph: e.partialProjectGraph,
                 projectFileMapCache: null,
             };
-            createDependenciesError = e;
+            projectGraphError = e;
         }
         else {
             throw e;
@@ -117,7 +117,7 @@ async function buildProjectGraphAndSourceMapsWithoutDaemon() {
     delete global.NX_GRAPH_CREATION;
     const errors = [
         ...(projectConfigurationsError?.errors ?? []),
-        ...(createDependenciesError?.errors ?? []),
+        ...(projectGraphError?.errors ?? []),
     ];
     if (errors.length > 0) {
         throw new error_types_1.ProjectGraphError(errors, projectGraph, sourceMaps);

package/src/project-graph/utils/find-project-for-path.js

@@ -9,9 +9,8 @@ const path_2 = require("../../utils/path");
  */
 function createProjectRootMappingsFromProjectConfigurations(projects) {
     const projectRootMappings = new Map();
-    for (const projectName of Object.keys(projects)) {
-        const root = projects[projectName].root;
-        projectRootMappings.set(normalizeProjectRoot(root), projectName);
+    for (const { name, root } of Object.values(projects)) {
+        projectRootMappings.set(normalizeProjectRoot(root), name);
     }
     return projectRootMappings;
 }

package/src/project-graph/utils/normalize-project-nodes.d.ts

@@ -2,7 +2,7 @@ import { ProjectGraphProjectNode } from '../../config/project-graph';
 import { ProjectGraphBuilder } from '../project-graph-builder';
 import { ProjectConfiguration, TargetConfiguration } from '../../config/workspace-json-project-json';
 import { CreateDependenciesContext } from '../plugins';
-export declare function normalizeProjectNodes(ctx: CreateDependenciesContext, builder: ProjectGraphBuilder): Promise<void>;
+export declare function normalizeProjectNodes({ projects }: CreateDependenciesContext, builder: ProjectGraphBuilder): Promise<void>;
 /**
  * Apply target defaults and normalization
  */

package/src/project-graph/utils/normalize-project-nodes.js

@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeImplicitDependencies = exports.normalizeProjectTargets = exports.normalizeProjectNodes = void 0;
 const find_matching_projects_1 = require("../../utils/find-matching-projects");
 const project_configuration_utils_1 = require("../utils/project-configuration-utils");
-async function normalizeProjectNodes(ctx, builder) {
-    const toAdd = [];
+async function normalizeProjectNodes({ projects }, builder) {
     // Sorting projects by name to make sure that the order of projects in the graph is deterministic.
     // This is important to ensure that expanded properties referencing projects (e.g. implicit dependencies)
     // are also deterministic, and thus don't cause the calculated project configuration hash to shift.
-    const projects = Object.keys(ctx.projects).sort();
+    const sortedProjectNames = Object.keys(projects).sort();
     // Used for expanding implicit dependencies (e.g. `@proj/*` or `tag:foo`)
-    const partialProjectGraphNodes = projects.reduce((graph, project) => {
-        const projectConfiguration = ctx.projects[project];
+    const partialProjectGraphNodes = sortedProjectNames.reduce((graph, project) => {
+        const projectConfiguration = projects[project];
         graph[project] = {
             name: project,
             type: projectConfiguration.projectType === 'library' ? 'lib' : 'app', // missing fallback to `e2e`
@@ -21,8 +20,9 @@ async function normalizeProjectNodes(ctx, builder) {
         };
         return graph;
     }, {});
-    for (const key of projects) {
-        const p = ctx.projects[key];
+    const toAdd = [];
+    for (const key of sortedProjectNames) {
+        const p = projects[key];
         p.implicitDependencies = normalizeImplicitDependencies(key, p.implicitDependencies, partialProjectGraphNodes);
         p.targets = normalizeProjectTargets(p, key);
         // TODO: remove in v16
@@ -31,7 +31,7 @@ async function normalizeProjectNodes(ctx, builder) {
                 ? 'e2e'
                 : 'app'
             : 'lib';
-        const tags = ctx.projects?.[key]?.tags || [];
+        const tags = p.tags || [];
         toAdd.push({
             name: key,
             type: projectType,

package/src/project-graph/utils/project-configuration-utils.d.ts

@@ -1,20 +1,36 @@
 import { NxJsonConfiguration, TargetDefaults } from '../../config/nx-json';
 import { ProjectGraphExternalNode } from '../../config/project-graph';
-import { ProjectConfiguration, TargetConfiguration } from '../../config/workspace-json-project-json';
+import { ProjectConfiguration, ProjectMetadata, TargetConfiguration, TargetMetadata } from '../../config/workspace-json-project-json';
 import { ONLY_MODIFIES_EXISTING_TARGET } from '../../plugins/target-defaults/symbols';
 import { LoadedNxPlugin } from '../plugins/internal-api';
-export type SourceInformation = [file: string, plugin: string];
+export type SourceInformation = [file: string | null, plugin: string];
 export type ConfigurationSourceMaps = Record<string, Record<string, SourceInformation>>;
-export declare function mergeProjectConfigurationIntoRootMap(projectRootMap: Map<string, ProjectConfiguration>, project: ProjectConfiguration & {
+export declare function mergeProjectConfigurationIntoRootMap(projectRootMap: Record<string, ProjectConfiguration>, project: ProjectConfiguration & {
     targets?: Record<string, TargetConfiguration & {
         [ONLY_MODIFIES_EXISTING_TARGET]?: boolean;
     }>;
 }, configurationSourceMaps?: ConfigurationSourceMaps, sourceInformation?: SourceInformation, skipCommandNormalization?: boolean): void;
+export declare function mergeMetadata<T = ProjectMetadata | TargetMetadata>(sourceMap: Record<string, [file: string, plugin: string]>, sourceInformation: [file: string, plugin: string], baseSourceMapPath: string, metadata: T, matchingMetadata?: T): T;
 export type ConfigurationResult = {
-    projects: Record<string, ProjectConfiguration>;
+    /**
+     * A map of project configurations, keyed by project root.
+     */
+    projects: {
+        [projectRoot: string]: ProjectConfiguration;
+    };
+    /**
+     * Node Name -> Node info
+     */
     externalNodes: Record<string, ProjectGraphExternalNode>;
+    /**
+     * Project Root -> Project Name
+     */
     projectRootMap: Record<string, string>;
     sourceMaps: ConfigurationSourceMaps;
+    /**
+     * The list of files that were used to create project configurations
+     */
+    matchingProjectFiles: string[];
 };
 /**
  * Transforms a list of project paths into a map of project configurations.
@@ -26,7 +42,7 @@ export type ConfigurationResult = {
  */
 export declare function createProjectConfigurations(root: string, nxJson: NxJsonConfiguration, projectFiles: string[], // making this parameter allows devkit to pick up newly created projects
 plugins: LoadedNxPlugin[]): Promise<ConfigurationResult>;
-export declare function readProjectConfigurationsFromRootMap(projectRootMap: Map<string, ProjectConfiguration>): Record<string, ProjectConfiguration>;
+export declare function readProjectConfigurationsFromRootMap(projectRootMap: Record<string, ProjectConfiguration>): Record<string, ProjectConfiguration>;
 /**
  * Merges two targets.
  *

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readTargetDefaultsForTarget = exports.resolveNxTokensInOptions = exports.isCompatibleTarget = exports.mergeTargetConfigurations = exports.readProjectConfigurationsFromRootMap = exports.createProjectConfigurations = exports.mergeProjectConfigurationIntoRootMap = void 0;
+exports.readTargetDefaultsForTarget = exports.resolveNxTokensInOptions = exports.isCompatibleTarget = exports.mergeTargetConfigurations = 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");
@@ -17,12 +17,12 @@ skipCommandNormalization) {
         configurationSourceMaps[project.root] = {};
     }
     const sourceMap = configurationSourceMaps?.[project.root];
-    let matchingProject = projectRootMap.get(project.root);
+    let matchingProject = projectRootMap[project.root];
     if (!matchingProject) {
-        projectRootMap.set(project.root, {
+        projectRootMap[project.root] = {
             root: project.root,
-        });
-        matchingProject = projectRootMap.get(project.root);
+        };
+        matchingProject = projectRootMap[project.root];
         if (sourceMap) {
             sourceMap[`root`] = sourceInformation;
         }
@@ -138,7 +138,8 @@ skipCommandNormalization) {
             updatedProjectConfiguration.targets[targetName] = mergedTarget;
         }
     }
-    projectRootMap.set(updatedProjectConfiguration.root, updatedProjectConfiguration);
+    projectRootMap[updatedProjectConfiguration.root] =
+        updatedProjectConfiguration;
 }
 exports.mergeProjectConfigurationIntoRootMap = mergeProjectConfigurationIntoRootMap;
 function mergeMetadata(sourceMap, sourceInformation, baseSourceMapPath, metadata, matchingMetadata) {
@@ -210,6 +211,7 @@ function mergeMetadata(sourceMap, sourceInformation, baseSourceMapPath, metadata
     }
     return result;
 }
+exports.mergeMetadata = mergeMetadata;
 /**
  * Transforms a list of project paths into a map of project configurations.
  *
@@ -264,7 +266,7 @@ plugins) {
     }
     return Promise.all(results).then((results) => {
         perf_hooks_1.performance.mark('createNodes:merge - start');
-        const projectRootMap = new Map();
+        const projectRootMap = {};
         const externalNodes = {};
         const configurationSourceMaps = {};
         for (const result of results.flat()) {
@@ -291,14 +293,17 @@ plugins) {
             }
             Object.assign(externalNodes, pluginExternalNodes);
         }
-        let projects;
         try {
-            projects = readProjectConfigurationsFromRootMap(projectRootMap);
+            // 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);
         }
         catch (e) {
             if ((0, error_types_1.isProjectsWithNoNameError)(e) ||
                 (0, error_types_1.isProjectsWithConflictingNamesError)(e)) {
-                projects = e.projects;
                 errors.push(e);
             }
             else {
@@ -312,18 +317,20 @@ plugins) {
         perf_hooks_1.performance.measure('build-project-configs', 'build-project-configs:start', 'build-project-configs:end');
         if (errors.length === 0) {
             return {
-                projects,
+                projects: projectRootMap,
                 externalNodes,
                 projectRootMap: rootMap,
                 sourceMaps: configurationSourceMaps,
+                matchingProjectFiles: projectFiles,
             };
         }
         else {
             throw new error_types_1.ProjectConfigurationsError(errors, {
-                projects,
+                projects: projectRootMap,
                 externalNodes,
                 projectRootMap: rootMap,
                 sourceMaps: configurationSourceMaps,
+                matchingProjectFiles: projectFiles,
             });
         }
     });
@@ -336,7 +343,8 @@ function readProjectConfigurationsFromRootMap(projectRootMap) {
     // to provide better error messaging.
     const conflicts = new Map();
     const projectRootsWithNoName = [];
-    for (const [root, configuration] of projectRootMap.entries()) {
+    for (const root in projectRootMap) {
+        const configuration = 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'])
@@ -544,7 +552,8 @@ function readTargetDefaultsForTarget(targetName, targetDefaults, executor) {
 exports.readTargetDefaultsForTarget = readTargetDefaultsForTarget;
 function createRootMap(projectRootMap) {
     const map = {};
-    for (const [projectRoot, { name: projectName }] of projectRootMap) {
+    for (const projectRoot in projectRootMap) {
+        const projectName = projectRootMap[projectRoot].name;
         map[projectRoot] = projectName;
     }
     return map;

package/src/project-graph/utils/retrieve-workspace-files.d.ts

@@ -9,12 +9,12 @@ import { LoadedNxPlugin } from '../plugins/internal-api';
  * @param nxJson
  */
 export declare function retrieveWorkspaceFiles(workspaceRoot: string, projectRootMap: Record<string, string>): Promise<{
-    allWorkspaceFiles: import("../file-utils").FileData[];
+    allWorkspaceFiles: import("nx/src/devkit-exports").FileData[];
     fileMap: {
         projectFileMap: ProjectFiles;
-        nonProjectFiles: import("../../native").FileData[];
+        nonProjectFiles: import("nx/src/native").FileData[];
     };
-    rustReferences: import("../../native").NxWorkspaceFilesExternals;
+    rustReferences: import("nx/src/native").NxWorkspaceFilesExternals;
 }>;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.