tree-sitter-bynk 0.216.1 → 0.220.0

package/grammar.js

@@ -1186,7 +1186,17 @@ module.exports = grammar({
     match_arm: ($) =>
       prec.right(
         seq(
-          field("pattern", $._pattern),
+          // #472: `refined_pattern` is admitted only here — the top-level
+          // pattern of a match arm — not through `_pattern` generally, so it
+          // stays unreachable from `is_expr` and from nested payload
+          // positions (`_pattern_binding`). Both of those sit in
+          // expression-continuable contexts (`&&`, `(`, …) where
+          // `refinement`'s own `&&`-joined predicate list becomes ambiguous
+          // with the surrounding expression grammar; a match arm's pattern is
+          // always followed by a fixed terminator (`if`/`=>`), so no such
+          // ambiguity exists here. This also matches the semantic scope
+          // (v1: no nested/`is`-position refined patterns).
+          field("pattern", choice($._pattern, $.refined_pattern)),
           // v0.145 (ADR 0169): an optional trailing `if <Bool-expr>` guard,
           // between the pattern and `=>`, gating the arm over its bindings. The
           // `if` reuses the existing keyword token (already highlighted).
@@ -1198,9 +1208,31 @@ module.exports = grammar({
           optional(","),
         ),
       ),
+    refined_pattern: ($) =>
+      seq(field("inner", $._pattern), "where", field("predicate", $.refinement)),
 
     _pattern: ($) =>
-      choice($.wildcard_pattern, $.literal_pattern, $.variant_pattern),
+      choice(
+        $.wildcard_pattern,
+        $.literal_pattern,
+        $.variant_pattern,
+        $.or_pattern,
+        $.paren_pattern,
+      ),
+    // #474 §2.3.4: `p₁ | p₂ | … | pₙ` — an or-pattern, left-associative;
+    // matches if any alternative matches. `|` is a pattern-position operator
+    // only — not a valid expression operator, and lexically distinct from
+    // boolean `||` — so there is no ambiguity with the surrounding
+    // `is`/match-arm productions.
+    or_pattern: ($) => prec.left(1, seq($._pattern, "|", $._pattern)),
+    // #474 §2.3.6: parentheses around a pattern are transparent grouping —
+    // `is (Held(...) | Confirmed(...))` — recommended for readability around
+    // an or-pattern but not otherwise meaningful; `is` already greedily
+    // parses one whole pattern, `|`-chain included, with or without them.
+    // #472: also never admits `refined_pattern` inside (mirrors `is_expr` —
+    // a refined pattern can only ever be a match arm's outermost pattern,
+    // never nested, parenthesized, or one alternative of an outer `|`-chain).
+    paren_pattern: ($) => seq("(", $._pattern, ")"),
     wildcard_pattern: () => "_",
     // v0.130 §2.3.4: a literal pattern — an integer (optionally negated), a
     // string, or a boolean. A closed set (ADR 0001); no `Float`, no `()`.

package/package.json

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

package/src/grammar.json

@@ -5696,8 +5696,17 @@
             "type": "FIELD",
             "name": "pattern",
             "content": {
-              "type": "SYMBOL",
-              "name": "_pattern"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "_pattern"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "refined_pattern"
+                }
+              ]
             }
           },
           {
@@ -5752,6 +5761,31 @@
         ]
       }
     },
+    "refined_pattern": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "inner",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_pattern"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "where"
+        },
+        {
+          "type": "FIELD",
+          "name": "predicate",
+          "content": {
+            "type": "SYMBOL",
+            "name": "refinement"
+          }
+        }
+      ]
+    },
     "_pattern": {
       "type": "CHOICE",
       "members": [
@@ -5766,6 +5800,52 @@
         {
           "type": "SYMBOL",
           "name": "variant_pattern"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "or_pattern"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "paren_pattern"
+        }
+      ]
+    },
+    "or_pattern": {
+      "type": "PREC_LEFT",
+      "value": 1,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "_pattern"
+          },
+          {
+            "type": "STRING",
+            "value": "|"
+          },
+          {
+            "type": "SYMBOL",
+            "name": "_pattern"
+          }
+        ]
+      }
+    },
+    "paren_pattern": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "("
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_pattern"
+        },
+        {
+          "type": "STRING",
+          "value": ")"
         }
       ]
     },

package/src/node-types.json

@@ -4419,6 +4419,14 @@
             "type": "literal_pattern",
             "named": true
           },
+          {
+            "type": "or_pattern",
+            "named": true
+          },
+          {
+            "type": "paren_pattern",
+            "named": true
+          },
           {
             "type": "variant_pattern",
             "named": true
@@ -5583,6 +5591,18 @@
             "type": "literal_pattern",
             "named": true
           },
+          {
+            "type": "or_pattern",
+            "named": true
+          },
+          {
+            "type": "paren_pattern",
+            "named": true
+          },
+          {
+            "type": "refined_pattern",
+            "named": true
+          },
           {
             "type": "variant_pattern",
             "named": true
@@ -6075,6 +6095,14 @@
             "type": "literal_pattern",
             "named": true
           },
+          {
+            "type": "or_pattern",
+            "named": true
+          },
+          {
+            "type": "paren_pattern",
+            "named": true
+          },
           {
             "type": "variant_pattern",
             "named": true
@@ -6439,6 +6467,37 @@
       }
     }
   },
+  {
+    "type": "or_pattern",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "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
+        }
+      ]
+    }
+  },
   {
     "type": "param",
     "named": true,
@@ -6624,6 +6683,37 @@
       ]
     }
   },
+  {
+    "type": "paren_pattern",
+    "named": true,
+    "fields": {},
+    "children": {
+      "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
+        }
+      ]
+    }
+  },
   {
     "type": "pred_atom",
     "named": true,
@@ -7437,6 +7527,48 @@
       ]
     }
   },
+  {
+    "type": "refined_pattern",
+    "named": true,
+    "fields": {
+      "inner": {
+        "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
+          }
+        ]
+      },
+      "predicate": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "refinement",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "refined_type",
     "named": true,
@@ -9969,6 +10101,14 @@
           "type": "named_binding",
           "named": true
         },
+        {
+          "type": "or_pattern",
+          "named": true
+        },
+        {
+          "type": "paren_pattern",
+          "named": true
+        },
         {
           "type": "variant_pattern",
           "named": true