b28-cli 1.7.1 → 1.7.2

package/dist/mergeJson.js

@@ -1,6 +1,11 @@
 "use strict";
 
 exports.__esModule = true;
+exports.mergeJsonFolders = undefined;
+
+var _typeof2 = require("babel-runtime/helpers/typeof");
+
+var _typeof3 = _interopRequireDefault(_typeof2);
 
 var _index = require("./util/index");
 
@@ -8,9 +13,16 @@ var _path = require("path");
 
 var _path2 = _interopRequireDefault(_path);
 
+var _fs = require("fs");
+
+var _fs2 = _interopRequireDefault(_fs);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function merge(obj) {
+  if (obj === undefined || obj === null) {
+    obj = {};
+  }
   var outData = Object.assign(Object.prototype.toString.call(obj) === "[object Object]" ? {} : [], obj);
 
   for (var _len = arguments.length, others = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -19,12 +31,94 @@ function merge(obj) {
 
   if (others) {
     others.forEach(function (itemObj) {
-      outData = (0, _index.mergeObject)(outData, itemObj);
+      if (itemObj !== undefined && itemObj !== null) {
+        outData = (0, _index.mergeObject)(outData, itemObj);
+      }
     });
   }
   return outData;
 }
 
+/**
+ * 同语种目录合并专用：深拷贝合并两个 JSON 对象，取两边 key 并集，次优先（次覆盖主）。
+ * 不引入 undefined，避免次 json 内容丢失。
+ * @param {Object} main 主 json（dir1）
+ * @param {Object} sub 次 json（dir2）
+ * @returns {Object} 新对象，不修改入参
+ */
+function unionMerge(main, sub) {
+  var isObj = function isObj(v) {
+    return (typeof v === "undefined" ? "undefined" : (0, _typeof3.default)(v)) === "object" && v !== null && !Array.isArray(v);
+  };
+  var isArr = function isArr(v) {
+    return Array.isArray(v);
+  };
+  var dedupe = function dedupe(arr) {
+    var seen = new Set();
+    return arr.filter(function (item) {
+      var k = (typeof item === "undefined" ? "undefined" : (0, _typeof3.default)(item)) === "object" && item !== null ? JSON.stringify(item) : String(item);
+      if (seen.has(k)) return false;
+      seen.add(k);
+      return true;
+    });
+  };
+
+  if (isArr(main) && isArr(sub)) {
+    return dedupe([].concat(main || [], sub || []));
+  }
+  if (isArr(main) || isArr(sub)) {
+    var a = isArr(sub) ? sub : main;
+    return a ? [].concat(a) : [];
+  }
+
+  main = main && (typeof main === "undefined" ? "undefined" : (0, _typeof3.default)(main)) === "object" ? main : {};
+  sub = sub && (typeof sub === "undefined" ? "undefined" : (0, _typeof3.default)(sub)) === "object" ? sub : {};
+  var out = {};
+  var keys = new Set([].concat(Object.keys(main), Object.keys(sub)));
+  keys.forEach(function (key) {
+    var m = main[key];
+    var s = sub[key];
+    var useSub = s !== undefined && s !== null;
+    var useMain = m !== undefined && m !== null;
+    if (useSub && useMain && isObj(m) && isObj(s)) {
+      out[key] = unionMerge(m, s);
+    } else if (useSub && useMain && isArr(m) && isArr(s)) {
+      out[key] = dedupe([].concat(m, s));
+    } else if (useSub) {
+      out[key] = isObj(s) ? unionMerge({}, s) : isArr(s) ? [].concat(s) : s;
+    } else if (useMain) {
+      out[key] = isObj(m) ? unionMerge(m, {}) : isArr(m) ? [].concat(m) : m;
+    }
+  });
+  return out;
+}
+
+/**
+ * 递归删除键值为 undefined 的词条（对象中不写入该 key，数组中过滤掉 undefined）
+ */
+function cleanUndefined(obj) {
+  if (obj === undefined || obj === null) {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    return obj.filter(function (item) {
+      return item !== undefined;
+    }).map(function (item) {
+      return (typeof item === "undefined" ? "undefined" : (0, _typeof3.default)(item)) === "object" && item !== null ? cleanUndefined(item) : item;
+    });
+  }
+  if ((typeof obj === "undefined" ? "undefined" : (0, _typeof3.default)(obj)) === "object") {
+    var cleaned = {};
+    for (var key in obj) {
+      if (obj[key] !== undefined) {
+        cleaned[key] = (0, _typeof3.default)(obj[key]) === "object" && obj[key] !== null ? cleanUndefined(obj[key]) : obj[key];
+      }
+    }
+    return cleaned;
+  }
+  return obj;
+}
+
 function mergeJson(main, file, outPath) {
   var action = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
 
@@ -40,6 +134,7 @@ function mergeJson(main, file, outPath) {
     }
     return merge.apply(undefined, data);
   }).then(function (data) {
+    data = cleanUndefined(data);
     if (!_path2.default.extname(outPath)) {
       outPath = _path2.default.join(outPath, "merge.json");
     }
@@ -54,4 +149,330 @@ function mergeJson(main, file, outPath) {
   });
 }
 
-exports.default = mergeJson;
+/**
+ * 合并两个目录下对应相同分类文件夹的 JSON 文件（同语种合并）。
+ * 始终做完全合并（两边所有 key 取并集），再对数组值去重。
+ * @param {String} dir1 第一个目录路径
+ * @param {String} dir2 第二个目录路径
+ * @param {String} outDir 输出目录路径
+ * @param {Number} action 保留参数，目录合并时忽略（始终完全合并+去重）
+ * @returns {Promise} 返回 Promise
+ */
+function mergeJsonFolders(dir1, dir2, outDir) {
+  var action = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
+
+  // 确保目录路径是绝对路径
+  dir1 = _path2.default.resolve(dir1);
+  dir2 = _path2.default.resolve(dir2);
+  outDir = _path2.default.resolve(outDir);
+
+  // 检查目录是否存在
+  if (!_fs2.default.existsSync(dir1)) {
+    return Promise.reject(new Error("\u76EE\u5F55\u4E0D\u5B58\u5728: " + dir1));
+  }
+  if (!_fs2.default.existsSync(dir2)) {
+    return Promise.reject(new Error("\u76EE\u5F55\u4E0D\u5B58\u5728: " + dir2));
+  }
+
+  // 扫描两个目录，获取子文件夹
+  var scan1 = (0, _index.scanFolder)(dir1);
+  var scan2 = (0, _index.scanFolder)(dir2);
+
+  // 获取两个目录的直接子文件夹名称
+  var getSubFolders = function getSubFolders(baseDir, folders) {
+    var subFolders = new Map();
+    folders.forEach(function (folderPath) {
+      var relativePath = _path2.default.relative(baseDir, folderPath);
+      var parts = relativePath.split(_path2.default.sep);
+      // 只获取第一层子文件夹
+      if (parts.length === 1 && parts[0] !== '') {
+        var folderName = parts[0];
+        if (!subFolders.has(folderName)) {
+          subFolders.set(folderName, folderPath);
+        }
+      }
+    });
+    return subFolders;
+  };
+
+  var subFolders1 = getSubFolders(dir1, scan1.folders);
+  var subFolders2 = getSubFolders(dir2, scan2.folders);
+
+  // 找到相同名称的文件夹（需要合并的）
+  var commonFolders = [];
+  subFolders1.forEach(function (folderPath1, folderName) {
+    if (subFolders2.has(folderName)) {
+      commonFolders.push({
+        name: folderName,
+        path1: folderPath1,
+        path2: subFolders2.get(folderName)
+      });
+    }
+  });
+
+  // 仅在 dir1 中存在的文件夹（无同名则原样输出）
+  var onlyInDir1 = [];
+  subFolders1.forEach(function (folderPath, folderName) {
+    if (!subFolders2.has(folderName)) {
+      onlyInDir1.push({ name: folderName, path: folderPath });
+    }
+  });
+
+  // 仅在 dir2 中存在的文件夹（无同名则原样输出）
+  var onlyInDir2 = [];
+  subFolders2.forEach(function (folderPath, folderName) {
+    if (!subFolders1.has(folderName)) {
+      onlyInDir2.push({ name: folderName, path: folderPath });
+    }
+  });
+
+  if (commonFolders.length > 0) {
+    (0, _index.log)("\u627E\u5230 " + commonFolders.length + " \u4E2A\u76F8\u540C\u540D\u79F0\u7684\u6587\u4EF6\u5939\uFF08\u5C06\u5408\u5E76\uFF09", _index.LOG_TYPE.LOG);
+  }
+  if (onlyInDir1.length > 0) {
+    (0, _index.log)("dir1 \u4E2D " + onlyInDir1.length + " \u4E2A\u65E0\u540C\u540D\u6587\u4EF6\u5939\uFF08\u5C06\u539F\u6837\u8F93\u51FA\uFF09", _index.LOG_TYPE.LOG);
+  }
+  if (onlyInDir2.length > 0) {
+    (0, _index.log)("dir2 \u4E2D " + onlyInDir2.length + " \u4E2A\u65E0\u540C\u540D\u6587\u4EF6\u5939\uFF08\u5C06\u539F\u6837\u8F93\u51FA\uFF09", _index.LOG_TYPE.LOG);
+  }
+
+  // 获取文件夹内的 JSON 文件列表（供合并与原样输出共用）
+  var getJsonFiles = function getJsonFiles(folderPath) {
+    var files = [];
+    try {
+      var items = _fs2.default.readdirSync(folderPath);
+      items.forEach(function (item) {
+        var itemPath = _path2.default.join(folderPath, item);
+        var stat = _fs2.default.statSync(itemPath);
+        if (stat.isFile() && _path2.default.extname(item).toLowerCase() === '.json') {
+          files.push({
+            name: item,
+            path: itemPath
+          });
+        }
+      });
+    } catch (error) {
+      (0, _index.log)("\u8BFB\u53D6\u6587\u4EF6\u5939\u5931\u8D25: " + folderPath + ", " + error.message, _index.LOG_TYPE.ERROR);
+    }
+    return files;
+  };
+
+  // 处理同名文件夹（合并）
+  var mergePromises = commonFolders.map(function (_ref) {
+    var name = _ref.name,
+        path1 = _ref.path1,
+        path2 = _ref.path2;
+
+    var jsonFiles1 = getJsonFiles(path1);
+    var jsonFiles2 = getJsonFiles(path2);
+
+    // 创建文件名映射，找到对应的JSON文件
+    var fileMap1 = new Map(jsonFiles1.map(function (f) {
+      return [f.name, f.path];
+    }));
+    var fileMap2 = new Map(jsonFiles2.map(function (f) {
+      return [f.name, f.path];
+    }));
+
+    // 找到所有需要合并的文件（两个文件夹中都存在的同名文件）
+    var filesToMerge = [];
+    fileMap1.forEach(function (filePath1, fileName) {
+      if (fileMap2.has(fileName)) {
+        filesToMerge.push({
+          fileName: fileName,
+          path1: filePath1,
+          path2: fileMap2.get(fileName)
+        });
+      }
+    });
+
+    // 如果没有同名文件，尝试合并所有文件
+    if (filesToMerge.length === 0) {
+      // 如果两个文件夹中都有文件，尝试合并第一个文件
+      if (jsonFiles1.length > 0 && jsonFiles2.length > 0) {
+        filesToMerge.push({
+          fileName: jsonFiles1[0].name,
+          path1: jsonFiles1[0].path,
+          path2: jsonFiles2[0].path
+        });
+      } else if (jsonFiles1.length > 0) {
+        // 只有第一个文件夹有文件
+        jsonFiles1.forEach(function (file) {
+          filesToMerge.push({
+            fileName: file.name,
+            path1: file.path,
+            path2: null
+          });
+        });
+      } else if (jsonFiles2.length > 0) {
+        // 只有第二个文件夹有文件
+        jsonFiles2.forEach(function (file) {
+          filesToMerge.push({
+            fileName: file.name,
+            path1: null,
+            path2: file.path
+          });
+        });
+      }
+    }
+
+    var loadJsonStrict = function loadJsonStrict(p) {
+      return p ? (0, _index.loadFile)(p).then(function (raw) {
+        return JSON.parse(raw);
+      }) : Promise.resolve(null);
+    };
+
+    // 合并每个文件
+    return Promise.all(filesToMerge.map(function (_ref2) {
+      var fileName = _ref2.fileName,
+          path1 = _ref2.path1,
+          path2 = _ref2.path2;
+
+      return Promise.all([loadJsonStrict(path1), loadJsonStrict(path2)]).then(function (data) {
+        var d0 = data[0];
+        var d1 = data[1];
+        var mergedData = void 0;
+        if (!d0 && !d1) {
+          return null;
+        }
+        if (!d0) {
+          mergedData = (typeof d1 === "undefined" ? "undefined" : (0, _typeof3.default)(d1)) === "object" && d1 !== null ? d1 : {};
+        } else if (!d1) {
+          mergedData = (typeof d0 === "undefined" ? "undefined" : (0, _typeof3.default)(d0)) === "object" && d0 !== null ? d0 : {};
+        } else {
+          // 同语种合并：unionMerge(主, 次)，次优先，不引入 undefined
+          mergedData = unionMerge(d0, d1);
+        }
+
+        // 去重和清理：数组按元素去重并过滤undefined；对象递归对数组值去重并移除undefined值
+        if (Array.isArray(mergedData)) {
+          var seen = new Set();
+          mergedData = mergedData.filter(function (item) {
+            // 过滤掉undefined和null
+            if (item === undefined || item === null) {
+              return false;
+            }
+            var key = (typeof item === "undefined" ? "undefined" : (0, _typeof3.default)(item)) === 'object' && item !== null ? JSON.stringify(item) : String(item);
+            if (seen.has(key)) return false;
+            seen.add(key);
+            return true;
+          });
+        } else if ((typeof mergedData === "undefined" ? "undefined" : (0, _typeof3.default)(mergedData)) === 'object' && mergedData !== null) {
+          var deduplicateObject = function deduplicateObject(obj) {
+            var result = {};
+            for (var key in obj) {
+              // 跳过undefined值
+              if (obj[key] === undefined) {
+                continue;
+              }
+              if (Array.isArray(obj[key])) {
+                (function () {
+                  var seen = new Set();
+                  result[key] = obj[key].filter(function (item) {
+                    // 过滤掉undefined和null
+                    if (item === undefined || item === null) {
+                      return false;
+                    }
+                    var itemKey = (typeof item === "undefined" ? "undefined" : (0, _typeof3.default)(item)) === 'object' && item !== null ? JSON.stringify(item) : String(item);
+                    if (seen.has(itemKey)) return false;
+                    seen.add(itemKey);
+                    return true;
+                  });
+                })();
+              } else if ((0, _typeof3.default)(obj[key]) === 'object' && obj[key] !== null) {
+                result[key] = deduplicateObject(obj[key]);
+              } else {
+                // 只保留非undefined的值
+                if (obj[key] !== undefined) {
+                  result[key] = obj[key];
+                }
+              }
+            }
+            return result;
+          };
+          mergedData = deduplicateObject(mergedData);
+        }
+
+        // 创建输出目录结构
+        var outputFolder = _path2.default.join(outDir, name);
+        (0, _index.createFolder)(outputFolder);
+        var outputPath = _path2.default.join(outputFolder, fileName);
+
+        // 兜底：避免写出 undefined / null 导致输出文件内容异常；并删除键值为 undefined 的词条
+        if (mergedData === undefined || mergedData === null) {
+          (0, _index.log)("\u5408\u5E76\u7ED3\u679C\u4E3A\u7A7A\uFF0C\u5DF2\u81EA\u52A8\u5199\u51FA\u7A7A\u5BF9\u8C61\uFF1Afolder=" + name + ", file=" + fileName, _index.LOG_TYPE.WARNING);
+          mergedData = {};
+        } else {
+          mergedData = cleanUndefined(mergedData);
+        }
+
+        return (0, _index.writeJson)(mergedData, outputPath).then(function () {
+          (0, _index.log)("\u5408\u5E76\u5B8C\u6210: " + outputPath, _index.LOG_TYPE.DONE);
+          return { folder: name, file: fileName, path: outputPath };
+        }).catch(function (error) {
+          (0, _index.log)("\u5408\u5E76\u5931\u8D25: " + outputPath + ", " + error.message, _index.LOG_TYPE.ERROR);
+          return null;
+        });
+      }).catch(function (error) {
+        (0, _index.log)("\u52A0\u8F7DJSON\u6587\u4EF6\u5931\u8D25: " + error.message, _index.LOG_TYPE.ERROR);
+        return null;
+      });
+    }));
+  });
+
+  // 无同名文件夹：原样输出 dir1 中独有的文件夹及其 JSON
+  var copyFromDir1Promises = onlyInDir1.map(function (_ref3) {
+    var name = _ref3.name,
+        folderPath = _ref3.path;
+
+    var outputFolder = _path2.default.join(outDir, name);
+    (0, _index.createFolder)(outputFolder);
+    var jsonFiles = getJsonFiles(folderPath);
+    return Promise.all(jsonFiles.map(function (f) {
+      return (0, _index.loadJson)(f.path).then(function (data) {
+        data = cleanUndefined(data);
+        var outputPath = _path2.default.join(outputFolder, f.name);
+        return (0, _index.writeJson)(data, outputPath).then(function () {
+          (0, _index.log)("\u539F\u6837\u8F93\u51FA: " + outputPath, _index.LOG_TYPE.DONE);
+          return { folder: name, file: f.name, path: outputPath };
+        });
+      });
+    }));
+  });
+
+  // 无同名文件夹：原样输出 dir2 中独有的文件夹及其 JSON
+  var copyFromDir2Promises = onlyInDir2.map(function (_ref4) {
+    var name = _ref4.name,
+        folderPath = _ref4.path;
+
+    var outputFolder = _path2.default.join(outDir, name);
+    (0, _index.createFolder)(outputFolder);
+    var jsonFiles = getJsonFiles(folderPath);
+    return Promise.all(jsonFiles.map(function (f) {
+      return (0, _index.loadJson)(f.path).then(function (data) {
+        data = cleanUndefined(data);
+        var outputPath = _path2.default.join(outputFolder, f.name);
+        return (0, _index.writeJson)(data, outputPath).then(function () {
+          (0, _index.log)("\u539F\u6837\u8F93\u51FA: " + outputPath, _index.LOG_TYPE.DONE);
+          return { folder: name, file: f.name, path: outputPath };
+        });
+      });
+    }));
+  });
+
+  var allPromises = [].concat(mergePromises, copyFromDir1Promises, copyFromDir2Promises);
+
+  return Promise.all(allPromises).then(function (results) {
+    var successCount = results.flat().filter(function (r) {
+      return r !== null;
+    }).length;
+    (0, _index.log)("\u5408\u5E76\u5B8C\u6210\uFF0C\u6210\u529F\u5904\u7406 " + successCount + " \u4E2A\u6587\u4EF6", _index.LOG_TYPE.DONE);
+    return results;
+  }).catch(function (error) {
+    (0, _index.log)("\u5408\u5E76\u76EE\u5F55\u5931\u8D25: " + error.message, _index.LOG_TYPE.ERROR);
+    return [];
+  });
+}
+
+exports.default = mergeJson;
+exports.mergeJsonFolders = mergeJsonFolders;

package/dist/util/config.js

@@ -20,49 +20,53 @@ var CONFIG_FILE_NAME = "b28.config.js";
 var TRANS_NAME_REGEX = /^_$/;
 
 var COMMAD = {
-  /**
-   * 提取词条
+  /**
+   * 提取词条
    */
   GET_WORDS: 0,
-  /**
-   * 翻译文件
+  /**
+   * 翻译文件
    */
   TRANSLATE: 1,
-  /**
-   * 翻译检查
+  /**
+   * 翻译检查
    */
   CHECK_TRANSLATE: 2,
-  /**
-   * Excel转JSON
+  /**
+   * Excel转JSON
    */
   EXCEL_TO_JSON: 3,
-  /**
-   * JSON转Excel
+  /**
+   * JSON转Excel
    */
   JSON_TO_EXCEL: 4,
-  /**
-   * JSON文件合并
+  /**
+   * JSON文件合并
    */
   MERGE_JSON: 5,
-  /**
-   * 原厂代码处理添加翻译
+  /**
+   * 原厂代码处理添加翻译
    */
   ORIGINAL_CODE: 6,
-  /**
-   * 提取词条及json文件生成一个excel表格
+  /**
+   * 提取词条及json文件生成一个excel表格
    */
   GET_ALLWORDS: 7,
-  /**
-   * 翻译文件检查
+  /**
+   * 翻译文件检查
    */
   CHECK_LANGEXCEL: 8,
-  /**
-   * 文件转码
+  /**
+   * 文件转码
    */
-  TRANS_ENCODE: 9
+  TRANS_ENCODE: 9,
+  /**
+   * 合并Excel文件
+   */
+  MERGE_EXCEL: 10
 };
 
-var COMMAD_TEXT = ["提取词条", "翻译文件", "翻译检查", "Excel转JSON", "JSON转Excel", "JSON合并", "原厂代码添加翻译", "提取词条及json文件生成一个excel表格", "翻译文件检查", "文件转码"];
+var COMMAD_TEXT = ["提取词条", "翻译文件", "翻译检查", "Excel转JSON", "JSON转Excel", "JSON合并", "原厂代码添加翻译", "提取词条及json文件生成一个excel表格", "翻译文件检查", "文件转码", "合并Excel文件"];
 
 var valid = {
   // 空或者存在的地址
@@ -105,6 +109,23 @@ var valid = {
       return "请输入有效的文件地址";
     }
     return true;
+  },
+
+  // 存在的文件或文件夹
+  fileOrFolder: function fileOrFolder(val) {
+    val = val || "";
+    val = val.replace(/(^\s*)|(\s*$)/g, "");
+    if (val === "") {
+      return "必填";
+    }
+
+    if (!_path2.default.isAbsolute(val)) {
+      val = _path2.default.resolve(process.cwd(), val);
+    }
+    if (!_fs2.default.existsSync(val)) {
+      return "请输入有效的文件或目录地址";
+    }
+    return true;
   }
 };
 
