Support "infer" types (#124)

* support inferred types * regenerate parser for 'infer_conditional_types' Co-authored-by: resolritter <resolritter@users.noreply.github.com>
tree-sitter · Feb 5, 2021 · da72060 · da72060
1 parent c17fe89
commit da72060
Show file tree

Hide file tree

Showing 8 changed files with 191,675 additions and 189,574 deletions.
diff --git a/common/corpus/types.txt b/common/corpus/types.txt
@@ -912,6 +912,9 @@ type T = X extends Y ? Z : Y
 type T = X extends ?Y ? ?X : Y
 type F<T, X, Y> = ((t: T) => X extends Y ? X : Y) extends ((t: T) => X extends Y ? Y : X) ? X : Y
 type F<T, X, Y> = (t: T) => X extends Y ? X : Y extends (t: T) => X extends Y ? Y : X ? X : Y
+type T<X, Y> = T extends X<infer Y> ? Y : X
+type T<X> = X extends (infer X)[] ? X : never;
+type T<X> = T extends { x: infer X } ? X : never;
 
 ---
 (program
@@ -986,4 +989,39 @@ type F<T, X, Y> = (t: T) => X extends Y ? X : Y extends (t: T) => X extends Y ?
             (type_identifier)
             (type_identifier)))
         (type_identifier)
-        (type_identifier)))))
+        (type_identifier))))
+  (type_alias_declaration
+    (type_identifier)
+    (type_parameters
+      (type_parameter (type_identifier))
+      (type_parameter (type_identifier)))
+    (conditional_type
+      (type_identifier)
+      (generic_type
+        (type_identifier)
+        (type_arguments
+          (infer_type (type_identifier))))
+      (type_identifier)
+      (type_identifier))) 
+    (type_alias_declaration
+      (type_identifier)
+      (type_parameters
+        (type_parameter (type_identifier)))
+      (conditional_type
+        (type_identifier)
+        (array_type
+          (parenthesized_type (infer_type (type_identifier))))
+        (type_identifier)
+        (type_identifier)))
+  (type_alias_declaration
+    (type_identifier)
+    (type_parameters
+      (type_parameter (type_identifier)))
+      (conditional_type
+        (type_identifier)
+        (object_type
+          (property_signature
+            (property_identifier)
+            (type_annotation (infer_type (type_identifier)))))
+      (type_identifier)
+      (type_identifier))))
diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -522,7 +522,8 @@ module.exports = function defineGrammar(dialect) {
         $.union_type,
         $.intersection_type,
         $.function_type,
-        $.constructor_type
+        $.constructor_type,
+        $.infer_type
       ),
 
       optional_identifier: $ => seq($.identifier, '?'),
@@ -567,6 +568,8 @@ module.exports = function defineGrammar(dialect) {
         $.conditional_type,
       ),
 
+      infer_type: $ => seq("infer", $._type_identifier),
+
       conditional_type: $ => prec.left(PREC.CONDITIONAL_TYPE, seq(
         field('left', $._type),
         'extends',

diff --git a/tsx/src/grammar.json b/tsx/src/grammar.json
@@ -7830,6 +7830,10 @@
         {
           "type": "SYMBOL",
           "name": "constructor_type"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "infer_type"
         }
       ]
     },
@@ -7995,6 +7999,19 @@
         }
       ]
     },
+    "infer_type": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "infer"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "_type_identifier"
+        }
+      ]
+    },
     "conditional_type": {
       "type": "PREC_LEFT",
       "value": 2,

diff --git a/tsx/src/node-types.json b/tsx/src/node-types.json
@@ -500,6 +500,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -807,6 +811,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -898,6 +906,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -1565,6 +1577,10 @@
             "type": "index_type_query",
             "named": true
           },
+          {
+            "type": "infer_type",
+            "named": true
+          },
           {
             "type": "intersection_type",
             "named": true
@@ -1651,6 +1667,10 @@
             "type": "index_type_query",
             "named": true
           },
+          {
+            "type": "infer_type",
+            "named": true
+          },
           {
             "type": "intersection_type",
             "named": true
@@ -1737,6 +1757,10 @@
             "type": "index_type_query",
             "named": true
           },
+          {
+            "type": "infer_type",
+            "named": true
+          },
           {
             "type": "intersection_type",
             "named": true
@@ -1823,6 +1847,10 @@
             "type": "index_type_query",
             "named": true
           },
+          {
+            "type": "infer_type",
+            "named": true
+          },
           {
             "type": "intersection_type",
             "named": true
@@ -1915,6 +1943,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -2033,6 +2065,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -2172,6 +2208,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -2997,6 +3037,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -3279,6 +3323,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -3511,6 +3559,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -3609,6 +3661,21 @@
       ]
     }
   },
+  {
+    "type": "infer_type",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "type_identifier",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "interface_declaration",
     "named": true,
@@ -3729,6 +3796,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -4199,6 +4270,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -4290,6 +4365,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -4931,6 +5010,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -5022,6 +5105,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -5235,6 +5322,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -5964,6 +6055,10 @@
             "type": "index_type_query",
             "named": true
           },
+          {
+            "type": "infer_type",
+            "named": true
+          },
           {
             "type": "intersection_type",
             "named": true
@@ -6056,6 +6151,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -6147,6 +6246,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -6280,6 +6383,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -6459,6 +6566,10 @@
           "type": "index_type_query",
           "named": true
         },
+        {
+          "type": "infer_type",
+          "named": true
+        },
         {
           "type": "intersection_type",
           "named": true
@@ -7038,6 +7149,10 @@
     "type": "in",
     "named": false
   },
+  {
+    "type": "infer",
+    "named": false
+  },
   {
     "type": "instanceof",
     "named": false