tree-sitter-kdl 1.0.0 → 1.0.2

package/.gitattributes

@@ -1,3 +1,7 @@
+/src/parser.c linguist-vendored
+/src/*.json linguist-vendored
+/examples/* linguist-vendored
+
 src/grammar.json -diff
 src/node-types.json -diff
 src/parser.c -diff

package/.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Build/test
+name: CI
 
 on:
   push:

package/.github/workflows/fuzz.yml

@@ -1,4 +1,4 @@
-name: Fuzz parser
+name: Fuzz Parser
 
 on:
   push:

package/.github/workflows/{build.yml → publish.yml}

@@ -1,4 +1,4 @@
-name: Build and Publish
+name: Publish
 
 on:
   push:

package/Cargo.toml

@@ -1,13 +1,18 @@
 [package]
 name = "tree-sitter-kdl"
-description = "kdl grammar for the tree-sitter parsing library"
-version = "0.0.1"
-authors = ["amaanq (Amaan Qureshi) <amaanq12@gmail.com>"]
+description = "KDL grammar for tree-sitter"
+version = "1.0.2"
+authors = [
+	"Amaan Qureshi <amaanq12@gmail.com>",
+	"Andrew Hlynskyi <ahlincq@gmail.com>",
+]
+license = "MIT"
+readme = "bindings/rust/README.md"
 keywords = ["incremental", "parsing", "kdl"]
 categories = ["parsing", "text-editors"]
-repository = "https://github.com/tree-sitter/tree-sitter-kdl"
-edition = "2018"
-license = "MIT"
+repository = "https://github.com/amaanq/tree-sitter-kdl"
+edition = "2021"
+autoexamples = false
 
 build = "bindings/rust/build.rs"
 include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]

package/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2023 Amaan Qureshi <amaanq12@gmail.com>, Andrew Hlynskyi <ahlincq@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/Package.swift

@@ -0,0 +1,38 @@
+// swift-tools-version:5.3
+import PackageDescription
+
+let package = Package(
+    name: "TreeSitterKDL",
+    platforms: [.macOS(.v10_13), .iOS(.v11)],
+    products: [
+        .library(name: "TreeSitterKDL", targets: ["TreeSitterKDL"]),
+    ],
+    dependencies: [],
+    targets: [
+        .target(name: "TreeSitterKDL",
+                path: ".",
+                exclude: [
+                    "binding.gyp",
+                    "bindings",
+                    "Cargo.toml",
+                    "test",
+                    "examples",
+                    "grammar.js",
+                    "LICENSE",
+                    "package.json",
+                    "README.md",
+                    "script",
+                    "src/grammar.json",
+                    "src/node-types.json",
+                ],
+                sources: [
+                    "src/parser.c",
+                    "src/scanner.c",
+                ],
+                resources: [
+                    .copy("queries")
+                ],
+                publicHeadersPath: "bindings/swift",
+                cSettings: [.headerSearchPath("src")])
+    ]
+)

package/README.md

@@ -1,5 +1,8 @@
 # tree-sitter-kdl
 
+[![Build Status](https://github.com/amaanq/tree-sitter-kdl/actions/workflows/ci.yml/badge.svg)](https://github.com/amaanq/tree-sitter-kdl/actions/workflows/ci.yml)
+[![Discord](https://img.shields.io/discord/1063097320771698699?logo=discord)](https://discord.gg/w7nTvsVJhm)
+
 KDL grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter)
 
 Adapted from the [official spec](https://github.com/kdl-org/kdl/blob/main/SPEC.md)

package/binding.gyp

@@ -10,7 +10,6 @@
         "bindings/node/binding.cc",
         "src/parser.c",
 		"src/scanner.c",
-        # If your language uses an external scanner, add it here.
       ],
       "cflags_c": [
         "-std=c99",

package/bindings/node/binding.cc

@@ -1,10 +1,10 @@
+#include "nan.h"
 #include "tree_sitter/parser.h"
 #include <node.h>
-#include "nan.h"
 
 using namespace v8;
 
-extern "C" TSLanguage * tree_sitter_kdl();
+extern "C" TSLanguage *tree_sitter_kdl();
 
 namespace {
 
@@ -16,13 +16,15 @@ void Init(Local<Object> exports, Local<Object> module) {
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
 
   Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
-  Local<Object> instance = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
+  Local<Object> instance =
+      constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
   Nan::SetInternalFieldPointer(instance, 0, tree_sitter_kdl());
 
-  Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("kdl").ToLocalChecked());
+  Nan::Set(instance, Nan::New("name").ToLocalChecked(),
+           Nan::New("kdl").ToLocalChecked());
   Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
 }
 
 NODE_MODULE(tree_sitter_kdl_binding, Init)
 
-}  // namespace
+} // namespace

package/bindings/node/index.js

@@ -1,19 +1,19 @@
 try {
-  module.exports = require("../../build/Release/tree_sitter_kdl_binding");
+  module.exports = require('../../build/Release/tree_sitter_kdl_binding');
 } catch (error1) {
   if (error1.code !== 'MODULE_NOT_FOUND') {
     throw error1;
   }
   try {
-    module.exports = require("../../build/Debug/tree_sitter_kdl_binding");
+    module.exports = require('../../build/Debug/tree_sitter_kdl_binding');
   } catch (error2) {
     if (error2.code !== 'MODULE_NOT_FOUND') {
       throw error2;
     }
-    throw error1
+    throw error1;
   }
 }
 
 try {
-  module.exports.nodeTypeInfo = require("../../src/node-types.json");
+  module.exports.nodeTypeInfo = require('../../src/node-types.json');
 } catch (_) {}

package/bindings/rust/README.md

@@ -0,0 +1,36 @@
+# tree-sitter-kdl
+
+This crate provides a KDL grammar for the [tree-sitter][] parsing library. To
+use this crate, add it to the `[dependencies]` section of your `Cargo.toml`
+file. (Note that you will probably also need to depend on the
+[`tree-sitter`][tree-sitter crate] crate to use the parsed result in any useful
+way.)
+
+```toml
+[dependencies]
+tree-sitter = "~0.20.3"
+tree-sitter-kdl = "1.0.2"
+```
+
+Typically, you will use the [language][language func] function to add this
+grammar to a tree-sitter [Parser][], and then use the parser to parse some code:
+
+```rust
+let code = r#"
+    fn double(x: i32) -> i32 {
+        x * 2
+    }
+"#;
+let mut parser = Parser::new();
+parser.set_language(tree_sitter_kdl::language()).expect("Error loading KDL grammar");
+let parsed = parser.parse(code, None);
+```
+
+If you have any questions, please reach out to us in the [tree-sitter
+discussions] page.
+
+[language func]: https://docs.rs/tree-sitter-kdl/*/tree_sitter_kdl/fn.language.html
+[parser]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Parser.html
+[tree-sitter]: https://tree-sitter.github.io/
+[tree-sitter crate]: https://crates.io/crates/tree-sitter
+[tree-sitter discussions]: https://github.com/tree-sitter/tree-sitter/discussions

