feat(crud): add support for new syntax

valueadd-poland · Jul 5, 2021 · d104a46 · d104a46
1 parent 23e92d6
commit d104a46
Show file tree

Hide file tree

Showing 19 changed files with 310 additions and 143 deletions.
diff --git a/src/collection/crud/crud-schema.interface.ts b/src/collection/crud/crud-schema.interface.ts
@@ -9,4 +9,8 @@ export interface CrudSchema {
   operation: string[];
   responseType?: string;
   stateDir: string;
+  /**
+   * Specifies whether to use creator NgRx syntax.
+   */
+  creators?: boolean;
 }
diff --git a/src/collection/crud/crud-schema.json b/src/collection/crud/crud-schema.json
@@ -72,6 +72,13 @@
       "type": "string",
       "description": "Add map operator to response pipe.",
       "x-prompt": "What is response object path to map?"
+    },
+    "creators": {
+      "type": "boolean",
+      "default": true,
+      "description": "Specifies whether to use creators NgRx syntax",
+      "aliases": ["c"],
+      "x-prompt": "Do you want to use the creators NgRx syntax?"
     }
   }
 }
diff --git a/src/collection/crud/index.spec.ts b/src/collection/crud/index.spec.ts
@@ -59,7 +59,8 @@ describe('crud', () => {
       stateDir: '/libs/data-access-test/src/lib/+state',
       operation: ['Read', 'ReadCollection', 'Create', 'Update', 'Delete'],
       mapResponse: 'data',
-      responseType: 'ApiResponse<TestModel>'
+      responseType: 'ApiResponse<TestModel>',
+      creators: false
     };
 
     appTree = await runner.runSchematicAsync('crud', crudOpts, appTree).toPromise();

diff --git a/src/collection/crud/index.ts b/src/collection/crud/index.ts
@@ -27,6 +27,14 @@ import { crudFacadeSpec } from './rules/crud-facade-spec.rule';
 import { crudFacade } from './rules/crud-facade.rule';
 import { crudReducer } from './rules/crud-reducer.rule';
 
+export interface CrudGenerate {
+  create: boolean;
+  read: boolean;
+  readCollection: boolean;
+  update: boolean;
+  delete: boolean;
+}
+
 export interface CrudOptions {
   actionPrefix: string;
   actionsAliasName: string;
@@ -66,13 +74,8 @@ export interface CrudOptions {
   stateDir: StateFilePaths;
   statePartialName: string;
   statePath: string;
-  toGenerate: {
-    create: boolean;
-    read: boolean;
-    readCollection: boolean;
-    update: boolean;
-    delete: boolean;
-  };
+  toGenerate: CrudGenerate;
+  creators: boolean;
 }
 
 // tslint:disable-next-line:cognitive-complexity
@@ -221,7 +224,8 @@ export function parseOptions(host: Tree, options: CrudSchema): CrudOptions {
       path: entityPath[0],
       name: entity
     },
-    statePath: stateDir
+    statePath: stateDir,
+    creators: options.creators || false
   };
 }
 

diff --git a/src/collection/crud/rules/crud-actions.rule.ts b/src/collection/crud/rules/crud-actions.rule.ts
@@ -9,29 +9,29 @@ import { CrudOptions } from '../index';
 function createActionRules(options: CrudOptions): Rule[] {
   const { toGenerate, entity, actionPrefix, statePath } = options;
   const rules: Rule[] = [];
+  const genericOptions = {
+    prefix: actionPrefix,
+    stateDir: statePath,
+    skipFormat: true,
+    creators: options.creators
+  };
 
   if (toGenerate.read) {
     rules.push(
       action({
         payload: getRequestPayloadClass(`Get${entity.name}`),
         name: `Get${entity.name}`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       }),
       action({
         payload: 'HttpErrorResponse',
         name: `Get${entity.name}Fail`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       }),
       action({
         payload: `${entity.name}`,
         name: `Get${entity.name}Success`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       })
     );
   }
@@ -41,23 +41,17 @@ function createActionRules(options: CrudOptions): Rule[] {
       action({
         payload: getRequestPayloadClass(`Get${entity.name}Collection`),
         name: `Get${entity.name}Collection`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       }),
       action({
         payload: 'HttpErrorResponse',
         name: `Get${entity.name}CollectionFail`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       }),
       action({
         payload: `${entity.name}[]`,
         name: `Get${entity.name}CollectionSuccess`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       })
     );
   }
@@ -67,23 +61,17 @@ function createActionRules(options: CrudOptions): Rule[] {
       action({
         payload: getRequestPayloadClass(`Create${entity.name}`),
         name: `Create${entity.name}`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       }),
       action({
         payload: 'HttpErrorResponse',
         name: `Create${entity.name}Fail`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       }),
       action({
         payload: entity.name,
         name: `Create${entity.name}Success`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       })
     );
   }
@@ -93,23 +81,17 @@ function createActionRules(options: CrudOptions): Rule[] {
       action({
         payload: getRequestPayloadClass(`Update${entity.name}`),
         name: `Update${entity.name}`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       }),
       action({
         payload: 'HttpErrorResponse',
         name: `Update${entity.name}Fail`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       }),
       action({
         payload: entity.name,
         name: `Update${entity.name}Success`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       })
     );
   }
@@ -119,23 +101,17 @@ function createActionRules(options: CrudOptions): Rule[] {
       action({
         payload: getRequestPayloadClass(`Remove${entity.name}`),
         name: `Remove${entity.name}`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       }),
       action({
         payload: 'HttpErrorResponse',
         name: `Remove${entity.name}Fail`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       }),
       action({
         payload: getRequestPayloadClass(`Remove${entity.name}`),
         name: `Remove${entity.name}Success`,
-        prefix: actionPrefix,
-        stateDir: statePath,
-        skipFormat: true
+        ...genericOptions
       })
     );
   }