Fix edge cases with type imports

Author: rtsao

common/corpus/types.txt

@@ -317,6 +317,10 @@ import {type UserID, type User} from "./User.js";
 import typeof {jimiguitar as GuitarT} from "./User.js";
 import type UserID, {addUser, removeUser} from './User.js';
 
+import type from './User.js';
+import type, {addUser} from './User.js';
+import type, {addUser, type User} from './User.js';
+
 ---
 
 (program
@@ -329,6 +333,14 @@ import type UserID, {addUser, removeUser} from './User.js';
   (import_statement
     (import_clause
       (named_imports (import_specifier (identifier) (identifier)))) (string (string_fragment)))
+  (import_statement
+    (import_clause (identifier)
+      (named_imports (import_specifier (identifier)) (import_specifier (identifier)))) (string (string_fragment)))
+  (import_statement
+    (import_clause (identifier)) (string (string_fragment)))
+  (import_statement
+    (import_clause (identifier)
+      (named_imports (import_specifier (identifier)))) (string (string_fragment)))
   (import_statement
     (import_clause (identifier)
       (named_imports (import_specifier (identifier)) (import_specifier (identifier)))) (string (string_fragment))))

common/define-grammar.js

@@ -267,6 +267,21 @@ module.exports = function defineGrammar(dialect) {
         previous
       ),
 
+      import_clause: ($, previous) => choice(
+        $.namespace_import,
+        $.named_imports,
+        seq(
+          choice($.identifier, alias('type', $.identifier)),
+          optional(seq(
+            ',',
+            choice(
+              $.namespace_import,
+              $.named_imports
+            )
+          ))
+        )
+      ),
+
       import_statement: $ => seq(
         'import',
         optional(choice('type', 'typeof')),

tsx/src/grammar.json

@@ -560,8 +560,22 @@
           "type": "SEQ",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "identifier"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "SYMBOL",
+                  "name": "identifier"
+                },
+                {
+                  "type": "ALIAS",
+                  "content": {
+                    "type": "STRING",
+                    "value": "type"
+                  },
+                  "named": true,
+                  "value": "identifier"
+                }
+              ]
             },
             {
               "type": "CHOICE",