tree-sitter-bynk 0.504.3 → 0.508.4

package/grammar.js

@@ -288,9 +288,12 @@ module.exports = grammar({
             // v0.6: `consumes a.b as Alias`.
             seq("as", field("alias", $.identifier)),
             // v0.17: `consumes a.b { Cap, … }` — selected capabilities.
+            // #2887: an exported type may be renamed, `T as Alias`.
             seq(
               "{",
-              optional(sep1(field("capability", $.identifier), ",")),
+              optional(
+                sep1($.consumes_item, ","),
+              ),
               optional(","),
               "}",
             ),
@@ -298,6 +301,14 @@ module.exports = grammar({
         ),
       ),
 
+    // #2890: one braced item of a selective `consumes`: a name, optionally
+    // renamed with `as`.
+    consumes_item: ($) =>
+      seq(
+        field("name", $.identifier),
+        optional(seq("as", field("alias", $.identifier))),
+      ),
+
     // v0.17: an adapter's binding module + optional npm dependency map.
     binding_decl: ($) =>
       seq(
@@ -2004,7 +2015,10 @@ module.exports = grammar({
     lambda_param: ($) =>
       choice(
         seq(
-          field("name", choice($.identifier, $._contextual_identifier)),
+          field(
+            "name",
+            choice($.identifier, $._contextual_identifier, alias("_", $.wildcard)),
+          ),
           optional(seq(":", field("type", $._type_ref))),
         ),
         field("pattern", alias($._lambda_record_pattern, $.record_pattern)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-bynk",
-  "version": "0.504.3",
+  "version": "0.508.4",
   "description": "Tree-sitter grammar for the Bynk language.",
   "main": "bindings/node",
   "types": "bindings/node",

package/queries/highlights.scm

@@ -251,6 +251,8 @@
 (qualified_name (identifier) @module)
 (uses_decl target: (qualified_name) @module)
 (consumes_decl target: (qualified_name) @module)
+; #2890: the name a `consumes U { T as Alias }` item introduces is a type.
+(consumes_item alias: (identifier) @type)
 (suite_decl target: (qualified_name) @module)
 
 ; -- Operators & punctuation --

package/src/grammar.json

@@ -669,12 +669,8 @@
                           "type": "SEQ",
                           "members": [
                             {
-                              "type": "FIELD",
-                              "name": "capability",
-                              "content": {
-                                "type": "SYMBOL",
-                                "name": "identifier"
-                              }
+                              "type": "SYMBOL",
+                              "name": "consumes_item"
                             },
                             {
                               "type": "REPEAT",
@@ -686,12 +682,8 @@
                                     "value": ","
                                   },
                                   {
-                                    "type": "FIELD",
-                                    "name": "capability",
-                                    "content": {
-                                      "type": "SYMBOL",
-                                      "name": "identifier"
-                                    }
+                                    "type": "SYMBOL",
+                                    "name": "consumes_item"
                                   }
                                 ]
                               }
@@ -730,6 +722,44 @@
         }
       ]
     },
+    "consumes_item": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "as"
+                },
+                {
+                  "type": "FIELD",
+                  "name": "alias",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "identifier"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
     "binding_decl": {
       "type": "SEQ",
       "members": [
@@ -9334,6 +9364,15 @@
                   {
                     "type": "SYMBOL",
                     "name": "_contextual_identifier"
+                  },
+                  {
+                    "type": "ALIAS",
+                    "content": {
+                      "type": "STRING",
+                      "value": "_"
+                    },
+                    "named": true,
+                    "value": "wildcard"
                   }
                 ]
               }

package/src/node-types.json

@@ -2529,8 +2529,34 @@
           }
         ]
       },
-      "capability": {
-        "multiple": true,
+      "target": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "qualified_name",
+            "named": true
+          }
+        ]
+      }
+    },
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "consumes_item",
+          "named": true
+        }
+      ]
+    }
+  },
+  {
+    "type": "consumes_item",
+    "named": true,
+    "fields": {
+      "alias": {
+        "multiple": false,
         "required": false,
         "types": [
           {
@@ -2539,12 +2565,12 @@
           }
         ]
       },
-      "target": {
+      "name": {
         "multiple": false,
         "required": true,
         "types": [
           {
-            "type": "qualified_name",
+            "type": "identifier",
             "named": true
           }
         ]
@@ -6389,6 +6415,10 @@
           {
             "type": "identifier",
             "named": true
+          },
+          {
+            "type": "wildcard",
+            "named": true
           }
         ]
       },