@agentscope-ai/i18n 1.0.1 → 1.0.2

package/lib/index.js

@@ -1,8 +1,5 @@
 const {
-  init,
-  initMT,
-  patch,
-  patchMT,
+  runTranslation,
   check,
   reverse,
   translate,
@@ -11,10 +8,7 @@ const {
 const { run: medusaRun } = require('./utils/medusa');
 
 module.exports = {
-  init,
-  initMT,
-  patch,
-  patchMT,
+  runTranslation,
   check,
   reverse,
   translate,

package/lib/parse-jsx.js

@@ -10,19 +10,26 @@ const {
   onlyContainsEmoji,
   isI18nCall,
   isInConsoleCall,
+  isDirectCallMode,
 } = require('./utils/ast-utils');
 
-// 生成i18n调用节点
-const createI18nCallNode = (i18nKey, defaultMessage, variables = []) => {
-  const baseNode = t.callExpression(
-    t.memberExpression(t.identifier('$i18n'), t.identifier('get')),
-    [
-      t.objectExpression([
-        t.objectProperty(t.identifier('id'), t.stringLiteral(i18nKey)),
-        t.objectProperty(t.identifier('dm'), t.stringLiteral(defaultMessage)),
-      ]),
-    ],
-  );
+// 生成i18n调用节点，支持成员调用和直接函数调用两种形式
+const createI18nCallNode = (i18nKey, defaultMessage, variables = [], callExpr) => {
+  let callee;
+  if (isDirectCallMode(callExpr)) {
+    callee = t.identifier(callExpr.functionName);
+  } else {
+    const objectName = (callExpr && callExpr.objectName) || '$i18n';
+    const methodName = (callExpr && callExpr.methodName) || 'get';
+    callee = t.memberExpression(t.identifier(objectName), t.identifier(methodName));
+  }
+
+  const baseNode = t.callExpression(callee, [
+    t.objectExpression([
+      t.objectProperty(t.identifier('id'), t.stringLiteral(i18nKey)),
+      t.objectProperty(t.identifier('dm'), t.stringLiteral(defaultMessage)),
+    ]),
+  ]);
 
   if (variables.length > 0) {
     baseNode.arguments.push(t.objectExpression(variables));
@@ -46,7 +53,7 @@ const processExpression = (exp) => {
 };
 
 // 处理模板字符串，提取变量和生成i18n调用
-const processTemplateLiteral = (path, getOrCreateKey) => {
+const processTemplateLiteral = (path, getOrCreateKey, callExpr) => {
   const val = [];
   const expressions = [];
 
@@ -102,7 +109,7 @@ const processTemplateLiteral = (path, getOrCreateKey) => {
     return t.objectProperty(t.identifier(name), exprNode);
   });
 
-  return createI18nCallNode(i18nKey, defaultMessage, varProperties);
+  return createI18nCallNode(i18nKey, defaultMessage, varProperties, callExpr);
 };
 
 // 解析JSX文件，提取中文文案并生成i18n调用
@@ -110,7 +117,8 @@ const parseJSX = (filePath, params = {}) => {
   const i18n = {};
   const contentKeyMap = new Map();
   let uniqueCounter = 0;
-  let ignoredLineCount = 0; // 记录被忽略的行数
+  let ignoredLineCount = 0;
+  const callExpr = params.callExpression;
 
   if (!params.keyPrefix) {
     throw new Error('keyPrefix is required in params');
@@ -190,8 +198,8 @@ const parseJSX = (filePath, params = {}) => {
       const { value } = path.node;
       if (
         chnRegExp.test(value) &&
-        !isI18nCall(path.parent) &&
-        !path.findParent((p) => isI18nCall(p.node)) &&
+        !isI18nCall(path.parent, callExpr) &&
+        !path.findParent((p) => isI18nCall(p.node, callExpr)) &&
         !isInConsoleCall(path) &&
         !shouldIgnoreNode(path)
       ) {
@@ -206,7 +214,7 @@ const parseJSX = (filePath, params = {}) => {
           const trimmedValue = rawValue.replace(/^\s+|\s+$/g, '');
 
           const i18nKey = getOrCreateKey(trimmedValue);
-          const i18nCallExpression = createI18nCallNode(i18nKey, trimmedValue);
+          const i18nCallExpression = createI18nCallNode(i18nKey, trimmedValue, [], callExpr);
 
           const parentType = path.parent.type;
           if (parentType === 'JSXAttribute') {
@@ -226,12 +234,12 @@ const parseJSX = (filePath, params = {}) => {
     },
     TemplateLiteral(path) {
       if (
-        !isI18nCall(path.parent) &&
-        !path.findParent((p) => isI18nCall(p.node)) &&
+        !isI18nCall(path.parent, callExpr) &&
+        !path.findParent((p) => isI18nCall(p.node, callExpr)) &&
         !isInConsoleCall(path) &&
         !shouldIgnoreNode(path)
       ) {
-        const newNode = processTemplateLiteral(path, getOrCreateKey);
+        const newNode = processTemplateLiteral(path, getOrCreateKey, callExpr);
         if (newNode) {
           path.replaceWith(newNode);
           hasChanges = true;
@@ -243,8 +251,8 @@ const parseJSX = (filePath, params = {}) => {
       const { value } = path.node;
       if (
         chnRegExp.test(value) &&
-        !isI18nCall(path.parent) &&
-        !path.findParent((p) => isI18nCall(p.node)) &&
+        !isI18nCall(path.parent, callExpr) &&
+        !path.findParent((p) => isI18nCall(p.node, callExpr)) &&
         !isInConsoleCall(path) &&
         !shouldIgnoreNode(path)
       ) {
@@ -258,7 +266,9 @@ const parseJSX = (filePath, params = {}) => {
         const trimmedValue = rawValue.replace(/^\s+|\s+$/g, '');
 
         const i18nKey = getOrCreateKey(trimmedValue);
-        const newNode = t.jsxExpressionContainer(createI18nCallNode(i18nKey, trimmedValue));
+        const newNode = t.jsxExpressionContainer(
+          createI18nCallNode(i18nKey, trimmedValue, [], callExpr),
+        );
 
         path.replaceWith(newNode);
         hasChanges = true;

package/lib/utils/ast-utils.js

@@ -42,19 +42,50 @@ function extractStringValue(node) {
 }
 
 /**
- * 检查 i18n.get 调用并提取 key
+ * 判断调用表达式是否使用直接函数调用模式 (functionName(...))
+ * 而非成员调用模式 (objectName.methodName(...))
+ */
+function isDirectCallMode(callExpr) {
+  return callExpr && callExpr.functionName && !callExpr.objectName && !callExpr.methodName;
+}
+
+/**
+ * 检查 CallExpression 的 callee 是否匹配配置的调用形式
+ * 支持两种形式：
+ *   - 成员调用：objectName.methodName(...)  （默认 $i18n.get）
+ *   - 直接调用：functionName(...)           （如 translate、t）
+ */
+function isMatchingCallee(node, callExpr) {
+  if (!node || node.type !== 'CallExpression') return false;
+
+  if (isDirectCallMode(callExpr)) {
+    return (
+      node.callee &&
+      node.callee.type === 'Identifier' &&
+      node.callee.name === callExpr.functionName
+    );
+  }
+
+  const objectName = (callExpr && callExpr.objectName) || '$i18n';
+  const methodName = (callExpr && callExpr.methodName) || 'get';
+  return (
+    node.callee &&
+    node.callee.type === 'MemberExpression' &&
+    node.callee.object &&
+    node.callee.object.name === objectName &&
+    node.callee.property &&
+    node.callee.property.name === methodName
+  );
+}
+
+/**
+ * 检查 i18n 调用并提取 key
  * @param {Object} node - CallExpression AST 节点
+ * @param {Object} [callExpr] - 自定义调用表达式配置
  * @returns {Object|null} 返回 {id, dm} 或 null
  */
-function extractI18nKey(node) {
-  if (
-    node.type !== 'CallExpression' ||
-    node.callee.type !== 'MemberExpression' ||
-    !node.callee.object ||
-    node.callee.object.name !== '$i18n' ||
-    !node.callee.property ||
-    node.callee.property.name !== 'get'
-  ) {
+function extractI18nKey(node, callExpr) {
+  if (!isMatchingCallee(node, callExpr)) {
     return null;
   }
 
@@ -63,7 +94,6 @@ function extractI18nKey(node) {
     return null;
   }
 
-  // 处理对象形式：i18n.get({id: key, dm: defaultMessage})
   if (args[0].type === 'ObjectExpression') {
     const idProperty = args[0].properties.find((prop) => prop.key && prop.key.name === 'id');
 
@@ -79,7 +109,7 @@ function extractI18nKey(node) {
     return id ? { id, dm } : null;
   }
 
-  // 处理直接传递key的形式：i18n.get(key)
+  // 直接传递 key 的形式：translate(key) 或 $i18n.get(key)
   else {
     const id = extractStringValue(args[0]);
     return id ? { id, dm: null } : null;
@@ -89,8 +119,8 @@ function extractI18nKey(node) {
 /**
  * 增强的 checkI18nCall 函数，支持更多 key 格式
  */
-function checkI18nCall(node) {
-  return extractI18nKey(node);
+function checkI18nCall(node, callExpr) {
+  return extractI18nKey(node, callExpr);
 }
 
 const chnRegExp = /[^\x00-\xff]/;
@@ -110,17 +140,8 @@ const onlyContainsEmoji = (text) => {
   return trimmedText.replace(emojiRegex, '') === '';
 };
 
-function isI18nCall(node) {
-  return (
-    node &&
-    node.type === 'CallExpression' &&
-    node.callee &&
-    node.callee.type === 'MemberExpression' &&
-    node.callee.object &&
-    node.callee.object.name === '$i18n' &&
-    node.callee.property &&
-    node.callee.property.name === 'get'
-  );
+function isI18nCall(node, callExpr) {
+  return isMatchingCallee(node, callExpr);
 }
 
 function isInConsoleCall(path) {
@@ -163,4 +184,6 @@ module.exports = {
   onlyContainsEmoji,
   isI18nCall,
   isInConsoleCall,
+  isDirectCallMode,
+  isMatchingCallee,
 };

package/lib/utils/file-utils.js

@@ -16,22 +16,61 @@ const shouldIgnoreFile = (file, doNotTranslateFiles) => {
 };
 
 // 添加导入语句到文件
-const injectImportStatement = (filePath, importPath) => {
+const injectImportStatement = (filePath, importPath, callExpr) => {
   try {
     const content = fs.readFileSync(filePath, 'utf8');
-    const importStatement = `import $i18n from '${importPath}';\n`;
+    const importName = (callExpr && callExpr.importName) || '$i18n';
+    const namedImport = callExpr && callExpr.namedImport;
+
+    // 对于 namedImport 模式，先检查是否已从同一路径导入
+    if (namedImport) {
+      const escapedPath = importPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+      // 匹配单条 import { ... } from 'path' 语句（含多行），
+      // 用 (?:(?!import\s)[\s\S]) 防止跨越多条 import 语句边界
+      const existingImportRegex = new RegExp(
+        `(import\\s+\\{(?:(?!\\bimport\\s)[\\s\\S])*?\\}\\s*from\\s*['"]${escapedPath}['"];?)`,
+        'gm',
+      );
+      const match = existingImportRegex.exec(content);
+
+      if (match) {
+        const existingImport = match[1];
+        // 提取花括号内的 specifiers 并逐个比对
+        const braceContent = existingImport.match(/\{([\s\S]*?)\}/);
+        if (braceContent) {
+          const specifiers = braceContent[1].split(',').map((s) => s.trim()).filter(Boolean);
+          if (specifiers.includes(importName)) {
+            return; // 已存在，无需添加
+          }
+        }
+        // 追加到已有的 named import 中：在最后一个 `}` 前插入
+        const newImport = existingImport.replace(/\s*}\s*from/, `, ${importName} } from`);
+        const newContent = content.replace(existingImport, newImport);
+        fs.writeFileSync(filePath, newContent, 'utf8');
+        return;
+      }
+    }
+
+    const importStatement = namedImport
+      ? `import { ${importName} } from '${importPath}';\n`
+      : `import ${importName} from '${importPath}';\n`;
 
     // 检查文件是否已经有这个导入语句
     if (!content.includes(importStatement.trim())) {
-      // 检查文件是否已经有其他导入语句
-      const importRegex = /^import\s+.*?from\s+['"].*?['"];?\n/gm;
-      const imports = content.match(importRegex);
-
-      if (imports) {
-        // 在最后一个导入语句后添加
-        const lastImport = imports[imports.length - 1];
-        const newContent = content.replace(lastImport, `${lastImport}${importStatement}`);
-        fs.writeFileSync(filePath, newContent, 'utf8');
+      // 匹配所有 import 语句（含多行），找到最后一条的结束位置
+      const multiLineImportRegex = /^import\s[\s\S]*?from\s*['"][^'"]*['"];?/gm;
+      let lastImportEnd = -1;
+      let m;
+      while ((m = multiLineImportRegex.exec(content)) !== null) {
+        const end = m.index + m[0].length;
+        if (end > lastImportEnd) lastImportEnd = end;
+      }
+
+      if (lastImportEnd > -1) {
+        // 在最后一条 import 语句之后插入新行
+        const before = content.slice(0, lastImportEnd);
+        const after = content.slice(lastImportEnd);
+        fs.writeFileSync(filePath, before + '\n' + importStatement + after.replace(/^\n/, ''), 'utf8');
       } else {
         // 如果没有导入语句，添加到文件开头
         fs.writeFileSync(filePath, importStatement + content, 'utf8');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentscope-ai/i18n",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A tool for translating Chinese content in frontend code repositories",
   "keywords": [
     "i18n",
@@ -14,18 +14,24 @@
   "files": [
     "lib/*",
     "skills/*",
+    "i18n.config.example.js",
     "README.md"
   ],
   "scripts": {
     "lint": "eslint .",
-    "format": "prettier --write \"lib/**/*.{ts,tsx}\""
+    "format": "prettier --write \"lib/**/*.{ts,tsx}\"",
+    "test": "jest"
   },
   "lint-staged": {
     "**/*.{js,jsx,html,css,json}": [
       "npx prettier --write"
     ]
   },
-  "author": [],
+  "repository": {
+    "type": "git",
+    "url": "http://gitlab.alibaba-inc.com/liveme-console/spark-i18n.git"
+  },
+  "author": "wangqifeng.wqf@alibaba-inc.com",
   "license": "ISC",
   "dependencies": {
     "@babel/generator": "^7.23.6",
@@ -61,7 +67,6 @@
     "node": ">=14.0.0"
   },
   "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "registry": "https://registry.npmjs.org"
   }
 }