ut2 1.19.1 → 1.20.1

package/es/has.js

@@ -0,0 +1,12 @@
+import hasPath from './internals/hasPath.js';
+import { objectProtoHasOwnProperty } from './internals/native.js';
+import isNil from './isNil.js';
+
+function baseHas(object, key) {
+    return objectProtoHasOwnProperty.call(object, key);
+}
+function has(object, key) {
+    return !isNil(object) && hasPath(object, key, baseHas);
+}
+
+export { has as default };

package/es/hasIn.js

@@ -0,0 +1,11 @@
+import hasPath from './internals/hasPath.js';
+import isNil from './isNil.js';
+
+function baseHasIn(object, key) {
+    return key in Object(object);
+}
+function hasIn(object, key) {
+    return !isNil(object) && hasPath(object, key, baseHasIn);
+}
+
+export { hasIn as default };

package/es/index.js

@@ -93,6 +93,8 @@ export { default as get } from './get.js';
 export { default as invert } from './invert.js';
 export { default as keys } from './keys.js';
 export { default as keysIn } from './keysIn.js';
+export { default as has } from './has.js';
+export { default as hasIn } from './hasIn.js';
 export { default as merge } from './merge.js';
 export { default as mergeObject } from './mergeObject.js';
 export { default as omit } from './omit.js';

package/es/internals/baseDebounce.js

@@ -63,9 +63,7 @@ function baseDebounce(func, wait, immediate, __throttle__) {
         if (timer !== nativeUndefined) {
             clearTimeout(timer);
             timer = nativeUndefined;
-            if (lastArgs) {
-                return invokeFunc(Date.now());
-            }
+            return invokeFunc(Date.now());
         }
         return result;
     }

package/es/internals/hasPath.js

@@ -0,0 +1,21 @@
+import isNil from '../isNil.js';
+import toPath from '../toPath.js';
+
+function hasPath(object, key, hasFunc) {
+    var paths = toPath(key, object);
+    var length = paths.length;
+    var index = 0;
+    var result = true;
+    while (!isNil(object) && index < length) {
+        var key_1 = paths[index];
+        result = hasFunc(object, key_1);
+        if (!result) {
+            break;
+        }
+        object = object[key_1];
+        index++;
+    }
+    return !!index && index === length && result;
+}
+
+export { hasPath as default };

package/es/internals/helpers.js

@@ -2,7 +2,7 @@ import isObjectLike from '../isObjectLike.js';
 import getTag from './getTag.js';
 import { argumentsTag, functionProtoToString, stringUndefined } from './native.js';
 
-var VERSION = "1.19.1";
+var VERSION = "1.20.1";
 var isBrowser = typeof window !== stringUndefined && isObjectLike(window) && typeof document !== stringUndefined && isObjectLike(document) && window.document === document;
 var supportedArgumentsType = getTag((function () { return arguments; })()) === argumentsTag;
 var FUNC_ERROR_TEXT = 'Expected a function';
