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

Fix #10699
angular · May 10, 2018 · c9a46eb · c9a46eb
1 parent 89242be
commit c9a46eb
Show file tree

Hide file tree

Showing 9 changed files with 178 additions and 253 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/@angular/cli/commands/build.ts b/packages/@angular/cli/commands/build.ts
@@ -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);
   }
 }
diff --git a/packages/@angular/cli/commands/e2e.ts b/packages/@angular/cli/commands/e2e.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);
   }
 }
diff --git a/packages/@angular/cli/commands/lint.ts b/packages/@angular/cli/commands/lint.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);
   }
 }
diff --git a/packages/@angular/cli/commands/run.ts b/packages/@angular/cli/commands/run.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.');
     }

diff --git a/packages/@angular/cli/commands/serve.ts b/packages/@angular/cli/commands/serve.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);
   }
 }
diff --git a/packages/@angular/cli/commands/test.ts b/packages/@angular/cli/commands/test.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);
   }
 }
diff --git a/packages/@angular/cli/commands/xi18n.ts b/packages/@angular/cli/commands/xi18n.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);
   }
 }