jssm 5.45.0 → 5.47.0

package/dist/es6/jssm.d.ts

@@ -1,6 +1,6 @@
 declare type StateType = string;
 import { JssmGenericState, JssmGenericConfig, JssmTransition, JssmTransitionList, // JssmTransitionRule,
-JssmMachineInternalState, JssmParseTree, JssmStateDeclaration, JssmArrow, JssmArrowDirection, JssmArrowKind, JssmLayout, FslDirection, FslTheme, HookDescription } from './jssm_types';
+JssmMachineInternalState, JssmParseTree, JssmStateDeclaration, JssmArrow, JssmArrowDirection, JssmArrowKind, JssmLayout, FslDirection, FslTheme, HookDescription, HookHandler } from './jssm_types';
 import { seq, weighted_rand_select, weighted_sample_select, histograph, weighted_histo_key } from './jssm_util';
 import { version } from './version';
 declare function arrow_direction(arrow: JssmArrow): JssmArrowDirection;
@@ -90,6 +90,8 @@ declare class Machine<mDT> {
     state_is_complete(whichState: StateType): boolean;
     has_completes(): boolean;
     set_hook(HookDesc: HookDescription): void;
+    hook(from: string, to: string, handler: HookHandler): Machine<mDT>;
+    hook_action(from: string, to: string, action: string, handler: HookHandler): Machine<mDT>;
     action(name: StateType, newData?: mDT): boolean;
     transition(newState: StateType, newData?: mDT): boolean;
     force_transition(newState: StateType, newData?: mDT): boolean;

package/dist/es6/jssm.js

@@ -2,7 +2,7 @@
 import { reduce as reduce_to_639 } from 'reduce-to-639-1';
 import { seq, weighted_rand_select, weighted_sample_select, histograph, weighted_histo_key, array_box_if_string, hook_name, named_hook_name } from './jssm_util';
 import { parse } from './jssm-dot'; // TODO FIXME WHARGARBL this could be post-typed
-import { version } from './version'; // replaced from package.js in build // TODO FIXME currently broken
+import { version } from './version'; // replaced from package.js in build
 /* eslint-disable complexity */
 function arrow_direction(arrow) {
     switch (String(arrow)) {
@@ -404,7 +404,7 @@ class Machine {
             // set up the action mapping, so that actions can be looked up by origin
             if (tr.action) {
                 // forward mapping first by action name
-                let actionMap = this._actions.get(tr.action); // TODO FIXME ?Map equiv
+                let actionMap = this._actions.get(tr.action);
                 if (!(actionMap)) {
                     actionMap = new Map();
                     this._actions.set(tr.action, actionMap);
@@ -416,7 +416,7 @@ class Machine {
                     actionMap.set(tr.from, thisEdgeId);
                 }
                 // reverse mapping first by state origin name
-                let rActionMap = this._reverse_actions.get(tr.from); // TODO FIXME ?Map equiv
+                let rActionMap = this._reverse_actions.get(tr.from);
                 if (!(rActionMap)) {
                     rActionMap = new Map();
                     this._reverse_actions.set(tr.from, rActionMap);
@@ -720,6 +720,16 @@ class Machine {
                 throw new RangeError(`Unknown hook type ${HookDesc.kind}, should be impossible`);
         }
     }
+    hook(from, to, handler) {
+        // TODO: should this throw if setting the hook fails, or ignore it and continue?
+        this.set_hook({ kind: 'hook', from, to, handler });
+        return this;
+    }
+    hook_action(from, to, action, handler) {
+        // TODO: should this throw if setting the hook fails, or ignore it and continue?
+        this.set_hook({ kind: 'named', from, to, action, handler });
+        return this;
+    }
     // remove_hook(HookDesc: HookDescription) {
     //   throw 'TODO: Should remove hook here';
     // }
@@ -832,13 +842,11 @@ class Machine {
         return this._edges[idx];
     }
     valid_action(action, _newData) {
-        // todo whargarbl implement hooks
         // todo whargarbl implement data stuff
         // todo major incomplete whargarbl comeback
         return this.current_action_for(action) !== undefined;
     }
     valid_transition(newState, _newData) {
-        // todo whargarbl implement hooks
         // todo whargarbl implement data stuff
         // todo major incomplete whargarbl comeback
         const transition_for = this.lookup_transition_for(this.state(), newState);
@@ -851,7 +859,6 @@ class Machine {
         return true;
     }
     valid_force_transition(newState, _newData) {
-        // todo whargarbl implement hooks
         // todo whargarbl implement data stuff
         // todo major incomplete whargarbl comeback
         return (this.lookup_transition_for(this.state(), newState) !== undefined);

package/dist/es6/jssm_types.d.ts

@@ -148,28 +148,29 @@ declare type JssmCompileSeStart<DataType> = {
 };
 declare type JssmParseTree = Array<JssmCompileSeStart<StateType>>;
 declare type JssmParseFunctionType = (string: any) => JssmParseTree;
+declare type HookHandler = Function;
 declare type BasicHookDescription = {
     kind: 'hook';
     from: string;
     to: string;
-    handler: Function;
+    handler: HookHandler;
 };
 declare type HookDescriptionWithAction = {
     kind: 'named';
     from: string;
     to: string;
     action: string;
-    handler: Function;
+    handler: HookHandler;
 };
 declare type EntryHook = {
     kind: 'entry';
     to: string;
-    handler: Function;
+    handler: HookHandler;
 };
 declare type ExitHook = {
     kind: 'exit';
     from: string;
-    handler: Function;
+    handler: HookHandler;
 };
 declare type HookDescription = BasicHookDescription | HookDescriptionWithAction | 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 };
+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.45.0";
+const version = "5.47.0";
 export { version };