@gram-data/tree-sitter-gram 0.1.7 → 0.1.9

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Andreas Kollegger
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -3,7 +3,7 @@
 A [tree-sitter](https://tree-sitter.github.io/tree-sitter/) grammar 
 for [gram](https://gram-data.github.io) notation.
 
-Gram is a subject based notation for structured data.
+Gram is a subject-based notation for structured data.
 
 If this is an object:
 ```
@@ -13,15 +13,15 @@ If this is an object:
 }
 ```
 
-Implicitly it is about a person. To become a subject, the implicit
+Implicitly the object is a person. To become a subject, the implicit
 information can be explicit.
 
 As a subject:
 ```
-[:Person {
+(:Person {
   name: "Andreas",
   roles: ["author"]
-}]
+})
 ```
 
 Learn more about `gram` at the [gram-data github org](https://github.com/gram-data) notation.

package/grammar.js

@@ -8,54 +8,46 @@ module.exports = grammar({
       repeat($.pattern)
     ),
 
-    pattern: $ => seq(optional(repeat($.annotation)), commaSep1($._patternComponent)),
+    pattern: $ => commaSep1($.pattern_element),
 
-    _patternComponent: $ => choice(
-      $.subject,
-      $._path
+    pattern_element: $ => seq(
+      optional(repeat($.annotation)), 
+      choice(
+        $.subject,
+        $._path,
+        $._reference
+      )
     ),
 
-    subject: $ => seq("[", optional($._attributes), optional(field("association", $._association)),"]"),
+    // ABKNOTE -- consider the naming of the two parts of a subject
+    // attributes & association
+    // information & association
+    subject: $ => seq("[", optional(field("attributes", $._attributes)), optional(field("association", $._association)),"]"),
 
-    annotation: $ => prec(9999,seq(
-      "@", 
+    annotation: $ => seq(
+      "@",
       field('key', $.symbol),
       "(",
       field('value', $._value),
       ")"
-    )),
+    ),
     
     _path: $ => choice(
       $.relationship,
       $.node
     ),
 
-    node: $ => seq("(", optional($._attributes),")"),
+    node: $ => seq(token("("), optional($._attributes), token(")")),
 
     relationship: $ => seq(field("left", $.node), field("value", $._relationship_value), field("right", $._path)),
-
-    _association: $ => choice($.membership, $.ordering),
     
-    membership: $ => seq(
-      "|", 
-      optional(seq(optional(field("labels", $.labels)), optional(field("record", $.record)), "|")), 
-      commaSep1($.member)),
-
-    ordering: $ => seq(
-      "-", 
-      optional(seq("[", optional(field("labels", $.labels)), optional(field("record", $.record)), "]-")), ">", 
-      commaSep1($.member)),
+    _association: $ => seq(
+      token("|"),
+      $.pattern
+    ),
 
     _reference: $ => $._value,
 
-    member: $ => seq(
-      optional(repeat($.annotation)), 
-      choice(
-        $._reference,
-        $._patternComponent
-      ),
-    ),
-
     _attributes: $ => choice(
       choice(field("identifier", $._value), field("labels", $.labels), field("record", $.record)), 
       seq(field("identifier", $._value), field("labels", $.labels)),
@@ -65,10 +57,10 @@ module.exports = grammar({
     ),
 
     _value: $ => choice(
+      prec.right(2, $.range),
+      prec.right(1, $._numeric_literal),
       $.symbol,
-      $._numeric_literal,
       $._string_literal,
-      $.range,
       $.math_symbol,
       $.greek,
       $.pictograph
@@ -78,18 +70,25 @@ module.exports = grammar({
 
     label: $ => seq(field("binder", $.binder), $.symbol),
 
-    binder: $ => choice(token(":"), token("::"), token("@")),
+    binder: $ => choice(token(":"), token("::")),
 
     record: $ => seq("{", commaSep($.property), "}"),
 
     property: $ => seq(
-      field('key', $.symbol),
+      field('key', $._key),
       field('binder', $.binder),
       field('value', $._value),
       optional(field('cardinality', choice('!', '?', '*', '+')))
     ),
 
-    symbol: $ => token(/[a-zA-Z_][0-9a-zA-Z_.\-]*/),
+
+    _key: $ => choice(
+      $.symbol,
+      $._string_literal
+    ),
+
+    symbol: $ => token(/[a-zA-Z_][0-9a-zA-Z_.\-@]*/),
+
 
     greek: $ => token(/[\u03B1-\u03C9\u0391-\u03A9]/),
     math_symbol: $ => token(/\p{Other_Math}/),
@@ -159,7 +158,7 @@ module.exports = grammar({
     },
 
     tagged_string: $ => {
-      const tagged = /[a-zA-Z][0-9a-zA-Z_.@]*`[^`\n]*`/;      
+      const tagged = /[a-zA-Z@][0-9a-zA-Z_.@]*`[^`\n]*`/;      
       return token(tagged);
     },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gram-data/tree-sitter-gram",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "subject-oriented notation for structured data",
   "homepage": "https://gram-data.github.io",
   "repository": "github:gram-data/tree-sitter-gram",
@@ -12,7 +12,12 @@
     "start": "tree-sitter playground",
     "test": "node --test bindings/node/*_test.js"
   },
-  "keywords": [],
+  "keywords": [
+    "tree-sitter",
+    "parser",
+    "gram",
+    "json"
+  ],
   "files": [
     "grammar.js",
     "binding.gyp",
@@ -24,8 +29,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "node-gyp-build": "^4.8.2",
-    "node-addon-api": "^8.1.0"
+    "node-gyp-build": "^4.8.4",
+    "node-addon-api": "^8.3.0"
   },
   "peerDependencies": {
     "tree-sitter": "^0.21.0"
@@ -36,17 +41,9 @@
     }
   },
   "devDependencies": {
-    "eslint": "^9.12.0",
-    "node-gyp": "^10.2.0",
+    "eslint": "^9.17.0",
+    "node-gyp": "^11.0.0",
     "prebuildify": "^6.0.1",
-    "tree-sitter-cli": "^0.24.2"
-  },
-  "tree-sitter": [
-    {
-      "scope": "source.gram",
-      "file-types": [
-        "gram"
-      ]
-    }
-  ]
-}
+    "tree-sitter-cli": "^0.24.5"
+  }
+}