@o3r/core 11.0.0-next.0 → 11.0.0-next.1

package/schematics/ng-add/index.js

@@ -4,39 +4,54 @@ exports.ngAdd = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const fs = require("node:fs");
 const path = require("node:path");
-const rxjs_1 = require("rxjs");
 const presets_1 = require("../shared/presets");
 const prompt_1 = require("@angular/cli/src/utilities/prompt");
 const schematics_2 = require("@o3r/schematics");
 const index_1 = require("./project-setup/index");
+const schematics_3 = require("@o3r/schematics");
+const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const workspacePackageName = '@o3r/workspace';
+const o3rDevDependencies = [
+    '@o3r/schematics'
+];
 /**
  * Add Otter library to an Angular Project
  * @param options
  */
-function ngAdd(options) {
+function ngAddFn(options) {
     const corePackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
-    const o3rCoreVersion = corePackageJsonContent.version ? `@${corePackageJsonContent.version}` : '';
-    const schematicsDependencies = ['@o3r/schematics'];
-    return async (tree, context) => {
-        // check if the workspace package is installed, if not installed and we are in workspace context, we install
-        const workspacePackageName = '@o3r/workspace';
-        if (!options.projectName && !(0, schematics_2.isPackageInstalled)(workspacePackageName)) {
-            schematicsDependencies.push(workspacePackageName);
+    const o3rCoreVersion = corePackageJsonContent.version;
+    const o3rVersionRange = options.exactO3rVersion ? o3rCoreVersion : `~${o3rCoreVersion}`;
+    return () => {
+        const dependenciesSetupConfig = {
+            projectName: options.projectName,
+            dependencies: o3rDevDependencies.reduce((acc, dep) => {
+                acc[dep] = {
+                    inManifest: [{
+                            range: o3rVersionRange,
+                            types: [dependencies_1.NodeDependencyType.Dev]
+                        }],
+                    ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
+                };
+                return acc;
+            }, {}),
+            ngAddToRun: [...o3rDevDependencies]
+        };
+        if (!options.projectName) {
+            dependenciesSetupConfig.dependencies[workspacePackageName] = {
+                toWorkspaceOnly: true,
+                inManifest: [{
+                        range: o3rVersionRange,
+                        types: [dependencies_1.NodeDependencyType.Default]
+                    }],
+                ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
+            };
+            (dependenciesSetupConfig.ngAddToRun ||= []).push(workspacePackageName);
         }
-        context.addTask(new schematics_2.AddDevInstall({
-            packageName: [
-                ...schematicsDependencies.map((dependency) => dependency + o3rCoreVersion)
-            ].join(' '),
-            hideOutput: false,
-            quiet: false,
-            force: options.forceInstall
-        }));
-        await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
-        return () => (0, schematics_1.chain)([
+        return (0, schematics_1.chain)([
             // eslint-disable-next-line @typescript-eslint/naming-convention
             (0, schematics_2.setupSchematicsDefaultParams)({ '*:ng-add': { registerDevtool: options.withDevtool } }),
-            ...schematicsDependencies.map((dep) => (0, schematics_1.externalSchematic)(dep, 'ng-add', options)),
-            options.projectName ? (0, index_1.prepareProject)(options) : (0, schematics_1.noop)(),
+            options.projectName ? (0, index_1.prepareProject)(options, dependenciesSetupConfig) : (0, schematics_1.noop)(),
             (0, schematics_2.registerPackageCollectionSchematics)(corePackageJsonContent),
             async (t, c) => {
                 const { preset, externalPresets, ...forwardOptions } = options;
@@ -54,9 +69,14 @@ function ngAdd(options) {
                     externalPresetRunner?.rule || (0, schematics_1.noop)()
                 ])(t, c);
             },
-            (0, schematics_2.displayModuleListRule)({ packageName: options.projectName })
-        ])(tree, context);
+            options.projectName ? (0, schematics_2.displayModuleListRule)({ packageName: options.projectName }) : (0, schematics_1.noop)(),
+            (0, schematics_3.setupDependencies)(dependenciesSetupConfig)
+        ]);
     };
 }
-exports.ngAdd = ngAdd;
+/**
+ * Add Otter library to an Angular Project
+ * @param options
+ */
+exports.ngAdd = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngAddFn);
 //# sourceMappingURL=index.js.map

package/schematics/ng-add/index.js.map

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

package/schematics/ng-add/project-setup/index.d.ts

@@ -1,9 +1,11 @@
-import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
-import { NgAddSchematicsSchema } from '../schema';
+import { type Rule } from '@angular-devkit/schematics';
+import { type SetupDependenciesOptions } from '@o3r/schematics';
+import type { NgAddSchematicsSchema } from '../schema';
 /**
  * Enable all the otter features requested by the user
  * Install all the related dependencies and import the features inside the application
  * @param options installation options to pass to the all the other packages' installation
+ * @param dependenciesSetupConfig
  */
-export declare const prepareProject: (options: NgAddSchematicsSchema) => (tree: Tree, context: SchematicContext) => Promise<() => void | Rule | import("@angular-devkit/schematics/src/tree/interface").Tree | import("rxjs").Observable<import("@angular-devkit/schematics/src/tree/interface").Tree> | Promise<void | Rule>>;
+export declare const prepareProject: (options: NgAddSchematicsSchema, dependenciesSetupConfig: SetupDependenciesOptions) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-add/project-setup/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/project-setup/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAsBvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAMlD;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,YAAkB,IAAI,0OA6ClF,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/project-setup/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAUpE,OAAO,EAML,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAMvD;;;;;GAKG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,2BAA2B,wBAAwB,KAAG,IA+ClH,CAAC"}

package/schematics/ng-add/project-setup/index.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareProject = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
-const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const fs = require("node:fs");
 const path = require("node:path");
 const index_1 = require("../../rule-factories/index");
@@ -15,8 +14,9 @@ const index_2 = require("../utils/index");
  * Enable all the otter features requested by the user
  * Install all the related dependencies and import the features inside the application
  * @param options installation options to pass to the all the other packages' installation
+ * @param dependenciesSetupConfig
  */
-const prepareProject = (options) => async (tree, context) => {
+const prepareProject = (options, dependenciesSetupConfig) => async (tree, context) => {
     const coreSchematicsFolder = path.resolve(__dirname, '..');
     const corePackageJsonPath = path.resolve(coreSchematicsFolder, '..', '..', 'package.json');
     const corePackageJsonContent = JSON.parse(fs.readFileSync(corePackageJsonPath, { encoding: 'utf-8' }));
@@ -34,28 +34,32 @@ const prepareProject = (options) => async (tree, context) => {
         ...(installOtterLinter ? ['@o3r/eslint-config-otter'] : []),
         ...depsInfo.o3rPeerDeps
     ]));
-    const type = projectType === 'library' ? dependencies_1.NodeDependencyType.Peer : dependencies_1.NodeDependencyType.Default;
     const projectDirectory = workspaceProject?.root;
-    const optionsAndWorkingDir = { ...options, workingDirectory: projectDirectory };
-    return () => {
-        const appLibRules = [
-            (0, schematics_2.updateImports)(schematics_2.mapImportV7toV8, schematics_2.renamedPackagesV7toV8),
-            (0, update_builders_names_1.updateBuildersNames)(),
-            (0, update_generators_names_1.updateOtterGeneratorsNames)(),
-            (0, index_1.updateOtterEnvironmentAdapter)(optionsAndWorkingDir, coreSchematicsFolder),
-            (0, index_1.updateStore)(optionsAndWorkingDir, projectType),
-            options.enableCustomization && projectType === 'application' ? (0, index_1.updateCustomizationEnvironment)(coreSchematicsFolder, o3rCoreVersion, optionsAndWorkingDir, false) : schematics_1.noop,
-            projectType === 'application' ? (0, index_1.updateAdditionalModules)(optionsAndWorkingDir, coreSchematicsFolder) : schematics_1.noop,
-            (0, schematics_2.removePackages)(replaced_packages_1.packagesToRemove),
-            (0, index_1.o3rBasicUpdates)(options.projectName, o3rCoreVersion, projectType),
-            (0, schematics_2.ngAddPackages)(internalPackagesToInstallWithNgAdd, { skipConfirmation: true, version: o3rCoreVersion, parentPackageInfo: '@o3r/core - setup', projectName: options.projectName, dependencyType: type, workingDirectory: projectDirectory }),
-            // task that should run after the schematics should be after the ng-add task as they will wait for the package installation before running the other dependencies
-            !options.skipLinter && installOtterLinter ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)(),
-            // dependencies for store (mainly ngrx, store dev tools, storage sync), playwright, linter are installed by hand if the option is active
-            options.skipInstall ? (0, schematics_1.noop)() : schematics_2.install
-        ];
-        return (0, schematics_1.chain)(appLibRules)(tree, context);
-    };
+    const optionsAndWorkingDir = { ...options, workingDirectory: projectDirectory, dependenciesSetupConfig };
+    internalPackagesToInstallWithNgAdd
+        .forEach((dep) => {
+        dependenciesSetupConfig.dependencies[dep] = {
+            inManifest: [{
+                    range: `${options.exactO3rVersion ? '' : '~'}${o3rCoreVersion}`,
+                    types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
+                }],
+            ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
+        };
+    });
+    (dependenciesSetupConfig.ngAddToRun ||= []).push(...internalPackagesToInstallWithNgAdd);
+    const appLibRules = [
+        (0, update_builders_names_1.updateBuildersNames)(),
+        (0, update_generators_names_1.updateOtterGeneratorsNames)(),
+        (0, index_1.updateOtterEnvironmentAdapter)(optionsAndWorkingDir, coreSchematicsFolder),
+        (0, index_1.updateStore)(optionsAndWorkingDir, projectType),
+        options.enableCustomization && projectType === 'application' ? (0, index_1.updateCustomizationEnvironment)(coreSchematicsFolder, o3rCoreVersion, optionsAndWorkingDir, false) : schematics_1.noop,
+        projectType === 'application' ? (0, index_1.updateAdditionalModules)(optionsAndWorkingDir, dependenciesSetupConfig) : schematics_1.noop,
+        (0, schematics_2.removePackages)(replaced_packages_1.packagesToRemove),
+        (0, index_1.o3rBasicUpdates)(options.projectName, o3rCoreVersion, projectType),
+        // task that should run after the schematics should be after the ng-add task as they will wait for the package installation before running the other dependencies
+        !options.skipLinter && installOtterLinter ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)()
+    ];
+    return (0, schematics_1.chain)(appLibRules);
 };
 exports.prepareProject = prepareProject;
 //# sourceMappingURL=index.js.map

