@statewalker/fsm 0.9.2 → 0.10.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 statewalker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1 +1 @@
-# Hierarchical Finite State Machine Implementation
+# @statewalker/fsm: Hierarchical Finite State Machine

package/dist/{cjs/statewalker-fsm.js → index-umd.js}

@@ -1,65 +1,9 @@
-// @statewalker/fsm v0.9.2 https://github.com/statewalker/statewalker Copyright 2022 Mikhail Kotelnikov
+// @statewalker/fsm v0.10.1 https://github.com/statewalker/statewalker-tree Copyright 2022 Mikhail Kotelnikov
 (function (global, factory) {
-typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
-typeof define === 'function' && define.amd ? define(['exports'], factory) :
-(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.statewalker = global.statewalker || {}, global.statewalker.fsm = global.statewalker.fsm || {})));
-})(this, (function (exports) { 'use strict';
-
-const MODE = {
-  NONE : 0,
-  FIRST: 1, // old=true; new=true => ENTER + ENTER
-  NEXT: 2,  // old=false; new=true => EXIT + ENTER
-  LEAF : 4, // old=true; new=false => ENTER + EXIT
-  LAST : 8, // old=false; new=false => EXIT + EXIT
-
-  ENTER: 1 | 2, // MODE.FIRST | MODE.NEXT
-  EXIT : 4 | 8 // MODE.LEAF | MODE.LAST
-};
-var MODE$1 = MODE;
-
-function newTreeWalker(
-  before, after,
-  context = { stack: [], status: MODE$1.NONE }
-) {
-  return (getNode) => {
-    let status = context.status;
-    const prev = status & MODE$1.EXIT;
-    if (prev) after(context);
-    if (status & MODE$1.ENTER) context.stack.push(context.current);
-    let node = getNode(context);
-    if (node) {
-      context.current = node;
-      status = context.status = prev ? MODE$1.NEXT : MODE$1.FIRST;
-      before(context);
-    } else {
-      node = context.current = context.stack.pop();
-      status = context.status = node ? prev ? MODE$1.LAST : MODE$1.LEAF : MODE$1.NONE;
-    }
-    return status !== MODE$1.NONE;
-  }
-}
-
-function newAsyncTreeWalker(
-  before, after,
-  context = { stack: [], status: MODE$1.NONE }
-) {
-  return async (getNode) => {
-    let status = context.status;
-    const prev = status & MODE$1.EXIT;
-    if (prev) await after(context);
-    if (status & MODE$1.ENTER) await context.stack.push(context.current);
-    let node = await getNode(context);
-    if (node) {
-      context.current = node;
-      status = context.status = prev ? MODE$1.NEXT : MODE$1.FIRST;
-      await before(context);
-    } else {
-      node = context.current = await context.stack.pop();
-      status = context.status = node ? prev ? MODE$1.LAST : MODE$1.LEAF : MODE$1.NONE;
-    }
-    return status !== MODE$1.NONE;
-  }
-}
+typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@statewalker/tree')) :
+typeof define === 'function' && define.amd ? define(['exports', '@statewalker/tree'], factory) :
+(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.statewalker = global.statewalker || {}, global.statewalker.fsm = global.statewalker.fsm || {}), global.statewalker.tree));
+})(this, (function (exports, tree) { 'use strict';
 
 function buildStateDescriptor(config = {}) {
   const { key, transitions = [], states = {}, options, ...params } = config;
@@ -269,7 +213,7 @@ function newProcessInstance({
       } else {
         const eventKey = process.event.key || KEYS.EVENT_EMPTY;
         const parentDescriptor = process.stack[process.stack.length - 1].descriptor;
-        const stateKey = process.status & MODE$1.ENTER
+        const stateKey = process.status & tree.MODE.ENTER
           ? KEYS.STATE_INITIAL
           : process.current ? process.current.key : KEYS.STATE_FINAL;
         key = getTargetStateKey(parentDescriptor, stateKey, eventKey);
@@ -297,40 +241,38 @@ function newAsyncProcess({
     newProcess,
     newState
   });
-  const shift = newAsyncTreeWalker(before, after, process);
+  const shift = tree.newAsyncTreeWalker(before, after, process);
   process.finished = false;
-  process.dispatch = (event) => {
+  process.next = (event) => {
     process.nextEvent = event;
-    process.running = process.running || Promise.resolve().then(async () => {
-      try {
-        while (!process.finished) {
-          // await Promise.resolve();
-          // console.log('XXX', process.nextEvent, process.running)
-          if (process.nextEvent) {
-            // Consume the next event if exists.
-            process.event = process.nextEvent;
-            process.nextEvent = undefined;
-          } else if (process.status & MODE$1.LEAF) {
-            // Returns control when the process is in a "leaf" state  (a state without children)
-            break;
+    return process.running = process.running || Promise
+      .resolve()
+      .then(async () => {
+        try {
+          process.event = process.nextEvent;
+          process.nextEvent = undefined;
+          while (!process.finished && process.event) {
+            process.finished = !await shift(loadNextState);
+            if ((process.status & tree.MODE.EXIT) && process.nextEvent) {
+              // Consume the next event if it exists.
+              process.event = process.nextEvent;
+              process.nextEvent = undefined;
+            } else if (process.status & tree.MODE.LEAF) {
+              // Returns control when the process is in a "leaf" state (a state without children)
+              break;
+            }
           }
-          process.finished = !await shift(loadNextState);
+        } catch (error) {
+          handleError(error);
         }
-      } catch (error) {
-        handleError(error);
-      } 
-    }).finally(() => process.running = undefined);
-  };
-
-  process.next = async (event) => {
-    process.dispatch(event);
-    await process.running;
-    return !process.finished;
+      })
+      .finally(() => process.running = undefined)
+      .then(() => !process.finished);
   };
   return process;
 }
 
-function newSyncProcess({ 
+function newSyncProcess({
   config,
   descriptor,
   before, after,
@@ -343,19 +285,19 @@ function newSyncProcess({
     newProcess,
     newState,
   });
-  const shift = newTreeWalker(before, after, process);
-  process.dispatch = process.next =(event) => {
+  const shift = tree.newTreeWalker(before, after, process);
+  process.dispatch = process.next = (event) => {
+    if (typeof event === 'string') event = { key : event };
     process.event = event;
     while (process.event) {
       if (!shift(loadNextState)) return false;
-      if (process.status & MODE$1.LEAF) return true;
+      if (process.status & tree.MODE.LEAF) return true;
     }
   };
   return process;
 }
 
 exports.KEYS = KEYS;
-exports.MODE = MODE$1;
 exports.buildStateDescriptor = buildStateDescriptor;
 exports.checkProcessDescriptor = checkProcessDescriptor;
 exports.getAllStateKeys = getAllStateKeys;
@@ -363,10 +305,14 @@ exports.getAllTransitions = getAllTransitions;
 exports.getStateDescriptor = getStateDescriptor;
 exports.getTargetStateKey = getTargetStateKey;
 exports.newAsyncProcess = newAsyncProcess;
-exports.newAsyncTreeWalker = newAsyncTreeWalker;
 exports.newProcessInstance = newProcessInstance;
 exports.newSyncProcess = newSyncProcess;
-exports.newTreeWalker = newTreeWalker;
+Object.keys(tree).forEach(function (k) {
+if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+enumerable: true,
+get: function () { return tree[k]; }
+});
+});
 
 Object.defineProperty(exports, '__esModule', { value: true });
 

package/dist/index-umd.min.js

@@ -0,0 +1,2 @@
+// @statewalker/fsm v0.10.1 https://github.com/statewalker/statewalker-tree Copyright 2022 Mikhail Kotelnikov
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("@statewalker/tree")):"function"==typeof define&&define.amd?define(["exports","@statewalker/tree"],t):t(((e="undefined"!=typeof globalThis?globalThis:e||self).statewalker=e.statewalker||{},e.statewalker.fsm=e.statewalker.fsm||{}),e.statewalker.tree)}(this,(function(e,t){"use strict";function n(e={}){const{key:t,transitions:s=[],states:r={},options:o,...c}=e,i={key:t,transitions:{},states:{},options:Object.assign(o||{},c)};for(const e of s){let t,n,s;if(Array.isArray(e))t=e[0],n=e[1],s=e[2];else{const{from:r,event:o,to:c}=e;t=r,n=o,s=c}(i.transitions[t]=i.transitions[t]||{})[n]=s}if(Array.isArray(r))for(const e of r)i.states[e.key]=n(e);else if(r)for(const e of Object.keys(r))i.states[e]=n(r[e]);return i}var s={STATE_ANY:"*",STATE_INITIAL:"",STATE_FINAL:"",EVENT_ANY:"*",EVENT_EMPTY:""};function r(e,t){let n;for(let s=e.stack.length-1;!n&&s>=0;s--){n=(e.stack[s].descriptor.states||{})[t]}return n||{transitions:{},states:{}}}function o(e,t,n){const r=[[t,n],[s.STATE_ANY,n],[t,s.EVENT_ANY],[s.STATE_ANY,s.EVENT_ANY]];let o;for(let t=0,n=r.length;void 0===o&&t<n;t++){const[n,c]=r[t],i=e.transitions[n];i&&(o=i[c],void 0===o&&(o=i[s.EVENT_ANY]))}return void 0!==o?o:s.STATE_FINAL}function c({config:e,descriptor:c,newState:i=(e=>e),newProcess:a=(e=>({descriptor:e,status:0,stack:[],event:void 0,current:void 0}))}){const f=a(c=c||n(e));return[f,()=>{let e,n;if(f.status)if(f.stack.length){const c=f.event.key||s.EVENT_EMPTY;e=o(f.stack[f.stack.length-1].descriptor,f.status&t.MODE.ENTER?s.STATE_INITIAL:f.current?f.current.key:s.STATE_FINAL,c),e&&(n=r(f,e))}else e=s.STATE_FINAL;else n=f.descriptor,e=n.key;return e?i({process:f,key:e,descriptor:n}):null}]}e.KEYS=s,e.buildStateDescriptor=n,e.checkProcessDescriptor=function(e){return function e(t,n=[],r=[]){r=[...r,t.key];const o=Object.assign({key:t.key},function(e){const t={},n={};for(const[s,r]of Object.entries(e.transitions)){t[s]=(t[s]||0)+1;for(const e of Object.values(r))n[e]=(n[e]||0)+1}const r=[],o=[];for(const e of Object.keys(t))e===s.STATE_ANY||e===s.STATE_FINAL||e===s.STATE_INITIAL||e in n||r.push(e);for(const e of Object.keys(n))e===s.STATE_FINAL||e in t||o.push(e);return{unreachableStates:r,deadendStates:o}}(t));if(o.deadendStates.length||o.unreachableStates.length){const e={path:r};n.push(e),o.deadendStates.length&&(e.deadendStates=o.deadendStates),o.unreachableStates.length&&(e.unreachableStates=o.unreachableStates)}for(const s of Object.values(t.states))e(s,n,r);return n}(e)},e.getAllStateKeys=function(e){const t={},n=e=>t[e]=(t[e]||0)+1;return function e(t){n(t.key);for(const[e,s]of Object.entries(t.transitions)){n(e);for(const e of Object.values(s))n(e)}for(const[s,r]of Object.entries(t.states))n(s),e(r)}(e),Object.keys(t).sort()},e.getAllTransitions=function(e){const t=[];let n=e.current?e.current.key:s.STATE_INITIAL;for(let r=e.stack.length-1;r>=0;r--){const o=e.stack[r],c=o.key,i=o.descriptor;for(const e of[n,s.STATE_ANY]){const n=i.transitions[e];if(n)for(const[s,r]of Object.entries(n))t.push([c,e,s,r])}n=c}return t},e.getStateDescriptor=r,e.getTargetStateKey=o,e.newAsyncProcess=function({config:e,descriptor:n,before:s,after:r,newProcess:o,newState:i,handleError:a=console.error}){const[f,u]=c({config:e,descriptor:n,newProcess:o,newState:i}),l=t.newAsyncTreeWalker(s,r,f);return f.finished=!1,f.next=e=>(f.nextEvent=e,f.running=f.running||Promise.resolve().then((async()=>{try{for(f.event=f.nextEvent,f.nextEvent=void 0;!f.finished&&f.event;)if(f.finished=!await l(u),f.status&t.MODE.EXIT&&f.nextEvent)f.event=f.nextEvent,f.nextEvent=void 0;else if(f.status&t.MODE.LEAF)break}catch(e){a(e)}})).finally((()=>f.running=void 0)).then((()=>!f.finished))),f},e.newProcessInstance=c,e.newSyncProcess=function({config:e,descriptor:n,before:s,after:r,newProcess:o,newState:i}){const[a,f]=c({config:e,descriptor:n,newProcess:o,newState:i}),u=t.newTreeWalker(s,r,a);return a.dispatch=a.next=e=>{for("string"==typeof e&&(e={key:e}),a.event=e;a.event;){if(!u(f))return!1;if(a.status&t.MODE.LEAF)return!0}},a},Object.keys(t).forEach((function(n){"default"===n||e.hasOwnProperty(n)||Object.defineProperty(e,n,{enumerable:!0,get:function(){return t[n]}})})),Object.defineProperty(e,"__esModule",{value:!0})}));

package/dist/{esm/statewalker-fsm-esm.js → index.js}

@@ -1,59 +1,6 @@
-// @statewalker/fsm v0.9.2 https://github.com/statewalker/statewalker Copyright 2022 Mikhail Kotelnikov
-const MODE = {
-  NONE : 0,
-  FIRST: 1, // old=true; new=true => ENTER + ENTER
-  NEXT: 2,  // old=false; new=true => EXIT + ENTER
-  LEAF : 4, // old=true; new=false => ENTER + EXIT
-  LAST : 8, // old=false; new=false => EXIT + EXIT
-
-  ENTER: 1 | 2, // MODE.FIRST | MODE.NEXT
-  EXIT : 4 | 8 // MODE.LEAF | MODE.LAST
-};
-var MODE$1 = MODE;
-
-function newTreeWalker(
-  before, after,
-  context = { stack: [], status: MODE$1.NONE }
-) {
-  return (getNode) => {
-    let status = context.status;
-    const prev = status & MODE$1.EXIT;
-    if (prev) after(context);
-    if (status & MODE$1.ENTER) context.stack.push(context.current);
-    let node = getNode(context);
-    if (node) {
-      context.current = node;
-      status = context.status = prev ? MODE$1.NEXT : MODE$1.FIRST;
-      before(context);
-    } else {
-      node = context.current = context.stack.pop();
-      status = context.status = node ? prev ? MODE$1.LAST : MODE$1.LEAF : MODE$1.NONE;
-    }
-    return status !== MODE$1.NONE;
-  }
-}
-
-function newAsyncTreeWalker(
-  before, after,
-  context = { stack: [], status: MODE$1.NONE }
-) {
-  return async (getNode) => {
-    let status = context.status;
-    const prev = status & MODE$1.EXIT;
-    if (prev) await after(context);
-    if (status & MODE$1.ENTER) await context.stack.push(context.current);
-    let node = await getNode(context);
-    if (node) {
-      context.current = node;
-      status = context.status = prev ? MODE$1.NEXT : MODE$1.FIRST;
-      await before(context);
-    } else {
-      node = context.current = await context.stack.pop();
-      status = context.status = node ? prev ? MODE$1.LAST : MODE$1.LEAF : MODE$1.NONE;
-    }
-    return status !== MODE$1.NONE;
-  }
-}
+// @statewalker/fsm v0.10.1 https://github.com/statewalker/statewalker-tree Copyright 2022 Mikhail Kotelnikov
+import { MODE, newAsyncTreeWalker, newTreeWalker } from '@statewalker/tree';
+export * from '@statewalker/tree';
 
 function buildStateDescriptor(config = {}) {
   const { key, transitions = [], states = {}, options, ...params } = config;
@@ -263,7 +210,7 @@ function newProcessInstance({
       } else {
         const eventKey = process.event.key || KEYS.EVENT_EMPTY;
         const parentDescriptor = process.stack[process.stack.length - 1].descriptor;
-        const stateKey = process.status & MODE$1.ENTER
+        const stateKey = process.status & MODE.ENTER
           ? KEYS.STATE_INITIAL
           : process.current ? process.current.key : KEYS.STATE_FINAL;
         key = getTargetStateKey(parentDescriptor, stateKey, eventKey);
@@ -293,38 +240,36 @@ function newAsyncProcess({
   });
   const shift = newAsyncTreeWalker(before, after, process);
   process.finished = false;
-  process.dispatch = (event) => {
+  process.next = (event) => {
     process.nextEvent = event;
-    process.running = process.running || Promise.resolve().then(async () => {
-      try {
-        while (!process.finished) {
-          // await Promise.resolve();
-          // console.log('XXX', process.nextEvent, process.running)
-          if (process.nextEvent) {
-            // Consume the next event if exists.
-            process.event = process.nextEvent;
-            process.nextEvent = undefined;
-          } else if (process.status & MODE$1.LEAF) {
-            // Returns control when the process is in a "leaf" state  (a state without children)
-            break;
+    return process.running = process.running || Promise
+      .resolve()
+      .then(async () => {
+        try {
+          process.event = process.nextEvent;
+          process.nextEvent = undefined;
+          while (!process.finished && process.event) {
+            process.finished = !await shift(loadNextState);
+            if ((process.status & MODE.EXIT) && process.nextEvent) {
+              // Consume the next event if it exists.
+              process.event = process.nextEvent;
+              process.nextEvent = undefined;
+            } else if (process.status & MODE.LEAF) {
+              // Returns control when the process is in a "leaf" state (a state without children)
+              break;
+            }
           }
-          process.finished = !await shift(loadNextState);
+        } catch (error) {
+          handleError(error);
         }
-      } catch (error) {
-        handleError(error);
-      } 
-    }).finally(() => process.running = undefined);
-  };
-
-  process.next = async (event) => {
-    process.dispatch(event);
-    await process.running;
-    return !process.finished;
+      })
+      .finally(() => process.running = undefined)
+      .then(() => !process.finished);
   };
   return process;
 }
 
-function newSyncProcess({ 
+function newSyncProcess({
   config,
   descriptor,
   before, after,
@@ -338,14 +283,15 @@ function newSyncProcess({
     newState,
   });
   const shift = newTreeWalker(before, after, process);
-  process.dispatch = process.next =(event) => {
+  process.dispatch = process.next = (event) => {
+    if (typeof event === 'string') event = { key : event };
     process.event = event;
     while (process.event) {
       if (!shift(loadNextState)) return false;
-      if (process.status & MODE$1.LEAF) return true;
+      if (process.status & MODE.LEAF) return true;
     }
   };
   return process;
 }
 
-export { KEYS, MODE$1 as MODE, buildStateDescriptor, checkProcessDescriptor, getAllStateKeys, getAllTransitions, getStateDescriptor, getTargetStateKey, newAsyncProcess, newAsyncTreeWalker, newProcessInstance, newSyncProcess, newTreeWalker };
+export { KEYS, buildStateDescriptor, checkProcessDescriptor, getAllStateKeys, getAllTransitions, getStateDescriptor, getTargetStateKey, newAsyncProcess, newProcessInstance, newSyncProcess };

package/dist/index.min.js

@@ -0,0 +1,2 @@
+// @statewalker/fsm v0.10.1 https://github.com/statewalker/statewalker-tree Copyright 2022 Mikhail Kotelnikov
+import{MODE as t,newAsyncTreeWalker as e,newTreeWalker as n}from"@statewalker/tree";export*from"@statewalker/tree";function s(t={}){const{key:e,transitions:n=[],states:r={},options:o,...c}=t,i={key:e,transitions:{},states:{},options:Object.assign(o||{},c)};for(const t of n){let e,n,s;if(Array.isArray(t))e=t[0],n=t[1],s=t[2];else{const{from:r,event:o,to:c}=t;e=r,n=o,s=c}(i.transitions[e]=i.transitions[e]||{})[n]=s}if(Array.isArray(r))for(const t of r)i.states[t.key]=s(t);else if(r)for(const t of Object.keys(r))i.states[t]=s(r[t]);return i}var r={STATE_ANY:"*",STATE_INITIAL:"",STATE_FINAL:"",EVENT_ANY:"*",EVENT_EMPTY:""};function o(t){return function t(e,n=[],s=[]){s=[...s,e.key];const o=Object.assign({key:e.key},function(t){const e={},n={};for(const[s,r]of Object.entries(t.transitions)){e[s]=(e[s]||0)+1;for(const t of Object.values(r))n[t]=(n[t]||0)+1}const s=[],o=[];for(const t of Object.keys(e))t===r.STATE_ANY||t===r.STATE_FINAL||t===r.STATE_INITIAL||t in n||s.push(t);for(const t of Object.keys(n))t===r.STATE_FINAL||t in e||o.push(t);return{unreachableStates:s,deadendStates:o}}(e));if(o.deadendStates.length||o.unreachableStates.length){const t={path:s};n.push(t),o.deadendStates.length&&(t.deadendStates=o.deadendStates),o.unreachableStates.length&&(t.unreachableStates=o.unreachableStates)}for(const r of Object.values(e.states))t(r,n,s);return n}(t)}function c(t,e){let n;for(let s=t.stack.length-1;!n&&s>=0;s--){n=(t.stack[s].descriptor.states||{})[e]}return n||{transitions:{},states:{}}}function i(t){const e={},n=t=>e[t]=(e[t]||0)+1;return function t(e){n(e.key);for(const[t,s]of Object.entries(e.transitions)){n(t);for(const t of Object.values(s))n(t)}for(const[s,r]of Object.entries(e.states))n(s),t(r)}(t),Object.keys(e).sort()}function a(t){const e=[];let n=t.current?t.current.key:r.STATE_INITIAL;for(let s=t.stack.length-1;s>=0;s--){const o=t.stack[s],c=o.key,i=o.descriptor;for(const t of[n,r.STATE_ANY]){const n=i.transitions[t];if(n)for(const[s,r]of Object.entries(n))e.push([c,t,s,r])}n=c}return e}function f(t,e,n){const s=[[e,n],[r.STATE_ANY,n],[e,r.EVENT_ANY],[r.STATE_ANY,r.EVENT_ANY]];let o;for(let e=0,n=s.length;void 0===o&&e<n;e++){const[n,c]=s[e],i=t.transitions[n];i&&(o=i[c],void 0===o&&(o=i[r.EVENT_ANY]))}return void 0!==o?o:r.STATE_FINAL}function u({config:e,descriptor:n,newState:o=(t=>t),newProcess:i=(t=>({descriptor:t,status:0,stack:[],event:void 0,current:void 0}))}){const a=i(n=n||s(e));return[a,()=>{let e,n;if(a.status)if(a.stack.length){const s=a.event.key||r.EVENT_EMPTY;e=f(a.stack[a.stack.length-1].descriptor,a.status&t.ENTER?r.STATE_INITIAL:a.current?a.current.key:r.STATE_FINAL,s),e&&(n=c(a,e))}else e=r.STATE_FINAL;else n=a.descriptor,e=n.key;return e?o({process:a,key:e,descriptor:n}):null}]}function T({config:n,descriptor:s,before:r,after:o,newProcess:c,newState:i,handleError:a=console.error}){const[f,T]=u({config:n,descriptor:s,newProcess:c,newState:i}),E=e(r,o,f);return f.finished=!1,f.next=e=>(f.nextEvent=e,f.running=f.running||Promise.resolve().then((async()=>{try{for(f.event=f.nextEvent,f.nextEvent=void 0;!f.finished&&f.event;)if(f.finished=!await E(T),f.status&t.EXIT&&f.nextEvent)f.event=f.nextEvent,f.nextEvent=void 0;else if(f.status&t.LEAF)break}catch(t){a(t)}})).finally((()=>f.running=void 0)).then((()=>!f.finished))),f}function E({config:e,descriptor:s,before:r,after:o,newProcess:c,newState:i}){const[a,f]=u({config:e,descriptor:s,newProcess:c,newState:i}),T=n(r,o,a);return a.dispatch=a.next=e=>{for("string"==typeof e&&(e={key:e}),a.event=e;a.event;){if(!T(f))return!1;if(a.status&t.LEAF)return!0}},a}export{r as KEYS,s as buildStateDescriptor,o as checkProcessDescriptor,i as getAllStateKeys,a as getAllTransitions,c as getStateDescriptor,f as getTargetStateKey,T as newAsyncProcess,u as newProcessInstance,E as newSyncProcess};

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@statewalker/fsm",
-  "version": "0.9.2",
-  "description": "Utility graph methods (iterators, tree builders etc)",
+  "version": "0.10.1",
+  "description": "HFSM Implementation",
   "keywords": [],
-  "homepage": "https://github.com/statewalker/statewalker",
+  "homepage": "https://github.com/statewalker/statewalker-tree",
   "author": {
     "name": "Mikhail Kotelnikov",
     "email": "mikhail.kotelnikov@gmail.com"
@@ -15,31 +15,31 @@
     "src/**/*.js",
     "index.js"
   ],
-  "main": "dist/esm/statewalker-fsm-esm.js",
-  "module": "dist/esm/statewalker-fsm-esm.js",
-  "jsdelivr": "dist/cjs/statewalker-fsm.min.js",
-  "unpkg": "dist/cjs/statewalker-fsm.min.js",
+  "dependencies": {
+    "@statewalker/tree": "0.10.0"
+  },
+  "devDependencies": {
+    "@statewalker/rollup": "^0.1.4",
+    "eslint": "^8",
+    "expect.js": "^0.3",
+    "mocha": "^10",
+    "rollup": "^2"
+  },
+  "module": "src/index.js",
   "exports": {
-    "package.json": "./package.json",
-    "umd": "./dist/cjs/statewalker-fsm.min.js",
-    "require": "./dist/cjs/statewalker-fsm.js",
     "import": "./src/index.js",
-    "default": "./dist/esm/statewalker-fsm-esm.js"
+    "umd": "./dist/index-umd.min.js",
+    "default": "./dist/index.js"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/statewalker/statewalker.git"
-  },
-  "devDependencies": {
-    "@statewalker/tree": "^0.9.1"
+    "url": "git@github.com:statewalker/statewalker-fsm.git"
   },
   "scripts": {
-    "eslint": "../../node_modules/eslint/bin/eslint.js src",
-    "rollup": "../../node_modules/rollup/dist/bin/rollup -c",
-    "test": "../../node_modules/mocha/bin/mocha -R spec ./test/index.js && yarn eslint",
-    "prepare": "yarn rollup",
-    "prepublishOnly": "rm -rf dist && yarn test && yarn rollup",
-    "postpublish": "zip -j dist/statewalker-fsm.zip -- ../../LICENSE README.md dist/*.js"
+    "eslint": "eslint src",
+    "rollup": "rollup -c",
+    "test": "mocha -R spec ./test/index.js && yarn eslint",
+    "prepublishOnly": "rm -rf dist && yarn test && yarn rollup"
   },
   "license": "MIT",
   "sideEffects": false,

package/src/newAsyncProcess.js

@@ -17,33 +17,31 @@ export default function newAsyncProcess({
   });
   const shift = newAsyncTreeWalker(before, after, process);
   process.finished = false;
-  process.dispatch = (event) => {
+  process.next = (event) => {
     process.nextEvent = event;
-    process.running = process.running || Promise.resolve().then(async () => {
-      try {
-        while (!process.finished) {
-          // await Promise.resolve();
-          // console.log('XXX', process.nextEvent, process.running)
-          if (process.nextEvent) {
-            // Consume the next event if exists.
-            process.event = process.nextEvent;
-            process.nextEvent = undefined;
-          } else if (process.status & MODE.LEAF) {
-            // Returns control when the process is in a "leaf" state  (a state without children)
-            break;
+    return process.running = process.running || Promise
+      .resolve()
+      .then(async () => {
+        try {
+          process.event = process.nextEvent;
+          process.nextEvent = undefined;
+          while (!process.finished && process.event) {
+            process.finished = !await shift(loadNextState);
+            if ((process.status & MODE.EXIT) && process.nextEvent) {
+              // Consume the next event if it exists.
+              process.event = process.nextEvent;
+              process.nextEvent = undefined;
+            } else if (process.status & MODE.LEAF) {
+              // Returns control when the process is in a "leaf" state (a state without children)
+              break;
+            }
           }
-          process.finished = !await shift(loadNextState);
+        } catch (error) {
+          handleError(error);
         }
-      } catch (error) {
-        handleError(error);
-      } 
-    }).finally(() => process.running = undefined);
-  }
-
-  process.next = async (event) => {
-    process.dispatch(event);
-    await process.running;
-    return !process.finished;
+      })
+      .finally(() => process.running = undefined)
+      .then(() => !process.finished);
   }
   return process;
 }

package/src/newSyncProcess.js

@@ -1,7 +1,7 @@
 import { MODE, newTreeWalker } from "@statewalker/tree";
 import newProcessInstance from "./newProcessInstance.js";
 
-export default function newSyncProcess({ 
+export default function newSyncProcess({
   config,
   descriptor,
   before, after,
@@ -15,7 +15,8 @@ export default function newSyncProcess({
     newState,
   });
   const shift = newTreeWalker(before, after, process);
-  process.dispatch = process.next =(event) => {
+  process.dispatch = process.next = (event) => {
+    if (typeof event === 'string') event = { key : event };
     process.event = event;
     while (process.event) {
       if (!shift(loadNextState)) return false;

package/dist/cjs/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}

package/dist/cjs/statewalker-fsm.min.js

@@ -1,2 +0,0 @@
-// @statewalker/fsm v0.9.2 https://github.com/statewalker/statewalker Copyright 2022 Mikhail Kotelnikov
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(((t="undefined"!=typeof globalThis?globalThis:t||self).statewalker=t.statewalker||{},t.statewalker.fsm=t.statewalker.fsm||{}))}(this,(function(t){"use strict";var e={NONE:0,FIRST:1,NEXT:2,LEAF:4,LAST:8,ENTER:3,EXIT:12};function n(t,n,s={stack:[],status:e.NONE}){return r=>{let o=s.status;const c=o&e.EXIT;c&&n(s),o&e.ENTER&&s.stack.push(s.current);let a=r(s);return a?(s.current=a,o=s.status=c?e.NEXT:e.FIRST,t(s)):(a=s.current=s.stack.pop(),o=s.status=a?c?e.LAST:e.LEAF:e.NONE),o!==e.NONE}}function s(t,n,s={stack:[],status:e.NONE}){return async r=>{let o=s.status;const c=o&e.EXIT;c&&await n(s),o&e.ENTER&&await s.stack.push(s.current);let a=await r(s);return a?(s.current=a,o=s.status=c?e.NEXT:e.FIRST,await t(s)):(a=s.current=await s.stack.pop(),o=s.status=a?c?e.LAST:e.LEAF:e.NONE),o!==e.NONE}}function r(t={}){const{key:e,transitions:n=[],states:s={},options:o,...c}=t,a={key:e,transitions:{},states:{},options:Object.assign(o||{},c)};for(const t of n){let e,n,s;if(Array.isArray(t))e=t[0],n=t[1],s=t[2];else{const{from:r,event:o,to:c}=t;e=r,n=o,s=c}(a.transitions[e]=a.transitions[e]||{})[n]=s}if(Array.isArray(s))for(const t of s)a.states[t.key]=r(t);else if(s)for(const t of Object.keys(s))a.states[t]=r(s[t]);return a}var o={STATE_ANY:"*",STATE_INITIAL:"",STATE_FINAL:"",EVENT_ANY:"*",EVENT_EMPTY:""};function c(t,e){let n;for(let s=t.stack.length-1;!n&&s>=0;s--){n=(t.stack[s].descriptor.states||{})[e]}return n||{transitions:{},states:{}}}function a(t,e,n){const s=[[e,n],[o.STATE_ANY,n],[e,o.EVENT_ANY],[o.STATE_ANY,o.EVENT_ANY]];let r;for(let e=0,n=s.length;void 0===r&&e<n;e++){const[n,c]=s[e],a=t.transitions[n];a&&(r=a[c],void 0===r&&(r=a[o.EVENT_ANY]))}return void 0!==r?r:o.STATE_FINAL}function i({config:t,descriptor:n,newState:s=(t=>t),newProcess:i=(t=>({descriptor:t,status:0,stack:[],event:void 0,current:void 0}))}){const f=i(n=n||r(t));return[f,()=>{let t,n;if(f.status)if(f.stack.length){const s=f.event.key||o.EVENT_EMPTY;t=a(f.stack[f.stack.length-1].descriptor,f.status&e.ENTER?o.STATE_INITIAL:f.current?f.current.key:o.STATE_FINAL,s),t&&(n=c(f,t))}else t=o.STATE_FINAL;else n=f.descriptor,t=n.key;return t?s({process:f,key:t,descriptor:n}):null}]}t.KEYS=o,t.MODE=e,t.buildStateDescriptor=r,t.checkProcessDescriptor=function(t){return function t(e,n=[],s=[]){s=[...s,e.key];const r=Object.assign({key:e.key},function(t){const e={},n={};for(const[s,r]of Object.entries(t.transitions)){e[s]=(e[s]||0)+1;for(const t of Object.values(r))n[t]=(n[t]||0)+1}const s=[],r=[];for(const t of Object.keys(e))t===o.STATE_ANY||t===o.STATE_FINAL||t===o.STATE_INITIAL||t in n||s.push(t);for(const t of Object.keys(n))t===o.STATE_FINAL||t in e||r.push(t);return{unreachableStates:s,deadendStates:r}}(e));if(r.deadendStates.length||r.unreachableStates.length){const t={path:s};n.push(t),r.deadendStates.length&&(t.deadendStates=r.deadendStates),r.unreachableStates.length&&(t.unreachableStates=r.unreachableStates)}for(const r of Object.values(e.states))t(r,n,s);return n}(t)},t.getAllStateKeys=function(t){const e={},n=t=>e[t]=(e[t]||0)+1;return function t(e){n(e.key);for(const[t,s]of Object.entries(e.transitions)){n(t);for(const t of Object.values(s))n(t)}for(const[s,r]of Object.entries(e.states))n(s),t(r)}(t),Object.keys(e).sort()},t.getAllTransitions=function(t){const e=[];let n=t.current?t.current.key:o.STATE_INITIAL;for(let s=t.stack.length-1;s>=0;s--){const r=t.stack[s],c=r.key,a=r.descriptor;for(const t of[n,o.STATE_ANY]){const n=a.transitions[t];if(n)for(const[s,r]of Object.entries(n))e.push([c,t,s,r])}n=c}return e},t.getStateDescriptor=c,t.getTargetStateKey=a,t.newAsyncProcess=function({config:t,descriptor:n,before:r,after:o,newProcess:c,newState:a,handleError:f=console.error}){const[u,T]=i({config:t,descriptor:n,newProcess:c,newState:a}),E=s(r,o,u);return u.finished=!1,u.dispatch=t=>{u.nextEvent=t,u.running=u.running||Promise.resolve().then((async()=>{try{for(;!u.finished;){if(u.nextEvent)u.event=u.nextEvent,u.nextEvent=void 0;else if(u.status&e.LEAF)break;u.finished=!await E(T)}}catch(t){f(t)}})).finally((()=>u.running=void 0))},u.next=async t=>(u.dispatch(t),await u.running,!u.finished),u},t.newAsyncTreeWalker=s,t.newProcessInstance=i,t.newSyncProcess=function({config:t,descriptor:s,before:r,after:o,newProcess:c,newState:a}){const[f,u]=i({config:t,descriptor:s,newProcess:c,newState:a}),T=n(r,o,f);return f.dispatch=f.next=t=>{for(f.event=t;f.event;){if(!T(u))return!1;if(f.status&e.LEAF)return!0}},f},t.newTreeWalker=n,Object.defineProperty(t,"__esModule",{value:!0})}));

package/dist/esm/statewalker-fsm-esm.min.js

@@ -1,2 +0,0 @@
-// @statewalker/fsm v0.9.2 https://github.com/statewalker/statewalker Copyright 2022 Mikhail Kotelnikov
-var t={NONE:0,FIRST:1,NEXT:2,LEAF:4,LAST:8,ENTER:3,EXIT:12};function e(e,n,s={stack:[],status:t.NONE}){return r=>{let o=s.status;const c=o&t.EXIT;c&&n(s),o&t.ENTER&&s.stack.push(s.current);let a=r(s);return a?(s.current=a,o=s.status=c?t.NEXT:t.FIRST,e(s)):(a=s.current=s.stack.pop(),o=s.status=a?c?t.LAST:t.LEAF:t.NONE),o!==t.NONE}}function n(e,n,s={stack:[],status:t.NONE}){return async r=>{let o=s.status;const c=o&t.EXIT;c&&await n(s),o&t.ENTER&&await s.stack.push(s.current);let a=await r(s);return a?(s.current=a,o=s.status=c?t.NEXT:t.FIRST,await e(s)):(a=s.current=await s.stack.pop(),o=s.status=a?c?t.LAST:t.LEAF:t.NONE),o!==t.NONE}}function s(t={}){const{key:e,transitions:n=[],states:r={},options:o,...c}=t,a={key:e,transitions:{},states:{},options:Object.assign(o||{},c)};for(const t of n){let e,n,s;if(Array.isArray(t))e=t[0],n=t[1],s=t[2];else{const{from:r,event:o,to:c}=t;e=r,n=o,s=c}(a.transitions[e]=a.transitions[e]||{})[n]=s}if(Array.isArray(r))for(const t of r)a.states[t.key]=s(t);else if(r)for(const t of Object.keys(r))a.states[t]=s(r[t]);return a}var r={STATE_ANY:"*",STATE_INITIAL:"",STATE_FINAL:"",EVENT_ANY:"*",EVENT_EMPTY:""};function o(t){return function t(e,n=[],s=[]){s=[...s,e.key];const o=Object.assign({key:e.key},function(t){const e={},n={};for(const[s,r]of Object.entries(t.transitions)){e[s]=(e[s]||0)+1;for(const t of Object.values(r))n[t]=(n[t]||0)+1}const s=[],o=[];for(const t of Object.keys(e))t===r.STATE_ANY||t===r.STATE_FINAL||t===r.STATE_INITIAL||t in n||s.push(t);for(const t of Object.keys(n))t===r.STATE_FINAL||t in e||o.push(t);return{unreachableStates:s,deadendStates:o}}(e));if(o.deadendStates.length||o.unreachableStates.length){const t={path:s};n.push(t),o.deadendStates.length&&(t.deadendStates=o.deadendStates),o.unreachableStates.length&&(t.unreachableStates=o.unreachableStates)}for(const r of Object.values(e.states))t(r,n,s);return n}(t)}function c(t,e){let n;for(let s=t.stack.length-1;!n&&s>=0;s--){n=(t.stack[s].descriptor.states||{})[e]}return n||{transitions:{},states:{}}}function a(t){const e={},n=t=>e[t]=(e[t]||0)+1;return function t(e){n(e.key);for(const[t,s]of Object.entries(e.transitions)){n(t);for(const t of Object.values(s))n(t)}for(const[s,r]of Object.entries(e.states))n(s),t(r)}(t),Object.keys(e).sort()}function i(t){const e=[];let n=t.current?t.current.key:r.STATE_INITIAL;for(let s=t.stack.length-1;s>=0;s--){const o=t.stack[s],c=o.key,a=o.descriptor;for(const t of[n,r.STATE_ANY]){const n=a.transitions[t];if(n)for(const[s,r]of Object.entries(n))e.push([c,t,s,r])}n=c}return e}function u(t,e,n){const s=[[e,n],[r.STATE_ANY,n],[e,r.EVENT_ANY],[r.STATE_ANY,r.EVENT_ANY]];let o;for(let e=0,n=s.length;void 0===o&&e<n;e++){const[n,c]=s[e],a=t.transitions[n];a&&(o=a[c],void 0===o&&(o=a[r.EVENT_ANY]))}return void 0!==o?o:r.STATE_FINAL}function f({config:e,descriptor:n,newState:o=(t=>t),newProcess:a=(t=>({descriptor:t,status:0,stack:[],event:void 0,current:void 0}))}){const i=a(n=n||s(e));return[i,()=>{let e,n;if(i.status)if(i.stack.length){const s=i.event.key||r.EVENT_EMPTY;e=u(i.stack[i.stack.length-1].descriptor,i.status&t.ENTER?r.STATE_INITIAL:i.current?i.current.key:r.STATE_FINAL,s),e&&(n=c(i,e))}else e=r.STATE_FINAL;else n=i.descriptor,e=n.key;return e?o({process:i,key:e,descriptor:n}):null}]}function E({config:e,descriptor:s,before:r,after:o,newProcess:c,newState:a,handleError:i=console.error}){const[u,E]=f({config:e,descriptor:s,newProcess:c,newState:a}),T=n(r,o,u);return u.finished=!1,u.dispatch=e=>{u.nextEvent=e,u.running=u.running||Promise.resolve().then((async()=>{try{for(;!u.finished;){if(u.nextEvent)u.event=u.nextEvent,u.nextEvent=void 0;else if(u.status&t.LEAF)break;u.finished=!await T(E)}}catch(t){i(t)}})).finally((()=>u.running=void 0))},u.next=async t=>(u.dispatch(t),await u.running,!u.finished),u}function T({config:n,descriptor:s,before:r,after:o,newProcess:c,newState:a}){const[i,u]=f({config:n,descriptor:s,newProcess:c,newState:a}),E=e(r,o,i);return i.dispatch=i.next=e=>{for(i.event=e;i.event;){if(!E(u))return!1;if(i.status&t.LEAF)return!0}},i}export{r as KEYS,t as MODE,s as buildStateDescriptor,o as checkProcessDescriptor,a as getAllStateKeys,i as getAllTransitions,c as getStateDescriptor,u as getTargetStateKey,E as newAsyncProcess,n as newAsyncTreeWalker,f as newProcessInstance,T as newSyncProcess,e as newTreeWalker};