fix typeof according to typescript rules

Author: resolritter

common/corpus/types.txt

@@ -711,14 +711,15 @@ type T = keyof (Person);
 
 type T = typeof Person;
 type T = typeof Person.P;
-type T = typeof Person<P>;
 type T = typeof import('person');
 
 type T = keyof typeof Person;
 
 type T = keyof U[number];
 type T = keyof U & V;
 
+type T = typeof array[number];
+
 ---
 
 (program
@@ -734,24 +735,23 @@ type T = keyof U & V;
     (type_query (identifier)))
   (type_alias_declaration (type_identifier)
     (type_query (member_expression (identifier) (property_identifier))))
-  (type_alias_declaration (type_identifier)
-    (type_query (generic_type (type_identifier) (type_arguments (type_identifier)))))
   (type_alias_declaration (type_identifier)
     (type_query (call_expression (import) (arguments (string (string_fragment))))))
   (type_alias_declaration (type_identifier)
     (index_type_query (type_query (identifier))))
   (type_alias_declaration (type_identifier)
     (index_type_query (lookup_type (type_identifier) (predefined_type))))
   (type_alias_declaration (type_identifier)
-    (intersection_type (index_type_query (type_identifier)) (type_identifier))))
+    (intersection_type (index_type_query (type_identifier)) (type_identifier)))
+  (type_alias_declaration (type_identifier)
+    (type_query (subscript_expression (identifier) (predefined_type)))))
 
 =======================================
 Lookup types
 =======================================
 
 type K1 = Foo[bar]
 type K1 = Foo['bar' | 'baz']
-type A = typeof some_array[number]
 
 ---
 
@@ -761,10 +761,7 @@ type A = typeof some_array[number]
     (lookup_type (type_identifier) (type_identifier)))
   (type_alias_declaration
     (type_identifier)
-    (lookup_type (type_identifier) (union_type (literal_type (string (string_fragment))) (literal_type (string (string_fragment))))))
-  (type_alias_declaration
-    (type_identifier)
-    (lookup_type (type_query (identifier)) (predefined_type))))
+    (lookup_type (type_identifier) (union_type (literal_type (string (string_fragment))) (literal_type (string (string_fragment)))))))
 
 
 =======================================
@@ -1222,3 +1219,50 @@ type A<B> = { [B in keyof C & string as `${P}1` | `${P}2`]: A[B] }
           (lookup_type
             (type_identifier)
             (type_identifier)))))))
+
+============================
+typeof in generic arguments
+============================
+
+type T = Foo<Bar<typeof bar>>
+type T = Foo<Bar<typeof bar.baz>>
+type T = Foo<Bar<typeof bar["baz"]>>
+
+---
+
+(program
+  (type_alias_declaration
+    (type_identifier)
+    (generic_type
+      (type_identifier)
+      (type_arguments
+        (generic_type
+          (type_identifier)
+          (type_arguments
+            (type_query
+              (identifier)))))))
+  (type_alias_declaration
+    (type_identifier)
+    (generic_type
+      (type_identifier)
+      (type_arguments
+        (generic_type
+          (type_identifier)
+          (type_arguments
+            (type_query
+              (member_expression
+                (identifier)
+                (property_identifier))))))))
+  (type_alias_declaration
+    (type_identifier)
+    (generic_type
+      (type_identifier)
+      (type_arguments
+        (generic_type
+          (type_identifier)
+          (type_arguments
+            (type_query
+              (subscript_expression
+                (identifier)
+                (string
+                  (string_fragment))))))))))

common/define-grammar.js

@@ -47,6 +47,12 @@ module.exports = function defineGrammar(dialect) {
       [$.type_query, $.subscript_expression, $.expression],
       [$.nested_type_identifier, $.generic_type, $._primary_type, $.lookup_type, $.index_type_query, $._type],
       [$.as_expression, $._primary_type],
+      [$._type_query_member_expression, $.member_expression],
+      [$._type_query_member_expression, $.primary_expression],
+      [$._type_query_subscript_expression, $.subscript_expression],
+      [$._type_query_subscript_expression, $.primary_expression],
+      [$._type_query_call_expression, $.primary_expression],
+      [$.type_query, $.primary_expression],
     ]),
 
     conflicts: ($, previous) => previous.concat([
@@ -655,9 +661,47 @@ module.exports = function defineGrammar(dialect) {
         seq(':', $.type_predicate)
       ),
 
+      // Type query expressions are more restrictive than regular expressions
+      _type_query_member_expression: $ => seq(
+        field('object', choice(
+          $.identifier,
+          alias($._type_query_subscript_expression, $.subscript_expression),
+          alias($._type_query_member_expression, $.member_expression),
+          alias($._type_query_call_expression, $.call_expression)
+        )),
+        choice('.', '?.'),
+        field('property', choice(
+          $.private_property_identifier,
+          alias($.identifier, $.property_identifier)
+        ))
+      ),
+      _type_query_subscript_expression: $ => seq(
+        field('object', choice(
+          $.identifier,
+          alias($._type_query_subscript_expression, $.subscript_expression),
+          alias($._type_query_member_expression, $.member_expression),
+          alias($._type_query_call_expression, $.call_expression)
+        )),
+        optional('?.'),
+        '[', field('index', choice($.predefined_type, $.string, $.number)), ']'
+      ),
+      _type_query_call_expression: $ => seq(
+        field('function', choice(
+          $.import,
+          $.identifier,
+          alias($._type_query_member_expression, $.member_expression),
+          alias($._type_query_subscript_expression, $.subscript_expression)
+        )),
+        field('arguments', $.arguments)
+      ),
       type_query: $ => prec.right(seq(
         'typeof',
-        choice($.primary_expression, $.generic_type),
+        choice(
+          alias($._type_query_subscript_expression, $.subscript_expression),
+          alias($._type_query_member_expression, $.member_expression),
+          alias($._type_query_call_expression, $.call_expression),
+          $.identifier
+        ),
       )),
 
       index_type_query: $ => seq(