feat(@angular/cli): Update commands to extract meta data into JSON

Author: Brocco

packages/angular/cli/commands.json

@@ -0,0 +1,21 @@
+{
+  "add": "./commands/add.json",
+  "build": "./commands/build.json",
+  "config": "./commands/config.json",
+  "doc": "./commands/doc.json",
+  "e2e": "./commands/e2e.json",
+  "make-this-awesome": "./commands/easter-egg.json",
+  "eject": "./commands/eject.json",
+  "generate": "./commands/generate.json",
+  "get": "./commands/getset.json",
+  "set": "./commands/getset.json",
+  "help": "./commands/help.json",
+  "lint": "./commands/lint.json",
+  "new": "./commands/new.json",
+  "run": "./commands/run.json",
+  "serve": "./commands/serve.json",
+  "test": "./commands/test.json",
+  "update": "./commands/update.json",
+  "version": "./commands/version.json",
+  "xi18n": "./commands/xi18n.json"
+}

packages/angular/cli/commands/add.json

@@ -0,0 +1,23 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "AddCommandOptions",
+  "description": "Add support for a library to your project.",
+  "$longDescription": "",
+
+  "$scope": "in",
+  "$impl": "./add#AddCommand",
+
+  "type": "object",
+  "properties": {
+    "collection": {
+      "type": "string",
+      "description": "The package to be added.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      }
+    }
+  },
+  "required": [
+  ]
+}

packages/angular/cli/commands/add.ts

@@ -9,40 +9,31 @@
 // tslint:disable:no-global-tslint-disable no-any
 import { tags, terminal } from '@angular-devkit/core';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
