@zohodesk/client_build_tool 0.0.10-exp.5 → 0.0.11-exp.6

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

@@ -0,0 +1,70 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.configI18nNumericIndexPlugin = configI18nNumericIndexPlugin;
+
+var _I18nNumericIndexPlugin = require("../custom_plugins/I18nNumericIndexPlugin/I18nNumericIndexPlugin");
+
+var _I18nNumericIndexHtmlInjectorPlugin = require("../custom_plugins/I18nNumericIndexPlugin/I18nNumericIndexHtmlInjectorPlugin");
+
+var _readI18nValues = require("../custom_plugins/I18nSplitPlugin/readI18nValues");
+
+function configI18nNumericIndexPlugin(options) {
+  if (!(options.i18nIndexing && options.i18nIndexing.enable)) {
+    return null;
+  }
+
+  const i18nOpts = options.i18nIndexing;
+  const cdnConfig = options.cdnMapping || {};
+  const requiredOptions = ['jsResourcePath', 'propertiesFolderPath', 'numericMapPath', 'jsonpFunc', 'htmlTemplateLabel', 'localeVarName', 'numericFilenameTemplate', 'dynamicFilenameTemplate'];
+  const missingOptions = requiredOptions.filter(opt => !i18nOpts[opt]);
+
+  if (missingOptions.length > 0) {
+    return null;
+  }
+
+  const {
+    locales,
+    allI18nObject
+  } = (0, _readI18nValues.readI18nValues)({
+    jsResource: i18nOpts.jsResourcePath,
+    propertiesFolder: i18nOpts.propertiesFolderPath,
+    disableDefault: false
+  });
+
+  if (!i18nOpts.numericFilenameTemplate.includes('[locale]')) {
+    return null;
+  }
+
+  if (!i18nOpts.dynamicFilenameTemplate.includes('[locale]')) {
+    return null;
+  } // Empty prefix - HtmlWebpackPlugin handles publicPath
+
+
+  const i18nAssetsPublicPathPrefix = '';
+  const numericIndexPluginOptions = {
+    enable: i18nOpts.enable,
+    jsResourcePath: i18nOpts.jsResourcePath,
+    propertiesFolderPath: i18nOpts.propertiesFolderPath,
+    numericMapPath: i18nOpts.numericMapPath,
+    locales,
+    allI18nObject,
+    numericFilenameTemplate: i18nOpts.numericFilenameTemplate,
+    dynamicFilenameTemplate: i18nOpts.dynamicFilenameTemplate,
+    jsonpFunc: i18nOpts.jsonpFunc,
+    singleFile: i18nOpts.singleFile || false,
+    includeContentHash: i18nOpts.includeContentHash || false,
+    generateManifest: i18nOpts.generateManifest || false
+  };
+  const htmlInjectorOptions = {
+    numericFilenameTemplate: i18nOpts.numericFilenameTemplate,
+    dynamicFilenameTemplate: i18nOpts.dynamicFilenameTemplate,
+    htmlTemplateLabel: i18nOpts.htmlTemplateLabel,
+    i18nAssetsPublicPathPrefix
+  };
+  const i18nNumericPluginInstance = new _I18nNumericIndexPlugin.I18nNumericIndexPlugin(numericIndexPluginOptions);
+  const htmlInjectorPluginInstance = new _I18nNumericIndexHtmlInjectorPlugin.I18nNumericIndexHtmlInjectorPlugin(htmlInjectorOptions);
+  return [i18nNumericPluginInstance, htmlInjectorPluginInstance];
+}

package/lib/shared/bundler/webpack/plugins.js

