@o3r/rules-engine 11.1.0-prerelease.40 → 11.1.0-prerelease.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/rules-engine",
-  "version": "11.1.0-prerelease.40",
+  "version": "11.1.0-prerelease.42",
   "publishConfig": {
     "access": "public"
   },
@@ -49,10 +49,10 @@
     "@ngrx/entity": "~18.0.0",
     "@ngrx/store": "~18.0.0",
     "@ngx-translate/core": "~15.0.0",
-    "@o3r/core": "^11.1.0-prerelease.40",
-    "@o3r/extractors": "^11.1.0-prerelease.40",
-    "@o3r/logger": "^11.1.0-prerelease.40",
-    "@o3r/schematics": "^11.1.0-prerelease.40",
+    "@o3r/core": "^11.1.0-prerelease.42",
+    "@o3r/extractors": "^11.1.0-prerelease.42",
+    "@o3r/logger": "^11.1.0-prerelease.42",
+    "@o3r/schematics": "^11.1.0-prerelease.42",
     "@schematics/angular": "~18.0.0",
     "globby": "^11.1.0",
     "jasmine": "^5.0.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":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA2FtD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAO9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAqHtD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}

package/schematics/ng-add/index.js

@@ -3,10 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
 const tslib_1 = require("tslib");
 const schematics_1 = require("@angular-devkit/schematics");
-const cms_adapter_1 = require("../cms-adapter");
+const utility_1 = require("@schematics/angular/utility");
 const path = tslib_1.__importStar(require("node:path"));
 const fs = tslib_1.__importStar(require("node:fs"));
+const ts = tslib_1.__importStar(require("typescript"));
+const cms_adapter_1 = require("../cms-adapter");
 const devtools_registration_1 = require("./helpers/devtools-registration");
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const devDependenciesToInstall = [
     'jsonpath-plus'
 ];
@@ -16,6 +19,19 @@ If the error is related to missing @o3r dependencies you need to install '@o3r/c
 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);
