fix: Omit then from Reply to correctly infer AsReply return 🎉

Coobaha · Feb 24, 2021 · a2a143c · a2a143c
1 parent b770776
commit a2a143c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/typed-fastify.ts b/src/typed-fastify.ts
@@ -99,10 +99,7 @@ const addSchema = <
 
 export default addSchema;
 
-export type Missing<Candidate extends any, MaybeRequired extends any> = [Candidate, MaybeRequired] extends [
-  never,
-  never,
-]
+type Missing<Candidate extends any, MaybeRequired extends any> = [Candidate, MaybeRequired] extends [never, never]
   ? false
   : [Candidate] extends [never]
   ? true
@@ -146,6 +143,7 @@ interface Reply<
     | 'request'
     | 'getHeader'
     | 'getHeaders'
+    | 'then'
   > {
   asReply(this: any): AsReply;
   matches<
@@ -227,6 +225,7 @@ interface Reply<
     status: Status,
   ): OpaqueReply<Op, Status, Content, Headers, Path, ServiceSchema, RawServer, RawRequest, RawReply, ContextConfig>;
 }
+
 type OpaqueReply<
   Op extends Operation,
   Status,
@@ -239,20 +238,15 @@ type OpaqueReply<
   RawReply extends F.RawReplyDefaultExpression<RawServer> = F.RawReplyDefaultExpression<RawServer>,
   ContextConfig = F.ContextConfigDefault,
   Opaque = Reply<Op, Status, Content, Headers, Path, ServiceSchema, RawServer, RawRequest, RawReply, ContextConfig>
-> = Status extends never | unknown
-  ? Opaque
-  : Content extends never | unknown
-  ? Opaque
-  : Headers extends never | unknown
-  ? Opaque
-  : never;
+> = Status extends unknown ? Opaque : Content extends unknown ? Opaque : Headers extends unknown ? Opaque : never;
 
 interface Invalid<msg = any> {
   readonly __INVALID__: unique symbol;
 }
 
 interface AsReply {
   readonly __REPLY_SYMBOL__: unique symbol;
+  then(fulfilled: () => void, rejected: (err: Error) => void): void;
 }
 const assertAsReply: (any: any) => asserts any is AsReply = () => {};
 export const asReply = (any: any) => {

diff --git a/test/integration.test.ts b/test/integration.test.ts
@@ -25,7 +25,7 @@ const defaultService: Service<TestSchema> = {
   },
   'GET /empty': async (req, reply) => {
     const fastifyReply = reply.status(204);
-    return fastifyReply;
+    return fastifyReply.send();
   },
 };