dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(transformer): shorten code in TS namespace transform (#3468)

Browse source 
Refactor to shorten code.
This commit is contained in:
overlookmotel 2024-05-30 21:56:31 +00:00
parent deef86aff2
commit 0f69ffda5f
1 changed files with 26 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
crates/oxc_transformer/src/typescript/namespace.rs
View file

@ -156,22 +156,19 @@ impl<'a> TypeScript<'a> {
let namespace_top_level = if let Some(body) = decl.body {
match body {
TSModuleDeclarationBody::TSModuleBlock(mut block) => {
TSModuleDeclarationBody::TSModuleBlock(block) => {
scope_id = block.scope_id.get();
self.ctx.ast.move_statement_vec(&mut block.body)
block.unbox().body
}
// We handle `namespace X.Y {}` as if it was
// namespace X {
// export namespace Y {}
// }
TSModuleDeclarationBody::TSModuleDeclaration(declaration) => {
let declaration =
Declaration::TSModuleDeclaration(self.ctx.ast.copy(&declaration));
let declaration = Declaration::TSModuleDeclaration(declaration);
let export_named_decl =
self.ctx.ast.plain_export_named_declaration_declaration(SPAN, declaration);
let stmt = self.ctx.ast.module_declaration(
ModuleDeclaration::ExportNamedDeclaration(export_named_decl),
);
let stmt = Statement::ExportNamedDeclaration(export_named_decl);
self.ctx.ast.new_vec_single(stmt)
}
}
@ -179,7 +176,6 @@ impl<'a> TypeScript<'a> {
self.ctx.ast.new_vec()
};
let mut is_empty = true;
let mut new_stmts = self.ctx.ast.new_vec();
for stmt in namespace_top_level {
@ -191,7 +187,6 @@ impl<'a> TypeScript<'a> {
let module_name = decl.id.name().clone();
if let Some(transformed) = self.handle_nested(decl.unbox(), None, ctx) {
is_empty = false;
if names.insert(module_name.clone()) {
new_stmts.push(Statement::from(
self.create_variable_declaration(&module_name),
@ -200,31 +195,27 @@ impl<'a> TypeScript<'a> {
new_stmts.push(transformed);
}
}
Statement::ClassDeclaration(decl) => {
is_empty = false;
Statement::ClassDeclaration(ref decl) => {
decl.bound_names(&mut |id| {
names.insert(id.name.clone());
});
new_stmts.push(Statement::ClassDeclaration(decl));
new_stmts.push(stmt);
}
Statement::FunctionDeclaration(decl) => {
is_empty = false;
Statement::FunctionDeclaration(ref decl) => {
decl.bound_names(&mut |id| {
names.insert(id.name.clone());
});
new_stmts.push(Statement::FunctionDeclaration(decl));
new_stmts.push(stmt);
}
Statement::TSEnumDeclaration(enum_decl) => {
is_empty = false;
Statement::TSEnumDeclaration(ref enum_decl) => {
names.insert(enum_decl.id.name.clone());
new_stmts.push(Statement::TSEnumDeclaration(enum_decl));
new_stmts.push(stmt);
}
Statement::VariableDeclaration(decl) => {
is_empty = false;
Statement::VariableDeclaration(ref decl) => {
decl.bound_names(&mut |id| {
names.insert(id.name.clone());
});
new_stmts.push(Statement::VariableDeclaration(decl));
new_stmts.push(stmt);
}
Statement::ExportNamedDeclaration(export_decl) => {
// NB: `ExportNamedDeclaration` with no declaration (e.g. `export {x}`) is not
@ -235,32 +226,10 @@ impl<'a> TypeScript<'a> {
continue;
}
match decl {
Declaration::TSEnumDeclaration(enum_decl) => {
is_empty = false;
self.add_declaration(
Declaration::TSEnumDeclaration(enum_decl),
&name,
&mut names,
&mut new_stmts,
);
}
Declaration::FunctionDeclaration(func_decl) => {
is_empty = false;
self.add_declaration(
Declaration::FunctionDeclaration(func_decl),
&name,
&mut names,
&mut new_stmts,
);
}
Declaration::ClassDeclaration(class_decl) => {
is_empty = false;
self.add_declaration(
Declaration::ClassDeclaration(class_decl),
&name,
&mut names,
&mut new_stmts,
);
Declaration::TSEnumDeclaration(_)
| Declaration::FunctionDeclaration(_)
| Declaration::ClassDeclaration(_) => {
self.add_declaration(decl, &name, &mut names, &mut new_stmts);
}
Declaration::VariableDeclaration(var_decl) => {
var_decl.declarations.iter().for_each(|decl| {
@ -268,7 +237,6 @@ impl<'a> TypeScript<'a> {
self.ctx.error(namespace_exporting_non_const(decl.span));
}
});
is_empty = false;
let stmts = self.handle_variable_declaration(var_decl, &name);
new_stmts.extend(stmts);
}
@ -285,7 +253,6 @@ impl<'a> TypeScript<'a> {
)),
ctx,
) {
is_empty = false;
if names.insert(module_name.clone()) {
new_stmts.push(Statement::from(
self.create_variable_declaration(&module_name),
@ -304,13 +271,12 @@ impl<'a> TypeScript<'a> {
continue;
}
}
is_empty = false;
new_stmts.push(stmt);
}
}
}
if is_empty {
if new_stmts.is_empty() {
// Delete the scope binding that `ctx.generate_uid_in_current_scope` created above,
// as no binding is actually being created
let current_scope_id = ctx.current_scope_id();
@ -461,15 +427,15 @@ impl<'a> TypeScript<'a> {
names: &mut FxHashSet<Atom<'a>>,
new_stmts: &mut Vec<'a, Statement<'a>>,
) {
if let Some(ident) = decl.id() {
let item_name = ident.name.clone();
let assignment_statement = self.create_assignment_statement(name, &item_name);
new_stmts.push(Statement::from(decl));
let assignment_statement =
self.ctx.ast.expression_statement(SPAN, assignment_statement);
new_stmts.push(assignment_statement);
names.insert(item_name);
}
// This function is only called with a function, class, or enum declaration,
// all of which are guaranteed to have an `id`
let ident = decl.id().unwrap();
let item_name = ident.name.clone();
new_stmts.push(Statement::from(decl));
let assignment_statement = self.create_assignment_statement(name, &item_name);
let assignment_statement = self.ctx.ast.expression_statement(SPAN, assignment_statement);
new_stmts.push(assignment_statement);
names.insert(item_name);
}
// name.item_name = item_name