ut2 1.5.3 → 1.5.4

package/lib/isEqual.js

@@ -1,181 +1,7 @@
 'use strict';
 
-var allKeys = require('./allKeys.js');
-var eq = require('./eq.js');
-var getTagWithBugfix = require('./internals/getTagWithBugfix.js');
-var native = require('./internals/native.js');
-var isBuffer = require('./isBuffer.js');
-var isFunction = require('./isFunction.js');
-var isNil = require('./isNil.js');
-var isObjectLike = require('./isObjectLike.js');
-var isTypedArray = require('./isTypedArray.js');
-var orderBy = require('./orderBy.js');
+var isEqualDeep = require('./internals/isEqualDeep.js');
 
-var symbolValueOf = native.symbolProto ? native.symbolProto.valueOf : undefined;
-function mapToArray(map) {
-    var result = [];
-    map.forEach(function (value, key) {
-        result.push([key, value]);
-    });
-    return orderBy(result, [0, 1]);
-}
-function setToArray(set) {
-    var result = [];
-    set.forEach(function (value) {
-        result.push(value);
-    });
-    return orderBy(result);
-}
-function argToArray(arg) {
-    return native.arrayProtoSlice.call(arg);
-}
-function toBufferView(bufferSource) {
-    return new Uint8Array(bufferSource.buffer || bufferSource, bufferSource.byteOffset || 0, bufferSource.byteLength);
-}
-function isDomNode(obj) {
-    return isObjectLike(obj) && typeof obj.nodeType === 'number' && typeof obj.nodeName === 'string' && typeof obj.isEqualNode === 'function';
-}
-function isEqualDeep(value, other, customizer, strictCheck, valueStack, otherStack) {
-    if (eq(value, other, strictCheck)) {
-        return true;
-    }
-    var valType = typeof value;
-    var othType = typeof other;
-    if (strictCheck && valType !== othType) {
-        return false;
-    }
-    if (isNil(value) || isNil(other) || (valType !== 'object' && othType !== 'object')) {
-        return false;
-    }
-    var tag = getTagWithBugfix(value);
-    if (tag !== getTagWithBugfix(other)) {
-        return false;
-    }
-    var convert;
-    switch (tag) {
-        case native.numberTag:
-            return eq(+value, +other, strictCheck);
-        case native.booleanTag:
-        case native.dateTag:
-            return strictCheck ? +value === +other : eq(+value, +other);
-        case native.stringTag:
-        case native.regExpTag:
-            return '' + value === '' + other;
-        case native.symbolTag:
-            return symbolValueOf ? symbolValueOf.call(value) === symbolValueOf.call(other) : false;
-        case native.errorTag:
-            return value.name === other.name && value.message === other.message;
-        case native.dataViewTag:
-        case native.arrayBufferTag:
-            if (value.byteLength !== other.byteLength || (value.byteOffset && value.byteOffset !== other.byteOffset)) {
-                return false;
-            }
-            convert = toBufferView;
-            break;
-        case native.mapTag:
-            convert = mapToArray;
-            break;
-        case native.setTag:
-            convert = setToArray;
-            break;
-        case native.argumentsTag:
-            convert = argToArray;
-            break;
-    }
-    if (convert) {
-        return isEqualDeep(convert(value), convert(other), customizer, strictCheck, valueStack, otherStack);
-    }
-    if (isDomNode(value) && isDomNode(other)) {
-        return value.isEqualNode(other);
-    }
-    var areArrays = tag === native.arrayTag;
-    if (!areArrays && isTypedArray(value)) {
-        if (value.byteLength !== other.byteLength) {
-            return false;
-        }
-        if (value.buffer === other.buffer && value.byteOffset === other.byteOffset) {
-            return true;
-        }
-        areArrays = true;
-    }
-    if (isBuffer(value)) {
-        if (!isBuffer(other)) {
-            return false;
-        }
-        areArrays = true;
-    }
-    valueStack = valueStack || [];
-    otherStack = otherStack || [];
-    var length = valueStack.length;
-    while (length--) {
-        if (valueStack[length] === value) {
-            return otherStack[length] === other;
-        }
-    }
-    valueStack.push(value);
-    otherStack.push(other);
-    var result = true;
-    var hasCustomizer = typeof customizer === 'function';
-    if (areArrays) {
-        length = value.length;
-        if (length !== other.length) {
-            return false;
-        }
-        while (length--) {
-            if (hasCustomizer) {
-                var compared = customizer(value[length], other[length], length, value, other, valueStack, otherStack);
-                if (compared !== undefined) {
-                    if (!compared) {
-                        return false;
-                    }
-                    continue;
-                }
-            }
-            if (!isEqualDeep(value[length], other[length], customizer, strictCheck, valueStack, otherStack)) {
-                return false;
-            }
-        }
-    }
-    else if (tag === native.objectTag) {
-        var keys = allKeys(value);
-        length = keys.length;
-        if (allKeys(other).length !== length) {
-            return false;
-        }
-        var skipCtor = false;
-        while (length--) {
-            var key = keys[length];
-            if (hasCustomizer) {
-                var compared = customizer(value[key], other[key], key, value, other, valueStack, otherStack);
-                if (compared !== undefined) {
-                    if (!compared) {
-                        return false;
-                    }
-                    continue;
-                }
-            }
-            if (!(native.objectProtoHasOwnProperty.call(other, key) && isEqualDeep(value[key], other[key], customizer, strictCheck, valueStack, otherStack))) {
-                return false;
-            }
-            if (!skipCtor && key === 'constructor') {
-                skipCtor = true;
-            }
-        }
-        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) {
-                return false;
-            }
-        }
-    }
-    else {
-        result = false;
-    }
-    valueStack.pop();
-    otherStack.pop();
-    return result;
-}
 function isEqual(value, other, customizer, strictCheck) {
     if (strictCheck === void 0) { strictCheck = false; }
     if (typeof customizer === 'function') {

package/lib/isMatch.js

@@ -3,13 +3,12 @@
 var allKeys = require('./allKeys.js');
 var getTag = require('./internals/getTag.js');
 var native = require('./internals/native.js');
-var isEqual = require('./isEqual.js');
+var isEqualDeep = require('./internals/isEqualDeep.js');
 
 function isDeepComparable(object, source) {
     return getTag(object) === native.objectTag && getTag(source) === native.objectTag;
 }
-function baseIsMatch(object, source, customizer, strictCheck, objStack, srcStack, executedCustomizer) {
-    if (executedCustomizer === void 0) { executedCustomizer = false; }
+function baseIsMatch(object, source, customizer, strictCheck, objStack, srcStack) {
     var hasCustomizer = typeof customizer === 'function';
     if (isDeepComparable(object, source)) {
         objStack = objStack || [];
@@ -38,7 +37,7 @@ function baseIsMatch(object, source, customizer, strictCheck, objStack, srcStack
                     continue;
                 }
             }
-            if (!baseIsMatch(object[key], source[key], customizer, strictCheck, objStack, srcStack, true)) {
+            if (!baseIsMatch(object[key], source[key], customizer, strictCheck, objStack, srcStack)) {
                 return false;
             }
         }
@@ -46,18 +45,17 @@ function baseIsMatch(object, source, customizer, strictCheck, objStack, srcStack
         srcStack.pop();
         return true;
     }
-    var result = isEqual(object, source, function (objValue, srcValue, k, obj, src) {
-        if (!executedCustomizer && hasCustomizer) {
+    var result = isEqualDeep(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;
             }
         }
-        executedCustomizer = false;
         if (isDeepComparable(objValue, srcValue)) {
             return baseIsMatch(objValue, srcValue, customizer, strictCheck, objStack, srcStack);
         }
-    }, strictCheck);
+    }, strictCheck, objStack, srcStack);
     return result;
 }
 function isMatch(object, source, customizer, strictCheck) {
@@ -68,7 +66,7 @@ function isMatch(object, source, customizer, strictCheck) {
             return !!compared;
         }
     }
-    return baseIsMatch(object, source, customizer, strictCheck, undefined, undefined, true);
+    return baseIsMatch(object, source, customizer, strictCheck, undefined, undefined);
 }
 
 module.exports = isMatch;

