@cascateer/core 2.1.31 → 2.1.33

package/package.json

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

package/src/lib/memoizeHashed.ts

@@ -1,5 +1,4 @@
 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));
+  memoize(func, (...args: Parameters<T>) => JSON.stringify(args ?? null));

package/src/operators/every.ts

@@ -0,0 +1,4 @@
+import { map, OperatorFunction } from "rxjs";
+
+export const every = (): OperatorFunction<any[], boolean> => (source) =>
+  source.pipe(map((values) => values.every(Boolean)));

package/src/operators/index.ts

@@ -1,4 +1,5 @@
 export { concat } from "./concat";
+export { every } from "./every";
 export { exchangeWith } from "./exchangeWith";
 export { flatMap } from "./flatMap";
 export {
@@ -12,3 +13,4 @@ export {
 } from "./multicast";
 export { proxyReplaySubject } from "./proxyReplaySubject";
 export { sequence } from "./sequence";
+export { some } from "./some";

package/src/operators/some.ts

@@ -0,0 +1,4 @@
+import { map, OperatorFunction } from "rxjs";
+
+export const some = (): OperatorFunction<any[], boolean> => (source) =>
+  source.pipe(map((values) => values.some(Boolean)));

package/src/terminal.ts

@@ -79,24 +79,27 @@ export class ExtendableTerminalAdapter<
   ) {
     return new ExtendableTerminalAdapter(
       this.context,
-      this.extendableEffects.extend((currentEffects) => () => {
-        const interceptor = new ProxyEffectInterceptor();
-        const source = {
-          store: {
-            effects: asStoreEffects(this.context.store.signals),
-          },
-          api: {
-            effects: interceptor.intercept(this.context.api.effects),
-          },
-          terminal: {
-            effects: interceptor.intercept(currentEffects),
-          },
-        };
+      this.extendableEffects.extend(
+        (currentEffects) => () =>
+          effects({
+            effect: (constructor) => {
+              const interceptor = new ProxyEffectInterceptor();
+              const source = {
+                store: {
+                  effects: asStoreEffects(this.context.store.signals),
+                },
+                api: {
+                  effects: interceptor.intercept(this.context.api.effects),
+                },
+                terminal: {
+                  effects: interceptor.intercept(currentEffects),
+                },
+              };
 
-        return effects({
-          effect: (constructor) => interceptor.proxy(constructor(source)),
-        });
-      }),
+              return interceptor.proxy(constructor(source));
+            },
+          }),
+      ),
       this.extendableActions,
     );
   }

package/src/types.ts

@@ -2,7 +2,6 @@ import { Dictionary, mapValues, tap } from "lodash";
 import {
   combineLatest,
   distinct,
-  map,
   ReplaySubject,
   switchMap,
   UnaryFunction,
@@ -11,7 +10,7 @@ import { Observable } from "rxjs/internal/Observable";
 import { ObservableInput } from "rxjs/internal/types";
 import { memoizeHashed } from "./lib";
 import { ProxyObservable } from "./observable";
-import { concat } from "./operators";
+import { concat, every, some } from "./operators";
 
 export interface Effect<Args, Result> extends UnaryFunction<
   Args,
@@ -46,9 +45,7 @@ export class ProxyEffectInterceptor extends ReplaySubject<
       memoizeHashed((args) =>
         tap(
           new ProxyObservable(effect(args), (target, receiver) =>
-            combineLatest([target.pending, receiver.refCount]).pipe(
-              map((values) => values.every(Boolean)),
-            ),
+            combineLatest([target.pending, receiver.refCount]).pipe(every()),
           ),
           (source) => this.next(source),
         ),
@@ -65,7 +62,7 @@ export class ProxyEffectInterceptor extends ReplaySubject<
           switchMap((sources) =>
             combineLatest(sources.map((source) => source.pending)),
           ),
-          map((values) => values.some(Boolean)),
+          some(),
         ),
       );
   }