Add more test cases

Author: rtsao

common/corpus/types.txt

@@ -319,6 +319,11 @@ import type UserID, {addUser, removeUser} from './User.js';
 
 import type from './User.js';
 import type, {addUser} from './User.js';
+import {type} from './User.js';
+import {addUser as type} from './User.js';
+import {type as addUser} from './User.js';
+import {type, addUser} from './User.js';
+import {addUser, type} from './User.js';
 import type, {addUser, type User} from './User.js';
 
 ---
@@ -341,6 +346,21 @@ import type, {addUser, type User} from './User.js';
   (import_statement
     (import_clause (identifier)
       (named_imports (import_specifier (identifier)))) (string (string_fragment)))
+  (import_statement
+    (import_clause
+      (named_imports (import_specifier (identifier)))) (string (string_fragment)))
+  (import_statement
+    (import_clause
+      (named_imports (import_specifier (identifier) (identifier)))) (string (string_fragment)))
+  (import_statement
+    (import_clause
+      (named_imports (import_specifier (identifier) (identifier)))) (string (string_fragment)))
+  (import_statement
+    (import_clause
+      (named_imports (import_specifier (identifier)) (import_specifier (identifier)))) (string (string_fragment)))
+  (import_statement
+    (import_clause
+      (named_imports (import_specifier (identifier)) (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

@@ -264,8 +264,14 @@ module.exports = function defineGrammar(dialect) {
 
       import_specifier: ($, previous) => seq(
         optional(choice('type', 'typeof')),
-        previous
-      ),
+        choice(
+        field('name', choice($.identifier, alias('type', $.identifier))),
+        seq(
+          field('name', choice($._module_export_name, alias('type', $.identifier))),
+          'as',
+          field('alias', choice($.identifier, alias('type', $.identifier)))
+        ),
+      )),
 
       import_clause: ($, previous) => choice(
         $.namespace_import,

tsx/src/grammar.json

@@ -734,8 +734,22 @@
               "type": "FIELD",
               "name": "name",
               "content": {
-                "type": "SYMBOL",
-                "name": "identifier"
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "identifier"
+                  },
+                  {
+                    "type": "ALIAS",
+                    "content": {
+                      "type": "STRING",
+                      "value": "type"
+                    },
+                    "named": true,
+                    "value": "identifier"
+                  }
+                ]
               }
             },
             {
@@ -745,8 +759,22 @@
                   "type": "FIELD",
                   "name": "name",
                   "content": {
-                    "type": "SYMBOL",
-                    "name": "_module_export_name"
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "_module_export_name"
+                      },
+                      {
+                        "type": "ALIAS",
+                        "content": {
+                          "type": "STRING",
+                          "value": "type"
+                        },
+                        "named": true,
+                        "value": "identifier"
+                      }
+                    ]
                   }
                 },
                 {
@@ -757,8 +785,22 @@
                   "type": "FIELD",
                   "name": "alias",
                   "content": {
-                    "type": "SYMBOL",
-                    "name": "identifier"
+                    "type": "CHOICE",
+                    "members": [
+                      {
+                        "type": "SYMBOL",
+                        "name": "identifier"
+                      },
+                      {
+                        "type": "ALIAS",
+                        "content": {
+                          "type": "STRING",
+                          "value": "type"
+                        },
+                        "named": true,
+                        "value": "identifier"
+                      }
+                    ]
                   }
                 }
               ]