mevento 1.9.1 → 1.9.5

package/fesm2020/mevento.mjs

@@ -1,5 +1,5 @@
-function error(token) {
-    const text = `Invalid token ${token.type}[${token.value}] at ${token.line}, ${token.col}\n`;
+function error(token, expected) {
+    const text = `Invalid token ${token.type}[${token.value}] at ${token.line}, ${token.col} ${expected ? `: expecting ${expected} token` : ''}\n`;
     throw (text);
 }
 function isNum(value) {
@@ -236,8 +236,7 @@ class Lexer {
             ['\n', '\r', '\u2028', '\u2029'].includes(String.fromCharCode(c));
     }
     _isWhiteSpace(c) {
-        return String.fromCharCode(c).trim() === "" &&
-            String.fromCharCode(c).length > 0;
+        return [' ', '\t'].includes(String.fromCharCode(c));
     }
     _isDigit(c) {
         // tslint:disable-next-line:no-bitwise
@@ -461,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;
@@ -762,7 +761,7 @@ class Parser {
             this.currentToken = this.lexer.nextToken();
         }
         else {
-            error(this.currentToken);
+            error(this.currentToken, type);
         }
     }
     _eatEOL() {
@@ -793,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());
@@ -889,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();
         }
@@ -946,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);
         }
@@ -1216,7 +1222,6 @@ class ANodeVisitor {
     }
     registerVisitor(type, visitor) {
         const methodName = `visit${type.name}`;
-        // console.log('Reg::::::', methodName, type);
         this._nodesVisitors[methodName] = visitor;
     }
 }
@@ -1245,10 +1250,15 @@ class NodeVisitor extends ANodeVisitor {
         this.registerVisitor(ContinueAST, this.visitContinueAST);
     }
     visit(node) {
-        const methodName = `visit${node.constructor.name}`;
-        // const fn = Object.getPrototypeOf(this)[methodName];
-        const fn = this._nodesVisitors[methodName];
-        return fn?.call(this, node);
+        try {
+            const methodName = `visit${node.constructor.name}`;
+            // const fn = Object.getPrototypeOf(this)[methodName];
+            const fn = this._nodesVisitors[methodName];
+            return fn?.call(this, node) ?? null;
+        }
+        catch (error) {
+            return null;
+        }
     }
     assignProperty(owner, property, value) {
         if (Array.isArray(owner)) {
@@ -1476,19 +1486,29 @@ 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;
     }
     visitIndexAccessorAST(node) {
         const ownerNode = node.owner;
         const owner = this.visit(ownerNode);
+        if (owner === null || owner === undefined) {
+            return null;
+        }
         if (typeof owner === 'object') {
             const key = this.visit(node.key);
             return owner[key];
@@ -1560,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");
@@ -1840,19 +1859,29 @@ 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;
     }
     async visitIndexAccessorAST(node) {
         const ownerNode = node.owner;
         const owner = await this.visit(ownerNode);
+        if (owner === null || owner === undefined) {
+            return null;
+        }
         if (typeof owner === 'object') {
             const key = await this.visit(node.key);
             return owner[key];