tree-sitter-bynk 0.243.0 → 0.290.0

package/README.md

@@ -0,0 +1,48 @@
+# tree-sitter-bynk
+
+[![License: MIT OR Apache-2.0](https://img.shields.io/badge/license-MIT%20OR%20Apache--2.0-blue.svg)](#license)
+
+The [tree-sitter](https://tree-sitter.github.io/tree-sitter/) grammar for the
+[Bynk](https://github.com/accuser/bynk) DSL — the source of truth for editor
+syntax highlighting (`queries/highlights.scm`, `injections.scm`) and the
+structural shape [`vscode-bynk`](https://github.com/accuser/bynk/tree/main/vscode-bynk)
+builds on.
+
+This directory is **two things**:
+
+- **The grammar** (`grammar.js`), published to npm as
+  [`tree-sitter-bynk`](https://www.npmjs.com/package/tree-sitter-bynk), with
+  generated Node and Rust bindings (`bindings/`). This is what editors and
+  `vscode-bynk` actually consume.
+- **A Rust crate** (this `Cargo.toml`, wrapping `bindings/rust/`) that exists
+  for exactly one purpose: the cross-parser conformance test
+  (`tests/conformance.rs`), which parses Bynk source with this grammar and
+  diffs the accept/reject decision against the hand-written
+  [`bynk-syntax`](https://crates.io/crates/bynk-syntax) recursive-descent
+  parser — the only guard tying the editor grammar to the compiler's own.
+
+> **Not a published Rust crate.** The Rust binding is `publish = false` and
+> kept off the release workflows' crate list; only the grammar itself ships
+> to npm.
+
+The grammar deliberately stays **permissive** in the places where Bynk's type
+checker would reject a program — semantic rules (type checking,
+exhaustiveness, effect propagation, `given` matching) are left entirely to
+the LSP (`bynk-lsp`), not encoded here.
+
+## Building
+
+```sh
+npm install
+npx tree-sitter generate
+npx tree-sitter test
+```
+
+The Rust binding builds as an ordinary workspace member (`cargo build -p
+tree-sitter-bynk`); `bynk-syntax` does not depend on it, so the conformance
+test's dev-dependency edge is cycle-free.
+
+## License
+
+Licensed under either of [Apache-2.0](https://github.com/accuser/bynk/blob/main/LICENSE-APACHE) or
+[MIT](https://github.com/accuser/bynk/blob/main/LICENSE-MIT) at your option.

package/grammar.js

@@ -74,6 +74,13 @@ module.exports = grammar({
     // whether a matcher (`called`/`never`/`before`) or an ordinary continuation
     // (`(`, an operator, …) follows.
     [$.observation_expr, $._primary],
+    // v0.140: inside `agent_decl`, a `store` field's own trailing
+    // `@annotation`s are the same rule as the handler-position annotation
+    // prefix that can immediately follow the last store field — one token of
+    // `@` lookahead can't tell which one a run of annotations belongs to.
+    // Both parses are equivalent once the next `on`/`store`/handler-body
+    // token is seen, so GLR resolves it rather than the grammar needing to.
+    [$.store_field],
   ],
 
   rules: {
@@ -435,7 +442,16 @@ module.exports = grammar({
         "Positive",
         "NonEmpty",
       ),
-    _pred_arg: ($) => choice($.number_literal, $.float_literal, $.string_literal),
+    // v0.21/v0.142 (ADR 0166): a refinement-bound number may be negated —
+    // `InRange(-1_000, 1_000_000)` — mirroring `parse_signed_num_literal`'s
+    // optional leading `-` (a string argument, `Matches`'s only shape, is
+    // never signed).
+    _pred_arg: ($) =>
+      choice(
+        seq(optional("-"), $.number_literal),
+        seq(optional("-"), $.float_literal),
+        $.string_literal,
+      ),
 
     _base_type: ($) => $.base_type,
     base_type: () =>
@@ -681,7 +697,10 @@ module.exports = grammar({
         // v0.142 (ADR 0166): the optional `limits { }` policy, likewise a
         // header-position `from http` concern restricted by the checker.
         optional(field("limits", $.limits_policy)),
-        repeat($.handler),
+        // v0.140 (ADR 0163): a handler may carry one or more `@name(args)`
+        // annotations (`@cache(maxAge: 5.minutes)`, `@limit(maxBody: …)`) —
+        // the same shape `store_annotation` already gives store fields.
+        repeat(seq(repeat(field("annotation", $.store_annotation)), $.handler)),
         "}",
       ),
     // v0.131: `cors { <name>: <value>, … }`. `cors` is a contextual keyword (like
@@ -757,6 +776,7 @@ module.exports = grammar({
             field("event_type", $._type_ref),
             optional(field("pattern", $.event_pattern)),
             ")",
+            optional(field("schema_dispatch", $.schema_dispatch_clause)),
           ),
         ),
       ),
@@ -773,6 +793,22 @@ module.exports = grammar({
         "..",
         "}",
       ),
+    // Events track, slice 4 (spine #936): dispatch by the envelope's
+    // `schemaVersion`, parallel to the payload pattern above but written
+    // after the closing `)` (matching the design notes' own form) rather
+    // than nested inside it. Nested inside the `Events` choice arm, not a
+    // free-standing clause any protocol could carry — `via` on `http`/
+    // `cron`/`queue`/`websocket` is a syntax error, not a checker
+    // diagnostic. Literal only (v1 of this clause); a range pattern
+    // (`via schema(2..)`) is unbuilt grammar, left to a future slice.
+    schema_dispatch_clause: ($) =>
+      seq(
+        "via",
+        "schema",
+        "(",
+        field("version", seq(optional("-"), $.number_literal)),
+        ")",
+      ),
     event_pattern_field: ($) =>
       seq(
         field("name", $.identifier),
@@ -804,7 +840,13 @@ module.exports = grammar({
         // v0.81 (storage track): the agent's `store` fields (ADR 0108).
         repeat($.store_field),
         repeat(choice($.invariant_decl, $.transition_decl)),
-        repeat($.handler),
+        // v0.140 (ADR 0163): handler-position annotations parse uniformly on
+        // agent handlers too; the checker (not the grammar) restricts which
+        // annotations apply to a non-HTTP handler. Only `on call` is a valid
+        // agent handler (`bynk.parse.handler_in_agent` rejects the rest) —
+        // protocol handlers (HTTP routes, cron, queue, WebSocket, events)
+        // belong on a `service`.
+        repeat(seq(repeat(field("annotation", $.store_annotation)), $.call_handler)),
         "}",
       ),
     // v0.80: an agent invariant — `invariant <name>: <predicate>`. Sits between
@@ -1333,8 +1375,12 @@ module.exports = grammar({
           optional(","),
         ),
       ),
+    // v1 (#472) admits only a wildcard `_` as the refined inner form —
+    // `parse_pattern_where_suffix` rejects anything else with
+    // `bynk.parse.refined_pattern_inner` ("a refined pattern's inner form
+    // must be `_` in this version"); binding a refined value is unbuilt.
     refined_pattern: ($) =>
-      seq(field("inner", $._pattern), "where", field("predicate", $.refinement)),
+      seq(field("inner", $.wildcard_pattern), "where", field("predicate", $.refinement)),
 
     _pattern: ($) =>
       choice(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-bynk",
-  "version": "0.243.0",
+  "version": "0.290.0",
   "description": "Tree-sitter grammar for the Bynk DSL (v0–v0.16).",
   "main": "bindings/node",
   "types": "bindings/node",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "prebuildify": "^6.0.0",
-    "tree-sitter-cli": "^0.26.9"
+    "tree-sitter-cli": "^0.27.0"
   },
   "tree-sitter": [
     {

package/src/grammar.json

@@ -1661,12 +1661,46 @@
       "type": "CHOICE",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "number_literal"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "-"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "SYMBOL",
+              "name": "number_literal"
+            }
+          ]
         },
         {
-          "type": "SYMBOL",
-          "name": "float_literal"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "-"
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            },
+            {
+              "type": "SYMBOL",
+              "name": "float_literal"
+            }
+          ]
         },
         {
           "type": "SYMBOL",
@@ -2907,8 +2941,24 @@
         {
           "type": "REPEAT",
           "content": {
-            "type": "SYMBOL",
-            "name": "handler"
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "REPEAT",
+                "content": {
+                  "type": "FIELD",
+                  "name": "annotation",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "store_annotation"
+                  }
+                }
+              },
+              {
+                "type": "SYMBOL",
+                "name": "handler"
+              }
+            ]
           }
         },
         {
@@ -3261,6 +3311,22 @@
                 {
                   "type": "STRING",
                   "value": ")"
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "FIELD",
+                      "name": "schema_dispatch",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "schema_dispatch_clause"
+                      }
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
                 }
               ]
             }
@@ -3305,6 +3371,52 @@
         }
       ]
     },
+    "schema_dispatch_clause": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "via"
+        },
+        {
+          "type": "STRING",
+          "value": "schema"
+        },
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "FIELD",
+          "name": "version",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": "-"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              },
+              {
+                "type": "SYMBOL",
+                "name": "number_literal"
+              }
+            ]
+          }
+        },
+        {
+          "type": "STRING",
+          "value": ")"
+        }
+      ]
+    },
     "event_pattern_field": {
       "type": "SEQ",
       "members": [
@@ -3455,8 +3567,24 @@
         {
           "type": "REPEAT",
           "content": {
-            "type": "SYMBOL",
-            "name": "handler"
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "REPEAT",
+                "content": {
+                  "type": "FIELD",
+                  "name": "annotation",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "store_annotation"
+                  }
+                }
+              },
+              {
+                "type": "SYMBOL",
+                "name": "call_handler"
+              }
+            ]
           }
         },
         {
@@ -6264,7 +6392,7 @@
           "name": "inner",
           "content": {
             "type": "SYMBOL",
-            "name": "_pattern"
+            "name": "wildcard_pattern"
           }
         },
         {
@@ -8064,6 +8192,9 @@
     [
       "observation_expr",
       "_primary"
+    ],
+    [
+      "store_field"
     ]
   ],
   "precedences": [],

