b28-cli 1.7.1 → 1.7.2

package/dist/ExtractLangExcel.js

@@ -10,17 +10,19 @@ var _asyncToGenerator2 = require("babel-runtime/helpers/asyncToGenerator");
 
 var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
 
-var _langArr;
+var _typeof2 = require("babel-runtime/helpers/typeof");
 
-/**
- *
- * @param {Array} words
- * @param {string} jsonPath
- * @param {string} outPath
+var _typeof3 = _interopRequireDefault(_typeof2);
+
+/**
+ * 主函数
+ * @param {Array} words 
+ * @param {string} jsonPath 
+ * @param {string} outPath 
  */
 var ExtractLangExcel = function () {
   var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(words, jsonPath, outPath) {
-    var outData, jsonFolders, filePath, dataIndex, curLang, _iterator, _isArray, _i, _ref2, jsonKey;
+    var outData, jsonFolders, filePath, dataIndex, curLang, timestamp, allTermsPath, problemTermsPath, _iterator, _isArray, _i, _ref2, jsonKey, langCount, problemTerms, problemData;
 
     return _regenerator2.default.wrap(function _callee$(_context) {
       while (1) {
@@ -28,87 +30,117 @@ var ExtractLangExcel = function () {
           case 0:
             outData = [], jsonFolders = [], filePath = "", dataIndex = 1, curLang = "en";
 
+
             jsonPath = (0, _index.correctPath)(jsonPath);
             jsonFolders = (0, _index.scanFolder)(jsonPath).items;
-            outPath = _path2.default.join((0, _index.correctPath)(outPath), "lang" + +(0, _index.getNowFormatDate)() + ".xlsx");
+            timestamp = (0, _index.getNowFormatDate)();
+            allTermsPath = _path2.default.join((0, _index.correctPath)(outPath), "lang_all_" + timestamp + ".xlsx");
+            problemTermsPath = _path2.default.join((0, _index.correctPath)(outPath), "lang_problems_" + timestamp + ".xlsx");
+
+            // 初始化数据结构 - 每一行的数据存在一个数组中
 
-            // 每一行的数据存在一个数组中，二维数组outData是完整的数据，用来最终生成excel文件
             words.forEach(function (item, index) {
               outData[index] = [];
               outData[index].push(item);
             });
 
+            // 添加标题行
+            outData.unshift(["词条"]);
+
+            // 收集所有语言
             _iterator = jsonFolders, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();
 
-          case 6:
+          case 9:
             if (!_isArray) {
-              _context.next = 12;
+              _context.next = 15;
               break;
             }
 
             if (!(_i >= _iterator.length)) {
-              _context.next = 9;
+              _context.next = 12;
               break;
             }
 
-            return _context.abrupt("break", 25);
+            return _context.abrupt("break", 28);
 
-          case 9:
+          case 12:
             _ref2 = _iterator[_i++];
-            _context.next = 16;
+            _context.next = 19;
             break;
 
-          case 12:
+          case 15:
             _i = _iterator.next();
 
             if (!_i.done) {
-              _context.next = 15;
+              _context.next = 18;
               break;
             }
 
-            return _context.abrupt("break", 25);
+            return _context.abrupt("break", 28);
 
-          case 15:
+          case 18:
             _ref2 = _i.value;
 
-          case 16:
+          case 19:
             jsonKey = _ref2;
 
-            curLang = langArr[jsonKey] || "en";
+            curLang = langArr[jsonKey] || jsonKey;
             outData[0].push(curLang);
             filePath = _path2.default.normalize(jsonPath + "/" + jsonKey + "/translate.json");
-            _context.next = 22;
+            _context.next = 25;
             return getExcelData(words, outData, filePath, dataIndex);
 
-          case 22:
+          case 25:
             dataIndex++;
 
-          case 23:
-            _context.next = 6;
+          case 26:
+            _context.next = 9;
             break;
 
-          case 25:
-            _context.prev = 25;
+          case 28:
+            _context.prev = 28;
 
-            outData = Array.from([].concat(new Set(outData))[0]);
-            (0, _index.writeExcel)(outData, outPath, "lang");
-            (0, _index.log)("\u4EE3\u7801\u4E2D\u6240\u6709\u8BCD\u6761\u7684\u7FFB\u8BD1\u5DF2\u63D0\u53D6\u5B8C\u6210\uFF0C\u4FDD\u5B58\u5728" + outPath + "\u4E2D", _index.LOG_TYPE.DONE);
-            _context.next = 35;
+            // 1. 生成全部词条Excel
+            (0, _index.writeExcel)(outData, allTermsPath, "全部词条");
+
+            // 2. 检查并生成有问题词条Excel
+            langCount = jsonFolders.length;
+            problemTerms = checkProblemTerms(outData, words, langCount);
+
+
+            if (problemTerms.length > 0) {
+              // 构建有问题词条的Excel数据
+              problemData = [["词条", "问题原因"].concat(outData[0].slice(1)) // 标题行
+              ];
+
+
+              problemTerms.forEach(function (item) {
+                problemData.push([item.term, item.problem].concat(item.data.slice(1)));
+              });
+
+              (0, _index.writeExcel)(problemData, problemTermsPath, "有问题词条");
+              (0, _index.log)("\u53D1\u73B0" + problemTerms.length + "\u4E2A\u6709\u95EE\u9898\u8BCD\u6761\uFF0C\u5DF2\u4FDD\u5B58\u5728" + problemTermsPath + "\u4E2D", _index.LOG_TYPE.WARNING);
+            } else {
+              (0, _index.log)("\u6CA1\u6709\u53D1\u73B0\u6709\u95EE\u9898\u8BCD\u6761", _index.LOG_TYPE.INFO);
+            }
+
+            (0, _index.log)("\u8BCD\u6761\u7FFB\u8BD1\u63D0\u53D6\u5B8C\u6210\uFF0C\u5168\u90E8\u8BCD\u6761\u4FDD\u5B58\u5728" + allTermsPath + "\u4E2D", _index.LOG_TYPE.DONE);
+            _context.next = 40;
             break;
 
-          case 31:
-            _context.prev = 31;
-            _context.t0 = _context["catch"](25);
+          case 36:
+            _context.prev = 36;
+            _context.t0 = _context["catch"](28);
 
             (0, _index.log)("\u5199\u5165excel\u5931\u8D25\uFF0C" + _context.t0, _index.LOG_TYPE.ERROR);
             return _context.abrupt("return", {});
 
-          case 35:
+          case 40:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, this, [[25, 31]]);
+    }, _callee, this, [[28, 36]]);
   }));
 
   return function ExtractLangExcel(_x, _x2, _x3) {
@@ -116,6 +148,9 @@ var ExtractLangExcel = function () {
   };
 }();
 
