nx 19.7.1 → 19.7.3

package/src/command-line/run/run.js

@@ -7,6 +7,7 @@ exports.printTargetRunHelp = printTargetRunHelp;
 exports.run = run;
 const npm_run_path_1 = require("npm-run-path");
 const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const print_help_1 = require("../../utils/print-help");
 const path_1 = require("path");
 const serialize_overrides_into_command_line_1 = require("../../utils/serialize-overrides-into-command-line");
@@ -163,14 +164,14 @@ async function runExecutor(targetDescription, overrides, context) {
 }
 function printTargetRunHelp(targetDescription, root) {
     const projectGraph = (0, project_graph_1.readCachedProjectGraph)();
-    return (0, params_1.handleErrors)(false, async () => {
+    return (0, handle_errors_1.handleErrors)(false, async () => {
         const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
         await printTargetRunHelpInternal(targetDescription, root, projectsConfigurations);
     });
 }
 function run(cwd, root, targetDescription, overrides, isVerbose, taskGraph) {
     const projectGraph = (0, project_graph_1.readCachedProjectGraph)();
-    return (0, params_1.handleErrors)(isVerbose, async () => {
+    return (0, handle_errors_1.handleErrors)(isVerbose, async () => {
         const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
         return iteratorToProcessStatusCode(await runExecutorInternal(targetDescription, overrides, root, cwd, projectsConfigurations, (0, configuration_1.readNxJson)(), projectGraph, taskGraph, isVerbose));
     });

package/src/command-line/run-many/command-object.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsRunManyCommand = void 0;
 const documentation_1 = require("../yargs-utils/documentation");
 const shared_options_1 = require("../yargs-utils/shared-options");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 exports.yargsRunManyCommand = {
     command: 'run-many',
     describe: 'Run target for multiple listed projects.',
     builder: (yargs) => (0, documentation_1.linkToNxDevAndExamples)((0, shared_options_1.withRunManyOptions)((0, shared_options_1.withOutputStyleOption)((0, shared_options_1.withTargetAndConfigurationOption)((0, shared_options_1.withBatch)(yargs)))), 'run-many'),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             await Promise.resolve().then(() => require('./run-many')).then((m) => m.runMany((0, shared_options_1.withOverrides)(args)));
         });
         process.exit(exitCode);

package/src/command-line/show/command-object.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsShowCommand = void 0;
 const yargs_1 = require("yargs");
 const shared_options_1 = require("../yargs-utils/shared-options");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 exports.yargsShowCommand = {
     command: 'show',
     describe: 'Show information about the workspace (e.g., list of projects).',
@@ -65,7 +65,7 @@ const showProjectsCommand = {
         .example('$0 show projects --type app --affected', 'Show affected apps in the workspace')
         .example('$0 show projects --affected --exclude=*-e2e', 'Show affected projects in the workspace, excluding end-to-end projects'),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose, async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose, async () => {
             const { showProjectsHandler } = await Promise.resolve().then(() => require('./projects'));
             await showProjectsHandler(args);
         });
@@ -106,7 +106,7 @@ const showProjectCommand = {
         .example('$0 show project my-app', 'View project information for my-app in JSON format')
         .example('$0 show project my-app --web', 'View project information for my-app in the browser'),
     handler: async (args) => {
-        const exitCode = await (0, params_1.handleErrors)(args.verbose, async () => {
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose, async () => {
             const { showProjectHandler } = await Promise.resolve().then(() => require('./project'));
             await showProjectHandler(args);
         });

package/src/command-line/sync/sync.js

@@ -5,11 +5,11 @@ const ora = require("ora");
 const nx_json_1 = require("../../config/nx-json");
 const project_graph_1 = require("../../project-graph/project-graph");
 const output_1 = require("../../utils/output");
-const params_1 = require("../../utils/params");
+const handle_errors_1 = require("../../utils/handle-errors");
 const sync_generators_1 = require("../../utils/sync-generators");
 const chalk = require("chalk");
 function syncHandler(options) {
-    return (0, params_1.handleErrors)(options.verbose, async () => {
+    return (0, handle_errors_1.handleErrors)(options.verbose, async () => {
         const projectGraph = await (0, project_graph_1.createProjectGraphAsync)();
         const nxJson = (0, nx_json_1.readNxJson)();
         const syncGenerators = await (0, sync_generators_1.collectAllRegisteredSyncGenerators)(projectGraph, nxJson);
@@ -32,24 +32,82 @@ function syncHandler(options) {
             });
             return 0;
         }
+        const { failedGeneratorsCount, areAllResultsFailures, anySyncGeneratorsFailed, } = (0, sync_generators_1.processSyncGeneratorResultErrors)(results);
+        const failedSyncGeneratorsFixMessageLines = (0, sync_generators_1.getFailedSyncGeneratorsFixMessageLines)(results, options.verbose);
+        if (areAllResultsFailures) {
+            output_1.output.error({
+                title: `The workspace is probably out of sync because ${failedGeneratorsCount === 1
+                    ? 'a sync generator'
+                    : 'some sync generators'} failed to run`,
+                bodyLines: failedSyncGeneratorsFixMessageLines,
+            });
+            return 1;
+        }
+        const resultBodyLines = (0, sync_generators_1.getSyncGeneratorSuccessResultsMessageLines)(results);
         if (options.check) {
             output_1.output.error({
-                title: `The workspace is out of sync`,
-                bodyLines: (0, sync_generators_1.syncGeneratorResultsToMessageLines)(results),
+                title: 'The workspace is out of sync',
+                bodyLines: resultBodyLines,
             });
+            if (anySyncGeneratorsFailed) {
+                output_1.output.error({
+                    title: failedGeneratorsCount === 1
+                        ? 'A sync generator failed to run'
+                        : 'Some sync generators failed to run',
+                    bodyLines: failedSyncGeneratorsFixMessageLines,
+                });
+            }
             return 1;
         }
         output_1.output.warn({
-            title: `The workspace is out of sync`,
-            bodyLines: (0, sync_generators_1.syncGeneratorResultsToMessageLines)(results),
+            title: 'The workspace is out of sync',
+            bodyLines: resultBodyLines,
         });
         const spinner = ora('Syncing the workspace...');
         spinner.start();
-        await (0, sync_generators_1.flushSyncGeneratorChanges)(results);
-        spinner.succeed(`The workspace was synced successfully!
-
-Please make sure to commit the changes to your repository.
-`);
+        try {
+            const flushResult = await (0, sync_generators_1.flushSyncGeneratorChanges)(results);
+            if ('generatorFailures' in flushResult) {
+                spinner.fail();
+                output_1.output.error({
+                    title: 'Failed to sync the workspace',
+                    bodyLines: (0, sync_generators_1.getFlushFailureMessageLines)(flushResult, options.verbose),
+                });
+                return 1;
+            }
+        }
+        catch (e) {
+            spinner.fail();
+            output_1.output.error({
+                title: 'Failed to sync the workspace',
+                bodyLines: [
+                    'Syncing the workspace failed with the following error:',
+                    '',
+                    e.message,
+                    ...(options.verbose && !!e.stack ? [`\n${e.stack}`] : []),
+                    '',
+                    'Please rerun with `--verbose` and report the error at: https://github.com/nrwl/nx/issues/new/choose',
+                ],
+            });
+            return 1;
+        }
+        const successTitle = anySyncGeneratorsFailed
+            ? // the identified changes were synced successfully, but the workspace
+                // is still not up to date, which we'll mention next
+                'The identified changes were synced successfully!'
+            : // the workspace is fully up to date
+                'The workspace was synced successfully!';
+        const successSubtitle = 'Please make sure to commit the changes to your repository.';
+        spinner.succeed(`${successTitle}\n\n${successSubtitle}`);
+        if (anySyncGeneratorsFailed) {
+            output_1.output.error({
+                title: `The workspace is probably still out of sync because ${failedGeneratorsCount === 1
+                    ? 'a sync generator'
+                    : 'some sync generators'} failed to run`,
+                bodyLines: failedSyncGeneratorsFixMessageLines,
+            });
+            return 1;
+        }
         return 0;
     });
 }

package/src/daemon/client/client.d.ts

@@ -4,7 +4,7 @@ import { Hash } from '../../hasher/task-hasher';
 import { Task, TaskGraph } from '../../config/task-graph';
 import { ConfigurationSourceMaps } from '../../project-graph/utils/project-configuration-utils';
 import { NxWorkspaceFiles, TaskRun } from '../../native';
-import type { SyncGeneratorChangesResult } from '../../utils/sync-generators';
+import type { FlushSyncGeneratorChangesResult, SyncGeneratorRunResult } from '../../utils/sync-generators';
 export type UnregisterCallback = () => void;
 export type ChangedFile = {
     path: string;
@@ -52,8 +52,8 @@ export declare class DaemonClient {
     hashGlob(globs: string[], exclude?: string[]): Promise<string>;
     getFlakyTasks(hashes: string[]): Promise<string[]>;
     recordTaskRuns(taskRuns: TaskRun[]): Promise<void>;
-    getSyncGeneratorChanges(generators: string[]): Promise<SyncGeneratorChangesResult[]>;
-    flushSyncGeneratorChangesToDisk(generators: string[]): Promise<void>;
+    getSyncGeneratorChanges(generators: string[]): Promise<SyncGeneratorRunResult[]>;
+    flushSyncGeneratorChangesToDisk(generators: string[]): Promise<FlushSyncGeneratorChangesResult>;
     getRegisteredSyncGenerators(): Promise<string[]>;
     updateWorkspaceContext(createdFiles: string[], updatedFiles: string[], deletedFiles: string[]): Promise<void>;
     isServerAvailable(): Promise<boolean>;

package/src/daemon/server/handle-flush-sync-generator-changes-to-disk.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleFlushSyncGeneratorChangesToDisk = handleFlushSyncGeneratorChangesToDisk;
 const sync_generators_1 = require("./sync-generators");
 async function handleFlushSyncGeneratorChangesToDisk(generators) {
-    await (0, sync_generators_1.flushSyncGeneratorChangesToDisk)(generators);
+    const result = await (0, sync_generators_1.flushSyncGeneratorChangesToDisk)(generators);
     return {
-        response: '{}',
+        response: JSON.stringify(result),
         description: 'handleFlushSyncGeneratorChangesToDisk',
     };
 }

package/src/daemon/server/handle-get-sync-generator-changes.js

@@ -4,12 +4,14 @@ exports.handleGetSyncGeneratorChanges = handleGetSyncGeneratorChanges;
 const sync_generators_1 = require("./sync-generators");
 async function handleGetSyncGeneratorChanges(generators) {
     const changes = await (0, sync_generators_1.getCachedSyncGeneratorChanges)(generators);
-    // strip out the content of the changes and any potential callback
-    const result = changes.map((change) => ({
-        generatorName: change.generatorName,
-        changes: change.changes.map((c) => ({ ...c, content: null })),
-        outOfSyncMessage: change.outOfSyncMessage,
-    }));
+    const result = changes.map((change) => 'error' in change
+        ? change
+        : // strip out the content of the changes and any potential callback
+            {
+                generatorName: change.generatorName,
+                changes: change.changes.map((c) => ({ ...c, content: null })),
+                outOfSyncMessage: change.outOfSyncMessage,
+            });
     return {
         response: JSON.stringify(result),
         description: 'handleGetSyncGeneratorChanges',

package/src/daemon/server/sync-generators.d.ts

@@ -1,10 +1,10 @@
 import type { ProjectGraph } from '../../config/project-graph';
-import { type SyncGeneratorChangesResult } from '../../utils/sync-generators';
-export declare function getCachedSyncGeneratorChanges(generators: string[]): Promise<SyncGeneratorChangesResult[]>;
-export declare function flushSyncGeneratorChangesToDisk(generators: string[]): Promise<void>;
+import { type FlushSyncGeneratorChangesResult, type SyncGeneratorRunResult } from '../../utils/sync-generators';
+export declare function getCachedSyncGeneratorChanges(generators: string[]): Promise<SyncGeneratorRunResult[]>;
+export declare function flushSyncGeneratorChangesToDisk(generators: string[]): Promise<FlushSyncGeneratorChangesResult>;
 export declare function collectAndScheduleSyncGenerators(projectGraph: ProjectGraph): void;
 export declare function getCachedRegisteredSyncGenerators(): Promise<string[]>;
 /**
  * @internal
  */
-export declare function _getConflictingGeneratorGroups(results: SyncGeneratorChangesResult[]): string[][];
+export declare function _getConflictingGeneratorGroups(results: SyncGeneratorRunResult[]): string[][];

package/src/daemon/server/sync-generators.js

@@ -59,7 +59,7 @@ async function flushSyncGeneratorChangesToDisk(generators) {
     for (const generator of generators) {
         syncGeneratorsCacheResultPromises.delete(generator);
     }
-    await (0, sync_generators_1.flushSyncGeneratorChanges)(results);
+    return await (0, sync_generators_1.flushSyncGeneratorChanges)(results);
 }
 function collectAndScheduleSyncGenerators(projectGraph) {
     if (!projectGraph) {
@@ -191,6 +191,7 @@ async function processConflictingGenerators(conflicts, initialResults) {
     const conflictRunResults = (await Promise.all(conflicts.map((generators) => {
         const [firstGenerator, ...generatorsToRun] = generators;
         // it must exists because the conflicts were identified from the initial results
+        // and it's guaranteed to be a success result
         const firstGeneratorResult = initialResults.find((r) => r.generatorName === firstGenerator);
         const tree = new tree_1.FsTree(workspace_root_1.workspaceRoot, false, `running sync generators ${generators.join(',')}`);
         // pre-apply the changes from the first generator to avoid running it
@@ -234,6 +235,9 @@ async function processConflictingGenerators(conflicts, initialResults) {
 function _getConflictingGeneratorGroups(results) {
     const changedFileToGeneratorMap = new Map();
     for (const result of results) {
+        if ('error' in result) {
+            continue;
+        }
         for (const change of result.changes) {
             if (!changedFileToGeneratorMap.has(change.path)) {
                 changedFileToGeneratorMap.set(change.path, new Set());
@@ -318,7 +322,12 @@ function runGenerator(generator, projects, tree) {
     scheduledGenerators.delete(generator);
     tree ??= new tree_1.FsTree(workspace_root_1.workspaceRoot, false, `running sync generator ${generator}`);
     return (0, sync_generators_1.runSyncGenerator)(tree, generator, projects).then((result) => {
-        log(generator, 'changes:', result.changes.map((c) => c.path).join(', '));
+        if ('error' in result) {
+            log(generator, 'error:', result.error.message);
+        }
+        else {
+            log(generator, 'changes:', result.changes.map((c) => c.path).join(', '));
+        }
         return result;
     });
 }

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js

@@ -89,7 +89,6 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
         return null;
     }
     const isGitHubDetected = schema.github ?? (await (0, url_shorten_1.repoUsesGithub)(schema.github));
-    let responseFromCreateNxCloudWorkspaceV1;
     let responseFromCreateNxCloudWorkspaceV2;
     /**
      * Do not create an Nx Cloud token if the user is using GitHub and

package/src/nx-cloud/utilities/get-cloud-options.d.ts

@@ -2,3 +2,4 @@ import { CloudTaskRunnerOptions } from '../nx-cloud-tasks-runner-shell';
 export declare function getCloudOptions(directory?: string): CloudTaskRunnerOptions;
 export declare function getCloudUrl(): string;
 export declare function removeTrailingSlash(apiUrl: string): string;
+export declare function isNxCloudId(token: string): boolean;

package/src/nx-cloud/utilities/get-cloud-options.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCloudOptions = getCloudOptions;
 exports.getCloudUrl = getCloudUrl;
 exports.removeTrailingSlash = removeTrailingSlash;
+exports.isNxCloudId = isNxCloudId;
 const nx_json_1 = require("../../config/nx-json");
 const run_command_1 = require("../../tasks-runner/run-command");
 const workspace_root_1 = require("../../utils/workspace-root");
@@ -17,3 +18,6 @@ function getCloudUrl() {
 function removeTrailingSlash(apiUrl) {
     return apiUrl[apiUrl.length - 1] === '/' ? apiUrl.slice(0, -1) : apiUrl;
 }
+function isNxCloudId(token) {
+    return token.length === 24;
+}

package/src/nx-cloud/utilities/is-workspace-claimed.d.ts

@@ -1 +1 @@
-export declare function isWorkspaceClaimed(nxCloudAccessToken: any): Promise<any>;
+export declare function isWorkspaceClaimed(accessToken: string): Promise<any>;

package/src/nx-cloud/utilities/is-workspace-claimed.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isWorkspaceClaimed = isWorkspaceClaimed;
 const get_cloud_options_1 = require("./get-cloud-options");
-async function isWorkspaceClaimed(nxCloudAccessToken) {
-    if (!nxCloudAccessToken)
+async function isWorkspaceClaimed(accessToken) {
+    if (!accessToken)
         return false;
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
     try {
-        const response = await require('axios').post(`${apiUrl}/nx-cloud/is-workspace-claimed`, {
-            nxCloudAccessToken,
-        });
+        const requestData = (0, get_cloud_options_1.isNxCloudId)(accessToken)
+            ? { nxCloudId: accessToken }
+            : { nxCloudAccessToken: accessToken };
+        const response = await require('axios').post(`${apiUrl}/nx-cloud/is-workspace-claimed`, requestData);
         if (response.data.message) {
             return false;
         }

package/src/nx-cloud/utilities/onboarding.js

@@ -23,6 +23,6 @@ async function getNxCloudAppOnBoardingUrl(token) {
 }
 function readNxCloudToken(tree) {
     const nxJson = (0, devkit_exports_1.readNxJson)(tree);
-    const { accessToken } = (0, run_command_1.getRunnerOptions)('default', nxJson, {}, true);
-    return accessToken;
+    const { accessToken, nxCloudId } = (0, run_command_1.getRunnerOptions)('default', nxJson, {}, true);
+    return accessToken || nxCloudId;
 }

package/src/plugins/package-json/create-nodes.js

@@ -110,7 +110,7 @@ function buildProjectConfigurationFromPackageJson(packageJson, workspaceRoot, pa
         sourceRoot: projectRoot,
         name,
         ...packageJson.nx,
-        targets: (0, package_json_1.readTargetsFromPackageJson)(packageJson),
+        targets: (0, package_json_1.readTargetsFromPackageJson)(packageJson, nxJson),
         tags: (0, package_json_1.getTagsFromPackageJson)(packageJson),
         metadata: (0, package_json_1.getMetadataFromPackageJson)(packageJson),
     };

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

@@ -18,7 +18,7 @@ export declare class ProjectGraphError extends Error {
      */
     getPartialProjectGraph(): ProjectGraph;
     getPartialSourcemaps(): ConfigurationSourceMaps;
-    getErrors(): (AggregateCreateNodesError | MergeNodesError | CreateMetadataError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | ProcessDependenciesError | ProcessProjectGraphError | WorkspaceValidityError)[];
+    getErrors(): (AggregateCreateNodesError | MergeNodesError | ProjectsWithNoNameError | MultipleProjectsWithSameNameError | CreateMetadataError | ProcessDependenciesError | ProcessProjectGraphError | WorkspaceValidityError)[];
 }
 export declare class MultipleProjectsWithSameNameError extends Error {
     conflicts: Map<string, string[]>;

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

@@ -24,7 +24,7 @@ class ProjectGraphError extends Error {
         tslib_1.__classPrivateFieldSet(this, _ProjectGraphError_partialProjectGraph, partialProjectGraph, "f");
         tslib_1.__classPrivateFieldSet(this, _ProjectGraphError_partialSourceMaps, partialSourceMaps, "f");
         this.stack = `${this.message}\n  ${errors
-            .map((error) => error.stack.split('\n').join('\n  '))
+            .map((error) => indentString(formatErrorStackAndCause(error), 2))
             .join('\n')}`;
     }
     /**
@@ -186,13 +186,13 @@ class MergeNodesError extends Error {
         this.name = this.constructor.name;
         this.file = file;
         this.pluginName = pluginName;
-        this.stack = `${this.message}\n  ${error.stack.split('\n').join('\n  ')}`;
+        this.stack = `${this.message}\n${indentString(formatErrorStackAndCause(error), 2)}`;
     }
 }
 exports.MergeNodesError = MergeNodesError;
 class CreateMetadataError extends Error {
     constructor(error, plugin) {
-        super(`The "${plugin}" plugin threw an error while creating metadata:`, {
+        super(`The "${plugin}" plugin threw an error while creating metadata: ${error.message}`, {
             cause: error,
         });
         this.error = error;
@@ -203,7 +203,7 @@ class CreateMetadataError extends Error {
 exports.CreateMetadataError = CreateMetadataError;
 class ProcessDependenciesError extends Error {
     constructor(pluginName, { cause }) {
-        super(`The "${pluginName}" plugin threw an error while creating dependencies:`, {
+        super(`The "${pluginName}" plugin threw an error while creating dependencies: ${cause.message}`, {
             cause,
         });
         this.pluginName = pluginName;
@@ -234,7 +234,7 @@ class ProcessProjectGraphError extends Error {
         });
         this.pluginName = pluginName;
         this.name = this.constructor.name;
-        this.stack = `${this.message}\n  ${cause.stack.split('\n').join('\n  ')}`;
+        this.stack = `${this.message}\n${indentString(cause, 2)}`;
     }
 }
 exports.ProcessProjectGraphError = ProcessProjectGraphError;
@@ -289,3 +289,17 @@ class LoadPluginError extends Error {
     }
 }
 exports.LoadPluginError = LoadPluginError;
+function indentString(str, indent) {
+    return (' '.repeat(indent) +
+        str
+            .split('\n')
+            .map((line) => ' '.repeat(indent) + line)
+            .join('\n'));
+}
+function formatErrorStackAndCause(error) {
+    const cause = error.cause && error.cause instanceof Error ? error.cause : null;
+    return (error.stack +
+        (cause
+            ? `\nCaused by: \n${indentString(cause.stack ?? cause.message, 2)}`
+            : ''));
+}