fix(@angular/cli): clean up architect options

Fix angular#10699

Author: filipesilva

package-lock.json

@@ -1,12 +1,6 @@
-import { ArchitectCommand } from '../models/architect-command';
 import { Option, CommandScope } from '../models/command';
 import { Version } from '../upgrade/version';
-
-export interface Options {
-  project?: string;
-  configuration?: string;
-  prod: boolean;
-}
+import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 
 export default class BuildCommand extends ArchitectCommand {
   public readonly name = 'build';
@@ -20,29 +14,14 @@ export default class BuildCommand extends ArchitectCommand {
     this.configurationOption
   ];
 
-  public validate(options: Options) {
+  public validate(options: ArchitectCommandOptions) {
     // Check Angular and TypeScript versions.
     Version.assertCompatibleAngularVersion(this.project.root);
     Version.assertTypescriptVersion(this.project.root);
     return super.validate(options);
   }
 
-  public async run(options: Options) {
-    let configuration = options.configuration;
-    if (!configuration && options.prod) {
-      configuration = 'production';
-    }
-
-    const overrides = { ...options };
-    delete overrides.project;
-    delete overrides.configuration;
-    delete overrides.prod;
-
-    return this.runArchitectTarget({
-      project: options.project,
-      target: this.target,
-      configuration,
-      overrides
-    }, options);
+  public async run(options: ArchitectCommandOptions) {
+    return this.runArchitectTarget(options);
   }
 }

packages/@angular/cli/commands/build.ts

@@ -1,11 +1,6 @@
 import { CommandScope, Option } from '../models/command';
-import { ArchitectCommand } from '../models/architect-command';
+import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 
-export interface Options {
-  project?: string;
-  configuration?: string;
-  prod: boolean;
-}
 
 export default class E2eCommand extends ArchitectCommand {
   public readonly name = 'e2e';
@@ -19,21 +14,7 @@ export default class E2eCommand extends ArchitectCommand {
     this.configurationOption
   ];
 
-  public run(options: Options) {
-    let configuration = options.configuration;
-    if (!configuration && options.prod) {
-      configuration = 'production';
-    }
-
-    const overrides = { ...options };
-    delete overrides.project;
-    delete overrides.prod;
-
-    return this.runArchitectTarget({
-      project: options.project,
-      target: this.target,
-      configuration,
-      overrides
-    }, options);
+  public run(options: ArchitectCommandOptions) {
+    return this.runArchitectTarget(options);
   }
 }

packages/@angular/cli/commands/e2e.ts

@@ -1,10 +1,6 @@
 import { CommandScope, Option } from '../models/command';
-import { ArchitectCommand } from '../models/architect-command';
+import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 
-export interface Options {
-  project?: string;
-  configuration?: string;
-}
 
 export default class LintCommand extends ArchitectCommand {
   public readonly name = 'lint';
@@ -17,14 +13,7 @@ export default class LintCommand extends ArchitectCommand {
     this.configurationOption
   ];
 
-  public async run(options: Options) {
-    const overrides = { ...options };
-    delete overrides.project;
-    return this.runArchitectTarget({
-      project: options.project,
-      target: this.target,
-      configuration: options.configuration,
-      overrides
-    }, options);
+  public async run(options: ArchitectCommandOptions) {
+    return this.runArchitectTarget(options);
   }
 }

packages/@angular/cli/commands/lint.ts

@@ -1,9 +1,6 @@
 import { CommandScope, Option } from '../models/command';
-import { ArchitectCommand } from '../models/architect-command';
+import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 
-export interface RunOptions {
-  target: string;
-}
 
 export default class RunCommand extends ArchitectCommand {
   public readonly name = 'run';
@@ -14,17 +11,9 @@ export default class RunCommand extends ArchitectCommand {
     this.configurationOption
   ];
 
-  public async run(options: RunOptions) {
+  public async run(options: ArchitectCommandOptions) {
     if (options.target) {
-      const [project, target, configuration] = options.target.split(':');
-      const overrides = { ...options };
-      delete overrides.target;
-      return this.runArchitectTarget({
-        project,
-        target,
-        configuration,
-        overrides
-      }, options);
+      return this.runArchitectTarget(options);
     } else {
       throw new Error('Invalid architect target.');
     }

packages/@angular/cli/commands/run.ts

@@ -1,12 +1,7 @@
 import { CommandScope, Option } from '../models/command';
 import { Version } from '../upgrade/version';
-import { ArchitectCommand } from '../models/architect-command';
+import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 
-export interface Options {
-  project?: string;
-  configuration?: string;
-  prod: boolean;
-}
 
 export default class ServeCommand extends ArchitectCommand {
   public readonly name = 'serve';
@@ -19,29 +14,14 @@ export default class ServeCommand extends ArchitectCommand {
     this.configurationOption
   ];
 
-  public validate(_options: Options) {
+  public validate(_options: ArchitectCommandOptions) {
     // Check Angular and TypeScript versions.
     Version.assertCompatibleAngularVersion(this.project.root);
     Version.assertTypescriptVersion(this.project.root);
     return true;
   }
 
-  public async run(options: Options) {
-    let configuration = options.configuration;
-    if (!configuration && options.prod) {
-      configuration = 'production';
-    }
-
-    const overrides = { ...options };
-    delete overrides.project;
-    delete overrides.configuration;
-    delete overrides.prod;
-
-    return this.runArchitectTarget({
-      project: options.project,
-      target: this.target,
-      configuration,
-      overrides
-    }, options);
+  public async run(options: ArchitectCommandOptions) {
+    return this.runArchitectTarget(options);
   }
 }

packages/@angular/cli/commands/serve.ts

@@ -1,11 +1,6 @@
 import { CommandScope, Option } from '../models/command';
-import { ArchitectCommand } from '../models/architect-command';
+import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 
-export interface Options {
-  project?: string;
-  configuration?: string;
-  prod: boolean;
-}
 
 export default class TestCommand extends ArchitectCommand {
   public readonly name = 'test';
@@ -19,22 +14,7 @@ export default class TestCommand extends ArchitectCommand {
     this.configurationOption
   ];
 
-  public async run(options: Options) {
-    let configuration = options.configuration;
-    if (!configuration && options.prod) {
-      configuration = 'production';
-    }
-
-    const overrides = { ...options };
-    delete overrides.project;
-    delete overrides.configuration;
-    delete overrides.prod;
-
-    return this.runArchitectTarget({
-      project: options.project,
-      target: this.target,
-      configuration,
-      overrides
-    }, options);
+  public async run(options: ArchitectCommandOptions) {
+    return this.runArchitectTarget(options);
   }
 }

packages/@angular/cli/commands/test.ts

@@ -1,10 +1,6 @@
 import { CommandScope, Option } from '../models/command';
-import { ArchitectCommand } from '../models/architect-command';
+import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 
-export interface Options {
-  project?: string;
-  configuration?: string;
-}
 
 export default class Xi18nCommand extends ArchitectCommand {
   public readonly name = 'xi18n';
@@ -16,14 +12,7 @@ export default class Xi18nCommand extends ArchitectCommand {
     this.configurationOption
   ];
 
-  public async run(options: Options) {
-    const overrides = { ...options };
-    delete overrides.project;
-    return this.runArchitectTarget({
-      project: options.project,
-      target: this.target,
-      configuration: options.configuration,
-      overrides
-    }, options);
+  public async run(options: ArchitectCommandOptions) {
+    return this.runArchitectTarget(options);
   }
 }

packages/@angular/cli/commands/xi18n.ts

@@ -1,4 +1,4 @@
-import { experimental, schema, strings } from '@angular-devkit/core';
+import { JsonObject, experimental, schema, strings } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
 import {
   Architect, BuilderDescription, BuildEvent,
@@ -11,7 +11,20 @@ import { concatMap, map, tap, toArray } from 'rxjs/operators';
 import { WorkspaceLoader } from '../models/workspace-loader';
 
 
-export abstract class ArchitectCommand<T = any> extends Command<T> {
+export interface ProjectAndConfigurationOptions {
+  project?: string;
+  configuration?: string;
+  prod: boolean;
+}
+
+export interface TargetOptions {
+  target?: string;
+}
+
+export type ArchitectCommandOptions = ProjectAndConfigurationOptions & TargetOptions & JsonObject;
+
+export abstract class ArchitectCommand extends Command<ArchitectCommandOptions> {
+
   private _host = new NodeJsSyncHost();
   private _architect: Architect;
   private _workspace: experimental.workspace.Workspace;
@@ -30,18 +43,19 @@ export abstract class ArchitectCommand<T = any> extends Command<T> {
 
   target: string | undefined;
 
-  public async initialize(options: any): Promise<void> {
+  public async initialize(options: ArchitectCommandOptions): Promise<void> {
     return this._loadWorkspaceAndArchitect().pipe(
       concatMap(() => {
         let targetSpec: TargetSpecifier;
+        const { project } = this._splitOptionsObject(options);
+
         if (options.project) {
           targetSpec = {
-            project: options.project,
+            project: project,
             target: this.target
           };
         } else if (options.target) {
-          const [project, target] = options.target.split(':');
-          targetSpec = { project, target };
+          targetSpec = { project, target: options.target };
         } else if (this.target) {
           const projects = this.getProjectNamesByTarget(this.target);
 
@@ -70,13 +84,10 @@ export abstract class ArchitectCommand<T = any> extends Command<T> {
       .then(() => { });
   }
 
-  public validate(options: any) {
+  public validate(options: ArchitectCommandOptions) {
     if (!options.project && this.target) {
       const projectNames = this.getProjectNamesByTarget(this.target);
-      const overrides = { ...options };
-      delete overrides.project;
-      delete overrides.configuration;
-      delete overrides.prod;
+      const { overrides } = this._splitOptionsObject(options);
       if (projectNames.length > 1 && Object.keys(overrides).length > 0) {
         throw new Error('Architect commands with multiple targets cannot specify overrides.'
           + `'${this.target}' would be run on the following projects: ${projectNames.join()}`);
@@ -146,10 +157,15 @@ export abstract class ArchitectCommand<T = any> extends Command<T> {
     aliases: ['c']
   };
 
-  protected async runArchitectTarget(
-    targetSpec: TargetSpecifier,
-    commandOptions: T,
-  ): Promise<number> {
+  protected async runArchitectTarget(options: ArchitectCommandOptions): Promise<number> {
+    const { project, configuration, overrides } = this._splitOptionsObject(options);
+    const targetSpec = {
+      project,
+      target: options.target || this.target,
+      configuration,
+      overrides,
+    };
+
     const runSingleTarget = (targetSpec: TargetSpecifier) => this._architect.run(
       this._architect.getBuilderConfiguration(targetSpec),
       { logger: this._logger }
@@ -174,7 +190,7 @@ export abstract class ArchitectCommand<T = any> extends Command<T> {
         e.errors.forEach(schemaError => {
           if (schemaError.keyword === 'additionalProperties') {
             const unknownProperty = schemaError.params.additionalProperty;
-            if (unknownProperty in commandOptions) {
+            if (unknownProperty in options) {
               const dashes = unknownProperty.length === 1 ? '-' : '--';
               this.logger.fatal(`Unknown option: '${dashes}${unknownProperty}'`);
 
@@ -229,4 +245,37 @@ export abstract class ArchitectCommand<T = any> extends Command<T> {
       tap((architect: Architect) => this._architect = architect),
     );
   }
+
+  private _splitOptionsObject(options: ArchitectCommandOptions): {
+    project?: string,
+    configuration?: string,
+    overrides: JsonObject,
+  } {
+    let project, target, configuration, overrides;
+
+    if (options.target) {
+      [project, target, configuration] = options.target.split(':');
+
+      overrides = { ...options };
+      delete overrides.target;
+    } else {
+      project = options.project;
+      configuration = options.configuration;
+      if (!configuration && options.prod) {
+        configuration = 'production';
+      }
+
+      overrides = { ...options };
+
+      delete overrides.configuration;
+      delete overrides.prod;
+      delete overrides.project;
+    }
+
+    return {
+      project,
+      configuration,
+      overrides
+    };
+  }
 }