feat(@angular/cli): add help for ng-new schematics

Before it was missing because we need to load the schematics engine for it.
I moved the ng update logic that did this to SchematicCommand.

Author: hansl

packages/angular/cli/commands/new-impl.ts

@@ -14,13 +14,9 @@ import { Schema as NewCommandSchema } from './new';
 
 export class NewCommand extends SchematicCommand<NewCommandSchema> {
   public readonly allowMissingWorkspace = true;
-  private schematicName = 'ng-new';
+  schematicName = 'ng-new';
 
   public async run(options: NewCommandSchema & Arguments) {
-    if (options.dryRun) {
-      options.skipGit = true;
-    }
-
     let collectionName: string;
     if (options.collection) {
       collectionName = options.collection;

packages/angular/cli/commands/update-impl.ts

@@ -9,28 +9,13 @@ import { normalize } from '@angular-devkit/core';
 import { Arguments, Option } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
 import { findUp } from '../utilities/find-up';
-import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 import { Schema as UpdateCommandSchema } from './update';
 
 export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
   public readonly allowMissingWorkspace = true;
 
-  private collectionName = '@schematics/update';
-  private schematicName = 'update';
-
-  async initialize(input: UpdateCommandSchema & Arguments) {
-    await super.initialize(input);
-
-    // Set the options.
-    const collection = this.getCollection(this.collectionName);
-    const schematic = this.getSchematic(collection, this.schematicName, true);
-    const options = await parseJsonSchemaToOptions(
-      this._workflow.registry,
-      schematic.description.schemaJson || {},
-    );
-
-    this.description.options.push(...options);
-  }
+  collectionName = '@schematics/update';
+  schematicName = 'update';
 
   async parseArguments(schematicOptions: string[], schema: Option[]): Promise<Arguments> {
     const args = await super.parseArguments(schematicOptions, schema);

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

@@ -82,6 +82,9 @@ export abstract class SchematicCommand<
   private readonly _engine: Engine<FileSystemCollectionDesc, FileSystemSchematicDesc>;
   protected _workflow: workflow.BaseWorkflow;
 
+  protected collectionName = '@schematics/angular';
+  protected schematicName?: string;
+
   constructor(
     context: CommandContext,
     description: CommandDescription,
@@ -95,6 +98,18 @@ export abstract class SchematicCommand<
   public async initialize(options: T & Arguments) {
     this._loadWorkspace();
     this.createWorkflow(options);
+
+    if (this.schematicName) {
+      // Set the options.
+      const collection = this.getCollection(this.collectionName);
+      const schematic = this.getSchematic(collection, this.schematicName, true);
+      const options = await parseJsonSchemaToOptions(
+        this._workflow.registry,
+        schematic.description.schemaJson || {},
+      );
+
+      this.description.options.push(...options);
+    }
   }
 
   public async printHelp(options: T & Arguments) {
@@ -330,7 +345,7 @@ export abstract class SchematicCommand<
       }
     }
 
-    return '@schematics/angular';
+    return this.collectionName;
   }
 
   protected async runSchematic(options: RunSchematicOptions) {
@@ -357,7 +372,7 @@ export abstract class SchematicCommand<
     schematicName = schematic.description.name;
 
     // TODO: Remove warning check when 'targets' is default
-    if (collectionName !== '@schematics/angular') {
+    if (collectionName !== this.collectionName) {
       const [ast, configPath] = getWorkspaceRaw('local');
       if (ast) {
         const projectsKeyValue = ast.properties.find(p => p.key.value === 'projects');

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

@@ -158,6 +158,9 @@ export async function parseJsonSchemaToOptions(
             defaultValue = schema.default;
           }
           break;
+
+        default:
+          console.log(types[0], schema);
       }
     }