code review changes

ngrx · Mar 10, 2019 · 4eb91da · 4eb91da
1 parent 0b4a3a2
commit 4eb91da
Show file tree

Hide file tree

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

diff --git a/modules/effects/schematics-core/utility/strings.ts b/modules/effects/schematics-core/utility/strings.ts
@@ -111,14 +111,14 @@ export function capitalize(str: string): string {
 }
 
 /**
- Returns the Pluralize form of a string
+ Returns the plural form of a string
 
  ```javascript
  'innerHTML'.pluralize()         // 'InnerHTMLs'
  'action_name'.pluralize()       // 'actionNames'
  'css-class-name'.pluralize()    // 'cssClassNames'
- 'regex'.capitalize()            // 'regexes'
- 'user'.capitalize()             // 'users'
+ 'regex'.pluralize()            // 'regexes'
+ 'user'.pluralize()             // 'users'
  ```
  */
 export function pluralize(str: string): string {

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

diff --git a/modules/entity/schematics-core/utility/strings.ts b/modules/entity/schematics-core/utility/strings.ts
@@ -111,14 +111,14 @@ export function capitalize(str: string): string {
 }
 
 /**
- Returns the Pluralize form of a string
+ Returns the plural form of a string
 
  ```javascript
  'innerHTML'.pluralize()         // 'InnerHTMLs'
  'action_name'.pluralize()       // 'actionNames'
  'css-class-name'.pluralize()    // 'cssClassNames'
- 'regex'.capitalize()            // 'regexes'
- 'user'.capitalize()             // 'users'
+ 'regex'.pluralize()            // 'regexes'
+ 'user'.pluralize()             // 'users'
  ```
  */
 export function pluralize(str: string): string {

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,9 @@ export function addReducerToStateInterface(
     return new NoopChange();
   }
 
-  let state = stringUtils.camelize(options.name);
-  if (options.plural) {
-    state = stringUtils.camelize(options.name) + 's';
-  }
+  const state = options.plural
+    ? stringUtils.pluralize(options.name)
+    : stringUtils.camelize(options.name);
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.State;';
@@ -154,10 +153,9 @@ export function addReducerToActionReducerMap(
 
   let node = actionReducerMap.initializer;
 
-  let state = stringUtils.camelize(options.name);
-  if (options.plural) {
-    state = stringUtils.camelize(options.name) + 's';
-  }
+  const state = options.plural
+    ? stringUtils.pluralize(options.name)
+    : stringUtils.camelize(options.name);
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.reducer,';

diff --git a/modules/router-store/schematics-core/utility/strings.ts b/modules/router-store/schematics-core/utility/strings.ts
@@ -111,14 +111,14 @@ export function capitalize(str: string): string {
 }
 
 /**
- Returns the Pluralize form of a string
+ Returns the plural form of a string
 
  ```javascript
  'innerHTML'.pluralize()         // 'InnerHTMLs'
  'action_name'.pluralize()       // 'actionNames'
  'css-class-name'.pluralize()    // 'cssClassNames'
- 'regex'.capitalize()            // 'regexes'
- 'user'.capitalize()             // 'users'
+ 'regex'.pluralize()            // 'regexes'
+ 'user'.pluralize()             // 'users'
  ```
  */
 export function pluralize(str: string): string {

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

diff --git a/modules/schematics-core/utility/strings.ts b/modules/schematics-core/utility/strings.ts
@@ -111,14 +111,14 @@ export function capitalize(str: string): string {
 }
 
 /**
- Returns the Pluralize form of a string
+ Returns the plural form of a string
 
  ```javascript
  'innerHTML'.pluralize()         // 'InnerHTMLs'
  'action_name'.pluralize()       // 'actionNames'
  'css-class-name'.pluralize()    // 'cssClassNames'
- 'regex'.capitalize()            // 'regexes'
- 'user'.capitalize()             // 'users'
+ 'regex'.pluralize()            // 'regexes'
+ 'user'.pluralize()             // 'users'
  ```
  */
 export function pluralize(str: string): string {

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

diff --git a/modules/schematics/schematics-core/utility/strings.ts b/modules/schematics/schematics-core/utility/strings.ts
@@ -111,14 +111,14 @@ export function capitalize(str: string): string {
 }
 
 /**
- Returns the Pluralize form of a string
+ Returns the plural form of a string
 
  ```javascript
  'innerHTML'.pluralize()         // 'InnerHTMLs'
  'action_name'.pluralize()       // 'actionNames'
  'css-class-name'.pluralize()    // 'cssClassNames'
- 'regex'.capitalize()            // 'regexes'
- 'user'.capitalize()             // 'users'
+ 'regex'.pluralize()            // 'regexes'
+ 'user'.pluralize()             // 'users'
  ```
  */
 export function pluralize(str: string): string {

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,9 @@ export function addReducerToStateInterface(
     return new NoopChange();
   }
 
-  let state = stringUtils.camelize(options.name);
-  if (options.plural) {
-    state = stringUtils.camelize(options.name) + 's';
-  }
+  const state = options.plural
+    ? stringUtils.pluralize(options.name)
+    : stringUtils.camelize(options.name);
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.State;';
@@ -154,10 +153,9 @@ export function addReducerToActionReducerMap(
 
   let node = actionReducerMap.initializer;
 
-  let state = stringUtils.camelize(options.name);
-  if (options.plural) {
-    state = stringUtils.camelize(options.name) + 's';
-  }
+  const state = options.plural
+    ? stringUtils.pluralize(options.name)
+    : stringUtils.camelize(options.name);
 
   const keyInsert =
     state + ': from' + stringUtils.classify(options.name) + '.reducer,';

diff --git a/modules/store-devtools/schematics-core/utility/strings.ts b/modules/store-devtools/schematics-core/utility/strings.ts
@@ -111,14 +111,14 @@ export function capitalize(str: string): string {
 }
 
 /**
- Returns the Pluralize form of a string
+ Returns the plural form of a string
 
  ```javascript
  'innerHTML'.pluralize()         // 'InnerHTMLs'
  'action_name'.pluralize()       // 'actionNames'
  'css-class-name'.pluralize()    // 'cssClassNames'
- 'regex'.capitalize()            // 'regexes'
- 'user'.capitalize()             // 'users'
+ 'regex'.pluralize()            // 'regexes'
+ 'user'.pluralize()             // 'users'
  ```
  */
 export function pluralize(str: string): string {

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

diff --git a/modules/store/schematics-core/utility/strings.ts b/modules/store/schematics-core/utility/strings.ts
@@ -111,14 +111,14 @@ export function capitalize(str: string): string {
 }
 
 /**
- Returns the Pluralize form of a string
+ Returns the plural form of a string
 
  ```javascript
  'innerHTML'.pluralize()         // 'InnerHTMLs'
  'action_name'.pluralize()       // 'actionNames'
  'css-class-name'.pluralize()    // 'cssClassNames'
- 'regex'.capitalize()            // 'regexes'
- 'user'.capitalize()             // 'users'
+ 'regex'.pluralize()            // 'regexes'
+ 'user'.pluralize()             // 'users'
  ```
  */
 export function pluralize(str: string): string {