@angular/cli 14.0.0-next.9 → 14.0.0-rc.2

package/lib/cli/index.js

@@ -73,7 +73,7 @@ async function default_1(options) {
             // Log nothing.
         }
         else {
-            logger.fatal('An unexpected error occurred: ' + JSON.stringify(err));
+            logger.fatal(`An unexpected error occurred: ${'toString' in err ? err.toString() : JSON.stringify(err)}`);
         }
         return 1;
     }

package/lib/config/schema.json

@@ -742,6 +742,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the class, relative to the workspace root.",
           "visible": false
         },
@@ -773,6 +776,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the component file, relative to the current workspace. Default is a folder with the same name as the component in the project root.",
           "visible": false
         },
@@ -812,6 +818,12 @@
           "alias": "t",
           "x-user-analytics": 10
         },
+        "standalone": {
+          "description": "Whether the generated component is standalone.",
+          "type": "boolean",
+          "default": false,
+          "x-user-analytics": 15
+        },
         "viewEncapsulation": {
           "description": "The view encapsulation strategy to use in the new component.",
           "enum": [
@@ -923,6 +935,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the interface that defines the directive, relative to the workspace root.",
           "visible": false
         },
@@ -964,6 +979,12 @@
           "format": "html-selector",
           "description": "The HTML selector to use for this directive."
         },
+        "standalone": {
+          "description": "Whether the generated directive is standalone.",
+          "type": "boolean",
+          "default": false,
+          "x-user-analytics": 15
+        },
         "flat": {
           "type": "boolean",
           "description": "When true (the default), creates the new files at the top level of the current project.",
@@ -1000,6 +1021,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the enum definition, relative to the current workspace.",
           "visible": false
         },
@@ -1045,6 +1069,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the interface that defines the guard, relative to the current workspace.",
           "visible": false
         },
@@ -1094,6 +1121,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the interceptor, relative to the workspace root.",
           "visible": false
         },
@@ -1135,6 +1165,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the interface, relative to the workspace root.",
           "visible": false
         },
@@ -1224,6 +1257,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the pipe, relative to the workspace root.",
           "visible": false
         },
@@ -1251,6 +1287,12 @@
           "description": "Do not import this pipe into the owning NgModule.",
           "x-user-analytics": 18
         },
+        "standalone": {
+          "description": "Whether the generated pipe is standalone.",
+          "type": "boolean",
+          "default": false,
+          "x-user-analytics": 15
+        },
         "module": {
           "type": "string",
           "description": "The declaring NgModule.",
@@ -1448,6 +1490,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the interface that defines the resolver, relative to the current workspace.",
           "visible": false
         },
@@ -1477,7 +1522,9 @@
         },
         "path": {
           "type": "string",
-          "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the service, relative to the workspace root.",
           "visible": false
         },
@@ -1510,6 +1557,9 @@
         "path": {
           "type": "string",
           "format": "path",
+          "$default": {
+            "$source": "workingDirectory"
+          },
           "description": "The path at which to create the worker file, relative to the current workspace.",
           "visible": false
         },

package/lib/config/workspace-schema.d.ts

@@ -292,6 +292,10 @@ export interface AngularComponentOptionsSchema {
      * Do not create "spec.ts" test files for the new component.
      */
     skipTests?: boolean;
+    /**
+     * Whether the generated component is standalone.
+     */
+    standalone?: boolean;
     /**
      * The file extension or preprocessor to use for style files, or 'none' to skip generating
      * the style file.
@@ -369,6 +373,10 @@ export interface AngularDirectiveOptionsSchema {
      * Do not create "spec.ts" test files for the new class.
      */
     skipTests?: boolean;
+    /**
+     * Whether the generated directive is standalone.
+     */
+    standalone?: boolean;
 }
 /**
  * Generates a new, generic enum definition for the given or default project.
@@ -640,6 +648,10 @@ export interface AngularPipeOptionsSchema {
      * Do not create "spec.ts" test files for the new pipe.
      */
     skipTests?: boolean;
