vue-i18n-extract-plugin 1.0.56 → 1.0.58

package/README.md

@@ -24,10 +24,10 @@ yarn global add vue-i18n-extract-plugin
 ## CLI
 
 ```bash
-extract-i18n --includePath=demo --rewrite
+extract-i18n --includePath=demo/src --rewrite
 ```
 
-这会提取demo目录下的所有`allowedExtensions`文件的`fromLang`，并生成一个对应的JSON文件，如果开启了自动翻译，则会自动翻译并生成对应的翻译JSON文件.
+这会提取demo/src目录下的所有`allowedExtensions`文件的`fromLang`，并生成一个对应的JSON文件，如果开启了自动翻译，则会自动翻译并生成对应的翻译JSON文件.
 
 ## Programming API
 
@@ -55,6 +55,7 @@ const defaultOptions = {
   autoTranslate: true, // 提取完成后是否自动翻译
   cleanTranslate: true, // 是否清理无用的翻译内容
   keepRaw: false, // 开启后只做转换不生成hash值，即："测试" -> $t("测试"), 开启rewrite时生效
+  keepDefaultMsg: false, // 保留默认消息，即："测试" -> $t("hashedKey", "测试")
   enabled: true, // 是否启用插件
   outputJsonFileInPlugin: true, // 是否在插件中输出 JSON 文件
   outputJsonFileDebounceTimeInPlugin: 2000, // 输出 JSON 文件的防抖时间

package/lib/options.js

@@ -9,6 +9,7 @@ const defaultOptions = {
   autoTranslate: true, // 提取完成后是否自动翻译
   cleanTranslate: true, // 是否清理无用的翻译内容
   keepRaw: false, // 开启后只做转换不生成hash值，即："测试" -> $t("测试"), 开启rewrite时生效
+  keepDefaultMsg: false, // 保留默认消息，即："测试" -> $t("hashedKey", "测试")
   enabled: true, // 是否启用插件
   outputJsonFileInPlugin: true, // 是否在插件中输出 JSON 文件
   outputJsonFileDebounceTimeInPlugin: 2000, // 输出 JSON 文件的防抖时间

package/lib/visitors.js

@@ -37,7 +37,7 @@ function isJSXElement(path, nodeName) {
   ) {
     const jsxAttr = path.findParent(p => p.isJSXAttribute());
     const attrName = jsxAttr.node.name.name;
-    if (attrName === "defaultMsg" || attrName === "values") {
+    if (attrName === "msg" || attrName === "values") {
       return true;
     }
   }
@@ -168,6 +168,10 @@ function createI18nVisitor(option, i18nMap) {
 
       const newArg = t.stringLiteral(generateText(keyText, hashed, option));
       path.node.arguments[0] = newArg;
+
+      if (option.keepDefaultMsg) {
+        path.node.arguments.push(t.stringLiteral(keyText));
+      }
     },
 
     StringLiteral(path) {
@@ -181,7 +185,7 @@ function createI18nVisitor(option, i18nMap) {
         return;
       }
 
-      // 跳过<Trans defaultMsg="你好，{name}" values={{name: '世界'} /> defaultMsg和values属性的转换
+      // 跳过<Trans msg="你好，{name}" values={{name: '世界'} /> msg和values属性的转换
       if (isJSXElement(path, option.JSXElement)) {
         return;
       }
@@ -227,7 +231,10 @@ function createI18nVisitor(option, i18nMap) {
           t.identifier("_ctx"),
           t.identifier(option.translateKey)
         ),
-        [t.stringLiteral(generateText(value, hashed, option))]
+        [
+          t.stringLiteral(generateText(value, hashed, option)),
+          option.keepDefaultMsg ? t.stringLiteral(value) : null
+        ].filter(Boolean)
       );
 
       // 判断是否createTextVNode或MemberExpression（如 Vue.createTextVNode）
@@ -253,9 +260,13 @@ function createI18nVisitor(option, i18nMap) {
         const hasCreateVNode = transformDirectiveIfNeeded(path, parentPath);
         if (!hasCreateVNode) {
           // 生成 $t("hashed")
-          callExpression = t.callExpression(t.identifier(option.translateKey), [
-            t.stringLiteral(generateText(value, hashed, option))
-          ]);
+          callExpression = t.callExpression(
+            t.identifier(option.translateKey),
+            [
+              t.stringLiteral(generateText(value, hashed, option)),
+              option.keepDefaultMsg ? t.stringLiteral(value) : null
+            ].filter(Boolean)
+          );
         }
       }
 
@@ -302,7 +313,10 @@ function createI18nVisitor(option, i18nMap) {
       }
 
       // 替换为字符类型翻译节点
-      const tCallExpression = `${option.translateKey}('${generateText(value, hashed, option)}')`;
+      const tCallExpression = option.keepDefaultMsg
+        ? `${option.translateKey}('${generateText(value, hashed, option)}', ${JSON.stringify(value)})`
+        : `${option.translateKey}('${generateText(value, hashed, option)}')`;
+
       node.value.raw = node.value.cooked = `\${${tCallExpression}}`;
     },
     JSXText(path) {
@@ -325,9 +339,13 @@ function createI18nVisitor(option, i18nMap) {
       // 替换为表达式 {$t("hashed")}
       path.replaceWith(
         t.jsxExpressionContainer(
-          t.callExpression(t.identifier(option.translateKey), [
-            t.stringLiteral(generateText(text, hashed, option))
-          ])
+          t.callExpression(
+            t.identifier(option.translateKey),
+            [
+              t.stringLiteral(generateText(text, hashed, option)),
+              option.keepDefaultMsg ? t.stringLiteral(text) : null
+            ].filter(Boolean)
+          )
         )
       );
     },
@@ -352,15 +370,19 @@ function createI18nVisitor(option, i18nMap) {
 
         path.replaceWith(
           t.jsxExpressionContainer(
-            t.callExpression(t.identifier(option.translateKey), [
-              t.stringLiteral(generateText(value, hashed, option))
-            ])
+            t.callExpression(
+              t.identifier(option.translateKey),
+              [
+                t.stringLiteral(generateText(value, hashed, option)),
+                option.keepDefaultMsg ? t.stringLiteral(value) : null
+              ].filter(Boolean)
+            )
           )
         );
       }
     },
     JSXElement(path) {
-      // <Trans id="aaa" defaultMsg="xxx" />
+      // <Trans id="aaa" msg="xxx" />
       const openingElement = path.node.openingElement;
       if (
         !t.isJSXIdentifier(openingElement.name) ||
@@ -371,9 +393,9 @@ function createI18nVisitor(option, i18nMap) {
 
       let idAttr = null;
       let idValue = null;
-      let defaultMsgValue = null;
+      let msgValue = null;
 
-      // 遍历属性，查找 id 和 defaultMsg
+      // 遍历属性，查找 id 和 msg
       openingElement.attributes.forEach(attr => {
         if (!t.isJSXAttribute(attr) || !t.isJSXIdentifier(attr.name)) return;
 
@@ -384,26 +406,26 @@ function createI18nVisitor(option, i18nMap) {
           }
         }
 
-        if (attr.name.name === "defaultMsg") {
+        if (attr.name.name === "msg") {
           if (attr.value && t.isStringLiteral(attr.value)) {
-            defaultMsgValue = attr.value.value;
+            msgValue = attr.value.value;
           }
         }
       });
 
-      // 计算 id，如果未提供，则使用 defaultMsg 的哈希值
-      if (!idValue && defaultMsgValue) {
-        idValue = generateId(defaultMsgValue, option);
+      // 计算 id，如果未提供，则使用 msg 的哈希值
+      if (!idValue && msgValue) {
+        idValue = generateId(msgValue, option);
 
         if (i18nMap) {
-          i18nMap[idValue] = defaultMsgValue;
+          i18nMap[idValue] = msgValue;
         }
       }
 
-      // 有id并且有defaultMsg的情况
-      if (idValue && defaultMsgValue) {
+      // 有id并且有msg的情况
+      if (idValue && msgValue) {
         if (i18nMap) {
-          i18nMap[idValue] = defaultMsgValue;
+          i18nMap[idValue] = msgValue;
         }
       }
 
@@ -418,14 +440,14 @@ function createI18nVisitor(option, i18nMap) {
         }
       }
 
-      if (!option.keepRaw) {
-        // 移除 defaultMsg
+      if (!option.keepDefaultMsg && !option.keepRaw) {
+        // 移除 msg
         openingElement.attributes = openingElement.attributes.filter(
           attr =>
             !(
               t.isJSXAttribute(attr) &&
               t.isJSXIdentifier(attr.name) &&
-              attr.name.name === "defaultMsg"
+              attr.name.name === "msg"
             )
         );
       }

package/lib/vite-plugin-i18n.js

@@ -1,15 +1,52 @@
+const { createFilter } = require("@rollup/pluginutils");
 const { transformAsync } = require("@babel/core");
 const { createI18nPlugin } = require("./visitors");
-const { relativeCWDPath, checkAgainstRegexArray } = require("./utils");
+const {
+  relativeCWDPath,
+  resolveFilterPath,
+  fixFolderPath
+} = require("./utils");
 const { defaultOptions } = require("./options");
 const { globalI18nMap, handleFinalI18nMap } = require("./extract");
 
+function createFilterFn(option) {
+  const {
+    i18nPkgImportPath: importPath,
+    allowedExtensions: extensions,
+    includePath,
+    excludedPath
+  } = option;
+
+  return createFilter(
+    extensions
+      .map(ext => includePath.map(p => `${fixFolderPath(p)}**/*${ext}`))
+      .flat(),
+    [
+      "node_modules/**",
+      importPath.endsWith("/")
+        ? [
+            resolveFilterPath(importPath + "index.ts"),
+            resolveFilterPath(importPath + "index.js")
+          ]
+        : [
+            resolveFilterPath(importPath + "/index.ts"),
+            resolveFilterPath(importPath + "/index.js"),
+            resolveFilterPath(importPath + ".ts"),
+            resolveFilterPath(importPath + ".js")
+          ],
+      excludedPath.map(resolveFilterPath)
+    ].flat()
+  );
+}
+
 function vitePluginI18n(option) {
   option = { ...defaultOptions, ...option };
 
   let config;
   let timer;
 
+  const filter = createFilterFn(option);
+
   return {
     name: "vite-plugin-i18n-hash",
     enforce: "post",
@@ -41,39 +78,24 @@ function vitePluginI18n(option) {
       config = resolvedConfig;
     },
     async transform(code, path) {
-      if (!option.enabled) return;
+      if (!option.enabled || !filter(path)) return;
 
-      if (option.allowedExtensions.some(ext => path.endsWith(ext))) {
-        if (
-          option.includePath?.length &&
-          !checkAgainstRegexArray(path, option.includePath)
-        ) {
-          return code;
-        }
-        if (
-          option.excludedPath?.length &&
-          checkAgainstRegexArray(path, option.excludedPath)
-        ) {
-          return code;
-        }
-
-        return transformAsync(code, {
-          configFile: false,
-          plugins: [createI18nPlugin(option, globalI18nMap)]
+      return transformAsync(code, {
+        configFile: false,
+        plugins: [createI18nPlugin(option, globalI18nMap)]
+      })
+        .then(result => {
+          if (option.outputJsonFileInPlugin && config?.command === "serve") {
+            clearTimeout(timer);
+            timer = setTimeout(() => {
+              handleFinalI18nMap(globalI18nMap, option, true);
+            }, option.outputJsonFileDebounceTimeInPlugin);
+          }
+          return result?.code;
         })
-          .then(result => {
-            if (option.outputJsonFileInPlugin && config?.command === "serve") {
-              clearTimeout(timer);
-              timer = setTimeout(() => {
-                handleFinalI18nMap(globalI18nMap, option, true);
-              }, option.outputJsonFileDebounceTimeInPlugin);
-            }
-            return result?.code;
-          })
-          .catch(e => {
-            console.error(e);
-          });
-      }
+        .catch(e => {
+          console.error(e);
+        });
     },
     buildEnd() {},
     closeBundle() {
@@ -83,6 +105,8 @@ function vitePluginI18n(option) {
   };
 }
 
+exports.createFilterFn = createFilterFn;
+
 module.exports = vitePluginI18n;
 
 /* import { defineConfig } from 'vite'

package/lib/vite-plugin-import-i18n.js

@@ -1,45 +1,24 @@
-const { createFilter } = require("@rollup/pluginutils");
 const { i18nImportTransform } = require("./import-i18n-transform");
+const { createFilterFn } = require("./vite-plugin-i18n");
 const { defaultOptions } = require("./options");
-const { resolveFilterPath, fixFolderPath } = require("./utils");
 
-function vitePluginImportI18n(options) {
-  const {
-    translateKey: importName,
-    i18nPkgImportPath: importPath,
-    allowedExtensions: extensions,
-    includePath,
-    excludedPath,
-    enabled
-  } = { ...defaultOptions, ...options };
+function vitePluginImportI18n(option) {
+  option = { ...defaultOptions, ...option };
 
-  const filter = createFilter(
-    extensions
-      .map(ext => includePath.map(p => `${fixFolderPath(p)}**/*${ext}`))
-      .flat(),
-    [
-      "node_modules/**",
-      importPath.endsWith("/")
-        ? [
-            resolveFilterPath(importPath + "index.ts"),
-            resolveFilterPath(importPath + "index.js")
-          ]
-        : [
-            resolveFilterPath(importPath + "/index.ts"),
-            resolveFilterPath(importPath + "/index.js"),
-            resolveFilterPath(importPath + ".ts"),
-            resolveFilterPath(importPath + ".js")
-          ],
-      excludedPath.map(resolveFilterPath)
-    ].flat()
-  );
+  const filter = createFilterFn(option);
 
   return {
     name: "vite-plugin-import-i18n",
     enforce: "pre",
     async transform(code, path) {
-      if (!enabled || !filter(path)) return;
-      return i18nImportTransform(code, path, importName, importPath);
+      if (!option.enabled || !filter(path)) return;
+
+      return i18nImportTransform(
+        code,
+        path,
+        option.translateKey,
+        option.i18nPkgImportPath
+      );
     }
   };
 }

package/package.json

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

package/types/vite-plugin-i18n.d.ts

@@ -1,4 +1,6 @@
 import { Plugin } from 'vite';
 import { I18nOptions } from './options';
 
+export function createFilterFn(option: Partial<I18nOptions>): (id: string) => boolean;
+
 export default function vitePluginI18n(option?: Partial<I18nOptions>): Plugin