util-helpers 4.15.0 → 4.15.1

package/esm/filterTree.js

@@ -32,12 +32,11 @@ import { isObject } from "./utils/type";
 function filterTree(tree, predicate) {
   var childrenField = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
   var nodeAssign = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'spread';
-  if (!Array.isArray(tree)) {
-    return tree;
-  }
-
   /** @type {T[]} */
   var result = [];
+  if (!Array.isArray(tree)) {
+    return result;
+  }
   tree.forEach(function (item) {
     var newItem = item;
     if (isObject(item)) {

package/esm/findTreeNode.js

@@ -34,6 +34,9 @@ function findTreeNode(tree, predicate) {
 
   /** @type {T|undefined} */
   var node;
+  if (!Array.isArray(tree)) {
+    return node;
+  }
   var _iterator = _createForOfIteratorHelper(tree),
     _step;
   try {

package/esm/findTreeNodes.js

@@ -37,6 +37,9 @@ function findTreeNodes(tree, predicate) {
 
   /** @type {T[]} */
   var nodes = [];
+  if (!Array.isArray(tree)) {
+    return nodes;
+  }
   var _iterator = _createForOfIteratorHelper(tree),
     _step;
   try {

package/esm/findTreeSelect.js

@@ -11,14 +11,13 @@ import { isObject } from "./utils/type";
  * @template {(item: T) => boolean} F
  * @param {T[]} tree 树结构数据
  * @param {F} predicate 遍历每一项执行的函数，参数是当前遍历到的节点数据，如果返回 Truthy 将返回包含该节点的所有父级节点
- * @param {string} [childrenField='children'] 子级字段名
+ * @param {string} [childrenField] 子级字段名
  * @param {T[]} [path=[]] 当前遍历路径
  * @returns {T[]}
  */
-function internalFindTreeSelect(tree, predicate) {
-  var childrenField = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
+function internalFindTreeSelect(tree, predicate, childrenField) {
   var path = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-  if (!tree) {
+  if (!Array.isArray(tree)) {
     return [];
   }
   var _iterator = _createForOfIteratorHelper(tree),

package/esm/listToTree.js

@@ -9,29 +9,30 @@ import { isObject } from "./utils/type";
  * @private
  * @template {Record<string,any>} [T=Record<string,any>]
  * @param {T[]} arr 列表数据
- * @param {object} options 配置项
+ * @param {object} [options] 配置项
  * @param {string} [options.childrenField='children'] 子级字段名称
- * @param {'none'|'null'|'array'} [options.emptyChildrenValue='none'] 子级为空时的值，none表示删除该子级，null表示为null，array表示为[]。
+ * @param {'none'|'null'} [options.emptyChildrenValue='none'] 子级为空时的值，none表示删除该子级，null表示为null，array表示为[]。
  */
-function processEmptyChildren(arr) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var _options$childrenFiel = options.childrenField,
-    childrenField = _options$childrenFiel === void 0 ? 'children' : _options$childrenFiel,
-    _options$emptyChildre = options.emptyChildrenValue,
-    emptyChildrenValue = _options$emptyChildre === void 0 ? 'none' : _options$emptyChildre;
+function processEmptyChildren(arr, options) {
+  var _ref = options || {},
+    _ref$childrenField = _ref.childrenField,
+    childrenField = _ref$childrenField === void 0 ? 'children' : _ref$childrenField,
+    _ref$emptyChildrenVal = _ref.emptyChildrenValue,
+    emptyChildrenValue = _ref$emptyChildrenVal === void 0 ? 'none' : _ref$emptyChildrenVal;
   arr.forEach(function (item) {
-    if (isObject(item) && Array.isArray(item[childrenField])) {
-      if (item[childrenField].length <= 0) {
-        if (emptyChildrenValue === 'null') {
-          // @ts-ignore
-          item[childrenField] = null;
-        } else if (emptyChildrenValue === 'none') {
-          delete item[childrenField];
-        }
+    // if (isObject(item) && Array.isArray(item[childrenField])) {
+    if (item[childrenField].length <= 0) {
+      if (emptyChildrenValue === 'null') {
+        // @ts-ignore
+        item[childrenField] = null;
+        // } else if (emptyChildrenValue === 'none') { // emptyChildrenValue='array' 不会执行该内部方法 
       } else {
-        processEmptyChildren(item[childrenField], options);
+        delete item[childrenField];
       }
+    } else {
+      processEmptyChildren(item[childrenField], options);
     }
+    // }
   });
 }
 
@@ -44,7 +45,7 @@ function processEmptyChildren(arr) {
  * @template {Record<string,any>} [T=Record<string,any>]
  * @template {*} [R=T&Record<string,any>]
  * @param {T[]} list 列表数据
- * @param {object} options 配置项
+ * @param {object} [options] 配置项
  * @param {string} [options.keyField='id'] 当前数据的键值字段名称
  * @param {string} [options.parentField='pid'] 当前数据的父级字段名称
  * @param {string} [options.childrenField='children'] 子级字段名称
@@ -70,24 +71,27 @@ function processEmptyChildren(arr) {
  * // [{"id":"1","name":"首页","code":"trade","pid":null},{"id":"2","name":"交易管理","code":"trade","pid":null,"childs":[{"id":"3","name":"交易查询","code":"trade-1","pid":"2","childs":[{"id":"4","name":"交易查询-查询操作","code":"trade-1-1","pid":"3"}]}]},{"id":"5","name":"权限管理","code":"authorization","pid":null,"childs":[{"id":"6","name":"角色管理","code":"authorization-1","pid":"5"},{"id":"7","name":"用户管理","code":"authorization-2","pid":"5"}]}]
  * 
  */
-function listToTree(list) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var _options$keyField = options.keyField,
-    keyField = _options$keyField === void 0 ? 'id' : _options$keyField,
-    _options$parentField = options.parentField,
-    parentField = _options$parentField === void 0 ? 'pid' : _options$parentField,
-    _options$childrenFiel2 = options.childrenField,
-    childrenField = _options$childrenFiel2 === void 0 ? 'children' : _options$childrenFiel2,
-    _options$emptyChildre2 = options.emptyChildrenValue,
-    emptyChildrenValue = _options$emptyChildre2 === void 0 ? 'none' : _options$emptyChildre2,
-    _options$nodeAssign = options.nodeAssign,
-    nodeAssign = _options$nodeAssign === void 0 ? 'spread' : _options$nodeAssign;
+function listToTree(list, options) {
+  var _ref2 = options || {},
+    _ref2$keyField = _ref2.keyField,
+    keyField = _ref2$keyField === void 0 ? 'id' : _ref2$keyField,
+    _ref2$parentField = _ref2.parentField,
+    parentField = _ref2$parentField === void 0 ? 'pid' : _ref2$parentField,
+    _ref2$childrenField = _ref2.childrenField,
+    childrenField = _ref2$childrenField === void 0 ? 'children' : _ref2$childrenField,
+    _ref2$emptyChildrenVa = _ref2.emptyChildrenValue,
+    emptyChildrenValue = _ref2$emptyChildrenVa === void 0 ? 'none' : _ref2$emptyChildrenVa,
+    _ref2$nodeAssign = _ref2.nodeAssign,
+    nodeAssign = _ref2$nodeAssign === void 0 ? 'spread' : _ref2$nodeAssign;
 
   /** @type {R[]} */
   var tree = [];
 
   /** @type {Object.<string, T[]>} */
   var record = {};
+  if (!Array.isArray(list)) {
+    return tree;
+  }
   list.forEach(function (item) {
     if (isObject(item)) {
       var newItem = nodeAssign === 'spread' ? _objectSpread({}, item) : item;

package/esm/parseIdCard.js

@@ -98,24 +98,21 @@ var Provinces = [
  *
  */
 function parseIdCard(id) {
-  if (!regIdCard.test(id)) {
+  var match = regIdCard.exec(id);
+  if (!match) {
     return null;
   }
 
-  /** @type {RegExpExecArray} */
-  // @ts-ignore
-  var info = regIdCard.exec(id);
-
   /** @type {{ province: string, city: string, area: string, year: string, month: string, day: string, gender: string }} */
   // @ts-ignore
-  var origin = (info === null || info === void 0 ? void 0 : info.groups) || {
-    province: info[1],
-    city: info[2],
-    area: info[3],
-    year: info[4],
-    month: info[5],
-    day: info[6],
-    gender: info[7]
+  var origin = match.groups || {
+    province: match[1],
+    city: match[2],
+    area: match[3],
+    year: match[4],
+    month: match[5],
+    day: match[6],
+    gender: match[7]
   };
   var province = Provinces.find(function (item) {
     return item[0] === origin.province;

package/esm/randomString.js

@@ -4,14 +4,12 @@ var defaultChars = numberChars + letterChars + letterChars.toUpperCase();
 
 /**
  * @private
- * @param {number} [len=0] 长度
- * @param {string} [optionalChars] 允许的字符，默认为数字和大小写字母
+ * @param {number} len 长度
+ * @param {string} optionalChars 允许的字符，默认为数字和大小写字母
  * @param {string} [prefix=''] 前缀部分，不计入长度
  * @returns {string}
  */
-function internalRandomString() {
-  var len = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-  var optionalChars = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultChars;
+function internalRandomString(len, optionalChars) {
   var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
   while (len-- > 0) {
     var r = optionalChars[Math.floor(Math.random() * optionalChars.length)];

package/esm/transformFieldNames.js

@@ -55,8 +55,7 @@ function transformFieldNames(data, fieldNames, childrenField) {
    * @param {Array.<object>} arr 列表数据
    * @returns {*}
    */
-  function recusion() {
-    var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  function recusion(arr) {
     return arr.map(function (item) {
       if (!isObject(item)) {
         return item;

package/esm/treeToList.js

@@ -24,6 +24,9 @@ import { isObject } from "./utils/type";
 function treeToList(tree, childrenField) {
   /** @type {R[]} */
   var list = [];
+  if (!Array.isArray(tree)) {
+    return list;
+  }
 
   /**
    * 递归遍历
@@ -35,7 +38,7 @@ function treeToList(tree, childrenField) {
         var newItem = _objectSpread({}, item);
         // @ts-ignore
         list.push(newItem);
-        if (newItem !== null && newItem !== void 0 && newItem[childrenField]) {
+        if (newItem[childrenField]) {
           if (Array.isArray(newItem[childrenField]) && newItem[childrenField].length > 0) {
             recusion(newItem[childrenField]);
           }

package/esm/utils/config.js

@@ -15,5 +15,5 @@ function setDisableWarning(bool) {
 }
 
 // eslint-disable-next-line no-undef
-var version = "4.15.0";
+var version = "4.15.1";
 export { config, setDisableWarning, version };

package/lib/filterTree.js

@@ -40,12 +40,11 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function filterTree(tree, predicate) {
   var childrenField = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
   var nodeAssign = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'spread';
-  if (!Array.isArray(tree)) {
-    return tree;
-  }
-
   /** @type {T[]} */
   var result = [];
+  if (!Array.isArray(tree)) {
+    return result;
+  }
   tree.forEach(function (item) {
     var newItem = item;
     if ((0, _type.isObject)(item)) {

package/lib/findTreeNode.js

@@ -42,6 +42,9 @@ function findTreeNode(tree, predicate) {
 
   /** @type {T|undefined} */
   var node;
+  if (!Array.isArray(tree)) {
+    return node;
+  }
   var _iterator = _createForOfIteratorHelper(tree),
     _step;
   try {

package/lib/findTreeNodes.js

@@ -45,6 +45,9 @@ function findTreeNodes(tree, predicate) {
 
   /** @type {T[]} */
   var nodes = [];
+  if (!Array.isArray(tree)) {
+    return nodes;
+  }
   var _iterator = _createForOfIteratorHelper(tree),
     _step;
   try {

package/lib/findTreeSelect.js

@@ -16,14 +16,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
  * @template {(item: T) => boolean} F
  * @param {T[]} tree 树结构数据
  * @param {F} predicate 遍历每一项执行的函数，参数是当前遍历到的节点数据，如果返回 Truthy 将返回包含该节点的所有父级节点
- * @param {string} [childrenField='children'] 子级字段名
+ * @param {string} [childrenField] 子级字段名
  * @param {T[]} [path=[]] 当前遍历路径
  * @returns {T[]}
  */
-function internalFindTreeSelect(tree, predicate) {
-  var childrenField = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
+function internalFindTreeSelect(tree, predicate, childrenField) {
   var path = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-  if (!tree) {
+  if (!Array.isArray(tree)) {
     return [];
   }
   var _iterator = _createForOfIteratorHelper(tree),

package/lib/listToTree.js

@@ -17,29 +17,30 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * @private
  * @template {Record<string,any>} [T=Record<string,any>]
  * @param {T[]} arr 列表数据
- * @param {object} options 配置项
+ * @param {object} [options] 配置项
  * @param {string} [options.childrenField='children'] 子级字段名称
- * @param {'none'|'null'|'array'} [options.emptyChildrenValue='none'] 子级为空时的值，none表示删除该子级，null表示为null，array表示为[]。
+ * @param {'none'|'null'} [options.emptyChildrenValue='none'] 子级为空时的值，none表示删除该子级，null表示为null，array表示为[]。
  */
-function processEmptyChildren(arr) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var _options$childrenFiel = options.childrenField,
-    childrenField = _options$childrenFiel === void 0 ? 'children' : _options$childrenFiel,
-    _options$emptyChildre = options.emptyChildrenValue,
-    emptyChildrenValue = _options$emptyChildre === void 0 ? 'none' : _options$emptyChildre;
+function processEmptyChildren(arr, options) {
+  var _ref = options || {},
+    _ref$childrenField = _ref.childrenField,
+    childrenField = _ref$childrenField === void 0 ? 'children' : _ref$childrenField,
+    _ref$emptyChildrenVal = _ref.emptyChildrenValue,
+    emptyChildrenValue = _ref$emptyChildrenVal === void 0 ? 'none' : _ref$emptyChildrenVal;
   arr.forEach(function (item) {
-    if ((0, _type.isObject)(item) && Array.isArray(item[childrenField])) {
-      if (item[childrenField].length <= 0) {
-        if (emptyChildrenValue === 'null') {
-          // @ts-ignore
-          item[childrenField] = null;
-        } else if (emptyChildrenValue === 'none') {
-          delete item[childrenField];
-        }
+    // if (isObject(item) && Array.isArray(item[childrenField])) {
+    if (item[childrenField].length <= 0) {
+      if (emptyChildrenValue === 'null') {
+        // @ts-ignore
+        item[childrenField] = null;
+        // } else if (emptyChildrenValue === 'none') { // emptyChildrenValue='array' 不会执行该内部方法 
       } else {
-        processEmptyChildren(item[childrenField], options);
+        delete item[childrenField];
       }
+    } else {
+      processEmptyChildren(item[childrenField], options);
     }
+    // }
   });
 }
 
@@ -52,7 +53,7 @@ function processEmptyChildren(arr) {
  * @template {Record<string,any>} [T=Record<string,any>]
  * @template {*} [R=T&Record<string,any>]
  * @param {T[]} list 列表数据
- * @param {object} options 配置项
+ * @param {object} [options] 配置项
  * @param {string} [options.keyField='id'] 当前数据的键值字段名称
  * @param {string} [options.parentField='pid'] 当前数据的父级字段名称
  * @param {string} [options.childrenField='children'] 子级字段名称
@@ -78,24 +79,27 @@ function processEmptyChildren(arr) {
  * // [{"id":"1","name":"首页","code":"trade","pid":null},{"id":"2","name":"交易管理","code":"trade","pid":null,"childs":[{"id":"3","name":"交易查询","code":"trade-1","pid":"2","childs":[{"id":"4","name":"交易查询-查询操作","code":"trade-1-1","pid":"3"}]}]},{"id":"5","name":"权限管理","code":"authorization","pid":null,"childs":[{"id":"6","name":"角色管理","code":"authorization-1","pid":"5"},{"id":"7","name":"用户管理","code":"authorization-2","pid":"5"}]}]
  * 
  */
-function listToTree(list) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var _options$keyField = options.keyField,
-    keyField = _options$keyField === void 0 ? 'id' : _options$keyField,
-    _options$parentField = options.parentField,
-    parentField = _options$parentField === void 0 ? 'pid' : _options$parentField,
-    _options$childrenFiel2 = options.childrenField,
-    childrenField = _options$childrenFiel2 === void 0 ? 'children' : _options$childrenFiel2,
-    _options$emptyChildre2 = options.emptyChildrenValue,
-    emptyChildrenValue = _options$emptyChildre2 === void 0 ? 'none' : _options$emptyChildre2,
-    _options$nodeAssign = options.nodeAssign,
-    nodeAssign = _options$nodeAssign === void 0 ? 'spread' : _options$nodeAssign;
+function listToTree(list, options) {
+  var _ref2 = options || {},
+    _ref2$keyField = _ref2.keyField,
+    keyField = _ref2$keyField === void 0 ? 'id' : _ref2$keyField,
+    _ref2$parentField = _ref2.parentField,
+    parentField = _ref2$parentField === void 0 ? 'pid' : _ref2$parentField,
+    _ref2$childrenField = _ref2.childrenField,
+    childrenField = _ref2$childrenField === void 0 ? 'children' : _ref2$childrenField,
+    _ref2$emptyChildrenVa = _ref2.emptyChildrenValue,
+    emptyChildrenValue = _ref2$emptyChildrenVa === void 0 ? 'none' : _ref2$emptyChildrenVa,
+    _ref2$nodeAssign = _ref2.nodeAssign,
+    nodeAssign = _ref2$nodeAssign === void 0 ? 'spread' : _ref2$nodeAssign;
 
   /** @type {R[]} */
   var tree = [];
 
   /** @type {Object.<string, T[]>} */
   var record = {};
+  if (!Array.isArray(list)) {
+    return tree;
+  }
   list.forEach(function (item) {
     if ((0, _type.isObject)(item)) {
       var newItem = nodeAssign === 'spread' ? _objectSpread({}, item) : item;

package/lib/parseIdCard.js

@@ -104,24 +104,21 @@ var Provinces = [
  *
  */
 function parseIdCard(id) {
-  if (!regIdCard.test(id)) {
+  var match = regIdCard.exec(id);
+  if (!match) {
     return null;
   }
 
-  /** @type {RegExpExecArray} */
-  // @ts-ignore
-  var info = regIdCard.exec(id);
-
   /** @type {{ province: string, city: string, area: string, year: string, month: string, day: string, gender: string }} */
   // @ts-ignore
-  var origin = (info === null || info === void 0 ? void 0 : info.groups) || {
-    province: info[1],
-    city: info[2],
-    area: info[3],
-    year: info[4],
-    month: info[5],
-    day: info[6],
-    gender: info[7]
+  var origin = match.groups || {
+    province: match[1],
+    city: match[2],
+    area: match[3],
+    year: match[4],
+    month: match[5],
+    day: match[6],
+    gender: match[7]
   };
   var province = Provinces.find(function (item) {
     return item[0] === origin.province;

package/lib/randomString.js

@@ -10,14 +10,12 @@ var defaultChars = numberChars + letterChars + letterChars.toUpperCase();
 
 /**
  * @private
- * @param {number} [len=0] 长度
- * @param {string} [optionalChars] 允许的字符，默认为数字和大小写字母
+ * @param {number} len 长度
+ * @param {string} optionalChars 允许的字符，默认为数字和大小写字母
  * @param {string} [prefix=''] 前缀部分，不计入长度
  * @returns {string}
  */
-function internalRandomString() {
-  var len = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-  var optionalChars = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultChars;
+function internalRandomString(len, optionalChars) {
   var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
   while (len-- > 0) {
     var r = optionalChars[Math.floor(Math.random() * optionalChars.length)];

package/lib/transformFieldNames.js

@@ -60,8 +60,7 @@ function transformFieldNames(data, fieldNames, childrenField) {
    * @param {Array.<object>} arr 列表数据
    * @returns {*}
    */
-  function recusion() {
-    var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  function recusion(arr) {
     return arr.map(function (item) {
       if (!(0, _type.isObject)(item)) {
         return item;

package/lib/treeToList.js

@@ -32,6 +32,9 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function treeToList(tree, childrenField) {
   /** @type {R[]} */
   var list = [];
+  if (!Array.isArray(tree)) {
+    return list;
+  }
 
   /**
    * 递归遍历
@@ -43,7 +46,7 @@ function treeToList(tree, childrenField) {
         var newItem = _objectSpread({}, item);
         // @ts-ignore
         list.push(newItem);
-        if (newItem !== null && newItem !== void 0 && newItem[childrenField]) {
+        if (newItem[childrenField]) {
           if (Array.isArray(newItem[childrenField]) && newItem[childrenField].length > 0) {
             recusion(newItem[childrenField]);
           }

package/lib/utils/config.js

@@ -24,5 +24,5 @@ function setDisableWarning(bool) {
 }
 
 // eslint-disable-next-line no-undef
-var version = "4.15.0";
+var version = "4.15.1";
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "4.15.0",
+  "version": "4.15.1",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -10,6 +10,7 @@
   "scripts": {
     "test": "jest --verbose",
     "test:coverage": "jest --coverage",
+    "test:coverage:local": "cross-env COVERAGE_LOCAL=1 jest --coverage",
     "test:math": "jest --verbose test/math",
     "test:type": "jest --verbose test/type",
     "test:validator": "jest --verbose test/validator",

package/types/listToTree.d.ts

@@ -8,7 +8,7 @@ export default listToTree;
  * @template {Record<string,any>} [T=Record<string,any>]
  * @template {*} [R=T&Record<string,any>]
  * @param {T[]} list 列表数据
- * @param {object} options 配置项
+ * @param {object} [options] 配置项
  * @param {string} [options.keyField='id'] 当前数据的键值字段名称
  * @param {string} [options.parentField='pid'] 当前数据的父级字段名称
  * @param {string} [options.childrenField='children'] 子级字段名称
@@ -40,4 +40,4 @@ declare function listToTree<T extends Record<string, any> = Record<string, any>,
     childrenField?: string | undefined;
     emptyChildrenValue?: "none" | "null" | "array" | undefined;
     nodeAssign?: "spread" | "self" | undefined;
-}): R[];
+} | undefined): R[];