+    /**
+     * Whether the generated pipe is standalone.
+     */
+    standalone?: boolean;
 }
 /**
  * Generates a new, generic resolver definition in the given or default project.

package/lib/init.js

@@ -120,7 +120,7 @@ const version_1 = require("../src/utilities/version");
     });
 })
     .then((exitCode) => {
-    process.exit(exitCode);
+    process.exitCode = exitCode;
 })
     .catch((err) => {
     // eslint-disable-next-line  no-console

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.0-next.9",
+  "version": "14.0.0-rc.2",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,23 +25,23 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1400.0-next.9",
-    "@angular-devkit/core": "14.0.0-next.9",
-    "@angular-devkit/schematics": "14.0.0-next.9",
-    "@schematics/angular": "14.0.0-next.9",
+    "@angular-devkit/architect": "0.1400.0-rc.2",
+    "@angular-devkit/core": "14.0.0-rc.2",
+    "@angular-devkit/schematics": "14.0.0-rc.2",
+    "@schematics/angular": "14.0.0-rc.2",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.4",
     "ini": "3.0.0",
-    "inquirer": "8.2.2",
+    "inquirer": "8.2.4",
     "jsonc-parser": "3.0.0",
     "npm-package-arg": "9.0.2",
     "npm-pick-manifest": "7.0.1",
     "open": "8.4.0",
     "ora": "5.4.1",
-    "pacote": "13.1.1",
+    "pacote": "13.3.0",
     "resolve": "1.22.0",
-    "semver": "7.3.6",
+    "semver": "7.3.7",
     "symbol-observable": "4.0.0",
     "uuid": "8.3.2",
     "yargs": "17.4.1"
@@ -49,12 +49,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "14.0.0-next.9",
-      "@angular-devkit/architect": "0.1400.0-next.9",
-      "@angular-devkit/build-angular": "14.0.0-next.9",
-      "@angular-devkit/build-webpack": "0.1400.0-next.9",
-      "@angular-devkit/core": "14.0.0-next.9",
-      "@angular-devkit/schematics": "14.0.0-next.9"
+      "@angular/cli": "14.0.0-rc.2",
+      "@angular-devkit/architect": "0.1400.0-rc.2",
+      "@angular-devkit/build-angular": "14.0.0-rc.2",
+      "@angular-devkit/build-webpack": "0.1400.0-rc.2",
+      "@angular-devkit/core": "14.0.0-rc.2",
+      "@angular-devkit/schematics": "14.0.0-rc.2"
     }
   },
   "engines": {

package/src/command-builder/architect-base-command-module.d.ts

@@ -13,7 +13,7 @@ export interface MissingTargetChoice {
     name: string;
     value: string;
 }
-export declare abstract class ArchitectBaseCommandModule<T> extends CommandModule<T> implements CommandModuleImplementation<T> {
+export declare abstract class ArchitectBaseCommandModule<T extends object> extends CommandModule<T> implements CommandModuleImplementation<T> {
     static scope: CommandScope;
     protected shouldReportAnalytics: boolean;
     protected readonly missingTargetChoices: MissingTargetChoice[] | undefined;

package/src/command-builder/command-module.js

@@ -42,6 +42,7 @@ const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const helpers_1 = require("yargs/helpers");
 const analytics_1 = require("../analytics/analytics");
+const completion_1 = require("../utilities/completion");
 const memoize_1 = require("../utilities/memoize");
 var CommandScope;
 (function (CommandScope) {
@@ -89,6 +90,12 @@ class CommandModule {
         for (const [key, value] of Object.entries(options)) {
             camelCasedOptions[helpers_1.Parser.camelCase(key)] = value;
         }
+        // Set up autocompletion if appropriate.
+        const autocompletionExitCode = await (0, completion_1.considerSettingUpAutocompletion)(this.commandName, this.context.logger);
+        if (autocompletionExitCode !== undefined) {
+            process.exitCode = autocompletionExitCode;
+            return;
+        }
         // Gather and report analytics.
         const analytics = await this.getAnalytics();
         if (this.shouldReportAnalytics) {
@@ -141,9 +148,8 @@ class CommandModule {
      * **Note:** This method should be called from the command bundler method.
      */
     addSchemaOptionsToCommand(localYargs, options) {
-        const workingDir = (0, core_1.normalize)(path.relative(this.context.root, process.cwd()));
         for (const option of options) {
-            const { default: defaultVal, positional, deprecated, description, alias, userAnalytics, type, hidden, name, choices, format, } = option;
+            const { default: defaultVal, positional, deprecated, description, alias, userAnalytics, type, hidden, name, choices, } = option;
             const sharedOptions = {
                 alias,
                 hidden,
@@ -153,10 +159,6 @@ class CommandModule {
                 // This should only be done when `--help` is used otherwise default will override options set in angular.json.
                 ...(this.context.args.options.help ? { default: defaultVal } : {}),
             };
-            // Special case for schematics
-            if (workingDir && format === 'path' && name === 'path' && hidden) {
-                sharedOptions.default = workingDir;
-            }
             if (positional === undefined) {
                 localYargs = localYargs.option(core_1.strings.dasherize(name), {
                     type,

package/src/command-builder/command-runner.js

@@ -110,16 +110,11 @@ async function runCommand(args, logger) {
         }
         localYargs = (0, command_1.addCommandModuleToYargs)(localYargs, CommandModule, context);
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const usageInstance = localYargs.getInternalMethods().getUsageInstance();
     if (jsonHelp) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const usageInstance = localYargs.getInternalMethods().getUsageInstance();
         usageInstance.help = () => (0, json_help_1.jsonHelpUsage)();
     }
-    if (getYargsCompletions) {
-        // When in auto completion mode avoid printing description as it causes a slugish
-        // experience when there are a large set of options.
-        usageInstance.getDescriptions = () => ({});
-    }
     await localYargs
         .scriptName('ng')
         // https://github.com/yargs/yargs/blob/main/docs/advanced.md#customizing-yargs-parser

package/src/command-builder/schematics-command-module.js

@@ -40,6 +40,7 @@ exports.SchematicsCommandModule = exports.DEFAULT_SCHEMATICS_COLLECTION = void 0
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const tools_1 = require("@angular-devkit/schematics/tools");
+const path_1 = require("path");
 const config_1 = require("../utilities/config");
 const memoize_1 = require("../utilities/memoize");
 const tty_1 = require("../utilities/tty");
@@ -109,9 +110,7 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
             optionTransforms: [
                 // Add configuration file defaults
                 async (schematic, current) => {
-                    const projectName = typeof current.project === 'string'
-                        ? current.project
-                        : this.getProjectName();
+                    const projectName = typeof (current === null || current === void 0 ? void 0 : current.project) === 'string' ? current.project : this.getProjectName();
                     return {
                         ...(await (0, config_1.getSchematicDefaults)(schematic.collection.name, schematic.name, projectName)),
                         ...current,
@@ -121,8 +120,10 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
             engineHostCreator: (options) => new schematic_engine_host_1.SchematicEngineHost(options.resolvePaths),
         });
         workflow.registry.addPostTransform(core_1.schema.transforms.addUndefinedDefaults);
-        workflow.registry.addSmartDefaultProvider('projectName', () => this.getProjectName());
         workflow.registry.useXDeprecatedProvider((msg) => logger.warn(msg));
+        workflow.registry.addSmartDefaultProvider('projectName', () => this.getProjectName());
+        const workingDir = (0, core_1.normalize)((0, path_1.relative)(this.context.root, process.cwd()));
+        workflow.registry.addSmartDefaultProvider('workingDirectory', () => workingDir === '' ? undefined : workingDir);
         let shouldReportAnalytics = true;
         workflow.engineHost.registerOptionsTransform(async (schematic, options) => {
             var _a;
@@ -136,6 +137,28 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
                     schematic.name.replace(/\//g, '_'),
                 ]);
             }
+            // TODO: The below should be removed in version 15 when we change 1P schematics to use the `workingDirectory smart default`.
+            // Handle `"format": "path"` options.
+            const schema = schematic === null || schematic === void 0 ? void 0 : schematic.schemaJson;
+            if (!options || !schema || !(0, core_1.isJsonObject)(schema)) {
+                return options;
+            }
+            if (!('path' in options && options['path'] === undefined)) {
+                return options;
+            }
+            const properties = schema === null || schema === void 0 ? void 0 : schema['properties'];
+            if (!properties || !(0, core_1.isJsonObject)(properties)) {
+                return options;
+            }
+            const property = properties['path'];
+            if (!property || !(0, core_1.isJsonObject)(property)) {
+                return options;
+            }
+            if (property['format'] === 'path' && !property['$default']) {
+                options['path'] = workingDir || undefined;
+                this.context.logger.warn(`The 'path' option in '${schematic === null || schematic === void 0 ? void 0 : schematic.schema}' is using deprecated behaviour.` +
+                    `'workingDirectory' smart default provider should be used instead.`);
+            }
             return options;
         });
         if (options.interactive !== false && (0, tty_1.isTTY)()) {
@@ -211,16 +234,20 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
     }
     async getSchematicCollections() {
         var _a;
+        // Resolve relative collections from the location of `angular.json`
+        const resolveRelativeCollection = (collectionName) => collectionName.charAt(0) === '.'
+            ? (0, path_1.resolve)(this.context.root, collectionName)
+            : collectionName;
         const getSchematicCollections = (configSection) => {
             if (!configSection) {
                 return undefined;
             }
             const { schematicCollections, defaultCollection } = configSection;
             if (Array.isArray(schematicCollections)) {
-                return new Set(schematicCollections);
+                return new Set(schematicCollections.map((c) => resolveRelativeCollection(c)));
             }
             else if (typeof defaultCollection === 'string') {
-                return new Set([defaultCollection]);
+                return new Set([resolveRelativeCollection(defaultCollection)]);
             }
             return undefined;
         };
@@ -277,11 +304,11 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
             if (err instanceof schematics_1.UnsuccessfulWorkflowExecution) {
                 // "See above" because we already printed the error.
                 logger.fatal('The Schematic workflow failed. See above.');
-                return 1;
             }
             else {
-                throw err;
+                logger.fatal(err.message);
             }
+            return 1;
         }
         finally {
             unsubscribe();
@@ -301,9 +328,9 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
         if (typeof defaultProjectName === 'string' && defaultProjectName) {
             if (!this.defaultProjectDeprecationWarningShown) {
                 logger.warn(core_1.tags.oneLine `
-            DEPRECATED: The 'defaultProject' workspace option has been deprecated.
-            The project to use will be determined from the current working directory.
-          `);
+             DEPRECATED: The 'defaultProject' workspace option has been deprecated.
+             The project to use will be determined from the current working directory.
+           `);
                 this.defaultProjectDeprecationWarningShown = true;
             }
             return defaultProjectName;

package/src/command-builder/utilities/command.d.ts

@@ -8,6 +8,6 @@
 import { Argv } from 'yargs';
 import { CommandContext, CommandModule, CommandModuleImplementation } from '../command-module';
 export declare const demandCommandFailureMessage = "You need to specify a command before moving on. Use '--help' to view the available commands.";
-export declare function addCommandModuleToYargs<T, U extends Partial<CommandModuleImplementation> & {
+export declare function addCommandModuleToYargs<T extends object, U extends Partial<CommandModuleImplementation> & {
     new (context: CommandContext): Partial<CommandModuleImplementation> & CommandModule;
 }>(localYargs: Argv<T>, commandModule: U, context: CommandContext): Argv<T>;

package/src/command-builder/utilities/schematic-engine-host.js

@@ -161,7 +161,9 @@ function wrap(schematicFile, schematicDirectory, moduleCache, exportName) {
     const schematicCode = (0, fs_1.readFileSync)(schematicFile, 'utf8');
     // `module` is required due to @angular/localize ng-add being in UMD format
     const headerCode = '(function() {\nvar exports = {};\nvar module = { exports };\n';
-    const footerCode = exportName ? `\nreturn exports['${exportName}'];});` : '\nreturn exports;});';
+    const footerCode = exportName
+        ? `\nreturn module.exports['${exportName}'];});`
+        : '\nreturn module.exports;});';
     const script = new vm_1.Script(headerCode + schematicCode + footerCode, {
         filename: schematicFile,
         lineOffset: 3,

package/src/commands/completion/cli.d.ts

@@ -12,5 +12,5 @@ export declare class CompletionCommandModule extends CommandModule implements Co
     describe: string;
     longDescriptionPath: string;
     builder(localYargs: Argv): Argv;
-    run(): void;
+    run(): Promise<number>;
 }

package/src/commands/completion/cli.js

@@ -14,13 +14,51 @@ exports.CompletionCommandModule = void 0;
 const path_1 = require("path");
 const yargs_1 = __importDefault(require("yargs"));
 const command_module_1 = require("../../command-builder/command-module");
+const command_1 = require("../../command-builder/utilities/command");
+const color_1 = require("../../utilities/color");
+const completion_1 = require("../../utilities/completion");
 class CompletionCommandModule extends command_module_1.CommandModule {
     constructor() {
         super(...arguments);
         this.command = 'completion';
-        this.describe = 'Generate a bash and zsh real-time type-ahead autocompletion script.';
+        this.describe = 'Set up Angular CLI autocompletion for your terminal.';
         this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
     }
+    builder(localYargs) {
+        return (0, command_1.addCommandModuleToYargs)(localYargs, CompletionScriptCommandModule, this.context);
+    }
+    async run() {
+        let rcFile;
+        try {
+            rcFile = await (0, completion_1.initializeAutocomplete)();
+        }
+        catch (err) {
+            this.context.logger.error(err.message);
+            return 1;
+        }
+        this.context.logger.info(`
+Appended \`source <(ng completion script)\` to \`${rcFile}\`. Restart your terminal or run the following to autocomplete \`ng\` commands:
+
+    ${color_1.colors.yellow('source <(ng completion script)')}
+      `.trim());
+        if ((await (0, completion_1.hasGlobalCliInstall)()) === false) {
+            this.context.logger.warn('Setup completed successfully, but there does not seem to be a global install of the' +
+                ' Angular CLI. For autocompletion to work, the CLI will need to be on your `$PATH`, which' +
+                ' is typically done with the `-g` flag in `npm install -g @angular/cli`.' +
+                '\n\n' +
+                'For more information, see https://angular.io/cli/completion#global-install');
+        }
+        return 0;
+    }
+}
+exports.CompletionCommandModule = CompletionCommandModule;
+class CompletionScriptCommandModule extends command_module_1.CommandModule {
+    constructor() {
+        super(...arguments);
+        this.command = 'script';
+        this.describe = 'Generate a bash and zsh real-time type-ahead autocompletion script.';
+        this.longDescriptionPath = undefined;
+    }
     builder(localYargs) {
         return localYargs;
     }
@@ -28,4 +66,3 @@ class CompletionCommandModule extends command_module_1.CommandModule {
         yargs_1.default.showCompletionScript();
     }
 }
