@angular/cli 14.0.0-next.8 → 14.0.0-next.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.0-next.8",
+  "version": "14.0.0-next.9",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,36 +25,36 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1400.0-next.8",
-    "@angular-devkit/core": "14.0.0-next.8",
-    "@angular-devkit/schematics": "14.0.0-next.8",
-    "@schematics/angular": "14.0.0-next.8",
+    "@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",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.4",
-    "ini": "2.0.0",
+    "ini": "3.0.0",
     "inquirer": "8.2.2",
     "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.0",
+    "pacote": "13.1.1",
     "resolve": "1.22.0",
-    "semver": "7.3.5",
+    "semver": "7.3.6",
     "symbol-observable": "4.0.0",
     "uuid": "8.3.2",
-    "yargs": "17.4.0"
+    "yargs": "17.4.1"
   },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "14.0.0-next.8",
-      "@angular-devkit/architect": "0.1400.0-next.8",
-      "@angular-devkit/build-angular": "14.0.0-next.8",
-      "@angular-devkit/build-webpack": "0.1400.0-next.8",
-      "@angular-devkit/core": "14.0.0-next.8",
-      "@angular-devkit/schematics": "14.0.0-next.8"
+      "@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"
     }
   },
   "engines": {

package/src/analytics/analytics.d.ts

@@ -22,7 +22,7 @@ export declare function isPackageNameSafeForAnalytics(name: string): boolean;
  * @param global Which config to use. "global" for user-level, and "local" for project-level.
  * @param value Either a user ID, true to generate a new User ID, or false to disable analytics.
  */
-export declare function setAnalyticsConfig(global: boolean, value: string | boolean): void;
+export declare function setAnalyticsConfig(global: boolean, value: string | boolean): Promise<void>;
 /**
  * Prompt the user for usage gathering permission.
  * @param force Whether to ask regardless of whether or not the user is using an interactive shell.

package/src/analytics/analytics.js

@@ -87,22 +87,21 @@ exports.isPackageNameSafeForAnalytics = isPackageNameSafeForAnalytics;
  * @param global Which config to use. "global" for user-level, and "local" for project-level.
  * @param value Either a user ID, true to generate a new User ID, or false to disable analytics.
  */
-function setAnalyticsConfig(global, value) {
+async function setAnalyticsConfig(global, value) {
+    var _a;
+    var _b;
     const level = global ? 'global' : 'local';
     analyticsDebug('setting %s level analytics to: %s', level, value);
-    const [config, configPath] = (0, config_1.getWorkspaceRaw)(level);
-    if (!config || !configPath) {
+    const workspace = await (0, config_1.getWorkspace)(level);
+    if (!workspace) {
         throw new Error(`Could not find ${level} workspace.`);
     }
-    const cli = config.get(['cli']);
-    if (cli !== undefined && !core_1.json.isJsonObject(cli)) {
-        throw new Error(`Invalid config found at ${configPath}. CLI should be an object.`);
-    }
-    if (value === true) {
-        value = (0, uuid_1.v4)();
+    const cli = ((_a = (_b = workspace.extensions)['cli']) !== null && _a !== void 0 ? _a : (_b['cli'] = {}));
+    if (!workspace || !core_1.json.isJsonObject(cli)) {
+        throw new Error(`Invalid config found at ${workspace.filePath}. CLI should be an object.`);
     }
-    config.modify(['cli', 'analytics'], value);
-    config.save();
+    cli.analytics = value === true ? (0, uuid_1.v4)() : value;
+    await workspace.save();
     analyticsDebug('done');
 }
 exports.setAnalyticsConfig = setAnalyticsConfig;
@@ -114,8 +113,8 @@ exports.setAnalyticsConfig = setAnalyticsConfig;
 async function promptAnalytics(global, force = false) {
     analyticsDebug('prompting user');
     const level = global ? 'global' : 'local';
-    const [config, configPath] = (0, config_1.getWorkspaceRaw)(level);
-    if (!config || !configPath) {
+    const workspace = await (0, config_1.getWorkspace)(level);
+    if (!workspace) {
         throw new Error(`Could not find a ${level} workspace. Are you in a project?`);
     }
     if (force || (0, tty_1.isTTY)()) {
@@ -133,7 +132,7 @@ async function promptAnalytics(global, force = false) {
                 default: false,
             },
         ]);
-        setAnalyticsConfig(global, answers.analytics);
+        await setAnalyticsConfig(global, answers.analytics);
         if (answers.analytics) {
             console.log('');
             console.log(core_1.tags.stripIndent `
@@ -169,6 +168,7 @@ exports.promptAnalytics = promptAnalytics;
  * - `undefined` when not configured.
  */
 async function getAnalytics(level) {
+    var _a;
     analyticsDebug('getAnalytics');
     if (environment_options_1.analyticsDisabled) {
         analyticsDebug('NG_CLI_ANALYTICS is false');
@@ -176,7 +176,7 @@ async function getAnalytics(level) {
     }
     try {
         const workspace = await (0, config_1.getWorkspace)(level);
-        const analyticsConfig = workspace === null || workspace === void 0 ? void 0 : workspace.getCli()['analytics'];
+        const analyticsConfig = (_a = workspace === null || workspace === void 0 ? void 0 : workspace.getCli()) === null || _a === void 0 ? void 0 : _a['analytics'];
         analyticsDebug('Workspace Analytics config found: %j', analyticsConfig);
         if (analyticsConfig === false) {
             return new core_1.analytics.NoopAnalytics();
@@ -210,6 +210,7 @@ exports.getAnalytics = getAnalytics;
  * or undefined if no sharing.
  */
 async function getSharedAnalytics() {
+    var _a;
     analyticsDebug('getSharedAnalytics');
     if (environment_options_1.analyticsShareDisabled) {
         analyticsDebug('NG_CLI_ANALYTICS is false');
@@ -218,7 +219,7 @@ async function getSharedAnalytics() {
     // If anything happens we just keep the NOOP analytics.
     try {
         const globalWorkspace = await (0, config_1.getWorkspace)('global');
-        const analyticsConfig = globalWorkspace === null || globalWorkspace === void 0 ? void 0 : globalWorkspace.getCli()['analyticsSharing'];
+        const analyticsConfig = (_a = globalWorkspace === null || globalWorkspace === void 0 ? void 0 : globalWorkspace.getCli()) === null || _a === void 0 ? void 0 : _a['analyticsSharing'];
         if (!analyticsConfig || !analyticsConfig.tracking || !analyticsConfig.uuid) {
             return undefined;
         }
@@ -288,10 +289,11 @@ function analyticsConfigValueToHumanFormat(value) {
     }
 }
 async function getAnalyticsInfoString() {
-    const [globalWorkspace] = (0, config_1.getWorkspaceRaw)('global');
-    const [localWorkspace] = (0, config_1.getWorkspaceRaw)('local');
-    const globalSetting = globalWorkspace === null || globalWorkspace === void 0 ? void 0 : globalWorkspace.get(['cli', 'analytics']);
-    const localSetting = localWorkspace === null || localWorkspace === void 0 ? void 0 : localWorkspace.get(['cli', 'analytics']);
+    var _a, _b;
+    const globalWorkspace = await (0, config_1.getWorkspace)('global');
+    const localWorkspace = await (0, config_1.getWorkspace)('local');
+    const globalSetting = (_a = globalWorkspace === null || globalWorkspace === void 0 ? void 0 : globalWorkspace.getCli()) === null || _a === void 0 ? void 0 : _a['analytics'];
+    const localSetting = (_b = localWorkspace === null || localWorkspace === void 0 ? void 0 : localWorkspace.getCli()) === null || _b === void 0 ? void 0 : _b['analytics'];
     const analyticsInstance = await createAnalytics(!!localWorkspace /** workspace */, true /** skipPrompt */);
     return (core_1.tags.stripIndents `
     Global setting: ${analyticsConfigValueToHumanFormat(globalSetting)}

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

@@ -68,7 +68,13 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
     }
     async getArchitectTargetOptions(target) {
         const architectHost = this.getArchitectHost();
-        const builderConf = await architectHost.getBuilderNameForTarget(target);
+        let builderConf;
+        try {
+            builderConf = await architectHost.getBuilderNameForTarget(target);
+        }
+        catch {
+            return [];
+        }
         let builderDesc;
         try {
             builderDesc = await architectHost.resolveBuilder(builderConf);

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

@@ -18,4 +18,8 @@ export declare abstract class ArchitectCommandModule extends ArchitectBaseComman
     run(options: Options<ArchitectCommandArgs> & OtherOptions): Promise<number | void>;
     private getArchitectProject;
     private getProjectNamesByTarget;
+    /** @returns a sorted list of project names to be used for auto completion. */
+    private getProjectChoices;
+    /** @returns a sorted list of configuration names to be used for auto completion. */
+    private getConfigurationChoices;
 }

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

@@ -17,13 +17,16 @@ exports.ArchitectCommandModule = void 0;
 const config_1 = require("../utilities/config");
 const memoize_1 = require("../utilities/memoize");
 const architect_base_command_module_1 = require("./architect-base-command-module");
-const command_module_1 = require("./command-module");
 class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBaseCommandModule {
     async builder(argv) {
+        const project = this.getArchitectProject();
+        const { jsonHelp, getYargsCompletions, help } = this.context.args.options;
         const localYargs = argv
             .positional('project', {
             describe: 'The name of the project to build. Can be an application or a library.',
             type: 'string',
+            // Hide choices from JSON help so that we don't display them in AIO.
+            choices: jsonHelp ? undefined : this.getProjectChoices(),
         })
             .option('configuration', {
             describe: `One or more named builder configurations as a comma-separated ` +
@@ -32,9 +35,13 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
                 `For more information, see https://angular.io/guide/workspace-config#alternate-build-configurations.`,
             alias: 'c',
             type: 'string',
+            // Show only in when using --help and auto completion because otherwise comma seperated configuration values will be invalid.
+            // Also, hide choices from JSON help so that we don't display them in AIO.
+            choices: (getYargsCompletions || help) && !jsonHelp && project
+                ? this.getConfigurationChoices(project)
+                : undefined,
         })
             .strict();
-        const project = this.getArchitectProject();
         if (!project) {
             return localYargs;
         }
@@ -72,10 +79,7 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
         }
         const [, projectName] = this.context.args.positional;
         if (projectName) {
-            if (!workspace.projects.has(projectName)) {
-                throw new command_module_1.CommandModuleError(`Project '${projectName}' does not exist.`);
-            }
-            return projectName;
+            return workspace.projects.has(projectName) ? projectName : undefined;
         }
         const target = this.getArchitectTarget();
         const projectFromTarget = this.getProjectNamesByTarget(target);
@@ -107,6 +111,22 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
         }
         return undefined;
     }
+    /** @returns a sorted list of project names to be used for auto completion. */
+    getProjectChoices() {
+        const { workspace } = this.context;
+        return workspace ? [...workspace.projects.keys()].sort() : undefined;
+    }
+    /** @returns a sorted list of configuration names to be used for auto completion. */
+    getConfigurationChoices(project) {
+        var _a, _b;
+        const projectDefinition = (_a = this.context.workspace) === null || _a === void 0 ? void 0 : _a.projects.get(project);
+        if (!projectDefinition) {
+            return undefined;
+        }
+        const target = this.getArchitectTarget();
+        const configurations = (_b = projectDefinition.targets.get(target)) === null || _b === void 0 ? void 0 : _b.configurations;
+        return configurations ? Object.keys(configurations).sort() : undefined;
+    }
 }
 __decorate([
     memoize_1.memoize

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

@@ -34,6 +34,7 @@ export interface CommandContext {
         options: {
             help: boolean;
             jsonHelp: boolean;
+            getYargsCompletions: boolean;
         } & Record<string, unknown>;
     };
 }

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

@@ -17,50 +17,58 @@ const cli_1 = require("../commands/add/cli");
 const cli_2 = require("../commands/analytics/cli");
 const cli_3 = require("../commands/build/cli");
 const cli_4 = require("../commands/cache/cli");
-const cli_5 = require("../commands/config/cli");
-const cli_6 = require("../commands/deploy/cli");
-const cli_7 = require("../commands/doc/cli");
-const cli_8 = require("../commands/e2e/cli");
-const cli_9 = require("../commands/extract-i18n/cli");
-const cli_10 = require("../commands/generate/cli");
-const cli_11 = require("../commands/lint/cli");
-const cli_12 = require("../commands/make-this-awesome/cli");
-const cli_13 = require("../commands/new/cli");
-const cli_14 = require("../commands/run/cli");
-const cli_15 = require("../commands/serve/cli");
-const cli_16 = require("../commands/test/cli");
-const cli_17 = require("../commands/update/cli");
-const cli_18 = require("../commands/version/cli");
+const cli_5 = require("../commands/completion/cli");
+const cli_6 = require("../commands/config/cli");
+const cli_7 = require("../commands/deploy/cli");
+const cli_8 = require("../commands/doc/cli");
+const cli_9 = require("../commands/e2e/cli");
+const cli_10 = require("../commands/extract-i18n/cli");
+const cli_11 = require("../commands/generate/cli");
+const cli_12 = require("../commands/lint/cli");
+const cli_13 = require("../commands/make-this-awesome/cli");
+const cli_14 = require("../commands/new/cli");
+const cli_15 = require("../commands/run/cli");
+const cli_16 = require("../commands/serve/cli");
+const cli_17 = require("../commands/test/cli");
+const cli_18 = require("../commands/update/cli");
+const cli_19 = require("../commands/version/cli");
 const color_1 = require("../utilities/color");
 const config_1 = require("../utilities/config");
 const package_manager_1 = require("../utilities/package-manager");
 const command_module_1 = require("./command-module");
 const command_1 = require("./utilities/command");
 const json_help_1 = require("./utilities/json-help");
+const normalize_options_middleware_1 = require("./utilities/normalize-options-middleware");
 const COMMANDS = [
-    cli_18.VersionCommandModule,
-    cli_7.DocCommandModule,
-    cli_12.AwesomeCommandModule,
-    cli_5.ConfigCommandModule,
+    cli_19.VersionCommandModule,
+    cli_8.DocCommandModule,
+    cli_13.AwesomeCommandModule,
+    cli_6.ConfigCommandModule,
     cli_2.AnalyticsCommandModule,
     cli_1.AddCommandModule,
-    cli_10.GenerateCommandModule,
+    cli_11.GenerateCommandModule,
     cli_3.BuildCommandModule,
-    cli_8.E2eCommandModule,
-    cli_16.TestCommandModule,
-    cli_15.ServeCommandModule,
-    cli_9.ExtractI18nCommandModule,
-    cli_6.DeployCommandModule,
-    cli_11.LintCommandModule,
-    cli_13.NewCommandModule,
-    cli_17.UpdateCommandModule,
-    cli_14.RunCommandModule,
+    cli_9.E2eCommandModule,
+    cli_17.TestCommandModule,
+    cli_16.ServeCommandModule,
+    cli_10.ExtractI18nCommandModule,
+    cli_7.DeployCommandModule,
+    cli_12.LintCommandModule,
+    cli_14.NewCommandModule,
+    cli_18.UpdateCommandModule,
+    cli_15.RunCommandModule,
     cli_4.CacheCommandModule,
+    cli_5.CompletionCommandModule,
 ].sort(); // Will be sorted by class name.
 const yargsParser = helpers_1.Parser;
 async function runCommand(args, logger) {
     var _a, _b;
-    const { $0, _: positional, help = false, jsonHelp = false, ...rest } = yargsParser(args, { boolean: ['help', 'json-help'], alias: { 'collection': 'c' } });
+    const { $0, _, help = false, jsonHelp = false, getYargsCompletions = false, ...rest } = yargsParser(args, {
+        boolean: ['help', 'json-help', 'get-yargs-completions'],
+        alias: { 'collection': 'c' },
+    });
+    // When `getYargsCompletions` is true the scriptName 'ng' at index 0 is not removed.
+    const positional = getYargsCompletions ? _.slice(1) : _;
     let workspace;
     let globalConfiguration;
     try {
@@ -86,6 +94,7 @@ async function runCommand(args, logger) {
             options: {
                 help,
                 jsonHelp,
+                getYargsCompletions,
                 ...rest,
             },
         },
@@ -101,9 +110,15 @@ 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
-        localYargs.getInternalMethods().getUsageInstance().help = () => (0, json_help_1.jsonHelpUsage)();
+        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')
@@ -135,6 +150,7 @@ async function runCommand(args, logger) {
     })
         .demandCommand(1, command_1.demandCommandFailureMessage)
         .recommendCommands()
+        .middleware(normalize_options_middleware_1.normalizeOptionsMiddleware)
         .version(false)
         .showHelpOnFail(false)
         .strict()

package/src/command-builder/utilities/normalize-options-middleware.d.ts

@@ -0,0 +1,18 @@
+/**
+ * @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 * as yargs from 'yargs';
+/**
+ * A Yargs middleware that normalizes non Array options when the argument has been provided multiple times.
+ *
+ * By default, when an option is non array and it is provided multiple times in the command line, yargs
+ * will not override it's value but instead it will be changed to an array unless `duplicate-arguments-array` is disabled.
+ * But this option also have an effect on real array options which isn't desired.
+ *
+ * See: https://github.com/yargs/yargs-parser/pull/163#issuecomment-516566614
+ */
+export declare function normalizeOptionsMiddleware(args: yargs.Arguments): void;

package/src/command-builder/utilities/normalize-options-middleware.js

@@ -0,0 +1,59 @@
+"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.normalizeOptionsMiddleware = void 0;
+const yargs = __importStar(require("yargs"));
+/**
+ * A Yargs middleware that normalizes non Array options when the argument has been provided multiple times.
+ *
+ * By default, when an option is non array and it is provided multiple times in the command line, yargs
+ * will not override it's value but instead it will be changed to an array unless `duplicate-arguments-array` is disabled.
+ * But this option also have an effect on real array options which isn't desired.
+ *
+ * See: https://github.com/yargs/yargs-parser/pull/163#issuecomment-516566614
+ */
+function normalizeOptionsMiddleware(args) {
+    // `getOptions` is not included in the types even though it's public API.
+    // https://github.com/yargs/yargs/issues/2098
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const { array } = yargs.getOptions();
+    const arrayOptions = new Set(array);
+    for (const [key, value] of Object.entries(args)) {
+        if (key !== '_' && Array.isArray(value) && !arrayOptions.has(key)) {
+            const newValue = value.pop();
+            // eslint-disable-next-line no-console
+            console.warn(`Option '${key}' has been specified multiple times. The value '${newValue}' will be used.`);
+            args[key] = newValue;
+        }
+    }
+}
+exports.normalizeOptionsMiddleware = normalizeOptionsMiddleware;

package/src/command-builder/utilities/schematic-engine-host.d.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { RuleFactory } from '@angular-devkit/schematics';
-import { NodeModulesEngineHost } from '@angular-devkit/schematics/tools';
+import { FileSystemCollectionDesc, NodeModulesEngineHost } from '@angular-devkit/schematics/tools';
 export declare class SchematicEngineHost extends NodeModulesEngineHost {
-    protected _resolveReferenceString(refString: string, parentPath: string): {
+    protected _resolveReferenceString(refString: string, parentPath: string, collectionDescription?: FileSystemCollectionDesc): {
         ref: RuleFactory<{}>;
         path: string;
     } | null;

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

@@ -21,21 +21,18 @@ const path_1 = require("path");
 const vm_1 = require("vm");
 /**
  * Environment variable to control schematic package redirection
- * Default: Angular schematics only
  */
 const schematicRedirectVariable = (_a = process.env['NG_SCHEMATIC_REDIRECT']) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-function shouldWrapSchematic(schematicFile) {
+function shouldWrapSchematic(schematicFile, schematicEncapsulation) {
     // Check environment variable if present
-    if (schematicRedirectVariable !== undefined) {
-        switch (schematicRedirectVariable) {
-            case '0':
-            case 'false':
-            case 'off':
-            case 'none':
-                return false;
-            case 'all':
-                return true;
-        }
+    switch (schematicRedirectVariable) {
+        case '0':
+        case 'false':
+        case 'off':
+        case 'none':
+            return false;
+        case 'all':
+            return true;
     }
     const normalizedSchematicFile = schematicFile.replace(/\\/g, '/');
     // Never wrap the internal update schematic when executed directly
@@ -45,17 +42,21 @@ function shouldWrapSchematic(schematicFile) {
         !normalizedSchematicFile.includes('node_modules/@angular/cli/node_modules/')) {
         return false;
     }
-    // Default is only first-party Angular schematic packages
+    // Check for first-party Angular schematic packages
     // Angular schematics are safe to use in the wrapped VM context
-    return /\/node_modules\/@(?:angular|schematics|nguniversal)\//.test(normalizedSchematicFile);
+    if (/\/node_modules\/@(?:angular|schematics|nguniversal)\//.test(normalizedSchematicFile)) {
+        return true;
+    }
+    // Otherwise use the value of the schematic collection's encapsulation option (current default of false)
+    return schematicEncapsulation;
 }
 class SchematicEngineHost extends tools_1.NodeModulesEngineHost {
-    _resolveReferenceString(refString, parentPath) {
+    _resolveReferenceString(refString, parentPath, collectionDescription) {
         const [path, name] = refString.split('#', 2);
         // Mimic behavior of ExportStringRef class used in default behavior
         const fullPath = path[0] === '.' ? (0, path_1.resolve)(parentPath !== null && parentPath !== void 0 ? parentPath : process.cwd(), path) : path;
         const schematicFile = require.resolve(fullPath, { paths: [parentPath] });
-        if (shouldWrapSchematic(schematicFile)) {
+        if (shouldWrapSchematic(schematicFile, !!(collectionDescription === null || collectionDescription === void 0 ? void 0 : collectionDescription.encapsulation))) {
             const schematicPath = (0, path_1.dirname)(schematicFile);
             const moduleCache = new Map();
             const factoryInitializer = wrap(schematicFile, schematicPath, moduleCache, name || 'default');
@@ -66,7 +67,7 @@ class SchematicEngineHost extends tools_1.NodeModulesEngineHost {
             return { ref: factory, path: schematicPath };
         }
         // All other schematics use default behavior
-        return super._resolveReferenceString(refString, parentPath);
+        return super._resolveReferenceString(refString, parentPath, collectionDescription);
     }
 }
 exports.SchematicEngineHost = SchematicEngineHost;
@@ -108,6 +109,15 @@ function wrap(schematicFile, schematicDirectory, moduleCache, exportName) {
             // Provide compatibility modules for older versions of @angular/cdk
             return legacyModules[id];
         }
+        else if (id.startsWith('schematics:')) {
+            // Schematics built-in modules use the `schematics` scheme (similar to the Node.js `node` scheme)
+            const builtinId = id.slice(11);
+            const builtinModule = loadBuiltinModule(builtinId);
+            if (!builtinModule) {
+                throw new Error(`Unknown schematics built-in module '${id}' requested from schematic '${schematicFile}'`);
+            }
+            return builtinModule;
+        }
         else if (id.startsWith('@angular-devkit/') || id.startsWith('@schematics/')) {
             // Files should not redirect `@angular/core` and instead use the direct
             // dependency if available. This allows old major version migrations to continue to function
@@ -170,3 +180,6 @@ function wrap(schematicFile, schematicDirectory, moduleCache, exportName) {
     const exportsFactory = script.runInNewContext(context);
     return exportsFactory;
 }
+function loadBuiltinModule(id) {
+    return undefined;
+}

package/src/commands/analytics/settings/cli.js

@@ -30,7 +30,7 @@ class AnalyticsDisableModule extends AnalyticsSettingModule {
         this.describe = 'Disables analytics gathering and reporting for the user.';
     }
     async run({ global }) {
-        (0, analytics_1.setAnalyticsConfig)(global, false);
+        await (0, analytics_1.setAnalyticsConfig)(global, false);
         process.stderr.write(await (0, analytics_1.getAnalyticsInfoString)());
     }
 }
@@ -43,7 +43,7 @@ class AnalyticsEnableModule extends AnalyticsSettingModule {
         this.describe = 'Enables analytics gathering and reporting for the user.';
     }
     async run({ global }) {
-        (0, analytics_1.setAnalyticsConfig)(global, true);
+        await (0, analytics_1.setAnalyticsConfig)(global, true);
         process.stderr.write(await (0, analytics_1.getAnalyticsInfoString)());
     }
 }

package/src/commands/cache/settings/cli.d.ts

@@ -14,7 +14,7 @@ export declare class CacheDisableModule extends CommandModule implements Command
     longDescriptionPath: string | undefined;
     static scope: CommandScope.In;
     builder(localYargs: Argv): Argv;
-    run(): void;
+    run(): Promise<void>;
 }
 export declare class CacheEnableModule extends CommandModule implements CommandModuleImplementation {
     command: string;
@@ -23,5 +23,5 @@ export declare class CacheEnableModule extends CommandModule implements CommandM
     longDescriptionPath: string | undefined;
     static scope: CommandScope.In;
     builder(localYargs: Argv): Argv;
-    run(): void;
+    run(): Promise<void>;
 }

package/src/commands/cache/settings/cli.js

@@ -21,7 +21,7 @@ class CacheDisableModule extends command_module_1.CommandModule {
         return localYargs;
     }
     run() {
-        (0, utilities_1.updateCacheConfig)('enabled', false);
+        return (0, utilities_1.updateCacheConfig)(this.getWorkspaceOrThrow(), 'enabled', false);
     }
 }
 exports.CacheDisableModule = CacheDisableModule;
@@ -36,7 +36,7 @@ class CacheEnableModule extends command_module_1.CommandModule {
         return localYargs;
     }
     run() {
-        (0, utilities_1.updateCacheConfig)('enabled', true);
+        return (0, utilities_1.updateCacheConfig)(this.getWorkspaceOrThrow(), 'enabled', true);
     }
 }
 exports.CacheEnableModule = CacheEnableModule;

package/src/commands/cache/utilities.d.ts

@@ -7,5 +7,5 @@
  */
 import { Cache } from '../../../lib/config/workspace-schema';
 import { AngularWorkspace } from '../../utilities/config';
-export declare function updateCacheConfig<K extends keyof Cache>(key: K, value: Cache[K]): void;
+export declare function updateCacheConfig<K extends keyof Cache>(workspace: AngularWorkspace, key: K, value: Cache[K]): Promise<void>;
 export declare function getCacheConfig(workspace: AngularWorkspace | undefined): Required<Cache>;

package/src/commands/cache/utilities.js

@@ -11,14 +11,13 @@ exports.getCacheConfig = exports.updateCacheConfig = void 0;
 const core_1 = require("@angular-devkit/core");
 const path_1 = require("path");
 const workspace_schema_1 = require("../../../lib/config/workspace-schema");
-const config_1 = require("../../utilities/config");
-function updateCacheConfig(key, value) {
-    const [localWorkspace] = (0, config_1.getWorkspaceRaw)('local');
-    if (!localWorkspace) {
-        throw new Error('Cannot find workspace configuration file.');
-    }
-    localWorkspace.modify(['cli', 'cache', key], value);
-    localWorkspace.save();
+function updateCacheConfig(workspace, key, value) {
+    var _a, _b;
+    var _c;
+    const cli = ((_a = (_c = workspace.extensions)['cli']) !== null && _a !== void 0 ? _a : (_c['cli'] = {}));
+    const cache = ((_b = cli['cache']) !== null && _b !== void 0 ? _b : (cli['cache'] = {}));
+    cache[key] = value;
+    return workspace.save();
 }
 exports.updateCacheConfig = updateCacheConfig;
 function getCacheConfig(workspace) {

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

@@ -0,0 +1,16 @@
+/**
+ * @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 { Argv } from 'yargs';
+import { CommandModule, CommandModuleImplementation } from '../../command-builder/command-module';
+export declare class CompletionCommandModule extends CommandModule implements CommandModuleImplementation {
+    command: string;
+    describe: string;
+    longDescriptionPath: string;
+    builder(localYargs: Argv): Argv;
+    run(): void;
+}

package/src/commands/completion/cli.js

@@ -0,0 +1,31 @@
+"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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CompletionCommandModule = void 0;
+const path_1 = require("path");
+const yargs_1 = __importDefault(require("yargs"));
+const command_module_1 = require("../../command-builder/command-module");
+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.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
+    }
+    builder(localYargs) {
+        return localYargs;
+    }
+    run() {
+        yargs_1.default.showCompletionScript();
+    }
+}
+exports.CompletionCommandModule = CompletionCommandModule;

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

@@ -0,0 +1 @@
+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`.

package/src/commands/config/cli.js

@@ -71,25 +71,22 @@ class ConfigCommandModule extends command_module_1.CommandModule {
         return 0;
     }
     async set(options) {
-        var _a, _b, _c;
+        var _a;
         if (!((_a = options.jsonPath) === null || _a === void 0 ? void 0 : _a.trim())) {
             throw new command_module_1.CommandModuleError('Invalid Path.');
         }
-        const validCliPaths = new Map([
-            ['cli.warnings.versionMismatch', undefined],
-            ['cli.defaultCollection', undefined],
-            ['cli.schematicCollections', undefined],
-            ['cli.packageManager', undefined],
-            ['cli.analytics', undefined],
-            ['cli.analyticsSharing.tracking', undefined],
-            ['cli.analyticsSharing.uuid', (v) => (v === '' ? (0, uuid_1.v4)() : `${v}`)],
-            ['cli.cache.enabled', undefined],
-            ['cli.cache.environment', undefined],
-            ['cli.cache.path', undefined],
+        const validGlobalCliPaths = new Set([
+            'cli.warnings.versionMismatch',
+            'cli.defaultCollection',
+            'cli.schematicCollections',
+            'cli.packageManager',
+            'cli.analytics',
+            'cli.analyticsSharing.tracking',
+            'cli.analyticsSharing.uuid',
         ]);
         if (options.global &&
             !options.jsonPath.startsWith('schematics.') &&
-            !validCliPaths.has(options.jsonPath)) {
+            !validGlobalCliPaths.has(options.jsonPath)) {
             throw new command_module_1.CommandModuleError('Invalid Path.');
         }
         const [config, configPath] = (0, config_1.getWorkspaceRaw)(options.global ? 'global' : 'local');
@@ -97,7 +94,10 @@ class ConfigCommandModule extends command_module_1.CommandModule {
         if (!config || !configPath) {
             throw new command_module_1.CommandModuleError('Confguration file cannot be found.');
         }
-        const value = (_c = (_b = validCliPaths.get(options.jsonPath)) === null || _b === void 0 ? void 0 : _b(options.value)) !== null && _c !== void 0 ? _c : options.value;
+        const normalizeUUIDValue = (v) => (v === '' ? (0, uuid_1.v4)() : `${v}`);
+        const value = options.jsonPath === 'cli.analyticsSharing.uuid'
+            ? normalizeUUIDValue(options.value)
+            : options.value;
         const modified = config.modify(parseJsonPath(options.jsonPath), normalizeValue(value));
         if (!modified) {
             logger.error('Value cannot be found.');

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

@@ -20,4 +20,6 @@ export declare class RunCommandModule extends ArchitectBaseCommandModule<RunComm
     builder(argv: Argv): Promise<Argv<RunCommandArgs>>;
     run(options: Options<RunCommandArgs> & OtherOptions): Promise<number>;
     protected makeTargetSpecifier(options?: Options<RunCommandArgs>): Target | undefined;
+    /** @returns a sorted list of target specifiers to be used for auto completion. */
+    private getTargetChoices;
 }

package/src/commands/run/cli.js

@@ -19,11 +19,15 @@ class RunCommandModule extends architect_base_command_module_1.ArchitectBaseComm
         this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
     }
     async builder(argv) {
+        const { jsonHelp, getYargsCompletions, help } = this.context.args.options;
         const localYargs = argv
             .positional('target', {
             describe: 'The Architect target to run.',
             type: 'string',
             demandOption: true,
+            // Show only in when using --help and auto completion because otherwise comma seperated configuration values will be invalid.
+            // Also, hide choices from JSON help so that we don't display them in AIO.
+            choices: (getYargsCompletions || help) && !jsonHelp ? this.getTargetChoices() : undefined,
         })
             .strict();
         const target = this.makeTargetSpecifier();
@@ -54,6 +58,26 @@ class RunCommandModule extends architect_base_command_module_1.ArchitectBaseComm
             configuration,
         };
     }
+    /** @returns a sorted list of target specifiers to be used for auto completion. */
+    getTargetChoices() {
+        if (!this.context.workspace) {
+            return;
+        }
+        const targets = [];
+        for (const [projectName, project] of this.context.workspace.projects) {
+            for (const [targetName, target] of project.targets) {
+                const currentTarget = `${projectName}:${targetName}`;
+                targets.push(currentTarget);
+                if (!target.configurations) {
+                    continue;
+                }
+                for (const configName of Object.keys(target.configurations)) {
+                    targets.push(`${currentTarget}:${configName}`);
+                }
+            }
+        }
+        return targets.sort();
+    }
 }
 exports.RunCommandModule = RunCommandModule;
 RunCommandModule.scope = command_module_1.CommandScope.In;

package/src/utilities/config.d.ts

@@ -10,14 +10,15 @@ import { PackageManager } from '../../lib/config/workspace-schema';
 import { JSONFile } from './json-file';
 export declare const workspaceSchemaPath: string;
 export declare class AngularWorkspace {
-    private workspace;
+    private readonly workspace;
     readonly filePath: string;
     readonly basePath: string;
     constructor(workspace: workspaces.WorkspaceDefinition, filePath: string);
     get extensions(): Record<string, json.JsonValue | undefined>;
     get projects(): workspaces.ProjectDefinitionCollection;
-    getCli(): Record<string, any>;
-    getProjectCli(projectName: string): Record<string, any>;
+    getCli(): Record<string, any> | undefined;
+    getProjectCli(projectName: string): Record<string, any> | undefined;
+    save(): Promise<void>;
     static load(workspaceFilePath: string): Promise<AngularWorkspace>;
 }
 export declare function getWorkspace(level?: 'local' | 'global'): Promise<AngularWorkspace | undefined>;

package/src/utilities/config.js

@@ -134,12 +134,15 @@ class AngularWorkspace {
     // Temporary helper functions to support refactoring
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     getCli() {
-        return this.workspace.extensions['cli'] || {};
+        return this.workspace.extensions['cli'];
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     getProjectCli(projectName) {
         const project = this.workspace.projects.get(projectName);
-        return (project === null || project === void 0 ? void 0 : project.extensions['cli']) || {};
+        return project === null || project === void 0 ? void 0 : project.extensions['cli'];
+    }
+    save() {
+        return core_1.workspaces.writeWorkspace(this.workspace, createWorkspaceHost(), this.filePath);
     }
     static async load(workspaceFilePath) {
         const result = await core_1.workspaces.readWorkspace(workspaceFilePath, createWorkspaceHost(), core_1.workspaces.WorkspaceFormat.JSON);
@@ -152,10 +155,13 @@ async function getWorkspace(level = 'local') {
     if (cachedWorkspaces.has(level)) {
         return cachedWorkspaces.get(level);
     }
-    const configPath = level === 'local' ? projectFilePath() : globalFilePath();
+    let configPath = level === 'local' ? projectFilePath() : globalFilePath();
     if (!configPath) {
-        cachedWorkspaces.set(level, undefined);
-        return undefined;
+        if (level === 'local') {
+            cachedWorkspaces.set(level, undefined);
+            return undefined;
+        }
+        configPath = createGlobalSettings();
     }
     try {
         const workspace = await AngularWorkspace.load(configPath);