fix merge return type

neuledge · May 20, 2020 · 0e67777 · 0e67777
1 parent 97e3e02
commit 0e67777
Show file tree

Hide file tree

Showing 3 changed files with 120 additions and 64 deletions.
diff --git a/src/Schema.ts b/src/Schema.ts
@@ -2,6 +2,7 @@ import { ErrorLike } from './schema/errors';
 import {
   MergeSchemaParameters,
   SchemaParameters,
+  SchemaResolveType,
   SchemaReturnType,
   SchemaValidatorFunction,
 } from './schema/io';
@@ -175,7 +176,7 @@ interface SchemaType {
   ): ValidatorProxy<
     Validator<
       FunctionType<
-        SchemaReturnType<A> & SchemaReturnType<B>,
+        SchemaReturnType<A & B, SchemaResolveType<A> & SchemaResolveType<B>>,
         MergeSchemaParameters<SchemaParameters<A> & SchemaParameters<B>>
       >
     >
@@ -185,7 +186,10 @@ interface SchemaType {
   ): ValidatorProxy<
     Validator<
       FunctionType<
-        SchemaReturnType<A> & SchemaReturnType<B> & SchemaReturnType<C>,
+        SchemaReturnType<
+          A & B & C,
+          SchemaResolveType<A> & SchemaResolveType<B> & SchemaResolveType<C>
+        >,
         MergeSchemaParameters<
           SchemaParameters<A> & SchemaParameters<B> & SchemaParameters<C>
         >
@@ -197,10 +201,13 @@ interface SchemaType {
   ): ValidatorProxy<
     Validator<
       FunctionType<
-        SchemaReturnType<A> &
-          SchemaReturnType<B> &
-          SchemaReturnType<C> &
-          SchemaReturnType<D>,
+        SchemaReturnType<
+          A & B & C & D,
+          SchemaResolveType<A> &
+            SchemaResolveType<B> &
+            SchemaResolveType<C> &
+            SchemaResolveType<D>
+        >,
         MergeSchemaParameters<
           SchemaParameters<A> &
             SchemaParameters<B> &
@@ -215,11 +222,14 @@ interface SchemaType {
   ): ValidatorProxy<
     Validator<
       FunctionType<
-        SchemaReturnType<A> &
-          SchemaReturnType<B> &
-          SchemaReturnType<C> &
-          SchemaReturnType<D> &
-          SchemaReturnType<E>,
+        SchemaReturnType<
+          A & B & C & D & E,
+          SchemaResolveType<A> &
+            SchemaResolveType<B> &
+            SchemaResolveType<C> &
+            SchemaResolveType<D> &
+            SchemaResolveType<E>
+        >,
         MergeSchemaParameters<
           SchemaParameters<A> &
             SchemaParameters<B> &
@@ -235,12 +245,15 @@ interface SchemaType {
   ): ValidatorProxy<
     Validator<
       FunctionType<
-        SchemaReturnType<A> &
-          SchemaReturnType<B> &
-          SchemaReturnType<C> &
-          SchemaReturnType<D> &
-          SchemaReturnType<E> &
-          SchemaReturnType<F>,
+        SchemaReturnType<
+          A & B & C & D & E & F,
+          SchemaResolveType<A> &
+            SchemaResolveType<B> &
+            SchemaResolveType<C> &
+            SchemaResolveType<D> &
+            SchemaResolveType<E> &
+            SchemaResolveType<F>
+        >,
         MergeSchemaParameters<
           SchemaParameters<A> &
             SchemaParameters<B> &
