@cascateer/core 2.4.19 → 2.4.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cascateer/core",
-  "version": "2.4.19",
+  "version": "2.4.21",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cascateer/core.git"
@@ -21,18 +21,18 @@
     "@types/lodash": "^4.17.24",
     "@types/object-hash": "^3.0.6",
     "@types/react": "^19.2.17",
-    "globals": "^17.6.0",
+    "globals": "^17.7.0",
     "typescript": "~6.0.3",
-    "typescript-eslint": "^8.61.1",
-    "vite": "^8.0.16",
+    "typescript-eslint": "^8.62.0",
+    "vite": "^8.1.0",
     "vitest": "^4.1.9"
   },
   "dependencies": {
-    "@cascateer/lib": "^1.0.21",
+    "@cascateer/lib": "^1.0.36",
     "lodash": "^4.18.1",
     "object-hash": "^3.0.0",
     "rxjs": "^7.8.2",
     "ts-brand": "^0.2.0",
-    "uuid": "^14.0.0"
+    "uuid": "^14.0.1"
   }
 }

package/src/api.ts

@@ -1,15 +1,19 @@
 import {
+  asArray,
+  asFunction,
   asObservable,
   ExtendableDictionary,
   MaybeArray,
+  MaybeFunction,
   MaybeObservable,
 } from "@cascateer/lib";
 import {
-  constant,
   Dictionary,
+  flow,
+  Function1,
+  Function2,
   intersectionWith,
   isEqual,
-  isFunction,
 } from "lodash";
 import {
   combineLatest,
@@ -23,32 +27,27 @@ import {
   shareReplay,
   Subject,
   tap,
-  UnaryFunction,
 } from "rxjs";
 import { memoize } from "./lib/memoize";
 import { ProxyObservable } from "./observable";
 import { Action, ProxyEffect } from "./types";
 
-interface TagsConstructor<Args, Result> {
-  (args: Args, result: Result): string[];
-}
-
 interface MemoizableConfig<Args, Result> {
-  predicate: UnaryFunction<Args, MaybeObservable<Result>>;
-  tags?: TagsConstructor<Args, Result> | MaybeArray<string>;
+  predicate: Function1<Args, MaybeObservable<Result>>;
+  tags?: MaybeFunction<[Args, Result], MaybeArray<string>>;
 }
 
 class Memoizable<Args, Result> {
-  predicate: UnaryFunction<Args, Observable<Result>>;
-  tags: TagsConstructor<Args, Result>;
+  predicate: Function1<Args, Observable<Result>>;
+  tags: Function2<Args, Result, string[]>;
 
-  subscribe: UnaryFunction<Observable<string[]>, ProxyEffect<Args, Result>>;
+  subscribe: Function1<Observable<string[]>, ProxyEffect<Args, Result>>;
 
-  share: UnaryFunction<NextObserver<string[]>, Action<Args, Result>>;
+  share: Function1<NextObserver<string[]>, Action<Args, Result>>;
 
   constructor({ predicate, tags }: MemoizableConfig<Args, Result>) {
     this.predicate = (args) => asObservable(predicate(args));
-    this.tags = isFunction(tags) ? tags : constant([tags ?? []].flat());
+    this.tags = flow(asFunction(tags ?? []), asArray);
 
     this.subscribe = (invalidatedTags) => {
       const memoizedEffect: ProxyEffect<Args, Result> = memoize(
@@ -91,7 +90,7 @@ export interface ApiEffect<Args, Result> extends ProxyEffect<Args, Result> {}
 
 type ApiAdapterPropertyConstructor<Source, Type extends "effect" | "action"> = {
   [T in Type]: <Args, Result>(
-    config: UnaryFunction<Source, MemoizableConfig<Args, Result>>,
+    config: Function1<Source, MemoizableConfig<Args, Result>>,
   ) => T extends "effect" ? ApiEffect<Args, Result> : Action<Args, Result>;
 }[Type];
 
@@ -130,7 +129,7 @@ export class ExtendableApiAdapter<
   ) {}
 
   provideEffects<MoreEffects extends Dictionary<ApiEffect<any, any>>>(
-    effects: UnaryFunction<
+    effects: Function1<
       { effect: ApiAdapterPropertyConstructor<Source, "effect"> },
       MoreEffects
     >,
@@ -151,7 +150,7 @@ export class ExtendableApiAdapter<
   }
 
   provideActions<MoreActions extends Dictionary<Action<any, any>>>(
-    actions: UnaryFunction<
+    actions: Function1<
       { action: ApiAdapterPropertyConstructor<Source, "action"> },
       MoreActions
     >,

package/src/lib/memoize.ts

@@ -2,6 +2,4 @@ import * as lodash from "lodash";
 import objectHash from "object-hash";
 
 export const memoize = <T extends (...args: any) => any>(func: T) =>
-  lodash.memoize(func, (...args: Parameters<T>) =>
-    lodash.tap(objectHash(args ?? null), (hash) => console.log({ hash, args })),
-  );
+  lodash.memoize(func, (...args: Parameters<T>) => objectHash(args ?? null));