dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-25 04:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(typescript/namespace): reuse TSModuleBlock's scope id (#3459)

Browse source
This commit is contained in:
Dunqing 2024-05-29 23:00:15 +00:00
parent 0d35f227b5
commit 1a50b86281
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@ use oxc_ast::{ast::*, syntax_directed_operations::BoundNames};
use oxc_span::{Atom, CompactStr, SPAN}; use oxc_span::{Atom, CompactStr, SPAN};
use oxc_syntax::{ use oxc_syntax::{
operator::{AssignmentOperator, LogicalOperator}, operator::{AssignmentOperator, LogicalOperator},
scope::{ScopeFlags, ScopeId},
symbol::SymbolFlags, symbol::SymbolFlags,
}; };
use oxc_traverse::TraverseCtx; use oxc_traverse::TraverseCtx;
@ -150,9 +151,13 @@ impl<'a> TypeScript<'a> {
&ctx.generate_uid_in_current_scope(real_name, SymbolFlags::FunctionScopedVariable), &ctx.generate_uid_in_current_scope(real_name, SymbolFlags::FunctionScopedVariable),
); );
// Reuse TSModuleBlock's scope id in transformed function.
let mut scope_id = None;
let namespace_top_level = if let Some(body) = decl.body { let namespace_top_level = if let Some(body) = decl.body {
match body { match body {
TSModuleDeclarationBody::TSModuleBlock(mut block) => { TSModuleDeclarationBody::TSModuleBlock(mut block) => {
scope_id = block.scope_id.get();
self.ctx.ast.move_statement_vec(&mut block.body) self.ctx.ast.move_statement_vec(&mut block.body)
} }
// We handle `namespace X.Y {}` as if it was // We handle `namespace X.Y {}` as if it was
@ -312,7 +317,7 @@ impl<'a> TypeScript<'a> {
return None; return None;
} }
Some(self.transform_namespace(&name, real_name, new_stmts, parent_export)) Some(self.transform_namespace(&name, real_name, new_stmts, parent_export, scope_id, ctx))
} }
// `namespace Foo { }` -> `let Foo; (function (_Foo) { })(Foo || (Foo = {}));` // `namespace Foo { }` -> `let Foo; (function (_Foo) { })(Foo || (Foo = {}));`
@ -342,6 +347,8 @@ impl<'a> TypeScript<'a> {
real_name: &Atom<'a>, real_name: &Atom<'a>,
stmts: Vec<'a, Statement<'a>>, stmts: Vec<'a, Statement<'a>>,
parent_export: Option<Expression<'a>>, parent_export: Option<Expression<'a>>,
scope_id: Option<ScopeId>,
ctx: &mut TraverseCtx,
) -> Statement<'a> { ) -> Statement<'a> {
// `(function (_N) { var x; })(N || (N = {}))`; // `(function (_N) { var x; })(N || (N = {}))`;
// ^^^^^^^^^^^^^^^^^^^^^^^^^^ // ^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -369,6 +376,11 @@ impl<'a> TypeScript<'a> {
params, params,
Some(body), Some(body),
); );
if let Some(scope_id) = scope_id {
function.scope_id.set(Some(scope_id));
*ctx.scopes_mut().get_flags_mut(scope_id) =
ScopeFlags::Function | ScopeFlags::StrictMode;
}
let function_expr = self.ctx.ast.function_expression(function); let function_expr = self.ctx.ast.function_expression(function);
self.ctx.ast.parenthesized_expression(SPAN, function_expr) self.ctx.ast.parenthesized_expression(SPAN, function_expr)
}; };

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

@ -1,6 +1,6 @@
commit: 4bd1b2c2 commit: 4bd1b2c2
Passed: 476/928 Passed: 479/928
# All Passed: # All Passed:
* babel-preset-react * babel-preset-react
@ -445,15 +445,12 @@ Passed: 476/928
* opts/optimizeConstEnums/input.ts * opts/optimizeConstEnums/input.ts
* opts/rewriteImportExtensions/input.ts * opts/rewriteImportExtensions/input.ts
# babel-plugin-transform-typescript (132/152) # babel-plugin-transform-typescript (135/152)
* enum/mix-references/input.ts * enum/mix-references/input.ts
* enum/ts5.0-const-foldable/input.ts * enum/ts5.0-const-foldable/input.ts
* exports/declared-types/input.ts * exports/declared-types/input.ts
* imports/type-only-export-specifier-2/input.ts * imports/type-only-export-specifier-2/input.ts
* namespace/empty-removed/input.ts
* namespace/nested/input.ts * namespace/nested/input.ts
* namespace/nested-namespace/input.ts
* namespace/same-name/input.ts
* optimize-const-enums/custom-values/input.ts * optimize-const-enums/custom-values/input.ts
* optimize-const-enums/custom-values-exported/input.ts * optimize-const-enums/custom-values-exported/input.ts
* optimize-const-enums/declare/input.ts * optimize-const-enums/declare/input.ts