@willbooster/tree-sitter-typescript 1.2.6 → 1.2.8

package/README.md

@@ -5,7 +5,7 @@
 [![Test](https://github.com/WillBooster/tree-sitter-typescript/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-typescript/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-typescript/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-typescript/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.26.0-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.28.5-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-typescript.svg)](https://crates.io/crates/willbooster-tree-sitter-typescript)
 
 TypeScript and TSX grammars for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
@@ -102,31 +102,43 @@ script/parse-examples
 cargo test
 ```
 
+`script/tree-sitter` (also `bun run tree-sitter`) runs the tree-sitter CLI of WillBooster/tree-sitter at the runtime
+version locked in `Cargo.lock`, so the parsers are generated, built, tested, and fuzzed with the generator and the
+runtime this package ships. The first run downloads that CLI from its GitHub Release into `.tmp/`, or builds it with
+`cargo` (which needs `cmake`) when the download fails or the release has no binary that runs here.
+
 `bun run test/ci-setup` installs Chromium for the browser tests. `bun run build/ci` regenerates `typescript/src/` and
 `tsx/src/` and builds both Wasm files. `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).
   Cases run with the `typescript` grammar unless they carry `:language(tsx)`;
 - an incremental-parsing check (`test/unit/incremental.test.ts`): `script/fuzz-corpus` runs `tree-sitter fuzz`, which
-  edits each corpus case of each grammar 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).
+  edits each corpus case of each grammar 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 files in `examples/`, the checked-in ones and those of the cloned repositories, fail to
   parse exactly as listed in `script/known-failures.txt`. `.ts` files are parsed with the `typescript` grammar and
   `.tsx` files with the `tsx` grammar. The first run clones the repositories. 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 with each grammar, since consumers parse files while they are being edited. It loads the Wasm builds
-  through @willbooster/web-tree-sitter, which `bun run build/ci` rebuilds after regenerating the parsers;
+- a performance check (`test/unit/performance.test.ts`) that recovering from an error on each of 20,000 lines takes
+  linear time with each grammar, measured in the parsing thread's CPU time, since consumers parse files while they are
+  being edited. It loads the Wasm builds through @willbooster/web-tree-sitter, which `bun run build/ci` rebuilds after
+  regenerating the parsers;
 - a check (`test/unit/queries.test.ts`) that the queries `tree-sitter.json` lists compile against each grammar, are
   published in the npm package and the crate, and that `javascript/queries/` matches the queries of the installed
   @willbooster/tree-sitter-javascript; after updating that dependency, `script/copy-javascript-queries` refreshes the
   copies;
 - checks that both Wasm builds load and parse through @willbooster/web-tree-sitter in Chromium
   (`test/unit/browser/`) and in Cloudflare Workers with and without Node.js compatibility
-  (`test/unit/workers.test.ts`, running the Worker in `test/fixtures/worker/`).
+  (`test/unit/workers.test.ts`, running the Worker in `test/fixtures/worker/`);
+- a check (`test/unit/runtimeVersion.test.ts`) that `package.json` and `Cargo.lock` lock the same runtime version,
+  since the Wasm tests run on @willbooster/web-tree-sitter and the Rust tests, the fuzzing, and the CLI on the
+  willbooster-tree-sitter crate.
+
+The tests compile the parsers into `.tmp/tree-sitter-lib` instead of the CLI's cache shared by every checkout;
+`script/parse-examples` and `script/fuzz-corpus` build a parser of their own per run and delete it afterwards.
+`mise.toml` sets `TREE_SITTER_LIBDIR` to `.tmp/tree-sitter-lib` as well, so other `tree-sitter` commands run in the
+checkout use this checkout's parsers too.
 
 CI also runs these tests on Linux arm64 and macOS, where the Rust binding compiles the parsers natively, and fuzzes
 both parsers with libFuzzer and sanitizers (`.github/workflows/robustness.yml`).

package/common/defineGrammar.js

