jssm 5.60.3 → 5.61.2

package/dist/es6/jssm.d.ts

@@ -42,6 +42,8 @@ declare class Machine<mDT> {
     _has_named_hooks: boolean;
     _has_entry_hooks: boolean;
     _has_exit_hooks: boolean;
+    _has_global_action_hooks: boolean;
+    _has_transition_hooks: boolean;
     _hooks: Map<string, Function>;
     _named_hooks: Map<string, Function>;
     _entry_hooks: Map<string, Function>;
@@ -106,6 +108,9 @@ declare class Machine<mDT> {
     hook_action(from: string, to: string, action: string, handler: HookHandler): Machine<mDT>;
     hook_global_action(action: string, handler: HookHandler): Machine<mDT>;
     hook_any_action(handler: HookHandler): Machine<mDT>;
+    hook_standard_transition(handler: HookHandler): Machine<mDT>;
+    hook_main_transition(handler: HookHandler): Machine<mDT>;
+    hook_forced_transition(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>;

package/dist/es6/jssm.js

@@ -350,6 +350,8 @@ class Machine {
         this._has_named_hooks = false;
         this._has_entry_hooks = false;
         this._has_exit_hooks = false;
+        this._has_global_action_hooks = false;
+        this._has_transition_hooks = true;
         // 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();
@@ -719,14 +721,17 @@ class Machine {
             case 'hook':
                 this._hooks.set(hook_name(HookDesc.from, HookDesc.to), HookDesc.handler);
                 this._has_hooks = true;
+                this._has_basic_hooks = true;
                 break;
             case 'named':
                 this._named_hooks.set(named_hook_name(HookDesc.from, HookDesc.to, HookDesc.action), HookDesc.handler);
                 this._has_hooks = true;
+                this._has_named_hooks = true;
                 break;
             case 'global action':
                 this._global_action_hooks.set(HookDesc.action, HookDesc.handler);
                 this._has_hooks = true;
+                this._has_global_action_hooks = true;
                 break;
             case 'any action':
                 this._any_action_hook = HookDesc.handler;
@@ -734,14 +739,17 @@ class Machine {
                 break;
             case 'standard transition':
                 this._standard_transition_hook = HookDesc.handler;
+                this._has_transition_hooks = true;
                 this._has_hooks = true;
                 break;
             case 'main transition':
                 this._main_transition_hook = HookDesc.handler;
+                this._has_transition_hooks = true;
                 this._has_hooks = true;
                 break;
             case 'forced transition':
                 this._forced_transition_hook = HookDesc.handler;
+                this._has_transition_hooks = true;
                 this._has_hooks = true;
                 break;
             case 'any transition':
@@ -751,10 +759,12 @@ class Machine {
             case 'entry':
                 this._entry_hooks.set(HookDesc.to, HookDesc.handler);
                 this._has_hooks = true;
+                this._has_entry_hooks = true;
                 break;
             case 'exit':
                 this._exit_hooks.set(HookDesc.from, HookDesc.handler);
                 this._has_hooks = true;
+                this._has_exit_hooks = true;
                 break;
             default:
                 console.log(`Unknown hook type ${HookDesc.kind}, should be impossible`);
@@ -781,6 +791,21 @@ class Machine {
         this.set_hook({ kind: 'any action', handler });
         return this;
     }
+    hook_standard_transition(handler) {
+        // TODO: should this throw if setting the hook fails, or ignore it and continue?
+        this.set_hook({ kind: 'standard transition', handler });
+        return this;
+    }
+    hook_main_transition(handler) {
+        // TODO: should this throw if setting the hook fails, or ignore it and continue?
+        this.set_hook({ kind: 'main transition', handler });
+        return this;
+    }
+    hook_forced_transition(handler) {
+        // TODO: should this throw if setting the hook fails, or ignore it and continue?
+        this.set_hook({ kind: 'forced transition', handler });
+        return this;
+    }
     hook_any_transition(handler) {
         // TODO: should this throw if setting the hook fails, or ignore it and continue?
         this.set_hook({ kind: 'any transition', handler });
@@ -823,8 +848,10 @@ class Machine {
         }
         else {
             if (this.valid_transition(newStateOrAction, newData)) {
+                if (this._has_transition_hooks) {
+                    trans_type = this.edges_between(this._state, newStateOrAction)[0].kind; // TODO this won't do the right thing if various edges have different types
+                }
                 valid = true;
-                trans_type = this.edges_between(this._state, newStateOrAction)[0].kind; // TODO this won't do the right thing if various edges have different types
                 newState = newStateOrAction;
             }
         }
@@ -854,26 +881,32 @@ class Machine {
                     }
                 }
                 // 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;
+                if (this._has_exit_hooks) {
+                    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) {
-                        if (n_maybe_hook({ from: this._state, to: newState, action: newStateOrAction }) === false) {
-                            return false;
+                if (this._has_named_hooks) {
+                    if (wasAction) {
+                        const nhn = named_hook_name(this._state, newState, newStateOrAction), n_maybe_hook = this._named_hooks.get(nhn);
+                        if (n_maybe_hook !== undefined) {
+                            if (n_maybe_hook({ from: this._state, to: newState, action: newStateOrAction }) === false) {
+                                return false;
+                            }
                         }
                     }
                 }
                 // 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;
+                if (this._has_basic_hooks) {
+                    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;
+                        }
                     }
                 }
                 // 7. edge type hook
@@ -908,10 +941,12 @@ class Machine {
                     }
                 }
                 // 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) {
-                        return false;
+                if (this._has_entry_hooks) {
+                    const maybe_en_hook = this._entry_hooks.get(newState);
+                    if (maybe_en_hook !== undefined) {
+                        if (maybe_en_hook({ to: newState, forced: wasForced }) === false) {
+                            return false;
+                        }
                     }
                 }
                 this._state = newState;

package/dist/es6/jssm_types.d.ts

@@ -164,20 +164,14 @@ declare type HookDescriptionWithAction = {
 };
 declare type StandardTransitionHook = {
     kind: 'standard transition';
-    from: string;
-    to: string;
     handler: HookHandler;
 };
 declare type MainTransitionHook = {
     kind: 'main transition';
-    from: string;
-    to: string;
     handler: HookHandler;
 };
 declare type ForcedTransitionHook = {
     kind: 'forced transition';
-    from: string;
-    to: string;
     handler: HookHandler;
 };
 declare type AnyTransitionHook = {

package/dist/es6/version.js

@@ -1,2 +1,2 @@
-const version = "5.60.3";
+const version = "5.61.2";
 export { version };