mevento 2.0.1 → 2.0.4

package/fesm2020/mevento.mjs

@@ -871,14 +871,16 @@ class Parser {
                 return this._arrayExpression();
             case TokenType.lbrace:
                 return this._objectExpression();
+            case TokenType.IF:
+                return this._ifStatement();
             default:
                 return this._variable();
         }
     }
     _term() {
         let node = this._factor();
-        node = this._tryParsingMemberExpression(node);
         node = this._tryParsingFunctionCall(node);
+        node = this._tryParsingMemberExpression(node);
         return node;
     }
     _expression() {
@@ -1208,8 +1210,8 @@ class Parser {
             case TokenType.eol:
                 this._eatEOL();
                 return this._statement();
-            case TokenType.IF:
-                return this._ifStatement();
+            // case TokenType.IF:
+            //     return this._ifStatement();
             case TokenType.WHILE_TILL:
                 return this._whileLoop();
             case TokenType.FOR_LOOP:
@@ -1535,7 +1537,7 @@ class MEvento extends NodeVisitor {
         if (op.type === TokenType.not) {
             return _boolValue(argValue) === false;
         }
-        if (isNum(argValue)) {
+        if (!isNum(argValue)) {
             throw new Error(`Operation ${op.value} not allowed no num value`);
         }
         if (op.type === TokenType.plus) {
@@ -1746,8 +1748,11 @@ class MEvento extends NodeVisitor {
     unregisterFunction(id) {
         delete this._functionsRegistry[id];
     }
-    execute(source, cache = true) {
+    execute(source, cache = true, input) {
         const module = MEvento.compile(source, cache);
+        if (input) {
+            Object.keys(input).forEach(k => this.changeVariable(k, input[k]));
+        }
         return this.visit(module);
     }
     static compile(source, cache = false) {
@@ -1768,9 +1773,12 @@ class MEvento extends NodeVisitor {
     static unregister(id) {
         delete MEvento._globalFunctionsRegistry[id];
     }
-    static run(source, cache = false) {
+    static run(source, cache = false, input) {
         const mevento = new MEvento();
         const module = MEvento.compile(source, cache);
+        if (input) {
+            Object.keys(input).forEach(k => mevento.changeVariable(k, input[k]));
+        }
         return mevento.visit(module);
     }
     static newInstance() {
@@ -1940,7 +1948,7 @@ class MEventoAsync extends MEvento {
         if (op.type === TokenType.not) {
             return _boolValue(argValue) === false;
         }
-        if (isNum(argValue)) {
+        if (!isNum(argValue)) {
             throw new Error(`Operation ${op.value} not allowed no num value`);
         }
         if (op.type === TokenType.plus) {
@@ -2129,13 +2137,19 @@ class MEventoAsync extends MEvento {
     unregisterFunction(id) {
         delete this._functionsRegistry[id];
     }
-    async execute(source, cache = true) {
+    async execute(source, cache = true, input) {
         const module = MEvento.compile(source, cache);
+        if (input) {
+            Object.keys(input).forEach(k => this.changeVariable(k, input[k]));
+        }
         return await this.visit(module);
     }
-    static async run(source, cache = false) {
+    static async run(source, cache = false, input) {
         const mevento = new MEventoAsync();
         const module = MEvento.compile(source, cache);
+        if (input) {
+            Object.keys(input).forEach(k => mevento.changeVariable(k, input[k]));
+        }
         return await mevento.visit(module);
     }
     static newInstance() {