naider 1.17.2 → 1.18.0

package/src/parser.js

@@ -468,6 +468,12 @@ export class Parser {
 
   parseTypedVariable() {
     const varType = this.advance().value;
+    if (this.at(T.LBRACE)) {
+      return this.parseDestructure(varType, false);
+    }
+    if (this.at(T.LBRACKET)) {
+      return this.parseDestructure(varType, false);
+    }
     const name = this.expectIdentLike();
     this.expect(T.ASSIGN);
     const value = this.parseExpression();
@@ -481,12 +487,47 @@ export class Parser {
       node.isMut = true;
       return node;
     }
+    if (this.at(T.LBRACE) || this.at(T.LBRACKET)) {
+      return this.parseDestructure(null, true);
+    }
     const name = this.expectIdentLike();
     this.expect(T.ASSIGN);
     const value = this.parseExpression();
     return new ASTNode('TypedVar', { varType: null, name, value, isMut: true });
   }
 
+  parseDestructure(varType, isMut) {
+    const pattern = this.at(T.LBRACE) ? 'object' : 'array';
+    this.advance(); // { or [
+    const names = [];
+    const endToken = pattern === 'object' ? T.RBRACE : T.RBRACKET;
+    while (!this.at(endToken) && !this.at(T.EOF)) {
+      this.skipWhitespace();
+      if (this.at(endToken)) break;
+      if (this.match(T.SPREAD)) {
+        const name = this.expectIdentLike();
+        names.push({ name, rest: true });
+      } else {
+        const name = this.expectIdentLike();
+        let alias = null;
+        if (this.match(T.COLON)) {
+          alias = this.expectIdentLike();
+        }
+        let defaultValue = null;
+        if (this.match(T.ASSIGN)) {
+          defaultValue = this.parseExpression();
+        }
+        names.push({ name, alias, defaultValue, rest: false });
+      }
+      this.match(T.COMMA);
+      this.skipWhitespace();
+    }
+    this.expect(endToken);
+    this.expect(T.ASSIGN);
+    const value = this.parseExpression();
+    return new ASTNode('Destructure', { pattern, names, value, varType, isMut });
+  }
+
   parseIf() {
     this.advance(); // if
     const condition = this.parseExpression();
@@ -1394,19 +1435,40 @@ export class Parser {
   parseSchema() {
     this.advance(); // schema
     const name = this.expect(T.IDENT).value;
+    let parent = null;
+    if (this.match(T.EXTENDS)) {
+      parent = this.expect(T.IDENT).value;
+    }
     this.expect(T.COLON);
     this.skipNewlines();
     this.expect(T.INDENT);
 
     const fields = [];
+    const methods = [];
+    let init = null;
     this.skipNewlines();
 
     while (!this.at(T.DEDENT) && !this.at(T.EOF)) {
-      fields.push(this.parseSchemaField());
+      if (this.at(T.FN) || this.at(T.FN_ASYNC)) {
+        methods.push(this.parseFunction(this.at(T.FN_ASYNC), false));
+      } else if (this.at(T.IDENT) && this.peek().value === 'init' && this.peek(1).type === T.LPAREN) {
+        this.advance(); // init
+        this.expect(T.LPAREN);
+        const params = this.parseFnParams();
+        this.expect(T.RPAREN);
+        this.expect(T.COLON);
+        const body = this.parseBlock();
+        init = { params, body };
+      } else {
+        fields.push(this.parseSchemaField());
+      }
       this.skipNewlines();
     }
     this.match(T.DEDENT);
 
+    if (parent || methods.length > 0 || init) {
+      return new ASTNode('ClassDecl', { name, parent, fields, methods, init });
+    }
     return new ASTNode('SchemaDecl', { name, fields });
   }
 

package/src/tokens.js

@@ -114,6 +114,10 @@ export const T = {
   SWAP: 'SWAP',
   IS: 'IS',
   ISNT: 'ISNT',
+  EXTENDS: 'EXTENDS',
+
+  // Types (auto)
+  TYPE_AUTO: 'TYPE_AUTO',
 
   // Operators
   ASSIGN: 'ASSIGN',
@@ -256,7 +260,9 @@ export const KEYWORDS = {
   'swap': T.SWAP,
   'is': T.IS,
   'isnt': T.ISNT,
+  'extends': T.EXTENDS,
   'print': T.LOG,
+  'auto': T.TYPE_AUTO,
   'true': T.BOOL,
   'false': T.BOOL,
   'null': T.NULL,
@@ -274,4 +280,5 @@ export const KEYWORDS = {
 export const TYPE_TOKENS = new Set([
   T.TYPE_STR, T.TYPE_INT, T.TYPE_NUM, T.TYPE_BOOL,
   T.TYPE_LIST, T.TYPE_MAP, T.TYPE_ANY, T.TYPE_JSON, T.TYPE_VOID,
+  T.TYPE_AUTO,
 ]);

package/vscode-naide/syntaxes/naide.tmLanguage.json

@@ -79,7 +79,7 @@
       "name": "storage.modifier.naide"
     },
     "types": {
-      "match": "\\b(str|int|num|bool|list|map|any|json|void)\\b",
+      "match": "\\b(str|int|num|bool|list|map|any|json|void|auto)\\b",
       "name": "support.type.naide"
     },
     "keywords-control": {
@@ -91,7 +91,7 @@
       "name": "keyword.other.naide"
     },
     "keywords-declaration": {
-      "match": "\\b(fn|fn\\.async|use|from|as|model|extends|schema|env|db|every|watch|test|assert|queue|job|new|enum|swap)\\b",
+      "match": "\\b(fn|fn\\.async|use|from|as|model|extends|schema|env|db|every|watch|test|assert|queue|job|new|enum|swap|init)\\b",
       "name": "keyword.declaration.naide"
     },
     "keywords-operator": {
@@ -129,7 +129,7 @@
           "name": "support.function.naide"
         },
         {
-          "match": "\\b(ask|sleep|exit|read|write|fetch_json|random|sort|reverse|unique|len|upper|lower|trim|split|join|contains|replace|keys|values|entries|range|abs|round|ceil|floor|sqrt|pow|sum|flat|zip|chunk|str|int|float|json_parse|json_str|now|time|print)\\b(?=\\s*[\\(])",
+          "match": "\\b(ask|sleep|exit|read|write|fetch_json|random|sort|reverse|unique|len|upper|lower|trim|split|join|contains|replace|keys|values|entries|range|abs|round|ceil|floor|sqrt|pow|sum|flat|zip|chunk|str|int|float|json_parse|json_str|now|time|print|map|filter|reduce|find|every|some|foreach)\\b(?=\\s*[\\(])",
           "name": "support.function.naide"
         }
       ]