@@ -257,13 +270,16 @@ interface SchemaType {
   // ): ValidatorProxy<
   //   Validator<
   //     FunctionType<
-  //       SchemaReturnType<A> &
-  //         SchemaReturnType<B> &
-  //         SchemaReturnType<C> &
-  //         SchemaReturnType<D> &
-  //         SchemaReturnType<E> &
-  //         SchemaReturnType<F> &
-  //         SchemaReturnType<G>,
+  //       SchemaReturnType<
+  //         A & B & C & D & E & F & G,
+  //         SchemaResolveType<A> &
+  //           SchemaResolveType<B> &
+  //           SchemaResolveType<C> &
+  //           SchemaResolveType<D> &
+  //           SchemaResolveType<E> &
+  //           SchemaResolveType<F> &
+  //           SchemaResolveType<G>
+  //       >,
   //       MergeSchemaParameters<
   //         SchemaParameters<A> &
   //           SchemaParameters<B> &
@@ -281,14 +297,17 @@ interface SchemaType {
   // ): ValidatorProxy<
   //   Validator<
   //     FunctionType<
-  //       SchemaReturnType<A> &
-  //         SchemaReturnType<B> &
-  //         SchemaReturnType<C> &
-  //         SchemaReturnType<D> &
-  //         SchemaReturnType<E> &
-  //         SchemaReturnType<F> &
-  //         SchemaReturnType<G> &
-  //         SchemaReturnType<H>,
+  //       SchemaReturnType<
+  //         A & B & C & D & E & F & G & H,
+  //         SchemaResolveType<A> &
+  //           SchemaResolveType<B> &
+  //           SchemaResolveType<C> &
+  //           SchemaResolveType<D> &
+  //           SchemaResolveType<E> &
+  //           SchemaResolveType<F> &
+  //           SchemaResolveType<G> &
+  //           SchemaResolveType<H>
+  //       >,
   //       MergeSchemaParameters<
   //         SchemaParameters<A> &
   //           SchemaParameters<B> &

diff --git a/src/schema/logic.test.ts b/src/schema/logic.test.ts
@@ -236,6 +236,24 @@ describe('schema/logic', () => {
       assert.deepEqual(validator({ x: 1, y: 2 }), { x: '1', y: '3' });
       assert.deepEqual(validator({ x: 1 }), { x: '1', y: '1' });
     });
+
+    it('merging [sync, async]', async () => {
+      const validator = merge(
+        (n: number) => n + 1,
+        (n: number) =>
+          n > 0
+            ? Promise.resolve(n + 1)
+            : Promise.reject(new Error('negative')),
+      );
+
+      typeCheck<typeof validator, (x: number) => PromiseLike<number>>('ok');
+
+      await assert.isFulfilled(validator(2));
+      await assert.isRejected(validator(-1), 'negative');
+
+      assert.equal(await validator(2), 3);
+      assert.equal(await validator(6), 7);
+    });
   });
 
   describe('optional', () => {

diff --git a/src/schema/logic.ts b/src/schema/logic.ts
@@ -1,6 +1,7 @@
 import {
   MergeSchemaParameters,
   SchemaParameters,
+  SchemaResolveType,
   SchemaReturnType,
 } from './io';
 import FunctionType from './FunctionType';
@@ -182,24 +183,30 @@ export function merge<A>(
 export function merge<A, B>(
   ...args: [A, B]
 ): FunctionType<
-  SchemaReturnType<A> & SchemaReturnType<B>,
+  SchemaReturnType<A & B, SchemaResolveType<A> & SchemaResolveType<B>>,
   MergeSchemaParameters<SchemaParameters<A> & SchemaParameters<B>>
 >;
 export function merge<A, B, C>(
   ...args: [A, B, C]
 ): FunctionType<
-  SchemaReturnType<A> & SchemaReturnType<B> & SchemaReturnType<C>,
+  SchemaReturnType<
+    A & B & C,
+    SchemaResolveType<A> & SchemaResolveType<B> & SchemaResolveType<C>
+  >,
   MergeSchemaParameters<
     SchemaParameters<A> & SchemaParameters<B> & SchemaParameters<C>
   >
 >;
 export function merge<A, B, C, D>(
   ...args: [A, B, C, D]
 ): FunctionType<
-  SchemaReturnType<A> &
-    SchemaReturnType<B> &
-    SchemaReturnType<C> &
-    SchemaReturnType<D>,
+  SchemaReturnType<
+    A & B & C & D,
+    SchemaResolveType<A> &
+      SchemaResolveType<B> &
+      SchemaResolveType<C> &
+      SchemaResolveType<D>
+  >,
   MergeSchemaParameters<
     SchemaParameters<A> &
       SchemaParameters<B> &
@@ -210,11 +217,14 @@ export function merge<A, B, C, D>(
 export function merge<A, B, C, D, E>(
   ...args: [A, B, C, D, E]
 ): FunctionType<
-  SchemaReturnType<A> &
-    SchemaReturnType<B> &
-    SchemaReturnType<C> &
-    SchemaReturnType<D> &
-    SchemaReturnType<E>,
+  SchemaReturnType<
+    A & B & C & D & E,
+    SchemaResolveType<A> &
+      SchemaResolveType<B> &
+      SchemaResolveType<C> &
+      SchemaResolveType<D> &
+      SchemaResolveType<E>
+  >,
   MergeSchemaParameters<
     SchemaParameters<A> &
       SchemaParameters<B> &
@@ -226,12 +236,15 @@ export function merge<A, B, C, D, E>(
 export function merge<A, B, C, D, E, F>(
   ...args: [A, B, C, D, E, F]
 ): FunctionType<
-  SchemaReturnType<A> &
-    SchemaReturnType<B> &
-    SchemaReturnType<C> &
-    SchemaReturnType<D> &
-    SchemaReturnType<E> &
-    SchemaReturnType<F>,
+  SchemaReturnType<
+    A & B & C & D & E & F,
+    SchemaResolveType<A> &
+      SchemaResolveType<B> &
+      SchemaResolveType<C> &
+      SchemaResolveType<D> &
+      SchemaResolveType<E> &
+      SchemaResolveType<F>
+  >,
   MergeSchemaParameters<
     SchemaParameters<A> &
       SchemaParameters<B> &
@@ -244,13 +257,16 @@ export function merge<A, B, C, D, E, F>(
 // export function merge<A, B, C, D, E, F, G>(
 //   ...args: [A, B, C, D, E, F, G]
 // ): FunctionType<
-//   SchemaReturnType<A> &
-//     SchemaReturnType<B> &
-//     SchemaReturnType<C> &
-//     SchemaReturnType<D> &
-//     SchemaReturnType<E> &
-//     SchemaReturnType<F> &
-//     SchemaReturnType<G>,
+//   SchemaReturnType<
+//     A & B & C & D & E & F & G,
+//     SchemaResolveType<A> &
+//       SchemaResolveType<B> &
+//       SchemaResolveType<C> &
+//       SchemaResolveType<D> &
+//       SchemaResolveType<E> &
+//       SchemaResolveType<F> &
+//       SchemaResolveType<G>
+//   >,
 //   MergeSchemaParameters<
 //     SchemaParameters<A> &
 //       SchemaParameters<B> &
@@ -264,14 +280,17 @@ export function merge<A, B, C, D, E, F>(
 // export function merge<A, B, C, D, E, F, G, H>(
 //   ...args: [A, B, C, D, E, F, G, H]
 // ): FunctionType<
-//   SchemaReturnType<A> &
-//     SchemaReturnType<B> &
-//     SchemaReturnType<C> &
-//     SchemaReturnType<D> &
-//     SchemaReturnType<E> &
-//     SchemaReturnType<F> &
-//     SchemaReturnType<G> &
-//     SchemaReturnType<H>,
+//   SchemaReturnType<
+//     A & B & C & D & E & F & G & H,
+//     SchemaResolveType<A> &
+//       SchemaResolveType<B> &
+//       SchemaResolveType<C> &
+//       SchemaResolveType<D> &
+//       SchemaResolveType<E> &
+//       SchemaResolveType<F> &
+//       SchemaResolveType<G> &
+//       SchemaResolveType<H>
+//   >,
 //   MergeSchemaParameters<
 //     SchemaParameters<A> &
 //       SchemaParameters<B> &