@gram-data/tree-sitter-gram 0.2.2 → 0.2.4

package/editors/README.md

@@ -57,8 +57,8 @@ Popular editors we'd love to see integrations for:
 
 All editor integrations should support these Gram language features:
 
-- **Subjects**: `[attributes]` and `[:type attributes]`
-- **Nodes**: `(attributes)`
+- **Subjects**: `[subject]` and `[:type subject]`
+- **Nodes**: `(subject)`
 - **Relationships**: `->`, `--`, `<-`, `<--`, `<->`, `<-->`
 - **Data types**: strings, numbers, booleans, null, arrays, objects
 - **Annotations**: `@key(value)`

package/editors/zed/README.md

@@ -80,7 +80,7 @@ Once installed, the extension automatically provides syntax highlighting for any
 
 The extension provides highlighting for:
 
-- **Subjects**: `[...]` and `[:type ...]` brackets
+- **Brackets**: `[...]` and `[:type ...]` bracket notation (containing subjects)
 - **Nodes**: `(...)` parentheses
 - **Relationships**: `->`, `--`, `<-`, `<-->`, etc.
 - **Strings**: Single, double, and backtick quoted strings

package/editors/zed/extension.toml

@@ -1,6 +1,6 @@
 id = "gram"
 name = "Gram Language Support"
-version = "0.2.1"
+version = "0.2.4"
 schema_version = 1
 authors = ["Gram Data Contributors"]
 description = "Support for Gram notation - a subject-oriented notation for structured data"
@@ -8,4 +8,4 @@ description = "Support for Gram notation - a subject-oriented notation for struc
 # path = "grammars/tree-sitter-gram"
 [grammars.gram]
 repository = "https://github.com/gram-data/tree-sitter-gram"
-rev = "9ea6cc1fb412128bc4197cc717a8e77e907472ec"
+rev = "d6c1b944723c508fde78bc77a39718d6e93e5b8d"

package/editors/zed/languages/gram/highlights.scm

@@ -39,19 +39,16 @@
 ] @punctuation.delimiter
 
 ; Field names in records and maps
-(property key: (symbol) @property)
-(property key: (string_literal) @property)
-(property key: (integer) @property)
-(mapping key: (symbol) @property)
-(mapping key: (string_literal) @property)
-(mapping key: (integer) @property)
+(record_property key: (symbol) @property)
+(record_property key: (string_literal) @property)
+(record_property key: (integer) @property)
+(map_entry key: (symbol) @property)
+(map_entry key: (string_literal) @property)
+(map_entry key: (integer) @property)
 
 ; Annotation keys
 (annotation key: (symbol) @attribute)
 
-; Annotations inside nodes
-(node annotations: (annotations) @attribute)
-
 ; Annotations inside relationship arrows
 [
     (right_arrow annotations: (annotations) @attribute)
@@ -60,14 +57,14 @@
     (bidirectional_arrow annotations: (annotations) @attribute)
 ]
 
-; Subject brackets (special highlighting)
-(subject) @type
+; Bracket notation (special highlighting)
+(subject_pattern) @type
 
 ; Node with labels
-(node (labels (symbol) @type))
+(node_pattern (labels (symbol) @type))
 
 ; Relationship arrows (special highlighting for graph syntax)
-(relationship) @keyword
+(relationship_pattern) @keyword
 
 ; Arrow operators in relationships
 (right_arrow) @operator

package/grammar.js