+// 其余函数保持不变...
+
+
 var _path = require("path");
 
 var _path2 = _interopRequireDefault(_path);
@@ -124,21 +159,78 @@ var _index = require("./util/index");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var langArr = (_langArr = {
+var langArr = {
   en: "英语",
   cn: "简体中文",
-  zh: "繁體中文",
-  de: "德语" }, _langArr["en"] = "英语", _langArr.es = "西班牙", _langArr.fr = "法国", _langArr.hu = "匈牙利", _langArr.it = "意大利", _langArr.pl = "波兰", _langArr.ro = "罗马尼亚", _langArr.sa = "阿拉伯", _langArr.tr = "土耳其", _langArr.ru = "俄语", _langArr.pt = "葡萄牙语", _langArr.uk = "乌克兰", _langArr.br = "巴西葡语", _langArr.nl = "荷兰语", _langArr.cs = "捷克语", _langArr.mx = "拉美西语", _langArr.kk = "哈萨克语", _langArr.ko = "韩语", _langArr.bg = "保加利亚语", _langArr.laes = "美西", _langArr.brpt = "巴葡", _langArr);
-
-function getExcelData(words, outData, filePath, dataIndex) {
+  zh: "台湾繁体",
+  de: "德语",
+  es: "欧洲西语",
+  fr: "法语",
+  hu: "匈牙利语",
+  it: "意大利语",
+  pl: "波兰语",
+  ro: "罗马尼亚语",
+  sa: "阿拉伯语",
+  tr: "土耳其语",
+  ru: "俄语",
+  pt: "葡萄牙语",
+  uk: "乌克兰语",
+  br: "巴西葡语",
+  nl: "荷兰语",
+  cs: "捷克语",
+  mx: "拉美西语",
+  kk: "哈萨克语",
+  ko: "韩语",
+  bg: "保加利亚语",
+  laes: "美西",
+  brpt: "巴葡"
+};
+
+/**
+ * 检查词条是否有问题的函数
+ * @param {Array} outData 全部数据
+ * @param {Array} words 词条列表
+ * @param {number} langCount 语言数量
+ * @returns {Array} 有问题的词条数据
+ */
+function checkProblemTerms(outData, words, langCount) {
+  var problemTerms = [];
+
+  // 跳过标题行(第一行)
+  for (var i = 1; i < outData.length; i++) {
+    var row = outData[i];
+    var term = words[i - 1]; // 对应原始词条
+    var hasProblem = false;
+    var problemReason = "";
+
+    // 检查每一行是否有空值(从第2列开始，第1列是词条本身)
+    for (var j = 1; j <= langCount; j++) {
+      var cell = row[j];
+      if (!cell || (typeof cell === "undefined" ? "undefined" : (0, _typeof3.default)(cell)) === 'object' && !cell.v) {
+        hasProblem = true;
+        problemReason = "缺失翻译";
+        break;
+      }
+    }
+
+    // 如果发现问题，添加到问题列表
+    if (hasProblem) {
+      problemTerms.push({
+        term: term,
+        problem: problemReason,
+        data: row
+      });
+    }
+  }
+
+  return problemTerms;
+}function getExcelData(words, outData, filePath, dataIndex) {
   return (0, _index.loadJson)(filePath).then(function (data) {
     data = trimJson(data);
-    // data是json文件的值，json对象
     words.forEach(function (item, wordIndex) {
       item = trimStr(item);
-      if (wordIndex == "0") {
-        return true;
-      }
+      if (wordIndex === 0) return; // 跳过标题行
+
       if (data[item]) {
         outData[wordIndex][dataIndex] = data[item];
       } else {
@@ -173,4 +265,5 @@ function trimStr(str) {
   unescape(str);
   return str;
 }
+
 exports.default = ExtractLangExcel;

package/dist/cmd.js

@@ -21,18 +21,18 @@ var _fs2 = _interopRequireDefault(_fs);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // 处理一些简单的命令
-/**
- * b28-cli init
- * b28-cli -v/v
- * b28-cli -h/h
+/**
+ * b28-cli init
+ * b28-cli -v/v
+ * b28-cli -h/h
  */
 var inquirer = require("inquirer");
 
 var figlet = require("figlet");
 
 
-/**
- * 生成配置文件需要的注释
+/**
+ * 生成配置文件需要的注释
  */
 var comments = {
   commandType: "操作类型",
@@ -65,11 +65,16 @@ var comments = {
   inExcel: "最终的语言包excel文件地址",
   transFilePath: "待转码文件地址",
   transOutPath: "转码后文件输出地址",
-  transEncode: "转码后文件的编码方式(默认UTF-8)"
+  transEncode: "转码后文件的编码方式(默认UTF-8)",
+  excelPath1: "第一个Excel文件地址",
+  excelPath2: "第二个Excel文件地址",
+  sheetName1: "第一个Excel中对应的sheet",
+  sheetName2: "第二个Excel中对应的sheet",
+  outPath: "输出json文件目录"
 };
 
-/**
- * 初始化b28.config.js文件
+/**
+ * 初始化b28.config.js文件
  */
 function handleInit() {
   var config = {};

package/dist/excel2json.js

@@ -2,75 +2,227 @@
 
 exports.__esModule = true;
 
+var _regenerator = require("babel-runtime/regenerator");
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
+var _asyncToGenerator2 = require("babel-runtime/helpers/asyncToGenerator");
+
+var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+
+/**
+ * excelPath, outPath, sheetName, key, value
+ */
+var excel2json = function () {
+  var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(option) {
+    var data, outPath, promiseList, key, langDirName, langDirPath, _outPath;
+
+    return _regenerator2.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            option.saveData = option.saveData === false ? false : true;
+            data = (0, _index.loadExcel)(option.excelPath, option.sheetName);
+
+
+            if (option.key) {
+              option.key = option.key.toUpperCase();
+            }
+            if (option.value) {
+              option.value = option.value.toUpperCase();
+            }
+
+            if (!(data.length === 0)) {
+              _context.next = 7;
+              break;
+            }
+
+            (0, _index.log)("\u6570\u636E\u4E3A\u7A7A\uFF0C\u53EF\u80FD\u662Fsheetname\u4E0D\u5B58\u5728\u5BFC\u81F4\u7684", _index.LOG_TYPE.WARNING);
+            return _context.abrupt("return", Promise.resolve([]));
+
+          case 7:
+            data = transferData(data, option);
+
+            if (!(data === -1)) {
+              _context.next = 10;
+              break;
+            }
+
+            return _context.abrupt("return", Promise.resolve({}));
+
+          case 10:
+            if (!option.outPath) {
+              _context.next = 37;
+              break;
+            }
+
+            if (!Array.isArray(data)) {
+              _context.next = 16;
+              break;
+            }
+
+            outPath = _path2.default.join(option.outPath, option.fileName || "lang.json");
+            return _context.abrupt("return", (0, _index.writeJson)(data, outPath).then(function (data) {
+              (0, _index.log)("Excel to Json\u6587\u4EF6\u5DF2\u5199\u5165\u5730\u5740-" + outPath);
+              return data;
+            }).catch(function (error) {
+              (0, _index.log)("Excel to Json\u5931\u8D25\uFF0C" + error, _index.LOG_TYPE.ERROR);
+              return {};
+            }));
+
+          case 16:
+            promiseList = [];
+
+            option.outPath = _path2.default.join(option.outPath, "lang");
+
+            // 确保lang目录存在
+            _context.next = 20;
+            return _fsExtra2.default.ensureDir(option.outPath);
+
+          case 20:
+            _context.t0 = _regenerator2.default.keys(data);
+
+          case 21:
+            if ((_context.t1 = _context.t0()).done) {
+              _context.next = 34;
+              break;
+            }
+
+            key = _context.t1.value;
+
+            // 使用配置的语种简写作为目录名（与 mergeExcel / ExtractLangExcel 保持一致）
+            langDirName = getLangDirName(key);
+            // 未配置简写时跳过该列，避免生成与配置不一致的目录名
+
+            if (langDirName) {
+              _context.next = 27;
+              break;
+            }
+
+            (0, _index.log)("\u672A\u5728\u8BED\u79CD\u6620\u5C04\u8868\u4E2D\u627E\u5230\u7B80\u5199\u914D\u7F6E\uFF0C\u5DF2\u8DF3\u8FC7\u5217\uFF1A" + key, _index.LOG_TYPE.WARNING);
+            return _context.abrupt("continue", 21);
+
+          case 27:
+            langDirPath = _path2.default.join(option.outPath, langDirName);
+            _context.next = 30;
+            return _fsExtra2.default.ensureDir(langDirPath);
+
+          case 30:
+
+            // 固定文件名为 translate.json
+            _outPath = _path2.default.join(langDirPath, "translate.json");
+
+            promiseList.push((0, _index.writeJson)(data[key], _outPath));
+            _context.next = 21;
+            break;
+
+          case 34:
+            return _context.abrupt("return", Promise.all(promiseList).then(function (data1) {
+              (0, _index.log)("Excel to Json\u6587\u4EF6\u5DF2\u5199\u5165\u6587\u4EF6\u5939-" + option.outPath + "\u4E0B");
+              return data;
+            }).catch(function (error) {
+              (0, _index.log)("Excel to Json\u5931\u8D25\uFF0C" + error, _index.LOG_TYPE.ERROR);
+              return {};
+            }));
+
+          case 35:
+            _context.next = 39;
+            break;
+
+          case 37:
+            (0, _index.log)("Excel to Json\u6210\u529F\uFF0C\u65E0\u9700\u4FDD\u5B58\u5230\u672C\u5730");
+            return _context.abrupt("return", Promise.resolve(data));
+
+          case 39:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, this);
+  }));
+
+  return function excel2json(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+/**
+ * 提供value输出对象json, 不提供输出数组json
+ * value为值对应的语言列，多个语言列用逗号隔开
+ */
+
+
 var _index = require("./util/index");
 
 var _path = require("path");
 
 var _path2 = _interopRequireDefault(_path);
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _fsExtra = require("fs-extra");
 
-/**
- * excelPath, outPath, sheetName, key, value
- */
-function excel2json(option) {
-  option.saveData = option.saveData === false ? false : true;
-  var data = (0, _index.loadExcel)(option.excelPath, option.sheetName);
+var _fsExtra2 = _interopRequireDefault(_fsExtra);
 
-  if (option.key) {
-    option.key = option.key.toUpperCase();
-  }
-  if (option.value) {
-    option.value = option.value.toUpperCase();
-  }
-  if (data.length === 0) {
-    (0, _index.log)("\u6570\u636E\u4E3A\u7A7A\uFF0C\u53EF\u80FD\u662Fsheetname\u4E0D\u5B58\u5728\u5BFC\u81F4\u7684", _index.LOG_TYPE.WARNING);
-    return Promise.resolve([]);
-  }
-  data = transferData(data, option);
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-  if (data === -1) {
-    return Promise.resolve({});
+// 语种映射表，与 mergeExcel.js / ExtractLangExcel.js 中的 langArr 保持一致
+// key 为语种简写（用于输出文件夹名），value 为对应中文描述，仅用于展示
+var langArr = {
+  en: "英语",
+  cn: "简体中文",
+  zh: "台湾繁体",
+  de: "德语",
+  es: "欧洲西语",
+  fr: "法语",
+  hu: "匈牙利语",
+  it: "意大利语",
+  pl: "波兰语",
+  ro: "罗马尼亚语",
+  sa: "阿拉伯语",
+  tr: "土耳其语",
+  ru: "俄语",
+  pt: "葡萄牙语",
+  uk: "乌克兰语",
+  br: "巴西葡语",
+  nl: "荷兰语",
+  cs: "捷克语",
+  mx: "拉美西语",
+  kk: "哈萨克语",
+  ko: "韩语",
+  bg: "保加利亚语",
+  laes: "美西",
+  brpt: "巴葡"
+};
+
+/**
+ * 根据语种名称或列名找到对应的语种简写（用于输出目录名）
+ * 规则：
+ * 1. 先按去空格+小写在 langArr 的 key 中查找
+ * 2. 再按值匹配 langArr 的中文描述
+ * 3. 都找不到则返回空字符串（表示未配置，不再自动生成新简写）
+ */
+function getLangDirName(langName) {
+  if (!langName || typeof langName !== "string") {
+    return "";
   }
 
-  if (option.outPath) {
-    if (Array.isArray(data)) {
-      var outPath = _path2.default.join(option.outPath, option.fileName || "lang.json");
+  // 去掉空格并转为小写
+  var normalized = langName.replace(/\s+/g, "").toLowerCase();
 
-      return (0, _index.writeJson)(data, outPath).then(function (data) {
-        (0, _index.log)("Excel to Json\u6587\u4EF6\u5DF2\u5199\u5165\u5730\u5740-" + outPath);
-        return data;
-      }).catch(function (error) {
-        (0, _index.log)("Excel to Json\u5931\u8D25\uFF0C" + error, _index.LOG_TYPE.ERROR);
-        return {};
-      });
-    } else {
-      var promiseList = [];
-      option.outPath = _path2.default.join(option.outPath, "lang");
-      for (var key in data) {
-        var _outPath = _path2.default.join(option.outPath, key + ".json");
+  // 直接使用配置的简写（langArr 的 key）
+  if (langArr[normalized]) {
+    return normalized;
+  }
 
-        promiseList.push((0, _index.writeJson)(data[key], _outPath));
-      }
-      return Promise.all(promiseList).then(function (data1) {
-        (0, _index.log)("Excel to Json\u6587\u4EF6\u5DF2\u5199\u5165\u6587\u4EF6\u5939-" + option.outPath + "\u4E0B");
-        return data;
-      }).catch(function (error) {
-        (0, _index.log)("Excel to Json\u5931\u8D25\uFF0C" + error, _index.LOG_TYPE.ERROR);
-        return {};
-      });
+  // 按中文描述反向匹配
+  for (var key in langArr) {
+    if (langArr[key] === langName || langArr[key].toLowerCase() === normalized) {
+      return key;
     }
-  } else {
-    (0, _index.log)("Excel to Json\u6210\u529F\uFF0C\u65E0\u9700\u4FDD\u5B58\u5230\u672C\u5730");
-    return Promise.resolve(data);
   }
-}
 
-/**
- * 提供value输出对象json, 不提供输出数组json
- * value为值对应的语言列，多个语言列用逗号隔开
- */
-function transferData(data, option) {
+  // 未在配置表中找到，返回空串，后续逻辑可据此判断是否跳过该语种
+  return "";
+}function transferData(data, option) {
   var keyValueRow = data.shift(),
       key = option.key,
       value = option.value || "",
@@ -98,7 +250,10 @@ function transferData(data, option) {
       }
       outData.push(value);
     });
-    return outData;
+    // 过滤掉 undefined 和空字符串
+    return outData.filter(function (v) {
+      return v !== undefined && v !== "";
+    });
   }
 
   // 多列解析，同时对重复的词条进行重新编码
@@ -174,6 +329,12 @@ function transferData(data, option) {
         transData[keyWorld] = valueWorld;
       });
     }
+    // 过滤掉 key 为 undefined 或 "" 的项
+    Object.keys(transData).forEach(function (k) {
+      if (k === undefined || k === "") {
+        delete transData[k];
+      }
+    });
     outData[valItem] = transData;
   });
 

package/dist/extract/extract-html.js

@@ -39,8 +39,8 @@ var Edit_TYPE = {
   title: 5
 };
 
-/**
- * HTML文件解析类
+/**
+ * HTML文件解析类
  */
 
 var ExtractHTML = function (_Extract) {

package/dist/extract/extract-js.js

@@ -39,8 +39,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var parseType = /^(CallExpression|StringLiteral|TemplateLiteral)$/i;
 var inTranslate = false;
 
-/**
- * JS文件解析类
+/**
+ * JS文件解析类
  */
 
 var ExtractJs = function (_Extract) {

package/dist/extract/extract-regexp.js

@@ -24,8 +24,8 @@ var _extractRegexp2 = _interopRequireDefault(_extractRegexp);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * 通过正则匹配对词条进行提取
+/**
+ * 通过正则匹配对词条进行提取
  */
 var ExtractOld = function (_Extract) {
   (0, _inherits3.default)(ExtractOld, _Extract);