@statewalker/fsm 0.20.0 → 0.20.2

package/dist/index.d.ts

@@ -16,11 +16,13 @@ declare const STATE_INITIAL = "";
 declare const STATE_FINAL = "";
 declare const EVENT_ANY = "*";
 declare const EVENT_EMPTY = "";
+type FsmStateKey = string;
+type FsmEventKey = string;
 type FsmStateConfig = {
-    key: string;
-    transitions: [string, string, string][];
+    key: FsmStateKey;
+    transitions?: [from: FsmStateKey, event: FsmEventKey, to: FsmStateKey][];
     states?: FsmStateConfig[];
-};
+} & Record<string, any>;
 
 declare class FsmStateDescriptor {
     transitions: Record<string, Record<string, string>>;
@@ -106,4 +108,4 @@ 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, FsmProcess, type FsmProcessDump, type FsmProcessDumpHandler, type FsmProcessHandler, FsmState, type FsmStateConfig, FsmStateDescriptor, type FsmStateDump, type FsmStateDumpHandler, type FsmStateErrorHandler, type FsmStateHandler, 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, 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 };

package/dist/index.js

@@ -30,8 +30,7 @@ var FsmBaseClass = class {
   }
   _removeHandler(type, handler) {
     let list = this.handlers[type];
-    if (!list)
-      return;
+    if (!list) return;
     list = list.filter((h) => h !== handler);
     if (list.length > 0) {
       this.handlers[type] = list;
@@ -123,7 +122,7 @@ var FsmStateDescriptor = class _FsmStateDescriptor {
   states = {};
   static build(config) {
     const descriptor = new _FsmStateDescriptor();
-    for (const [from, event, to] of config.transitions) {
+    for (const [from, event, to] of config.transitions || []) {
       const index = descriptor.transitions[from] = descriptor.transitions[from] || {};
       index[event] = to;
     }
@@ -145,8 +144,7 @@ var FsmStateDescriptor = class _FsmStateDescriptor {
     for (let i = 0, len = pairs.length; targetKey === void 0 && i < len; i++) {
       const [stateKey2, eventKey2] = pairs[i];
       const stateTransitions = this.transitions[stateKey2];
-      if (!stateTransitions)
-        continue;
+      if (!stateTransitions) continue;
       targetKey = stateTransitions[eventKey2];
     }
     return targetKey !== void 0 ? targetKey : STATE_FINAL;
@@ -180,13 +178,11 @@ var FsmProcess = class extends FsmBaseClass {
       if (this.status & STATUS_EXIT) {
         await this.state?._runHandler("onExit", this.state);
       }
-      if (!this._update())
-        return false;
+      if (!this._update()) return false;
       if (this.status & STATUS_ENTER) {
         await this.state?._runHandler("onEnter", this.state);
       }
-      if (this.status & mask)
-        return true;
+      if (this.status & mask) return true;
     }
   }
   async dump(...args) {
@@ -199,8 +195,7 @@ var FsmProcess = class extends FsmBaseClass {
       return stateDump;
     };
     const dumpStates = async (state, stack = []) => {
-      if (!state)
-        return stack;
+      if (!state) return stack;
       state.parent && await dumpStates(state.parent, stack);
       stack.push(await dumpState(state));
       return stack;
@@ -244,14 +239,12 @@ var FsmProcess = class extends FsmBaseClass {
     return state;
   }
   _getSubstate(parent, prevStateKey) {
-    if (!parent)
-      return;
+    if (!parent) return;
     const toState = parent.descriptor?.getTargetStateKey(
       prevStateKey || STATE_INITIAL,
       this.event || EVENT_EMPTY
     ) || STATE_FINAL;
-    if (!toState)
-      return;
+    if (!toState) return;
     return this._newSubstate(parent, toState);
   }
   _newSubstate(parent, toState) {
@@ -262,8 +255,7 @@ var FsmProcess = class extends FsmBaseClass {
     return this._newState(parent, toState, descriptor);
   }
   _update() {
-    if (this.status & STATUS_FINISHED)
-      return false;
+    if (this.status & STATUS_FINISHED) return false;
     const nextState = this.status !== STATUS_NONE ? this.status & STATUS_ENTER ? this._getSubstate(this.state, STATE_INITIAL) : this._getSubstate(this.state?.parent, this.state?.key) : this._newState(void 0, this.config.key, this.rootDescriptor);
     if (nextState !== void 0) {
       this.state = nextState;
@@ -275,8 +267,7 @@ var FsmProcess = class extends FsmBaseClass {
       } else {
         this.status = STATUS_LEAF;
       }
-      if (!this.state)
-        this.status = STATUS_FINISHED;
+      if (!this.state) this.status = STATUS_FINISHED;
     }
     return !(this.status & STATUS_FINISHED);
   }
@@ -335,11 +326,12 @@ function setProcessTracer(process, print) {
   });
 }
 function setStateTracer(state, print) {
-  const printLine = print || getPrinter(state);
   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}" -->`);
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statewalker/fsm",
-  "version": "0.20.0",
+  "version": "0.20.2",
   "description": "HFSM Implementation",
   "keywords": [],
   "homepage": "https://github.com/statewalker/statewalker-fsm",
@@ -24,10 +24,8 @@
       "import": "./src/index.ts"
     }
   },
-  "dependencies": {
-    "@statewalker/tree": "0.10.2"
-  },
   "devDependencies": {
+    "@changesets/cli": "^2.27.7",
     "@statewalker/eslint-config": "*",
     "@statewalker/typescript-config": "*",
     "eslint": "^9.0.0",
@@ -40,7 +38,8 @@
     "url": "git@github.com:statewalker/statewalker-fsm.git"
   },
   "scripts": {
-    "build": "yarn test && tsup",
+    "dist": "yarn test && tsup",
+    "build": "yarn dist",
     "watch": "tsup --watch",
     "clean": "rm -rf dist",
     "lint": "eslint \"**/*.(js|ts)\"",

package/src/FsmStateConfig.ts

@@ -4,10 +4,10 @@ export const STATE_FINAL = "";
 export const EVENT_ANY = "*";
 export const EVENT_EMPTY = "";
 
+export type FsmStateKey = string;
+export type FsmEventKey = string;
 export type FsmStateConfig = {
-  key: string;
-
-  transitions: [string, string, string][];
-
+  key: FsmStateKey;
+  transitions?: [from: FsmStateKey, event: FsmEventKey, to: FsmStateKey][];
   states?: FsmStateConfig[];
-};
+} & Record<string, any>;

package/src/FsmStateDescriptor.ts

@@ -11,7 +11,7 @@ export class FsmStateDescriptor {
 
   static build(config: FsmStateConfig) {
     const descriptor = new FsmStateDescriptor();
-    for (const [from, event, to] of config.transitions) {
+    for (const [from, event, to] of config.transitions || []) {
       const index = (descriptor.transitions[from] =
         descriptor.transitions[from] || {});
       index[event] = to;

package/src/context/tracer.ts

@@ -9,11 +9,12 @@ export function setProcessTracer(process: FsmProcess, print?: Printer) {
 }
 
 export function setStateTracer(state: FsmState, print?: Printer) {
-  const printLine = print || getPrinter(state);
   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}" -->`);
   });
 }