@willbooster/tree-sitter-typescript 1.3.1 → 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)));
+      },
 
-      _local_export_specifier: (_, previous) => seq(optional(choice('type', 'typeof')), previous),
+      _module_export_name: ($, previous) => choice(previous, alias('type', $.identifier)),
+
+      _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))
           )
         ),
 
@@ -939,16 +950,7 @@ module.exports = function defineGrammar(dialect) {
 
       asserts_annotation: ($) => seq(seq(':', $.asserts)),
 
-      type: ($) =>
-        choice(
-          $.primary_type,
-          $.function_type,
-          $.readonly_type,
-          $.constructor_type,
-          $.infer_type,
-          prec(-1, alias($._type_query_member_expression_in_type_annotation, $.member_expression)),
-          prec(-1, alias($._type_query_call_expression_in_type_annotation, $.call_expression))
-        ),
+      type: ($) => choice($.primary_type, $.function_type, $.readonly_type, $.constructor_type, $.infer_type),
 
       tuple_parameter: ($) =>
         seq(
@@ -1028,6 +1030,8 @@ module.exports = function defineGrammar(dialect) {
           $.flow_maybe_type,
           $.type_query,
           $.index_type_query,
+          prec(-1, alias($._type_query_member_expression_in_type_annotation, $.member_expression)),
+          prec(-1, alias($._type_query_call_expression_in_type_annotation, $.call_expression)),
           alias($.this, $.this_type),
           $.existential_type,
           $.literal_type,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-typescript",
-  "version": "1.3.1",
+  "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.1",
+    "version": "1.3.3",
     "license": "MIT",
     "description": "TypeScript and TSX grammars for tree-sitter",
     "authors": [

package/tsx/src/node-types.json

@@ -283,6 +283,10 @@
         "type": "array_type",
         "named": true
       },
+      {
+        "type": "call_expression",
+        "named": true
+      },
       {
         "type": "conditional_type",
         "named": true
@@ -319,6 +323,10 @@
         "type": "lookup_type",
         "named": true
       },
+      {
+        "type": "member_expression",
+        "named": true
+      },
       {
         "type": "nested_type_identifier",
         "named": true
@@ -455,10 +463,6 @@
     "type": "type",
     "named": true,
     "subtypes": [
-      {
-        "type": "call_expression",
-        "named": true
-      },
       {
         "type": "constructor_type",
         "named": true
@@ -471,10 +475,6 @@
         "type": "infer_type",
         "named": true
       },
-      {
-        "type": "member_expression",
-        "named": true
-      },
       {
         "type": "primary_type",
         "named": true

package/typescript/src/node-types.json

@@ -279,6 +279,10 @@
         "type": "array_type",
         "named": true
       },
+      {
+        "type": "call_expression",
+        "named": true
+      },
       {
         "type": "conditional_type",
         "named": true
@@ -315,6 +319,10 @@
         "type": "lookup_type",
         "named": true
       },
+      {
+        "type": "member_expression",
+        "named": true
+      },
       {
         "type": "nested_type_identifier",
         "named": true
@@ -451,10 +459,6 @@
     "type": "type",
     "named": true,
     "subtypes": [
-      {
-        "type": "call_expression",
-        "named": true
-      },
       {
         "type": "constructor_type",
         "named": true
@@ -467,10 +471,6 @@
         "type": "infer_type",
         "named": true
       },
-      {
-        "type": "member_expression",
-        "named": true
-      },
       {
         "type": "primary_type",
         "named": true