@statewalker/fsm 0.8.0 → 0.9.2

package/dist/cjs/statewalker-fsm.js

@@ -1,9 +1,65 @@
-// @statewalker/fsm v0.8.0 https://github.com/statewalker/statewalker Copyright 2021 Mikhail Kotelnikov
+// @statewalker/fsm v0.9.2 https://github.com/statewalker/statewalker 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';
+})(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;
+  }
+}
 
 function buildStateDescriptor(config = {}) {
   const { key, transitions = [], states = {}, options, ...params } = config;
@@ -41,11 +97,11 @@ function buildStateDescriptor(config = {}) {
 }
 
 var KEYS = {
-  STATE_ANY : '*',
-  STATE_INITIAL : '',
-  STATE_FINAL : '',
-  EVENT_ANY : '*',
-  EVENT_EMPTY : '',
+  STATE_ANY : "*",
+  STATE_INITIAL : "",
+  STATE_FINAL : "",
+  EVENT_ANY : "*",
+  EVENT_EMPTY : "",
 };
 
 function checkProcessDescriptor(descriptor) {
@@ -101,6 +157,15 @@ function checkProcessDescriptor(descriptor) {
   }
 }
 
+function getStateDescriptor(process, stateKey) {
+  let descriptor;
+  for (let i = process.stack.length - 1; !descriptor && i >= 0; i--) {
+    const states = process.stack[i].descriptor.states || {};
+    descriptor = states[stateKey];
+  }
+  return descriptor || { transitions: {}, states: {} };
+}
+
 /**
  * This method returns a list of all states used in 
  * the specified state descriptor.
@@ -179,60 +244,6 @@ function getTargetStateKey(descriptor, stateKey, eventKey) {
   return (targetKey !== undefined) ? targetKey : KEYS.STATE_FINAL;
 }
 
-const MODE = {
-  NONE : 0,
-  LEAF : 1,
-  LAST : 2,
-  FIRST : 4,
-  NEXT : 8,
-};
-MODE.ENTER = MODE.FIRST | MODE.NEXT;
-MODE.EXIT = MODE.LAST | MODE.LEAF;
-
-function newTreeWalker(
-  before, after,
-  context = { stack: [], status: MODE.NONE }
-) {
-  return (getNode) => {
-    let status = context.status;
-    const prev = status & MODE.EXIT;
-    if (prev) after(context);
-    if (status & MODE.ENTER) context.stack.push(context.current);
-    let node = getNode(context);
-    if (node) {
-      context.current = node;
-      status = context.status = prev ? MODE.NEXT : MODE.FIRST;
-      before(context);
-    } else {
-      node = context.current = context.stack.pop();
-      status = context.status = node ? prev ? MODE.LAST : MODE.LEAF : MODE.NONE;
-    }
-    return status !== MODE.NONE;
-  }
-}
-
-function newAsyncTreeWalker(
-  before, after,
-  context = { stack: [], status: MODE.NONE }
-) {
-  return async (getNode) => {
-    let status = context.status;
-    const prev = status & MODE.EXIT;
-    if (prev) await after(context);
-    if (status & MODE.ENTER) await context.stack.push(context.current);
-    let node = await getNode(context);
-    if (node) {
-      context.current = node;
-      status = context.status = prev ? MODE.NEXT : MODE.FIRST;
-      await before(context);
-    } else {
-      node = context.current = await context.stack.pop();
-      status = context.status = node ? prev ? MODE.LAST : MODE.LEAF : MODE.NONE;
-    }
-    return status !== MODE.NONE;
-  }
-}
-
 function newProcessInstance({
   config,
   descriptor,
@@ -257,20 +268,16 @@ function newProcessInstance({
         key = KEYS.STATE_FINAL;
       } else {
         const eventKey = process.event.key || KEYS.EVENT_EMPTY;
-        const descriptor = process.stack[process.stack.length - 1].descriptor;
-        const stateKey = process.status & MODE.ENTER
+        const parentDescriptor = process.stack[process.stack.length - 1].descriptor;
+        const stateKey = process.status & MODE$1.ENTER
           ? KEYS.STATE_INITIAL
           : process.current ? process.current.key : KEYS.STATE_FINAL;
-        key = getTargetStateKey(descriptor, stateKey, eventKey);
-      }
-      if (key) {
-        for (let i = process.stack.length - 1; !descriptor && i >= 0; i--) {
-          const states = process.stack[i].descriptor.states || {};
-          descriptor = states[key];
+        key = getTargetStateKey(parentDescriptor, stateKey, eventKey);
+        if (key) {
+          descriptor = getStateDescriptor(process, key);
         }
       }
     }
-    descriptor = descriptor || { transitions: {}, states: {} };
     return key ? newState({ process, key, descriptor }) : null;
   };
   return [process, loadNextState];
@@ -282,26 +289,43 @@ function newAsyncProcess({
   before, after,
   newProcess,
   newState,
+  handleError = console.error
 }) {
   const [process, loadNextState] = newProcessInstance({
     config,
     descriptor,
     newProcess,
-    newState,
+    newState
   });
   const shift = newAsyncTreeWalker(before, after, process);
+  process.finished = false;
+  process.dispatch = (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;
+          }
+          process.finished = !await shift(loadNextState);
+        }
+      } catch (error) {
+        handleError(error);
+      } 
+    }).finally(() => process.running = undefined);
+  };
+
   process.next = async (event) => {
-    process.event = event;
-    if (process.running) return;
-    try {
-      process.running = true;
-      while (process.event) {
-        if (!await shift(loadNextState)) return false;
-        if (process.status & MODE.LEAF) return true;
-      }
-    } finally {
-      process.running = false;
-    }
+    process.dispatch(event);
+    await process.running;
+    return !process.finished;
   };
   return process;
 }
@@ -320,26 +344,30 @@ function newSyncProcess({
     newState,
   });
   const shift = newTreeWalker(before, after, process);
-  process.next = (event) => {
+  process.dispatch = process.next =(event) => {
     process.event = event;
     while (process.event) {
       if (!shift(loadNextState)) return false;
-      if (process.status & MODE.LEAF) return true;
+      if (process.status & MODE$1.LEAF) return true;
     }
   };
   return process;
 }
 
 exports.KEYS = KEYS;
+exports.MODE = MODE$1;
 exports.buildStateDescriptor = buildStateDescriptor;
 exports.checkProcessDescriptor = checkProcessDescriptor;
 exports.getAllStateKeys = getAllStateKeys;
 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.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));

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

@@ -1,2 +1,2 @@
-// @statewalker/fsm v0.8.0 https://github.com/statewalker/statewalker Copyright 2021 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";function e(t={}){const{key:s,transitions:n=[],states:r={},options:o,...c}=t,a={key:s,transitions:{},states:{},options:Object.assign(o||{},c)};for(const t of n){let e,s,n;if(Array.isArray(t))e=t[0],s=t[1],n=t[2];else{const{from:r,event:o,to:c}=t;e=r,s=o,n=c}(a.transitions[e]=a.transitions[e]||{})[s]=n}if(Array.isArray(r))for(const t of r)a.states[t.key]=e(t);else if(r)for(const t of Object.keys(r))a.states[t]=e(r[t]);return a}var s={STATE_ANY:"*",STATE_INITIAL:"",STATE_FINAL:"",EVENT_ANY:"*",EVENT_EMPTY:""};function n(t,e,n){const r=[[e,n],[s.STATE_ANY,n],[e,s.EVENT_ANY],[s.STATE_ANY,s.EVENT_ANY]];let o;for(let e=0,n=r.length;void 0===o&&e<n;e++){const[n,c]=r[e],a=t.transitions[n];a&&(o=a[c],void 0===o&&(o=a[s.EVENT_ANY]))}return void 0!==o?o:s.STATE_FINAL}const r={NONE:0,LEAF:1,LAST:2,FIRST:4,NEXT:8};function o({config:t,descriptor:o,newState:c=(t=>t),newProcess:a=(t=>({descriptor:t,status:0,stack:[],event:void 0,current:void 0}))}){const i=a(o=o||e(t));return[i,()=>{let t,e;if(i.status){if(i.stack.length){const e=i.event.key||s.EVENT_EMPTY;t=n(i.stack[i.stack.length-1].descriptor,i.status&r.ENTER?s.STATE_INITIAL:i.current?i.current.key:s.STATE_FINAL,e)}else t=s.STATE_FINAL;if(t)for(let s=i.stack.length-1;!e&&s>=0;s--){e=(i.stack[s].descriptor.states||{})[t]}}else e=i.descriptor,t=e.key;return e=e||{transitions:{},states:{}},t?c({process:i,key:t,descriptor:e}):null}]}r.ENTER=r.FIRST|r.NEXT,r.EXIT=r.LAST|r.LEAF,t.KEYS=s,t.buildStateDescriptor=e,t.checkProcessDescriptor=function(t){return function t(e,n=[],r=[]){r=[...r,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 r=[],o=[];for(const t of Object.keys(e))t===s.STATE_ANY||t===s.STATE_FINAL||t===s.STATE_INITIAL||t in n||r.push(t);for(const t of Object.keys(n))t===s.STATE_FINAL||t in e||o.push(t);return{unreachableStates:r,deadendStates:o}}(e));if(o.deadendStates.length||o.unreachableStates.length){const t={path:r};n.push(t),o.deadendStates.length&&(t.deadendStates=o.deadendStates),o.unreachableStates.length&&(t.unreachableStates=o.unreachableStates)}for(const s of Object.values(e.states))t(s,n,r);return n}(t)},t.getAllStateKeys=function(t){const e={},s=t=>e[t]=(e[t]||0)+1;return function t(e){s(e.key);for(const[t,n]of Object.entries(e.transitions)){s(t);for(const t of Object.values(n))s(t)}for(const[n,r]of Object.entries(e.states))s(n),t(r)}(t),Object.keys(e).sort()},t.getAllTransitions=function(t){const e=[];let n=t.current?t.current.key:s.STATE_INITIAL;for(let r=t.stack.length-1;r>=0;r--){const o=t.stack[r],c=o.key,a=o.descriptor;for(const t of[n,s.STATE_ANY]){const s=a.transitions[t];if(s)for(const[n,r]of Object.entries(s))e.push([c,t,n,r])}n=c}return e},t.getTargetStateKey=n,t.newAsyncProcess=function({config:t,descriptor:e,before:s,after:n,newProcess:c,newState:a}){const[i,f]=o({config:t,descriptor:e,newProcess:c,newState:a}),u=function(t,e,s={stack:[],status:r.NONE}){return async n=>{let o=s.status;const c=o&r.EXIT;c&&await e(s),o&r.ENTER&&await s.stack.push(s.current);let a=await n(s);return a?(s.current=a,o=s.status=c?r.NEXT:r.FIRST,await t(s)):(a=s.current=await s.stack.pop(),o=s.status=a?c?r.LAST:r.LEAF:r.NONE),o!==r.NONE}}(s,n,i);return i.next=async t=>{if(i.event=t,!i.running)try{for(i.running=!0;i.event;){if(!await u(f))return!1;if(i.status&r.LEAF)return!0}}finally{i.running=!1}},i},t.newProcessInstance=o,t.newSyncProcess=function({config:t,descriptor:e,before:s,after:n,newProcess:c,newState:a}){const[i,f]=o({config:t,descriptor:e,newProcess:c,newState:a}),u=function(t,e,s={stack:[],status:r.NONE}){return n=>{let o=s.status;const c=o&r.EXIT;c&&e(s),o&r.ENTER&&s.stack.push(s.current);let a=n(s);return a?(s.current=a,o=s.status=c?r.NEXT:r.FIRST,t(s)):(a=s.current=s.stack.pop(),o=s.status=a?c?r.LAST:r.LEAF:r.NONE),o!==r.NONE}}(s,n,i);return i.next=t=>{for(i.event=t;i.event;){if(!u(f))return!1;if(i.status&r.LEAF)return!0}},i},Object.defineProperty(t,"__esModule",{value:!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.js

@@ -1,4 +1,60 @@
-// @statewalker/fsm v0.8.0 https://github.com/statewalker/statewalker Copyright 2021 Mikhail Kotelnikov
+// @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;
+  }
+}
+
 function buildStateDescriptor(config = {}) {
   const { key, transitions = [], states = {}, options, ...params } = config;
   const result = {
@@ -35,11 +91,11 @@ function buildStateDescriptor(config = {}) {
 }
 
 var KEYS = {
-  STATE_ANY : '*',
-  STATE_INITIAL : '',
-  STATE_FINAL : '',
-  EVENT_ANY : '*',
-  EVENT_EMPTY : '',
+  STATE_ANY : "*",
+  STATE_INITIAL : "",
+  STATE_FINAL : "",
+  EVENT_ANY : "*",
+  EVENT_EMPTY : "",
 };
 
 function checkProcessDescriptor(descriptor) {
@@ -95,6 +151,15 @@ function checkProcessDescriptor(descriptor) {
   }
 }
 
+function getStateDescriptor(process, stateKey) {
+  let descriptor;
+  for (let i = process.stack.length - 1; !descriptor && i >= 0; i--) {
+    const states = process.stack[i].descriptor.states || {};
+    descriptor = states[stateKey];
+  }
+  return descriptor || { transitions: {}, states: {} };
+}
+
 /**
  * This method returns a list of all states used in 
  * the specified state descriptor.
@@ -173,60 +238,6 @@ function getTargetStateKey(descriptor, stateKey, eventKey) {
   return (targetKey !== undefined) ? targetKey : KEYS.STATE_FINAL;
 }
 
-const MODE = {
-  NONE : 0,
-  LEAF : 1,
-  LAST : 2,
-  FIRST : 4,
-  NEXT : 8,
-};
-MODE.ENTER = MODE.FIRST | MODE.NEXT;
-MODE.EXIT = MODE.LAST | MODE.LEAF;
-
-function newTreeWalker(
-  before, after,
-  context = { stack: [], status: MODE.NONE }
-) {
-  return (getNode) => {
-    let status = context.status;
-    const prev = status & MODE.EXIT;
-    if (prev) after(context);
-    if (status & MODE.ENTER) context.stack.push(context.current);
-    let node = getNode(context);
-    if (node) {
-      context.current = node;
-      status = context.status = prev ? MODE.NEXT : MODE.FIRST;
-      before(context);
-    } else {
-      node = context.current = context.stack.pop();
-      status = context.status = node ? prev ? MODE.LAST : MODE.LEAF : MODE.NONE;
-    }
-    return status !== MODE.NONE;
-  }
-}
-
-function newAsyncTreeWalker(
-  before, after,
-  context = { stack: [], status: MODE.NONE }
-) {
-  return async (getNode) => {
-    let status = context.status;
-    const prev = status & MODE.EXIT;
-    if (prev) await after(context);
-    if (status & MODE.ENTER) await context.stack.push(context.current);
-    let node = await getNode(context);
-    if (node) {
-      context.current = node;
-      status = context.status = prev ? MODE.NEXT : MODE.FIRST;
-      await before(context);
-    } else {
-      node = context.current = await context.stack.pop();
-      status = context.status = node ? prev ? MODE.LAST : MODE.LEAF : MODE.NONE;
-    }
-    return status !== MODE.NONE;
-  }
-}
-
 function newProcessInstance({
   config,
   descriptor,
@@ -251,20 +262,16 @@ function newProcessInstance({
         key = KEYS.STATE_FINAL;
       } else {
         const eventKey = process.event.key || KEYS.EVENT_EMPTY;
-        const descriptor = process.stack[process.stack.length - 1].descriptor;
-        const stateKey = process.status & MODE.ENTER
+        const parentDescriptor = process.stack[process.stack.length - 1].descriptor;
+        const stateKey = process.status & MODE$1.ENTER
           ? KEYS.STATE_INITIAL
           : process.current ? process.current.key : KEYS.STATE_FINAL;
-        key = getTargetStateKey(descriptor, stateKey, eventKey);
-      }
-      if (key) {
-        for (let i = process.stack.length - 1; !descriptor && i >= 0; i--) {
-          const states = process.stack[i].descriptor.states || {};
-          descriptor = states[key];
+        key = getTargetStateKey(parentDescriptor, stateKey, eventKey);
+        if (key) {
+          descriptor = getStateDescriptor(process, key);
         }
       }
     }
-    descriptor = descriptor || { transitions: {}, states: {} };
     return key ? newState({ process, key, descriptor }) : null;
   };
   return [process, loadNextState];
@@ -276,26 +283,43 @@ function newAsyncProcess({
   before, after,
   newProcess,
   newState,
+  handleError = console.error
 }) {
   const [process, loadNextState] = newProcessInstance({
     config,
     descriptor,
     newProcess,
-    newState,
+    newState
   });
   const shift = newAsyncTreeWalker(before, after, process);
+  process.finished = false;
+  process.dispatch = (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;
+          }
+          process.finished = !await shift(loadNextState);
+        }
+      } catch (error) {
+        handleError(error);
+      } 
+    }).finally(() => process.running = undefined);
+  };
+
   process.next = async (event) => {
-    process.event = event;
-    if (process.running) return;
-    try {
-      process.running = true;
-      while (process.event) {
-        if (!await shift(loadNextState)) return false;
-        if (process.status & MODE.LEAF) return true;
-      }
-    } finally {
-      process.running = false;
-    }
+    process.dispatch(event);
+    await process.running;
+    return !process.finished;
   };
   return process;
 }
@@ -314,14 +338,14 @@ function newSyncProcess({
     newState,
   });
   const shift = newTreeWalker(before, after, process);
-  process.next = (event) => {
+  process.dispatch = process.next =(event) => {
     process.event = event;
     while (process.event) {
       if (!shift(loadNextState)) return false;
-      if (process.status & MODE.LEAF) return true;
+      if (process.status & MODE$1.LEAF) return true;
     }
   };
   return process;
 }
 
-export { KEYS, buildStateDescriptor, checkProcessDescriptor, getAllStateKeys, getAllTransitions, getTargetStateKey, newAsyncProcess, newProcessInstance, newSyncProcess };
+export { KEYS, MODE$1 as MODE, buildStateDescriptor, checkProcessDescriptor, getAllStateKeys, getAllTransitions, getStateDescriptor, getTargetStateKey, newAsyncProcess, newAsyncTreeWalker, newProcessInstance, newSyncProcess, newTreeWalker };

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

@@ -1,2 +1,2 @@
-// @statewalker/fsm v0.8.0 https://github.com/statewalker/statewalker Copyright 2021 Mikhail Kotelnikov
-function t(e={}){const{key:n,transitions:s=[],states:r={},options:o,...c}=e,a={key:n,transitions:{},states:{},options:Object.assign(o||{},c)};for(const t of s){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 e of r)a.states[e.key]=t(e);else if(r)for(const e of Object.keys(r))a.states[e]=t(r[e]);return a}var e={STATE_ANY:"*",STATE_INITIAL:"",STATE_FINAL:"",EVENT_ANY:"*",EVENT_EMPTY:""};function n(t){return function t(n,s=[],r=[]){r=[...r,n.key];const o=Object.assign({key:n.key},function(t){const n={},s={};for(const[e,r]of Object.entries(t.transitions)){n[e]=(n[e]||0)+1;for(const t of Object.values(r))s[t]=(s[t]||0)+1}const r=[],o=[];for(const t of Object.keys(n))t===e.STATE_ANY||t===e.STATE_FINAL||t===e.STATE_INITIAL||t in s||r.push(t);for(const t of Object.keys(s))t===e.STATE_FINAL||t in n||o.push(t);return{unreachableStates:r,deadendStates:o}}(n));if(o.deadendStates.length||o.unreachableStates.length){const t={path:r};s.push(t),o.deadendStates.length&&(t.deadendStates=o.deadendStates),o.unreachableStates.length&&(t.unreachableStates=o.unreachableStates)}for(const e of Object.values(n.states))t(e,s,r);return s}(t)}function s(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 r(t){const n=[];let s=t.current?t.current.key:e.STATE_INITIAL;for(let r=t.stack.length-1;r>=0;r--){const o=t.stack[r],c=o.key,a=o.descriptor;for(const t of[s,e.STATE_ANY]){const e=a.transitions[t];if(e)for(const[s,r]of Object.entries(e))n.push([c,t,s,r])}s=c}return n}function o(t,n,s){const r=[[n,s],[e.STATE_ANY,s],[n,e.EVENT_ANY],[e.STATE_ANY,e.EVENT_ANY]];let o;for(let n=0,s=r.length;void 0===o&&n<s;n++){const[s,c]=r[n],a=t.transitions[s];a&&(o=a[c],void 0===o&&(o=a[e.EVENT_ANY]))}return void 0!==o?o:e.STATE_FINAL}const c={NONE:0,LEAF:1,LAST:2,FIRST:4,NEXT:8};function a({config:n,descriptor:s,newState:r=(t=>t),newProcess:a=(t=>({descriptor:t,status:0,stack:[],event:void 0,current:void 0}))}){const i=a(s=s||t(n));return[i,()=>{let t,n;if(i.status){if(i.stack.length){const n=i.event.key||e.EVENT_EMPTY;t=o(i.stack[i.stack.length-1].descriptor,i.status&c.ENTER?e.STATE_INITIAL:i.current?i.current.key:e.STATE_FINAL,n)}else t=e.STATE_FINAL;if(t)for(let e=i.stack.length-1;!n&&e>=0;e--){n=(i.stack[e].descriptor.states||{})[t]}}else n=i.descriptor,t=n.key;return n=n||{transitions:{},states:{}},t?r({process:i,key:t,descriptor:n}):null}]}function i({config:t,descriptor:e,before:n,after:s,newProcess:r,newState:o}){const[i,u]=a({config:t,descriptor:e,newProcess:r,newState:o}),f=function(t,e,n={stack:[],status:c.NONE}){return async s=>{let r=n.status;const o=r&c.EXIT;o&&await e(n),r&c.ENTER&&await n.stack.push(n.current);let a=await s(n);return a?(n.current=a,r=n.status=o?c.NEXT:c.FIRST,await t(n)):(a=n.current=await n.stack.pop(),r=n.status=a?o?c.LAST:c.LEAF:c.NONE),r!==c.NONE}}(n,s,i);return i.next=async t=>{if(i.event=t,!i.running)try{for(i.running=!0;i.event;){if(!await f(u))return!1;if(i.status&c.LEAF)return!0}}finally{i.running=!1}},i}function u({config:t,descriptor:e,before:n,after:s,newProcess:r,newState:o}){const[i,u]=a({config:t,descriptor:e,newProcess:r,newState:o}),f=function(t,e,n={stack:[],status:c.NONE}){return s=>{let r=n.status;const o=r&c.EXIT;o&&e(n),r&c.ENTER&&n.stack.push(n.current);let a=s(n);return a?(n.current=a,r=n.status=o?c.NEXT:c.FIRST,t(n)):(a=n.current=n.stack.pop(),r=n.status=a?o?c.LAST:c.LEAF:c.NONE),r!==c.NONE}}(n,s,i);return i.next=t=>{for(i.event=t;i.event;){if(!f(u))return!1;if(i.status&c.LEAF)return!0}},i}c.ENTER=c.FIRST|c.NEXT,c.EXIT=c.LAST|c.LEAF;export{e as KEYS,t as buildStateDescriptor,n as checkProcessDescriptor,s as getAllStateKeys,r as getAllTransitions,o as getTargetStateKey,i as newAsyncProcess,a as newProcessInstance,u as newSyncProcess};
+// @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};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statewalker/fsm",
-  "version": "0.8.0",
+  "version": "0.9.2",
   "description": "Utility graph methods (iterators, tree builders etc)",
   "keywords": [],
   "homepage": "https://github.com/statewalker/statewalker",
@@ -31,21 +31,19 @@
     "url": "https://github.com/statewalker/statewalker.git"
   },
   "devDependencies": {
-    "@statewalker/tree": "^0.8.0"
+    "@statewalker/tree": "^0.9.1"
   },
   "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",
-    "pretest": "yarn rollup",
     "prepare": "yarn rollup",
-    "prepublishOnly": "rm -rf dist && yarn test",
+    "prepublishOnly": "rm -rf dist && yarn test && yarn rollup",
     "postpublish": "zip -j dist/statewalker-fsm.zip -- ../../LICENSE README.md dist/*.js"
   },
   "license": "MIT",
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
-  },
-  "gitHead": "bd8ef5bbb5f0d6b7fc06941ec737a36fa85d69c0"
+  }
 }

package/src/KEYS.js

@@ -1,7 +1,7 @@
 export default {
-  STATE_ANY : '*',
-  STATE_INITIAL : '',
-  STATE_FINAL : '',
-  EVENT_ANY : '*',
-  EVENT_EMPTY : '',
+  STATE_ANY : "*",
+  STATE_INITIAL : "",
+  STATE_FINAL : "",
+  EVENT_ANY : "*",
+  EVENT_EMPTY : "",
 }

package/src/checkProcessDescriptor.js

@@ -1,4 +1,4 @@
-import KEYS from './KEYS.js';
+import KEYS from "./KEYS.js";
 
 export default function checkProcessDescriptor(descriptor) {
   return checkStateDescriptor(descriptor);

package/src/getAllTransitions.js

@@ -1,4 +1,4 @@
-import KEYS from './KEYS.js';
+import KEYS from "./KEYS.js";
 
 /**
  * Returns all possible transitions from the current state of the process.

package/src/getStateDescriptor.js

@@ -0,0 +1,8 @@
+export default function getStateDescriptor(process, stateKey) {
+  let descriptor;
+  for (let i = process.stack.length - 1; !descriptor && i >= 0; i--) {
+    const states = process.stack[i].descriptor.states || {};
+    descriptor = states[stateKey];
+  }
+  return descriptor || { transitions: {}, states: {} };
+}

package/src/getTargetStateKey.js

@@ -1,4 +1,4 @@
-import KEYS from './KEYS.js';
+import KEYS from "./KEYS.js";
 
 export default function getTargetStateKey(descriptor, stateKey, eventKey) {
   const pairs = [

package/src/index.js

@@ -1,9 +1,11 @@
-export { default as buildStateDescriptor } from './buildStateDescriptor.js';
-export { default as checkProcessDescriptor } from './checkProcessDescriptor.js';
-export { default as getAllStateKeys } from './getAllStateKeys.js';
-export { default as getAllTransitions } from './getAllTransitions.js';
-export { default as getTargetStateKey } from './getTargetStateKey.js';
-export { default as KEYS } from './KEYS.js';
-export { default as newAsyncProcess } from './newAsyncProcess.js';
-export { default as newProcessInstance } from './newProcessInstance.js';
-export { default as newSyncProcess } from './newSyncProcess.js';
+export * from "@statewalker/tree";
+export { default as buildStateDescriptor } from "./buildStateDescriptor.js";
+export { default as checkProcessDescriptor } from "./checkProcessDescriptor.js";
+export { default as getStateDescriptor } from "./getStateDescriptor.js";
+export { default as getAllStateKeys } from "./getAllStateKeys.js";
+export { default as getAllTransitions } from "./getAllTransitions.js";
+export { default as getTargetStateKey } from "./getTargetStateKey.js";
+export { default as KEYS } from "./KEYS.js";
+export { default as newAsyncProcess } from "./newAsyncProcess.js";
+export { default as newProcessInstance } from "./newProcessInstance.js";
+export { default as newSyncProcess } from "./newSyncProcess.js";

package/src/newAsyncProcess.js

@@ -1,5 +1,5 @@
-import { MODE, newAsyncTreeWalker } from '@statewalker/tree';
-import newProcessInstance from './newProcessInstance.js';
+import { MODE, newAsyncTreeWalker } from "@statewalker/tree";
+import newProcessInstance from "./newProcessInstance.js";
 
 export default function newAsyncProcess({
   config,
@@ -7,26 +7,43 @@ export default function newAsyncProcess({
   before, after,
   newProcess,
   newState,
+  handleError = console.error
 }) {
   const [process, loadNextState] = newProcessInstance({
     config,
     descriptor,
     newProcess,
-    newState,
+    newState
   });
   const shift = newAsyncTreeWalker(before, after, process);
+  process.finished = false;
+  process.dispatch = (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;
+          }
+          process.finished = !await shift(loadNextState);
+        }
+      } catch (error) {
+        handleError(error);
+      } 
+    }).finally(() => process.running = undefined);
+  }
+
   process.next = async (event) => {
-    process.event = event;
-    if (process.running) return;
-    try {
-      process.running = true;
-      while (process.event) {
-        if (!await shift(loadNextState)) return false;
-        if (process.status & MODE.LEAF) return true;
-      }
-    } finally {
-      process.running = false;
-    }
+    process.dispatch(event);
+    await process.running;
+    return !process.finished;
   }
   return process;
 }

package/src/newProcessInstance.js

@@ -1,7 +1,8 @@
-import { MODE } from '@statewalker/tree';
-import buildStateDescriptor from './buildStateDescriptor.js';
-import getTargetStateKey from './getTargetStateKey.js';
-import KEYS from './KEYS.js';
+import { MODE } from "@statewalker/tree";
+import buildStateDescriptor from "./buildStateDescriptor.js";
+import getTargetStateKey from "./getTargetStateKey.js";
+import getStateDescriptor from "./getStateDescriptor.js";
+import KEYS from "./KEYS.js";
 
 export default function newProcessInstance({
   config,
@@ -27,20 +28,16 @@ export default function newProcessInstance({
         key = KEYS.STATE_FINAL;
       } else {
         const eventKey = process.event.key || KEYS.EVENT_EMPTY;
-        const descriptor = process.stack[process.stack.length - 1].descriptor;
+        const parentDescriptor = process.stack[process.stack.length - 1].descriptor;
         const stateKey = process.status & MODE.ENTER
           ? KEYS.STATE_INITIAL
           : process.current ? process.current.key : KEYS.STATE_FINAL;
-        key = getTargetStateKey(descriptor, stateKey, eventKey);
-      }
-      if (key) {
-        for (let i = process.stack.length - 1; !descriptor && i >= 0; i--) {
-          const states = process.stack[i].descriptor.states || {};
-          descriptor = states[key];
+        key = getTargetStateKey(parentDescriptor, stateKey, eventKey);
+        if (key) {
+          descriptor = getStateDescriptor(process, key);
         }
       }
     }
-    descriptor = descriptor || { transitions: {}, states: {} };
     return key ? newState({ process, key, descriptor }) : null;
   };
   return [process, loadNextState];

package/src/newSyncProcess.js

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

package/LICENSE

@@ -1,27 +0,0 @@
-Copyright 2010-2020 Mikhail Kotelnikov
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the author nor the names of contributors may be used to
-  endorse or promote products derived from this software without specific prior
-  written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.