Merge pull request #188 from IWANABETHATGUY/fix/template-literal

fix: 🐛 template-literal-type with infer type

Author: mjambon

common/corpus/types.txt

@@ -1101,9 +1101,8 @@ type A<B, C> = B extends C
     ? `${C}${"" extends C ? "" : "."}${B}`
     : never
   : never
-
+type Trim<S extends string> = S extends `${infer R}` ? Trim<R>  : S;
 ---
-
 (program
   (type_alias_declaration
     (type_identifier)
@@ -1138,7 +1137,8 @@ type A<B, C> = B extends C
     (template_literal_type
       (template_type
         (literal_type
-          (string (string_fragment))))
+          (string
+            (string_fragment))))
       (template_type
         (literal_type
           (number)))))
@@ -1166,12 +1166,30 @@ type A<B, C> = B extends C
               (literal_type
                 (string))
               (literal_type
-                (string (string_fragment)))))
+                (string
+                  (string_fragment)))))
           (template_type
             (type_identifier)))
         (predefined_type))
-      (predefined_type))))
-
+      (predefined_type)))
+  (type_alias_declaration
+    (type_identifier)
+    (type_parameters
+      (type_parameter
+        (type_identifier)
+        (constraint
+          (predefined_type))))
+    (conditional_type
+      (type_identifier)
+      (template_literal_type
+        (template_type
+          (infer_type
+            (type_identifier))))
+      (generic_type
+        (type_identifier)
+        (type_arguments
+          (type_identifier)))
+      (type_identifier))))
 ==================================
 Mapped type 'as' clauses
 ==================================

common/define-grammar.js

@@ -635,7 +635,7 @@ module.exports = function defineGrammar(dialect) {
         $.template_literal_type
       ),
 
-      template_type: $ => seq('${',$._primary_type,'}'),
+      template_type: $ => seq('${',choice($._primary_type, $.infer_type),'}'),
 
       template_literal_type: $ =>     seq(
         '`',

tsx/src/grammar.json

@@ -8669,8 +8669,17 @@
           "value": "${"
         },
         {
-          "type": "SYMBOL",
-          "name": "_primary_type"
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_primary_type"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "infer_type"
+            }
+          ]
         },
         {
           "type": "STRING",

tsx/src/node-types.json

@@ -5104,6 +5104,10 @@
         {
           "type": "_primary_type",
           "named": true
+        },
+        {
+          "type": "infer_type",
+          "named": true
         }
       ]
     }