@statewalker/fsm 0.20.2 → 0.22.0

package/dist/index.d.ts

@@ -77,6 +77,7 @@ declare class FsmProcess extends FsmBaseClass {
     config: FsmStateConfig;
     rootDescriptor: FsmStateDescriptor;
     constructor(config: FsmStateConfig);
+    shutdown(event?: string): Promise<void>;
     dispatch(event: string, mask?: number): Promise<boolean>;
     dump(...args: unknown[]): Promise<FsmProcessDump>;
     restore(dump: FsmProcessDump, ...args: unknown[]): Promise<this>;
@@ -89,23 +90,4 @@ declare class FsmProcess extends FsmBaseClass {
     _update(): boolean;
 }
 
-declare const KEY_HANDLERS = "handlers";
-declare function callStateHandlers(state: FsmState): void;
-declare function addSubstateHandlers(state: FsmState, handlers: Record<string, FsmStateHandler>): void;
-
-type Printer = (...args: any[]) => void;
-type PrinterConfig = {
-    prefix?: string;
-    print?: (...args: any[]) => void;
-    lineNumbers?: boolean;
-};
-declare const KEY_PRINTER = "printer";
-declare function preparePrinter(process: FsmProcess, { prefix, print, lineNumbers }: PrinterConfig): Printer;
-declare function setPrinter(state: FsmState, config?: PrinterConfig): void;
-declare function setProcessPrinter(process: FsmProcess, config?: PrinterConfig): void;
-declare function getPrinter(state: FsmState): Printer;
-
-declare function setProcessTracer(process: FsmProcess, print?: Printer): () => void;
-declare function setStateTracer(state: FsmState, print?: Printer): 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, type FsmStateSyncHandler, KEY_HANDLERS, 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, addSubstateHandlers, callStateHandlers, getPrinter, 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, type FsmStateSyncHandler, STATE_ANY, STATE_FINAL, STATE_INITIAL, STATUS_ENTER, STATUS_EXIT, STATUS_FINISHED, STATUS_FIRST, STATUS_LAST, STATUS_LEAF, STATUS_NEXT, STATUS_NONE };

package/dist/index.js

