@willbooster/tree-sitter-typescript 1.1.1 → 1.1.3

package/common/defineGrammar.js

@@ -84,7 +84,11 @@ module.exports = function defineGrammar(dialect) {
       [$._parameter_name, $.primary_type],
       [$.pattern, $.primary_type],
 
-      [$.optional_tuple_parameter, $.primary_type],
+      [$._tuple_label, $.primary_type],
+      [$._tuple_label, $.literal_type],
+      [$._tuple_label, $.index_type_query],
+      [$._tuple_label, $.readonly_type],
+      [$._tuple_label, $.predefined_type],
       [$.rest_pattern, $.primary_type, $.primary_expression],
 
       [$.object, $.object_type],
@@ -163,6 +167,16 @@ module.exports = function defineGrammar(dialect) {
               field('arguments', $.arguments)
             )
           ),
+          // A tag with type arguments is parsed like a generic call. Optional type arguments in the `template_call`
+          // alternative below would make the parser commit to a tagged template at the `<` of `f<T>(x)`.
+          prec(
+            'call',
+            seq(
+              field('function', $.expression),
+              field('type_arguments', $.type_arguments),
+              field('arguments', $.template_string)
+            )
+          ),
           prec(
             'template_call',
             seq(
@@ -625,9 +639,46 @@ module.exports = function defineGrammar(dialect) {
         ),
 
       tuple_parameter: ($) =>
-        seq(field('name', choice($.identifier, $.rest_pattern)), field('type', $.type_annotation)),
+        seq(
+          field('name', choice($._tuple_label, alias($._tuple_rest_label, $.rest_pattern))),
+          field('type', $.type_annotation)
+        ),
 
-      optional_tuple_parameter: ($) => seq(field('name', $.identifier), '?', field('type', $.type_annotation)),
+      optional_tuple_parameter: ($) => seq(field('name', $._tuple_label), '?', field('type', $.type_annotation)),
+
+      _tuple_rest_label: ($) => seq('...', $._tuple_label),
+
+      // TypeScript accepts any identifier name as a tuple label, but where a tuple member begins, the keywords that
+      // can begin a type are lexed as those keywords, so they are listed here. Keywords that are rules of their own
+      // are aliased as rules: repeating their strings would turn those rules into nodes that wrap a token.
+      _tuple_label: ($) =>
+        choice(
+          $.identifier,
+          alias(
+            choice(
+              'any',
+              'number',
+              'boolean',
+              'string',
+              'symbol',
+              'void',
+              'unknown',
+              'never',
+              'object',
+              'readonly',
+              'keyof',
+              'infer',
+              'typeof',
+              'new',
+              'const',
+              'unique',
+              'abstract',
+              'import'
+            ),
+            $.identifier
+          ),
+          alias(choice($.undefined, $.null, $.true, $.false, $.this), $.identifier)
+        ),
 
       optional_type: ($) => seq($.type, '?'),
       rest_type: ($) => seq('...', $.type),

package/package.json

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

package/tree-sitter.json

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