@o3r/rules-engine 10.0.0-prerelease.99 → 10.1.0-prerelease.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/rules-engine",
-  "version": "10.0.0-prerelease.99",
+  "version": "10.1.0-prerelease.0",
   "publishConfig": {
     "access": "public"
   },
@@ -48,16 +48,16 @@
     "@ngrx/entity": "~17.1.0",
     "@ngrx/store": "~17.1.0",
     "@ngx-translate/core": "~15.0.0",
-    "@o3r/core": "^10.0.0-prerelease.99",
-    "@o3r/extractors": "^10.0.0-prerelease.99",
-    "@o3r/logger": "^10.0.0-prerelease.99",
-    "@o3r/schematics": "^10.0.0-prerelease.99",
+    "@o3r/core": "^10.1.0-prerelease.0",
+    "@o3r/extractors": "^10.1.0-prerelease.0",
+    "@o3r/logger": "^10.1.0-prerelease.0",
+    "@o3r/schematics": "^10.1.0-prerelease.0",
     "@schematics/angular": "~17.2.0",
     "globby": "^11.1.0",
     "jasmine": "^5.0.0",
     "jsonpath-plus": "^8.0.0",
     "rxjs": "^7.8.1",
-    "typescript": "~5.2.2",
+    "typescript": "~5.3.3",
     "typescript-json-schema": "~0.63.0"
   },
   "peerDependenciesMeta": {

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":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAGjF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAyEtD;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAGjF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA0FtD;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}

package/schematics/ng-add/index.js

@@ -8,6 +8,9 @@ const cms_adapter_1 = require("../cms-adapter");
 const path = tslib_1.__importStar(require("node:path"));
 const fs = tslib_1.__importStar(require("node:fs"));
 const devtools_registration_1 = require("./helpers/devtools-registration");
+const devDependenciesToInstall = [
+    'jsonpath-plus'
+];
 /**
  * Add Otter rules-engine to an Angular Project
  * @param options
@@ -16,7 +19,7 @@ function ngAddFn(options) {
     /* ng add rules */
     return async (tree, context) => {
         try {
-            const { ngAddPackages, getDefaultOptionsForSchematic, getO3rPeerDeps, getProjectNewDependenciesType, getWorkspaceConfig, ngAddPeerDependencyPackages, removePackages, setupSchematicsDefaultParams } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics')));
+            const { setupDependencies, getPackageInstallConfig, getDefaultOptionsForSchematic, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig, getExternalDependenciesVersionRange, removePackages, setupSchematicsDefaultParams } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics')));
             options = { ...getDefaultOptionsForSchematic(getWorkspaceConfig(tree), '@o3r/rules-engine', 'ng-add', options), ...options };
             const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
             const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf-8' }));
@@ -25,8 +28,24 @@ function ngAddFn(options) {
                 depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
             }
             const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
-            const workingDirectory = workspaceProject?.root || '.';
-            const dependencyType = getProjectNewDependenciesType(workspaceProject);
+            const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
+                acc[dep] = {
+                    inManifest: [{
+                            range: `~${depsInfo.packageVersion}`,
+                            types: getProjectNewDependenciesTypes(workspaceProject)
+                        }]
+                };
+                return acc;
+            }, getPackageInstallConfig(packageJsonPath, tree, options.projectName));
+            Object.entries(getExternalDependenciesVersionRange(devDependenciesToInstall, packageJsonPath))
+                .forEach(([dep, range]) => {
+                dependencies[dep] = {
+                    inManifest: [{
+                            range,
+                            types: getProjectNewDependenciesTypes(workspaceProject)
+                        }]
+                };
+            });
             const rule = (0, schematics_1.chain)([
                 (0, schematics_2.registerPackageCollectionSchematics)(packageJson),
                 setupSchematicsDefaultParams({
@@ -40,14 +59,10 @@ function ngAddFn(options) {
                     }
                 }),
                 removePackages(['@otter/rules-engine', '@otter/rules-engine-core']),
-                ngAddPeerDependencyPackages(['jsonpath-plus'], packageJsonPath, dependencyType, { ...options, workingDirectory, skipNgAddSchematicRun: true }, '@o3r/rules-engine - install builder dependency'),
-                ngAddPackages(depsInfo.o3rPeerDeps, {
-                    skipConfirmation: true,
-                    version: depsInfo.packageVersion,
-                    parentPackageInfo: depsInfo.packageName,
+                setupDependencies({
                     projectName: options.projectName,
-                    dependencyType,
-                    workingDirectory
+                    dependencies,
+                    ngAddToRun: depsInfo.o3rPeerDeps
                 }),
                 ...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
                 await (0, devtools_registration_1.registerDevtools)(options)