util-helpers 4.21.2 → 4.21.4

package/esm/VERSION.js

@@ -1,4 +1,4 @@
-var VERSION = "4.21.2";
+var VERSION = "4.21.4";
 var VERSION$1 = VERSION;
 
 export { VERSION$1 as default };

package/esm/index.js

@@ -64,6 +64,6 @@ export { default as findTreeSelect } from './findTreeSelect.js';
 export { setDisableWarning } from './utils/config.js';
 export { default as VERSION } from './VERSION.js';
 
-var version = "4.21.2";
+var version = "4.21.4";
 
 export { version };

package/esm/isChinese.js

@@ -1,18 +1,23 @@
 import { toString } from 'ut2';
+import { objectValues } from './utils/native.js';
 
 var chineseDictionary = {
     chineseBasic: '[\u4e00-\u9fa5]',
-    chineseExtend: '[\u9ea6-\u9fef]',
-    chineseExtendA: '[\u3400-\u4DB5]',
-    chineseExtendB: "[\uD840\uDC00-\uD869\uDED6]",
-    chineseExtendC: "[\uD869\uDF00-\uD86D\uDF34]",
+    chineseExtend: '[\u9ea6-\u9fff]',
+    chineseExtend2: '[\uF900-\uFAD9]',
+    chineseExtendA: '[\u3400-\u4DBF]',
+    chineseExtendB: "[\uD840\uDC00-\uD869\uDEDF]",
+    chineseExtendC: "[\uD869\uDF00-\uD86D\uDF38]",
     chineseExtendD: "[\uD86D\uDF40-\uD86E\uDC1D]",
     chineseExtendE: "[\uD86E\uDC20-\uD873\uDEA1]",
-    chineseExtendF: "[\uD873\uDEB0-\uD87A\uDFE0]"
+    chineseExtendF: "[\uD873\uDEB0-\uD87A\uDFE0]",
+    chineseExtendG: "[\uD880\uDC00-\uD884\uDF4A]",
+    chineseExtendH: "[\uD884\uDF50-\uD888\uDFAF]",
+    chineseExtendI: "[\uD87A\uDFF0-\uD87B\uDE5D]"
 };
 var looseChineseRegExp = chineseDictionary.chineseBasic + '+';
 var chineseRegExp = '^' + chineseDictionary.chineseBasic + '+$';
-var chineseWithExtend = '(?:' + chineseDictionary.chineseBasic + '|' + chineseDictionary.chineseExtend + '|' + chineseDictionary.chineseExtendA + '|' + chineseDictionary.chineseExtendB + '|' + chineseDictionary.chineseExtendC + '|' + chineseDictionary.chineseExtendD + '|' + chineseDictionary.chineseExtendE + '|' + chineseDictionary.chineseExtendF + ')';
+var chineseWithExtend = '(?:' + objectValues(chineseDictionary).join('|') + ')';
 var looseChineseExtendRegExp = chineseWithExtend + '+';
 var chineseExtendRegExp = '^' + chineseWithExtend + '+$';
 var supportRegExpUnicode = RegExp.prototype.hasOwnProperty('unicode');

package/esm/transformFieldNames.js

