@willbooster/tree-sitter-kotlin 1.0.0 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-kotlin",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Kotlin grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -14,58 +14,52 @@
   },
   "license": "MIT",
   "author": "WillBooster Inc.",
-  "main": "bindings/node",
-  "types": "bindings/node",
   "files": [
     "grammar.js",
     "tree-sitter.json",
-    "binding.gyp",
-    "prebuilds/**",
-    "bindings/node/*",
-    "queries/*",
-    "src/**",
+    "src/node-types.json",
     "*.wasm"
   ],
   "scripts": {
-    "build-prebuilds": "prebuildify --napi --strip --name tree-sitter-kotlin",
     "build-wasm": "tree-sitter build --wasm",
-    "build/ci": "tree-sitter generate && node-gyp rebuild",
+    "build/ci": "tree-sitter generate && tree-sitter build --wasm",
     "cleanup": "bun wb lint --fix --format",
     "format": "bun wb lint --format",
-    "install": "node-gyp-build",
     "lint": "bun wb lint",
     "lint-fix": "bun wb lint --fix",
     "prepare": "(bun lefthook install || true) && (test ! -f .lefthook/normalize-bun-lockfile.sh || bash .lefthook/normalize-bun-lockfile.sh)",
     "release": "wb release",
-    "release-test": "node node_modules/semantic-release/bin/semantic-release.js --dry-run --plugins @semantic-release/commit-analyzer @semantic-release/release-notes-generator",
     "prestart": "bun run build-wasm",
     "start": "tree-sitter playground",
     "test": "bun wb test",
     "test/ci": "bun wb test-on-ci",
+    "typecheck": "bun wb typecheck",
     "verify": "bun wb verify",
     "verify-full": "bun wb verify --full"
   },
-  "dependencies": {
-    "node-addon-api": "^8.3.0",
-    "node-gyp-build": "^4.8.4"
-  },
   "devDependencies": {
     "@semantic-release/exec": "7.1.0",
+    "@tsconfig/bun": "1.0.11",
+    "@types/bun": "1.4.2",
+    "@willbooster/oxfmt-config": "1.2.2",
+    "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.8.0",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
-    "node-gyp": "13.0.2",
-    "prebuildify": "^6.0.1",
+    "oxfmt": "0.68.0",
+    "oxlint": "1.83.0",
+    "oxlint-tsgolint": "7.0.2002",
     "semantic-release": "25.0.9",
     "sort-package-json": "4.0.0",
-    "tree-sitter": "^0.25.0",
-    "tree-sitter-cli": "^0.27.0"
+    "tree-sitter-cli": "0.27.0",
+    "typescript": "7.0.2",
+    "web-tree-sitter": "0.27.0"
   },
   "peerDependencies": {
-    "tree-sitter": "^0.25.0"
+    "web-tree-sitter": "^0.27.0"
   },
   "peerDependenciesMeta": {
-    "tree-sitter": {
+    "web-tree-sitter": {
       "optional": true
     }
   },

package/src/node-types.json

@@ -51,6 +51,14 @@
     "type": "expression",
     "named": true,
     "subtypes": [
+      {
+        "type": "break_expression",
+        "named": true
+      },
+      {
+        "type": "continue_expression",
+        "named": true
+      },
       {
         "type": "index_expression",
         "named": true
@@ -551,6 +559,22 @@
       ]
     }
   },
+  {
+    "type": "break_expression",
+    "named": true,
+    "fields": {
+      "label": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "identifier",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "call_expression",
     "named": true,
@@ -846,6 +870,22 @@
       ]
     }
   },
+  {
+    "type": "continue_expression",
+    "named": true,
+    "fields": {
+      "label": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "identifier",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
   {
     "type": "delegation_specifier",
     "named": true,
@@ -892,6 +932,20 @@
     "type": "do_while_statement",
     "named": true,
     "fields": {
+      "body": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "block",
+            "named": true
+          },
+          {
+            "type": "statement",
+            "named": true
+          }
+        ]
+      },
       "condition": {
         "multiple": false,
         "required": true,
@@ -904,20 +958,12 @@
       }
     },
     "children": {
-      "multiple": true,
+      "multiple": false,
       "required": false,
       "types": [
-        {
-          "type": "block",
-          "named": true
-        },
         {
           "type": "label",
           "named": true
-        },
-        {
-          "type": "statement",
-          "named": true
         }
       ]
     }
@@ -1024,7 +1070,22 @@
   {
     "type": "for_statement",
     "named": true,
-    "fields": {},
+    "fields": {
+      "body": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "block",
+            "named": true
+          },
+          {
+            "type": "statement",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
       "required": true,
@@ -1034,7 +1095,7 @@
           "named": true
         },
         {
-          "type": "block",
+          "type": "expression",
           "named": true
         },
         {
@@ -1045,10 +1106,6 @@
           "type": "multi_variable_declaration",
           "named": true
         },
-        {
-          "type": "statement",
-          "named": true
-        },
         {
           "type": "variable_declaration",
           "named": true
@@ -1222,6 +1279,24 @@
     "type": "if_expression",
     "named": true,
     "fields": {
+      "alternative": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "assignment",
+            "named": true
+          },
+          {
+            "type": "block",
+            "named": true
+          },
+          {
+            "type": "expression",
+            "named": true
+          }
+        ]
+      },
       "condition": {
         "multiple": false,
         "required": true,
@@ -1231,25 +1306,25 @@
             "named": true
           }
         ]
+      },
+      "consequence": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "assignment",
+            "named": true
+          },
+          {
+            "type": "block",
+            "named": true
+          },
+          {
+            "type": "expression",
+            "named": true
+          }
+        ]
       }
