refactor(@angular/cli): Simplify retrival of collection name

Keen Yee Liau · vikerman · commit ebc92c212504 · 2019-10-03T14:42:35.000-07:00
diff --git a/packages/angular/cli/commands/new-impl.ts b/packages/angular/cli/commands/new-impl.ts
@@ -17,11 +17,7 @@ export class NewCommand extends SchematicCommand<NewCommandSchema> {
   schematicName = 'ng-new';
 
   async initialize(options: NewCommandSchema & Arguments) {
-    if (options.collection) {
-      this.collectionName = options.collection;
-    } else {
-      this.collectionName = await this.parseCollectionName(options);
-    }
+    this.collectionName = options.collection || await this.getDefaultSchematicCollection();
 
     return super.initialize(options);
   }
@@ -43,7 +39,4 @@ export class NewCommand extends SchematicCommand<NewCommandSchema> {
     });
   }
 
-  private async parseCollectionName(options: any): Promise<string> {
-    return options.collection || this.getDefaultSchematicCollection();
-  }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,7 @@ export class NewCommand extends SchematicCommand<NewCommandSchema> {`
`17`	`17`	`schematicName = 'ng-new';`
`18`	`18`
`19`	`19`	`async initialize(options: NewCommandSchema & Arguments) {`
`20`		`- if (options.collection) {`
`21`		`- this.collectionName = options.collection;`
`22`		`- } else {`
`23`		`- this.collectionName = await this.parseCollectionName(options);`
`24`		`- }`
	`20`	`+ this.collectionName = options.collection \|\| await this.getDefaultSchematicCollection();`
`25`	`21`
`26`	`22`	`return super.initialize(options);`
`27`	`23`	`}`
`@@ -43,7 +39,4 @@ export class NewCommand extends SchematicCommand<NewCommandSchema> {`
`43`	`39`	`});`
`44`	`40`	`}`
`45`	`41`
`46`		`- private async parseCollectionName(options: any): Promise<string> {`
`47`		`- return options.collection \|\| this.getDefaultSchematicCollection();`
`48`		`- }`
`49`	`42`	`}`