feat(combinators): improve typings

This allows for `next(1, holdSubject)` to infer that the returned type is a HoldSubject
This allows for `next(1, subject)` to infer that the return type is a Subject

Author: TylorS

src/combinators/complete.ts

@@ -9,13 +9,17 @@ export const complete: CompleteFn = curry2<any, Subject<any> | HoldSubject<any>,
 ) as CompleteFn;
 
 export interface CompleteFn {
-  (value: any, subject: Subject<any> | HoldSubject<any>): Subject<any> | HoldSubject<any>;
-  <T>(value: T, subject: Subject<T> | HoldSubject<T>): Subject<T> | HoldSubject<T>;
+  (value: any, holdSubject: HoldSubject<any>): HoldSubject<any>;
+  <T>(value: T, holdSubject: HoldSubject<T>): HoldSubject<T>;
+
+  (value: any, subject: Subject<any>): Subject<any>;
+  <T>(value: T, subject: Subject<T>): Subject<T>;
 
   (value: any): CurriedCompleteFn<any>;
   <T>(value: T): CurriedCompleteFn<T>;
 }
 
 export interface CurriedCompleteFn<T> {
-  (subject: Subject<T> | HoldSubject<T>): Subject<T> | HoldSubject<T>;
+  (holdSubject: HoldSubject<T>): HoldSubject<T>;
+  (subject: Subject<T>): Subject<T>;
 }

src/combinators/error.ts

@@ -9,13 +9,16 @@ export const error: ErrorFn = curry2<Error, Subject<any> | HoldSubject<any>, Sub
 ) as ErrorFn;
 
 export interface ErrorFn {
-  <Err extends Error>(err: Err, subject: Subject<any> | HoldSubject<any>): Subject<any> | HoldSubject<any>;
-  <Err extends Error, T>(err: Err, subject: Subject<T> | HoldSubject<T>): Subject<T> | HoldSubject<T>;
+  <Err extends Error>(err: Err, holdSubject: HoldSubject<any>): HoldSubject<any>;
+  <Err extends Error>(err: Err, subject: Subject<any>): Subject<any>;
+  <Err extends Error, T>(err: Err, holdSubject: HoldSubject<T>): HoldSubject<T>;
+  <Err extends Error, T>(err: Err, subject: Subject<T>): Subject<T>;
 
   <Err extends Error>(err: Err): CurriedErrorFn<any>;
   <Err extends Error, T>(err: Err): CurriedErrorFn<T>;
 }
 
 export interface CurriedErrorFn<T> {
-  (subject: Subject<T> | HoldSubject<T>): Subject<T> | HoldSubject<T>;
+  (holdSubject: HoldSubject<T>): HoldSubject<T>;
+  (subject: Subject<T>): HoldSubject<T>;
 }

src/combinators/next.ts

@@ -1,6 +1,7 @@
 import { curry2 } from '@most/prelude';
 
 import { Subject, HoldSubject } from '../interfaces';
+import { sync, hold } from '../';
 
 export const next: NextFn = curry2<any, Subject<any> | HoldSubject<any>, Subject<any> | HoldSubject<any>>(
   function next (value: any, subject: Subject<any> | HoldSubject<any>) {
@@ -9,13 +10,17 @@ export const next: NextFn = curry2<any, Subject<any> | HoldSubject<any>, Subject
 ) as NextFn;
 
 export interface NextFn {
-  (value: any, subject: Subject<any> | HoldSubject<any>): Subject<any> | HoldSubject<any>;
-  <T>(value: T, subject: Subject<T> | HoldSubject<T>): Subject<T> | HoldSubject<T>;
+  (value: any, holdSubject: HoldSubject<any>): HoldSubject<any>;
+  (value: any, subject: Subject<any>): Subject<any>;
+
+  <T>(value: T, holdSubject: HoldSubject<T>): HoldSubject<T>;
+  <T>(vlaue: T, subject: Subject<T>): Subject<T>;
 
   (value: any): CurriedNextFn<any>;
   <T>(value: T): CurriedNextFn<T>;
 }
 
 export interface CurriedNextFn<T> {
-  (subject: Subject<T> | HoldSubject<T>): Subject<T> | HoldSubject<T>;
+  (holdSubject: HoldSubject<T>): HoldSubject<T>;
+  (subject: Subject<T>): Subject<T>;
 }