-exports.CompletionCommandModule = CompletionCommandModule;

package/src/commands/completion/long-description.md

@@ -1 +1,73 @@
-To enable bash and zsh real-time type-ahead autocompletion, copy and paste the generated script to your `.bashrc`, `.bash_profile`, `.zshrc` or `.zsh_profile`.
+Setting up autocompletion configures your terminal, so pressing the `<TAB>` key while in the middle
+of typing will display various commands and options available to you. This makes it very easy to
+discover and use CLI commands without lots of memorization.
+
+![A demo of Angular CLI autocompletion in a terminal. The user types several partial `ng` commands,
+using autocompletion to finish several arguments and list contextual options.
+](generated/images/guide/cli/completion.gif)
+
+## Automated setup
+
+The CLI should prompt and ask to set up autocompletion for you the first time you use it (v14+).
+Simply answer "Yes" and the CLI will take care of the rest.
+
+```
+$ ng serve
+? Would you like to enable autocompletion? This will set up your terminal so pressing TAB while
+typing Angular CLI commands will show possible options and autocomplete arguments. (Enabling
+autocompletion will modify configuration files in your home directory.) Yes
+Appended `source <(ng completion script)` to `/home/my-username/.bashrc`. Restart your terminal or
+run:
+
+source <(ng completion script)
+
+to autocomplete `ng` commands.
+
+# Serve output...
+```
+
+If you already refused the prompt, it won't ask again. But you can run `ng completion` to
+do the same thing automatically.
+
+This modifies your terminal environment to load Angular CLI autocompletion, but can't update your
+current terminal session. Either restart it or run `source <(ng completion script)` directly to
+enable autocompletion in your current session.
+
+Test it out by typing `ng ser<TAB>` and it should autocomplete to `ng serve`. Ambiguous arguments
+will show all possible options and their documentation, such as `ng generate <TAB>`.
+
+## Manual setup
+
+Some users may have highly customized terminal setups, possibly with configuration files checked
+into source control with an opinionated structure. `ng completion` only ever appends Angular's setup
+to an existing configuration file for your current shell, or creates one if none exists. If you want
+more control over exactly where this configuration lives, you can manually set it up by having your
+shell run at startup:
+
+```bash
+source <(ng completion script)
+```
+
+This is equivalent to what `ng completion` will automatically set up, and gives power users more
+flexibility in their environments when desired.
+
+## Platform support
+
+Angular CLI supports autocompletion for the Bash and Zsh shells on MacOS and Linux operating
+systems.
+
+Windows does not support autocompletion in native shells, such as Cmd and Powershell. However,
+the Angular CLI supports Git Bash and
+[Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/) using Bash or Zsh.
+
+## Global install
+
+Autocompletion works by configuring your terminal to invoke the Angular CLI on startup to load the
+setup script. This means the terminal must be able to find and execute the Angular CLI, typically
+through a global install that places the binary on the user's `$PATH`. If you get
+`command not found: ng`, make sure the CLI is installed globally which you can do with the `-g`
+flag:
+
+```bash
+npm install -g @angular/cli
+```

