fix: extend is-equal check for arrays

tada5hi · May 20, 2023 · 406d48b · 406d48b
1 parent d59c647
commit 406d48b
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 11 deletions.
diff --git a/src/utils/check.ts b/src/utils/check.ts
@@ -39,22 +39,42 @@ export function isEqual(x: any, y: any): boolean {
         return x.toString() === y.toString();
     }
 
-    if (!isObject(x) || !isObject(y)) {
-        return false;
-    }
+    if (
+        isObject(x) &&
+        isObject(y)
+    ) {
+        const keysX = Reflect.ownKeys(x) as string[];
+        const keysY = Reflect.ownKeys(y) as string[];
+        if (keysX.length !== keysY.length) {
+            return false;
+        }
 
-    const keysX = Reflect.ownKeys(x) as string[];
-    const keysY = Reflect.ownKeys(y) as string[];
-    if (keysX.length !== keysY.length) {
-        return false;
+        for (let i = 0; i < keysX.length; i++) {
+            const key = keysX[i];
+            if (!Reflect.has(y, key) || !isEqual(x[key], y[key])) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
-    for (let i = 0; i < keysX.length; i++) {
-        const key = keysX[i];
-        if (!Reflect.has(y, key) || !isEqual(x[key], y[key])) {
+    if (
+        Array.isArray(x) &&
+        Array.isArray(y)
+    ) {
+        if (x.length !== y.length) {
             return false;
         }
+
+        for (let i = 0; i < x.length; i++) {
+            if (!isEqual(x[i], y[i])) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
-    return true;
+    return false;
 }
diff --git a/test/unit/utils/array.spec.ts b/test/unit/utils/array.spec.ts
@@ -23,6 +23,15 @@ describe('src/utils/array', function () {
         arr = [{foo: 'bar'}, {foo: 'baz'}]
         expect(distinctArray(arr)).toEqual(arr);
 
+        arr = [['foo', 'bar'], ['foo']];
+        expect(distinctArray(arr)).toEqual([['foo', 'bar'], ['foo']]);
+
+        arr = [['foo', 'bar'], ['foo', 'bar']];
+        expect(distinctArray(arr)).toEqual([['foo', 'bar']]);
+
+        arr = [['foo', 'bar'], ['bar', 'foo']];
+        expect(distinctArray(arr)).toEqual([['foo', 'bar'], ['bar', 'foo']]);
+
         let circ : any = {foo: 'bar'};
         circ.bar = circ;