@o3r/core 14.0.0-next.8 → 14.0.0-next.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/core",
-  "version": "14.0.0-next.8",
+  "version": "14.0.0-next.9",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "@ngrx/entity": "^20.0.0",
     "@ngrx/store": "^20.0.0",
     "@nx/angular": "~21.6.0",
-    "@o3r/telemetry": "~14.0.0-next.8",
+    "@o3r/telemetry": "~14.0.0-next.9",
     "@schematics/angular": "^20.0.0",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
@@ -76,7 +76,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "~14.0.0-next.8",
+    "@o3r/schematics": "~14.0.0-next.9",
     "tslib": "^2.6.2",
     "uuid": "^11.0.5"
   },
@@ -88,11 +88,11 @@
     "@ngrx/store": "~20.1.0",
     "@ngrx/store-devtools": "~20.1.0",
     "@nx/eslint-plugin": "~21.6.0",
-    "@o3r/store-sync": "~14.0.0-next.8",
+    "@o3r/store-sync": "~14.0.0-next.9",
     "@stylistic/eslint-plugin": "~5.6.0",
     "@types/jest": "~30.0.0",
-    "@typescript-eslint/eslint-plugin": "~8.47.0",
-    "@typescript-eslint/parser": "~8.47.0",
+    "@typescript-eslint/eslint-plugin": "~8.51.0",
+    "@typescript-eslint/parser": "~8.51.0",
     "angular-eslint": "~20.6.0",
     "cpy-cli": "^6.0.0",
     "eslint": "~9.39.0",
@@ -100,7 +100,7 @@
     "eslint-import-resolver-typescript": "~4.4.0",
     "eslint-plugin-import": "~2.32.0",
     "eslint-plugin-import-newlines": "~1.4.0",
-    "eslint-plugin-jest": "~29.1.0",
+    "eslint-plugin-jest": "~29.11.0",
     "eslint-plugin-jsdoc": "~61.5.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
     "eslint-plugin-unicorn": "~62.0.0",
@@ -114,7 +114,7 @@
     "jsonc-eslint-parser": "~2.4.0",
     "nx": "~21.6.0",
     "ts-jest": "~29.4.0",
-    "typescript-eslint": "~8.47.0",
+    "typescript-eslint": "~8.51.0",
     "zone.js": "~0.15.0"
   },
   "engines": {

package/schematics/store/common/templates/__storeName@dasherize__-module.ts.template

@@ -1,4 +1,4 @@
-import { InjectionToken, ModuleWithProviders, NgModule } from '@angular/core';
+import { InjectionToken, ModuleWithProviders, NgModule, Optional } from '@angular/core';
 import { Action, ActionReducer, StoreModule } from '@ngrx/store';
 <%if (isAsync) {%>
 import { EffectsModule } from '@ngrx/effects';
@@ -6,24 +6,35 @@ import { <%= storeName %>Effect } from './<%= fileName %>.effect';<%}%>
 import { <%= cStoreName %>Reducer } from './<%= fileName %>.reducer';
 import { <%= scuStoreName %>_STORE_NAME, <%= storeName %>State } from './<%= fileName %>.state';
 
+/** Action Reducer map for <%= storeName %> store */
+type <%= storeName %>ActionReducer<T extends <%= storeName %>State=<%= storeName %>State, V extends Action=Action> = ActionReducer<T, V>;
+
+/** Internal Token of the <%= storeName %> reducer */
+const INTERNAL_<%= scuStoreName %>_REDUCER_TOKEN = new InjectionToken<<%= storeName %>ActionReducer>('Internal <%= storeName %> Reducer');
+
 /** Token of the <%= storeName %> reducer */
-export const <%= scuStoreName %>_REDUCER_TOKEN = new InjectionToken<ActionReducer<<%= storeName %>State, Action>>('Feature <%= storeName %> Reducer');
+export const <%= scuStoreName %>_REDUCER_TOKEN = new InjectionToken<<%= storeName %>ActionReducer>('Feature <%= storeName %> Reducer');
 
-/** Provide default reducer for <%= storeName %> store */
-export function getDefault<%= storeName %>Reducer() {
-  return <%= cStoreName %>Reducer;
+/**
+ * Retrieve default reducer for <%= storeName %> store
+ * @param customReducer
+ */
+export function get<%= storeName %>Reducer(customReducer: <%= storeName %>ActionReducer = <%= cStoreName %>Reducer): <%= storeName %>ActionReducer {
+  return customReducer;
 }
 
 @NgModule({
   imports: [
-    StoreModule.forFeature(<%= scuStoreName %>_STORE_NAME, <%= scuStoreName %>_REDUCER_TOKEN)<%if (isAsync) {%>, EffectsModule.forFeature([<%= storeName %>Effect])<%}%>
+    StoreModule.forFeature(<%= scuStoreName %>_STORE_NAME, INTERNAL_<%= scuStoreName %>_REDUCER_TOKEN)<%if (isAsync) {%>, EffectsModule.forFeature([<%= storeName %>Effect])<%}%>
   ],
-  providers: [
-    { provide: <%= scuStoreName %>_REDUCER_TOKEN, useFactory: getDefault<%= storeName %>Reducer }
-  ]
+  providers: [{
+    provide: INTERNAL_<%= scuStoreName %>_REDUCER_TOKEN,
+    useFactory: get<%= storeName %>Reducer,
+    deps: [[new Optional(), <%= scuStoreName %>_REDUCER_TOKEN]]
+  }]
 })
 export class <%= storeName %>StoreModule {
-  public static forRoot<T extends <%= storeName %>State>(reducerFactory: () => ActionReducer<T, Action>): ModuleWithProviders<<%= storeName %>StoreModule> {
+  public static forRoot<T extends <%= storeName %>State>(reducerFactory: () => <%= storeName %>ActionReducer<T>): ModuleWithProviders<<%= storeName %>StoreModule> {
     return {
       ngModule: <%= storeName %>StoreModule,
       providers: [