@o3r/rules-engine 12.5.0-prerelease.4 → 12.5.0-prerelease.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/rules-engine",
-  "version": "12.5.0-prerelease.4",
+  "version": "12.5.0-prerelease.41",
   "publishConfig": {
     "access": "public"
   },
@@ -36,6 +36,9 @@
       "default": "./fesm2022/o3r-rules-engine-fixtures-jest.mjs"
     }
   },
+  "generatorDependencies": {
+    "jsonpath-plus": "~10.3.0"
+  },
   "peerDependencies": {
     "@angular-devkit/architect": ">=0.1900.0 <0.2000.0-0",
     "@angular-devkit/core": "^19.0.0",
@@ -47,11 +50,11 @@
     "@ngrx/effects": "^19.0.0",
     "@ngrx/entity": "^19.0.0",
     "@ngrx/store": "^19.0.0",
-    "@ngx-translate/core": "~16.0.4",
-    "@o3r/core": "^12.5.0-prerelease.4",
-    "@o3r/extractors": "^12.5.0-prerelease.4",
-    "@o3r/logger": "^12.5.0-prerelease.4",
-    "@o3r/schematics": "^12.5.0-prerelease.4",
+    "@ngx-translate/core": "^15.0.0 || ~16.0.4",
+    "@o3r/core": "^12.5.0-prerelease.41",
+    "@o3r/extractors": "^12.5.0-prerelease.41",
+    "@o3r/logger": "^12.5.0-prerelease.41",
+    "@o3r/schematics": "^12.5.0-prerelease.41",
     "@schematics/angular": "^19.0.0",
     "globby": "^11.1.0",
     "jasmine": "^5.0.0",
@@ -59,6 +62,7 @@
     "jsonpath-plus": "^9.0.0 || ^10.0.0",
     "rxjs": "^7.8.1",
     "ts-node": "~10.9.2",
+    "type-fest": "^4.30.0",
     "typescript": "^5.5.4",
     "typescript-json-schema": "^0.65.0"
   },
@@ -87,6 +91,9 @@
     "json-schema": {
       "optional": true
     },
+    "type-fest": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
     },
@@ -95,7 +102,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^12.5.0-prerelease.4",
+    "@o3r/schematics": "^12.5.0-prerelease.41",
     "tslib": "^2.6.2"
   },
   "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":"AAEA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AA4BpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA2FlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AA+BpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAqHlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -11,8 +11,26 @@ const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const ts = tslib_1.__importStar(require("typescript"));
 const cms_adapter_1 = require("../cms-adapter");
 const devtools_registration_1 = require("./helpers/devtools-registration");
+/**
+ * List of external dependencies to be added to the project as peer dependencies
+ */
+const dependenciesToInstall = [
+    '@angular/common',
+    '@angular/platform-browser-dynamic',
+    '@angular/core',
+    '@angular/forms',
+    '@ngrx/effects',
+    '@ngrx/entity',
+    '@ngrx/store',
+    '@ngx-translate/core',
+    'jsonpath-plus',
+    'rxjs'
+];
+/**
+ * List of external dependencies to be added to the project as dev dependencies
+ */
 const devDependenciesToInstall = [
-    'jsonpath-plus'
+    '@angular-devkit/architect'
 ];
 const updateAppModuleOrAppConfig = (projectName) => (tree, context) => {
     const moduleFilePath = (0, schematics_2.getAppModuleFilePath)(tree, context, projectName);
@@ -41,6 +59,8 @@ function ngAddFn(options) {
             depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
         }
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
+        const projectDirectory = workspaceProject?.root || '.';
+        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
         const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
             acc[dep] = {
                 inManifest: [{
@@ -51,15 +71,13 @@ function ngAddFn(options) {
             };
             return acc;
         }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
-        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(devDependenciesToInstall, packageJsonPath, context.logger))
-            .forEach(([dep, range]) => {
-            dependencies[dep] = {
-                inManifest: [{
-                        range,
-                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
-                    }]
-            };
-        });
+        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
+            devDependenciesToInstall,
+            dependenciesToInstall,
+            projectType: workspaceProject?.projectType,
+            projectPackageJson,
+            o3rPackageJsonPath: packageJsonPath
+        }, context.logger);
         const schematicsDefaultOptions = {
             useRulesEngine: undefined
         };
@@ -72,7 +90,10 @@ function ngAddFn(options) {
             (0, schematics_2.removePackages)(['@otter/rules-engine', '@otter/rules-engine-core']),
             (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
-                dependencies,
+                dependencies: {
+                    ...dependencies,
+                    ...externalDependenciesInfo
+                },
                 ngAddToRun: depsInfo.o3rPeerDeps
             }),
             ...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),