@cascateer/core 2.1.27 → 2.1.29

package/package.json

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

package/src/api.ts

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

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,
@@ -9,7 +10,6 @@ import {
 } from "rxjs";
 import { Observable } from "rxjs/internal/Observable";
 import { ObservableInput } from "rxjs/internal/types";
-import { memoizeHashed } from "./lib";
 import { ProxyObservable } from "./observable";
 import { concat } from "./operators";
 
@@ -43,15 +43,17 @@ export class ProxyEffectInterceptor extends ReplaySubject<
     effects: Effects,
   ): ProxyEffects<Effects> {
     return mapValues(effects, (effect) =>
-      memoizeHashed((args) =>
-        tap(
-          new ProxyObservable(effect(args), (target) =>
-            combineLatest([target.pending, target.refCount]).pipe(
-              map((values) => values.every(Boolean)),
+      memoize(
+        (args) =>
+          tap(
+            new ProxyObservable(effect(args), (target) =>
+              combineLatest([target.pending, target.refCount]).pipe(
+                map((values) => values.every(Boolean)),
+              ),
             ),
+            (source) => this.next(source),
           ),
-          (source) => this.next(source),
-        ),
+        (args) => objectHash(args ?? null),
       ),
     );
   }