@@ -242,7 +242,7 @@ module.exports = function defineGrammar(dialect) {
             prec(
               'generic_call',
               seq(
-                field('function', choice($.primary_expression, $.new_expression)),
+                field('function', $.primary_expression),
                 field('type_arguments', $.type_arguments),
                 field('arguments', choice($.arguments, $.template_string))
               )
@@ -251,7 +251,7 @@ module.exports = function defineGrammar(dialect) {
           prec(
             'template_call',
             seq(
-              field('function', choice($.primary_expression, $.new_expression)),
+              field('function', choice($.primary_expression, alias($._argumentless_new_expression, $.new_expression))),
               field('arguments', $.template_string)
             )
           ),
@@ -266,17 +266,29 @@ module.exports = function defineGrammar(dialect) {
           )
         ),
 
+      // As in ECMAScript, a `new` with arguments is a member-level (primary) expression and one without them is not, so a
+      // member access, a call, or a further argument list binds to the nearest `new` with arguments: `new new A().b`
+      // constructs `new A().b`, and `new new A()(2)` constructs `new A()`.
       new_expression: ($) =>
-        prec.right(
+        prec(
           'new',
           seq(
             'new',
-            field('constructor', $.primary_expression),
+            field('constructor', $._new_constructor),
             field('type_arguments', optional($.type_arguments)),
-            field('arguments', optional($.arguments))
+            field('arguments', $.arguments)
           )
         ),
 
+      _argumentless_new_expression: ($) =>
+        prec.right(
+          'new',
+          seq('new', field('constructor', $._new_constructor), field('type_arguments', optional($.type_arguments)))
+        ),
+
+      _new_constructor: ($) =>
+        prec('new', choice($.primary_expression, alias($._argumentless_new_expression, $.new_expression))),
+
       assignment_expression: ($) =>
         prec.right(
           'assign',
@@ -287,18 +299,26 @@ module.exports = function defineGrammar(dialect) {
 
       _lhs_expression: ($, previous) => choice(previous, $.non_null_expression),
 
-      primary_expression: ($, previous) => choice(previous, $.non_null_expression),
+      primary_expression: ($, previous) => choice(previous, $.non_null_expression, $.new_expression),
 
       // If the dialect is regular typescript, we exclude JSX expressions and
       // include type assertions. If the dialect is TSX, we do the opposite.
       expression: ($, previous) => {
-        const choices = [$.as_expression, $.satisfies_expression, $.instantiation_expression, $.internal_module];
+        const choices = [
+          $.as_expression,
+          $.satisfies_expression,
+          $.instantiation_expression,
+          $.internal_module,
+          alias($._argumentless_new_expression, $.new_expression),
+        ];
+        // A `new` with arguments is a primary expression (see new_expression).
+        const members = previous.members.filter((member) => member.name !== 'new_expression');
 
         if (dialect === 'typescript') {
           choices.push($.type_assertion);
-          choices.push(...previous.members.filter((member) => member.name !== '_jsx_element'));
+          choices.push(...members.filter((member) => member.name !== '_jsx_element'));
         } else if (dialect === 'tsx') {
-          choices.push(...previous.members);
+          choices.push(...members);
         } else {
           throw new Error(`Unknown dialect ${dialect}`);
         }
@@ -419,7 +439,8 @@ module.exports = function defineGrammar(dialect) {
           ')'
         ),
 
-      non_null_expression: ($) => prec.left('unary', seq($.expression, '!')),
+      // TypeScript parses a postfix `!` as part of a member access chain, so `new A!()` constructs `A!`.
+      non_null_expression: ($) => prec('member', seq($.primary_expression, '!')),
 
       variable_declarator: ($) =>
         choice(
@@ -565,13 +586,7 @@ module.exports = function defineGrammar(dialect) {
       satisfies_expression: ($) => prec.left('binary', seq($.expression, 'satisfies', $.type)),
 
       instantiation_expression: ($) =>
-        prec.dynamic(
-          -1,
-          prec(
-            'instantiation',
-            seq(choice($.primary_expression, $.new_expression), field('type_arguments', $.type_arguments))
-          )
-        ),
+        prec.dynamic(-1, prec('instantiation', seq($.primary_expression, field('type_arguments', $.type_arguments)))),
 
       class_heritage: ($) => choice(seq($.extends_clause, optional($.implements_clause)), $.implements_clause),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-typescript",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "TypeScript and TSX grammars for tree-sitter",
   "keywords": [
     "incremental",
@@ -27,8 +27,8 @@
     "*.wasm"
   ],
   "scripts": {
-    "build-wasm": "tree-sitter build --wasm typescript && tree-sitter build --wasm tsx",
-    "build/ci": "tree-sitter generate typescript/grammar.js && tree-sitter generate tsx/grammar.js && bun run build-wasm",
+    "build-wasm": "script/tree-sitter build --wasm typescript && script/tree-sitter build --wasm tsx",
+    "build/ci": "script/tree-sitter generate typescript/grammar.js && script/tree-sitter generate tsx/grammar.js && bun run build-wasm",
     "cleanup": "bun wb lint --fix --format",
     "format": "bun wb lint --format",
     "lint": "bun wb lint",
@@ -36,10 +36,11 @@
     "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",
+    "tree-sitter": "script/tree-sitter",
     "typecheck": "bun wb typecheck",
     "verify": "bun wb verify",
     "verify-full": "bun wb verify --full"
@@ -51,8 +52,8 @@
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
     "@willbooster/tree-sitter-javascript": "1.0.16",
-    "@willbooster/wb": "22.13.0",
-    "@willbooster/web-tree-sitter": "1.0.7",
+    "@willbooster/wb": "22.13.1",
+    "@willbooster/web-tree-sitter": "1.0.15",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
     "oxfmt": "0.70.0",
@@ -61,7 +62,6 @@
     "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",
     "vite": "8.3.0",
     "vitest": "5.0.1",

package/tree-sitter.json

@@ -83,7 +83,7 @@
     }
   ],
   "metadata": {
-    "version": "1.2.6",
+    "version": "1.2.8",
     "license": "MIT",
     "description": "TypeScript and TSX grammars for tree-sitter",
     "authors": [

package/tsx/src/node-types.json

@@ -221,6 +221,10 @@
         "type": "meta_property",
         "named": true
       },
+      {
+        "type": "new_expression",
+        "named": true
+      },
       {
         "type": "non_null_expression",
         "named": true
@@ -3110,10 +3114,6 @@
       "multiple": false,
       "required": false,
       "types": [
-        {
-          "type": "new_expression",
-          "named": true
-        },
         {
           "type": "primary_expression",
           "named": true
@@ -4057,7 +4057,7 @@
       "required": true,
       "types": [
         {
-          "type": "expression",
+          "type": "primary_expression",
           "named": true
         }
       ]

package/typescript/src/node-types.json

@@ -217,6 +217,10 @@
         "type": "meta_property",
         "named": true
       },
+      {
+        "type": "new_expression",
+        "named": true
+      },
       {
         "type": "non_null_expression",
         "named": true
@@ -3106,10 +3110,6 @@
       "multiple": false,
       "required": false,
       "types": [
-        {
-          "type": "new_expression",
-          "named": true
-        },
         {
           "type": "primary_expression",
           "named": true
@@ -3808,7 +3808,7 @@
       "required": true,
       "types": [
         {
-          "type": "expression",
+          "type": "primary_expression",
           "named": true
         }
       ]