jssm 5.56.2 → 5.58.0

package/dist/es6/jssm.d.ts

@@ -41,9 +41,12 @@ declare class Machine<mDT> {
     _has_basic_hooks: boolean;
     _has_named_hooks: boolean;
     _has_entry_hooks: boolean;
+    _has_exit_hooks: boolean;
     _hooks: Map<string, Function>;
     _named_hooks: Map<string, Function>;
     _entry_hooks: Map<string, Function>;
+    _exit_hooks: Map<string, Function>;
+    _any_action_hook: HookHandler | undefined;
     _any_transition_hook: HookHandler | undefined;
     constructor({ start_states, complete, transitions, machine_author, machine_comment, machine_contributor, machine_definition, machine_language, machine_license, machine_name, machine_version, state_declaration, fsl_version, dot_preamble, arrange_declaration, arrange_start_declaration, arrange_end_declaration, theme, flow, graph_layout }: JssmGenericConfig<mDT>);
     _new_state(state_config: JssmGenericState): StateType;
@@ -99,6 +102,7 @@ declare class Machine<mDT> {
     hook_action(from: string, to: string, action: string, handler: HookHandler): Machine<mDT>;
     hook_any_transition(handler: HookHandler): Machine<mDT>;
     hook_entry(to: string, handler: HookHandler): Machine<mDT>;
+    hook_exit(from: string, handler: HookHandler): Machine<mDT>;
     transition_impl(newStateOrAction: StateType, newData: mDT | undefined, wasForced: boolean, wasAction: boolean): boolean;
     action(actionName: StateType, newData?: mDT): boolean;
     transition(newState: StateType, newData?: mDT): boolean;

package/dist/es6/jssm.js

@@ -349,10 +349,13 @@ class Machine {
         this._has_basic_hooks = false;
         this._has_named_hooks = false;
         this._has_entry_hooks = false;
+        this._has_exit_hooks = false;
         // no need for a boolean has any transition hook, as it's one or nothing, so just test that for undefinedness
         this._hooks = new Map();
         this._named_hooks = new Map();
         this._entry_hooks = new Map();
+        this._exit_hooks = new Map();
+        this._any_action_hook = undefined;
         this._any_transition_hook = undefined;
         if (state_declaration) {
             state_declaration.map((state_decl) => {
@@ -716,6 +719,10 @@ class Machine {
                 this._named_hooks.set(named_hook_name(HookDesc.from, HookDesc.to, HookDesc.action), HookDesc.handler);
                 this._has_hooks = true;
                 break;
+            case 'any action':
+                this._any_action_hook = HookDesc.handler;
+                this._has_hooks = true;
+                break;
             case 'any transition':
                 this._any_transition_hook = HookDesc.handler;
                 this._has_hooks = true;
@@ -724,9 +731,10 @@ class Machine {
                 this._entry_hooks.set(HookDesc.to, HookDesc.handler);
                 this._has_hooks = true;
                 break;
-            // case 'exit':
-            //   console.log('TODO: Should add exit hook here');
-            //   throw 'TODO: Should add exit hook here';
+            case 'exit':
+                this._exit_hooks.set(HookDesc.from, HookDesc.handler);
+                this._has_hooks = true;
+                break;
             default:
                 console.log(`Unknown hook type ${HookDesc.kind}, should be impossible`);
                 throw new RangeError(`Unknown hook type ${HookDesc.kind}, should be impossible`);
@@ -752,6 +760,11 @@ class Machine {
         this.set_hook({ kind: 'entry', to, handler });
         return this;
     }
+    hook_exit(from, handler) {
+        // TODO: should this throw if setting the hook fails, or ignore it and continue?
+        this.set_hook({ kind: 'exit', from, handler });
+        return this;
+    }
     // remove_hook(HookDesc: HookDescription) {
     //   throw 'TODO: Should remove hook here';
     // }
@@ -781,16 +794,29 @@ class Machine {
         if (valid) {
             if (this._has_hooks) {
                 // 1. any action hook
+                if (wasAction) {
+                    if (this._any_action_hook !== undefined) {
+                        if (this._any_action_hook() === false) {
+                            return false;
+                        }
+                    }
+                }
+                // 2. global specific action hook
                 // not yet implemented
-                // 2. any transition hook
+                // 3. any transition hook
                 if (this._any_transition_hook !== undefined) {
                     if (this._any_transition_hook() === false) {
                         return false;
                     }
                 }
-                // 3. exit hook
-                // not yet implemented
-                // 4. named transition / action hook
+                // 4. exit hook
+                const maybe_ex_hook = this._exit_hooks.get(this._state);
+                if (maybe_ex_hook !== undefined) {
+                    if (maybe_ex_hook({ from: this._state, forced: wasForced }) === false) {
+                        return false;
+                    }
+                }
+                // 5. named transition / action hook
                 if (wasAction) {
                     const nhn = named_hook_name(this._state, newState, newStateOrAction), n_maybe_hook = this._named_hooks.get(nhn);
                     if (n_maybe_hook !== undefined) {
@@ -799,16 +825,16 @@ class Machine {
                         }
                     }
                 }
-                // 5. regular hook
+                // 6. regular hook
                 const hn = hook_name(this._state, newState), maybe_hook = this._hooks.get(hn);
                 if (maybe_hook !== undefined) {
                     if (maybe_hook({ from: this._state, to: newState, forced: wasForced, action: wasAction ? newStateOrAction : undefined }) === false) {
                         return false;
                     }
                 }
-                // 6. edge type hook
+                // 7. edge type hook
                 // not yet implemented
-                // 7. entry hook
+                // 8. entry hook
                 const maybe_en_hook = this._entry_hooks.get(newState);
                 if (maybe_en_hook !== undefined) {
                     if (maybe_en_hook({ to: newState, forced: wasForced }) === false) {

package/dist/es6/jssm_types.d.ts

@@ -166,6 +166,10 @@ declare type AnyTransitionHook = {
     kind: 'any transition';
     handler: HookHandler;
 };
+declare type AnyActionHook = {
+    kind: 'any action';
+    handler: HookHandler;
+};
 declare type EntryHook = {
     kind: 'entry';
     to: string;
@@ -176,5 +180,5 @@ declare type ExitHook = {
     from: string;
     handler: HookHandler;
 };
-declare type HookDescription = BasicHookDescription | HookDescriptionWithAction | AnyTransitionHook | EntryHook | ExitHook;
+declare type HookDescription = BasicHookDescription | HookDescriptionWithAction | AnyActionHook | AnyTransitionHook | EntryHook | ExitHook;
 export { JssmColor, JssmTransition, JssmTransitions, JssmTransitionList, JssmTransitionRule, JssmArrow, JssmArrowKind, JssmArrowDirection, JssmGenericConfig, JssmGenericState, JssmGenericMachine, JssmParseTree, JssmCompileSe, JssmCompileSeStart, JssmCompileRule, JssmPermitted, JssmPermittedOpt, JssmResult, JssmStateDeclaration, JssmStateDeclarationRule, JssmLayout, JssmParseFunctionType, JssmMachineInternalState, FslDirection, FslTheme, HookDescription, HookHandler };

package/dist/es6/version.js

@@ -1,2 +1,2 @@
-const version = "5.56.2";
+const version = "5.58.0";
 export { version };