@o3r/core 10.0.0-next.9 → 11.0.0-next.0

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

@@ -8,7 +8,6 @@ const schematics_2 = require("@o3r/schematics");
 const node_path_1 = require("node:path");
 /**
  * Update Otter environment variable for schematics
- *
  * @param options @see RuleFactory.options
  * @param rootPath @see RuleFactory.rootPath
  * @param options.projectName
@@ -22,15 +21,14 @@ const node_path_1 = require("node:path");
 function updateOtterEnvironmentAdapter(options, _rootPath) {
     /**
      * Add Configuration for schematics
-     *
      * @param tree
      * @param _context
      * @param context
      */
     const editAngularJson = (tree, context) => {
-        const workspace = (0, schematics_2.readAngularJson)(tree);
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, options.projectName, 'application');
-        if (!workspaceProject) {
+        const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
+        const workspaceProject = options.projectName ? workspace?.projects[options.projectName] : undefined;
+        if (!workspace || !workspaceProject) {
             context.logger.error('No application detected, the Otter environment will not be setup');
             return tree;
         }
@@ -61,8 +59,7 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
                     workspaceProject.architect.build.configurations.options.outputPath ||= (0, node_path_1.join)(workspaceProject.root, 'dist-dev');
                 }
             }
-            const { name, ...newProject } = workspaceProject;
-            workspace.projects[name] = newProject;
+            workspace.projects[options.projectName] = workspaceProject;
         }
         else {
             workspace.cli.packageManager ||= (0, schematics_2.getPackageManager)();
@@ -93,20 +90,19 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
     };
     /**
      * Use Angular CLI generator to create environment files
-     *
      * @param tree
      * @param context
      */
     const generateEnvironmentFiles = (tree, context) => {
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, options.projectName, 'application');
-        if (!workspaceProject) {
+        const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
+        const workspaceProject = options.projectName ? workspace?.projects[options.projectName] : undefined;
+        if (!workspace || !workspaceProject) {
             context.logger.error('No application detected, the environment can not be generated');
             return tree;
         }
         if (tree.exists(node_path_1.posix.join(workspaceProject.root, 'src/environments/environment.ts'))) {
             return tree;
         }
-        const workspace = (0, schematics_2.readAngularJson)(tree);
         const projectName = options.projectName || Object.keys(workspace.projects)[0];
         const envBasePath = node_path_1.posix.join(workspaceProject.root, 'src', 'environments');
         const envDevFilePath = node_path_1.posix.join(envBasePath, 'environment.development.ts');
@@ -117,12 +113,11 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
     };
     /**
      * Update environment files to add `production` boolean
-     *
      * @param tree
      * @param _context
      */
     const editEnvironmentFiles = (tree, _context) => {
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, options.projectName, 'application');
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         if (!workspaceProject) {
             return tree;
         }

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"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"}

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,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAWnD;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAC,EAAE,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CAyHpK"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAWjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAgBnD;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAC,EAAE,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CA+IpK"}

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

@@ -2,19 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateStore = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
-const ts = require("typescript");
+const schematics_2 = require("@o3r/schematics");
+const utility_1 = require("@schematics/angular/utility");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const path = require("node:path");
-const schematics_2 = require("@o3r/schematics");
+const ts = require("typescript");
+const fs = require("node:fs");
 const packageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
 const ngrxEffectsDep = '@ngrx/effects';
 const ngrxEntityDep = '@ngrx/entity';
 const ngrxStoreDep = '@ngrx/store';
-/** @deprecated to be removed in v10 */
-const ngrxStoreLocalstorageDep = 'ngrx-store-localstorage';
 const ngrxRouterStore = '@ngrx/router-store';
 const ngrxRouterStoreDevToolDep = '@ngrx/store-devtools';
