Fix $subscribeTo accept PartialObserver from RxJS (#123)

yogurt1 · web-flow · commit 638e555addb6 · 2020-03-23T19:33:59.000+08:00
* fix subscribeTo typedef

* fix observable type

* fix use rest args in sbuscribeTo
diff --git a/src/methods/subscribeTo.js b/src/methods/subscribeTo.js
@@ -1,7 +1,7 @@
 import { Subscription } from 'rxjs'
 
-export default function subscribeTo (observable, next, error, complete) {
-  const subscription = observable.subscribe(next, error, complete)
+export default function subscribeTo (observable, ...subscribeArgs) {
+  const subscription = observable.subscribe(...subscribeArgs)
   ;(this._subscription || (this._subscription = new Subscription())).add(subscription)
   return subscription
 }
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -1,8 +1,9 @@
 import Vue from 'vue'
 import { WatchOptions } from 'vue'
-import { Observable } from 'rxjs'
+import { Observable, PartialObserver } from 'rxjs'
 
 export type Observables = Record<string, Observable<any>>
+
 declare module 'vue/types/options' {
   interface ComponentOptions<V extends Vue> {
     subscriptions?: Observables | ((this: V) => Observables)
@@ -15,19 +16,27 @@ export interface WatchObservable<T> {
   newValue: T
   oldValue: T
 }
+
 declare module "vue/types/vue" {
   interface Vue {
     $observables: Observables;
     $watchAsObservable(expr: string, options?: WatchOptions): Observable<WatchObservable<any>>
     $watchAsObservable<T>(fn: (this: this) => T, options?: WatchOptions): Observable<WatchObservable<T>>
     $eventToObservable(event: string): Observable<{name: string, msg: any}>
-    $subscribeTo<T>(
-      observable: Observable<T>,
-      next: (t: T) => void,
-      error?: (e: any) => void,
-      complete?: () => void): void
     $fromDOMEvent(selector: string | null, event: string): Observable<Event>
     $createObservableMethod(methodName: string): Observable<any>
+
+    $subscribeTo<T>(
+      observable: Observable<T>,
+      observer?: PartialObserver<T>,
+    ): void;
+
+    $subscribeTo<T>(
+      observable: Observable<T>,
+      next: (value: T) => void,
+      error?: (error: any) => void,
+      complete?: () => void,
+    ): void;
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import { Subscription } from 'rxjs'`
`2`	`2`
`3`		`-export default function subscribeTo (observable, next, error, complete) {`
`4`		`- const subscription = observable.subscribe(next, error, complete)`
	`3`	`+export default function subscribeTo (observable, ...subscribeArgs) {`
	`4`	`+ const subscription = observable.subscribe(...subscribeArgs)`
`5`	`5`	`;(this._subscription \|\| (this._subscription = new Subscription())).add(subscription)`
`6`	`6`	`return subscription`
`7`	`7`	`}`