@o3r/localization 9.3.0-alpha.3 → 9.3.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/localization",
-  "version": "9.3.0-alpha.3",
+  "version": "9.3.0-alpha.5",
   "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.3",
-    "@o3r/dynamic-content": "^9.3.0-alpha.3",
-    "@o3r/extractors": "^9.3.0-alpha.3",
-    "@o3r/logger": "^9.3.0-alpha.3",
-    "@o3r/schematics": "^9.3.0-alpha.3",
+    "@o3r/core": "^9.3.0-alpha.5",
+    "@o3r/dynamic-content": "^9.3.0-alpha.5",
+    "@o3r/extractors": "^9.3.0-alpha.5",
+    "@o3r/logger": "^9.3.0-alpha.5",
+    "@o3r/schematics": "^9.3.0-alpha.5",
     "@schematics/angular": "~16.2.0",
     "chokidar": "^3.5.2",
     "intl-messageformat": "~10.5.0",

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,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKjF;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,IAAI,CAoEpF"}
+{"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"}

package/schematics/cms-adapter/index.js

@@ -12,6 +12,9 @@ const path = require("node:path");
  * @param rootPath @see RuleFactory.rootPath
  */
 function updateCmsAdapter(options) {
+    if (!options.projectName) {
+        return schematics_1.noop;
+    }
     /**
      * Add cms extractors builder into the angular.json
      *

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

@@ -12,5 +12,7 @@ export declare function updateLocalization(options: {
 /**
  *
  */
-export declare function updateI18n(): Rule;
+export declare function updateI18n(options: {
+    projectName?: string | undefined;
+}): Rule;
 //# sourceMappingURL=index.d.ts.map

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,EAA0C,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAoCjI;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CA8a/G;AAED;;GAEG;AACH,wBAAgB,UAAU,IAAI,IAAI,CAwCjC"}
+{"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"}

package/schematics/localization-base/index.js

@@ -20,6 +20,9 @@ const angularCdkDep = '@angular/cdk';
  * @param rootPath @see RuleFactory.rootPath
  */
 function updateLocalization(options, rootPath) {
+    if (!options.projectName) {
+        return schematics_1.noop;
+    }
     const mainAssetsFolder = 'src/assets';
     const devResourcesFolder = 'dev-resources';
     /**
@@ -29,13 +32,15 @@ function updateLocalization(options, rootPath) {
      * @param context
      */
     const generateLocalesFolder = (tree, context) => {
+        const workingDirectory = (0, schematics_2.getProjectRootDir)(tree, options.projectName) || '.';
         let gitIgnoreContent = '';
-        if (tree.exists('.gitignore')) {
-            gitIgnoreContent = tree.read('.gitignore').toString();
+        const gitIgnorePath = path.posix.join(workingDirectory, '.gitignore');
+        if (tree.exists(gitIgnorePath)) {
+            gitIgnoreContent = tree.read(gitIgnorePath).toString();
             if (gitIgnoreContent.indexOf('/*.metadata.json')) {
                 return tree;
             }
-            tree.delete('.gitignore');
+            tree.delete(gitIgnorePath);
         }
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname)), [
             (0, schematics_1.template)({
@@ -43,7 +48,8 @@ function updateLocalization(options, rootPath) {
                 devResourcesFolder,
                 gitIgnoreContent,
                 mainAssetsFolder
-            })
+            }),
+            (0, schematics_1.move)(workingDirectory)
         ]);
         const rule = (0, schematics_1.mergeWith)(templateSource, schematics_1.MergeStrategy.Overwrite);
         return rule(tree, context);
@@ -58,7 +64,7 @@ function updateLocalization(options, rootPath) {
         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 projectRoot = path.posix.join('/', workspaceProject?.root || '');
+        const projectRoot = path.posix.join(workspaceProject?.root || '');
         const distFolder = (workspaceProject &&
             workspaceProject.architect &&
             workspaceProject.architect.build &&
@@ -365,7 +371,10 @@ exports.updateLocalization = updateLocalization;
 /**
  *
  */
-function updateI18n() {
+function updateI18n(options) {
+    if (!options.projectName) {
+        return schematics_1.noop;
+    }
     /**
      * Add i18n generation builders into angular.json
      *
@@ -373,7 +382,7 @@ function updateI18n() {
      */
     const updateAngularJson = (tree) => {
         const workspace = (0, schematics_2.readAngularJson)(tree);
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree);
+        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, options.projectName);
         if (!workspaceProject) {
             return tree;
         }

package/schematics/ng-add/index.js

@@ -23,10 +23,10 @@ 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 = getProjectRootDir(tree, options.projectName);
+            const workingDirectory = options.projectName ? getProjectRootDir(tree, options.projectName) : '.';
             return () => (0, schematics_1.chain)([
                 updateLocalization(options, __dirname),
-                updateI18n(),
+                updateI18n(options),
                 options.skipLinter ? (0, schematics_1.noop)() : applyEsLintFix(),
                 // install ngx-translate and message format dependencies
                 options.skipInstall ? schematics_1.noop : install,