webpack-gc-i18n-plugin 1.1.12 → 1.1.13

package/dist/customLoader/index.mjs

@@ -25,7 +25,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
+/* global Reflect, Promise, SuppressedError, Symbol */
 
 var __assign = function () {
   __assign = Object.assign || function __assign(t) {
@@ -77,8 +77,12 @@ function __generator(thisArg, body) {
     f,
     y,
     t,
-    g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-  return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
     return this;
   }), g;
   function verb(n) {
@@ -547,7 +551,7 @@ function splitTrailingInlineText(value) {
  */
 function checkNeedSplit(str) {
   // 检查字符串中是否包含需要切割的特殊字符
-  return str.includes('\\') || str.includes('>') || str.includes('<');
+  return str.includes('\\') || /<\/?[A-Za-z][^>]*>/.test(str);
 }
 
 /**
@@ -556,49 +560,29 @@ function checkNeedSplit(str) {
  * @return {types.CallExpression} - babel的深度扫描的表达式
  */
 function convertToTemplateLiteral(strArray, option) {
-  const quasis = [];
+  const quasis = [types.templateElement({
+    raw: '',
+    cooked: ''
+  }, false)];
   const expressions = [];
-  strArray.forEach((str, index) => {
-    if (index === 0) {
-      if (getOriginRegex().test(str)) {
-        quasis.push(types.templateElement({
-          raw: '',
-          cooked: ''
-        }, false));
-        expressions.push(createI18nTranslator({
-          value: str,
-          isExpression: true,
-          insertOption: option
-        }));
-      } else {
-        quasis.push(types.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.templateElement({
+        raw: '',
+        cooked: ''
+      }, false));
     } else {
-      if (getOriginRegex().test(str)) {
-        expressions.push(createI18nTranslator({
-          value: str,
-          isExpression: true,
-          insertOption: option
-        }));
-      } else {
-        quasis.push(types.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.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.templateLiteral(quasis, expressions);
   const deepScanCall = types.callExpression(types.identifier('$deepScan'), [templateLiteral]);
   // 打印转换结果