Merge pull request #26 from jfrconley/joco/relax-openapi-router

make implement route less strict
jfrconley · Mar 21, 2024 · 14fbee6 · 14fbee6
2 parents 20e9929 + 9ad9ce7
commit 14fbee6
Show file tree

Hide file tree

Showing 4 changed files with 299 additions and 470 deletions.
diff --git a/.changeset/tender-fans-try.md b/.changeset/tender-fans-try.md
@@ -0,0 +1,5 @@
+---
+"@nornir/rest": patch
+---
+
+Update handler type of implement route to be less persnickety
diff --git a/packages/rest/src/runtime/openapi/openapi-router.mts b/packages/rest/src/runtime/openapi/openapi-router.mts
@@ -24,6 +24,7 @@ type GenericRouteBuilder = (chain: Nornir<OpenAPIHttpRequest>) => Nornir<OpenAPI
 
 type RouteKey = `${HttpMethod}:${string}`
 
+
 export class OpenAPIRouter<
     const InputSpec,
     const Spec extends OpenAPIV3_1.Document = DereferenceSpec<InputSpec>
@@ -181,8 +182,9 @@ export class OpenAPIRouter<
         const Method extends UnionIntersection<keyof NonNullable<NonNullable<Spec["paths"]>[Path]>, OpenAPIHttpMethods>,
         Operation extends OpenAPIV3_1.OperationObject = OperationFromDocument<Spec, Path, Method>,
         InputType = RequestTypeFromOperation<Operation>,
-        ResponseType = ResponseTypeFromOperation<Operation>
-    >(path: Path, method: Method, handler: (chain: Nornir<NoInfer<InputType>>) => Nornir<NoInfer<InputType>, NoInfer<ResponseType>>) {
+        ResponseType = ResponseTypeFromOperation<Operation>,
+        Handler extends (chain: Nornir<NoInfer<InputType>>) => Nornir<NoInfer<InputType>, NoInfer<ResponseType>> = (chain: Nornir<NoInfer<InputType>>) => Nornir<NoInfer<InputType>, NoInfer<ResponseType>>
+    >(path: Path, method: Method, handler: NoInfer<Handler>) {
         const route = {
             path: path as string,
             method: method.toUpperCase() as HttpMethod,
@@ -284,4 +286,3 @@ export class OpenAPIRouter<
         }
     }
 }
-