@o3r/core 11.6.0-prerelease.2 → 11.6.0-prerelease.20

package/schematics/rule-factories/otter-environment/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAOjF;;;;;;;;;;GAUG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE;IACP,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,EACD,SAAS,EAAE,MAAM,GAChB,IAAI,CAqIN"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAsBpC;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE;IACP,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,EACD,SAAS,EAAE,MAAM,GAChB,IAAI,CAqHN"}

package/schematics/rule-factories/otter-environment/index.js

@@ -1,27 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateOtterEnvironmentAdapter = updateOtterEnvironmentAdapter;
+const node_path_1 = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const index_1 = require("@schematics/angular/environments/index");
 const ts = require("typescript");
-const schematics_2 = require("@o3r/schematics");
-const node_path_1 = require("node:path");
+const editTsConfigJson = (tree) => {
+    if (tree.exists('/tsconfig.json')) {
+        const tsConfig = ts.parseConfigFileTextToJson('/tsconfig.json', tree.readText('/tsconfig.json')).config;
+        if (tsConfig.compilerOptions?.noPropertyAccessFromIndexSignature) {
+            delete tsConfig.compilerOptions.noPropertyAccessFromIndexSignature;
+        }
+        tree.overwrite('/tsconfig.json', JSON.stringify(tsConfig, null, 2));
+    }
+    return tree;
+};
 /**
  * Update Otter environment variable for schematics
  * @param options @see RuleFactory.options
- * @param rootPath @see RuleFactory.rootPath
  * @param options.projectName
  * @param options.enableStorybook
  * @param options.enableStyling
  * @param options.enableAnalytics
  * @param options.workingDirectory
- * @param _rootPath
+ * @param _rootPath @see RuleFactory.rootPath
  */
 function updateOtterEnvironmentAdapter(options, _rootPath) {
     /**
      * Add Configuration for schematics
      * @param tree
-     * @param _context
      * @param context
      */
     const editAngularJson = (tree, context) => {
@@ -39,7 +47,7 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
                 if (path) {
                     workspaceProject.schematics[item] = {
                         path: node_path_1.posix.join(workspaceProject.root, path),
-                        ...(workspaceProject.schematics[item] || {})
+                        ...workspaceProject.schematics[item]
                     };
                 }
             });
@@ -56,7 +64,7 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
                 if (path) {
                     workspaceProject.schematics[item] = {
                         path: node_path_1.posix.join(workspaceProject.root, path),
-                        ...(workspaceProject.schematics[item] || {})
+                        ...workspaceProject.schematics[item]
                     };
                 }
             });
@@ -66,16 +74,6 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
         tree.overwrite('/angular.json', JSON.stringify(workspace, null, 2));
         return tree;
     };
