Merge remote-tracking branch 'upstream/master' into fix/event-callback-observables-order

Author: OBe95

package.json

@@ -21,29 +21,29 @@
     "url": "[email protected]:LeetCode-OpenSource/rxjs-hooks.git"
   },
   "devDependencies": {
-    "@types/jest": "^24.0.23",
+    "@types/jest": "^25.1.0",
     "@types/lodash": "^4.14.149",
     "@types/react-dom": "^16.9.4",
     "@types/react-test-renderer": "^16.9.1",
     "@types/sinon": "^7.5.1",
     "@types/sinon-chai": "^3.2.3",
     "@types/webpack": "^4.41.0",
     "codecov": "^3.6.1",
-    "fork-ts-checker-webpack-plugin": "^3.1.1",
+    "fork-ts-checker-webpack-plugin": "^4.0.1",
     "happypack": "^5.0.1",
     "html-webpack-plugin": "^3.2.0",
-    "husky": "^3.1.0",
-    "jest": "^24.9.0",
-    "lint-staged": "^9.5.0",
+    "husky": "^4.0.0",
+    "jest": "^25.1.0",
+    "lint-staged": "^10.0.1",
     "prettier": "^1.19.1",
     "react": "16.12.0",
     "react-dom": "16.12.0",
     "react-test-renderer": "16.12.0",
     "rxjs": "^6.5.3",
-    "sinon": "^7.5.0",
+    "sinon": "^9.0.0",
     "source-map-loader": "^0.2.4",
     "standard": "^14.3.1",
-    "ts-jest": "^24.2.0",
+    "ts-jest": "^25.0.0",
     "ts-loader": "^6.2.1",
     "tslint": "^5.20.1",
     "tslint-config-prettier": "^1.18.0",

src/use-observable.ts

@@ -4,20 +4,13 @@ import useConstant from 'use-constant'
 
 import { RestrictArray } from './type'
 
-export type InputFactory<State, Inputs = undefined> = Inputs extends undefined
-  ? (state$: Observable<State>) => Observable<State>
-  : (inputs$: Observable<RestrictArray<Inputs>>, state$: Observable<State>) => Observable<State>
-
-export function useObservable<State>(inputFactory: InputFactory<State>): State | null
-export function useObservable<State>(inputFactory: InputFactory<State>, initialState: State): State
-export function useObservable<State, Inputs>(
-  inputFactory: InputFactory<State, Inputs>,
-  initialState: State,
-  inputs: RestrictArray<Inputs>,
-): State
-
+export type InputFactory<State> = (state$: Observable<State>) => Observable<State>;
+export type InputFactoryWithInputs<State, Inputs> = (inputs$: Observable<RestrictArray<Inputs>>, state$: Observable<State>) => Observable<State>;
+export function useObservable<State>(inputFactory: InputFactory<State>): State | null;
+export function useObservable<State>(inputFactory: InputFactory<State>, initialState: State): State;
+export function useObservable<State, Inputs>(inputFactory: InputFactoryWithInputs<State, Inputs>, initialState: State, inputs: RestrictArray<Inputs>): State;
 export function useObservable<State, Inputs extends ReadonlyArray<any>>(
-  inputFactory: InputFactory<State, Inputs>,
+  inputFactory: InputFactoryWithInputs<State, Inputs>,
   initialState?: State,
   inputs?: RestrictArray<Inputs>,
 ): State | null {
@@ -38,7 +31,7 @@ export function useObservable<State, Inputs extends ReadonlyArray<any>>(
         state$: Observable<State | undefined>,
       ) => Observable<State>)(inputs$, state$) as BehaviorSubject<State>
     } else {
-      output$ = (inputFactory as (state$: Observable<State | undefined>) => Observable<State>)(
+      output$ = (inputFactory as unknown as (state$: Observable<State | undefined>) => Observable<State>)(
         state$,
       ) as BehaviorSubject<State>
     }