refactor

satohshi · Jun 19, 2024 · 02e9740 · 02e9740
1 parent d6fdea9
commit 02e9740
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/.changeset/quick-hotels-rule.md b/.changeset/quick-hotels-rule.md
@@ -0,0 +1,5 @@
+---
+'pb-option-builder': patch
+---
+
+refactor
diff --git a/src/index.ts b/src/index.ts
@@ -47,18 +47,11 @@ type Expand<
 					}[keyof U]
 				>
 			: never
-		expand?: NonNullable<TRelation[Key]> extends Array<infer U extends TSchema[keyof TSchema]>
+		expand?: NonNullable<TRelation[Key]> extends
+			| Array<infer U extends TSchema[keyof TSchema]>
+			| (infer U extends TSchema[keyof TSchema])
 			? Array<Expand<TSchema, TRelation, Related<TSchema, TRelation, U>>>
-			: NonNullable<TRelation[Key]> extends infer U extends TSchema[keyof TSchema]
-				? Array<Expand<TSchema, TRelation, Related<TSchema, TRelation, U>>>
-				: never
-
-		// Build fails with this simpler syntax due to a bug in esbuild (fixed in v0.19.12 but dependency is not updated yet in tsup and vitest)
-		// expand?: NonNullable<TRelation[Key]> extends
-		// 	| Array<infer U extends TSchema[keyof TSchema]>
-		// 	| infer U extends TSchema[keyof TSchema]
-		// 	? Array<Expand<TSchema, TRelation, Related<TSchema, TRelation, U>>>
-		// 	: never
+			: never
 	}
 }[TKey]