+const fastDeepEqualDep = 'fast-deep-equal';
 /**
  * Add Redux Store support
  *
@@ -24,6 +25,23 @@ const ngrxRouterStoreDevToolDep = '@ngrx/store-devtools';
  * @param projectType
  */
 function updateStore(options, projectType) {
+    const addStoreModules = (tree) => {
+        const coreSchematicsFolder = path.resolve(__dirname, '..', '..');
+        const corePackageJsonPath = path.resolve(coreSchematicsFolder, '..', 'package.json');
+        const corePackageJsonContent = JSON.parse(fs.readFileSync(corePackageJsonPath, { encoding: 'utf-8' }));
+        const o3rCoreVersion = corePackageJsonContent.version;
+        const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
+        const workspaceProject = options.projectName && workspaceConfig?.projects?.[options.projectName] || undefined;
+        const projectDirectory = workspaceProject?.root;
+        return (0, schematics_2.ngAddPackages)(['@o3r/store-sync'], {
+            skipConfirmation: true,
+            version: o3rCoreVersion,
+            parentPackageInfo: '@o3r/core - setup',
+            projectName: options.projectName,
+            dependencyType: dependencies_1.NodeDependencyType.Default,
+            workingDirectory: projectDirectory
+        });
+    };
     /**
      * Changed package.json start script to run localization generation
      *
@@ -32,12 +50,11 @@ function updateStore(options, projectType) {
      */
     const updatePackageJson = (tree, context) => {
         const type = projectType === 'library' ? dependencies_1.NodeDependencyType.Peer : dependencies_1.NodeDependencyType.Default;
-        const appDeps = [ngrxEffectsDep, ngrxRouterStoreDevToolDep];
-        const corePeerDeps = [ngrxEntityDep, ngrxStoreDep, ngrxStoreLocalstorageDep];
+        const appDeps = [ngrxEffectsDep, ngrxRouterStore, ngrxRouterStoreDevToolDep, fastDeepEqualDep];
+        const corePeerDeps = [ngrxEntityDep, ngrxStoreDep];
         let dependenciesList = [...corePeerDeps];
         if (projectType === 'application') {
             dependenciesList = [...dependenciesList, ...appDeps];
-            dependenciesList = (0, schematics_2.isApplicationThatUsesRouterModule)(tree, options) ? [...dependenciesList, ngrxRouterStore] : dependenciesList;
         }
         return () => {
             try {
@@ -56,6 +73,7 @@ function updateStore(options, projectType) {
      * @param context
      */
     const registerModules = (tree, context) => {
+        const additionalRules = [];
         const moduleFilePath = (0, schematics_2.getAppModuleFilePath)(tree, context, options.projectName);
         if (!moduleFilePath) {
             return tree;
@@ -67,14 +85,13 @@ function updateStore(options, projectType) {
             return tree;
         }
         let recorder = tree.beginUpdate(moduleFilePath);
-        const ngModulesMetadata = (0, ast_utils_1.getDecoratorMetadata)(sourceFile, 'NgModule', '@angular/core');
-        const moduleIndex = ngModulesMetadata[0] ? ngModulesMetadata[0].pos - ('NgModule'.length + 1) : sourceFileContent.indexOf('@NgModule');
-        const addImportToModuleFile = (name, file, moduleFunction) => recorder = (0, schematics_2.addImportToModuleFile)(name, file, sourceFile, sourceFileContent, context, recorder, moduleFilePath, moduleIndex, moduleFunction);
+        const { moduleIndex } = (0, schematics_2.getModuleIndex)(sourceFile, sourceFileContent);
+        const addImportToModuleFile = (name, file, moduleFunction) => additionalRules.push((0, utility_1.addRootImport)(options.projectName, ({ code, external }) => code `${external(name, file)}${moduleFunction}`));
         const insertImportToModuleFile = (name, file, isDefault) => recorder = (0, schematics_2.insertImportToModuleFile)(name, file, sourceFile, recorder, moduleFilePath, isDefault);
         const insertBeforeModule = (line) => recorder = (0, schematics_2.insertBeforeModule)(line, sourceFileContent, recorder, moduleIndex);
         addImportToModuleFile('EffectsModule', '@ngrx/effects', '.forRoot([])');
         addImportToModuleFile('StoreModule', '@ngrx/store', '.forRoot(rootReducers, {metaReducers, runtimeChecks})');
-        insertImportToModuleFile('StorageSync', '@o3r/core');
+        insertImportToModuleFile('StorageSync', '@o3r/store-sync');
         insertImportToModuleFile('RuntimeChecks', '@ngrx/store');
         insertImportToModuleFile('Serializer', '@o3r/core');
         insertImportToModuleFile('environment', '../environments/environment');
@@ -102,10 +119,10 @@ const runtimeChecks: Partial<RuntimeChecks> = {
   strictStateSerializability: false
 };`);
         tree.commitUpdate(recorder);
-        return tree;
+        return (0, schematics_1.chain)(additionalRules)(tree, context);
     };
     return (0, schematics_1.chain)([
-        ...(projectType === 'application' ? [registerModules] : []),
+        ...(projectType === 'application' ? [registerModules, addStoreModules] : []),
         updatePackageJson
     ]);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"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"}

package/schematics/schematics-update/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ngGenerateUpdateSchematicsSchema",
   "title": "Generate Otter NgUpdate rule",
   "description": "ng generate Otter ngUpdate rule",

package/schematics/service/index.d.ts

@@ -2,7 +2,6 @@ import { Rule } from '@angular-devkit/schematics';
 import { NgGenerateServiceSchematicsSchema } from './schema';
 /**
  * add a Service to an Otter project
- *
  * @param options
  */
 export declare function ngGenerateService(options: NgGenerateServiceSchematicsSchema): Rule;

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;AAE7D;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,iCAAiC,GAAG,IAAI,CAsFlF"}
+{"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;AAE7D;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,iCAAiC,GAAG,IAAI,CAsFlF"}

package/schematics/service/index.js

@@ -7,7 +7,6 @@ const schematics_2 = require("@o3r/schematics");
 const path = require("node:path");
 /**
  * add a Service to an Otter project
- *
  * @param options
  */
 function ngGenerateService(options) {
@@ -37,7 +36,7 @@ function ngGenerateService(options) {
         else {
             currentServiceIndex = '';
         }
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree);
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
         let packageName = destination;
         if (workspaceProject?.projectType !== 'application') {

package/schematics/service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/service/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/service/index.ts"],"names":[],"mappings":"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"}

package/schematics/service/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ngGenerateServiceSchematicsSchema",
   "title": "Generate Otter Service",
   "description": "ng generate Otter Service",

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

@@ -0,0 +1,10 @@
+import type { PresetOptions } from './preset.interface';
+/**
+ * Preset Installing all the Otter modules
+ * @param options
+ */
+export declare function allPreset(options: PresetOptions): {
+    modules: string[];
+    rule: import("@angular-devkit/schematics").Rule;
+};
+//# sourceMappingURL=all.preset.d.ts.map

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

@@ -0,0 +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;;;EA6B/C"}

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

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.allPreset = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const helpers_1 = require("./helpers");
+const schematics_2 = require("@o3r/schematics");
+/**
+ * Preset Installing all the Otter modules
+ * @param options
+ */
+function allPreset(options) {
+    const modules = [
+        '@o3r/analytics',
+        '@o3r/apis-manager',
+        '@o3r/application',
+        '@o3r/components',
+        '@o3r/configuration',
+        '@o3r/dynamic-content',
+        '@o3r/eslint-config-otter',
+        '@o3r/eslint-plugin',
+        '@o3r/forms',
+        '@o3r/localization',
+        '@o3r/logger',
+        '@o3r/rules-engine',
+        '@o3r/store-sync',
+        '@o3r/stylelint-plugin',
+        '@o3r/styling'
+    ];
+    const rule = (0, helpers_1.defaultPresetRuleFactory)(modules, options);
+    return {
+        modules,
+        rule: (0, schematics_1.chain)([
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            (0, schematics_2.setupSchematicsDefaultParams)({ '*:ng-add': { enableMetadataExtract: true } }),
+            rule
+        ])
+    };
+}
+exports.allPreset = allPreset;
+//# sourceMappingURL=all.preset.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"all.preset.js","sourceRoot":"","sources":["../../../../schematics/shared/presets/all.preset.ts"],"names":[],"mappings":";;;AAAA,2DAAmD;AACnD,uCAAqD;AAErD,gDAAoF;AAEpF;;;GAGG;AACH,SAAgB,SAAS,CAAC,OAAsB;IAC9C,MAAM,OAAO,GAAG;QACd,gBAAgB;QAChB,mBAAmB;QACnB,kBAAkB;QAClB,iBAAiB;QACjB,oBAAoB;QACpB,sBAAsB;QACtB,0BAA0B;QAC1B,oBAAoB;QACpB,YAAY;QACZ,mBAAmB;QACnB,aAAa;QACb,mBAAmB;QACnB,iBAAiB;QACjB,uBAAuB;QACvB,cAAc;KACf,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,kCAAwB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAExD,OAAO;QACL,OAAO;QACP,IAAI,EAAE,IAAA,kBAAK,EAAC;YACV,gEAAgE;YAChE,IAAA,yCAA4B,EAAC,EAAE,UAAU,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,EAAyB,CAAC;YACpG,IAAI;SACL,CAAC;KACH,CAAC;AACJ,CAAC;AA7BD,8BA6BC"}

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

@@ -0,0 +1,10 @@
+import { SchematicContext, Tree } from '@angular-devkit/schematics';
+import type { PresetFactory } from './preset.interface';
+/**
+ * Generate the Preset runner for external presets
+ * @param externalPresetLabel
+ * @param tree
+ * @param context
+ */
+export declare function getExternalPreset(externalPresetLabel: string, tree: Tree, context: SchematicContext): PresetFactory;
+//# sourceMappingURL=external.preset.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getExternalPreset = void 0;
+const helpers_1 = require("./helpers");
+const schematics_1 = require("@o3r/schematics");
+/**
+ * Generate the Preset runner for external presets
+ * @param externalPresetLabel
+ * @param tree
+ * @param context
+ */
+function getExternalPreset(externalPresetLabel, tree, context) {
+    const presetLabel = `${schematics_1.OTTER_MODULE_PRESET_PREFIX}${externalPresetLabel}`;
+    return async (options) => {
+        const modules = (await (0, schematics_1.getAvailableModules)(presetLabel, schematics_1.OTTER_MODULE_SUPPORTED_SCOPES, { logger: context.logger, workspaceConfig: (0, schematics_1.getWorkspaceConfig)(tree) }))
+            .map((mod) => mod.name);
+        const rule = (0, helpers_1.defaultPresetRuleFactory)(modules, options);
+        return {
+            modules,
+            rule
+        };
+    };
+}
+exports.getExternalPreset = getExternalPreset;
+//# sourceMappingURL=external.preset.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"external.preset.js","sourceRoot":"","sources":["../../../../schematics/shared/presets/external.preset.ts"],"names":[],"mappings":";;;AACA,uCAAqD;AAErD,gDAKyB;AAEzB;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,mBAA2B,EAAE,IAAU,EAAE,OAAyB;IAClG,MAAM,WAAW,GAAG,GAAG,uCAA0B,GAAG,mBAAmB,EAAE,CAAC;IAE1E,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,OAAO,GAAG,CAAC,MAAM,IAAA,gCAAmB,EAAC,WAAW,EAAE,0CAA6B,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAC3J,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,IAAI,GAAG,IAAA,kCAAwB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAExD,OAAO;YACL,OAAO;YACP,IAAI;SACL,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAbD,8CAaC"}

package/schematics/shared/presets/helpers.js

@@ -12,7 +12,7 @@ const path = require("node:path");
  */
 function defaultPresetRuleFactory(moduleToInstall, options = {}) {
     return (tree, _context) => {
-        const workingDirectory = options.projectName ? (0, schematics_1.getProjectRootDir)(tree, options.projectName) : '.';
+        const workingDirectory = options?.projectName && (0, schematics_1.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root || '.';
         if (!moduleToInstall.length) {
             return tree;
         }

package/schematics/shared/presets/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../schematics/shared/presets/helpers.ts"],"names":[],"mappings":";;;AACA,gDAAiE;AACjE,2EAA4E;AAC5E,8BAA8B;AAC9B,kCAAkC;AAIlC;;;;GAIG;AACH,SAAgB,wBAAwB,CAAC,eAAyB,EAAE,UAAyB,EAAE;IAE7F,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;QACxB,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,8BAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAClG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;QAED,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAgB,CAAC;QAC5J,OAAO,IAAA,0BAAa,EAAC,eAAe,EAAE;YACpC,GAAG,OAAO;YACV,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE,sBAAsB,CAAC,OAAO;YACvC,iBAAiB,EAAE,0BAA0B;YAC7C,cAAc,EAAE,iCAAkB,CAAC,GAAG;YACtC,gBAAgB;SACjB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAlBD,4DAkBC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../schematics/shared/presets/helpers.ts"],"names":[],"mappings":";;;AACA,gDAAoE;AACpE,2EAA4E;AAC5E,8BAA8B;AAC9B,kCAAkC;AAIlC;;;;GAIG;AACH,SAAgB,wBAAwB,CAAC,eAAyB,EAAE,UAAyB,EAAE;IAE7F,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;QACxB,MAAM,gBAAgB,GAAG,OAAO,EAAE,WAAW,IAAI,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,IAAI,GAAG,CAAC;QACtH,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;QAED,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAgB,CAAC;QAC5J,OAAO,IAAA,0BAAa,EAAC,eAAe,EAAE;YACpC,GAAG,OAAO;YACV,gBAAgB,EAAE,IAAI;YACtB,OAAO,EAAE,sBAAsB,CAAC,OAAO;YACvC,iBAAiB,EAAE,0BAA0B;YAC7C,cAAc,EAAE,iCAAkB,CAAC,GAAG;YACtC,gBAAgB;SACjB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAlBD,4DAkBC"}

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

@@ -1,4 +1,5 @@
 import type { Presets } from './preset.interface';
 export * from './preset.interface';
+export * from './external.preset';
 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":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAElD,cAAc,oBAAoB,CAAC;AAEnC,eAAO,MAAM,OAAO,EAAE,OAGrB,CAAC"}
+{"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"}

package/schematics/shared/presets/index.js

@@ -2,11 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.presets = void 0;
 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);
 exports.presets = {
     basic: basic_preset_1.basicPreset,
-    cms: cms_preset_1.cmsPreset
+    cms: cms_preset_1.cmsPreset,
+    all: all_preset_1.allPreset
 };
 //# sourceMappingURL=index.js.map

package/schematics/shared/presets/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/shared/presets/index.ts"],"names":[],"mappings":";;;;AAAA,iDAA6C;AAC7C,6CAAyC;AAGzC,6DAAmC;AAEtB,QAAA,OAAO,GAAY;IAC9B,KAAK,EAAE,0BAAW;IAClB,GAAG,EAAE,sBAAS;CACf,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/shared/presets/index.ts"],"names":[],"mappings":";;;;AAAA,6CAAyC;AACzC,iDAA6C;AAC7C,6CAAyC;AAGzC,6DAAmC;AACnC,4DAAkC;AAErB,QAAA,OAAO,GAAY;IAC9B,KAAK,EAAE,0BAAW;IAClB,GAAG,EAAE,sBAAS;IACd,GAAG,EAAE,sBAAS;CACf,CAAC"}

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

@@ -2,8 +2,7 @@ import { Rule } from '@angular-devkit/schematics';
 import { NgShowModulesSchematicsSchema } from './schema';
 /**
  * Show the list of available modules
- *
  * @param options
  */
-export declare function ngShowModules(options: NgShowModulesSchematicsSchema): Promise<Rule>;
+export declare function ngShowModules(options: NgShowModulesSchematicsSchema): Rule;
 //# sourceMappingURL=index.d.ts.map

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;AAGzD;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC,CAGzF"}
+{"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;AAGzD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,6BAA6B,GAAG,IAAI,CAE1E"}

package/schematics/show-modules/index.js

@@ -1,15 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngShowModules = void 0;
-const module_list_1 = require("../rule-factories/module-list");
+const schematics_1 = require("@o3r/schematics");
 /**
  * Show the list of available modules
- *
  * @param options
  */
-async function ngShowModules(options) {
-    const { OTTER_MODULE_KEYWORD, OTTER_MODULE_SUPPORTED_SCOPES } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return (0, module_list_1.displayModuleList)(OTTER_MODULE_KEYWORD, OTTER_MODULE_SUPPORTED_SCOPES, options.cmsOnly, options.hideInstalledModule);
+function ngShowModules(options) {
+    return (0, schematics_1.displayModuleListRule)({ keyword: schematics_1.OTTER_MODULE_KEYWORD, scopeWhitelist: schematics_1.OTTER_MODULE_SUPPORTED_SCOPES, onlyCmsModules: options.cmsOnly, onlyNotInstalledModules: options.hideInstalledModule });
 }
 exports.ngShowModules = ngShowModules;
 //# sourceMappingURL=index.js.map

package/schematics/show-modules/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/show-modules/index.ts"],"names":[],"mappings":";;;AAEA,+DAAkE;AAElE;;;;GAIG;AACI,KAAK,UAAU,aAAa,CAAC,OAAsC;IACxE,MAAM,EAAE,oBAAoB,EAAE,6BAA6B,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;IAChG,OAAO,IAAA,+BAAiB,EAAC,oBAAoB,EAAE,6BAA6B,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAC9H,CAAC;AAHD,sCAGC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/show-modules/index.ts"],"names":[],"mappings":";;;AAEA,gDAA6G;AAE7G;;;GAGG;AACH,SAAgB,aAAa,CAAC,OAAsC;IAClE,OAAO,IAAA,kCAAqB,EAAC,EAAE,OAAO,EAAE,iCAAoB,EAAE,cAAc,EAAE,0CAA6B,EAAE,cAAc,EAAE,OAAO,CAAC,OAAO,EAAE,uBAAuB,EAAE,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;AACxM,CAAC;AAFD,sCAEC"}

package/schematics/show-modules/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "NgShowModules",
   "title": "Show available Otter modules",
   "description": "ng generate Renovate bot",

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;AAKlK,OAAO,EAAE,0CAA0C,EAAE,MAAM,UAAU,CAAC;AAEtE;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,0CAA0C,GAAG,IAAI,CA4DpG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/store/entity-async/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA2E,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAKlK,OAAO,EAAE,0CAA0C,EAAE,MAAM,UAAU,CAAC;AAEtE;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,0CAA0C,GAAG,IAAI,CAgEpG"}

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

@@ -15,6 +15,10 @@ function ngGenerateEntityAsyncStore(options) {
         const destination = (0, schematics_2.getDestinationPath)('@o3r/core:store', options.path, tree, options.projectName);
         const commonTemplates = (0, schematics_1.url)('../common/templates');
         const asyncEntityTemplates = (0, schematics_1.url)('./templates');
+        options.storeName = options.storeName?.trim();
+        options.modelName = options.modelName?.trim();
+        options.sdkPackage = options.sdkPackage?.trim();
+        options.modelIdPropName = options.modelIdPropName?.trim();
         // Add extra formatted properties
         const formattedProperties = {
             isAsync: true,

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/store/entity-async/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/store/entity-async/index.ts"],"names":[],"mappings":"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"}

package/schematics/store/entity-async/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ngGenerateEntityAsyncStoreSchematicsSchema",
   "title": "Generate Entity Async Otter Store",
   "description": "ng generate Entity Async Otter Store",

package/schematics/store/entity-async/templates/__storeName@dasherize__.state.ts

@@ -5,7 +5,7 @@ import {AsyncStoreItem} from '@o3r/core';
 /**
  * <%= hasSDK ? modelName : storeName %> model
  */
-export interface <%= storeModelName %> extends AsyncStoreItem<% if (hasSDK) {%>, <%= modelName %><% } %>{
+export interface <%= storeModelName %> extends AsyncStoreItem<% if (hasSDK) {%>, <%= modelName %><% } %> {
   <% if (!hasSDK) {%><%= modelIdPropName %>: string;<% } %>
 }
 

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;AAM7I,OAAO,EAAE,yCAAyC,EAAE,MAAM,UAAU,CAAC;AAErE;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,yCAAyC,GAAG,IAAI,CA2DlG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/store/entity-sync/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAsD,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAM7I,OAAO,EAAE,yCAAyC,EAAE,MAAM,UAAU,CAAC;AAErE;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,yCAAyC,GAAG,IAAI,CA+DlG"}

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

@@ -15,6 +15,10 @@ function ngGenerateEntitySyncStore(options) {
         const destination = (0, schematics_2.getDestinationPath)('@o3r/core:store', options.path, tree, options.projectName);
         const commonTemplates = (0, schematics_1.url)('../common/templates');
         const syncEntityTemplates = (0, schematics_1.url)('./templates');
+        options.storeName = options.storeName?.trim();
+        options.modelName = options.modelName?.trim();
+        options.sdkPackage = options.sdkPackage?.trim();
+        options.modelIdPropName = options.modelIdPropName?.trim();
         // Add extra formatted properties
         const formattedProperties = {
             isAsync: false,