@willbooster/tree-sitter-typescript 1.3.2 → 1.3.4

package/common/defineGrammar.js

@@ -70,6 +70,7 @@ module.exports = function defineGrammar(dialect) {
       $._global_declaration_start,
       $._global_declaration_end,
       $.__error_recovery,
+      $._namespace_expression_end,
     ],
 
     supertypes: ($, previous) => [...previous, $.type, $.primary_type],
@@ -145,6 +146,9 @@ module.exports = function defineGrammar(dialect) {
     ],
 
     conflicts: ($, previous) => [
+      [$.export_specifier, $._local_export_specifier, $._module_export_name],
+      [$.export_specifier, $._module_export_name],
+      [$.export_specifier, $._local_export_specifier],
       ...withTypeArgumentsTarget($, previous),
       [$._type_arguments_target, $.using_declaration],
       [$._type_arguments_target, $._for_header, $._for_using_declaration],
@@ -386,6 +390,23 @@ module.exports = function defineGrammar(dialect) {
 
       _lhs_expression: ($, previous) => choice(previous, $.non_null_expression),
 
+      await_expression: (_, previous) => {
+        const members = previous.content.content.members;
+        const guardIndex = members.findIndex(
+          (member) => member.type === 'SYMBOL' && member.name === '_await_operand_end'
+        );
+        if (guardIndex === -1) {
+          throw new Error('JavaScript await_expression must have a bare _await_operand_end member');
+        }
+        return {
+          ...previous,
+          content: {
+            ...previous.content,
+            content: seq(...members.map((member, index) => (index === guardIndex ? optional(member) : member))),
+          },
+        };
+      },
+
       primary_expression: ($) =>
         choice($._type_arguments_target, alias($._argumentless_new_expression, $.new_expression)),
 
@@ -393,20 +414,19 @@ module.exports = function defineGrammar(dialect) {
       // after `new A` to the `new` (`new A<T>()`, `new new A<T>()`), so a `new` without arguments takes none.
       _type_arguments_target: ($) => {
         const members = JavaScript.grammar.rules.primary_expression.members.filter(
-          (member) => member.type !== 'ALIAS' || member.content.name !== '_argumentless_new_expression'
+          (member) =>
+            (member.type !== 'ALIAS' || member.content.name !== '_argumentless_new_expression') &&
+            (dialect !== 'typescript' || member.name !== '_jsx_element')
         );
         return choice(...members, $.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];
         const members = previous.members;
 
         if (dialect === 'typescript') {
-          choices.push($.type_assertion);
-          choices.push(...members.filter((member) => member.name !== '_jsx_element'));
+          choices.push($.type_assertion, ...members);
         } else if (dialect === 'tsx') {
           choices.push(...members);
         } else {
@@ -475,9 +495,21 @@ module.exports = function defineGrammar(dialect) {
       // tsx only. See jsx_opening_element.
       jsx_self_closing_element: ($) => prec.dynamic(-1, seq($._jsx_start_opening_element, '/>')),
 
-      export_specifier: (_, previous) => seq(optional(choice('type', 'typeof')), previous),
+      export_specifier: ($) => {
+        const name = choice($._module_export_name, alias('as', $.identifier));
+        const specifier = seq(field('name', name), optional(seq('as', field('alias', name))));
+        return choice(specifier, prec.dynamic(1, seq(choice('type', 'typeof'), specifier)));
+      },
+
+      _module_export_name: ($, previous) => choice(previous, alias('type', $.identifier)),
 
-      _local_export_specifier: (_, previous) => seq(optional(choice('type', 'typeof')), previous),
+      _local_export_specifier: ($) => {
+        const specifier = seq(
+          field('name', choice($.identifier, alias('type', $.identifier), alias('as', $.identifier), $.string)),
+          optional(seq('as', field('alias', choice($._module_export_name, alias('as', $.identifier)))))
+        );
+        return choice(specifier, prec.dynamic(1, seq(choice('type', 'typeof'), specifier)));
+      },
 
       _import_identifier: ($) => choice($.identifier, alias('type', $.identifier)),
 
@@ -486,11 +518,7 @@ module.exports = function defineGrammar(dialect) {
           optional(choice('type', 'typeof')),
           choice(
             field('name', $._import_identifier),
-            seq(
-              field('name', choice($._module_export_name, alias('type', $.identifier))),
-              'as',
-              field('alias', $._import_identifier)
-            )
+            seq(field('name', $._module_export_name), 'as', field('alias', $._import_identifier))
           )
         ),
 
@@ -526,14 +554,14 @@ module.exports = function defineGrammar(dialect) {
       // variable named `using`.
       using_declaration: ($) =>
         seq(
-          field('kind', choice('using', seq('await', 'using'))),
+          field('kind', choice('using', seq(alias($._await_keyword, 'await'), 'using'))),
           commaSep1(alias($._using_declarator, $.variable_declarator)),
           $._semicolon
         ),
 
       _for_using_declaration: ($) =>
         seq(
-          field('kind', choice('using', seq('await', 'using'))),
+          field('kind', choice('using', seq(alias($._await_keyword, 'await'), 'using'))),
           commaSep1(alias($._using_declarator, $.variable_declarator)),
           ';'
         ),
@@ -559,7 +587,10 @@ module.exports = function defineGrammar(dialect) {
               field('kind', choice('let', 'const')),
               field('left', choice($._binding_identifier, $._destructuring_pattern))
             ),
-            seq(field('kind', choice('using', seq('await', 'using'))), field('left', $._binding_identifier))
+            seq(
+              field('kind', choice('using', seq(alias($._await_keyword, 'await'), 'using'))),
+              field('left', $._binding_identifier)
+            )
           ),
           field('operator', choice('in', 'of')),
           field('right', $._expressions),
@@ -799,7 +830,7 @@ module.exports = function defineGrammar(dialect) {
 
       module: ($) => seq('module', $._module),
 
-      internal_module: ($) => seq('namespace', $._module),
+      internal_module: ($) => seq('namespace', $._module, optional($._namespace_expression_end)),
 
       global_declaration: ($) =>
         seq(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-typescript",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "TypeScript and TSX grammars for tree-sitter",
   "keywords": [
     "incremental",
@@ -53,7 +53,7 @@
     "@vitest/browser-playwright": "5.0.2",
     "@willbooster/oxfmt-config": "1.2.2",
     "@willbooster/oxlint-config": "1.4.8",
-    "@willbooster/tree-sitter-javascript": "1.0.21",
+    "@willbooster/tree-sitter-javascript": "1.0.25",
     "@willbooster/wb": "22.18.0",
     "@willbooster/web-tree-sitter": "1.0.17",
     "conventional-changelog-conventionalcommits": "10.4.0",

package/tree-sitter.json

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

package/tsx/src/node-types.json

@@ -97,14 +97,6 @@
         "type": "internal_module",
         "named": true
       },
-      {
-        "type": "jsx_element",
-        "named": true
-      },
-      {
-        "type": "jsx_self_closing_element",
-        "named": true
-      },
       {
         "type": "primary_expression",
         "named": true
@@ -209,6 +201,14 @@
         "type": "identifier",
         "named": true
       },
+      {
+        "type": "jsx_element",
+        "named": true
+      },
+      {
+        "type": "jsx_self_closing_element",
+        "named": true
+      },
       {
         "type": "member_expression",
         "named": true
@@ -3146,6 +3146,14 @@
           "type": "identifier",
           "named": true
         },
+        {
+          "type": "jsx_element",
+          "named": true
+        },
+        {
+          "type": "jsx_self_closing_element",
+          "named": true
+        },
         {
           "type": "member_expression",
           "named": true