vue-i18n-extract-plugin 1.0.78 → 1.0.79

package/lib/visitors.js

@@ -18,10 +18,8 @@ function isTFunction(node, option) {
 }
 
 function isVNodeCall(path, nodeName) {
-  const node = path.node;
   if (!path.isCallExpression()) return false;
-
-  const callee = node.callee;
+  const callee = path.node.callee;
   return (
     (t.isIdentifier(callee) && callee.name === nodeName) ||
     (t.isMemberExpression(callee) &&
@@ -56,7 +54,23 @@ function getPropKey(propNode) {
   return null;
 }
 
-// 将静态属性转换为动态属性，如 <div title="xxx" /> => <div :title="$t('hashed')" />
+/**
+ * 向 hoisted dynamicProps 数组中追加 propKey（若不存在）
+ * @returns 是否真的发生了修改
+ */
+function pushDynamicPropsIfMissing(arr, propKey) {
+  const hasKey = arr.elements.some(
+    el => t.isStringLiteral(el) && el.value === propKey
+  );
+
+  if (!hasKey) {
+    arr.elements.push(t.stringLiteral(propKey));
+  }
+
+  return !hasKey;
+}
+
+// 自动补齐动态属性，如 createVNode(c, {message: dynamicValue}) => createVNode(c, {message: dynamicValue}, null, 8, ['message'])
 function transformDirectiveIfNeeded(path, parentPath) {
   let hasCreateVNode = false;
   // 属性值情况，如 title: "xxx"
@@ -66,11 +80,7 @@ function transformDirectiveIfNeeded(path, parentPath) {
     if (!propKey) return;
 
     const vNodeCall = path.findParent(
-      p =>
-        p.isCallExpression() &&
-        (t.isIdentifier(p.node.callee, { name: "_createVNode" }) ||
-          (t.isMemberExpression(p.node.callee) &&
-            t.isIdentifier(p.node.callee.property, { name: "_createVNode" })))
+      p => isVNodeCall(p, "_createVNode") || isVNodeCall(p, "_createElementVNode")
     );
 
     if (vNodeCall) {
@@ -91,13 +101,23 @@ function transformDirectiveIfNeeded(path, parentPath) {
       }
 
       // 设置 patchFlag = 8
-      args[patchFlagIndex] = t.numericLiteral(8);
+      if (!args[patchFlagIndex]) {
+        args[patchFlagIndex] = t.numericLiteral(8);
+      }
 
       // 设置 dynamicProps = ["propKey"]
       const existingDynamicProps = args[dynamicPropsIndex];
-      if (!existingDynamicProps || !t.isArrayExpression(existingDynamicProps)) {
+      
+      if (t.isIdentifier(existingDynamicProps)) {
+        const arr = hoistedMap.get(existingDynamicProps.name);
+        if (arr) {
+          pushDynamicPropsIfMissing(arr, propKey);
+        }
+      }
+
+      if (!existingDynamicProps) {
         args[dynamicPropsIndex] = t.arrayExpression([t.stringLiteral(propKey)]);
-      } else {
+      } else if (t.isArrayExpression(existingDynamicProps)) {
         const existingKeys = new Set(
           existingDynamicProps.elements
             .filter(el => t.isStringLiteral(el))
@@ -284,10 +304,26 @@ function isAnyVNodeCall(path) {
   return false;
 }
 
+const hoistedMap = new Map();
+
 function createI18nVisitor(option, i18nMap) {
   const excludedCall = [...option.excludedCall, ...EXCLUDED_CALL];
 
   return {
+    Program(path) {
+      path.traverse({
+        VariableDeclarator(p) {
+          const { id, init } = p.node;
+          if (
+            t.isIdentifier(id) &&
+            t.isArrayExpression(init) &&
+            id.name.startsWith("_hoisted_")
+          ) {
+            hoistedMap.set(id.name, init);
+          }
+        }
+      });
+    },
     CallExpression(path) {
       if (!isTFunction(path.node, option)) {
         if (isVNodeCall(path, "_createTextVNode")) {

package/package.json

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