From ff19cef63117d54821ff53251ce512f1e2a0d9ae Mon Sep 17 00:00:00 2001
From: eryue0220 <eryue0220@gmail.com>
Date: Sat, 28 Mar 2026 00:40:35 +0800
Subject: [PATCH] fix transformAngularFile api

---
 .../src/component/transform.rs                | 314 ++---------
 .../tests/integration_test.rs                 | 532 +++++-------------
 napi/angular-compiler/index.d.ts              |   4 +-
 napi/angular-compiler/src/lib.rs              |  10 +-
 4 files changed, 182 insertions(+), 678 deletions(-)

diff --git a/crates/oxc_angular_compiler/src/component/transform.rs b/crates/oxc_angular_compiler/src/component/transform.rs
index fc54dda59..12136dd4d 100644
--- a/crates/oxc_angular_compiler/src/component/transform.rs
+++ b/crates/oxc_angular_compiler/src/component/transform.rs
@@ -1471,9 +1471,11 @@ pub fn transform_angular_file(
     allocator: &Allocator,
     path: &str,
     source: &str,
-    options: &TransformOptions,
+    options: Option<&TransformOptions>,
     resolved_resources: Option<&ResolvedResources>,
 ) -> TransformResult {
+    let default_options = TransformOptions::default();
+    let options = options.unwrap_or_else(|| &default_options);
     // JIT mode uses a completely different code path
     if options.jit {
         return transform_angular_file_jit(allocator, path, source, options);
@@ -3806,13 +3808,7 @@ export class HelloComponent {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "hello.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "hello.component.ts", source, None, None);
 
         assert_eq!(result.component_count, 1);
         assert!(!result.has_errors());
@@ -3848,13 +3844,7 @@ import { Component } from '@angular/core';
 export class TestComponent {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "test.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
         assert!(!result.has_errors());
 
@@ -3907,13 +3897,7 @@ export class TestComponent {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "test.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
         assert!(!result.has_errors());
 
@@ -3940,13 +3924,7 @@ export class RegularClass {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "regular.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "regular.ts", source, None, None);
 
         assert_eq!(result.component_count, 0);
         assert!(!result.has_errors());
@@ -3974,13 +3952,7 @@ export class FirstComponent {}
 export class SecondComponent {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "multi.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "multi.component.ts", source, None, None);
 
         assert_eq!(result.component_count, 2);
         assert!(!result.has_errors());
@@ -4019,13 +3991,7 @@ export class ButtonComponent {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "button.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "button.component.ts", source, None, None);
 
         assert_eq!(result.component_count, 1);
         assert!(!result.has_errors());
@@ -4062,13 +4028,8 @@ import { Component } from '@angular/core';
 export class BitErrorSummaryComponent {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "error-summary.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result =
+            transform_angular_file(&allocator, "error-summary.component.ts", source, None, None);
 
         assert_eq!(result.component_count, 1);
         assert!(!result.has_errors());
@@ -4109,13 +4070,7 @@ import { Component } from '@angular/core';
 export class AppComponent {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "app.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "app.component.ts", source, None, None);
 
         assert_eq!(result.component_count, 1);
         assert!(!result.has_errors());
@@ -4160,13 +4115,7 @@ import { Directive } from '@angular/core';
 export class MyDirective {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "my.directive.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "my.directive.ts", source, None, None);
 
         // The @Directive decorator should be removed from the output
         assert!(
@@ -4213,13 +4162,7 @@ export class NavBaseDirective {}
 export class NavComponent extends NavBaseDirective {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "nav.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "nav.component.ts", source, None, None);
 
         // Both decorators should be removed
         assert!(
@@ -4264,13 +4207,8 @@ export abstract class NavBaseComponent {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "nav-base.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result =
+            transform_angular_file(&allocator, "nav-base.component.ts", source, None, None);
 
         // The @Directive() decorator should be removed
         assert!(
@@ -4314,13 +4252,7 @@ export class MyService {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "my.service.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "my.service.ts", source, None, None);
 
         // The @Injectable decorator should be removed from the output
         assert!(
@@ -4359,13 +4291,7 @@ import { Injectable } from '@angular/core';
 export class LocalService {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "local.service.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "local.service.ts", source, None, None);
 
         // The @Injectable() decorator should be removed
         assert!(
@@ -4408,13 +4334,7 @@ export class MyService {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "factory.service.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "factory.service.ts", source, None, None);
 
         // The @Injectable decorator should be removed
         assert!(
@@ -4449,13 +4369,7 @@ import { Injectable } from '@angular/core';
 export class Config {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "config.service.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "config.service.ts", source, None, None);
 
         // The @Injectable decorator should be removed
         assert!(
@@ -4495,13 +4409,7 @@ export class DataComponent {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "data.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "data.component.ts", source, None, None);
 
         // Both decorators should be removed
         assert!(
@@ -4539,13 +4447,7 @@ import { Injectable } from '@angular/core';
 export class PlatformService {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "platform.service.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "platform.service.ts", source, None, None);
 
         // ɵprov should be generated
         assert!(
@@ -4575,13 +4477,7 @@ export class UppercasePipe implements PipeTransform {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "uppercase.pipe.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "uppercase.pipe.ts", source, None, None);
 
         // The @Pipe decorator should be removed from the output
         assert!(
@@ -4626,13 +4522,7 @@ import { Pipe } from '@angular/core';
 export class MyPurePipe {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "my-pure.pipe.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "my-pure.pipe.ts", source, None, None);
 
         assert!(
             result.code.contains("static ɵpipe = "),
@@ -4657,13 +4547,7 @@ import { Pipe } from '@angular/core';
 export class ImpurePipe {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "impure.pipe.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "impure.pipe.ts", source, None, None);
 
         assert!(
             result.code.contains("static ɵpipe = "),
@@ -4692,13 +4576,7 @@ import { Pipe } from '@angular/core';
 export class LegacyPipe {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "legacy.pipe.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "legacy.pipe.ts", source, None, None);
 
         assert!(
             result.code.contains("static ɵpipe = "),
@@ -4735,13 +4613,7 @@ export class DataComponent {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "data.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "data.component.ts", source, None, None);
 
         // Both decorators should be removed
         assert!(!result.code.contains("@Pipe"), "Code should NOT contain @Pipe decorator");
@@ -4800,13 +4672,7 @@ export class AppComponent {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "app.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "app.component.ts", source, None, None);
 
         // All decorators should be removed
         assert!(!result.code.contains("@Pipe"), "Code should NOT contain @Pipe decorator");
@@ -4871,13 +4737,7 @@ import { NgModule } from '@angular/core';
 export class AppModule {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "app.module.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "app.module.ts", source, None, None);
 
         // The @NgModule decorator should be removed from the output
         assert!(
@@ -4916,13 +4776,7 @@ import { NgModule } from '@angular/core';
 export class EmptyModule {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "empty.module.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "empty.module.ts", source, None, None);
 
         // The @NgModule() decorator should be removed
         assert!(
@@ -4953,13 +4807,8 @@ import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 export class CustomElementsModule {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "custom-elements.module.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result =
+            transform_angular_file(&allocator, "custom-elements.module.ts", source, None, None);
 
         // ɵmod should be generated with schemas
         assert!(
@@ -4983,13 +4832,7 @@ import { NgModule } from '@angular/core';
 export class IdentifiedModule {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "identified.module.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "identified.module.ts", source, None, None);
 
         // ɵmod should be generated
         assert!(
@@ -5026,13 +4869,7 @@ export class AppComponent {}
 export class AppModule {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "app.module.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "app.module.ts", source, None, None);
 
         // Both decorators should be removed
         assert!(!result.code.contains("@NgModule"), "Code should NOT contain @NgModule decorator");
@@ -5087,13 +4924,7 @@ export class AppComponent {
 export class AppModule {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "app.module.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "app.module.ts", source, None, None);
 
         // All decorators should be removed
         assert!(!result.code.contains("@Pipe"), "Code should NOT contain @Pipe decorator");
@@ -5161,13 +4992,8 @@ import { NgModule, forwardRef } from '@angular/core';
 export class AppModule {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "forward-ref.module.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result =
+            transform_angular_file(&allocator, "forward-ref.module.ts", source, None, None);
 
         // ɵmod should be generated
         assert!(
@@ -5257,7 +5083,7 @@ export class TestComponent {}
         options.resolved_imports = Some(resolved_imports);
 
         let result =
-            transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+            transform_angular_file(&allocator, "test.component.ts", source, Some(&options), None);
 
         assert!(!result.has_errors());
         // The output should contain the host directive feature
@@ -5402,7 +5228,7 @@ export class TestComponent {
         options.emit_class_metadata = true;
 
         let result =
-            transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+            transform_angular_file(&allocator, "test.component.ts", source, Some(&options), None);
 
         // @Inject(DARK_THEME) now uses namespace imports (i1 for @app/theme),
         // so rxjs gets i2 for Observable.
@@ -5459,7 +5285,7 @@ export class TestComponent {
         options.emit_class_metadata = true;
 
         let result =
-            transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+            transform_angular_file(&allocator, "test.component.ts", source, Some(&options), None);
 
         // The type 'AbstractService' is imported from './service' and should get a namespace import
         // even though the @Inject token 'SERVICE_TOKEN' is also from './service'.
@@ -5509,7 +5335,7 @@ export class TestComponent {
         options.emit_class_metadata = true;
 
         let result =
-            transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+            transform_angular_file(&allocator, "test.component.ts", source, Some(&options), None);
 
         // Should NOT generate a namespace import for ./some.interface
         // (the original `import type` statement may still appear, but no `import * as iN`)
@@ -5545,7 +5371,7 @@ export class TestComponent {
         options.emit_class_metadata = true;
 
         let result =
-            transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+            transform_angular_file(&allocator, "test.component.ts", source, Some(&options), None);
 
         // Should NOT generate a namespace import for ./some.interface
         assert!(
@@ -5576,13 +5402,7 @@ export class MyDirective {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "my.directive.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "my.directive.ts", source, None, None);
 
         assert!(!result.has_errors(), "Transform should not have errors: {:?}", result.diagnostics);
 
@@ -5641,13 +5461,7 @@ export class OSTypeIconPipe implements PipeTransform {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "os-type-icon.pipe.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "os-type-icon.pipe.ts", source, None, None);
 
         // Both decorators should be removed
         assert!(
@@ -5695,13 +5509,7 @@ export class OSTypeIconPipe implements PipeTransform {
 }
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "os-type-icon.pipe.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "os-type-icon.pipe.ts", source, None, None);
 
         // Both decorators should be removed
         assert!(
@@ -5749,13 +5557,7 @@ import { Component, Injectable } from '@angular/core';
 export class TestCmp {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "test.component.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
         assert!(
             !result.code.contains("@Component"),
@@ -5799,13 +5601,7 @@ import { Directive, Injectable } from '@angular/core';
 export class TestDir {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "test.directive.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "test.directive.ts", source, None, None);
 
         assert!(
             !result.code.contains("@Directive"),
@@ -5847,13 +5643,7 @@ import { NgModule, Injectable } from '@angular/core';
 export class TestNgModule {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "test.module.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "test.module.ts", source, None, None);
 
         assert!(
             !result.code.contains("@NgModule"),
@@ -5905,13 +5695,7 @@ import { BrnTooltipTrigger } from '@spartan-ng/brain/tooltip';
 export class UnityTooltipTrigger {}
 "#;
 
-        let result = transform_angular_file(
-            &allocator,
-            "tooltip.directive.ts",
-            source,
-            &TransformOptions::default(),
-            None,
-        );
+        let result = transform_angular_file(&allocator, "tooltip.directive.ts", source, None, None);
 
         assert!(!result.has_errors(), "Transform should not have errors: {:?}", result.diagnostics);
 
diff --git a/crates/oxc_angular_compiler/tests/integration_test.rs b/crates/oxc_angular_compiler/tests/integration_test.rs
index 3cbb514cc..fa6d8cc33 100644
--- a/crates/oxc_angular_compiler/tests/integration_test.rs
+++ b/crates/oxc_angular_compiler/tests/integration_test.rs
@@ -914,13 +914,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     // The consts array should contain ["ngFor", "ngForOf"] in that order
     // This is emitted under the Template marker (4) in the attribute array
@@ -975,13 +969,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert_eq!(result.component_count, 1);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -1037,13 +1025,7 @@ export class ExternalComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -1587,13 +1569,7 @@ import { Component } from '@angular/core';
 export class StyledComponent {}
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "styled.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "styled.component.ts", source, None, None);
 
     assert_eq!(result.component_count, 1);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -1630,13 +1606,8 @@ import { Component } from '@angular/core';
 export class MultiStyledComponent {}
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "multi-styled.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result =
+        transform_angular_file(&allocator, "multi-styled.component.ts", source, None, None);
 
     assert_eq!(result.component_count, 1);
     assert!(!result.has_errors());
@@ -1665,7 +1636,8 @@ export class StyledComponent {}
     let mut options = ComponentTransformOptions::default();
     options.minify_component_styles = true;
 
-    let result = transform_angular_file(&allocator, "styled.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "styled.component.ts", source, Some(&options), None);
 
     assert_eq!(result.component_count, 1);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -1689,13 +1661,7 @@ import { Component } from '@angular/core';
 export class NoStylesComponent {}
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "no-styles.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "no-styles.component.ts", source, None, None);
 
     assert_eq!(result.component_count, 1);
     assert!(!result.has_errors());
@@ -1874,13 +1840,7 @@ import { Component } from '@angular/core';
 export class BadgeComponent {}
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "badge.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "badge.component.ts", source, None, None);
 
     assert_eq!(result.component_count, 1);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -1949,13 +1909,7 @@ export class SecondComponent {
 }
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "multi.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "multi.component.ts", source, None, None);
 
     assert_eq!(result.component_count, 2, "Should compile both components");
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -2056,13 +2010,7 @@ export class GridComponent {
 }
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "grid.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "grid.component.ts", source, None, None);
 
     assert_eq!(result.component_count, 1, "Should compile the component");
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -2132,13 +2080,7 @@ import { Component } from '@angular/core';
 export class MenuComponent {}
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "menu.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "menu.component.ts", source, None, None);
 
     assert_eq!(result.component_count, 1);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -2168,13 +2110,7 @@ import { Component } from '@angular/core';
 export class MultiMenuComponent {}
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "multi-menu.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "multi-menu.component.ts", source, None, None);
 
     assert_eq!(result.component_count, 1);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -2213,13 +2149,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert_eq!(result.component_count, 1);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -2272,13 +2202,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert_eq!(result.component_count, 1);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -2414,13 +2338,7 @@ export class MatFabButton {
 export class MatMiniFabButton {}
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "fab.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "fab.ts", source, None, None);
 
     assert_eq!(result.component_count, 2, "Should compile both components");
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -2511,13 +2429,7 @@ export class MatMiniFabButton {{
 "
     );
 
-    let result = transform_angular_file(
-        &allocator,
-        "fab.ts",
-        &source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "fab.ts", &source, None, None);
 
     assert_eq!(result.component_count, 2, "Should compile both components");
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -2619,13 +2531,7 @@ export class MatMiniFabButton {
 
     let resources = ResolvedResources { templates, styles: std::collections::HashMap::new() };
 
-    let result = transform_angular_file(
-        &allocator,
-        "fab.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        Some(&resources),
-    );
+    let result = transform_angular_file(&allocator, "fab.ts", source, None, Some(&resources));
 
     assert_eq!(result.component_count, 2, "Should compile both components");
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -2711,13 +2617,7 @@ export class MatDrawerContainer {
 }
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "drawer.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "drawer.ts", source, None, None);
 
     assert_eq!(result.component_count, 3, "Should compile all three components");
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
@@ -2785,13 +2685,7 @@ export class TestComponent {
 }
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -2847,13 +2741,7 @@ export class TestComponent {
 }
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -2909,13 +2797,7 @@ export class BitLabelComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -2992,13 +2874,7 @@ export class TestComponent {
 }
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -3183,8 +3059,7 @@ import { Component } from '@angular/core';
 export class SvgInSwitchCaseComponent {}
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.ts", source, None, None);
 
     // Verify that conditionalCreate uses ":svg:svg" not just "svg"
     assert!(
@@ -3246,13 +3121,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
     eprintln!("OUTPUT:\n{}", result.code);
@@ -3494,13 +3363,8 @@ export class DashboardBoxComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "dashboard-box.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result =
+        transform_angular_file(&allocator, "dashboard-box.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -3750,8 +3614,7 @@ export class TestComponent {
 ";
 
     // OXC always uses Full mode (elementStart, not domElementStart)
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.ts", source, None, None);
 
     // Should use elementStart (Full mode), NOT domElementStart (DomOnly mode)
     assert!(
@@ -3789,8 +3652,7 @@ import { Component } from '@angular/core';
 export class TestComponent {}
 ";
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.ts", source, None, None);
 
     // OXC in local compilation mode: always Full mode for component templates
     assert!(
@@ -3820,8 +3682,7 @@ import { Component } from '@angular/core';
 export class TestComponent {}
 ";
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.ts", source, None, None);
 
     // Non-standalone should always use Full mode
     assert!(
@@ -4038,7 +3899,7 @@ export class TestComponent {}
         angular_version: Some(AngularVersion::new(21, 0, 0)),
         ..Default::default()
     };
-    let result = transform_angular_file(&allocator, "test.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.ts", source, Some(&options), None);
 
     // Should use Full mode (elementStart), NOT DomOnly (domElementStart)
     assert!(
@@ -4075,7 +3936,7 @@ export class TestComponent {}
         angular_version: Some(AngularVersion::new(21, 0, 0)),
         ..Default::default()
     };
-    let result = transform_angular_file(&allocator, "test.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.ts", source, Some(&options), None);
 
     // Implicit standalone + empty imports should still use Full mode
     assert!(
@@ -4108,8 +3969,7 @@ import { Component } from '@angular/core';
 export class TestComponent {}
 ";
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.ts", source, None, None);
 
     // OXC in local compilation mode: always Full mode for component templates
     assert!(
@@ -4145,8 +4005,7 @@ export class TestComponent {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.ts", source, None, None);
 
     // OXC in local compilation mode: always Full mode for component templates
     assert!(
@@ -4180,8 +4039,7 @@ import { AsyncPipe, DatePipe, SlicePipe } from '@angular/common';
 export class TestComponent {}
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.ts", source, None, None);
 
     // OXC in local compilation mode: always Full mode for component templates
     assert!(
@@ -4216,8 +4074,7 @@ export class HighlightDirective {}
 export class TestComponent {}
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.ts", source, None, None);
 
     assert!(
         result.code.contains("ɵɵelementStart"),
@@ -4286,13 +4143,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     // Pure property bindings keep Bindings marker (3), NOT I18n marker (6).
     // The i18n marker on a property binding is a no-op for directive matching.
@@ -4324,13 +4175,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     // The consts array should contain [6,"heading"] (AttributeMarker.I18n = 6)
     // because the interpolated attribute has an i18n message (i18n-heading).
@@ -4377,13 +4222,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     // The consts array should NOT contain [6,"cuTooltip"] because [cuTooltip]="expr"
     // is a pure property binding, not an interpolated attribute.
@@ -4547,7 +4386,8 @@ export class TestComponent {
         ..ComponentTransformOptions::default()
     };
 
-    let result = transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "test.component.ts", source, Some(&options), None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -4606,7 +4446,8 @@ export class TestComponent {
         ..ComponentTransformOptions::default()
     };
 
-    let result = transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "test.component.ts", source, Some(&options), None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -4651,7 +4492,8 @@ export class TestComponent {
         ..ComponentTransformOptions::default()
     };
 
-    let result = transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "test.component.ts", source, Some(&options), None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -4704,13 +4546,7 @@ import { Component } from '@angular/core';
 export class IconComponent {}
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "icon.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "icon.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
     let code = &result.code;
     eprintln!("OUTPUT:\n{code}");
@@ -4755,13 +4591,7 @@ export class IconComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "icon.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "icon.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
     let code = &result.code;
     eprintln!("OUTPUT:\n{code}");
@@ -4807,13 +4637,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
     let code = &result.code;
     eprintln!("OUTPUT:\n{code}");
@@ -5038,7 +4862,7 @@ export class ToastPositionHelperDirective {
         &allocator,
         "toast-position-helper.directive.ts",
         source,
-        &ComponentTransformOptions::default(),
+        None,
         None,
     );
 
@@ -5101,13 +4925,7 @@ export class MultiDepDirective {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "multi-dep.directive.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "multi-dep.directive.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -5173,13 +4991,8 @@ export class ChatBotTriggerComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "chatbot-trigger.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result =
+        transform_angular_file(&allocator, "chatbot-trigger.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -5233,13 +5046,7 @@ export class LoginFormComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "login-form.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "login-form.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -5306,13 +5113,7 @@ export class TabsComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "tabs.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "tabs.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -5375,13 +5176,7 @@ export class MixedQueryComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "mixed-query.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "mixed-query.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -5630,13 +5425,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -5672,13 +5461,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -5713,13 +5496,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -5756,13 +5533,7 @@ import { Component } from '@angular/core';
 export class TestComponent {}
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -5789,13 +5560,7 @@ import { Component } from '@angular/core';
 export class TestComponent {}
 ";
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -5837,13 +5602,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -5892,13 +5651,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -5957,13 +5710,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -6057,7 +5804,8 @@ export class TestComponent {}
 "#;
 
     let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "test.component.ts", source, Some(&options), None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     let normalized = result.code.replace([' ', '\n', '\t'], "");
@@ -6084,8 +5832,7 @@ import { Component } from '@angular/core';
 export class LegacyComponent {}
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     let normalized = result.code.replace([' ', '\n', '\t'], "");
@@ -6116,7 +5863,8 @@ export class ImplicitStandaloneComponent {}
 "#;
 
     let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "test.component.ts", source, Some(&options), None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     let normalized = result.code.replace([' ', '\n', '\t'], "");
@@ -6149,7 +5897,8 @@ export class AppComponent {}
 "#;
 
     let options = ComponentTransformOptions { jit: true, ..Default::default() };
-    let result = transform_angular_file(&allocator, "app.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "app.component.ts", source, Some(&options), None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     // Should have __decorate import from tslib
@@ -6200,7 +5949,8 @@ export class AppComponent {}
 "#;
 
     let options = ComponentTransformOptions { jit: true, ..Default::default() };
-    let result = transform_angular_file(&allocator, "app.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "app.component.ts", source, Some(&options), None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     // Should have resource import for template
@@ -6237,7 +5987,8 @@ export class AppComponent {}
 "#;
 
     let options = ComponentTransformOptions { jit: true, ..Default::default() };
-    let result = transform_angular_file(&allocator, "app.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "app.component.ts", source, Some(&options), None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     // Should have resource import for style
@@ -6268,7 +6019,8 @@ export class AppComponent {
 "#;
 
     let options = ComponentTransformOptions { jit: true, ..Default::default() };
-    let result = transform_angular_file(&allocator, "app.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "app.component.ts", source, Some(&options), None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     // Should have ctorParameters static property
@@ -6305,7 +6057,8 @@ export class AppComponent {
 "#;
 
     let options = ComponentTransformOptions { jit: true, ..Default::default() };
-    let result = transform_angular_file(&allocator, "app.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "app.component.ts", source, Some(&options), None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     // Should have let declaration
@@ -6343,7 +6096,7 @@ export class HighlightDirective {
 
     let options = ComponentTransformOptions { jit: true, ..Default::default() };
     let result =
-        transform_angular_file(&allocator, "highlight.directive.ts", source, &options, None);
+        transform_angular_file(&allocator, "highlight.directive.ts", source, Some(&options), None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     // Should have __decorate with Directive
@@ -6390,7 +6143,8 @@ export class App {
 "#;
 
     let options = ComponentTransformOptions { jit: true, ..Default::default() };
-    let result = transform_angular_file(&allocator, "app.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "app.component.ts", source, Some(&options), None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     // Should have all JIT characteristics
@@ -6441,7 +6195,7 @@ export class HighlightDirective {
 
     let options = ComponentTransformOptions { jit: true, ..Default::default() };
     let result =
-        transform_angular_file(&allocator, "highlight.directive.ts", source, &options, None);
+        transform_angular_file(&allocator, "highlight.directive.ts", source, Some(&options), None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     // propDecorators must be present — Angular's JIT runtime reads this
@@ -6504,7 +6258,8 @@ export class TestComponent {
 "#;
 
     let options = ComponentTransformOptions { jit: true, ..Default::default() };
-    let result = transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "test.component.ts", source, Some(&options), None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     // `ServiceC | null` resolves correctly (1 non-null type)
@@ -6548,7 +6303,8 @@ export abstract class BaseProvider {
 "#;
 
     let options = ComponentTransformOptions { jit: true, ..Default::default() };
-    let result = transform_angular_file(&allocator, "base.provider.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "base.provider.ts", source, Some(&options), None);
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
     // The abstract keyword should NOT appear before "class" in the output
@@ -6597,7 +6353,8 @@ export class TestComponent {
 
     let options = ComponentTransformOptions { sourcemap: true, ..Default::default() };
 
-    let result = transform_angular_file(&allocator, "app.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "app.component.ts", source, Some(&options), None);
 
     assert!(
         result.map.is_some(),
@@ -6634,7 +6391,8 @@ export class TestComponent {
 
     let options = ComponentTransformOptions { sourcemap: true, jit: true, ..Default::default() };
 
-    let result = transform_angular_file(&allocator, "app.component.ts", source, &options, None);
+    let result =
+        transform_angular_file(&allocator, "app.component.ts", source, Some(&options), None);
 
     assert!(
         result.map.is_some(),
@@ -6661,13 +6419,7 @@ export class TestComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "app.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "app.component.ts", source, None, None);
 
     assert!(result.map.is_none(), "Source map should be None when sourcemap option is false");
 }
@@ -6693,8 +6445,13 @@ export class TestComponent {
 
     let options = ComponentTransformOptions { sourcemap: true, ..Default::default() };
 
-    let result =
-        transform_angular_file(&allocator, "app.component.ts", source, &options, Some(&resolved));
+    let result = transform_angular_file(
+        &allocator,
+        "app.component.ts",
+        source,
+        Some(&options),
+        Some(&resolved),
+    );
 
     assert!(
         result.map.is_some(),
@@ -6713,7 +6470,7 @@ fn test_sourcemap_no_angular_classes() {
 
     let options = ComponentTransformOptions { sourcemap: true, ..Default::default() };
 
-    let result = transform_angular_file(&allocator, "plain.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "plain.ts", source, Some(&options), None);
 
     // Even for files with no Angular components, if sourcemap is requested,
     // a trivial identity source map should be returned
@@ -6741,8 +6498,7 @@ import { Component } from '@angular/core';
 export class HelloComponent {}
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "hello.component.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "hello.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     // Should have exactly one dts declaration
@@ -6792,8 +6548,7 @@ export class UserComponent {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "user.component.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "user.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     let decl = &result.dts_declarations[0];
@@ -6833,8 +6588,7 @@ import { Component } from '@angular/core';
 export class LegacyComponent {}
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "legacy.component.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "legacy.component.ts", source, None, None);
     assert!(!result.has_errors());
 
     let decl = &result.dts_declarations[0];
@@ -6861,8 +6615,7 @@ import { Component } from '@angular/core';
 export class TooltipComponent {}
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "tooltip.component.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "tooltip.component.ts", source, None, None);
     assert!(!result.has_errors());
 
     let decl = &result.dts_declarations[0];
@@ -6890,9 +6643,7 @@ export class HighlightDirective {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result =
-        transform_angular_file(&allocator, "highlight.directive.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "highlight.directive.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     assert_eq!(result.dts_declarations.len(), 1);
@@ -6947,8 +6698,7 @@ export class CapitalizePipe implements PipeTransform {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "capitalize.pipe.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "capitalize.pipe.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     assert_eq!(result.dts_declarations.len(), 1);
@@ -6987,8 +6737,7 @@ export class MyPipe implements PipeTransform {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "my.pipe.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "my.pipe.ts", source, None, None);
 
     assert_eq!(result.dts_declarations.len(), 1);
     let decl = &result.dts_declarations[0];
@@ -7017,8 +6766,7 @@ import { CommonModule } from '@angular/common';
 export class MyModule {}
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "my.module.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "my.module.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     assert_eq!(result.dts_declarations.len(), 1);
@@ -7071,8 +6819,7 @@ export class DataService {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "data.service.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "data.service.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     assert_eq!(result.dts_declarations.len(), 1);
@@ -7108,8 +6855,7 @@ export class GenericService<T, U> {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "generic.service.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "generic.service.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     assert_eq!(result.dts_declarations.len(), 1);
@@ -7145,8 +6891,7 @@ export class GenericPipe<T> implements PipeTransform {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "generic.pipe.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "generic.pipe.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     assert_eq!(result.dts_declarations.len(), 1);
@@ -7184,8 +6929,7 @@ export class GenericDirective<T, U> {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "generic.directive.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "generic.directive.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     assert_eq!(result.dts_declarations.len(), 1);
@@ -7218,8 +6962,7 @@ import { NgModule } from '@angular/core';
 export class GenericModule<T> {}
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "generic.module.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "generic.module.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     assert_eq!(result.dts_declarations.len(), 1);
@@ -7270,8 +7013,7 @@ export class MyPipe implements PipeTransform {
 export class MultiComponent {}
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "multi.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "multi.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     // Should have declarations for all 3 classes
@@ -7298,8 +7040,7 @@ export class PlainClass {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "plain.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "plain.ts", source, None, None);
 
     // Should have no dts declarations for plain classes
     assert!(
@@ -7325,8 +7066,7 @@ export class SignalComponent {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "signal.component.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "signal.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     assert_eq!(result.dts_declarations.len(), 1);
@@ -7360,8 +7100,7 @@ export class TestComponent {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     let decl = &result.dts_declarations[0];
@@ -7393,8 +7132,7 @@ export class TestComponent {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     let decl = &result.dts_declarations[0];
@@ -7424,8 +7162,7 @@ export class TestComponent {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     let decl = &result.dts_declarations[0];
@@ -7457,8 +7194,7 @@ export class TestDirective {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.directive.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.directive.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     let decl = &result.dts_declarations[0];
@@ -7488,8 +7224,7 @@ import { Component } from '@angular/core';
 export class LayoutComponent {}
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "layout.component.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "layout.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     let decl = &result.dts_declarations[0];
@@ -7527,8 +7262,7 @@ export class TestComponent {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     let decl = &result.dts_declarations[0];
@@ -7565,8 +7299,7 @@ export class TestDirective {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.directive.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.directive.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     let decl = &result.dts_declarations[0];
@@ -7603,8 +7336,7 @@ export class TestComponent {
 }
 "#;
 
-    let options = ComponentTransformOptions::default();
-    let result = transform_angular_file(&allocator, "test.component.ts", source, &options, None);
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
     assert!(!result.has_errors(), "Should compile without errors: {:?}", result.diagnostics);
 
     let decl = &result.dts_declarations[0];
@@ -8068,13 +7800,7 @@ export class MyComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
@@ -8129,13 +7855,7 @@ export class MyComponent {
 }
 "#;
 
-    let result = transform_angular_file(
-        &allocator,
-        "test.component.ts",
-        source,
-        &ComponentTransformOptions::default(),
-        None,
-    );
+    let result = transform_angular_file(&allocator, "test.component.ts", source, None, None);
 
     assert!(!result.has_errors(), "Should not have errors: {:?}", result.diagnostics);
 
diff --git a/napi/angular-compiler/index.d.ts b/napi/angular-compiler/index.d.ts
index e1740cbc5..375efcc0c 100644
--- a/napi/angular-compiler/index.d.ts
+++ b/napi/angular-compiler/index.d.ts
@@ -731,14 +731,14 @@ export interface TopLevelDeclarations {
 export declare function transformAngularFile(
   source: string,
   filename: string,
-  options: TransformOptions,
+  options?: TransformOptions | undefined | null,
   resolvedResources?: ResolvedResources | undefined | null,
 ): Promise<TransformResult>
 
 export declare function transformAngularFileSync(
   source: string,
   filename: string,
-  options: TransformOptions,
+  options?: TransformOptions | undefined | null,
   resolvedResources?: ResolvedResources | undefined | null,
 ): TransformResult
 
diff --git a/napi/angular-compiler/src/lib.rs b/napi/angular-compiler/src/lib.rs
index ba3133fe1..827e41ae9 100644
--- a/napi/angular-compiler/src/lib.rs
+++ b/napi/angular-compiler/src/lib.rs
@@ -1042,7 +1042,7 @@ pub struct ResolvedResources {
 pub struct TransformAngularFileTask {
     source: String,
     filename: String,
-    options: TransformOptions,
+    options: Option<TransformOptions>,
     resolved_resources: Option<ResolvedResources>,
 }
 
@@ -1057,7 +1057,7 @@ impl Task for TransformAngularFileTask {
         };
 
         let allocator = Allocator::default();
-        let rust_options: RustTransformOptions = std::mem::take(&mut self.options).into();
+        let rust_options: RustTransformOptions = self.options.take().unwrap_or_default().into();
 
         // Convert resolved resources to Rust types
         let rust_resources = self
@@ -1069,7 +1069,7 @@ impl Task for TransformAngularFileTask {
             &allocator,
             &self.filename,
             &self.source,
-            &rust_options,
+            Some(&rust_options),
             rust_resources.as_ref(),
         );
 
@@ -1120,7 +1120,7 @@ impl Task for TransformAngularFileTask {
 pub fn transform_angular_file(
     source: String,
     filename: String,
-    options: TransformOptions,
+    options: Option<TransformOptions>,
     resolved_resources: Option<ResolvedResources>,
 ) -> AsyncTask<TransformAngularFileTask> {
     AsyncTask::new(TransformAngularFileTask { source, filename, options, resolved_resources })
@@ -1130,7 +1130,7 @@ pub fn transform_angular_file(
 pub fn transform_angular_file_sync(
     source: String,
     filename: String,
-    options: TransformOptions,
+    options: Option<TransformOptions>,
     resolved_resources: Option<ResolvedResources>,
 ) -> napi::Result<TransformResult> {
     let mut result = TransformAngularFileTask { source, filename, options, resolved_resources };