package/src/node-types.json

@@ -287,6 +287,16 @@
     "type": "agent_decl",
     "named": true,
     "fields": {
+      "annotation": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "store_annotation",
+            "named": true
+          }
+        ]
+      },
       "key": {
         "multiple": false,
         "required": true,
@@ -313,7 +323,7 @@
       "required": false,
       "types": [
         {
-          "type": "handler",
+          "type": "call_handler",
           "named": true
         },
         {
@@ -7837,22 +7847,6 @@
         "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "literal_pattern",
-            "named": true
-          },
-          {
-            "type": "or_pattern",
-            "named": true
-          },
-          {
-            "type": "paren_pattern",
-            "named": true
-          },
-          {
-            "type": "variant_pattern",
-            "named": true
-          },
           {
             "type": "wildcard_pattern",
             "named": true
@@ -8062,6 +8056,26 @@
       }
     }
   },
+  {
+    "type": "schema_dispatch_clause",
+    "named": true,
+    "fields": {
+      "version": {
+        "multiple": true,
+        "required": true,
+        "types": [
+          {
+            "type": "-",
+            "named": false
+          },
+          {
+            "type": "number_literal",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "scheme",
     "named": true,
@@ -8287,6 +8301,16 @@
     "type": "service_decl",
     "named": true,
     "fields": {
+      "annotation": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "store_annotation",
+            "named": true
+          }
+        ]
+      },
       "cors": {
         "multiple": false,
         "required": false,
@@ -8494,6 +8518,16 @@
             "named": true
           }
         ]
+      },
+      "schema_dispatch": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "schema_dispatch_clause",
+            "named": true
+          }
+        ]
       }
     }
   },
@@ -11351,6 +11385,10 @@
     "type": "schedule",
     "named": false
   },
+  {
+    "type": "schema",
+    "named": false
+  },
   {
     "type": "security",
     "named": false
@@ -11415,6 +11453,10 @@
     "type": "validation_error_type",
     "named": true
   },
+  {
+    "type": "via",
+    "named": false
+  },
   {
     "type": "websocket",
     "named": false