vue-i18n-extract-plugin 1.0.75 → 1.0.77

package/lib/visitors.js

@@ -182,6 +182,7 @@ function unwrapVueCacheCallIfNeeded(path) {
     return false;
   }
 
+  normalizeVNodePatchFlag(assignPath.node.right);
   // 用 createTextVNode(...) 替换整个 _cache || (...)
   logicalPath.replaceWith(assignPath.node.right);
   return true;
@@ -213,23 +214,93 @@ function unwrapVueSlotArrayCache(path) {
 
   if (!isCache) return false;
 
+  // 删除 array 里的 vnode参数-1
+  arrayPath.node.elements.forEach(el => {
+    normalizeVNodePatchFlag(el);
+  });
+
   // unwrap：用 array.elements 替换 spread(...)
   spreadPath.replaceWithMultiple(arrayPath.node.elements);
 
   return true;
 }
 
+function normalizeVNodePatchFlag(node) {
+  const path = { node, isCallExpression: () => t.isCallExpression(node) };
+  if (!isAnyVNodeCall(path)) return;
+  if (isVNodeCall(path, "_createTextVNode")) return;
+
+  const args = node.arguments;
+  if (!args || args.length < 4) return;
+
+  const flag = args[3];
+  if (t.isNumericLiteral(flag) && flag.value !== -1) {
+    return;
+  }
+  args.splice(3, 1); // 删除第4个参数 -1
+}
+
 function isDynamicTextExpression(node) {
   // 只要不是 StringLiteral，100% 是动态文本
   return !t.isStringLiteral(node);
 }
 
+function unwrapNearestCacheBoundary(path) {
+  let p = path.parentPath;
+
+  while (p) {
+    // 先拆[..._cache2[0] || (_cache2[0] = [createBaseVNode(...)])]
+    if (!unwrapVueSlotArrayCache(p)) {
+      // 再尝试拆 _cache2[0] || (_cache2[0] = createTextVNode(...))
+      unwrapVueCacheCallIfNeeded(p);
+    }
+    p = p.parentPath;
+  }
+}
+
+const VNODE_CALLS = new Set([
+  "_createTextVNode",
+  "_createElementVNode",
+  "_createElementBlock",
+  "_createVNode",
+  "_createBlock",
+  "_createBaseVNode",
+  "_createStaticVNode"
+]);
+
+function isAnyVNodeCall(path) {
+  if (!path.isCallExpression()) return false;
+
+  const callee = path.node.callee;
+
+  if (t.isIdentifier(callee)) {
+    return VNODE_CALLS.has(callee.name);
+  }
+
+  if (t.isMemberExpression(callee) && t.isIdentifier(callee.property)) {
+    return VNODE_CALLS.has(callee.property.name);
+  }
+
+  return false;
+}
+
 function createI18nVisitor(option, i18nMap) {
   const excludedCall = [...option.excludedCall, ...EXCLUDED_CALL];
 
   return {
     CallExpression(path) {
-      if (!isTFunction(path.node, option)) return;
+      if (!isTFunction(path.node, option)) {
+        if (isVNodeCall(path, "_createTextVNode")) {
+          const args = path.node.arguments;
+          if (!args.length) return;
+          const content = args[0];
+          // 是否动态文本
+          if (isDynamicTextExpression(content)) {
+            args[1] = t.numericLiteral(1); // PatchFlags.TEXT createTextVNode(" " + toDisplayString$1(text)) => createTextVNode(" " + toDisplayString$1(text), 1)
+          }
+        }
+        return;
+      }
 
       const [firstArg] = path.node.arguments;
       let keyText = null;
@@ -261,19 +332,6 @@ function createI18nVisitor(option, i18nMap) {
         path.node.arguments.push(t.stringLiteral(keyText));
       }
     },
-    CallExpression(path) {
-      if (!isVNodeCall(path, "_createTextVNode")) return;
-
-      const args = path.node.arguments;
-      if (!args.length) return;
-
-      const content = args[0];
-
-      // 是否动态文本
-      if (isDynamicTextExpression(content)) {
-        args[1] = t.numericLiteral(1); // PatchFlags.TEXT createTextVNode(" " + toDisplayString$1(text)) => createTextVNode(" " + toDisplayString$1(text), 1)
-      }
-    },
     StringLiteral(path) {
       if (option.extractFromText === false) return;
       if (!shouldTransform(path)) return;
@@ -341,11 +399,7 @@ function createI18nVisitor(option, i18nMap) {
       if (isVNodeCall(parentPath, "_createTextVNode")) {
         // createTextVNode强制补充第二个参数 1
         parentPath.node.arguments = [callExpression, t.numericLiteral(1)];
-        // 先尝试 [...(_cache2[4] || (_cache2[4] = [ createTextVNode(...) ]))]
-        if (!unwrapVueSlotArrayCache(parentPath)) {
-          // 再尝试拆 _cache2[0] || (_cache2[0] = createTextVNode(...))
-          unwrapVueCacheCallIfNeeded(parentPath);
-        }
+        unwrapNearestCacheBoundary(path);
         // 是否 vue.createElementVNode(...)，且该 StringLiteral 是第三个参数
       } else if (
         isVNodeCall(parentPath, "_createElementVNode") ||
@@ -363,11 +417,7 @@ function createI18nVisitor(option, i18nMap) {
           } else {
             args[3] = t.numericLiteral(1);
           }
-          // 先尝试 [...(_cache2[4] || (_cache2[4] = [ createTextVNode(...) ]))]
-          if (!unwrapVueSlotArrayCache(parentPath)) {
-            // 再尝试拆 _cache2[0] || (_cache2[0] = createTextVNode(...))
-            unwrapVueCacheCallIfNeeded(parentPath);
-          }
+          unwrapNearestCacheBoundary(path);
         }
       } else {
         const hasCreateVNode = transformDirectiveIfNeeded(path, parentPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-i18n-extract-plugin",
-  "version": "1.0.75",
+  "version": "1.0.77",
   "main": "lib/index.js",
   "types": "types/index.d.ts",
   "bin": {