@o3r/core 10.0.0-prerelease.99 → 10.1.0-prerelease.0

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAiB/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAyDtD;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAK/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA6EjD;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}

package/schematics/ng-add/index.js

@@ -2,44 +2,53 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
-const prompt_1 = require("@angular/cli/src/utilities/prompt");
-const schematics_2 = require("@o3r/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 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;
+    return () => {
+        const dependenciesSetupConfig = {
+            projectName: options.projectName,
+            dependencies: o3rDevDependencies.reduce((acc, dep) => {
+                acc[dep] = {
+                    inManifest: [{
+                            range: `~${o3rCoreVersion}`,
+                            types: [dependencies_1.NodeDependencyType.Dev]
+                        }]
+                };
+                return acc;
+            }, {}),
+            ngAddToRun: [...o3rDevDependencies]
+        };
+        if (!options.projectName) {
+            dependenciesSetupConfig.dependencies[workspacePackageName] = {
+                toWorkspaceOnly: true,
+                inManifest: [{
+                        range: `~${o3rCoreVersion}`,
+                        types: [dependencies_1.NodeDependencyType.Default]
+                    }]
+            };
+            (dependenciesSetupConfig.ngAddToRun ||= []).push(workspacePackageName);
         }
-        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const workingDirectory = workspaceProject?.root || '.';
-        context.addTask(new schematics_2.AddDevInstall({
-            packageName: [
-                ...schematicsDependencies.map((dependency) => dependency + o3rCoreVersion)
-            ].join(' '),
-            hideOutput: false,
-            quiet: false,
-            workingDirectory,
-            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;
@@ -57,8 +66,9 @@ function ngAddFn(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)
+        ]);
     };
 }
 /**

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

@@ -1,9 +1,11 @@
-import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+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;AAmBvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAMvD;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,YAAkB,IAAI,0OA4ClF,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,IA8ClH,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,27 +34,31 @@ 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, 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: `~${o3rCoreVersion}`,
+                    types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
+                }]
+        };
+    });
+    (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-create/templates/schematics/ng-add/index.ts.template

@@ -1,32 +1,61 @@
 import { chain, noop, Rule } from '@angular-devkit/schematics';
-import { applyEsLintFix, createSchematicWithMetricsIfInstalled, install, ngAddPackages, getO3rPeerDeps  } from '@o3r/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
+];
+
 /**
  * Add Otter <%= featureName %> to an Otter Project
  *
  * @param options
  */
 function ngAddFn(options: NgAddSchematicsSchema): Rule {
-  return async (_tree, context) => {
-    // 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` })
-    ]);
+  return async (tree, context) => {
+    try {
+      // 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
+        })
+      ]);
+    } 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);
+    }
   };
 }
-
-export const ngAdd = createSchematicWithMetricsIfInstalled(ngAddFn);

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/rule-factories/additional-modules/index.d.ts

@@ -1,13 +1,14 @@
 import { Rule } from '@angular-devkit/schematics';
+import { type SetupDependenciesOptions } from '@o3r/schematics';
 /**
  * Add additional modules for dev only
  * @param options @see RuleFactory.options
  * @param options.projectName
  * @param options.workingDirectory the directory where to execute the rule factory
- * @param _rootPath @see RuleFactory.rootPath
+ * @param dependenciesSetupConfig
  */
 export declare function updateAdditionalModules(options: {
     projectName?: string | undefined;
     workingDirectory?: string | undefined;
-}, _rootPath: string): Rule;
+}, dependenciesSetupConfig: SetupDependenciesOptions): Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/rule-factories/additional-modules/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAiBjF;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAwMrJ"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AAczB;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,uBAAuB,EAAE,wBAAwB,GAAG,IAAI,CA6MrL"}

package/schematics/rule-factories/additional-modules/index.js

@@ -8,31 +8,38 @@ const utility_1 = require("@schematics/angular/utility");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const change_1 = require("@schematics/angular/utility/change");
 const path = require("node:path");
+const fs = require("node:fs");
+const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const packageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
+const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf-8' }));
 const ngrxStoreDevtoolsDep = '@ngrx/store-devtools';
 /**
  * Add additional modules for dev only
  * @param options @see RuleFactory.options
  * @param options.projectName
  * @param options.workingDirectory the directory where to execute the rule factory
- * @param _rootPath @see RuleFactory.rootPath
+ * @param dependenciesSetupConfig
  */
