@o3r/localization 9.3.0-alpha.49 → 9.3.0-alpha.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/localization",
-  "version": "9.3.0-alpha.49",
+  "version": "9.3.0-alpha.50",
   "description": "This module provides a runtime dynamic language/translation support and debug tools.",
   "keywords": [
     "localization",
@@ -20,11 +20,11 @@
     "@formatjs/intl-numberformat": "^8.0.2",
     "@ngrx/store": "~16.2.0",
     "@ngx-translate/core": "~15.0.0",
-    "@o3r/core": "^9.3.0-alpha.49",
-    "@o3r/dynamic-content": "^9.3.0-alpha.49",
-    "@o3r/extractors": "^9.3.0-alpha.49",
-    "@o3r/logger": "^9.3.0-alpha.49",
-    "@o3r/schematics": "^9.3.0-alpha.49",
+    "@o3r/core": "^9.3.0-alpha.50",
+    "@o3r/dynamic-content": "^9.3.0-alpha.50",
+    "@o3r/extractors": "^9.3.0-alpha.50",
+    "@o3r/logger": "^9.3.0-alpha.50",
+    "@o3r/schematics": "^9.3.0-alpha.50",
     "@schematics/angular": "~16.2.0",
     "chokidar": "^3.5.2",
     "intl-messageformat": "~10.5.0",

package/schematics/cms-adapter/index.d.ts

@@ -1,7 +1,6 @@
 import { Rule } from '@angular-devkit/schematics';
 /**
  * Update CMS adapter tools
- *
  * @param options @see RuleFactory.options
  * @param options.projectName
  * @param rootPath @see RuleFactory.rootPath

package/schematics/cms-adapter/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/cms-adapter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKvF;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,IAAI,CAuEpF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/cms-adapter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKvF;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,IAAI,CAoEpF"}

package/schematics/cms-adapter/index.js

@@ -6,7 +6,6 @@ const schematics_2 = require("@o3r/schematics");
 const path = require("node:path");
 /**
  * Update CMS adapter tools
- *
  * @param options @see RuleFactory.options
  * @param options.projectName
  * @param rootPath @see RuleFactory.rootPath
@@ -17,15 +16,14 @@ function updateCmsAdapter(options) {
     }
     /**
      * Add cms extractors builder into the angular.json
-     *
      * @param tree
      * @param _context
      * @param context
      */
     const editAngularJson = (tree, context) => {
-        const workspace = (0, schematics_2.readAngularJson)(tree);
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, options.projectName);
-        if (!workspaceProject) {
+        const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
+        const workspaceProject = options.projectName ? workspace?.projects[options.projectName] : undefined;
+        if (!workspace || !workspaceProject) {
             context.logger.error('No project detected, the extractors will not be added');
             return tree;
         }
@@ -39,20 +37,18 @@ function updateCmsAdapter(options) {
                 libraries: []
             }
         };
-        const { name, ...newProject } = workspaceProject;
-        workspace.projects[name] = newProject;
+        workspace.projects[options.projectName] = workspaceProject;
         tree.overwrite('/angular.json', JSON.stringify(workspace, null, 2));
         return tree;
     };
     /**
      * Add cms extractors scripts into the package.json
-     *
      * @param tree
      * @param _context
      * @param context
      */
     const addExtractorsScripts = (tree, context) => {
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, options.projectName);
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         if (!workspaceProject) {
             context.logger.error('No package detected, the extractor scripts will not be added');
             return tree;

package/schematics/localization-base/index.d.ts

@@ -1,7 +1,6 @@
 import { Rule } from '@angular-devkit/schematics';
 /**
  * Add Otter localization support
- *
  * @param options @see RuleFactory.options
  * @param options.projectName
  * @param rootPath @see RuleFactory.rootPath
@@ -11,6 +10,8 @@ export declare function updateLocalization(options: {
 }, rootPath: string): Rule;
 /**
  *
+ * @param options
+ * @param options.projectName
  */
 export declare function updateI18n(options: {
     projectName?: string | undefined;

package/schematics/localization-base/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/localization-base/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAoC7I;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAmb/G;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE;IAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAC,GAAG,IAAI,CA0C5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/localization-base/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAgC7I;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CA6a/G;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE;IAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAC,GAAG,IAAI,CAwC5E"}

package/schematics/localization-base/index.js

@@ -14,7 +14,6 @@ const formatjsIntlNumberformatDep = '@formatjs/intl-numberformat';
 const angularCdkDep = '@angular/cdk';
 /**
  * Add Otter localization support
- *
  * @param options @see RuleFactory.options
  * @param options.projectName
  * @param rootPath @see RuleFactory.rootPath
@@ -27,12 +26,11 @@ function updateLocalization(options, rootPath) {
     const devResourcesFolder = 'dev-resources';
     /**
      * Generate locales folder
-     *
      * @param tree
      * @param context
      */
     const generateLocalesFolder = (tree, context) => {
-        const workingDirectory = (0, schematics_2.getProjectRootDir)(tree, options.projectName) || '.';
+        const workingDirectory = (options.projectName && (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root) || '.';
         let gitIgnoreContent = '';
         const gitIgnorePath = path.posix.join(workingDirectory, '.gitignore');
         if (tree.exists(gitIgnorePath)) {
@@ -56,14 +54,13 @@ function updateLocalization(options, rootPath) {
     };
     /**
      * Add translation generation builders into angular.json
-     *
      * @param tree
      * @param context
      */
     const updateAngularJson = (tree, context) => {
-        const workspace = (0, schematics_2.readAngularJson)(tree);
-        const projectName = options.projectName || Object.keys(workspace.projects)[0];
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, projectName, 'application');
+        const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
+        const projectName = options.projectName;
+        const workspaceProject = options.projectName ? workspace?.projects[options.projectName] : undefined;
         const projectRoot = path.posix.join(workspaceProject?.root || '');
         const distFolder = (workspaceProject &&
             workspaceProject.architect &&
@@ -72,7 +69,7 @@ function updateLocalization(options, rootPath) {
             (workspaceProject.architect.build.configurations && workspaceProject.architect.build.configurations.production && workspaceProject.architect.build.configurations.production.outputPath ||
                 workspaceProject.architect.build.options.outputPath)) || './dist';
         // exit if not an application
-        if (!workspaceProject) {
+        if (!workspace || !projectName || !workspaceProject) {
             context.logger.debug('No application project found to add translation extraction');
             return tree;
         }
@@ -167,16 +164,15 @@ function updateLocalization(options, rootPath) {
     };
     /**
      * Changed package.json start script to run localization generation
-     *
      * @param tree
      * @param context
      */
     const updatePackageJson = (tree, context) => {
-        const workspace = (0, schematics_2.readAngularJson)(tree);
-        const projectName = options.projectName || Object.keys(workspace.projects)[0];
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, projectName || null, 'application');
+        const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
+        const projectName = options.projectName;
+        const workspaceProject = options.projectName ? workspace?.projects[options.projectName] : undefined;
         const packageManagerRunner = (0, schematics_2.getPackageManagerRunner)((0, schematics_2.getWorkspaceConfig)(tree));
-        if (!workspaceProject) {
+        if (!projectName || !workspace || !workspaceProject) {
             context.logger.debug('No application project found to add translation extraction');
             return tree;
         }
@@ -198,7 +194,6 @@ function updateLocalization(options, rootPath) {
     };
     /**
      * Edit main module with the translation required configuration
-     *
      * @param tree
      * @param context
      */
@@ -252,7 +247,6 @@ function updateLocalization(options, rootPath) {
     };
     /**
      * Set language as default on application bootstrap
-     *
      * @param tree
      * @param context
      */
@@ -302,7 +296,6 @@ function updateLocalization(options, rootPath) {
     };
     /**
      * Add mockTranslationModule to application tests.
-     *
      * @param tree
      * @param context
      */
@@ -335,15 +328,15 @@ function updateLocalization(options, rootPath) {
     };
     /**
      * Add location required dependencies
-     *
      * @param tree
      * @param _context
      * @param context
      */
     const addDependencies = (tree, context) => {
-        const type = (0, schematics_2.getProjectDepType)(tree);
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
+        const workingDirectory = workspaceProject?.root || '.';
+        const type = (0, schematics_2.getProjectNewDependenciesType)(workspaceProject);
         const generatorDependencies = [ngxTranslateCoreDep, intlMessageFormatDep, formatjsIntlNumberformatDep, angularCdkDep];
-        const workingDirectory = (0, schematics_2.getProjectRootDir)(tree, options.projectName);
         try {
             return (0, schematics_2.ngAddPeerDependencyPackages)(generatorDependencies, packageJsonPath, type, { ...options, workingDirectory, skipNgAddSchematicRun: true })(tree, context);
         }
@@ -370,6 +363,8 @@ function updateLocalization(options, rootPath) {
 exports.updateLocalization = updateLocalization;
 /**
  *
+ * @param options
+ * @param options.projectName
  */
 function updateI18n(options) {
     if (!options.projectName) {
@@ -377,13 +372,12 @@ function updateI18n(options) {
     }
     /**
      * Add i18n generation builders into angular.json
-     *
      * @param tree
      */
     const updateAngularJson = (tree) => {
-        const workspace = (0, schematics_2.readAngularJson)(tree);
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, options.projectName);
-        if (!workspaceProject) {
+        const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
+        const workspaceProject = options.projectName ? workspace?.projects[options.projectName] : undefined;
+        if (!workspace || !workspaceProject) {
             return tree;
         }
         if (!workspaceProject.architect) {
@@ -401,8 +395,7 @@ function updateI18n(options) {
                 }
             };
         }
-        const { name, ...newProject } = workspaceProject;
-        workspace.projects[name] = newProject;
+        workspace.projects[options.projectName] = workspaceProject;
         return (0, schematics_2.writeAngularJson)(tree, workspace);
     };
     return (0, schematics_1.chain)([

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

@@ -2,7 +2,6 @@ import { Rule } from '@angular-devkit/schematics';
 import type { NgAddSchematicsSchema } from './schema';
 /**
  * Add Otter localization to an Angular Project
- *
  * @param options for the dependencies installations
  */
 export declare function ngAdd(options: NgAddSchematicsSchema): Rule;

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,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEtD;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAkD1D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEtD;;;GAGG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAoD1D"}

package/schematics/ng-add/index.js

@@ -8,13 +8,12 @@ const schematics_2 = require("@o3r/schematics");
 const cms_adapter_1 = require("../cms-adapter");
 /**
  * Add Otter localization to an Angular Project
- *
  * @param options for the dependencies installations
  */
 function ngAdd(options) {
     return async (tree, context) => {
         try {
-            const { applyEsLintFix, install, getProjectDepType, getProjectRootDir, ngAddPackages, ngAddPeerDependencyPackages, getO3rPeerDeps } = await Promise.resolve().then(() => require('@o3r/schematics'));
+            const { applyEsLintFix, install, getProjectNewDependenciesType, getWorkspaceConfig, ngAddPackages, ngAddPeerDependencyPackages, getO3rPeerDeps } = 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: 'utf-8' }));
@@ -23,7 +22,9 @@ function ngAdd(options) {
             context.logger.info('Get information on https://github.com/AmadeusITGroup/otter/tree/main/docs/localization/LOCALIZATION.md#Debugging');
             // eslint-disable-next-line @typescript-eslint/naming-convention
             const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
-            const workingDirectory = options.projectName ? getProjectRootDir(tree, options.projectName) : '.';
+            const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
+            const workingDirectory = workspaceProject?.root || '.';
+            const dependencyType = getProjectNewDependenciesType(workspaceProject);
             return () => (0, schematics_1.chain)([
                 updateLocalization(options, __dirname),
                 updateI18n(options),
@@ -35,7 +36,7 @@ function ngAdd(options) {
                     version: depsInfo.packageVersion,
                     parentPackageInfo: `${depsInfo.packageName} - setup`,
                     projectName: options.projectName,
-                    dependencyType: getProjectDepType(t),
+                    dependencyType,
                     workingDirectory
                 })(t, c),
                 ngAddPeerDependencyPackages(['chokidar'], packageJsonPath, NodeDependencyType.Dev, { ...options, workingDirectory, skipNgAddSchematicRun: true }, '@o3r/localization - install builder dependency'),