code review comments

ngrx · Mar 9, 2019 · 0b4a3a2 · 0b4a3a2
1 parent 757d04e
commit 0b4a3a2
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 69 deletions.
diff --git a/modules/effects/schematics-core/utility/ngrx-utils.ts b/modules/effects/schematics-core/utility/ngrx-utils.ts
@@ -90,10 +90,10 @@ export function addReducerToStateInterface(
     return new NoopChange();
   }
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.State;';
@@ -154,10 +154,10 @@ export function addReducerToActionReducerMap(
 
   let node = actionReducerMap.initializer;
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.reducer,';

diff --git a/modules/entity/schematics-core/utility/ngrx-utils.ts b/modules/entity/schematics-core/utility/ngrx-utils.ts
@@ -90,10 +90,10 @@ export function addReducerToStateInterface(
     return new NoopChange();
   }
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.State;';
@@ -154,10 +154,10 @@ export function addReducerToActionReducerMap(
 
   let node = actionReducerMap.initializer;
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.reducer,';

diff --git a/modules/router-store/schematics-core/utility/ngrx-utils.ts b/modules/router-store/schematics-core/utility/ngrx-utils.ts
@@ -90,10 +90,10 @@ export function addReducerToStateInterface(
     return new NoopChange();
   }
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.State;';
@@ -154,10 +154,10 @@ export function addReducerToActionReducerMap(
 
   let node = actionReducerMap.initializer;
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.reducer,';

diff --git a/modules/schematics-core/utility/ngrx-utils.ts b/modules/schematics-core/utility/ngrx-utils.ts
@@ -90,10 +90,10 @@ export function addReducerToStateInterface(
     return new NoopChange();
   }
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.State;';
@@ -154,10 +154,10 @@ export function addReducerToActionReducerMap(
 
   let node = actionReducerMap.initializer;
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.reducer,';

diff --git a/modules/schematics/schematics-core/utility/ngrx-utils.ts b/modules/schematics/schematics-core/utility/ngrx-utils.ts
@@ -90,10 +90,10 @@ export function addReducerToStateInterface(
     return new NoopChange();
   }
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.State;';
@@ -154,10 +154,10 @@ export function addReducerToActionReducerMap(
 
   let node = actionReducerMap.initializer;
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.reducer,';

diff --git a/modules/schematics/src/entity/index.spec.ts b/modules/schematics/src/entity/index.spec.ts
@@ -162,7 +162,7 @@ describe('Entity Schematic', () => {
     ).toBeGreaterThanOrEqual(0);
   });
 
-  it('should create all files of an entity within grouped and nested folders', () => {
+  it('should update the state to plural', () => {
     const options = {
       ...defaultOptions,
       name: 'user',

diff --git a/modules/schematics/src/entity/index.ts b/modules/schematics/src/entity/index.ts
@@ -31,7 +31,6 @@ export default function(options: EntityOptions): Rule {
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;
-    options.plural = true;
 
     if (options.module) {
       options.module = findModuleFromOptions(host, options);
@@ -56,7 +55,7 @@ export default function(options: EntityOptions): Rule {
     ]);
 
     return chain([
-      addReducerToState({ ...options }),
+      addReducerToState({ ...options, plural: true }),
       addReducerImportToNgModule({ ...options }),
       branchAndMerge(chain([mergeWith(templateSource)])),
     ])(host, context);

diff --git a/modules/schematics/src/entity/schema.json b/modules/schematics/src/entity/schema.json
@@ -49,11 +49,6 @@
       "description":
         "Group actions, reducers and effects within relative subfolders",
       "aliases": ["g"]
-    },
-    "plural": {
-      "type": "boolean",
-      "default": true,
-      "description": "Update state with plural."
     }
   },
   "required": []

diff --git a/modules/schematics/src/entity/schema.ts b/modules/schematics/src/entity/schema.ts
@@ -36,9 +36,4 @@ export interface Schema {
    */
 
   group?: boolean;
-  /**
-   * Specifies if this is state and reducer variable will be plural
-   */
-
-  plural?: boolean;
 }
diff --git a/modules/store-devtools/schematics-core/utility/ngrx-utils.ts b/modules/store-devtools/schematics-core/utility/ngrx-utils.ts
@@ -90,10 +90,10 @@ export function addReducerToStateInterface(
     return new NoopChange();
   }
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.State;';
@@ -154,10 +154,10 @@ export function addReducerToActionReducerMap(
 
   let node = actionReducerMap.initializer;
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.reducer,';

diff --git a/modules/store/schematics-core/utility/ngrx-utils.ts b/modules/store/schematics-core/utility/ngrx-utils.ts
@@ -90,10 +90,10 @@ export function addReducerToStateInterface(
     return new NoopChange();
   }
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.State;';
@@ -154,10 +154,10 @@ export function addReducerToActionReducerMap(
 
   let node = actionReducerMap.initializer;
 
-  const state =
-    options.plural === undefined
-      ? stringUtils.camelize(options.name)
-      : stringUtils.camelize(options.name) + 's';
+  let state = stringUtils.camelize(options.name);
+  if (options.plural) {
+    state = stringUtils.camelize(options.name) + 's';
+  }
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.reducer,';