package/package.json

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

package/types/internals/isEqualDeep.d.ts

@@ -0,0 +1,26 @@
+type Customizer = (objValue: any, othValue: any, key?: number | string | symbol, object?: any, other?: any, valueStack?: any[], otherStack?: any[]) => void | boolean;
+/**
+ *
+ * 深度比较两个值是否相等。
+ *
+ * 支持比较 `boolean` `number` `string` `symbol` `array` `array buffer` `date` `error` `map` `object` `regexp` `set` `typed array` 类型。对象只比较自身的属性，不包括继承和不可枚举的属性。
+ *
+ * 如果 `strictCheck=true` , 以下值不相等：
+ *
+ * 1. `0` `-0`
+ * 2. `typeof` 不同类型，如 `1` `Object(1)`
+ * 3. 无效日期对象，如 `new Date('')` `new Date('abc')`
+ *
+ * @static
+ * @alias module:Language.isEqual
+ * @since 1.3.0
+ * @param {*} value 要比较的值。
+ * @param {*} other 另一个要比较的值。
+ * @param {Function} [customizer] 自定义比较。
+ * @param {boolean} [strictCheck=false] 严格比较，默认 `false` 。
+ * @param {*[]} [valueStack] 值的堆栈。
+ * @param {*[]} [otherStack] 另一个值的堆栈。
+ * @returns {boolean} 如果两个值相等，返回 `true` ，否则返回 `false` 。
+ */
+declare function isEqualDeep(value: any, other: any, customizer?: Customizer, strictCheck?: boolean, valueStack?: any[], otherStack?: any[]): boolean;
+export default isEqualDeep;

package/types/isEqual.d.ts

@@ -1,4 +1,4 @@
-type Customizer = (objValue: any, othValue: any, key?: number | string | symbol, object?: any, other?: any, valueStack?: any[], otherStack?: any[]) => void | boolean;
+import isEqualDeep from './internals/isEqualDeep';
 /**
  * 深度比较两个值是否相等。
  *
@@ -40,5 +40,5 @@ type Customizer = (objValue: any, othValue: any, key?: number | string | symbol,
  * isEqual({foo: 'a'}, {foo: 'b'}, customizer); // true
  *
  */
-declare function isEqual(value: any, other: any, customizer?: Customizer, strictCheck?: boolean): boolean;
+declare function isEqual(value: any, other: any, customizer?: Parameters<typeof isEqualDeep>[2], strictCheck?: boolean): boolean;
 export default isEqual;