@statewalker/fsm 0.9.1 → 0.9.2

package/dist/cjs/statewalker-fsm.js

@@ -1,9 +1,9 @@
-// @statewalker/fsm v0.9.1 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,
@@ -15,48 +15,49 @@ const MODE = {
   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.NONE }
+  context = { stack: [], status: MODE$1.NONE }
 ) {
   return (getNode) => {
     let status = context.status;
-    const prev = status & MODE.EXIT;
+    const prev = status & MODE$1.EXIT;
     if (prev) after(context);
-    if (status & MODE.ENTER) context.stack.push(context.current);
+    if (status & MODE$1.ENTER) context.stack.push(context.current);
     let node = getNode(context);
     if (node) {
       context.current = node;
-      status = context.status = prev ? MODE.NEXT : MODE.FIRST;
+      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.LAST : MODE.LEAF : MODE.NONE;
+      status = context.status = node ? prev ? MODE$1.LAST : MODE$1.LEAF : MODE$1.NONE;
     }
-    return status !== MODE.NONE;
+    return status !== MODE$1.NONE;
   }
 }
 
 function newAsyncTreeWalker(
   before, after,
-  context = { stack: [], status: MODE.NONE }
+  context = { stack: [], status: MODE$1.NONE }
 ) {
   return async (getNode) => {
     let status = context.status;
-    const prev = status & MODE.EXIT;
+    const prev = status & MODE$1.EXIT;
     if (prev) await after(context);
-    if (status & MODE.ENTER) await context.stack.push(context.current);
+    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.NEXT : MODE.FIRST;
+      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.LAST : MODE.LEAF : MODE.NONE;
+      status = context.status = node ? prev ? MODE$1.LAST : MODE$1.LEAF : MODE$1.NONE;
     }
-    return status !== MODE.NONE;
+    return status !== MODE$1.NONE;
   }
 }
 
@@ -268,7 +269,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.ENTER
+        const stateKey = process.status & MODE$1.ENTER
           ? KEYS.STATE_INITIAL
           : process.current ? process.current.key : KEYS.STATE_FINAL;
         key = getTargetStateKey(parentDescriptor, stateKey, eventKey);
@@ -288,24 +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.running = Promise.resolve();
+  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.dispatch(event);
     await process.running;
-    return await (process.running = (async() => {
-      process.event = event;
-      while (process.event) {
-        if (!await shift(loadNextState)) return false;
-        if (process.status & MODE.LEAF) return true;
-      }
-    })())
+    return !process.finished;
   };
   return process;
 }
@@ -324,18 +344,18 @@ 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;
+exports.MODE = MODE$1;
 exports.buildStateDescriptor = buildStateDescriptor;
 exports.checkProcessDescriptor = checkProcessDescriptor;
 exports.getAllStateKeys = getAllStateKeys;
@@ -350,4 +370,4 @@ exports.newTreeWalker = newTreeWalker;
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));

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

