@statewalker/fsm 0.26.0 → 0.27.0

package/dist/index.d.ts

@@ -117,9 +117,10 @@ declare function setStateTracer(state: FsmState, print?: Printer): void;
 declare function isStateTransitionEnabled(process: FsmProcess, event: string): boolean;
 declare function getStateTransitions(state?: FsmState): [from: string, event: string, to: string][];
 
-declare function newFsmProcess(config: FsmStateConfig, handler: (state: string, event: undefined | string) => void | Promise<void> | ((event: undefined | string) => void | Promise<void>) | Promise<(event: undefined | string) => void | Promise<void>>): [
+type Module<C = unknown> = (context: C) => void | (() => void | Promise<void>) | Promise<void | (() => void | Promise<void>)>;
+declare function newFsmProcess<C>(context: C, config: FsmStateConfig, load: (state: string, event: undefined | string) => undefined | Module<C> | Module<C>[] | Promise<undefined | Module<C> | Module<C>[]>): [
     dispatch: (event: string) => Promise<boolean>,
     shutdown: () => Promise<void>
 ];
 
-export { EVENT_ANY, EVENT_EMPTY, type FsmEventKey, FsmProcess, type FsmProcessDump, type FsmProcessDumpHandler, type FsmProcessHandler, FsmState, type FsmStateConfig, FsmStateDescriptor, type FsmStateDump, type FsmStateDumpHandler, type FsmStateErrorHandler, type FsmStateHandler, type FsmStateKey, KEY_PRINTER, type Printer, type PrinterConfig, STATE_ANY, STATE_FINAL, STATE_INITIAL, STATUS_ENTER, STATUS_EXIT, STATUS_FINISHED, STATUS_FIRST, STATUS_LAST, STATUS_LEAF, STATUS_NEXT, STATUS_NONE, getPrinter, getProcessPrinter, getStateTransitions, isStateTransitionEnabled, newFsmProcess, newProcess, preparePrinter, setPrinter, setProcessPrinter, setProcessTracer, setStateTracer };
+export { EVENT_ANY, EVENT_EMPTY, type FsmEventKey, FsmProcess, type FsmProcessDump, type FsmProcessDumpHandler, type FsmProcessHandler, FsmState, type FsmStateConfig, FsmStateDescriptor, type FsmStateDump, type FsmStateDumpHandler, type FsmStateErrorHandler, type FsmStateHandler, type FsmStateKey, KEY_PRINTER, type Module, type Printer, type PrinterConfig, STATE_ANY, STATE_FINAL, STATE_INITIAL, STATUS_ENTER, STATUS_EXIT, STATUS_FINISHED, STATUS_FIRST, STATUS_LAST, STATUS_LEAF, STATUS_NEXT, STATUS_NONE, getPrinter, getProcessPrinter, getStateTransitions, isStateTransitionEnabled, newFsmProcess, newProcess, preparePrinter, setPrinter, setProcessPrinter, setProcessTracer, setStateTracer };

package/dist/index.js

@@ -410,22 +410,24 @@ function getTransitionsFromDescriptor(descriptor, prevStateKey, index = {}) {
 }
 
 // src/newFsmProcess.ts
-function newFsmProcess(config, handler) {
+function newFsmProcess(context, config, load) {
   let started = false;
   let terminated = false;
   const process = new FsmProcess(config);
   process.onStateCreate((state) => {
     started = true;
-    let cleanup;
     state.onEnter(async () => {
-      cleanup = await handler(state.key, process.event);
-    });
-    state.onExit(async () => {
-      cleanup?.(process.event);
+      const modules = await load(state.key, process.event) ?? [];
+      for (const module of Array.isArray(modules) ? modules : [modules]) {
+        const handler = await module(context);
+        if (typeof handler === "function") {
+          state.onExit(handler);
+        }
+      }
     });
   });
   async function dispatch(event) {
-    return terminated || event !== void 0 ? process.dispatch(event) : false;
+    return terminated || event !== void 0 && (!started || isStateTransitionEnabled(process, event)) ? process.dispatch(event) : false;
   }
   async function shutdown() {
     await process.shutdown();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statewalker/fsm",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "description": "HFSM Implementation",
   "keywords": [],
   "homepage": "https://github.com/statewalker/statewalker-fsm",

package/src/newFsmProcess.ts

@@ -2,16 +2,24 @@ import { FsmProcess } from "./FsmProcess.js";
 import type { FsmStateConfig } from "./FsmStateConfig.js";
 import { isStateTransitionEnabled } from "./utils/transitions.js";
 
-export function newFsmProcess(
+export type Module<C = unknown> = (
+  context: C,
+) =>
+  | void
+  | (() => void | Promise<void>)
+  | Promise<void | (() => void | Promise<void>)>;
+
+export function newFsmProcess<C>(
+  context: C,
   config: FsmStateConfig,
-  handler: (
+  load: (
     state: string,
     event: undefined | string,
   ) =>
-    | void
-    | Promise<void>
-    | ((event: undefined | string) => void | Promise<void>)
-    | Promise<(event: undefined | string) => void | Promise<void>>,
+    | undefined
+    | Module<C>
+    | Module<C>[]
+    | Promise<undefined | Module<C> | Module<C>[]>,
 ): [
   dispatch: (event: string) => Promise<boolean>,
   shutdown: () => Promise<void>,
@@ -21,19 +29,20 @@ export function newFsmProcess(
   const process = new FsmProcess(config);
   process.onStateCreate((state) => {
     started = true;
-    let cleanup: Awaited<ReturnType<typeof handler>> | undefined;
     state.onEnter(async () => {
-      cleanup = await handler(state.key, process.event);
-    });
-    state.onExit(async () => {
-      cleanup?.(process.event);
+      const modules = (await load(state.key, process.event)) ?? [];
+      for (const module of Array.isArray(modules) ? modules : [modules]) {
+        const handler = await module(context);
+        if (typeof handler === "function") {
+          state.onExit(handler);
+        }
+      }
     });
   });
   async function dispatch(event: string): Promise<boolean> {
     return terminated ||
-      (event !== undefined 
-        // && (!started || isStateTransitionEnabled(process, event))
-      )
+      (event !== undefined &&
+        (!started || isStateTransitionEnabled(process, event)))
       ? process.dispatch(event)
       : false;
   }