feat: adding api flag to schematics, cleaning up tests

modules/schematics/src/action/files/__name@dasherize@if-flat__/__name@dasherize__.actions.ts

@@ -2,14 +2,14 @@ import { Action } from '@ngrx/store';
 
 export enum <%= classify(name) %>ActionTypes {
   Load<%= classify(name) %>s = '[<%= classify(name) %>] Load <%= classify(name) %>s',
-  Load<%= classify(name) %>sSuccess = '[<%= classify(name) %>] Load <%= classify(name) %>s Success',
-  Load<%= classify(name) %>sFailure = '[<%= classify(name) %>] Load <%= classify(name) %>s Failure',
+  <% if (api) { %>Load<%= classify(name) %>sSuccess = '[<%= classify(name) %>] Load <%= classify(name) %>s Success',<% } %>
+  <% if (api) { %>Load<%= classify(name) %>sFailure = '[<%= classify(name) %>] Load <%= classify(name) %>s Failure',<% } %>
 }
 
 export class Load<%= classify(name) %>s implements Action {
   readonly type = <%= classify(name) %>ActionTypes.Load<%= classify(name) %>s;
 }
-
+<% if (api) { %>
 export class Load<%= classify(name) %>sSuccess implements Action {
   readonly type = <%= classify(name) %>ActionTypes.Load<%= classify(name) %>sSuccess;
   constructor(public payload: { data: any[] }) { }
@@ -19,5 +19,6 @@ export class Load<%= classify(name) %>sFailure implements Action {
   readonly type = <%= classify(name) %>ActionTypes.Load<%= classify(name) %>sFailure;
   constructor(public payload: { error: any }) { }
 }
-
-export type <%= classify(name) %>Actions = Load<%= classify(name) %>s | Load<%= classify(name) %>sSuccess | Load<%= classify(name) %>sFailure;
+<% } %>
+<% if (api) { %>export type <%= classify(name) %>Actions = Load<%= classify(name) %>s | Load<%= classify(name) %>sSuccess | Load<%= classify(name) %>sFailure;<% } %>
+<% if (!api) { %>export type <%= classify(name) %>Actions = Load<%= classify(name) %>s;<% } %>

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

@@ -101,36 +101,6 @@ describe('Action Schematic', () => {
     expect(fileContent).toMatch(/export class LoadFoos implements Action/);
   });
 
-  it('should create a class based on the provided name for success', () => {
-    const tree = schematicRunner.runSchematic(
-      'action',
-      defaultOptions,
-      appTree
-    );
-    const fileContent = tree.readContent(
-      `${projectPath}/src/app/foo.actions.ts`
-    );
-
-    expect(fileContent).toMatch(
-      /export class LoadFoosSuccess implements Action/
-    );
-  });
-
-  it('should create a class based on the provided name for failure', () => {
-    const tree = schematicRunner.runSchematic(
-      'action',
-      defaultOptions,
-      appTree
-    );
-    const fileContent = tree.readContent(
-      `${projectPath}/src/app/foo.actions.ts`
-    );
-
-    expect(fileContent).toMatch(
-      /export class LoadFoosFailure implements Action/
-    );
-  });
-
   it('should create the union type based on the provided name', () => {
     const tree = schematicRunner.runSchematic(
       'action',

modules/schematics/src/action/schema.json

@@ -38,6 +38,13 @@
       "default": false,
       "description": "Group actions file within 'actions' folder",
       "aliases": ["g"]
+    },
+    "api": {
+      "type": "boolean",
+      "default": false,
+      "description":
+        "Specifies if api success and failure actions should be generated.",
+      "aliases": ["a"]
     }
   },
   "required": []

modules/schematics/src/action/schema.ts

@@ -2,29 +2,37 @@ export interface Schema {
   /**
    * The name of the component.
    */
-
   name: string;
+
   /**
    * The path to create the component.
    */
-
   path?: string;
+
   /**
    * The name of the project.
    */
   project?: string;
+
   /**
    * Specifies if a spec file is generated.
    */
   spec?: boolean;
+
   /**
    * Flag to indicate if a dir is created.
    */
 
   flat?: boolean;
+
   /**
    * Group actions file within 'actions' folder
    */
-
   group?: boolean;
+
+  /**
+   * Specifies if api success and failure actions
+   * should be generated.
+   */
+  api?: boolean;
 }

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

@@ -1,11 +1,12 @@
 import { Injectable } from '@angular/core';
 import { Actions, Effect<% if (feature) { %>, ofType<% } %> } from '@ngrx/effects';
-<% if (feature) { %>import { catchError, map, switchMap } from 'rxjs/operators';<% } %>
-<% if (feature) { %>import { Load<%= classify(name) %>sFailure, Load<%= classify(name) %>sSuccess, <%= classify(name) %>ActionTypes } from '<%= featurePath(group, flat, "actions", dasherize(name)) %><%= dasherize(name) %>.actions';<% } %>
+<% if (feature && !api) { %>import { <%= classify(name) %>ActionTypes } from '<%= featurePath(group, flat, "actions", dasherize(name)) %><%= dasherize(name) %>.actions';<% } %>
+<% if (feature && api) { %>import { catchError, map, switchMap } from 'rxjs/operators';<% } %>
+<% if (feature && api) { %>import { Load<%= classify(name) %>sFailure, Load<%= classify(name) %>sSuccess, <%= classify(name) %>ActionTypes } from '<%= featurePath(group, flat, "actions", dasherize(name)) %><%= dasherize(name) %>.actions';<% } %>
 
 @Injectable()
 export class <%= classify(name) %>Effects {
-<% if (feature) { %>
+<% if (feature && api) { %>
 
   private _testObservable = of([
     { myDataProperty: 1000, myOtherDataProperty: 'some-text' },
@@ -26,6 +27,9 @@ export class <%= classify(name) %>Effects {
     )
   );
 <% } %>
-
+<% if (feature && !api) { %>
+  @Effect()
+  load<%= classify(name) %>s$ = this.actions$.pipe(ofType(<%= classify(name) %>ActionTypes.Load<%= classify(name) %>s));
+<% } %>
   constructor(private actions$: Actions) {}
 }

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

@@ -236,7 +236,7 @@ describe('Effect Schematic', () => {
     );
 
     expect(content).toMatch(
-      /import \{ LoadFoosFailure, LoadFoosSuccess, FooActionTypes } from \'\.\.\/\.\.\/actions\/foo\/foo\.actions';/
+      /import \{ FooActionTypes } from \'\.\.\/\.\.\/actions\/foo\/foo\.actions';/
     );
   });
 
@@ -251,16 +251,11 @@ describe('Effect Schematic', () => {
       /import { Actions, Effect, ofType } from '@ngrx\/effects';/
     );
     expect(content).toMatch(
-      /import { LoadFoosFailure, LoadFoosSuccess, FooActionTypes } from '\.\/foo.actions';/
+      /import { FooActionTypes } from '\.\/foo.actions';/
     );
     expect(content).toMatch(/export class FooEffects/);
-    expect(content).toMatch(/loadFoos\$ = this\.actions\$.pipe\(/);
-    expect(content).toMatch(/ofType\(FooActionTypes\.LoadFoo\),/);
-    expect(content).toMatch(/switchMap\(\(\) =>/);
-    expect(content).toMatch(/this\._testObservable\.pipe\(/);
-    expect(content).toMatch(/map\(data => new LoadFoosSuccess\({ data }\)\),/);
     expect(content).toMatch(
-      /catchError\(error => of\(new LoadFoosFailure\({ error }\)\)\)\)/
+      /loadFoos\$ = this\.actions\$.pipe\(ofType\(FooActionTypes\.LoadFoos\)\);/
     );
   });
 

modules/schematics/src/effect/schema.json

@@ -56,6 +56,13 @@
       "default": false,
       "description": "Group effects file within 'effects' folder",
       "aliases": ["g"]
+    },
+    "api": {
+      "type": "boolean",
+      "default": false,
+      "description":
+        "Specifies if effect has api success and failure actions wired up",
+      "aliases": ["a"]
     }
   },
   "required": []

modules/schematics/src/effect/schema.ts

@@ -2,40 +2,50 @@ export interface Schema {
   /**
    * The name of the component.
    */
-
   name: string;
+
   /**
    * The path to create the effect.
    */
-
   path?: string;
+
   /**
    * The name of the project.
    */
   project?: string;
+
   /**
    * Flag to indicate if a dir is created.
    */
   flat?: boolean;
+
   /**
    * Specifies if a spec file is generated.
    */
   spec?: boolean;
+
   /**
    * Allows specification of the declaring module.
    */
   module?: string;
+
   /**
    * Specifies if this is a root-level effect
    */
   root?: boolean;
+
   /**
    * Specifies if this is grouped within a feature
    */
   feature?: boolean;
+
   /**
    * Specifies if this is grouped within an 'effects' folder
    */
-
   group?: boolean;
+
+  /**
+   * Specifies if effect has api success and failure actions wired up
+   */
+  api?: boolean;
 }

modules/schematics/src/feature/schema.json

@@ -49,6 +49,13 @@
       "description":
         "Group actions, reducers and effects within relative subfolders",
       "aliases": ["g"]
+    },
+    "api": {
+      "type": "boolean",
+      "default": false,
+      "description":
+        "Specifies if api success and failure actions, reducer, and effects should be generated as part of this feature.",
+      "aliases": ["a"]
     }
   },
   "required": []

