@willbooster/tree-sitter-kotlin 1.3.1 → 1.4.0

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

@@ -45,6 +45,7 @@ module.exports = grammar({
     [$._loop_prefix, $.annotated_expression],
     [$._loop_prefix, $.modifiers, $.type_modifiers, $.annotated_expression],
     [$._loop_prefix, $.labeled_expression],
+    [$._loop_prefix, $.type_modifiers, $.annotated_expression],
     [$.parameter_modifiers, $.type_modifiers],
     [$.function_modifier, $.type_modifiers],
     [$.function_modifier, $._reserved_identifier],
@@ -88,7 +89,7 @@ module.exports = grammar({
     '$',
   ],
 
-  inline: ($) => [$._statements, $._identifier],
+  inline: ($) => [$._statements, $._identifier, $._control_structure_body],
 
   precedences: ($) => [
     [$.block, $.lambda_literal],
@@ -298,7 +299,7 @@ module.exports = grammar({
           'in',
           $.expression,
           ')',
-          optional(field('body', choice($.block, $.statement)))
+          optional(field('body', $._control_structure_body))
         )
       ),
 
@@ -310,7 +311,7 @@ module.exports = grammar({
           '(',
           field('condition', $.expression),
           ')',
-          optional(choice(field('body', choice($.block, $.statement)), ';'))
+          optional(choice(field('body', $._control_structure_body), ';'))
         )
       ),
 
@@ -319,7 +320,7 @@ module.exports = grammar({
         seq(
           optional($._loop_prefix),
           'do',
-          optional(choice(field('body', choice($.block, $.statement)), ';')),
+          optional(choice(field('body', $._control_structure_body), ';')),
           'while',
           '(',
           field('condition', $.expression),
@@ -598,18 +599,23 @@ module.exports = grammar({
           field('condition', $.expression),
           ')',
           choice(
-            field('consequence', choice($.block, $.expression, $.assignment)),
+            field('consequence', $._control_structure_body),
             ';',
             seq(
-              optional(field('consequence', choice($.block, $.expression, $.assignment))),
+              optional(field('consequence', $._control_structure_body)),
               optional(';'),
               'else',
-              choice(field('alternative', choice($.block, $.expression, $.assignment)), ';')
+              choice(field('alternative', $._control_structure_body), ';')
             )
           )
         )
       ),
 
+    // Unlike Kotlin's grammar, this excludes declarations, which the compiler rejects here anyway: allowing them
+    // lets declarations nest in every expression context and exceeds tree-sitter's limit of 65535 parse states.
+    _control_structure_body: ($) =>
+      choice($.block, $.expression, $.assignment, $.for_statement, $.while_statement, $.do_while_statement),
+
     parenthesized_expression: ($) => seq('(', $.expression, ')'),
 
     collection_literal: ($) => seq('[', commaSep1($.expression), optional(','), ']'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-kotlin",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "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/src/node-types.json

@@ -936,12 +936,28 @@
         "multiple": false,
         "required": false,
         "types": [
+          {
+            "type": "assignment",
+            "named": true
+          },
           {
             "type": "block",
             "named": true
           },
           {
-            "type": "statement",
+            "type": "do_while_statement",
+            "named": true
+          },
+          {
+            "type": "expression",
+            "named": true
+          },
+          {
+            "type": "for_statement",
+            "named": true
+          },
+          {
+            "type": "while_statement",
             "named": true
           }
         ]
@@ -1079,12 +1095,28 @@
         "multiple": false,
         "required": false,
         "types": [
+          {
+            "type": "assignment",
+            "named": true
+          },
           {
             "type": "block",
             "named": true
           },
           {
-            "type": "statement",
+            "type": "do_while_statement",
+            "named": true
+          },
+          {
+            "type": "expression",
+            "named": true
+          },
+          {
+            "type": "for_statement",
+            "named": true
+          },
+          {
+            "type": "while_statement",
             "named": true
           }
         ]
@@ -1295,9 +1327,21 @@
             "type": "block",
             "named": true
           },
+          {
+            "type": "do_while_statement",
+            "named": true
+          },
           {
             "type": "expression",
             "named": true
+          },
+          {
+            "type": "for_statement",
+            "named": true
+          },
+          {
+            "type": "while_statement",
+            "named": true
           }
         ]
       },
@@ -1323,9 +1367,21 @@
             "type": "block",
             "named": true
           },
+          {
+            "type": "do_while_statement",
+            "named": true
+          },
           {
             "type": "expression",
             "named": true
+          },
+          {
+            "type": "for_statement",
+            "named": true
+          },
+          {
+            "type": "while_statement",
+            "named": true
           }
         ]
       }
@@ -2605,12 +2661,28 @@
         "multiple": false,
         "required": false,
         "types": [
+          {
+            "type": "assignment",
+            "named": true
+          },
           {
             "type": "block",
             "named": true
           },
           {
-            "type": "statement",
+            "type": "do_while_statement",
+            "named": true
+          },
+          {
+            "type": "expression",
+            "named": true
+          },
+          {
+            "type": "for_statement",
+            "named": true
+          },
+          {
+            "type": "while_statement",
             "named": true
           }
         ]

package/tree-sitter.json

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