Schematics: Add and import feature key for reducer state (#2017)

Closes #1996
ngrx · Jul 18, 2019 · 136c5eb · 136c5eb
1 parent 3cc4f3d
commit 136c5eb
Show file tree

Hide file tree

Showing 40 changed files with 285 additions and 83 deletions.
diff --git a/modules/data/schematics-core/index.ts b/modules/data/schematics-core/index.ts
@@ -7,6 +7,7 @@ import {
   group,
   capitalize,
   featurePath,
+  pluralize,
 } from './utility/strings';
 
 export {
@@ -64,6 +65,7 @@ export const stringUtils = {
   group,
   capitalize,
   featurePath,
+  pluralize,
 };
 
 export { updatePackage } from './utility/update';

diff --git a/modules/data/schematics-core/utility/ngrx-utils.ts b/modules/data/schematics-core/utility/ngrx-utils.ts
@@ -93,8 +93,11 @@ export function addReducerToStateInterface(
     ? stringUtils.pluralize(options.name)
     : stringUtils.camelize(options.name);
 
-  const keyInsert =
-    state + ': from' + stringUtils.classify(options.name) + '.State;';
+  const keyInsert = `[from${stringUtils.classify(
+    options.name
+  )}.${stringUtils.camelize(state)}FeatureKey]: from${stringUtils.classify(
+    options.name
+  )}.State;`;
   const expr = node as any;
   let position;
   let toInsert;
@@ -144,6 +147,7 @@ export function addReducerToActionReducerMap(
 
       return { initializer: variable.initializer, type };
     })
+    .filter(initWithType => initWithType.type !== undefined)
     .find(({ type }) => type.typeName.text === 'ActionReducerMap');
 
   if (!actionReducerMap || !actionReducerMap.initializer) {
@@ -156,8 +160,11 @@ export function addReducerToActionReducerMap(
     ? stringUtils.pluralize(options.name)
     : stringUtils.camelize(options.name);
 
-  const keyInsert =
-    state + ': from' + stringUtils.classify(options.name) + '.reducer,';
+  const keyInsert = `[from${stringUtils.classify(
+    options.name
+  )}.${stringUtils.camelize(state)}FeatureKey]: from${stringUtils.classify(
+    options.name
+  )}.reducer,`;
   const expr = node as any;
   let position;
   let toInsert;
@@ -227,12 +234,17 @@ export function addReducerImportToNgModule(options: any): Rule {
       relativePath,
       true
     );
+    const state = options.plural
+      ? stringUtils.pluralize(options.name)
+      : stringUtils.camelize(options.name);
     const [storeNgModuleImport] = addImportToModule(
       source,
       modulePath,
-      `StoreModule.forFeature('${stringUtils.camelize(
+      `StoreModule.forFeature(from${stringUtils.classify(
         options.name
-      )}', from${stringUtils.classify(options.name)}.reducer)`,
+      )}.${state}FeatureKey, from${stringUtils.classify(
+        options.name
+      )}.reducer)`,
       relativePath
     );
     const changes = [...commonImports, reducerImport, storeNgModuleImport];

diff --git a/modules/effects/schematics-core/index.ts b/modules/effects/schematics-core/index.ts
@@ -7,6 +7,7 @@ import {
   group,
   capitalize,
   featurePath,
+  pluralize,
 } from './utility/strings';
 
 export {
@@ -64,6 +65,7 @@ export const stringUtils = {
   group,
   capitalize,
   featurePath,
+  pluralize,
 };
 
 export { updatePackage } from './utility/update';

diff --git a/modules/effects/schematics-core/utility/ngrx-utils.ts b/modules/effects/schematics-core/utility/ngrx-utils.ts
@@ -93,8 +93,11 @@ export function addReducerToStateInterface(
     ? stringUtils.pluralize(options.name)
     : stringUtils.camelize(options.name);
 
-  const keyInsert =
-    state + ': from' + stringUtils.classify(options.name) + '.State;';
+  const keyInsert = `[from${stringUtils.classify(
+    options.name
+  )}.${stringUtils.camelize(state)}FeatureKey]: from${stringUtils.classify(
+    options.name
+  )}.State;`;
   const expr = node as any;
   let position;
   let toInsert;
@@ -144,6 +147,7 @@ export function addReducerToActionReducerMap(
 
       return { initializer: variable.initializer, type };
     })
+    .filter(initWithType => initWithType.type !== undefined)
     .find(({ type }) => type.typeName.text === 'ActionReducerMap');
 
   if (!actionReducerMap || !actionReducerMap.initializer) {
@@ -156,8 +160,11 @@ export function addReducerToActionReducerMap(
     ? stringUtils.pluralize(options.name)
     : stringUtils.camelize(options.name);
 
-  const keyInsert =
-    state + ': from' + stringUtils.classify(options.name) + '.reducer,';
+  const keyInsert = `[from${stringUtils.classify(
+    options.name
+  )}.${stringUtils.camelize(state)}FeatureKey]: from${stringUtils.classify(
+    options.name
+  )}.reducer,`;
   const expr = node as any;
   let position;
   let toInsert;
@@ -227,12 +234,17 @@ export function addReducerImportToNgModule(options: any): Rule {
       relativePath,
       true
     );
+    const state = options.plural
+      ? stringUtils.pluralize(options.name)
+      : stringUtils.camelize(options.name);
     const [storeNgModuleImport] = addImportToModule(
       source,
       modulePath,
-      `StoreModule.forFeature('${stringUtils.camelize(
+      `StoreModule.forFeature(from${stringUtils.classify(
         options.name
-      )}', from${stringUtils.classify(options.name)}.reducer)`,
+      )}.${state}FeatureKey, from${stringUtils.classify(
+        options.name
+      )}.reducer)`,
       relativePath
     );
     const changes = [...commonImports, reducerImport, storeNgModuleImport];

diff --git a/modules/entity/schematics-core/index.ts b/modules/entity/schematics-core/index.ts
@@ -7,6 +7,7 @@ import {
   group,
   capitalize,
   featurePath,
+  pluralize,
 } from './utility/strings';
 
 export {
@@ -64,6 +65,7 @@ export const stringUtils = {
   group,
   capitalize,
   featurePath,
+  pluralize,
 };
 
 export { updatePackage } from './utility/update';

diff --git a/modules/entity/schematics-core/utility/ngrx-utils.ts b/modules/entity/schematics-core/utility/ngrx-utils.ts
@@ -93,8 +93,11 @@ export function addReducerToStateInterface(
     ? stringUtils.pluralize(options.name)
     : stringUtils.camelize(options.name);
 
-  const keyInsert =
-    state + ': from' + stringUtils.classify(options.name) + '.State;';
+  const keyInsert = `[from${stringUtils.classify(
+    options.name
+  )}.${stringUtils.camelize(state)}FeatureKey]: from${stringUtils.classify(
+    options.name
+  )}.State;`;
   const expr = node as any;
   let position;
   let toInsert;
@@ -144,6 +147,7 @@ export function addReducerToActionReducerMap(
 
       return { initializer: variable.initializer, type };
     })
+    .filter(initWithType => initWithType.type !== undefined)
     .find(({ type }) => type.typeName.text === 'ActionReducerMap');
 
   if (!actionReducerMap || !actionReducerMap.initializer) {
@@ -156,8 +160,11 @@ export function addReducerToActionReducerMap(
     ? stringUtils.pluralize(options.name)
     : stringUtils.camelize(options.name);
 
-  const keyInsert =
-    state + ': from' + stringUtils.classify(options.name) + '.reducer,';
+  const keyInsert = `[from${stringUtils.classify(
+    options.name
+  )}.${stringUtils.camelize(state)}FeatureKey]: from${stringUtils.classify(
+    options.name
+  )}.reducer,`;
   const expr = node as any;
   let position;
   let toInsert;
@@ -227,12 +234,17 @@ export function addReducerImportToNgModule(options: any): Rule {
       relativePath,
       true
     );
+    const state = options.plural
+      ? stringUtils.pluralize(options.name)
+      : stringUtils.camelize(options.name);
     const [storeNgModuleImport] = addImportToModule(
       source,
       modulePath,
-      `StoreModule.forFeature('${stringUtils.camelize(
+      `StoreModule.forFeature(from${stringUtils.classify(
         options.name
-      )}', from${stringUtils.classify(options.name)}.reducer)`,
+      )}.${state}FeatureKey, from${stringUtils.classify(
+        options.name
+      )}.reducer)`,
       relativePath
     );
     const changes = [...commonImports, reducerImport, storeNgModuleImport];

diff --git a/modules/router-store/schematics-core/index.ts b/modules/router-store/schematics-core/index.ts
@@ -7,6 +7,7 @@ import {
   group,
   capitalize,
   featurePath,
+  pluralize,
 } from './utility/strings';
 
 export {
@@ -64,6 +65,7 @@ export const stringUtils = {
   group,
   capitalize,
   featurePath,
+  pluralize,
 };
 
 export { updatePackage } from './utility/update';

diff --git a/modules/router-store/schematics-core/utility/ngrx-utils.ts b/modules/router-store/schematics-core/utility/ngrx-utils.ts
@@ -93,8 +93,11 @@ export function addReducerToStateInterface(
     ? stringUtils.pluralize(options.name)
     : stringUtils.camelize(options.name);
 
-  const keyInsert =
-    state + ': from' + stringUtils.classify(options.name) + '.State;';
+  const keyInsert = `[from${stringUtils.classify(
+    options.name
+  )}.${stringUtils.camelize(state)}FeatureKey]: from${stringUtils.classify(
+    options.name
+  )}.State;`;
   const expr = node as any;
   let position;
   let toInsert;
@@ -144,6 +147,7 @@ export function addReducerToActionReducerMap(
 
       return { initializer: variable.initializer, type };
     })
+    .filter(initWithType => initWithType.type !== undefined)
     .find(({ type }) => type.typeName.text === 'ActionReducerMap');
 
   if (!actionReducerMap || !actionReducerMap.initializer) {
@@ -156,8 +160,11 @@ export function addReducerToActionReducerMap(
     ? stringUtils.pluralize(options.name)
     : stringUtils.camelize(options.name);
 
-  const keyInsert =
-    state + ': from' + stringUtils.classify(options.name) + '.reducer,';
+  const keyInsert = `[from${stringUtils.classify(
+    options.name
+  )}.${stringUtils.camelize(state)}FeatureKey]: from${stringUtils.classify(
+    options.name
+  )}.reducer,`;
   const expr = node as any;
   let position;
   let toInsert;
@@ -227,12 +234,17 @@ export function addReducerImportToNgModule(options: any): Rule {
       relativePath,
       true
     );
+    const state = options.plural
+      ? stringUtils.pluralize(options.name)
+      : stringUtils.camelize(options.name);
     const [storeNgModuleImport] = addImportToModule(
       source,
       modulePath,
-      `StoreModule.forFeature('${stringUtils.camelize(
+      `StoreModule.forFeature(from${stringUtils.classify(
         options.name
-      )}', from${stringUtils.classify(options.name)}.reducer)`,
+      )}.${state}FeatureKey, from${stringUtils.classify(
+        options.name
+      )}.reducer)`,
       relativePath
     );
     const changes = [...commonImports, reducerImport, storeNgModuleImport];

diff --git a/modules/schematics-core/index.ts b/modules/schematics-core/index.ts
@@ -7,6 +7,7 @@ import {
   group,
   capitalize,
   featurePath,
+  pluralize,
 } from './utility/strings';
 
 export {
@@ -64,6 +65,7 @@ export const stringUtils = {
   group,
   capitalize,
   featurePath,
+  pluralize,
 };
 
 export { updatePackage } from './utility/update';

diff --git a/modules/schematics-core/utility/ngrx-utils.ts b/modules/schematics-core/utility/ngrx-utils.ts
@@ -93,8 +93,11 @@ export function addReducerToStateInterface(
     ? stringUtils.pluralize(options.name)
     : stringUtils.camelize(options.name);
 
-  const keyInsert =
-    state + ': from' + stringUtils.classify(options.name) + '.State;';
+  const keyInsert = `[from${stringUtils.classify(
+    options.name
+  )}.${stringUtils.camelize(state)}FeatureKey]: from${stringUtils.classify(
+    options.name
+  )}.State;`;
   const expr = node as any;
   let position;
   let toInsert;
@@ -144,6 +147,7 @@ export function addReducerToActionReducerMap(
 
       return { initializer: variable.initializer, type };
     })
+    .filter(initWithType => initWithType.type !== undefined)
     .find(({ type }) => type.typeName.text === 'ActionReducerMap');
 
   if (!actionReducerMap || !actionReducerMap.initializer) {
@@ -156,8 +160,11 @@ export function addReducerToActionReducerMap(
     ? stringUtils.pluralize(options.name)
     : stringUtils.camelize(options.name);
 
-  const keyInsert =
-    state + ': from' + stringUtils.classify(options.name) + '.reducer,';
+  const keyInsert = `[from${stringUtils.classify(
+    options.name
+  )}.${stringUtils.camelize(state)}FeatureKey]: from${stringUtils.classify(
+    options.name
+  )}.reducer,`;
   const expr = node as any;
   let position;
   let toInsert;
@@ -227,12 +234,17 @@ export function addReducerImportToNgModule(options: any): Rule {
       relativePath,
       true
     );
+    const state = options.plural
+      ? stringUtils.pluralize(options.name)
+      : stringUtils.camelize(options.name);
     const [storeNgModuleImport] = addImportToModule(
       source,
       modulePath,
-      `StoreModule.forFeature('${stringUtils.camelize(
+      `StoreModule.forFeature(from${stringUtils.classify(
         options.name
-      )}', from${stringUtils.classify(options.name)}.reducer)`,
+      )}.${state}FeatureKey, from${stringUtils.classify(
+        options.name
+      )}.reducer)`,
       relativePath
     );
     const changes = [...commonImports, reducerImport, storeNgModuleImport];

diff --git a/modules/schematics/schematics-core/index.ts b/modules/schematics/schematics-core/index.ts
@@ -7,6 +7,7 @@ import {
   group,
   capitalize,
   featurePath,
+  pluralize,
 } from './utility/strings';
 
 export {
@@ -64,6 +65,7 @@ export const stringUtils = {
   group,
   capitalize,
   featurePath,
+  pluralize,
 };
 
 export { updatePackage } from './utility/update';