@cascateer/core 2.2.0 → 2.2.1

package/package.json

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

package/src/api.ts

@@ -4,9 +4,7 @@ import {
   intersectionWith,
   isEqual,
   isFunction,
-  memoize,
 } from "lodash";
-import objectHash from "object-hash";
 import {
   combineLatest,
   filter,
@@ -22,6 +20,7 @@ import {
   UnaryFunction,
 } from "rxjs";
 import { asObservable, ExtendableDictionary, property } from "./lib";
+import { memoizeHashed } from "./lib/memoizeHashed";
 import { ProxyObservable } from "./observable";
 import { Action, MaybeArray, MaybeObservable, ProxyEffect } from "./types";
 
@@ -48,7 +47,7 @@ class Memoizable<Args, Result> {
     this.tags = isFunction(tags) ? tags : constant([tags ?? []].flat());
 
     this.subscribe = (invalidatedTags) => {
-      const memoizedEffect: ProxyEffect<Args, Result> = memoize(
+      const memoizedEffect: ProxyEffect<Args, Result> = memoizeHashed(
         (args) =>
           new ProxyObservable((pending) =>
             this.predicate(args).pipe(
@@ -72,7 +71,6 @@ class Memoizable<Args, Result> {
               shareReplay({ bufferSize: 1, refCount: false }),
             ),
           ),
-        (args) => objectHash(args ?? null),
       );
 
       return memoizedEffect;

package/src/lib/memoizeHashed.ts

@@ -0,0 +1,5 @@
+import { memoize } from "lodash";
+import objectHash from "object-hash";
+
+export const memoizeHashed = <T extends (...args: any) => any>(func: T) =>
+  memoize(func, (...args: Parameters<T>) => objectHash(args ?? null));

package/src/types.ts

@@ -2,6 +2,7 @@ import { Dictionary, mapValues, tap } from "lodash";
 import { combineLatest, ReplaySubject, switchMap, UnaryFunction } from "rxjs";
 import { Observable } from "rxjs/internal/Observable";
 import { ObservableInput } from "rxjs/internal/types";
+import { memoizeHashed } from "./lib/memoizeHashed";
 import { ProxyObservable } from "./observable";
 import { concat, every, some } from "./operators";
 
@@ -34,15 +35,15 @@ export class ProxyEffectInterceptor extends ReplaySubject<
   intercept<Effects extends Dictionary<ProxyEffect<any, any>>>(
     effects: Effects,
   ): ProxyEffects<Effects> {
-    return mapValues(
-      effects,
-      (effect) => (args) =>
+    return mapValues(effects, (effect) =>
+      memoizeHashed((args) =>
         tap(
           new ProxyObservable(effect(args), (target, receiver) =>
             combineLatest([target.pending, receiver.refCount]).pipe(every()),
           ),
           (source) => this.next(source),
         ),
+      ),
     );
   }