package/schematics/ng-add/project-setup/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/project-setup/index.ts"],"names":[],"mappings":";;;AAAA,2DAAuF;AACvF,2EAA8E;AAC9E,8BAA8B;AAC9B,kCAAkC;AAClC,sDAMoC;AACpC,gDAUyB;AAEzB,gGAA2F;AAC3F,kGAAkG;AAClG,2EAAuE;AACvE,0CAA8D;AAE9D;;;;GAIG;AACI,MAAM,cAAc,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;IAChH,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IAC3F,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IACvG,IAAI,CAAC,sBAAsB,EAAE;QAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;KACzF;IACD,MAAM,cAAc,GAAG,sBAAsB,CAAC,OAAO,CAAC;IACtD,MAAM,kBAAkB,GAAG,MAAM,IAAA,oCAA4B,EAAC,OAAO,CAAC,CAAC;IACvE,MAAM,eAAe,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;IACjD,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,IAAI,eAAe,EAAE,QAAQ,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,SAAS,CAAC;IAC9G,MAAM,WAAW,GAAG,gBAAgB,EAAE,WAAW,CAAC;IAClD,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,mBAAmB,CAAC,CAAC;IACrD,MAAM,kCAAkC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;QAC5D,GAAG,CAAC,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,GAAG,QAAQ,CAAC,WAAW;KACxB,CAAC,CAAC,CAAC;IACJ,MAAM,IAAI,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,iCAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,iCAAkB,CAAC,OAAO,CAAC;IAC9F,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,IAAI,CAAC;IAChD,MAAM,oBAAoB,GAAG,EAAE,GAAG,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,CAAC;IAEhF,OAAO,GAAG,EAAE;QAEV,MAAM,WAAW,GAAW;YAC1B,IAAA,0BAAa,EAAC,4BAAe,EAAE,kCAAqB,CAAQ;YAC5D,IAAA,2CAAmB,GAAE;YACrB,IAAA,oDAA0B,GAAE;YAC5B,IAAA,qCAA6B,EAAC,oBAAoB,EAAE,oBAAoB,CAAC;YACzE,IAAA,mBAAW,EAAC,oBAAoB,EAAE,WAAW,CAAC;YAC9C,OAAO,CAAC,mBAAmB,IAAI,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,IAAA,sCAA8B,EAAC,oBAAoB,EAAE,cAAc,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAI;YACvK,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,IAAA,+BAAuB,EAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,iBAAI;YAC1G,IAAA,2BAAc,EAAC,oCAAgB,CAAC;YAChC,IAAA,uBAAe,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,WAAW,CAAC;YACjE,IAAA,0BAAa,EAAC,kCAAkC,EAC9C,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,CACxL;YACD,iKAAiK;YACjK,CAAC,OAAO,CAAC,UAAU,IAAI,kBAAkB,CAAC,CAAC,CAAC,IAAA,2BAAc,GAAE,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE;YACrE,wIAAwI;YACxI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,oBAAO;SACvC,CAAC;QAEF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC,CAAC;AA7CW,QAAA,cAAc,kBA6CzB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-add/project-setup/index.ts"],"names":[],"mappings":"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"}

