@zohodesk/client_build_tool 0.0.11-exp.12 → 0.0.11-exp.15

package/lib/schemas/defaultConfigValues.js

@@ -176,6 +176,7 @@ var _default = {
   },
   i18nIndexing: {
     enable: false,
+    devMode: false,
     jsResourcePath: './deskapp/properties/JSResources.properties',
     propertiesFolderPath: './deskapp/properties',
     numericMapPath: './deskapp/properties/i18n-numeric-map.json',
@@ -187,7 +188,8 @@ var _default = {
     localeVarName: 'window.userLangCode',
     singleFile: false,
     includeContentHash: false,
-    generateManifest: false
+    generateManifest: false,
+    manifestPath: null
   },
   publicFolders: ['...'],
   app: {

package/lib/schemas/defaultConfigValuesOnly.js

@@ -99,6 +99,7 @@ var _default = {
   },
   i18nIndexing: {
     enable: false,
+    devMode: false,
     jsResourcePath: './deskapp/properties/JSResources.properties',
     propertiesFolderPath: './deskapp/properties',
     numericMapPath: './deskapp/properties/i18n-numeric-map.json',
@@ -109,7 +110,8 @@ var _default = {
     localeVarName: 'window.userLangCode',
     singleFile: false,
     includeContentHash: false,
-    generateManifest: false
+    generateManifest: false,
+    manifestPath: null
   },
   publicFolders: ['...', {
     source: './deskapp/tp/',

package/lib/shared/bundler/webpack/custom_plugins/I18nNumericIndexPlugin/I18nNumericIndexPlugin.js

@@ -28,7 +28,8 @@ class I18nNumericIndexPlugin {
       singleFile: options.singleFile || false,
       singleFileTemplate: options.singleFileTemplate,
       includeContentHash: options.includeContentHash || false,
-      generateManifest: options.generateManifest || false
+      generateManifest: options.generateManifest || false,
+      manifestPath: options.manifestPath || 'i18n/manifest.json'
     };
     this.numericMap = null;
     this.i18nData = null;
@@ -103,7 +104,8 @@ class I18nNumericIndexPlugin {
 
         const {
           sortedKeys,
-          totalKeys
+          totalKeys,
+          originalKeyToNumericId
         } = this.getNumericMap(compilation);
         const {
           jsResourceBase,
@@ -113,28 +115,31 @@ class I18nNumericIndexPlugin {
         if (!locales.length) return callback();
         const numericKeysSet = new Set(sortedKeys);
         const englishData = allI18n.en_US || jsResourceBase;
+        const isDevMode = this.options.devMode || process.env.NODE_ENV === 'development';
         locales.forEach(locale => {
           const localeData = allI18n[locale] || {};
           const numericData = {};
-
-          for (let i = 0; i < totalKeys; i++) {
-            const key = sortedKeys[i];
-
-            if (key && jsResourceBase[key] !== undefined) {
-              numericData[i] = localeData[key] ?? englishData[key];
-            }
-          }
-
-          const dynamicData = {};
+          const unmappedData = {};
           Object.keys(jsResourceBase).forEach(key => {
-            if (!numericKeysSet.has(key)) {
-              dynamicData[key] = localeData[key] ?? englishData[key];
+            const translation = localeData[key] ?? englishData[key];
+
+            if (originalKeyToNumericId && originalKeyToNumericId.hasOwnProperty(key)) {
+              const numericId = originalKeyToNumericId[key];
+              numericData[numericId] = translation;
+            } else if (numericKeysSet.has(key)) {
+              const index = sortedKeys.indexOf(key);
+
+              if (index !== -1) {
+                numericData[index] = translation;
+              }
+            } else {
+              unmappedData[key] = translation;
             }
           });
 
           if (this.options.singleFile) {
             const combinedData = { ...numericData,
-              ...dynamicData
+              ...unmappedData
             };
 
             if (Object.keys(combinedData).length > 0) {
@@ -146,14 +151,25 @@ class I18nNumericIndexPlugin {
               this.emitChunk(compilation, this.options.numericFilenameTemplate, locale, numericData, 'numeric');
             }
 
-            if (Object.keys(dynamicData).length > 0) {
-              this.emitChunk(compilation, this.options.dynamicFilenameTemplate, locale, dynamicData, 'dynamic');
+            if (Object.keys(unmappedData).length > 0) {
+              this.emitChunk(compilation, this.options.dynamicFilenameTemplate, locale, unmappedData, 'dynamic');
             }
           }
         });
 
         if (this.options.generateManifest && Object.keys(this.manifest).length > 0) {
-          const manifestPath = path.dirname(this.options.numericFilenameTemplate) + '/manifest.json';
+          // Determine manifest path
+          let manifestPath;
+
+          if (this.options.manifestPath) {
+            // Use explicitly configured path
+            manifestPath = this.options.manifestPath;
+          } else {
+            // Default to same directory as i18n files with manifest.json name
+            const template = this.options.singleFileTemplate || this.options.numericFilenameTemplate;
+            manifestPath = path.dirname(template) + '/manifest.json';
+          }
+
           const manifestContent = JSON.stringify(this.manifest, null, 2);
           compilation.emitAsset(manifestPath, new RawSource(manifestContent));
         }

package/lib/shared/bundler/webpack/loaderConfigs/i18nIdReplaceLoaderConfig.js

@@ -56,6 +56,7 @@ function i18nIdReplaceLoaderConfig(options, webpackContext) {
     allI18nData: allI18nData,
     sourceMaps: false,
     numericMapPath: numericMapPath,
+    devMode: options.i18nIndexing?.devMode || false,
     includePaths: options.i18nIndexing?.loaderOptions?.includePaths || [],
     excludePaths: options.i18nIndexing?.loaderOptions?.excludePaths || ['node_modules', 'tests']
   };

package/lib/shared/bundler/webpack/loaders/i18nIdReplaceLoader.js

@@ -61,6 +61,8 @@ module.exports = function i18nIdReplaceLoader(source, map) {
     return callback(null, source, map);
   }
 
+  const isDevMode = options.devMode || process.env.NODE_ENV === 'development';
+
   try {
     const ast = parser.parse(source, {
       sourceType: 'module',

package/lib/shared/bundler/webpack/pluginConfigs/configI18nNumericIndexPlugin.js

@@ -16,8 +16,11 @@ function configI18nNumericIndexPlugin(options) {
     return null;
   }
 
-  const i18nOpts = options.i18nIndexing;
-  const requiredOptions = ['jsResourcePath', 'propertiesFolderPath', 'numericMapPath', 'jsonpFunc', 'htmlTemplateLabel', 'localeVarName', 'numericFilenameTemplate', 'dynamicFilenameTemplate'];
+  const i18nOpts = options.i18nIndexing; // Check for required options based on singleFile mode
+
+  const baseRequiredOptions = ['jsResourcePath', 'propertiesFolderPath', 'numericMapPath', 'jsonpFunc', 'htmlTemplateLabel', 'localeVarName']; // Add template requirements based on mode
+
+  const requiredOptions = i18nOpts.singleFile ? [...baseRequiredOptions, 'singleFileTemplate'] : [...baseRequiredOptions, 'numericFilenameTemplate', 'dynamicFilenameTemplate'];
   const missingOptions = requiredOptions.filter(opt => !i18nOpts[opt]);
 
   if (missingOptions.length > 0) {
@@ -31,14 +34,20 @@ function configI18nNumericIndexPlugin(options) {
     jsResource: i18nOpts.jsResourcePath,
     propertiesFolder: i18nOpts.propertiesFolderPath,
     disableDefault: false
-  });
+  }); // Validate template patterns based on mode
 
-  if (!i18nOpts.numericFilenameTemplate.includes('[locale]')) {
-    return null;
-  }
+  if (i18nOpts.singleFile) {
+    if (i18nOpts.singleFileTemplate && !i18nOpts.singleFileTemplate.includes('[locale]')) {
+      return null;
+    }
+  } else {
+    if (!i18nOpts.numericFilenameTemplate?.includes('[locale]')) {
+      return null;
+    }
 
-  if (!i18nOpts.dynamicFilenameTemplate.includes('[locale]')) {
-    return null;
+    if (!i18nOpts.dynamicFilenameTemplate?.includes('[locale]')) {
+      return null;
+    }
   }
 
   const i18nAssetsPublicPathPrefix = '';
@@ -60,7 +69,8 @@ function configI18nNumericIndexPlugin(options) {
     jsonpFunc: i18nOpts.jsonpFunc,
     singleFile: i18nOpts.singleFile || false,
     includeContentHash: finalIncludeContentHash,
-    generateManifest: i18nOpts.generateManifest || false
+    generateManifest: i18nOpts.generateManifest || false,
+    manifestPath: i18nOpts.manifestPath
   };
   const htmlInjectorOptions = {
     numericFilenameTemplate: i18nOpts.numericFilenameTemplate,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/client_build_tool",
-  "version": "0.0.11-exp.12",
+  "version": "0.0.11-exp.15",
   "description": "A CLI tool to  build  web applications and client libraries",
   "main": "lib/index.js",
   "bin": {