package/bindings/rust/build.rs

@@ -10,29 +10,10 @@ fn main() {
     let parser_path = src_dir.join("parser.c");
     c_config.file(&parser_path);
 
-    // If your language uses an external scanner written in C,
-    // then include this block of code:
-
     let scanner_path = src_dir.join("scanner.c");
     c_config.file(&scanner_path);
     println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
 
     c_config.compile("parser");
     println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
-
-    // If your language uses an external scanner written in C++,
-    // then include this block of code:
-
-    /*
-    let mut cpp_config = cc::Build::new();
-    cpp_config.cpp(true);
-    cpp_config.include(&src_dir);
-    cpp_config
-        .flag_if_supported("-Wno-unused-parameter")
-        .flag_if_supported("-Wno-unused-but-set-variable");
-    let scanner_path = src_dir.join("scanner.cc");
-    cpp_config.file(&scanner_path);
-    cpp_config.compile("scanner");
-    println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
-    */
 }

package/bindings/rust/lib.rs

@@ -1,4 +1,9 @@
-//! This crate provides kdl language support for the [tree-sitter][] parsing library.
+// ------------------------------------------------------------------------------------------------
+// Copyright © 2023, Amaan Qureshi <amaanq12@gmail.com>, Andrew Hlynskyi <ahlincq@gmail.com>
+// See the LICENSE file in this repo for license details.
+// ------------------------------------------------------------------------------------------------
+
+//! This crate provides KDL language support for the [tree-sitter][] parsing library.
 //!
 //! Typically, you will use the [language][language func] function to add this language to a
 //! tree-sitter [Parser][], and then use the parser to parse some code:
