feat(Schematics): Add group option to entity blueprint (#792)

Closes #779

Author: brandonroberts

…@if-flat__/__name@dasherize__.actions.ts …ame@dasherize@group-actions__.actions.tsmodules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.actions.ts renamed to modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize@group-actions__.actions.ts modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.actions.ts renamed to modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize@group-actions__.actions.ts

@@ -1,6 +1,6 @@
 import { Action } from '@ngrx/store';
 import { Update } from '@ngrx/entity';
-import { <%= classify(name) %> } from './<%= dasherize(name) %>.model';
+import { <%= classify(name) %> } from '<%= featurePath(group, flat, "models", dasherize(name)) %><%= dasherize(name) %>.model';
 
 export enum <%= classify(name) %>ActionTypes {
   Load<%= classify(name) %>s = '[<%= classify(name) %>] Load <%= classify(name) %>s',

…ze@if-flat__/__name@dasherize__.model.ts …__name@dasherize@group-models__.model.tsmodules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.model.ts renamed to modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize@group-models__.model.ts modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.model.ts renamed to modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize@group-models__.model.ts

@@ -1,6 +1,6 @@
 import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity';
-import { <%= classify(name) %> } from './<%= dasherize(name) %>.model';
-import { <%= classify(name) %>Actions, <%= classify(name) %>ActionTypes } from './<%= dasherize(name) %>.actions';
+import { <%= classify(name) %> } from '<%= featurePath(group, flat, "models", dasherize(name)) %><%= dasherize(name) %>.model';
+import { <%= classify(name) %>Actions, <%= classify(name) %>ActionTypes } from '<%= featurePath(group, flat, "actions", dasherize(name)) %><%= dasherize(name) %>.actions';
 
 export interface State extends EntityState<<%= classify(name) %>> {
   // additional entities state properties

…@if-flat__/__name@dasherize__.reducer.ts …me@dasherize@group-reducers__.reducer.tsmodules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.reducer.ts renamed to modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize@group-reducers__.reducer.ts modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.reducer.ts renamed to modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize@group-reducers__.reducer.ts

@@ -1,4 +1,4 @@
-import { reducer, initialState } from './<%= dasherize(name) %>.reducer';
+import { reducer, initialState } from '<%= featurePath(group, flat, "reducers", dasherize(name)) %><%= dasherize(name) %>.reducer';
 
 describe('<%= classify(name) %> Reducer', () => {
   describe('unknown action', () => {

…__name@dasherize__.reducer__dot__spec.ts …e@group-reducers__.reducer__dot__spec.tsmodules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.reducer__dot__spec.ts renamed to modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize@group-reducers__.reducer__dot__spec.ts modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.reducer__dot__spec.ts renamed to modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize@group-reducers__.reducer__dot__spec.ts

@@ -60,6 +60,45 @@ describe('Entity Schematic', () => {
 
     const tree = schematicRunner.runSchematic('entity', options, appTree);
     const content = getFileContent(tree, '/src/app/app.module.ts');
+
     expect(content).toMatch(/import \* as fromFoo from '\.\/foo.reducer';/);
   });
+
+  it('should create all files of an entity within grouped and nested folders', () => {
+    const options = { ...defaultOptions, flat: false, group: true, spec: true };
+
+    const tree = schematicRunner.runSchematic('entity', options);
+    const files = tree.files;
+    expect(
+      files.indexOf('/src/app/foo/actions/foo.actions.ts')
+    ).toBeGreaterThanOrEqual(0);
+    expect(
+      files.indexOf('/src/app/foo/models/foo.model.ts')
+    ).toBeGreaterThanOrEqual(0);
+    expect(
+      files.indexOf('/src/app/foo/reducers/foo.reducer.ts')
+    ).toBeGreaterThanOrEqual(0);
+    expect(
+      files.indexOf('/src/app/foo/reducers/foo.reducer.spec.ts')
+    ).toBeGreaterThanOrEqual(0);
+  });
+
+  it('should create all files of an entity within grouped folders if group is set', () => {
+    const options = { ...defaultOptions, group: true, spec: true };
+
+    const tree = schematicRunner.runSchematic('entity', options);
+    const files = tree.files;
+    expect(
+      files.indexOf('/src/app/actions/foo.actions.ts')
+    ).toBeGreaterThanOrEqual(0);
+    expect(
+      files.indexOf('/src/app/models/foo.model.ts')
+    ).toBeGreaterThanOrEqual(0);
+    expect(
+      files.indexOf('/src/app/reducers/foo.reducer.ts')
+    ).toBeGreaterThanOrEqual(0);
+    expect(
+      files.indexOf('/src/app/reducers/foo.reducer.spec.ts')
+    ).toBeGreaterThanOrEqual(0);
+  });
 });

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

@@ -39,6 +39,12 @@ export default function(options: EntityOptions): Rule {
       template({
         ...stringUtils,
         'if-flat': (s: string) => (options.flat ? '' : s),
+        'group-actions': (name: string) =>
+          stringUtils.group(name, options.group ? 'actions' : ''),
+        'group-models': (name: string) =>
+          stringUtils.group(name, options.group ? 'models' : ''),
+        'group-reducers': (s: string) =>
+          stringUtils.group(s, options.group ? 'reducers' : ''),
         ...(options as object),
         dot: () => '.',
       }),

modules/schematics/src/entity/index.ts

@@ -10,4 +10,5 @@ export interface Schema {
   module?: string;
   reducers?: string;
   flat?: boolean;
+  group?: boolean;
 }

modules/schematics/src/entity/schema.d.ts

@@ -37,6 +37,12 @@
       "type": "boolean",
       "default": true,
       "description": "Flag to indicate if a dir is created."
+    },
+    "group": {
+      "type": "boolean",
+      "default": false,
+      "description": "Group actions, reducers and effects within relative subfolders",
+      "aliases": ["g"]
     }
   },
   "required": [