tree-sitter-bynk 0.512.10 → 0.562.0

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: {
@@ -279,6 +288,8 @@ module.exports = grammar({
         $.env_clause,
         $.stub_clause,
         $.fixture_decl,
+        $.type_decl,
+        $.const_decl,
         $.fn_decl,
         $.case,
         $.property_decl,
@@ -415,6 +426,8 @@ module.exports = grammar({
         "opaque",
         field("base", $._base_type),
         optional(seq("where", field("refinement", $.refinement))),
+        // #2686: `@example(…)` after the refinement.
+        repeat(field("annotation", $.store_annotation)),
       ),
 
     refined_type: ($) =>
@@ -423,6 +436,8 @@ module.exports = grammar({
         seq(
           field("base", $._base_type),
           optional(seq("where", field("refinement", $.refinement))),
+        // #2686: `@example(…)` after the refinement.
+        repeat(field("annotation", $.store_annotation)),
         ),
       ),
 
@@ -436,10 +451,14 @@ 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),
         optional(seq("where", field("refinement", $.refinement))),
+        // #2686: `@example(…)` after the refinement.
+        repeat(field("annotation", $.store_annotation)),
         // v0.11: an optional initial-value expression. Meaningful on agent
         // `store` fields; the checker restricts where it applies.
         optional(seq("=", field("init", $._expression))),
@@ -950,6 +969,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",
             "(",
@@ -1132,7 +1154,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),
       ),
 
@@ -1584,7 +1608,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),
@@ -1598,6 +1624,7 @@ module.exports = grammar({
             ),
           ),
         ),
+        ),
       ),
     // v0.79: `~> expr` — an asynchronous fire-and-forget send (no binder).
     effect_send_stmt: ($) => seq("~>", field("value", $._expression)),
@@ -1995,8 +2022,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
@@ -2004,7 +2032,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.512.10",
+  "version": "0.562.0",
   "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

@@ -586,6 +586,14 @@
           "type": "SYMBOL",
           "name": "fixture_decl"
         },
+        {
+          "type": "SYMBOL",
+          "name": "type_decl"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "const_decl"
+        },
         {
           "type": "SYMBOL",
           "name": "fn_decl"
@@ -1398,6 +1406,17 @@
               "type": "BLANK"
             }
           ]
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "FIELD",
+            "name": "annotation",
+            "content": {
+              "type": "SYMBOL",
+              "name": "store_annotation"
+            }
+          }
         }
       ]
     },
@@ -1439,6 +1458,17 @@
                 "type": "BLANK"
               }
             ]
+          },
+          {
+            "type": "REPEAT",
+            "content": {
+              "type": "FIELD",
+              "name": "annotation",
+              "content": {
+                "type": "SYMBOL",
+                "name": "store_annotation"
+              }
+            }
           }
         ]
       }
@@ -1504,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",
@@ -1549,6 +1590,17 @@
             }
           ]
         },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "FIELD",
+            "name": "annotation",
+            "content": {
+              "type": "SYMBOL",
+              "name": "store_annotation"
+            }
+          }
+        },
         {
           "type": "CHOICE",
           "members": [
@@ -3997,6 +4049,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": [
@@ -4859,8 +4936,17 @@
                   "type": "FIELD",
                   "name": "label",
                   "content": {
-                    "type": "SYMBOL",
-                    "name": "identifier"
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "identifier"
+                      },
+                      {
+                        "type": "SYMBOL",
+                        "name": "_contextual_identifier"
+                      }
+                    ]
                   }
                 },
                 {
@@ -7525,78 +7611,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": {
@@ -9272,6 +9362,10 @@
           {
             "type": "STRING",
             "value": "par"
+          },
+          {
+            "type": "STRING",
+            "value": "by"
           }
         ]
       },
@@ -10897,6 +10991,12 @@
     ],
     [
       "store_field"
+    ],
+    [
+      "let_else_stmt"
+    ],
+    [
+      "effect_let_stmt"
     ]
   ],
   "precedences": [],

package/src/node-types.json

@@ -8618,6 +8618,16 @@
     "type": "opaque_type",
     "named": true,
     "fields": {
+      "annotation": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "store_annotation",
+            "named": true
+          }
+        ]
+      },
       "base": {
         "multiple": false,
         "required": true,
@@ -9448,6 +9458,16 @@
     "type": "record_field",
     "named": true,
     "fields": {
+      "annotation": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "store_annotation",
+            "named": true
+          }
+        ]
+      },
       "init": {
         "multiple": false,
         "required": false,
@@ -9927,6 +9947,16 @@
     "type": "refined_type",
     "named": true,
     "fields": {
+      "annotation": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "store_annotation",
+            "named": true
+          }
+        ]
+      },
       "base": {
         "multiple": false,
         "required": true,
@@ -10577,6 +10607,16 @@
     "type": "service_protocol",
     "named": true,
     "fields": {
+      "address": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "string_literal",
+            "named": true
+          }
+        ]
+      },
       "event_type": {
         "multiple": false,
         "required": false,
@@ -12328,6 +12368,10 @@
           "type": "case",
           "named": true
         },
+        {
+          "type": "const_decl",
+          "named": true
+        },
         {
           "type": "consumes_decl",
           "named": true
@@ -12352,6 +12396,10 @@
           "type": "stub_clause",
           "named": true
         },
+        {
+          "type": "type_decl",
+          "named": true
+        },
         {
           "type": "uses_decl",
           "named": true
@@ -13954,6 +14002,10 @@
     "type": "else",
     "named": false
   },
+  {
+    "type": "email",
+    "named": false
+  },
   {
     "type": "embed",
     "named": false