@@ -28,18 +33,25 @@ pub fn language() -> Language {
     unsafe { tree_sitter_kdl() }
 }
 
-/// The content of the [`node-types.json`][] file for this grammar.
-///
-/// [`node-types.json`]: https://tree-sitter.github.io/tree-sitter/using-parsers#static-node-types
-pub const NODE_TYPES: &'static str = include_str!("../../src/node-types.json");
+/// The source of the Rust tree-sitter grammar description.
+pub const GRAMMAR: &str = include_str!("../../grammar.js");
+
+/// The syntax highlighting query for this language.
+pub const HIGHLIGHTS_QUERY: &str = include_str!("../../queries/highlights.scm");
 
-// Uncomment these to include any queries that this grammar contains
+/// The injection query for this language.
+pub const INJECTIONS_QUERY: &str = include_str!("../../queries/injections.scm");
+
+/// The symbol tagging query for this language.
+pub const LOCALS_QUERY: &str = include_str!("../../queries/locals.scm");
 
-// pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm");
-// pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm");
-// pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm");
 // pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm");
 
+/// The content of the [`node-types.json`][] file for this grammar.
+///
+/// [`node-types.json`]: https://tree-sitter.github.io/tree-sitter/using-parsers#static-node-types
+pub const NODE_TYPES: &str = include_str!("../../src/node-types.json");
+
 #[cfg(test)]
 mod tests {
     #[test]
@@ -47,6 +59,6 @@ mod tests {
         let mut parser = tree_sitter::Parser::new();
         parser
             .set_language(super::language())
-            .expect("Error loading kdl language");
+            .expect("Error loading KDL grammar");
     }
 }

package/bindings/swift/kdl.h

@@ -0,0 +1,16 @@
+#ifndef TREE_SITTER_KDL_H_
+#define TREE_SITTER_KDL_H_
+
+typedef struct TSLanguage TSLanguage;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern TSLanguage *tree_sitter_kdl();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TREE_SITTER_KDL_H_

package/grammar.js

@@ -1,4 +1,13 @@
+/**
+ * @file KDL grammar for tree-sitter
+ * @author Amaan Qureshi <amaanq12@gmail.com>
+ * @license MIT
+ * @see {@link https://kdl.dev|official website}
+ * @see {@link https://github.com/kdl-org/kdl/blob/main/SPEC.md|official syntax spec}
+ */
+
 // deno-lint-ignore-file no-control-regex
+/* eslint-disable arrow-parens */
 /* eslint-disable camelcase */
 /* eslint-disable-next-line spaced-comment */
 /// <reference types="tree-sitter-cli/dsl" />