@@ -7,54 +7,55 @@ module.exports = grammar({
   ],
 
   rules: {
-    gram: ($) => seq(field("root", optional($.record)), repeat($.pattern)),
+    // top-level rule, forming an outer pattern shaped like `[ record | sequence-of-top-level-elements ]`
+    gram: ($) => seq(field("root", optional($.record)), repeat($.annotated_pattern)),
 
-    pattern: ($) =>
+    // top-level elements are annotated patterns shaped like `[annotation-record | pattern-elements]`
+    annotated_pattern: ($) =>
       seq(
         field("annotations", optional($.annotations)),
-        field("elements", commaSep1($._pattern_element)),
+        field("elements", commaSep1($._annotated_pattern_element)),
       ),
-    _pattern_element: ($) => choice($.subject, $._path),
+    _annotated_pattern_element: ($) => choice($.subject_pattern, $._path_pattern),
 
-    subject: ($) =>
+    subject_pattern: ($) =>
       seq(
         "[",
-        field("attributes", optional($._attributes)),
-        field("pattern", optional(seq("|", $.sub_pattern))),
+        field("subject", optional($._subject)),
+        field("elements", optional(seq("|", $.subject_pattern_elements))),
         "]",
       ),
 
-    sub_pattern: ($) => commaSep1($._sub_pattern_element),
+    subject_pattern_elements: ($) => commaSep1($._subject_pattern_element),
 
-    _sub_pattern_element: ($) => choice($.subject, $._path, $.reference),
+    _subject_pattern_element: ($) => choice($.subject_pattern, $._path_pattern, $.pattern_reference),
 
     annotations: ($) => repeat1($.annotation),
 
     annotation: ($) =>
       seq("@", field("key", $.symbol), "(", field("value", $._value), ")"),
 
-    _path: ($) => choice($.relationship, $.node),
+    _path_pattern: ($) => choice($.relationship_pattern, $.node_pattern),
 
-    node: ($) =>
+    node_pattern: ($) =>
       seq(
         "(",
-        field("annotations", optional($.annotations)),
-        field("attributes", optional($._attributes)),
+        field("subject", optional($._subject)),
         ")",
       ),
 
-    relationship: ($) =>
+    relationship_pattern: ($) =>
       seq(
-        field("left", $.node),
+        field("left", $.node_pattern),
         field("kind", $._relationship_kind),
-        field("right", $._path),
+        field("right", $._path_pattern),
       ),
 
-    reference: ($) => field("identifier", $._identifier),
+    pattern_reference: ($) => field("identifier", $._identifier),
 
     _identifier: ($) => choice($.symbol, $.string_literal, $.integer),
 
-    _attributes: ($) =>
+    _subject: ($) =>
       choice(
         choice(
           field("identifier", $._identifier),
@@ -99,18 +100,18 @@ module.exports = grammar({
 
     _label: ($) => seq(choice(":", "::"), $.symbol),
 
-    record: ($) => seq("{", commaSep($.property), "}"),
+    record: ($) => seq("{", commaSep($.record_property), "}"),
 
-    property: ($) =>
+    record_property: ($) =>
       seq(
         field("key", $._identifier),
         choice(":", "::"),
         field("value", $._value),
       ),
 
-    map: ($) => seq("{", commaSep($.mapping), "}"),
+    map: ($) => seq("{", commaSep($.map_entry), "}"),
 
-    mapping: ($) =>
+    map_entry: ($) =>
       seq(field("key", $._identifier), ":", field("value", $._scalar_value)),
 
     symbol: ($) => token(/[a-zA-Z_][0-9a-zA-Z_.\-@]*/),
@@ -230,7 +231,7 @@ module.exports = grammar({
             seq(
               "[",
               field("annotations", optional($.annotations)),
-              field("attributes", optional($._attributes)),
+              field("subject", optional($._subject)),
               "]",
             ),
           ),
@@ -242,7 +243,7 @@ module.exports = grammar({
             seq(
               "[",
               field("annotations", optional($.annotations)),
-              field("attributes", optional($._attributes)),
+              field("subject", optional($._subject)),
               "]",
             ),
           ),
@@ -254,7 +255,7 @@ module.exports = grammar({
             seq(
               "[",
               field("annotations", optional($.annotations)),
-              field("attributes", optional($._attributes)),
+              field("subject", optional($._subject)),
               "]",
             ),
           ),
@@ -270,7 +271,7 @@ module.exports = grammar({
             seq(
               "[",
               field("annotations", optional($.annotations)),
-              field("attributes", optional($._attributes)),
+              field("subject", optional($._subject)),
               "]",
             ),
           ),
@@ -282,7 +283,7 @@ module.exports = grammar({
             seq(
               "[",
               field("annotations", optional($.annotations)),
-              field("attributes", optional($._attributes)),
+              field("subject", optional($._subject)),
               "]",
             ),
           ),
@@ -294,7 +295,7 @@ module.exports = grammar({
             seq(
               "[",
               field("annotations", optional($.annotations)),
-              field("attributes", optional($._attributes)),
+              field("subject", optional($._subject)),
               "]",
             ),
           ),
@@ -310,7 +311,7 @@ module.exports = grammar({
             seq(
               "[",
               field("annotations", optional($.annotations)),
-              field("attributes", optional($._attributes)),
+              field("subject", optional($._subject)),
               "]",
             ),
           ),
@@ -322,7 +323,7 @@ module.exports = grammar({
             seq(
               "[",
               field("annotations", optional($.annotations)),
-              field("attributes", optional($._attributes)),
+              field("subject", optional($._subject)),
               "]",
             ),
           ),
@@ -334,7 +335,7 @@ module.exports = grammar({
             seq(
               "[",
               field("annotations", optional($.annotations)),
-              field("attributes", optional($._attributes)),
+              field("subject", optional($._subject)),
               "]",
             ),
           ),
@@ -350,7 +351,7 @@ module.exports = grammar({
             seq(
               "[",
               field("annotations", optional($.annotations)),
-              field("attributes", optional($._attributes)),
+              field("subject", optional($._subject)),
               "]",
             ),
           ),
@@ -362,7 +363,7 @@ module.exports = grammar({
             seq(
               "[",
               field("annotations", optional($.annotations)),
-              field("attributes", optional($._attributes)),
+              field("subject", optional($._subject)),
               "]",
             ),
           ),
@@ -374,7 +375,7 @@ module.exports = grammar({
             seq(
               "[",
               field("annotations", optional($.annotations)),
-              field("attributes", optional($._attributes)),
+              field("subject", optional($._subject)),
               "]",
             ),
           ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gram-data/tree-sitter-gram",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "subject-oriented notation for structured data",
   "homepage": "https://gram-data.github.io",
   "repository": {

package/queries/highlights.scm

@@ -39,19 +39,16 @@
 ] @punctuation.delimiter
 
 ; Field names in records and maps
-(property key: (symbol) @property)
-(property key: (string_literal) @property)
-(property key: (integer) @property)
-(mapping key: (symbol) @property)
-(mapping key: (string_literal) @property)
-(mapping key: (integer) @property)
+(record_property key: (symbol) @property)
+(record_property key: (string_literal) @property)
+(record_property key: (integer) @property)
+(map_entry key: (symbol) @property)
+(map_entry key: (string_literal) @property)
+(map_entry key: (integer) @property)
 
 ; Annotation keys
 (annotation key: (symbol) @attribute)
 
-; Annotations inside nodes
-(node annotations: (annotations) @attribute)
-
 ; Annotations inside relationship arrows
 [
     (right_arrow annotations: (annotations) @attribute)
@@ -60,14 +57,14 @@
     (bidirectional_arrow annotations: (annotations) @attribute)
 ]
 
-; Subject brackets (special highlighting)
-(subject) @type
+; Bracket notation (special highlighting)
+(subject_pattern) @type
 
 ; Node with labels
-(node (labels (symbol) @type))
+(node_pattern (labels (symbol) @type))
 
 ; Relationship arrows (special highlighting for graph syntax)
-(relationship) @keyword
+(relationship_pattern) @keyword
 
 ; Arrow operators in relationships
 (right_arrow) @operator