@cascateer/core 2.1.20 → 2.1.22

package/package.json

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

package/src/api.ts

@@ -5,11 +5,9 @@ import {
   isEqual,
   isFunction,
   memoize,
-  thru,
 } from "lodash";
 import objectHash from "object-hash";
 import {
-  BehaviorSubject,
   combineLatest,
   filter,
   finalize,
@@ -52,35 +50,27 @@ class Memoizable<Args, Result> {
     this.subscribe = (invalidatedTags) => {
       const memoizedEffect: ProxyEffect<Args, Result> = memoize(
         (args) =>
-          thru(
-            new BehaviorSubject(false),
-            (pending) =>
-              new ProxyObservable(this.predicate(args), (target) => ({
-                value: target.pipe(
-                  tap({
-                    subscribe: () => pending.next(true),
-                  }),
-                  finalize(() => pending.next(false)),
-                  repeat({
-                    delay: () =>
-                      combineLatest([
-                        memoizedEffect(args).pipe(
-                          map((result) => this.tags(args, result)),
-                        ),
-                        invalidatedTags,
-                      ]).pipe(
-                        filter(([tags, invalidatedTags]) =>
-                          isEqual(
-                            tags,
-                            intersectionWith(tags, invalidatedTags),
-                          ),
-                        ),
-                      ),
-                  }),
-                  shareReplay({ bufferSize: 1, refCount: false }),
-                ),
-                pending,
-              })),
+          new ProxyObservable((pending) =>
+            this.predicate(args).pipe(
+              tap({
+                subscribe: () => pending.next(true),
+              }),
+              finalize(() => pending.next(false)),
+              repeat({
+                delay: () =>
+                  combineLatest([
+                    memoizedEffect(args).pipe(
+                      map((result) => this.tags(args, result)),
+                    ),
+                    invalidatedTags,
+                  ]).pipe(
+                    filter(([tags, invalidatedTags]) =>
+                      isEqual(tags, intersectionWith(tags, invalidatedTags)),
+                    ),
+                  ),
+              }),
+              shareReplay({ bufferSize: 1, refCount: false }),
+            ),
           ),
         (args) => objectHash(args ?? null),
       );

package/src/observable/ProxyObservable.ts

@@ -1,46 +1,31 @@
-import { tap, thru } from "lodash";
+import { constant, once, tap } from "lodash";
 import {
+  BehaviorSubject,
   isObservable,
   map,
+  NextObserver,
   Observable,
-  of,
   ReplaySubject,
   scan,
   Subscriber,
   UnaryFunction,
 } from "rxjs";
 
-export interface ProxyObservableDescriptor<T, U> {
-  (target: T):
-    | U
-    | {
-        value: U;
-        pending?: Observable<boolean>;
-      };
-}
-
-export class ProxyObservable<
-  X,
-  Y = X,
-  T extends Observable<X> = Observable<X>,
-> extends Observable<Y> {
+export class ProxyObservable<T> extends Observable<T> {
   pending: Observable<boolean>;
   refCount: Observable<number>;
 
   constructor(
-    target: T,
-    descriptor: ProxyObservableDescriptor<T, Observable<Y>>,
+    target: Observable<T> | ((pending: NextObserver<boolean>) => Observable<T>),
+    pendingFactory?: UnaryFunction<ProxyObservable<T>, Observable<boolean>>,
   ) {
-    const { value, pending = of(false) } = thru(
-      descriptor(target),
-      (descriptor) =>
-        isObservable(descriptor) ? { value: descriptor } : descriptor,
-    );
-
     const subscribers = new ReplaySubject<
-      UnaryFunction<Set<Subscriber<Y>>, void>
+      UnaryFunction<Set<Subscriber<T>>, void>
     >();
 
+    const project = once(isObservable(target) ? constant(target) : target);
+    const pending = new BehaviorSubject(false);
+
     super((subscriber) => {
       subscribers.next((subscribers) => subscribers.add(subscriber));
 
@@ -48,12 +33,15 @@ export class ProxyObservable<
         subscribers.next((subscribers) => subscribers.delete(subscriber)),
       );
 
-      return value.subscribe(subscriber);
+      return project(pending).subscribe(subscriber);
     });
 
+    console.log(pendingFactory, this);
+    pendingFactory?.call(null, this).subscribe(pending);
+
     this.pending = pending;
     this.refCount = subscribers.pipe(
-      scan(tap, new Set<Subscriber<Y>>()),
+      scan(tap, new Set<Subscriber<T>>()),
       map((subscribers) => subscribers.size),
     );
   }

package/src/observable/Signal.ts

@@ -54,7 +54,7 @@ export class Signal<T> extends ProxyObservable<T> {
     enumerator?: SignalEnumerator<T>;
     reflector?: SignalReflector<T>;
   }) {
-    super(value, identity);
+    super(value);
 
     this.enumerator = enumerator;
     this.reflector = reflector;

package/src/types.ts

@@ -45,12 +45,11 @@ export class ProxyEffectInterceptor extends ReplaySubject<
       effects,
       (effect) => (args) =>
         tap(
-          new ProxyObservable(effect(args), (target) => ({
-            value: target,
-            pending: combineLatest([target.pending, target.refCount]).pipe(
+          new ProxyObservable(effect(args), (target) =>
+            combineLatest([target.pending, target.refCount]).pipe(
               map((values) => values.every(Boolean)),
             ),
-          })),
+          ),
           (source) => this.next(source),
         ),
     );
@@ -58,9 +57,8 @@ export class ProxyEffectInterceptor extends ReplaySubject<
 
   proxy<Args, Result>(effect: Effect<Args, Result>): ProxyEffect<Args, Result> {
     return (args) =>
-      new ProxyObservable(effect(args), (target) => ({
-        value: target,
-        pending: this.pipe(
+      new ProxyObservable(effect(args), () =>
+        this.pipe(
           distinct(),
           concat(),
           switchMap((sources) =>
@@ -68,7 +66,7 @@ export class ProxyEffectInterceptor extends ReplaySubject<
           ),
           map((values) => values.some(Boolean)),
         ),
-      }));
+      );
   }
 }