@willbooster/tree-sitter-typescript 1.3.2 → 1.3.3

package/common/defineGrammar.js

@@ -145,6 +145,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],
@@ -475,9 +478,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 +501,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))
           )
         ),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-typescript",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "TypeScript and TSX grammars for tree-sitter",
   "keywords": [
     "incremental",

package/tree-sitter.json

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