chore: minor type cleanup

edmundhung · Apr 30, 2024 · 5e00132 · 5e00132
1 parent be32a14
commit 5e00132
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/packages/conform-dom/formdata.ts b/packages/conform-dom/formdata.ts
@@ -249,7 +249,7 @@ export function normalize<
  * Flatten a tree into a dictionary
  */
 export function flatten(
-	data: Record<string | number | symbol, unknown> | Array<unknown> | undefined,
+	data: unknown,
 	options?: {
 		resolve?: (data: unknown) => unknown | null;
 		prefix?: string;
@@ -307,7 +307,7 @@ export function flatten(
 
 		if (Array.isArray(data)) {
 			processArray(data, prefix);
-		} else {
+		} else if (data && isPlainObject(data)) {
 			processObject(data, prefix);
 		}
 	}

diff --git a/packages/conform-dom/submission.ts b/packages/conform-dom/submission.ts
@@ -482,7 +482,6 @@ export function setState(
 
 	Object.assign(
 		state,
-		// @ts-expect-error FIXME flatten should be more flexible
 		flatten(result, {
 			resolve(data) {
 				if (isPlainObject(data) || Array.isArray(data)) {
@@ -524,14 +523,11 @@ export function setListState(
 	});
 }
 
-export function serialize<Schema>(
-	defaultValue: DefaultValue<Schema>,
-): FormValue<Schema> {
+export function serialize<Schema>(defaultValue: Schema): FormValue<Schema> {
 	if (isPlainObject(defaultValue)) {
 		// @ts-expect-error FIXME
 		return Object.entries(defaultValue).reduce<Record<string, unknown>>(
 			(result, [key, value]) => {
-				// @ts-ignore-error FIXME
 				result[key] = serialize(value);
 				return result;
 			},
@@ -540,10 +536,7 @@ export function serialize<Schema>(
 	} else if (Array.isArray(defaultValue)) {
 		// @ts-expect-error FIXME
 		return defaultValue.map(serialize);
-	} else if (
-		// @ts-ignore-error FIXME
-		defaultValue instanceof Date
-	) {
+	} else if (defaultValue instanceof Date) {
 		// @ts-expect-error FIXME
 		return defaultValue.toISOString();
 	} else if (typeof defaultValue === 'boolean') {