vue-i18n-extract-plugin 1.0.71 → 1.0.73

package/lib/visitors.js

@@ -153,14 +153,14 @@ function generateJSXElement(name, id, msg) {
   return t.jsxElement(openingElement, null, [], true);
 }
 
-function unwrapVueCacheIfNeeded(path) {
+function unwrapVueCacheCallIfNeeded(path) {
   const assignPath = path.parentPath;
-  if (!assignPath || !assignPath.isAssignmentExpression({ operator: "=" })) {
+  if (!assignPath?.isAssignmentExpression({ operator: "=" })) {
     return false;
   }
 
   const logicalPath = assignPath.parentPath;
-  if (!logicalPath || !logicalPath.isLogicalExpression({ operator: "||" })) {
+  if (!logicalPath?.isLogicalExpression({ operator: "||" })) {
     return false;
   }
 
@@ -169,8 +169,8 @@ function unwrapVueCacheIfNeeded(path) {
   // 校验 left: _cache[x]
   const isCacheMember =
     t.isMemberExpression(left) &&
-    (t.isIdentifier(left.object, { name: "_cache" }) ||
-      (t.isIdentifier(left.object) && left.object.name.startsWith("_cache")));
+    t.isIdentifier(left.object) &&
+    left.object.name.startsWith("_cache");
 
   // 校验 right: (_cache[x] = createTextVNode(...))
   const isSameAssignment =
@@ -187,6 +187,38 @@ function unwrapVueCacheIfNeeded(path) {
   return true;
 }
 
+function unwrapVueSlotArrayCache(path) {
+  // 1. 找 ArrayExpression
+  const arrayPath = path.findParent(p => p.isArrayExpression());
+  if (!arrayPath) return false;
+
+  // 2. array 是 assignment 的 right
+  const assignPath = arrayPath.parentPath;
+  if (!assignPath?.isAssignmentExpression({ operator: "=" })) return false;
+
+  // 3. assignment 在 LogicalExpression || 中
+  const logicalPath = assignPath.parentPath;
+  if (!logicalPath?.isLogicalExpression({ operator: "||" })) return false;
+
+  // 4. logical 在 SpreadElement 中
+  const spreadPath = logicalPath.parentPath;
+  if (!spreadPath?.isSpreadElement()) return false;
+
+  // 5. 校验 _cache[x]
+  const left = logicalPath.node.left;
+  const isCache =
+    t.isMemberExpression(left) &&
+    t.isIdentifier(left.object) &&
+    left.object.name.startsWith("_cache");
+
+  if (!isCache) return false;
+
+  // unwrap：用 array.elements 替换 spread(...)
+  spreadPath.replaceWithMultiple(arrayPath.node.elements);
+
+  return true;
+}
+
 function isDynamicTextExpression(node) {
   // 只要不是 StringLiteral，100% 是动态文本
   return !t.isStringLiteral(node);
@@ -309,19 +341,26 @@ function createI18nVisitor(option, i18nMap) {
       if (isVNodeCall(parentPath, "_createTextVNode")) {
         // createTextVNode强制补充第二个参数 1
         parentPath.node.arguments = [callExpression, t.numericLiteral(1)];
-        // 尝试拆 cache
-        unwrapVueCacheIfNeeded(parentPath);
+        // 先尝试 [...(_cache2[4] || (_cache2[4] = [ createTextVNode(...) ]))]
+        if (!unwrapVueSlotArrayCache(parentPath)) {
+          // 再尝试拆 _cache2[0] || (_cache2[0] = createTextVNode(...))
+          unwrapVueCacheCallIfNeeded(parentPath);
+        }
         // 是否 vue.createElementVNode(...)，且该 StringLiteral 是第三个参数
       } else if (isVNodeCall(parentPath, "_createElementVNode")) {
         const callExpr = parentPath.node;
         const args = callExpr.arguments;
-
-        // 当前是第三个参数，且参数数量为3
+        // 第 3 个参数是 children
         const argIndex = args.findIndex(arg => arg === path.node);
-        if (argIndex === 2 && args.length === 3) {
-          args[2] = callExpression; // 替换第3个参数
-          args.push(t.numericLiteral(1)); // 添加第4个参数
-          return;
+        if (argIndex === 2) {
+          args[2] = callExpression;
+          // 强制 patchFlag = 1
+          if (args.length < 4) {
+            args.push(t.numericLiteral(1));
+          } else {
+            args[3] = t.numericLiteral(1);
+          }
+          unwrapVueCacheCallIfNeeded(parentPath);
         }
       } else {
         const hasCreateVNode = transformDirectiveIfNeeded(path, parentPath);

package/package.json

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