package/schematics/ng-add/schema.d.ts

@@ -22,5 +22,7 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
     withDevtool: boolean;
     /** Force package installation (in case of unmet peer dependencies) */
     forceInstall: boolean;
+    /** Use a pinned version for otter packages */
+    exactO3rVersion?: boolean;
 }
 //# sourceMappingURL=schema.d.ts.map

package/schematics/ng-add/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC;AAElD,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,qDAAqD;IACrD,MAAM,EAAE,WAAW,CAAC;IAEpB,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,EAAE,OAAO,CAAC;IAErB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,8DAA8D;IAC9D,WAAW,EAAE,OAAO,CAAC;IAErB,sEAAsE;IACtE,YAAY,EAAE,OAAO,CAAC;CACvB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC;AAElD,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,qDAAqD;IACrD,MAAM,EAAE,WAAW,CAAC;IAEpB,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,EAAE,OAAO,CAAC;IAErB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,8DAA8D;IAC9D,WAAW,EAAE,OAAO,CAAC;IAErB,sEAAsE;IACtE,YAAY,EAAE,OAAO,CAAC;IAEtB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}

package/schematics/ng-add/schema.json

@@ -53,6 +53,11 @@
       "description": "Force package installation (in case of unmet peer dependencies)",
       "type": "boolean",
       "default": true