@@ -1,17 +1,8 @@
-// src/utils/bindMethods.ts
-function bindMethods(obj, ...methods) {
-  const o = obj;
-  methods.forEach((methodName) => {
-    o[methodName] = o[methodName].bind(o);
-  });
-  return obj;
-}
-
 // src/FsmBaseClass.ts
 var FsmBaseClass = class {
-  handlers = {};
-  data = {};
   constructor() {
+    this.handlers = {};
+    this.data = {};
     bindMethods(this, "setData", "getData");
   }
   setData(key, value) {
@@ -56,13 +47,16 @@ var FsmBaseClass = class {
     console.error(error);
   }
 };
+function bindMethods(obj, ...methods) {
+  const o = obj;
+  methods.forEach((methodName) => {
+    o[methodName] = o[methodName].bind(o);
+  });
+  return obj;
+}
 
 // src/FsmState.ts
 var FsmState = class extends FsmBaseClass {
-  process;
-  key;
-  parent;
-  descriptor;
   constructor(process, parent, key, descriptor) {
     super();
     this.process = process;
@@ -118,8 +112,10 @@ var EVENT_EMPTY = "";
 
 // src/FsmStateDescriptor.ts
 var FsmStateDescriptor = class _FsmStateDescriptor {
-  transitions = {};
-  states = {};
+  constructor() {
+    this.transitions = {};
+    this.states = {};
+  }
   static build(config) {
     const descriptor = new _FsmStateDescriptor();
     for (const [from, event, to] of config.transitions || []) {
@@ -161,17 +157,21 @@ var STATUS_FINISHED = 16;
 var STATUS_ENTER = STATUS_FIRST | STATUS_NEXT;
 var STATUS_EXIT = STATUS_LEAF | STATUS_LAST;
 var FsmProcess = class extends FsmBaseClass {
-  state;
-  event;
-  status = 0;
-  config;
-  rootDescriptor;
   constructor(config) {
     super();
+    this.status = 0;
     this.rootDescriptor = FsmStateDescriptor.build(config);
     this.config = config;
     bindMethods(this, "dispatch", "dump", "restore");
   }
+  async shutdown(event) {
+    while (this.state) {
+      this.event = event;
+      this.status = STATUS_FINISHED;
+      await this.state?._runHandler("onExit", this.state);
+      this.state = this.state.parent;
+    }
+  }
   async dispatch(event, mask = STATUS_LEAF) {
     this.event = event;
     while (true) {
@@ -272,77 +272,12 @@ var FsmProcess = class extends FsmBaseClass {
     return !(this.status & STATUS_FINISHED);
   }
 };
-
-// src/context/handlers.ts
-var KEY_HANDLERS = "handlers";
-function callStateHandlers(state) {
-  const key = state.key;
-  for (let parent = state.parent; !!parent; parent = parent?.parent) {
-    const handlers = parent.getData(KEY_HANDLERS)?.[key];
-    handlers?.forEach((handler) => handler(state));
-  }
-}
-function addSubstateHandlers(state, handlers) {
-  const oldIndex = state.getData(KEY_HANDLERS);
-  const index = oldIndex ? { ...oldIndex } : {};
-  for (const [key, handler] of Object.entries(handlers)) {
-    const list = index[key] = index[key] || [];
-    list.push(handler);
-  }
-  state.setData(KEY_HANDLERS, index);
-}
-
-// src/context/printer.ts
-var KEY_PRINTER = "printer";
-function preparePrinter(process, { prefix = "", print = console.log, lineNumbers = false }) {
-  let lineCounter = 0;
-  const shift = () => {
-    let prefix2 = "";
-    for (let s = process.state?.parent; !!s; s = s.parent) {
-      prefix2 += "  ";
-    }
-    return prefix2;
-  };
-  const getPrefix = lineNumbers ? () => `[${++lineCounter}]${shift()}` : shift;
-  const printer = (...args) => print(prefix, getPrefix(), ...args);
-  return printer;
-}
-function setPrinter(state, config = {}) {
-  const printer = preparePrinter(state.process, config);
-  state.setData(KEY_PRINTER, printer);
-}
-function setProcessPrinter(process, config = {}) {
-  const printer = preparePrinter(process, config);
-  process.setData(KEY_PRINTER, printer);
-}
-function getPrinter(state) {
-  return state.getData(KEY_PRINTER, true) || state.process.getData(KEY_PRINTER) || console.log;
-}
-
-// src/context/tracer.ts
-function setProcessTracer(process, print) {
-  return process.onStateCreate((state) => {
-    setStateTracer(state, print);
-  });
-}
-function setStateTracer(state, print) {
-  state.onEnter(() => {
-    const printLine = print || getPrinter(state);
-    printLine(`<${state?.key} event="${state.process.event}">`);
-  });
-  state.onExit(() => {
-    const printLine = print || getPrinter(state);
-    printLine(`</${state.key}> <!-- event="${state.process.event}" -->`);
-  });
-}
 export {
   EVENT_ANY,
   EVENT_EMPTY,
   FsmProcess,
   FsmState,
   FsmStateDescriptor,
-  KEY_HANDLERS,
-  KEY_PRINTER,
   STATE_ANY,
   STATE_FINAL,
   STATE_INITIAL,
@@ -353,13 +288,5 @@ export {
   STATUS_LAST,
   STATUS_LEAF,
   STATUS_NEXT,
-  STATUS_NONE,
-  addSubstateHandlers,
-  callStateHandlers,
-  getPrinter,
-  preparePrinter,
-  setPrinter,
-  setProcessPrinter,
-  setProcessTracer,
-  setStateTracer
+  STATUS_NONE
 };

package/dist/utils/index.d.ts

@@ -0,0 +1,23 @@
+import { FsmState, FsmStateHandler, FsmProcess } from '../index.js';
+
+declare const KEY_HANDLERS = "handlers";
+declare function callStateHandlers(state: FsmState): void;
+declare function addSubstateHandlers(state: FsmState, handlers: Record<string, FsmStateHandler>): void;
+
+type Printer = (...args: any[]) => void;
+type PrinterConfig = {
+    prefix?: string;
+    print?: (...args: any[]) => void;
+    lineNumbers?: boolean;
+};
+declare const KEY_PRINTER = "printer";
+declare function preparePrinter(process: FsmProcess, { prefix, print, lineNumbers }: PrinterConfig): Printer;
+declare function setPrinter(state: FsmState, config?: PrinterConfig): void;
+declare function setProcessPrinter(process: FsmProcess, config?: PrinterConfig): void;
+declare function getProcessPrinter(process: FsmProcess): Printer;
+declare function getPrinter(state: FsmState): Printer;
+
+declare function setProcessTracer(process: FsmProcess, print?: Printer): () => void;
+declare function setStateTracer(state: FsmState, print?: Printer): void;
+
+export { KEY_HANDLERS, KEY_PRINTER, type Printer, type PrinterConfig, addSubstateHandlers, callStateHandlers, getPrinter, getProcessPrinter, preparePrinter, setPrinter, setProcessPrinter, setProcessTracer, setStateTracer };

package/dist/utils/index.js

@@ -0,0 +1,78 @@
+// src/utils/handlers.ts
+var KEY_HANDLERS = "handlers";
+function callStateHandlers(state) {
+  const key = state.key;
+  for (let parent = state.parent; !!parent; parent = parent?.parent) {
+    const handlers = parent.getData(KEY_HANDLERS)?.[key];
+    handlers?.forEach((handler) => handler(state));
+  }
+}
+function addSubstateHandlers(state, handlers) {
+  const oldIndex = state.getData(KEY_HANDLERS);
+  const index = oldIndex ? { ...oldIndex } : {};
+  for (const [key, handler] of Object.entries(handlers)) {
+    const list = index[key] = index[key] || [];
+    list.push(handler);
+  }
+  state.setData(KEY_HANDLERS, index);
+}
+
+// src/utils/printer.ts
+var KEY_PRINTER = "printer";
+function preparePrinter(process, { prefix = "", print = console.log, lineNumbers = false }) {
+  let lineCounter = 0;
+  const shift = () => {
+    let prefix2 = "";
+    for (let s = process.state?.parent; !!s; s = s.parent) {
+      prefix2 += "  ";
+    }
+    return prefix2;
+  };
+  const getPrefix = lineNumbers ? () => `[${++lineCounter}]${shift()}` : shift;
+  const printer = (...args) => print(prefix, getPrefix(), ...args);
+  return printer;
+}
+function setPrinter(state, config = {}) {
+  const printer = preparePrinter(state.process, config);
+  state.setData(KEY_PRINTER, printer);
+}
+function setProcessPrinter(process, config = {}) {
+  const printer = preparePrinter(process, config);
+  process.setData(KEY_PRINTER, printer);
+}
+function getProcessPrinter(process) {
+  return process.getData(KEY_PRINTER) || console.log;
+}
+function getPrinter(state) {
+  return state.getData(KEY_PRINTER, true) || getProcessPrinter(state.process);
+}
+
+// src/utils/tracer.ts
+function setProcessTracer(process, print) {
+  return process.onStateCreate((state) => {
+    setStateTracer(state, print);
+  });
+}
+function setStateTracer(state, print) {
+  state.onEnter(() => {
+    const printLine = print || getPrinter(state);
+    printLine(`<${state?.key} event="${state.process.event}">`);
+  });
+  state.onExit(() => {
+    const printLine = print || getPrinter(state);
+    printLine(`</${state.key}> <!-- event="${state.process.event}" -->`);
+  });
+}
+export {
+  KEY_HANDLERS,
+  KEY_PRINTER,
+  addSubstateHandlers,
+  callStateHandlers,
+  getPrinter,
+  getProcessPrinter,
+  preparePrinter,
+  setPrinter,
+  setProcessPrinter,
+  setProcessTracer,
+  setStateTracer
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statewalker/fsm",
-  "version": "0.20.2",
+  "version": "0.22.0",
   "description": "HFSM Implementation",
   "keywords": [],
   "homepage": "https://github.com/statewalker/statewalker-fsm",
@@ -20,9 +20,8 @@
   "unpkg": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
-    ".": {
-      "import": "./src/index.ts"
-    }
+    ".": "./dist/index.js",
+    "./utils": "./dist/utils/index.js"
   },
   "devDependencies": {
     "@changesets/cli": "^2.27.7",

package/src/FsmBaseClass.ts

@@ -1,5 +1,3 @@
-import { bindMethods } from "./utils/bindMethods.ts";
-
 export class FsmBaseClass {
   handlers: Record<string, Function[]> = {};
   data: Record<string, unknown> = {};
@@ -50,3 +48,11 @@ export class FsmBaseClass {
     console.error(error);
   }
 }
+
+export function bindMethods<T>(obj: T, ...methods: string[]) {
+  const o = obj as any;
+  methods.forEach((methodName) => {
+    o[methodName] = (o[methodName] as Function).bind(o);
+  });
+  return obj;
+}

package/src/FsmProcess.ts

@@ -1,10 +1,5 @@
-import { bindMethods } from "./utils/bindMethods.ts";
-import { FsmBaseClass } from "./FsmBaseClass.ts";
-import {
-  FsmState,
-  FsmStateDump,
-  FsmStateSyncHandler,
-} from "./FsmState.ts";
+import { FsmBaseClass, bindMethods } from "./FsmBaseClass.ts";
+import { FsmState, FsmStateDump, FsmStateSyncHandler } from "./FsmState.ts";
 import {
   EVENT_EMPTY,
   FsmStateConfig,
@@ -54,6 +49,15 @@ export class FsmProcess extends FsmBaseClass {
     bindMethods(this, "dispatch", "dump", "restore");
   }
 
+  async shutdown(event?: string) {
+    while (this.state) {
+      this.event = event;
+      this.status = STATUS_FINISHED;
+      await this.state?._runHandler("onExit", this.state);
+      this.state = this.state.parent;
+    }
+  }
+
   async dispatch(event: string, mask: number = STATUS_LEAF) {
     this.event = event;
     while (true) {

package/src/FsmState.ts

@@ -1,5 +1,4 @@
-import { bindMethods } from "./utils/bindMethods.ts";
-import { FsmBaseClass } from "./FsmBaseClass.ts";
+import { FsmBaseClass, bindMethods } from "./FsmBaseClass.ts";
 import { FsmProcess } from "./FsmProcess.ts";
 import { FsmStateDescriptor } from "./FsmStateDescriptor.ts";
 

package/src/index.ts

@@ -2,4 +2,3 @@ export * from "./FsmProcess.ts";
 export * from "./FsmState.ts";
 export * from "./FsmStateConfig.ts";
 export * from "./FsmStateDescriptor.ts";
-export * from "./context/index.ts";

package/src/{context → utils}/handlers.ts

@@ -1,4 +1,4 @@
-import { FsmState, FsmStateHandler } from "../FsmState.ts";
+import type { FsmState, FsmStateHandler } from "../FsmState.ts";
 
 export const KEY_HANDLERS = "handlers";
 

package/src/{context → utils}/printer.ts

@@ -1,5 +1,5 @@
-import { type FsmProcess } from "../FsmProcess.ts";
-import { type FsmState } from "../FsmState.ts";
+import type { FsmProcess } from "../FsmProcess.ts";
+import type { FsmState } from "../FsmState.ts";
 export type Printer = (...args: any[]) => void;
 export type PrinterConfig = {
   prefix?: string;
@@ -39,10 +39,10 @@ export function setProcessPrinter(
   process.setData(KEY_PRINTER, printer);
 }
 
+export function getProcessPrinter(process: FsmProcess): Printer {
+  return process.getData(KEY_PRINTER) || console.log;
+}
+
 export function getPrinter(state: FsmState): Printer {
-  return (
-    state.getData(KEY_PRINTER, true) ||
-    state.process.getData(KEY_PRINTER) ||
-    console.log
-  );
+  return state.getData(KEY_PRINTER, true) || getProcessPrinter(state.process);
 }

package/src/{context → utils}/tracer.ts

@@ -1,5 +1,5 @@
-import { FsmProcess } from "../FsmProcess.ts";
-import { FsmState } from "../FsmState.ts";
+import type { FsmProcess } from "../FsmProcess.ts";
+import type { FsmState } from "../FsmState.ts";
 import { getPrinter, type Printer } from "./printer.ts";
 
 export function setProcessTracer(process: FsmProcess, print?: Printer) {

package/src/utils/bindMethods.ts

@@ -1,7 +0,0 @@
-export function bindMethods<T>(obj: T, ...methods: string[]) {
-  const o = obj as any;
-  methods.forEach((methodName) => {
-    o[methodName] = (o[methodName] as Function).bind(o);
-  });
-  return obj;
-}