mevento 1.9.0 → 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() {
@@ -883,11 +882,14 @@ class Parser {
     _objectProperties() {
         const properties = [];
         if (this.currentToken?.type != TokenType.rbrace) {
+            this._eatEOL();
             properties.push(this._property());
         }
         while (this.currentToken?.type === TokenType.comma) {
             this._eat(TokenType.comma);
+            this._eatEOL();
             properties.push(this._property());
+            this._eatEOL();
         }
         return properties;
     }
@@ -972,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;
@@ -1242,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)) {
@@ -1265,7 +1273,7 @@ class MEventScope {
         this.parent = parent;
     }
     resolve(key) {
-        return Object.keys(this.memory).includes(key) ? this.memory[key] : (this.parent ? this.parent.resolve(key) : null);
+        return Object.keys(this.memory).includes(key) ? this.memory[key] : (this.parent?.resolve(key) ?? null);
     }
     change(key, value, declare = true) {
         if (Object.keys(this.memory).includes(key)) {
@@ -1287,27 +1295,27 @@ class MEvento extends NodeVisitor {
     constructor() {
         super();
         this.rootScope = new MEventScope("Program", {});
-        this.currentScrope = this.rootScope;
+        this.currentScope = this.rootScope;
         this.debug = false;
         this._functionsRegistry = {};
         this._functionsRegistry = { ...MEvento._globalFunctionsRegistry };
     }
     resolve(name) {
-        return this.currentScrope?.resolve(name) ?? null;
+        return this.currentScope?.resolve(name) ?? null;
     }
     changeVariable(name, value) {
-        if (this.currentScrope?.change(name, value)) {
+        if (this.currentScope?.change(name, value)) {
             return value;
         }
         else
             return null;
     }
     pushScope(name) {
-        const scope = new MEventScope(name, {}, this.currentScrope);
-        this.currentScrope = scope;
+        const scope = new MEventScope(name, {}, this.currentScope);
+        this.currentScope = scope;
     }
     popScope() {
-        this.currentScrope = this.currentScrope?.parent;
+        this.currentScope = this.currentScope?.parent;
     }
     log(message) {
         if (this.debug) {
@@ -1337,7 +1345,7 @@ class MEvento extends NodeVisitor {
     }
     visitIdentifierAST(node) {
         const id = node.value;
-        return this.currentScrope?.resolve(id) ?? null;
+        return this?.resolve(id) ?? null;
     }
     visitLiteralAST(node) {
         const value = node.value;
@@ -1486,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];
@@ -1850,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];