@willbooster/tree-sitter-typescript 1.2.4 → 1.2.5

package/README.md

@@ -105,7 +105,8 @@ cargo test
   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 builds that CLI with `cargo`).
+  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`, `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

package/common/defineGrammar.js

@@ -1,6 +1,26 @@
 // oxlint-disable unicorn/prefer-module -- This package is CommonJS, so tree-sitter loads the grammar as CommonJS.
 const JavaScript = require('@willbooster/tree-sitter-javascript/grammar');
 
+// Words that are keywords only in some positions and identifiers elsewhere, besides the JavaScript grammar's.
+const TYPESCRIPT_CONTEXTUAL_KEYWORDS = [
+  'declare',
+  'namespace',
+  'type',
+  'public',
+  'private',
+  'protected',
+  'override',
+  'readonly',
+  'module',
+  'any',
+  'number',
+  'boolean',
+  'string',
+  'symbol',
+  'object',
+  'new',
+];
+
 module.exports = function defineGrammar(dialect) {
   return grammar(JavaScript, {
     name: dialect,
@@ -63,6 +83,8 @@ module.exports = function defineGrammar(dialect) {
       [$.primary_expression, $._for_header, $._for_using_declaration],
       [$._for_header, $._binding_identifier],
       [$.expression, $.call_expression, $.instantiation_expression],
+      [$._field_name, $._property_name],
+      [$._property_name, $.public_field_definition],
 
       // This appears to be necessary to parse a parenthesized class expression
       [$.class],
@@ -118,6 +140,9 @@ module.exports = function defineGrammar(dialect) {
     ],
 
     rules: {
+      // A field named `get`, `set`, or `static` is told apart from a member that the word modifies by the line-break
+      // sentinels allowed right after the name, as in the JavaScript grammar's field_definition. They are not allowed
+      // after a type annotation, which may continue on the next line.
       public_field_definition: ($) =>
         seq(
           repeat(field('decorator', $.decorator)),
@@ -128,17 +153,64 @@ module.exports = function defineGrammar(dialect) {
             )
           ),
           choice(
-            seq(optional('static'), optional($.override_modifier), optional('readonly')),
-            seq(optional('abstract'), optional('readonly')),
-            seq(optional('readonly'), optional('abstract')),
-            optional('accessor')
-          ),
-          field('name', $._property_name),
-          optional(choice('?', '!')),
-          field('type', optional($.type_annotation)),
-          optional($._initializer)
+            seq(
+              choice(
+                seq(optional('static'), optional($.override_modifier), optional('readonly')),
+                seq(optional('abstract'), optional('readonly')),
+                seq(optional('readonly'), optional('abstract')),
+                optional('accessor')
+              ),
+              choice(
+                seq(
+                  field('name', $._field_name),
+                  choice(
+                    optional(choice($._initializer, $._line_break_after_field)),
+                    seq($._field_annotations, optional($._initializer))
+                  )
+                ),
+                // A line break after `get` or `set` continues a getter or setter. Allowing both sentinels here tells
+                // the scanner that a `*` on the next line cannot continue the member, unlike after `static`.
+                seq(
+                  field('name', alias(choice('get', 'set'), $.property_identifier)),
+                  choice(
+                    optional(choice($._initializer, $._line_break_after_modifier, $._line_break_after_field)),
+                    seq($._field_annotations, optional($._initializer))
+                  )
+                )
+              )
+            ),
+            // A line break after a leading `static` continues a static member.
+            seq(
+              field('name', alias('static', $.property_identifier)),
+              choice(
+                optional(choice($._initializer, $._line_break_after_modifier)),
+                seq($._field_annotations, optional($._initializer))
+              )
+            ),
+            // After a modifier, `static` is a field name, which a line break ends.
+            seq(
+              choice(
+                seq('static', optional($.override_modifier), optional('readonly')),
+                seq($.override_modifier, optional('readonly')),
+                seq('readonly', optional('abstract')),
+                seq('abstract', optional('readonly')),
+                'accessor'
+              ),
+              field('name', alias('static', $.property_identifier)),
+              choice(
+                optional(choice($._initializer, $._line_break_after_field)),
+                seq($._field_annotations, optional($._initializer))
+              )
+            )
+          )
         ),
 
+      _field_annotations: ($) =>
+        choice(seq(choice('?', '!'), field('type', optional($.type_annotation))), field('type', $.type_annotation)),
+
+      _field_name: ($, previous) =>
+        choice(previous, alias(choice(...TYPESCRIPT_CONTEXTUAL_KEYWORDS), $.property_identifier)),
+
       // override original catch_clause, add optional type annotation
       catch_clause: ($) =>
         seq(
@@ -251,15 +323,6 @@ module.exports = function defineGrammar(dialect) {
           )
         ),
 
-      // Any identifier name may name a JSX attribute, such as `class` in `<div class="x" />`, which the JavaScript
-      // grammar's reserved words reject (WillBooster/tree-sitter-javascript#25).
-      _jsx_attribute_name: ($) =>
-        choice(
-          alias($.jsx_identifier, $.property_identifier),
-          alias(reserved('properties', $.identifier), $.property_identifier),
-          $.jsx_namespace_name
-        ),
-
       // This rule is only referenced by expression when the dialect is 'tsx'
       jsx_opening_element: ($) => prec.dynamic(-1, seq($._jsx_start_opening_element, '>')),
 
@@ -268,9 +331,7 @@ module.exports = function defineGrammar(dialect) {
 
       export_specifier: (_, previous) => seq(optional(choice('type', 'typeof')), previous),
 
-      // Any identifier name may be exported or imported. The JavaScript grammar rejects reserved words other than
-      // `default`, for which it leaves no node (WillBooster/tree-sitter-javascript#17 and #24).
-      _module_export_name: ($) => choice(reserved('properties', $.identifier), $.string),
+      _local_export_specifier: (_, previous) => seq(optional(choice('type', 'typeof')), previous),
 
       _import_identifier: ($) => choice($.identifier, alias('type', $.identifier)),
 
@@ -301,7 +362,7 @@ module.exports = function defineGrammar(dialect) {
           'import',
           optional(choice('type', 'typeof')),
           choice(seq($.import_clause, $._from_clause), $.import_require_clause, field('source', $.string)),
-          optional($.import_attribute),
+          optional(choice($.import_attribute, $._line_break_before_attributes)),
           $._semicolon
         ),
 
@@ -314,33 +375,6 @@ module.exports = function defineGrammar(dialect) {
           seq('export', 'as', 'namespace', $.identifier, $._semicolon)
         ),
 
-      // The JavaScript grammar leaves `await (x).y` ambiguous with a call of an identifier named `await`, and GLR keeps
-      // the call; TypeScript and V8 read the operator (WillBooster/tree-sitter-javascript#23).
-      await_expression: ($) => prec.dynamic(2, prec('unary_void', seq('await', $.expression))),
-
-      // The JavaScript grammar's for header takes no `using` declaration, although ECMAScript allows one.
-      for_statement: ($) =>
-        seq(
-          'for',
-          '(',
-          choice(
-            field(
-              'initializer',
-              choice(
-                alias($.for_lexical_declaration, $.lexical_declaration),
-                alias($.for_variable_declaration, $.variable_declaration),
-                alias($._for_using_declaration, $.using_declaration)
-              )
-            ),
-            seq(field('initializer', $._expressions), ';'),
-            field('initializer', $.empty_statement)
-          ),
-          field('condition', choice(seq($._expressions, ';'), $.empty_statement)),
-          field('increment', optional($._expressions)),
-          ')',
-          field('body', $.statement)
-        ),
-
       // ECMAScript binds only identifiers in a using declaration, so `using [a] = b` assigns to a subscript of a
       // variable named `using`.
       using_declaration: ($) =>
@@ -391,8 +425,11 @@ module.exports = function defineGrammar(dialect) {
         choice(
           seq(
             field('name', choice($._binding_identifier, $._destructuring_pattern)),
-            field('type', optional($.type_annotation)),
-            optional($._initializer)
+            // The line-break sentinel applies only right after the name: a type may continue on the next line.
+            choice(
+              optional(choice($._initializer, $._line_break_after_binding)),
+              seq(field('type', $.type_annotation), optional($._initializer))
+            )
           ),
           prec('declaration', seq(field('name', $._binding_identifier), '!', field('type', $.type_annotation)))
         ),
@@ -450,7 +487,14 @@ module.exports = function defineGrammar(dialect) {
         prec(
           'call',
           seq(
-            field('function', choice($.identifier, alias($.decorator_member_expression, $.member_expression))),
+            field(
+              'function',
+              choice(
+                $.identifier,
+                alias($.decorator_member_expression, $.member_expression),
+                alias($.decorator_parenthesized_expression, $.parenthesized_expression)
+              )
+            ),
             optional(field('type_arguments', $.type_arguments)),
             field('arguments', $.arguments)
           )
@@ -458,18 +502,6 @@ module.exports = function defineGrammar(dialect) {
 
       decorator_parenthesized_expression: ($) => seq('(', $._expressions, ')'),
 
-      // A decorator's member name may be any identifier name, as a member expression's may, which the JavaScript
-      // grammar's reserved words reject.
-      decorator_member_expression: ($) =>
-        prec(
-          'member',
-          seq(
-            field('object', choice($.identifier, alias($.decorator_member_expression, $.member_expression))),
-            '.',
-            field('property', reserved('properties', alias($.identifier, $.property_identifier)))
-          )
-        ),
-
       class_body: ($) =>
         seq(
           '{',
@@ -508,7 +540,7 @@ module.exports = function defineGrammar(dialect) {
             field('name', $._property_name),
             optional('?'),
             $._call_signature,
-            field('body', $.statement_block)
+            field('body', alias($._class_member_body, $.statement_block))
           )
         ),
 
@@ -619,17 +651,6 @@ module.exports = function defineGrammar(dialect) {
 
       import_alias: ($) => seq('import', $.identifier, '=', choice($.identifier, $.nested_identifier), $._semicolon),
 
-      // A qualified name may end in any identifier name, as a member expression may.
-      nested_identifier: ($) =>
-        prec(
-          'member',
-          seq(
-            field('object', choice($.identifier, alias($.nested_identifier, $.member_expression))),
-            '.',
-            field('property', reserved('properties', alias($.identifier, $.property_identifier)))
-          )
-        ),
-
       nested_type_identifier: ($) =>
         prec(
           'member',
@@ -1112,29 +1133,7 @@ module.exports = function defineGrammar(dialect) {
       // allowed on the identifier inside the alias: around the alias, the keyword token still wins in the lexer.
       _type_identifier: ($) => alias(reserved('properties', $.identifier), $.type_identifier),
 
-      _reserved_identifier: (_, previous) =>
-        choice(
-          'declare',
-          'namespace',
-          'type',
-          'public',
-          'private',
-          'protected',
-          'override',
-          'readonly',
-          'module',
-          'any',
-          'number',
-          'boolean',
-          'string',
-          'symbol',
-          'export',
-          'object',
-          'new',
-          'readonly',
-          'using',
-          previous
-        ),
+      _reserved_identifier: (_, previous) => choice(...TYPESCRIPT_CONTEXTUAL_KEYWORDS, previous),
     },
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-typescript",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "TypeScript and TSX grammars for tree-sitter",
   "keywords": [
     "incremental",
@@ -48,7 +48,7 @@
     "@vitest/browser-playwright": "5.0.1",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/tree-sitter-javascript": "1.0.3",
+    "@willbooster/tree-sitter-javascript": "1.0.15",
     "@willbooster/wb": "22.13.0",
     "@willbooster/web-tree-sitter": "1.0.7",
     "conventional-changelog-conventionalcommits": "10.4.0",

package/tree-sitter.json

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

package/tsx/src/node-types.json

@@ -159,6 +159,10 @@
         "type": "object_pattern",
         "named": true
       },
+      {
+        "type": "parenthesized_expression",
+        "named": true
+      },
       {
         "type": "rest_pattern",
         "named": true
@@ -2018,7 +2022,7 @@
       }
     },
     "children": {
-      "multiple": false,
+      "multiple": true,
       "required": false,
       "types": [
         {
@@ -2033,6 +2037,10 @@
           "type": "identifier",
           "named": true
         },
+        {
+          "type": "import_attribute",
+          "named": true
+        },
         {
           "type": "namespace_export",
           "named": true
@@ -4739,6 +4747,10 @@
           "type": "object_pattern",
           "named": true
         },
+        {
+          "type": "parenthesized_expression",
+          "named": true
+        },
         {
           "type": "subscript_expression",
           "named": true

package/typescript/src/node-types.json

@@ -155,6 +155,10 @@
         "type": "object_pattern",
         "named": true
       },
+      {
+        "type": "parenthesized_expression",
+        "named": true
+      },
       {
         "type": "rest_pattern",
         "named": true
@@ -2014,7 +2018,7 @@
       }
     },
     "children": {
-      "multiple": false,
+      "multiple": true,
       "required": false,
       "types": [
         {
@@ -2029,6 +2033,10 @@
           "type": "identifier",
           "named": true
         },
+        {
+          "type": "import_attribute",
+          "named": true
+        },
         {
           "type": "namespace_export",
           "named": true
@@ -4490,6 +4498,10 @@
           "type": "object_pattern",
           "named": true
         },
+        {
+          "type": "parenthesized_expression",
+          "named": true
+        },
         {
           "type": "subscript_expression",
           "named": true