td-octopus 0.0.20 → 0.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "td-octopus",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "I18N tool",
   "author": "Anthony Li",
   "bin": {

package/src/export/index.js

@@ -3,7 +3,7 @@
  * @Author: 郑泳健
  * @Date: 2022-06-01 13:56:18
  * @LastEditors: 郑泳健
- * @LastEditTime: 2022-12-28 15:47:31
+ * @LastEditTime: 2023-06-12 11:33:34
  */
 const {
     syncFiles,
@@ -25,6 +25,7 @@ function doExport() {
     (async () => {
         const otpConfig = getProjectConfig()
         const distLang = otpConfig && otpConfig.distLangs
+        const baiduApiKey = otpConfig && otpConfig.baiduApiKey
 
         if (!Array.isArray(distLang)) {
             console.log(`请配置${OCTOPUS_CONFIG_FILE}里面的distLangs`)
@@ -42,7 +43,7 @@ function doExport() {
             const langFlat = flatObject(currentLangMap);
             spinner.start('正在同步文件的key')
             // 删除掉多余的key，增加新的key，同时提取没有翻译过的key的列表
-            const { fileKeyValueList, addList, allList } = await getAdjustLangObjAndAddList(lang, langFlat, zhCNflat);
+            const { fileKeyValueList, addList, allList } = await getAdjustLangObjAndAddList(lang, langFlat, zhCNflat, baiduApiKey, spinner);
             spinner.succeed('同步文件的key成功')
             // 重写文件
             rewriteFiles(fileKeyValueList, lang);

package/src/extract/getLangData.js

@@ -23,6 +23,9 @@ function getLangData(fileName) {
  */
 function getLangJson(fileName) {
   const fileContent = fs.readFileSync(fileName, { encoding: 'utf8' });
+  if(!fileContent) {
+    return {}
+  }
   let obj = fileContent.match(/export\s*default\s*({[\s\S]+);?$/)[1];
   obj = obj.replace(/\s*;\s*$/, '');
   let jsObj = {};

package/src/translate/index.js

@@ -3,7 +3,7 @@
  * @Author: 郑泳健
  * @Date: 2022-06-01 13:56:18
  * @LastEditors: 郑泳健
- * @LastEditTime: 2022-12-28 15:47:31
+ * @LastEditTime: 2023-06-12 11:33:51
  */
 const {
     syncFiles,
@@ -25,6 +25,7 @@ function translate() {
     (async () => {
         const otpConfig = getProjectConfig()
         const distLang = otpConfig && otpConfig.distLangs
+        const baiduApiKey = otpConfig && otpConfig.baiduApiKey
 
         if (!Array.isArray(distLang)) {
             console.log(`请配置${OCTOPUS_CONFIG_FILE}里面的distLangs`)
@@ -42,7 +43,7 @@ function translate() {
             const langFlat = flatObject(currentLangMap);
             spinner.start('正在同步文件的key')
             // 删除掉多余的key，增加新的key，同时提取没有翻译过的key的列表
-            const { fileKeyValueList, addList } = await getAdjustLangObjAndAddList(lang, langFlat, zhCNflat);
+            const { fileKeyValueList, addList } = await getAdjustLangObjAndAddList(lang, langFlat, zhCNflat, baiduApiKey, spinner);
             spinner.succeed('同步文件的key成功')
             // 重写文件
             rewriteFiles(fileKeyValueList, lang);

package/src/utils/translate.js

@@ -3,7 +3,7 @@
  * @Author: 郑泳健
  * @Date: 2022-06-02 10:09:01
  * @LastEditors: 郑泳健
- * @LastEditTime: 2023-01-04 14:54:06
+ * @LastEditTime: 2023-06-12 11:32:52
  */
 const fs = require('fs');
 const path = require('path');
@@ -130,12 +130,12 @@ function getFileKeyValueList(adjustLangObj) {
  * @param {*} zhCNObj zh-CN 的key/value
  * @returns { fileKeyValueList: [{fileName: a, value: {"b.c": xx}}], addList: [["a.b.c": "dd"]] }
  */
-async function getAdjustLangObjAndAddList(lang, langObj = {}, zhCNObj = {}) {
+async function getAdjustLangObjAndAddList(lang, langObj = {}, zhCNObj = {}, baiduApiKey, spinner) {
     const langObjKeys = Object.keys(langObj);
     // 调整后的语言包key/value
     const adjustLangObj = {};
     // 需要新增的key/value
-    const needAddList = [];
+    let needAddList = [];
     // 全量的的key/value
     const allList = [];
     // 循环zh-CN的key，得到当前语言包的key
@@ -154,8 +154,10 @@ async function getAdjustLangObjAndAddList(lang, langObj = {}, zhCNObj = {}) {
 
         adjustLangObj[key] = langObj[key] || zhCNObj[key];
     }
-
-    const addList = await combinText(needAddList, lang);
+    if(baiduApiKey) {
+      spinner.text = `当前配置了百度翻译，预计翻译时间需要${(needAddList.length / 60)?.toFixed(2)}分钟，如果等不及，请先去掉百度翻译配置`
+    }
+    const addList = await combinText(needAddList, lang, spinner);
 
     return {
         fileKeyValueList: getFileKeyValueList(adjustLangObj),
@@ -167,9 +169,9 @@ async function getAdjustLangObjAndAddList(lang, langObj = {}, zhCNObj = {}) {
 /**
  * 合并需要翻译的中文，因为百度翻译限制一次性中文只能有3000字
  * 因为百度免费翻译有时候会抽风，会导致翻译结果出错，为了减少没被翻译的，所以现在设置一次性翻译200字
- * @param {*} needAddList 
+ * @param {*} needAddList
  */
-async function combinText(needAddList, lang) {
+async function combinText(needAddList, lang, spinner) {
     const otpConfig = getProjectConfig()
     const { baiduApiKey, baiduLangMap } = otpConfig || {}
     const { appId, appKey } = baiduApiKey || {}
@@ -183,11 +185,10 @@ async function combinText(needAddList, lang) {
     if (!appId || !appKey || !toLang) {
         return needAddList;
     }
-
     // 分组
     const groupList = groupByLength(needAddList, 200)
     // 分组翻译结果
-    const transformResultList = await getTransformResultList(groupList, appId, appKey, 'zh', toLang)
+    const transformResultList = await getTransformResultList(groupList, appId, appKey, 'zh', toLang, spinner)
 
     return needAddList.map((i, index) => {
         i[2] = transformResultList[index];
@@ -197,28 +198,30 @@ async function combinText(needAddList, lang) {
 
 /**
  * 对分组的结果进行翻译
- * @param {*} groupList 
- * @param {*} appId 
- * @param {*} appKey 
- * @param {*} fromLang 
- * @param {*} toLang 
- * @returns 
+ * @param {*} groupList
+ * @param {*} appId
+ * @param {*} appKey
+ * @param {*} fromLang
+ * @param {*} toLang
+ * @returns
  */
-async function getTransformResultList(groupList, appId, appKey, fromLang, toLang) {
-    let translatList = []
+async function getTransformResultList(groupList, appId, appKey, fromLang, toLang, spinner) {
+    let translatList = [];
+    let num = 1
     for (const i of groupList) {
+        spinner.text = `翻译进度${num}/${groupList.length}`
         const baiduResult = await baiduTranslation(appId, appKey, fromLang, toLang, JSON.stringify(i))
-
+        num++;
         try {
-            const splitBaiduResult = baiduResult?.[0]
-            const transResultList = JSON.parse(splitBaiduResult);
-            // 这里是判断百度翻译返回的长度是不是和传入的一样
-            const reduceNum = i.length - transResultList.length;
-            translatList = [...translatList, ...transResultList].concat(Array(reduceNum).fill(''))
+            const res = baiduResult?.[0]
+            // const transResultList = JSON.parse(splitBaiduResult);
+            // // 这里是判断百度翻译返回的长度是不是和传入的一样
+            // const reduceNum = i.length - transResultList.length;
+            translatList = [...translatList, res]
 
         } catch (e) {
             console.log(`百度翻译出现部分失败, 失败原因: ${e.message}`)
-            translatList = translatList.concat(Array(i.length).fill(''))
+            translatList = translatList.concat('')
         }
     }
 
@@ -229,32 +232,32 @@ async function getTransformResultList(groupList, appId, appKey, fromLang, toLang
  * 对数组进行分组
  * @param {*} groupList 原数组
  * @param {*} max 最大多少字
- * @returns 
+ * @returns
  */
 function groupByLength(groupList, max) {
     const list = [[]]
     let str = ''
     // 变成${max}个字符一组的数组，用于一次百度翻译
     groupList.forEach((it) => {
-        let [, text] = it;
-
-        if ((str + text).length < max) {
-            list[list.length - 1] = Array.isArray(list[list.length - 1]) ? [...list[list.length - 1], text] : [text]
-            str = str + text
-        } else {
-            list.push([text])
-            str = ''
-        }
+        const [, text] = it;
+        list.push(text)
+        // if ((str + text).length < max) {
+        //     list[list.length - 1] = Array.isArray(list[list.length - 1]) ? [...list[list.length - 1], text] : [text]
+        //     str = str + text
+        // } else {
+        //     list.push([text])
+        //     str = ''
+        // }
     })
     return list
 }
 
 /**
  * 百度翻译
- * @param {*} from 
- * @param {*} to 
- * @param {*} text 
- * @returns 
+ * @param {*} from
+ * @param {*} to
+ * @param {*} text
+ * @returns
  */
 async function baiduTranslation(appId, appKey, from, to, text) {
     return new Promise((resolve, reject) => {
@@ -263,15 +266,15 @@ async function baiduTranslation(appId, appKey, from, to, text) {
             return baiduTranslate(appId, appKey, to, from)(text)
                 .then(data => {
                     if (data && data.trans_result) {
-                        const result = data.trans_result.map(item => item.dst) || [];
+                        const result = data.trans_result.map(item => item.dst) || '';
                         resolve(result);
                     } else {
-                        resolve('[]')
+                        resolve('')
                     }
                 }).catch(err => {
-                    reject('[]');
+                    reject('');
                 });
-        }, 1000)
+        }, 1100)
     })
 }