@o3r/rules-engine 12.3.0-prerelease.48 → 12.3.0-prerelease.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/rules-engine",
-  "version": "12.3.0-prerelease.48",
+  "version": "12.3.0-prerelease.49",
   "publishConfig": {
     "access": "public"
   },
@@ -48,10 +48,10 @@
     "@ngrx/entity": "^19.0.0",
     "@ngrx/store": "^19.0.0",
     "@ngx-translate/core": "~16.0.4",
-    "@o3r/core": "^12.3.0-prerelease.48",
-    "@o3r/extractors": "^12.3.0-prerelease.48",
-    "@o3r/logger": "^12.3.0-prerelease.48",
-    "@o3r/schematics": "^12.3.0-prerelease.48",
+    "@o3r/core": "^12.3.0-prerelease.49",
+    "@o3r/extractors": "^12.3.0-prerelease.49",
+    "@o3r/logger": "^12.3.0-prerelease.49",
+    "@o3r/schematics": "^12.3.0-prerelease.49",
     "@schematics/angular": "^19.0.0",
     "globby": "^11.1.0",
     "jasmine": "^5.0.0",
@@ -91,6 +91,7 @@
     }
   },
   "dependencies": {
+    "@o3r/schematics": "^12.3.0-prerelease.49",
     "tslib": "^2.6.2"
   },
   "engines": {

package/schematics/ng-add/helpers/devtools-registration.d.ts

@@ -1,9 +1,8 @@
-import { Rule } from '@angular-devkit/schematics';
 import type { NgAddSchematicsSchema } from '../schema';
 /**
  * Register Devtools to the application
  * @param options
  * @param options.projectName
  */
-export declare const registerDevtools: (options: NgAddSchematicsSchema) => Promise<Rule>;
+export declare const registerDevtools: (options: NgAddSchematicsSchema) => import("@angular-devkit/schematics").Rule;
 //# sourceMappingURL=devtools-registration.d.ts.map

package/schematics/ng-add/helpers/devtools-registration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devtools-registration.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/devtools-registration.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,WAAW,CAAC;AAOnB;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAU,SAAS,qBAAqB,KAAG,OAAO,CAAC,IAAI,CAgBnF,CAAC"}
+{"version":3,"file":"devtools-registration.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/devtools-registration.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,WAAW,CAAC;AAOnB;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,SAAS,qBAAqB,8CAe9D,CAAC"}

package/schematics/ng-add/helpers/devtools-registration.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const node_fs_1 = require("node:fs");
 const path = tslib_1.__importStar(require("node:path"));
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const DEVTOOL_MODULE_NAME = 'RulesEngineDevtoolsModule';
 const MESSAGE_DEVTOOL_SERVICE_NAME = 'RulesEngineDevtoolsMessageService';
 const CONSOLE_DEVTOOL_SERVICE_NAME = 'RulesEngineDevtoolsConsoleService';
@@ -14,16 +15,15 @@ const PACKAGE_NAME = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirna
  * @param options
  * @param options.projectName
  */
-const registerDevtools = async (options) => {
-    const { registerDevtoolsToApplication } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics')));
+const registerDevtools = (options) => {
     return (0, schematics_1.chain)([
-        registerDevtoolsToApplication({
+        (0, schematics_2.registerDevtoolsToApplication)({
             moduleName: DEVTOOL_MODULE_NAME,
             packageName: PACKAGE_NAME,
             serviceName: MESSAGE_DEVTOOL_SERVICE_NAME,
             projectName: options.projectName
         }),
-        registerDevtoolsToApplication({
+        (0, schematics_2.registerDevtoolsToApplication)({
             moduleName: DEVTOOL_MODULE_NAME,
             packageName: PACKAGE_NAME,
             serviceName: CONSOLE_DEVTOOL_SERVICE_NAME,

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;AAcpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAiHlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAKtD,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;AA4BpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA2FlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("node:fs"));
 const path = tslib_1.__importStar(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 ts = tslib_1.__importStar(require("typescript"));
@@ -13,15 +14,8 @@ const devtools_registration_1 = require("./helpers/devtools-registration");
 const devDependenciesToInstall = [
     'jsonpath-plus'
 ];
-const reportMissingSchematicsDep = (logger) => (reason) => {
-    logger.error(`[ERROR]: Adding @o3r/rules-engine has failed.
-If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the rules-engine package. Please run 'ng add @o3r/core' .
-Otherwise, use the error message as guidance.`);
-    throw reason;
-};
-const updateAppModuleOrAppConfig = (projectName) => async (tree, context) => {
-    const { getAppModuleFilePath } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics')));
-    const moduleFilePath = getAppModuleFilePath(tree, context, projectName);
+const updateAppModuleOrAppConfig = (projectName) => (tree, context) => {
+    const moduleFilePath = (0, schematics_2.getAppModuleFilePath)(tree, context, projectName);
     if (!moduleFilePath) {
         return () => tree;
     }
@@ -38,32 +32,31 @@ const updateAppModuleOrAppConfig = (projectName) => async (tree, context) => {
  */
 function ngAddFn(options) {
     /* ng add rules */
-    return async (tree, context) => {
-        const { setupDependencies, getPackageInstallConfig, getDefaultOptionsForSchematic, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig, getExternalDependenciesVersionRange, removePackages, setupSchematicsParamsForProject, registerPackageCollectionSchematics } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics')));
-        options = { ...getDefaultOptionsForSchematic(getWorkspaceConfig(tree), '@o3r/rules-engine', 'ng-add', options), ...options };
+    return (tree, context) => {
+        options = { ...(0, schematics_2.getDefaultOptionsForSchematic)((0, schematics_2.getWorkspaceConfig)(tree), '@o3r/rules-engine', 'ng-add', options), ...options };
         const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
         const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
-        const depsInfo = getO3rPeerDeps(packageJsonPath);
+        const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
         if (options.enableMetadataExtract) {
             depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
         }
-        const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
             acc[dep] = {
                 inManifest: [{
                         range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
-                        types: getProjectNewDependenciesTypes(workspaceProject)
+                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
                     }],
                 ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
             };
             return acc;
-        }, getPackageInstallConfig(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
-        Object.entries(getExternalDependenciesVersionRange(devDependenciesToInstall, packageJsonPath, context.logger))
+        }, (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: getProjectNewDependenciesTypes(workspaceProject)
+                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
                     }]
             };
         });
@@ -71,19 +64,19 @@ function ngAddFn(options) {
             useRulesEngine: undefined
         };
         const rule = (0, schematics_1.chain)([
-            registerPackageCollectionSchematics(packageJson),
-            setupSchematicsParamsForProject({
+            (0, schematics_2.registerPackageCollectionSchematics)(packageJson),
+            (0, schematics_2.setupSchematicsParamsForProject)({
                 '@o3r/core:component': schematicsDefaultOptions,
                 '@o3r/core:component-container': schematicsDefaultOptions
             }, options.projectName),
-            removePackages(['@otter/rules-engine', '@otter/rules-engine-core']),
-            setupDependencies({
+            (0, schematics_2.removePackages)(['@otter/rules-engine', '@otter/rules-engine-core']),
+            (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
                 dependencies,
                 ngAddToRun: depsInfo.o3rPeerDeps
             }),
             ...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
-            await (0, devtools_registration_1.registerDevtools)(options),
+            (0, devtools_registration_1.registerDevtools)(options),
             updateAppModuleOrAppConfig(options.projectName)
         ]);
         context.logger.info(`The package ${depsInfo.packageName} comes with a debug mechanism`);
@@ -95,9 +88,6 @@ function ngAddFn(options) {
  * Add Otter rules-engine to an Angular Project
  * @param options
  */
-const ngAdd = (options) => async (_, { logger }) => {
-    const { createOtterSchematic } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics'))).catch(reportMissingSchematicsDep(logger));
-    return createOtterSchematic(ngAddFn)(options);
-};
+const ngAdd = (options) => (0, schematics_2.createOtterSchematic)(ngAddFn)(options);
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map