Merge pull request #201 from kraftwerk28/fix-template-literal-type

Add intersection/union types to `_primary_type`

Author: mjambon

common/corpus/types.txt

@@ -1102,6 +1102,7 @@ type A<B, C> = B extends C
     : never
   : never
 type Trim<S extends string> = S extends `${infer R}` ? Trim<R>  : S;
+type A = `${true & ('foo' | false)}`;
 ---
 (program
   (type_alias_declaration
@@ -1189,7 +1190,22 @@ type Trim<S extends string> = S extends `${infer R}` ? Trim<R>  : S;
         (type_identifier)
         (type_arguments
           (type_identifier)))
-      (type_identifier))))
+      (type_identifier)))
+  (type_alias_declaration
+    (type_identifier)
+    (template_literal_type
+      (template_type
+        (intersection_type
+          (literal_type
+            (true))
+          (parenthesized_type
+            (union_type
+              (literal_type
+                (string
+                  (string_fragment)))
+              (literal_type
+                (false)))))))))
+
 ==================================
 Mapped type 'as' clauses
 ==================================

common/define-grammar.js

@@ -587,8 +587,6 @@ module.exports = function defineGrammar(dialect) {
 
       _type: $ => choice(
         $._primary_type,
-        $.union_type,
-        $.intersection_type,
         $.function_type,
         $.readonly_type,
         $.constructor_type,
@@ -642,12 +640,14 @@ module.exports = function defineGrammar(dialect) {
         $.literal_type,
         $.lookup_type,
         $.conditional_type,
-        $.template_literal_type
+        $.template_literal_type,
+        $.intersection_type,
+        $.union_type
       ),
 
-      template_type: $ => seq('${',choice($._primary_type, $.infer_type),'}'),
+      template_type: $ => seq('${', choice($._primary_type, $.infer_type), '}'),
 
-      template_literal_type: $ =>     seq(
+      template_literal_type: $ => seq(
         '`',
         repeat(choice(
           $._template_chars,

tsx/src/grammar.json

@@ -8347,14 +8347,6 @@
           "type": "SYMBOL",
           "name": "_primary_type"
         },
-        {
-          "type": "SYMBOL",
-          "name": "union_type"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "intersection_type"
-        },
         {
           "type": "SYMBOL",
           "name": "function_type"
@@ -8613,6 +8605,14 @@
         {
           "type": "SYMBOL",
           "name": "template_literal_type"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "intersection_type"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "union_type"
         }
       ]
     },