@jest/expect-utils 28.0.0-alpha.7 → 28.0.0

package/build/jasmineUtils.js

@@ -36,7 +36,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // Extracted out of jasmine 2.5.2
 const equals = (a, b, customTesters, strictCheck) => {
   customTesters = customTesters || [];
-  return eq(a, b, [], [], customTesters, strictCheck ? hasKey : hasDefinedKey);
+  return eq(a, b, [], [], customTesters, strictCheck);
 };
 
 exports.equals = equals;
@@ -63,7 +63,7 @@ function asymmetricMatch(a, b) {
 } // Equality function lovingly adapted from isEqual in
 //   [Underscore](http://underscorejs.org)
 
-function eq(a, b, aStack, bStack, customTesters, hasKey) {
+function eq(a, b, aStack, bStack, customTesters, strictCheck) {
   var result = true;
   var asymmetricResult = asymmetricMatch(a, b);
 
@@ -149,24 +149,49 @@ function eq(a, b, aStack, bStack, customTesters, hasKey) {
   bStack.push(b); // Recursively compare objects and arrays.
   // Compare array lengths to determine if a deep comparison is necessary.
 
-  if (className == '[object Array]' && a.length !== b.length) {
+  if (strictCheck && className == '[object Array]' && a.length !== b.length) {
     return false;
   } // Deep compare objects.
 
   var aKeys = keys(a, hasKey),
     key;
-  var size = aKeys.length; // Ensure that both objects contain the same number of properties before comparing deep equality.
+  var bKeys = keys(b, hasKey); // Add keys corresponding to asymmetric matchers if they miss in non strict check mode
 
-  if (keys(b, hasKey).length !== size) {
+  if (!strictCheck) {
+    for (var index = 0; index !== bKeys.length; ++index) {
+      key = bKeys[index];
+
+      if ((isAsymmetric(b[key]) || b[key] === undefined) && !hasKey(a, key)) {
+        aKeys.push(key);
+      }
+    }
+
+    for (var index = 0; index !== aKeys.length; ++index) {
+      key = aKeys[index];
+
+      if ((isAsymmetric(a[key]) || a[key] === undefined) && !hasKey(b, key)) {
+        bKeys.push(key);
+      }
+    }
+  } // Ensure that both objects contain the same number of properties before comparing deep equality.
+
+  var size = aKeys.length;
+
+  if (bKeys.length !== size) {
     return false;
   }
 
   while (size--) {
     key = aKeys[size]; // Deep compare each member
 
-    result =
-      hasKey(b, key) &&
-      eq(a[key], b[key], aStack, bStack, customTesters, hasKey);
+    if (strictCheck)
+      result =
+        hasKey(b, key) &&
+        eq(a[key], b[key], aStack, bStack, customTesters, strictCheck);
+    else
+      result =
+        (hasKey(b, key) || isAsymmetric(a[key]) || a[key] === undefined) &&
+        eq(a[key], b[key], aStack, bStack, customTesters, strictCheck);
 
     if (!result) {
       return false;
@@ -194,10 +219,6 @@ function keys(obj, hasKey) {
   );
 }
 
-function hasDefinedKey(obj, key) {
-  return hasKey(obj, key) && obj[key] !== undefined;
-}
-
 function hasKey(obj, key) {
   return Object.prototype.hasOwnProperty.call(obj, key);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jest/expect-utils",
-  "version": "28.0.0-alpha.7",
+  "version": "28.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -17,10 +17,10 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "jest-get-type": "^28.0.0-alpha.3"
+    "jest-get-type": "^28.0.0"
   },
   "devDependencies": {
-    "jest-matcher-utils": "^28.0.0-alpha.7"
+    "jest-matcher-utils": "^28.0.0"
   },
   "engines": {
     "node": "^12.13.0 || ^14.15.0 || ^16.13.0 || >=17.0.0"
@@ -28,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "06f58f8ca70abc9c09d554967935b58ce85c48d6"
+  "gitHead": "8f9b812faf8e4d241d560a8574f0c6ed20a89365"
 }