tree-sitter-compact 0.2.0 → 0.3.0

package/README.md

@@ -2,6 +2,8 @@
 
 [![CI][ci]](https://github.com/1NickPappas/compact-tree-sitter/actions/workflows/tests.yml)
 [![crates][crates]](https://crates.io/crates/tree-sitter-compact)
+[![npm][npm]](https://www.npmjs.com/package/tree-sitter-compact)
+[![pypi][pypi]](https://pypi.org/project/tree-sitter-compact/)
 
 Compact grammar for [tree-sitter][].
 
@@ -10,17 +12,26 @@ based on the [formal grammar][grammar] published by the Midnight Foundation.
 
 ## Compatibility
 
-This grammar targets Compact **language 0.23.0** and newer (toolchain
-**0.31.1** and newer, runtime **0.16.0**), the version supported on Midnight
-mainnet. Support starts at **0.31.1**: the grammar accepts the language as
-defined by that toolchain and no longer accepts legacy syntax such as top-level
-body-less `circuit` declarations or the old `assert expr "msg";` statement.
-See the [compatibility matrix][support-matrix] for details.
+This grammar is a single **superset** grammar that accepts the Compact language
+across all currently supported toolchains — from **0.31.1** (language 0.23.0,
+runtime 0.16.0), the version on the current Midnight mainnet (ledger 8), through
+**0.35.0** (language 0.27.0, runtime 0.20.0), which targets ledger 9.
 
-| Grammar | Compact language | Compact toolchain |
-|---------|------------------|-------------------|
-| 0.2.x   | 0.23.0           | 0.31.1            |
-| 0.1.x   | 0.23.0           | 0.31.1            |
+Support starts at **0.31.1**: the grammar does not accept legacy syntax such as
+top-level body-less `circuit` declarations or the old `assert expr "msg";`
+statement.
+
+| Grammar | Compact language | Compact toolchain | Runtime         | Ledger |
+|---------|------------------|-------------------|-----------------|--------|
+| 0.3.x   | 0.23.0 – 0.27.0  | 0.31.1 – 0.35.0   | 0.16.0 – 0.20.0 | 8, 9   |
+| 0.2.x   | 0.23.0           | 0.31.1            | 0.16.0          | 8      |
+| 0.1.x   | 0.23.0           | 0.31.1            | 0.16.0          | 8      |
+
+The grammar is version-agnostic: it does **not** evaluate `pragma
+language_version` and accepts the union of supported syntax. Use the Compact
+compiler to enforce the language version; the grammar is intended for parsing,
+highlighting, and editor tooling. See [COMPATIBILITY.md](COMPATIBILITY.md) for
+the full mapping and release/versioning policy.
 
 The grammar follows independent [Semantic Versioning][semver]: the parse tree
 is the public API, so adding nodes or fields is a minor release and breaking
@@ -67,7 +78,7 @@ parser.setLanguage(Compact);
 ```toml
 [dependencies]
 tree-sitter = "0.25"
-tree-sitter-compact = "0.1"
+tree-sitter-compact = "0.3"
 ```
 
 ### Python
@@ -94,3 +105,5 @@ import tree_sitter_compact
 
 [ci]: https://img.shields.io/github/actions/workflow/status/1NickPappas/compact-tree-sitter/tests.yml?logo=github&label=CI
 [crates]: https://img.shields.io/crates/v/tree-sitter-compact?logo=rust
+[npm]: https://img.shields.io/npm/v/tree-sitter-compact?logo=npm
+[pypi]: https://img.shields.io/pypi/v/tree-sitter-compact?logo=pypi&logoColor=ffd242

package/grammar.js

@@ -74,6 +74,7 @@ module.exports = grammar({
     //        →    ecdecl
     //        →    struct
     //        →    enumdef
+    //        →    contract-implements-declaration
     _pelt: ($) =>
       choice(
         $.pragma,
@@ -88,6 +89,7 @@ module.exports = grammar({
         $.ecdecl,
         $.struct,
         $.enumdef,
+        $.contract_implements_declaration,
         $.type_alias_declaration,
       ),
 
@@ -353,6 +355,17 @@ module.exports = grammar({
         field('type', $.type),
       ),
 
+    // Contract-implements-declaration (contract-implements-declaration)
+    //
+    // contract-implements-declaration → contract implements type ;
+    contract_implements_declaration: ($) =>
+      seq(
+        'contract',
+        'implements',
+        field('type', $.type),
+        ';',
+      ),
+
     // Structure-definition (struct)
     //
     // struct →    export^opt struct struct-name gparams^opt { arg ; … ; arg ;^opt } ;^opt
@@ -682,6 +695,7 @@ module.exports = grammar({
         $.slice_term, // Slice with size and range expressions
         $.disclose_term, // Disclose with single expression
         $.assert_term, // Assert with condition and message
+        $.emit_term, // Emit with a single expression
         $.bytes_literal, // Bytes literal with optional spread
         $.struct_term, // Struct literal with type reference
         $.array_literal, // Array literal with optional spread
@@ -697,6 +711,7 @@ module.exports = grammar({
     slice_term: ($) => seq('slice', '<', field('tsize', $.tsize), '>', '(', field('expr', $.expr), ',', field('expr', $.expr), ')'),
     disclose_term: ($) => seq('disclose', '(', field('expr', $.expr), ')'),
     assert_term: ($) => prec(2, seq('assert', '(', field('condition', $.expr), ',', field('message', $.str), ')')),
+    emit_term: ($) => prec(2, seq('emit', '(', field('value', $.expr), ')')),
     array_literal: ($) => seq('[', commaSep(field('element', $.tuple_arg)), ']'),
     bytes_literal: ($) => seq('Bytes', '[', commaSep(field('element', $.tuple_arg)), ']'),
     tuple_arg: ($) => choice($.spread_element, field('expr', $.expr)),
@@ -781,16 +796,19 @@ module.exports = grammar({
 
     // identifier (id, module-name, function-name, struct-name, enum-name, contract-name, tvar-name)
     //
-    // Identifiers have the same syntax as TypeScript identifiers: a Unicode
-    // letter, `_`, or `$`, followed by letters, digits, `_`, or `$`.
-    id: ($) => /[\p{L}_$][\p{L}\p{N}_$]*/,
-    module_name: ($) => /[\p{L}_$][\p{L}\p{N}_$]*/,
-    function_name: ($) => /[\p{L}_$][\p{L}\p{N}_$]*/,
-    struct_name: ($) => /[\p{L}_$][\p{L}\p{N}_$]*/,
-    enum_name: ($) => /[\p{L}_$][\p{L}\p{N}_$]*/,
-    contract_name: ($) => /[\p{L}_$][\p{L}\p{N}_$]*/,
-    tvar_name: ($) => /[\p{L}_$][\p{L}\p{N}_$]*/,
-    type_name: ($) => /[\p{L}_$][\p{L}\p{N}_$]*/,
+    // Matches the compiler's identifier rule, which follows
+    // https://tc39.es/ecma262/#sec-names-and-keywords and
+    // https://www.unicode.org/reports/tr31/#Table_Lexical_Classes_for_Identifiers:
+    // an initial character in Lu, Ll, Lt, Lm, Lo, or Nl (or `_`/`$`), followed by
+    // those plus Mn, Mc, Nd, and Pc.
+    id: ($) => /[\p{L}\p{Nl}_$][\p{L}\p{Nl}\p{Mn}\p{Mc}\p{Nd}\p{Pc}$]*/,
+    module_name: ($) => /[\p{L}\p{Nl}_$][\p{L}\p{Nl}\p{Mn}\p{Mc}\p{Nd}\p{Pc}$]*/,
+    function_name: ($) => /[\p{L}\p{Nl}_$][\p{L}\p{Nl}\p{Mn}\p{Mc}\p{Nd}\p{Pc}$]*/,
+    struct_name: ($) => /[\p{L}\p{Nl}_$][\p{L}\p{Nl}\p{Mn}\p{Mc}\p{Nd}\p{Pc}$]*/,
+    enum_name: ($) => /[\p{L}\p{Nl}_$][\p{L}\p{Nl}\p{Mn}\p{Mc}\p{Nd}\p{Pc}$]*/,
+    contract_name: ($) => /[\p{L}\p{Nl}_$][\p{L}\p{Nl}\p{Mn}\p{Mc}\p{Nd}\p{Pc}$]*/,
+    tvar_name: ($) => /[\p{L}\p{Nl}_$][\p{L}\p{Nl}\p{Mn}\p{Mc}\p{Nd}\p{Pc}$]*/,
+    type_name: ($) => /[\p{L}\p{Nl}_$][\p{L}\p{Nl}\p{Mn}\p{Mc}\p{Nd}\p{Pc}$]*/,
 
     // field-literal (nat)
     //

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-compact",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "A zero-knowledge smart contract programming language",
   "repository": "https://github.com/1NickPappas/compact-tree-sitter",
   "homepage": "https://github.com/1NickPappas/compact-tree-sitter#readme",
@@ -17,9 +17,9 @@
     }
   ],
   "compact": {
-    "language": "0.23.0",
-    "toolchain": "0.31.1",
-    "runtime": "0.16.0"
+    "language": ">=0.23.0 <=0.27.0",
+    "toolchain": ">=0.31.1 <=0.35.0",
+    "runtime": ">=0.16.0 <=0.20.0"
   },
   "main": "bindings/node",
   "types": "bindings/node",

package/queries/highlights.scm

@@ -48,6 +48,8 @@
 "fold" @keyword
 "slice" @keyword
 "disclose" @keyword
+"emit" @keyword
+"implements" @keyword
 "pad" @keyword
 
 ; Operators

package/src/grammar.json

@@ -88,6 +88,10 @@
           "type": "SYMBOL",
           "name": "enumdef"
         },
+        {
+          "type": "SYMBOL",
+          "name": "contract_implements_declaration"
+        },
         {
           "type": "SYMBOL",
           "name": "type_alias_declaration"
@@ -1522,6 +1526,31 @@
         }
       ]
     },
+    "contract_implements_declaration": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "contract"
+        },
+        {
+          "type": "STRING",
+          "value": "implements"
+        },
+        {
+          "type": "FIELD",
+          "name": "type",
+          "content": {
+            "type": "SYMBOL",
+            "name": "type"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": ";"
+        }
+      ]
+    },
     "struct": {
       "type": "SEQ",
       "members": [
@@ -3434,6 +3463,10 @@
           "type": "SYMBOL",
           "name": "assert_term"
         },
+        {
+          "type": "SYMBOL",
+          "name": "emit_term"
+        },
         {
           "type": "SYMBOL",
           "name": "bytes_literal"
@@ -3900,6 +3933,35 @@
         ]
       }
     },
+    "emit_term": {
+      "type": "PREC",
+      "value": 2,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "emit"
+          },
+          {
+            "type": "STRING",
+            "value": "("
+          },
+          {
+            "type": "FIELD",
+            "name": "value",
+            "content": {
+              "type": "SYMBOL",
+              "name": "expr"
+            }
+          },
+          {
+            "type": "STRING",
+            "value": ")"
+          }
+        ]
+      }
+    },
     "array_literal": {
       "type": "SEQ",
       "members": [
@@ -4413,35 +4475,35 @@
     },
     "id": {
       "type": "PATTERN",
-      "value": "[\\p{L}_$][\\p{L}\\p{N}_$]*"
+      "value": "[\\p{L}\\p{Nl}_$][\\p{L}\\p{Nl}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}$]*"
     },
     "module_name": {
       "type": "PATTERN",
-      "value": "[\\p{L}_$][\\p{L}\\p{N}_$]*"
+      "value": "[\\p{L}\\p{Nl}_$][\\p{L}\\p{Nl}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}$]*"
     },
     "function_name": {
       "type": "PATTERN",
-      "value": "[\\p{L}_$][\\p{L}\\p{N}_$]*"
+      "value": "[\\p{L}\\p{Nl}_$][\\p{L}\\p{Nl}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}$]*"
     },
     "struct_name": {
       "type": "PATTERN",
-      "value": "[\\p{L}_$][\\p{L}\\p{N}_$]*"
+      "value": "[\\p{L}\\p{Nl}_$][\\p{L}\\p{Nl}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}$]*"
     },
     "enum_name": {
       "type": "PATTERN",
-      "value": "[\\p{L}_$][\\p{L}\\p{N}_$]*"
+      "value": "[\\p{L}\\p{Nl}_$][\\p{L}\\p{Nl}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}$]*"
     },
     "contract_name": {
       "type": "PATTERN",
-      "value": "[\\p{L}_$][\\p{L}\\p{N}_$]*"
+      "value": "[\\p{L}\\p{Nl}_$][\\p{L}\\p{Nl}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}$]*"
     },
     "tvar_name": {
       "type": "PATTERN",
-      "value": "[\\p{L}_$][\\p{L}\\p{N}_$]*"
+      "value": "[\\p{L}\\p{Nl}_$][\\p{L}\\p{Nl}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}$]*"
     },
     "type_name": {
       "type": "PATTERN",
-      "value": "[\\p{L}_$][\\p{L}\\p{N}_$]*"
+      "value": "[\\p{L}\\p{Nl}_$][\\p{L}\\p{Nl}\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}$]*"
     },
     "nat": {
       "type": "CHOICE",

package/src/node-types.json

@@ -803,6 +803,22 @@
       }
     }
   },
+  {
+    "type": "contract_implements_declaration",
+    "named": true,
+    "fields": {
+      "type": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "type",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "contract_name",
     "named": true,
@@ -922,6 +938,22 @@
       }
     }
   },
+  {
+    "type": "emit_term",
+    "named": true,
+    "fields": {
+      "value": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "expr",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "enum_name",
     "named": true,
@@ -1722,6 +1754,10 @@
             "type": "cdefn",
             "named": true
           },
+          {
+            "type": "contract_implements_declaration",
+            "named": true
+          },
           {
             "type": "ecdecl",
             "named": true
@@ -2441,6 +2477,10 @@
           "type": "cdefn",
           "named": true
         },
+        {
+          "type": "contract_implements_declaration",
+          "named": true
+        },
         {
           "type": "ecdecl",
           "named": true
@@ -2702,6 +2742,10 @@
           "type": "disclose_term",
           "named": true
         },
+        {
+          "type": "emit_term",
+          "named": true
+        },
         {
           "type": "expr_seq_term",
           "named": true
@@ -3179,6 +3223,10 @@
     "type": "else",
     "named": false
   },
+  {
+    "type": "emit",
+    "named": false
+  },
   {
     "type": "enum",
     "named": false
@@ -3215,6 +3263,10 @@
     "type": "if",
     "named": false
   },
+  {
+    "type": "implements",
+    "named": false
+  },
   {
     "type": "import",
     "named": false