-function updateAdditionalModules(options, _rootPath) {
+function updateAdditionalModules(options, dependenciesSetupConfig) {
     /**
      * Update package.json to add additional modules dependencies
      * @param tree
-     * @param context
      */
-    const updatePackageJson = (tree, context) => {
+    const updatePackageJson = (tree) => {
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const type = (0, schematics_2.getProjectNewDependenciesType)(workspaceProject);
-        const generatorDependencies = [ngrxStoreDevtoolsDep];
-        try {
-            return (0, schematics_2.ngAddPeerDependencyPackages)(generatorDependencies, packageJsonPath, type, { ...options, skipNgAddSchematicRun: true });
-        }
-        catch (e) {
-            context.logger.warn(`Could not find generatorDependencies ${generatorDependencies.join(', ')} in file ${packageJsonPath}`);
-        }
+        const types = (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject);
+        dependenciesSetupConfig.dependencies.chokidar = {
+            inManifest: [{
+                    range: packageJson.peerDependencies.chokidar,
+                    types: [dependencies_1.NodeDependencyType.Dev]
+                }]
+        };
+        dependenciesSetupConfig.dependencies[ngrxStoreDevtoolsDep] = {
+            inManifest: [{
+                    range: packageJson.generatorDependencies[ngrxStoreDevtoolsDep],
+                    types
+                }]
+        };
         return tree;
     };
     /**

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

@@ -66,7 +66,7 @@ function updateOtterEnvironmentAdapter(options, _rootPath) {
             schematics_2.OTTER_ITEM_TYPES.forEach((item) => {
                 const path = schematics_2.TYPES_DEFAULT_FOLDER[item].lib ? `modules/${scope}/${schematics_2.TYPES_DEFAULT_FOLDER[item].lib}` : null;
                 if (path) {
-                    workspace.schematics[item] = {
+                    workspace.schematics[`${item}*`] = {
                         path,
                         ...(workspace.schematics[item] || {})
                     };

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

@@ -2,7 +2,6 @@ import { Rule } from '@angular-devkit/schematics';
 import { NgAddPackageOptions } from '@o3r/schematics';
 /**
  * Add Playwright to Otter application
- *
  * @param options @see RuleFactory.options
  * @param options.projectName
  * @param rootPath @see RuleFactory.rootPath

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/playwright/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA+D,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AACtJ,OAAO,EAAqB,mBAAmB,EAA+B,MAAM,iBAAiB,CAAC;AAItG;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,GAAG,IAAI,CAsD1F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/playwright/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA+D,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AACtJ,OAAO,EAGL,mBAAmB,EAEpB,MAAM,iBAAiB,CAAC;AAMzB;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,GAAG,IAAI,CAoE1F"}

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

@@ -6,14 +6,16 @@ const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const path = require("node:path");
+const fs = require("node:fs");
 /**
  * Add Playwright to Otter application
- *
  * @param options @see RuleFactory.options
  * @param options.projectName
  * @param rootPath @see RuleFactory.rootPath
  */
 function updatePlaywright(rootPath, options = {}) {
+    const ownPackageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
+    const ownPackageJson = JSON.parse(fs.readFileSync(ownPackageJsonPath, { encoding: 'utf-8' }));
     return (tree, context) => {
         // update gitignore
         if (tree.exists('/.gitignore')) {
@@ -36,8 +38,19 @@ function updatePlaywright(rootPath, options = {}) {
             packageJson.scripts['test:playwright:sanity'] ||= 'playwright test --config=e2e-playwright/playwright-config.sanity.ts';
             tree.overwrite('/package.json', JSON.stringify(packageJson, null, 2));
         }
-        const corePackageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
-        const ngAddRules = (0, schematics_2.ngAddPeerDependencyPackages)(['@playwright/test', 'rimraf'], corePackageJsonPath, dependencies_1.NodeDependencyType.Dev, { ...options, skipNgAddSchematicRun: true });
+        const dependencies = ['@playwright/test', 'rimraf'].reduce((acc, dep) => {
+            acc[dep] = {
+                inManifest: [{
+                        range: ownPackageJson.generatorDependencies[dep],
+                        types: [dependencies_1.NodeDependencyType.Dev]
+                    }]
+            };
+            return acc;
+        }, {});
+        const ngAddRules = (0, schematics_2.setupDependencies)({
+            projectName: options.projectName || undefined,
+            dependencies
+        });
         // generate files
         if (!tree.exists('/e2e-playwright/playwright-config.ts')) {
             const name = 'my-scenario';

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

@@ -1,4 +1,5 @@
 import { Rule } from '@angular-devkit/schematics';
+import { type SetupDependenciesOptions } from '@o3r/schematics';
 import { WorkspaceProject } from '@o3r/schematics';
 /**
  * Add Redux Store support
@@ -7,9 +8,12 @@ import { WorkspaceProject } from '@o3r/schematics';
  * @param options.projectName
  * @param options.workingDirectory
  * @param projectType
+ * @param options.dependenciesSetupConfig
+ * @param options.workingDirector
  */
 export declare function updateStore(options: {
     projectName?: string | undefined;
-    workingDirectory?: string | undefined;
+    workingDirector?: string | undefined;
+    dependenciesSetupConfig: SetupDependenciesOptions;
 }, projectType?: WorkspaceProject['projectType']): Rule;
 //# sourceMappingURL=index.d.ts.map

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;AAWjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAiBnD;;;;;;;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,CA6IpK"}
+{"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,CAAA;CAAE,EACtI,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CAkIrD"}

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

@@ -5,18 +5,18 @@ 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 dependencies_1 = require("@schematics/angular/utility/dependencies");
 const path = require("node:path");
 const ts = require("typescript");
 const fs = require("node:fs");
-const packageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
+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 ngrxEffectsDep = '@ngrx/effects';
 const ngrxEntityDep = '@ngrx/entity';
 const ngrxStoreDep = '@ngrx/store';
 const ngrxRouterStore = '@ngrx/router-store';
 const ngrxRouterStoreDevToolDep = '@ngrx/store-devtools';
-// TODO Remove this explicit dependency when correctly brought by the ng-add of @o3r/store-sync
-const fastDeepEqualDep = 'fast-deep-equal';
 /**
  * Add Redux Store support
  * @param options @see RuleFactory.options
@@ -24,47 +24,40 @@ const fastDeepEqualDep = 'fast-deep-equal';
  * @param options.projectName
  * @param options.workingDirectory
  * @param projectType
+ * @param options.dependenciesSetupConfig
+ * @param options.workingDirector
  */
 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
-        });
+        const storeSyncPackageName = '@o3r/store-sync';
+        options.dependenciesSetupConfig.dependencies[storeSyncPackageName] = {
+            inManifest: [{
+                    range: `~${o3rCoreVersion}`,
+                    types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
+                }]
+        };
+        (options.dependenciesSetupConfig.ngAddToRun ||= []).push(storeSyncPackageName);
     };
     /**
-     * Changed package.json start script to run localization generation
+     * Change package.json with the new dependencies
      * @param tree
-     * @param context
      */
-    const updatePackageJson = (tree, context) => {
-        const type = projectType === 'library' ? dependencies_1.NodeDependencyType.Peer : dependencies_1.NodeDependencyType.Default;
-        const appDeps = [ngrxEffectsDep, ngrxRouterStore, ngrxRouterStoreDevToolDep, fastDeepEqualDep];
+    const updatePackageJson = (tree) => {
+        const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
+        const workspaceProject = options.projectName && workspaceConfig?.projects?.[options.projectName] || undefined;
+        const appDeps = [ngrxEffectsDep, ngrxRouterStore, ngrxRouterStoreDevToolDep];
         const corePeerDeps = [ngrxEntityDep, ngrxStoreDep];
-        let dependenciesList = [...corePeerDeps];
-        if (projectType === 'application') {
-            dependenciesList = [...dependenciesList, ...appDeps];
-        }
-        return () => {
-            try {
-                return (0, schematics_2.ngAddPeerDependencyPackages)(dependenciesList, packageJsonPath, type, { ...options, skipNgAddSchematicRun: true })(tree, context);
-            }
-            catch (e) {
-                context.logger.warn(`Could not find generatorDependency ${dependenciesList.join(', ')} in file ${packageJsonPath}`);
-                return tree;
-            }
-        };
+        const dependenciesList = projectType === 'application' ? [...corePeerDeps, ...appDeps] : [...corePeerDeps];
+        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(dependenciesList, corePackageJsonPath)).forEach(([dep, range]) => {
+            options.dependenciesSetupConfig.dependencies[dep] = {
+                inManifest: [{
+                        range,
+                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
+                    }]
+            };
+        });
     };
     /**
      * Edit main module with the translation required configuration

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

@@ -1,4 +1,4 @@
-import type { Rule } from '@angular-devkit/schematics';
+import { type Rule } from '@angular-devkit/schematics';
 import type { PresetOptions } from './preset.interface';
 /**
  * Default implementation of the preset rule

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,KAAK,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAMrD,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAEtD;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,aAAkB,GAAG,IAAI,CAkBrG"}
+{"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,CAgCrG"}

package/schematics/shared/presets/helpers.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultPresetRuleFactory = void 0;
-const schematics_1 = require("@o3r/schematics");
-const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const fs = require("node:fs");
 const path = require("node:path");
 /**
@@ -12,18 +12,30 @@ const path = require("node:path");
  */
 function defaultPresetRuleFactory(moduleToInstall, options = {}) {
     return (tree, _context) => {
-        const workingDirectory = options?.projectName && (0, schematics_1.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root || '.';
+        const corePackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', '..', 'package.json'), { encoding: 'utf-8' }));
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         if (!moduleToInstall.length) {
             return tree;
         }
-        const corePackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', '..', 'package.json'), { encoding: 'utf-8' }));
-        return (0, schematics_1.ngAddPackages)(moduleToInstall, {
-            ...options,
-            skipConfirmation: true,
-            version: corePackageJsonContent.version,
-            parentPackageInfo: '@o3r/core - preset setup',
-            dependencyType: dependencies_1.NodeDependencyType.Dev,
-            workingDirectory
+        const dependencies = moduleToInstall.reduce((acc, dep) => {
+            acc[dep] = {
+                inManifest: [{
+                        range: `~${corePackageJsonContent.version}`,
+                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
+                    }]
+            };
+            return acc;
+        }, {});
+        if (options.dependenciesSetupConfig) {
+            options.dependenciesSetupConfig.dependencies = {
+                ...options.dependenciesSetupConfig.dependencies,
+                ...dependencies
+            };
+        }
+        return options.dependenciesSetupConfig ? schematics_1.noop : (0, schematics_2.setupDependencies)({
+            projectName: options.projectName,
+            dependencies,
+            ngAddToRun: moduleToInstall
         });
     };
 }