@cascateer/core 2.1.26 → 2.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cascateer/core",
-  "version": "2.1.26",
+  "version": "2.1.27",
   "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,
@@ -21,7 +19,12 @@ import {
   tap,
   UnaryFunction,
 } from "rxjs";
-import { asObservable, ExtendableDictionary, property } from "./lib";
+import {
+  asObservable,
+  ExtendableDictionary,
+  memoizeHashed,
+  property,
+} from "./lib";
 import { ProxyObservable } from "./observable";
 import { Action, MaybeArray, MaybeObservable, ProxyEffect } from "./types";
 
@@ -48,7 +51,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 +75,6 @@ class Memoizable<Args, Result> {
               shareReplay({ bufferSize: 1, refCount: false }),
             ),
           ),
-        (args) => objectHash(args ?? null),
       );
 
       return memoizedEffect;

package/src/dom.ts

@@ -1,4 +1,4 @@
-import { identity, isObject, memoize } from "lodash";
+import { isObject, memoize } from "lodash";
 import { createFragment } from ".";
 
 export class CustomElement extends HTMLElement {
@@ -18,7 +18,7 @@ export const defineCustomElement = memoize((key: string) => {
   customElements.define(key, constructor);
 
   return constructor;
-}, identity);
+});
 
 export const defineCustomProperties = (
   definitions: Partial<JSX.CSSCustomPropertyDefinitions>,

package/src/lib/index.ts

@@ -11,6 +11,7 @@ export {
 } from "./Enumerable";
 export { ExtendableDictionary } from "./ExtendableDictionary";
 export { keys } from "./keys";
+export { memoizeHashed } from "./memoizeHashed";
 export { nthArg } from "./nthArg";
 export { property } from "./property";
 

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

@@ -1,5 +1,4 @@
-import { Dictionary, mapValues, memoize, tap } from "lodash";
-import objectHash from "object-hash";
+import { Dictionary, mapValues, tap } from "lodash";
 import {
   combineLatest,
   distinct,
@@ -10,6 +9,7 @@ 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,17 +43,15 @@ export class ProxyEffectInterceptor extends ReplaySubject<
     effects: Effects,
   ): ProxyEffects<Effects> {
     return mapValues(effects, (effect) =>
-      memoize(
-        (args) =>
-          tap(
-            new ProxyObservable(effect(args), (target) =>
-              combineLatest([target.pending, target.refCount]).pipe(
-                map((values) => values.every(Boolean)),
-              ),
+      memoizeHashed((args) =>
+        tap(
+          new ProxyObservable(effect(args), (target) =>
+            combineLatest([target.pending, target.refCount]).pipe(
+              map((values) => values.every(Boolean)),
             ),
-            (source) => this.next(source),
           ),
-        (args) => objectHash(args ?? null),
+          (source) => this.next(source),
+        ),
       ),
     );
   }