@@ -11,12 +11,12 @@ function toSource(func) {
         try {
             return functionProtoToString.call(func);
         }
-        catch (e) {
+        catch (err) {
         }
         try {
             return func + '';
         }
-        catch (e) {
+        catch (err) {
         }
     }
     return '';

package/es/internals/nodeUtil.js

@@ -9,7 +9,7 @@ var nodeUtil = (function () {
             return types;
         }
     }
-    catch (e) {
+    catch (err) {
     }
 })();
 var nodeIsArrayBuffer = nodeUtil && nodeUtil.isArrayBuffer;

package/es/toPath.js

@@ -1,11 +1,12 @@
 import stringToPath from './internals/stringToPath.js';
 import isArray from './isArray.js';
+import isNil from './isNil.js';
 import isObject from './isObject.js';
 import isSymbol from './isSymbol.js';
 import toString from './toString.js';
 
 function toKey(value) {
-    return isSymbol(value) ? value : toString(value);
+    return isSymbol(value) ? value : isNil(value) ? value + '' : toString(value);
 }
 function toPath(value, object) {
     if (isArray(value)) {

package/es/words.js

@@ -1,4 +1,4 @@
-var reAsciiWord = /[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
+var reAsciiWord = /[^\x20-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
 function words(string, pattern) {
     if (pattern === void 0) { pattern = reAsciiWord; }
     return string.match(pattern) || [];

package/lib/has.js

@@ -0,0 +1,14 @@
+'use strict';
+
+var hasPath = require('./internals/hasPath.js');
+var native = require('./internals/native.js');
+var isNil = require('./isNil.js');
+
+function baseHas(object, key) {
+    return native.objectProtoHasOwnProperty.call(object, key);
+}
+function has(object, key) {
+    return !isNil(object) && hasPath(object, key, baseHas);
+}
+
+module.exports = has;

package/lib/hasIn.js

@@ -0,0 +1,13 @@
+'use strict';
+
+var hasPath = require('./internals/hasPath.js');
+var isNil = require('./isNil.js');
+
+function baseHasIn(object, key) {
+    return key in Object(object);
+}
+function hasIn(object, key) {
+    return !isNil(object) && hasPath(object, key, baseHasIn);
+}
+
+module.exports = hasIn;

package/lib/index.js

@@ -95,6 +95,8 @@ var get = require('./get.js');
 var invert = require('./invert.js');
 var keys = require('./keys.js');
 var keysIn = require('./keysIn.js');
+var has = require('./has.js');
+var hasIn = require('./hasIn.js');
 var merge = require('./merge.js');
 var mergeObject = require('./mergeObject.js');
 var omit = require('./omit.js');
@@ -247,6 +249,8 @@ exports.get = get;
 exports.invert = invert;
 exports.keys = keys;
 exports.keysIn = keysIn;
+exports.has = has;
+exports.hasIn = hasIn;
 exports.merge = merge;
 exports.mergeObject = mergeObject;
 exports.omit = omit;

package/lib/internals/baseDebounce.js

@@ -65,9 +65,7 @@ function baseDebounce(func, wait, immediate, __throttle__) {
         if (timer !== native.nativeUndefined) {
             clearTimeout(timer);
             timer = native.nativeUndefined;
-            if (lastArgs) {
-                return invokeFunc(Date.now());
-            }
+            return invokeFunc(Date.now());
         }
         return result;
     }

package/lib/internals/hasPath.js

@@ -0,0 +1,23 @@
+'use strict';
+
+var isNil = require('../isNil.js');
+var toPath = require('../toPath.js');
+
+function hasPath(object, key, hasFunc) {
+    var paths = toPath(key, object);
+    var length = paths.length;
+    var index = 0;
+    var result = true;
+    while (!isNil(object) && index < length) {
+        var key_1 = paths[index];
+        result = hasFunc(object, key_1);
+        if (!result) {
+            break;
+        }
+        object = object[key_1];
+        index++;
+    }
+    return !!index && index === length && result;
+}
+
+module.exports = hasPath;

package/lib/internals/helpers.js

@@ -4,7 +4,7 @@ var isObjectLike = require('../isObjectLike.js');
 var getTag = require('./getTag.js');
 var native = require('./native.js');
 
-var VERSION = "1.19.1";
+var VERSION = "1.20.1";
 var isBrowser = typeof window !== native.stringUndefined && isObjectLike(window) && typeof document !== native.stringUndefined && isObjectLike(document) && window.document === document;
 var supportedArgumentsType = getTag((function () { return arguments; })()) === native.argumentsTag;
 var FUNC_ERROR_TEXT = 'Expected a function';
@@ -13,12 +13,12 @@ function toSource(func) {
         try {
             return native.functionProtoToString.call(func);
         }
-        catch (e) {
+        catch (err) {
         }
         try {
             return func + '';
         }
-        catch (e) {
+        catch (err) {
         }
     }
     return '';

package/lib/internals/nodeUtil.js

@@ -11,7 +11,7 @@ var nodeUtil = (function () {
             return types;
         }
     }
-    catch (e) {
+    catch (err) {
     }
 })();
 var nodeIsArrayBuffer = nodeUtil && nodeUtil.isArrayBuffer;

package/lib/toPath.js

@@ -2,12 +2,13 @@
 
 var stringToPath = require('./internals/stringToPath.js');
 var isArray = require('./isArray.js');
+var isNil = require('./isNil.js');
 var isObject = require('./isObject.js');
 var isSymbol = require('./isSymbol.js');
 var toString = require('./toString.js');
 
 function toKey(value) {
-    return isSymbol(value) ? value : toString(value);
+    return isSymbol(value) ? value : isNil(value) ? value + '' : toString(value);
 }
 function toPath(value, object) {
     if (isArray(value)) {

package/lib/words.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var reAsciiWord = /[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
+var reAsciiWord = /[^\x20-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g;
 function words(string, pattern) {
     if (pattern === void 0) { pattern = reAsciiWord; }
     return string.match(pattern) || [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ut2",
-  "version": "1.19.1",
+  "version": "1.20.1",
   "author": "caijf",
   "license": "MIT",
   "main": "lib/index.js",
@@ -18,7 +18,7 @@
     "build:doc": "npm run doc",
     "doc": "rm -rf docs && rm -rf docs-src && tsc -p tsconfig.build.json -t esnext --outDir docs-src && jsdoc -c conf.json && rm -rf docs-src",
     "doc:open": "open ./docs/index.html",
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+    "lint": "eslint .",
     "lint:fix": "npm run lint:js -- --fix",
     "prettier": "prettier -w **/*",
     "commit": "cz",
@@ -59,34 +59,35 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.8.0",
-    "@commitlint/config-conventional": "^19.8.0",
-    "@commitlint/cz-commitlint": "^19.8.0",
-    "@rollup/plugin-commonjs": "^28.0.3",
+    "@commitlint/cli": "^19.8.1",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@commitlint/cz-commitlint": "^19.8.1",
+    "@eslint/js": "^9.31.0",
+    "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^12.1.2",
-    "@types/jest": "^29.5.14",
-    "@types/node": "^20.17.24",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@rollup/plugin-typescript": "^12.1.4",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^20.19.9",
     "benchmark": "^2.1.4",
     "commitizen": "^4.3.1",
     "cross-env": "^7.0.3",
     "dayjs": "^1.11.13",
     "docdash": "^2.0.2",
-    "eslint": "^8.57.1",
+    "eslint": "^9.31.0",
+    "globals": "^16.3.0",
     "husky": "^9.1.7",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
+    "jest": "^30.0.5",
+    "jest-environment-jsdom": "^30.0.5",
     "jsdoc": "^4.0.4",
-    "lint-staged": "^15.5.0",
+    "lint-staged": "^15.5.2",
     "lodash": "^4.17.21",
-    "prettier": "^3.5.3",
-    "rollup": "^4.35.0",
-    "ts-jest": "^29.2.6",
-    "typescript": "^5.8.2",
+    "prettier": "^3.6.2",
+    "rollup": "^4.45.1",
+    "ts-jest": "^29.4.0",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.38.0",
     "underscore": "^1.13.7"
   },
   "engines": {

package/types/clamp.d.ts

@@ -5,12 +5,16 @@ interface Clamp {
 /**
  * 数字限制在 `lower` 和 `upper` 之间的值。
  *
+ * 特殊说明：
+ * - 如果只传入 1 个参数，直接返回该参数；
+ * - 如果只传入 2 个参数，`lower` 透传给 `upper`。
+ *
  * @function
  * @alias module:Number.clamp
  * @since 1.0.0
  * @param {number} number 被限制的值。
- * @param {number} [lower] 下限。默认 `0`。
- * @param {number} upper 上限。默认 `0`。
+ * @param {number} [lower] 下限。
+ * @param {number} upper 上限。
  * @returns {number} 限制后的值。
  * @example
  *

package/types/has.d.ts

@@ -0,0 +1,28 @@
+import { Many, TPath } from './internals/types';
+/**
+ * 判断对象自身的属性是否包含路径属性。
+ *
+ * @alias module:Object.has
+ * @since 1.20.0
+ * @see {@link https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/Object/hasOwnProperty | hasOwnProperty}
+ * @param {*} object 要查询的对象。
+ * @param {string | number | symbol | Array} path 属性路径字符串或数组。
+ * @returns {boolean} 对象自身的属性是否包含路径属性。
+ * @example
+ * const obj = { a: [{ b: { c: 1 } }] };
+ *
+ * has(obj, 'a[0].b.c'); // true
+ *
+ * has(obj, 'a.0.b.c'); // true
+ *
+ * has(obj, ['a', '0', 'b', 'c']); // true
+ *
+ * has(obj, 'a.b.c'); // false
+ *
+ * has(obj, 'a.0.b.c.d'); // false
+ *
+ * // 不包含继承属性
+ * has(obj, 'toString'); // false
+ */
+declare function has(object: any, key: Many<TPath>): boolean;
+export default has;

package/types/hasIn.d.ts

@@ -0,0 +1,28 @@
+import { Many, TPath } from './internals/types';
+/**
+ * 判断对象自身及继承的属性是否包含路径属性。
+ *
+ * @alias module:Object.hasIn
+ * @since 1.20.0
+ * @see {@link https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/in | in}
+ * @param {*} object 要查询的对象。
+ * @param {string | number | symbol | Array} path 属性路径字符串或数组。
+ * @returns {boolean} 对象自身及继承的属性是否包含路径属性。
+ * @example
+ * const obj = { a: [{ b: { c: 1 } }] };
+ *
+ * hasIn(obj, 'a[0].b.c'); // true
+ *
+ * hasIn(obj, 'a.0.b.c'); // true
+ *
+ * hasIn(obj, ['a', '0', 'b', 'c']); // true
+ *
+ * hasIn(obj, 'a.b.c'); // false
+ *
+ * hasIn(obj, 'a.0.b.c.d'); // false
+ *
+ * // 包含继承属性
+ * hasIn(obj, 'toString'); // true
+ */
+declare function hasIn(object: any, key: Many<TPath>): boolean;
+export default hasIn;

package/types/index.d.ts

@@ -135,6 +135,8 @@ export { default as get } from './get';
 export { default as invert } from './invert';
 export { default as keys } from './keys';
 export { default as keysIn } from './keysIn';
+export { default as has } from './has';
+export { default as hasIn } from './hasIn';
 export { default as merge } from './merge';
 export { default as mergeObject } from './mergeObject';
 export { default as omit } from './omit';

package/types/internals/hasPath.d.ts

@@ -0,0 +1,13 @@
+import { Many, TPath } from './types';
+type HasFunc = (object: object, key: TPath) => boolean;
+/**
+ * 判断对象是否包含路径属性。
+ *
+ * @private
+ * @param {*} object 要查询的对象。
+ * @param {string | number | symbol | Array} path 属性路径字符串或数组。
+ * @param {Function} hasFunc 对象包含属性的函数。
+ * @returns {boolean} 对象是否包含路径属性。
+ */
+declare function hasPath(object: object, key: Many<TPath>, hasFunc: HasFunc): boolean;
+export default hasPath;

package/types/words.d.ts

@@ -5,7 +5,7 @@
  * @since 1.0.0
  * @see {@link https://zh.wikipedia.org/wiki/ASCII ASCII}
  * @param {string} string 要拆分的字符串。
- * @param {RegExp | string} [pattern=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g] 匹配模式。默认 `/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g`。
+ * @param {RegExp | string} [pattern=/[^\x20-\x2f\x3a-\x40\x5b-\x60\x7b-\x7e]+/g] 匹配模式。默认 `/[^\x20-\x2f\x3a-\x40\x5b-\x60\x7b-\x7e]+/g`。
  * @returns {string[]} 拆分后的数组。
  * @example
  *