mevento 1.9.4 → 1.9.6

package/fesm2020/mevento.mjs

@@ -460,7 +460,7 @@ class Lexer {
             if (this._currentChar === Chars.pipe && this._pick() === Chars.pipe) {
                 this._advance();
                 this._advance();
-                return new Token(TokenType.and, '||', lastL, lastC);
+                return new Token(TokenType.or, '||', lastL, lastC);
             }
             if (this._currentChar === Chars.quote || this._currentChar === Chars.squote) {
                 const startChar = this._currentChar;
@@ -792,7 +792,7 @@ class Parser {
             case TokenType.minus:
             case TokenType.not:
                 this._eat(this.currentToken.type);
-                return new UnaryExpressionAST(token, this._factor());
+                return new UnaryExpressionAST(token, this._expression());
             case TokenType.numberConst:
                 this._eat(TokenType.numberConst);
                 return new LiteralAST(token, token.value.toString());
@@ -888,6 +888,9 @@ class Parser {
         while (this.currentToken?.type === TokenType.comma) {
             this._eat(TokenType.comma);
             this._eatEOL();
+            if (this._expect(TokenType.rbrace)) {
+                break;
+            }
             properties.push(this._property());
             this._eatEOL();
         }
@@ -945,6 +948,10 @@ class Parser {
         const result = [expr];
         while (this.currentToken?.type === TokenType.comma) {
             this._eat(TokenType.comma);
+            this._eatEOL();
+            if (this._expect(TokenType.rbracket)) {
+                break;
+            }
             expr = this._expression();
             result.push(expr);
         }
@@ -974,7 +981,6 @@ class Parser {
         const node = this._expression();
         if (![TokenType.semi, TokenType.eol, TokenType.eof]
             .includes(this.currentToken.type)) {
-            console.log('DDDMMMS', this.currentToken);
             error(this.currentToken);
         }
         return node;
@@ -1216,7 +1222,6 @@ class ANodeVisitor {
     }
     registerVisitor(type, visitor) {
         const methodName = `visit${type.name}`;
-        // console.log('Reg::::::', methodName, type);
         this._nodesVisitors[methodName] = visitor;
     }
 }
@@ -1249,7 +1254,7 @@ class NodeVisitor extends ANodeVisitor {
             const methodName = `visit${node.constructor.name}`;
             // const fn = Object.getPrototypeOf(this)[methodName];
             const fn = this._nodesVisitors[methodName];
-            return fn?.call(this, node);
+            return fn?.call(this, node) ?? null;
         }
         catch (error) {
             return null;
@@ -1375,7 +1380,7 @@ class MEvento extends NodeVisitor {
         const callee = node.callee;
         const args = node.arguments;
         const calleeName = callee.value;
-        const fn = this._functionsRegistry[calleeName];
+        const fn = this.resolveFunction(calleeName);
         const argValues = args.map((e) => this.visit(e));
         // print("argValues::", argValues)
         return fn?.(argValues, this);
@@ -1481,13 +1486,20 @@ class MEvento extends NodeVisitor {
     }
     visitLogicalExpressionAST(node) {
         const leftNode = node.left;
-        const test = this.visit(leftNode);
+        let test = this.visit(leftNode);
         const testBoolValue = _boolValue(test);
         if (node.operator.type === TokenType.and) {
-            return testBoolValue && _boolValue(this.visit(node.right));
+            if (!testBoolValue) {
+                return false;
+            }
+            return _boolValue(this.visit(node.right));
         }
         if (node.operator.type === TokenType.or) {
-            return testBoolValue || _boolValue(this.visit(node.right));
+            if (testBoolValue) {
+                return test;
+            }
+            test = this.visit(node.right);
+            return test;
         }
         return false;
     }
@@ -1568,7 +1580,6 @@ class MEvento extends NodeVisitor {
                 if (!isNum(tmp))
                     throw Error("Cant update value");
                 this.changeVariable(loopIdentifier.value, node.direction.type === TokenType.up ? tmp + updateValue : tmp - updateValue);
-                // console.log('Update loop from ' + tmp + ' to ' + this.resolve(loopIdentifier.value))
             }
             else {
                 throw Error("Update value cant be non number");
@@ -1629,6 +1640,12 @@ class MEvento extends NodeVisitor {
             return this.visit(it);
         });
     }
+    setFunctionResolver(resolver) {
+        this._functionResolver = resolver;
+    }
+    resolveFunction(name) {
+        return this._functionsRegistry[name] ?? this._functionResolver?.(name);
+    }
     registerFunction(id, fn) {
         this._functionsRegistry[id] = fn;
     }
@@ -1848,13 +1865,20 @@ class MEventoAsync extends MEvento {
     }
     async visitLogicalExpressionAST(node) {
         const leftNode = node.left;
-        const test = await this.visit(leftNode);
+        let test = await this.visit(leftNode);
         const testBoolValue = _boolValue(test);
         if (node.operator.type === TokenType.and) {
-            return testBoolValue && _boolValue(await this.visit(node.right));
+            if (!testBoolValue) {
+                return false;
+            }
+            return _boolValue(await this.visit(node.right));
         }
         if (node.operator.type === TokenType.or) {
-            return testBoolValue || _boolValue(await this.visit(node.right));
+            if (testBoolValue) {
+                return test;
+            }
+            test = await this.visit(node.right);
+            return test;
         }
         return false;
     }