refactor: move all CLI-specific exceptions to different options

packages/schematics/angular/application/index.ts

@@ -73,6 +73,10 @@ function minimalPathFilter(path: string): boolean {
   return !toRemoveList.some(re => re.test(path));
 }
 export default function (options: ApplicationOptions): Rule {
+  if (!options.name) {
+    options.name = options._[0];
+  }
+
   return (host: Tree, context: SchematicContext) => {
     const appRootSelector = `${options.prefix}-root`;
     const componentOptions = !options.minimal ?

packages/schematics/angular/application/schema.d.ts

@@ -7,6 +7,15 @@
  */
 
 export interface Schema {
+    // tslint:disable-next-line:no-any
+    _?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliAppConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliParsedPath?: any;
+
     /**
      * The directory name to create the app in.
      */

packages/schematics/angular/application/schema.json

@@ -4,6 +4,11 @@
   "title": "Angular Application Options Schema",
   "type": "object",
   "properties": {
+    "_": {},
+    "_angularCliConfig": {},
+    "_angularCliAppConfig": {},
+    "_angularCliParsedPath": {},
+
     "directory": {
       "type": "string",
       "description": "The directory name to create the app in.",

packages/schematics/angular/class/index.ts

@@ -20,10 +20,13 @@ import {
   url,
 } from '@angular-devkit/schematics';
 import * as stringUtils from '../strings';
+import { parseOptions } from '../utility/args';
 import { Schema as ClassOptions } from './schema';
 
 
 export default function (options: ClassOptions): Rule {
+  parseOptions('class', options);
+
   options.type = !!options.type ? `.${options.type}` : '';
   options.path = options.path ? normalize(options.path) : options.path;
   const sourceDir = options.sourceDir;

packages/schematics/angular/class/schema.d.ts

@@ -7,6 +7,15 @@
  */
 
 export interface Schema {
+    // tslint:disable-next-line:no-any
+    _?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliAppConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliParsedPath?: any;
+
     name: string;
     appRoot?: string;
     path?: string;

packages/schematics/angular/class/schema.json

@@ -4,6 +4,11 @@
   "title": "Angular Class Options Schema",
   "type": "object",
   "properties": {
+    "_": {},
+    "_angularCliConfig": {},
+    "_angularCliAppConfig": {},
+    "_angularCliParsedPath": {},
+
     "name": {
       "type": "string"
     },

packages/schematics/angular/component/index.ts

@@ -24,6 +24,7 @@ import {
 import 'rxjs/add/operator/merge';
 import * as ts from 'typescript';
 import * as stringUtils from '../strings';
+import { parseOptions } from '../utility/args';
 import { addDeclarationToModule, addExportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
@@ -102,6 +103,8 @@ function buildSelector(options: ComponentOptions) {
 
 
 export default function(options: ComponentOptions): Rule {
+  parseOptions('component', options);
+
   const sourceDir = options.sourceDir;
   if (!sourceDir) {
     throw new SchematicsException(`sourceDir option is required.`);

packages/schematics/angular/component/schema.d.ts

@@ -7,6 +7,15 @@
  */
 
 export interface Schema {
+    // tslint:disable-next-line:no-any
+    _?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliAppConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliParsedPath?: any;
+
     path?: string;
     appRoot?: string;
     sourceDir?: string;

packages/schematics/angular/component/schema.json

@@ -4,6 +4,11 @@
   "title": "Angular Application Options Schema",
   "type": "object",
   "properties": {
+    "_": {},
+    "_angularCliConfig": {},
+    "_angularCliAppConfig": {},
+    "_angularCliParsedPath": {},
+
     "path": {
       "type": "string",
       "default": "app"

packages/schematics/angular/directive/index.ts

@@ -24,6 +24,7 @@ import {
 import 'rxjs/add/operator/merge';
 import * as ts from 'typescript';
 import * as stringUtils from '../strings';
+import { parseOptions } from '../utility/args';
 import { addDeclarationToModule, addExportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
@@ -99,6 +100,8 @@ function buildSelector(options: DirectiveOptions) {
 }
 
 export default function (options: DirectiveOptions): Rule {
+  parseOptions('directive', options);
+
   options.selector = options.selector || buildSelector(options);
   options.path = options.path ? normalize(options.path) : options.path;
   const sourceDir = options.sourceDir;

packages/schematics/angular/directive/schema.d.ts

@@ -7,6 +7,15 @@
  */
 
 export interface Schema {
+    // tslint:disable-next-line:no-any
+    _?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliAppConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliParsedPath?: any;
+
     name: string;
     path?: string;
     appRoot?: string;

packages/schematics/angular/directive/schema.json

@@ -4,6 +4,11 @@
   "title": "Angular Class Options Schema",
   "type": "object",
   "properties": {
+    "_": {},
+    "_angularCliConfig": {},
+    "_angularCliAppConfig": {},
+    "_angularCliParsedPath": {},
+
     "name": {
       "type": "string"
     },

packages/schematics/angular/enum/index.ts

@@ -18,10 +18,13 @@ import {
   url,
 } from '@angular-devkit/schematics';
 import * as stringUtils from '../strings';
+import { parseOptions } from '../utility/args';
 import { Schema as EnumOptions } from './schema';
 
 
 export default function (options: EnumOptions): Rule {
+  parseOptions('enum', options);
+
   options.path = options.path ? normalize(options.path) : options.path;
   const sourceDir = options.sourceDir;
   if (!sourceDir) {

packages/schematics/angular/enum/schema.d.ts

@@ -7,6 +7,15 @@
  */
 
 export interface Schema {
+    // tslint:disable-next-line:no-any
+    _?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliAppConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliParsedPath?: any;
+
     name: string;
     path?: string;
     appRoot?: string;

packages/schematics/angular/enum/schema.json

@@ -4,6 +4,11 @@
   "title": "Angular Enum Options Schema",
   "type": "object",
   "properties": {
+    "_": {},
+    "_angularCliConfig": {},
+    "_angularCliAppConfig": {},
+    "_angularCliParsedPath": {},
+
     "name": {
       "type": "string"
     },

packages/schematics/angular/guard/index.ts

@@ -24,6 +24,7 @@ import {
 import 'rxjs/add/operator/merge';
 import * as ts from 'typescript';
 import * as stringUtils from '../strings';
+import { parseOptions } from '../utility/args';
 import { addProviderToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
@@ -66,6 +67,8 @@ function addDeclarationToNgModule(options: GuardOptions): Rule {
 }
 
 export default function (options: GuardOptions): Rule {
+  parseOptions('guard', options);
+
   options.path = options.path ? normalize(options.path) : options.path;
   const sourceDir = options.sourceDir;
   if (!sourceDir) {

packages/schematics/angular/guard/schema.d.ts

@@ -7,6 +7,15 @@
  */
 
 export interface Schema {
+    // tslint:disable-next-line:no-any
+    _?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliAppConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliParsedPath?: any;
+
     name: string;
     spec?: boolean;
     flat?: boolean;

packages/schematics/angular/guard/schema.json

@@ -4,6 +4,11 @@
   "title": "Angular Guard Options Schema",
   "type": "object",
   "properties": {
+    "_": {},
+    "_angularCliConfig": {},
+    "_angularCliAppConfig": {},
+    "_angularCliParsedPath": {},
+
     "name": {
       "type": "string"
     },

packages/schematics/angular/interface/index.ts

@@ -18,10 +18,13 @@ import {
   url,
 } from '@angular-devkit/schematics';
 import * as stringUtils from '../strings';
+import { parseOptions } from '../utility/args';
 import { Schema as InterfaceOptions } from './schema';
 
 
 export default function (options: InterfaceOptions): Rule {
+  parseOptions('interface', options);
+
   options.prefix = options.prefix ? options.prefix : '';
   options.type = !!options.type ? `.${options.type}` : '';
   options.path = options.path ? normalize(options.path) : options.path;

packages/schematics/angular/interface/schema.d.ts

@@ -7,6 +7,15 @@
  */
 
 export interface Schema {
+    // tslint:disable-next-line:no-any
+    _?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliAppConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliParsedPath?: any;
+
     name: string;
     path?: string;
     appRoot?: string;

packages/schematics/angular/interface/schema.json

@@ -4,6 +4,11 @@
   "title": "Angular Interface Options Schema",
   "type": "object",
   "properties": {
+    "_": {},
+    "_angularCliConfig": {},
+    "_angularCliAppConfig": {},
+    "_angularCliParsedPath": {},
+
     "name": {
       "type": "string"
     },

packages/schematics/angular/module/index.ts

@@ -23,6 +23,7 @@ import {
 } from '@angular-devkit/schematics';
 import * as ts from 'typescript';
 import * as stringUtils from '../strings';
+import { parseOptions } from '../utility/args';
 import { addImportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { findModuleFromOptions } from '../utility/find-module';
@@ -70,6 +71,8 @@ function addDeclarationToNgModule(options: ModuleOptions): Rule {
 }
 
 export default function (options: ModuleOptions): Rule {
+  parseOptions('module', options);
+
   options.path = options.path ? normalize(options.path) : options.path;
   const sourceDir = options.sourceDir;
   if (!sourceDir) {

packages/schematics/angular/module/schema.d.ts

@@ -7,6 +7,15 @@
  */
 
 export interface Schema {
+    // tslint:disable-next-line:no-any
+    _?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliAppConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliParsedPath?: any;
+
     name: string;
     path?: string;
     appRoot?: string;

packages/schematics/angular/module/schema.json

@@ -4,6 +4,11 @@
   "title": "Angular Module Options Schema",
   "type": "object",
   "properties": {
+    "_": {},
+    "_angularCliConfig": {},
+    "_angularCliAppConfig": {},
+    "_angularCliParsedPath": {},
+
     "name": {
       "type": "string"
     },

packages/schematics/angular/pipe/index.ts

@@ -24,6 +24,7 @@ import {
 import 'rxjs/add/operator/merge';
 import * as ts from 'typescript';
 import * as stringUtils from '../strings';
+import { parseOptions } from '../utility/args';
 import { addDeclarationToModule, addExportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
@@ -86,6 +87,8 @@ function addDeclarationToNgModule(options: PipeOptions): Rule {
 }
 
 export default function (options: PipeOptions): Rule {
+  parseOptions('pipe', options);
+
   options.path = options.path ? normalize(options.path) : options.path;
   const sourceDir = options.sourceDir;
   if (!sourceDir) {

packages/schematics/angular/pipe/schema.d.ts

@@ -7,6 +7,15 @@
  */
 
 export interface Schema {
+    // tslint:disable-next-line:no-any
+    _?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliAppConfig?: any;
+    // tslint:disable-next-line:no-any
+    _angularCliParsedPath?: any;
+
     name: string;
     path?: string;
     appRoot?: string;

packages/schematics/angular/pipe/schema.json

@@ -4,6 +4,11 @@
   "title": "Angular Pipe Options Schema",
   "type": "object",
   "properties": {
+    "_": {},
+    "_angularCliConfig": {},
+    "_angularCliAppConfig": {},
+    "_angularCliParsedPath": {},
+
     "name": {
       "type": "string"
     },