tree-sitter-familymarkup 1.9.1 → 1.11.0

package/grammar.js

@@ -36,7 +36,7 @@ module.exports = grammar({
 
     relation: $ => seq(
       field('sources', $.sources),
-      field('arrow', $._arrows),
+      field('arrow', choice($.eq, $.arrow)),
       field('label', optional($.words)),
       optional($._nl),
       field('targets', optional($.targets)),
@@ -47,7 +47,7 @@ module.exports = grammar({
       field('delimiter', choice('+', ',', $._words))
     ),
     targets: $ => repeatWith(
-      choice($.name_ref, $.name_def, $.num_unknown, $.unknown, $.comment),
+      choice($.name_def, $.num_unknown, $.unknown, $.comment),
       field('delimiter', choice(',', $._nl, $._words))
     ),
 
@@ -63,6 +63,7 @@ module.exports = grammar({
       field('surname', optional($.new_surname)),
       field('name', $.name),
       field('aliases', optional($.name_aliases)),
+      field('surname', optional(alias($.name, $.surname))),
     ),
 
     num: _ => /\d+[.)]?/,
@@ -85,7 +86,9 @@ module.exports = grammar({
     words: _ => /\p{Ll}([\p{Ll}'"\s]*[\p{Ll}'"])?/u,
     _words: $ => alias($.words, '_words'),
 
-    _arrows: _ => choice('=', '<->', '->', '<-', '-'),
+    eq: _ => "=",
+
+    arrow: _ => choice('<->', '->', '<-', '-'),
   },
 });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tree-sitter-familymarkup",
   "description": "Tree sitter for FamilyMarkup",
-  "version": "1.9.1",
+  "version": "1.11.0",
   "main": "bindings/node",
   "types": "bindings/node",
   "scripts": {
@@ -18,6 +18,8 @@
   "files": [
     "grammar.js",
     "binding.gyp",
+    "tree-sitter.json",
+    "queries.json",
     "prebuilds/**",
     "bindings/node/*",
     "queries/*",

package/queries/highlights.scm

@@ -1,56 +1,42 @@
 (family_name
   (name) @class.declaration.family_name
-)
 
-(family_name
   (name_aliases
     (name) @class.declaration.family_name.alias
-  )
+  )?
 )
 
 (name_ref
+  (name) @property.static.name.ref
   (surname) @class.family_name.ref
 )
 
-(name_ref
+(name_def
   (name) @property.static.name.ref
-)
-
-(name_def 
-  (name) @property.declaration.static.name.def
-)
-
-(name_def 
-  (name_aliases (name) @property.declaration.static.name.def.alias)
+  (surname)? @class.family_name.ref
 )
 
 (sources
   (name) @property.static.name.ref
 )
 
-(targets
-  (name_def
-    .
-    (name) @property.static.name.ref
-    .
-  )
-)
-
 (relation
-  arrow: "="
+  (sources)
+  (eq)
   (targets
     (name_def
-      .
+      (new_surname
+        (name) @class.family_name.ref
+      )?
       (name) @property.declaration.static.name.def
-      .
+      (name_aliases
+        (name) @property.declaration.static.name.def.alias
+      )?
+      (surname)? @class.family_name.ref
     )
   )
 )
 
-(new_surname
-  (name) @class.family_name.ref
-)
-
 (unknown) @string.unknown
 
 (comment) @comment

package/queries.json

@@ -0,0 +1,3 @@
+{
+  "highlights": "(family_name\n  (name) @class.declaration.family_name\n\n  (name_aliases\n    (name) @class.declaration.family_name.alias\n  )?\n)\n\n(name_ref\n  (name) @property.static.name.ref\n  (surname) @class.family_name.ref\n)\n\n(name_def\n  (name) @property.static.name.ref\n  (surname)? @class.family_name.ref\n)\n\n(sources\n  (name) @property.static.name.ref\n)\n\n(relation\n  (sources)\n  (eq)\n  (targets\n    (name_def\n      (new_surname\n        (name) @class.family_name.ref\n      )?\n      (name) @property.declaration.static.name.def\n      (name_aliases\n        (name) @property.declaration.static.name.def.alias\n      )?\n      (surname)? @class.family_name.ref\n    )\n  )\n)\n\n(unknown) @string.unknown\n\n(comment) @comment\n\n(num) @number.targets\n\n(sources delimiter: _ @punctuation.delimiter.sources)\n(targets delimiter: _ @punctuation.delimiter.targets)\n\n\"+\" @operator.sources.join\n\n(relation arrow: _ @operator.arrow)\n\n(relation label: _ @string.label)\n"
+}

package/src/grammar.json

@@ -222,8 +222,17 @@
           "type": "FIELD",
           "name": "arrow",
           "content": {
-            "type": "SYMBOL",
-            "name": "_arrows"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "eq"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "arrow"
+              }
+            ]
           }
         },
         {
@@ -354,10 +363,6 @@
         {
           "type": "CHOICE",
           "members": [
-            {
-              "type": "SYMBOL",
-              "name": "name_ref"
-            },
             {
               "type": "SYMBOL",
               "name": "name_def"
@@ -408,10 +413,6 @@
                   {
                     "type": "CHOICE",
                     "members": [
-                      {
-                        "type": "SYMBOL",
-                        "name": "name_ref"
-                      },
                       {
                         "type": "SYMBOL",
                         "name": "name_def"
@@ -545,6 +546,27 @@
               }
             ]
           }
+        },
+        {
+          "type": "FIELD",
+          "name": "surname",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "ALIAS",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "name"
+                },
+                "named": true,
+                "value": "surname"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
         }
       ]
     },
@@ -703,13 +725,13 @@
       "named": false,
       "value": "_words"
     },
-    "_arrows": {
+    "eq": {
+      "type": "STRING",
+      "value": "="
+    },
+    "arrow": {
       "type": "CHOICE",
       "members": [
-        {
-          "type": "STRING",
-          "value": "="
-        },
         {
           "type": "STRING",
           "value": "<->"

package/src/node-types.json

@@ -1,4 +1,9 @@
 [
+  {
+    "type": "arrow",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "comment",
     "named": true,
@@ -110,12 +115,16 @@
         ]
       },
       "surname": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
             "type": "new_surname",
             "named": true
+          },
+          {
+            "type": "surname",
+            "named": true
           }
         ]
       }
@@ -183,24 +192,12 @@
         "required": true,
         "types": [
           {
-            "type": "-",
-            "named": false
-          },
-          {
-            "type": "->",
-            "named": false
-          },
-          {
-            "type": "<-",
-            "named": false
-          },
-          {
-            "type": "<->",
-            "named": false
+            "type": "arrow",
+            "named": true
           },
           {
-            "type": "=",
-            "named": false
+            "type": "eq",
+            "named": true
           }
         ]
       },
@@ -340,10 +337,6 @@
           "type": "name_def",
           "named": true
         },
-        {
-          "type": "name_ref",
-          "named": true
-        },
         {
           "type": "num_unknown",
           "named": true
@@ -404,10 +397,6 @@
     "type": "<->",
     "named": false
   },
-  {
-    "type": "=",
-    "named": false
-  },
   {
     "type": "?",
     "named": false
@@ -416,6 +405,10 @@
     "type": "_words",
     "named": false
   },
+  {
+    "type": "eq",
+    "named": true
+  },
   {
     "type": "name",
     "named": true