@gram-data/tree-sitter-gram 0.3.4 → 0.3.5

package/bindings/node/binding_test.js

@@ -8,30 +8,29 @@ test("can load grammar", () => {
   assert.doesNotThrow(() => parser.setLanguage(require(".")));
 });
 
-test("annotation node kinds: identified_annotation and property_annotation", () => {
+test("parses a simple node pattern", () => {
   const Parser = require("tree-sitter");
   const GramLang = require(".");
   const parser = new Parser();
   parser.setLanguage(GramLang);
 
-  const annotated = (root) => root.child(0) ?? null;
+  const tree = parser.parse("(a)");
+  const pattern = tree.rootNode.child(0);
+  assert(pattern, "root should have a pattern child");
 
-  const withIdentified = parser.parse("@@p (a)");
-  const ap1 = annotated(withIdentified.rootNode);
-  assert(ap1?.type === "annotated_pattern", "root should have annotated_pattern child");
-  const annotations1 = ap1.childForFieldName("annotations");
-  assert(annotations1, "annotations node should exist");
-  const first1 = annotations1.child(0);
-  assert.strictEqual(first1?.type, "identified_annotation", "@@ form should be identified_annotation");
-  assert(first1?.childForFieldName("identifier"), "identified_annotation should have identifier field");
+  // Find the symbol 'a' in the pattern
+  function findSymbol(node, text) {
+    if (node.isNamed && node.type === "symbol" && node.text === text) {
+      return node;
+    }
+    for (let i = 0; i < node.childCount; i++) {
+      const result = findSymbol(node.child(i), text);
+      if (result) return result;
+    }
+    return null;
+  }
 
-  const withProperty = parser.parse("@x(1) ()");
-  const ap2 = annotated(withProperty.rootNode);
-  assert(ap2?.type === "annotated_pattern", "root should have annotated_pattern child");
-  const annotations2 = ap2.childForFieldName("annotations");
-  assert(annotations2, "annotations node should exist");
-  const first2 = annotations2.child(0);
-  assert.strictEqual(first2?.type, "property_annotation", "@ form should be property_annotation");
-  assert(first2?.childForFieldName("key"), "property_annotation should have key field");
-  assert(first2?.childForFieldName("value"), "property_annotation should have value field");
+  const symbol = findSymbol(pattern, "a");
+  assert(symbol, "pattern should contain symbol 'a'");
+  assert.strictEqual(symbol.type, "symbol");
 });

package/editors/zed/extension.toml

@@ -1,6 +1,6 @@
 id = "gram"
 name = "Gram Language Support"
-version = "0.3.4"
+version = "0.3.5"
 schema_version = 1
 authors = ["Gram Data Contributors"]
 description = "Support for Gram notation - composable data patterns"
@@ -8,4 +8,4 @@ description = "Support for Gram notation - composable data patterns"
 # path = "grammars/tree-sitter-gram"
 [grammars.gram]
 repository = "https://github.com/gram-data/tree-sitter-gram"
-rev = "7aee4c203a5c6ea48660ae6d8af849ed90317bed"
+rev = "869488b6bbea325b4c4153a7a6bee97df7931a58"

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

@@ -21,30 +21,48 @@
 ; Reference identifier: pattern_reference (FR-001)
 (pattern_reference identifier: (_) @variable)
 
-; Definition-like identifiers (FR-001): @type
+; Symbols and identifiers (generic; definition/reference/tag captured above)
+(symbol) @variable
+
+; Definition-like identifiers and labels (FR-001): @type
+; These must come AFTER generic symbol rule to take priority
+
+; Labels (symbols and quoted names in labels nodes)
+(labels (symbol) @type)
+(labels (quoted_name) @type)
+
+; Annotation identifiers and labels
+(identified_annotation identifier: (_) @type)
+(identified_annotation labels: (labels (symbol) @type))
+(identified_annotation labels: (labels (quoted_name) @type))
+
+; Subject, node, and relationship pattern definitions (FR-001): @type
 ; subject/node subject is _subject (use wildcard _ as it may be hidden in some runtimes)
 (subject_pattern subject: (_ identifier: (_) @type))
 (subject_pattern subject: (_ labels: (labels (symbol) @type)))
+(subject_pattern subject: (_ labels: (labels (quoted_name) @type)))
 (node_pattern subject: (_ identifier: (_) @type))
 (node_pattern subject: (_ labels: (labels (symbol) @type)))
+(node_pattern subject: (_ labels: (labels (quoted_name) @type)))
 (relationship_pattern left: (node_pattern subject: (_ identifier: (_) @type)))
 (relationship_pattern left: (node_pattern subject: (_ labels: (labels (symbol) @type))))
+(relationship_pattern left: (node_pattern subject: (_ labels: (labels (quoted_name) @type))))
 (relationship_pattern right: (node_pattern subject: (_ identifier: (_) @type)))
 (relationship_pattern right: (node_pattern subject: (_ labels: (labels (symbol) @type))))
+(relationship_pattern right: (node_pattern subject: (_ labels: (labels (quoted_name) @type))))
 ; Arrow kind: subject is inside optional brackets on the arrow
 (relationship_pattern kind: (right_arrow subject: (_ identifier: (_) @type)))
 (relationship_pattern kind: (right_arrow subject: (_ labels: (labels (symbol) @type))))
+(relationship_pattern kind: (right_arrow subject: (_ labels: (labels (quoted_name) @type))))
 (relationship_pattern kind: (left_arrow subject: (_ identifier: (_) @type)))
 (relationship_pattern kind: (left_arrow subject: (_ labels: (labels (symbol) @type))))
+(relationship_pattern kind: (left_arrow subject: (_ labels: (labels (quoted_name) @type))))
 (relationship_pattern kind: (undirected_arrow subject: (_ identifier: (_) @type)))
 (relationship_pattern kind: (undirected_arrow subject: (_ labels: (labels (symbol) @type))))
+(relationship_pattern kind: (undirected_arrow subject: (_ labels: (labels (quoted_name) @type))))
 (relationship_pattern kind: (bidirectional_arrow subject: (_ identifier: (_) @type)))
 (relationship_pattern kind: (bidirectional_arrow subject: (_ labels: (labels (symbol) @type))))
-(identified_annotation identifier: (_) @type)
-(identified_annotation labels: (labels (symbol) @type))
-
-; Symbols and identifiers (generic; definition/reference/tag captured above)
-(symbol) @variable
+(relationship_pattern kind: (bidirectional_arrow subject: (_ labels: (labels (quoted_name) @type))))
 
 ; Keywords and operators
 [
@@ -71,11 +89,11 @@
 
 ; Field names in records and maps
 (record_property key: (symbol) @property)
-(record_property key: (string_literal) @property)
-(record_property key: (integer) @property)
+(record_property key: (quoted_name) @property)
+(record_property key: (double_quoted_name) @property)
 (map_entry key: (symbol) @property)
-(map_entry key: (string_literal) @property)
-(map_entry key: (integer) @property)
+(map_entry key: (quoted_name) @property)
+(map_entry key: (double_quoted_name) @property)
 
 ; Annotation keys (property-style) and headers (identified/label-style)
 (property_annotation key: (symbol) @attribute)

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

@@ -7,22 +7,31 @@
 ; Definitions: identifiers that define a pattern or annotation
 (subject_pattern subject: (_ identifier: (_) @local.definition))
 (subject_pattern subject: (_ labels: (labels (symbol) @local.definition)))
+(subject_pattern subject: (_ labels: (labels (quoted_name) @local.definition)))
 (node_pattern subject: (_ identifier: (_) @local.definition))
 (node_pattern subject: (_ labels: (labels (symbol) @local.definition)))
+(node_pattern subject: (_ labels: (labels (quoted_name) @local.definition)))
 (relationship_pattern left: (node_pattern subject: (_ identifier: (_) @local.definition)))
 (relationship_pattern left: (node_pattern subject: (_ labels: (labels (symbol) @local.definition))))
+(relationship_pattern left: (node_pattern subject: (_ labels: (labels (quoted_name) @local.definition))))
 (relationship_pattern right: (node_pattern subject: (_ identifier: (_) @local.definition)))
 (relationship_pattern right: (node_pattern subject: (_ labels: (labels (symbol) @local.definition))))
+(relationship_pattern right: (node_pattern subject: (_ labels: (labels (quoted_name) @local.definition))))
 (relationship_pattern kind: (right_arrow subject: (_ identifier: (_) @local.definition)))
 (relationship_pattern kind: (right_arrow subject: (_ labels: (labels (symbol) @local.definition))))
+(relationship_pattern kind: (right_arrow subject: (_ labels: (labels (quoted_name) @local.definition))))
 (relationship_pattern kind: (left_arrow subject: (_ identifier: (_) @local.definition)))
 (relationship_pattern kind: (left_arrow subject: (_ labels: (labels (symbol) @local.definition))))
+(relationship_pattern kind: (left_arrow subject: (_ labels: (labels (quoted_name) @local.definition))))
 (relationship_pattern kind: (undirected_arrow subject: (_ identifier: (_) @local.definition)))
 (relationship_pattern kind: (undirected_arrow subject: (_ labels: (labels (symbol) @local.definition))))
+(relationship_pattern kind: (undirected_arrow subject: (_ labels: (labels (quoted_name) @local.definition))))
 (relationship_pattern kind: (bidirectional_arrow subject: (_ identifier: (_) @local.definition)))
 (relationship_pattern kind: (bidirectional_arrow subject: (_ labels: (labels (symbol) @local.definition))))
+(relationship_pattern kind: (bidirectional_arrow subject: (_ labels: (labels (quoted_name) @local.definition))))
 (identified_annotation identifier: (_) @local.definition)
 (identified_annotation labels: (labels (symbol) @local.definition))
+(identified_annotation labels: (labels (quoted_name) @local.definition))
 
 ; References: pattern_reference identifier
 (pattern_reference identifier: (_) @local.reference)

package/grammar.js

@@ -69,7 +69,7 @@ module.exports = grammar({
 
     pattern_reference: ($) => field("identifier", $._identifier),
 
-    _identifier: ($) => choice($.symbol, $.string_literal, $.integer),
+    _identifier: ($) => choice($.symbol, $.quoted_name, $.integer),
 
     _subject: ($) =>
       choice(
@@ -114,13 +114,13 @@ module.exports = grammar({
 
     labels: ($) => repeat1($._label),
 
-    _label: ($) => seq(choice(":", "::"), $.symbol),
+    _label: ($) => seq(choice(":", "::"), choice($.symbol, $.quoted_name)),
 
     record: ($) => seq("{", commaSep($.record_property), "}"),
 
     record_property: ($) =>
       seq(
-        field("key", $._identifier),
+        field("key", $._key_name),
         choice(":", "::"),
         field("value", $._value),
       ),
@@ -128,7 +128,7 @@ module.exports = grammar({
     map: ($) => seq("{", commaSep($.map_entry), "}"),
 
     map_entry: ($) =>
-      seq(field("key", $._identifier), ":", field("value", $._scalar_value)),
+      seq(field("key", $._key_name), ":", field("value", $._scalar_value)),
 
     symbol: ($) => token(/[a-zA-Z_][0-9a-zA-Z_.\-@]*/),
 
@@ -174,6 +174,15 @@ module.exports = grammar({
       return token(measurement);
     },
 
+    quoted_name: ($) =>
+      delimit_string(alias($._backticked_text, $.string_content), "`"),
+
+    double_quoted_name: ($) =>
+      delimit_string(alias($._double_quoted_text, $.string_content), '"'),
+
+    _key_name: ($) =>
+      choice($.symbol, $.quoted_name, $.double_quoted_name),
+
     string_literal: ($) =>
       choice(
         $._single_quoted_string,

package/package.json

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

package/queries/highlights.scm

@@ -21,30 +21,48 @@
 ; Reference identifier: pattern_reference (FR-001)
 (pattern_reference identifier: (_) @variable)
 
-; Definition-like identifiers (FR-001): @type
+; Symbols and identifiers (generic; definition/reference/tag captured above)
+(symbol) @variable
+
+; Definition-like identifiers and labels (FR-001): @type
+; These must come AFTER generic symbol rule to take priority
+
+; Labels (symbols and quoted names in labels nodes)
+(labels (symbol) @type)
+(labels (quoted_name) @type)
+
+; Annotation identifiers and labels
+(identified_annotation identifier: (_) @type)
+(identified_annotation labels: (labels (symbol) @type))
+(identified_annotation labels: (labels (quoted_name) @type))
+
+; Subject, node, and relationship pattern definitions (FR-001): @type
 ; subject/node subject is _subject (use wildcard _ as it may be hidden in some runtimes)
 (subject_pattern subject: (_ identifier: (_) @type))
 (subject_pattern subject: (_ labels: (labels (symbol) @type)))
+(subject_pattern subject: (_ labels: (labels (quoted_name) @type)))
 (node_pattern subject: (_ identifier: (_) @type))
 (node_pattern subject: (_ labels: (labels (symbol) @type)))
+(node_pattern subject: (_ labels: (labels (quoted_name) @type)))
 (relationship_pattern left: (node_pattern subject: (_ identifier: (_) @type)))
 (relationship_pattern left: (node_pattern subject: (_ labels: (labels (symbol) @type))))
+(relationship_pattern left: (node_pattern subject: (_ labels: (labels (quoted_name) @type))))
 (relationship_pattern right: (node_pattern subject: (_ identifier: (_) @type)))
 (relationship_pattern right: (node_pattern subject: (_ labels: (labels (symbol) @type))))
+(relationship_pattern right: (node_pattern subject: (_ labels: (labels (quoted_name) @type))))
 ; Arrow kind: subject is inside optional brackets on the arrow
 (relationship_pattern kind: (right_arrow subject: (_ identifier: (_) @type)))
 (relationship_pattern kind: (right_arrow subject: (_ labels: (labels (symbol) @type))))
+(relationship_pattern kind: (right_arrow subject: (_ labels: (labels (quoted_name) @type))))
 (relationship_pattern kind: (left_arrow subject: (_ identifier: (_) @type)))
 (relationship_pattern kind: (left_arrow subject: (_ labels: (labels (symbol) @type))))
+(relationship_pattern kind: (left_arrow subject: (_ labels: (labels (quoted_name) @type))))
 (relationship_pattern kind: (undirected_arrow subject: (_ identifier: (_) @type)))
 (relationship_pattern kind: (undirected_arrow subject: (_ labels: (labels (symbol) @type))))
+(relationship_pattern kind: (undirected_arrow subject: (_ labels: (labels (quoted_name) @type))))
 (relationship_pattern kind: (bidirectional_arrow subject: (_ identifier: (_) @type)))
 (relationship_pattern kind: (bidirectional_arrow subject: (_ labels: (labels (symbol) @type))))
-(identified_annotation identifier: (_) @type)
-(identified_annotation labels: (labels (symbol) @type))
-
-; Symbols and identifiers (generic; definition/reference/tag captured above)
-(symbol) @variable
+(relationship_pattern kind: (bidirectional_arrow subject: (_ labels: (labels (quoted_name) @type))))
 
 ; Keywords and operators
 [
@@ -71,11 +89,11 @@
 
 ; Field names in records and maps
 (record_property key: (symbol) @property)
-(record_property key: (string_literal) @property)
-(record_property key: (integer) @property)
+(record_property key: (quoted_name) @property)
+(record_property key: (double_quoted_name) @property)
 (map_entry key: (symbol) @property)
-(map_entry key: (string_literal) @property)
-(map_entry key: (integer) @property)
+(map_entry key: (quoted_name) @property)
+(map_entry key: (double_quoted_name) @property)
 
 ; Annotation keys (property-style) and headers (identified/label-style)
 (property_annotation key: (symbol) @attribute)

package/queries/locals.scm

@@ -7,22 +7,31 @@
 ; Definitions: identifiers that define a pattern or annotation
 (subject_pattern subject: (_ identifier: (_) @local.definition))
 (subject_pattern subject: (_ labels: (labels (symbol) @local.definition)))
+(subject_pattern subject: (_ labels: (labels (quoted_name) @local.definition)))
 (node_pattern subject: (_ identifier: (_) @local.definition))
 (node_pattern subject: (_ labels: (labels (symbol) @local.definition)))
+(node_pattern subject: (_ labels: (labels (quoted_name) @local.definition)))
 (relationship_pattern left: (node_pattern subject: (_ identifier: (_) @local.definition)))
 (relationship_pattern left: (node_pattern subject: (_ labels: (labels (symbol) @local.definition))))
+(relationship_pattern left: (node_pattern subject: (_ labels: (labels (quoted_name) @local.definition))))
 (relationship_pattern right: (node_pattern subject: (_ identifier: (_) @local.definition)))
 (relationship_pattern right: (node_pattern subject: (_ labels: (labels (symbol) @local.definition))))
+(relationship_pattern right: (node_pattern subject: (_ labels: (labels (quoted_name) @local.definition))))
 (relationship_pattern kind: (right_arrow subject: (_ identifier: (_) @local.definition)))
 (relationship_pattern kind: (right_arrow subject: (_ labels: (labels (symbol) @local.definition))))
+(relationship_pattern kind: (right_arrow subject: (_ labels: (labels (quoted_name) @local.definition))))
 (relationship_pattern kind: (left_arrow subject: (_ identifier: (_) @local.definition)))
 (relationship_pattern kind: (left_arrow subject: (_ labels: (labels (symbol) @local.definition))))
+(relationship_pattern kind: (left_arrow subject: (_ labels: (labels (quoted_name) @local.definition))))
 (relationship_pattern kind: (undirected_arrow subject: (_ identifier: (_) @local.definition)))
 (relationship_pattern kind: (undirected_arrow subject: (_ labels: (labels (symbol) @local.definition))))
+(relationship_pattern kind: (undirected_arrow subject: (_ labels: (labels (quoted_name) @local.definition))))
 (relationship_pattern kind: (bidirectional_arrow subject: (_ identifier: (_) @local.definition)))
 (relationship_pattern kind: (bidirectional_arrow subject: (_ labels: (labels (symbol) @local.definition))))
+(relationship_pattern kind: (bidirectional_arrow subject: (_ labels: (labels (quoted_name) @local.definition))))
 (identified_annotation identifier: (_) @local.definition)
 (identified_annotation labels: (labels (symbol) @local.definition))
+(identified_annotation labels: (labels (quoted_name) @local.definition))
 
 ; References: pattern_reference identifier
 (pattern_reference identifier: (_) @local.reference)

package/src/grammar.json

@@ -377,7 +377,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "string_literal"
+          "name": "quoted_name"
         },
         {
           "type": "SYMBOL",
@@ -679,8 +679,17 @@
           ]
         },
         {
-          "type": "SYMBOL",
-          "name": "symbol"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "symbol"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "quoted_name"
+            }
+          ]
         }
       ]
     },
@@ -738,7 +747,7 @@
           "name": "key",
           "content": {
             "type": "SYMBOL",
-            "name": "_identifier"
+            "name": "_key_name"
           }
         },
         {
@@ -818,7 +827,7 @@
           "name": "key",
           "content": {
             "type": "SYMBOL",
-            "name": "_identifier"
+            "name": "_key_name"
           }
         },
         {
@@ -979,6 +988,75 @@
         "value": "-?(0|[1-9]\\d*)([a-zA-Z]+)"
       }
     },
+    "quoted_name": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "`"
+        },
+        {
+          "type": "FIELD",
+          "name": "content",
+          "content": {
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_backticked_text"
+            },
+            "named": true,
+            "value": "string_content"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "`"
+        }
+      ]
+    },
+    "double_quoted_name": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "\""
+        },
+        {
+          "type": "FIELD",
+          "name": "content",
+          "content": {
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_double_quoted_text"
+            },
+            "named": true,
+            "value": "string_content"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "\""
+        }
+      ]
+    },
+    "_key_name": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "symbol"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "quoted_name"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "double_quoted_name"
+        }
+      ]
+    },
     "string_literal": {
       "type": "CHOICE",
       "members": [