fix(@angular/cli): add options in help for architect commands

And fix a bug with json schema to Option array.

Author: hansl

packages/angular/cli/models/architect-command.ts

@@ -87,6 +87,12 @@ export abstract class ArchitectCommand extends Command<ArchitectCommandOptions>
     if ((!targetSpec.project || !targetSpec.target) && !this.multiTarget) {
       throw new Error('Cannot determine project or target for Architect command.');
     }
+
+    const builderConf = this._architect.getBuilderConfiguration(targetSpec);
+    const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
+    const targetOptionArray = await parseJsonSchemaToOptions(this._registry, builderDesc.schema);
+
+    this.description.options.push(...targetOptionArray);
   }
 
   async run(options: ArchitectCommandOptions) {

packages/angular/cli/utilities/json-schema.ts

@@ -79,7 +79,7 @@ export async function parseJsonSchemaToOptions(
     if (!parentSchema) {
       // Ignore root.
       return;
-    } else if (pointer.split(/properties|items/g).length > 2) {
+    } else if (pointer.split(/\/(?:properties|items|definitions)\//g).length > 2) {
       // Ignore subitems (objects or arrays).
       return;
     } else if (json.isJsonArray(current)) {