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

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',

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',

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

@@ -103,7 +103,8 @@ class I18nNumericIndexPlugin {
 
         const {
           sortedKeys,
-          totalKeys
+          totalKeys,
+          originalKeyToNumericId
         } = this.getNumericMap(compilation);
         const {
           jsResourceBase,
@@ -113,28 +114,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,8 +150,8 @@ 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');
             }
           }
         });

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/package.json

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