@willbooster/tree-sitter-kotlin 1.1.0 → 1.2.0

package/README.md

@@ -3,8 +3,9 @@
 [![npm version](https://img.shields.io/npm/v/@willbooster/tree-sitter-kotlin.svg)](https://www.npmjs.com/package/@willbooster/tree-sitter-kotlin)
 [![license](https://img.shields.io/npm/l/@willbooster/tree-sitter-kotlin.svg)](https://www.npmjs.com/package/@willbooster/tree-sitter-kotlin)
 [![Test](https://github.com/WillBooster/tree-sitter-kotlin/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-kotlin/actions/workflows/test.yml)
+[![Test rust](https://github.com/WillBooster/tree-sitter-kotlin/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-kotlin/actions/workflows/test-rust.yml)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
-[![wbfy](https://img.shields.io/badge/wbfy-20.23.1-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.23.2-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 
 Kotlin grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
 [tree-sitter-grammars/tree-sitter-kotlin](https://github.com/tree-sitter-grammars/tree-sitter-kotlin). We are grateful
@@ -14,15 +15,21 @@ This fork fixes parsing bugs and raises conformance with the Kotlin grammar.
 
 ## Usage
 
+The npm package ships `tree-sitter-kotlin.wasm` for [web-tree-sitter](https://www.npmjs.com/package/web-tree-sitter):
+
 ```js
-const Parser = require('tree-sitter');
-const Kotlin = require('@willbooster/tree-sitter-kotlin');
+import { fileURLToPath } from 'node:url';
+import { Language, Parser } from 'web-tree-sitter';
 
+await Parser.init();
 const parser = new Parser();
-parser.setLanguage(Kotlin);
+const wasmPath = fileURLToPath(import.meta.resolve('@willbooster/tree-sitter-kotlin/tree-sitter-kotlin.wasm'));
+parser.setLanguage(await Language.load(wasmPath));
 const tree = parser.parse('fun main() = println("Hello")\n');
 ```
 
+The package also ships the node types in `src/node-types.json`.
+
 In Rust, depend on the Git repository; the crate is not published to crates.io:
 
 ```toml
@@ -53,16 +60,15 @@ cargo test
 - an incremental-parsing check (`test/unit/incremental.test.ts`): `tree-sitter fuzz` edits each corpus case at random,
   reparses it, undoes the edits, and reparses again. `TREE_SITTER_SEED`, `TREE_SITTER_ITERATIONS`, and
   `TREE_SITTER_EDITS` run other or more edits;
-- the Node.js binding test;
 - a check that real-world Kotlin files cloned into `examples/` fail to parse exactly as listed in
   `script/known-failures.txt`. The first run clones them. The example repositories are pinned to commits in
   `script/parse-examples`. After a grammar change or a moved pin alters that list, `script/parse-examples` rewrites
   it; review its diff before committing;
 - a performance check (`test/unit/performance.test.ts`) that recovering from an error on each of 10,000 lines takes
-  linear time, since consumers parse files while they are being edited. It loads the Node.js addon, which
-  `bun run build/ci` rebuilds after regenerating the parser.
+  linear time, since consumers parse files while they are being edited. It loads the Wasm build through
+  web-tree-sitter, which `bun run build/ci` rebuilds after regenerating the parser.
 
-CI also runs these tests on every platform that gets a prebuild, and fuzzes the parser with libFuzzer and sanitizers
+CI also runs these tests on Linux arm64 and macOS, where the Rust binding compiles the parser natively, and fuzzes the parser with libFuzzer and sanitizers
 (`.github/workflows/robustness.yml`).
 
 ### References

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-kotlin",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Kotlin grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -14,30 +14,21 @@
   },
   "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",
@@ -46,10 +37,6 @@
     "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",
@@ -59,22 +46,20 @@
     "@willbooster/wb": "22.8.0",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
-    "node-gyp": "13.0.2",
     "oxfmt": "0.68.0",
     "oxlint": "1.83.0",
     "oxlint-tsgolint": "7.0.2002",
-    "prebuildify": "^6.0.1",
     "semantic-release": "25.0.9",
     "sort-package-json": "4.0.0",
-    "tree-sitter": "^0.25.0",
-    "tree-sitter-cli": "^0.27.0",
-    "typescript": "7.0.2"
+    "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/tree-sitter.json

@@ -13,7 +13,7 @@
     }
   ],
   "metadata": {
-    "version": "1.1.0",
+    "version": "1.2.0",
     "license": "MIT",
     "description": "Kotlin grammar for tree-sitter",
     "authors": [
@@ -26,13 +26,13 @@
     }
   },
   "bindings": {
-    "c": true,
-    "go": true,
+    "c": false,
+    "go": false,
     "java": false,
-    "node": true,
-    "python": true,
+    "node": false,
+    "python": false,
     "rust": true,
-    "swift": 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 (_) {}