mevento 1.9.1 → 1.9.4

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
@@ -762,7 +761,7 @@ class Parser {
             this.currentToken = this.lexer.nextToken();
         }
         else {
-            error(this.currentToken);
+            error(this.currentToken, type);
         }
     }
     _eatEOL() {
@@ -975,6 +974,7 @@ 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;
@@ -1245,10 +1245,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);
+        }
+        catch (error) {
+            return null;
+        }
     }
     assignProperty(owner, property, value) {
         if (Array.isArray(owner)) {
@@ -1489,6 +1494,9 @@ class MEvento extends NodeVisitor {
     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];
@@ -1853,6 +1861,9 @@ class MEventoAsync extends MEvento {
     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];