@cascateer/core 2.1.10 → 2.1.12

package/package.json

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

package/src/types.ts

@@ -1,4 +1,5 @@
-import { Dictionary, mapValues, tap } from "lodash";
+import { Dictionary, mapValues, memoize, tap } from "lodash";
+import objectHash from "object-hash";
 import {
   combineLatest,
   distinct,
@@ -42,35 +43,40 @@ export class AsyncEffectInterceptor extends ReplaySubject<
   intercept<Effects extends Dictionary<AsyncEffect<any, any>>>(
     effects: Effects,
   ): AsyncEffects<Effects> {
-    return mapValues(
-      effects,
-      (effect) => (args) => tap(effect(args), (source) => this.next(source)),
+    return mapValues(effects, (effect) =>
+      memoize(
+        (args) => tap(effect(args), (source) => this.next(source)),
+        (args) => objectHash(args ?? null),
+      ),
     );
   }
 
   toAsyncEffect<Args, Result>(
     effect: Effect<Args, Result>,
   ): AsyncEffect<Args, Result> {
-    return (args) =>
-      new (class
-        extends ProxyObservable<Result>
-        implements AsyncObservable<Result>
-      {
-        pending: Observable<boolean>;
+    return memoize(
+      (args) =>
+        new (class
+          extends ProxyObservable<Result>
+          implements AsyncObservable<Result>
+        {
+          pending: Observable<boolean>;
 
-        constructor(interceptor: AsyncEffectInterceptor) {
-          super(effect(args), identity);
+          constructor(interceptor: AsyncEffectInterceptor) {
+            super(effect(args), identity);
 
-          this.pending = interceptor.pipe(
-            distinct(),
-            concat(),
-            switchMap((sources) =>
-              combineLatest(sources.map((source) => source.pending)),
-            ),
-            map((values) => values.some(Boolean)),
-          );
-        }
-      })(this);
+            this.pending = interceptor.pipe(
+              distinct(),
+              concat(),
+              switchMap((sources) =>
+                combineLatest(sources.map((source) => source.pending)),
+              ),
+              map((values) => values.some(Boolean)),
+            );
+          }
+        })(this),
+      (args) => objectHash(args ?? null),
+    );
   }
 }