remove void from resolved and unresolved

tangramdotdev · Nov 25, 2024 · 1d5c45a · 1d5c45a
1 parent 7866e59
commit 1d5c45a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/packages/runtime/src/resolve.ts b/packages/runtime/src/resolve.ts
@@ -1,10 +1,9 @@
-import * as im from "immutable";
+import im from "immutable";
 import * as tg from "./index.ts";
 import type { MaybePromise } from "./util.ts";
 
-export type Unresolved<T extends void | tg.Value> = MaybePromise<
+export type Unresolved<T extends tg.Value> = MaybePromise<
 	T extends
-		| void
 		| undefined
 		| boolean
 		| number
@@ -21,8 +20,7 @@ export type Unresolved<T extends void | tg.Value> = MaybePromise<
 				: never
 >;
 
-export type Resolved<T extends Unresolved<void | tg.Value>> = T extends
-	| void
+export type Resolved<T extends Unresolved<tg.Value>> = T extends
 	| undefined
 	| boolean
 	| number

diff --git a/packages/runtime/src/target.ts b/packages/runtime/src/target.ts
@@ -16,7 +16,11 @@ type FunctionArg<
 	A extends Array<tg.Value> = Array<tg.Value>,
 	R extends void | tg.Value = void | tg.Value,
 > = {
-	function: (...args: A) => tg.Unresolved<R>;
+	function: (
+		...args: A
+	) => R extends void
+		? MaybePromise<void>
+		: tg.Unresolved<Extract<R, tg.Value>>;
 	module: tg.Module;
 	name: string;
 };

diff --git a/packages/runtime/tangram.d.ts b/packages/runtime/tangram.d.ts
@@ -539,7 +539,13 @@ declare namespace tg {
 	export function target<
 		A extends Array<tg.Value> = Array<tg.Value>,
 		R extends void | tg.Value = void | tg.Value,
-	>(function_: (...args: A) => tg.Unresolved<R>): tg.Target<A, R>;
+	>(
+		function_: (
+			...args: A
+		) => R extends void
+			? MaybePromise<void>
+			: tg.Unresolved<Extract<R, tg.Value>>,
+	): tg.Target<A, R>;
 	export function target<
 		A extends Array<tg.Value> = Array<tg.Value>,
 		R extends void | tg.Value = void | tg.Value,
@@ -932,9 +938,8 @@ declare namespace tg {
 	 * Unresolved<Array<{ key: string }>> = MaybePromise<Array<MaybePromise<{ key: MaybePromise<string> }>>>
 	 * ```
 	 */
-	export type Unresolved<T extends void | tg.Value> = tg.MaybePromise<
+	export type Unresolved<T extends tg.Value> = tg.MaybePromise<
 		T extends
-			| void
 			| undefined
 			| boolean
 			| number
@@ -963,8 +968,7 @@ declare namespace tg {
 	 * Resolved<Promise<Array<Promise<string>>>> = Array<string>
 	 * ```
 	 */
-	export type Resolved<T extends tg.Unresolved<void | tg.Value>> = T extends
-		| void
+	export type Resolved<T extends tg.Unresolved<tg.Value>> = T extends
 		| undefined
 		| boolean
 		| number