tree-sitter-bynk 0.525.22 → 0.603.10

package/grammar.js

@@ -102,6 +102,15 @@ module.exports = grammar({
     // 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],
+    // #3191: `by` is contextual. After a statement's value, `by` opens a
+    // call-site actor clause (`let r <- f() by User("bob")`) or is the first
+    // token of the next statement, an ordinary name (`by`, `by.log()`). One
+    // token cannot tell them apart; GLR keeps both, and `call_site_actor`'s
+    // dynamic precedence settles it for the clause. The compiler is the
+    // authority on the contrived one-line layout (it also asks for the actor to
+    // follow on the same line); the grammar has no newline awareness.
+    [$.let_else_stmt],
+    [$.effect_let_stmt],
   ],
 
   rules: {
@@ -442,6 +451,8 @@ module.exports = grammar({
 
     record_field: ($) =>
       seq(
+        // #3343: `@name("…")` before the field, the key it has on a request.
+        repeat(field("annotation", $.store_annotation)),
         field("name", $.identifier),
         ":",
         field("type", $._type_ref),
@@ -807,6 +818,9 @@ module.exports = grammar({
         ")",
         "->",
         field("return_type", $._type_ref),
+        // #3458: internal `@name(arg)` annotations (a first-party typed read's
+        // failure policy); the checker refuses them outside the std library.
+        repeat(field("annotation", $.store_annotation)),
       ),
 
     // message-bundles track, slice 1 (#859): `messages "<tag>" @reference {
@@ -958,6 +972,9 @@ module.exports = grammar({
           "http",
           "cron",
           seq("queue", "(", field("name", $.string_literal), ")"),
+          // #3328: `from email("support@shop.example")` — inbound email.
+          // `email` is contextual, like `websocket`.
+          seq("email", "(", field("address", $.string_literal), ")"),
           seq(
             "websocket",
             "(",
@@ -1140,7 +1157,9 @@ module.exports = grammar({
       ),
     annotation_arg: ($) =>
       seq(
-        optional(seq(field("label", $.identifier), ":")),
+        // #3191: `by:` is a label here (`@indexed(by: f)`), and `by` is also a
+        // contextual identifier a value may start with.
+        optional(seq(field("label", choice($.identifier, $._contextual_identifier)), ":")),
         field("value", $._expression),
       ),
 
@@ -1345,7 +1364,8 @@ module.exports = grammar({
     // The closed, compiler-known scheme set. `None`/`Internal` are zero-crypto;
     // `Bearer` (JWT/HS256), `Signature` (HMAC over the body), and `Oidc`
     // (JWKS/RS256+ES256) are compiler-generated verifiers.
-    scheme: () => choice("None", "Internal", "Bearer", "Signature", "Oidc", "Foreign"),
+    scheme: () =>
+      choice("None", "Internal", "Bearer", "Signature", "Oidc", "Foreign", "SignedCookie"),
     // v0.51: the keyed-args scheme config — `(key = value, …)`. Values are
     // string or integer literals; the checker validates which keys each scheme
     // admits (Bearer: secret; Signature: secret/header/timestamp/tolerance).
@@ -1355,11 +1375,23 @@ module.exports = grammar({
         sep1($.scheme_arg, ","),
         ")",
       ),
+    // #3386: `12.hours` in a scheme config.
+    scheme_duration: ($) => seq($.number_literal, ".", $.identifier),
     scheme_arg: ($) =>
       seq(
         field("key", $.identifier),
         "=",
-        field("value", choice($.string_literal, $.number_literal)),
+        field(
+          "value",
+          choice(
+            $.string_literal,
+            $.number_literal,
+            // #3386: a duration (`ttl = 12.hours`) or a bare variant name
+            // (`sameSite = Lax`).
+            $.scheme_duration,
+            $.identifier,
+          ),
+        ),
       ),
     // v0.45: the handler `by <binder>: <Actor>` clause — sits after the protocol
     // config and before the parameters.
@@ -1592,7 +1624,9 @@ module.exports = grammar({
     // `prec.right` so an immediately-following `(` is taken as the identity
     // argument rather than starting a fresh token sequence.
     call_site_actor: ($) =>
-      prec.right(
+      prec.dynamic(
+        1,
+        prec.right(
         seq(
           "by",
           field("actor", $.identifier),
@@ -1606,6 +1640,7 @@ module.exports = grammar({
             ),
           ),
         ),
+        ),
       ),
     // v0.79: `~> expr` — an asynchronous fire-and-forget send (no binder).
     effect_send_stmt: ($) => seq("~>", field("value", $._expression)),
@@ -2003,8 +2038,9 @@ module.exports = grammar({
         $._contextual_identifier,
       ),
 
-    // `trace`, `advance` and `par` are contextual in the compiler — ordinary
-    // identifiers outside `trace(Cap.op)` / `advance Clock by …`. Here, as
+    // `trace`, `advance`, `par` and `by` are contextual in the compiler — ordinary
+    // identifiers outside `trace(Cap.op)` / `advance Clock by …` / an actor
+    // clause (`by` is a clause word only before the actor it names, #3191). Here, as
     // `word`-shaped literals, they are extracted as keyword tokens, and where an
     // identifier and the keyword are both valid (an expression or statement
     // head) the keyword always wins the lex. Re-admit the keyword token as an
@@ -2012,7 +2048,7 @@ module.exports = grammar({
     // followed by an identifier can only open an `advance_stmt`, and `trace (`
     // is a declared conflict that `trace_expr`'s dynamic precedence settles.
     _contextual_identifier: ($) =>
-      alias(choice("trace", "advance", "par"), $.identifier),
+      alias(choice("trace", "advance", "par", "by"), $.identifier),
 
     // v0.20a: a lambda — `(params) => expr | block`. Conflicts with
     // paren_expr/unit_literal until the `=>` disambiguates (GLR conflict

package/package.json

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

package/queries/highlights.scm

@@ -21,6 +21,7 @@
   "cron"
   "queue"
   "websocket"
+  "email"
   "schedule"
   "message"
   "Events"

package/src/grammar.json

@@ -1534,6 +1534,17 @@
     "record_field": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "FIELD",
+            "name": "annotation",
+            "content": {
+              "type": "SYMBOL",
+              "name": "store_annotation"
+            }
+          }
+        },
         {
           "type": "FIELD",
           "name": "name",
@@ -3309,6 +3320,17 @@
             "type": "SYMBOL",
             "name": "_type_ref"
           }
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "FIELD",
+            "name": "annotation",
+            "content": {
+              "type": "SYMBOL",
+              "name": "store_annotation"
+            }
+          }
         }
       ]
     },
@@ -4038,6 +4060,31 @@
                 }
               ]
             },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "email"
+                },
+                {
+                  "type": "STRING",
+                  "value": "("
+                },
+                {
+                  "type": "FIELD",
+                  "name": "address",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "string_literal"
+                  }
+                },
+                {
+                  "type": "STRING",
+                  "value": ")"
+                }
+              ]
+            },
             {
               "type": "SEQ",
               "members": [
@@ -4900,8 +4947,17 @@
                   "type": "FIELD",
                   "name": "label",
                   "content": {
-                    "type": "SYMBOL",
-                    "name": "identifier"
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "identifier"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "_contextual_identifier"
+                      }
+                    ]
                   }
                 },
                 {
@@ -6180,6 +6236,10 @@
         {
           "type": "STRING",
           "value": "Foreign"
+        },
+        {
+          "type": "STRING",
+          "value": "SignedCookie"
         }
       ]
     },
@@ -6221,6 +6281,23 @@
         }
       ]
     },
+    "scheme_duration": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "number_literal"
+        },
+        {
+          "type": "STRING",
+          "value": "."
+        },
+        {
+          "type": "SYMBOL",
+          "name": "identifier"
+        }
+      ]
+    },
     "scheme_arg": {
       "type": "SEQ",
       "members": [
@@ -6249,6 +6326,14 @@
               {
                 "type": "SYMBOL",
                 "name": "number_literal"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "scheme_duration"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
               }
             ]
           }