@@ -1,2 +1,2 @@
-// @statewalker/fsm v0.9.1 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";const e={NONE:0,FIRST:1,NEXT:2,LEAF:4,LAST:8,ENTER:3,EXIT:12};function s(t,s,n={stack:[],status:e.NONE}){return r=>{let o=n.status;const c=o&e.EXIT;c&&s(n),o&e.ENTER&&n.stack.push(n.current);let a=r(n);return a?(n.current=a,o=n.status=c?e.NEXT:e.FIRST,t(n)):(a=n.current=n.stack.pop(),o=n.status=a?c?e.LAST:e.LEAF:e.NONE),o!==e.NONE}}function n(t,s,n={stack:[],status:e.NONE}){return async r=>{let o=n.status;const c=o&e.EXIT;c&&await s(n),o&e.ENTER&&await n.stack.push(n.current);let a=await r(n);return a?(n.current=a,o=n.status=c?e.NEXT:e.FIRST,await t(n)):(a=n.current=await n.stack.pop(),o=n.status=a?c?e.LAST:e.LEAF:e.NONE),o!==e.NONE}}function r(t={}){const{key:e,transitions:s=[],states:n={},options:o,...c}=t,a={key:e,transitions:{},states:{},options:Object.assign(o||{},c)};for(const t of s){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(n))for(const t of n)a.states[t.key]=r(t);else if(n)for(const t of Object.keys(n))a.states[t]=r(n[t]);return a}var o={STATE_ANY:"*",STATE_INITIAL:"",STATE_FINAL:"",EVENT_ANY:"*",EVENT_EMPTY:""};function c(t,e){let s;for(let n=t.stack.length-1;!s&&n>=0;n--){s=(t.stack[n].descriptor.states||{})[e]}return s||{transitions:{},states:{}}}function a(t,e,s){const n=[[e,s],[o.STATE_ANY,s],[e,o.EVENT_ANY],[o.STATE_ANY,o.EVENT_ANY]];let r;for(let e=0,s=n.length;void 0===r&&e<s;e++){const[s,c]=n[e],a=t.transitions[s];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:s,newState:n=(t=>t),newProcess:i=(t=>({descriptor:t,status:0,stack:[],event:void 0,current:void 0}))}){const u=i(s=s||r(t));return[u,()=>{let t,s;if(u.status)if(u.stack.length){const n=u.event.key||o.EVENT_EMPTY;t=a(u.stack[u.stack.length-1].descriptor,u.status&e.ENTER?o.STATE_INITIAL:u.current?u.current.key:o.STATE_FINAL,n),t&&(s=c(u,t))}else t=o.STATE_FINAL;else s=u.descriptor,t=s.key;return t?n({process:u,key:t,descriptor:s}):null}]}t.KEYS=o,t.MODE=e,t.buildStateDescriptor=r,t.checkProcessDescriptor=function(t){return function t(e,s=[],n=[]){n=[...n,e.key];const r=Object.assign({key:e.key},function(t){const e={},s={};for(const[n,r]of Object.entries(t.transitions)){e[n]=(e[n]||0)+1;for(const t of Object.values(r))s[t]=(s[t]||0)+1}const n=[],r=[];for(const t of Object.keys(e))t===o.STATE_ANY||t===o.STATE_FINAL||t===o.STATE_INITIAL||t in s||n.push(t);for(const t of Object.keys(s))t===o.STATE_FINAL||t in e||r.push(t);return{unreachableStates:n,deadendStates:r}}(e));if(r.deadendStates.length||r.unreachableStates.length){const t={path:n};s.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,s,n);return s}(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 s=t.current?t.current.key:o.STATE_INITIAL;for(let n=t.stack.length-1;n>=0;n--){const r=t.stack[n],c=r.key,a=r.descriptor;for(const t of[s,o.STATE_ANY]){const s=a.transitions[t];if(s)for(const[n,r]of Object.entries(s))e.push([c,t,n,r])}s=c}return e},t.getStateDescriptor=c,t.getTargetStateKey=a,t.newAsyncProcess=function({config:t,descriptor:s,before:r,after:o,newProcess:c,newState:a}){const[u,f]=i({config:t,descriptor:s,newProcess:c,newState:a}),T=n(r,o,u);return u.running=Promise.resolve(),u.next=async t=>(await u.running,await(u.running=(async()=>{for(u.event=t;u.event;){if(!await T(f))return!1;if(u.status&e.LEAF)return!0}})())),u},t.newAsyncTreeWalker=n,t.newProcessInstance=i,t.newSyncProcess=function({config:t,descriptor:n,before:r,after:o,newProcess:c,newState:a}){const[u,f]=i({config:t,descriptor:n,newProcess:c,newState:a}),T=s(r,o,u);return u.next=t=>{for(u.event=t;u.event;){if(!T(f))return!1;if(u.status&e.LEAF)return!0}},u},t.newTreeWalker=s,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,4 @@
-// @statewalker/fsm v0.9.1 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
@@ -9,48 +9,49 @@ const MODE = {
   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.NONE }
