fix(@schematics/angular): fix module discovery

When creating schematics with names that are paths, the path option
is the path to create the schematic into. we need to app root to discover
the module.

Author: hansl

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

@@ -8,6 +8,7 @@
 
 export interface Schema {
     name: string;
+    appRoot?: string;
     path?: string;
     sourceDir?: string;
     /**

packages/schematics/angular/class/schema.json

@@ -7,6 +7,10 @@
     "name": {
       "type": "string"
     },
+    "appRoot": {
+      "type": "string",
+      "default": "app"
+    },
     "path": {
       "type": "string",
       "default": "app"

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

@@ -8,6 +8,7 @@
 
 export interface Schema {
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
     name: string;
     /**

packages/schematics/angular/component/schema.json

@@ -8,6 +8,10 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string",
+      "default": "app"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src",

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

@@ -9,6 +9,7 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     /**
      * The prefix to apply to generated selectors.
      */

packages/schematics/angular/directive/schema.json

@@ -11,6 +11,10 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string",
+      "default": "app"
+    },
     "prefix": {
       "type": "string",
       "description": "The prefix to apply to generated selectors.",

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

@@ -9,5 +9,6 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
 }

packages/schematics/angular/enum/schema.json

@@ -11,6 +11,10 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string",
+      "default": "app"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"

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

@@ -15,5 +15,6 @@ export interface Schema {
      */
     module?: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
 }

packages/schematics/angular/guard/schema.json

@@ -25,6 +25,10 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string",
+      "default": "app"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"

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

@@ -9,6 +9,7 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
     /**
      * Specifies the prefix to use.

packages/schematics/angular/interface/schema.json

@@ -11,6 +11,10 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string",
+      "default": "app"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"

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

@@ -9,8 +9,10 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
     routing?: boolean;
+    routingScope?: ('Child' | 'Root');
     spec?: boolean;
     flat?: boolean;
     commonModule?: boolean;

packages/schematics/angular/module/schema.json

@@ -11,6 +11,10 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string",
+      "default": "app"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"

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

@@ -9,6 +9,7 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
     /**
      * Flag to indicate if a dir is created.

packages/schematics/angular/pipe/schema.json

@@ -11,6 +11,10 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string",
+      "default": "app"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"

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

@@ -9,6 +9,7 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
     /**
      * Flag to indicate if a dir is created.

packages/schematics/angular/service/schema.json

@@ -11,6 +11,10 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string",
+      "default": "app"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"

packages/schematics/angular/utility/find-module.ts

@@ -16,6 +16,7 @@ export interface ModuleOptions {
   sourceDir?: string;
   path?: string;
   skipImport?: boolean;
+  appRoot?: string;
 }
 
 
@@ -35,7 +36,7 @@ export function findModuleFromOptions(host: Tree,
     return normalizePath(findModule(host, pathToCheck));
   } else {
     const modulePath = normalizePath(
-      options.sourceDir + '/' + options.path + '/' + options.module);
+      options.sourceDir + '/' + (options.appRoot || options.path) + '/' + options.module);
     const moduleBaseName = normalizePath(modulePath).split('/').pop();
 
     if (host.exists(modulePath)) {