fix: fixes pipe types

OctoD · Mar 11, 2021 · 9393122 · 9393122
1 parent 2f22aa6
commit 9393122
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/pipe-async.ts b/src/pipe-async.ts
@@ -30,10 +30,11 @@ type Tail<T extends any[]> = ((...t: T) => void) extends (
   : never;
 
 type PipeAsync = <
-  F extends [(arg: any) => Promise<any>, ...Array<(arg: any) => Promise<any>>]
+  F extends [((arg: any) => Promise<any> | (() => Promise<any>)), ...Array<(arg: any) => Promise<any>>]
 >(
   ...f: F & AsChain<F>
-) => (arg: ArgType<F[0]>) => Promise<ReturnType<F[LastIndexOf<F>]>>;
+) => 
+F[0] extends () => any ? () => ReturnType<F[LastIndexOf<F>]> : F[0] extends (arg: infer U) => any ? (arg: U) => ReturnType<F[LastIndexOf<F>]> : never;
 
 /**
  * Creates a pipeline of asynchronous functions.
@@ -73,7 +74,7 @@ type PipeAsync = <
  */
 export const pipeasync: PipeAsync = (...args) => {
   const [first, ...othersFns] = args;
-  return async (arg) => {
+  return (async (arg: any) => {
     const firstvalue = await first(arg);
     let latestvalue = firstvalue;
 
@@ -82,5 +83,5 @@ export const pipeasync: PipeAsync = (...args) => {
     }
 
     return latestvalue;
-  };
+  }) as any;
 };
diff --git a/src/pipe.ts b/src/pipe.ts
@@ -27,9 +27,12 @@ type Tail<T extends any[]> = ((...t: T) => void) extends (
   ? U
   : never;
 
-type Pipe = <F extends [(arg: any) => any, ...Array<(arg: any) => any>]>(
+type Pipe = <F extends [((arg: any) => any | (() => any)), ...Array<(arg: any) => any>]>(
   ...f: F & AsChain<F>
-) => (arg: ArgType<F[0]>) => ReturnType<F[LastIndexOf<F>]>;
+) => 
+F[0] extends () => any ? () => ReturnType<F[LastIndexOf<F>]> : F[0] extends (arg: infer U) => any ? (arg: U) => ReturnType<F[LastIndexOf<F>]> : never;
+
+// (arg: ArgType<F[0]>) => ReturnType<F[LastIndexOf<F>]>;
 
 /**
  * Creates a pipeline of synchronous functions
@@ -48,5 +51,5 @@ type Pipe = <F extends [(arg: any) => any, ...Array<(arg: any) => any>]>(
  */
 export const pipe: Pipe = (...args) => {
   const [first, ...othersFns] = args;
-  return (arg) => othersFns.reduce((retval, fn) => fn(retval), first(arg));
+  return ((arg: unknown) => othersFns.reduce((retval, fn) => fn(retval), first(arg))) as any;
 };