@gram-data/tree-sitter-gram 0.1.10 → 0.1.11

package/grammar.js

@@ -66,27 +66,25 @@ module.exports = grammar({
       $.pictograph
     ),
 
-    labels: $ => repeat1($.label),
+    _binder: $ => token(/::?/),
 
-    label: $ => seq(field("binder", $.binder), field("symbol", $.symbol)),
+    labels: $ => repeat1($.label),
 
-    binder: $ => choice(token(":"), token("::")),
+    label: $ => seq($._binder, field("symbol", $.symbol)),
 
     record: $ => seq("{", commaSep($.property), "}"),
 
-    property: $ => seq(
-      field('key', $._key),
-      field('binder', $.binder),
-      field('value', $._value),
-      optional(field('cardinality', choice('!', '?', '*', '+')))
-    ),
-
-
     _key: $ => choice(
       $.symbol,
       $._string_literal
     ),
 
+    property: $ => seq(
+      field('key', $._key),
+      $._binder,
+      field('value', $._value)
+    ),
+
     symbol: $ => token(/[a-zA-Z_][0-9a-zA-Z_.\-@]*/),
 
 
@@ -168,20 +166,26 @@ module.exports = grammar({
     },
 
     _relationship_value: $ => choice(
-      $.single_undirected,
-      $.single_bidirectional,
-      $.single_right,
-      $.single_left,
-      $.double_undirected,
-      $.double_bidirectional,
-      $.double_right,
-      $.double_left,
-      $.squiggle_undirected,
-      $.squiggle_bidirectional,
-      $.squiggle_right,
-      $.squiggle_left,
+      alias($.single_undirected, $.undirected),
+      alias($.double_undirected, $.undirected),
+      alias($.squiggle_undirected, $.undirected),
+      alias($.single_bidirectional, $.bidirectional),
+      alias($.double_bidirectional, $.bidirectional),
+      alias($.squiggle_bidirectional, $.bidirectional),
+      alias($.single_left, $.left),
+      alias($.double_left, $.left),
+      alias($.squiggle_left, $.left),
+      alias($.single_right, $.right),
+      alias($.double_right, $.right),
+      alias($.squiggle_right, $.right)
     ),
-      
+    
+    // undirected: $ => alias(choice(
+    //   $.single_undirected,
+    //   $.double_undirected,
+    //   $.squiggle_undirected
+    // ), $.undirected),
+
     single_undirected: $ => seq("-", optional(seq("[", $._attributes, "]")), "-"),
     single_bidirectional: $ => seq("<-", optional(seq("[", $._attributes, "]")), "->"),
     single_right: $ => seq("-", optional(seq("[", $._attributes, "]")), "->"),

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@gram-data/tree-sitter-gram",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "subject-oriented notation for structured data",
   "homepage": "https://gram-data.github.io",
-  "repository": "github:gram-data/tree-sitter-gram",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/gram-data/tree-sitter-gram.git"
+  },
   "main": "bindings/node",
   "types": "bindings/node",
   "scripts": {

package/src/grammar.json

@@ -442,6 +442,13 @@
         }
       ]
     },
+    "_binder": {
+      "type": "TOKEN",
+      "content": {
+        "type": "PATTERN",
+        "value": "::?"
+      }
+    },
     "labels": {
       "type": "REPEAT1",
       "content": {
@@ -453,12 +460,8 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "FIELD",
-          "name": "binder",
-          "content": {
-            "type": "SYMBOL",
-            "name": "binder"
-          }
+          "type": "SYMBOL",
+          "name": "_binder"
         },
         {
           "type": "FIELD",
@@ -470,25 +473,6 @@
         }
       ]
     },
-    "binder": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "TOKEN",
-          "content": {
-            "type": "STRING",
-            "value": ":"
-          }
-        },
-        {
-          "type": "TOKEN",
-          "content": {
-            "type": "STRING",
-            "value": "::"
-          }
-        }
-      ]
-    },
     "record": {
       "type": "SEQ",
       "members": [
@@ -535,6 +519,19 @@
         }
       ]
     },
+    "_key": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "symbol"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_string_literal"
+        }
+      ]
+    },
     "property": {
       "type": "SEQ",
       "members": [
@@ -547,12 +544,8 @@
           }
         },
         {
-          "type": "FIELD",
-          "name": "binder",
-          "content": {
-            "type": "SYMBOL",
-            "name": "binder"
-          }
+          "type": "SYMBOL",
+          "name": "_binder"
         },
         {
           "type": "FIELD",
@@ -561,52 +554,6 @@
             "type": "SYMBOL",
             "name": "_value"
           }
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "FIELD",
-              "name": "cardinality",
-              "content": {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "STRING",
-                    "value": "!"
-                  },
-                  {
-                    "type": "STRING",
-                    "value": "?"
-                  },
-                  {
-                    "type": "STRING",
-                    "value": "*"
-                  },
-                  {
-                    "type": "STRING",
-                    "value": "+"
-                  }
-                ]
-              }
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
-        }
-      ]
-    },
-    "_key": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SYMBOL",
-          "name": "symbol"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_string_literal"
         }
       ]
     },
@@ -826,52 +773,112 @@
       "type": "CHOICE",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "single_undirected"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "single_undirected"
+          },
+          "named": true,
+          "value": "undirected"
         },
         {
-          "type": "SYMBOL",
-          "name": "single_bidirectional"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "double_undirected"
+          },
+          "named": true,
+          "value": "undirected"
         },
         {
-          "type": "SYMBOL",
-          "name": "single_right"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "squiggle_undirected"
+          },
+          "named": true,
+          "value": "undirected"
         },
         {
-          "type": "SYMBOL",
-          "name": "single_left"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "single_bidirectional"
+          },
+          "named": true,
+          "value": "bidirectional"
         },
         {
-          "type": "SYMBOL",
-          "name": "double_undirected"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "double_bidirectional"
+          },
+          "named": true,
+          "value": "bidirectional"
         },
         {
-          "type": "SYMBOL",
-          "name": "double_bidirectional"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "squiggle_bidirectional"
+          },
+          "named": true,
+          "value": "bidirectional"
         },
         {
-          "type": "SYMBOL",
-          "name": "double_right"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "single_left"
+          },
+          "named": true,
+          "value": "left"
         },
         {
-          "type": "SYMBOL",
-          "name": "double_left"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "double_left"
+          },
+          "named": true,
+          "value": "left"
         },
         {
-          "type": "SYMBOL",
-          "name": "squiggle_undirected"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "squiggle_left"
+          },
+          "named": true,
+          "value": "left"
         },
         {
-          "type": "SYMBOL",
-          "name": "squiggle_bidirectional"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "single_right"
+          },
+          "named": true,
+          "value": "right"
         },
         {
-          "type": "SYMBOL",
-          "name": "squiggle_right"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "double_right"
+          },
+          "named": true,
+          "value": "right"
         },
         {
-          "type": "SYMBOL",
-          "name": "squiggle_left"
+          "type": "ALIAS",
+          "content": {
+            "type": "SYMBOL",
+            "name": "squiggle_right"
+          },
+          "named": true,
+          "value": "right"
         }
       ]
     },