@willbooster/tree-sitter-kotlin 1.3.2 → 1.4.1

package/README.md

@@ -1,12 +1,12 @@
 # @willbooster/tree-sitter-kotlin
 
 [![npm version](https://img.shields.io/npm/v/@willbooster/tree-sitter-kotlin.svg)](https://www.npmjs.com/package/@willbooster/tree-sitter-kotlin)
-[![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-kotlin.svg)](https://crates.io/crates/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.2-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.26.0-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-kotlin.svg)](https://crates.io/crates/willbooster-tree-sitter-kotlin)
 
 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
@@ -16,11 +16,15 @@ 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):
+The npm package ships `tree-sitter-kotlin.wasm` for
+[@willbooster/web-tree-sitter](https://www.npmjs.com/package/@willbooster/web-tree-sitter), which runs in Node.js, Bun,
+browsers, and Cloudflare Workers.
+
+In Node.js and Bun:
 
 ```js
 import { fileURLToPath } from 'node:url';
-import { Language, Parser } from 'web-tree-sitter';
+import { Language, Parser } from '@willbooster/web-tree-sitter';
 
 await Parser.init();
 const parser = new Parser();
@@ -29,6 +33,31 @@ parser.setLanguage(await Language.load(wasmPath));
 const tree = parser.parse('fun main() = println("Hello")\n');
 ```
 
+In browsers, load both `.wasm` files by URL. With Vite:
+
+```js
+import { Language, Parser } from '@willbooster/web-tree-sitter';
+import runtimeUrl from '@willbooster/web-tree-sitter/web-tree-sitter.wasm?url';
+import kotlinUrl from '@willbooster/tree-sitter-kotlin/tree-sitter-kotlin.wasm?url';
+
+await Parser.init({ locateFile: () => runtimeUrl });
+const parser = new Parser();
+parser.setLanguage(await Language.load(kotlinUrl));
+```
+
+In Cloudflare Workers, which do not allow compiling Wasm at run time, import both `.wasm` files as modules (with or
+without Node.js compatibility):
+
+```js
+import { Language, Parser } from '@willbooster/web-tree-sitter';
+import runtime from '@willbooster/web-tree-sitter/web-tree-sitter.wasm';
+import kotlin from '@willbooster/tree-sitter-kotlin/tree-sitter-kotlin.wasm';
+
+await Parser.init({ wasmModule: runtime });
+const parser = new Parser();
+parser.setLanguage(await Language.load(kotlin));
+```
+
 The package also ships the node types in `src/node-types.json`.
 
 In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-kotlin):
@@ -49,6 +78,7 @@ parser.set_language(&tree_sitter_kotlin::LANGUAGE.into())?;
 ```sh
 mise install
 bun install --frozen-lockfile
+bun run test/ci-setup
 bun run build/ci
 bun run test
 script/parse-examples
@@ -67,7 +97,10 @@ cargo test
   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 Wasm build through
-  web-tree-sitter, which `bun run build/ci` rebuilds after regenerating the parser.
+  @willbooster/web-tree-sitter, which `bun run build/ci` rebuilds after regenerating the parser;
+- checks that the Wasm build parses Kotlin through @willbooster/web-tree-sitter in Chromium
+  (`test/unit/browser.test.ts`) and in Cloudflare Workers with and without
+  Node.js compatibility (`test/unit/workers.test.ts`).
 
 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`).

package/grammar.js

@@ -49,6 +49,8 @@ module.exports = grammar({
     [$.parameter_modifiers, $.type_modifiers],
     [$.function_modifier, $.type_modifiers],
     [$.function_modifier, $._reserved_identifier],
+    [$.function_modifier, $.type_modifiers, $._reserved_identifier],
+    [$.type_modifiers, $._reserved_identifier],
     [$.variable_declaration, $.type_modifiers],
     [$.variable_declaration, $.type_modifiers, $.modifiers, $.annotated_expression],
     [$.variable_declaration, $.type_modifiers, $.annotated_expression],
@@ -61,6 +63,9 @@ module.exports = grammar({
     [$.class_modifier, $._reserved_identifier],
     [$.platform_modifier, $._reserved_identifier],
     [$.property_modifier, $._reserved_identifier],
+    [$.inheritance_modifier, $._reserved_identifier],
+    [$.visibility_modifier, $._reserved_identifier],
+    [$.member_modifier, $._reserved_identifier],
 
     [$.explicit_delegation, $.expression],
     [$.qualified_identifier],
@@ -87,6 +92,8 @@ module.exports = grammar({
     'set',
     // used to check if we can parse a comment
     '$',
+    // used to check if a modifier alone on its line belongs to a declaration on the next line
+    'val',
   ],
 
   inline: ($) => [$._statements, $._identifier, $._control_structure_body],
@@ -371,17 +378,22 @@ module.exports = grammar({
         )
       ),
 
-    class_modifier: () => choice('enum', 'sealed', 'annotation', 'data', 'inner', 'value'),
+    // A modifier keyword that `_reserved_identifier` also accepts as a name makes `@A\nsealed interface B` parse as
+    // an infix call as well, since `interface` lexes as an identifier where no keyword is valid, so the modifier
+    // reading takes dynamic precedence. The name takes none: it would outweigh the modifiers again wherever a
+    // reading has more names, such as `get` calls in a class body misread as a trailing lambda.
+    class_modifier: () => prec.dynamic(1, choice('enum', 'sealed', 'annotation', 'data', 'inner', 'value')),
 
-    function_modifier: () => prec.right(choice('tailrec', 'operator', 'infix', 'inline', 'external', 'suspend')),
+    function_modifier: () =>
+      prec.dynamic(1, prec.right(choice('tailrec', 'operator', 'infix', 'inline', 'external', 'suspend'))),
 
-    property_modifier: () => 'const',
+    property_modifier: () => prec.dynamic(1, 'const'),
 
-    visibility_modifier: () => choice('public', 'private', 'protected', 'internal'),
+    visibility_modifier: () => prec.dynamic(1, choice('public', 'private', 'protected', 'internal')),
 
-    inheritance_modifier: () => choice('abstract', 'final', 'open'),
+    inheritance_modifier: () => prec.dynamic(1, choice('abstract', 'final', 'open')),
 
-    member_modifier: () => choice('override', 'lateinit'),
+    member_modifier: () => prec.dynamic(1, choice('override', 'lateinit')),
 
     parameter_modifiers: ($) => repeat1(choice($.annotation, $.parameter_modifier)),
 
@@ -389,7 +401,7 @@ module.exports = grammar({
 
     reification_modifier: () => 'reified',
 
-    platform_modifier: () => choice('expect', 'actual'),
+    platform_modifier: () => prec.dynamic(1, choice('expect', 'actual')),
 
     type_modifiers: ($) => prec.right(repeat1(choice($.annotation, 'suspend'))),
 
@@ -746,25 +758,37 @@ module.exports = grammar({
     identifier: () => token(choice(/[\p{L}_][\p{L}_\p{Nd}]*/u, /`[^\r\n`]+`/)),
 
     _reserved_identifier: ($) =>
-      prec.dynamic(
-        1,
-        alias(
-          choice(
-            'actual',
-            'annotation',
-            'constructor',
-            'const',
-            'data',
-            'enum',
-            'expect',
-            'inner',
-            'get',
-            'set',
-            'operator',
-            'value'
-          ),
-          $.identifier
-        )
+      alias(
+        choice(
+          'abstract',
+          'actual',
+          'annotation',
+          'const',
+          'constructor',
+          'data',
+          'enum',
+          'expect',
+          'external',
+          'final',
+          'get',
+          'infix',
+          'inline',
+          'inner',
+          'internal',
+          'lateinit',
+          'open',
+          'operator',
+          'override',
+          'private',
+          'protected',
+          'public',
+          'sealed',
+          'set',
+          'suspend',
+          'tailrec',
+          'value'
+        ),
+        $.identifier
       ),
 
     shebang: () => /#!.*/,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-kotlin",
-  "version": "1.3.2",
+  "version": "1.4.1",
   "description": "Kotlin grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -33,6 +33,7 @@
     "start": "tree-sitter playground",
     "test": "bun wb test",
     "test/ci": "bun wb test-on-ci",
+    "test/ci-setup": "playwright install --with-deps chromium",
     "typecheck": "bun wb typecheck",
     "verify": "bun wb verify",
     "verify-full": "bun wb verify --full"
@@ -41,25 +42,30 @@
     "@semantic-release/exec": "7.1.0",
     "@tsconfig/bun": "1.0.11",
     "@types/bun": "1.4.2",
+    "@vitest/browser-playwright": "5.0.1",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/wb": "22.8.0",
+    "@willbooster/wb": "22.11.5",
+    "@willbooster/web-tree-sitter": "1.0.0",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
-    "oxfmt": "0.68.0",
-    "oxlint": "1.83.0",
+    "oxfmt": "0.70.0",
+    "oxlint": "1.85.0",
     "oxlint-tsgolint": "7.0.2002",
+    "playwright": "1.63.0",
     "semantic-release": "25.0.9",
     "sort-package-json": "4.0.0",
     "tree-sitter-cli": "0.27.0",
     "typescript": "7.0.2",
-    "web-tree-sitter": "0.27.0"
+    "vite": "8.3.0",
+    "vitest": "5.0.1",
+    "wrangler": "4.136.2"
   },
   "peerDependencies": {
-    "web-tree-sitter": "^0.27.0"
+    "@willbooster/web-tree-sitter": "^1.0.0"
   },
   "peerDependenciesMeta": {
-    "web-tree-sitter": {
+    "@willbooster/web-tree-sitter": {
       "optional": true
     }
   },

package/tree-sitter.json

@@ -13,7 +13,7 @@
     }
   ],
   "metadata": {
-    "version": "1.3.2",
+    "version": "1.4.1",
     "license": "MIT",
     "description": "Kotlin grammar for tree-sitter",
     "authors": [