ut2 1.3.1 → 1.4.0

package/lib/isArrayBuffer.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 var nodeUtil = require('./internals/nodeUtil.js');
-var isObjectLike = require('./isObjectLike.js');
 
 function isArrayBuffer(value) {
-    return nodeUtil.nodeIsArrayBuffer ? nodeUtil.nodeIsArrayBuffer(value) : isObjectLike(value) && isType(value, 'ArrayBuffer');
+    return nodeUtil.nodeIsArrayBuffer ? nodeUtil.nodeIsArrayBuffer(value) : checkType.checkType(value, native.arrayBufferTag);
 }
 
 module.exports = isArrayBuffer;

package/lib/isBlob.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
+var checkType = require('./internals/checkType.js');
 var native = require('./internals/native.js');
 
 function isBlob(value) {
-    return (native.blobExisted && value instanceof Blob) || isType(value, ['Blob', 'File']);
+    return (native.blobExisted && value instanceof Blob) || checkType.checkTypes(value, [native.blobTag, native.fileTag]);
 }
 
 module.exports = isBlob;

package/lib/isBoolean.js

@@ -1,9 +1,10 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 
 function isBoolean(value) {
-    return value === true || value === false || isType(value, 'Boolean');
+    return value === true || value === false || checkType.checkType(value, native.booleanTag);
 }
 
 module.exports = isBoolean;

package/lib/isDataView.js

@@ -1,9 +1,10 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 
 function isDataView(value) {
-    return isType(value, 'DataView');
+    return checkType.checkType(value, native.dataViewTag);
 }
 
 module.exports = isDataView;

package/lib/isDate.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 var nodeUtil = require('./internals/nodeUtil.js');
-var isObjectLike = require('./isObjectLike.js');
 
 function isDate(value) {
-    return nodeUtil.nodeIsDate ? nodeUtil.nodeIsDate(value) : isObjectLike(value) && isType(value, 'Date');
+    return nodeUtil.nodeIsDate ? nodeUtil.nodeIsDate(value) : checkType.checkType(value, native.dateTag);
 }
 
 module.exports = isDate;

package/lib/isEqual.js

@@ -124,13 +124,14 @@ function isEqualDeep(value, other, customizer, strictCheck, valueStack, otherSta
             if (hasCustomizer) {
                 var compared = customizer(value[length], other[length], length, value, other, valueStack, otherStack);
                 if (compared !== undefined) {
-                    result = !!compared;
-                    break;
+                    if (!compared) {
+                        return false;
+                    }
+                    continue;
                 }
             }
             if (!isEqualDeep(value[length], other[length], customizer, strictCheck, valueStack, otherStack)) {
-                result = false;
-                break;
+                return false;
             }
         }
     }
@@ -146,23 +147,24 @@ function isEqualDeep(value, other, customizer, strictCheck, valueStack, otherSta
             if (hasCustomizer) {
                 var compared = customizer(value[key], other[key], key, value, other, valueStack, otherStack);
                 if (compared !== undefined) {
-                    result = !!compared;
-                    break;
+                    if (!compared) {
+                        return false;
+                    }
+                    continue;
                 }
             }
             if (!(native.hasOwnProperty.call(other, key) && isEqualDeep(value[key], other[key], customizer, strictCheck, valueStack, otherStack))) {
-                result = false;
-                break;
+                return false;
             }
             if (!skipCtor && key === 'constructor') {
                 skipCtor = true;
             }
         }
-        if (result && !skipCtor) {
+        if (!skipCtor) {
             var valCtor = value.constructor;
             var othCtor = other.constructor;
             if (valCtor !== othCtor && !(isFunction(valCtor) && valCtor instanceof valCtor && isFunction(othCtor) && othCtor instanceof othCtor) && 'constructor' in value && 'constructor' in other) {
-                result = false;
+                return false;
             }
         }
     }

package/lib/isError.js

@@ -1,13 +1,11 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 var isObjectLike = require('./isObjectLike.js');
 
 function isError(value) {
-    if (!isObjectLike(value)) {
-        return false;
-    }
-    return value instanceof Error || isType(value, ['Error', 'DOMException']);
+    return isObjectLike(value) && (value instanceof Error || checkType.checkTypes(value, [native.errorTag, native.domExceptionTag]));
 }
 
 module.exports = isError;