-    },
-    "children": {
-      "multiple": true,
-      "required": false,
-      "types": [
-        {
-          "type": "assignment",
-          "named": true
-        },
-        {
-          "type": "block",
-          "named": true
-        },
-        {
-          "type": "expression",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -2442,6 +2517,20 @@
     "type": "when_entry",
     "named": true,
     "fields": {
+      "body": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "block",
+            "named": true
+          },
+          {
+            "type": "statement",
+            "named": true
+          }
+        ]
+      },
       "condition": {
         "multiple": true,
         "required": false,
@@ -2460,20 +2549,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "block",
-          "named": true
-        },
-        {
-          "type": "statement",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -2522,6 +2597,20 @@
     "type": "while_statement",
     "named": true,
     "fields": {
+      "body": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "block",
+            "named": true
+          },
+          {
+            "type": "statement",
+            "named": true
+          }
+        ]
+      },
       "condition": {
         "multiple": false,
         "required": true,
@@ -2534,20 +2623,12 @@
       }
     },
     "children": {
-      "multiple": true,
+      "multiple": false,
       "required": false,
       "types": [
-        {
-          "type": "block",
-          "named": true
-        },
         {
           "type": "label",
           "named": true
-        },
-        {
-          "type": "statement",
-          "named": true
         }
       ]
     }
@@ -2773,6 +2854,14 @@
     "named": true,
     "extra": true
   },
+  {
+    "type": "break",
+    "named": false
+  },
+  {
+    "type": "break@",
+    "named": false
+  },
   {
     "type": "by",
     "named": false
@@ -2797,6 +2886,14 @@
     "type": "constructor",
     "named": false
   },
+  {
+    "type": "continue",
+    "named": false
+  },
+  {
+    "type": "continue@",
+    "named": false
+  },
   {
     "type": "crossinline",
     "named": false

package/tree-sitter.json

@@ -13,7 +13,7 @@
     }
   ],
   "metadata": {
-    "version": "1.0.0",
+    "version": "1.2.0",
     "license": "MIT",
     "description": "Kotlin grammar for tree-sitter",
     "authors": [
@@ -26,11 +26,13 @@
     }
   },
   "bindings": {
-    "c": true,
-    "go": true,
-    "node": true,
-    "python": true,
-    "rust": false,
-    "swift": true
+    "c": false,
+    "go": false,
+    "java": false,
+    "node": false,
+    "python": false,
+    "rust": true,
+    "swift": false,
+    "zig": false
   }
 }

package/binding.gyp

@@ -1,30 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "tree_sitter_kotlin_binding",
-      "dependencies": [
-        "<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except",
-      ],
-      "include_dirs": [
-        "src",
-      ],
-      "sources": [
-        "bindings/node/binding.cc",
-        "src/parser.c",
-        "src/scanner.c",
-      ],
-      "conditions": [
-        ["OS!='win'", {
-          "cflags_c": [
-            "-std=c11",
-          ],
-        }, { # OS == "win"
-          "cflags_c": [
-            "/std:c11",
-            "/utf-8",
-          ],
-        }],
-      ],
-    }
-  ]
-}

package/bindings/node/binding.cc

@@ -1,20 +0,0 @@
-#include <napi.h>
-
-typedef struct TSLanguage TSLanguage;
-
-extern "C" TSLanguage *tree_sitter_kotlin();
-
-// "tree-sitter", "language" hashed with BLAKE2
-const napi_type_tag LANGUAGE_TYPE_TAG = {
-    0x8AF2E5212AD58ABF, 0xD5006CAD83ABBA16
-};
-
-Napi::Object Init(Napi::Env env, Napi::Object exports) {
-    exports["name"] = Napi::String::New(env, "kotlin");
-    auto language = Napi::External<TSLanguage>::New(env, tree_sitter_kotlin());
-    language.TypeTag(&LANGUAGE_TYPE_TAG);
-    exports["language"] = language;
-    return exports;
-}
-
-NODE_API_MODULE(tree_sitter_kotlin_binding, Init)

package/bindings/node/binding_test.js

@@ -1,9 +0,0 @@
-const assert = require("node:assert");
-const { test } = require("node:test");
-
-const Parser = require("tree-sitter");
-
-test("can load grammar", () => {
-  const parser = new Parser();
-  assert.doesNotThrow(() => parser.setLanguage(require(".")));
-});

package/bindings/node/index.d.ts

@@ -1,28 +0,0 @@
-type BaseNode = {
-  type: string;
-  named: boolean;
-};
-
-type ChildNode = {
-  multiple: boolean;
-  required: boolean;
-  types: BaseNode[];
-};
-
-type NodeInfo =
-  | (BaseNode & {
-      subtypes: BaseNode[];
-    })
-  | (BaseNode & {
-      fields: { [name: string]: ChildNode };
-      children: ChildNode[];
-    });
-
-type Language = {
-  name: string;
-  language: unknown;
-  nodeTypeInfo: NodeInfo[];
-};
-
-declare const language: Language;
-export = language;

package/bindings/node/index.js

@@ -1,11 +0,0 @@
-const root = require("path").join(__dirname, "..", "..");
-
-module.exports =
-  typeof process.versions.bun === "string"
-    // Support `bun build --compile` by being statically analyzable enough to find the .node file at build-time
-    ? require(`../../prebuilds/${process.platform}-${process.arch}/tree-sitter-kotlin.node`)
-    : require("node-gyp-build")(root);
-
-try {
-  module.exports.nodeTypeInfo = require("../../src/node-types.json");
-} catch (_) {}