-    const editTsConfigJson = (tree) => {
-        if (tree.exists('/tsconfig.json')) {
-            const tsConfig = ts.parseConfigFileTextToJson('/tsconfig.json', tree.readText('/tsconfig.json')).config;
-            if (tsConfig.compilerOptions?.noPropertyAccessFromIndexSignature) {
-                delete tsConfig.compilerOptions.noPropertyAccessFromIndexSignature;
-            }
-            tree.overwrite('/tsconfig.json', JSON.stringify(tsConfig, null, 2));
-        }
-        return tree;
-    };
     /**
      * Use Angular CLI generator to create environment files
      * @param tree
@@ -117,7 +115,7 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
         const envDefaultFilePath = node_path_1.posix.join(envBasePath, 'environment.ts');
         const addProductionBoolean = (envFilePath, value) => {
             let envContent = tree.readText(envFilePath);
-            if (!/production['"]?:\s*(true|false)/.test(envContent)) {
+            if (!/production["']?:\s*(true|false)/.test(envContent)) {
                 envContent = envContent.replace(/(const environment = {)/, `$1\n  production: ${String(value)},\n`);
                 tree.overwrite(envFilePath, envContent);
             }

package/schematics/rule-factories/store/index.d.ts

@@ -4,12 +4,11 @@ import { WorkspaceProject } from '@o3r/schematics';
 /**
  * Add Redux Store support
  * @param options @see RuleFactory.options
- * @param rootPath @see RuleFactory.rootPath
  * @param options.projectName
- * @param options.workingDirectory
- * @param projectType
- * @param options.dependenciesSetupConfig
  * @param options.workingDirector
+ * @param options.dependenciesSetupConfig
+ * @param options.exactO3rVersion
+ * @param projectType
  */
 export declare function updateStore(options: {
     projectName?: string | undefined;

package/schematics/rule-factories/store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AACjF,OAAO,EASL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAkBnD;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,uBAAuB,EAAE,wBAAwB,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,EACjK,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CAoIrD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EASL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAoBzB;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,uBAAuB,EAAE,wBAAwB,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,EACjK,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CAmIrD"}

package/schematics/rule-factories/store/index.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateStore = updateStore;
+const fs = require("node:fs");
+const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const utility_1 = require("@schematics/angular/utility");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
-const path = require("node:path");
 const ts = require("typescript");
-const fs = require("node:fs");
 const coreSchematicsFolder = path.resolve(__dirname, '..', '..');
 const corePackageJsonPath = path.resolve(coreSchematicsFolder, '..', 'package.json');
 const corePackageJsonContent = JSON.parse(fs.readFileSync(corePackageJsonPath, { encoding: 'utf8' }));
@@ -20,17 +20,16 @@ const ngrxRouterStoreDevToolDep = '@ngrx/store-devtools';
 /**
  * Add Redux Store support
  * @param options @see RuleFactory.options
- * @param rootPath @see RuleFactory.rootPath
  * @param options.projectName
- * @param options.workingDirectory
- * @param projectType
- * @param options.dependenciesSetupConfig
  * @param options.workingDirector
+ * @param options.dependenciesSetupConfig
+ * @param options.exactO3rVersion
+ * @param projectType
  */
 function updateStore(options, projectType) {
     const addStoreModules = (tree) => {
         const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
-        const workspaceProject = options.projectName && workspaceConfig?.projects?.[options.projectName] || undefined;
+        const workspaceProject = (options.projectName && workspaceConfig?.projects?.[options.projectName]) || undefined;
         const storeSyncPackageName = '@o3r/store-sync';
         options.dependenciesSetupConfig.dependencies[storeSyncPackageName] = {
             inManifest: [{
@@ -48,7 +47,7 @@ function updateStore(options, projectType) {
      */
     const updatePackageJson = (tree, context) => {
         const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
-        const workspaceProject = options.projectName && workspaceConfig?.projects?.[options.projectName] || undefined;
+        const workspaceProject = (options.projectName && workspaceConfig?.projects?.[options.projectName]) || undefined;
         const appDeps = [ngrxEffectsDep, ngrxRouterStore, ngrxRouterStoreDevToolDep];
         const corePeerDeps = [ngrxEntityDep, ngrxStoreDep];
         const dependenciesList = projectType === 'application' ? [...corePeerDeps, ...appDeps] : [...corePeerDeps];

package/schematics/schematics-update/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/schematics-update/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAIvF,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAC;AAsE5D;;;GAGG;AACH,eAAO,MAAM,gBAAgB,qDAA4D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/schematics-update/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AASpC,OAAO,EACL,gCAAgC,EACjC,MAAM,UAAU,CAAC;AAoElB;;;GAGG;AACH,eAAO,MAAM,gBAAgB,qDAA4D,CAAC"}

package/schematics/schematics-update/index.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateUpdate = void 0;
+const node_fs_1 = require("node:fs");
+const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
-const path = require("node:path");
 const otter_environment_1 = require("../rule-factories/otter-environment");
-const node_fs_1 = require("node:fs");
 /**
  * add a new ngUpdate function
  * @param options
@@ -14,7 +14,7 @@ function ngGenerateUpdateFn(options) {
     const generateFiles = (tree, _context) => {
         const destination = (0, schematics_2.getDestinationPath)('@o3r/core:schematics-update', options.path, tree, options.projectName);
         const sanitizedVersion = options.version.replace('.', '_');
-        const baseVersion = `${options.version}${options.version.indexOf('.') > -1 ? '' : '.0'}.0-alpha.0`;
+        const baseVersion = `${options.version}${options.version.includes('.') ? '' : '.0'}.0-alpha.0`;
         const updateFunction = `updateV${sanitizedVersion}`;
         const barrelPath = path.join(destination, 'schematics', 'ng-update', 'index.ts');
         let migrationFilePath = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(destination, '..', 'package.json'), { encoding: 'utf8' }))['ng-update'];

package/schematics/schematics-update/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/schematics-update/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,gCAAiC,SAAQ,qBAAqB;IAC7E,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAEhB,iDAAiD;IACjD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/schematics-update/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,gCAAiC,SAAQ,qBAAqB;IAC7E,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAEhB,iDAAiD;IACjD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB"}

package/schematics/service/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/service/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA2E,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAGlK,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAkG7D;;;GAGG;AACH,eAAO,MAAM,iBAAiB,sDAA6D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/service/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAWpC,OAAO,EACL,iCAAiC,EAClC,MAAM,UAAU,CAAC;AAkGlB;;;GAGG;AACH,eAAO,MAAM,iBAAiB,sDAA6D,CAAC"}

package/schematics/service/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateService = void 0;
+const path = require("node:path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
-const path = require("node:path");
 /**
  * Add a Service to an Otter project
  * @param options
@@ -25,9 +25,9 @@ function ngGenerateServiceFn(options) {
             tree.overwrite(barrelPath, currentServiceIndex);
         }
         const barrelJasminePath = path.join(destination, name, 'fixture', 'jasmine', 'index.ts');
-        const currentFixtureJasmineIndex = tree.exists(barrelJasminePath) && tree.read(barrelJasminePath)?.toString() || '';
+        const currentFixtureJasmineIndex = (tree.exists(barrelJasminePath) && tree.read(barrelJasminePath)?.toString()) || '';
         const barrelJestPath = path.join(destination, name, 'fixture', 'jest', 'index.ts');
-        const currentFixtureJestIndex = tree.exists(barrelJestPath) && tree.read(barrelJestPath)?.toString() || '';
+        const currentFixtureJestIndex = (tree.exists(barrelJestPath) && tree.read(barrelJestPath)?.toString()) || '';
         const inServiceBarrelPath = path.join(destination, name, 'index.ts');
         if (tree.exists(inServiceBarrelPath)) {
             const currentServiceIndexBuffer = tree.read(inServiceBarrelPath);

package/schematics/service/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/service/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,iCAAkC,SAAQ,qBAAqB;IAC9E,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,kCAAkC;IAClC,WAAW,EAAE,MAAM,CAAC;IAEpB,wCAAwC;IACxC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/service/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,iCAAkC,SAAQ,qBAAqB;IAC9E,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,kCAAkC;IAClC,WAAW,EAAE,MAAM,CAAC;IAEpB,wCAAwC;IACxC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB"}

package/schematics/shared/presets/all.preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"all.preset.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/all.preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGxD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,aAAa;;;EA8B/C"}
+{"version":3,"file":"all.preset.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/all.preset.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B;;;GAGG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,aAAa;;;EA6B/C"}

package/schematics/shared/presets/all.preset.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.allPreset = allPreset;
 const schematics_1 = require("@angular-devkit/schematics");
-const helpers_1 = require("./helpers");
 const schematics_2 = require("@o3r/schematics");
+const helpers_1 = require("./helpers");
 /**
  * Preset Installing all the Otter modules
  * @param options
@@ -17,7 +17,7 @@ function allPreset(options) {
         '@o3r/configuration',
         '@o3r/design',
         '@o3r/dynamic-content',
-        '@o3r/eslint-config-otter',
+        '@o3r/eslint-config',
         '@o3r/eslint-plugin',
         '@o3r/forms',
         '@o3r/localization',
@@ -31,7 +31,6 @@ function allPreset(options) {
     return {
         modules,
         rule: (0, schematics_1.chain)([
-            // eslint-disable-next-line @typescript-eslint/naming-convention
             (0, schematics_2.setupSchematicsParamsForProject)({ '*:ng-add': { enableMetadataExtract: true } }, options.projectName),
             rule
         ])

package/schematics/shared/presets/basic.preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basic.preset.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/basic.preset.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,wBAAgB,WAAW;;EAI1B"}
+{"version":3,"file":"basic.preset.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/basic.preset.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,wBAAgB,WAAW;;EAI1B"}

package/schematics/shared/presets/cms.preset.d.ts

@@ -1,7 +1,6 @@
 import type { PresetOptions } from './preset.interface';
 /**
  * Preset Installing the minimum modules to fully administrated the application via CMS
- *
  * @param options
  */
 export declare function cmsPreset(options: PresetOptions): {

package/schematics/shared/presets/cms.preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cms.preset.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/cms.preset.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGxD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,aAAa;;;EAoB/C"}
+{"version":3,"file":"cms.preset.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/cms.preset.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B;;;GAGG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,aAAa;;;EAmB/C"}

package/schematics/shared/presets/cms.preset.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cmsPreset = cmsPreset;
 const schematics_1 = require("@angular-devkit/schematics");
-const helpers_1 = require("./helpers");
 const schematics_2 = require("@o3r/schematics");
+const helpers_1 = require("./helpers");
 /**
  * Preset Installing the minimum modules to fully administrated the application via CMS
- *
  * @param options
  */
 function cmsPreset(options) {
@@ -22,7 +21,6 @@ function cmsPreset(options) {
     return {
         modules,
         rule: (0, schematics_1.chain)([
-            // eslint-disable-next-line @typescript-eslint/naming-convention
             (0, schematics_2.setupSchematicsParamsForProject)({ '*:ng-add': { enableMetadataExtract: true } }, options.projectName),
             rule
         ])

package/schematics/shared/presets/external.preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"external.preset.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/external.preset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAQxD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,mBAAmB,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,GAAG,aAAa,CAanH"}
+{"version":3,"file":"external.preset.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/external.preset.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,IAAI,EACL,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EACV,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,mBAAmB,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,GAAG,aAAa,CAanH"}

package/schematics/shared/presets/external.preset.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExternalPreset = getExternalPreset;
-const helpers_1 = require("./helpers");
 const schematics_1 = require("@o3r/schematics");
+const helpers_1 = require("./helpers");
 /**
  * Generate the Preset runner for external presets
  * @param externalPresetLabel

package/schematics/shared/presets/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAK3D,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAEtD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,aAAkB,GAAG,IAAI,CAiCrG"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/helpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EACV,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,aAAkB,GAAG,IAAI,CAkCrG"}

package/schematics/shared/presets/helpers.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultPresetRuleFactory = defaultPresetRuleFactory;
-const schematics_1 = require("@angular-devkit/schematics");
-const schematics_2 = require("@o3r/schematics");
 const fs = require("node:fs");
 const path = require("node:path");
+const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 /**
  * Default implementation of the preset rule
  * @param moduleToInstall
@@ -14,7 +14,7 @@ function defaultPresetRuleFactory(moduleToInstall, options = {}) {
     return (tree, _context) => {
         const corePackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', '..', 'package.json'), { encoding: 'utf8' }));
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        if (!moduleToInstall.length) {
+        if (moduleToInstall.length === 0) {
             return tree;
         }
         const dependencies = moduleToInstall.reduce((acc, dep) => {
@@ -33,11 +33,13 @@ function defaultPresetRuleFactory(moduleToInstall, options = {}) {
                 ...dependencies
             };
         }
-        return options.dependenciesSetupConfig ? schematics_1.noop : (0, schematics_2.setupDependencies)({
-            projectName: options.projectName,
-            dependencies,
-            ngAddToRun: moduleToInstall
-        });
+        return options.dependenciesSetupConfig
+            ? schematics_1.noop
+            : (0, schematics_2.setupDependencies)({
+                projectName: options.projectName,
+                dependencies,
+                ngAddToRun: moduleToInstall
+            });
     };
 }
 //# sourceMappingURL=helpers.js.map

package/schematics/shared/presets/index.d.ts

@@ -1,5 +1,5 @@
 import type { Presets } from './preset.interface';
-export * from './preset.interface';
 export * from './external.preset';
+export * from './preset.interface';
 export declare const presets: Presets;
 //# sourceMappingURL=index.d.ts.map

package/schematics/shared/presets/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAElD,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAElC,eAAO,MAAM,OAAO,EAAE,OAIrB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,OAAO,EACR,MAAM,oBAAoB,CAAC;AAE5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AAEnC,eAAO,MAAM,OAAO,EAAE,OAIrB,CAAC"}

package/schematics/shared/presets/index.js

@@ -5,8 +5,8 @@ const tslib_1 = require("tslib");
 const all_preset_1 = require("./all.preset");
 const basic_preset_1 = require("./basic.preset");
 const cms_preset_1 = require("./cms.preset");
-tslib_1.__exportStar(require("./preset.interface"), exports);
 tslib_1.__exportStar(require("./external.preset"), exports);
+tslib_1.__exportStar(require("./preset.interface"), exports);
 exports.presets = {
     basic: basic_preset_1.basicPreset,
     cms: cms_preset_1.cmsPreset,

package/schematics/shared/presets/preset.interface.d.ts

@@ -1,6 +1,6 @@
 import type { Rule } from '@angular-devkit/schematics';
-import type { PresetNames } from '../../ng-add/schema';
 import type { SchematicOptionObject, SetupDependenciesOptions } from '@o3r/schematics';
+import type { PresetNames } from '../../ng-add/schema';
 /** Options of the preset runner  */
 export interface PresetOptions {
     /** Project name */

package/schematics/shared/presets/preset.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preset.interface.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/preset.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAEvF,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAC5B,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,oDAAoD;IACpD,cAAc,CAAC,EAAE,qBAAqB,CAAC;IAEvC,uDAAuD;IACvD,uBAAuB,CAAC,EAAE,wBAAwB,CAAC;IAEnD,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,uCAAuC;AACvC,MAAM,WAAW,MAAM;IACrB,8CAA8C;IAC9C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,4CAA4C;IAC5C,IAAI,EAAE,IAAI,CAAC;CACZ;AAED,0DAA0D;AAC1D,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;AAEjF,kBAAkB;AAClB,MAAM,MAAM,OAAO,GAAG;KAAG,CAAC,IAAI,WAAW,GAAG,aAAa;CAAE,CAAC"}
+{"version":3,"file":"preset.interface.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/preset.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAE7B,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAC5B,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,oDAAoD;IACpD,cAAc,CAAC,EAAE,qBAAqB,CAAC;IAEvC,uDAAuD;IACvD,uBAAuB,CAAC,EAAE,wBAAwB,CAAC;IAEnD,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,uCAAuC;AACvC,MAAM,WAAW,MAAM;IACrB,8CAA8C;IAC9C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,4CAA4C;IAC5C,IAAI,EAAE,IAAI,CAAC;CACZ;AAED,0DAA0D;AAC1D,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;AAEjF,kBAAkB;AAClB,MAAM,MAAM,OAAO,GAAG;KAAG,CAAC,IAAI,WAAW,GAAG,aAAa;CAAE,CAAC"}

package/schematics/show-modules/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/show-modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAClD,OAAO,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAWzD;;;GAGG;AACH,eAAO,MAAM,aAAa,kDAAyD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/show-modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAOpC,OAAO,EACL,6BAA6B,EAC9B,MAAM,UAAU,CAAC;AAUlB;;;GAGG;AACH,eAAO,MAAM,aAAa,kDAAyD,CAAC"}

package/schematics/show-modules/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/show-modules/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,6BAA8B,SAAQ,qBAAqB;IAC1E,uDAAuD;IACvD,OAAO,EAAE,OAAO,CAAC;IACjB,8DAA8D;IAC9D,mBAAmB,EAAE,OAAO,CAAC;CAC9B"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/show-modules/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,6BAA8B,SAAQ,qBAAqB;IAC1E,uDAAuD;IACvD,OAAO,EAAE,OAAO,CAAC;IACjB,8DAA8D;IAC9D,mBAAmB,EAAE,OAAO,CAAC;CAC9B"}

package/schematics/store/common/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../schematics/store/common/helpers.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,MAAM,WAAW,wBAAwB;IAEvC,uDAAuD;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,uCAAuC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,mDAAmD;IACnD,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,gDAAgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,6CAA6C;IAC7C,MAAM,EAAE,OAAO,CAAC;IAEhB,6EAA6E;IAC7E,WAAW,EAAE,OAAO,CAAC;IAErB,gDAAgD;IAChD,cAAc,EAAE,MAAM,CAAC;IAEvB,oDAAoD;IACpD,gBAAgB,EAAE,MAAM,CAAC;IAEzB,8CAA8C;IAC9C,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,2BAA2B;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,0BAA0B;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,gBAAgB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../schematics/store/common/helpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,wBAAwB;IAEvC,uDAAuD;IACvD,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,uCAAuC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,mDAAmD;IACnD,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,gDAAgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,6CAA6C;IAC7C,MAAM,EAAE,OAAO,CAAC;IAEhB,6EAA6E;IAC7E,WAAW,EAAE,OAAO,CAAC;IAErB,gDAAgD;IAChD,cAAc,EAAE,MAAM,CAAC;IAEvB,oDAAoD;IACpD,gBAAgB,EAAE,MAAM,CAAC;IAEzB,8CAA8C;IAC9C,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,2BAA2B;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,0BAA0B;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,gBAAgB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}

package/schematics/store/common/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/store/common/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D;;GAEG;AACH,MAAM,WAAW,qCAAsC,SAAQ,qBAAqB;IAClF,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAElB,kBAAkB;IAClB,UAAU,EAAE,MAAM,CAAC;IAEnB,wDAAwD;IACxD,SAAS,EAAE,MAAM,CAAC;IAElB,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/store/common/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB;;GAEG;AACH,MAAM,WAAW,qCAAsC,SAAQ,qBAAqB;IAClF,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAElB,kBAAkB;IAClB,UAAU,EAAE,MAAM,CAAC;IAEnB,wDAAwD;IACxD,SAAS,EAAE,MAAM,CAAC;IAElB,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB"}

package/schematics/store/entity-async/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/store/entity-async/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA2E,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAIlK,OAAO,EAAE,0CAA0C,EAAE,MAAM,UAAU,CAAC;AAwEtE;;;GAGG;AACH,eAAO,MAAM,0BAA0B,+DAAsE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/store/entity-async/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAWpC,OAAO,EACL,0CAA0C,EAC3C,MAAM,UAAU,CAAC;AA0ElB;;;GAGG;AACH,eAAO,MAAM,0BAA0B,+DAAsE,CAAC"}

package/schematics/store/entity-async/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateEntityAsyncStore = void 0;
+const path = require("node:path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
-const path = require("node:path");
 /**
  * Create an Otter friendly entity async store
  * @param options
@@ -29,7 +29,7 @@ function ngGenerateEntityAsyncStoreFn(options) {
             hasCustomId: !!options.modelIdPropName && options.modelIdPropName !== 'id',
             storeModelName: options.sdkPackage ? `${core_1.strings.classify(options.modelName)}Model` : `${core_1.strings.classify(options.storeName)}Model`,
             payloadModelName: options.sdkPackage ? options.modelName : `${core_1.strings.classify(options.storeName)}Model`,
-            modelIdPropName: options.modelIdPropName ? options.modelIdPropName : 'id',
+            modelIdPropName: options.modelIdPropName || 'id',
             reviverModelName: `revive${options.modelName}`,
             fileName: core_1.strings.dasherize(options.storeName)
         };
@@ -50,8 +50,7 @@ function ngGenerateEntityAsyncStoreFn(options) {
             }),
             (0, schematics_1.renameTemplateFiles)(),
             (0, schematics_1.move)(`${destination}/${core_1.strings.dasherize(options.storeName)}`)
-        ]), schematics_1.MergeStrategy.Overwrite));
-        rules.push((0, schematics_1.mergeWith)((0, schematics_1.apply)(asyncEntityTemplates, [
+        ]), schematics_1.MergeStrategy.Overwrite), (0, schematics_1.mergeWith)((0, schematics_1.apply)(asyncEntityTemplates, [
             (0, schematics_1.template)({
                 ...core_1.strings,
                 ...options,

package/schematics/store/entity-async/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/store/entity-async/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,kBAAkB,CAAC;AAEzE;;GAEG;AACH,MAAM,WAAW,0CAA2C,SAAQ,qCAAqC;IACvG,kDAAkD;IAClD,eAAe,EAAE,MAAM,CAAC;IAExB,0BAA0B;IAC1B,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/store/entity-async/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qCAAqC,EACtC,MAAM,kBAAkB,CAAC;AAE1B;;GAEG;AACH,MAAM,WAAW,0CAA2C,SAAQ,qCAAqC;IACvG,kDAAkD;IAClD,eAAe,EAAE,MAAM,CAAC;IAExB,0BAA0B;IAC1B,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC"}

package/schematics/store/entity-sync/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/store/entity-sync/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAsD,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAK7I,OAAO,EAAE,yCAAyC,EAAE,MAAM,UAAU,CAAC;AAuErE;;;GAGG;AACH,eAAO,MAAM,yBAAyB,8DAAqE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/store/entity-sync/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAWpC,OAAO,EACL,yCAAyC,EAC1C,MAAM,UAAU,CAAC;AAyElB;;;GAGG;AACH,eAAO,MAAM,yBAAyB,8DAAqE,CAAC"}

package/schematics/store/entity-sync/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateEntitySyncStore = void 0;
+const path = require("node:path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
-const path = require("node:path");
 /**
  * Create an Otter friendly entity sync store
  * @param options
@@ -29,7 +29,7 @@ function ngGenerateEntitySyncStoreFn(options) {
             hasCustomId: !!options.modelIdPropName && options.modelIdPropName !== 'id',
             storeModelName: options.sdkPackage ? `${core_1.strings.classify(options.modelName)}Model` : `${core_1.strings.classify(options.storeName)}Model`,
             payloadModelName: options.sdkPackage ? options.modelName : `${core_1.strings.classify(options.storeName)}Model`,
-            modelIdPropName: options.modelIdPropName ? options.modelIdPropName : 'id',
+            modelIdPropName: options.modelIdPropName || 'id',
             reviverModelName: `revive${options.modelName}`,
             fileName: core_1.strings.dasherize(options.storeName)
         };
@@ -49,8 +49,7 @@ function ngGenerateEntitySyncStoreFn(options) {
                 currentStoreIndex
             }),
             (0, schematics_1.move)(`${destination}/${core_1.strings.dasherize(options.storeName)}`)
-        ]), schematics_1.MergeStrategy.Overwrite));
-        rules.push((0, schematics_1.mergeWith)((0, schematics_1.apply)(syncEntityTemplates, [
+        ]), schematics_1.MergeStrategy.Overwrite), (0, schematics_1.mergeWith)((0, schematics_1.apply)(syncEntityTemplates, [
             (0, schematics_1.template)({
                 ...core_1.strings,
                 ...options,

package/schematics/store/entity-sync/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/store/entity-sync/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,qCAAqC,EAAC,MAAM,kBAAkB,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,yCAA0C,SAAQ,qCAAqC;IACtG,kDAAkD;IAClD,eAAe,EAAE,MAAM,CAAC;CACzB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/store/entity-sync/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qCAAqC,EACtC,MAAM,kBAAkB,CAAC;AAE1B;;GAEG;AACH,MAAM,WAAW,yCAA0C,SAAQ,qCAAqC;IACtG,kDAAkD;IAClD,eAAe,EAAE,MAAM,CAAC;CACzB"}

package/schematics/store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAa,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,+BAA+B,EAAE,MAAM,UAAU,CAAC;AA0B3D;;;GAGG;AACH,eAAO,MAAM,eAAe,oDAA2D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAEL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EACL,+BAA+B,EAChC,MAAM,UAAU,CAAC;AA+BlB;;;GAGG;AACH,eAAO,MAAM,eAAe,oDAA2D,CAAC"}

package/schematics/store/index.js

@@ -14,16 +14,21 @@ function ngGenerateStoreFn(options) {
         return acc;
     }, {});
     switch (options.storeType) {
-        case 'simple-sync':
+        case 'simple-sync': {
             return (0, schematics_1.schematic)('store-simple-sync', parameterToChildSchematics);
-        case 'simple-async':
+        }
+        case 'simple-async': {
             return (0, schematics_1.schematic)('store-simple-async', parameterToChildSchematics);
-        case 'entity-async':
+        }
+        case 'entity-async': {
             return (0, schematics_1.schematic)('store-entity-async', parameterToChildSchematics);
-        case 'entity-sync':
+        }
+        case 'entity-sync': {
             return (0, schematics_1.schematic)('store-entity-sync', parameterToChildSchematics);
-        default:
+        }
+        default: {
             return (0, schematics_1.schematic)('store-entity-async', parameterToChildSchematics);
+        }
     }
 }
 /**

package/schematics/store/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/store/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,0CAA0C,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,yCAAyC,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,0CAA0C,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,yCAAyC,EAAE,MAAM,sBAAsB,CAAC;AAEjF;;GAEG;AACH,MAAM,WAAW,mCAAoC,SAAQ,qBAAqB;IAChF,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,iBAAiB;IACjB,SAAS,EAAE,cAAc,GAAG,cAAc,GAAG,aAAa,GAAG,aAAa,CAAC;IAE3E,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,KAAK,QAAQ,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS;CAAE,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,+BAA+B,GAAG,mCAAmC,GAC/E,QAAQ,CAAC,0CAA0C,CAAC,GACpD,QAAQ,CAAC,0CAA0C,CAAC,GACpD,QAAQ,CAAC,yCAAyC,CAAC,GACnD,QAAQ,CAAC,yCAAyC,CAAC,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/store/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,0CAA0C,EAC3C,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,yCAAyC,EAC1C,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,0CAA0C,EAC3C,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,yCAAyC,EAC1C,MAAM,sBAAsB,CAAC;AAE9B;;GAEG;AACH,MAAM,WAAW,mCAAoC,SAAQ,qBAAqB;IAChF,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,iBAAiB;IACjB,SAAS,EAAE,cAAc,GAAG,cAAc,GAAG,aAAa,GAAG,aAAa,CAAC;IAE3E,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,KAAK,QAAQ,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS;CAAE,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,+BAA+B,GAAG,mCAAmC,GAC/E,QAAQ,CAAC,0CAA0C,CAAC,GACpD,QAAQ,CAAC,0CAA0C,CAAC,GACpD,QAAQ,CAAC,yCAAyC,CAAC,GACnD,QAAQ,CAAC,yCAAyC,CAAC,CAAC"}

package/schematics/store/simple-async/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/store/simple-async/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA2E,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAIlK,OAAO,EAAE,0CAA0C,EAAE,MAAM,UAAU,CAAC;AAqEtE;;;GAGG;AACH,eAAO,MAAM,0BAA0B,+DAAsE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/store/simple-async/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAQL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAWpC,OAAO,EACL,0CAA0C,EAC3C,MAAM,UAAU,CAAC;AAuElB;;;GAGG;AACH,eAAO,MAAM,0BAA0B,+DAAsE,CAAC"}

package/schematics/store/simple-async/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateSimpleAsyncStore = void 0;
+const path = require("node:path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
-const path = require("node:path");
 /**
  * Create an Otter friendly simple async store
  * @param options
@@ -46,8 +46,7 @@ function ngGenerateSimpleAsyncStoreFn(options) {
             }),
             (0, schematics_1.renameTemplateFiles)(),
             (0, schematics_1.move)(`${destination}/${core_1.strings.dasherize(options.storeName)}`)
-        ]), schematics_1.MergeStrategy.Overwrite));
-        rules.push((0, schematics_1.mergeWith)((0, schematics_1.apply)(syncEntityTemplates, [
+        ]), schematics_1.MergeStrategy.Overwrite), (0, schematics_1.mergeWith)((0, schematics_1.apply)(syncEntityTemplates, [
             (0, schematics_1.template)({
                 ...core_1.strings,
                 ...options,

package/schematics/store/simple-async/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/store/simple-async/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,kBAAkB,CAAC;AAEzE;;GAEG;AACH,MAAM,WAAW,0CAA2C,SAAQ,qCAAqC;IACvG,0BAA0B;IAC1B,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/store/simple-async/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qCAAqC,EACtC,MAAM,kBAAkB,CAAC;AAE1B;;GAEG;AACH,MAAM,WAAW,0CAA2C,SAAQ,qCAAqC;IACvG,0BAA0B;IAC1B,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC"}

package/schematics/store/simple-sync/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/store/simple-sync/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAqD,IAAI,EAAwC,MAAM,4BAA4B,CAAC;AAI3I,OAAO,EAAC,yCAAyC,EAAC,MAAM,UAAU,CAAC;AA+DnE,eAAO,MAAM,yBAAyB,8DAAqE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/store/simple-sync/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAWpC,OAAO,EACL,yCAAyC,EAC1C,MAAM,UAAU,CAAC;AAgElB,eAAO,MAAM,yBAAyB,8DAAqE,CAAC"}