@angular/cli 14.0.0-next.4 → 14.0.0-next.5

package/{commands/easter-egg-impl.js → src/commands/make-this-awesome/cli.js}

@@ -7,14 +7,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AwesomeCommand = void 0;
-const command_1 = require("../models/command");
-const color_1 = require("../utilities/color");
-function pickOne(of) {
-    return of[Math.floor(Math.random() * of.length)];
-}
-class AwesomeCommand extends command_1.Command {
-    async run() {
+exports.AwesomeCommandModule = void 0;
+const command_module_1 = require("../../command-builder/command-module");
+const color_1 = require("../../utilities/color");
+class AwesomeCommandModule extends command_module_1.CommandModule {
+    constructor() {
+        super(...arguments);
+        this.command = 'make-this-awesome';
+        this.describe = false;
+        this.deprecated = false;
+    }
+    builder(localYargs) {
+        return localYargs;
+    }
+    run() {
+        const pickOne = (of) => of[Math.floor(Math.random() * of.length)];
         const phrase = pickOne([
             `You're on it, there's nothing for me to do!`,
             `Let's take a look... nope, it's all good!`,
@@ -25,7 +32,7 @@ class AwesomeCommand extends command_1.Command {
             `I spy with my little eye a great developer!`,
             `Noop... already awesome.`,
         ]);
-        this.logger.info(color_1.colors.green(phrase));
+        this.context.logger.info(color_1.colors.green(phrase));
     }
 }
-exports.AwesomeCommand = AwesomeCommand;
+exports.AwesomeCommandModule = AwesomeCommandModule;

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

@@ -0,0 +1,23 @@
+/**
+ * @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 { CommandModuleImplementation, CommandScope, Options, OtherOptions } from '../../command-builder/command-module';
+import { SchematicsCommandArgs, SchematicsCommandModule } from '../../command-builder/schematics-command-module';
+export interface NewCommandArgs extends SchematicsCommandArgs {
+    collection?: string;
+}
+export declare class NewCommandModule extends SchematicsCommandModule implements CommandModuleImplementation<NewCommandArgs> {
+    protected schematicName: string;
+    static scope: CommandScope;
+    command: string;
+    aliases: string;
+    describe: string;
+    longDescriptionPath?: string | undefined;
+    builder(argv: Argv): Promise<Argv<NewCommandArgs>>;
+    run(options: Options<NewCommandArgs> & OtherOptions): number | void | Promise<number | void>;
+}

package/src/commands/new/cli.js

@@ -0,0 +1,36 @@
+"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.NewCommandModule = void 0;
+const command_module_1 = require("../../command-builder/command-module");
+const schematics_command_module_1 = require("../../command-builder/schematics-command-module");
+const new_impl_1 = require("./new-impl");
+class NewCommandModule extends schematics_command_module_1.SchematicsCommandModule {
+    constructor() {
+        super(...arguments);
+        this.schematicName = 'ng-new';
+        this.command = 'new [name]';
+        this.aliases = 'n';
+        this.describe = 'Creates a new Angular workspace.';
+    }
+    async builder(argv) {
+        const baseYargs = await super.builder(argv);
+        return baseYargs.option('collection', {
+            alias: 'c',
+            describe: 'A collection of schematics to use in generating the initial application.',
+            type: 'string',
+        });
+    }
+    run(options) {
+        const command = new new_impl_1.NewCommand(this.context, 'new');
+        return command.validateAndRun(options);
+    }
+}
+exports.NewCommandModule = NewCommandModule;
+NewCommandModule.scope = command_module_1.CommandScope.Out;

package/src/commands/new/new-impl.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 { SchematicCommand } from '../../../models/schematic-command';
+import { Options, OtherOptions } from '../../command-builder/command-module';
+import { NewCommandArgs } from './cli';
+declare type NewCommandOptions = Options<NewCommandArgs>;
+export declare class NewCommand extends SchematicCommand<NewCommandOptions> {
+    readonly allowMissingWorkspace = true;
+    schematicName: string;
+    initialize(options: NewCommandOptions): Promise<void>;
+    run(options: NewCommandOptions & OtherOptions): Promise<number | void>;
+}
+export {};

package/{commands → src/commands/new}/new-impl.js

@@ -8,8 +8,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NewCommand = void 0;
-const schematic_command_1 = require("../models/schematic-command");
-const version_1 = require("../models/version");
+const schematic_command_1 = require("../../../models/schematic-command");
+const version_1 = require("../../utilities/version");
 class NewCommand extends schematic_command_1.SchematicCommand {
     constructor() {
         super(...arguments);
@@ -24,13 +24,14 @@ class NewCommand extends schematic_command_1.SchematicCommand {
         // Register the version of the CLI in the registry.
         const version = version_1.VERSION.full;
         this._workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version);
+        const { dryRun, force, interactive, defaults, collection, ...schematicOptions } = options;
         return this.runSchematic({
             collectionName: this.collectionName,
             schematicName: this.schematicName,
-            schematicOptions: options['--'] || [],
-            debug: !!options.debug,
-            dryRun: !!options.dryRun,
-            force: !!options.force,
+            schematicOptions,
+            debug: false,
+            dryRun,
+            force,
         });
     }
 }

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

@@ -0,0 +1,23 @@
+/**
+ * @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 { Target } from '@angular-devkit/architect';
+import { Argv } from 'yargs';
+import { ArchitectBaseCommandModule } from '../../command-builder/architect-base-command-module';
+import { CommandModuleImplementation, CommandScope, Options, OtherOptions } from '../../command-builder/command-module';
+export interface RunCommandArgs {
+    target: string;
+}
+export declare class RunCommandModule extends ArchitectBaseCommandModule<RunCommandArgs> implements CommandModuleImplementation<RunCommandArgs> {
+    static scope: CommandScope;
+    command: string;
+    describe: string;
+    longDescriptionPath: string;
+    builder(argv: Argv): Promise<Argv<RunCommandArgs>>;
+    run(options: Options<RunCommandArgs> & OtherOptions): Promise<number>;
+    protected makeTargetSpecifier(options?: Options<RunCommandArgs>): Target | undefined;
+}

package/src/commands/run/cli.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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RunCommandModule = void 0;
+const path_1 = require("path");
+const architect_base_command_module_1 = require("../../command-builder/architect-base-command-module");
+const command_module_1 = require("../../command-builder/command-module");
+class RunCommandModule extends architect_base_command_module_1.ArchitectBaseCommandModule {
+    constructor() {
+        super(...arguments);
+        this.command = 'run <target>';
+        this.describe = 'Runs an Architect target with an optional custom builder configuration defined in your project.';
+        this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
+    }
+    async builder(argv) {
+        const localYargs = argv
+            .positional('target', {
+            describe: 'The Architect target to run.',
+            type: 'string',
+            demandOption: true,
+        })
+            .strict();
+        const target = this.makeTargetSpecifier();
+        if (!target) {
+            return localYargs;
+        }
+        const schemaOptions = await this.getArchitectTargetOptions(target);
+        return this.addSchemaOptionsToCommand(localYargs, schemaOptions);
+    }
+    async run(options) {
+        const target = this.makeTargetSpecifier(options);
+        const { target: _target, ...extraOptions } = options;
+        if (!target) {
+            throw new command_module_1.CommandModuleError('Cannot determine project or target.');
+        }
+        return this.runSingleTarget(target, extraOptions);
+    }
+    makeTargetSpecifier(options) {
+        var _a;
+        const architectTarget = (_a = options === null || options === void 0 ? void 0 : options.target) !== null && _a !== void 0 ? _a : this.context.args.positional[1];
+        if (!architectTarget) {
+            return undefined;
+        }
+        const [project = '', target = '', configuration] = architectTarget.split(':');
+        return {
+            project,
+            target,
+            configuration,
+        };
+    }
+}
+exports.RunCommandModule = RunCommandModule;
+RunCommandModule.scope = command_module_1.CommandScope.In;

package/src/commands/serve/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 { ArchitectCommandModule } from '../../command-builder/architect-command-module';
+import { CommandModuleImplementation } from '../../command-builder/command-module';
+export declare class ServeCommandModule extends ArchitectCommandModule implements CommandModuleImplementation {
+    multiTarget: boolean;
+    command: string;
+    aliases: string[];
+    describe: string;
+    longDescriptionPath?: string | undefined;
+}

package/src/commands/serve/cli.js

@@ -0,0 +1,21 @@
+"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.ServeCommandModule = void 0;
+const architect_command_module_1 = require("../../command-builder/architect-command-module");
+class ServeCommandModule extends architect_command_module_1.ArchitectCommandModule {
+    constructor() {
+        super(...arguments);
+        this.multiTarget = false;
+        this.command = 'serve [project]';
+        this.aliases = ['s'];
+        this.describe = 'Builds and serves your application, rebuilding on file changes.';
+    }
+}
+exports.ServeCommandModule = ServeCommandModule;

package/src/commands/test/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 { ArchitectCommandModule } from '../../command-builder/architect-command-module';
+import { CommandModuleImplementation } from '../../command-builder/command-module';
+export declare class TestCommandModule extends ArchitectCommandModule implements CommandModuleImplementation {
+    multiTarget: boolean;
+    command: string;
+    aliases: string[];
+    describe: string;
+    longDescriptionPath: string;
+}

package/src/commands/test/cli.js

@@ -0,0 +1,23 @@
+"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.TestCommandModule = void 0;
+const path_1 = require("path");
+const architect_command_module_1 = require("../../command-builder/architect-command-module");
+class TestCommandModule extends architect_command_module_1.ArchitectCommandModule {
+    constructor() {
+        super(...arguments);
+        this.multiTarget = true;
+        this.command = 'test [project]';
+        this.aliases = ['t'];
+        this.describe = 'Runs unit tests in a project.';
+        this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
+    }
+}
+exports.TestCommandModule = TestCommandModule;

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

@@ -0,0 +1,29 @@
+/**
+ * @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, CommandScope, Options, OtherOptions } from '../../command-builder/command-module';
+export interface UpdateCommandArgs {
+    packages?: string | string[];
+    force: boolean;
+    next: boolean;
+    'migrate-only'?: boolean;
+    name?: string;
+    from?: string;
+    to?: string;
+    'allow-dirty': boolean;
+    verbose: boolean;
+    'create-commits': boolean;
+}
+export declare class UpdateCommandModule extends CommandModule<UpdateCommandArgs> {
+    static scope: CommandScope;
+    command: string;
+    describe: string;
+    longDescriptionPath?: string | undefined;
+    builder(localYargs: Argv): Argv<UpdateCommandArgs>;
+    run(options: Options<UpdateCommandArgs> & OtherOptions): Promise<number | void>;
+}

package/src/commands/update/cli.js

@@ -0,0 +1,83 @@
+"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.UpdateCommandModule = void 0;
+const command_module_1 = require("../../command-builder/command-module");
+const update_impl_1 = require("./update-impl");
+class UpdateCommandModule extends command_module_1.CommandModule {
+    constructor() {
+        super(...arguments);
+        this.command = 'update [packages..]';
+        this.describe = 'Updates your workspace and its dependencies. See https://update.angular.io/.';
+    }
+    builder(localYargs) {
+        return localYargs
+            .positional('packages', {
+            description: 'The names of package(s) to update.',
+            type: 'string',
+        })
+            .option('force', {
+            description: 'Ignore peer dependency version mismatches. ' +
+                'Passes the `--force` flag to the package manager when installing packages.',
+            type: 'boolean',
+            default: false,
+        })
+            .option('next', {
+            description: 'Use the prerelease version, including beta and RCs.',
+            type: 'boolean',
+            default: false,
+        })
+            .option('migrate-only', {
+            description: 'Only perform a migration, do not update the installed version.',
+            type: 'boolean',
+        })
+            .option('name', {
+            description: 'The name of the migration to run.',
+            type: 'string',
+            implies: ['migrate-only'],
+            conflicts: ['to', 'from'],
+        })
+            .option('from', {
+            description: 'Version from which to migrate from. Only available with a single package being updated, and only on migration only.',
+            type: 'string',
+            implies: ['to', 'migrate-only'],
+            conflicts: ['name'],
+        })
+            .option('to', {
+            describe: 'Version up to which to apply migrations. Only available with a single package being updated, ' +
+                'and only on migrations only. Requires from to be specified. Default to the installed version detected.',
+            type: 'string',
+            implies: ['from', 'migrate-only'],
+            conflicts: ['name'],
+        })
+            .option('allow-dirty', {
+            describe: 'Whether to allow updating when the repository contains modified or untracked files.',
+            type: 'boolean',
+            default: false,
+        })
+            .option('verbose', {
+            describe: 'Display additional details about internal operations during execution.',
+            type: 'boolean',
+            default: false,
+        })
+            .option('create-commits', {
+            describe: 'Create source control commits for updates and migrations.',
+            type: 'boolean',
+            alias: ['C'],
+            default: false,
+        })
+            .strict();
+    }
+    run(options) {
+        const command = new update_impl_1.UpdateCommand(this.context, 'update');
+        return command.validateAndRun(options);
+    }
+}
+exports.UpdateCommandModule = UpdateCommandModule;
+UpdateCommandModule.scope = command_module_1.CommandScope.In;

package/src/commands/update/schematic/index.js

@@ -31,7 +31,7 @@ const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const npa = __importStar(require("npm-package-arg"));
 const semver = __importStar(require("semver"));
-const package_metadata_1 = require("../../../../utilities/package-metadata");
+const package_metadata_1 = require("../../../utilities/package-metadata");
 // Angular guarantees that a major is compatible with its following major (so packages that depend
 // on Angular 5 are also compatible with Angular 6). This is, in code, represented by verifying
 // that all other packages that have a peer dependency of `"@angular/core": "^5.0.0"` actually

package/{commands → src/commands/update}/update-impl.d.ts

@@ -5,14 +5,15 @@
  * 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 { Command } from '../models/command';
-import { Arguments } from '../models/interface';
-import { Schema as UpdateCommandSchema } from './update';
-export declare class UpdateCommand extends Command<UpdateCommandSchema> {
+import { Command } from '../../../models/command';
+import { Options } from '../../command-builder/command-module';
+import { UpdateCommandArgs } from './cli';
+declare type UpdateCommandOptions = Options<UpdateCommandArgs>;
+export declare class UpdateCommand extends Command<UpdateCommandOptions> {
     readonly allowMissingWorkspace = true;
     private workflow;
     private packageManager;
-    initialize(options: UpdateCommandSchema & Arguments): Promise<void>;
+    initialize(options: UpdateCommandOptions): Promise<void>;
     private executeSchematic;
     /**
      * @return Whether or not the migration was performed successfully.
@@ -23,7 +24,7 @@ export declare class UpdateCommand extends Command<UpdateCommandSchema> {
      */
     private executeMigrations;
     private executePackageMigrations;
-    run(options: UpdateCommandSchema & Arguments): Promise<number>;
+    run(options: UpdateCommandOptions): Promise<number>;
     /**
      * @return Whether or not the commit was successful.
      */
@@ -36,3 +37,4 @@ export declare class UpdateCommand extends Command<UpdateCommandSchema> {
     private checkCLIVersion;
     private getCLIUpdateRunnerVersion;
 }
+export {};

package/{commands → src/commands/update}/update-impl.js

@@ -38,17 +38,17 @@ const npm_package_arg_1 = __importDefault(require("npm-package-arg"));
 const npm_pick_manifest_1 = __importDefault(require("npm-pick-manifest"));
 const path = __importStar(require("path"));
 const semver = __importStar(require("semver"));
-const workspace_schema_1 = require("../lib/config/workspace-schema");
-const command_1 = require("../models/command");
-const schematic_engine_host_1 = require("../models/schematic-engine-host");
-const version_1 = require("../models/version");
-const color_1 = require("../utilities/color");
-const install_package_1 = require("../utilities/install-package");
-const log_file_1 = require("../utilities/log-file");
-const package_manager_1 = require("../utilities/package-manager");
-const package_metadata_1 = require("../utilities/package-metadata");
-const package_tree_1 = require("../utilities/package-tree");
-const UPDATE_SCHEMATIC_COLLECTION = path.join(__dirname, '../src/commands/update/schematic/collection.json');
+const workspace_schema_1 = require("../../../lib/config/workspace-schema");
+const command_1 = require("../../../models/command");
+const schematic_engine_host_1 = require("../../../models/schematic-engine-host");
+const color_1 = require("../../utilities/color");
+const install_package_1 = require("../../utilities/install-package");
+const log_file_1 = require("../../utilities/log-file");
+const package_manager_1 = require("../../utilities/package-manager");
+const package_metadata_1 = require("../../utilities/package-metadata");
+const package_tree_1 = require("../../utilities/package-tree");
+const version_1 = require("../../utilities/version");
+const UPDATE_SCHEMATIC_COLLECTION = path.join(__dirname, 'schematic/collection.json');
 /**
  * Disable CLI version mismatch checks and forces usage of the invoked CLI
  * instead of invoking the local installed version.
@@ -218,7 +218,7 @@ class UpdateCommand extends command_1.Command {
         await (0, package_manager_1.ensureCompatibleNpm)(this.context.root);
         // Check if the current installed CLI version is older than the latest compatible version.
         if (!disableVersionCheck) {
-            const cliVersionToInstall = await this.checkCLIVersion(options['--'], options.verbose, options.next);
+            const cliVersionToInstall = await this.checkCLIVersion(options.packages, options.verbose, options.next);
             if (cliVersionToInstall) {
                 this.logger.warn('The installed Angular CLI version is outdated.\n' +
                     `Installing a temporary Angular CLI versioned ${cliVersionToInstall} to perform the update.`);
@@ -231,7 +231,8 @@ class UpdateCommand extends command_1.Command {
             }
         };
         const packages = [];
-        for (const request of options['--'] || []) {
+        const packagesFromOptions = typeof options.packages === 'string' ? [options.packages] : options.packages;
+        for (const request of packagesFromOptions !== null && packagesFromOptions !== void 0 ? packagesFromOptions : []) {
             try {
                 const packageIdentifier = (0, npm_package_arg_1.default)(request);
                 // only registry identifiers are supported
@@ -363,8 +364,8 @@ class UpdateCommand extends command_1.Command {
                 }
             }
             let result;
-            if (typeof options.migrateOnly == 'string') {
-                result = await this.executeMigration(packageName, migrations, options.migrateOnly, options.createCommits);
+            if (options.name) {
+                result = await this.executeMigration(packageName, migrations, options.name, options.createCommits);
             }
             else {
                 const from = coerceVersionNumber(options.from);
@@ -487,21 +488,11 @@ class UpdateCommand extends command_1.Command {
             try {
                 // Remove existing node modules directory to provide a stronger guarantee that packages
                 // will be hoisted into the correct locations.
-                // The below should be removed and replaced with just `rm` when support for Node.Js 12 is removed.
-                const { rm, rmdir } = fs.promises;
-                if (rm) {
-                    await rm(path.join(this.context.root, 'node_modules'), {
-                        force: true,
-                        recursive: true,
-                        maxRetries: 3,
-                    });
-                }
-                else {
-                    await rmdir(path.join(this.context.root, 'node_modules'), {
-                        recursive: true,
-                        maxRetries: 3,
-                    });
-                }
+                await fs.promises.rm(path.join(this.context.root, 'node_modules'), {
+                    force: true,
+                    recursive: true,
+                    maxRetries: 3,
+                });
             }
             catch { }
             const result = await (0, install_package_1.installAllPackages)(this.packageManager, options.force ? ['--force'] : [], this.context.root);
@@ -648,7 +639,7 @@ class UpdateCommand extends command_1.Command {
      * @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(packagesToUpdate, next)}`, this.logger, {
+        const { version } = await (0, package_metadata_1.fetchPackageManifest)(`@angular/cli@${this.getCLIUpdateRunnerVersion(typeof packagesToUpdate === 'string' ? [packagesToUpdate] : packagesToUpdate, next)}`, this.logger, {
             verbose,
             usingYarn: this.packageManager === workspace_schema_1.PackageManager.Yarn,
         });

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

@@ -0,0 +1,19 @@
+/**
+ * @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 VersionCommandModule extends CommandModule implements CommandModuleImplementation {
+    command: string;
+    aliases: string[];
+    describe: string;
+    longDescriptionPath?: string | undefined;
+    builder(localYargs: Argv): Argv;
+    run(): Promise<void>;
+    private getVersion;
+    private getPackageManagerVersion;
+}