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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.0-next.7",
+  "version": "14.0.0-next.8",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,10 +25,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1400.0-next.7",
-    "@angular-devkit/core": "14.0.0-next.7",
-    "@angular-devkit/schematics": "14.0.0-next.7",
-    "@schematics/angular": "14.0.0-next.7",
+    "@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",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.4",
@@ -36,10 +36,10 @@
     "inquirer": "8.2.2",
     "jsonc-parser": "3.0.0",
     "npm-package-arg": "9.0.2",
-    "npm-pick-manifest": "7.0.0",
+    "npm-pick-manifest": "7.0.1",
     "open": "8.4.0",
     "ora": "5.4.1",
-    "pacote": "13.0.5",
+    "pacote": "13.1.0",
     "resolve": "1.22.0",
     "semver": "7.3.5",
     "symbol-observable": "4.0.0",
@@ -49,12 +49,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "14.0.0-next.7",
-      "@angular-devkit/architect": "0.1400.0-next.7",
-      "@angular-devkit/build-angular": "14.0.0-next.7",
-      "@angular-devkit/build-webpack": "0.1400.0-next.7",
-      "@angular-devkit/core": "14.0.0-next.7",
-      "@angular-devkit/schematics": "14.0.0-next.7"
+      "@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"
     }
   },
   "engines": {

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

@@ -9,10 +9,14 @@ import { Architect, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { CommandModule, CommandModuleImplementation, CommandScope, OtherOptions } from './command-module';
 import { Option } from './utilities/json-schema';
+export interface MissingTargetChoice {
+    name: string;
+    value: string;
+}
 export declare abstract class ArchitectBaseCommandModule<T> extends CommandModule<T> implements CommandModuleImplementation<T> {
     static scope: CommandScope;
     protected shouldReportAnalytics: boolean;
-    protected readonly missingErrorTarget: string | undefined;
+    protected readonly missingTargetChoices: MissingTargetChoice[] | undefined;
     protected runSingleTarget(target: Target, options: OtherOptions): Promise<number>;
     private _architectHost;
     protected getArchitectHost(): WorkspaceNodeModulesArchitectHost;
@@ -20,4 +24,7 @@ export declare abstract class ArchitectBaseCommandModule<T> extends CommandModul
     protected getArchitect(): Architect;
     protected getArchitectTargetOptions(target: Target): Promise<Option[]>;
     private warnOnMissingNodeModules;
+    protected getArchitectTarget(): string;
+    protected onMissingTarget(defaultMessage: string): Promise<1>;
+    private getMissingTargetPackageToInstall;
 }

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

@@ -11,9 +11,12 @@ exports.ArchitectBaseCommandModule = void 0;
 const architect_1 = require("@angular-devkit/architect");
 const node_1 = require("@angular-devkit/architect/node");
 const core_1 = require("@angular-devkit/core");
+const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const analytics_1 = require("../analytics/analytics");
+const prompt_1 = require("../utilities/prompt");
+const tty_1 = require("../utilities/tty");
 const command_module_1 = require("./command-module");
 const json_schema_1 = require("./utilities/json-schema");
 class ArchitectBaseCommandModule extends command_module_1.CommandModule {
@@ -22,14 +25,13 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
         this.shouldReportAnalytics = false;
     }
     async runSingleTarget(target, options) {
-        var _a;
         const architectHost = await this.getArchitectHost();
         let builderName;
         try {
             builderName = await architectHost.getBuilderNameForTarget(target);
         }
         catch (e) {
-            throw new command_module_1.CommandModuleError((_a = this.missingErrorTarget) !== null && _a !== void 0 ? _a : e.message);
+            return this.onMissingTarget(e.message);
         }
         await this.reportAnalytics({
             ...(await architectHost.getOptionsForTarget(target)),
@@ -98,6 +100,60 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
         }
         this.context.logger.warn(`Node packages may not be installed. Try installing with '${this.context.packageManager} install'.`);
     }
+    getArchitectTarget() {
+        return this.commandName;
+    }
+    async onMissingTarget(defaultMessage) {
+        const { logger } = this.context;
+        const choices = this.missingTargetChoices;
+        if (!(choices === null || choices === void 0 ? void 0 : choices.length)) {
+            logger.error(defaultMessage);
+            return 1;
+        }
+        const missingTargetMessage = `Cannot find "${this.getArchitectTarget()}" target for the specified project.\n` +
+            `You can add a package that implements these capabilities.\n\n` +
+            `For example:\n` +
+            choices.map(({ name, value }) => `  ${name}: ng add ${value}`).join('\n') +
+            '\n';
+        if ((0, tty_1.isTTY)()) {
+            // Use prompts to ask the user if they'd like to install a package.
+            logger.warn(missingTargetMessage);
+            const packageToInstall = await this.getMissingTargetPackageToInstall(choices);
+            if (packageToInstall) {
+                // Example run: `ng add @angular-eslint/schematics`.
+                const binPath = (0, path_1.resolve)(__dirname, '../../bin/ng.js');
+                const { error } = (0, child_process_1.spawnSync)(process.execPath, [binPath, 'add', packageToInstall], {
+                    stdio: 'inherit',
+                });
+                if (error) {
+                    throw error;
+                }
+            }
+        }
+        else {
+            // Non TTY display error message.
+            logger.error(missingTargetMessage);
+        }
+        return 1;
+    }
+    async getMissingTargetPackageToInstall(choices) {
+        if (choices.length === 1) {
+            // Single choice
+            const { name, value } = choices[0];
+            if (await (0, prompt_1.askConfirmation)(`Would you like to add ${name} now?`, true, false)) {
+                return value;
+            }
+            return null;
+        }
+        // Multiple choice
+        return (0, prompt_1.askQuestion)(`Would you like to add a package with "${this.getArchitectTarget()}" capabilities now?`, [
+            {
+                name: 'No',
+                value: null,
+            },
+            ...choices,
+        ], 0, null);
+    }
 }
 exports.ArchitectBaseCommandModule = ArchitectBaseCommandModule;
 ArchitectBaseCommandModule.scope = command_module_1.CommandScope.In;

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

@@ -17,6 +17,5 @@ export declare abstract class ArchitectCommandModule extends ArchitectBaseComman
     builder(argv: Argv): Promise<Argv<ArchitectCommandArgs>>;
     run(options: Options<ArchitectCommandArgs> & OtherOptions): Promise<number | void>;
     private getArchitectProject;
-    private getArchitectTarget;
     private getProjectNamesByTarget;
 }

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

@@ -6,9 +6,16 @@
  * 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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 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 {
@@ -39,7 +46,6 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
         return this.addSchemaOptionsToCommand(localYargs, schemaOptions);
     }
     async run(options) {
-        var _a;
         const target = this.getArchitectTarget();
         const { configuration = '', project, ...architectOptions } = options;
         if (!project) {
@@ -48,7 +54,7 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
             let result = 0;
             const projectNames = this.getProjectNamesByTarget(target);
             if (!projectNames) {
-                throw new command_module_1.CommandModuleError((_a = this.missingErrorTarget) !== null && _a !== void 0 ? _a : 'Cannot determine project or target for command.');
+                return this.onMissingTarget('Cannot determine project or target for command.');
             }
             for (const project of projectNames) {
                 result |= await this.runSingleTarget({ configuration, target, project }, architectOptions);
@@ -75,9 +81,6 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
         const projectFromTarget = this.getProjectNamesByTarget(target);
         return (projectFromTarget === null || projectFromTarget === void 0 ? void 0 : projectFromTarget.length) ? projectFromTarget[0] : undefined;
     }
-    getArchitectTarget() {
-        return this.commandName;
-    }
     getProjectNamesByTarget(target) {
         const workspace = this.getWorkspaceOrThrow();
         const allProjectsForTargetName = [];
@@ -105,4 +108,7 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
         return undefined;
     }
 }
+__decorate([
+    memoize_1.memoize
+], ArchitectCommandModule.prototype, "getProjectNamesByTarget", null);
 exports.ArchitectCommandModule = ArchitectCommandModule;

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

@@ -72,7 +72,6 @@ export declare abstract class CommandModule<T extends {} = {}> implements Comman
     abstract run(options: Options<T> & OtherOptions): Promise<number | void> | number | void;
     handler(args: ArgumentsCamelCase<T> & OtherOptions): Promise<void>;
     reportAnalytics(options: (Options<T> & OtherOptions) | OtherOptions, paths?: string[], dimensions?: (boolean | number | string)[]): Promise<void>;
-    private _analytics;
     protected getAnalytics(): Promise<analytics.Analytics>;
     /**
      * Adds schema options to a command also this keeps track of options that are required for analytics.

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

@@ -22,6 +22,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -36,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 memoize_1 = require("../utilities/memoize");
 var CommandScope;
 (function (CommandScope) {
     /** Command can only run inside an Angular workspace. */
@@ -124,13 +131,10 @@ class CommandModule {
             metrics: [],
         });
     }