modules/schematics/src/feature/schema.ts

@@ -3,38 +3,45 @@ export interface Schema {
    * The name of the feature.
    */
   name: string;
+
   /**
    * The path to create the feature.
    */
   path?: string;
+
   /**
    * The name of the project.
    */
   project?: string;
+
   /**
    * Flag to indicate if a dir is created.
    */
   flat?: boolean;
+
   /**
    * Specifies if a spec file is generated.
    */
   spec?: boolean;
+
   /**
    * Allows specification of the declaring module.
    */
-
   module?: string;
+
   /**
    * Allows specification of the declaring reducers.
    */
-
   reducers?: string;
+
   /**
    * Specifies if this is grouped within sub folders
    */
-
   group?: boolean;
+
   /**
-   * Specifies if this is grouped within a feature
+   * Specifies if api success and failure actions, reducer, and effects
+   * should be generated as part of this feature.
    */
+  api?: boolean;
 }

modules/schematics/src/reducer/schema.json

@@ -53,6 +53,13 @@
       "default": false,
       "description": "Group reducer file within 'reducers' folder",
       "aliases": ["g"]
+    },
+    "api": {
+      "type": "boolean",
+      "default": false,
+      "description":
+        "Specifies if api success and failure actions should be added to the reducer",
+      "aliases": ["a"]
     }
   },
   "required": []

modules/schematics/src/reducer/schema.ts

@@ -3,41 +3,50 @@ export interface Schema {
    * The name of the component.
    */
   name: string;
+
   /**
    * The path to create the effect.
    */
-
   path?: string;
+
   /**
    * The name of the project.
    */
   project?: string;
+
   /**
    * Flag to indicate if a dir is created.
    */
   flat?: boolean;
+
   /**
    * Specifies if a spec file is generated.
    */
   spec?: boolean;
+
   /**
    * Allows specification of the declaring module.
    */
-
   module?: string;
+
   /**
    * Allows specification of the declaring reducers.
    */
-
   reducers?: string;
+
   /**
    * Specifies if this is grouped within sub folders
    */
-
   group?: boolean;
+
   /**
    * Specifies if this is grouped within a feature
    */
-
   feature?: boolean;
+
+  /**
+   * Specifies if api success and failure actions
+   * should be added to the reducer.
+   */
+  api?: boolean;
 }