@angular/cli 14.0.0-next.8 → 14.0.0-rc.1

package/lib/cli/index.js

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

package/lib/config/schema.json

@@ -812,6 +812,12 @@
           "alias": "t",
           "x-user-analytics": 10
         },
+        "standalone": {
+          "description": "Whether the generated component is standalone.",
+          "type": "boolean",
+          "default": false,
+          "x-user-analytics": 15
+        },
         "viewEncapsulation": {
           "description": "The view encapsulation strategy to use in the new component.",
           "enum": [
@@ -964,6 +970,12 @@
           "format": "html-selector",
           "description": "The HTML selector to use for this directive."
         },
+        "standalone": {
+          "description": "Whether the generated directive is standalone.",
+          "type": "boolean",
+          "default": false,
+          "x-user-analytics": 15
+        },
         "flat": {
           "type": "boolean",
           "description": "When true (the default), creates the new files at the top level of the current project.",
@@ -1251,6 +1263,12 @@
           "description": "Do not import this pipe into the owning NgModule.",
           "x-user-analytics": 18
         },
+        "standalone": {
+          "description": "Whether the generated pipe is standalone.",
+          "type": "boolean",
+          "default": false,
+          "x-user-analytics": 15
+        },
         "module": {
           "type": "string",
           "description": "The declaring NgModule.",

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

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

package/lib/init.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.0-next.8",
+  "version": "14.0.0-rc.1",
   "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-rc.1",
+    "@angular-devkit/core": "14.0.0-rc.1",
+    "@angular-devkit/schematics": "14.0.0-rc.1",
+    "@schematics/angular": "14.0.0-rc.1",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.4",
-    "ini": "2.0.0",
-    "inquirer": "8.2.2",
+    "ini": "3.0.0",
+    "inquirer": "8.2.4",
     "jsonc-parser": "3.0.0",
     "npm-package-arg": "9.0.2",
     "npm-pick-manifest": "7.0.1",
     "open": "8.4.0",
     "ora": "5.4.1",
-    "pacote": "13.1.0",
+    "pacote": "13.3.0",
     "resolve": "1.22.0",
-    "semver": "7.3.5",
+    "semver": "7.3.7",
     "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-rc.1",
+      "@angular-devkit/architect": "0.1400.0-rc.1",
+      "@angular-devkit/build-angular": "14.0.0-rc.1",
+      "@angular-devkit/build-webpack": "0.1400.0-rc.1",
+      "@angular-devkit/core": "14.0.0-rc.1",
+      "@angular-devkit/schematics": "14.0.0-rc.1"
     }
   },
   "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.d.ts

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

package/src/command-builder/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-module.js

@@ -42,6 +42,7 @@ const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const helpers_1 = require("yargs/helpers");
 const analytics_1 = require("../analytics/analytics");
+const completion_1 = require("../utilities/completion");
 const memoize_1 = require("../utilities/memoize");
 var CommandScope;
 (function (CommandScope) {
@@ -89,6 +90,12 @@ class CommandModule {
         for (const [key, value] of Object.entries(options)) {
             camelCasedOptions[helpers_1.Parser.camelCase(key)] = value;
         }
+        // Set up autocompletion if appropriate.
+        const autocompletionExitCode = await (0, completion_1.considerSettingUpAutocompletion)(this.commandName, this.context.logger);
+        if (autocompletionExitCode !== undefined) {
+            process.exitCode = autocompletionExitCode;
+            return;
+        }
         // Gather and report analytics.
         const analytics = await this.getAnalytics();
         if (this.shouldReportAnalytics) {

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,
             },
         },
@@ -103,7 +112,8 @@ async function runCommand(args, logger) {
     }
     if (jsonHelp) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        localYargs.getInternalMethods().getUsageInstance().help = () => (0, json_help_1.jsonHelpUsage)();
+        const usageInstance = localYargs.getInternalMethods().getUsageInstance();
+        usageInstance.help = () => (0, json_help_1.jsonHelpUsage)();
     }
     await localYargs
         .scriptName('ng')
@@ -135,6 +145,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/schematics-command-module.js

@@ -40,6 +40,7 @@ exports.SchematicsCommandModule = exports.DEFAULT_SCHEMATICS_COLLECTION = void 0
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const tools_1 = require("@angular-devkit/schematics/tools");
+const path_1 = require("path");
 const config_1 = require("../utilities/config");
 const memoize_1 = require("../utilities/memoize");
 const tty_1 = require("../utilities/tty");
@@ -109,9 +110,7 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
             optionTransforms: [
                 // Add configuration file defaults
                 async (schematic, current) => {
-                    const projectName = typeof current.project === 'string'
-                        ? current.project
-                        : this.getProjectName();
+                    const projectName = typeof (current === null || current === void 0 ? void 0 : current.project) === 'string' ? current.project : this.getProjectName();
                     return {
                         ...(await (0, config_1.getSchematicDefaults)(schematic.collection.name, schematic.name, projectName)),
                         ...current,
@@ -211,16 +210,20 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
     }
     async getSchematicCollections() {
         var _a;
+        // Resolve relative collections from the location of `angular.json`
+        const resolveRelativeCollection = (collectionName) => collectionName.charAt(0) === '.'
+            ? (0, path_1.resolve)(this.context.root, collectionName)
+            : collectionName;
         const getSchematicCollections = (configSection) => {
             if (!configSection) {
                 return undefined;
             }
             const { schematicCollections, defaultCollection } = configSection;
             if (Array.isArray(schematicCollections)) {
-                return new Set(schematicCollections);
+                return new Set(schematicCollections.map((c) => resolveRelativeCollection(c)));
             }
             else if (typeof defaultCollection === 'string') {
-                return new Set([defaultCollection]);
+                return new Set([resolveRelativeCollection(defaultCollection)]);
             }
             return undefined;
         };
@@ -277,11 +280,11 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
             if (err instanceof schematics_1.UnsuccessfulWorkflowExecution) {
                 // "See above" because we already printed the error.
                 logger.fatal('The Schematic workflow failed. See above.');
-                return 1;
             }
             else {
-                throw err;
+                logger.fatal(err.message);
             }
+            return 1;
         }
         finally {
             unsubscribe();

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

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

package/src/command-builder/utilities/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;