tree-sitter-bynk 0.80.0 → 0.97.0

package/grammar.js

@@ -48,7 +48,7 @@ module.exports = grammar({
   word: ($) => $.identifier,
 
   conflicts: ($) => [
-    // `match e { … }` / `if e { … }` / `commit e`: after a bare identifier `e`,
+    // `match e { … }` / `if e { … }`: after a bare identifier `e`,
     // the `{` is ambiguous between opening the match/if body and opening a
     // record construction/spread `e { … }`. Keep all parses alive; the body
     // content (match arms / block statements vs field inits) decides which one
@@ -95,7 +95,7 @@ module.exports = grammar({
       ),
 
     _item_fragment: ($) =>
-      choice($._context_body_item, $.handler, $.state_decl, $.key_decl),
+      choice($._context_body_item, $.handler, $.store_field, $.key_decl),
 
     // The body of a fragment block: statements then an optional tail value,
     // mirroring `block` so multi-statement and bare-expression snippets parse.
@@ -330,7 +330,7 @@ module.exports = grammar({
         field("type", $._type_ref),
         optional(seq("where", field("refinement", $.refinement))),
         // v0.11: an optional initial-value expression. Meaningful on agent
-        // `state` fields; the checker restricts where it applies.
+        // `store` fields; the checker restricts where it applies.
         optional(seq("=", field("init", $._expression))),
       ),
 
@@ -387,7 +387,7 @@ module.exports = grammar({
     _pred_arg: ($) => choice($.number_literal, $.float_literal, $.string_literal),
 
     _base_type: ($) => $.base_type,
-    base_type: () => choice("Int", "String", "Bool", "Float"),
+    base_type: () => choice("Int", "String", "Bool", "Float", "Duration", "Instant"),
 
     _type_ref: ($) =>
       choice(
@@ -550,13 +550,14 @@ module.exports = grammar({
         field("name", $.identifier),
         "{",
         field("key", $.key_decl),
-        field("state", $.state_decl),
+        // v0.81 (storage track): the agent's `store` fields (ADR 0108).
+        repeat($.store_field),
         repeat($.invariant_decl),
         repeat($.handler),
         "}",
       ),
     // v0.80: an agent invariant — `invariant <name>: <predicate>`. Sits between
-    // the state block and the handlers.
+    // the store fields and the handlers.
     invariant_decl: ($) =>
       seq(
         "invariant",
@@ -566,13 +567,40 @@ module.exports = grammar({
       ),
     key_decl: ($) =>
       seq("key", field("name", $.identifier), ":", field("type", $._type_ref)),
-    state_decl: ($) =>
+    // v0.81 (storage track): `store <name>: <Kind>[…] [= init]`. `store` is a
+    // contextual keyword (also a valid identifier — e.g. a `cache.store`
+    // context); the `word` directive resolves it by context.
+    store_field: ($) =>
       seq(
-        "state",
-        "{",
-        optional(sep1($.record_field, ",")),
-        optional(","),
-        "}",
+        "store",
+        field("name", $.identifier),
+        ":",
+        field("kind", $.store_kind),
+        repeat(field("annotation", $.store_annotation)),
+        optional(seq("=", field("init", $._expression))),
+      ),
+    store_kind: ($) =>
+      seq(
+        field("head", $.identifier),
+        optional(seq("[", sep1($._type_ref, ","), "]")),
+      ),
+
+    // v0.85 (storage track; ADR 0111): `@<name>(<args>)` field annotations.
+    // `@` appears only here; the name is an ordinary identifier (the checker
+    // matches the closed registry). An argument is an optional `label:` then a
+    // value expression — `by: orderId`, `5.minutes`.
+    store_annotation: ($) =>
+      seq(
+        "@",
+        field("name", $.identifier),
+        optional(
+          seq("(", optional(sep1($.annotation_arg, ",")), optional(","), ")"),
+        ),
+      ),
+    annotation_arg: ($) =>
+      seq(
+        optional(seq(field("label", $.identifier), ":")),
+        field("value", $._expression),
       ),
 
     // v0.5 `on call`; v0.44 `on GET("path")` / `on schedule("expr")` /
@@ -746,7 +774,7 @@ module.exports = grammar({
         $.let_stmt,
         $.effect_let_stmt,
         $.effect_send_stmt,
-        $.commit_stmt,
+        $.assign_stmt,
         prec(1, $.assert_expr),
       ),
 
@@ -768,7 +796,9 @@ module.exports = grammar({
       ),
     // v0.79: `~> expr` — an asynchronous fire-and-forget send (no binder).
     effect_send_stmt: ($) => seq("~>", field("value", $._expression)),
-    commit_stmt: ($) => seq("commit", field("value", $._expression)),
+    // v0.81 (storage track): `name := expr` — a `Cell` store write.
+    assign_stmt: ($) =>
+      seq(field("target", $.identifier), ":=", field("value", $._expression)),
 
     // A let/effect-let may bind the discard name `_`.
     _binding_name: ($) => choice($.identifier, alias("_", $.wildcard)),

package/package.json

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

package/queries/highlights.scm

@@ -11,7 +11,6 @@
   "let"
   "match"
   "is"
-  "commit"
   "assert"
   "on"
   "given"
@@ -39,7 +38,7 @@
   "provides"
   "service"
   "agent"
-  "state"
+  "store"
   "exports"
   "key"
   "test"
@@ -153,7 +152,7 @@
   "+" "-" "*" "/"
   "==" "!=" "<" "<=" ">" ">="
   "&&" "||" "!"
-  "<-" "~>" "->" "=" "?"
+  "<-" "~>" ":=" "->" "=" "?"
 ] @operator
 
 [

package/src/grammar.json

@@ -60,7 +60,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "state_decl"
+          "name": "store_field"
         },
         {
           "type": "SYMBOL",
@@ -1576,6 +1576,14 @@
         {
           "type": "STRING",
           "value": "Float"
+        },
+        {
+          "type": "STRING",
+          "value": "Duration"
+        },
+        {
+          "type": "STRING",
+          "value": "Instant"
         }
       ]
     },
@@ -2454,11 +2462,10 @@
           }
         },
         {
-          "type": "FIELD",
-          "name": "state",
+          "type": "REPEAT",
           "content": {
             "type": "SYMBOL",
-            "name": "state_decl"
+            "name": "store_field"
           }
         },
         {
@@ -2539,16 +2546,43 @@
         }
       ]
     },
-    "state_decl": {
+    "store_field": {
       "type": "SEQ",
       "members": [
         {
           "type": "STRING",
-          "value": "state"
+          "value": "store"
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
         },
         {
           "type": "STRING",
-          "value": "{"
+          "value": ":"
+        },
+        {
+          "type": "FIELD",
+          "name": "kind",
+          "content": {
+            "type": "SYMBOL",
+            "name": "store_kind"
+          }
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "FIELD",
+            "name": "annotation",
+            "content": {
+              "type": "SYMBOL",
+              "name": "store_annotation"
+            }
+          }
         },
         {
           "type": "CHOICE",
@@ -2557,23 +2591,15 @@
               "type": "SEQ",
               "members": [
                 {
-                  "type": "SYMBOL",
-                  "name": "record_field"
+                  "type": "STRING",
+                  "value": "="
                 },
                 {
-                  "type": "REPEAT",
+                  "type": "FIELD",
+                  "name": "init",
                   "content": {
-                    "type": "SEQ",
-                    "members": [
-                      {
-                        "type": "STRING",
-                        "value": ","
-                      },
-                      {
-                        "type": "SYMBOL",
-                        "name": "record_field"
-                      }
-                    ]
+                    "type": "SYMBOL",
+                    "name": "_expression"
                   }
                 }
               ]
@@ -2582,22 +2608,186 @@
               "type": "BLANK"
             }
           ]
+        }
+      ]
+    },
+    "store_kind": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "head",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
         },
         {
           "type": "CHOICE",
           "members": [
             {
-              "type": "STRING",
-              "value": ","
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "["
+                },
+                {
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "_type_ref"
+                    },
+                    {
+                      "type": "REPEAT",
+                      "content": {
+                        "type": "SEQ",
+                        "members": [
+                          {
+                            "type": "STRING",
+                            "value": ","
+                          },
+                          {
+                            "type": "SYMBOL",
+                            "name": "_type_ref"
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "STRING",
+                  "value": "]"
+                }
+              ]
             },
             {
               "type": "BLANK"
             }
           ]
-        },
+        }
+      ]
+    },
+    "store_annotation": {
+      "type": "SEQ",
+      "members": [
         {
           "type": "STRING",
-          "value": "}"
+          "value": "@"
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "("
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SEQ",
+                      "members": [
+                        {
+                          "type": "SYMBOL",
+                          "name": "annotation_arg"
+                        },
+                        {
+                          "type": "REPEAT",
+                          "content": {
+                            "type": "SEQ",
+                            "members": [
+                              {
+                                "type": "STRING",
+                                "value": ","
+                              },
+                              {
+                                "type": "SYMBOL",
+                                "name": "annotation_arg"
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": ","
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                },
+                {
+                  "type": "STRING",
+                  "value": ")"
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        }
+      ]
+    },
+    "annotation_arg": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "FIELD",
+                  "name": "label",
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "identifier"
+                  }
+                },
+                {
+                  "type": "STRING",
+                  "value": ":"
+                }
+              ]
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
+        {
+          "type": "FIELD",
+          "name": "value",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_expression"
+          }
         }
       ]
     },
@@ -3619,7 +3809,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "commit_stmt"
+          "name": "assign_stmt"
         },
         {
           "type": "PREC",
@@ -3756,12 +3946,20 @@
         }
       ]
     },
-    "commit_stmt": {
+    "assign_stmt": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "FIELD",
+          "name": "target",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
+        },
         {
           "type": "STRING",
-          "value": "commit"
+          "value": ":="
         },
         {
           "type": "FIELD",