+    },
+    "exactO3rVersion": {
+      "type": "boolean",
+      "description": "Use a pinned version for otter packages",
+      "default": false
     }
   },
   "additionalProperties": true,

package/schematics/ng-add/updates-for-v8/cms-adapters/update-builders-names.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-builders-names.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/updates-for-v8/cms-adapters/update-builders-names.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,2DAEoC;AACpC,gDAAqD;AAErD;;GAEG;AACH,SAAgB,mBAAmB;IAEjC;;;;OAIG;IACH,MAAM,iBAAiB,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAChD,MAAM,SAAS,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;YAChF,OAAO,IAAI,CAAC;SACb;QAED,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC9D,MAAM,qBAAqB,GAAG;YAC5B,yCAAyC,EAAE,2BAA2B;YACtE,4CAA4C,EAAE,6BAA6B;YAC3E,qCAAqC,EAAE,wBAAwB;YAC/D,4CAA4C,EAAE,4BAA4B;YAC1E,sBAAsB,EAAE,wBAAwB;YAChD,8BAA8B,EAAE,gCAAgC;YAChE,6BAA6B,EAAE,uBAAuB;YACtD,+BAA+B,EAAE,yBAAyB;YAC1D,2BAA2B,EAAE,qBAAqB;YAClD,qBAAqB,EAAE,eAAe;YACtC,qCAAqC,EAAE,+BAA+B;SACvE,CAAC;QAEF,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC1C,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACzD,IAAI,gBAAgB,CAAC,SAAS,EAAE;gBAC9B,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;oBAC9D,MAAM,WAAW,GAAuC,gBAAgB,CAAC,SAAU,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC;oBAC3G,IAAI,qBAAqB,CAAC,WAAW,CAAC,EAAE;wBACtC,gBAAgB,CAAC,SAAU,CAAC,aAAa,CAAC,CAAC,OAAO,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;qBACzF;gBACH,CAAC,CAAC,CAAC;gBACH,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC;aACpD;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC;QACX,iBAAiB;KAClB,CAAC,CAAC;AACL,CAAC;AAlDD,kDAkDC"}
+{"version":3,"file":"update-builders-names.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/updates-for-v8/cms-adapters/update-builders-names.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,2DAEoC;AACpC,gDAAqD;AAErD;;GAEG;AACH,SAAgB,mBAAmB;IAEjC;;;;OAIG;IACH,MAAM,iBAAiB,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAChD,MAAM,SAAS,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;YAChF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC9D,MAAM,qBAAqB,GAAG;YAC5B,yCAAyC,EAAE,2BAA2B;YACtE,4CAA4C,EAAE,6BAA6B;YAC3E,qCAAqC,EAAE,wBAAwB;YAC/D,4CAA4C,EAAE,4BAA4B;YAC1E,sBAAsB,EAAE,wBAAwB;YAChD,8BAA8B,EAAE,gCAAgC;YAChE,6BAA6B,EAAE,uBAAuB;YACtD,+BAA+B,EAAE,yBAAyB;YAC1D,2BAA2B,EAAE,qBAAqB;YAClD,qBAAqB,EAAE,eAAe;YACtC,qCAAqC,EAAE,+BAA+B;SACvE,CAAC;QAEF,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC1C,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACzD,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;gBAC/B,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;oBAC9D,MAAM,WAAW,GAAuC,gBAAgB,CAAC,SAAU,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC;oBAC3G,IAAI,qBAAqB,CAAC,WAAW,CAAC,EAAE,CAAC;wBACvC,gBAAgB,CAAC,SAAU,CAAC,aAAa,CAAC,CAAC,OAAO,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;oBAC1F,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC;YACrD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC;QACX,iBAAiB;KAClB,CAAC,CAAC;AACL,CAAC;AAlDD,kDAkDC"}

