fix: babelify & swcify

Author: magic-akari

crates/swc_estree_ast/src/typescript.rs

@@ -10,6 +10,7 @@ use crate::{
     object::ObjectKey,
     pat::AssignmentPattern,
     stmt::Statement,
+    PrivateName,
 };
 
 #[derive(Debug, Clone, PartialEq)]
@@ -248,7 +249,8 @@ pub struct TSQualifiedName {
     #[serde(flatten)]
     pub base: BaseNode,
     pub left: Box<TSEntityName>,
-    pub right: Identifier,
+    #[serde(flatten)]
+    pub right: TSMemberName,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
@@ -467,6 +469,15 @@ pub enum TSEntityName {
     Qualified(TSQualifiedName),
 }
 
+#[derive(Debug, Clone, PartialEq)]
+#[ast_serde]
+pub enum TSMemberName {
+    #[tag("Identifier")]
+    Id(Identifier),
+    #[tag("PrivateName")]
+    PrivateName(PrivateName),
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 #[serde(tag = "type")]

crates/swc_estree_compat/src/babelify/typescript.rs

@@ -9,14 +9,14 @@ use swc_ecma_ast::{
     TsExprWithTypeArgs, TsExternalModuleRef, TsFnOrConstructorType, TsFnParam, TsFnType,
     TsImportEqualsDecl, TsImportType, TsIndexSignature, TsIndexedAccessType, TsInferType,
     TsInterfaceBody, TsInterfaceDecl, TsIntersectionType, TsKeywordType, TsKeywordTypeKind, TsLit,
-    TsLitType, TsMappedType, TsMethodSignature, TsModuleBlock, TsModuleDecl, TsModuleName,
-    TsModuleRef, TsNamespaceBody, TsNamespaceDecl, TsNamespaceExportDecl, TsNonNullExpr,
-    TsOptionalType, TsParamProp, TsParamPropParam, TsParenthesizedType, TsPropertySignature,
-    TsQualifiedName, TsRestType, TsThisType, TsThisTypeOrIdent, TsTplLitType, TsTupleElement,
-    TsTupleType, TsType, TsTypeAliasDecl, TsTypeAnn, TsTypeAssertion, TsTypeElement, TsTypeLit,
-    TsTypeOperator, TsTypeOperatorOp, TsTypeParam, TsTypeParamDecl, TsTypeParamInstantiation,
-    TsTypePredicate, TsTypeQuery, TsTypeQueryExpr, TsTypeRef, TsUnionOrIntersectionType,
-    TsUnionType,
+    TsLitType, TsMappedType, TsMemberName, TsMethodSignature, TsModuleBlock, TsModuleDecl,
+    TsModuleName, TsModuleRef, TsNamespaceBody, TsNamespaceDecl, TsNamespaceExportDecl,
+    TsNonNullExpr, TsOptionalType, TsParamProp, TsParamPropParam, TsParenthesizedType,
+    TsPropertySignature, TsQualifiedName, TsRestType, TsThisType, TsThisTypeOrIdent, TsTplLitType,
+    TsTupleElement, TsTupleType, TsType, TsTypeAliasDecl, TsTypeAnn, TsTypeAssertion,
+    TsTypeElement, TsTypeLit, TsTypeOperator, TsTypeOperatorOp, TsTypeParam, TsTypeParamDecl,
+    TsTypeParamInstantiation, TsTypePredicate, TsTypeQuery, TsTypeQueryExpr, TsTypeRef,
+    TsUnionOrIntersectionType, TsUnionType,
 };
 use swc_estree_ast::{
     Access, ArrayPattern, IdOrRest, IdOrString, Identifier, ObjectPattern, RestElement,
@@ -26,8 +26,8 @@ use swc_estree_ast::{
     TSExpressionWithTypeArguments, TSExternalModuleReference, TSFunctionType,
     TSImportEqualsDeclModuleRef, TSImportEqualsDeclaration, TSImportType, TSIndexSignature,
     TSIndexedAccessType, TSInferType, TSInterfaceBody, TSInterfaceDeclaration, TSIntersectionType,
-    TSIntrinsicKeyword, TSLiteralType, TSLiteralTypeLiteral, TSMappedType, TSMethodSignature,
-    TSModuleBlock, TSModuleDeclBody, TSModuleDeclaration, TSNamedTupleMember,
+    TSIntrinsicKeyword, TSLiteralType, TSLiteralTypeLiteral, TSMappedType, TSMemberName,
+    TSMethodSignature, TSModuleBlock, TSModuleDeclBody, TSModuleDeclaration, TSNamedTupleMember,
     TSNamespaceExportDeclaration, TSNeverKeyword, TSNonNullExpression, TSNullKeyword,
     TSNumberKeyword, TSObjectKeyword, TSOptionalType, TSParamPropParam, TSParameterProperty,
     TSParenthesizedType, TSPropertySignature, TSQualifiedName, TSRestType, TSStringKeyword,
@@ -192,6 +192,17 @@ impl Babelify for TsEntityName {
     }
 }
 
+impl Babelify for TsMemberName {
+    type Output = TSMemberName;
+
+    fn babelify(self, ctx: &Context) -> Self::Output {
+        match self {
+            Self::Ident(i) => Self::Output::Id(i.babelify(ctx)),
+            Self::PrivateName(p) => Self::Output::PrivateName(p.babelify(ctx)),
+        }
+    }
+}
+
 impl Babelify for TsTypeElement {
     type Output = TSTypeElement;
 
@@ -842,7 +853,8 @@ impl Babelify for TsExprWithTypeArgs {
                     base: ctx.base(e.span),
                     left: Box::new(babelify_expr(*e.obj, ctx)),
                     right: match e.prop {
-                        MemberProp::Ident(id) => id.babelify(ctx),
+                        MemberProp::Ident(id) => TSMemberName::Id(id.babelify(ctx)),
+                        MemberProp::PrivateName(p) => TSMemberName::PrivateName(p.babelify(ctx)),
                         _ => unreachable!(),
                     },
                 }),

crates/swc_estree_compat/src/swcify/class.rs

@@ -1,6 +1,6 @@
 use swc_ecma_ast::{
     ClassMember, Expr, Function, MemberExpr, MemberProp, MethodKind, ParamOrTsParamProp,
-    TsExprWithTypeArgs,
+    TsExprWithTypeArgs, TsMemberName,
 };
 use swc_estree_ast::{
     ClassBody, ClassBodyEl, ClassImpl, ClassMethodKind, TSEntityName,
@@ -198,7 +198,10 @@ impl Swcify for TSExpressionWithTypeArguments {
         fn swcify_qualified_name(qualified_name: TSQualifiedName, ctx: &Context) -> Box<Expr> {
             Box::new(Expr::Member(MemberExpr {
                 obj: swcify_expr(*qualified_name.left, ctx),
-                prop: MemberProp::Ident(qualified_name.right.swcify(ctx).id),
+                prop: match qualified_name.right.swcify(ctx) {
+                    TsMemberName::Ident(id) => MemberProp::Ident(id),
+                    TsMemberName::PrivateName(p) => MemberProp::PrivateName(p),
+                },
                 span: ctx.span(&qualified_name.base),
             }))
         }

crates/swc_estree_compat/src/swcify/typescript.rs

@@ -1,11 +1,11 @@
 use swc_ecma_ast::{
-    Accessibility, Ident, TsEntityName, TsQualifiedName, TsType, TsTypeAnn, TsTypeParam,
-    TsTypeParamDecl, TsTypeParamInstantiation,
+    Accessibility, Ident, TsEntityName, TsMemberName, TsQualifiedName, TsType, TsTypeAnn,
+    TsTypeParam, TsTypeParamDecl, TsTypeParamInstantiation,
 };
 use swc_estree_ast::{
-    Access, FlowType, SuperTypeParams, TSEntityName, TSQualifiedName, TSType, TSTypeAnnotation,
-    TSTypeParameter, TSTypeParameterDeclaration, TSTypeParameterInstantiation, TypeAnnotOrNoop,
-    TypeParamDeclOrNoop,
+    Access, FlowType, SuperTypeParams, TSEntityName, TSMemberName, TSQualifiedName, TSType,
+    TSTypeAnnotation, TSTypeParameter, TSTypeParameterDeclaration, TSTypeParameterInstantiation,
+    TypeAnnotOrNoop, TypeParamDeclOrNoop,
 };
 
 use super::Context;
@@ -140,7 +140,18 @@ impl Swcify for TSQualifiedName {
     fn swcify(self, ctx: &Context) -> Self::Output {
         TsQualifiedName {
             left: self.left.swcify(ctx),
-            right: self.right.swcify(ctx).id,
+            right: self.right.swcify(ctx),
+        }
+    }
+}
+
+impl Swcify for TSMemberName {
+    type Output = TsMemberName;
+
+    fn swcify(self, ctx: &Context) -> Self::Output {
+        match self {
+            Self::Id(id) => Self::Output::Ident(id.swcify(ctx).id),
+            Self::PrivateName(p) => Self::Output::Ident(p.swcify(ctx).id),
         }
     }
 }