+    if (!moduleFilePath) {
+        return () => tree;
+    }
+    const sourceFileContent = tree.readText(moduleFilePath);
+    const sourceFile = ts.createSourceFile(moduleFilePath, sourceFileContent, ts.ScriptTarget.ES2015, true);
+    if ((0, ast_utils_1.isImported)(sourceFile, 'RulesEngineRunnerModule', '@o3r/rules-engine')) {
+        return () => tree;
+    }
+    return (0, utility_1.addRootImport)(projectName, ({ code, external }) => code `\n${external('RulesEngineRunnerModule', '@o3r/rules-engine')}.forRoot()`);
+};
 /**
  * Add Otter rules-engine to an Angular Project
  * @param options
@@ -70,7 +86,8 @@ function ngAddFn(options) {
                 ngAddToRun: depsInfo.o3rPeerDeps
             }),
             ...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
-            await (0, devtools_registration_1.registerDevtools)(options)
+            await (0, devtools_registration_1.registerDevtools)(options),
+            updateAppModuleOrAppConfig(options.projectName)
         ]);
         context.logger.info(`The package ${depsInfo.packageName} comes with a debug mechanism`);
         context.logger.info('Get information on https://github.com/AmadeusITGroup/otter/tree/main/docs/rules-engine/how-to-use/debug.md');

package/schematics/rules-engine-to-component/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/rules-engine-to-component/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAiBvF,OAAO,EAAE,gDAAgD,EAAE,MAAM,UAAU,CAAC;AAyJ5E;;;GAGG;AACH,eAAO,MAAM,gCAAgC,qEAA4E,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/rules-engine-to-component/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAQ,MAAM,4BAA4B,CAAC;AAmBrE,OAAO,EAAE,gDAAgD,EAAE,MAAM,UAAU,CAAC;AAqL5E;;;GAGG;AACH,eAAO,MAAM,gCAAgC,qEAA4E,CAAC"}

package/schematics/rules-engine-to-component/index.js

@@ -28,83 +28,102 @@ const checkRulesEngine = (componentPath) => (tree) => {
  * @param options
  */
 function ngGenerateRulesEngineToComponentFn(options) {
-    const generateFiles = (tree, _context) => {
-        const componentPath = options.path;
-        const projectName = options.projectName || (0, schematics_2.getLibraryNameFromPath)(componentPath) || '';
-        const imports = [
-            {
-                from: '@angular/core',
-                importNames: ['inject', 'OnInit', 'OnDestroy']
-            },
-            {
-                from: '@o3r/core',
-                importNames: ['computeItemIdentifier']
-            },
-            {
-                from: '@o3r/rules-engine',
-                importNames: ['RulesEngineRunnerService']
-            }
-        ];
-        let sourceFile = ts.createSourceFile(componentPath, tree.readText(componentPath), ts.ScriptTarget.ES2020, true);
-        const recorder = tree.beginUpdate(componentPath);
-        const changes = imports.reduce((acc, { importNames, from }) => acc.concat(importNames.map((importName) => (0, ast_utils_1.insertImport)(sourceFile, componentPath, importName, from))), []);
-        (0, change_1.applyToUpdateRecorder)(recorder, changes);
-        tree.commitUpdate(recorder);
-        sourceFile = ts.createSourceFile(componentPath, tree.readText(componentPath), ts.ScriptTarget.ES2020, true);
-        const result = ts.transform(sourceFile, [
-            (ctx) => (rootNode) => {
-                const { factory } = ctx;
-                const visit = (node) => {
-                    if (ts.isClassDeclaration(node)) {
-                        const implementsClauses = node.heritageClauses?.find((heritageClause) => heritageClause.token === ts.SyntaxKind.ImplementsKeyword);
-                        const interfaceToImplements = (0, schematics_2.generateImplementsExpressionWithTypeArguments)('OnInit, OnDestroy');
-                        const deduplicateHeritageClauses = (clauses) => clauses.filter((h, i) => !clauses.slice(i + 1).some((h2) => h2.kind === h.kind && h2.expression.escapedText === h.expression.escapedText));
-                        const newImplementsClauses = implementsClauses
-                            ? factory.updateHeritageClause(implementsClauses, deduplicateHeritageClauses([...implementsClauses.types, ...interfaceToImplements]))
-                            : factory.createHeritageClause(ts.SyntaxKind.ImplementsKeyword, [...interfaceToImplements]);
-                        const heritageClauses = Array.from(node.heritageClauses ?? [])
-                            .filter((h) => h.token !== ts.SyntaxKind.ImplementsKeyword)
-                            .concat(newImplementsClauses);
-                        const newModifiers = []
-                            .concat(ts.getDecorators(node) || [])
-                            .concat(ts.getModifiers(node) || []);
-                        const propertiesToAdd = (0, schematics_2.generateClassElementsFromString)(`
-              private readonly componentName = computeItemIdentifier('${node.name?.escapedText}', '${projectName}');
-              private readonly rulesEngineService = inject(RulesEngineRunnerService, {optional: true});
-            `);
-                        const newNgOnInit = (0, schematics_2.getSimpleUpdatedMethod)(node, factory, 'ngOnInit', (0, schematics_2.generateBlockStatementsFromString)(`
-              if (this.rulesEngineService) {
-                this.rulesEngineService.enableRuleSetFor(this.componentName);
-              }
-            `));
-                        const newNgOnDestroy = (0, schematics_2.getSimpleUpdatedMethod)(node, factory, 'ngOnDestroy', (0, schematics_2.generateBlockStatementsFromString)(`
-              if (this.rulesEngineService) {
-                this.rulesEngineService.disableRuleSetFor(this.componentName);
-              }
-            `));
-                        const newMembers = node.members
-                            .filter((classElement) => !((0, schematics_2.findMethodByName)('ngOnInit')(classElement) || (0, schematics_2.findMethodByName)('ngOnDestroy')(classElement)))
-                            .concat(propertiesToAdd, newNgOnInit, newNgOnDestroy)
-                            .sort(schematics_2.sortClassElement);
-                        return factory.updateClassDeclaration(node, newModifiers, node.name, node.typeParameters, heritageClauses, newMembers);
-                    }
-                    return ts.visitEachChild(node, visit, ctx);
-                };
-                return ts.visitNode(rootNode, visit);
-            },
-            schematics_2.fixStringLiterals
-        ]);
-        const printer = ts.createPrinter({
-            removeComments: false,
-            newLine: ts.NewLineKind.LineFeed
-        });
-        tree.overwrite(componentPath, printer.printFile(result.transformed[0]));
-        return tree;
-    };
+    const componentPath = options.path;
     return (0, schematics_1.chain)([
-        checkRulesEngine(options.path),
-        generateFiles,
-        options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)()
+        checkRulesEngine(componentPath),
+        (tree) => {
+            const { standalone } = (0, schematics_2.getO3rComponentInfoOrThrowIfNotFound)(tree, componentPath);
+            const generateFiles = () => {
+                const projectName = options.projectName || (0, schematics_2.getLibraryNameFromPath)(componentPath) || '';
+                const imports = [
+                    {
+                        from: '@angular/core',
+                        importNames: ['inject', 'OnInit', 'OnDestroy']
+                    },
+                    {
+                        from: '@o3r/core',
+                        importNames: ['computeItemIdentifier']
+                    },
+                    {
+                        from: '@o3r/rules-engine',
+                        importNames: ['RulesEngineRunnerService',
+                            ...(standalone ? ['RulesEngineRunnerModule'] : [])
+                        ]
+                    }
+                ];
+                let sourceFile = ts.createSourceFile(componentPath, tree.readText(componentPath), ts.ScriptTarget.ES2020, true);
+                const recorder = tree.beginUpdate(componentPath);
+                const changes = imports.reduce((acc, { importNames, from }) => acc.concat(importNames.map((importName) => (0, ast_utils_1.insertImport)(sourceFile, componentPath, importName, from))), []);
+                (0, change_1.applyToUpdateRecorder)(recorder, changes);
+                tree.commitUpdate(recorder);
+                sourceFile = ts.createSourceFile(componentPath, tree.readText(componentPath), ts.ScriptTarget.ES2020, true);
+                const result = ts.transform(sourceFile, [
+                    ...(standalone
+                        ? [(0, schematics_2.addImportsIntoComponentDecoratorTransformerFactory)(['RulesEngineRunnerModule'])]
+                        : []),
+                    (ctx) => (rootNode) => {
+                        const { factory } = ctx;
+                        const visit = (node) => {
+                            if (ts.isClassDeclaration(node)) {
+                                const implementsClauses = node.heritageClauses?.find((heritageClause) => heritageClause.token === ts.SyntaxKind.ImplementsKeyword);
+                                const interfaceToImplements = (0, schematics_2.generateImplementsExpressionWithTypeArguments)('OnInit, OnDestroy');
+                                const deduplicateHeritageClauses = (clauses) => clauses.filter((h, i) => !clauses.slice(i + 1).some((h2) => h2.kind === h.kind && h2.expression.escapedText === h.expression.escapedText));
+                                const newImplementsClauses = implementsClauses
+                                    ? factory.updateHeritageClause(implementsClauses, deduplicateHeritageClauses([...implementsClauses.types, ...interfaceToImplements]))
+                                    : factory.createHeritageClause(ts.SyntaxKind.ImplementsKeyword, [...interfaceToImplements]);
+                                const heritageClauses = Array.from(node.heritageClauses ?? [])
+                                    .filter((h) => h.token !== ts.SyntaxKind.ImplementsKeyword)
+                                    .concat(newImplementsClauses);
+                                const newModifiers = []
+                                    .concat(ts.getDecorators(node) || [])
+                                    .concat(ts.getModifiers(node) || []);
+                                const propertiesToAdd = (0, schematics_2.generateClassElementsFromString)(`
+                  private readonly componentName = computeItemIdentifier('${node.name?.escapedText}', '${projectName}');
+                  private readonly rulesEngineService = inject(RulesEngineRunnerService, {optional: true});
+                `);
+                                const newNgOnInit = (0, schematics_2.getSimpleUpdatedMethod)(node, factory, 'ngOnInit', (0, schematics_2.generateBlockStatementsFromString)(`
+                  if (this.rulesEngineService) {
+                    this.rulesEngineService.enableRuleSetFor(this.componentName);
+                  }
+                `));
+                                const newNgOnDestroy = (0, schematics_2.getSimpleUpdatedMethod)(node, factory, 'ngOnDestroy', (0, schematics_2.generateBlockStatementsFromString)(`
+                  if (this.rulesEngineService) {
+                    this.rulesEngineService.disableRuleSetFor(this.componentName);
+                  }
+                `));
+                                const newMembers = node.members
+                                    .filter((classElement) => !((0, schematics_2.findMethodByName)('ngOnInit')(classElement) || (0, schematics_2.findMethodByName)('ngOnDestroy')(classElement)))
+                                    .concat(propertiesToAdd, newNgOnInit, newNgOnDestroy)
+                                    .sort(schematics_2.sortClassElement);
+                                return factory.updateClassDeclaration(node, newModifiers, node.name, node.typeParameters, heritageClauses, newMembers);
+                            }
+                            return ts.visitEachChild(node, visit, ctx);
+                        };
+                        return ts.visitNode(rootNode, visit);
+                    },
+                    schematics_2.fixStringLiterals
+                ]);
+                const printer = ts.createPrinter({
+                    removeComments: false,
+                    newLine: ts.NewLineKind.LineFeed
+                });
+                tree.overwrite(componentPath, printer.printFile(result.transformed[0]));
+                return tree;
+            };
+            const updateModuleRule = () => {
+                const moduleFilePath = options.path.replace(/component.ts$/, 'module.ts');
+                const moduleSourceFile = ts.createSourceFile(moduleFilePath, tree.readText(moduleFilePath), ts.ScriptTarget.ES2020, true);
+                const recorder = tree.beginUpdate(moduleFilePath);
+                const changes = (0, ast_utils_1.addImportToModule)(moduleSourceFile, moduleFilePath, 'RulesEngineRunnerModule', '@o3r/rules-engine');
+                (0, change_1.applyToUpdateRecorder)(recorder, changes);
+                tree.commitUpdate(recorder);
+            };
+            return (0, schematics_1.chain)([
+                standalone ? schematics_1.noop : updateModuleRule,
+                generateFiles,
+                options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)()
+            ]);
+        }
     ]);
 }
 /**

package/schematics/rules-engine-to-component/schema.d.ts

@@ -2,8 +2,8 @@ import type { SchematicOptionObject } from '@o3r/schematics';
 export interface NgGenerateRulesEngineToComponentSchematicsSchema extends SchematicOptionObject {
     /** Project name */
     projectName?: string | undefined;
-    /** Component Folder */
-    path?: string | undefined;
+    /** Path to the component */
+    path: string;
     /** Skip the linter process */
     skipLinter: boolean;
 }

package/schematics/rules-engine-to-component/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/rules-engine-to-component/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,gDAAiD,SAAQ,qBAAqB;IAC7F,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,uBAAuB;IACvB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/rules-engine-to-component/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,gDAAiD,SAAQ,qBAAqB;IAC7F,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAC;IAEb,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB"}

package/schematics/rules-engine-to-component/schema.json

@@ -13,7 +13,7 @@
     },
     "path": {
       "type": "string",
-      "description": "Directory containing the component"
+      "description": "Path to the component"
     },
     "skipLinter": {
       "type": "boolean",