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

feat(transformer/typescript): support transform exported TSModuleBlock (#2076)

Browse source
This commit is contained in:
Dunqing 2024-01-18 23:20:26 +08:00 committed by GitHub
parent 56ca8b6dfe
commit f5bf5dece1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 56 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
crates/oxc_transformer/src/typescript/mod.rs
View file

@ -56,8 +56,21 @@ impl<'a> TypeScript<'a> {
pub fn transform_statement(&mut self, stmt: &mut Statement<'a>) {
let new_stmt = match stmt {
Statement::ModuleDeclaration(module_decl) => {
if let ModuleDeclaration::ExportNamedDeclaration(decl) = &mut **module_decl {
self.transform_export_named_declaration(decl)
if let ModuleDeclaration::ExportNamedDeclaration(export_decl) = &mut **module_decl {
self.transform_export_named_declaration(export_decl).or_else(|| {
export_decl.declaration.as_mut().and_then(|decl| {
if decl.modifiers().is_some_and(Modifiers::is_contains_declare) {
None
} else {
match decl {
Declaration::TSModuleDeclaration(ts_module_decl) => {
Some(self.transform_ts_module_block(ts_module_decl))
}
_ => None,
}
}
})
})
} else {
None
}
@ -579,14 +592,26 @@ impl<'a> TypeScript<'a> {
let mut insert_var_decl = vec![];
for (index, stmt) in stmts.iter().enumerate() {
if let Statement::Declaration(Declaration::TSModuleDeclaration(decl)) = stmt {
if !decl.modifiers.is_contains_declare() {
insert_var_decl.push((index, decl.id.name().clone()));
match stmt {
Statement::Declaration(Declaration::TSModuleDeclaration(decl)) => {
if !decl.modifiers.is_contains_declare() {
insert_var_decl.push((index, decl.id.name().clone(), false));
}
}
Statement::ModuleDeclaration(module_decl) => {
if let ModuleDeclaration::ExportNamedDeclaration(decl) = &**module_decl {
if let Some(Declaration::TSModuleDeclaration(decl)) = &decl.declaration {
if !decl.modifiers.is_contains_declare() {
insert_var_decl.push((index, decl.id.name().clone(), true));
}
}
}
}
_ => {}
}
}
for (index, name) in insert_var_decl.into_iter().rev() {
for (index, name, is_export) in insert_var_decl.into_iter().rev() {
let kind = VariableDeclarationKind::Let;
let decls = {
let binding_identifier = BindingIdentifier::new(SPAN, name.clone());
@ -598,8 +623,21 @@ impl<'a> TypeScript<'a> {
let variable_declaration =
self.ast.variable_declaration(SPAN, kind, decls, Modifiers::empty());
let stmt =
Statement::Declaration(Declaration::VariableDeclaration(variable_declaration));
let decl = Declaration::VariableDeclaration(variable_declaration);
let stmt = if is_export {
self.ast.module_declaration(ModuleDeclaration::ExportNamedDeclaration(
self.ast.export_named_declaration(
SPAN,
Some(decl),
self.ast.new_vec(),
None,
ImportOrExportKind::Value,
),
))
} else {
Statement::Declaration(decl)
};
stmts.insert(index, stmt);
}
}

6
tasks/transform_conformance/babel.snap.md
View file

@ -1,4 +1,4 @@
Passed: 316/1179
Passed: 318/1179
# All Passed:
* babel-plugin-transform-numeric-separator
@ -832,7 +832,7 @@ Passed: 316/1179
* general/function-duplicate-name/input.js
* general/object/input.js
# babel-plugin-transform-typescript (85/158)
# babel-plugin-transform-typescript (87/158)
* class/abstract-class-decorated/input.ts
* class/abstract-class-decorated-method/input.ts
* class/abstract-class-decorated-parameter/input.ts
@ -874,9 +874,7 @@ Passed: 316/1179
* namespace/clobber-export/input.ts
* namespace/clobber-import/input.ts
* namespace/contentious-names/input.ts
* namespace/declare/input.ts
* namespace/empty-removed/input.ts
* namespace/export/input.ts
* namespace/export-type-only/input.ts
* namespace/module-nested/input.ts
* namespace/module-nested-export/input.ts

8
tasks/transform_conformance/typescript.snap.md
View file

@ -632,6 +632,14 @@ let M6;
})(M6 || (M6 = {}));
let M6;
(function(_M6) {
export let A;
(function(_A) {
var Color = (Color => {
const Yellow = 1;
Color[Color['Yellow'] = Yellow] = 'Yellow';
return Color;
})(Color || {});
})(A || (A = {}));
var t = A.Color.Yellow;
t = A.Color.Red;
})(M6 || (M6 = {}));