@chaoswise/intl 2.1.0 → 2.1.1

package/bin/scripts/collect.js

@@ -1,34 +1,34 @@
-const { v4: uuidv4 } = require("uuid");
+const { v4: uuidv4 } = require('uuid');
 
-const getConf = require("./conf");
-const { targetEntryFiles } = require("./util/getTargetFiles");
-const transformAst = require("./util/transformAst");
-const log = require("./util/log");
-const file = require("./util/file");
-const writeNewWordsFile = require("./util/writeNewWordsFile");
-const { readWordJson } = require("./util/getWord");
-const getGroupName = require("./util/getGroupName");
-const getPkgJson = require("./util/getPkgJson");
+const getConf = require('./conf');
+const { targetEntryFiles } = require('./util/getTargetFiles');
+const transformAst = require('./util/transformAst');
+const log = require('./util/log');
+const file = require('./util/file');
+const writeNewWordsFile = require('./util/writeNewWordsFile');
+const { readWordJson } = require('./util/getWord');
+const getGroupName = require('./util/getGroupName');
+const getPkgJson = require('./util/getPkgJson');
 
-const service = require("./service");
+const service = require('./service');
 
 async function collect() {
-  log.info("工程扫描中...");
+  log.info('工程扫描中...');
 
   const package = getPkgJson();
   const conf = getConf();
   const groupName = getGroupName();
-  const newWordsFileType = conf.newWordsFileType || "excel";
+  const newWordsFileType = conf.newWordsFileType || 'excel';
 
   // 检查newWordsFileType
-  if (!["json", "excel"].includes(newWordsFileType)) {
+  if (!['json', 'excel'].includes(newWordsFileType)) {
     log.error(`配置：newWordsFileType 只能为json或者excel`);
     process.exit(1);
   }
 
   // 读取wordJson
   if (conf.localWordPath && !readWordJson(conf.localWordPath)) {
-    log.error("localWordPath配置有误");
+    log.error('localWordPath配置有误');
     process.exit(1);
   }
 
@@ -37,19 +37,19 @@ async function collect() {
 
   // 遍历文件，并对代码进行ast处理的方法：transformAst(type, files, conf, replaceWords)
   // 第一次遍历，只收集中文，不传入replaceWords
-  const info = transformAst("Collect", files, conf);
+  const info = transformAst('Collect', files, conf);
 
   // 在国际化平台中获取所有已存在中文信息
-  const res = await service.searchByZh(info.allWords);
+  const res = await service.searchByZh(info.allWords, groupName);
   if (res.code !== 10000) {
-    log.error("请求数据出错:" + res.msg);
+    log.error('请求数据出错:' + res.msg);
     process.exit(1);
   }
   const wordsMap = res.data;
   // 获取所有语种
   const languageRes = await service.getLanguage();
   if (languageRes.code !== 10000) {
-    log.error("请求数据出错:" + languageRes.msg);
+    log.error('请求数据出错:' + languageRes.msg);
     process.exit(1);
   }
   const languages = languageRes.data;
@@ -76,7 +76,7 @@ async function collect() {
       if (Object.keys(currentCopy).length < languages.length) {
         newWords[currentDt.key] = {};
         languages.forEach((dt) => {
-          newWords[currentDt.key][dt.key] = currentCopy[dt.key] || "待翻译";
+          newWords[currentDt.key][dt.key] = currentCopy[dt.key] || '待翻译';
         });
       } else {
         exist[currentDt.key] = currentDt;
@@ -99,7 +99,7 @@ async function collect() {
           });
           // 词条不存在
           if (value.length === 0) {
-            newWords[key][dt.key] = "待翻译";
+            newWords[key][dt.key] = '待翻译';
           }
           // {"zh_CN": "你好a","zh_TW": "","en_US": "hello"},{"zh_CN": "你好a","en_US": "hello"}
           // 处理en_US在这两个数据中翻译相同的情况，比如 {en_US: hello}
@@ -110,11 +110,11 @@ async function collect() {
           else if (hasValue.length > 1) {
             newWords[key][
               dt.key
-            ] = `该词条在平台中对应多个翻译，请手动确认:${hasValue.join("/")}`;
+            ] = `该词条在平台中对应多个翻译，请手动确认:${hasValue.join('/')}`;
           }
           // 词条存在但是该语种未翻译，比如zh_TW在上面数据中都未翻译的情况
           else {
-            newWords[key][dt.key] = "待翻译";
+            newWords[key][dt.key] = '待翻译';
           }
         }
       });
@@ -125,10 +125,10 @@ async function collect() {
   await service.saveExist({ version: package.version, groupName, exist });
 
   // 第二次遍历，传入replaceWords，对代码进行国际化通用API转化，把词条替换成数据库的id，或者脚本临时生成的uuid
-  transformAst("collect", files, conf, replaceWords);
+  transformAst('collect', files, conf, replaceWords);
 
-  log.success("★★★ 脚本执行成功 ★★★");
-  log.info("国际化配置文件： .intlconfig.js，可根据需求自定义修改");
+  log.success('★★★ 脚本执行成功 ★★★');
+  log.info('国际化配置文件： .intlconfig.js，可根据需求自定义修改');
   // 本次扫描出新的待翻译词条，写入到newWords中
   if (Object.keys(newWords).length) {
     writeNewWordsFile(newWordsFileType, newWords, package.version);
@@ -138,7 +138,7 @@ async function collect() {
   if (warnLogs.length) {
     const fileName = `intl.logs.warn.${new Date()
       .toLocaleString()
-      .replace(/[\/ ]/g, "_")}.txt`;
+      .replace(/[\/ ]/g, '_')}.txt`;
     file.write(fileName, JSON.stringify(warnLogs, null, 2));
     log.warn(`存在脚本无法处理的情况，具体查看 ${fileName} 手动处理`);
   }

package/bin/scripts/service/index.js

@@ -1,9 +1,9 @@
-const axios = require("axios");
-const getConf = require("../conf");
+const axios = require('axios');
+const getConf = require('../conf');
 
 const conf = getConf();
 
-axios.defaults.baseURL = (conf.baseURL || "") + "/api/i18n";
+axios.defaults.baseURL = (conf.baseURL || '') + '/api/i18n';
 
 axios.interceptors.response.use(
   function (response) {
@@ -19,26 +19,26 @@ axios.interceptors.response.use(
 );
 
 // 在国际化平台中获取所有已存在中文信息
-exports.searchByZh = (zhs) => {
-  return axios.post("/content/getContentsByMain", zhs);
+exports.searchByZh = (zhs, groupName) => {
+  return axios.post('/content/getContentsByMain?groupName=' + groupName, zhs);
 };
 
 // 查询所有语种
 exports.getLanguage = () => {
-  return axios.get("/language/list");
+  return axios.get('/language/list');
 };
 
 // 根据词条id获取所有数据库词条信息
 exports.getJson = (data) => {
-  return axios.post("/content/downloadContentByKeys", data);
+  return axios.post('/content/downloadContentByKeys', data);
 };
 
 // 保存替换的特殊方法
 exports.saveMethod = (data) => {
-  return axios.post("/history/method/save", data);
+  return axios.post('/history/method/save', data);
 };
 
 // 保存已有词条
 exports.saveExist = (data) => {
-  return axios.post("/history/exist/save", data);
+  return axios.post('/history/exist/save', data);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/intl",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "author": "cloudwiser",
   "description": "intl",
   "main": "lib/index.js",
@@ -84,5 +84,5 @@
     "react-dom": "^16.13.1"
   },
   "license": "MIT",
-  "gitHead": "f7289295edebb57f5bd96f7f3df2271ebd3aa3f0"
+  "gitHead": "39a7b110a359f24658c1b44af5d8867207a76ce4"
 }