@@ -49,10 +49,12 @@ var _configRuntimeResourceCleanup = require("./pluginConfigs/configRuntimeResour
 
 var _configCustomScriptLoadingStrategyPlugin = require("./pluginConfigs/configCustomScriptLoadingStrategyPlugin");
 
+var _configI18nNumericIndexPlugin = require("./pluginConfigs/configI18nNumericIndexPlugin");
+
 // import { IgnorePlugin } from 'webpack';
 function plugins(options) {
   const {
     webpackPlugins
   } = options;
-  return [(0, _configEnvVariables.configEnvVariables)(options), (0, _configCustomAttributesPlugin.configCustomAttributesPlugin)(options), (0, _configTPHashMappingPlugin.configTPHashMappingPlugin)(options), (0, _configCopyPublicFolders.configCopyPublicFolders)(options), (0, _configIgnorePlugin.configIgnorePlugin)(options), (0, _configMiniCSSExtractPlugin.configMiniCSSExtractPlugin)(options), (0, _configSelectorWeightPlugin.configSelectorWeightPlugin)(options), (0, _configVariableConversionPlugin.configVariableConversionPlugin)(options), (0, _configI18nSplitPlugin.configI18nSplitPlugin)(options), (0, _configRtlCssPlugin.configRtlCssPlugin)(options), (0, _configHtmlWebpackPlugin.configHtmlWebpackPlugin)(options), (0, _configCustomScriptLoadingStrategyPlugin.configCustomScriptLoadingStrategyPlugin)(options), (0, _configCdnChangePlugin.configCdnChangePlugin)(options), (0, _configServiceWorkerPlugin.configServiceWorkerPlugin)(options), (0, _configEFCTemplatePlugin.configEFCTemplatePlugin)(options), (0, _configResourceHintsPlugin.configResourceHintsPlugin)(options), (0, _configBundleAnalyzer.configBundleAnalyzer)(options), (0, _configManifestJsonPlugin.configManifestJsonPlugin)(options), (0, _configSourceMapPlugin.configSourceMapPlugin)(options), (0, _configProgressPlugin.configProgressPlugin)(options), (0, _configBundleIntegrityReport.configBundleIntegrityReport)(options), (0, _configRuntimeResourceCleanup.configRuntimeResourceCleanup)(options), ...webpackPlugins].filter(Boolean);
+  return [(0, _configEnvVariables.configEnvVariables)(options), (0, _configCustomAttributesPlugin.configCustomAttributesPlugin)(options), (0, _configTPHashMappingPlugin.configTPHashMappingPlugin)(options), (0, _configCopyPublicFolders.configCopyPublicFolders)(options), (0, _configIgnorePlugin.configIgnorePlugin)(options), (0, _configMiniCSSExtractPlugin.configMiniCSSExtractPlugin)(options), (0, _configSelectorWeightPlugin.configSelectorWeightPlugin)(options), (0, _configVariableConversionPlugin.configVariableConversionPlugin)(options), (0, _configI18nSplitPlugin.configI18nSplitPlugin)(options), (0, _configRtlCssPlugin.configRtlCssPlugin)(options), (0, _configHtmlWebpackPlugin.configHtmlWebpackPlugin)(options), ...((0, _configI18nNumericIndexPlugin.configI18nNumericIndexPlugin)(options) || []), (0, _configCustomScriptLoadingStrategyPlugin.configCustomScriptLoadingStrategyPlugin)(options), (0, _configCdnChangePlugin.configCdnChangePlugin)(options), (0, _configServiceWorkerPlugin.configServiceWorkerPlugin)(options), (0, _configEFCTemplatePlugin.configEFCTemplatePlugin)(options), (0, _configResourceHintsPlugin.configResourceHintsPlugin)(options), (0, _configBundleAnalyzer.configBundleAnalyzer)(options), (0, _configManifestJsonPlugin.configManifestJsonPlugin)(options), (0, _configSourceMapPlugin.configSourceMapPlugin)(options), (0, _configProgressPlugin.configProgressPlugin)(options), (0, _configBundleIntegrityReport.configBundleIntegrityReport)(options), (0, _configRuntimeResourceCleanup.configRuntimeResourceCleanup)(options), ...webpackPlugins].filter(Boolean);
 }

package/lib/shared/bundler/webpack/utils/i18n/collectAstKeys.js

@@ -0,0 +1,96 @@
+"use strict";
+
+const {
+  walk
+} = require('estree-walker');
+
+const PREFIX_I18N_COMMENT = 'I18N';
+const PREFIX_I18N_COMMENT_DYNAMIC = 'dynamic-i18n-key';
+
+function getI18nKeysFromSingleComment(commentNode, validKeysSet) {
+  const foundKeysInComment = [];
+
+  if (!commentNode || typeof commentNode.value !== 'string') {
+    return foundKeysInComment;
+  }
+
+  const commentString = commentNode.value.trim();
+  let i18nKeyStr;
+
+  if (commentString.startsWith(PREFIX_I18N_COMMENT)) {
+    i18nKeyStr = commentString.slice(PREFIX_I18N_COMMENT.length).trim();
+  } else if (commentString.startsWith(PREFIX_I18N_COMMENT_DYNAMIC)) {
+    i18nKeyStr = commentString.slice(PREFIX_I18N_COMMENT_DYNAMIC.length).trim();
+  }
+
+  if (!i18nKeyStr) {
+    return foundKeysInComment;
+  }
+
+  const potentialKeys = i18nKeyStr.split(',').map(key => key.trim()).filter(key => key);
+  potentialKeys.forEach(key => {
+    if (validKeysSet.has(key)) {
+      foundKeysInComment.push(key);
+    }
+  });
+  return foundKeysInComment;
+}
+/**
+ * Traverses an AST and its comments to collect and categorize i18n keys.
+ *
+ * @param {object} astProgramNode - The Program node of the AST.
+ * @param {object[]} commentsArray - An array of comment nodes from the AST.
+ * @param {object} allI18nKeysMasterMap - Object map of all valid i18n keys (from JSResources).
+ * @param {boolean} [isDebug=false] - Flag for verbose logging.
+ * @returns {{literalKeys: Set<string>, commentKeys: Set<string>}}
+ * literalKeys: Set of valid i18n keys found as string literals.
+ * commentKeys: Set of valid i18n keys found in comments.
+ */
+
+
+function collectAndCategorizeUsedI18nKeys(astProgramNode, commentsArray, allI18nKeysMasterMap, isDebug = false) {
+  const foundLiteralKeys = new Set();
+  const foundCommentKeys = new Set();
+  const validKeysSet = new Set(Object.keys(allI18nKeysMasterMap || {}));
+
+  if (validKeysSet.size === 0 && isDebug) {
+    console.warn('[collectAndCategorizeUsedI18nKeys] allI18nKeysMasterMap is empty. No keys can be collected.');
+  } // 1. Collect keys from AST string literals
+
+
+  if (astProgramNode) {
+    try {
+      walk(astProgramNode, {
+        enter(node) {
+          if ((node.type === 'Literal' || node.type === 'StringLiteral') && typeof node.value === 'string') {
+            if (validKeysSet.has(node.value)) {
+              foundLiteralKeys.add(node.value);
+            }
+          }
+        }
+
+      });
+    } catch (error) {
+      console.error('[collectAndCategorizeUsedI18nKeys] Error during AST walk:', error);
+    }
+  } // 2. Collect keys from comments
+
+
+  if (commentsArray && Array.isArray(commentsArray)) {
+    commentsArray.forEach(commentNode => {
+      const keysFromComment = getI18nKeysFromSingleComment(commentNode, validKeysSet);
+      keysFromComment.forEach(key => {
+        foundCommentKeys.add(key);
+      });
+    });
+  }
+
+  return {
+    literalKeys: foundLiteralKeys,
+    commentKeys: foundCommentKeys
+  };
+}
+
+module.exports = {
+  collectAndCategorizeUsedI18nKeys: collectAndCategorizeUsedI18nKeys
+};

package/lib/shared/bundler/webpack/utils/propertiesParser.js

@@ -0,0 +1,103 @@
+"use strict";
+
+/**
+ * Shared properties file parsing utility
+ * Handles consistent parsing across all i18n tools
+ */
+// Decode Unicode escape sequences (for values only)
+function decodeUnicodeEscapes(str) {
+  if (typeof str !== 'string') {
+    return str;
+  }
+
+  return str.replace(/\\u([0-9a-fA-F]{4})/g, (match, hex) => {
+    return String.fromCharCode(parseInt(hex, 16));
+  });
+}
+/**
+ * Parse properties file content into key-value pairs
+ * @param {string} content - Properties file content
+ * @returns {Object} Parsed key-value pairs
+ */
+
+
+function parseProperties(content) {
+  const lines = content.split(/\r?\n/);
+  const data = {};
+  lines.forEach(line => {
+    const trimmedLine = line.trim();
+
+    if (trimmedLine.startsWith('#') || trimmedLine.startsWith('!') || trimmedLine === '') {
+      return;
+    } // Find unescaped separator (= or :)
+
+
+    let separatorIndex = -1;
+
+    for (let i = 0; i < trimmedLine.length; i++) {
+      if ((trimmedLine[i] === '=' || trimmedLine[i] === ':') && (i === 0 || trimmedLine[i - 1] !== '\\')) {
+        separatorIndex = i;
+        break;
+      }
+    }
+
+    if (separatorIndex > 0) {
+      let key = trimmedLine.substring(0, separatorIndex).trim();
+      let value = trimmedLine.substring(separatorIndex + 1).trim();
+
+      if (key) {
+        // Handle escaped spaces in keys only
+        key = key.replace(/\\ /g, ' '); // Decode Unicode escape sequences ONLY in values, not keys
+
+        value = decodeUnicodeEscapes(value);
+        data[key] = value;
+      }
+    }
+  });
+  return data;
+}
+/**
+ * Parse properties file content into a Set of keys only
+ * @param {string} content - Properties file content
+ * @returns {Set<string>} Set of keys
+ */
+
+
+function parsePropertiesToKeySet(content) {
+  const lines = content.split(/\r?\n/);
+  const keys = new Set();
+  lines.forEach(line => {
+    const trimmedLine = line.trim();
+
+    if (trimmedLine.startsWith('#') || trimmedLine.startsWith('!') || trimmedLine === '') {
+      return;
+    } // Find unescaped separator (= or :)
+
+
+    let separatorIndex = -1;
+
+    for (let i = 0; i < trimmedLine.length; i++) {
+      if ((trimmedLine[i] === '=' || trimmedLine[i] === ':') && (i === 0 || trimmedLine[i - 1] !== '\\')) {
+        separatorIndex = i;
+        break;
+      }
+    }
+
+    if (separatorIndex > 0) {
+      let key = trimmedLine.substring(0, separatorIndex).trim();
+
+      if (key) {
+        // Handle escaped spaces in keys only
+        key = key.replace(/\\ /g, ' ');
+        keys.add(key);
+      }
+    }
+  });
+  return keys;
+}
+
+module.exports = {
+  parseProperties,
+  parsePropertiesToKeySet,
+  decodeUnicodeEscapes
+};

package/lib/shared/postcss/custom_postcss_plugins/VariableModificationPlugin/index.js

@@ -259,7 +259,7 @@ var _default = ({
               if (range) {
                 // console.log('multiple :', decl.value)
                 let newVal = '';
-                decl.value.split(' ').filter(Boolean).forEach(singleVal => {
+                decl.value.split(' ').forEach(singleVal => {
                   newVal += `${singleConvertor(singleVal, settings.replacements.px, {
                     decl,
                     filename,

package/lib/shared/server/urlConcat.js

@@ -20,7 +20,7 @@ function urlConcat(url, path) {
     return path;
   }
 
-  return `${slashRemovedUrl}/${slashRemovedPath}`;
+  return `${slashRemovedUrl}/${slashRemovedPath}/`;
 }
 
 function removeLastSlash(url) {

package/package.json

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