@angular/cli 14.1.0-next.0 → 14.1.0-next.3

package/src/commands/run/cli.js

@@ -14,6 +14,7 @@ const command_module_1 = require("../../command-builder/command-module");
 class RunCommandModule extends architect_base_command_module_1.ArchitectBaseCommandModule {
     constructor() {
         super(...arguments);
+        this.scope = command_module_1.CommandScope.In;
         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');
@@ -29,6 +30,16 @@ class RunCommandModule extends architect_base_command_module_1.ArchitectBaseComm
             // Also, hide choices from JSON help so that we don't display them in AIO.
             choices: (getYargsCompletions || help) && !jsonHelp ? this.getTargetChoices() : undefined,
         })
+            .middleware((args) => {
+            // TODO: remove in version 15.
+            const { configuration, target } = args;
+            if (typeof configuration === 'string' && target) {
+                const targetWithConfig = target.split(':', 2);
+                targetWithConfig.push(configuration);
+                throw new command_module_1.CommandModuleError('Unknown argument: configuration.\n' +
+                    `Provide the configuration as part of the target 'ng run ${targetWithConfig.join(':')}'.`);
+            }
+        }, true)
             .strict();
         const target = this.makeTargetSpecifier();
         if (!target) {
@@ -80,4 +91,3 @@ class RunCommandModule extends architect_base_command_module_1.ArchitectBaseComm
     }
 }
 exports.RunCommandModule = RunCommandModule;
-RunCommandModule.scope = command_module_1.CommandScope.In;

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

