@willbooster/tree-sitter-javascript 1.0.18 → 1.0.20

package/README.md

@@ -5,7 +5,7 @@
 [![Test](https://github.com/WillBooster/tree-sitter-javascript/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-javascript/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-javascript/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-javascript/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.28.6-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.28.7-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-javascript.svg)](https://crates.io/crates/willbooster-tree-sitter-javascript)
 
 JavaScript and JSX grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
@@ -88,13 +88,16 @@ script/parse-examples
 cargo test
 ```
 
+Every `tree-sitter` command, from `generate` to the tests, runs the CLI of the WillBooster/tree-sitter runtime version
+locked in `Cargo.lock` (`script/tree-sitter`), whose generator and runtime have fixes that the upstream CLI lacks.
+`script/fork-cli` downloads that CLI into `.tmp/` from its GitHub Release on first use, or builds it with `cargo` when
+the download fails or the release has no binary that runs here.
+
 `bun run test` runs:
 
 - the corpus in `test/corpus`, with the native build and with the Wasm build (the first run downloads the WASI SDK);
 - an incremental-parsing check (`test/unit/incremental.test.ts`): `script/fuzz-corpus` runs `tree-sitter fuzz`, which
-  edits each corpus case at random, reparses it, undoes the edits, and reparses again, on the WillBooster/tree-sitter
-  runtime version locked in `Cargo.lock` (the first run downloads that CLI from its GitHub Release, or builds it with
-  `cargo` when the download fails or the release has no binary that runs here). `TREE_SITTER_SEED`,
+  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;
 - a check that the real-world JavaScript files in `examples/`, the checked-in ones and those of the cloned repository,
   fail to parse exactly as listed in `script/known-failures.txt`. The first run clones the repository. The example
@@ -113,7 +116,8 @@ cargo test
   the crate (`test/unit/queries.test.ts`).
 
 The tests and `script/parse-examples` compile the parser into `.tmp/tree-sitter-lib` instead of the CLI's cache shared
-by every checkout; `script/fuzz-corpus` builds a per-run parser in `.tmp/fuzz` and deletes it afterwards.
+by every checkout, and `mise.toml` sets `TREE_SITTER_LIBDIR` to it for any other command run in the checkout;
+`script/fuzz-corpus` builds a parser of its own in `.tmp/fuzz` for each run and deletes it afterwards.
 
 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

@@ -500,7 +500,6 @@ module.exports = grammar({
         $.binary_expression,
         $.ternary_expression,
         $.update_expression,
-        $.new_expression,
         $.yield_expression
       ),
 
@@ -527,7 +526,9 @@ module.exports = grammar({
         $.generator_function,
         $.class,
         $.meta_property,
-        $.call_expression
+        $.call_expression,
+        $.new_expression,
+        alias($._argumentless_new_expression, $.new_expression)
       ),
 
     yield_expression: ($) =>
@@ -789,10 +790,7 @@ module.exports = grammar({
     call_expression: ($) =>
       choice(
         prec('call', seq(field('function', choice($.expression, $.import)), field('arguments', $.arguments))),
-        prec(
-          'template_call',
-          seq(field('function', choice($.primary_expression, $.new_expression)), field('arguments', $.template_string))
-        ),
+        prec('template_call', seq(field('function', $.primary_expression), field('arguments', $.template_string))),
         prec(
           'member',
           seq(
@@ -803,15 +801,15 @@ module.exports = grammar({
         )
       ),
 
+    // As in ECMAScript, a member access or index extends the nearest `new` with arguments, while an argument list fills
+    // the nearest `new` that still lacks one: `new new A().b` constructs `new A().b`, `new new A().b(2)` constructs
+    // `new A().b` with `2`, and `new new A()(2)` constructs `new A()`. The 'member' and 'new' precedences make the parser
+    // shift a `.`, `[`, or argument list after a constructor rather than end a `new` without arguments, so that form
+    // never takes one. Both forms are primary expressions, so a nested `new` matches the constructor field's type.
     new_expression: ($) =>
-      prec.right(
-        'new',
-        seq(
-          'new',
-          field('constructor', choice($.primary_expression, $.new_expression)),
-          field('arguments', optional(prec.dynamic(1, $.arguments)))
-        )
-      ),
+      prec('new', seq('new', field('constructor', $.primary_expression), field('arguments', $.arguments))),
+
+    _argumentless_new_expression: ($) => prec.right('new', seq('new', field('constructor', $.primary_expression))),
 
     await_expression: ($) => prec.dynamic(2, prec('unary_void', seq('await', $.expression))),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-javascript",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "JavaScript grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -22,8 +22,8 @@
     "*.wasm"
   ],
   "scripts": {
-    "build-wasm": "tree-sitter build --wasm",
-    "build/ci": "tree-sitter generate && tree-sitter build --wasm",
+    "build-wasm": "script/tree-sitter build --wasm",
+    "build/ci": "script/tree-sitter generate && script/tree-sitter build --wasm",
     "cleanup": "bun wb lint --fix --format",
     "format": "bun wb lint --format",
     "lint": "bun wb lint",
@@ -31,7 +31,7 @@
     "prepare": "(bun lefthook install || true) && (test ! -f .lefthook/normalize-bun-lockfile.sh || bash .lefthook/normalize-bun-lockfile.sh)",
     "release": "wb release",
     "prestart": "bun run build-wasm",
-    "start": "tree-sitter playground",
+    "start": "script/tree-sitter playground",
     "test": "bun wb test",
     "test/ci": "bun wb test-on-ci",
     "test/ci-setup": "playwright install --with-deps chromium",
@@ -46,7 +46,7 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/wb": "22.13.1",
-    "@willbooster/web-tree-sitter": "1.0.12",
+    "@willbooster/web-tree-sitter": "1.0.16",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
     "oxfmt": "0.70.0",

package/src/node-types.json

@@ -57,10 +57,6 @@
         "type": "jsx_self_closing_element",
         "named": true
       },
-      {
-        "type": "new_expression",
-        "named": true
-      },
       {
         "type": "primary_expression",
         "named": true
@@ -165,6 +161,10 @@
         "type": "meta_property",
         "named": true
       },
+      {
+        "type": "new_expression",
+        "named": true
+      },
       {
         "type": "null",
         "named": true
@@ -2236,10 +2236,6 @@
         "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "new_expression",
-            "named": true
-          },
           {
             "type": "primary_expression",
             "named": true

package/tree-sitter.json

@@ -24,7 +24,7 @@
     }
   ],
   "metadata": {
-    "version": "1.0.18",
+    "version": "1.0.20",
     "license": "MIT",
     "description": "JavaScript grammar for tree-sitter",
     "authors": [