package/lib/isFunction.js

@@ -1,13 +1,14 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 var isObject = require('./isObject.js');
 
 function isFunction(value) {
     if (!isObject(value)) {
         return false;
     }
-    return isType(value, ['Function', 'AsyncFunction', 'GeneratorFunction', 'Proxy']);
+    return checkType.checkTypes(value, native.functionTags);
 }
 
 module.exports = isFunction;

package/lib/isMap.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 var nodeUtil = require('./internals/nodeUtil.js');
-var isObjectLike = require('./isObjectLike.js');
 
 function isMap(value) {
-    return nodeUtil.nodeIsMap ? nodeUtil.nodeIsMap(value) : isObjectLike(value) && isType(value, 'Map');
+    return nodeUtil.nodeIsMap ? nodeUtil.nodeIsMap(value) : checkType.checkType(value, native.mapTag);
 }
 
 module.exports = isMap;

package/lib/isMatch.js

@@ -0,0 +1,73 @@
+'use strict';
+
+var allKeys = require('./allKeys.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
+var isEqual = require('./isEqual.js');
+
+function isDeepComparable(object, source) {
+    return checkType.checkType(object, native.objectTag) && checkType.checkType(source, native.objectTag);
+}
+function baseIsMatch(object, source, customizer, strictCheck, objStack, srcStack) {
+    var hasCustomizer = typeof customizer === 'function';
+    if (isDeepComparable(object, source)) {
+        objStack = objStack || [];
+        srcStack = srcStack || [];
+        var stackLen = objStack.length;
+        while (stackLen--) {
+            if (objStack[stackLen] === object && srcStack[stackLen] === source) {
+                return true;
+            }
+        }
+        objStack.push(object);
+        srcStack.push(source);
+        var keys = allKeys(source);
+        var length_1 = keys.length;
+        while (length_1--) {
+            var key = keys[length_1];
+            if (!(key in object)) {
+                return false;
+            }
+            var compared = void 0;
+            if (hasCustomizer) {
+                compared = customizer(object[key], source[key], key, object, source, objStack, srcStack);
+            }
+            if (compared !== undefined) {
+                if (!compared) {
+                    return false;
+                }
+                continue;
+            }
+            if (!baseIsMatch(object[key], source[key], customizer, strictCheck, objStack, srcStack)) {
+                return false;
+            }
+        }
+        objStack.pop();
+        srcStack.pop();
+        return true;
+    }
+    var result = isEqual(object, source, function (objValue, srcValue, k, obj, src) {
+        if (hasCustomizer) {
+            var compared = customizer(objValue, srcValue, k, obj, src, objStack, srcStack);
+            if (compared !== undefined) {
+                return compared;
+            }
+        }
+        if (isDeepComparable(objValue, srcValue)) {
+            return baseIsMatch(objValue, srcValue, customizer, strictCheck, objStack, srcStack);
+        }
+    }, strictCheck);
+    return result;
+}
+function isMatch(object, source, customizer, strictCheck) {
+    if (strictCheck === void 0) { strictCheck = false; }
+    if (typeof customizer === 'function' && isDeepComparable(object, source)) {
+        var compared = customizer(object, source);
+        if (compared !== undefined) {
+            return !!compared;
+        }
+    }
+    return baseIsMatch(object, source, customizer, strictCheck);
+}
+
+module.exports = isMatch;

package/lib/isNumber.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
-var isObjectLike = require('./isObjectLike.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 
 function isNumber(value) {
-    return typeof value === 'number' || (isObjectLike(value) && isType(value, 'Number'));
+    return typeof value === 'number' || checkType.checkType(value, native.numberTag);
 }
 
 module.exports = isNumber;

package/lib/isPlainObject.js

@@ -1,11 +1,11 @@
 'use strict';
 
 var native = require('./internals/native.js');
-var isType = require('./internals/isType.js');
+var checkType = require('./internals/checkType.js');
 var isObjectLike = require('./isObjectLike.js');
 
 function isPlainObject(value) {
-    if (!isObjectLike(value) || !isType(value, 'Object')) {
+    if (!isObjectLike(value) || !checkType.checkType(value, native.objectTag)) {
         return false;
     }
     var proto = Object.getPrototypeOf(Object(value));

package/lib/isRegExp.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 var nodeUtil = require('./internals/nodeUtil.js');
-var isObjectLike = require('./isObjectLike.js');
 
 function isRegExp(value) {
-    return nodeUtil.nodeIsRegExp ? nodeUtil.nodeIsRegExp(value) : isObjectLike(value) && isType(value, 'RegExp');
+    return nodeUtil.nodeIsRegExp ? nodeUtil.nodeIsRegExp(value) : checkType.checkType(value, native.regExpTag);
 }
 
 module.exports = isRegExp;

package/lib/isSet.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 var nodeUtil = require('./internals/nodeUtil.js');
-var isObjectLike = require('./isObjectLike.js');
 
 function isSet(value) {
-    return nodeUtil.nodeIsSet ? nodeUtil.nodeIsSet(value) : isObjectLike(value) && isType(value, 'Set');
+    return nodeUtil.nodeIsSet ? nodeUtil.nodeIsSet(value) : checkType.checkType(value, native.setTag);
 }
 
 module.exports = isSet;

package/lib/isString.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
-var isObjectLike = require('./isObjectLike.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 
 function isString(value) {
-    return typeof value === 'string' || (isObjectLike(value) && isType(value, 'String'));
+    return typeof value === 'string' || checkType.checkType(value, native.stringTag);
 }
 
 module.exports = isString;

package/lib/isSymbol.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
-var isObjectLike = require('./isObjectLike.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 
 function isSymbol(value) {
-    return typeof value === 'symbol' || (isObjectLike(value) && isType(value, 'Symbol'));
+    return typeof value === 'symbol' || checkType.checkType(value, native.symbolTag);
 }
 
 module.exports = isSymbol;

package/lib/isTypedArray.js

@@ -1,6 +1,7 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 var nodeUtil = require('./internals/nodeUtil.js');
 var isLength = require('./isLength.js');
 var isObjectLike = require('./isObjectLike.js');
@@ -9,7 +10,7 @@ function isTypedArray(value) {
     if (nodeUtil.nodeIsTypedArray) {
         return nodeUtil.nodeIsTypedArray(value);
     }
-    return isObjectLike(value) && isLength(value.length) && isType(value, ['Float32Array', 'Float64Array', 'Int8Array', 'Int16Array', 'Int32Array', 'Uint8Array', 'Uint8ClampedArray', 'Uint16Array', 'Uint32Array', 'BigInt64Array', 'BigUint64Array']);
+    return isObjectLike(value) && isLength(value.length) && checkType.checkTypes(value, native.typedArrayTags);
 }
 
 module.exports = isTypedArray;

package/lib/isWeakMap.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
-var isObjectLike = require('./isObjectLike.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 
 function isWeakMap(value) {
-    return isObjectLike(value) && isType(value, 'WeakMap');
+    return checkType.checkType(value, native.weakMapTag);
 }
 
 module.exports = isWeakMap;

package/lib/isWeakSet.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var isType = require('./internals/isType.js');
-var isObjectLike = require('./isObjectLike.js');
+var checkType = require('./internals/checkType.js');
+var native = require('./internals/native.js');
 
 function isWeakSet(value) {
-    return isObjectLike(value) && isType(value, 'WeakSet');
+    return checkType.checkType(value, native.weakSetTag);
 }
 
 module.exports = isWeakSet;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ut2",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "author": "caijf",
   "license": "MIT",
   "main": "lib/index.js",

package/types/index.d.ts

@@ -66,6 +66,7 @@ export { default as isFunction } from './isFunction';
 export { default as isInteger } from './isInteger';
 export { default as isLength } from './isLength';
 export { default as isMap } from './isMap';
+export { default as isMatch } from './isMatch';
 export { default as isNaN } from './isNaN';
 export { default as isNil } from './isNil';
 export { default as isNull } from './isNull';

package/types/internals/checkType.d.ts

@@ -0,0 +1,2 @@
+export declare function checkType(value: any, tag: string): boolean;
+export declare function checkTypes(value: any, tags: string[]): boolean;

package/types/internals/native.d.ts

@@ -47,6 +47,12 @@ export declare const errorTag = "[object Error]";
 export declare const arrayBufferTag = "[object ArrayBuffer]";
 export declare const argumentsTag = "[object Arguments]";
 export declare const arrayTag = "[object Array]";
+export declare const typedArrayTags: string[];
+export declare const functionTags: string[];
+export declare const weakSetTag = "[object WeakSet]";
+export declare const blobTag = "[object Blob]";
+export declare const fileTag = "[object Blob]";
+export declare const domExceptionTag = "[object DOMException]";
 export declare const objectTag = "[object Object]";
 export declare const dataViewTag = "[object DataView]";
 export declare const mapTag = "[object Map]";

package/types/isBuffer.d.ts

@@ -11,7 +11,7 @@
  * @returns {boolean} 如果值为 `buffer` ，返回 `true` ，否则返回 `false` 。
  * @example
  *
- * isBuffer(new Buffer(2)); // true
+ * isBuffer(Buffer.alloc(2)); // true
  *
  * isBuffer({}); // false
  *

package/types/isMatch.d.ts

@@ -0,0 +1,44 @@
+type Customizer = (objValue: any, srcValue: any, key?: number | string | symbol, object?: any, source?: any, objStack?: any[], srcStack?: any[]) => void | undefined | boolean;
+/**
+ * 执行一个深比较，确定 `object` 是否含有和 `source` 完全相等的属性值。
+ *
+ * 注意：只有普通对象才会执行部分匹配，函数、数组不会执行部分匹配。
+ *
+ * 如果 `strictCheck=true` , 以下值不相等：
+ *
+ * 1. `0` `-0`
+ * 2. `typeof` 不同类型，如 `1` `Object(1)`
+ * 3. 无效日期对象，如 `new Date('')` `new Date('abc')`
+ *
+ * @static
+ * @alias module:Language.isMatch
+ * @since 1.4.0
+ * @requires module:Language.isEqual
+ * @param {Object} object 要检查的对象。
+ * @param {Object} source 属性值相匹配的对象。
+ * @param {Function} [customizer] 自定义比较。
+ * @param {boolean} [strictCheck=false] 严格比较。
+ * @returns {boolean} 如果 `object` 匹配，返回 `true` ，否则返回 `false` 。
+ * @example
+ *
+ * const object = { a: 1, b: -0 }
+ *
+ * isMatch(object, { a: 1 }); // true
+ * isMatch(object, { b: 0 }); // true
+ *
+ * // 严格比较
+ * isMatch(object, { b: 0 }, undefined, true); // false
+ *
+ * // 自定义比较
+ * function customizer(objValue, srcValue){
+ *   if(typeof objValue === 'string' && typeof srcValue === 'string'){
+ *     return true;
+ *   }
+ * }
+ * isMatch({ foo: 'a' }, { foo: 'b' }, customizer); // true
+ * isMatch({ foo: ['a'] }, { foo: ['b'] }, customizer); // true
+ * isMatch({ foo: 'a' }, { foo: 'b' }, customizer); // true
+ *
+ */
+declare function isMatch(object: object, source: object, customizer?: Customizer, strictCheck?: boolean): boolean;
+export default isMatch;

package/es/internals/isType.js

@@ -1,11 +0,0 @@
-import getTag from './getTag.js';
-
-function isType(value, type) {
-    var nativeTypeString = getTag(value);
-    if (typeof type === 'string') {
-        return nativeTypeString === '[object ' + type + ']';
-    }
-    return type.some(function (item) { return nativeTypeString === '[object ' + item + ']'; });
-}
-
-export { isType as default };

package/lib/internals/isType.js

@@ -1,13 +0,0 @@
-'use strict';
-
-var getTag = require('./getTag.js');
-
-function isType(value, type) {
-    var nativeTypeString = getTag(value);
-    if (typeof type === 'string') {
-        return nativeTypeString === '[object ' + type + ']';
-    }
-    return type.some(function (item) { return nativeTypeString === '[object ' + item + ']'; });
-}
-
-module.exports = isType;

package/types/internals/isType.d.ts

@@ -1,11 +0,0 @@
-/**
- * 检测值的 `Object.prototype.toString` 类型。
- *
- * @private
- * @since 1.0.0
- * @param {*} value 检查值
- * @param {string | string[]} type 类型名称
- * @returns {boolean} 返回值类型是否匹配
- */
-declare function isType(value: any, type: string | string[]): boolean;
-export default isType;