@cascateer/core 2.0.13 → 2.0.15

package/package.json

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

package/src/api.ts

@@ -38,7 +38,7 @@ interface TagsConstructor<Args, Result> {
 
 interface MemoizableConfig<Args, Result> {
   predicate: UnaryFunction<Args, MaybeObservable<{ data: Result }>>;
-  tags: TagsConstructor<Args, Result> | MaybeArray<string>;
+  tags?: TagsConstructor<Args, Result> | MaybeArray<string>;
 }
 
 class Memoizable<Args, Result> {
@@ -52,7 +52,7 @@ class Memoizable<Args, Result> {
   constructor({ predicate, tags }: MemoizableConfig<Args, Result>) {
     this.predicate = (args) =>
       asObservable(predicate(args)).pipe(map(property("data")));
-    this.tags = isFunction(tags) ? tags : constant([tags].flat());
+    this.tags = isFunction(tags) ? tags : constant([tags ?? []].flat());
 
     this.subscribe = (invalidatedTags) => {
       const loading = new BehaviorSubject(false);

package/src/component.ts

@@ -1,6 +1,7 @@
 import { Dictionary, kebabCase } from "lodash";
 import { defer, share, UnaryFunction } from "rxjs";
 import { createFragment } from ".";
+import { ApiAdapter, ApiEffect } from "./api";
 import { cssStyleSheets } from "./css";
 import { defineCustomElement } from "./dom";
 import { ExtendableDictionary } from "./lib";
@@ -67,6 +68,8 @@ export class ComponentsAdapter<
 export class ExtendableComponentsAdapter<
   StoreSignals extends Dictionary<ComputedSignal<any>>,
   StoreActions extends Dictionary<Action<any, any>>,
+  ApiEffects extends Dictionary<ApiEffect<any, any>>,
+  ApiActions extends Dictionary<Action<any, any>>,
   TerminalEffects extends Dictionary<TerminalEffect<any, any>>,
   TerminalActions extends Dictionary<Action<any, any>>,
   Components extends Dictionary<ComponentConstructor<any>>,
@@ -78,6 +81,7 @@ export class ExtendableComponentsAdapter<
   constructor(
     public context: {
       store: StoreAdapter<StoreSignals, StoreActions>;
+      api: ApiAdapter<ApiEffects, ApiActions>;
       terminal: TerminalAdapter<TerminalEffects, TerminalActions>;
     },
     private extendableComponents: ExtendableDictionary<
@@ -98,6 +102,10 @@ export class ExtendableComponentsAdapter<
                 effects: StoreEffects<StoreSignals>;
                 actions: StoreActions;
               };
+              api: {
+                effects: ApiEffects;
+                actions: ApiActions;
+              };
               terminal: {
                 effects: TerminalEffects;
                 actions: TerminalActions;
@@ -121,6 +129,10 @@ export class ExtendableComponentsAdapter<
                   effects: asStoreEffects(this.context.store.signals),
                   actions: this.context.store.actions,
                 },
+                api: {
+                  effects: this.context.api.effects,
+                  actions: this.context.api.actions,
+                },
                 terminal: {
                   effects: this.context.terminal.effects,
                   actions: this.context.terminal.actions,
@@ -135,17 +147,22 @@ export class ExtendableComponentsAdapter<
 export class ComponentsProvider<
   StoreSignals extends Dictionary<ComputedSignal<any>>,
   StoreActions extends Dictionary<Action<any, any>>,
+  ApiEffects extends Dictionary<ApiEffect<any, any>>,
+  ApiActions extends Dictionary<Action<any, any>>,
   TerminalEffects extends Dictionary<TerminalEffect<any, any>>,
   TerminalActions extends Dictionary<Action<any, any>>,
 > extends ExtendableComponentsAdapter<
   StoreSignals,
   StoreActions,
+  ApiEffects,
+  ApiActions,
   TerminalEffects,
   TerminalActions,
   {}
 > {
   constructor(context: {
     store: StoreAdapter<StoreSignals, StoreActions>;
+    api: ApiAdapter<ApiEffects, ApiActions>;
     terminal: TerminalAdapter<TerminalEffects, TerminalActions>;
   }) {
     super(context, new ExtendableDictionary({}));

package/src/index.ts

@@ -1,4 +1,4 @@
-export { ApiProvider } from "./api";
+export { ApiProvider, type ApiEffect } from "./api";
 export { App } from "./app";
 export { createComponent } from "./component";
 export { defineCustomProperties } from "./dom";
@@ -6,4 +6,4 @@ export { createElement, createFragment } from "./jsx-runtime";
 export { createSlice } from "./slice";
 export { type StoreEffect } from "./store";
 export { type TerminalEffect } from "./terminal";
-export { type Action, type MaybeObservable } from "./types";
+export { type Action, type Effect, type MaybeObservable } from "./types";

package/src/slice.ts

@@ -54,6 +54,8 @@ interface SliceConfig<
         new (): ComponentsProvider<
           StoreSignals,
           StoreActions,
+          ApiEffects,
+          ApiActions,
           TerminalEffects,
           TerminalActions
         >;
@@ -171,13 +173,15 @@ export class Slice<
                         class extends ComponentsProvider<
                           StoreSignals,
                           StoreActions,
+                          ApiEffects,
+                          ApiActions,
                           TerminalEffects,
                           TerminalActions
                         > {
                           constructor() {
                             super(context);
                           }
-                        })({ store: this.store, terminal: this.terminal }),
+                        })({ store: this.store, api, terminal: this.terminal }),
                     }).components,
                     (componentConstructor) =>
                       componentConstructor.predicate(key),