@@ -256,13 +277,13 @@ var baseQuestions = [{
 }], [{
   type: "input",
   name: "mainJsonPath",
-  message: "主json文件地址：",
-  validate: valid.existFile
+  message: "主json文件地址或目录：",
+  validate: valid.fileOrFolder
 }, {
   type: "input",
   name: "mergeJsonPath",
-  message: "次json文件地址：",
-  validate: valid.existFile
+  message: "次json文件地址或目录：",
+  validate: valid.fileOrFolder
 }, {
   type: "input",
   name: "outMergeJsonPath",
@@ -370,10 +391,47 @@ var baseQuestions = [{
   name: "transEncode",
   message: "转码后文件的编码方式(默认UTF-8)",
   default: "utf-8"
+}], [{
+  type: "input",
+  name: "excelPath1",
+  message: "第一个Excel文件地址：",
+  validate: valid.existFile
+}, {
+  type: "input",
+  name: "sheetName1",
+  message: "第一个Excel中对应的sheet：",
+  default: ""
+}, {
+  type: "input",
+  name: "excelPath2",
+  message: "第二个Excel文件地址：",
+  validate: valid.existFile
+}, {
+  type: "input",
+  name: "sheetName2",
+  message: "第二个Excel中对应的sheet：",
+  default: ""
+}, {
+  type: "input",
+  name: "keyName",
+  message: "key对应列：",
+  default: "EN"
+}, {
+  type: "input",
+  name: "valueName",
+  message: "value对应列（ALL代表所有语种列）：",
+  default: "ALL"
+}, {
+  type: "input",
+  name: "outPath",
+  message: "输出json文件目录：",
+  default: function _default(answers) {
+    return (0, _index.getDirname)(answers.excelPath1);
+  }
 }]];
 
-/**
- * 忽略文件正则
+/**
+ * 忽略文件正则
  */
 var EXCLUDE_FILE = "**/{img,images,lang,b28,goform,node_modules,cgi-bin,css}/**";
 var EXCLUDE_FILE_END = "**/{img,lang,b28,goform,cgi-bin,*.min.js,*shiv.js,*respond.js,*shim.js,.gitignore,.pidTmp,*.css,*.jpg,*.png,*.gif,*.bat,*.cgi}";
@@ -382,12 +440,12 @@ var EXTNAME_VUE = "**/*.vue";
 var EXTNAME_OTHER = "**/{*.jsx,*.ts}";
 var EXTNAME_HTML = "**/{*.aspx,*.asp,*.ejs,*.html,*.htm}";
 var TRANS_EXCLUDE = "**/{*.min.js,*shiv.js,*respond.js,*shim.js,.gitignore,.pidTmp,*.css,*.jpg,*.jpeg,*.png,*.gif,*.bat,*.cgi}";
-/**
- * 不进行匹配词条的正则
+/**
+ * 不进行匹配词条的正则
  */
 var IGNORE_REGEXP = [/^[a-z]*[0-9]+[a-z]*$/i, /^[a-z]$/i, /^(mac|ip|TPC|QVLAN|VLAN|SSID|PPPoE|WPA|WPA2|WPA2-PSK|WPA-PSK|WEP|TKIP|AES|TKIP&AES|N\/A|mBPS|KB\/s|ping|UPnP|ASCII|hex|APSD|)$/i, /<%([\s\S]*)%>/i, /\(\[([\s\S]*)\]\)/i, /^(&nbsp;)+$/i, /[a-z0-9]*&[a-z]*=/i, /^(\s*<\s*\/([a-z0-9]+)?>\s*)*$/i, /^((ht|f)tps?):\/\/([\w\-]+(\.[\w\-]+)*\/)*[\w\-]+(\.[\w\-]+)*\/?(\?([\w\-\.,@?^=%&:\/~\+#]*)+)?/i];
-/**
- * 不进行匹配词条的规则函数
+/**
+ * 不进行匹配词条的规则函数
  */
 var IGNORE_WORDS = ["none", "visible", "display", "block"];
 var IGNORE_FUNCTIONS = [