tree-sitter-bynk 0.233.2 → 0.239.0

package/grammar.js

@@ -184,12 +184,16 @@ module.exports = grammar({
         $.fn_decl,
         $.messages_decl,
         // Permissive: capability/service/etc. can syntactically appear
-        // anywhere — the LSP reports semantic placement errors.
+        // anywhere — the LSP reports semantic placement errors. Events
+        // track slice 0 (spine #936): `event` follows the same permissive
+        // precedent (`bynk.event.outside_context` rejects it here, at the
+        // checker, not the grammar).
         $.capability_decl,
         $.provider_decl,
         $.service_decl,
         $.agent_decl,
         $.actor_decl,
+        $.event_decl,
       ),
 
     _context_body_item: ($) =>
@@ -205,6 +209,7 @@ module.exports = grammar({
         $.agent_decl,
         $.actor_decl,
         $.messages_decl,
+        $.event_decl,
       ),
 
     // v0.17: adapter items — a binding clause, capabilities, boundary types,
@@ -226,6 +231,7 @@ module.exports = grammar({
         $.agent_decl,
         $.actor_decl,
         $.messages_decl,
+        $.event_decl,
       ),
 
     _test_body_item: ($) =>
@@ -338,6 +344,18 @@ module.exports = grammar({
         optional(seq("=", field("init", $._expression))),
       ),
 
+    // Events track, slice 0 (spine #936): `event Name = { fields }` — a
+    // typed fact a context may emit and other contexts' subscriber services
+    // may receive. Record body only (mirrors `record_type`, not the full
+    // `_type_body` choice — no sum/opaque/refined event shapes).
+    event_decl: ($) =>
+      seq(
+        "event",
+        field("name", $.identifier),
+        "=",
+        field("body", $.record_type),
+      ),
+
     // v0.154 (ADR 0178): a sum body may carry a trailing `embeds E as V, …`
     // clause declaring error embeddings the `?` operator auto-converts.
     // `embeds`/`as` are contextual — matched only in this position.
@@ -573,6 +591,10 @@ module.exports = grammar({
       seq(
         "fn",
         field("name", $.identifier),
+        // #926: optional `[T, …]` type parameters on the op itself — resolved
+        // only from an explicit type argument at the call site (mirroring
+        // `fn_decl`'s own `[A, B]` slot, `grammar.js:525`).
+        optional(seq("[", sep1(field("type_param", $.identifier), ","), "]")),
         "(",
         optional(sep1($.param, ",")),
         optional(","),
@@ -698,6 +720,12 @@ module.exports = grammar({
     // types. `websocket`, `in`, and `out` are contextual (resolved by `word`).
     // #548: `websocket` lowercased to match the other protocol sources (was
     // `WebSocket`).
+    // Events track, slice 0 (spine #936): `from Events(E)`, optionally
+    // filtered by a slice-1 structural pattern, `from Events(E { field:
+    // value, .. })`. `Events`, capitalised, is matched as plain `identifier`
+    // text the same way `websocket` is matched lowercase — it names the
+    // `Events` capability directly, not a built-in type name, so no lexer
+    // reservation.
     service_protocol: ($) =>
       seq(
         "from",
@@ -718,6 +746,47 @@ module.exports = grammar({
             optional(","),
             ")",
           ),
+          seq(
+            "Events",
+            "(",
+            field("event_type", $._type_ref),
+            optional(field("pattern", $.event_pattern)),
+            ")",
+          ),
+        ),
+      ),
+    // Events track, slice 1 (spine #936): the structural delivery filter on
+    // a subscription header. A trailing `..` is mandatory whenever any field
+    // is listed — mirrors the hand-written parser's `bynk.parse.
+    // event_pattern_empty` rejection of `Events(E { })`. `..` is one literal
+    // token here (not two `.`s), keeping this grammar in agreement with the
+    // Rust lexer's dedicated `DotDot` token.
+    event_pattern: ($) =>
+      seq(
+        "{",
+        repeat(seq(field("field", $.event_pattern_field), ",")),
+        "..",
+        "}",
+      ),
+    event_pattern_field: ($) =>
+      seq(
+        field("name", $.identifier),
+        ":",
+        field("value", $.event_pattern_value),
+      ),
+    // A closed set, mirroring `literal_pattern` plus a nullary-variant
+    // reference (`variant_pattern` without a payload list — no nested
+    // sub-patterns in v1). The checker separately rejects a payload-carrying
+    // variant (`bynk.event.pattern_variant_payload`) since the grammar has
+    // no payload-list position here to reject it structurally.
+    event_pattern_value: ($) =>
+      choice(
+        seq(optional("-"), $.number_literal),
+        $.string_literal,
+        $.boolean_literal,
+        seq(
+          optional(seq(field("type", $.identifier), ".")),
+          field("variant", $.identifier),
         ),
       ),
 
@@ -803,6 +872,27 @@ module.exports = grammar({
         // queue-handler shape (the protocol on the service header disambiguates).
         $.ws_open_handler,
         $.ws_close_handler,
+        // Events track, slice 0 (spine #936): a `from Events(E)` service's
+        // one handler.
+        $.event_handler,
+      ),
+    // Events track, slice 0 (spine #936): `on event(e: E) -> Effect[()] { … }`
+    // — a `from Events(E)` subscriber's one handler. Same generic shape as
+    // every other handler form (params/by/given/body all uniform); the
+    // checker verifies the param count/type against the service header.
+    event_handler: ($) =>
+      seq(
+        "on",
+        "event",
+        "(",
+        optional(sep1($.param, ",")),
+        optional(","),
+        ")",
+        "->",
+        field("return_type", $._type_ref),
+        optional(field("by", $.by_clause)),
+        optional(field("given", $.given_clause)),
+        field("body", $.block),
       ),
     call_handler: ($) =>
       seq(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-bynk",
-  "version": "0.233.2",
+  "version": "0.239.0",
   "description": "Tree-sitter grammar for the Bynk DSL (v0–v0.16).",
   "main": "bindings/node",
   "types": "bindings/node",

package/queries/highlights.scm

@@ -23,6 +23,7 @@
   "websocket"
   "schedule"
   "message"
+  "Events"
 ] @keyword
 
 [
@@ -55,6 +56,7 @@
   "requires"
   "ensures"
   "messages"
+  "event"
 ] @keyword.declaration
 
 [
@@ -111,6 +113,12 @@
 
 ; User-defined type names appear in type positions.
 (type_decl name: (identifier) @type)
+; Events track slice 0/1 (spine #936): an `event` declaration names a type,
+; like `type_decl`; the header's `event_type` and a pattern field's
+; qualifier both reference one.
+(event_decl name: (identifier) @type)
+(service_protocol event_type: (identifier) @type)
+(event_pattern_value type: (identifier) @type)
 (opaque_type) @type
 (generic_type_ref arg: (identifier) @type)
 ; v0.157 (ADR 0183): a user generic-type application — the head name and each
@@ -159,6 +167,8 @@
 (field_init name: (identifier) @field)
 (field_init shorthand: (identifier) @field)
 (named_binding field: (identifier) @field)
+; Events track slice 1 (spine #936): a subscription pattern's field name.
+(event_pattern_field name: (identifier) @field)
 
 ; -- Variants & constants --
 
@@ -174,6 +184,13 @@
 ; `positional_binding` capture now that the payload position is a full pattern.
 ((variant_pattern variant: (identifier) @variable)
  (#match? @variable "^[a-z_]"))
+; Events track slice 1 (spine #936): a subscription pattern's variant value
+; (`region: Region.Domestic` / bare `Domestic`) — always a nullary reference
+; (the checker rejects a payload-carrying variant), so unlike
+; `variant_pattern` there is no binding-vs-tag ambiguity; still keyed on
+; capitalisation for consistency with every other variant reference.
+((event_pattern_value variant: (identifier) @constant)
+ (#match? @constant "^[A-Z]"))
 (boolean_literal) @constant.builtin
 
 ; -- Literals --

package/src/grammar.json

@@ -406,6 +406,10 @@
         {
           "type": "SYMBOL",
           "name": "actor_decl"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "event_decl"
         }
       ]
     },
@@ -455,6 +459,10 @@
         {
           "type": "SYMBOL",
           "name": "messages_decl"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "event_decl"
         }
       ]
     },
@@ -508,6 +516,10 @@
         {
           "type": "SYMBOL",
           "name": "messages_decl"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "event_decl"
         }
       ]
     },
@@ -1194,6 +1206,35 @@
         }
       ]
     },
+    "event_decl": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "event"
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "="
+        },
+        {
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "SYMBOL",
+            "name": "record_type"
+          }
+        }
+      ]
+    },
     "sum_type": {
       "type": "PREC_RIGHT",
       "value": 0,
@@ -2373,6 +2414,60 @@
             "name": "identifier"
           }
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "["
+                },
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "FIELD",
+                      "name": "type_param",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "identifier"
+                      }
+                    },
+                    {
+                      "type": "REPEAT",
+                      "content": {
+                        "type": "SEQ",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ","
+                          },
+                          {
+                            "type": "FIELD",
+                            "name": "type_param",
+                            "content": {
+                              "type": "SYMBOL",
+                              "name": "identifier"
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "STRING",
+                  "value": "]"
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "STRING",
           "value": "("
@@ -3116,6 +3211,181 @@
                   "value": ")"
                 }
               ]
+            },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "Events"
+                },
+                {
+                  "type": "STRING",
+                  "value": "("
+                },
+                {
+                  "type": "FIELD",
+                  "name": "event_type",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "_type_ref"
+                  }
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "FIELD",
+                      "name": "pattern",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "event_pattern"
+                      }
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                },
+                {
+                  "type": "STRING",
+                  "value": ")"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "event_pattern": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "FIELD",
+                "name": "field",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "event_pattern_field"
+                }
+              },
+              {
+                "type": "STRING",
+                "value": ","
+              }
+            ]
+          }
+        },
+        {
+          "type": "STRING",
+          "value": ".."
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "event_pattern_field": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": ":"
+        },
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "event_pattern_value"
+          }
+        }
+      ]
+    },
+    "event_pattern_value": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "-"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "SYMBOL",
+              "name": "number_literal"
+            }
+          ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "string_literal"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "boolean_literal"
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "FIELD",
+                      "name": "type",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "identifier"
+                      }
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "."
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "FIELD",
+              "name": "variant",
+              "content": {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
             }
           ]
         }
@@ -3542,6 +3812,128 @@
         {
           "type": "SYMBOL",
           "name": "ws_close_handler"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "event_handler"
+        }
+      ]
+    },
+    "event_handler": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "on"
+        },
+        {
+          "type": "STRING",
+          "value": "event"
+        },
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "param"
+                },
+                {
+                  "type": "REPEAT",
+                  "content": {
+                    "type": "SEQ",
+                    "members": [
+                      {
+                        "type": "STRING",
+                        "value": ","
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "param"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ","
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        },
+        {
+          "type": "STRING",
+          "value": "->"
+        },
+        {
+          "type": "FIELD",
+          "name": "return_type",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_type_ref"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "by",
+              "content": {
+                "type": "SYMBOL",
+                "name": "by_clause"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "given",
+              "content": {
+                "type": "SYMBOL",
+                "name": "given_clause"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "SYMBOL",
+            "name": "block"
+          }
         }
       ]
     },