tree-sitter-syscript 1.0.0 → 1.0.1

package/grammar.js

@@ -42,20 +42,20 @@ module.exports = grammar({
 		function: $ => seq("fn", $.method),
 		method: $ => seq(field("name", $.identifier), $.param_list, optional(seq(":", choice($.type_signature, "noreturn"))), $.code_block),
 		param_list: $ => seq("(", optional(seq($.parameter, optional(seq(",", $.parameter)))), ")"),
-		parameter: $ => seq(optional("..."), $.identifier, ":", $.type_signature),
+		parameter: $ => seq(optional("..."), field("name", $.identifier), ":", $.type_signature),
 		code_block: $ => seq("{", repeat($.statement), "}"),
 
 		declaration: $ => seq(choice($.let_declaration, $.const_declaration), ";"),
 		let_declaration: $ => seq("let", field("name", $.identifier), ":", field("type", $.type_signature), optional(seq("=", field("value", $.value)))),
 		const_declaration: $ => seq("const", field("name", $.identifier), ":", field("type", $.type_signature), "=", field("value", $.value)),
 
-		statement: $ => choice($.if_statement, $.while_loop, $.for_loop, $.declaration, seq(choice($.return_statement, $.control_flow, $.value), ";")),
+		statement: $ => choice($.if_statement, $.while_loop, $.for_loop, $.declaration, seq(choice($.return_statement, $.control_flow, $.value), ";"), ";"),
 
 		return_statement: $ => seq("return", optional($.value)),
 		control_flow: $ => choice("break", "continue"),
 
 		routine: $ => choice($.code_block, $.statement),
-		if_statement: $ => prec.right(1, seq("if", field("condition", $.parenthesis_enclosed), $.routine, optional(seq("else", $.routine)))),
+		if_statement: $ => prec.right(1, seq("if", field("condition", $.parenthesis_enclosed), field("branch", $.routine), optional(seq("else", field("else_branch", $.routine))))),
 		while_loop: $ => seq("while", field("condition", $.parenthesis_enclosed), $.routine),
 
 		for_loop: $ => seq("for", $.for_loop_def, $.routine),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "tree-sitter-syscript",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"description": "Syscript grammar for tree-sitter",
 	"repository": "https://github.com/tree-sitter/tree-sitter-syscript",
 	"license": "MIT",

package/src/grammar.json

@@ -479,8 +479,12 @@
           ]
         },
         {
-          "type": "SYMBOL",
-          "name": "identifier"
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
         },
         {
           "type": "STRING",
@@ -673,6 +677,10 @@
               "value": ";"
             }
           ]
+        },
+        {
+          "type": "STRING",
+          "value": ";"
         }
       ]
     },
@@ -742,8 +750,12 @@
             }
           },
           {
-            "type": "SYMBOL",
-            "name": "routine"
+            "type": "FIELD",
+            "name": "branch",
+            "content": {
+              "type": "SYMBOL",
+              "name": "routine"
+            }
           },
           {
             "type": "CHOICE",
@@ -756,8 +768,12 @@
                     "value": "else"
                   },
                   {
-                    "type": "SYMBOL",
-                    "name": "routine"
+                    "type": "FIELD",
+                    "name": "else_branch",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "routine"
+                    }
                   }
                 ]
               },

package/src/node-types.json

@@ -331,6 +331,16 @@
     "type": "if_statement",
     "named": true,
     "fields": {
+      "branch": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "routine",
+            "named": true
+          }
+        ]
+      },
       "condition": {
         "multiple": false,
         "required": true,
@@ -340,17 +350,17 @@
             "named": true
           }
         ]
+      },
+      "else_branch": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "routine",
+            "named": true
+          }
+        ]
       }
-    },
-    "children": {
-      "multiple": true,
-      "required": true,
-      "types": [
-        {
-          "type": "routine",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -500,15 +510,22 @@
   {
     "type": "parameter",
     "named": true,
-    "fields": {},
+    "fields": {
+      "name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "identifier",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
-      "multiple": true,
+      "multiple": false,
       "required": true,
       "types": [
-        {
-          "type": "identifier",
-          "named": true
-        },
         {
           "type": "type_signature",
           "named": true
@@ -797,7 +814,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "control_flow",