@o3r/rules-engine 13.4.0-prerelease.9 → 13.5.0-prerelease.0

package/schematics/facts-service/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/facts-service/index.ts"],"names":[],"mappings":"AAKA,OAAO,EASL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAkEpC;;;GAGG;AACH,eAAO,MAAM,sBAAsB,wBAAiD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/facts-service/index.ts"],"names":[],"mappings":"AAKA,OAAO,EASL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAqEpC;;;GAGG;AACH,eAAO,MAAM,sBAAsB,wBAAiD,CAAC"}

package/schematics/facts-service/index.js

@@ -14,7 +14,8 @@ function ngGenerateFactsServiceFn(options) {
     const generateFiles = () => {
         const name = (0, strings_1.dasherize)(options.name);
         const serviceFolderPath = path.posix.join(options.path, name);
-        const servicePath = path.posix.join(serviceFolderPath, `${name}-facts.service.ts`);
+        const ngServicePath = path.posix.join(serviceFolderPath, `${name}-facts.ts`);
+        const o3rServicePath = path.posix.join(serviceFolderPath, `${name}-facts-service.ts`);
         const factsInterfaceName = `${(0, strings_1.classify)(name)}Facts`;
         return (0, schematics_1.chain)([
             (0, schematics_1.externalSchematic)('@schematics/angular', 'service', {
@@ -22,9 +23,11 @@ function ngGenerateFactsServiceFn(options) {
                 path: serviceFolderPath,
                 flat: true,
                 name: factsInterfaceName,
-                skipTests: true,
-                type: 'service'
+                skipTests: true
             }),
+            // Angular schematics will generate this service file with this pattern: -facts.ts (since the factsInterfaceName ends with 'Facts')
+            // We need to rename it to -facts-service.ts to avoid confusion with the facts file that is created just after
+            (0, schematics_1.move)(ngServicePath, o3rServicePath),
             (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
                 (0, schematics_1.template)({
                     name,
@@ -33,21 +36,21 @@ function ngGenerateFactsServiceFn(options) {
                 (0, schematics_1.renameTemplateFiles)(),
                 (0, schematics_1.move)(serviceFolderPath)
             ]), schematics_1.MergeStrategy.Overwrite),
-            (0, schematics_2.addImportsRule)(servicePath, [
+            (0, schematics_2.addImportsRule)(o3rServicePath, [
                 {
                     from: '@o3r/rules-engine',
                     importNames: ['FactsService', 'RulesEngineService']
                 },
                 {
-                    from: `./${name}.facts`,
+                    from: `./${name}-facts`,
                     importNames: [factsInterfaceName]
                 }
             ]),
             (t) => {
-                const serviceText = t.readText(servicePath);
-                t.overwrite(servicePath, serviceText
+                const serviceText = t.readText(o3rServicePath);
+                t.overwrite(o3rServicePath, serviceText
                     .replace('constructor() { }', 'public facts = {};')
-                    .replace('Service {', `Service extends FactsService<${factsInterfaceName}> {`));
+                    .replace(`${factsInterfaceName} {`, `${factsInterfaceName} extends FactsService<${factsInterfaceName}> {`));
                 return t;
             }
         ]);

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

@@ -111,7 +111,7 @@ function ngGenerateRulesEngineToComponentFn(options) {
                 return tree;
             };
             const updateModuleRule = () => {
-                const moduleFilePath = options.path.replace(/component.ts$/, 'module.ts');
+                const moduleFilePath = options.path.replace(/\.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');