package/src/commands/config/cli.js

@@ -83,6 +83,7 @@ class ConfigCommandModule extends command_module_1.CommandModule {
             'cli.analytics',
             'cli.analyticsSharing.tracking',
             'cli.analyticsSharing.uuid',
+            'cli.completion.prompted',
         ]);
         if (options.global &&
             !options.jsonPath.startsWith('schematics.') &&

package/src/commands/doc/cli.js

@@ -93,8 +93,8 @@ class DocCommandModule extends command_module_1.CommandModule {
             catch { }
         }
         await (0, open_1.default)(options.search
-            ? `https://${domain}/api?query=${options.keyword}`
-            : `https://${domain}/docs?search=${options.keyword}`);
+            ? `https://${domain}/docs?search=${options.keyword}`
+            : `https://${domain}/api?query=${options.keyword}`);
     }
 }
 exports.DocCommandModule = DocCommandModule;

package/src/commands/update/cli.js

@@ -122,7 +122,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
             alias: ['C'],
             default: false,
         })
-            .check(({ packages, next, 'allow-dirty': allowDirty, 'migrate-only': migrateOnly }) => {
+            .check(({ packages, 'allow-dirty': allowDirty, 'migrate-only': migrateOnly }) => {
             const { logger } = this.context;
             // This allows the user to easily reset any changes from the update.
             if ((packages === null || packages === void 0 ? void 0 : packages.length) && !this.checkCleanGit()) {
@@ -137,9 +137,6 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                 if ((packages === null || packages === void 0 ? void 0 : packages.length) !== 1) {
                     throw new command_module_1.CommandModuleError(`A single package must be specified when using the 'migrate-only' option.`);
                 }
-                if (next) {
-                    logger.warn(`'next' option has no effect when using 'migrate-only' option.`);
-                }
             }
             return true;
         })
@@ -584,8 +581,9 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                     }
                 }
                 const result = await this.executeMigrations(workflow, migration.package, migrations, migration.from, migration.to, options.createCommits);
