nx 23.3.0-beta.1 → 23.3.0-beta.2

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

@@ -30,6 +30,7 @@ const workspace_context_1 = require("../utils/workspace-context");
 const build_project_graph_1 = require("./build-project-graph");
 const error_types_1 = require("./error-types");
 const nx_deps_cache_1 = require("./nx-deps-cache");
+const nx_plugin_capabilities_1 = require("./plugins/nx-plugin-capabilities");
 const get_plugins_1 = require("./plugins/get-plugins");
 const retrieve_workspace_files_1 = require("./utils/retrieve-workspace-files");
 const handle_import_1 = require("../utils/handle-import");
@@ -40,16 +41,21 @@ const handle_import_1 = require("../utils/handle-import");
  * @throws {Error} if there is no cached ProjectGraph to read from
  */
 function readCachedProjectGraph(minimumComputedAt) {
-    const projectGraphCache = (0, nx_deps_cache_1.readProjectGraphCache)(minimumComputedAt);
-    if (!projectGraphCache) {
-        const angularSpecificError = (0, fileutils_1.fileExists)(`${workspace_root_1.workspaceRoot}/angular.json`)
-            ? (0, strip_indents_1.stripIndents) `
+    const cached = (0, nx_deps_cache_1.readProjectGraphCache)(minimumComputedAt);
+    if (!cached) {
+        throw noCachedProjectGraphError();
+    }
+    return cached.projectGraph;
+}
+function noCachedProjectGraphError() {
+    const angularSpecificError = (0, fileutils_1.fileExists)(`${workspace_root_1.workspaceRoot}/angular.json`)
+        ? (0, strip_indents_1.stripIndents) `
       Make sure invoke 'node ./decorate-angular-cli.js' in your postinstall script.
       The decorated CLI will compute the project graph.
       'ng --help' should say 'Smart Monorepos · Fast Builds'.
       `
-            : '';
-        throw new Error((0, strip_indents_1.stripIndents) `
+        : '';
+    return new Error((0, strip_indents_1.stripIndents) `
       [readCachedProjectGraph] ERROR: No cached ProjectGraph is available.
 
       If you are leveraging \`readCachedProjectGraph()\` directly then you will need to refactor your usage to first ensure that
@@ -59,8 +65,6 @@ function readCachedProjectGraph(minimumComputedAt) {
 
       ${angularSpecificError}
     `);
-    }
-    return projectGraphCache;
 }
 function readCachedProjectConfiguration(projectName) {
     const graph = readCachedProjectGraph();
@@ -86,6 +90,8 @@ function readProjectsConfigurationFromProjectGraph(projectGraph) {
 }
 async function buildProjectGraphAndSourceMapsWithoutDaemon() {
     preventRecursionInGraphConstruction();
+    // Answer from the plugins loaded below, not an earlier cached graph's rows.
+    (0, nx_plugin_capabilities_1.noteGraphReadFromCache)(undefined);
     global.NX_GRAPH_CREATION = true;
     const nxJson = (0, nx_json_1.readNxJson)();
     (0, workspace_context_1.refreshWorkspaceContext)(workspace_root_1.workspaceRoot);
@@ -138,7 +144,12 @@ async function buildProjectGraphAndSourceMapsWithoutDaemon() {
         ...(projectGraphError?.errors ?? []),
     ];
     if (cacheEnabled) {
-        (0, nx_deps_cache_1.writeCache)(projectFileMapCache, projectGraph, sourceMaps, errors);
+        const computedAt = Date.now();
+        // Before the graph, so a cached graph never lacks its row.
+        if (errors.length === 0) {
+            (0, nx_plugin_capabilities_1.getNxPluginCapabilitiesStore)()?.record(computedAt, plugins.map((plugin) => plugin.capabilities()));
+        }
+        (0, nx_deps_cache_1.writeCache)(projectFileMapCache, projectGraph, sourceMaps, errors, computedAt);
     }
     if (errors.length > 0) {
         throw new error_types_1.ProjectGraphError(errors, projectGraph, sourceMaps);
@@ -151,14 +162,7 @@ function handleProjectGraphError(opts, e) {
     if (opts.exitOnError) {
         const isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
         if (e instanceof error_types_1.ProjectGraphError) {
-            let title = e.message;
-            const bodyLines = isVerbose
-                ? [e.stack]
-                : ['Pass --verbose to see the stacktraces.'];
-            output_1.output.error({
-                title,
-                bodyLines: bodyLines,
-            });
+            output_1.output.error((0, error_types_1.formatProjectGraphError)(e, isVerbose));
         }
         else if (typeof e.message === 'string') {
             const lines = e.message.split('\n');
@@ -180,7 +184,12 @@ function handleProjectGraphError(opts, e) {
     }
 }
 async function readCachedGraphAndHydrateFileMap(minimumComputedAt) {
-    const graph = readCachedProjectGraph(minimumComputedAt);
+    const cached = (0, nx_deps_cache_1.readProjectGraphCache)(minimumComputedAt);
+    if (!cached) {
+        throw noCachedProjectGraphError();
+    }
+    const graph = cached.projectGraph;
+    (0, nx_plugin_capabilities_1.noteGraphReadFromCache)(cached.computedAt);
     const projectRootMap = Object.fromEntries(Object.entries(graph.nodes).map(([project, { data }]) => [
         data.root,
         project,
@@ -262,45 +271,33 @@ async function createProjectGraphAndSourceMapsAsync(opts = {
         const lock = !native_1.IS_WASM
             ? new native_1.FileLock((0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'project-graph.lock'))
             : null;
-        let locked = lock?.locked;
-        while (locked) {
+        let holdingLock = lock?.tryLock() ?? false;
+        while (lock && !holdingLock) {
             logger_1.logger.verbose('Waiting for graph construction in another process to complete');
             const spinner = new delayed_spinner_1.DelayedSpinner('Waiting for graph construction in another process to complete');
             const start = Date.now();
-            await lock.wait();
-            spinner.cleanup();
-            // Note: This will currently throw if any of the caches are missing...
-            // It would be nice if one of the processes that was waiting for the lock
-            // could pick up the slack and build the graph if it's missing, but
-            // we wouldn't want either of the below to happen:
-            // - All of the waiting processes to build the graph
-            // - Even one of the processes building the graph on a legitimate error
             try {
-                // Ensuring that computedAt was after this process started
-                // waiting for the graph to complete, means that the graph
-                // was computed by the process was already working.
+                await lock.wait();
+                // A graph computed after this process started waiting is the holder's.
                 const graph = await readCachedGraphAndHydrateFileMap(start);
                 const sourceMaps = (0, nx_deps_cache_1.readSourceMapsCache)();
                 if (!sourceMaps) {
                     throw new Error('The project graph was computed in another process, but the source maps are missing.');
                 }
-                return {
-                    projectGraph: graph,
-                    sourceMaps,
-                };
+                return { projectGraph: graph, sourceMaps };
             }
             catch (e) {
-                // If the error is that the cached graph is stale after unlock,
-                // the process that was working on the graph must have been canceled,
-                // so we will fall through to the normal flow to ensure
-                // its created by one of the processes that was waiting
                 if (!(e instanceof error_types_1.StaleProjectGraphCacheError)) {
                     throw e;
                 }
+                // The holder stopped without writing a graph: build it here, or wait for
+                // whoever took the lock first.
+                holdingLock = lock.tryLock();
+            }
+            finally {
+                spinner.cleanup();
             }
-            locked = lock.check();
         }
-        lock?.lock();
         try {
             const res = await buildProjectGraphAndSourceMapsWithoutDaemon();
             perf_hooks_1.performance.measure('createProjectGraphAsync >> retrieve-project-configurations', 'retrieve-project-configurations:start', 'retrieve-project-configurations:end');
@@ -325,7 +322,9 @@ async function createProjectGraphAndSourceMapsAsync(opts = {
             handleProjectGraphError(opts, e);
         }
         finally {
-            lock?.unlock();
+            if (holdingLock) {
+                lock.unlock();
+            }
         }
     }
     else {

package/dist/src/utils/ab-testing.d.ts

@@ -28,7 +28,7 @@ export interface RecordStatMetaError {
     [key: string]: string | boolean;
 }
 export type RecordStatMeta = RecordStatMetaStart | RecordStatMetaComplete | RecordStatMetaError;
-export type MessageOptionKey = 'yes' | 'skip' | 'never';
+export type MessageOptionKey = 'yes' | 'skip';
 interface MessageData {
     code: string;
     message: string;

package/dist/src/utils/ab-testing.js

@@ -4,13 +4,11 @@ exports.messages = exports.PromptMessages = exports.NX_CLOUD_DEMO_URL = exports.
 exports.nxCloudHyperlink = nxCloudHyperlink;
 exports.nxCloudDemoHyperlink = nxCloudDemoHyperlink;
 exports.recordStat = recordStat;
-const tslib_1 = require("tslib");
 const node_child_process_1 = require("node:child_process");
 const is_ci_1 = require("./is-ci");
 const package_manager_1 = require("./package-manager");
 const get_cloud_options_1 = require("../nx-cloud/utilities/get-cloud-options");
 const terminal_link_1 = require("./terminal-link");
-const pc = tslib_1.__importStar(require("picocolors"));
 exports.NX_CLOUD_URL = 'https://nx.dev/nx-cloud';
 exports.NX_CLOUD_DEMO_URL = 'https://cloud.nx.app/demo/intro';
 /**
@@ -39,7 +37,6 @@ const messageOptions = {
             choices: [
                 { value: 'yes', name: 'Yes' },
                 { value: 'skip', name: 'Skip for now' },
-                { value: 'never', name: pc.dim("No, don't ask again") },
             ],
             footer: '\nFree for small teams. Remote caching and task distribution. 2-minute setup:',
         },
@@ -50,7 +47,6 @@ const messageOptions = {
             choices: [
                 { value: 'yes', name: 'Yes' },
                 { value: 'skip', name: 'Skip for now' },
-                { value: 'never', name: pc.dim("No, don't ask again") },
             ],
             footer: '\nLearn about it at',
             hint: `\n(it's free and can be disabled any time)`,

package/dist/src/utils/handle-errors.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleErrors = handleErrors;
+const error_types_1 = require("../project-graph/error-types");
 const logger_1 = require("./logger");
 const output_1 = require("./output");
 const handle_import_1 = require("./handle-import");
@@ -17,35 +18,9 @@ async function handleErrors(isVerbose, fn) {
         if (err.constructor.name === 'UnsuccessfulWorkflowExecution') {
             logger_1.logger.error('The generator workflow failed. See above.');
         }
-        else if (err.name === 'ProjectGraphError') {
-            const projectGraphError = err;
-            let title = projectGraphError.message;
-            if (projectGraphError.cause &&
-                typeof projectGraphError.cause === 'object' &&
-                'message' in projectGraphError.cause) {
-                title += ' ' + projectGraphError.cause.message + '.';
-            }
-            output_1.output.error({
-                title,
-                bodyLines: isVerbose
-                    ? formatErrorStackAndCause(projectGraphError, isVerbose)
-                    : projectGraphError.getErrors().map((e) => e.message),
-            });
-        }
-        else if (err.name === 'ProjectConfigurationsError') {
-            const projectConfigurationsError = err;
-            let title = projectConfigurationsError.message;
-            if (projectConfigurationsError.cause &&
-                typeof projectConfigurationsError.cause === 'object' &&
-                'message' in projectConfigurationsError.cause) {
-                title += ' ' + projectConfigurationsError.cause.message + '.';
-            }
-            output_1.output.error({
-                title,
-                bodyLines: isVerbose
-                    ? formatErrorStackAndCause(projectConfigurationsError, isVerbose)
-                    : projectConfigurationsError.errors.map((e) => e.message),
-            });
+        else if (err.name === 'ProjectGraphError' ||
+            err.name === 'ProjectConfigurationsError') {
+            output_1.output.error((0, error_types_1.formatProjectGraphError)(err, isVerbose));
         }
         else if (err.name === 'MinReleaseAgeViolationError') {
             // A cooldown violation already carries a user-shaped headline plus
@@ -59,7 +34,7 @@ async function handleErrors(isVerbose, fn) {
             const lines = (err.message ? err.message : err.toString()).split('\n');
             const bodyLines = lines.slice(1);
             if (isVerbose) {
-                bodyLines.push(...formatErrorStackAndCause(err, isVerbose));
+                bodyLines.push((0, error_types_1.formatErrorStackAndCause)(err));
             }
             else if (err.stack) {
                 bodyLines.push('Pass --verbose to see the stacktrace.');
@@ -76,16 +51,3 @@ async function handleErrors(isVerbose, fn) {
         return 1;
     }
 }
-function formatErrorStackAndCause(error, verbose) {
-    return [
-        verbose ? error.stack || error.message : error.message,
-        ...(error.cause && typeof error.cause === 'object'
-            ? [
-                'Caused by:',
-                verbose && 'stack' in error.cause
-                    ? error.cause.stack.toString()
-                    : error.cause.toString(),
-            ]
-            : []),
-    ];
-}

package/dist/src/utils/plugins/plugin-capabilities.js

@@ -63,12 +63,17 @@ async function tryGetModule(packageJson, workspaceRoot) {
             packageJson['nx-migrations'] ??
             packageJson['schematics'] ??
             packageJson['builders']) {
-            const [pluginPromise] = (0, in_process_loader_1.loadNxPlugin)(packageJson.name, workspaceRoot);
-            return await pluginPromise;
+            return await (0, in_process_loader_1.loadNxPlugin)(packageJson.name, workspaceRoot);
         }
         else {
             return {
                 name: packageJson.name,
+                capabilities: () => ({
+                    hasCreateDependencies: false,
+                    hasCreateMetadata: false,
+                    hasPreTasksExecution: false,
+                    hasPostTasksExecution: false,
+                }),
             };
         }
     }

package/dist/src/utils/serialize-overrides-into-command-line.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeOverridesIntoCommandLine = serializeOverridesIntoCommandLine;
-const flat_1 = require("flat");
 const shell_quoting_1 = require("./shell-quoting");
 function serializeOverridesIntoCommandLine(options) {
     const unparsed = options._ ? [...options._] : [];
@@ -24,9 +23,8 @@ function serializeOption(key, value, unparsed) {
         value.forEach((item) => serializeOption(key, item, unparsed));
     }
     else if (Object.prototype.toString.call(value) === '[object Object]') {
-        const flattened = (0, flat_1.flatten)(value, { safe: true });
-        for (const flattenedKey in flattened) {
-            serializeOption(`${key}.${flattenedKey}`, flattened[flattenedKey], unparsed);
+        for (const nestedKey of Object.keys(value)) {
+            serializeOption(`${key}.${nestedKey}`, value[nestedKey], unparsed);
         }
     }
     else if (typeof value === 'string' &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "23.3.0-beta.1",
+  "version": "23.3.0-beta.2",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
@@ -100,7 +100,6 @@
     "fast-string-width": "3.0.2",
     "fast-wrap-ansi": "0.2.0",
     "figures": "3.2.0",
-    "flat": "5.0.2",
     "follow-redirects": "1.16.0",
     "form-data": "4.0.6",
     "fs-constants": "1.0.0",
@@ -185,16 +184,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "23.3.0-beta.1",
-    "@nx/nx-darwin-x64": "23.3.0-beta.1",
-    "@nx/nx-freebsd-x64": "23.3.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "23.3.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "23.3.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "23.3.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "23.3.0-beta.1",
-    "@nx/nx-linux-x64-musl": "23.3.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "23.3.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "23.3.0-beta.1"
+    "@nx/nx-darwin-arm64": "23.3.0-beta.2",
+    "@nx/nx-darwin-x64": "23.3.0-beta.2",
+    "@nx/nx-freebsd-x64": "23.3.0-beta.2",
+    "@nx/nx-linux-arm-gnueabihf": "23.3.0-beta.2",
+    "@nx/nx-linux-arm64-gnu": "23.3.0-beta.2",
+    "@nx/nx-linux-arm64-musl": "23.3.0-beta.2",
+    "@nx/nx-linux-x64-gnu": "23.3.0-beta.2",
+    "@nx/nx-linux-x64-musl": "23.3.0-beta.2",
+    "@nx/nx-win32-arm64-msvc": "23.3.0-beta.2",
+    "@nx/nx-win32-x64-msvc": "23.3.0-beta.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",