fix(Schematics): Use correct paths for nested and grouped feature blu…

…eprint (#756)

modules/schematics/src/effect/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.effects.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Actions, Effect } from '@ngrx/effects';
-<% if(feature) { %>import { <%= classify(name) %>Actions, <%= classify(name) %>ActionTypes } from '<%= featurePath(group, "actions") %><%= dasherize(name) %>.actions';<% } %>
+<% if(feature) { %>import { <%= classify(name) %>Actions, <%= classify(name) %>ActionTypes } from '<%= featurePath(group, flat, "actions", dasherize(name)) %><%= dasherize(name) %>.actions';<% } %>
 
 @Injectable()
 export class <%= classify(name) %>Effects {

modules/schematics/src/effect/index.spec.ts

@@ -184,4 +184,26 @@ describe('Effect Schematic', () => {
       files.indexOf('/src/app/effects/foo.effects.ts')
     ).toBeGreaterThanOrEqual(0);
   });
+
+  it('should group and nest the effect within a feature', () => {
+    const options = {
+      ...defaultOptions,
+      spec: false,
+      group: true,
+      flat: false,
+      feature: true,
+    };
+
+    const tree = schematicRunner.runSchematic('effect', options, appTree);
+    const files = tree.files;
+    expect(
+      files.indexOf('/src/app/effects/foo/foo.effects.ts')
+    ).toBeGreaterThanOrEqual(0);
+
+    const content = getFileContent(tree, '/src/app/effects/foo/foo.effects.ts');
+
+    expect(content).toMatch(
+      /import\ \{\ FooActions,\ FooActionTypes\ }\ from\ \'\.\.\/\.\.\/actions\/foo\/foo\.actions';/
+    );
+  });
 });

modules/schematics/src/reducer/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.reducer.ts

@@ -1,5 +1,5 @@
 import { Action } from '@ngrx/store';
-<% if(feature) { %>import { <%= classify(name) %>Actions, <%= classify(name) %>ActionTypes } from '<%= featurePath(group, "actions") %><%= dasherize(name) %>.actions';<% } %>
+<% if(feature) { %>import { <%= classify(name) %>Actions, <%= classify(name) %>ActionTypes } from '<%= featurePath(group, flat, "actions", dasherize(name)) %><%= dasherize(name) %>.actions';<% } %>
 
 export interface State {
 

modules/schematics/src/reducer/index.spec.ts

@@ -98,4 +98,29 @@ describe('Reducer Schematic', () => {
     expect(tree.files.length).toEqual(1);
     expect(tree.files[0]).toEqual('/src/app/reducers/foo.reducer.ts');
   });
+
+  it('should group and nest the reducer within a feature', () => {
+    const options = {
+      ...defaultOptions,
+      spec: false,
+      group: true,
+      flat: false,
+      feature: true,
+    };
+
+    const tree = schematicRunner.runSchematic('reducer', options, appTree);
+    const files = tree.files;
+    expect(
+      files.indexOf('/src/app/reducers/foo/foo.reducer.ts')
+    ).toBeGreaterThanOrEqual(0);
+
+    const content = getFileContent(
+      tree,
+      '/src/app/reducers/foo/foo.reducer.ts'
+    );
+
+    expect(content).toMatch(
+      /import\ \{\ FooActions,\ FooActionTypes\ }\ from\ \'\.\.\/\.\.\/actions\/foo\/foo\.actions';/
+    );
+  });
 });

modules/schematics/src/strings.ts

@@ -134,10 +134,19 @@ export function capitalize(str: string): string {
   return str.charAt(0).toUpperCase() + str.substr(1);
 }
 
-export function group(path: string, group: string | undefined) {
-  return group ? `${group}/${path}` : path;
+export function group(name: string, group: string | undefined) {
+  return group ? `${group}/${name}` : name;
 }
 
-export function featurePath(group: boolean | undefined, path: string) {
+export function featurePath(
+  group: boolean | undefined,
+  flat: boolean | undefined,
+  path: string,
+  name: string
+) {
+  if (group && !flat) {
+    return `../../${path}/${name}/`;
+  }
+
   return group ? `../${path}/` : './';
 }