Merge pull request #2439 from aaron-binary/update-js-interpreter-2.1.0

aaron/JS-Interpreter@^2.1.0

Author: Aaron

package-lock.json

@@ -82,7 +82,7 @@
     "jquery": "^3.4.1",
     "jquery-ui": "1.12.1",
     "jquery-ui-css": "1.11.4",
-    "js-interpreter": "^1.4.6",
+    "js-interpreter": "^2.1.0",
     "json2csv": "^3.11.5",
     "lint-staged": "^8.1.7",
     "loader-utils": "^1.1.0",
@@ -105,6 +105,7 @@
     "@binary-com/smartcharts": "^0.6.1",
     "binary-style": "^0.2.4",
     "blockly": "github:google/blockly#59e5ac6",
+    "clone": "aminmarashi/clone#d97b4f",
     "commander": "^2.20.0",
     "concat-stream": "^2.0.0",
     "core-js": "^2.6.5",

package.json

@@ -1,8 +1,22 @@
+import clone from 'clone';
 import JSInterpreter from 'js-interpreter';
 import { observer as globalObserver } from '../../common/utils/observer';
 import { createScope } from './CliTools';
 import Interface from './Interface';
 
+/* eslint-disable func-names, no-underscore-dangle */
+JSInterpreter.prototype.takeStateSnapshot = function() {
+    const newStateStack = clone(this.stateStack, undefined, undefined, undefined, true);
+    return newStateStack;
+};
+
+JSInterpreter.prototype.restoreStateSnapshot = function(snapshot) {
+    this.stateStack = clone(snapshot, undefined, undefined, undefined, true);
+    this.global = this.stateStack[0].scope;
+    this.initFunc_(this, this.global);
+};
+/* eslint-enable */
+
 const unrecoverableErrors = [
     'InsufficientBalance',
     'CustomLimitsReached',
@@ -55,9 +69,9 @@ export default class Interpreter {
 
             const pseudoBotIf = interpreter.nativeToPseudo(BotIf);
 
-            Object.entries(ticksIf).forEach(([name, f]) =>
-                interpreter.setProperty(pseudoBotIf, name, this.createAsync(interpreter, f))
-            );
+            Object.entries(ticksIf).forEach(([name, f]) => {
+                interpreter.setProperty(pseudoBotIf, name, this.createAsync(interpreter, f));
+            });
 
             interpreter.setProperty(
                 pseudoBotIf,
@@ -168,16 +182,31 @@ export default class Interpreter {
         }
     }
     createAsync(interpreter, func) {
-        return interpreter.createAsyncFunction((...args) => {
+        const asyncFunc = (...args) => {
             const callback = args.pop();
 
-            func(...args.map(arg => interpreter.pseudoToNative(arg)))
+            // Workaround for unknown number of args
+            const reversedArgs = args.slice().reverse();
+            const firsDefinedArgIdx = reversedArgs.findIndex(arg => arg !== undefined);
+
+            // Remove extra undefined args from end of the args
+            const functionArgs = firsDefinedArgIdx < 0 ? [] : reversedArgs.slice(firsDefinedArgIdx).reverse();
+            // End of workaround
+
+            func(...functionArgs.map(arg => interpreter.pseudoToNative(arg)))
                 .then(rv => {
                     callback(interpreter.nativeToPseudo(rv));
                     this.loop();
                 })
                 .catch(e => this.$scope.observer.emit('Error', e));
-        });
+        };
+
+        // TODO: This is a workaround, create issue on original repo, once fixed
+        // remove this. We don't know how many args are going to be passed, so we
+        // assume a max of 100.
+        const MAX_ACCEPTABLE_FUNC_ARGS = 100;
+        Object.defineProperty(asyncFunc, 'length', { value: MAX_ACCEPTABLE_FUNC_ARGS + 1 });
+        return interpreter.createAsyncFunction(asyncFunc);
     }
     hasStarted() {
         return !this.stopped;