@@ -7566,78 +7651,82 @@
       ]
     },
     "call_site_actor": {
-      "type": "PREC_RIGHT",
-      "value": 0,
+      "type": "PREC_DYNAMIC",
+      "value": 1,
       "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "by"
-          },
-          {
-            "type": "FIELD",
-            "name": "actor",
-            "content": {
-              "type": "SYMBOL",
-              "name": "identifier"
-            }
-          },
-          {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": "("
-                  },
-                  {
-                    "type": "FIELD",
-                    "name": "identity",
-                    "content": {
-                      "type": "SYMBOL",
-                      "name": "_expression"
-                    }
-                  },
-                  {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "SEQ",
-                        "members": [
-                          {
-                            "type": "STRING",
-                            "value": ","
-                          },
-                          {
-                            "type": "FIELD",
-                            "name": "claims",
-                            "content": {
-                              "type": "SYMBOL",
-                              "name": "_expression"
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "BLANK"
-                      }
-                    ]
-                  },
-                  {
-                    "type": "STRING",
-                    "value": ")"
-                  }
-                ]
-              },
-              {
-                "type": "BLANK"
+        "type": "PREC_RIGHT",
+        "value": 0,
+        "content": {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": "by"
+            },
+            {
+              "type": "FIELD",
+              "name": "actor",
+              "content": {
+                "type": "SYMBOL",
+                "name": "identifier"
               }
-            ]
-          }
-        ]
+            },
+            {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "("
+                    },
+                    {
+                      "type": "FIELD",
+                      "name": "identity",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "_expression"
+                      }
+                    },
+                    {
+                      "type": "CHOICE",
+                      "members": [
+                        {
+                          "type": "SEQ",
+                          "members": [
+                            {
+                              "type": "STRING",
+                              "value": ","
+                            },
+                            {
+                              "type": "FIELD",
+                              "name": "claims",
+                              "content": {
+                                "type": "SYMBOL",
+                                "name": "_expression"
+                              }
+                            }
+                          ]
+                        },
+                        {
+                          "type": "BLANK"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "STRING",
+                      "value": ")"
+                    }
+                  ]
+                },
+                {
+                  "type": "BLANK"
+                }
+              ]
+            }
+          ]
+        }
       }
     },
     "effect_send_stmt": {
@@ -9313,6 +9402,10 @@
           {
             "type": "STRING",
             "value": "par"
+          },
+          {
+            "type": "STRING",
+            "value": "by"
           }
         ]
       },