-                if (!result) {
-                    return 0;
+                // A non-zero value is a failure for the package's migrations
+                if (result !== 0) {
+                    return result;
                 }
             }
         }

package/src/utilities/completion.d.ts

@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { logging } from '@angular-devkit/core';
+/**
+ * Checks if it is appropriate to prompt the user to setup autocompletion. If not, does nothing. If
+ * so prompts and sets up autocompletion for the user. Returns an exit code if the program should
+ * terminate, otherwise returns `undefined`.
+ * @returns an exit code if the program should terminate, undefined otherwise.
+ */
+export declare function considerSettingUpAutocompletion(command: string, logger: logging.Logger): Promise<number | undefined>;
+/**
+ * Sets up autocompletion for the user's terminal. This attempts to find the configuration file for
+ * the current shell (`.bashrc`, `.zshrc`, etc.) and append a command which enables autocompletion
+ * for the Angular CLI. Supports only Bash and Zsh. Returns whether or not it was successful.
+ * @return The full path of the configuration file modified.
+ */
+export declare function initializeAutocomplete(): Promise<string>;
+/**
+ * Returns whether the user has a global CLI install or `undefined` if this can't be determined.
+ * Execution from `npx` is *not* considered a global CLI install.
+ *
+ * This does *not* mean the current execution is from a global CLI install, only that a global
+ * install exists on the system.
+ */
+export declare function hasGlobalCliInstall(): Promise<boolean | undefined>;

