Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(es): Use Into and From for AST construction #9201

Merged
merged 33 commits into from
Jul 11, 2024
Merged

refactor(es): Use Into and From for AST construction #9201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b2c913c
`Decl::$VARIANT(Box::new($ARG))`
kdy1 Jul 11, 2024
470274d
`Decl::$VARIANT($ARG)`
kdy1 Jul 11, 2024
cd070bb
`Stmt::$VARIANT(Box::new($ARG))`
kdy1 Jul 11, 2024
c09c5a7
`Stmt::$VARIANT($ARG)`
kdy1 Jul 11, 2024
cc62981
`ModuleDecl::$VARIANT($ARG)`
kdy1 Jul 11, 2024
37f9bf2
`ModuleItem::$VARIANT($ARG)`
kdy1 Jul 11, 2024
b45925b
into into
kdy1 Jul 11, 2024
fc29b21
into into
kdy1 Jul 11, 2024
f5a4175
Fix AST
kdy1 Jul 11, 2024
ae2b27a
More work
kdy1 Jul 11, 2024
fe3ef8e
More from impl
kdy1 Jul 11, 2024
fe25324
More from impl
kdy1 Jul 11, 2024
aefd3a0
More ast work
kdy1 Jul 11, 2024
078d2d2
More fix
kdy1 Jul 11, 2024
86b25f5
More from impl
kdy1 Jul 11, 2024
5dc654e
More fix
kdy1 Jul 11, 2024
5a51b53
More from impl
kdy1 Jul 11, 2024
9744e4b
More from impl
kdy1 Jul 11, 2024
b103969
More fix
kdy1 Jul 11, 2024
8cfaab7
More fix
kdy1 Jul 11, 2024
642878a
FIx `StmtLike`
kdy1 Jul 11, 2024
e2ff52c
More from impl
kdy1 Jul 11, 2024
b48b35d
More fix
kdy1 Jul 11, 2024
9dc96da
More from impl
kdy1 Jul 11, 2024
da42749
More fix
kdy1 Jul 11, 2024
92df7c2
More fix
kdy1 Jul 11, 2024
395d17a
More fix
kdy1 Jul 11, 2024
71d8260
More fix
kdy1 Jul 11, 2024
09ea59f
Fix AST
kdy1 Jul 11, 2024
cc0d110
Fix more
kdy1 Jul 11, 2024
a77bec9
Fix more
kdy1 Jul 11, 2024
d8d928f
Fix more
kdy1 Jul 11, 2024
6e220fa
Fix
kdy1 Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions crates/swc_bundler/src/bundler/chunk/cjs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,14 @@ where
});
module.sort(info.id, &ctx.graph, &ctx.cycles, &self.cm);

let stmt = ModuleItem::Stmt(wrap_module(
let stmt = wrap_module(
SyntaxContext::empty(),
SyntaxContext::empty().apply_mark(self.unresolved_mark),
info.local_ctxt(),
load_var,
module.into(),
));
)
.into();

let wrapped = Modules::from(
info.id,
Expand Down Expand Up @@ -150,7 +151,7 @@ fn wrap_module(

// var load = __swcpack_require__.bind(void 0, moduleDecl)

Stmt::Decl(Decl::Var(Box::new(VarDecl {
VarDecl {
span: DUMMY_SP,
kind: VarDeclKind::Var,
declare: false,
Expand All @@ -168,7 +169,8 @@ fn wrap_module(
definite: false,
}],
..Default::default()
})))
}
.into()
}

struct RequireReplacer<'a, 'b, L, R>
Expand Down Expand Up @@ -248,16 +250,15 @@ where
// Side effect import
if i.specifiers.is_empty() {
self.replaced = true;
*node = ModuleItem::Stmt(
CallExpr {
span: DUMMY_SP,
callee: load_var.as_callee(),
args: vec![],
*node = CallExpr {
span: DUMMY_SP,
callee: load_var.as_callee(),
args: vec![],

..Default::default()
}
.into_stmt(),
);
..Default::default()
}
.into_stmt()
.into();
return;
}

Expand Down Expand Up @@ -291,7 +292,7 @@ where
}
ImportSpecifier::Namespace(ns) => {
self.replaced = true;
*node = ModuleItem::Stmt(Stmt::Decl(Decl::Var(Box::new(VarDecl {
*node = VarDecl {
span: i.span,
kind: VarDeclKind::Var,
declare: false,
Expand All @@ -311,14 +312,15 @@ where
definite: false,
}],
..Default::default()
}))));
}
.into();
return;
}
}
}

