@o3r/localization 9.3.0-alpha.6 → 9.3.0-alpha.60

package/README.md

@@ -717,5 +717,5 @@ Otter framework provides a set of code generators based on [angular schematics](
 | Schematics                     | Description                                                    | How to use                           |
 | ------------------------------ | -------------------------------------------------------------- | ------------------------------------ |
 | add                            | Include Otter localization module in a library / application.  | `ng add @o3r/localization`           |
-| localization-to-component      | Add localization architecture to an Otter component                         | `ng g localization-to-component`     |
-| localization-key-to-component  | Add localization key to an Otter component                     | `ng g localization-key-to-component` |
+| localization-to-component      | Add localization architecture to an Otter component            | `ng g localization-to-component`     |
+| localization-key-to-component  | Add a localization key to an Otter component                   | `ng g localization-key-to-component` |

package/builders/helpers/localization.generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"localization.generator.d.ts","sourceRoot":"","sources":["../../../builders/helpers/localization.generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAShF,4DAA4D;AAC5D,MAAM,WAAW,yBAAyB;IACxC,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAC;CACjC;AAED,6BAA6B;AAC7B,MAAM,WAAW,qBAAqB;IACpC,4BAA4B;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,yDAAyD;IACzD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iDAAiD;IACjD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iCAAiC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,kCAAkC;AAClC,MAAM,WAAW,oBAAoB;IACnC,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAC;CACtC;AAED,gCAAgC;AAChC,MAAM,WAAW,mBAAmB;IAClC,CAAC,IAAI,EAAE,MAAM,GAAG;QACd,IAAI,EAAE,oBAAoB,CAAC;QAC3B,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;CACH;AAED,4BAA4B;AAC5B,MAAM,WAAW,kBAAkB;IACjC,CAAC,mBAAmB,EAAE,MAAM,GAAG,oBAAoB,CAAC;CACrD;AAED;;GAEG;AACH,qBAAa,qBAAqB;IAEhC,sCAAsC;IACtC,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,MAAM,CAAoB;gBAEtB,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS;IAK3D,8CAA8C;IAC9C,OAAO,CAAC,oBAAoB;IAK5B;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IA4B3B;;;;;OAKG;IACH,OAAO,CAAC,qCAAqC;IAyB7C;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IA0B1B;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAIxB;;;;;OAKG;IACH,OAAO,CAAC,oCAAoC;IA4B5C;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAYnB,kDAAkD;IAC3C,uBAAuB;;;;;IAc9B;;;;;;OAMG;IACU,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,kBAAkB,GAAE,MAAM,EAAO,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA2BnJ;;;;OAIG;IACU,+BAA+B,CAAC,sBAAsB,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA8BjH;;;;OAIG;IACU,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE;IAQzD;;;;OAIG;IACU,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE;IASzD;;;;;;;;;OASG;IACI,gBAAgB,CAAC,eAAe,EAAE,mBAAmB,EAAE,OAAO,EAAE;QACrE,mBAAmB,EAAE,OAAO,CAAC;QAC7B,eAAe,EAAE,kBAAkB,CAAC;QACpC,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,OAAO,CAAC;KACnB,GAAG,oBAAoB;CAkCzB"}
+{"version":3,"file":"localization.generator.d.ts","sourceRoot":"","sources":["../../../builders/helpers/localization.generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAUhF,4DAA4D;AAC5D,MAAM,WAAW,yBAAyB;IACxC,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAC;CACjC;AAED,6BAA6B;AAC7B,MAAM,WAAW,qBAAqB;IACpC,4BAA4B;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,yDAAyD;IACzD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iDAAiD;IACjD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iCAAiC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,kCAAkC;AAClC,MAAM,WAAW,oBAAoB;IACnC,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAC;CACtC;AAED,gCAAgC;AAChC,MAAM,WAAW,mBAAmB;IAClC,CAAC,IAAI,EAAE,MAAM,GAAG;QACd,IAAI,EAAE,oBAAoB,CAAC;QAC3B,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;CACH;AAED,4BAA4B;AAC5B,MAAM,WAAW,kBAAkB;IACjC,CAAC,mBAAmB,EAAE,MAAM,GAAG,oBAAoB,CAAC;CACrD;AAED;;GAEG;AACH,qBAAa,qBAAqB;IAEhC,sCAAsC;IACtC,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,MAAM,CAAoB;gBAEtB,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS;IAK3D,8CAA8C;IAC9C,OAAO,CAAC,oBAAoB;IAK5B;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IA4B3B;;;;;OAKG;IACH,OAAO,CAAC,qCAAqC;IAyB7C;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IA0B1B;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAIxB;;;;;OAKG;IACH,OAAO,CAAC,oCAAoC;IA4B5C;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAYnB,kDAAkD;IAC3C,uBAAuB;;;;;IAc9B;;;;;;OAMG;IACU,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,kBAAkB,GAAE,MAAM,EAAO,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA2BnJ;;;;OAIG;IACU,+BAA+B,CAAC,sBAAsB,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA8BjH;;;;OAIG;IACU,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE;IAQzD;;;;OAIG;IACU,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE;IASzD;;;;;;;;;OASG;IACI,gBAAgB,CAAC,eAAe,EAAE,mBAAmB,EAAE,OAAO,EAAE;QACrE,mBAAmB,EAAE,OAAO,CAAC;QAC7B,eAAe,EAAE,kBAAkB,CAAC;QACpC,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,OAAO,CAAC;KACnB,GAAG,oBAAoB;CAkCzB"}

package/builders/helpers/localization.generator.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalizationExtractor = void 0;
 const extractors_1 = require("@o3r/extractors");
+const schematics_1 = require("@o3r/schematics");
 const fs = require("node:fs");
 const glob = require("globby");
 const path = require("node:path");
@@ -19,7 +20,7 @@ class LocalizationExtractor {
     /** Get the list of file from tsconfig.json */
     getFilesFromTsConfig() {
         const { include, exclude, cwd } = this.getPatternsFromTsConfig();
-        return glob(include, { ignore: exclude, cwd });
+        return glob.sync(include, { ignore: exclude, cwd });
     }
     /**
      * Return the class node if the class is an angular element
@@ -147,7 +148,7 @@ class LocalizationExtractor {
         }
         if (typeof loc.defaultValue === 'undefined' && typeof loc.$ref === 'undefined' && !loc.dictionary) {
             this.logger.error(`${key} has no default value or $ref defined`);
-            throw new Error(`${key} has no default value or $ref defined`);
+            throw new schematics_1.O3rCliError(`${key} has no default value or $ref defined`);
         }
         return res;
     }
@@ -173,7 +174,7 @@ class LocalizationExtractor {
         const tsconfigResult = ts.readConfigFile(this.tsconfigPath, ts.sys.readFile);
         if (tsconfigResult.error) {
             this.logger.error(tsconfigResult.error.messageText.toString());
-            throw new Error(tsconfigResult.error.messageText.toString());
+            throw new schematics_1.O3rCliError(tsconfigResult.error.messageText.toString());
         }
         const include = [...(tsconfigResult.config.files || []), ...(tsconfigResult.config.include || [])];
         const exclude = tsconfigResult.config.exclude || [];
@@ -216,7 +217,7 @@ class LocalizationExtractor {
      * @param extraLocalizationFiles Additional translations to add
      */
     async extractLocalizationFromTsConfig(extraLocalizationFiles = []) {
-        const files = await this.getFilesFromTsConfig();
+        const files = this.getFilesFromTsConfig();
         const tsFiles = files
             .filter((file) => /\.ts$/.test(file))
             .map((file) => path.join(path.dirname(this.tsconfigPath), file));
@@ -282,7 +283,7 @@ class LocalizationExtractor {
                 }
                 else {
                     this.logger.error(`The key ${data.key} from ${origin} try to override the previous value (${metadata[data.key].value || 'ref ' + metadata[data.key].ref} -> ${data.value || 'ref ' + data.ref})`);
-                    throw new Error('Duplicate key');
+                    throw new schematics_1.O3rCliError('Duplicate key');
                 }
             }
             metadata[data.key] = data;

package/builders/i18n/index.js

@@ -24,8 +24,8 @@ exports.default = (0, architect_1.createBuilder)((options, context) => {
                     recursive: true
                 });
             }
-            const enGB = path.join(i18nPath, options.defaultLanguageFile);
-            fs.writeFileSync(enGB, newContent);
+            const defaultLanguageFile = path.join(i18nPath, options.defaultLanguageFile);
+            fs.writeFileSync(defaultLanguageFile, newContent + '\n');
         });
     });
     return {

package/builders/localization/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../builders/localization/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAgFrD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,CAGvE;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAC1C,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC9C,cAAc,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA8BjE;;AAgLD,wBA0MG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../builders/localization/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAgFrD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG;IAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,CAGvE;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAC1C,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC9C,cAAc,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA8BjE;;AAgLD,wBA0MG"}

package/builders/localization/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTranslationsForLanguage = exports.loadTranslations = void 0;
 const architect_1 = require("@angular-devkit/architect");
+const schematics_1 = require("@o3r/schematics");
 const fs = require("node:fs");
 const globby_1 = require("globby");
 const path = require("node:path");
@@ -54,7 +55,7 @@ function checkUnusedTranslation(language, defaultBundle, customTranslations, con
         .filter((key) => !dictionaryKeysPatterns.some((dictionaryKeyPattern) => key.startsWith(dictionaryKeyPattern)));
     missingMetadata.forEach((key) => context.logger[failIfMissingMetadata ? 'error' : 'warn'](`The key "${key}" from "${language}" is not part of the MetaData`));
     if (missingMetadata.length && failIfMissingMetadata) {
-        throw new Error(`There is missing metadata for ${language}`);
+        throw new schematics_1.O3rCliError(`There is missing metadata for ${language}`);
     }
 }
 /**
@@ -98,7 +99,7 @@ function getTranslationsForLanguage(language, filesPerLanguage, defaultLanguageM
     if (defaultLanguage) {
         // Throw an error if we find a circular dependency
         if (dependencyPath.has(defaultLanguage)) {
-            throw new Error(`Circular dependency found: ${[...Array.from(dependencyPath), defaultLanguage].join('->')}`);
+            throw new schematics_1.O3rCliError(`Circular dependency found: ${[...Array.from(dependencyPath), defaultLanguage].join('->')}`);
         }
         else {
             // Else, recursively resolve its bundle and use it as a base for the current language

package/builders/localization-extractor/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../builders/localization-extractor/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AAI9D,cAAc,UAAU,CAAC;;AAEzB,wBA4LG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../builders/localization-extractor/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AAI9D,cAAc,UAAU,CAAC;;AAEzB,wBA4LG"}

package/builders/localization-extractor/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const architect_1 = require("@angular-devkit/architect");
+const schematics_1 = require("@o3r/schematics");
 const chokidar = require("chokidar");
 const fs = require("node:fs");
 const globby_1 = require("globby");
@@ -61,7 +62,7 @@ exports.default = (0, architect_1.createBuilder)(async (options, context) => {
                 .filter((metadataItem) => !!metadataItem.value &&
                 validations_1.validators.reduce((isInvalid, validator) => isInvalid || !validator(metadataItem.value), false));
             if (translationsWithIssue.length) {
-                throw new Error(`The following translations are invalid: ${translationsWithIssue.map((translation) => translation.key).join(', ')}`);
+                throw new schematics_1.O3rCliError(`The following translations are invalid: ${translationsWithIssue.map((translation) => translation.key).join(', ')}`);
             }
             context.reportProgress(STEP_NUMBER, STEP_NUMBER, 'Generating metadata');
             // Create output folder if does not exist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/localization",
-  "version": "9.3.0-alpha.6",
+  "version": "9.3.0-alpha.60",
   "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.6",
-    "@o3r/dynamic-content": "^9.3.0-alpha.6",
-    "@o3r/extractors": "^9.3.0-alpha.6",
-    "@o3r/logger": "^9.3.0-alpha.6",
-    "@o3r/schematics": "^9.3.0-alpha.6",
+    "@o3r/core": "^9.3.0-alpha.60",
+    "@o3r/dynamic-content": "^9.3.0-alpha.60",
+    "@o3r/extractors": "^9.3.0-alpha.60",
+    "@o3r/logger": "^9.3.0-alpha.60",
+    "@o3r/schematics": "^9.3.0-alpha.60",
     "@schematics/angular": "~16.2.0",
     "chokidar": "^3.5.2",
     "intl-messageformat": "~10.5.0",
@@ -61,7 +61,7 @@
     "tslib": "^2.5.3"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "builders": "./builders.json",
   "schematics": "./collection.json",

package/schematics/add-localization-key/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/add-localization-key/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAYpC,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,UAAU,CAAC;AA8FrE;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,oCAAoC,GAAG,IAAI,CAyJxF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/add-localization-key/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAapC,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,UAAU,CAAC;AA8FrE;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,oCAAoC,GAAG,IAAI,CAyJxF"}

package/schematics/add-localization-key/index.js

@@ -58,7 +58,7 @@ const getLocalizationInformation = (componentPath, tree) => {
         }
     }
     if (!defaultTranslationVariableName) {
-        throw new Error(`Unable to find initialization of ${translationsVariableName} in ${componentPath}.`);
+        throw new schematics_2.O3rCliError(`Unable to find initialization of ${translationsVariableName} in ${componentPath}.`);
     }
     const importDeclaration = componentSourceFile.statements.find((statement) => ts.isImportDeclaration(statement)
         && ts.isStringLiteral(statement.moduleSpecifier)
@@ -67,7 +67,7 @@ const getLocalizationInformation = (componentPath, tree) => {
         && ts.isNamedImports(statement.importClause.namedBindings)
         && !!statement.importClause.namedBindings.elements.find((element) => ts.isIdentifier(element.name) && element.name.escapedText.toString() === defaultTranslationVariableName));
     if (!importDeclaration) {
-        throw new Error(`Unable to find import declaration of ${defaultTranslationVariableName} in ${componentPath}`);
+        throw new schematics_2.O3rCliError(`Unable to find import declaration of ${defaultTranslationVariableName} in ${componentPath}`);
     }
     const translationsPath = node_path_1.posix.join((0, node_path_1.dirname)(componentPath), `${importDeclaration.moduleSpecifier.text}.ts`);
     return {

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/localization-to-component/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/localization-to-component/index.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAoBpC,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAkClE;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,iCAAiC,GAAG,IAAI,CA6SlF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/localization-to-component/index.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAqBpC,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAkClE;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,iCAAiC,GAAG,IAAI,CA6SlF"}

package/schematics/localization-to-component/index.js

@@ -16,7 +16,7 @@ const checkLocalization = (componentPath, tree, baseFileName) => {
         node_path_1.posix.join((0, node_path_1.dirname)(componentPath), `${baseFileName}.translation.ts`)
     ];
     if (files.some((file) => tree.exists(file))) {
-        throw new Error(`Unable to add localization to this component because it already has at least one of these files: ${files.join(', ')}.`);
+        throw new schematics_2.O3rCliError(`Unable to add localization to this component because it already has at least one of these files: ${files.join(', ')}.`);
     }
     const componentSourceFile = ts.createSourceFile(componentPath, tree.readText(componentPath), ts.ScriptTarget.ES2020, true);
     const o3rClassDeclaration = componentSourceFile.statements.find((statement) => ts.isClassDeclaration(statement)
@@ -24,7 +24,7 @@ const checkLocalization = (componentPath, tree, baseFileName) => {
     if (o3rClassDeclaration.members.find((classElement) => ts.isPropertyDeclaration(classElement)
         && ts.isIdentifier(classElement.name)
         && localizationProperties.includes(classElement.name.escapedText.toString()))) {
-        throw new Error(`Unable to add localization to this component because it already has at least one of these properties: ${localizationProperties.join(', ')}.`);
+        throw new schematics_2.O3rCliError(`Unable to add localization to this component because it already has at least one of these properties: ${localizationProperties.join(', ')}.`);
     }
 };
 /**

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,CAiD1D"}
+{"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),
@@ -34,7 +35,8 @@ function ngAdd(options) {
                     skipConfirmation: true,
                     version: depsInfo.packageVersion,
                     parentPackageInfo: `${depsInfo.packageName} - setup`,
-                    dependencyType: getProjectDepType(t),
+                    projectName: options.projectName,
+                    dependencyType,
                     workingDirectory
                 })(t, c),
                 ngAddPeerDependencyPackages(['chokidar'], packageJsonPath, NodeDependencyType.Dev, { ...options, workingDirectory, skipNgAddSchematicRun: true }, '@o3r/localization - install builder dependency'),