Refactor alias as _import_identifier

Author: rtsao

common/define-grammar.js

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

tsx/src/grammar.json

@@ -560,22 +560,8 @@
           "type": "SEQ",
           "members": [
             {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "identifier"
-                },
-                {
-                  "type": "ALIAS",
-                  "content": {
-                    "type": "STRING",
-                    "value": "type"
-                  },
-                  "named": true,
-                  "value": "identifier"
-                }
-              ]
+              "type": "SYMBOL",
+              "name": "_import_identifier"
             },
             {
               "type": "CHOICE",
@@ -734,22 +720,8 @@
               "type": "FIELD",
               "name": "name",
               "content": {
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "SYMBOL",
-                    "name": "identifier"
-                  },
-                  {
-                    "type": "ALIAS",
-                    "content": {
-                      "type": "STRING",
-                      "value": "type"
-                    },
-                    "named": true,
-                    "value": "identifier"
-                  }
-                ]
+                "type": "SYMBOL",
+                "name": "_import_identifier"
               }
             },
             {
@@ -785,22 +757,8 @@
                   "type": "FIELD",
                   "name": "alias",
                   "content": {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "SYMBOL",
-                        "name": "identifier"
-                      },
-                      {
-                        "type": "ALIAS",
-                        "content": {
-                          "type": "STRING",
-                          "value": "type"
-                        },
-                        "named": true,
-                        "value": "identifier"
-                      }
-                    ]
+                    "type": "SYMBOL",
+                    "name": "_import_identifier"
                   }
                 }
               ]
@@ -7325,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",