From 8f997a50719892cd01f4b949cc12b8ed932cc670 Mon Sep 17 00:00:00 2001
From: Giovanni <github@puskin.it>
Date: Thu, 12 Dec 2024 11:54:48 +0100
Subject: [PATCH] assert: make partialDeepStrictEqual throw when comparing [0]
 with [-0]

Fixes: https://github.com/nodejs/node/issues/56230
---
 lib/assert.js                        | 78 ++++++++++++++++++++--------
 test/parallel/test-assert-objects.js | 50 ++++++++++++++++++
 2 files changed, 107 insertions(+), 21 deletions(-)

diff --git a/lib/assert.js b/lib/assert.js
index a2991a096ac081..07cf8eaf2c210a 100644
--- a/lib/assert.js
+++ b/lib/assert.js
@@ -497,6 +497,15 @@ function partiallyCompareSets(actual, expected, comparedObjects) {
   return true;
 }
 
+// Helper function to get a unique key for 0, -0 to avoid collisions
+function getZeroKey(item) {
+  if (item === 0) {
+    if (ObjectIs(item, -0)) return '-0';
+    return '0';
+  }
+  return item;
+}
+
 function partiallyCompareArrays(actual, expected, comparedObjects) {
   if (expected.length > actual.length) {
     return false;
@@ -506,39 +515,66 @@ function partiallyCompareArrays(actual, expected, comparedObjects) {
 
   // Create a map to count occurrences of each element in the expected array
   const expectedCounts = new SafeMap();
-  for (const expectedItem of expected) {
-    let found = false;
-    for (const { 0: key, 1: count } of expectedCounts) {
-      if (isDeepStrictEqual(key, expectedItem)) {
-        expectedCounts.set(key, count + 1);
-        found = true;
-        break;
+  const safeExpected = new SafeArrayIterator(expected);
+
+  for (const expectedItem of safeExpected) {
+    // Check if the item is a zero or a -0, as these need to be handled separately
+    if (expectedItem === 0) {
+      const zeroKey = getZeroKey(expectedItem);
+      expectedCounts.set(zeroKey, {
+        count: (expectedCounts.get(zeroKey)?.count || 0) + 1,
+        expectedType: typeof expectedItem,
+      });
+    } else {
+      let found = false;
+      for (const { 0: key, 1: { count, expectedType } } of expectedCounts) {
+        // eslint-disable-next-line valid-typeof
+        if (isDeepStrictEqual(key, expectedItem) && expectedType === typeof expectedItem) {
+          expectedCounts.set(key, { count: count + 1, expectedType });
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        expectedCounts.set(expectedItem, { count: 1, expectedType: typeof expectedItem });
       }
-    }
-    if (!found) {
-      expectedCounts.set(expectedItem, 1);
     }
   }
 
   const safeActual = new SafeArrayIterator(actual);
 
-  // Create a map to count occurrences of relevant elements in the actual array
   for (const actualItem of safeActual) {
-    for (const { 0: key, 1: count } of expectedCounts) {
-      if (isDeepStrictEqual(key, actualItem)) {
-        if (count === 1) {
-          expectedCounts.delete(key);
-        } else {
-          expectedCounts.set(key, count - 1);
+    // Check if the item is a zero or a -0, as these need to be handled separately
+    if (actualItem === 0) {
+      const zeroKey = getZeroKey(actualItem);
+
+      if (expectedCounts.has(zeroKey)) {
+        const { count, expectedType } = expectedCounts.get(zeroKey);
+        // eslint-disable-next-line valid-typeof
+        if (expectedType === typeof actualItem) {
+          if (count === 1) {
+            expectedCounts.delete(zeroKey);
+          } else {
+            expectedCounts.set(zeroKey, { count: count - 1, expectedType });
+          }
+        }
+      }
+    } else {
+      for (const { 0: expectedItem, 1: { count, expectedType } } of expectedCounts) {
+        // eslint-disable-next-line valid-typeof
+        if (isDeepStrictEqual(expectedItem, actualItem) && expectedType === typeof actualItem) {
+          if (count === 1) {
+            expectedCounts.delete(expectedItem);
+          } else {
+            expectedCounts.set(expectedItem, { count: count - 1, expectedType });
+          }
+          break;
         }
-        break;
       }
     }
   }
 
-  const { size } = expectedCounts;
-  expectedCounts.clear();
-  return size === 0;
+  return expectedCounts.size === 0;
 }
 
 /**
diff --git a/test/parallel/test-assert-objects.js b/test/parallel/test-assert-objects.js
index 3f02ff3c274daa..af0dd5f553b615 100644
--- a/test/parallel/test-assert-objects.js
+++ b/test/parallel/test-assert-objects.js
@@ -97,6 +97,41 @@ describe('Object Comparison Tests', () => {
           actual: [1, 'two', true],
           expected: [1, 'two', false],
         },
+        {
+          description: 'throws when comparing [0] with [-0]',
+          actual: [0],
+          expected: [-0],
+        },
+        {
+          description: 'throws when comparing [0, 0, 0] with [0, -0]',
+          actual: [0, 0, 0],
+          expected: [0, -0],
+        },
+        {
+          description: 'throws when comparing [-0] with [0]',
+          actual: [0],
+          expected: [-0],
+        },
+        {
+          description: 'throws when comparing ["-0"] with [-0]',
+          actual: ['-0'],
+          expected: [-0],
+        },
+        {
+          description: 'throws when comparing [-0] with ["-0"]',
+          actual: [-0],
+          expected: ['-0'],
+        },
+        {
+          description: 'throws when comparing ["0"] with [0]',
+          actual: ['0'],
+          expected: [0],
+        },
+        {
+          description: 'throws when comparing [0] with ["0"]',
+          actual: [0],
+          expected: ['0'],
+        },
         {
           description:
             'throws when comparing two Date objects with different times',
@@ -385,6 +420,21 @@ describe('Object Comparison Tests', () => {
         actual: [1, 'two', true],
         expected: [1, 'two', true],
       },
+      {
+        description: 'compares [0] with [0]',
+        actual: [0],
+        expected: [0],
+      },
+      {
+        description: 'compares [-0] with [-0]',
+        actual: [-0],
+        expected: [-0],
+      },
+      {
+        description: 'compares [0, -0, 0] with [0, 0]',
+        actual: [0, -0, 0],
+        expected: [0, 0],
+      },
       {
         description: 'compares two Date objects with the same time',
         actual: new Date(0),