@@ -51,21 +60,21 @@ const ANNOTATION_BUILTINS = [
 module.exports = grammar({
   name: 'kdl',
 
-  conflicts: ($) => [
+  conflicts: $ => [
     [$.document],
     [$._node_space],
     [$.node_children],
   ],
 
-  extras: ($) => [$.multi_line_comment],
+  extras: $ => [$.multi_line_comment],
 
-  externals: ($) => [$._eof],
+  externals: $ => [$._eof],
 
-  word: ($) => $._normal_bare_identifier,
+  word: $ => $._normal_bare_identifier,
 
   rules: {
     // nodes := linespace* (node nodes?)? linespace*
-    document: ($) =>
+    document: $ =>
       seq(
         repeat($._linespace),
         optional(seq(
@@ -79,7 +88,7 @@ module.exports = grammar({
       ),
 
     // node := ('/-' node-space*)? type? identifier (node-space+ node-prop-or-arg)* (node-space* node-children ws*)? node-space* node-terminator
-    node: ($) => prec(PREC.node,
+    node: $ => prec(PREC.node,
       seq(
         alias(optional(seq('/-', repeat($._node_space))), $.node_comment),
         optional($.type),
@@ -92,16 +101,16 @@ module.exports = grammar({
     ),
 
     // node-prop-or-arg (field) := ('/-' node-space*)? (prop | value)
-    // _node_prop_or_arg: ($) =>
+    // _node_prop_or_arg: $ =>
     //   seq(
     //     alias(optional(seq('/-', repeat($._node_space))), $.node_prop_or_arg_slash_dash),
     //     field('node_prop_or_arg', choice($.prop, $.value)),
     //   ),
-    node_field: ($) => choice($._node_field_comment, $._node_field),
-    _node_field_comment: ($) => alias(seq('/-', repeat($._node_space), $._node_field), $.node_field_comment),
-    _node_field: ($) => choice($.prop, $.value),
+    node_field: $ => choice($._node_field_comment, $._node_field),
+    _node_field_comment: $ => alias(seq('/-', repeat($._node_space), $._node_field), $.node_field_comment),
+    _node_field: $ => choice($.prop, $.value),
     // node-children := ('/-' node-space*)? '{' nodes '}'
-    node_children: ($) =>
+    node_children: $ =>
       seq(
         optional(seq(alias('/-', $.node_children_comment), repeat($._node_space))),
         '{',
@@ -113,26 +122,25 @@ module.exports = grammar({
         '}',
       ),
     // node-space := ws* escline ws* | ws+
-    _node_space: ($) =>
+    _node_space: $ =>
       choice(
         seq(repeat($._ws), $._escline, repeat($._ws)),
         repeat1($._ws),
       ),
     // node-terminator := single-line-comment | newline | ';' | eof
-    _node_terminator: ($) =>
+    _node_terminator: $ =>
       choice($.single_line_comment, $._newline, ';', $._eof),
 
-
     // identifier := string | bare-identifier
-    identifier: ($) => choice($.string, $._bare_identifier),
+    identifier: $ => choice($.string, $._bare_identifier),
     // bare-identifier := ((identifier-char - digit - sign) identifier-char* | sign ((identifier-char - digit) identifier-char*)?) - keyword
-    _bare_identifier: ($) =>
+    _bare_identifier: $ =>
       choice(
         $._normal_bare_identifier,
         seq($._sign, optional(seq($.__identifier_char_no_digit, repeat($._identifier_char)))),
       ),
 
-    // _normal_bare_identifier: ($) => $.__identifier_char_no_digit_sign,
+    // _normal_bare_identifier: $ => $.__identifier_char_no_digit_sign,
     _normal_bare_identifier: () => token(
       seq(
         /[\u4E00-\u9FFF\p{L}\p{M}\p{N}\p{Emoji}_~!@#\$%\^&\*.:'\|\?&&[^\s\d\/(){}<>;\[\]=,"]]/,
@@ -155,23 +163,23 @@ module.exports = grammar({
     ),
 
     // keyword := boolean | 'null'
-    keyword: ($) => choice($.boolean, 'null'),
+    keyword: $ => choice($.boolean, 'null'),
     // type annotations
     annotation_type: () => choice(...ANNOTATION_BUILTINS),
     // prop := identifier '=' value
-    prop: ($) => seq($.identifier, '=', $.value),
+    prop: $ => seq($.identifier, '=', $.value),
     // value := type? (string | number | keyword)
-    value: ($) => seq(optional($.type), choice($.string, $.number, $.keyword)),
+    value: $ => seq(optional($.type), choice($.string, $.number, $.keyword)),
     // type := '(' identifier ')'
-    type: ($) => seq('(', choice($.identifier, $.annotation_type), ')'),
+    type: $ => seq('(', choice($.identifier, $.annotation_type), ')'),
 
     // String
     // string := raw-string | escaped-string
-    string: ($) => choice($._raw_string, $._escaped_string),
+    string: $ => choice($._raw_string, $._escaped_string),
     // escaped-string := '"' character* '"'
-    _escaped_string: ($) => seq('"', alias(repeat(choice($.escape, /[^"]/)), $.string_fragment), '"'),
+    _escaped_string: $ => seq('"', alias(repeat(choice($.escape, /[^"]/)), $.string_fragment), '"'),
     // character := '\' escape | [^\"]
-    _character: ($) => choice($.escape, /[^"]/),
+    _character: $ => choice($.escape, /[^"]/),
     // escape := ["\\/bfnrt] | 'u{' hex-digit{1, 6} '}'
     escape: () =>
       token.immediate(/\\\\|\\"|\\\/|\\b|\\f|\\n|\\r|\\t|\\u\{[0-9a-fA-F]{1,6}\}/),
@@ -179,9 +187,9 @@ module.exports = grammar({
     _hex_digit: () => /[0-9a-fA-F]/,
 
     // // raw-string := 'r' raw-string-hash
-    // raw_string: ($) => seq('r', $._raw_string_hash),
+    // raw_string: $ => seq('r', $._raw_string_hash),
     // // raw-string-hash := '#' raw-string-hash '#' | raw-string-quotes
-    // _raw_string_hash: ($) => choice(seq('#', $._raw_string_hash, '#'), $._raw_string_quotes),
+    // _raw_string_hash: $ => choice(seq('#', $._raw_string_hash, '#'), $._raw_string_quotes),
     // // raw-string-quotes := '"' .* '"'
     // _raw_string_quotes: () => seq('"', /.*/, '"'),
     _raw_string: () =>
@@ -195,12 +203,11 @@ module.exports = grammar({
         ),
       ),
 
-
     // number := decimal | hex | octal | binary
-    number: ($) => choice($._decimal, $._hex, $._octal, $._binary),
+    number: $ => choice($._decimal, $._hex, $._octal, $._binary),
 
     // decimal := sign? integer ('.' integer)? exponent?
-    _decimal: ($) =>
+    _decimal: $ =>
       seq(
         optional($._sign),
         $._integer,
@@ -209,29 +216,29 @@ module.exports = grammar({
       ),
 
     // exponent := ('e' | 'E') sign? integer
-    _exponent: ($) => seq(choice('e', 'E'), optional($._sign), $._integer),
+    _exponent: $ => seq(choice('e', 'E'), optional($._sign), $._integer),
     // integer := digit (digit | '_')*
-    _integer: ($) => seq($._digit, repeat(choice($._digit, '_'))),
+    _integer: $ => seq($._digit, repeat(choice($._digit, '_'))),
     // digit := [0-9]
     _digit: () => /[0-9]/,
     // sign := '+' | '-'
     _sign: () => choice('+', '-'),
 
     // hex := sign? '0x' hex-digit (hex-digit | '_')*
-    _hex: ($) => seq(optional($._sign), '0x', $._hex_digit, repeat(choice($._hex_digit, '_'))),
+    _hex: $ => seq(optional($._sign), '0x', $._hex_digit, repeat(choice($._hex_digit, '_'))),
     // octal := sign? '0o' [0-7] [0-7_]*
-    _octal: ($) => seq(optional($._sign), '0o', /[0-7]/, repeat(choice(/[0-7]/, '_'))),
+    _octal: $ => seq(optional($._sign), '0o', /[0-7]/, repeat(choice(/[0-7]/, '_'))),
     // binary := sign? '0b' ('0' | '1') ('0' | '1' | '_')*
-    _binary: ($) => seq(optional($._sign), '0b', choice('0', '1'), repeat(choice('0', '1', '_'))),
+    _binary: $ => seq(optional($._sign), '0b', choice('0', '1'), repeat(choice('0', '1', '_'))),
 
     // boolean := 'true' | 'false'
     boolean: () => choice('true', 'false'),
 
     // escline := '\\' ws* (single-line-comment | newline)
-    _escline: ($) => seq('\\', repeat($._ws), choice($.single_line_comment, $._newline)),
+    _escline: $ => seq('\\', repeat($._ws), choice($.single_line_comment, $._newline)),
 
     // linespace := newline | ws | single-line-comment
-    _linespace: ($) => choice($._newline, $._ws, $.single_line_comment),
+    _linespace: $ => choice($._newline, $._ws, $.single_line_comment),
 
     // newline := See Table (All line-break white_space)
     // Newline
@@ -251,7 +258,7 @@ module.exports = grammar({
     _newline: () => choice(/\r'/, /\n/, /\r\n/, /\u0085/, /\u000C/, /\u2028/, /\u2029/),
 
     // ws := bom | unicode-space | multi-line-comment
-    _ws: ($) => choice($._bom, $._unicode_space, $.multi_line_comment),
+    _ws: $ => choice($._bom, $._unicode_space, $.multi_line_comment),
 
     // bom := '\u{FEFF}'
     _bom: () => /\u{FEFF}/,
@@ -285,17 +292,17 @@ module.exports = grammar({
       /[\u0009\u0020\u00A0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000]/,
 
     // single-line-comment := '//' ^newline+ (newline | eof)
-    single_line_comment: ($) =>
+    single_line_comment: $ =>
       seq(
         '//',
         repeat1(/[^\r\n\u0085\u000C\u2028\u2029]/),
         choice($._newline, $._eof),
       ),
     // multi-line-comment := '/*' commented-block
-    multi_line_comment: ($) =>
+    multi_line_comment: $ =>
       seq('/*', repeat(prec.right(2, choice($.commented_block, /[^*\/]/))), '*/'),
     // commented-block := '*/' | (multi-line-comment | '*' | '/' | [^*/]+) commented-block
-    commented_block: ($) =>
+    commented_block: $ =>
       prec.right(1, seq(
         /[^*\/]/,
         repeat(choice($.multi_line_comment, /[^*\/]/)),

package/package.json

@@ -1,21 +1,18 @@
 {
   "name": "tree-sitter-kdl",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "KDL grammar for tree-sitter",
   "main": "bindings/node",
   "keywords": [
     "parser",
-    "lexer"
+    "lexer",
+    "kdl"
   ],
-  "author": "Amaan Qureshi",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/amaanq/tree-sitter-kdl.git"
-  },
-  "license": "ISC",
+  "author": "Amaan Qureshi <amaanq12@gmail.com>",
+  "contributors": [
+    "Andrew Hlynskyi <ahlincq@gmail.com>"
+  ],
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/amaanq/tree-sitter-kdl/issues"
   },
@@ -24,9 +21,26 @@
     "nan": "^2.17.0"
   },
   "devDependencies": {
-    "@types/node": "^18.11.18",
     "eslint": "^8.32.0",
     "eslint-config-google": "^0.14.0",
     "tree-sitter-cli": "^0.20.7"
-  }
+  },
+  "repository": "https://github.com/amaanq/tree-sitter-kdl",
+  "scripts": {
+    "build": "tree-sitter generate && node-gyp build",
+    "test": "tree-sitter test && script/parse-examples",
+    "parse": "tree-sitter parse",
+    "test-windows": "tree-sitter test"
+  },
+  "tree-sitter": [
+    {
+      "scope": "source.kdl",
+      "file-types": [
+        "kdl"
+      ],
+      "highlights": [
+        "queries/highlights.scm"
+      ]
+    }
+  ]
 }

package/queries/folds.scm

@@ -1,3 +1,8 @@
 ; Folds
 
-(node_children) @fold
+[
+  (node)
+  (node_children)
+  (string)
+  (multi_line_comment)
+] @fold

package/queries/highlights.scm

@@ -48,7 +48,7 @@
 [
   (single_line_comment)
   (multi_line_comment)
-] @comment
+] @comment @spell
 
 (node (node_comment) (#set! "priority" 105)) @comment
 (node (node_field (node_field_comment) (#set! "priority" 105)) @comment)

package/queries/indents.scm

@@ -0,0 +1,7 @@
+(node (node_children) @indent)
+
+"}" @indent_end
+
+[ "{" "}" ] @branch
+
+[ "(" ")" ] @branch

package/queries/injections.scm

@@ -0,0 +1,4 @@
+[
+  (single_line_comment)
+  (multi_line_comment)
+] @comment