Skip to content

refactor(transformer/arrow-function): wrapping arrow function iife by using wrap_arrow_function_iife #8530

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

Merged
graphite-app merged 1 commit into from
Jan 16, 2025
Merged

refactor(transformer/arrow-function): wrapping arrow function iife by using wrap_arrow_function_iife #8530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 2 additions & 44 deletions crates/oxc_transformer/src/common/arrow_function_converter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ use oxc_syntax::{
};
use oxc_traverse::{Ancestor, BoundIdentifier, Traverse, TraverseCtx};

use crate::EnvOptions;
use crate::{utils::ast_builder::wrap_arrow_function_iife, EnvOptions};

type FxIndexMap<K, V> = IndexMap<K, V, FxBuildHasher>;

Expand Down Expand Up @@ -419,12 +419,7 @@ impl<'a> Traverse<'a> for ArrowFunctionConverter<'a> {
// prop = (() => { return async () => {} })();
// }
// ```
Some(Self::wrap_arrow_function_with_iife(
arrow.span,
arrow.scope_id(),
expr,
ctx,
))
Some(wrap_arrow_function_iife(expr, ctx))
} else {
return;
}
Expand Down Expand Up @@ -1207,43 +1202,6 @@ impl<'a> ArrowFunctionConverter<'a> {

statements.insert(0, stmt);
}

/// Wrap an arrow function with IIFE
///
/// `() => {}` -> `(() => { return () => {}; })()`
fn wrap_arrow_function_with_iife(
span: Span,
scope_id: ScopeId,
expr: &mut Expression<'a>,
ctx: &mut TraverseCtx<'a>,
) -> Expression<'a> {
let kind = FormalParameterKind::ArrowFormalParameters;
let params = ctx.ast.formal_parameters(SPAN, kind, ctx.ast.vec(), NONE);
let statement = ctx.ast.statement_return(SPAN, Some(ctx.ast.move_expression(expr)));
let statements = ctx.ast.vec1(statement);
let body = ctx.ast.function_body(SPAN, ctx.ast.vec(), statements);
let parent_scope_id = ctx
.create_child_scope(ctx.current_scope_id(), ScopeFlags::Arrow | ScopeFlags::Function);
ctx.scopes_mut().change_parent_id(scope_id, Some(parent_scope_id));
let arrow = ctx.ast.alloc_arrow_function_expression_with_scope_id(
SPAN,
false,
false,
NONE,
params,
NONE,
body,
parent_scope_id,
);
// IIFE
ctx.ast.expression_call(
span,
Expression::ArrowFunctionExpression(arrow),
NONE,
ctx.ast.vec(),
false,
)
}
}

/// Visitor for inserting `this` after `super` in constructor body.
Expand Down
Loading