tree-sitter-bynk 0.492.1 → 0.508.4

package/grammar.js

@@ -270,6 +270,8 @@ module.exports = grammar({
         $.consumes_decl,
         $.env_clause,
         $.stub_clause,
+        $.fixture_decl,
+        $.fn_decl,
         $.case,
         $.property_decl,
       ),
@@ -286,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(","),
               "}",
             ),
@@ -296,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(
@@ -470,6 +483,16 @@ module.exports = grammar({
         field("path", $.string_literal),
       ),
 
+    // #2841: `fixture name = "fixtures/…"` in a suite body — a project file's
+    // text as a `String` constant for the suite's cases. Contextual `fixture`.
+    fixture_decl: ($) =>
+      seq(
+        "fixture",
+        field("name", $.identifier),
+        "=",
+        field("path", $.string_literal),
+      ),
+
     // #2617 (named constants): `const Name: Type = <static expression>` — a
     // named value. Admitted in every body like `embed`; placement
     // (`bynk.resolve.const_outside_context_or_commons`), the name's case
@@ -561,6 +584,7 @@ module.exports = grammar({
         "NonNegative",
         "Positive",
         "NonEmpty",
+        "IsoDate",
       ),
     // 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
@@ -700,6 +724,8 @@ module.exports = grammar({
         ")",
         "->",
         field("return_type", $._type_ref),
+        // #2868: a context function's capabilities, after the return type.
+        optional(field("given", $.given_clause)),
         // Constrained generics slice 0: a method's `where A: Eq` clause bounds
         // a receiver type's parameter.
         optional($.where_clause),
@@ -841,6 +867,9 @@ 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)),
+        // #2858: the optional `json { }` policy, likewise a header-position
+        // `from http` concern restricted by the checker.
+        optional(field("json", $.json_policy)),
         // 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.
@@ -883,6 +912,18 @@ module.exports = grammar({
       ),
     limits_field: ($) =>
       seq(field("name", $.identifier), ":", field("value", $._expression)),
+    // #2858: `json { <name>: <value>, … }`. `json` is a contextual keyword (like
+    // `limits`); the one field name, `options`, is an ordinary identifier matched
+    // by the checker.
+    json_policy: ($) =>
+      seq(
+        "json",
+        "{",
+        repeat(seq($.json_field, optional(","))),
+        "}",
+      ),
+    json_field: ($) =>
+      seq(field("name", $.identifier), ":", field("value", $._expression)),
     // v0.44: `from <protocol>` on the service header.
     // v0.103: `from websocket(in: I, out: O)` binds the inbound/outbound frame
     // types. `websocket`, `in`, and `out` are contextual (resolved by `word`).
@@ -1621,7 +1662,10 @@ module.exports = grammar({
         PREC.expect,
         seq(
           "expect",
-          field("cond", choice($.observation_expr, $.faults_expr, $._expression)),
+          field(
+            "cond",
+            choice($.observation_expr, $.faults_expr, $.snapshot_expr, $._expression),
+          ),
         ),
       ),
 
@@ -1638,6 +1682,18 @@ module.exports = grammar({
         "faults",
       ),
 
+    // #2842: a snapshot claim — `expect <value> matches snapshot "<name>"`
+    // compares the value's canonical JSON with a stored snapshot. `matches` and
+    // `snapshot` are contextual, as `faults` is: an expression is never followed
+    // by a bare identifier, so the words alone decide.
+    snapshot_expr: ($) =>
+      seq(
+        field("value", $._expression),
+        "matches",
+        "snapshot",
+        field("name", $.string_literal),
+      ),
+
     // v0.117: an observation — a `Cap.op` seam reference followed by one of the
     // sugar matchers. `called` / `never` / `once` / `times` / `with` / `before`
     // are contextual (state-lexed as keywords only here; ordinary identifiers
@@ -1959,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.492.1",
+  "version": "0.508.4",
   "description": "Tree-sitter grammar for the Bynk language.",
   "main": "bindings/node",
   "types": "bindings/node",

package/queries/highlights.scm

@@ -46,6 +46,7 @@
   "cors"
   "security"
   "limits"
+  "json"
   "exports"
   "key"
   "suite"
@@ -112,10 +113,17 @@
 ; #2134: the contextual `env` word heading a suite/case `env { … }` clause.
 "env" @keyword
 
+; #2841: the contextual `fixture` word heading a suite `fixture` declaration.
+"fixture" @keyword
+
 ; #1706: the fault-claim word — contextual, like the observation words: the
 ; token exists only inside a `faults_expr`.
 "faults" @keyword.operator
 
+; #2842: the snapshot claim's words — contextual, like `faults`: the tokens exist
+; only inside a `snapshot_expr`.
+(snapshot_expr ["matches" "snapshot"] @keyword.operator)
+
 ; #2640: `par` is contextual (an identifier elsewhere), so it is a keyword only
 ; as the head of a `par_stmt`.
 (par_stmt "par" @keyword)
@@ -243,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

@@ -582,6 +582,14 @@
           "type": "SYMBOL",
           "name": "stub_clause"
         },
+        {
+          "type": "SYMBOL",
+          "name": "fixture_decl"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "fn_decl"
+        },
         {
           "type": "SYMBOL",
           "name": "case"
@@ -661,12 +669,8 @@
                           "type": "SEQ",
                           "members": [
                             {
-                              "type": "FIELD",
-                              "name": "capability",
-                              "content": {
-                                "type": "SYMBOL",
-                                "name": "identifier"
-                              }
+                              "type": "SYMBOL",
+                              "name": "consumes_item"
                             },
                             {
                               "type": "REPEAT",
@@ -678,12 +682,8 @@
                                     "value": ","
                                   },
                                   {
-                                    "type": "FIELD",
-                                    "name": "capability",
-                                    "content": {
-                                      "type": "SYMBOL",
-                                      "name": "identifier"
-                                    }
+                                    "type": "SYMBOL",
+                                    "name": "consumes_item"
                                   }
                                 ]
                               }
@@ -722,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": [
@@ -1693,6 +1731,35 @@
         }
       ]
     },
+    "fixture_decl": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "fixture"
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "="
+        },
+        {
+          "type": "FIELD",
+          "name": "path",
+          "content": {
+            "type": "SYMBOL",
+            "name": "string_literal"
+          }
+        }
+      ]
+    },
     "const_decl": {
       "type": "SEQ",
       "members": [
@@ -2158,6 +2225,10 @@
         {
           "type": "STRING",
           "value": "NonEmpty"
+        },
+        {
+          "type": "STRING",
+          "value": "IsoDate"
         }
       ]
     },
