@o3r/rules-engine 10.2.0-prerelease.4 → 10.2.0-prerelease.40

package/schematics/ng-add/index.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
 const tslib_1 = require("tslib");
 const schematics_1 = require("@angular-devkit/schematics");
-const schematics_2 = require("@o3r/schematics");
 const cms_adapter_1 = require("../cms-adapter");
 const path = tslib_1.__importStar(require("node:path"));
 const fs = tslib_1.__importStar(require("node:fs"));
@@ -11,6 +10,12 @@ 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;
+};
 /**
  * Add Otter rules-engine to an Angular Project
  * @param options
@@ -18,72 +23,67 @@ const devDependenciesToInstall = [
 function ngAddFn(options) {
     /* ng add rules */
     return async (tree, context) => {
-        try {
-            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' }));
-            const depsInfo = getO3rPeerDeps(packageJsonPath);
-            if (options.enableMetadataExtract) {
-                depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
-            }
-            const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
-            const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
-                acc[dep] = {
-                    inManifest: [{
-                            range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
-                            types: getProjectNewDependenciesTypes(workspaceProject)
-                        }],
-                    ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
-                };
-                return acc;
-            }, getPackageInstallConfig(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
-            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({
-                    // eslint-disable-next-line @typescript-eslint/naming-convention
-                    '@o3r/core:component': {
-                        useRulesEngine: undefined
-                    },
-                    // eslint-disable-next-line @typescript-eslint/naming-convention
-                    '@o3r/core:component-container': {
-                        useRulesEngine: undefined
-                    }
-                }),
-                removePackages(['@otter/rules-engine', '@otter/rules-engine-core']),
-                setupDependencies({
-                    projectName: options.projectName,
-                    dependencies,
-                    ngAddToRun: depsInfo.o3rPeerDeps
-                }),
-                ...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
-                await (0, devtools_registration_1.registerDevtools)(options)
-            ]);
-            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');
-            return () => rule(tree, context);
-        }
-        catch (e) {
-            // rules-engine needs o3r/core as peer dep. o3r/core will install o3r/schematics
-            context.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 (e);
+        const { setupDependencies, getPackageInstallConfig, getDefaultOptionsForSchematic, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig, getExternalDependenciesVersionRange, removePackages, setupSchematicsDefaultParams, registerPackageCollectionSchematics } = 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' }));
+        const depsInfo = getO3rPeerDeps(packageJsonPath);
+        if (options.enableMetadataExtract) {
+            depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
         }
+        const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
+        const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
+            acc[dep] = {
+                inManifest: [{
+                        range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
+                        types: getProjectNewDependenciesTypes(workspaceProject)
+                    }],
+                ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
+            };
+            return acc;
+        }, getPackageInstallConfig(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
+        Object.entries(getExternalDependenciesVersionRange(devDependenciesToInstall, packageJsonPath))
+            .forEach(([dep, range]) => {
+            dependencies[dep] = {
+                inManifest: [{
+                        range,
+                        types: getProjectNewDependenciesTypes(workspaceProject)
+                    }]
+            };
+        });
+        const rule = (0, schematics_1.chain)([
+            registerPackageCollectionSchematics(packageJson),
+            setupSchematicsDefaultParams({
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                '@o3r/core:component': {
+                    useRulesEngine: undefined
+                },
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                '@o3r/core:component-container': {
+                    useRulesEngine: undefined
+                }
+            }),
+            removePackages(['@otter/rules-engine', '@otter/rules-engine-core']),
+            setupDependencies({
+                projectName: options.projectName,
+                dependencies,
+                ngAddToRun: depsInfo.o3rPeerDeps
+            }),
+            ...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
+            await (0, devtools_registration_1.registerDevtools)(options)
+        ]);
+        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');
+        return rule;
     };
 }
 /**
  * Add Otter rules-engine to an Angular Project
  * @param options
  */
-exports.ngAdd = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngAddFn);
+const ngAdd = (options) => async (_, { logger }) => {
+    const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics'))).catch(reportMissingSchematicsDep(logger));
+    return createSchematicWithMetricsIfInstalled(ngAddFn)(options);
+};
+exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map