@o3r/core 11.6.0-prerelease.5 → 11.6.0-prerelease.51

package/schematics/ng-add/updates-for-v8/generators/update-generators-names.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateOtterGeneratorsNames = updateOtterGeneratorsNames;
-/* eslint-disable @typescript-eslint/naming-convention */
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const generatorsMappingFromV7 = {
@@ -33,36 +32,35 @@ function updateGeneratorsPackage(schematicsToUpdate) {
         }
     });
 }
+/**
+ * Change otter generators names into angular.json
+ * @param tree
+ * @param context
+ */
+const updateAngularJson = (tree, context) => {
+    const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
+    if (!workspace) {
+        context.logger.error('No workspace detected');
+        return tree;
+    }
+    const projectsInAngularJson = Object.keys(workspace.projects);
+    if (workspace.schematics) {
+        updateGeneratorsPackage(workspace.schematics);
+        delete workspace.schematics['@otter/ng-tools:api-service'];
+    }
+    projectsInAngularJson.forEach((projectName) => {
+        if (workspace.projects[projectName].schematics) {
+            updateGeneratorsPackage(workspace.projects[projectName].schematics);
+            delete workspace.projects[projectName].schematics['@otter/ng-tools:api-service'];
+        }
+    });
+    tree.overwrite('/angular.json', JSON.stringify(workspace, null, 2));
+    return tree;
+};
 /**
  * Update otter generators names
  */
 function updateOtterGeneratorsNames() {
-    /**
-     * Change otter generators names into angular.json
-     *
-     * @param tree
-     * @param context
-     */
-    const updateAngularJson = (tree, context) => {
-        const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
-        if (!workspace) {
-            context.logger.error('No workspace detected');
-            return tree;
-        }
-        const projectsInAngularJson = Object.keys(workspace.projects);
-        if (workspace.schematics) {
-            updateGeneratorsPackage(workspace.schematics);
-            delete workspace.schematics['@otter/ng-tools:api-service'];
-        }
-        projectsInAngularJson.forEach(projectName => {
-            if (workspace.projects[projectName].schematics) {
-                updateGeneratorsPackage(workspace.projects[projectName].schematics);
-                delete workspace.projects[projectName].schematics['@otter/ng-tools:api-service'];
-            }
-        });
-        tree.overwrite('/angular.json', JSON.stringify(workspace, null, 2));
-        return tree;
-    };
     return (0, schematics_1.chain)([
         updateAngularJson
     ]);

package/schematics/ng-add/utils/linter/index.d.ts

@@ -1,9 +1,14 @@
-import { SchematicContext } from '@angular-devkit/schematics';
+import { SchematicContext, type Tree } from '@angular-devkit/schematics';
+/**
+ * If the ESLint FlatConfig is used in the repository
+ * @param tree
+ */
+export declare const isUsingFlatConfig: (tree: Tree) => import("@angular-devkit/core").PathFragment | undefined;
 /**
  * Checks if `eslint` package is installed. If so, ask the user for otter linter rules install.
  * Otherwise displays a message to inform the user that otter linter rules can be added later.
- *
  * @param context Schematics context
+ * @param tree
  */
-export declare const shouldOtterLinterBeInstalled: (context: SchematicContext) => Promise<boolean>;
+export declare const shouldOtterLinterBeInstalled: (context: SchematicContext, tree: Tree) => Promise<boolean>;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-add/utils/linter/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/utils/linter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAG9D;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,YAAmB,gBAAgB,KAAG,OAAO,CAAC,OAAO,CAe7F,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/utils/linter/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,iBAAiB,SAAU,IAAI,4DAAgF,CAAC;AAE7H;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,YAAmB,gBAAgB,QAAQ,IAAI,KAAG,OAAO,CAAC,OAAO,CAezG,CAAC"}

package/schematics/ng-add/utils/linter/index.js

@@ -1,26 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shouldOtterLinterBeInstalled = void 0;
+exports.shouldOtterLinterBeInstalled = exports.isUsingFlatConfig = void 0;
 const prompt_1 = require("@angular/cli/src/utilities/prompt");
+/**
+ * If the ESLint FlatConfig is used in the repository
+ * @param tree
+ */
+const isUsingFlatConfig = (tree) => tree.root.subfiles.find((file) => /eslint\.config\.{m,c,}[jt]s/.test(file));
+exports.isUsingFlatConfig = isUsingFlatConfig;
 /**
  * Checks if `eslint` package is installed. If so, ask the user for otter linter rules install.
  * Otherwise displays a message to inform the user that otter linter rules can be added later.
- *
  * @param context Schematics context
+ * @param tree
  */
-const shouldOtterLinterBeInstalled = async (context) => {
+const shouldOtterLinterBeInstalled = async (context, tree) => {
     const linterPackageName = 'eslint';
     let useOtterLinter = false;
     try {
         require.resolve(`${linterPackageName}/package.json`);
         if (context.interactive) {
             useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have ESLint installed. Would you like to add otter config rules for ESLint?
-Otherwise, you can add them later via this command: ng add @o3r/eslint-config-otter`, true);
+Otherwise, you can add them later via this command: ng add @o3r/eslint-config${(0, exports.isUsingFlatConfig)(tree) ? '' : '-otter'}`, true);
         }
     }
     catch {
         context.logger.info(`ESLint package not installed. Skipping Otter linter phase!
-You can add Otter linter config rules later to the project via this command: ng add @o3r/eslint-config-otter`);
+You can add Otter linter config rules later to the project via this command: ng add @o3r/eslint-config`);
     }
     return useOtterLinter;
 };

package/schematics/ng-add-create/index.d.ts

@@ -2,13 +2,11 @@ import { Rule } from '@angular-devkit/schematics';
 import { NgGenerateUpdateSchematicsSchema } from './schema';
 /**
  * Rule factory to include `ng add` skeleton
- *
  * @param options
  */
 export declare const updateTemplates: (options: NgGenerateUpdateSchematicsSchema) => Rule;
 /**
  * add a new ngUpdate function
- *
  * @param options
  */
 export declare const ngAddCreate: (options: NgGenerateUpdateSchematicsSchema) => Rule;

package/schematics/ng-add-create/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add-create/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAMvF,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAC;AAiE5D;;;;GAIG;AACH,eAAO,MAAM,eAAe,qDAA2D,CAAC;AAaxF;;;;GAIG;AACH,eAAO,MAAM,WAAW,qDAAuD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add-create/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC,OAAO,EACL,gCAAgC,EACjC,MAAM,UAAU,CAAC;AA6DlB;;;GAGG;AACH,eAAO,MAAM,eAAe,qDAA2D,CAAC;AAYxF;;;GAGG;AACH,eAAO,MAAM,WAAW,qDAAuD,CAAC"}

package/schematics/ng-add-create/index.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAddCreate = exports.updateTemplates = void 0;
-const schematics_1 = require("@angular-devkit/schematics");
-const path = require("node:path");
 const fs = require("node:fs");
+const path = require("node:path");
+const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
-const schematics_3 = require("@angular-devkit/schematics");
 /**
  * Rule factory to include `ng add` skeleton
- *
  * @param options
  */
 function updateTemplatesFn(options) {
@@ -29,10 +27,9 @@ function updateTemplatesFn(options) {
             const otterVersion = o3rCorePackageJson.dependencies['@o3r/schematics'];
             const packageManagerRunner = (0, schematics_2.getPackageManagerRunner)();
             packageJson.scripts ||= {};
-            packageJson.scripts['build:schematics'] =
-                `tsc -b tsconfig.builders.json --pretty && ${packageManagerRunner} cpy 'schematics/**/*.json' dist/schematics && ${packageManagerRunner} cpy 'collection.json' dist`;
-            // eslint-disable-next-line @typescript-eslint/dot-notation, dot-notation
-            packageJson['schematics'] = './collection.json';
+            // eslint-disable-next-line @stylistic/max-len -- keep the command on the same line
+            packageJson.scripts['build:schematics'] = `tsc -b tsconfig.builders.json --pretty && ${packageManagerRunner} cpy 'schematics/**/*.json' dist/schematics && ${packageManagerRunner} cpy 'collection.json' dist`;
+            packageJson.schematics = './collection.json';
             packageJson.peerDependencies ||= {};
             packageJson.peerDependencies['@angular-devkit/schematics'] = angularVersion;
             packageJson.peerDependencies['@angular-devkit/core'] = angularVersion;
@@ -50,27 +47,25 @@ function updateTemplatesFn(options) {
         }
         // generate skeleton
         const featureName = options.name || path.basename(process.cwd());
-        const templateSource = (0, schematics_3.apply)((0, schematics_3.url)('./templates'), [
-            (0, schematics_3.template)({
+        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
+            (0, schematics_1.template)({
                 featureName,
                 tsconfigBuildPath: (0, schematics_2.findConfigFileRelativePath)(tree, ['tsconfig.build.json', 'tsconfig.base.json', 'tsconfig.json'], targetPath)
             }),
-            (0, schematics_3.renameTemplateFiles)(),
+            (0, schematics_1.renameTemplateFiles)(),
             (0, schematics_1.move)(targetPath)
         ]);
-        const rule = (0, schematics_3.mergeWith)(templateSource, schematics_3.MergeStrategy.AllowCreationConflict);
+        const rule = (0, schematics_1.mergeWith)(templateSource, schematics_1.MergeStrategy.AllowCreationConflict);
         return rule(tree, context);
     };
 }
 /**
  * Rule factory to include `ng add` skeleton
- *
  * @param options
  */
 exports.updateTemplates = (0, schematics_2.createSchematicWithMetricsIfInstalled)(updateTemplatesFn);
 /**
  * add a new ngUpdate function
- *
  * @param options
  */
 function ngAddCreateFn(options) {
@@ -80,7 +75,6 @@ function ngAddCreateFn(options) {
 }
 /**
  * add a new ngUpdate function
- *
  * @param options
  */
 exports.ngAddCreate = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngAddCreateFn);

package/schematics/ng-add-create/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add-create/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,gCAAiC,SAAQ,qBAAqB;IAC7E,mBAAmB;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,iDAAiD;IACjD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAE3B"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add-create/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,gCAAiC,SAAQ,qBAAqB;IAC7E,mBAAmB;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,iDAAiD;IACjD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAE3B"}

package/schematics/ng-update/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAmBjF;;GAEG;AACH,eAAO,MAAM,UAAU,4BAAsD,CAAC;AAkB9E;;GAEG;AACH,eAAO,MAAM,WAAW,4BAAuD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AA0BpC;;GAEG;AAEH,eAAO,MAAM,UAAU,4BAAsD,CAAC;AAkB9E;;GAEG;AAEH,eAAO,MAAM,WAAW,4BAAuD,CAAC"}

package/schematics/ng-update/index.js

@@ -1,15 +1,14 @@
 "use strict";
-/* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable camelcase */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateV10_0 = exports.updateV8_2 = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
-const import_map_1 = require("./v8.2/import-map");
 const configuration_1 = require("./v10.0/configuration");
+const import_map_1 = require("./v8.2/import-map");
 /**
  * Update of Otter library V8.2
  */
+// eslint-disable-next-line @typescript-eslint/naming-convention -- version is in the function name
 function updateV8_2Fn() {
     return (tree, context) => {
         const updateRules = [
@@ -21,10 +20,12 @@ function updateV8_2Fn() {
 /**
  * Update of Otter library V8.2
  */
+// eslint-disable-next-line @typescript-eslint/naming-convention -- version is in the function name
 exports.updateV8_2 = (0, schematics_2.createSchematicWithMetricsIfInstalled)(updateV8_2Fn);
 /**
  * Update of Otter library V10.0
  */
+// eslint-disable-next-line @typescript-eslint/naming-convention -- version is in the function name
 function updateV10_0Fn() {
     return (tree, context) => {
         const updateRules = [
@@ -38,5 +39,6 @@ function updateV10_0Fn() {
 /**
  * Update of Otter library V10.0
  */
+// eslint-disable-next-line @typescript-eslint/naming-convention -- version is in the function name
 exports.updateV10_0 = (0, schematics_2.createSchematicWithMetricsIfInstalled)(updateV10_0Fn);
 //# sourceMappingURL=index.js.map

package/schematics/ng-update/v10.0/configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v10.0/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAQ,MAAM,4BAA4B,CAAC;AAK7D;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,IAYjC,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v10.0/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EAEL,MAAM,4BAA4B,CAAC;AAOpC;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,IAYjC,CAAC"}

package/schematics/ng-update/v10.0/configuration.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateConfiguration = void 0;
 const schematics_1 = require("@o3r/schematics");
-const matchingRegex = /(Configuration)<\s*['"](?:strict|legacy)['"]\s*>/g;
+const matchingRegex = /(Configuration)<\s*["'](?:strict|legacy)["']\s*>/g;
 /**
  * Rule to update the configuration declaration
  * As configuration cannot be legacy anymore,
@@ -14,7 +14,7 @@ const updateConfiguration = (tree) => {
     files.forEach((file) => {
         const text = tree.readText(file);
         const matches = Array.from(text.matchAll(matchingRegex));
-        if (matches.length) {
+        if (matches.length > 0) {
             tree.overwrite(file, text.replaceAll(matchingRegex, '$1'));
         }
     });

package/schematics/ng-update/v8.2/import-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-map.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v8.2/import-map.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,oFAAoF;AACpF,eAAO,MAAM,mBAAmB,EAAE,cAoCjC,CAAC"}
+{"version":3,"file":"import-map.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v8.2/import-map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACf,MAAM,iBAAiB,CAAC;AAEzB,oFAAoF;AACpF,eAAO,MAAM,mBAAmB,EAAE,cAoCjC,CAAC"}

package/schematics/page/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/page/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA8F,IAAI,EAAoD,MAAM,4BAA4B,CAAC;AAehM,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AA6O1D;;;GAGG;AACH,eAAO,MAAM,cAAc,mDAA0D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/page/index.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,IAAI,EAML,MAAM,4BAA4B,CAAC;AA0BpC,OAAO,EACL,8BAA8B,EAC/B,MAAM,UAAU,CAAC;AAsOlB;;;GAGG;AACH,eAAO,MAAM,cAAc,mDAA0D,CAAC"}

package/schematics/page/index.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGeneratePage = void 0;
+const path = require("node:path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
-const path = require("node:path");
 const ts = require("typescript");
 const configuration_1 = require("../rule-factories/component/configuration");
-const theming_1 = require("../rule-factories/component/theming");
-const localization_1 = require("../rule-factories/component/localization");
 const fixture_1 = require("../rule-factories/component/fixture");
+const localization_1 = require("../rule-factories/component/localization");
+const theming_1 = require("../rule-factories/component/theming");
 /**
  * Add a Page to an Otter project
  * @param options
@@ -77,12 +77,14 @@ function ngGeneratePageFn(options) {
             type: 'Component',
             skipSelector: false,
             standalone: options.standalone,
-            ...(options.standalone ? {
-                skipImport: true
-            } : {
-                module: `${dasherizedPageName}.module.ts`,
-                export: true
-            }),
+            ...(options.standalone
+                ? {
+                    skipImport: true
+                }
+                : {
+                    module: `${dasherizedPageName}.module.ts`,
+                    export: true
+                }),
             flat: true
         }), 
         // Angular schematics generate spec file with this pattern: component-name.component.spec.ts
@@ -106,8 +108,7 @@ function ngGeneratePageFn(options) {
             path: componentPath,
             skipLinter: options.skipLinter,
             componentType: 'Page'
-        }));
-        rules.push((0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
+        }), (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
             (0, schematics_1.template)({
                 ...core_1.strings,
                 ...options,
@@ -115,8 +116,7 @@ function ngGeneratePageFn(options) {
             }),
             (0, schematics_1.renameTemplateFiles)(),
             (0, schematics_1.move)(pagePath)
-        ]), schematics_1.MergeStrategy.Overwrite));
-        rules.push((0, configuration_1.getAddConfigurationRules)(componentPath, options), (0, theming_1.getAddThemingRules)(o3rStylePath, options), (0, localization_1.getAddLocalizationRules)(componentPath, options), (0, fixture_1.getAddFixtureRules)(componentPath, {
+        ]), schematics_1.MergeStrategy.Overwrite), (0, configuration_1.getAddConfigurationRules)(componentPath, options), (0, theming_1.getAddThemingRules)(o3rStylePath, options), (0, localization_1.getAddLocalizationRules)(componentPath, options), (0, fixture_1.getAddFixtureRules)(componentPath, {
             skipLinter: options.skipLinter,
             useComponentFixtures: options.usePageFixtures
         }, true));
@@ -131,7 +131,7 @@ function ngGeneratePageFn(options) {
         const indexFilePath = path.posix.join(core_1.strings.dasherize(options.scope), core_1.strings.dasherize(options.name), 'index');
         const route = {
             path: core_1.strings.dasherize(options.name),
-            import: `./${indexFilePath.replace(/[\\/]/g, '/')}`,
+            import: `./${indexFilePath.replace(/[/\\]/g, '/')}`,
             module: `${pageName}${options.standalone ? 'Component' : 'Module'}`
         };
         if (options.appRoutingModulePath) {
@@ -140,7 +140,7 @@ function ngGeneratePageFn(options) {
         const appModuleFilePath = (0, schematics_2.getAppModuleFilePath)(tree, context, options.projectName);
         if (appModuleFilePath) {
             const text = tree.readText(appModuleFilePath);
-            const match = text.match(/(provideRouter|RouterModule\.forRoot)\((\s*)?(?<routeVarName>[^,\s)]*)/);
+            const match = text.match(/(provideRouter|RouterModule\.forRoot)\((\s*)?(?<routeVarName>[^\s),]*)/);
             const routeVariableName = match?.groups?.routeVarName;
             if (routeVariableName) {
                 const sourceFile = ts.createSourceFile(appModuleFilePath, text, ts.ScriptTarget.ES2015, true);
@@ -149,7 +149,7 @@ function ngGeneratePageFn(options) {
                     && ts.isStringLiteral(statement.moduleSpecifier)
                     && !!statement.importClause?.namedBindings
                     && ts.isNamedImports(statement.importClause.namedBindings)
-                    && statement.importClause.namedBindings.elements.some((element) => element.name.escapedText === routeVariableName));
+                    && statement.importClause.namedBindings.elements.some((element) => element.name.escapedText.toString() === routeVariableName));
                 const importRouteVariablePath = importStatement?.moduleSpecifier?.text;
                 // If importRouteVariablePath is undefined it is because the variable is defined in this file
                 const appRoutingModulePath = importRouteVariablePath ? path.join(path.dirname(appModuleFilePath), `${importRouteVariablePath}.ts`) : appModuleFilePath;

package/schematics/page/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/page/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,8BAA+B,SAAQ,qBAAqB;IAC3E,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB;IACjB,KAAK,EAAE,MAAM,CAAC;IAEd,sCAAsC;IACtC,oBAAoB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1C,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,qCAAqC;IACrC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,kEAAkE;IAClE,eAAe,EAAE,OAAO,CAAC;IAEzB,2DAA2D;IAC3D,cAAc,EAAE,OAAO,CAAC;IAExB,oDAAoD;IACpD,eAAe,EAAE,OAAO,CAAC;IAEzB,oDAAoD;IACpD,UAAU,EAAE,OAAO,CAAC;IAEpB,uCAAuC;IACvC,eAAe,EAAE,OAAO,CAAC;IAEzB,4BAA4B;IAC5B,aAAa,EAAE,OAAO,CAAC;CACxB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/page/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,8BAA+B,SAAQ,qBAAqB;IAC3E,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB;IACjB,KAAK,EAAE,MAAM,CAAC;IAEd,sCAAsC;IACtC,oBAAoB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1C,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,qCAAqC;IACrC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,kEAAkE;IAClE,eAAe,EAAE,OAAO,CAAC;IAEzB,2DAA2D;IAC3D,cAAc,EAAE,OAAO,CAAC;IAExB,oDAAoD;IACpD,eAAe,EAAE,OAAO,CAAC;IAEzB,oDAAoD;IACpD,UAAU,EAAE,OAAO,CAAC;IAEpB,uCAAuC;IACvC,eAAe,EAAE,OAAO,CAAC;IAEzB,4BAA4B;IAC5B,aAAa,EAAE,OAAO,CAAC;CACxB"}

package/schematics/renovate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/renovate/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAwD,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAE/I,OAAO,EAAE,qCAAqC,EAAE,MAAM,UAAU,CAAC;AA0BjE;;;GAGG;AACH,eAAO,MAAM,8BAA8B,0DAA0E,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/renovate/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAKL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EACL,qCAAqC,EACtC,MAAM,UAAU,CAAC;AAyBlB;;;GAGG;AACH,eAAO,MAAM,8BAA8B,0DAA0E,CAAC"}

package/schematics/renovate/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/renovate/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,qCAAsC,SAAQ,qBAAqB;IAClF,+DAA+D;IAC/D,gBAAgB,EAAE,MAAM,CAAC;CAC1B"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/renovate/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qCAAsC,SAAQ,qBAAqB;IAClF,+DAA+D;IAC/D,gBAAgB,EAAE,MAAM,CAAC;CAC1B"}

package/schematics/rule-factories/additional-modules/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AAczB;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,uBAAuB,EAAE,wBAAwB,GAAG,IAAI,CA6MrL"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AAuBzB;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,uBAAuB,EAAE,wBAAwB,GAAG,IAAI,CA4MrL"}

package/schematics/rule-factories/additional-modules/index.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAdditionalModules = updateAdditionalModules;
+const fs = require("node:fs");
+const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
-const ts = require("typescript");
 const utility_1 = require("@schematics/angular/utility");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const change_1 = require("@schematics/angular/utility/change");
-const path = require("node:path");
-const fs = require("node:fs");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const ts = require("typescript");
 const packageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
 const ngrxStoreDevtoolsDep = '@ngrx/store-devtools';

package/schematics/rule-factories/component/analytics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/analytics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,wBAAwB,CAAC;AAGlF,eAAO,MAAM,oBAAoB,kBAChB,MAAM,WACZ,mCAAmC,KAC3C,IAaF,CAAC"}
+{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/analytics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,mCAAmC,EACpC,MAAM,wBAAwB,CAAC;AAKhC,eAAO,MAAM,oBAAoB,kBAChB,MAAM,WACZ,mCAAmC,KAC3C,IAaF,CAAC"}

package/schematics/rule-factories/component/common.d.ts

@@ -2,7 +2,6 @@ import { Rule } from '@angular-devkit/schematics';
 /**
  * Ask questions to get rules to execute
  * or throw if the package is not installed
- *
  * @param path file path
  * @param optionName name of the option to setup
  * @param defaultApplyRule should the rule be applied by default

package/schematics/rule-factories/component/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,IAAI,EAAqC,MAAM,4BAA4B,CAAC;AAKrH;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,kDAAkD,SACvD,MAAM,cACA,MAAM,oBACA,OAAO,GAAG,IAAI,GAAG,SAAS,gBAC9B,MAAM,0BACI,MAAM,EAAE,eACnB,MAAM,iBACJ,MAAM,qBACH,GAAG,KACpB,IA6DF,CAAC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/common.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAUpC;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,kDAAkD,SACvD,MAAM,cACA,MAAM,oBACA,OAAO,GAAG,IAAI,GAAG,SAAS,gBAC9B,MAAM,0BACI,MAAM,EAAE,eACnB,MAAM,iBACJ,MAAM,qBACH,GAAG,KACpB,IAiEF,CAAC"}

package/schematics/rule-factories/component/common.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.askQuestionsToGetRulesOrThrowIfPackageNotAvailable = void 0;
-const schematics_1 = require("@angular-devkit/schematics");
 const prompt_1 = require("@angular/cli/src/utilities/prompt");
+const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 /**
  * Ask questions to get rules to execute
  * or throw if the package is not installed
- *
  * @param path file path
  * @param optionName name of the option to setup
  * @param defaultApplyRule should the rule be applied by default
@@ -61,19 +60,23 @@ const askQuestionsToGetRulesOrThrowIfPackageNotAvailable = (path, optionName, de
             ...schematicOptions,
             path
         };
-        return applyRule ? (0, schematics_1.chain)([
-            packageName !== '@o3r/core'
-                ? (0, schematics_1.externalSchematic)(packageName, schematicName, options)
-                : (0, schematics_1.schematic)(schematicName, options),
-            ...(alwaysApplyRule !== 'ask-again' ? [
-                (0, schematics_2.setupSchematicsParamsForProject)(schematicsNameToUpdate.reduce((acc, schematicToUpdateName) => {
-                    acc[schematicToUpdateName] = {
-                        [optionName]: alwaysApplyRule === 'yes'
-                    };
-                    return acc;
-                }, {}), options.projectName)
-            ] : [])
-        ]) : schematics_1.noop;
+        return applyRule
+            ? (0, schematics_1.chain)([
+                packageName === '@o3r/core'
+                    ? (0, schematics_1.schematic)(schematicName, options)
+                    : (0, schematics_1.externalSchematic)(packageName, schematicName, options),
+                ...(alwaysApplyRule === 'ask-again'
+                    ? []
+                    : [
+                        (0, schematics_2.setupSchematicsParamsForProject)(schematicsNameToUpdate.reduce((acc, schematicToUpdateName) => {
+                            acc[schematicToUpdateName] = {
+                                [optionName]: alwaysApplyRule === 'yes'
+                            };
+                            return acc;
+                        }, {}), options.projectName)
+                    ])
+            ])
+            : schematics_1.noop;
     };
 };
 exports.askQuestionsToGetRulesOrThrowIfPackageNotAvailable = askQuestionsToGetRulesOrThrowIfPackageNotAvailable;

package/schematics/rule-factories/component/configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,wBAAwB,CAAC;AAGlF,eAAO,MAAM,wBAAwB,kBACpB,MAAM,WACZ,IAAI,CAAC,mCAAmC,EAAE,gBAAgB,GAAG,YAAY,GAAG,aAAa,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,mCAAmC,EAAE,oBAAoB,CAAC,CAAC,KAC7K,IAcF,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,mCAAmC,EACpC,MAAM,wBAAwB,CAAC;AAKhC,eAAO,MAAM,wBAAwB,kBACpB,MAAM,WACZ,IAAI,CAAC,mCAAmC,EAAE,gBAAgB,GAAG,YAAY,GAAG,aAAa,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,mCAAmC,EAAE,oBAAoB,CAAC,CAAC,KAC7K,IAcF,CAAC"}

package/schematics/rule-factories/component/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,wBAAwB,CAAC;AAGlF,eAAO,MAAM,kBAAkB,kBACd,MAAM,WACZ,IAAI,CAAC,mCAAmC,EAAE,YAAY,GAAG,YAAY,CAAC,KAC9E,IAYF,CAAC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,mCAAmC,EACpC,MAAM,wBAAwB,CAAC;AAKhC,eAAO,MAAM,kBAAkB,kBACd,MAAM,WACZ,IAAI,CAAC,mCAAmC,EAAE,YAAY,GAAG,YAAY,CAAC,KAC9E,IAYF,CAAC"}

package/schematics/rule-factories/component/design-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"design-token.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/design-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,wBAAwB,CAAC;AAGlF,eAAO,MAAM,sBAAsB,oBAChB,MAAM,aACZ,MAAM,WACR,IAAI,CAAC,mCAAmC,EAAE,qBAAqB,CAAC,KACxE,IAYF,CAAC"}
+{"version":3,"file":"design-token.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/design-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,mCAAmC,EACpC,MAAM,wBAAwB,CAAC;AAKhC,eAAO,MAAM,sBAAsB,oBAChB,MAAM,aACZ,MAAM,WACR,IAAI,CAAC,mCAAmC,EAAE,qBAAqB,CAAC,KACxE,IAYF,CAAC"}

package/schematics/rule-factories/component/fixture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixture.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/fixture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,wBAAwB,CAAC;AAGlF,eAAO,MAAM,kBAAkB,kBACd,MAAM,WACZ,IAAI,CAAC,mCAAmC,EAAE,sBAAsB,GAAG,YAAY,CAAC,uBAExF,IAaF,CAAC"}
+{"version":3,"file":"fixture.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/fixture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,mCAAmC,EACpC,MAAM,wBAAwB,CAAC;AAKhC,eAAO,MAAM,kBAAkB,kBACd,MAAM,WACZ,IAAI,CAAC,mCAAmC,EAAE,sBAAsB,GAAG,YAAY,CAAC,uBAExF,IAaF,CAAC"}

package/schematics/rule-factories/component/localization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"localization.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/localization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,wBAAwB,CAAC;AAGlF,eAAO,MAAM,uBAAuB,kBACnB,MAAM,WACZ,IAAI,CAAC,mCAAmC,EAAE,iBAAiB,GAAG,YAAY,GAAG,eAAe,CAAC,KACrG,IAaF,CAAC"}
+{"version":3,"file":"localization.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/localization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,mCAAmC,EACpC,MAAM,wBAAwB,CAAC;AAKhC,eAAO,MAAM,uBAAuB,kBACnB,MAAM,WACZ,IAAI,CAAC,mCAAmC,EAAE,iBAAiB,GAAG,YAAY,GAAG,eAAe,CAAC,KACrG,IAaF,CAAC"}

package/schematics/rule-factories/component/rules-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rules-engine.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/rules-engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,wBAAwB,CAAC;AAGlF,eAAO,MAAM,sBAAsB,kBAClB,MAAM,WACZ,IAAI,CAAC,mCAAmC,EAAE,gBAAgB,GAAG,YAAY,GAAG,aAAa,GAAG,oBAAoB,CAAC,KACzH,IAaF,CAAC"}
+{"version":3,"file":"rules-engine.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/rules-engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,mCAAmC,EACpC,MAAM,wBAAwB,CAAC;AAKhC,eAAO,MAAM,sBAAsB,kBAClB,MAAM,WACZ,IAAI,CAAC,mCAAmC,EAAE,gBAAgB,GAAG,YAAY,GAAG,aAAa,GAAG,oBAAoB,CAAC,KACzH,IAaF,CAAC"}

package/schematics/rule-factories/component/theming.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"theming.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/theming.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,wBAAwB,CAAC;AAGlF,eAAO,MAAM,kBAAkB,cAClB,MAAM,WACR,IAAI,CAAC,mCAAmC,EAAE,iBAAiB,CAAC,KACpE,IAQF,CAAC"}
+{"version":3,"file":"theming.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/theming.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,mCAAmC,EACpC,MAAM,wBAAwB,CAAC;AAKhC,eAAO,MAAM,kBAAkB,cAClB,MAAM,WACR,IAAI,CAAC,mCAAmC,EAAE,iBAAiB,CAAC,KACpE,IAQF,CAAC"}

package/schematics/rule-factories/customization-environment/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/customization-environment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAUpC;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAkGnK"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/customization-environment/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAOL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAoBpC;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAoGnK"}

package/schematics/rule-factories/customization-environment/index.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateCustomizationEnvironment = updateCustomizationEnvironment;
+const node_path_1 = 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 dependencies_1 = require("@schematics/angular/utility/dependencies");
-const node_path_1 = require("node:path");
 /**
  * Enable customization capabilities
  * @param rootPath @see RuleFactory.rootPath
@@ -22,7 +22,7 @@ function updateCustomizationEnvironment(rootPath, o3rCoreVersion, options, isLib
      * @param context
      */
     const generateC11nFolder = (tree, context) => {
-        const workingDirectory = options?.projectName && (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root || '.';
+        const workingDirectory = (options?.projectName && (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root) || '.';
         if (tree.exists(node_path_1.posix.join(workingDirectory, 'src', 'customization', 'presenters-map.empty.ts'))) {
             return tree;
         }
@@ -48,7 +48,7 @@ function updateCustomizationEnvironment(rootPath, o3rCoreVersion, options, isLib
         if ((0, ast_utils_1.isImported)(fileInfo.sourceFile, 'C11nModule', '@otter/common') || (0, ast_utils_1.isImported)(fileInfo.sourceFile, 'C11nModule', '@o3r/components')) {
             return tree;
         }
-        const fileContent = tree.readText(fileInfo.moduleFilePath).replace(/[\r\n ]*/g, '');
+        const fileContent = tree.readText(fileInfo.moduleFilePath).replace(/\s*/g, '');
         const recorder = tree.beginUpdate(fileInfo.moduleFilePath);
         const moduleIndex = fileInfo.moduleIndex;
         /**
@@ -70,9 +70,7 @@ function updateCustomizationEnvironment(rootPath, o3rCoreVersion, options, isLib
         updatedRecorder = insertImportToModuleFile(updatedRecorder, 'registerCustomComponents', '../customization/presenters-map.empty');
         updatedRecorder = insertImportToModuleFile(updatedRecorder, 'Provider', '@angular/core');
         updatedRecorder = insertImportToModuleFile(updatedRecorder, 'initializeCustomProviders', '../customization/custom-providers.empty');
-        additionalRules.push((0, utility_1.addRootImport)(options?.projectName, ({ code }) => code `...entry.customComponentsModules`));
-        additionalRules.push((0, utility_1.addRootProvider)(options?.projectName, ({ code }) => code `...customProviders`));
-        additionalRules.push((0, utility_1.addRootImport)(options?.projectName, ({ code }) => code `C11nModule.forRoot({registerCompFunc: registerCustomComponents})`));
+        additionalRules.push((0, utility_1.addRootImport)(options?.projectName, ({ code }) => code `...entry.customComponentsModules`), (0, utility_1.addRootProvider)(options?.projectName, ({ code }) => code `...customProviders`), (0, utility_1.addRootImport)(options?.projectName, ({ code }) => code `C11nModule.forRoot({registerCompFunc: registerCustomComponents})`));
         updatedRecorder = insertImportToModuleFile(updatedRecorder, 'C11nModule', '@o3r/components');
         updatedRecorder = insertBeforeModule(updatedRecorder, 'const entry = initializeEntryComponents();');
         updatedRecorder = insertBeforeModule(updatedRecorder, 'const customProviders: Provider[] = initializeCustomProviders();');
@@ -80,7 +78,7 @@ function updateCustomizationEnvironment(rootPath, o3rCoreVersion, options, isLib
         return (0, schematics_1.chain)(additionalRules)(tree, context);
     };
     return (tree, _context) => {
-        const workingDirectory = options?.projectName && (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root || '.';
+        const workingDirectory = (options?.projectName && (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root) || '.';
         return (0, schematics_1.chain)([
             generateC11nFolder,
             registerModules,