jssm 5.50.0 → 5.51.0

package/dist/es6/jssm.d.ts

@@ -96,8 +96,8 @@ declare class Machine<mDT> {
     hook(from: string, to: string, handler: HookHandler): Machine<mDT>;
     hook_action(from: string, to: string, action: string, handler: HookHandler): Machine<mDT>;
     hook_any_transition(handler: HookHandler): Machine<mDT>;
-    action(name: StateType, newData?: mDT): boolean;
-    transition_impl(newState: StateType, newData: mDT | undefined, wasForced: boolean, wasAction: boolean): boolean;
+    transition_impl(newStateOrAction: StateType, newData: mDT | undefined, wasForced: boolean, wasAction: boolean): boolean;
+    action(actionName: StateType, newData?: mDT): boolean;
     transition(newState: StateType, newData?: mDT): boolean;
     force_transition(newState: StateType, newData?: mDT): boolean;
     current_action_for(action: StateType): number;

package/dist/es6/jssm.js

@@ -746,53 +746,25 @@ class Machine {
     // remove_hook(HookDesc: HookDescription) {
     //   throw 'TODO: Should remove hook here';
     // }
-    action(name, newData) {
-        // todo whargarbl implement hooks
-        // todo whargarbl implement data stuff
-        // todo major incomplete whargarbl comeback
-        if (this.valid_action(name, newData)) {
-            const edge = this.current_action_edge_for(name);
-            if (this._has_hooks) {
-                let hook_permits = undefined;
-                if (this._any_transition_hook !== undefined) {
-                    if (this._any_transition_hook() === false) {
-                        return false;
-                    }
-                }
-                const nhn = named_hook_name(this._state, edge.to, name), maybe_hook = this._named_hooks.get(nhn);
-                if (maybe_hook === undefined) {
-                    hook_permits = true;
-                }
-                else {
-                    hook_permits = maybe_hook({ from: this._state, to: edge.to, action: name });
-                }
-                if (hook_permits !== false) {
-                    this._state = edge.to;
-                    return true;
-                }
-                else {
-                    return false;
-                }
-            }
-            else {
-                this._state = edge.to;
-                return true;
+    transition_impl(newStateOrAction, newData, wasForced, wasAction) {
+        let valid = false, newState;
+        if (wasForced) {
+            if (this.valid_force_transition(newStateOrAction, newData)) {
+                valid = true;
+                newState = newStateOrAction;
             }
         }
-        else {
-            return false;
-        }
-    }
-    transition_impl(newState, newData, wasForced, wasAction) {
-        let valid = false;
-        if (wasForced) {
-            if (this.valid_force_transition(newState, newData)) {
+        else if (wasAction) {
+            if (this.valid_action(newStateOrAction, newData)) {
+                const edge = this.current_action_edge_for(newStateOrAction);
                 valid = true;
+                newState = edge.to;
             }
         }
         else {
-            if (this.valid_transition(newState, newData)) {
+            if (this.valid_transition(newStateOrAction, newData)) {
                 valid = true;
+                newState = newStateOrAction;
             }
         }
         // todo whargarbl implement data stuff
@@ -805,12 +777,24 @@ class Machine {
                         return false;
                     }
                 }
+                if (wasAction) {
+                    const nhn = named_hook_name(this._state, newState, newStateOrAction), n_maybe_hook = this._named_hooks.get(nhn);
+                    if (n_maybe_hook === undefined) {
+                        hook_permits = true;
+                    }
+                    else {
+                        hook_permits = n_maybe_hook({ from: this._state, to: newState, action: newStateOrAction });
+                    }
+                    if (!(hook_permits)) {
+                        return false;
+                    }
+                }
                 const hn = hook_name(this._state, newState), maybe_hook = this._hooks.get(hn);
                 if (maybe_hook === undefined) {
                     hook_permits = true;
                 }
                 else {
-                    hook_permits = maybe_hook({ from: this._state, to: newState, forced: wasForced });
+                    hook_permits = maybe_hook({ from: this._state, to: newState, forced: wasForced, action: wasAction ? newStateOrAction : undefined });
                 }
                 if (hook_permits !== false) {
                     this._state = newState;
@@ -829,6 +813,9 @@ class Machine {
             return false;
         }
     }
+    action(actionName, newData) {
+        return this.transition_impl(actionName, newData, false, true);
+    }
     transition(newState, newData) {
         return this.transition_impl(newState, newData, false, false);
     }

package/dist/es6/version.js

@@ -1,2 +1,2 @@
-const version = "5.50.0";
+const version = "5.51.0";
 export { version };