package/schematics/ng-add/updates-for-v8/generators/update-generators-names.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-generators-names.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/updates-for-v8/generators/update-generators-names.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,2DAEoC;AACpC,gDAA0E;AAE1E,MAAM,uBAAuB,GAAG;IAC9B,2BAA2B,EAAE,qBAAqB;IAClD,qCAAqC,EAAE,+BAA+B;IACtE,qCAAqC,EAAE,+BAA+B;IACtE,yBAAyB,EAAE,mBAAmB;IAC9C,uBAAuB,EAAE,iBAAiB;IAC1C,oCAAoC,EAAE,8BAA8B;IACpE,mCAAmC,EAAE,6BAA6B;IAClE,oCAAoC,EAAE,8BAA8B;IACpE,mCAAmC,EAAE,6BAA6B;IAClE,8BAA8B,EAAE,wBAAwB;IACxD,4BAA4B,EAAE,sBAAsB;IACpD,sBAAsB,EAAE,gBAAgB;IACxC,mCAAmC,EAAE,6BAA6B;IAClE,8BAA8B,EAAE,wBAAwB;IACxD,qCAAqC,EAAE,+BAA+B;IACtE,kCAAkC,EAAE,kCAAkC;IACtE,qCAAqC,EAAE,kCAAkC;IACzE,mCAAmC,EAAE,gCAAgC;CACtE,CAAC;AAEF,SAAS,uBAAuB,CAAC,kBAAuC;IACrE,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAA8C,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;QACtG,IAAI,uBAAuB,CAAC,aAAa,CAAC,EAAE;YAC1C,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;YAC/G,iCAAiC;YACjC,OAAO,kBAAkB,CAAC,aAAa,CAAC,CAAC;SAC1C;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,SAAgB,0BAA0B;IAExC;;;;;OAKG;IACH,MAAM,iBAAiB,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAChD,MAAM,SAAS,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC;SACb;QAED,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC9D,IAAI,SAAS,CAAC,UAAU,EAAE;YACxB,uBAAuB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAC9C,OAAO,SAAS,CAAC,UAAU,CAAC,6BAA6B,CAAC,CAAC;SAC5D;QACD,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC1C,IAAI,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAU,EAAE;gBAC9C,uBAAuB,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAW,CAAC,CAAC;gBACrE,OAAO,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAW,CAAC,6BAA6B,CAAC,CAAC;aACnF;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC;QACX,iBAAiB;KAClB,CAAC,CAAC;AACL,CAAC;AAnCD,gEAmCC"}
+{"version":3,"file":"update-generators-names.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/updates-for-v8/generators/update-generators-names.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,2DAEoC;AACpC,gDAA0E;AAE1E,MAAM,uBAAuB,GAAG;IAC9B,2BAA2B,EAAE,qBAAqB;IAClD,qCAAqC,EAAE,+BAA+B;IACtE,qCAAqC,EAAE,+BAA+B;IACtE,yBAAyB,EAAE,mBAAmB;IAC9C,uBAAuB,EAAE,iBAAiB;IAC1C,oCAAoC,EAAE,8BAA8B;IACpE,mCAAmC,EAAE,6BAA6B;IAClE,oCAAoC,EAAE,8BAA8B;IACpE,mCAAmC,EAAE,6BAA6B;IAClE,8BAA8B,EAAE,wBAAwB;IACxD,4BAA4B,EAAE,sBAAsB;IACpD,sBAAsB,EAAE,gBAAgB;IACxC,mCAAmC,EAAE,6BAA6B;IAClE,8BAA8B,EAAE,wBAAwB;IACxD,qCAAqC,EAAE,+BAA+B;IACtE,kCAAkC,EAAE,kCAAkC;IACtE,qCAAqC,EAAE,kCAAkC;IACzE,mCAAmC,EAAE,gCAAgC;CACtE,CAAC;AAEF,SAAS,uBAAuB,CAAC,kBAAuC;IACrE,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAA8C,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;QACtG,IAAI,uBAAuB,CAAC,aAAa,CAAC,EAAE,CAAC;YAC3C,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;YAC/G,iCAAiC;YACjC,OAAO,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,SAAgB,0BAA0B;IAExC;;;;;OAKG;IACH,MAAM,iBAAiB,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAChD,MAAM,SAAS,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC9D,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;YACzB,uBAAuB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAC9C,OAAO,SAAS,CAAC,UAAU,CAAC,6BAA6B,CAAC,CAAC;QAC7D,CAAC;QACD,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC1C,IAAI,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAU,EAAE,CAAC;gBAC/C,uBAAuB,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAW,CAAC,CAAC;gBACrE,OAAO,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,UAAW,CAAC,6BAA6B,CAAC,CAAC;YACpF,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC;QACX,iBAAiB;KAClB,CAAC,CAAC;AACL,CAAC;AAnCD,gEAmCC"}

package/schematics/ng-add/utils/linter/index.js

