Merge pull request #240 from rtsao/fix-type-imports

Fix edge cases with type imports

Author: Hendrik van Antwerpen

common/corpus/types.txt

@@ -317,6 +317,15 @@ 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} 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';
+
 ---
 
 (program
@@ -329,6 +338,29 @@ 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
+      (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

@@ -262,9 +262,32 @@ module.exports = function defineGrammar(dialect) {
         previous
       ),
 
+      _import_identifier: $ => choice($.identifier, alias('type', $.identifier)),
+
       import_specifier: ($, previous) => seq(
         optional(choice('type', 'typeof')),
-        previous
+        choice(
+        field('name', $._import_identifier),
+        seq(
+          field('name', choice($._module_export_name, alias('type', $.identifier))),
+          'as',
+          field('alias', $._import_identifier)
+        ),
+      )),
+
+      import_clause: ($, previous) => choice(
+        $.namespace_import,
+        $.named_imports,
+        seq(
+          $._import_identifier,
+          optional(seq(
+            ',',
+            choice(
+              $.namespace_import,
+              $.named_imports
+            )
+          ))
+        )
       ),
 
       import_statement: $ => seq(

tsx/src/grammar.json

@@ -561,7 +561,7 @@
           "members": [
             {
               "type": "SYMBOL",
-              "name": "identifier"
+              "name": "_import_identifier"
             },
             {
               "type": "CHOICE",
@@ -721,7 +721,7 @@
               "name": "name",
               "content": {
                 "type": "SYMBOL",
-                "name": "identifier"
+                "name": "_import_identifier"
               }
             },
             {
@@ -731,8 +731,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"
+                      }
+                    ]
                   }
                 },
                 {
@@ -744,7 +758,7 @@
                   "name": "alias",
                   "content": {
                     "type": "SYMBOL",
-                    "name": "identifier"
+                    "name": "_import_identifier"
                   }
                 }
               ]
@@ -7269,6 +7283,24 @@
         }
       ]
     },
+    "_import_identifier": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "identifier"
+        },
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "STRING",
+            "value": "type"
+          },
+          "named": true,
+          "value": "identifier"
+        }
+      ]
+    },
     "non_null_expression": {
       "type": "PREC_LEFT",
       "value": "unary",