@scion-scxml/core-base 1.0.24 → 1.0.26

package/lib/helpers.js

@@ -70,7 +70,8 @@ function initializeModel(rootState, opts){
                     }]
                 },
                 state
-            ]
+            ],
+            modelFnName: state.modelFnName
         };
     }
 
@@ -429,11 +430,13 @@ function getStateWithHigherSourceChildPriority(s1, s2) {
 }
 
 function initializeModelGeneratorFn(modelFn, opts, interpreter){
-    return modelFn.call(interpreter,
+    const model = modelFn.call(interpreter,
         opts._x,
         opts._x._sessionid,
         opts._x._ioprocessors,
         interpreter.isIn.bind(interpreter));
+    model.modelFnName = modelFn.name
+    return model 
 }
 
 function deserializeSerializedConfiguration(serializedConfiguration,idToStateMap){

package/lib/scion-core-base.js

@@ -147,6 +147,7 @@ class BaseInterpreter extends EventEmitter {
     this._isStepping = false;
 
     this._scriptingContext = this.opts.interpreterScriptingContext || (this.opts.InterpreterScriptingContext ? new this.opts.InterpreterScriptingContext(this) : {}); 
+    this._scriptingContext._invokeMap = this.opts._invokeMap || this._scriptingContext._invokeMap;
 
     this.opts.generateSessionid = this.opts.generateSessionid || BaseInterpreter.generateSessionid;
     this.opts.sessionid = this.opts.sessionid || this.opts.generateSessionid();
@@ -1352,10 +1353,15 @@ class InterpreterScriptingContext{
         var timeoutHandle = setTimeout(function(){
           if (event.sendid) delete this._timeoutMap[event.sendid];
           this._timeouts.delete(timeoutOptions);
-          if(this._interpreter.opts.doSend){
-            this._interpreter.opts.doSend(session, event);
+          const parentSessionOpts = this._interpreter.opts.parentSession && this._interpreter.opts.parentSession.opts;
+          const _doSend = this._interpreter.opts.doSend || BaseInterpreter.doSend;
+          const sendAsync = typeof this._interpreter.opts.sendAsync === 'boolean' ?
+            this._interpreter.opts.sendAsync :
+            !!(parentSessionOpts && parentSessionOpts.sendAsync);
+          if(_doSend){
+            _doSend(session, event);
           }else{
-            session[this._interpreter.opts.sendAsync ? 'genAsync' : 'gen'](event);
+            session[sendAsync ? 'genAsync' : 'gen'](event);
           }
         }.bind(this), options.delay || 0);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scion-scxml/core-base",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "Provide BaseInterpreter class and helper functions to modules that implement Statechart interface.",
   "main": "./lib/scion-core-base.js",
   "directories": {
@@ -39,5 +39,5 @@
     "babel-preset-es2015": "^6.9.0",
     "babelify": "^8.0.0"
   },
-  "gitHead": "0838a38c74a63ce40c48168e03c4e783e37c1731"
+  "gitHead": "ce920c0df2cbf1e96b0ebafa658c1019c43f81d7"
 }

package/.git

@@ -1 +0,0 @@
-gitdir: ../../../.git/modules/projects/libraries/core-base