@willbooster/tree-sitter-typescript 1.2.8 → 1.2.9

package/README.md

@@ -105,7 +105,7 @@ 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.
+`cargo` (with the `cmake` that `mise.toml` pins) 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:

package/common/defineGrammar.js

@@ -248,13 +248,7 @@ module.exports = function defineGrammar(dialect) {
               )
             )
           ),
-          prec(
-            'template_call',
-            seq(
-              field('function', choice($.primary_expression, alias($._argumentless_new_expression, $.new_expression))),
-              field('arguments', $.template_string)
-            )
-          ),
+          prec('template_call', seq(field('function', $.primary_expression), field('arguments', $.template_string))),
           prec(
             'member',
             seq(
@@ -266,15 +260,14 @@ 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()`.
+      // tree-sitter-javascript's two forms of `new`, with type arguments; its 'member' and 'new' precedences group nested
+      // `new` as ECMAScript does (`new new A().b` constructs `new A().b`), and both forms are primary expressions.
       new_expression: ($) =>
         prec(
           'new',
           seq(
             'new',
-            field('constructor', $._new_constructor),
+            field('constructor', $.primary_expression),
             field('type_arguments', optional($.type_arguments)),
             field('arguments', $.arguments)
           )
@@ -283,12 +276,9 @@ module.exports = function defineGrammar(dialect) {
       _argumentless_new_expression: ($) =>
         prec.right(
           'new',
-          seq('new', field('constructor', $._new_constructor), field('type_arguments', optional($.type_arguments)))
+          seq('new', field('constructor', $.primary_expression), field('type_arguments', optional($.type_arguments)))
         ),
 
-      _new_constructor: ($) =>
-        prec('new', choice($.primary_expression, alias($._argumentless_new_expression, $.new_expression))),
-
       assignment_expression: ($) =>
         prec.right(
           'assign',
@@ -299,20 +289,13 @@ module.exports = function defineGrammar(dialect) {
 
       _lhs_expression: ($, previous) => choice(previous, $.non_null_expression),
 
-      primary_expression: ($, previous) => choice(previous, $.non_null_expression, $.new_expression),
+      primary_expression: ($, previous) => choice(previous, $.non_null_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,
-          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');
+        const choices = [$.as_expression, $.satisfies_expression, $.instantiation_expression, $.internal_module];
+        const members = previous.members;
 
         if (dialect === 'typescript') {
           choices.push($.type_assertion);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-typescript",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "TypeScript and TSX grammars for tree-sitter",
   "keywords": [
     "incremental",
@@ -51,9 +51,9 @@
     "@vitest/browser-playwright": "5.0.1",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/tree-sitter-javascript": "1.0.16",
+    "@willbooster/tree-sitter-javascript": "1.0.20",
     "@willbooster/wb": "22.13.1",
-    "@willbooster/web-tree-sitter": "1.0.15",
+    "@willbooster/web-tree-sitter": "1.0.17",
     "conventional-changelog-conventionalcommits": "10.4.0",
     "lefthook": "2.1.14",
     "oxfmt": "0.70.0",

package/tree-sitter.json

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

package/tsx/src/node-types.json

@@ -105,10 +105,6 @@
         "type": "jsx_self_closing_element",
         "named": true
       },
-      {
-        "type": "new_expression",
-        "named": true
-      },
       {
         "type": "primary_expression",
         "named": true

package/typescript/src/node-types.json

@@ -97,10 +97,6 @@
         "type": "internal_module",
         "named": true
       },
-      {
-        "type": "new_expression",
-        "named": true
-      },
       {
         "type": "primary_expression",
         "named": true