package/src/utilities/completion.js

@@ -0,0 +1,282 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasGlobalCliInstall = exports.initializeAutocomplete = exports.considerSettingUpAutocompletion = void 0;
+const core_1 = require("@angular-devkit/core");
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const path = __importStar(require("path"));
+const process_1 = require("process");
+const color_1 = require("../utilities/color");
+const config_1 = require("../utilities/config");
+const environment_options_1 = require("../utilities/environment-options");
+const tty_1 = require("../utilities/tty");
+/**
+ * Checks if it is appropriate to prompt the user to setup autocompletion. If not, does nothing. If
+ * so prompts and sets up autocompletion for the user. Returns an exit code if the program should
+ * terminate, otherwise returns `undefined`.
+ * @returns an exit code if the program should terminate, undefined otherwise.
+ */
+async function considerSettingUpAutocompletion(command, logger) {
+    // Check if we should prompt the user to setup autocompletion.
+    const completionConfig = await getCompletionConfig();
+    if (!(await shouldPromptForAutocompletionSetup(command, completionConfig))) {
+        return undefined; // Already set up or prompted previously, nothing to do.
+    }
+    // Prompt the user and record their response.
+    const shouldSetupAutocompletion = await promptForAutocompletion();
+    if (!shouldSetupAutocompletion) {
+        // User rejected the prompt and doesn't want autocompletion.
+        logger.info(`
+Ok, you won't be prompted again. Should you change your mind, the following command will set up autocompletion for you:
+
+    ${color_1.colors.yellow(`ng completion`)}
+    `.trim());
+        // Save configuration to remember that the user was prompted and avoid prompting again.
+        await setCompletionConfig({ ...completionConfig, prompted: true });
+        return undefined;
+    }
+    // User accepted the prompt, set up autocompletion.
+    let rcFile;
+    try {
+        rcFile = await initializeAutocomplete();
+    }
+    catch (err) {
+        // Failed to set up autocompeletion, log the error and abort.
+        logger.error(err.message);
+        return 1;
+    }
+    // Notify the user autocompletion was set up successfully.
+    logger.info(`
+Appended \`source <(ng completion script)\` to \`${rcFile}\`. Restart your terminal or run the following to autocomplete \`ng\` commands:
+
+    ${color_1.colors.yellow(`source <(ng completion script)`)}
+    `.trim());
+    if ((await hasGlobalCliInstall()) === false) {
+        logger.warn('Setup completed successfully, but there does not seem to be a global install of the' +
+            ' Angular CLI. For autocompletion to work, the CLI will need to be on your `$PATH`, which' +
+            ' is typically done with the `-g` flag in `npm install -g @angular/cli`.' +
+            '\n\n' +
+            'For more information, see https://angular.io/cli/completion#global-install');
+    }
+    // Save configuration to remember that the user was prompted.
+    await setCompletionConfig({ ...completionConfig, prompted: true });
+    return undefined;
+}
+exports.considerSettingUpAutocompletion = considerSettingUpAutocompletion;
+async function getCompletionConfig() {
+    var _a;
+    const wksp = await (0, config_1.getWorkspace)('global');
+    return (_a = wksp === null || wksp === void 0 ? void 0 : wksp.getCli()) === null || _a === void 0 ? void 0 : _a['completion'];
+}
+async function setCompletionConfig(config) {
+    var _a;
+    var _b;
+    const wksp = await (0, config_1.getWorkspace)('global');
+    if (!wksp) {
+        throw new Error(`Could not find global workspace`);
+    }
+    (_a = (_b = wksp.extensions)['cli']) !== null && _a !== void 0 ? _a : (_b['cli'] = {});
+    const cli = wksp.extensions['cli'];
+    if (!core_1.json.isJsonObject(cli)) {
+        throw new Error(`Invalid config found at ${wksp.filePath}. \`extensions.cli\` should be an object.`);
+    }
+    cli.completion = config;
+    await wksp.save();
+}
+async function shouldPromptForAutocompletionSetup(command, config) {
+    // Force whether or not to prompt for autocomplete to give an easy path for e2e testing to skip.
+    if (environment_options_1.forceAutocomplete !== undefined) {
+        return environment_options_1.forceAutocomplete;
+    }
+    // Don't prompt on `ng update` or `ng completion`.
+    if (command === 'update' || command === 'completion') {
+        return false;
+    }
+    // Non-interactive and continuous integration systems don't care about autocompletion.
+    if (!(0, tty_1.isTTY)()) {
+        return false;
+    }
+    // Skip prompt if the user has already been prompted.
+    if (config === null || config === void 0 ? void 0 : config.prompted) {
+        return false;
+    }
+    // `$HOME` variable is necessary to find RC files to modify.
+    const home = process_1.env['HOME'];
+    if (!home) {
+        return false;
+    }
+    // Get possible RC files for the current shell.
+    const shell = process_1.env['SHELL'];
+    if (!shell) {
+        return false;
+    }
+    const rcFiles = getShellRunCommandCandidates(shell, home);
+    if (!rcFiles) {
+        return false; // Unknown shell.
+    }
+    // Don't prompt if the user is missing a global CLI install. Autocompletion won't work after setup
+    // anyway and could be annoying for users running one-off commands via `npx` or using `npm start`.
+    if ((await hasGlobalCliInstall()) === false) {
+        return false;
+    }
+    // Check each RC file if they already use `ng completion script` in any capacity and don't prompt.
+    for (const rcFile of rcFiles) {
+        const contents = await fs_1.promises.readFile(rcFile, 'utf-8').catch(() => undefined);
+        if (contents === null || contents === void 0 ? void 0 : contents.includes('ng completion script')) {
+            return false;
+        }
+    }
+    return true;
+}
+async function promptForAutocompletion() {
+    // Dynamically load `inquirer` so users don't have to pay the cost of parsing and executing it for
+    // the 99% of builds that *don't* prompt for autocompletion.
+    const { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
+    const { autocomplete } = await prompt([
+        {
+            name: 'autocomplete',
+            type: 'confirm',
+            message: `
+Would you like to enable autocompletion? This will set up your terminal so pressing TAB while typing
+Angular CLI commands will show possible options and autocomplete arguments. (Enabling autocompletion
+will modify configuration files in your home directory.)
+      `
+                .split('\n')
+                .join(' ')
+                .trim(),
+            default: true,
+        },
+    ]);
+    return autocomplete;
+}
+/**
+ * Sets up autocompletion for the user's terminal. This attempts to find the configuration file for
+ * the current shell (`.bashrc`, `.zshrc`, etc.) and append a command which enables autocompletion
+ * for the Angular CLI. Supports only Bash and Zsh. Returns whether or not it was successful.
+ * @return The full path of the configuration file modified.
+ */
+async function initializeAutocomplete() {
+    var _a, _b;
+    // Get the currently active `$SHELL` and `$HOME` environment variables.
+    const shell = process_1.env['SHELL'];
+    if (!shell) {
+        throw new Error('`$SHELL` environment variable not set. Angular CLI autocompletion only supports Bash or' +
+            " Zsh. If you're on Windows, Cmd and Powershell don't support command autocompletion," +
+            ' but Git Bash or Windows Subsystem for Linux should work, so please try again in one of' +
+            ' those environments.');
+    }
+    const home = process_1.env['HOME'];
+    if (!home) {
+        throw new Error('`$HOME` environment variable not set. Setting up autocompletion modifies configuration files' +
+            ' in the home directory and must be set.');
+    }
+    // Get all the files we can add `ng completion` to which apply to the user's `$SHELL`.
+    const runCommandCandidates = getShellRunCommandCandidates(shell, home);
+    if (!runCommandCandidates) {
+        throw new Error(`Unknown \`$SHELL\` environment variable value (${shell}). Angular CLI autocompletion only supports Bash or Zsh.`);
+    }
+    // Get the first file that already exists or fallback to a new file of the first candidate.
+    const candidates = await Promise.allSettled(runCommandCandidates.map((rcFile) => fs_1.promises.access(rcFile).then(() => rcFile)));
+    const rcFile = (_b = (_a = candidates.find((result) => result.status === 'fulfilled')) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : runCommandCandidates[0];
+    // Append Angular autocompletion setup to RC file.
+    try {
+        await fs_1.promises.appendFile(rcFile, '\n\n# Load Angular CLI autocompletion.\nsource <(ng completion script)\n');
+    }
+    catch (err) {
+        throw new Error(`Failed to append autocompletion setup to \`${rcFile}\`:\n${err.message}`);
+    }
+    return rcFile;
+}
+exports.initializeAutocomplete = initializeAutocomplete;
+/** Returns an ordered list of possible candidates of RC files used by the given shell. */
+function getShellRunCommandCandidates(shell, home) {
+    if (shell.toLowerCase().includes('bash')) {
+        return ['.bashrc', '.bash_profile', '.profile'].map((file) => path.join(home, file));
+    }
+    else if (shell.toLowerCase().includes('zsh')) {
+        return ['.zshrc', '.zsh_profile', '.profile'].map((file) => path.join(home, file));
+    }
+    else {
+        return undefined;
+    }
+}
+/**
+ * Returns whether the user has a global CLI install or `undefined` if this can't be determined.
+ * Execution from `npx` is *not* considered a global CLI install.
+ *
+ * This does *not* mean the current execution is from a global CLI install, only that a global
+ * install exists on the system.
+ */
+async function hasGlobalCliInstall() {
+    var _a;
+    // List all binaries with the `ng` name on the user's `$PATH`.
+    const proc = (0, child_process_1.execFile)('which', ['-a', 'ng']);
+    let stdout = '';
+    (_a = proc.stdout) === null || _a === void 0 ? void 0 : _a.addListener('data', (content) => {
+        stdout += content;
+    });
+    const exitCode = await new Promise((resolve) => {
+        proc.addListener('exit', (exitCode) => {
+            resolve(exitCode);
+        });
+    });
+    switch (exitCode) {
+        case 0:
+            // Successfully listed all `ng` binaries on the `$PATH`. Look for at least one line which is a
+            // global install. We can't easily identify global installs, but local installs are typically
+            // placed in `node_modules/.bin` by NPM / Yarn. `npx` also currently caches files at
+            // `~/.npm/_npx/*/node_modules/.bin/`, so the same logic applies.
+            const lines = stdout.split('\n').filter((line) => line !== '');
+            const hasGlobalInstall = lines.some((line) => {
+                // A binary is a local install if it is a direct child of a `node_modules/.bin/` directory.
+                const parent = path.parse(path.parse(line).dir);
+                const grandparent = path.parse(parent.dir);
+                const localInstall = grandparent.base === 'node_modules' && parent.base === '.bin';
+                return !localInstall;
+            });
+            return hasGlobalInstall;
+        case 1:
+            // No instances of `ng` on the user's `$PATH`.
+            return false;
+        case null:
+            // `which` was killed by a signal and did not exit gracefully. Maybe it hung or something else
+            // went very wrong, so treat this as inconclusive.
+            return undefined;
+        default:
+            // `which` returns exit code 2 if an invalid option is specified and `-a` doesn't appear to be
+            // supported on all systems. Other exit codes mean unknown errors occurred. Can't tell whether
+            // CLI is globally installed, so treat this as inconclusive.
+            return undefined;
+    }
+}
+exports.hasGlobalCliInstall = hasGlobalCliInstall;

package/src/utilities/environment-options.d.ts

@@ -10,3 +10,4 @@ export declare const analyticsShareDisabled: boolean;
 export declare const isCI: boolean;
 export declare const disableVersionCheck: boolean;
 export declare const ngDebug: boolean;
+export declare const forceAutocomplete: boolean | undefined;

package/src/utilities/environment-options.js

@@ -7,7 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ngDebug = exports.disableVersionCheck = exports.isCI = exports.analyticsShareDisabled = exports.analyticsDisabled = void 0;
+exports.forceAutocomplete = exports.ngDebug = exports.disableVersionCheck = exports.isCI = exports.analyticsShareDisabled = exports.analyticsDisabled = void 0;
 function isPresent(variable) {
     return typeof variable === 'string' && variable !== '';
 }
@@ -17,8 +17,15 @@ function isDisabled(variable) {
 function isEnabled(variable) {
     return isPresent(variable) && (variable === '1' || variable.toLowerCase() === 'true');
 }
+function optional(variable) {
+    if (!isPresent(variable)) {
+        return undefined;
+    }
+    return isEnabled(variable);
+}
 exports.analyticsDisabled = isDisabled(process.env['NG_CLI_ANALYTICS']);
 exports.analyticsShareDisabled = isDisabled(process.env['NG_CLI_ANALYTICS_SHARE']);
 exports.isCI = isEnabled(process.env['CI']);
 exports.disableVersionCheck = isEnabled(process.env['NG_DISABLE_VERSION_CHECK']);
 exports.ngDebug = isEnabled(process.env['NG_DEBUG']);
+exports.forceAutocomplete = optional(process.env['NG_FORCE_AUTOCOMPLETE']);

package/src/utilities/json-file.js

@@ -59,6 +59,7 @@ class JSONFile {
         }
         const edits = (0, jsonc_parser_1.modify)(this.content, jsonPath, value, {
             getInsertionIndex,
+            // TODO: use indentation from original file.
             formattingOptions: {
                 insertSpaces: true,
                 tabSize: 2,