@@ -20,11 +20,14 @@ function transformFieldNames(data, fieldNames, childrenField, nodeAssign) {
             if (childrenField && isArray(newItem[childrenField]) && newItem[childrenField].length > 0) {
                 newItem[childrenField] = recusion(newItem[childrenField].slice());
             }
-            objectKeys(fieldNames).forEach(function (newKey) {
+            var newKeys = objectKeys(fieldNames);
+            newKeys.forEach(function (newKey) {
                 var oldKey = fieldNames[newKey];
                 if (oldKey in newItem) {
                     newItem[newKey] = newItem[oldKey];
-                    delKeys.push(oldKey);
+                    if (newKeys.indexOf(oldKey) === -1) {
+                        delKeys.push(oldKey);
+                    }
                 }
             });
             if (delKeys.length > 0) {

package/esm/utils/native.js

@@ -2,7 +2,8 @@ import { constant, noop } from 'ut2';
 import { URLExisted } from './setup.js';
 
 var objectKeys = Object.keys;
+var objectValues = Object.values;
 var createObjectURL = URLExisted ? URL.createObjectURL : constant('');
 var revokeObjectURL = URLExisted ? URL.revokeObjectURL : noop;
 
-export { createObjectURL, objectKeys, revokeObjectURL };
+export { createObjectURL, objectKeys, objectValues, revokeObjectURL };

package/lib/VERSION.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var VERSION = "4.21.2";
+var VERSION = "4.21.4";
 var VERSION$1 = VERSION;
 
 module.exports = VERSION$1;

package/lib/index.js

@@ -66,7 +66,7 @@ var findTreeSelect = require('./findTreeSelect.js');
 var config = require('./utils/config.js');
 var VERSION = require('./VERSION.js');
 
-exports.version = "4.21.2";
+exports.version = "4.21.4";
 
 exports.isMobile = isMobile;
 exports.isTelephone = isTelephone;

package/lib/isChinese.js

@@ -1,20 +1,25 @@
 'use strict';
 
 var ut2 = require('ut2');
+var native = require('./utils/native.js');
 
 var chineseDictionary = {
     chineseBasic: '[\u4e00-\u9fa5]',
-    chineseExtend: '[\u9ea6-\u9fef]',
-    chineseExtendA: '[\u3400-\u4DB5]',
-    chineseExtendB: "[\uD840\uDC00-\uD869\uDED6]",
-    chineseExtendC: "[\uD869\uDF00-\uD86D\uDF34]",
+    chineseExtend: '[\u9ea6-\u9fff]',
+    chineseExtend2: '[\uF900-\uFAD9]',
+    chineseExtendA: '[\u3400-\u4DBF]',
+    chineseExtendB: "[\uD840\uDC00-\uD869\uDEDF]",
+    chineseExtendC: "[\uD869\uDF00-\uD86D\uDF38]",
     chineseExtendD: "[\uD86D\uDF40-\uD86E\uDC1D]",
     chineseExtendE: "[\uD86E\uDC20-\uD873\uDEA1]",
-    chineseExtendF: "[\uD873\uDEB0-\uD87A\uDFE0]"
+    chineseExtendF: "[\uD873\uDEB0-\uD87A\uDFE0]",
+    chineseExtendG: "[\uD880\uDC00-\uD884\uDF4A]",
+    chineseExtendH: "[\uD884\uDF50-\uD888\uDFAF]",
+    chineseExtendI: "[\uD87A\uDFF0-\uD87B\uDE5D]"
 };
 var looseChineseRegExp = chineseDictionary.chineseBasic + '+';
 var chineseRegExp = '^' + chineseDictionary.chineseBasic + '+$';
-var chineseWithExtend = '(?:' + chineseDictionary.chineseBasic + '|' + chineseDictionary.chineseExtend + '|' + chineseDictionary.chineseExtendA + '|' + chineseDictionary.chineseExtendB + '|' + chineseDictionary.chineseExtendC + '|' + chineseDictionary.chineseExtendD + '|' + chineseDictionary.chineseExtendE + '|' + chineseDictionary.chineseExtendF + ')';
+var chineseWithExtend = '(?:' + native.objectValues(chineseDictionary).join('|') + ')';
 var looseChineseExtendRegExp = chineseWithExtend + '+';
 var chineseExtendRegExp = '^' + chineseWithExtend + '+$';
 var supportRegExpUnicode = RegExp.prototype.hasOwnProperty('unicode');

package/lib/transformFieldNames.js

@@ -22,11 +22,14 @@ function transformFieldNames(data, fieldNames, childrenField, nodeAssign) {
             if (childrenField && ut2.isArray(newItem[childrenField]) && newItem[childrenField].length > 0) {
                 newItem[childrenField] = recusion(newItem[childrenField].slice());
             }
-            native.objectKeys(fieldNames).forEach(function (newKey) {
+            var newKeys = native.objectKeys(fieldNames);
+            newKeys.forEach(function (newKey) {
                 var oldKey = fieldNames[newKey];
                 if (oldKey in newItem) {
                     newItem[newKey] = newItem[oldKey];
-                    delKeys.push(oldKey);
+                    if (newKeys.indexOf(oldKey) === -1) {
+                        delKeys.push(oldKey);
+                    }
                 }
             });
             if (delKeys.length > 0) {

package/lib/utils/native.js

@@ -4,5 +4,6 @@ var ut2 = require('ut2');
 var setup = require('./setup.js');
 
 exports.objectKeys = Object.keys;
+exports.objectValues = Object.values;
 exports.createObjectURL = setup.URLExisted ? URL.createObjectURL : ut2.constant('');
 exports.revokeObjectURL = setup.URLExisted ? URL.revokeObjectURL : ut2.noop;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "4.21.2",
+  "version": "4.21.4",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -24,7 +24,7 @@
     "commit": "cz",
     "prepublishOnly": "npm test && npm run build",
     "tsc": "tsc --noEmit",
-    "prepare": "husky install"
+    "prepare": "husky"
   },
   "repository": {
     "type": "git",
@@ -51,34 +51,36 @@
   },
   "homepage": "https://doly-dev.github.io/util-helpers/index.html",
   "devDependencies": {
-    "@babel/core": "^7.23.9",
-    "@babel/preset-env": "^7.23.9",
-    "@babel/preset-typescript": "^7.23.3",
+    "@babel/core": "^7.24.3",
+    "@babel/preset-env": "^7.24.3",
+    "@babel/preset-typescript": "^7.24.1",
     "@commitlint/cli": "^17.8.1",
     "@commitlint/config-conventional": "^17.8.1",
+    "@commitlint/cz-commitlint": "^17.8.1",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-replace": "^5.0.5",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/jest": "^29.5.12",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
+    "@typescript-eslint/eslint-plugin": "^7.3.1",
+    "@typescript-eslint/parser": "^7.3.1",
     "babel-jest": "^29.7.0",
     "babel-plugin-minify-replace": "^0.5.0",
+    "commitizen": "^4.3.0",
     "cross-env": "^7.0.3",
-    "cz-conventional-changelog": "^3.3.0",
     "docdash": "^2.0.2",
-    "eslint": "^8.56.0",
-    "husky": "^8.0.3",
+    "eslint": "^8.57.0",
+    "husky": "^9.0.11",
+    "inquirer": "8",
     "jest": "^29.7.0",
     "jest-canvas-mock": "^2.5.2",
     "jest-environment-jsdom": "^29.7.0",
     "jsdoc": "^4.0.2",
     "lint-staged": "^13.3.0",
-    "prettier": "^2.8.8",
-    "rollup": "^3.29.4",
-    "typescript": "^5.3.3"
+    "prettier": "^3.2.5",
+    "rollup": "^4.13.0",
+    "typescript": "^5.4.3"
   },
   "lint-staged": {
     "**/*.ts": "eslint",
@@ -86,7 +88,7 @@
   },
   "config": {
     "commitizen": {
-      "path": "./node_modules/cz-conventional-changelog"
+      "path": "@commitlint/cz-commitlint"
     }
   },
   "dependencies": {

package/types/ajax.d.ts

@@ -25,7 +25,7 @@ type AjaxOptions = {
  * @property {boolean} [async=true] 是否异步执行操作
  * @property {string|null} [user=null] 用户名，用于认证用途
  * @property {string|null} [password=null] 密码，用于认证用途
- * @property {object} [headers] 自定义请求头
+ * @property {Object} [headers] 自定义请求头
  * @property {string} [responseType] 响应类型
  * @property {number} [timeout] 请求超时的毫秒数
  * @property {boolean} [withCredentials=false] 跨域请求时是否需要使用凭证

package/types/filterTree.d.ts

@@ -7,11 +7,11 @@ type NodeAssign = 'spread' | 'self';
  * @static
  * @alias module:Tree.filterTree
  * @since 4.15.0
- * @param {object[]} tree 树结构数据
+ * @param {Object[]} tree 树结构数据
  * @param {function} predicate 遍历每一项执行的函数，参数是当前遍历到的节点数据，如果返回 `Truthy` ，结果将包含该节点
  * @param {string} [childrenField='children'] 子级字段名
  * @param {'spread'|'self'} [nodeAssign='spread'] 节点赋值方式。spread表示使用展开运算符创建新值，self表示使用自身对象。
- * @returns {object[]}
+ * @returns {Object[]}
  * @example
  * const menus = [{ id: '1', name: '首页', code: 'trade', pid: null }, { id: '2', name: '交易管理', code: 'trade', pid: null, children: [{ id: '3', name: '交易查询', code: 'trade-1', pid: '2', children: [{ id: '4', name: '交易查询-查询操作', code: 'trade-1-1', pid: '3' }]}]}, { id: '5', name: '权限管理', code: 'authorization', pid: null, children: [{ id: '6', name: '角色管理', code: 'authorization-1', pid: '5' }, { id: '7', name: '用户管理', code: 'authorization-2', pid: '5' }]}];
  *

package/types/findTreeNode.d.ts

@@ -4,10 +4,10 @@
  * @static
  * @alias module:Tree.findTreeNode
  * @since 4.14.0
- * @param {object[]} tree 树结构数据
+ * @param {Object[]} tree 树结构数据
  * @param {function} predicate 遍历每一项执行的函数，参数是当前遍历到的节点数据，如果返回 `Truthy` ，将返回该节点
  * @param {string} [childrenField='children'] 子级字段名
- * @returns {object|undefined}
+ * @returns {Object|undefined}
  * @example
  * const menus = [{ id: '1', name: '首页', code: 'trade', pid: null }, { id: '2', name: '交易管理', code: 'trade', pid: null, children: [{ id: '3', name: '交易查询', code: 'trade-1', pid: '2', children: [{ id: '4', name: '交易查询-查询操作', code: 'trade-1-1', pid: '3' }]}]}, { id: '5', name: '权限管理', code: 'authorization', pid: null, children: [{ id: '6', name: '角色管理', code: 'authorization-1', pid: '5' }, { id: '7', name: '用户管理', code: 'authorization-2', pid: '5' }]}];
  *

package/types/findTreeNodes.d.ts

@@ -4,10 +4,10 @@
  * @static
  * @alias module:Tree.findTreeNodes
  * @since 4.15.0
- * @param {object[]} tree 树结构数据
+ * @param {Object[]} tree 树结构数据
  * @param {function} predicate 遍历每一项执行的函数，参数是当前遍历到的节点数据，如果返回 Truthy ，返回结果将包含该节点
  * @param {string} [childrenField='children'] 子级字段名
- * @returns {object[]}
+ * @returns {Object[]}
  * @example
  * const menus = [{ id: '1', name: '首页', code: 'trade', pid: null }, { id: '2', name: '交易管理', code: 'trade', pid: null, children: [{ id: '3', name: '交易查询', code: 'trade-1', pid: '2', children: [{ id: '4', name: '交易查询-查询操作', code: 'trade-1-1', pid: '3' }]}]}, { id: '5', name: '权限管理', code: 'authorization', pid: null, children: [{ id: '6', name: '角色管理', code: 'authorization-1', pid: '5' }, { id: '7', name: '用户管理', code: 'authorization-2', pid: '5' }]}];
  *

package/types/findTreeSelect.d.ts

@@ -4,10 +4,10 @@
  * @static
  * @alias module:Tree.findTreeSelect
  * @since 4.14.0
- * @param {object[]} tree 树结构数据
+ * @param {Object[]} tree 树结构数据
  * @param {function} predicate 遍历每一项执行的函数，参数是当前遍历到的节点数据，如果返回 Truthy 将返回包含该节点的所有父级节点
  * @param {string} [childrenField='children'] 子级字段名
- * @returns {object[]}
+ * @returns {Object[]}
  * @example
  * const menus = [{ id: '1', name: '首页', code: 'trade', pid: null }, { id: '2', name: '交易管理', code: 'trade', pid: null, children: [{ id: '3', name: '交易查询', code: 'trade-1', pid: '2', children: [{ id: '4', name: '交易查询-查询操作', code: 'trade-1-1', pid: '3' }]}]}, { id: '5', name: '权限管理', code: 'authorization', pid: null, children: [{ id: '6', name: '角色管理', code: 'authorization-1', pid: '5' }, { id: '7', name: '用户管理', code: 'authorization-2', pid: '5' }]}];
  *

package/types/formatMobile.d.ts

@@ -10,7 +10,7 @@ type Options = {
  * @alias module:Processor.formatMobile
  * @since 4.5.0
  * @param {string} mobileNo 手机号码
- * @param {object} [options] 配置项
+ * @param {Object} [options] 配置项
  * @param {string} [options.spaceMark=' '] 间隔字符
  * @returns {string} 格式化后的手机号码
  * @example

package/types/isChinese.d.ts

@@ -14,7 +14,7 @@ type Options = {
  * @param {*} value 要检测的值
  * @param {Object} [options] 配置项
  * @param {boolean} [options.loose=false] 宽松模式。如果为true，只要包含中文即为true
- * @param {boolean} [options.useExtend=false] 使用统一表意文字扩展A-F。注意：如果不支持 `RegExp.prototype.unicode`，扩展字符集将自动不生效，如IE浏览器。
+ * @param {boolean} [options.useExtend=false] 使用统一表意文字扩展A-I。注意：如果不支持 `RegExp.prototype.unicode`，扩展字符集将自动不生效，如IE浏览器。
  * @returns {boolean} 值是否为中文
  * @example
  *

package/types/listToTree.d.ts

@@ -12,14 +12,14 @@ type Options = {
  * @static
  * @alias module:Tree.listToTree
  * @since 4.14.0
- * @param {object[]} list 列表数据
- * @param {object} [options] 配置项
+ * @param {Object[]} list 列表数据
+ * @param {Object} [options] 配置项
  * @param {string} [options.keyField='id'] 当前数据的键值字段名称
  * @param {string} [options.parentField='pid'] 当前数据的父级字段名称
  * @param {string} [options.childrenField='children'] 子级字段名称
  * @param {'none'|'null'|'array'} [options.emptyChildrenValue='none'] 子级为空时的值，none表示删除该子级，null表示为null，array表示为[]。
  * @param {'spread'|'self'} [options.nodeAssign='spread'] 节点赋值方式。spread表示使用展开运算符创建新值，self表示使用自身对象。
- * @returns {object[]} 树结构
+ * @returns {Object[]} 树结构
  * @example
  *
  * const menus = [

package/types/transformFieldNames.d.ts

@@ -9,11 +9,11 @@ type TransformFieldNames<D extends any, F extends Record<string, any>, C extends
  * @static
  * @alias module:Tree.transformFieldNames
  * @since 4.14.0
- * @param {object[]} data 对象数组。如果是树结构数据，需要指定第三个参数 childrenField
- * @param {function} fieldNames 字段名映射
+ * @param {Object[]} data 对象数组。如果是树结构数据，需要指定第三个参数 childrenField
+ * @param {Object} fieldNames 字段名映射
  * @param {string} [childrenField] 子级数据字段名
  * @param {'spread'|'self'} [nodeAssign='spread'] 节点赋值方式。spread表示使用展开运算符创建新值，self表示使用自身对象。
- * @returns {object[]}
+ * @returns {Object[]}
  * @example
  *
  * const options = [{code: '1', name: 'one'},{code:'2', name:'two'}];

package/types/treeToList.d.ts

@@ -4,9 +4,9 @@
  * @static
  * @alias module:Tree.treeToList
  * @since 4.14.0
- * @param {object[]} tree 树结构数据
+ * @param {Object[]} tree 树结构数据
  * @param {string} childrenField 子级字段名称
- * @returns {object[]} 列表数据
+ * @returns {Object[]} 列表数据
  * @example
  * const menus = [{ id: '1', name: '首页', code: 'trade', pid: null }, { id: '2', name: '交易管理', code: 'trade', pid: null, children: [{ id: '3', name: '交易查询', code: 'trade-1', pid: '2', children: [{ id: '4', name: '交易查询-查询操作', code: 'trade-1-1', pid: '3' }]}]}, { id: '5', name: '权限管理', code: 'authorization', pid: null, children: [{ id: '6', name: '角色管理', code: 'authorization-1', pid: '5' }, { id: '7', name: '用户管理', code: 'authorization-2', pid: '5' }]}];
  *

package/types/utils/native.d.ts

@@ -2,5 +2,11 @@ export declare const objectKeys: {
     (o: object): string[];
     (o: {}): string[];
 };
+export declare const objectValues: {
+    <T>(o: {
+        [s: string]: T;
+    } | ArrayLike<T>): T[];
+    (o: {}): any[];
+};
 export declare const createObjectURL: (obj: Blob | MediaSource) => string;
 export declare const revokeObjectURL: (url: string) => void;