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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/core",
-  "version": "12.5.0-prerelease.2",
+  "version": "12.5.0-prerelease.20",
   "publishConfig": {
     "access": "public"
   },
@@ -39,7 +39,7 @@
     "@ngrx/entity": "^19.0.0",
     "@ngrx/store": "^19.0.0",
     "@nx/angular": "~20.8.0",
-    "@o3r/telemetry": "^12.5.0-prerelease.2",
+    "@o3r/telemetry": "^12.5.0-prerelease.20",
     "@schematics/angular": "^19.0.0",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
@@ -78,12 +78,11 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^12.5.0-prerelease.2",
+    "@o3r/schematics": "^12.5.0-prerelease.20",
     "tslib": "^2.6.2",
     "uuid": "^11.0.5"
   },
   "generatorDependencies": {
-    "@angular/material": "~19.2.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
     "@ngrx/effects": "~19.2.0",
     "@ngrx/entity": "~19.2.0",
@@ -91,19 +90,19 @@
     "@ngrx/store": "~19.2.0",
     "@ngrx/store-devtools": "~19.2.0",
     "@nx/eslint-plugin": "~20.8.0",
-    "@o3r/store-sync": "^12.5.0-prerelease.2",
+    "@o3r/store-sync": "^12.5.0-prerelease.20",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@types/jest": "~29.5.2",
-    "@typescript-eslint/eslint-plugin": "~8.34.0",
-    "@typescript-eslint/parser": "~8.34.0",
+    "@typescript-eslint/eslint-plugin": "~8.35.0",
+    "@typescript-eslint/parser": "~8.35.0",
     "angular-eslint": "~19.4.0",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.28.0",
+    "eslint": "~9.29.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~3.10.0",
-    "eslint-plugin-import": "~2.31.0",
+    "eslint-plugin-import": "~2.32.0",
     "eslint-plugin-import-newlines": "~1.4.0",
-    "eslint-plugin-jest": "~28.13.0",
+    "eslint-plugin-jest": "~28.14.0",
     "eslint-plugin-jsdoc": "~50.8.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
     "eslint-plugin-unicorn": "~56.0.0",
@@ -114,7 +113,7 @@
     "jest-preset-angular": "~14.5.0",
     "jsonc-eslint-parser": "~2.4.0",
     "nx": "~20.8.0",
-    "typescript-eslint": "~8.34.0",
+    "typescript-eslint": "~8.35.0",
     "zone.js": "~0.15.0"
   },
   "engines": {

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":"AAKA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAuGpC;;;GAGG;AACH,eAAO,MAAM,KAAK,wBAAgC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAwGpC;;;GAGG;AACH,eAAO,MAAM,KAAK,wBAAgC,CAAC"}

package/schematics/ng-add/index.js

@@ -52,8 +52,10 @@ function ngAddFn(options) {
         return (0, schematics_1.chain)([
             (0, schematics_2.setupSchematicsParamsForProject)({ '*:ng-add': { registerDevtool: options.withDevtool } }, options.projectName),
             options.exactO3rVersion ? (0, schematics_2.setupSchematicsParamsForProject)({ '*:*': { exactO3rVersion: true } }, options.projectName) : (0, schematics_1.noop)(),
+            // Warning: this should always be executed before the setup dependencies as it modifies the options.dependencies
             options.projectName ? (0, index_1.prepareProject)(options, dependenciesSetupConfig) : (0, schematics_1.noop)(),
             (0, schematics_2.registerPackageCollectionSchematics)(corePackageJsonContent),
+            (0, schematics_3.setupDependencies)(dependenciesSetupConfig),
             async (t, c) => {
                 const { preset, externalPresets, ...forwardOptions } = options;
                 const presetOptions = { projectName: forwardOptions.projectName, exactO3rVersion: forwardOptions.exactO3rVersion, forwardOptions, isUsingEslintLegacy: (0, utils_1.isUsingLegacyConfig)(t) };
@@ -71,8 +73,7 @@ function ngAddFn(options) {
                     externalPresetRunner?.rule || (0, schematics_1.noop)()
                 ])(t, c);
             },
-            options.projectName ? (0, schematics_2.displayModuleListRule)({ packageName: options.projectName }) : (0, schematics_1.noop)(),
-            (0, schematics_3.setupDependencies)(dependenciesSetupConfig)
+            options.projectName ? (0, schematics_2.displayModuleListRule)({ packageName: options.projectName }) : (0, schematics_1.noop)()
         ]);
     };
 }

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":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AAuBzB;;;;;;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,CA4MrL"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AAmBzB;;;;;;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

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAdditionalModules = updateAdditionalModules;
-const fs = require("node:fs");
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const utility_1 = require("@schematics/angular/utility");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const change_1 = require("@schematics/angular/utility/change");
-const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const ts = require("typescript");
-const packageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
-const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
+const o3rPackageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
 const ngrxStoreDevtoolsDep = '@ngrx/store-devtools';
 /**
  * Add additional modules for dev only
@@ -24,21 +21,22 @@ function updateAdditionalModules(options, dependenciesSetupConfig) {
     /**
      * Update package.json to add additional modules dependencies
      * @param tree
+     * @param context
      */
-    const updatePackageJson = (tree) => {
-        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        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
-                }]
+    const updatePackageJson = (tree, context) => {
+        const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
+        const workspaceProject = (options.projectName && workspaceConfig?.projects?.[options.projectName]) || undefined;
+        const projectDirectory = workspaceProject?.root || '.';
+        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
+        dependenciesSetupConfig.dependencies = {
+            ...dependenciesSetupConfig.dependencies,
+            ...(0, schematics_2.getExternalDependenciesInfo)({
+                dependenciesToInstall: [ngrxStoreDevtoolsDep],
+                devDependenciesToInstall: ['chokidar'],
+                o3rPackageJsonPath,
+                projectType: workspaceProject?.projectType,
+                projectPackageJson
+            }, context.logger)
         };
         return tree;
     };

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":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EASL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAoBzB;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,uBAAuB,EAAE,wBAAwB,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,EACjK,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CAmIrD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/store/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EASL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAuBzB;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,uBAAuB,EAAE,wBAAwB,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,EACjK,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CAuIrD"}

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

@@ -48,17 +48,21 @@ function updateStore(options, projectType) {
     const updatePackageJson = (tree, context) => {
         const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
         const workspaceProject = (options.projectName && workspaceConfig?.projects?.[options.projectName]) || undefined;
+        const projectDirectory = workspaceProject?.root || '.';
+        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
         const appDeps = [ngrxEffectsDep, ngrxRouterStore, ngrxRouterStoreDevToolDep];
         const corePeerDeps = [ngrxEntityDep, ngrxStoreDep];
         const dependenciesList = projectType === 'application' ? [...corePeerDeps, ...appDeps] : [...corePeerDeps];
-        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(dependenciesList, corePackageJsonPath, context.logger)).forEach(([dep, range]) => {
-            options.dependenciesSetupConfig.dependencies[dep] = {
-                inManifest: [{
-                        range,
-                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
-                    }]
-            };
-        });
+        options.dependenciesSetupConfig.dependencies = {
+            ...options.dependenciesSetupConfig.dependencies,
+            ...(0, schematics_2.getExternalDependenciesInfo)({
+                dependenciesToInstall: dependenciesList,
+                devDependenciesToInstall: [],
+                o3rPackageJsonPath: corePackageJsonPath,
+                projectType,
+                projectPackageJson
+            }, context.logger)
+        };
     };
     /**
      * Edit main module with the translation required configuration