@cascateer/core 2.1.30 → 2.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cascateer/core",
-  "version": "2.1.30",
+  "version": "2.1.31",
   "repository": {
     "type": "git",
     "url": "https://github.com/cascateer/core.git"

package/src/observable/ProxyObservable.ts

@@ -20,14 +20,14 @@ export class ProxyObservable<
 
   constructor(
     target: U | ((pending: NextObserver<boolean>) => U),
-    pendingFactory?: UnaryFunction<U, Observable<boolean>>,
+    handler?: (target: U, receiver: ProxyObservable<T>) => Observable<boolean>,
   ) {
     const subscribers = new ReplaySubject<
       UnaryFunction<Set<Subscriber<T>>, void>
     >();
 
     const pending = new BehaviorSubject(false);
-    const source = once(() =>
+    const memoizedTarget = once(() =>
       isObservable(target) ? target : target(pending),
     );
 
@@ -38,7 +38,7 @@ export class ProxyObservable<
         subscribers.next((subscribers) => subscribers.delete(subscriber)),
       );
 
-      return source().subscribe(subscriber);
+      return memoizedTarget().subscribe(subscriber);
     });
 
     this.pending = pending;
@@ -47,6 +47,6 @@ export class ProxyObservable<
       map((subscribers) => subscribers.size),
     );
 
-    pendingFactory?.call(null, source()).subscribe(pending);
+    handler?.call(null, memoizedTarget(), this).subscribe(pending);
   }
 }

package/src/operators/index.ts

@@ -12,4 +12,3 @@ export {
 } from "./multicast";
 export { proxyReplaySubject } from "./proxyReplaySubject";
 export { sequence } from "./sequence";
-export { tapSubscription } from "./tapSubscription";

package/src/types.ts

@@ -45,8 +45,8 @@ export class ProxyEffectInterceptor extends ReplaySubject<
     return mapValues(effects, (effect) =>
       memoizeHashed((args) =>
         tap(
-          new ProxyObservable(effect(args), (target) =>
-            combineLatest([target.pending, target.refCount]).pipe(
+          new ProxyObservable(effect(args), (target, receiver) =>
+            combineLatest([target.pending, receiver.refCount]).pipe(
               map((values) => values.every(Boolean)),
             ),
           ),

package/src/operators/tapSubscription.ts

@@ -1,14 +0,0 @@
-import { MonoTypeOperatorFunction, NextObserver, tap } from "rxjs";
-
-export const tapSubscription =
-  <T>(observer?: NextObserver<boolean>): MonoTypeOperatorFunction<T> =>
-  (source) => {
-    let subscriptions = 0;
-
-    return source.pipe(
-      tap({
-        subscribe: () => observer?.next(++subscriptions > 0),
-        unsubscribe: () => observer?.next(--subscriptions > 0),
-      }),
-    );
-  };