@@ -20,7 +20,7 @@ interface UpdateCommandArgs {
     'create-commits': boolean;
 }
 export declare class UpdateCommandModule extends CommandModule<UpdateCommandArgs> {
-    static scope: CommandScope;
+    scope: CommandScope;
     protected shouldReportAnalytics: boolean;
     command: string;
     describe: string;

package/src/commands/update/cli.js

@@ -49,6 +49,7 @@ const schematic_engine_host_1 = require("../../command-builder/utilities/schemat
 const schematic_workflow_1 = require("../../command-builder/utilities/schematic-workflow");
 const color_1 = require("../../utilities/color");
 const environment_options_1 = require("../../utilities/environment-options");
+const error_1 = require("../../utilities/error");
 const log_file_1 = require("../../utilities/log-file");
 const package_metadata_1 = require("../../utilities/package-metadata");
 const package_tree_1 = require("../../utilities/package-tree");
@@ -58,6 +59,7 @@ const UPDATE_SCHEMATIC_COLLECTION = path.join(__dirname, 'schematic/collection.j
 class UpdateCommandModule extends command_module_1.CommandModule {
     constructor() {
         super(...arguments);
+        this.scope = command_module_1.CommandScope.In;
         this.shouldReportAnalytics = false;
         this.command = 'update [packages..]';
         this.describe = 'Updates your workspace and its dependencies. See https://update.angular.io/.';
@@ -178,6 +180,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                 packages.push(packageIdentifier);
             }
             catch (e) {
+                (0, error_1.assertIsError)(e);
                 logger.error(e.message);
                 return 1;
             }
@@ -230,6 +233,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                 logger.error(`${color_1.colors.symbols.cross} Migration failed. See above for further details.\n`);
             }
             else {
+                (0, error_1.assertIsError)(e);
                 const logPath = (0, log_file_1.writeErrorToLogFile)(e);
                 logger.fatal(`${color_1.colors.symbols.cross} Migration failed: ${e.message}\n` +
                     `  See "${logPath}" for further details.\n`);
@@ -366,6 +370,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                 migrations = require.resolve(migrations, { paths: [packagePath] });
             }
             catch (e) {
+                (0, error_1.assertIsError)(e);
                 if (e.code === 'MODULE_NOT_FOUND') {
                     logger.error('Migrations for package were not found.');
                 }
@@ -425,6 +430,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                 });
             }
             catch (e) {
+                (0, error_1.assertIsError)(e);
                 logger.error(`Error fetching metadata for '${packageName}': ` + e.message);
                 return 1;
             }
@@ -438,6 +444,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                     manifest = (0, npm_pick_manifest_1.default)(metadata, requestIdentifier.fetchSpec);
                 }
                 catch (e) {
+                    (0, error_1.assertIsError)(e);
                     if (e.code === 'ETARGET') {
                         // If not found and next was used and user did not provide a specifier, try latest.
                         // Package may not have a next tag.
@@ -448,6 +455,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                                 manifest = (0, npm_pick_manifest_1.default)(metadata, 'latest');
                             }
                             catch (e) {
+                                (0, error_1.assertIsError)(e);
                                 if (e.code !== 'ETARGET' && e.code !== 'ENOVERSIONS') {
                                     throw e;
                                 }
@@ -554,6 +562,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                         }));
                     }
                     catch (e) {
+                        (0, error_1.assertIsError)(e);
                         if (e.code === 'MODULE_NOT_FOUND') {
                             // Fallback to trying to resolve the package's main entry point
                             packagePath = require.resolve(migration.package, { paths: [this.context.root] });
@@ -564,6 +573,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                     }
                 }
                 catch (e) {
+                    (0, error_1.assertIsError)(e);
                     if (e.code === 'MODULE_NOT_FOUND') {
                         logVerbose(e.toString());
                         logger.error(`Migrations for package (${migration.package}) were not found.` +
@@ -587,6 +597,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                         migrations = require.resolve(migration.collection, { paths: [packagePath] });
                     }
                     catch (e) {
+                        (0, error_1.assertIsError)(e);
                         if (e.code === 'MODULE_NOT_FOUND') {
                             logger.error(`Migrations for package (${migration.package}) were not found.`);
                         }
@@ -740,7 +751,6 @@ class UpdateCommandModule extends command_module_1.CommandModule {
     }
 }
 exports.UpdateCommandModule = UpdateCommandModule;
-UpdateCommandModule.scope = command_module_1.CommandScope.In;
 /**
  * @return Whether or not the working directory has Git changes to commit.
  */

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

@@ -35,6 +35,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 error_1 = require("../../../utilities/error");
 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
@@ -199,6 +200,7 @@ function _performUpdate(tree, context, infoMap, logger, migrateOnly) {
         packageJson = JSON.parse(packageJsonContent.toString());
     }
     catch (e) {
+        (0, error_1.assertIsError)(e);
         throw new schematics_1.SchematicsException('package.json could not be parsed: ' + e.message);
     }
     const updateDependency = (deps, name, newVersion) => {
@@ -588,6 +590,7 @@ function _getAllDependencies(tree) {
         packageJson = JSON.parse(packageJsonContent.toString());
     }
     catch (e) {
+        (0, error_1.assertIsError)(e);
         throw new schematics_1.SchematicsException('package.json could not be parsed: ' + e.message);
     }
     return [

package/src/utilities/color.js

@@ -64,7 +64,6 @@ function removeColor(text) {
 }
 exports.removeColor = removeColor;
 // Create a separate instance to prevent unintended global changes to the color configuration
-// Create function is not defined in the typings. See: https://github.com/doowb/ansi-colors/pull/44
 const colors = ansiColors.create();
 exports.colors = colors;
 colors.enabled = supportColor();

package/src/utilities/completion.js

@@ -40,6 +40,7 @@ const color_1 = require("../utilities/color");
 const config_1 = require("../utilities/config");
 const environment_options_1 = require("../utilities/environment-options");
 const tty_1 = require("../utilities/tty");
+const error_1 = require("./error");
 /**
  * Checks if it is appropriate to prompt the user to setup autocompletion. If not, does nothing. If
  * so prompts and sets up autocompletion for the user. Returns an exit code if the program should
@@ -71,6 +72,7 @@ Ok, you won't be prompted again. Should you change your mind, the following comm
         rcFile = await initializeAutocomplete();
     }
     catch (err) {
+        (0, error_1.assertIsError)(err);
         // Failed to set up autocompeletion, log the error and abort.
         logger.error(err.message);
         return 1;
@@ -213,6 +215,7 @@ async function initializeAutocomplete() {
         await fs_1.promises.appendFile(rcFile, '\n\n# Load Angular CLI autocompletion.\nsource <(ng completion script)\n');
     }
     catch (err) {
+        (0, error_1.assertIsError)(err);
         throw new Error(`Failed to append autocompletion setup to \`${rcFile}\`:\n${err.message}`);
     }
     return rcFile;

package/src/utilities/config.d.ts

@@ -31,7 +31,7 @@ export declare function getWorkspace(level: 'local' | 'global'): Promise<Angular
  * NB: This method is intended to be used only for `ng config`.
  */
 export declare function getWorkspaceRaw(level?: 'local' | 'global'): Promise<[JSONFile | null, string | null]>;
-export declare function validateWorkspace(data: json.JsonObject): Promise<void>;
+export declare function validateWorkspace(data: json.JsonObject, isGlobal: boolean): Promise<void>;
 export declare function getProjectByCwd(workspace: AngularWorkspace): string | null;
 export declare function getConfiguredPackageManager(): Promise<PackageManager | null>;
 export declare function getSchematicDefaults(collection: string, schematic: string, project?: string | null): Promise<{}>;

package/src/utilities/config.js

@@ -200,11 +200,18 @@ async function getWorkspaceRaw(level = 'local') {
     return [new json_file_1.JSONFile(configPath), configPath];
 }
 exports.getWorkspaceRaw = getWorkspaceRaw;
-async function validateWorkspace(data) {
+async function validateWorkspace(data, isGlobal) {
     const schema = (0, json_file_1.readAndParseJson)(exports.workspaceSchemaPath);
+    // We should eventually have a dedicated global config schema and use that to validate.
+    const schemaToValidate = isGlobal
+        ? {
+            '$ref': '#/definitions/global',
+            definitions: schema['definitions'],
+        }
+        : schema;
     const { formats } = await Promise.resolve().then(() => __importStar(require('@angular-devkit/schematics')));
     const registry = new core_1.json.schema.CoreSchemaRegistry(formats.standardFormats);
-    const validator = await registry.compile(schema).toPromise();
+    const validator = await registry.compile(schemaToValidate).toPromise();
     const { success, errors } = await validator(data).toPromise();
     if (!success) {
         throw new core_1.json.schema.SchemaValidationException(errors);

package/src/utilities/error.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @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
+ */
+export declare function assertIsError(value: unknown): asserts value is Error & {
+    code?: string;
+};

package/src/utilities/error.js

@@ -0,0 +1,18 @@
+"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.assertIsError = void 0;
+const assert_1 = __importDefault(require("assert"));
+function assertIsError(value) {
+    (0, assert_1.default)(value instanceof Error, 'catch clause variable is not an Error instance');
+}
+exports.assertIsError = assertIsError;