feat(rxjs): improve rxjs from (vitest-dev#987)

Co-authored-by: Jan Morawietz <jan.morawietz@paessler.com>
chaii3 · Dec 8, 2021 · fbcbef6 · fbcbef6
1 parent fa3cab3
commit fbcbef6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/packages/rxjs/from/_demo.vue b/packages/rxjs/from/_demo.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
-import { defineComponent, onMounted, Ref, ref } from 'vue-demi'
+import { onMounted, Ref, ref } from 'vue-demi'
 import { interval } from 'rxjs'
 import {
   mapTo,
   takeUntil,
   withLatestFrom,
-  startWith,
   map,
 } from 'rxjs/operators'
 import { useSubscription } from '../useSubscription'
@@ -21,7 +20,10 @@ onMounted(() => {
       .pipe(
         mapTo(1),
         takeUntil(fromEvent(button as Ref<HTMLButtonElement>, 'click')),
-        withLatestFrom(from(count).pipe(startWith(0))),
+        withLatestFrom(from(count, {
+          immediate: true,
+          deep: false,
+        })),
         map(([total, curr]) => curr + total),
       )
       .subscribe(toObserver(count)),

diff --git a/packages/rxjs/from/index.md b/packages/rxjs/from/index.md
@@ -22,7 +22,10 @@ useSubscription(
     .pipe(
       mapTo(1),
       takeUntil(fromEvent(button, 'click')),
-      withLatestFrom(from(count).pipe(startWith(0))),
+      withLatestFrom(from(count, {
+        immediate: true,
+        deep: false,
+      })),
       map(([total, curr]) => curr + total),
     )
     .subscribe(toObserver(count)) // same as ).subscribe(val => (count.value = val))

diff --git a/packages/rxjs/from/index.ts b/packages/rxjs/from/index.ts
@@ -1,12 +1,16 @@
 import { from as fromRxjs, fromEvent as fromEventRx, Observable } from 'rxjs'
 import type { ObservableInput } from 'rxjs'
 import { filter, mergeMap } from 'rxjs/operators'
-import { Ref, isRef, watch } from 'vue-demi'
+import { Ref, isRef, watch, WatchOptions } from 'vue-demi'
 
-export function from<T>(value: ObservableInput<T> | Ref<T>): Observable<T> {
+export function from<T>(value: ObservableInput<T> | Ref<T>, watchOptions?: WatchOptions): Observable<T> {
   if (isRef<T>(value)) {
     return new Observable((subscriber) => {
-      watch(value, val => subscriber.next(val))
+      const watchStopHandle = watch(value, val => subscriber.next(val), watchOptions)
+
+      return () => {
+        watchStopHandle()
+      }
     })
   }
   else {