tree-sitter-hledger 0.1.0 → 0.1.4

package/README.md

@@ -16,6 +16,7 @@ This parser complements the existing [hledger-lsp](../hledger-lsp) language serv
 ## Features
 
 **Transactions:**
+
 - Dates with flexible formats (`2024-01-15`, `2024.1.5`, `01/15`, `1-5`)
 - Status markers (`*` cleared, `!` pending)
 - Transaction codes (`(#123)`)
@@ -23,6 +24,7 @@ This parser complements the existing [hledger-lsp](../hledger-lsp) language serv
 - Inline comments with tags (`; category:food, project:home`)
 
 **Postings:**
+
 - Account names (including spaces)
 - Amounts with various formats:
   - Symbol on left: `$100`, `-$50`, `$-25`
@@ -33,31 +35,38 @@ This parser complements the existing [hledger-lsp](../hledger-lsp) language serv
 - Inline comments with tags
 
 **Commodities:**
+
 - Currency symbols: `$`, `€`, `£`, `¥`, etc.
 - Alphabetic codes: `USD`, `EUR`, `BTC`
 - Quoted symbols: `"AAPL US Equity"`
 
 **Directives:**
+
 - `account` - Account declarations
 - `commodity` - Commodity declarations
 - `include` - File includes
 - `payee` - Payee declarations
 - `tag` - Tag declarations
+- `P` - Market price declarations
+- `alias` - Alias declarations
+- `decimal-mark` - Decimal mark declarations
 
 **Comments:**
+
 - Line comments: `;` or `#`
 - Block comments: `comment` ... `end comment`
 - Inline comments with tag parsing
 
 **Structure:**
+
 - Indentation-based posting blocks
 - Code folding support
 - Syntax highlighting queries
 
 ## Future Enhancements
+
 - Automated transaction rules (`=`)
 - Periodic transactions (`~`)
-- Additional directives (alias, apply account, etc.)
 - Multi-line commodity format blocks
 
 ## Usage
@@ -87,6 +96,7 @@ npm test
 ## Grammar Overview
 
 **Transactions:**
+
 ```hledger
 2024-01-05 * Groceries  ; category:food
     Expenses:Food:Groceries    $50.00
@@ -94,6 +104,7 @@ npm test
 ```
 
 **Costs and Assertions:**
+
 ```hledger
 2024-01-10 * Currency Exchange
     Assets:EUR    100 EUR @ $1.10
@@ -101,6 +112,7 @@ npm test
 ```
 
 **Directives:**
+
 ```hledger
 account Assets:Checking
 commodity $1000.00
@@ -109,6 +121,7 @@ include expenses.journal
 ```
 
 **Comments:**