-    async getAnalytics() {
-        if (this._analytics) {
-            return this._analytics;
-        }
-        return (this._analytics = await (0, analytics_1.createAnalytics)(!!this.context.workspace, 
+    getAnalytics() {
+        return (0, analytics_1.createAnalytics)(!!this.context.workspace, 
         // Don't prompt for `ng update` and `ng analytics` commands.
-        ['update', 'analytics'].includes(this.commandName)));
+        ['update', 'analytics'].includes(this.commandName));
     }
     /**
      * Adds schema options to a command also this keeps track of options that are required for analytics.
@@ -180,8 +184,11 @@ class CommandModule {
         return workspace;
     }
 }
-exports.CommandModule = CommandModule;
 CommandModule.scope = CommandScope.Both;
+__decorate([
+    memoize_1.memoize
+], CommandModule.prototype, "getAnalytics", null);
+exports.CommandModule = CommandModule;
 /**
  * Creates an known command module error.
  * This is used so during executation we can filter between known validation error and real non handled errors.

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

@@ -27,11 +27,8 @@ export declare abstract class SchematicsCommandModule extends CommandModule<Sche
     builder(argv: Argv): Promise<Argv<SchematicsCommandArgs>>;
     /** Get schematic schema options.*/
     protected getSchematicOptions(collection: Collection<FileSystemCollectionDescription, FileSystemSchematicDescription>, schematicName: string, workflow: NodeWorkflow): Promise<Option[]>;
-    private _workflowForBuilder;
     protected getOrCreateWorkflowForBuilder(collectionName: string): NodeWorkflow;
-    private _workflowForExecution;
     protected getOrCreateWorkflowForExecution(collectionName: string, options: SchematicsExecutionOptions): Promise<NodeWorkflow>;
-    private _schematicCollections;
     protected getSchematicCollections(): Promise<Set<string>>;
     protected parseSchematicInfo(schematic: string | undefined): [collectionName: string | undefined, schematicName: string | undefined];
     protected runSchematic(options: {

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

@@ -22,6 +22,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -35,6 +41,7 @@ const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const tools_1 = require("@angular-devkit/schematics/tools");
 const config_1 = require("../utilities/config");
+const memoize_1 = require("../utilities/memoize");
 const tty_1 = require("../utilities/tty");
 const command_module_1 = require("./command-module");
 const json_schema_1 = require("./utilities/json-schema");
@@ -46,7 +53,6 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
         super(...arguments);
         this.allowPrivateSchematics = false;
         this.shouldReportAnalytics = false;
-        this._workflowForBuilder = new Map();
         this.defaultProjectDeprecationWarningShown = false;
     }
     async builder(argv) {
@@ -83,21 +89,12 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
         return (0, json_schema_1.parseJsonSchemaToOptions)(workflow.registry, schemaJson);
     }
     getOrCreateWorkflowForBuilder(collectionName) {
-        const cached = this._workflowForBuilder.get(collectionName);
-        if (cached) {
-            return cached;
-        }
-        const workflow = new tools_1.NodeWorkflow(this.context.root, {
+        return new tools_1.NodeWorkflow(this.context.root, {
             resolvePaths: this.getResolvePaths(collectionName),
             engineHostCreator: (options) => new schematic_engine_host_1.SchematicEngineHost(options.resolvePaths),
         });
-        this._workflowForBuilder.set(collectionName, workflow);
-        return workflow;
     }
     async getOrCreateWorkflowForExecution(collectionName, options) {
-        if (this._workflowForExecution) {
-            return this._workflowForExecution;
-        }
         const { logger, root, packageManager } = this.context;
         const { force, dryRun, packageRegistry } = options;
         const workflow = new tools_1.NodeWorkflow(root, {
@@ -210,13 +207,10 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
                 }
             });
         }
-        return (this._workflowForExecution = workflow);
+        return workflow;
     }
     async getSchematicCollections() {
         var _a;
-        if (this._schematicCollections) {
-            return this._schematicCollections;
-        }
         const getSchematicCollections = (configSection) => {
             if (!configSection) {
                 return undefined;
@@ -236,18 +230,15 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
             if (project) {
                 const value = getSchematicCollections(workspace.getProjectCli(project));
                 if (value) {
-                    this._schematicCollections = value;
                     return value;
                 }
             }
         }
         const value = (_a = getSchematicCollections(workspace === null || workspace === void 0 ? void 0 : workspace.getCli())) !== null && _a !== void 0 ? _a : getSchematicCollections(globalConfiguration === null || globalConfiguration === void 0 ? void 0 : globalConfiguration.getCli());
         if (value) {
-            this._schematicCollections = value;
             return value;
         }
-        this._schematicCollections = new Set([exports.DEFAULT_SCHEMATICS_COLLECTION]);
-        return this._schematicCollections;
+        return new Set([exports.DEFAULT_SCHEMATICS_COLLECTION]);
     }
     parseSchematicInfo(schematic) {
         if (schematic === null || schematic === void 0 ? void 0 : schematic.includes(':')) {
@@ -331,5 +322,14 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
                 [__dirname, process.cwd()];
     }
 }
-exports.SchematicsCommandModule = SchematicsCommandModule;
 SchematicsCommandModule.scope = command_module_1.CommandScope.In;
+__decorate([
+    memoize_1.memoize
+], SchematicsCommandModule.prototype, "getOrCreateWorkflowForBuilder", null);
+__decorate([
+    memoize_1.memoize
+], SchematicsCommandModule.prototype, "getOrCreateWorkflowForExecution", null);
+__decorate([
+    memoize_1.memoize
+], SchematicsCommandModule.prototype, "getSchematicCollections", null);
+exports.SchematicsCommandModule = SchematicsCommandModule;

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

@@ -5,10 +5,11 @@
  * 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 { MissingTargetChoice } from '../../command-builder/architect-base-command-module';
 import { ArchitectCommandModule } from '../../command-builder/architect-command-module';
 import { CommandModuleImplementation } from '../../command-builder/command-module';
 export declare class DeployCommandModule extends ArchitectCommandModule implements CommandModuleImplementation {
-    missingErrorTarget: string;
+    missingTargetChoices: MissingTargetChoice[];
     multiTarget: boolean;
     command: string;
     longDescriptionPath: string;

package/src/commands/deploy/cli.js

@@ -8,24 +8,38 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeployCommandModule = void 0;
-const core_1 = require("@angular-devkit/core");
 const path_1 = require("path");
 const architect_command_module_1 = require("../../command-builder/architect-command-module");
 class DeployCommandModule extends architect_command_module_1.ArchitectCommandModule {
     constructor() {
         super(...arguments);
-        this.missingErrorTarget = core_1.tags.stripIndents `
-  Cannot find "deploy" target for the specified project.
-
-  You should add a package that implements deployment capabilities for your
-  favorite platform.
-  
-  For example:
-    ng add @angular/fire
-    ng add @azure/ng-deploy
-  
-  Find more packages on npm https://www.npmjs.com/search?q=ng%20deploy
-  `;
+        // The below choices should be kept in sync with the list in https://angular.io/guide/deployment
+        this.missingTargetChoices = [
+            {
+                name: 'Amazon S3',
+                value: '@jefiozie/ngx-aws-deploy',
+            },
+            {
+                name: 'Azure',
+                value: '@azure/ng-deploy',
+            },
+            {
+                name: 'Firebase',
+                value: '@angular/fire',
+            },
+            {
+                name: 'Netlify',
+                value: '@netlify-builder/deploy',
+            },
+            {
+                name: 'NPM',
+                value: 'ngx-deploy-npm',
+            },
+            {
+                name: 'GitHub Pages',
+                value: 'angular-cli-ghpages',
+            },
+        ];
         this.multiTarget = false;
         this.command = 'deploy [project]';
         this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');

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

@@ -5,11 +5,12 @@
  * 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 { MissingTargetChoice } from '../../command-builder/architect-base-command-module';
 import { ArchitectCommandModule } from '../../command-builder/architect-command-module';
 import { CommandModuleImplementation } from '../../command-builder/command-module';
 export declare class E2eCommandModule extends ArchitectCommandModule implements CommandModuleImplementation {
+    missingTargetChoices: MissingTargetChoice[];
     multiTarget: boolean;
-    missingErrorTarget: string;
     command: string;
     aliases: string[];
     describe: string;

package/src/commands/e2e/cli.js

@@ -8,24 +8,25 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.E2eCommandModule = void 0;
-const core_1 = require("@angular-devkit/core");
 const architect_command_module_1 = require("../../command-builder/architect-command-module");
 class E2eCommandModule extends architect_command_module_1.ArchitectCommandModule {
     constructor() {
         super(...arguments);
+        this.missingTargetChoices = [
+            {
+                name: 'Cypress',
+                value: '@cypress/schematic',
+            },
+            {
+                name: 'Nightwatch',
+                value: '@nightwatch/schematics',
+            },
+            {
+                name: 'WebdriverIO',
+                value: '@wdio/schematics',
+            },
+        ];
         this.multiTarget = true;
-        this.missingErrorTarget = core_1.tags.stripIndents `
-  Cannot find "e2e" target for the specified project.
-
-  You should add a package that implements end-to-end testing capabilities.
-
-  For example:
-    Cypress: ng add @cypress/schematic
-    Nightwatch: ng add @nightwatch/schematics
-    WebdriverIO: ng add @wdio/schematics
-
-  More options will be added to the list as they become available.
-  `;
         this.command = 'e2e [project]';
         this.aliases = ['e'];
         this.describe = 'Builds and serves an Angular application, then runs end-to-end tests.';

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

@@ -5,10 +5,11 @@
  * 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 { MissingTargetChoice } from '../../command-builder/architect-base-command-module';
 import { ArchitectCommandModule } from '../../command-builder/architect-command-module';
 import { CommandModuleImplementation } from '../../command-builder/command-module';
 export declare class LintCommandModule extends ArchitectCommandModule implements CommandModuleImplementation {
-    missingErrorTarget: string;
+    missingTargetChoices: MissingTargetChoice[];
     multiTarget: boolean;
     command: string;
     longDescriptionPath: string;

package/src/commands/lint/cli.js

@@ -8,20 +8,17 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LintCommandModule = void 0;
-const core_1 = require("@angular-devkit/core");
 const path_1 = require("path");
 const architect_command_module_1 = require("../../command-builder/architect-command-module");
 class LintCommandModule extends architect_command_module_1.ArchitectCommandModule {
     constructor() {
         super(...arguments);
-        this.missingErrorTarget = core_1.tags.stripIndents `
-  Cannot find "lint" target for the specified project.
-  
-  You should add a package that implements linting capabilities.
-  
-  For example:
-    ng add @angular-eslint/schematics
-  `;
+        this.missingTargetChoices = [
+            {
+                name: 'ESLint',
+                value: '@angular-eslint/schematics',
+            },
+        ];
         this.multiTarget = true;
         this.command = 'lint [project]';
         this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');

package/src/commands/new/cli.js

@@ -39,9 +39,14 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
         var _a;
         // Register the version of the CLI in the registry.
         const collectionName = (_a = options.collection) !== null && _a !== void 0 ? _a : (await this.getCollectionFromConfig());
-        const workflow = await this.getOrCreateWorkflowForExecution(collectionName, options);
-        workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version_1.VERSION.full);
         const { dryRun, force, interactive, defaults, collection, ...schematicOptions } = options;
+        const workflow = await this.getOrCreateWorkflowForExecution(collectionName, {
+            dryRun,
+            force,
+            interactive,
+            defaults,
+        });
+        workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version_1.VERSION.full);
         // Compatibility check for NPM 7
         if (collectionName === '@schematics/angular' &&
             !schematicOptions.skipInstall &&

package/src/commands/update/cli.js

@@ -67,7 +67,8 @@ class UpdateCommandModule extends command_module_1.CommandModule {
         return localYargs
             .positional('packages', {
             description: 'The names of package(s) to update.',
-            coerce: (value) => (typeof value === 'string' ? [value] : value),
+            type: 'string',
+            array: true,
         })
             .option('force', {
             description: 'Ignore peer dependency version mismatches. ' +
@@ -656,7 +657,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
      * @returns the version to install or null when there is no update to install.
      */
     async checkCLIVersion(packagesToUpdate, verbose = false, next = false) {
-        const { version } = await (0, package_metadata_1.fetchPackageManifest)(`@angular/cli@${this.getCLIUpdateRunnerVersion(typeof packagesToUpdate === 'string' ? [packagesToUpdate] : packagesToUpdate, next)}`, this.context.logger, {
+        const { version } = await (0, package_metadata_1.fetchPackageManifest)(`@angular/cli@${this.getCLIUpdateRunnerVersion(packagesToUpdate, next)}`, this.context.logger, {
             verbose,
             usingYarn: this.context.packageManager.name === workspace_schema_1.PackageManager.Yarn,
         });

package/src/utilities/memoize.d.ts

@@ -0,0 +1,15 @@
+/**
+ * @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
+ */
+/**
+ * A decorator that memoizes methods and getters.
+ *
+ * **Note**: Be cautious where and how to use this decorator as the size of the cache will grow unbounded.
+ *
+ * @see https://en.wikipedia.org/wiki/Memoization
+ */
+export declare function memoize<T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;

package/src/utilities/memoize.js

@@ -0,0 +1,69 @@
+"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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.memoize = void 0;
+/**
+ * A decorator that memoizes methods and getters.
+ *
+ * **Note**: Be cautious where and how to use this decorator as the size of the cache will grow unbounded.
+ *
+ * @see https://en.wikipedia.org/wiki/Memoization
+ */
+function memoize(target, propertyKey, descriptor) {
+    const descriptorPropertyName = descriptor.get ? 'get' : 'value';
+    const originalMethod = descriptor[descriptorPropertyName];
+    if (typeof originalMethod !== 'function') {
+        throw new Error('Memoize decorator can only be used on methods or get accessors.');
+    }
+    const cache = new Map();
+    return {
+        ...descriptor,
+        [descriptorPropertyName]: function (...args) {
+            for (const arg of args) {
+                if (!isJSONSerializable(arg)) {
+                    throw new Error(`Argument ${isNonPrimitive(arg) ? arg.toString() : arg} is JSON serializable.`);
+                }
+            }
+            const key = JSON.stringify(args);
+            if (cache.has(key)) {
+                return cache.get(key);
+            }
+            const result = originalMethod.apply(this, args);
+            cache.set(key, result);
+            return result;
+        },
+    };
+}
+exports.memoize = memoize;
+/** Method to check if value is a non primitive. */
+function isNonPrimitive(value) {
+    return ((value !== null && typeof value === 'object') ||
+        typeof value === 'function' ||
+        typeof value === 'symbol');
+}
+/** Method to check if the values are JSON serializable */
+function isJSONSerializable(value) {
+    if (!isNonPrimitive(value)) {
+        // Can be seralized since it's a primitive.
+        return true;
+    }
+    let nestedValues;
+    if (Array.isArray(value)) {
+        // It's an array, check each item.
+        nestedValues = value;
+    }
+    else if (Object.prototype.toString.call(value) === '[object Object]') {
+        // It's a plain object, check each value.
+        nestedValues = Object.values(value);
+    }
+    if (!nestedValues || nestedValues.some((v) => !isJSONSerializable(v))) {
+        return false;
+    }
+    return true;
+}

package/src/utilities/package-manager.js

@@ -6,6 +6,12 @@
  * 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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageManagerUtils = void 0;
 const core_1 = require("@angular-devkit/core");
@@ -16,6 +22,7 @@ const path_1 = require("path");
 const semver_1 = require("semver");
 const workspace_schema_1 = require("../../lib/config/workspace-schema");
 const config_1 = require("./config");
+const memoize_1 = require("./memoize");
 const spinner_1 = require("./spinner");
 class PackageManagerUtils {
     constructor(context) {
@@ -168,7 +175,6 @@ class PackageManagerUtils {
             (_b = childProcess.stderr) === null || _b === void 0 ? void 0 : _b.on('data', (data) => bufferedOutput.push({ stream: process.stderr, data: data }));
         });
     }
-    // TODO(alan-agius4): use the memoize decorator when it's merged.
     getVersion(name) {
         try {
             return (0, child_process_1.execSync)(`${name} --version`, {
@@ -186,7 +192,6 @@ class PackageManagerUtils {
             return undefined;
         }
     }
-    // TODO(alan-agius4): use the memoize decorator when it's merged.
     getName() {
         const packageManager = this.getConfiguredPackageManager();
         if (packageManager) {
@@ -273,4 +278,10 @@ class PackageManagerUtils {
         return result;
     }
 }
+__decorate([
+    memoize_1.memoize
+], PackageManagerUtils.prototype, "getVersion", null);
+__decorate([
+    memoize_1.memoize
+], PackageManagerUtils.prototype, "getName", null);
 exports.PackageManagerUtils = PackageManagerUtils;

package/src/utilities/prompt.d.ts

@@ -5,4 +5,6 @@
  * 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 type { ListChoiceOptions } from 'inquirer';
 export declare function askConfirmation(message: string, defaultResponse: boolean, noTTYResponse?: boolean): Promise<boolean>;
+export declare function askQuestion(message: string, choices: ListChoiceOptions[], defaultResponseIndex: number, noTTYResponse: null | string): Promise<string | null>;

package/src/utilities/prompt.js

@@ -30,7 +30,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.askConfirmation = void 0;
+exports.askQuestion = exports.askConfirmation = void 0;
 const tty_1 = require("./tty");
 async function askConfirmation(message, defaultResponse, noTTYResponse) {
     if (!(0, tty_1.isTTY)()) {
@@ -48,3 +48,20 @@ async function askConfirmation(message, defaultResponse, noTTYResponse) {
     return answers['confirmation'];
 }
 exports.askConfirmation = askConfirmation;
+async function askQuestion(message, choices, defaultResponseIndex, noTTYResponse) {
+    if (!(0, tty_1.isTTY)()) {
+        return noTTYResponse;
+    }
+    const question = {
+        type: 'list',
+        name: 'answer',
+        prefix: '',
+        message,
+        choices,
+        default: defaultResponseIndex,
+    };
+    const { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
+    const answers = await prompt([question]);
+    return answers['answer'];
+}
+exports.askQuestion = askQuestion;