fix(@schematics/angular): fix module discovery

hansl · hansl · commit e0ea4ff44e45 · 2017-09-14T13:06:44.000-07:00
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.
diff --git a/packages/schematics/angular/class/schema.d.ts b/packages/schematics/angular/class/schema.d.ts
@@ -8,6 +8,7 @@
 
 export interface Schema {
     name: string;
+    appRoot?: string;
     path?: string;
     sourceDir?: string;
     /**
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
@@ -7,6 +7,9 @@
     "name": {
       "type": "string"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "path": {
       "type": "string",
       "default": "app"
diff --git a/packages/schematics/angular/component/schema.d.ts b/packages/schematics/angular/component/schema.d.ts
@@ -8,6 +8,7 @@
 
 export interface Schema {
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
     name: string;
     /**
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
@@ -8,6 +8,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src",
diff --git a/packages/schematics/angular/directive/schema.d.ts b/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.
      */
diff --git a/packages/schematics/angular/directive/schema.json b/packages/schematics/angular/directive/schema.json
@@ -11,6 +11,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "prefix": {
       "type": "string",
       "description": "The prefix to apply to generated selectors.",
diff --git a/packages/schematics/angular/enum/schema.d.ts b/packages/schematics/angular/enum/schema.d.ts
@@ -9,5 +9,6 @@
 export interface Schema {
     name: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
 }
diff --git a/packages/schematics/angular/enum/schema.json b/packages/schematics/angular/enum/schema.json
@@ -11,6 +11,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"
diff --git a/packages/schematics/angular/guard/schema.d.ts b/packages/schematics/angular/guard/schema.d.ts
@@ -15,5 +15,6 @@ export interface Schema {
      */
     module?: string;
     path?: string;
+    appRoot?: string;
     sourceDir?: string;
 }
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
@@ -25,6 +25,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"
diff --git a/packages/schematics/angular/interface/schema.d.ts b/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.
diff --git a/packages/schematics/angular/interface/schema.json b/packages/schematics/angular/interface/schema.json
@@ -11,6 +11,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"
diff --git a/packages/schematics/angular/module/schema.d.ts b/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;
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
@@ -11,6 +11,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"
diff --git a/packages/schematics/angular/pipe/schema.d.ts b/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.
diff --git a/packages/schematics/angular/pipe/schema.json b/packages/schematics/angular/pipe/schema.json
@@ -11,6 +11,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"
diff --git a/packages/schematics/angular/service/schema.d.ts b/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.
diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
@@ -11,6 +11,9 @@
       "type": "string",
       "default": "app"
     },
+    "appRoot": {
+      "type": "string"
+    },
     "sourceDir": {
       "type": "string",
       "default": "src"
diff --git a/packages/schematics/angular/utility/find-module.ts b/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)) {

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@`
`9`	`9`	`export interface Schema {`
`10`	`10`	`name: string;`
`11`	`11`	`path?: string;`
	`12`	`+ appRoot?: string;`
`12`	`13`	`sourceDir?: string;`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,6 @@ export interface Schema {`
`15`	`15`	`*/`
`16`	`16`	`module?: string;`
`17`	`17`	`path?: string;`
	`18`	`+ appRoot?: string;`
`18`	`19`	`sourceDir?: string;`
`19`	`20`	`}`