npm - @konomanoasa/tree-sitter-toml - Versions diffs - 0.1.0 → 0.3.0 - Mend

@konomanoasa/tree-sitter-toml 0.1.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/Cargo.toml ADDED Viewed

@@ -0,0 +1,23 @@
+[package]
+name = "tree-sitter-toml"
+version = "0.3.0"
+edition = "2024"
+build = "bindings/rust/build.rs"
+links = "tree-sitter-toml"
+publish = false
+[lib]
+path = "bindings/rust/lib.rs"
+[[test]]
+name = "bindings"
+path = "test/bindings.test.rs"
+[dependencies]
+tree-sitter-language = "0.1.8"
+[dev-dependencies]
+tree-sitter = "0.27.0"
+[build-dependencies]
+cc = "1.4"

package/README.md CHANGED Viewed

@@ -4,7 +4,7 @@
 [![npm](https://img.shields.io/npm/v/@konomanoasa/tree-sitter-toml)](https://www.npmjs.com/package/@konomanoasa/tree-sitter-toml)
 [Tree-sitter](https://tree-sitter.github.io/tree-sitter/) grammar for
-TOML 1.1.0.
+Tom's Obvious Minimal Language 1.1.0.
 ## Installation
@@ -12,11 +12,20 @@ TOML 1.1.0.
 npm install @konomanoasa/tree-sitter-toml
 ```
+## Grammar
+| Grammar | Description | Rust constant |
+| --- | --- | --- |
+| `toml` | TOML 1.1.0 | `LANGUAGE` |
 ## Development
+Development requires Node.js 24.2.0 or later.
 ```sh
 npm install
-npm run parse -- script.toml
+npm run build
+npm test
 ```
 ## Specifications

package/bindings/rust/build.rs ADDED Viewed

@@ -0,0 +1,23 @@
+use std::{env, path::Path};
+fn main() {
+  let mut build = cc::Build::new();
+  build.std("c17");
+  if build.get_compiler().is_like_msvc() {
+    build.flag("-utf-8");
+  }
+  if env::var("TARGET").expect("Cargo must provide TARGET")
+    == "wasm32-unknown-unknown"
+  {
+    let headers = env::var_os("DEP_TREE_SITTER_LANGUAGE_WASM_HEADERS")
+      .expect("tree-sitter-language must provide WebAssembly headers");
+    build.include(&headers);
+    println!("cargo::rerun-if-changed={}", Path::new(&headers).display());
+  }
+  println!("cargo::rerun-if-changed=src");
+  build
+    .include("src")
+    .files(["src/parser.c", "src/scanner.c"])
+    .compile("tree-sitter-toml");
+}

package/bindings/rust/lib.rs ADDED Viewed

@@ -0,0 +1,12 @@
+use tree_sitter_language::LanguageFn;
+unsafe extern "C" {
+  fn tree_sitter_toml() -> *const ();
+}
+pub const LANGUAGE: LanguageFn =
+  unsafe { LanguageFn::from_raw(tree_sitter_toml) };
+pub const NODE_TYPES: &str = include_str!("../../src/node-types.json");
+pub const HIGHLIGHTS_QUERY: &str = include_str!("../../queries/highlights.scm");

package/grammar.js CHANGED Viewed

@@ -1,6 +1,9 @@
 const sign = optional(choice("-", "+"));
-const digit = ($) => alias($._digit, $.digit);
+const digit = ($, rule = $._digit) => alias(rule, $.digit);
+const digits = (characters) =>
+  choice(...Array.from(characters, (character) => new RegExp(character)));
 const hexdig = ($) => alias($._hexdig, $.hexdig);
@@ -37,6 +40,8 @@ export default grammar({
     [$.key, $.dotted_key],
     [$.dotted_key],
     [$.unsigned_dec_int, $._digit],
+    [$._digit, $.time_hour],
+    [$._digit1_9, $.time_hour],
     [$.offset_date_time, $.local_date_time, $.local_date],
     [$.array_values],
     [$.inline_table_keyvals],
@@ -141,7 +146,7 @@ export default grammar({
     oct_int: ($) => seq("0o", separated(alias($._digit0_7, $.digit0_7))),
     bin_int: ($) => seq("0b", separated(alias($._digit0_1, $.digit0_1))),
     _digit: ($) => choice(/0/, $._digit1_9),
-    _digit1_9: () => /[1-9]/,
+    _digit1_9: () => digits("123456789"),
     _digit0_7: () => /[0-7]/,
     _digit0_1: () => /[01]/,
     _hexdig: ($) => choice($._digit, /[A-Fa-f]/),
@@ -160,12 +165,29 @@ export default grammar({
     date_time: ($) =>
       choice($.offset_date_time, $.local_date_time, $.local_date, $.local_time),
     date_fullyear: ($) => seq(...times(4, digit($))),
-    date_month: ($) => seq(...times(2, digit($))),
-    date_mday: ($) => seq(...times(2, digit($))),
+    date_month: ($) =>
+      choice(
+        seq(digit($, /0/), digit($, $._digit1_9)),
+        seq(digit($, /1/), digit($, digits("012"))),
+      ),
+    date_mday: ($) =>
+      choice(
+        seq(digit($, /0/), digit($, $._digit1_9)),
+        seq(digit($, digits("12")), digit($)),
+        seq(digit($, /3/), digit($, digits("01"))),
+      ),
     time_delim: ($) => choice("T", "t", alias($._space, " ")),
-    time_hour: ($) => seq(...times(2, digit($))),
-    time_minute: ($) => seq(...times(2, digit($))),
-    time_second: ($) => seq(...times(2, digit($))),
+    time_hour: ($) =>
+      choice(
+        seq(digit($, digits("01")), digit($)),
+        seq(digit($, /2/), digit($, digits("0123"))),
+      ),
+    time_minute: ($) => seq(digit($, digits("012345")), digit($)),
+    time_second: ($) =>
+      choice(
+        seq(digit($, digits("012345")), digit($)),
+        seq(digit($, /6/), digit($, /0/)),
+      ),
     time_secfrac: ($) => seq(".", repeat1(digit($))),
     time_numoffset: ($) =>
       seq(choice("+", "-"), $.time_hour, ":", $.time_minute),

package/package.json CHANGED Viewed

@@ -1,27 +1,31 @@
 {
   "name": "@konomanoasa/tree-sitter-toml",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "type": "module",
   "description": "Tree-sitter grammar for TOML.",
   "license": "MIT",
   "repository": "git+https://github.com/konomanoasa/tree-sitter-toml.git",
   "files": [
+    "Cargo.toml",
+    "bindings/rust/*.rs",
     "grammar.js",
     "queries/*.scm",
     "src/*.c",
     "src/*.json",
     "src/tree_sitter/*.h",
+    "test/bindings.test.rs",
     "tree-sitter.json"
   ],
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
+    "build": "npm run tree-sitter -- build-all",
     "check": "biome check . && node scripts/check-c.js && node scripts/check-generated.js && npm test",
     "format": "biome check --write . && node scripts/check-c.js --write",
     "generate": "npm run tree-sitter -- generate-all",
-    "parse": "npm run tree-sitter -- parse --scope source.toml",
     "test": "npm run tree-sitter -- test-corpus --rebuild && node --test --test-concurrency=1 \"test/*.test.js\"",
+    "test:bindings": "cargo test --locked",
     "test:fuzz": "node --test --test-name-pattern=\"fixed-seed generated histories\" test/incremental.test.js",
     "test:fuzz:corpus": "npm run tree-sitter -- fuzz-all --iterations 100 --edits 5",
     "test:highlights": "node --test test/highlight.test.js",

package/src/grammar.json CHANGED Viewed

@@ -1182,8 +1182,45 @@
       ]
     },
     "_digit1_9": {
-      "type": "PATTERN",
-      "value": "[1-9]"
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "PATTERN",
+          "value": "1"
+        },
+        {
+          "type": "PATTERN",
+          "value": "2"
+        },
+        {
+          "type": "PATTERN",
+          "value": "3"
+        },
+        {
+          "type": "PATTERN",
+          "value": "4"
+        },
+        {
+          "type": "PATTERN",
+          "value": "5"
+        },
+        {
+          "type": "PATTERN",
+          "value": "6"
+        },
+        {
+          "type": "PATTERN",
+          "value": "7"
+        },
+        {
+          "type": "PATTERN",
+          "value": "8"
+        },
+        {
+          "type": "PATTERN",
+          "value": "9"
+        }
+      ]
     },
     "_digit0_7": {
       "type": "PATTERN",
@@ -1487,48 +1524,158 @@
       ]
     },
     "date_month": {
-      "type": "SEQ",
+      "type": "CHOICE",
       "members": [
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_digit"
-          },
-          "named": true,
-          "value": "digit"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "PATTERN",
+                "value": "0"
+              },
+              "named": true,
+              "value": "digit"
+            },
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_digit1_9"
+              },
+              "named": true,
+              "value": "digit"
+            }
+          ]
         },
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_digit"
-          },
-          "named": true,
-          "value": "digit"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "PATTERN",
+                "value": "1"
+              },
+              "named": true,
+              "value": "digit"
+            },
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "PATTERN",
+                    "value": "0"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "1"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "2"
+                  }
+                ]
+              },
+              "named": true,
+              "value": "digit"
+            }
+          ]
         }
       ]
     },
     "date_mday": {
-      "type": "SEQ",
+      "type": "CHOICE",
       "members": [
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_digit"
-          },
-          "named": true,
-          "value": "digit"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "PATTERN",
+                "value": "0"
+              },
+              "named": true,
+              "value": "digit"
+            },
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_digit1_9"
+              },
+              "named": true,
+              "value": "digit"
+            }
+          ]
         },
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_digit"
-          },
-          "named": true,
-          "value": "digit"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "PATTERN",
+                    "value": "1"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "2"
+                  }
+                ]
+              },
+              "named": true,
+              "value": "digit"
+            },
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_digit"
+              },
+              "named": true,
+              "value": "digit"
+            }
+          ]
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "PATTERN",
+                "value": "3"
+              },
+              "named": true,
+              "value": "digit"
+            },
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "PATTERN",
+                    "value": "0"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "1"
+                  }
+                ]
+              },
+              "named": true,
+              "value": "digit"
+            }
+          ]
         }
       ]
     },
@@ -1555,25 +1702,79 @@
       ]
     },
     "time_hour": {
-      "type": "SEQ",
+      "type": "CHOICE",
       "members": [
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_digit"
-          },
-          "named": true,
-          "value": "digit"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "PATTERN",
+                    "value": "0"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "1"
+                  }
+                ]
+              },
+              "named": true,
+              "value": "digit"
+            },
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_digit"
+              },
+              "named": true,
+              "value": "digit"
+            }
+          ]
         },
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_digit"
-          },
-          "named": true,
-          "value": "digit"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "PATTERN",
+                "value": "2"
+              },
+              "named": true,
+              "value": "digit"
+            },
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "PATTERN",
+                    "value": "0"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "1"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "2"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "3"
+                  }
+                ]
+              },
+              "named": true,
+              "value": "digit"
+            }
+          ]
         }
       ]
     },
@@ -1583,8 +1784,33 @@
         {
           "type": "ALIAS",
           "content": {
-            "type": "SYMBOL",
-            "name": "_digit"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "PATTERN",
+                "value": "0"
+              },
+              {
+                "type": "PATTERN",
+                "value": "1"
+              },
+              {
+                "type": "PATTERN",
+                "value": "2"
+              },
+              {
+                "type": "PATTERN",
+                "value": "3"
+              },
+              {
+                "type": "PATTERN",
+                "value": "4"
+              },
+              {
+                "type": "PATTERN",
+                "value": "5"
+              }
+            ]
           },
           "named": true,
           "value": "digit"
@@ -1601,25 +1827,78 @@
       ]
     },
     "time_second": {
-      "type": "SEQ",
+      "type": "CHOICE",
       "members": [
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_digit"
-          },
-          "named": true,
-          "value": "digit"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "PATTERN",
+                    "value": "0"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "1"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "2"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "3"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "4"
+                  },
+                  {
+                    "type": "PATTERN",
+                    "value": "5"
+                  }
+                ]
+              },
+              "named": true,
+              "value": "digit"
+            },
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "SYMBOL",
+                "name": "_digit"
+              },
+              "named": true,
+              "value": "digit"
+            }
+          ]
         },
         {
-          "type": "ALIAS",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_digit"
-          },
-          "named": true,
-          "value": "digit"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "PATTERN",
+                "value": "6"
+              },
+              "named": true,
+              "value": "digit"
+            },
+            {
+              "type": "ALIAS",
+              "content": {
+                "type": "PATTERN",
+                "value": "0"
+              },
+              "named": true,
+              "value": "digit"
+            }
+          ]
         }
       ]
     },
@@ -2221,6 +2500,14 @@
       "unsigned_dec_int",
       "_digit"
     ],
+    [
+      "_digit",
+      "time_hour"
+    ],
+    [
+      "_digit1_9",
+      "time_hour"
+    ],
     [
       "offset_date_time",
       "local_date_time",

package/src/node-types.json CHANGED Viewed

@@ -207,6 +207,11 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "digit1_9",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "dotted_key",
     "named": true,
@@ -1231,10 +1236,6 @@
     "type": "digit0_7",
     "named": true
   },
-  {
-    "type": "digit1_9",
-    "named": true
-  },
   {
     "type": "e",
     "named": false