webpack-gc-i18n-plugin 1.1.12 → 1.1.14

package/dist/customLoader/index.cjs

@@ -570,7 +570,7 @@ function splitTrailingInlineText(value) {
  */
 function checkNeedSplit(str) {
   // 检查字符串中是否包含需要切割的特殊字符
-  return str.includes('\\') || str.includes('>') || str.includes('<');
+  return str.includes('\\') || /<\/?[A-Za-z][^>]*>/.test(str);
 }
 
 /**
@@ -579,49 +579,29 @@ function checkNeedSplit(str) {
  * @return {types.CallExpression} - babel的深度扫描的表达式
  */
 function convertToTemplateLiteral(strArray, option) {
-  const quasis = [];
+  const quasis = [types__namespace.templateElement({
+    raw: '',
+    cooked: ''
+  }, false)];
   const expressions = [];
-  strArray.forEach((str, index) => {
-    if (index === 0) {
-      if (getOriginRegex().test(str)) {
-        quasis.push(types__namespace.templateElement({
-          raw: '',
-          cooked: ''
-        }, false));
-        expressions.push(createI18nTranslator({
-          value: str,
-          isExpression: true,
-          insertOption: option
-        }));
-      } else {
-        quasis.push(types__namespace.templateElement({
-          raw: str,
-          cooked: str
-        }, false));
-      }
+  strArray.forEach(str => {
+    if (getOriginRegex().test(str)) {
+      expressions.push(createI18nTranslator({
+        value: str,
+        isExpression: true,
+        insertOption: option
+      }));
+      quasis.push(types__namespace.templateElement({
+        raw: '',
+        cooked: ''
+      }, false));
     } else {
-      if (getOriginRegex().test(str)) {
-        expressions.push(createI18nTranslator({
-          value: str,
-          isExpression: true,
-          insertOption: option
-        }));
-      } else {
-        quasis.push(types__namespace.templateElement({
-          raw: str,
-          cooked: str
-        }, false));
-      }
+      const quasi = quasis[quasis.length - 1];
+      quasi.value.raw += str;
+      quasi.value.cooked = `${quasi.value.cooked || ''}${str}`;
     }
   });
-  if (quasis.length === expressions.length) {
-    quasis.push(types__namespace.templateElement({
-      raw: '',
-      cooked: ''
-    }, true));
-  } else if (quasis.length > expressions.length) {
-    quasis[quasis.length - 1].tail = true;
-  }
+  quasis[quasis.length - 1].tail = true;
   const templateLiteral = types__namespace.templateLiteral(quasis, expressions);
   const deepScanCall = types__namespace.callExpression(types__namespace.identifier('$deepScan'), [templateLiteral]);
   // 打印转换结果
@@ -717,7 +697,12 @@ function hasOriginSymbols$1(value) {
   const originRegex = REGEX_MAP[option.originLang];
   return originRegex ? originRegex.test(value) : false;
 }
+function isTemplateFragmentSegment(value) {
+  return /[^\p{Script=Han}A-Za-z0-9_\s]/u.test(value);
+}
 function getTemplateSemanticSplitSegments(value) {
+  const expressionCount = value.match(/\$\{[^}]+}/g)?.length || 0;
+  if (expressionCount < 2) return [];
   const segments = value.split(/\$\{[^}]+}/g);
   const result = new Set();
   for (let index = 0; index < segments.length - 1; index++) {
@@ -725,7 +710,7 @@ function getTemplateSemanticSplitSegments(value) {
     const afterValue = segments[index + 1];
     if (!hasOriginSymbols$1(beforeValue) || !hasOriginSymbols$1(afterValue)) continue;
     [beforeValue, afterValue].forEach(segment => {
-      if (segment.trim().length > 1) {
+      if (segment.trim().length > 1 && isTemplateFragmentSegment(segment)) {
         result.add(segment);
       }
     });