+
 ```hledger
 ; Line comment
 # Another style

package/grammar.js

@@ -125,11 +125,58 @@ module.exports = grammar({
         $.include_directive,
         $.payee_directive,
         $.tag_directive,
+        $.alias_directive,
+        $.decimal_mark_directive,
+        $.market_price_directive,
+        $.apply_account_directive,
+        $.default_commodity_directive,
+        $.default_year_directive,
       ),
       optional($.inline_comment),
       $._newline,
     ),
 
+    alias_directive: $ => seq(
+      'alias',
+      field('old_name', $.account),
+      '=',
+      field('new_name', $.account),
+    ),
+
+    decimal_mark_directive: $ => seq(
+      'decimal-mark',
+      field('decimal_mark', $.decimal_mark),
+    ),
+
+    decimal_mark: _$ => /[.,]/,
+
+    market_price_directive: $ => seq(
+      'P',
+      field('date', $.date),
+      field('commodity_1_symbol', $.commodity),
+      field('commodity_2_amount', $.amount),
+    ),
+
+    default_commodity_directive: $ => seq(
+      'D',
+      /[ \t]+/,
+      field('default_commodity', $.amount),
+    ),
+
+    default_year_directive: _$ => seq(
+      'Y',
+      /[ \t]+/,
+      field('default_year', /\d{4}/),
+    ),
+
+    apply_account_directive: $ => seq(
+      'apply account',
+      /[ \t]+/,
+      field('account', $.account),
+    ),
+
+
+
     account_directive: $ => seq(
       'account',
       field('name', $.account),
@@ -184,7 +231,7 @@ module.exports = grammar({
     description: _ => /[^*!=(;\s][^;\n]*/,
 
 
-    account: _ => /([^\s;#\n]+([ \t][^;\s\n#]+)*?)/,
+    account: _ => /([^\s;#\n=]+([ \t][^;\s\n#=]+)*?)/,
 
     // Amount: quantity with optional commodity
     amount: $ => choice(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-hledger",
-  "version": "0.1.0",
+  "version": "0.1.4",
   "description": "Tree-sitter grammar for hledger journal files",
   "main": "bindings/node",
   "types": "bindings/node",
@@ -42,7 +42,7 @@
     "nan": "^2.17.0"
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.20.8"
+    "tree-sitter-cli": "^0.26.3"
   },
   "tree-sitter": [
     {

package/src/grammar.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://tree-sitter.github.io/tree-sitter/assets/schemas/grammar.schema.json",
   "name": "hledger",
   "rules": {
     "source_file": {
@@ -437,6 +438,30 @@
             {
               "type": "SYMBOL",
               "name": "tag_directive"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "alias_directive"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "decimal_mark_directive"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "market_price_directive"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "apply_account_directive"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "default_commodity_directive"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "default_year_directive"
             }
           ]
         },
@@ -458,6 +483,152 @@
         }
       ]
     },
+    "alias_directive": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "alias"
+        },
+        {
+          "type": "FIELD",
+          "name": "old_name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "account"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "="
+        },
+        {
+          "type": "FIELD",
+          "name": "new_name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "account"
+          }
+        }
+      ]
+    },
+    "decimal_mark_directive": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "decimal-mark"
+        },
+        {
+          "type": "FIELD",
+          "name": "decimal_mark",
+          "content": {
+            "type": "SYMBOL",
+            "name": "decimal_mark"
+          }
+        }
+      ]
+    },
+    "decimal_mark": {
+      "type": "PATTERN",
+      "value": "[.,]"
+    },
+    "market_price_directive": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "P"
+        },
+        {
+          "type": "FIELD",
+          "name": "date",
+          "content": {
+            "type": "SYMBOL",
+            "name": "date"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "commodity_1_symbol",
+          "content": {
+            "type": "SYMBOL",
+            "name": "commodity"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "commodity_2_amount",
+          "content": {
+            "type": "SYMBOL",
+            "name": "amount"
+          }
+        }
+      ]
+    },
+    "default_commodity_directive": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "D"
+        },
+        {
+          "type": "PATTERN",
+          "value": "[ \\t]+"
+        },
+        {
+          "type": "FIELD",
+          "name": "default_commodity",
+          "content": {
+            "type": "SYMBOL",
+            "name": "amount"
+          }
+        }
+      ]
+    },
+    "default_year_directive": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "Y"
+        },
+        {
+          "type": "PATTERN",
+          "value": "[ \\t]+"
+        },
+        {
+          "type": "FIELD",
+          "name": "default_year",
+          "content": {
+            "type": "PATTERN",
+            "value": "\\d{4}"
+          }
+        }
+      ]
+    },
+    "apply_account_directive": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "apply account"
+        },
+        {
+          "type": "PATTERN",
+          "value": "[ \\t]+"
+        },
+        {
+          "type": "FIELD",
+          "name": "account",
+          "content": {
+            "type": "SYMBOL",
+            "name": "account"
+          }
+        }
+      ]
+    },
     "account_directive": {
       "type": "SEQ",
       "members": [
@@ -690,7 +861,7 @@
     },
     "account": {
       "type": "PATTERN",
-      "value": "([^\\s;#\\n]+([ \\t][^;\\s\\n#]+)*?)"
+      "value": "([^\\s;#\\n=]+([ \\t][^;\\s\\n#=]+)*?)"
     },
     "amount": {
       "type": "CHOICE",
@@ -922,6 +1093,6 @@
     }
   ],
   "inline": [],
-  "supertypes": []
-}
-
+  "supertypes": [],
+  "reserved": {}
+}

package/src/node-types.json

@@ -15,6 +15,32 @@
       }
     }
   },
+  {
+    "type": "alias_directive",
+    "named": true,
+    "fields": {
+      "new_name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "account",
+            "named": true
+          }
+        ]
+      },
+      "old_name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "account",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "amount",
     "named": true,
@@ -51,6 +77,22 @@
       }
     }
   },
+  {
+    "type": "apply_account_directive",
+    "named": true,
+    "fields": {
+      "account": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "account",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "assertion",
     "named": true,
@@ -141,6 +183,43 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "decimal_mark_directive",
+    "named": true,
+    "fields": {
+      "decimal_mark": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "decimal_mark",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
+  {
+    "type": "default_commodity_directive",
+    "named": true,
+    "fields": {
+      "default_commodity": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "amount",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
+  {
+    "type": "default_year_directive",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "include_directive",
     "named": true,
@@ -177,6 +256,42 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "market_price_directive",
+    "named": true,
+    "fields": {
+      "commodity_1_symbol": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "commodity",
+            "named": true
+          }
+        ]
+      },
+      "commodity_2_amount": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "amount",
+            "named": true
+          }
+        ]
+      },
+      "date": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "date",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "payee_directive",
     "named": true,
@@ -262,6 +377,7 @@
   {
     "type": "source_file",
     "named": true,
+    "root": true,
     "fields": {},
     "children": {
       "multiple": true,
@@ -271,6 +387,14 @@
           "type": "account_directive",
           "named": true
         },
+        {
+          "type": "alias_directive",
+          "named": true
+        },
+        {
+          "type": "apply_account_directive",
+          "named": true
+        },
         {
           "type": "block_comment",
           "named": true
@@ -279,6 +403,18 @@
           "type": "commodity_directive",
           "named": true
         },
+        {
+          "type": "decimal_mark_directive",
+          "named": true
+        },
+        {
+          "type": "default_commodity_directive",
+          "named": true
+        },
+        {
+          "type": "default_year_directive",
+          "named": true
+        },
         {
           "type": "include_directive",
           "named": true
@@ -291,6 +427,10 @@
           "type": "line_comment",
           "named": true
         },
+        {
+          "type": "market_price_directive",
+          "named": true
+        },
         {
           "type": "payee_directive",
           "named": true
@@ -460,6 +600,18 @@
     "type": "@@",
     "named": false
   },
+  {
+    "type": "D",
+    "named": false
+  },
+  {
+    "type": "P",
+    "named": false
+  },
+  {
+    "type": "Y",
+    "named": false
+  },
   {
     "type": "account",
     "named": false
@@ -468,6 +620,14 @@
     "type": "account",
     "named": true
   },
+  {
+    "type": "alias",
+    "named": false
+  },
+  {
+    "type": "apply account",
+    "named": false
+  },
   {
     "type": "comment",
     "named": false
@@ -476,6 +636,14 @@
     "type": "commodity",
     "named": false
   },
+  {
+    "type": "decimal-mark",
+    "named": false
+  },
+  {
+    "type": "decimal_mark",
+    "named": true
+  },
   {
     "type": "dedent",
     "named": true