From 4ab9f663569b5e5bf1ad4367aebd4074e4b35e94 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 19 Mar 2025 20:32:15 +0900
Subject: [PATCH] Update deep-equal.ts
---
packages/frontend/src/utility/deep-equal.ts | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/packages/frontend/src/utility/deep-equal.ts b/packages/frontend/src/utility/deep-equal.ts
index c64d82c6cc..2859641dc7 100644
--- a/packages/frontend/src/utility/deep-equal.ts
+++ b/packages/frontend/src/utility/deep-equal.ts
@@ -3,24 +3,35 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-export function deepEqual(a: any, b: any): boolean {
+type JsonLike = string | number | boolean | null | undefined | JsonLike[] | { [key: string]: JsonLike } | Map<string, JsonLike>;
+
+export function deepEqual(a: JsonLike, b: JsonLike): boolean {
if (a === b) return true;
+ if (typeof a !== typeof b) return false;
if (a === null) return b === null;
+ if (a === undefined) return b === undefined;
+
if (Array.isArray(a) && Array.isArray(b)) {
if (a.length !== b.length) return false;
for (let i = 0; i < a.length; i++) {
if (!deepEqual(a[i], b[i])) return false;
}
return true;
+ } else if (a instanceof Map && b instanceof Map) {
+ if (a.size !== b.size) return false;
+ for (const [k, v] of a) {
+ if (!deepEqual(v, b.get(k))) return false;
+ }
+ return true;
} else if (((typeof a) === 'object') && ((typeof b) === 'object')) {
const aks = Object.keys(a);
- const bks = Object.keys(b);
+ const bks = Object.keys(b as { [key: string]: JsonLike });
if (aks.length !== bks.length) return false;
for (let i = 0; i < aks.length; i++) {
const k = aks[i];
- if (!deepEqual(a[k], b[k])) return false;
+ if (!deepEqual(a[k], (b as { [key: string]: JsonLike })[k])) return false;
}
return true;
}