@@ -14,13 +14,13 @@ const shouldOtterLinterBeInstalled = async (context) => {
     try {
         require.resolve(`${linterPackageName}/package.json`);
         if (context.interactive) {
-            useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have eslint installed. Would you like to add otter config rules for eslint ?
+            useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have ESLint installed. Would you like to add otter config rules for ESLint?
 Otherwise, you can add them later via this command: ng add @o3r/eslint-config-otter`, true);
         }
     }
     catch {
-        context.logger.info(`eslint package not installed. Skipping otter linter phase !
-You can add otter linter config rules later to the project via this command: ng add @o3r/eslint-config-otter`);
+        context.logger.info(`ESLint package not installed. Skipping Otter linter phase!
+You can add Otter linter config rules later to the project via this command: ng add @o3r/eslint-config-otter`);
     }
     return useOtterLinter;
 };

package/schematics/ng-add/utils/linter/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/utils/linter/index.ts"],"names":[],"mappings":";;;AACA,8DAAoE;AAEpE;;;;;GAKG;AACI,MAAM,4BAA4B,GAAG,KAAK,EAAE,OAAyB,EAAoB,EAAE;IAChG,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI;QACF,OAAO,CAAC,OAAO,CAAC,GAAG,iBAAiB,eAAe,CAAC,CAAC;QACrD,IAAI,OAAO,CAAC,WAAW,EAAE;YACvB,cAAc,GAAG,MAAM,IAAA,wBAAe,EAAC;oFACuC,EAAE,IAAI,CAAC,CAAC;SACvF;KACF;IAAC,MAAM;QACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;6GACqF,CAAC,CAAC;KAC5G;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAfW,QAAA,4BAA4B,gCAevC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../schematics/ng-add/utils/linter/index.ts"],"names":[],"mappings":";;;AACA,8DAAoE;AAEpE;;;;;GAKG;AACI,MAAM,4BAA4B,GAAG,KAAK,EAAE,OAAyB,EAAoB,EAAE;IAChG,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,GAAG,iBAAiB,eAAe,CAAC,CAAC;QACrD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,cAAc,GAAG,MAAM,IAAA,wBAAe,EAAC;oFACuC,EAAE,IAAI,CAAC,CAAC;QACxF,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;6GACqF,CAAC,CAAC;IAC7G,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAfW,QAAA,4BAA4B,gCAevC"}

package/schematics/ng-add-create/index.d.ts

@@ -5,11 +5,11 @@ import { NgGenerateUpdateSchematicsSchema } from './schema';
  *
  * @param options
  */
-export declare function updateTemplates(options: NgGenerateUpdateSchematicsSchema): Rule;
+export declare const updateTemplates: (options: NgGenerateUpdateSchematicsSchema) => Rule;
 /**
  * add a new ngUpdate function
  *
  * @param options
  */
-export declare function ngAddCreate(options: NgGenerateUpdateSchematicsSchema): Rule;
+export declare const ngAddCreate: (options: NgGenerateUpdateSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-add-create/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add-create/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAMvF,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAC;AAE5D;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gCAAgC,GAAG,IAAI,CAwD/E;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,gCAAgC,GAAG,IAAI,CAI3E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add-create/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAMvF,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAC;AAiE5D;;;;GAIG;AACH,eAAO,MAAM,eAAe,qDAA2D,CAAC;AAaxF;;;;GAIG;AACH,eAAO,MAAM,WAAW,qDAAuD,CAAC"}

package/schematics/ng-add-create/index.js

@@ -11,7 +11,7 @@ const schematics_3 = require("@angular-devkit/schematics");
  *
  * @param options
  */
-function updateTemplates(options) {
+function updateTemplatesFn(options) {
     const targetPath = options.path ? path.posix.join('/', options.path) : '/';
     const packageJsonPath = path.posix.join(targetPath, 'package.json');
     return (tree, context) => {
@@ -62,16 +62,26 @@ function updateTemplates(options) {
         return rule(tree, context);
     };
 }
-exports.updateTemplates = updateTemplates;
+/**
+ * Rule factory to include `ng add` skeleton
+ *
+ * @param options
+ */
+exports.updateTemplates = (0, schematics_2.createSchematicWithMetricsIfInstalled)(updateTemplatesFn);
 /**
  * add a new ngUpdate function
  *
  * @param options
  */
-function ngAddCreate(options) {
+function ngAddCreateFn(options) {
     return (0, schematics_1.chain)([
-        updateTemplates(options)
+        (0, exports.updateTemplates)(options)
     ]);
 }
-exports.ngAddCreate = ngAddCreate;
+/**
+ * add a new ngUpdate function
+ *
+ * @param options
+ */
+exports.ngAddCreate = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngAddCreateFn);
 //# sourceMappingURL=index.js.map

package/schematics/ng-add-create/index.js.map

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

package/schematics/ng-add-create/templates/schematics/ng-add/index.ts.template

@@ -1,39 +1,69 @@
 import { chain, noop, Rule } from '@angular-devkit/schematics';
 import type { NgAddSchematicsSchema } from './schema';
 import * as path from 'node:path';
+import type { DependencyToAdd } from '@o3r/schematics';
+
+const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
 
 const doCustomAction: Rule = (tree, _context) => {
   // your custom code here
   return tree;
 };
 
+const dependenciesToInstall = [
+  // Add the dependencies to install here
+];
+
+const dependenciesToNgAdd = [
+  // Add the dependencies to install with NgAdd here
+];
+
+const reportMissingSchematicsDep = (logger: { error: (message: string) => any }) => (reason: any) => {
+  logger.error(`[ERROR]: Adding <%= featureName %> has failed.
+If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the <%= featureName %> package. Please run 'ng add @o3r/core' .
+Otherwise, use the error message as guidance.`);
+  throw reason;
+};
+
 /**
  * Add Otter <%= featureName %> to an Otter Project
  *
  * @param options
  */
-export function ngAdd(options: NgAddSchematicsSchema): Rule {
-  return async (_tree, context) => {
-    try {
-      // use dynamic import to properly raise an exception if it is not an Otter project.
-      const { applyEsLintFix, install, ngAddPackages, getO3rPeerDeps } = await import('@o3r/schematics');
-      // retrieve dependencies following the /^@o3r\/.*/ pattern within the peerDependencies of the current module
-      const depsInfo = getO3rPeerDeps(path.resolve(__dirname, '..', '..', 'package.json'));
-      return chain([
-        // optional custom action dedicated to this module
-        doCustomAction,
-        options.skipLinter ? noop() : applyEsLintFix(),
-        // install packages needed in the current module
-        options.skipInstall ? noop : install,
-        // add the missing Otter modules in the current project
-        ngAddPackages(depsInfo.o3rPeerDeps, { skipConfirmation: true, version: depsInfo.packageVersion, parentPackageInfo: `${depsInfo.packageName!} - setup` })
-      ]);
-    } catch (e) {
-      // If the installation is initialized in a non-Otter application, mandatory packages will be missing. We need to notify the user
-      context.logger.error(`[ERROR]: Adding <%= featureName %> has failed.
-      If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the <%= featureName %> package. Please run 'ng add @o3r/core' .
-      Otherwise, use the error message as guidance.`);
-      throw (e);
-    }
+function ngAddFn(options: NgAddSchematicsSchema): Rule {
+  return async (tree, context) => {
+    // use dynamic import to properly raise an exception if it is not an Otter project.
+    const { getProjectNewDependenciesTypes, getPackageInstallConfig, applyEsLintFix, install } = await import('@o3r/schematics');
+    // current package version
+    const version = JSON.stringify(fs.readFileSync(packageJsonPath)).version;
+    const dependencies = [...dependenciesToInstall, ...dependenciesToNgAdd].reduce((acc, dep) => {
+      acc[dep] = {
+        inManifest: [{
+          range: `~${version}`,
+          types: getProjectNewDependenciesTypes(workspaceProject)
+        }]
+      };
+      return acc;
+    }, getPackageInstallConfig(packageJsonPath, tree, options.projectName));
+    return chain([
+      // optional custom action dedicated to this module
+      doCustomAction,
+      options.skipLinter ? noop() : applyEsLintFix(),
+      setupDependencies({
+        projectName: options.projectName,
+        dependencies,
+        ngAddToRun: dependenciesToNgAdd,
+        skipInstall: options.skipInstall
+      })
+    ]);
   };
 }
+
+/**
+ * Add module to an Angular Project
+ * @param options ng add options
+ */
+export const ngAdd = (options: NgAddSchematicsSchema): Rule => async (_, { logger }) => {
+  const { createSchematicWithMetricsIfInstalled } = await import('@o3r/schematics').catch(reportMissingSchematicsDep(logger));
+  return createSchematicWithMetricsIfInstalled(ngAddFn)(options);
+};

package/schematics/ng-add-create/templates/schematics/ng-add/schema.json.template

@@ -4,7 +4,7 @@
   "title": "Add <%= featureName %> project",
   "description": "'ng add <%= featureName %>' project",
   "properties": {
-    "name": {
+    "projectName": {
       "type": "string",
       "description": "Project name",
       "$default": {
@@ -18,8 +18,7 @@
     },
     "skipInstall": {
       "type": "boolean",
-      "description": "Skip the install process",
-      "default": true
+      "description": "Skip the install process"
     }
   },
   "additionalProperties": true,

package/schematics/ng-add-create/templates/schematics/ng-add/schema.ts.template

@@ -2,7 +2,7 @@ import type { SchematicOptionObject } from '@o3r/schematics';
 
 export interface NgAddSchematicsSchema extends SchematicOptionObject {
   /** Project name */
-  name: string | undefined;
+  projectName: string | undefined;
 
   /** Skip the linter process */
   skipLinter: boolean;

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

@@ -1,10 +1,10 @@
 import { Rule } from '@angular-devkit/schematics';
 /**
- * update of Otter library V8.2
+ * Update of Otter library V8.2
  */
-export declare function updateV8_2(): Rule;
+export declare const updateV8_2: (options: unknown) => Rule;
 /**
- * update of Otter library V10.0
+ * Update of Otter library V10.0
  */
-export declare function updateV10_0(): Rule;
+export declare const updateV10_0: (options: unknown) => Rule;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKjF;;GAEG;AACH,wBAAgB,UAAU,IAAI,IAAI,CASjC;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CASlC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAmBjF;;GAEG;AACH,eAAO,MAAM,UAAU,4BAAsD,CAAC;AAkB9E;;GAEG;AACH,eAAO,MAAM,WAAW,4BAAuD,CAAC"}

package/schematics/ng-update/index.js

@@ -8,9 +8,9 @@ const schematics_2 = require("@o3r/schematics");
 const import_map_1 = require("./v8.2/import-map");
 const configuration_1 = require("./v10.0/configuration");
 /**
- * update of Otter library V8.2
+ * Update of Otter library V8.2
  */
-function updateV8_2() {
+function updateV8_2Fn() {
     return (tree, context) => {
         const updateRules = [
             (0, schematics_2.updateImports)(import_map_1.mapImportAsyncStore)
@@ -18,17 +18,25 @@ function updateV8_2() {
         return (0, schematics_1.chain)(updateRules)(tree, context);
     };
 }
-exports.updateV8_2 = updateV8_2;
 /**
- * update of Otter library V10.0
+ * Update of Otter library V8.2
  */
-function updateV10_0() {
+exports.updateV8_2 = (0, schematics_2.createSchematicWithMetricsIfInstalled)(updateV8_2Fn);
+/**
+ * Update of Otter library V10.0
+ */
+function updateV10_0Fn() {
     return (tree, context) => {
         const updateRules = [
+            // Some of these imports were missed in the generators of v9, so it's easier to just run the update again
+            (0, schematics_2.updateImports)(import_map_1.mapImportAsyncStore),
             configuration_1.updateConfiguration
         ];
         return (0, schematics_1.chain)(updateRules)(tree, context);
     };
 }
-exports.updateV10_0 = updateV10_0;
+/**
+ * Update of Otter library V10.0
+ */
+exports.updateV10_0 = (0, schematics_2.createSchematicWithMetricsIfInstalled)(updateV10_0Fn);
 //# sourceMappingURL=index.js.map

package/schematics/ng-update/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":";AAAA,yDAAyD;AACzD,8BAA8B;;;AAE9B,2DAAiF;AACjF,gDAAgD;AAChD,kDAAwD;AACxD,yDAA4D;AAE5D;;GAEG;AACH,SAAgB,UAAU;IACxB,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAE/C,MAAM,WAAW,GAAW;YAC1B,IAAA,0BAAa,EAAC,gCAAmB,CAAC;SACnC,CAAC;QAEF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC;AATD,gCASC;AAED;;GAEG;AACH,SAAgB,WAAW;IACzB,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAE/C,MAAM,WAAW,GAAW;YAC1B,mCAAmB;SACpB,CAAC;QAEF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC;AATD,kCASC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":";AAAA,yDAAyD;AACzD,8BAA8B;;;AAE9B,2DAAiF;AACjF,gDAAuF;AACvF,kDAAwD;AACxD,yDAA4D;AAE5D;;GAEG;AACH,SAAS,YAAY;IACnB,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAE/C,MAAM,WAAW,GAAW;YAC1B,IAAA,0BAAa,EAAC,gCAAmB,CAAC;SACnC,CAAC;QAEF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACU,QAAA,UAAU,GAAG,IAAA,kDAAqC,EAAC,YAAY,CAAC,CAAC;AAE9E;;GAEG;AACH,SAAS,aAAa;IACpB,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAE/C,MAAM,WAAW,GAAW;YAC1B,yGAAyG;YACzG,IAAA,0BAAa,EAAC,gCAAmB,CAAC;YAClC,mCAAmB;SACpB,CAAC;QAEF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACU,QAAA,WAAW,GAAG,IAAA,kDAAqC,EAAC,aAAa,CAAC,CAAC"}

package/schematics/ng-update/v10.0/configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../schematics/ng-update/v10.0/configuration.ts"],"names":[],"mappings":";;;AACA,gDAA8D;AAE9D,MAAM,aAAa,GAAG,mDAAmD,CAAC;AAE1E;;;;;GAKG;AACI,MAAM,mBAAmB,GAAS,CAAC,IAAU,EAAE,EAAE;IACtD,MAAM,KAAK,GAAG,IAAA,0CAA6B,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;QACzD,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,IAAI,CAAC,SAAS,CACZ,IAAI,EACJ,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,CACrC,CAAC;SACH;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAZW,QAAA,mBAAmB,uBAY9B"}
+{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../schematics/ng-update/v10.0/configuration.ts"],"names":[],"mappings":";;;AACA,gDAA8D;AAE9D,MAAM,aAAa,GAAG,mDAAmD,CAAC;AAE1E;;;;;GAKG;AACI,MAAM,mBAAmB,GAAS,CAAC,IAAU,EAAE,EAAE;IACtD,MAAM,KAAK,GAAG,IAAA,0CAA6B,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;QACzD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,CACZ,IAAI,EACJ,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,CACrC,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAZW,QAAA,mBAAmB,uBAY9B"}

package/schematics/ng-update/v8.2/import-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-map.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v8.2/import-map.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,oFAAoF;AACpF,eAAO,MAAM,mBAAmB,EAAE,cAiCjC,CAAC"}
+{"version":3,"file":"import-map.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v8.2/import-map.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,oFAAoF;AACpF,eAAO,MAAM,mBAAmB,EAAE,cAoCjC,CAAC"}

package/schematics/ng-update/v8.2/import-map.js

@@ -10,6 +10,9 @@ exports.mapImportAsyncStore = {
         isSerializer: {
             newPackage: '@o3r/store-sync'
         },
+        StorageSync: {
+            newPackage: '@o3r/store-sync'
+        },
         StoreSyncConfig: {
             newPackage: '@o3r/store-sync'
         },