+  context = { stack: [], status: MODE$1.NONE }
 ) {
   return (getNode) => {
     let status = context.status;
-    const prev = status & MODE.EXIT;
+    const prev = status & MODE$1.EXIT;
     if (prev) after(context);
-    if (status & MODE.ENTER) context.stack.push(context.current);
+    if (status & MODE$1.ENTER) context.stack.push(context.current);
     let node = getNode(context);
     if (node) {
       context.current = node;
-      status = context.status = prev ? MODE.NEXT : MODE.FIRST;
+      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.LAST : MODE.LEAF : MODE.NONE;
+      status = context.status = node ? prev ? MODE$1.LAST : MODE$1.LEAF : MODE$1.NONE;
     }
-    return status !== MODE.NONE;
+    return status !== MODE$1.NONE;
   }
 }
 
 function newAsyncTreeWalker(
   before, after,
-  context = { stack: [], status: MODE.NONE }
+  context = { stack: [], status: MODE$1.NONE }
 ) {
   return async (getNode) => {
     let status = context.status;
-    const prev = status & MODE.EXIT;
+    const prev = status & MODE$1.EXIT;
     if (prev) await after(context);
-    if (status & MODE.ENTER) await context.stack.push(context.current);
+    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.NEXT : MODE.FIRST;
+      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.LAST : MODE.LEAF : MODE.NONE;
+      status = context.status = node ? prev ? MODE$1.LAST : MODE$1.LEAF : MODE$1.NONE;
     }
-    return status !== MODE.NONE;
+    return status !== MODE$1.NONE;
   }
 }
 
@@ -262,7 +263,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.ENTER
+        const stateKey = process.status & MODE$1.ENTER
           ? KEYS.STATE_INITIAL
           : process.current ? process.current.key : KEYS.STATE_FINAL;
         key = getTargetStateKey(parentDescriptor, stateKey, eventKey);
@@ -282,24 +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.running = Promise.resolve();
+  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.dispatch(event);
     await process.running;
-    return await (process.running = (async() => {
-      process.event = event;
-      while (process.event) {
-        if (!await shift(loadNextState)) return false;
-        if (process.status & MODE.LEAF) return true;
-      }
-    })())
+    return !process.finished;
   };
   return process;
 }
@@ -318,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, MODE, buildStateDescriptor, checkProcessDescriptor, getAllStateKeys, getAllTransitions, getStateDescriptor, getTargetStateKey, newAsyncProcess, newAsyncTreeWalker, newProcessInstance, newSyncProcess, newTreeWalker };
+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.9.1 https://github.com/statewalker/statewalker Copyright 2021 Mikhail Kotelnikov
-const 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 T({config:e,descriptor:s,before:r,after:o,newProcess:c,newState:a}){const[i,u]=f({config:e,descriptor:s,newProcess:c,newState:a}),T=n(r,o,i);return i.running=Promise.resolve(),i.next=async e=>(await i.running,await(i.running=(async()=>{for(i.event=e;i.event;){if(!await T(u))return!1;if(i.status&t.LEAF)return!0}})())),i}function E({config:n,descriptor:s,before:r,after:o,newProcess:c,newState:a}){const[i,u]=f({config:n,descriptor:s,newProcess:c,newState:a}),T=e(r,o,i);return i.next=e=>{for(i.event=e;i.event;){if(!T(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,T as newAsyncProcess,n as newAsyncTreeWalker,f as newProcessInstance,E as newSyncProcess,e as newTreeWalker};
+// @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.9.1",
+  "version": "0.9.2",
   "description": "Utility graph methods (iterators, tree builders etc)",
   "keywords": [],
   "homepage": "https://github.com/statewalker/statewalker",
@@ -45,6 +45,5 @@
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
-  },
-  "gitHead": "d1f5418f6f1f621d3e47378e6b5d3dd3aff9bdad"
+  }
 }

package/src/newAsyncProcess.js

@@ -7,24 +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.running = Promise.resolve();
+  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.dispatch(event);
     await process.running;
-    return await (process.running = (async() => {
-      process.event = event;
-      while (process.event) {
-        if (!await shift(loadNextState)) return false;
-        if (process.status & MODE.LEAF) return true;
-      }
-    })())
+    return !process.finished;
   }
   return process;
 }

package/src/newSyncProcess.js

@@ -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.