I need more macro

Author: kdy1

ecmascript/ast/Cargo.toml

@@ -14,6 +14,7 @@ swc_atoms = { version = "0.2", path ="../../atoms" }
 swc_common = { version = "0.7", path ="../../common" }
 enum_kind = { version = "0.2", path ="../../macros/enum_kind" }
 string_enum = { version = "0.3", path ="../../macros/string_enum" }
+is-macro = "0.1"
 num-bigint = { version = "0.2", features = ["serde"] }
 
 [dev-dependencies]

ecmascript/ast/src/class.rs

@@ -10,6 +10,7 @@ use crate::{
     },
     EmptyStmt,
 };
+use is_macro::Is;
 use serde::{Deserialize, Serialize};
 use swc_common::{ast_node, Span};
 
@@ -42,7 +43,7 @@ pub struct Class {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum ClassMember {
     #[tag("Constructor")]
     Constructor(Constructor),

ecmascript/ast/src/decl.rs

@@ -6,15 +6,17 @@ use crate::{
     pat::Pat,
     typescript::{TsEnumDecl, TsInterfaceDecl, TsModuleDecl, TsTypeAliasDecl},
 };
+use is_macro::Is;
 use string_enum::StringEnum;
 use swc_common::{ast_node, Span};
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum Decl {
     #[tag("ClassDeclaration")]
     Class(ClassDecl),
     #[tag("FunctionDeclaration")]
+    #[is(name = "fn_decl")]
     Fn(FnDecl),
     #[tag("VariableDeclaration")]
     Var(VarDecl),

ecmascript/ast/src/expr.rs

@@ -15,11 +15,12 @@ use crate::{
     },
     Invalid,
 };
+use is_macro::Is;
 use serde::{self, Deserialize, Serialize};
 use swc_common::{ast_node, Span, Spanned, DUMMY_SP};
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum Expr {
     #[tag("ThisExpression")]
     This(ThisExpr),
@@ -31,6 +32,7 @@ pub enum Expr {
     Object(ObjectLit),
 
     #[tag("FunctionExpression")]
+    #[is(name = "fn_expr")]
     Fn(FnExpr),
 
     #[tag("UnaryExpression")]
@@ -99,12 +101,14 @@ pub enum Expr {
     Class(ClassExpr),
 
     #[tag("YieldExpression")]
+    #[is(name = "yield_expr")]
     Yield(YieldExpr),
 
     #[tag("MetaProperty")]
     MetaProp(MetaPropExpr),
 
     #[tag("AwaitExpression")]
+    #[is(name = "await_expr")]
     Await(AwaitExpr),
 
     #[tag("ParenthesisExpression")]
@@ -177,7 +181,7 @@ pub struct ObjectLit {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum PropOrSpread {
     /// Spread properties, e.g., `{a: 1, ...obj, b: 2}`.
     #[tag("SpreadElement")]
@@ -442,9 +446,10 @@ pub struct ParenExpr {
 
 #[ast_node]
 #[allow(variant_size_differences)]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum ExprOrSuper {
     #[tag("Super")]
+    #[is(name = "super_")]
     Super(Super),
 
     #[tag("*")]
@@ -477,7 +482,7 @@ impl Spanned for ExprOrSpread {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 #[allow(variant_size_differences)]
 pub enum BlockStmtOrExpr {
     #[tag("BlockStatement")]
@@ -487,7 +492,7 @@ pub enum BlockStmtOrExpr {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum PatOrExpr {
     #[tag("ThisExpression")]
     #[tag("ArrayExpression")]

ecmascript/ast/src/function.rs

@@ -4,6 +4,7 @@ use crate::{
     stmt::BlockStmt,
     typescript::{TsParamProp, TsTypeAnn, TsTypeParamDecl},
 };
+use is_macro::Is;
 use swc_common::{ast_node, Span};
 
 /// Common parts of function and method.
@@ -44,7 +45,7 @@ pub struct Param {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum ParamOrTsParamProp {
     #[tag("TsParameterProperty")]
     TsParamProp(TsParamProp),

ecmascript/ast/src/jsx.rs

@@ -4,12 +4,13 @@ use crate::{
     lit::Lit,
     typescript::TsTypeParamInstantiation,
 };
+use is_macro::Is;
 use swc_atoms::JsWord;
 use swc_common::{ast_node, Span};
 
 /// Used for `obj` property of `JSXMemberExpr`.
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 #[allow(variant_size_differences)]
 pub enum JSXObject {
     #[tag("JSXMemberExpression")]

ecmascript/ast/src/module.rs

@@ -1,9 +1,10 @@
 use crate::{module_decl::ModuleDecl, stmt::Stmt};
+use is_macro::Is;
 use swc_atoms::JsWord;
 use swc_common::{ast_node, Span};
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum Program {
     #[tag("Module")]
     Module(Module),
@@ -34,7 +35,7 @@ pub struct Script {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum ModuleItem {
     #[tag("ImportDeclaration")]
     #[tag("ExportDeclaration")]

ecmascript/ast/src/module_decl.rs

@@ -5,10 +5,11 @@ use crate::{
     lit::Str,
     typescript::{TsExportAssignment, TsImportEqualsDecl, TsInterfaceDecl, TsNamespaceExportDecl},
 };
+use is_macro::Is;
 use swc_common::{ast_node, Span};
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum ModuleDecl {
     #[tag("ImportDeclaration")]
     Import(ImportDecl),
@@ -106,20 +107,21 @@ pub struct ExportDefaultDecl {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum DefaultDecl {
     #[tag("ClassExpression")]
     Class(ClassExpr),
 
     #[tag("FunctionExpression")]
+    #[is(name = "fn_expr")]
     Fn(FnExpr),
 
     #[tag("TsInterfaceDeclaration")]
     TsInterfaceDecl(TsInterfaceDecl),
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum ImportSpecifier {
     #[tag("ImportSpecifier")]
     Named(ImportNamedSpecifier),
@@ -160,7 +162,7 @@ pub struct ImportNamedSpecifier {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum ExportSpecifier {
     #[tag("ExportNamespaceSpecifier")]
     Namespace(ExportNamespaceSpecifier),

ecmascript/ast/src/pat.rs

@@ -1,8 +1,9 @@
 use crate::{expr::Expr, ident::Ident, prop::PropName, typescript::TsTypeAnn, Invalid};
+use is_macro::Is;
 use swc_common::{ast_node, Span};
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum Pat {
     #[tag("Identifier")]
     Ident(Ident),
@@ -89,7 +90,7 @@ pub struct RestPat {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum ObjectPatProp {
     #[tag("KeyValuePatternProperty")]
     KeyValue(KeyValuePatProp),

ecmascript/ast/src/prop.rs

@@ -7,10 +7,11 @@ use crate::{
     stmt::BlockStmt,
     typescript::TsTypeAnn,
 };
+use is_macro::Is;
 use swc_common::{ast_node, Span};
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum Prop {
     /// `a` in `{ a, }`
     #[tag("Identifier")]
@@ -83,7 +84,7 @@ pub struct MethodProp {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum PropName {
     #[tag("Identifier")]
     Ident(Ident),

ecmascript/ast/src/stmt.rs

@@ -4,6 +4,7 @@ use crate::{
     ident::Ident,
     pat::Pat,
 };
+use is_macro::Is;
 use swc_common::{ast_node, Span};
 
 /// Use when only block statements are allowed.
@@ -17,7 +18,7 @@ pub struct BlockStmt {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum Stmt {
     #[tag("BlockStatement")]
     Block(BlockStmt),
@@ -32,18 +33,22 @@ pub enum Stmt {
     With(WithStmt),
 
     #[tag("ReturnStatement")]
+    #[is(name = "return_stmt")]
     Return(ReturnStmt),
 
     #[tag("LabeledStatement")]
     Labeled(LabeledStmt),
 
     #[tag("BreakStatement")]
+    #[is(name = "break_stmt")]
     Break(BreakStmt),
 
     #[tag("ContinueStatement")]
+    #[is(name = "continue_stmt")]
     Continue(ContinueStmt),
 
     #[tag("IfStatement")]
+    #[is(name = "if_stmt")]
     If(IfStmt),
 
     #[tag("SwitchStatement")]
@@ -54,15 +59,18 @@ pub enum Stmt {
 
     /// A try statement. If handler is null then finalizer must be a BlockStmt.
     #[tag("TryStatement")]
+    #[is(name = "try_stmt")]
     Try(TryStmt),
 
     #[tag("WhileStatement")]
+    #[is(name = "while_stmt")]
     While(WhileStmt),
 
     #[tag("DoWhileStatement")]
     DoWhile(DoWhileStmt),
 
     #[tag("ForStatement")]
+    #[is(name = "for_stmt")]
     For(ForStmt),
 
     #[tag("ForInStatement")]
@@ -275,7 +283,7 @@ pub struct CatchClause {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 pub enum VarDeclOrPat {
     #[tag("VariableDeclaration")]
     VarDecl(VarDecl),
@@ -285,7 +293,7 @@ pub enum VarDeclOrPat {
 }
 
 #[ast_node]
-#[derive(Eq, Hash)]
+#[derive(Eq, Hash, Is)]
 #[allow(variant_size_differences)]
 pub enum VarDeclOrExpr {
     #[tag("VariableDeclaration")]