@o3r/localization 12.3.0-prerelease.48 → 12.3.0-prerelease.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/localization",
-  "version": "12.3.0-prerelease.48",
+  "version": "12.3.0-prerelease.49",
   "publishConfig": {
     "access": "public"
   },
@@ -44,11 +44,11 @@
     "@formatjs/intl-numberformat": "^8.0.2",
     "@ngrx/store": "^19.0.0",
     "@ngx-translate/core": "~16.0.4",
-    "@o3r/core": "^12.3.0-prerelease.48",
-    "@o3r/dynamic-content": "^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/dynamic-content": "^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",
     "@yarnpkg/cli": "^4.3.1",
     "@yarnpkg/core": "^4.1.1",
@@ -115,6 +115,7 @@
     }
   },
   "dependencies": {
+    "@o3r/schematics": "^12.3.0-prerelease.49",
     "tslib": "^2.6.2"
   },
   "engines": {

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

@@ -4,5 +4,5 @@ import type { NgAddSchematicsSchema } from '../schema';
  * Register Devtools to the application
  * @param options
  */
-export declare const registerDevtools: (options: NgAddSchematicsSchema) => Promise<Rule>;
+export declare const registerDevtools: (options: NgAddSchematicsSchema) => 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;;;GAGG;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":"AAIA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,WAAW,CAAC;AAOnB;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAI,SAAS,qBAAqB,KAAG,IAejE,CAAC"}

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

@@ -4,6 +4,7 @@ exports.registerDevtools = void 0;
 const node_fs_1 = require("node:fs");
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const DEVTOOL_MODULE_NAME = 'LocalizationDevtoolsModule';
 const MESSAGE_DEVTOOL_SERVICE_NAME = 'LocalizationDevtoolsMessageService';
 const CONSOLE_DEVTOOL_SERVICE_NAME = 'LocalizationDevtoolsConsoleService';
@@ -12,16 +13,15 @@ const PACKAGE_NAME = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirna
  * Register Devtools to the application
  * @param options
  */
-const registerDevtools = async (options) => {
-    const { registerDevtoolsToApplication } = await Promise.resolve().then(() => 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,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA4ElB;;;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,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAmBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA0DlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -4,44 +4,38 @@ exports.ngAdd = void 0;
 const fs = require("node:fs");
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const cms_adapter_1 = require("../cms-adapter");
 const devtools_registration_1 = require("./helpers/devtools-registration");
 const dependenciesToInstall = [
     'chokidar',
     'globby'
 ];
-const reportMissingSchematicsDep = (logger) => (reason) => {
-    logger.error(`[ERROR]: Adding @o3r/localization has failed.
-      If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the localization package. Please run 'ng add @o3r/core' .
-      Otherwise, use the error message as guidance.`);
-    throw reason;
-};
 /**
  * Add Otter localization to an Angular Project
  * @param options for the dependencies installations
  */
 function ngAddFn(options) {
     return async (tree, context) => {
-        const { applyEsLintFix, getPackageInstallConfig, getProjectNewDependenciesTypes, getWorkspaceConfig, setupDependencies, getO3rPeerDeps, getExternalDependenciesVersionRange, registerPackageCollectionSchematics, setupSchematicsParamsForProject } = await Promise.resolve().then(() => require('@o3r/schematics'));
         const { updateI18n, updateLocalization } = await Promise.resolve().then(() => require('../localization-base'));
         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);
         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/localization/LOCALIZATION.md#Debugging');
         const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
-        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(dependenciesToInstall, packageJsonPath, context.logger)).forEach(([dep, range]) => {
+        }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
+        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(dependenciesToInstall, packageJsonPath, context.logger)).forEach(([dep, range]) => {
             dependencies[dep] = {
                 inManifest: [{
                         range,
@@ -49,19 +43,19 @@ function ngAddFn(options) {
                     }]
             };
         });
-        const registerDevtoolRule = await (0, devtools_registration_1.registerDevtools)(options);
+        const registerDevtoolRule = (0, devtools_registration_1.registerDevtools)(options);
         return (0, schematics_1.chain)([
             updateLocalization(options, __dirname),
             updateI18n(options),
-            options.skipLinter ? (0, schematics_1.noop)() : applyEsLintFix(),
-            setupDependencies({
+            options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)(),
+            (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
                 dependencies,
                 ngAddToRun: depsInfo.o3rPeerDeps
             }),
             (0, cms_adapter_1.updateCmsAdapter)(options),
-            registerPackageCollectionSchematics(packageJson),
-            setupSchematicsParamsForProject({ '@o3r/core:component*': { useLocalization: true } }, options.projectName),
+            (0, schematics_2.registerPackageCollectionSchematics)(packageJson),
+            (0, schematics_2.setupSchematicsParamsForProject)({ '@o3r/core:component*': { useLocalization: true } }, options.projectName),
             registerDevtoolRule
         ]);
     };
@@ -70,9 +64,6 @@ function ngAddFn(options) {
  * Add Otter localization to an Angular Project
  * @param options for the dependencies installations
  */
-const ngAdd = (options) => async (_, { logger }) => {
-    const { createOtterSchematic } = await Promise.resolve().then(() => 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