webpack-gc-i18n-plugin 1.1.7 → 1.1.9

package/dist/customLoader/index.cjs

@@ -50,6 +50,16 @@ PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
 /* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
+var __assign = function () {
+  __assign = Object.assign || function __assign(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
 function __awaiter(thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -415,7 +425,7 @@ const REGEX_MAP = {
  */
 function splitByRegex(str, separatorRegex) {
   // 定义标点符号的正则表达式
-  const punctuationRegex = /[，。？！《》,.．：!?""''；'"、0-9\n\r\t\v\f]/;
+  const punctuationRegex = /[，。？！《》（）(),.．：!?""''；'"、0-9\n\r\t\v\f]/;
   // 创建一个新的正则表达式，用于分割字符串
   const splitRegex = new RegExp(`(${separatorRegex.source}|${punctuationRegex.source})`, separatorRegex.flags);
 
@@ -425,7 +435,7 @@ function splitByRegex(str, separatorRegex) {
   let currentMatch = '';
 
   // 定义连接标点符号的正则表达式
-  const connectPunctuationRegex = /[，。？！《》,.．：!?；'"、0-9]/;
+  const connectPunctuationRegex = /[，。？！《》（）(),.．：!?；'"、0-9]/;
   // 创建一个新的正则表达式，用于检测是否需要连接
   const connectRegex = new RegExp(`(${separatorRegex.source}|${connectPunctuationRegex.source})`, separatorRegex.flags);
 
@@ -472,7 +482,85 @@ function splitByRegex(str, separatorRegex) {
   if (tempStr) {
     finalResult.push(tempStr);
   }
-  return finalResult;
+  return mergeInlineTextSeparatedOriginChunks(finalResult, separatorRegex);
+}
+function mergeInlineTextSeparatedOriginChunks(strArray, separatorRegex) {
+  const result = [];
+  for (let i = 0; i < strArray.length; i++) {
+    let current = strArray[i];
+    if (!separatorRegex.test(current) && i + 1 < strArray.length && separatorRegex.test(strArray[i + 1])) {
+      const {
+        beforeInlineText,
+        inlineText
+      } = splitTrailingInlineText(current);
+      if (inlineText && /[^\s\u00a0]/.test(inlineText)) {
+        if (beforeInlineText) {
+          result.push(beforeInlineText);
+        }
+        current = `${normalizeInlineTextPrefix(inlineText)}${strArray[i + 1]}`;
+        i += 1;
+      }
+    }
+    if (!separatorRegex.test(current) && isInlineTextSeparator(current) && /[^\s\u00a0]/.test(current) && i + 1 < strArray.length && separatorRegex.test(strArray[i + 1])) {
+      current = `${normalizeInlineTextPrefix(current)}${strArray[i + 1]}`;
+      i += 1;
+    }
+    if (separatorRegex.test(current)) {
+      while (i + 2 < strArray.length && isInlineTextSeparator(strArray[i + 1]) && separatorRegex.test(strArray[i + 2])) {
+        current += `${normalizeInlineTextSeparator(strArray[i + 1])}${strArray[i + 2]}`;
+        i += 2;
+      }
+      if (i + 1 < strArray.length) {
+        const {
+          inlineText,
+          rest
+        } = splitLeadingInlineText(strArray[i + 1]);
+        if (inlineText) {
+          current += normalizeInlineTextSeparator(inlineText);
+          strArray[i + 1] = rest;
+        }
+      }
+    }
+    if (current) {
+      result.push(current);
+    }
+  }
+  return result;
+}
+function isInlineTextSeparator(value) {
+  return value !== '' && !/[<>]/.test(value);
+}
+function normalizeInlineTextSeparator(value) {
+  return /^[\s\u00a0]+$/.test(value) ? ' ' : value.replace(/[\s\u00a0]+/g, ' ');
+}
+function normalizeInlineTextPrefix(value) {
+  return value.replace(/[\s\u00a0]+/g, ' ').trimStart();
+}
+function splitLeadingInlineText(value) {
+  const tagIndex = value.search(/[<>]/);
+  if (tagIndex === -1) {
+    return {
+      inlineText: value,
+      rest: ''
+    };
+  }
+  return {
+    inlineText: value.slice(0, tagIndex),
+    rest: value.slice(tagIndex)
+  };
+}
+function splitTrailingInlineText(value) {
+  const tagEndIndex = value.lastIndexOf('>');
+  if (tagEndIndex === -1) {
+    return {
+      beforeInlineText: '',
+      inlineText: value
+    };
+  }
+  return {
+    beforeInlineText: value.slice(0, tagEndIndex + 1),
+    inlineText: value.slice(tagEndIndex + 1)
+  };
 }
 
 /**
@@ -482,7 +570,7 @@ function splitByRegex(str, separatorRegex) {
  */
 function checkNeedSplit(str) {
   // 检查字符串中是否包含需要切割的特殊字符
-  return str.includes('\n') || str.includes('\\') || str.includes('\r') || str.includes('\t') || str.includes('\v') || str.includes('\f') || str.includes('>') || str.includes('<');
+  return str.includes('\\') || str.includes('>') || str.includes('<');
 }
 
 /**
@@ -807,6 +895,13 @@ function createI18nTranslator(createOption) {
     uncodeValue: valStr,
     namespace: nameSpace
   };
+  insertOption?.collector?.record?.({
+    key: option.useValueAsKey ? trimmedValue : generatedKey,
+    value: trimmedValue,
+    namespace: nameSpace,
+    resourcePath: insertOption?.resourcePath,
+    root: insertOption?.root
+  });
   if (option.translateExtends) {
     const {
       handleCodeCall,
@@ -1164,9 +1259,13 @@ function getExpressionPlaceholder(expression) {
     return getExpressionPlaceholder(expression.expression);
   }
   const generateCode = generate__namespace.default?.default || generate__namespace.default || generate__namespace;
-  return generateCode(expression, {
+  return normalizeExpressionPlaceholder(generateCode(expression, {
     comments: false
-  }).code;
+  }).code);
+}
+function normalizeExpressionPlaceholder(placeholder) {
+  if (placeholder === null) return null;
+  return placeholder.replace(/(^|[^\w$])(?:_vm|\$data)\s*\./g, '$1').replace(/(^|[^\w$])(?:_vm|\$data)\s*\[/g, '$1[');
 }
 function optimizeConditionalExpression(expression) {
   if (!types.isConditionalExpression(expression)) return null;
@@ -1412,11 +1511,11 @@ function CallExpressionFn (insertOption) {
             isExpression: true
           });
           path.replaceWith(replaceNode);
-          translateSetLang(replaceNode);
+          translateSetLang(replaceNode, insertOption);
         }
       } else if (option.translateType === TranslateTypeEnum.FULL_AUTO) {
         // 全自动模式下还是只收集 单独 $t 调用
-        if (callee.name === option.translateKey || callee.property && callee.property.name === option.translateKey) translateSetLang(node);
+        if (callee.name === option.translateKey || callee.property && callee.property.name === option.translateKey) translateSetLang(node, insertOption);
       }
     }
   };
@@ -1427,7 +1526,7 @@ function CallExpressionFn (insertOption) {
  * @param node - 调用表达式节点
  * @return
  */
-function translateSetLang(node) {
+function translateSetLang(node, insertOption) {
   // 获取调用表达式的参数
   let arg = node.arguments || [];
   // 提取参数作为值
@@ -1448,6 +1547,13 @@ function translateSetLang(node) {
     }
     // 调用翻译工具的 setLangObj 方法设置语言对象属性
     setLangObj(resolvedId, value);
+    insertOption?.collector?.record?.({
+      key: option.useValueAsKey ? value : resolvedId,
+      value,
+      namespace: option.namespace,
+      resourcePath: insertOption?.resourcePath,
+      root: insertOption?.root
+    });
   }
 }
 
@@ -1602,7 +1708,7 @@ var index$1 = /*#__PURE__*/Object.freeze({
  */
 module.exports = function (source) {
   return __awaiter(this, void 0, void 0, function () {
-    var baseUtils, option$1, filter, global, sourceObj, result, e_1;
+    var baseUtils, option$1, filter, global, loaderOptions, sourceObj, result, e_1;
     var _a;
     return __generator(this, function (_b) {
       switch (_b.label) {
@@ -1620,6 +1726,7 @@ module.exports = function (source) {
           if (option$1.excludedPath.length && baseUtils.checkAgainstRegexArray(global.resourcePath, option$1.excludedPath)) {
             return [2 /*return*/, source]; // 在黑名单目录中的文件，不处理，直接返回原始代码。
           }
+          loaderOptions = global.getOptions ? global.getOptions() : {};
           if (!option$1.translateExtends) return [3 /*break*/, 2];
           return [4 /*yield*/, (_a = option$1.translateExtends) === null || _a === void 0 ? void 0 : _a.handleInitFile(source, global.resourcePath)];
         case 1:
@@ -1635,7 +1742,11 @@ module.exports = function (source) {
           return [4 /*yield*/, babel__namespace.transformAsync(sourceObj.source, {
             configFile: false,
             // 不加载本地 Babel 配置文件
-            plugins: [filter.default(sourceObj)] // 使用核心模块提供的 `filter` 插件
+            plugins: [filter.default(__assign(__assign({}, sourceObj), {
+              resourcePath: global.resourcePath,
+              root: loaderOptions.root || global.rootContext,
+              collector: loaderOptions.collector
+            }))] // 使用核心模块提供的 `filter` 插件
           })
           // 如果转换成功，返回转换后的代码；否则返回空字符串。
           ];