Remove any types from applySchema

seasonedcc · Jun 3, 2024 · cae4be9 · cae4be9
1 parent 94e06ad
commit cae4be9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/constructors.ts b/src/constructors.ts
@@ -134,15 +134,15 @@ function withSchema<I, E>(
 function applySchema<ParsedInput, ParsedEnvironment>(
   inputSchema?: ParserSchema<ParsedInput>,
   environmentSchema?: ParserSchema<ParsedEnvironment>,
-): <R, Input, Environment>(
-  fn: Composable<(input?: Input, environment?: Environment) => R>,
-) => ParsedInput extends Input
-  ? ParsedEnvironment extends Environment
-    ? ComposableWithSchema<R>
-    : Internal.FailToCompose<ParsedEnvironment, Environment>
-  : Internal.FailToCompose<ParsedInput, Input> {
-  return ((fn: any) => {
-    return (input?: unknown, environment?: unknown) => {
+) {
+  return <Input, Environment, T extends Composable>(
+    fn: T,
+  ): ParsedInput extends Input
+    ? ParsedEnvironment extends Environment
+      ? ComposableWithSchema<UnpackData<T>>
+      : Internal.FailToCompose<ParsedEnvironment, Environment>
+    : Internal.FailToCompose<ParsedInput, Input> => {
+    return ((input?: unknown, environment?: unknown) => {
       const envResult = (environmentSchema ?? alwaysUnknownSchema).safeParse(
         environment,
       )
@@ -162,9 +162,13 @@ function applySchema<ParsedInput, ParsedEnvironment>(
             )
         return Promise.resolve(failure([...inputErrors, ...envErrors]))
       }
-      return fn(result.data as any, envResult.data as any)
-    }
-  }) as any
+      return fn(result.data as Input, envResult.data as Environment)
+    }) as ParsedInput extends Input
+      ? ParsedEnvironment extends Environment
+        ? ComposableWithSchema<UnpackData<T>>
+        : Internal.FailToCompose<ParsedEnvironment, Environment>
+      : Internal.FailToCompose<ParsedInput, Input>
+  }
 }
 
 const alwaysUnknownSchema: ParserSchema<unknown> = {

diff --git a/src/tests/constructors.test.ts b/src/tests/constructors.test.ts
@@ -373,7 +373,7 @@ describe('applySchema', () => {
       ),
     )
     type _R = Expect<
-      Equal<typeof handler, ComposableWithSchema<[number, number]>>
+      Equal<typeof handler, ComposableWithSchema<readonly [number, number]>>
     >
 
     assertEquals(