feat: add named field for narration and payee

polarmutex · Oct 10, 2023 · 0631b99 · 0631b99
1 parent 1c407c2
commit 0631b99
Show file tree

Hide file tree

Showing 4 changed files with 2,288 additions and 2,239 deletions.
diff --git a/grammar.js b/grammar.js
@@ -169,10 +169,10 @@ module.exports = grammar({
         _txn_strings: $ =>
             choice(
                 seq(
-                    alias($.string, $.payee),
-                    alias($.string, $.narration),
+                    field("payee", alias($.string, $.payee)),
+                    field("narration", alias($.string, $.narration)),
                 ),
-                alias($.string, $.narration),
+                field("narration", alias($.string, $.narration)),
             ),
 
         // OPTIONAL

diff --git a/src/grammar.json b/src/grammar.json
@@ -474,33 +474,45 @@
           "type": "SEQ",
           "members": [
             {
-              "type": "ALIAS",
+              "type": "FIELD",
+              "name": "payee",
               "content": {
-                "type": "SYMBOL",
-                "name": "string"
-              },
-              "named": true,
-              "value": "payee"
+                "type": "ALIAS",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "string"
+                },
+                "named": true,
+                "value": "payee"
+              }
             },
             {
-              "type": "ALIAS",
+              "type": "FIELD",
+              "name": "narration",
               "content": {
-                "type": "SYMBOL",
-                "name": "string"
-              },
-              "named": true,
-              "value": "narration"
+                "type": "ALIAS",
+                "content": {
+                  "type": "SYMBOL",
+                  "name": "string"
+                },
+                "named": true,
+                "value": "narration"
+              }
             }
           ]
         },
         {
-          "type": "ALIAS",
+          "type": "FIELD",
+          "name": "narration",
           "content": {
-            "type": "SYMBOL",
-            "name": "string"
-          },
-          "named": true,
-          "value": "narration"
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "string"
+            },
+            "named": true,
+            "value": "narration"
+          }
         }
       ]
     },

diff --git a/src/node-types.json b/src/node-types.json
@@ -1349,6 +1349,26 @@
           }
         ]
       },
+      "narration": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "narration",
+            "named": true
+          }
+        ]
+      },
+      "payee": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "payee",
+            "named": true
+          }
+        ]
+      },
       "tags_links": {
         "multiple": false,
         "required": false,
@@ -1382,14 +1402,6 @@
           "type": "key_value",
           "named": true
         },
-        {
-          "type": "narration",
-          "named": true
-        },
-        {
-          "type": "payee",
-          "named": true
-        },
         {
           "type": "posting",
           "named": true