fix(frontend/backend): deepCloneの戻り値にundefinedを含まないように

resolve #98
taiyme · Nov 5, 2023 · 4f7fbb6 · 4f7fbb6
1 parent 05507cd
commit 4f7fbb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/backend/src/misc/clone.ts b/packages/backend/src/misc/clone.ts
@@ -7,14 +7,15 @@
 // structredCloneが遅いため
 // SEE: http://var.blog.jp/archives/86038606.html
 
-type Cloneable = string | number | boolean | null | { [key: string]: Cloneable } | Cloneable[];
+type Cloneable = string | number | boolean | null | { [key: string]: Cloneable | undefined } | Cloneable[];
 
 export function deepClone<T extends Cloneable>(x: T): T {
 	if (typeof x === 'object') {
 		if (x === null) return x;
 		if (Array.isArray(x)) return x.map(deepClone) as T;
 		const obj = {} as Record<string, Cloneable>;
 		for (const [k, v] of Object.entries(x)) {
+			if (v === undefined) continue;
 			obj[k] = deepClone(v);
 		}
 		return obj as T;

diff --git a/packages/frontend/src/scripts/clone.ts b/packages/frontend/src/scripts/clone.ts
@@ -9,14 +9,15 @@
 // あと、Vue RefをIndexedDBに保存しようとしてstructredCloneを使ったらエラーになった
 // https://github.com/misskey-dev/misskey/pull/8098#issuecomment-1114144045
 
-type Cloneable = string | number | boolean | null | { [key: string]: Cloneable } | Cloneable[];
+type Cloneable = string | number | boolean | null | { [key: string]: Cloneable | undefined } | Cloneable[];
 
 export function deepClone<T extends Cloneable>(x: T): T {
 	if (typeof x === 'object') {
 		if (x === null) return x;
 		if (Array.isArray(x)) return x.map(deepClone) as T;
 		const obj = {} as Record<string, Cloneable>;
 		for (const [k, v] of Object.entries(x)) {
+			if (v === undefined) continue;
 			obj[k] = deepClone(v);
 		}
 		return obj as T;