self.replaced = true;
*node = ModuleItem::Stmt(Stmt::Decl(Decl::Var(Box::new(VarDecl {
*node = VarDecl {
span: i.span,
kind: VarDeclKind::Var,
declare: false,
Expand All @@ -339,7 +341,8 @@ where
definite: false,
}],
..Default::default()
}))));
}
.into();
}
}
}
Expand Down
55 changes: 29 additions & 26 deletions crates/swc_bundler/src/bundler/chunk/computed_key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ where
});
additional_items.push((
module_id,
ModuleItem::ModuleDecl(ModuleDecl::ExportNamed(NamedExport {
NamedExport {
span: DUMMY_SP,
specifiers: vec![specifier],
src: None,
Expand All @@ -94,7 +94,8 @@ where
}
.into_with(),
),
})),
}
.into(),
));
}
}
Expand All @@ -112,7 +113,7 @@ where

module.append_all(additional_items);

let return_stmt = Stmt::Return(ReturnStmt {
let return_stmt = ReturnStmt {
span: DUMMY_SP,
arg: Some(
ObjectLit {
Expand All @@ -121,7 +122,8 @@ where
}
.into(),
),
});
}
.into();

module.iter().for_each(|(_, v)| {
if let ModuleItem::ModuleDecl(ModuleDecl::ExportAll(ref export)) = v {
Expand Down Expand Up @@ -179,10 +181,7 @@ where
}],
};

module.append(
id,
ModuleItem::Stmt(Stmt::Decl(Decl::Var(Box::new(var_decl)))),
);
module.append(id, var_decl.into());

// print_hygiene(
// "wrap",
Expand Down Expand Up @@ -233,7 +232,7 @@ impl Fold for ExportToReturn {
};

let stmt = match decl {
ModuleDecl::Import(_) => return ModuleItem::ModuleDecl(decl),
ModuleDecl::Import(_) => return decl.into(),
ModuleDecl::ExportDecl(export) => {
match &export.decl {
Decl::Class(ClassDecl { ident, .. }) | Decl::Fn(FnDecl { ident, .. }) => {
Expand All @@ -246,7 +245,7 @@ impl Fold for ExportToReturn {
_ => unreachable!(),
}

Some(Stmt::Decl(export.decl))
Some(ModuleItem::from(export.decl))
}

ModuleDecl::ExportDefaultDecl(export) => match export.decl {
Expand All @@ -259,11 +258,14 @@ impl Fold for ExportToReturn {
ident.clone(),
);

Some(Stmt::Decl(Decl::Class(ClassDecl {
ident,
class: expr.class,
declare: false,
})))
Some(
ClassDecl {
ident,
class: expr.class,
declare: false,
}
.into(),
)
}
DefaultDecl::Fn(expr) => {
let ident = expr.ident;
Expand All @@ -274,18 +276,19 @@ impl Fold for ExportToReturn {
ident.clone(),
);

Some(Stmt::Decl(Decl::Fn(FnDecl {
ident,
function: expr.function,
declare: false,
})))
Some(
FnDecl {
ident,
function: expr.function,
declare: false,
}
.into(),
)
}
DefaultDecl::TsInterfaceDecl(_) => None,
},
ModuleDecl::ExportDefaultExpr(_) => None,
ModuleDecl::ExportAll(export) => {
return ModuleItem::ModuleDecl(ModuleDecl::ExportAll(export))
}
ModuleDecl::ExportAll(export) => return export.into(),
ModuleDecl::ExportNamed(export) => {
for specifier in &export.specifiers {
match specifier {
Expand Down Expand Up @@ -322,7 +325,7 @@ impl Fold for ExportToReturn {
{
None
} else {
return ModuleItem::ModuleDecl(ModuleDecl::ExportNamed(export));
return export.into();
}
}
ModuleDecl::TsImportEquals(_) => None,
Expand All @@ -331,9 +334,9 @@ impl Fold for ExportToReturn {
};

if let Some(stmt) = stmt {
ModuleItem::Stmt(stmt)
stmt
} else {
ModuleItem::Stmt(Stmt::Empty(EmptyStmt { span: DUMMY_SP }))
EmptyStmt { span: DUMMY_SP }.into()
}
}
}
Loading
Loading