feat(schematics): add entity generation as part of feature schematic

modules/schematics/src/entity/schema.json

@@ -52,6 +52,12 @@
       "default": false,
       "description": "Group actions, reducers and effects within relative subfolders",
       "aliases": ["g"]
+    },
+    "feature": {
+      "type": "boolean",
+      "default": false,
+      "description": "Flag to indicate if part of a feature schematic.",
+      "visible": false
     }
   },
   "required": []

modules/schematics/src/entity/schema.ts

@@ -36,4 +36,9 @@ export interface Schema {
    */
 
   group?: boolean;
+
+  /**
+   * Specifies if this is grouped within a feature
+   */
+  feature?: boolean;
 }

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

@@ -21,6 +21,7 @@ describe('Feature Schematic', () => {
     project: 'bar',
     module: '',
     group: false,
+    entity: false,
   };
 
   const projectPath = getTestProjectPath();
@@ -64,6 +65,7 @@ describe('Feature Schematic', () => {
     expect(
       files.includes(`${projectPath}/src/app/foo.selectors.spec.ts`)
     ).toBeTruthy();
+    expect(files.includes(`${projectPath}/src/app/foo.model.ts`)).toBeFalsy();
   });
 
   it('should not create test files when skipTests is true', async () => {
@@ -269,4 +271,40 @@ describe('Feature Schematic', () => {
 
     expect(fileContent).toMatchSnapshot();
   });
+
+  it('should create all files of a feature with an entity', async () => {
+    const options = { ...defaultOptions, entity: true };
+
+    const tree = await schematicRunner.runSchematic(
+      'feature',
+      options,
+      appTree
+    );
+    const files = tree.files;
+    expect(
+      files.includes(`${projectPath}/src/app/foo.actions.ts`)
+    ).toBeTruthy();
+    expect(
+      files.includes(`${projectPath}/src/app/foo.actions.spec.ts`)
+    ).toBeFalsy();
+    expect(
+      files.includes(`${projectPath}/src/app/foo.reducer.ts`)
+    ).toBeTruthy();
+    expect(
+      files.includes(`${projectPath}/src/app/foo.reducer.spec.ts`)
+    ).toBeTruthy();
+    expect(
+      files.includes(`${projectPath}/src/app/foo.effects.ts`)
+    ).toBeTruthy();
+    expect(
+      files.includes(`${projectPath}/src/app/foo.effects.spec.ts`)
+    ).toBeTruthy();
+    expect(
+      files.includes(`${projectPath}/src/app/foo.selectors.ts`)
+    ).toBeFalsy();
+    expect(
+      files.includes(`${projectPath}/src/app/foo.selectors.spec.ts`)
+    ).toBeFalsy();
+    expect(files.includes(`${projectPath}/src/app/foo.model.ts`)).toBeTruthy();
+  });
 });

modules/schematics/src/feature/index.ts

@@ -1,59 +1,78 @@
 import {
+  chain,
   Rule,
+  schematic,
   SchematicContext,
   Tree,
-  chain,
-  schematic,
 } from '@angular-devkit/schematics';
+
 import { Schema as FeatureOptions } from './schema';
 
 export default function (options: FeatureOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
-    return chain([
-      schematic('action', {
-        flat: options.flat,
-        group: options.group,
-        name: options.name,
-        path: options.path,
-        project: options.project,
-        skipTests: options.skipTests,
-        api: options.api,
-        prefix: options.prefix,
-      }),
-      schematic('reducer', {
-        flat: options.flat,
-        group: options.group,
-        module: options.module,
-        name: options.name,
-        path: options.path,
-        project: options.project,
-        skipTests: options.skipTests,
-        reducers: options.reducers,
-        feature: true,
-        api: options.api,
-        prefix: options.prefix,
-      }),
-      schematic('effect', {
-        flat: options.flat,
-        group: options.group,
-        module: options.module,
-        name: options.name,
-        path: options.path,
-        project: options.project,
-        skipTests: options.skipTests,
-        feature: true,
-        api: options.api,
-        prefix: options.prefix,
-      }),
-      schematic('selector', {
-        flat: options.flat,
-        group: options.group,
-        name: options.name,
-        path: options.path,
-        project: options.project,
-        skipTests: options.skipTests,
-        feature: true,
-      }),
-    ])(host, context);
+    return chain(
+      (options.entity
+        ? [
+            schematic('entity', {
+              name: options.name,
+              path: options.path,
+              project: options.project,
+              flat: options.flat,
+              skipTests: options.skipTests,
+              module: options.module,
+              reducers: options.reducers,
+              group: options.group,
+              feature: true,
+            }),
+          ]
+        : [
+            schematic('action', {
+              flat: options.flat,
+              group: options.group,
+              name: options.name,
+              path: options.path,
+              project: options.project,
+              skipTests: options.skipTests,
+              api: options.api,
+              prefix: options.prefix,
+            }),
+            schematic('reducer', {
+              flat: options.flat,
+              group: options.group,
+              module: options.module,
+              name: options.name,
+              path: options.path,
+              project: options.project,
+              skipTests: options.skipTests,
+              reducers: options.reducers,
+              feature: true,
+              api: options.api,
+              prefix: options.prefix,
+            }),
+            schematic('selector', {
+              flat: options.flat,
+              group: options.group,
+              name: options.name,
+              path: options.path,
+              project: options.project,
+              skipTests: options.skipTests,
+              feature: true,
+            }),
+          ]
+      ).concat([
+        schematic('effect', {
+          flat: options.flat,
+          group: options.group,
+          module: options.module,
+          name: options.name,
+          path: options.path,
+          project: options.project,
+          skipTests: options.skipTests,
+          feature: true,
+          api: options.api,
+          prefix: options.prefix,
+        }),
+      ])
+    )(host, context);
   };
 }

modules/schematics/src/feature/schema.json

@@ -65,6 +65,13 @@
       "type": "string",
       "default": "load",
       "x-prompt": "What should be the prefix of the action, effect and reducer?"
+    },
+    "entity": {
+      "description": "Toggle whether an entity is created as part of the feature",
+      "type": "boolean",
+      "aliases": ["e"],
+      "x-prompt": "Should we use @ngrx/entity to create the reducer?",
+      "default": "false"
     }
   },
   "required": []

modules/schematics/src/feature/schema.ts

@@ -46,4 +46,6 @@ export interface Schema {
   api?: boolean;
 
   prefix?: string;
+
+  entity?: boolean;
 }