feat(@angular/cli): allow schematic command to specify the default colletion.

Author: qiyigg

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

@@ -9,7 +9,6 @@
 // tslint:disable:no-global-tslint-disable no-any
 import { tags, terminal } from '@angular-devkit/core';
 import { SchematicCommand } from '../models/schematic-command';
-import { getDefaultSchematicCollection } from '../utilities/config';
 
 
 export class GenerateCommand extends SchematicCommand {
@@ -61,7 +60,7 @@ export class GenerateCommand extends SchematicCommand {
   }
 
   private parseSchematicInfo(options: any) {
-    let collectionName = getDefaultSchematicCollection();
+    let collectionName = this.getDefaultSchematicCollection();
 
     let schematicName: string = options.schematic;
 

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

@@ -8,8 +8,6 @@
 
 // tslint:disable:no-global-tslint-disable no-any
 import { SchematicCommand } from '../models/schematic-command';
-import { getDefaultSchematicCollection } from '../utilities/config';
-
 
 export class NewCommand extends SchematicCommand {
   public readonly allowMissingWorkspace = true;
@@ -65,7 +63,7 @@ export class NewCommand extends SchematicCommand {
   }
 
   private parseCollectionName(options: any): string {
-    const collectionName = options.collection || options.c || getDefaultSchematicCollection();
+    const collectionName = options.collection || options.c || this.getDefaultSchematicCollection();
 
     return collectionName;
   }

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

@@ -40,9 +40,10 @@ import {
 import { take } from 'rxjs/operators';
 import { WorkspaceLoader } from '../models/workspace-loader';
 import {
-  getDefaultSchematicCollection,
   getPackageManager,
+  getProjectByCwd,
   getSchematicDefaults,
+  getWorkspace,
 } from '../utilities/config';
 import { ArgumentStrategy, Command, CommandContext, Option } from './command';
 
@@ -188,6 +189,36 @@ export abstract class SchematicCommand extends Command {
     return this._workflow;
   }
 
+  protected getDefaultSchematicCollection(): string {
+    let workspace = getWorkspace('local');
+
+    if (workspace) {
+      const project = getProjectByCwd(workspace);
+      if (project && workspace.getProjectCli(project)) {
+        const value = workspace.getProjectCli(project)['defaultCollection'];
+        if (typeof value == 'string') {
+          return value;
+        }
+      }
+      if (workspace.getCli()) {
+        const value = workspace.getCli()['defaultCollection'];
+        if (typeof value == 'string') {
+          return value;
+        }
+      }
+    }
+
+    workspace = getWorkspace('global');
+    if (workspace && workspace.getCli()) {
+      const value = workspace.getCli()['defaultCollection'];
+      if (typeof value == 'string') {
+        return value;
+      }
+    }
+
+    return '@schematics/angular';
+  }
+
   protected runSchematic(options: RunSchematicOptions) {
     const {collectionName, schematicName, debug, dryRun} = options;
     let schematicOptions = this.removeCoreOptions(options.schematicOptions);
@@ -347,7 +378,7 @@ export abstract class SchematicCommand extends Command {
     // Make a copy.
     this._originalOptions = [...this.options];
 
-    const collectionName = options.collectionName || getDefaultSchematicCollection();
+    const collectionName = options.collectionName || this.getDefaultSchematicCollection();
 
     const collection = this.getCollection(collectionName);
 

packages/angular/cli/utilities/config.ts

@@ -140,7 +140,7 @@ export function validateWorkspace(json: JsonObject) {
   return true;
 }
 
-function getProjectByCwd(workspace: experimental.workspace.Workspace): string | null {
+export function getProjectByCwd(workspace: experimental.workspace.Workspace): string | null {
   try {
     return workspace.getProjectByPath(normalize(process.cwd()));
   } catch (e) {
@@ -265,36 +265,6 @@ function getLegacyPackageManager(): string | null {
   return null;
 }
 
-export function getDefaultSchematicCollection(): string {
-  let workspace = getWorkspace('local');
-
-  if (workspace) {
-    const project = getProjectByCwd(workspace);
-    if (project && workspace.getProjectCli(project)) {
-      const value = workspace.getProjectCli(project)['defaultCollection'];
-      if (typeof value == 'string') {
-        return value;
-      }
-    }
-    if (workspace.getCli()) {
-      const value = workspace.getCli()['defaultCollection'];
-      if (typeof value == 'string') {
-        return value;
-      }
-    }
-  }
-
-  workspace = getWorkspace('global');
-  if (workspace && workspace.getCli()) {
-    const value = workspace.getCli()['defaultCollection'];
-    if (typeof value == 'string') {
-      return value;
-    }
-  }
-
-  return '@schematics/angular';
-}
-
 export function getSchematicDefaults(
   collection: string,
   schematic: string,