@@ -10938,6 +11031,12 @@
     ],
     [
       "store_field"
+    ],
+    [
+      "let_else_stmt"
+    ],
+    [
+      "effect_let_stmt"
     ]
   ],
   "precedences": [],

package/src/node-types.json

@@ -1948,6 +1948,16 @@
     "type": "capability_op",
     "named": true,
     "fields": {
+      "annotation": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "store_annotation",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": true,
@@ -10295,10 +10305,18 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "identifier",
+            "named": true
+          },
           {
             "type": "number_literal",
             "named": true
           },
+          {
+            "type": "scheme_duration",
+            "named": true
+          },
           {
             "type": "string_literal",
             "named": true
@@ -10322,6 +10340,25 @@
       ]
     }
   },
+  {
+    "type": "scheme_duration",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "identifier",
+          "named": true
+        },
+        {
+          "type": "number_literal",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "security_field",
     "named": true,
@@ -10607,6 +10644,16 @@
     "type": "service_protocol",
     "named": true,
     "fields": {
+      "address": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "string_literal",
+            "named": true
+          }
+        ]
+      },
       "event_type": {
         "multiple": false,
         "required": false,
@@ -13822,6 +13869,10 @@
     "type": "Signature",
     "named": false
   },
+  {
+    "type": "SignedCookie",
+    "named": false
+  },
   {
     "type": "Some",
     "named": false
@@ -13992,6 +14043,10 @@
     "type": "else",
     "named": false
   },
+  {
+    "type": "email",
+    "named": false
+  },
   {
     "type": "embed",
     "named": false