Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ impl AdjustStaticMembersTransformer {
// Determine if we need to extract the variable declaration part
// Pattern: let X = class X {} -> we wrap the class expression and assignments
let (var_prefix, class_expr_start, class_expr_end) =
self.extract_var_declaration_parts(start_span, source)?;
self.extract_var_declaration_parts(start_span, source, group.class_name)?;

// Build the wrapped code
let mut wrapped = String::new();
Expand Down Expand Up @@ -287,6 +287,7 @@ impl AdjustStaticMembersTransformer {
&self,
stmt_span: Span,
source: &str,
class_name: &str,
) -> Option<(String, u32, u32)> {
let stmt_text = &source[stmt_span.start as usize..stmt_span.end as usize];

Expand Down Expand Up @@ -324,7 +325,10 @@ impl AdjustStaticMembersTransformer {
}
} else {
// It's a class declaration: class X {}
return Some((String::new(), stmt_span.start, stmt_span.end));
// We must assign the IIFE result to a variable so the class name
// remains in scope for subsequent export statements.
let var_prefix = format!("let {} = ", class_name);
return Some((var_prefix, stmt_span.start, stmt_span.end));
}

None
Expand Down
23 changes: 23 additions & 0 deletions crates/oxc_angular_compiler/tests/adjust_static_members_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -414,3 +414,26 @@ ClassB.ɵfac = factoryB;

test_wrap_static(input, &["/* @__PURE__ */ (() =>", "return ClassA;", "return ClassB;"], &[]);
}

#[test]
fn test_class_declaration_preserves_binding_for_export() {
// Regression test: class declarations (not variable declarations) must
// produce `let X = /* @__PURE__ */ (() => { ... })()` so the name remains
// in scope for subsequent `export { X }` statements.
let input = r"
class ClipboardModule {}
ClipboardModule.ɵfac = function ClipboardModule_Factory(t) { return new (t || ClipboardModule)(); };
ClipboardModule.ɵmod = defineNgModule({ type: ClipboardModule });
export { ClipboardModule };
";

test_wrap_static(
input,
&[
"let ClipboardModule = /* @__PURE__ */ (() =>",
"return ClipboardModule;",
"export { ClipboardModule }",
],
&[],
);
}
Loading