@chaoswise/intl 2.1.2 → 2.1.3

package/bin/scripts/addLocale.js

@@ -4,6 +4,7 @@ const transformAst = require('./util/transformAst');
 const getWordsByIds = require('./util/getWordsByIds');
 const log = require('./util/log');
 const genXlsx = require('./util/genXlsx');
+const service = require('./service');
 
 async function update() {
   log.info('收集全部词条...');
@@ -15,19 +16,33 @@ async function update() {
   // 获取全部词条
   const allWords = await getWordsByIds(_downloadIds, conf);
 
+  // 获取所有语种
+  const languageRes = await service.getLanguage();
+  if (languageRes.code !== 10000) {
+    log.error('请求数据出错:' + languageRes.msg);
+    process.exit(1);
+  }
+  const languages = languageRes.data;
+  const mainLanguage = languages.filter((l) => l.isMain)[0];
+
   const localeKeys = Object.keys(allWords);
-  const xlsxData = _downloadIds.map(id => {
+  const xlsxData = _downloadIds.map((id) => {
     const localeObj = {};
-    localeKeys.forEach(key => {
-      localeObj[key] = allWords[key][id] || '待翻译';
+    localeKeys.forEach((key) => {
+      if (mainLanguage && key === mainLanguage.key) {
+        localeObj[key] =
+          allWords[key][id] || info.defaultKeyWordMap[id] || '待翻译';
+      } else {
+        localeObj[key] = allWords[key][id] || '待翻译';
+      }
     });
     return {
       id,
-      ...localeObj
-    }
+      ...localeObj,
+    };
   });
 
-  await genXlsx(xlsxData)
+  await genXlsx(xlsxData);
 }
 
 module.exports = update;

package/bin/scripts/util/makeVisitorUpdate.js

@@ -2,21 +2,14 @@ const t = require('@babel/types');
 const specialMatch = require('./specialMatch');
 
 module.exports = function f(
-  {
-    i18nObject,
-    i18nMethod,
-    importCode,
-    ignoreLines,
-    i18nDefaultFunctionKey,
-  },
+  { i18nObject, i18nMethod, importCode, ignoreLines, i18nDefaultFunctionKey },
   returns,
-  { special },
+  { special }
 ) {
-  const { replaceWords, downloadIds } = returns;
+  const { replaceWords, downloadIds, defaultKeyWordMap } = returns;
 
   // XXX: [TRICKY] 防止中文转码为 unicode
   function hackValue(value, id) {
-
     return Object.assign(t.StringLiteral(value), {
       extra: {
         raw: `'${id}'`, // id
@@ -64,7 +57,6 @@ module.exports = function f(
 
   // 替换字符串为我们使用的国际化API
   function makeReplace(value, variables) {
-
     // 存在临时id替换
     returns.hasTouch = true;
 
@@ -90,25 +82,54 @@ module.exports = function f(
 
   // 函数或方法调用表达式
   function dealCallExpressionNode(node) {
+    // 记录当前key对应的默认词条
+    if (
+      node.callee.type === 'MemberExpression' &&
+      node.callee.object.type === 'CallExpression' &&
+      node.callee.property.name === i18nDefaultFunctionKey &&
+      ((node.callee.object.callee.type === 'MemberExpression' &&
+        node.callee.object.callee.object.name === i18nObject &&
+        node.callee.object.callee.property.name === i18nMethod) ||
+        (!i18nObject &&
+          node.callee.object.callee.type === 'Identifier' &&
+          node.callee.object.callee.name === i18nMethod))
+    ) {
+      if (
+        node.arguments.length > 0 &&
+        node.callee.object.arguments.length > 0
+      ) {
+        const k = node.callee.object.arguments[0].value;
+        const v = node.arguments[0].value;
+
+        if (k) {
+          defaultKeyWordMap[k] = v;
+        }
+      }
+    }
+
     const res = {
       needReplace: false,
       value: null,
       skip: false,
-    }
+      otherArgs: [],
+    };
 
     if (
       (node.callee.type === 'MemberExpression' &&
         node.callee.object.name === i18nObject &&
         node.callee.property.name === i18nMethod) ||
-      (!i18nObject && node.callee.type === 'Identifier' && node.callee.name === i18nMethod)
+      (!i18nObject &&
+        node.callee.type === 'Identifier' &&
+        node.callee.name === i18nMethod)
     ) {
       // 收集现有的 key
       const args = node.arguments;
-      if(!args.length) {
+      if (!args.length) {
         return res;
       }
 
       let key = args[0].value;
+      res.otherArgs = args.slice(1);
 
       // intl.t(key)
       // replaceWords { key: id }
@@ -137,16 +158,21 @@ module.exports = function f(
 
       if (!shouldIgnore(node) && special) {
         // intl.get('id').d(中文) 获取id和中文
+        // TODO: 当前get()方法不支持处理有参数的场景[get('id',{a:1})]，如需处理需要同时修改脚手架中的react-router-config-loader
         const { id, defaultValue } = specialMatch(value) || {};
         if (!id) return;
 
+        defaultKeyWordMap[id] = defaultValue;
+
         const finalyId = replaceWords[id];
         if (finalyId) {
           returns.hasTouch = true;
           downloadIds.push(finalyId);
 
-          const str = `${i18nObject ? `${i18nObject}.` : ''}${i18nMethod}("${finalyId}").${i18nDefaultFunctionKey}("${defaultValue}")`;
-          const newStr = hackValue(str, str,);
+          const str = `${
+            i18nObject ? `${i18nObject}.` : ''
+          }${i18nMethod}("${finalyId}").${i18nDefaultFunctionKey}("${defaultValue}")`;
+          const newStr = hackValue(str, str);
           path.replaceWith(newStr);
           path.skip();
         } else {
@@ -169,12 +195,13 @@ module.exports = function f(
     // 函数或方法调用表达式，比如：a('中午')
     CallExpression(path) {
       const { node } = path;
-
       if (!node.ignore) {
-        const { needReplace, value, skip } = dealCallExpressionNode(node);
+        const { needReplace, value, skip, otherArgs } =
+          dealCallExpressionNode(node);
 
         if (needReplace) {
           const res = makeReplace(value);
+          res.arguments = res.arguments.concat(otherArgs);
           path.replaceWith(res);
 
           path.node.ignore = true;
@@ -183,4 +210,4 @@ module.exports = function f(
       }
     },
   };
-}
+};

package/bin/scripts/util/transformAst.js

@@ -82,6 +82,7 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
   const allWords = []; // 收集到的所有词条
   const downloadIds = []; // 需要从平台下载的词条id
   const specialMethod = []; // 替换的国际化特殊方法
+  const defaultKeyWordMap = {}; // addLocal指令中使用：记录当前key对应的默认词条
 
   // babel配置
   const transformOptions = {
@@ -129,6 +130,7 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
       replaceWords: replaceWords || {},
       downloadIds,
       specialMethod,
+      defaultKeyWordMap,
       hasImport: false, // 是否已经引入通用国际化API，import {init} from ...;
       hasTouch: false, // 是否存在需要替换的词条
     };
@@ -200,5 +202,6 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
     allWords,
     downloadIds,
     specialMethod,
+    defaultKeyWordMap
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/intl",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "author": "cloudwiser",
   "description": "intl",
   "main": "lib/index.js",
@@ -84,5 +84,5 @@
     "react-dom": "^16.13.1"
   },
   "license": "MIT",
-  "gitHead": "b47f3fd4716247a1c51c0da46b6bafb5a6fff086"
+  "gitHead": "422bbd1a0545e50a6e8a6e41240536bbc5274e20"
 }