ut2 1.5.3 → 1.5.4

package/es/internals/isEqualDeep.js

@@ -0,0 +1,178 @@
+import allKeys from '../allKeys.js';
+import eq from '../eq.js';
+import getTagWithBugfix from './getTagWithBugfix.js';
+import { symbolProto, arrayBufferTag, dataViewTag, errorTag, symbolTag, regExpTag, stringTag, dateTag, booleanTag, numberTag, objectTag, objectProtoHasOwnProperty, argumentsTag, setTag, mapTag, arrayTag, arrayProtoSlice } from './native.js';
+import isBuffer from '../isBuffer.js';
+import isFunction from '../isFunction.js';
+import isNil from '../isNil.js';
+import isObjectLike from '../isObjectLike.js';
+import isTypedArray from '../isTypedArray.js';
+import orderBy from '../orderBy.js';
+
+var symbolValueOf = symbolProto ? 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 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 numberTag:
+            return eq(+value, +other, strictCheck);
+        case booleanTag:
+        case dateTag:
+            return strictCheck ? +value === +other : eq(+value, +other);
+        case stringTag:
+        case regExpTag:
+            return '' + value === '' + other;
+        case symbolTag:
+            return symbolValueOf ? symbolValueOf.call(value) === symbolValueOf.call(other) : false;
+        case errorTag:
+            return value.name === other.name && value.message === other.message;
+        case dataViewTag:
+        case arrayBufferTag:
+            if (value.byteLength !== other.byteLength || (value.byteOffset && value.byteOffset !== other.byteOffset)) {
+                return false;
+            }
+            convert = toBufferView;
+            break;
+        case mapTag:
+            convert = mapToArray;
+            break;
+        case setTag:
+            convert = setToArray;
+            break;
+        case 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 === 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 === 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 (!(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;
+}
+
+export { isEqualDeep as default };

package/es/isEqual.js

@@ -1,179 +1,5 @@
-import allKeys from './allKeys.js';
-import eq from './eq.js';
-import getTagWithBugfix from './internals/getTagWithBugfix.js';
-import { symbolProto, arrayBufferTag, dataViewTag, errorTag, symbolTag, regExpTag, stringTag, dateTag, booleanTag, numberTag, objectTag, objectProtoHasOwnProperty, argumentsTag, setTag, mapTag, arrayTag, arrayProtoSlice } from './internals/native.js';
-import isBuffer from './isBuffer.js';
-import isFunction from './isFunction.js';
-import isNil from './isNil.js';
-import isObjectLike from './isObjectLike.js';
-import isTypedArray from './isTypedArray.js';
-import orderBy from './orderBy.js';
+import isEqualDeep from './internals/isEqualDeep.js';
 
-var symbolValueOf = symbolProto ? 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 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 numberTag:
-            return eq(+value, +other, strictCheck);
-        case booleanTag:
-        case dateTag:
-            return strictCheck ? +value === +other : eq(+value, +other);
-        case stringTag:
-        case regExpTag:
-            return '' + value === '' + other;
-        case symbolTag:
-            return symbolValueOf ? symbolValueOf.call(value) === symbolValueOf.call(other) : false;
-        case errorTag:
-            return value.name === other.name && value.message === other.message;
-        case dataViewTag:
-        case arrayBufferTag:
-            if (value.byteLength !== other.byteLength || (value.byteOffset && value.byteOffset !== other.byteOffset)) {
-                return false;
-            }
-            convert = toBufferView;
-            break;
-        case mapTag:
-            convert = mapToArray;
-            break;
-        case setTag:
-            convert = setToArray;
-            break;
-        case 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 === 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 === 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 (!(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/es/isMatch.js

@@ -1,13 +1,12 @@
 import allKeys from './allKeys.js';
 import getTag from './internals/getTag.js';
 import { objectTag } from './internals/native.js';
-import isEqual from './isEqual.js';
+import isEqualDeep from './internals/isEqualDeep.js';
 
 function isDeepComparable(object, source) {
     return getTag(object) === objectTag && getTag(source) === 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 || [];
@@ -36,7 +35,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;
             }
         }
@@ -44,18 +43,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) {
@@ -66,7 +64,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);
 }
 
 export { isMatch as default };

package/lib/internals/helpers.js

@@ -3,7 +3,7 @@
 var getTag = require('./getTag.js');
 var native = require('./native.js');
 
-exports.VERSION = "1.5.3";
+exports.VERSION = "1.5.4";
 exports.supportedArgumentsType = getTag((function () { return arguments; })()) === native.argumentsTag;
 exports.FUNC_ERROR_TEXT = 'Expected a function';
 function toSource(func) {

package/lib/internals/isEqualDeep.js

@@ -0,0 +1,180 @@
+'use strict';
+
+var allKeys = require('../allKeys.js');
+var eq = require('../eq.js');
+var getTagWithBugfix = require('./getTagWithBugfix.js');
+var native = require('./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 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;
+}
+
+module.exports = isEqualDeep;