-import { CommandScope, Option } from '../models/command';
 import { parseOptions } from '../models/command-runner';
 import { SchematicCommand } from '../models/schematic-command';
 import { NpmInstall } from '../tasks/npm-install';
 import { getPackageManager } from '../utilities/config';
 
 
 export class AddCommand extends SchematicCommand {
-  readonly name = 'add';
-  readonly description = 'Add support for a library to your project.';
   readonly allowPrivateSchematics = true;
-  static aliases = [];
-  static scope = CommandScope.inProject;
-  arguments = ['collection'];
-  options: Option[] = [];
 
   private async _parseSchematicOptions(collectionName: string): Promise<any> {
     const schematicOptions = await this.getOptions({
       schematicName: 'ng-add',
       collectionName,
     });
+    this.addOptions(schematicOptions);
 
-    const options = this.options.concat(schematicOptions.options);
-    const args = schematicOptions.arguments.map(arg => arg.name);
-
-    return parseOptions(this._rawArgs, options, args, this.argStrategy);
+    return parseOptions(this._rawArgs, this.options);
   }
 
   validate(options: any) {
     const collectionName = options._[0];
 
     if (!collectionName) {
       this.logger.fatal(
-        `The "ng ${this.name}" command requires a name argument to be specified eg. `
+        `The "ng add" command requires a name argument to be specified eg. `
         + `${terminal.yellow('ng add [name] ')}. For more details, use "ng help".`,
       );
 
@@ -57,7 +48,7 @@ export class AddCommand extends SchematicCommand {
 
     if (!firstArg) {
       this.logger.fatal(
-        `The "ng ${this.name}" command requires a name argument to be specified eg. `
+        `The "ng add" command requires a name argument to be specified eg. `
         + `${terminal.yellow('ng add [name] ')}. For more details, use "ng help".`,
       );
 

packages/angular/cli/commands/build.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "BuildCommandOptions",
+  "description": "Builds your app and places it into the output path (dist/ by default).",
+  "$longDescription": "",
+
+  "$aliases": [ "b" ],
+  "$scope": "in",
+  "$type": "architect",
+  "$impl": "./build#BuildCommand",
+
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the project to build.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      }
+    },
+    "configuration": {
+      "description": "Specify the configuration to use.",
+      "type": "string",
+      "aliases": ["c"]
+    },
+    "prod": {
+      "description": "Flag to set configuration to 'production'.",
+      "type": "boolean"
+    }
+  },
+  "required": [
+  ]
+}

packages/angular/cli/commands/build.ts

@@ -7,20 +7,10 @@
  */
 
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
-import { CommandScope, Option } from '../models/command';
 import { Version } from '../upgrade/version';
 
 export class BuildCommand extends ArchitectCommand {
-  public readonly name = 'build';
   public readonly target = 'build';
-  public readonly description =
-    'Builds your app and places it into the output path (dist/ by default).';
-  public static aliases = ['b'];
-  public static scope = CommandScope.inProject;
-  public options: Option[] = [
-    this.prodOption,
-    this.configurationOption,
-  ];
 
   public validate(options: ArchitectCommandOptions) {
     // Check Angular and TypeScript versions.

packages/angular/cli/commands/config.json

@@ -0,0 +1,38 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "ConfigCommandOptions",
+  "description": "Get/set configuration values.",
+  "$longDescription": "",
+
+  "$aliases": [],
+  "$scope": "in",
+  "$impl": "./config#ConfigCommand",
+
+  "type": "object",
+  "properties": {
+    "jsonPath": {
+      "type": "string",
+      "description": "The path to the value to get/set.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      }
+    },
+    "value": {
+      "type": "string",
+      "description": "The new value to be set.",
+      "$default": {
+        "$source": "argv",
+        "index": 1
+      }
+    },
+    "global": {
+      "type": "boolean",
+      "description": "Get/set the value in the global configuration (in your home directory).",
+      "default": false,
+      "aliases": ["g"]
+    }
+  },
+  "required": [
+  ]
+}

packages/angular/cli/commands/config.ts

@@ -17,7 +17,7 @@ import {
   tags,
 } from '@angular-devkit/core';
 import { writeFileSync } from 'fs';
-import { Command, Option } from '../models/command';
+import { Command } from '../models/command';
 import {
   getWorkspace,
   getWorkspaceRaw,
@@ -179,19 +179,6 @@ function normalizeValue(value: string, path: string): JsonValue {
 }
 
 export class ConfigCommand extends Command {
-  public readonly name = 'config';
-  public readonly description = 'Get/set configuration values.';
-  public readonly arguments = ['jsonPath', 'value'];
-  public readonly options: Option[] = [
-    {
-      name: 'global',
-      type: Boolean,
-      'default': false,
-      aliases: ['g'],
-      description: 'Get/set the value in the global configuration (in your home directory).',
-    },
-  ];
-
   public run(options: ConfigOptions) {
     const level = options.global ? 'global' : 'local';
 

packages/angular/cli/commands/doc.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "DocCommandOptions",
+  "description": "Opens the official Angular API documentation for a given keyword.",
+  "$longDescription": "",
+
+  "$aliases": [ "d" ],
+  "$type": "",
+  "$impl": "./doc#DocCommand",
+
+  "type": "object",
+  "properties": {
+    "keyword": {
+      "type": "string",
+      "description": "The query to search upon.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      }
+    },
+    "search": {
+      "aliases": ["s"],
+      "type": "boolean",
+      "default": false,
+      "description": "Search whole angular.io instead of just api."
+    }
+  },
+  "required": [
+  ]
+}

packages/angular/cli/commands/doc.ts

@@ -15,20 +15,6 @@ export interface Options {
 }
 
 export class DocCommand extends Command {
-  public readonly name = 'doc';
-  public readonly description = 'Opens the official Angular API documentation for a given keyword.';
-  public static aliases = ['d'];
-  public readonly arguments = ['keyword'];
-  public readonly options = [
-    {
-      name: 'search',
-      aliases: ['s'],
-      type: Boolean,
-      default: false,
-      description: 'Search whole angular.io instead of just api.',
-    },
-  ];
-
   public validate(options: Options) {
     if (!options.keyword) {
       this.logger.error(`keyword argument is required.`);

packages/angular/cli/commands/e2e.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "E2eCommandOptions",
+  "description": "",
+  "$longDescription": "",
+
+  "$aliases": [ "e" ],
+  "$scope": "in",
+  "$type": "architect",
+  "$impl": "./e2e#E2eCommand",
+
+  "type": "object",
+  "properties": {
+    "configuration": {
+      "description": "Specify the configuration to use.",
+      "type": "string",
+      "aliases": ["c"]
+    },
+    "prod": {
+      "description": "Flag to set configuration to 'production'.",
+      "type": "boolean"
+    }
+  },
+  "required": [
+  ]
+}

packages/angular/cli/commands/e2e.ts

@@ -7,20 +7,11 @@
  */
 
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
-import { CommandScope, Option } from '../models/command';
 
 
 export class E2eCommand extends ArchitectCommand {
-  public readonly name = 'e2e';
   public readonly target = 'e2e';
-  public readonly description = 'Run e2e tests in existing project.';
-  public static aliases: string[] = ['e'];
-  public static scope = CommandScope.inProject;
   public readonly multiTarget = true;
-  public readonly options: Option[] = [
-    this.prodOption,
-    this.configurationOption,
-  ];
 
   public async run(options: ArchitectCommandOptions) {
     return this.runArchitectTarget(options);

packages/angular/cli/commands/easter-egg.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "EasterEggCommandOptions",
+  "description": "",
+  "$longDescription": "",
+  "$hidden": true,
+
+  "$impl": "./easter-egg#AwesomeCommand",
+
+  "type": "object"
+}

packages/angular/cli/commands/easter-egg.ts

@@ -7,19 +7,13 @@
  */
 
 import { terminal } from '@angular-devkit/core';
-import { Command, Option } from '../models/command';
+import { Command } from '../models/command';
 
 function pickOne(of: string[]): string {
   return of[Math.floor(Math.random() * of.length)];
 }
 
 export class AwesomeCommand extends Command {
-  public readonly name = 'make-this-awesome';
-  public readonly description = '';
-  public readonly hidden = true;
-  readonly arguments: string[] = [];
-  readonly options: Option[] = [];
-
   run() {
     const phrase = pickOne([
       `You're on it, there's nothing for me to do!`,

packages/angular/cli/commands/eject.json

@@ -0,0 +1,12 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "CommandOptions",
+  "description": "Temporarily disabled. Ejects your app and output the proper webpack configuration and scripts.",
+  "$longDescription": "",
+
+  "$hidden": true,
+  "$scope": "in",
+  "$impl": "./eject#EjectCommand",
+
+  "type": "object"
+}