@@ -2784,6 +2855,22 @@
             "name": "_type_ref"
           }
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "given",
+              "content": {
+                "type": "SYMBOL",
+                "name": "given_clause"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "CHOICE",
           "members": [
@@ -3558,6 +3645,22 @@
             }
           ]
         },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "json",
+              "content": {
+                "type": "SYMBOL",
+                "name": "json_policy"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "REPEAT",
           "content": {
@@ -3785,6 +3888,72 @@
         }
       ]
     },
+    "json_policy": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "json"
+        },
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "json_field"
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              }
+            ]
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "json_field": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": ":"
+        },
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_expression"
+          }
+        }
+      ]
+    },
     "service_protocol": {
       "type": "SEQ",
       "members": [
@@ -7667,6 +7836,10 @@
                   "type": "SYMBOL",
                   "name": "faults_expr"
                 },
+                {
+                  "type": "SYMBOL",
+                  "name": "snapshot_expr"
+                },
                 {
                   "type": "SYMBOL",
                   "name": "_expression"
@@ -7710,6 +7883,35 @@
         }
       ]
     },
+    "snapshot_expr": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_expression"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "matches"
+        },
+        {
+          "type": "STRING",
+          "value": "snapshot"
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "string_literal"
+          }
+        }
+      ]
+    },
     "observation_expr": {
       "type": "SEQ",
       "members": [
@@ -9162,6 +9364,15 @@
                   {
                     "type": "SYMBOL",
                     "name": "_contextual_identifier"
+                  },
+                  {
+                    "type": "ALIAS",
+                    "content": {
+                      "type": "STRING",
+                      "value": "_"
+                    },
+                    "named": true,
+                    "value": "wildcard"
                   }
                 ]
               }