fix(@schematics/angular): Resolve project by new smart default provider.

fixes #788

Author: Brocco

packages/schematics/angular/application/index.ts

@@ -346,13 +346,15 @@ export default function (options: ApplicationOptions): Rule {
         routingScope: 'Root',
         path: sourceDir,
         spec: false,
+        project: options.name,
       }),
       schematic('component', {
         name: 'app',
         selector: appRootSelector,
         flat: true,
         path: sourceDir,
         skipImport: true,
+        project: options.name,
         ...componentOptions,
       }),
       mergeWith(

packages/schematics/angular/class/index.ts

@@ -9,6 +9,7 @@ import { strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
+  SchematicsException,
   Tree,
   apply,
   branchAndMerge,
@@ -27,7 +28,7 @@ export default function (options: ClassOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     const workspace = getWorkspace(host);
     if (!options.project) {
-      options.project = Object.keys(workspace.projects)[0];
+      throw new SchematicsException('Option (project) is required.');
     }
     const project = workspace.projects[options.project];
 

packages/schematics/angular/class/index_spec.ts

@@ -21,6 +21,7 @@ describe('Class Schematic', () => {
     name: 'foo',
     type: '',
     spec: false,
+    project: 'bar',
   };
 
 

packages/schematics/angular/class/schema.json

@@ -21,7 +21,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "visible": false
+      "$default": {
+        "$source": "projectName"
+      }
     },
     "spec": {
       "type": "boolean",

packages/schematics/angular/component/index.ts

@@ -108,7 +108,7 @@ export default function(options: ComponentOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     const workspace = getWorkspace(host);
     if (!options.project) {
-      options.project = Object.keys(workspace.projects)[0];
+      throw new SchematicsException('Option (project) is required.');
     }
     const project = workspace.projects[options.project];
 

packages/schematics/angular/component/index_spec.ts

@@ -28,6 +28,7 @@ describe('Component Schematic', () => {
     spec: true,
     module: undefined,
     export: false,
+    project: 'bar',
   };
 
 
@@ -253,7 +254,7 @@ describe('Component Schematic', () => {
   });
 
   it('should handle a path in the name and module options', () => {
-    appTree = schematicRunner.runSchematic('module', { name: 'admin/module' }, appTree);
+    appTree = schematicRunner.runSchematic('module', { name: 'admin/module', project: 'bar' }, appTree);
 
     const options = { ...defaultOptions, name: 'other/test-component', module: 'admin/module' };
     appTree = schematicRunner.runSchematic('component', options, appTree);

packages/schematics/angular/component/schema.json

@@ -13,7 +13,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "visible": false
+      "$default": {
+        "$source": "projectName"
+      }
     },
     "name": {
       "type": "string",

packages/schematics/angular/directive/index.ts

@@ -105,7 +105,7 @@ export default function (options: DirectiveOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     const workspace = getWorkspace(host);
     if (!options.project) {
-      options.project = Object.keys(workspace.projects)[0];
+      throw new SchematicsException('Option (project) is required.');
     }
     const project = workspace.projects[options.project];
 

packages/schematics/angular/directive/index_spec.ts

@@ -24,6 +24,7 @@ describe('Directive Schematic', () => {
     export: false,
     prefix: 'app',
     flat: true,
+    project: 'bar',
   };
 
   const workspaceOptions: WorkspaceOptions = {

packages/schematics/angular/directive/schema.json

@@ -21,7 +21,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "visible": false
+      "$default": {
+        "$source": "projectName"
+      }
     },
     "prefix": {
       "type": "string",

packages/schematics/angular/enum/index.ts

@@ -9,6 +9,7 @@ import { strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
+  SchematicsException,
   Tree,
   apply,
   branchAndMerge,
@@ -27,7 +28,7 @@ export default function (options: EnumOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     const workspace = getWorkspace(host);
     if (!options.project) {
-      options.project = Object.keys(workspace.projects)[0];
+      throw new SchematicsException('Option (project) is required.');
     }
     const project = workspace.projects[options.project];
 

packages/schematics/angular/enum/index_spec.ts

@@ -19,6 +19,7 @@ describe('Enum Schematic', () => {
   );
   const defaultOptions: EnumOptions = {
     name: 'foo',
+    project: 'bar',
   };
 
   const workspaceOptions: WorkspaceOptions = {

packages/schematics/angular/enum/schema.json

@@ -21,7 +21,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "visible": false
+      "$default": {
+        "$source": "projectName"
+      }
     }
   },
   "required": []

packages/schematics/angular/guard/index.ts

@@ -69,7 +69,7 @@ export default function (options: GuardOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     const workspace = getWorkspace(host);
     if (!options.project) {
-      options.project = Object.keys(workspace.projects)[0];
+      throw new SchematicsException('Option (project) is required.');
     }
     const project = workspace.projects[options.project];
 

packages/schematics/angular/guard/index_spec.ts

@@ -22,6 +22,7 @@ describe('Guard Schematic', () => {
     spec: true,
     module: undefined,
     flat: true,
+    project: 'bar',
   };
   const workspaceOptions: WorkspaceOptions = {
     name: 'workspace',

packages/schematics/angular/guard/schema.json

@@ -36,7 +36,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "visible": false
+      "$default": {
+        "$source": "projectName"
+      }
     }
   },
   "required": []

packages/schematics/angular/interface/index.ts

@@ -9,6 +9,7 @@ import { strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
+  SchematicsException,
   Tree,
   apply,
   branchAndMerge,
@@ -27,7 +28,7 @@ export default function (options: InterfaceOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     const workspace = getWorkspace(host);
     if (!options.project) {
-      options.project = Object.keys(workspace.projects)[0];
+      throw new SchematicsException('Option (project) is required.');
     }
     const project = workspace.projects[options.project];
 

packages/schematics/angular/interface/index_spec.ts

@@ -21,6 +21,7 @@ describe('Interface Schematic', () => {
     name: 'foo',
     prefix: '',
     type: '',
+    project: 'bar',
   };
 
   const workspaceOptions: WorkspaceOptions = {

packages/schematics/angular/interface/schema.json

@@ -21,7 +21,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "visible": false
+      "$default": {
+        "$source": "projectName"
+      }
     },
     "prefix": {
       "type": "string",

packages/schematics/angular/library/index.ts

@@ -225,6 +225,7 @@ export default function (options: LibraryOptions): Rule {
         flat: true,
         path: sourceDir,
         spec: false,
+        project: options.name,
       }),
       schematic('component', {
         name: options.name,
@@ -234,11 +235,13 @@ export default function (options: LibraryOptions): Rule {
         flat: true,
         path: sourceDir,
         export: true,
+        project: options.name,
       }),
       schematic('service', {
         name: options.name,
         flat: true,
         path: sourceDir,
+        project: options.name,
       }),
       (_tree: Tree, context: SchematicContext) => {
         context.addTask(new NodePackageInstallTask());

packages/schematics/angular/module/index.ts

@@ -74,7 +74,7 @@ export default function (options: ModuleOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     const workspace = getWorkspace(host);
     if (!options.project) {
-      options.project = Object.keys(workspace.projects)[0];
+      throw new SchematicsException('Option (project) is required.');
     }
     const project = workspace.projects[options.project];
 

packages/schematics/angular/module/index_spec.ts

@@ -22,6 +22,7 @@ describe('Module Schematic', () => {
     spec: true,
     module: undefined,
     flat: false,
+    project: 'bar',
   };
 
   const workspaceOptions: WorkspaceOptions = {

packages/schematics/angular/module/schema.json

@@ -21,7 +21,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "visible": false
+      "$default": {
+        "$source": "projectName"
+      }
     },
     "routing": {
       "type": "boolean",

packages/schematics/angular/pipe/index.ts

@@ -89,7 +89,7 @@ export default function (options: PipeOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     const workspace = getWorkspace(host);
     if (!options.project) {
-      options.project = Object.keys(workspace.projects)[0];
+      throw new SchematicsException('Option (project) is required.');
     }
     const project = workspace.projects[options.project];
 

packages/schematics/angular/pipe/index_spec.ts

@@ -24,6 +24,7 @@ describe('Pipe Schematic', () => {
     module: undefined,
     export: false,
     flat: true,
+    project: 'bar',
   };
 
   const workspaceOptions: WorkspaceOptions = {

packages/schematics/angular/pipe/schema.json

@@ -21,7 +21,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "visible": false
+      "$default": {
+        "$source": "projectName"
+      }
     },
     "flat": {
       "type": "boolean",

packages/schematics/angular/service/index.ts

@@ -9,6 +9,7 @@ import { strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
+  SchematicsException,
   Tree,
   apply,
   filter,
@@ -26,7 +27,7 @@ export default function (options: ServiceOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     const workspace = getWorkspace(host);
     if (!options.project) {
-      options.project = Object.keys(workspace.projects)[0];
+      throw new SchematicsException('Option (project) is required.');
     }
     const project = workspace.projects[options.project];
 

packages/schematics/angular/service/index_spec.ts

@@ -21,6 +21,7 @@ describe('Service Schematic', () => {
     name: 'foo',
     spec: true,
     flat: false,
+    project: 'bar',
   };
 
   const workspaceOptions: WorkspaceOptions = {

packages/schematics/angular/service/schema.json

@@ -21,7 +21,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "visible": false
+      "$default": {
+        "$source": "projectName"
+      }
     },
     "flat": {
       "type": "boolean",