diff --git a/crates/angular_conformance/README.md b/crates/angular_conformance/README.md
index e255c61b6..8302d8409 100644
--- a/crates/angular_conformance/README.md
+++ b/crates/angular_conformance/README.md
@@ -4,7 +4,7 @@ A conformance testing framework that validates the oxc Angular compiler implemen
 
 ## Overview
 
-This crate extracts test cases from Angular's TypeScript spec files and runs them against the Rust implementation to ensure compatibility. Currently maintains **100% pass rate** across 1,252 extracted test assertions.
+This crate extracts test cases from Angular's TypeScript spec files and runs them against the Rust implementation to ensure compatibility. It currently maintains a **100% pass rate** across **1,264** extracted test assertions against Angular **v22.0.0-rc.2**.
 
 ## Architecture
 
diff --git a/crates/angular_conformance/fixtures/compiler_facade_interface_spec.json b/crates/angular_conformance/fixtures/compiler_facade_interface_spec.json
index 581ec8324..cfaecf2ac 100644
--- a/crates/angular_conformance/fixtures/compiler_facade_interface_spec.json
+++ b/crates/angular_conformance/fixtures/compiler_facade_interface_spec.json
@@ -1,5 +1,5 @@
 {
   "name": "compiler_facade_interface_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/compiler_facade_interface_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/compiler_facade_interface_spec.ts",
   "test_groups": []
 }
diff --git a/crates/angular_conformance/fixtures/expression_parser_ast_spec.json b/crates/angular_conformance/fixtures/expression_parser_ast_spec.json
index 4af87fa72..3d1398039 100644
--- a/crates/angular_conformance/fixtures/expression_parser_ast_spec.json
+++ b/crates/angular_conformance/fixtures/expression_parser_ast_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "ast_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/expression_parser/ast_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/expression_parser/ast_spec.ts",
   "test_groups": [
     {
       "name": "RecursiveAstVisitor",
diff --git a/crates/angular_conformance/fixtures/expression_parser_lexer_spec.json b/crates/angular_conformance/fixtures/expression_parser_lexer_spec.json
index 9dbe2a637..800f28615 100644
--- a/crates/angular_conformance/fixtures/expression_parser_lexer_spec.json
+++ b/crates/angular_conformance/fixtures/expression_parser_lexer_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "lexer_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/expression_parser/lexer_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/expression_parser/lexer_spec.ts",
   "test_groups": [
     {
       "name": "lexer",
diff --git a/crates/angular_conformance/fixtures/expression_parser_parser_spec.json b/crates/angular_conformance/fixtures/expression_parser_parser_spec.json
index 29d3ea7a3..3045d33f6 100644
--- a/crates/angular_conformance/fixtures/expression_parser_parser_spec.json
+++ b/crates/angular_conformance/fixtures/expression_parser_parser_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "parser_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/expression_parser/parser_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/expression_parser/parser_spec.ts",
   "test_groups": [
     {
       "name": "parser",
@@ -1474,6 +1474,32 @@
                   "type": "CheckAction",
                   "input": "('key' in obj) && true",
                   "expected": "(\"key\" in obj) && true"
+                },
+                {
+                  "type": "CheckAction",
+                  "input": "'in' in {in: foo}",
+                  "expected": "\"in\" in {in: foo}"
+                }
+              ]
+            },
+            {
+              "name": "should throw on invalid in expressions",
+              "path": "parser/parseAction/should throw on invalid in expressions",
+              "assertions": [
+                {
+                  "type": "ExpectActionError",
+                  "input": "in",
+                  "error_contains": "Unexpected token in"
+                },
+                {
+                  "type": "ExpectActionError",
+                  "input": "in foo",
+                  "error_contains": "Unexpected token in"
+                },
+                {
+                  "type": "ExpectActionError",
+                  "input": "'foo' in",
+                  "error_contains": "Unexpected end of expression: 'foo' in at the end of the expression ['foo' in]"
                 }
               ]
             },
@@ -2074,17 +2100,6 @@
                         }
                       ]
                     },
-                    {
-                      "name": "should report missing comma between arrow function parameters",
-                      "path": "parser/parseBinding/arrow functions/arrow function validations/should report missing comma between arrow function parameters",
-                      "assertions": [
-                        {
-                          "type": "ExpectBindingError",
-                          "input": "(a b) => a + b",
-                          "error_contains": "Missing expected ,"
-                        }
-                      ]
-                    },
                     {
                       "name": "should report an error inside the arrow function expression",
                       "path": "parser/parseBinding/arrow functions/arrow function validations/should report an error inside the arrow function expression",
diff --git a/crates/angular_conformance/fixtures/expression_parser_serializer_spec.json b/crates/angular_conformance/fixtures/expression_parser_serializer_spec.json
index ac501d75e..609823cf9 100644
--- a/crates/angular_conformance/fixtures/expression_parser_serializer_spec.json
+++ b/crates/angular_conformance/fixtures/expression_parser_serializer_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "serializer_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/expression_parser/serializer_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/expression_parser/serializer_spec.ts",
   "test_groups": [
     {
       "name": "serializer",
diff --git a/crates/angular_conformance/fixtures/i18n_digest_spec.json b/crates/angular_conformance/fixtures/i18n_digest_spec.json
index 05d859c67..fa0e734a3 100644
--- a/crates/angular_conformance/fixtures/i18n_digest_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_digest_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "digest_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/digest_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/digest_spec.ts",
   "test_groups": [
     {
       "name": "digest",
diff --git a/crates/angular_conformance/fixtures/i18n_extractor_merger_spec.json b/crates/angular_conformance/fixtures/i18n_extractor_merger_spec.json
index a44b45078..242da7a4f 100644
--- a/crates/angular_conformance/fixtures/i18n_extractor_merger_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_extractor_merger_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "extractor_merger_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/extractor_merger_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/extractor_merger_spec.ts",
   "test_groups": [
     {
       "name": "Extractor",
@@ -153,8 +153,8 @@
               "assertions": []
             },
             {
-              "name": "should ignore implicit elements in non translatable ICU messages",
-              "path": "Extractor/ICU messages/should ignore implicit elements in non translatable ICU messages",
+              "name": "should ignore implicit elements in non translatable ICU messages 2",
+              "path": "Extractor/ICU messages/should ignore implicit elements in non translatable ICU messages 2",
               "assertions": []
             }
           ]
diff --git a/crates/angular_conformance/fixtures/i18n_i18n_ast_spec.json b/crates/angular_conformance/fixtures/i18n_i18n_ast_spec.json
index 818089368..3b4d43882 100644
--- a/crates/angular_conformance/fixtures/i18n_i18n_ast_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_i18n_ast_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "i18n_ast_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/i18n_ast_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/i18n_ast_spec.ts",
   "test_groups": [
     {
       "name": "Message",
diff --git a/crates/angular_conformance/fixtures/i18n_i18n_html_parser_spec.json b/crates/angular_conformance/fixtures/i18n_i18n_html_parser_spec.json
index c2d406a0f..45b92d79c 100644
--- a/crates/angular_conformance/fixtures/i18n_i18n_html_parser_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_i18n_html_parser_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "i18n_html_parser_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/i18n_html_parser_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/i18n_html_parser_spec.ts",
   "test_groups": [
     {
       "name": "I18N html parser",
diff --git a/crates/angular_conformance/fixtures/i18n_i18n_parser_spec.json b/crates/angular_conformance/fixtures/i18n_i18n_parser_spec.json
index eb1a7575f..e8745b0a0 100644
--- a/crates/angular_conformance/fixtures/i18n_i18n_parser_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_i18n_parser_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "i18n_parser_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/i18n_parser_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/i18n_parser_spec.ts",
   "test_groups": [
     {
       "name": "I18nParser",
diff --git a/crates/angular_conformance/fixtures/i18n_integration_xliff2_spec.json b/crates/angular_conformance/fixtures/i18n_integration_xliff2_spec.json
index 0355e11dc..b42afd958 100644
--- a/crates/angular_conformance/fixtures/i18n_integration_xliff2_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_integration_xliff2_spec.json
@@ -1,5 +1,5 @@
 {
   "name": "integration_xliff2_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/integration_xliff2_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/integration_xliff2_spec.ts",
   "test_groups": []
 }
diff --git a/crates/angular_conformance/fixtures/i18n_integration_xliff_spec.json b/crates/angular_conformance/fixtures/i18n_integration_xliff_spec.json
index 08aa18a4c..785927a86 100644
--- a/crates/angular_conformance/fixtures/i18n_integration_xliff_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_integration_xliff_spec.json
@@ -1,5 +1,5 @@
 {
   "name": "integration_xliff_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/integration_xliff_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/integration_xliff_spec.ts",
   "test_groups": []
 }
diff --git a/crates/angular_conformance/fixtures/i18n_integration_xmb_xtb_spec.json b/crates/angular_conformance/fixtures/i18n_integration_xmb_xtb_spec.json
index c666a5ebe..1547eeb07 100644
--- a/crates/angular_conformance/fixtures/i18n_integration_xmb_xtb_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_integration_xmb_xtb_spec.json
@@ -1,5 +1,5 @@
 {
   "name": "integration_xmb_xtb_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/integration_xmb_xtb_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/integration_xmb_xtb_spec.ts",
   "test_groups": []
 }
diff --git a/crates/angular_conformance/fixtures/i18n_message_bundle_spec.json b/crates/angular_conformance/fixtures/i18n_message_bundle_spec.json
index f71ab7303..6579d602f 100644
--- a/crates/angular_conformance/fixtures/i18n_message_bundle_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_message_bundle_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "message_bundle_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/message_bundle_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/message_bundle_spec.ts",
   "test_groups": [
     {
       "name": "MessageBundle",
diff --git a/crates/angular_conformance/fixtures/i18n_serializers_i18n_ast_spec.json b/crates/angular_conformance/fixtures/i18n_serializers_i18n_ast_spec.json
index 086c1dd80..69e11ab00 100644
--- a/crates/angular_conformance/fixtures/i18n_serializers_i18n_ast_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_serializers_i18n_ast_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "i18n_ast_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/i18n_ast_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/i18n_ast_spec.ts",
   "test_groups": [
     {
       "name": "i18n AST",
diff --git a/crates/angular_conformance/fixtures/i18n_serializers_placeholder_spec.json b/crates/angular_conformance/fixtures/i18n_serializers_placeholder_spec.json
index f09cdf163..afdca773a 100644
--- a/crates/angular_conformance/fixtures/i18n_serializers_placeholder_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_serializers_placeholder_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "placeholder_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/placeholder_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/placeholder_spec.ts",
   "test_groups": [
     {
       "name": "PlaceholderRegistry",
diff --git a/crates/angular_conformance/fixtures/i18n_serializers_xliff2_spec.json b/crates/angular_conformance/fixtures/i18n_serializers_xliff2_spec.json
index b284b7571..2b8d630d4 100644
--- a/crates/angular_conformance/fixtures/i18n_serializers_xliff2_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_serializers_xliff2_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "xliff2_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/xliff2_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/xliff2_spec.ts",
   "test_groups": [
     {
       "name": "XLIFF 2.0 serializer",
diff --git a/crates/angular_conformance/fixtures/i18n_serializers_xliff_spec.json b/crates/angular_conformance/fixtures/i18n_serializers_xliff_spec.json
index 07e541405..7f26539d5 100644
--- a/crates/angular_conformance/fixtures/i18n_serializers_xliff_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_serializers_xliff_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "xliff_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/xliff_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/xliff_spec.ts",
   "test_groups": [
     {
       "name": "XLIFF serializer",
diff --git a/crates/angular_conformance/fixtures/i18n_serializers_xmb_spec.json b/crates/angular_conformance/fixtures/i18n_serializers_xmb_spec.json
index 4b8dfa494..00aded913 100644
--- a/crates/angular_conformance/fixtures/i18n_serializers_xmb_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_serializers_xmb_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "xmb_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/xmb_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/xmb_spec.ts",
   "test_groups": [
     {
       "name": "XMB serializer",
diff --git a/crates/angular_conformance/fixtures/i18n_serializers_xml_helper_spec.json b/crates/angular_conformance/fixtures/i18n_serializers_xml_helper_spec.json
index 2e502b051..a6a84107b 100644
--- a/crates/angular_conformance/fixtures/i18n_serializers_xml_helper_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_serializers_xml_helper_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "xml_helper_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/xml_helper_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/xml_helper_spec.ts",
   "test_groups": [
     {
       "name": "XML helper",
diff --git a/crates/angular_conformance/fixtures/i18n_serializers_xtb_spec.json b/crates/angular_conformance/fixtures/i18n_serializers_xtb_spec.json
index 91aed981f..1490c78c7 100644
--- a/crates/angular_conformance/fixtures/i18n_serializers_xtb_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_serializers_xtb_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "xtb_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/xtb_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/serializers/xtb_spec.ts",
   "test_groups": [
     {
       "name": "XTB serializer",
diff --git a/crates/angular_conformance/fixtures/i18n_translation_bundle_spec.json b/crates/angular_conformance/fixtures/i18n_translation_bundle_spec.json
index 0e9fbace6..0966156a2 100644
--- a/crates/angular_conformance/fixtures/i18n_translation_bundle_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_translation_bundle_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "translation_bundle_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/translation_bundle_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/translation_bundle_spec.ts",
   "test_groups": [
     {
       "name": "TranslationBundle",
diff --git a/crates/angular_conformance/fixtures/i18n_whitespace_sensitivity_spec.json b/crates/angular_conformance/fixtures/i18n_whitespace_sensitivity_spec.json
index cdb8b6ef3..15cdb22dd 100644
--- a/crates/angular_conformance/fixtures/i18n_whitespace_sensitivity_spec.json
+++ b/crates/angular_conformance/fixtures/i18n_whitespace_sensitivity_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "whitespace_sensitivity_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/whitespace_sensitivity_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/i18n/whitespace_sensitivity_spec.ts",
   "test_groups": [
     {
       "name": "i18nPreserveWhitespaceForLegacyExtraction",
diff --git a/crates/angular_conformance/fixtures/integration_spec.json b/crates/angular_conformance/fixtures/integration_spec.json
index d23da8112..a96e23801 100644
--- a/crates/angular_conformance/fixtures/integration_spec.json
+++ b/crates/angular_conformance/fixtures/integration_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "integration_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/integration_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/integration_spec.ts",
   "test_groups": [
     {
       "name": "integration tests",
diff --git a/crates/angular_conformance/fixtures/ml_parser_ast_serializer_spec.json b/crates/angular_conformance/fixtures/ml_parser_ast_serializer_spec.json
index 8cf0a1423..f2573a382 100644
--- a/crates/angular_conformance/fixtures/ml_parser_ast_serializer_spec.json
+++ b/crates/angular_conformance/fixtures/ml_parser_ast_serializer_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "ast_serializer_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/ml_parser/ast_serializer_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/ml_parser/ast_serializer_spec.ts",
   "test_groups": [
     {
       "name": "Node serializer",
diff --git a/crates/angular_conformance/fixtures/ml_parser_html_parser_spec.json b/crates/angular_conformance/fixtures/ml_parser_html_parser_spec.json
index 3a8800645..440d49118 100644
--- a/crates/angular_conformance/fixtures/ml_parser_html_parser_spec.json
+++ b/crates/angular_conformance/fixtures/ml_parser_html_parser_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "html_parser_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/ml_parser/html_parser_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/ml_parser/html_parser_spec.ts",
   "test_groups": [
     {
       "name": "HtmlParser",
@@ -90,6 +90,28 @@
                     }
                   ]
                 },
+                {
+                  "name": "should parse named HTML entities containing digits",
+                  "path": "HtmlParser/parse/text nodes/should parse named HTML entities containing digits",
+                  "assertions": [
+                    {
+                      "type": "HumanizeDom",
+                      "input": "<div>&sup1;</div>",
+                      "expected": [
+                        ["html.Element", "div", 0.0],
+                        ["html.Text", "¹", 1.0, [""], ["¹", "&sup1;"], [""]]
+                      ]
+                    },
+                    {
+                      "type": "HumanizeDom",
+                      "input": "<div>&frac12;</div>",
+                      "expected": [
+                        ["html.Element", "div", 0.0],
+                        ["html.Text", "½", 1.0, [""], ["½", "&frac12;"], [""]]
+                      ]
+                    }
+                  ]
+                },
                 {
                   "name": "should normalize line endings within CDATA",
                   "path": "HtmlParser/parse/text nodes/should normalize line endings within CDATA",
@@ -605,32 +627,6 @@
                     }
                   ]
                 },
-                {
-                  "name": "should parse attributes containing unquoted interpolation",
-                  "path": "HtmlParser/parse/attributes/should parse attributes containing unquoted interpolation",
-                  "assertions": [
-                    {
-                      "type": "HumanizeDom",
-                      "input": "<div foo={{message}}></div>",
-                      "expected": [
-                        ["html.Element", "div", 0.0],
-                        [
-                          "html.Attribute",
-                          "foo",
-                          "{{message}}",
-                          [""],
-                          ["{{", "message", "}}"],
-                          [""]
-                        ]
-                      ]
-                    }
-                  ]
-                },
-                {
-                  "name": "should parse bound inputs with expressions containing newlines",
-                  "path": "HtmlParser/parse/attributes/should parse bound inputs with expressions containing newlines",
-                  "assertions": []
-                },
                 {
                   "name": "should decode HTML entities in interpolated attributes",
                   "path": "HtmlParser/parse/attributes/should decode HTML entities in interpolated attributes",
@@ -770,8 +766,8 @@
               "groups": [],
               "tests": [
                 {
-                  "name": "should parse out expansion forms",
-                  "path": "HtmlParser/parse/expansion forms/should parse out expansion forms",
+                  "name": "should parse out expansion forms (with multiple cases)",
+                  "path": "HtmlParser/parse/expansion forms/should parse out expansion forms (with multiple cases)",
                   "assertions": []
                 },
                 {
@@ -790,8 +786,8 @@
                   "assertions": []
                 },
                 {
-                  "name": "should not normalize line-endings in ICU expressions in external templates when `i18nNormalizeLineEndingsInICUs` is not set",
-                  "path": "HtmlParser/parse/expansion forms/should not normalize line-endings in ICU expressions in external templates when `i18nNormalizeLineEndingsInICUs` is not set",
+                  "name": "should not normalize line-endings in ICU expressions in external templates when `i18nNormalizeLineEndingsInICUs` is not set (escapedString:false)",
+                  "path": "HtmlParser/parse/expansion forms/should not normalize line-endings in ICU expressions in external templates when `i18nNormalizeLineEndingsInICUs` is not set (escapedString:false)",
                   "assertions": []
                 },
                 {
@@ -981,6 +977,24 @@
                     }
                   ]
                 },
+                {
+                  "name": "should parse exhaustive default checks in a switch block",
+                  "path": "HtmlParser/parse/blocks/should parse exhaustive default checks in a switch block",
+                  "assertions": [
+                    {
+                      "type": "HumanizeDom",
+                      "input": "@switch (expr) {@case ('foo') {} @default never;}",
+                      "expected": [
+                        ["html.Block", "switch", 0.0],
+                        ["html.BlockParameter", "expr"],
+                        ["html.Block", "case", 1.0],
+                        ["html.BlockParameter", "'foo'"],
+                        ["html.Text", " ", 1.0, [" "]],
+                        ["html.Block", "default never", 1.0]
+                      ]
+                    }
+                  ]
+                },
                 {
                   "name": "should close void elements used right before a block",
                   "path": "HtmlParser/parse/blocks/should close void elements used right before a block",
@@ -1032,8 +1046,8 @@
                   "assertions": []
                 },
                 {
-                  "name": "should parse an incomplete block with no parameters",
-                  "path": "HtmlParser/parse/blocks/should parse an incomplete block with no parameters",
+                  "name": "should parse an incomplete block with no body",
+                  "path": "HtmlParser/parse/blocks/should parse an incomplete block with no body",
                   "assertions": []
                 }
               ]
@@ -1081,7 +1095,7 @@
                           "html.LetDeclaration",
                           "foo",
                           "123 + 456",
-                          "@let foo = 123 + 456",
+                          "@let foo = 123 + 456;",
                           "foo",
                           "123 + 456"
                         ]
diff --git a/crates/angular_conformance/fixtures/ml_parser_html_whitespaces_spec.json b/crates/angular_conformance/fixtures/ml_parser_html_whitespaces_spec.json
index 90e5919eb..5a3474cdb 100644
--- a/crates/angular_conformance/fixtures/ml_parser_html_whitespaces_spec.json
+++ b/crates/angular_conformance/fixtures/ml_parser_html_whitespaces_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "html_whitespaces_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/ml_parser/html_whitespaces_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/ml_parser/html_whitespaces_spec.ts",
   "test_groups": [
     {
       "name": "removeWhitespaces",
diff --git a/crates/angular_conformance/fixtures/ml_parser_inline_comment_spec.json b/crates/angular_conformance/fixtures/ml_parser_inline_comment_spec.json
new file mode 100644
index 000000000..9bb14e721
--- /dev/null
+++ b/crates/angular_conformance/fixtures/ml_parser_inline_comment_spec.json
@@ -0,0 +1,57 @@
+{
+  "name": "inline_comment_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/ml_parser/inline_comment_spec.ts",
+  "test_groups": [
+    {
+      "name": "Inline comments in attributes",
+      "groups": [],
+      "tests": [
+        {
+          "name": "should ignore single line comments between attributes",
+          "path": "Inline comments in attributes/should ignore single line comments between attributes",
+          "assertions": []
+        },
+        {
+          "name": "should ignore single line comments between inputs and outputs",
+          "path": "Inline comments in attributes/should ignore single line comments between inputs and outputs",
+          "assertions": []
+        },
+        {
+          "name": "should ignore single line comments at the end of tag",
+          "path": "Inline comments in attributes/should ignore single line comments at the end of tag",
+          "assertions": []
+        },
+        {
+          "name": "should handle commented out attribute",
+          "path": "Inline comments in attributes/should handle commented out attribute",
+          "assertions": []
+        },
+        {
+          "name": "should comment an attribute with a // on a new line",
+          "path": "Inline comments in attributes/should comment an attribute with a // on a new line",
+          "assertions": []
+        },
+        {
+          "name": "should ignore multi-line comments between attributes",
+          "path": "Inline comments in attributes/should ignore multi-line comments between attributes",
+          "assertions": []
+        },
+        {
+          "name": "should ignore multi-line comments at the end of tag",
+          "path": "Inline comments in attributes/should ignore multi-line comments at the end of tag",
+          "assertions": []
+        },
+        {
+          "name": "should handle * inside multi-line comments",
+          "path": "Inline comments in attributes/should handle * inside multi-line comments",
+          "assertions": []
+        },
+        {
+          "name": "should maintain correct source spans with comments",
+          "path": "Inline comments in attributes/should maintain correct source spans with comments",
+          "assertions": []
+        }
+      ]
+    }
+  ]
+}
diff --git a/crates/angular_conformance/fixtures/ml_parser_lexer_spec.json b/crates/angular_conformance/fixtures/ml_parser_lexer_spec.json
index e31eb2f97..8a0daaa99 100644
--- a/crates/angular_conformance/fixtures/ml_parser_lexer_spec.json
+++ b/crates/angular_conformance/fixtures/ml_parser_lexer_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "lexer_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/ml_parser/lexer_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/ml_parser/lexer_spec.ts",
   "test_groups": [
     {
       "name": "HtmlLexer",
@@ -961,8 +961,8 @@
                           "assertions": []
                         },
                         {
-                          "name": "should not normalize line-endings in ICU expressions when `i18nNormalizeLineEndingsInICUs` is not defined",
-                          "path": "HtmlLexer/open tags/expansion forms/[line ending normalization/{escapedString: false}/should not normalize line-endings in ICU expressions when `i18nNormalizeLineEndingsInICUs` is not defined",
+                          "name": "should not normalize line-endings in ICU expressions when `i18nNormalizeLineEndingsInICUs` is not defined (escapedString:false)",
+                          "path": "HtmlLexer/open tags/expansion forms/[line ending normalization/{escapedString: false}/should not normalize line-endings in ICU expressions when `i18nNormalizeLineEndingsInICUs` is not defined (escapedString:false)",
                           "assertions": []
                         },
                         {
@@ -2715,30 +2715,6 @@
                 }
               ]
             },
-            {
-              "name": "should parse bound inputs with expressions containing newlines",
-              "path": "HtmlLexer/attributes/should parse bound inputs with expressions containing newlines",
-              "assertions": [
-                {
-                  "type": "HtmlLexerTest",
-                  "input": "<app-component\n        [attr]=\"[\n        {text: 'some text',url:'//www.google.com'},\n        {text:'other text',url:'//www.google.com'}]\">",
-                  "test_type": "HumanizeParts",
-                  "expected": [
-                    ["TokenType.TAG_OPEN_START", "", "app-component"],
-                    ["TokenType.ATTR_NAME", "", "[attr]"],
-                    ["TokenType.ATTR_QUOTE", "\""],
-                    [
-                      "TokenType.ATTR_VALUE_TEXT",
-                      "[\n        {text: 'some text',url:'//www.google.com'},\n        {text:'other text',url:'//www.google.com'}]"
-                    ],
-                    ["TokenType.ATTR_QUOTE", "\""],
-                    ["TokenType.TAG_OPEN_END"],
-                    ["TokenType.EOF"]
-                  ],
-                  "options": null
-                }
-              ]
-            },
             {
               "name": "should allow whitespace",
               "path": "HtmlLexer/attributes/should allow whitespace",
@@ -3136,6 +3112,48 @@
                 }
               ]
             },
+            {
+              "name": "should parse named entities containing digits",
+              "path": "HtmlLexer/entities/should parse named entities containing digits",
+              "assertions": [
+                {
+                  "type": "HtmlLexerTest",
+                  "input": "&sup1;",
+                  "test_type": "HumanizeParts",
+                  "expected": [
+                    ["TokenType.TEXT", ""],
+                    ["TokenType.ENCODED_ENTITY", "¹", "&sup1;"],
+                    ["TokenType.TEXT", ""],
+                    ["TokenType.EOF"]
+                  ],
+                  "options": null
+                },
+                {
+                  "type": "HtmlLexerTest",
+                  "input": "&frac12;",
+                  "test_type": "HumanizeParts",
+                  "expected": [
+                    ["TokenType.TEXT", ""],
+                    ["TokenType.ENCODED_ENTITY", "½", "&frac12;"],
+                    ["TokenType.TEXT", ""],
+                    ["TokenType.EOF"]
+                  ],
+                  "options": null
+                },
+                {
+                  "type": "HtmlLexerTest",
+                  "input": "&blk34;",
+                  "test_type": "HumanizeParts",
+                  "expected": [
+                    ["TokenType.TEXT", ""],
+                    ["TokenType.ENCODED_ENTITY", "▓", "&blk34;"],
+                    ["TokenType.TEXT", ""],
+                    ["TokenType.EOF"]
+                  ],
+                  "options": null
+                }
+              ]
+            },
             {
               "name": "should parse hexadecimal entities",
               "path": "HtmlLexer/entities/should parse hexadecimal entities",
@@ -4055,8 +4073,8 @@
                       "assertions": []
                     },
                     {
-                      "name": "should not normalize line-endings in ICU expressions when `i18nNormalizeLineEndingsInICUs` is not defined",
-                      "path": "HtmlLexer/expansion forms/[line ending normalization/{escapedString: false}/should not normalize line-endings in ICU expressions when `i18nNormalizeLineEndingsInICUs` is not defined",
+                      "name": "should not normalize line-endings in ICU expressions when `i18nNormalizeLineEndingsInICUs` is not defined (escapeString: false)",
+                      "path": "HtmlLexer/expansion forms/[line ending normalization/{escapedString: false}/should not normalize line-endings in ICU expressions when `i18nNormalizeLineEndingsInICUs` is not defined (escapeString: false)",
                       "assertions": []
                     },
                     {
@@ -5010,6 +5028,61 @@
                 }
               ]
             },
+            {
+              "name": "should parse @default never;",
+              "path": "HtmlLexer/blocks/should parse @default never;",
+              "assertions": [
+                {
+                  "type": "HtmlLexerTest",
+                  "input": "@default never;",
+                  "test_type": "HumanizeParts",
+                  "expected": [
+                    ["TokenType.BLOCK_OPEN_START", "default never"],
+                    ["TokenType.BLOCK_OPEN_END"],
+                    ["TokenType.BLOCK_CLOSE"],
+                    ["TokenType.EOF"]
+                  ],
+                  "options": null
+                }
+              ]
+            },
+            {
+              "name": "should parse @default never(expr);",
+              "path": "HtmlLexer/blocks/should parse @default never(expr);",
+              "assertions": [
+                {
+                  "type": "HtmlLexerTest",
+                  "input": "@default never(expr);",
+                  "test_type": "HumanizeParts",
+                  "expected": [
+                    ["TokenType.BLOCK_OPEN_START", "default never"],
+                    ["TokenType.BLOCK_PARAMETER", "expr"],
+                    ["TokenType.BLOCK_OPEN_END"],
+                    ["TokenType.BLOCK_CLOSE"],
+                    ["TokenType.EOF"]
+                  ],
+                  "options": null
+                }
+              ]
+            },
+            {
+              "name": "should parse @default never ;",
+              "path": "HtmlLexer/blocks/should parse @default never ;",
+              "assertions": [
+                {
+                  "type": "HtmlLexerTest",
+                  "input": "@default never ;",
+                  "test_type": "HumanizeParts",
+                  "expected": [
+                    ["TokenType.BLOCK_OPEN_START", "default never"],
+                    ["TokenType.BLOCK_OPEN_END"],
+                    ["TokenType.BLOCK_CLOSE"],
+                    ["TokenType.EOF"]
+                  ],
+                  "options": null
+                }
+              ]
+            },
             {
               "name": "should parse a block with parameters",
               "path": "HtmlLexer/blocks/should parse a block with parameters",
diff --git a/crates/angular_conformance/fixtures/output_abstract_emitter_node_only_spec.json b/crates/angular_conformance/fixtures/output_abstract_emitter_node_only_spec.json
index 51ccdc4b7..95cc8ad34 100644
--- a/crates/angular_conformance/fixtures/output_abstract_emitter_node_only_spec.json
+++ b/crates/angular_conformance/fixtures/output_abstract_emitter_node_only_spec.json
@@ -1,9 +1,9 @@
 {
   "name": "abstract_emitter_node_only_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/output/abstract_emitter_node_only_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/output/abstract_emitter_node_only_spec.ts",
   "test_groups": [
     {
-      "name": "AbstractEmitter",
+      "name": "AbstractEmitter (node only)",
       "groups": [
         {
           "name": "EmitterVisitorContext",
@@ -11,42 +11,42 @@
           "tests": [
             {
               "name": "should add source files to the source map",
-              "path": "AbstractEmitter/EmitterVisitorContext/should add source files to the source map",
+              "path": "AbstractEmitter (node only)/EmitterVisitorContext/should add source files to the source map",
               "assertions": []
             },
             {
               "name": "should generate a valid mapping",
-              "path": "AbstractEmitter/EmitterVisitorContext/should generate a valid mapping",
+              "path": "AbstractEmitter (node only)/EmitterVisitorContext/should generate a valid mapping",
               "assertions": []
             },
             {
               "name": "should be able to shift the content",
-              "path": "AbstractEmitter/EmitterVisitorContext/should be able to shift the content",
+              "path": "AbstractEmitter (node only)/EmitterVisitorContext/should be able to shift the content",
               "assertions": []
             },
             {
               "name": "should use the default source file for the first character",
-              "path": "AbstractEmitter/EmitterVisitorContext/should use the default source file for the first character",
+              "path": "AbstractEmitter (node only)/EmitterVisitorContext/should use the default source file for the first character",
               "assertions": []
             },
             {
               "name": "should use an explicit mapping for the first character",
-              "path": "AbstractEmitter/EmitterVisitorContext/should use an explicit mapping for the first character",
+              "path": "AbstractEmitter (node only)/EmitterVisitorContext/should use an explicit mapping for the first character",
               "assertions": []
             },
             {
               "name": "should map leading segment without span",
-              "path": "AbstractEmitter/EmitterVisitorContext/should map leading segment without span",
+              "path": "AbstractEmitter (node only)/EmitterVisitorContext/should map leading segment without span",
               "assertions": []
             },
             {
               "name": "should handle indent",
-              "path": "AbstractEmitter/EmitterVisitorContext/should handle indent",
+              "path": "AbstractEmitter (node only)/EmitterVisitorContext/should handle indent",
               "assertions": []
             },
             {
               "name": "should coalesce identical span",
-              "path": "AbstractEmitter/EmitterVisitorContext/should coalesce identical span",
+              "path": "AbstractEmitter (node only)/EmitterVisitorContext/should coalesce identical span",
               "assertions": []
             }
           ]
diff --git a/crates/angular_conformance/fixtures/output_abstract_emitter_spec.json b/crates/angular_conformance/fixtures/output_abstract_emitter_spec.json
index 8e1a4152c..469188113 100644
--- a/crates/angular_conformance/fixtures/output_abstract_emitter_spec.json
+++ b/crates/angular_conformance/fixtures/output_abstract_emitter_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "abstract_emitter_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/output/abstract_emitter_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/output/abstract_emitter_spec.ts",
   "test_groups": [
     {
       "name": "AbstractEmitter",
@@ -29,16 +29,6 @@
               "path": "AbstractEmitter/escapeIdentifier/should escape carriage returns",
               "assertions": []
             },
-            {
-              "name": "should escape $",
-              "path": "AbstractEmitter/escapeIdentifier/should escape $",
-              "assertions": []
-            },
-            {
-              "name": "should not escape $",
-              "path": "AbstractEmitter/escapeIdentifier/should not escape $",
-              "assertions": []
-            },
             {
               "name": "should add quotes for non-identifiers",
               "path": "AbstractEmitter/escapeIdentifier/should add quotes for non-identifiers",
diff --git a/crates/angular_conformance/fixtures/output_output_jit_spec.json b/crates/angular_conformance/fixtures/output_output_jit_spec.json
index 3fe4a45b2..bd1d74fb0 100644
--- a/crates/angular_conformance/fixtures/output_output_jit_spec.json
+++ b/crates/angular_conformance/fixtures/output_output_jit_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "output_jit_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/output/output_jit_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/output/output_jit_spec.ts",
   "test_groups": [
     {
       "name": "Output JIT",
diff --git a/crates/angular_conformance/fixtures/output_source_map_spec.json b/crates/angular_conformance/fixtures/output_source_map_spec.json
index 78fe394f9..b3764e93a 100644
--- a/crates/angular_conformance/fixtures/output_source_map_spec.json
+++ b/crates/angular_conformance/fixtures/output_source_map_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "source_map_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/output/source_map_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/output/source_map_spec.ts",
   "test_groups": [
     {
       "name": "source map generation",
diff --git a/crates/angular_conformance/fixtures/render3_r3_ast_absolute_span_spec.json b/crates/angular_conformance/fixtures/render3_r3_ast_absolute_span_spec.json
index bb0dcdb0a..e55dbaee9 100644
--- a/crates/angular_conformance/fixtures/render3_r3_ast_absolute_span_spec.json
+++ b/crates/angular_conformance/fixtures/render3_r3_ast_absolute_span_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "r3_ast_absolute_span_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/render3/r3_ast_absolute_span_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/render3/r3_ast_absolute_span_spec.ts",
   "test_groups": [
     {
       "name": "expression AST absolute source spans",
@@ -837,8 +837,8 @@
               "assertions": []
             },
             {
-              "name": "is correct for variables and placeholders",
-              "path": "expression AST absolute source spans/ICU expressions/is correct for variables and placeholders",
+              "name": "is correct for variables and placeholders in nested ICUs",
+              "path": "expression AST absolute source spans/ICU expressions/is correct for variables and placeholders in nested ICUs",
               "assertions": []
             }
           ]
diff --git a/crates/angular_conformance/fixtures/render3_r3_ast_spans_spec.json b/crates/angular_conformance/fixtures/render3_r3_ast_spans_spec.json
index 1793f7c79..1a84935d1 100644
--- a/crates/angular_conformance/fixtures/render3_r3_ast_spans_spec.json
+++ b/crates/angular_conformance/fixtures/render3_r3_ast_spans_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "r3_ast_spans_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/render3/r3_ast_spans_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/render3/r3_ast_spans_spec.ts",
   "test_groups": [
     {
       "name": "R3 AST source spans",
@@ -164,7 +164,7 @@
                       "<div data-prop=\"{{v}}\">",
                       "</div>"
                     ],
-                    ["BoundAttribute", "data-prop=\"{{v}}\"", "prop", "{{v}}"]
+                    ["BoundAttribute", "data-prop=\"{{v}}\"", "data-prop", "{{v}}"]
                   ],
                   "ignore_error": false
                 }
@@ -332,8 +332,8 @@
               ]
             },
             {
-              "name": "is correct for reference via data-ref-...",
-              "path": "R3 AST source spans/templates/is correct for reference via data-ref-...",
+              "name": "is correct for data-ref-... attribute",
+              "path": "R3 AST source spans/templates/is correct for data-ref-... attribute",
               "assertions": [
                 {
                   "type": "ExpectFromHtml",
@@ -345,7 +345,7 @@
                       "<ng-template data-ref-a>",
                       "</ng-template>"
                     ],
-                    ["Reference", "data-ref-a", "a", "<empty>"]
+                    ["TextAttribute", "data-ref-a", "data-ref-a", "<empty>"]
                   ],
                   "ignore_error": false
                 }
@@ -372,8 +372,8 @@
               ]
             },
             {
-              "name": "is correct for variables via data-let-...",
-              "path": "R3 AST source spans/templates/is correct for variables via data-let-...",
+              "name": "is correct for data-let-... attribute",
+              "path": "R3 AST source spans/templates/is correct for data-let-... attribute",
               "assertions": [
                 {
                   "type": "ExpectFromHtml",
@@ -385,7 +385,7 @@
                       "<ng-template data-let-a=\"b\">",
                       "</ng-template>"
                     ],
-                    ["Variable", "data-let-a=\"b\"", "a", "b"]
+                    ["TextAttribute", "data-let-a=\"b\"", "data-let-a", "b"]
                   ],
                   "ignore_error": false
                 }
@@ -605,8 +605,8 @@
               ]
             },
             {
-              "name": "is correct for bound events via data-on-",
-              "path": "R3 AST source spans/events/is correct for bound events via data-on-",
+              "name": "is correct for text attribute via data-on-",
+              "path": "R3 AST source spans/events/is correct for text attribute via data-on-",
               "assertions": [
                 {
                   "type": "ExpectFromHtml",
@@ -618,7 +618,7 @@
                       "<div data-on-event=\"v\">",
                       "</div>"
                     ],
-                    ["BoundEvent", "data-on-event=\"v\"", "event", "v"]
+                    ["TextAttribute", "data-on-event=\"v\"", "data-on-event", "v"]
                   ],
                   "ignore_error": false
                 }
@@ -662,8 +662,8 @@
               ]
             },
             {
-              "name": "is correct for bound events and properties via data-bindon-",
-              "path": "R3 AST source spans/events/is correct for bound events and properties via data-bindon-",
+              "name": "is correct for TextAttribute and properties via data-bindon-",
+              "path": "R3 AST source spans/events/is correct for TextAttribute and properties via data-bindon-",
               "assertions": [
                 {
                   "type": "ExpectFromHtml",
@@ -675,8 +675,7 @@
                       "<div data-bindon-prop=\"v\">",
                       "</div>"
                     ],
-                    ["BoundAttribute", "data-bindon-prop=\"v\"", "prop", "v"],
-                    ["BoundEvent", "data-bindon-prop=\"v\"", "prop", "v"]
+                    ["TextAttribute", "data-bindon-prop=\"v\"", "data-bindon-prop", "v"]
                   ],
                   "ignore_error": false
                 }
@@ -752,21 +751,6 @@
                   "ignore_error": false
                 }
               ]
-            },
-            {
-              "name": "is correct for references via data-ref-",
-              "path": "R3 AST source spans/references/is correct for references via data-ref-",
-              "assertions": [
-                {
-                  "type": "ExpectFromHtml",
-                  "input": "<div ref-a></div>",
-                  "expected": [
-                    ["Element", "<div ref-a></div>", "<div ref-a>", "</div>"],
-                    ["Reference", "ref-a", "a", "<empty>"]
-                  ],
-                  "ignore_error": false
-                }
-              ]
             }
           ]
         },
@@ -949,6 +933,29 @@
                   "ignore_error": false
                 }
               ]
+            },
+            {
+              "name": "is correct for switch blocks with exhaustive checking",
+              "path": "R3 AST source spans/switch blocks/is correct for switch blocks with exhaustive checking",
+              "assertions": [
+                {
+                  "type": "ExpectFromHtml",
+                  "input": "@switch (cond.kind) {@case (x()) {X case}@default never;}",
+                  "expected": [
+                    [
+                      "SwitchBlock",
+                      "@switch (cond.kind) {@case (x()) {X case}@default never;}",
+                      "@switch (cond.kind) {",
+                      "}"
+                    ],
+                    ["SwitchBlockCaseGroup", "@case (x()) {X case}", "@case (x()) {"],
+                    ["SwitchBlockCase", "@case (x()) {X case}", "@case (x()) {"],
+                    ["Text", "X case"],
+                    ["SwitchExhaustiveCheck", "@default never;", "@default never;"]
+                  ],
+                  "ignore_error": false
+                }
+              ]
             }
           ]
         },
@@ -1041,7 +1048,7 @@
                 {
                   "type": "ExpectFromHtml",
                   "input": "@let foo = 123;",
-                  "expected": [["LetDeclaration", "@let foo = 123", "foo", "123"]],
+                  "expected": [["LetDeclaration", "@let foo = 123;", "foo", "123"]],
                   "ignore_error": false
                 }
               ]
diff --git a/crates/angular_conformance/fixtures/render3_r3_ast_visitor_spec.json b/crates/angular_conformance/fixtures/render3_r3_ast_visitor_spec.json
new file mode 100644
index 000000000..cea650a33
--- /dev/null
+++ b/crates/angular_conformance/fixtures/render3_r3_ast_visitor_spec.json
@@ -0,0 +1,17 @@
+{
+  "name": "r3_ast_visitor_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/render3/r3_ast_visitor_spec.ts",
+  "test_groups": [
+    {
+      "name": "RecursiveVisitor",
+      "groups": [],
+      "tests": [
+        {
+          "name": "should not mutate IfBlockBranch children when visiting",
+          "path": "RecursiveVisitor/should not mutate IfBlockBranch children when visiting",
+          "assertions": []
+        }
+      ]
+    }
+  ]
+}
diff --git a/crates/angular_conformance/fixtures/render3_r3_template_transform_spec.json b/crates/angular_conformance/fixtures/render3_r3_template_transform_spec.json
index 14f06f3e8..c1794704f 100644
--- a/crates/angular_conformance/fixtures/render3_r3_template_transform_spec.json
+++ b/crates/angular_conformance/fixtures/render3_r3_template_transform_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "r3_template_transform_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/render3/r3_template_transform_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/render3/r3_template_transform_spec.ts",
   "test_groups": [
     {
       "name": "R3 template transform",
@@ -943,12 +943,12 @@
           ]
         },
         {
-          "name": "Ignored elements",
+          "name": "<script> and <style> elements",
           "groups": [],
           "tests": [
             {
               "name": "should ignore <script> elements",
-              "path": "R3 template transform/Ignored elements/should ignore <script> elements",
+              "path": "R3 template transform/<script> and <style> elements/should ignore <script> elements",
               "assertions": [
                 {
                   "type": "ExpectFromHtml",
@@ -960,7 +960,7 @@
             },
             {
               "name": "should ignore <style> elements",
-              "path": "R3 template transform/Ignored elements/should ignore <style> elements",
+              "path": "R3 template transform/<script> and <style> elements/should ignore <style> elements",
               "assertions": [
                 {
                   "type": "ExpectFromHtml",
@@ -969,6 +969,22 @@
                   "ignore_error": false
                 }
               ]
+            },
+            {
+              "name": "should not ignore namespaced SVG <style> elements",
+              "path": "R3 template transform/<script> and <style> elements/should not ignore namespaced SVG <style> elements",
+              "assertions": [
+                {
+                  "type": "ExpectFromHtml",
+                  "input": "<svg><style>.a { fill: none; }</style></svg>",
+                  "expected": [
+                    ["Element", ":svg:svg"],
+                    ["Element", ":svg:style"],
+                    ["Text", ".a { fill: none; }"]
+                  ],
+                  "ignore_error": false
+                }
+              ]
             }
           ]
         },
@@ -1251,8 +1267,29 @@
                   "assertions": []
                 },
                 {
-                  "name": "should report if parameters are passed to `idle` trigger",
-                  "path": "R3 template transform/deferred blocks/block validations/should report if parameters are passed to `idle` trigger",
+                  "name": "should allow optional parameter on `idle` trigger and parse timeout",
+                  "path": "R3 template transform/deferred blocks/block validations/should allow optional parameter on `idle` trigger and parse timeout",
+                  "assertions": [
+                    {
+                      "type": "ExpectFromHtml",
+                      "input": "@defer (on idle(1)) {hello}",
+                      "expected": [
+                        ["DeferredBlock"],
+                        ["IdleDeferredTrigger", 1.0],
+                        ["Text", "hello"]
+                      ],
+                      "ignore_error": false
+                    }
+                  ]
+                },
+                {
+                  "name": "should report if `idle` trigger value cannot be parsed",
+                  "path": "R3 template transform/deferred blocks/block validations/should report if `idle` trigger value cannot be parsed",
+                  "assertions": []
+                },
+                {
+                  "name": "should report if `idle` trigger has more than one parameter",
+                  "path": "R3 template transform/deferred blocks/block validations/should report if `idle` trigger has more than one parameter",
                   "assertions": []
                 },
                 {
@@ -1676,6 +1713,40 @@
                 }
               ]
             },
+            {
+              "name": "should parse prefetch `on idle(100)` trigger and preserve timeout",
+              "path": "R3 template transform/deferred blocks/should parse prefetch `on idle(100)` trigger and preserve timeout",
+              "assertions": [
+                {
+                  "type": "ExpectFromHtml",
+                  "input": "@defer (on idle; prefetch on idle(100)){hello}",
+                  "expected": [
+                    ["DeferredBlock"],
+                    ["IdleDeferredTrigger"],
+                    ["IdleDeferredTrigger", 100.0],
+                    ["Text", "hello"]
+                  ],
+                  "ignore_error": false
+                }
+              ]
+            },
+            {
+              "name": "should parse hydrate `on idle(100)` trigger and preserve timeout",
+              "path": "R3 template transform/deferred blocks/should parse hydrate `on idle(100)` trigger and preserve timeout",
+              "assertions": [
+                {
+                  "type": "ExpectFromHtml",
+                  "input": "@defer (on idle; hydrate on idle(100)){hello}",
+                  "expected": [
+                    ["DeferredBlock"],
+                    ["IdleDeferredTrigger", 100.0],
+                    ["IdleDeferredTrigger"],
+                    ["Text", "hello"]
+                  ],
+                  "ignore_error": false
+                }
+              ]
+            },
             {
               "name": "should allow arbitrary number of spaces after the `prefetch` keyword",
               "path": "R3 template transform/deferred blocks/should allow arbitrary number of spaces after the `prefetch` keyword",
@@ -1942,6 +2013,26 @@
                   "name": "should report if a default block has parameters",
                   "path": "R3 template transform/switch blocks/validations/should report if a default block has parameters",
                   "assertions": []
+                },
+                {
+                  "name": "should report if in a @switch block a @default never block has a body",
+                  "path": "R3 template transform/switch blocks/validations/should report if in a @switch block a @default never block has a body",
+                  "assertions": []
+                },
+                {
+                  "name": "should report if a switch fallthrough case is followed by a @default never block",
+                  "path": "R3 template transform/switch blocks/validations/should report if a switch fallthrough case is followed by a @default never block",
+                  "assertions": []
+                },
+                {
+                  "name": "should throw if @default never is not the last case in a switch block",
+                  "path": "R3 template transform/switch blocks/validations/should throw if @default never is not the last case in a switch block",
+                  "assertions": []
+                },
+                {
+                  "name": "should throw if a semicolon is missing after @default never",
+                  "path": "R3 template transform/switch blocks/validations/should throw if a semicolon is missing after @default never",
+                  "assertions": []
                 }
               ]
             }
@@ -1974,6 +2065,18 @@
                 }
               ]
             },
+            {
+              "name": "should parse a switch block with a default never case",
+              "path": "R3 template transform/switch blocks/should parse a switch block with a default never case",
+              "assertions": [
+                {
+                  "type": "ExpectFromHtml",
+                  "input": "\n          @switch (cond.kind) {\n            @default never;\n          }\n        ",
+                  "expected": [["SwitchBlock", "cond.kind"], ["SwitchExhaustiveCheck"]],
+                  "ignore_error": false
+                }
+              ]
+            },
             {
               "name": "should parse a switch block when preserveWhitespaces is enabled",
               "path": "R3 template transform/switch blocks/should parse a switch block when preserveWhitespaces is enabled",
diff --git a/crates/angular_conformance/fixtures/render3_style_parser_spec.json b/crates/angular_conformance/fixtures/render3_style_parser_spec.json
index 9894156f6..2eb3b8bc0 100644
--- a/crates/angular_conformance/fixtures/render3_style_parser_spec.json
+++ b/crates/angular_conformance/fixtures/render3_style_parser_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "style_parser_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/render3/style_parser_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/render3/style_parser_spec.ts",
   "test_groups": [
     {
       "name": "style parsing",
diff --git a/crates/angular_conformance/fixtures/render3_view_binding_spec.json b/crates/angular_conformance/fixtures/render3_view_binding_spec.json
index 1b0ba4ad0..af4060aa1 100644
--- a/crates/angular_conformance/fixtures/render3_view_binding_spec.json
+++ b/crates/angular_conformance/fixtures/render3_view_binding_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "binding_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/render3/view/binding_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/render3/view/binding_spec.ts",
   "test_groups": [
     {
       "name": "findMatchingDirectivesAndPipes",
@@ -280,6 +280,52 @@
               "assertions": []
             }
           ]
+        },
+        {
+          "name": "directive de-duplication",
+          "groups": [],
+          "tests": [
+            {
+              "name": "should give precedence to the template-matched directive over a host-directive-based match",
+              "path": "t2 binding/directive de-duplication/should give precedence to the template-matched directive over a host-directive-based match",
+              "assertions": []
+            },
+            {
+              "name": "should de-duplicate directives that match multiple times as host directives",
+              "path": "t2 binding/directive de-duplication/should de-duplicate directives that match multiple times as host directives",
+              "assertions": []
+            },
+            {
+              "name": "should merge the `inputs` of duplicated host directives",
+              "path": "t2 binding/directive de-duplication/should merge the `inputs` of duplicated host directives",
+              "assertions": []
+            },
+            {
+              "name": "should merge the `outputs` of duplicated host directives",
+              "path": "t2 binding/directive de-duplication/should merge the `outputs` of duplicated host directives",
+              "assertions": []
+            },
+            {
+              "name": "should capture conflicting input bindings in host directives",
+              "path": "t2 binding/directive de-duplication/should capture conflicting input bindings in host directives",
+              "assertions": []
+            },
+            {
+              "name": "should not capture conflicting input bindings if they are equivalent",
+              "path": "t2 binding/directive de-duplication/should not capture conflicting input bindings if they are equivalent",
+              "assertions": []
+            },
+            {
+              "name": "should capture conflicting output bindings in host directives",
+              "path": "t2 binding/directive de-duplication/should capture conflicting output bindings in host directives",
+              "assertions": []
+            },
+            {
+              "name": "should not capture conflicting output bindings if they are equivalent",
+              "path": "t2 binding/directive de-duplication/should not capture conflicting output bindings if they are equivalent",
+              "assertions": []
+            }
+          ]
         }
       ],
       "tests": [
diff --git a/crates/angular_conformance/fixtures/render3_view_i18n_spec.json b/crates/angular_conformance/fixtures/render3_view_i18n_spec.json
index befe0e926..ab6a2d203 100644
--- a/crates/angular_conformance/fixtures/render3_view_i18n_spec.json
+++ b/crates/angular_conformance/fixtures/render3_view_i18n_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "i18n_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/render3/view/i18n_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/render3/view/i18n_spec.ts",
   "test_groups": [
     {
       "name": "Utils",
diff --git a/crates/angular_conformance/fixtures/render3_view_parse_template_options_spec.json b/crates/angular_conformance/fixtures/render3_view_parse_template_options_spec.json
index 6c30a0b3f..8b13ffe94 100644
--- a/crates/angular_conformance/fixtures/render3_view_parse_template_options_spec.json
+++ b/crates/angular_conformance/fixtures/render3_view_parse_template_options_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "parse_template_options_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/render3/view/parse_template_options_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/render3/view/parse_template_options_spec.ts",
   "test_groups": [
     {
       "name": "collectCommentNodes",
diff --git a/crates/angular_conformance/fixtures/schema_dom_element_schema_registry_spec.json b/crates/angular_conformance/fixtures/schema_dom_element_schema_registry_spec.json
index f5fbb6522..a825e3d68 100644
--- a/crates/angular_conformance/fixtures/schema_dom_element_schema_registry_spec.json
+++ b/crates/angular_conformance/fixtures/schema_dom_element_schema_registry_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "dom_element_schema_registry_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/schema/dom_element_schema_registry_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/schema/dom_element_schema_registry_spec.ts",
   "test_groups": [
     {
       "name": "DOMElementSchema",
@@ -21,6 +21,27 @@
             }
           ]
         },
+        {
+          "name": "Custom XML / XHTML namespaces",
+          "groups": [],
+          "tests": [
+            {
+              "name": "should support elements with custom namespaces",
+              "path": "DOMElementSchema/Custom XML / XHTML namespaces/should support elements with custom namespaces",
+              "assertions": []
+            },
+            {
+              "name": "should support properties on custom namespaced elements",
+              "path": "DOMElementSchema/Custom XML / XHTML namespaces/should support properties on custom namespaced elements",
+              "assertions": []
+            },
+            {
+              "name": "should return correct security contexts for custom namespaced elements",
+              "path": "DOMElementSchema/Custom XML / XHTML namespaces/should return correct security contexts for custom namespaced elements",
+              "assertions": []
+            }
+          ]
+        },
         {
           "name": "normalizeAnimationStyleProperty",
           "groups": [],
@@ -150,11 +171,6 @@
           "path": "DOMElementSchema/should check security contexts for attributes",
           "assertions": []
         },
-        {
-          "name": "generate a new schema",
-          "path": "DOMElementSchema/generate a new schema",
-          "assertions": []
-        },
         {
           "name": "should support aria property if attribute is also supported",
           "path": "DOMElementSchema/should support aria property if attribute is also supported",
diff --git a/crates/angular_conformance/fixtures/schema_trusted_types_sinks_spec.json b/crates/angular_conformance/fixtures/schema_trusted_types_sinks_spec.json
index 837e0fb03..be9e7c9ab 100644
--- a/crates/angular_conformance/fixtures/schema_trusted_types_sinks_spec.json
+++ b/crates/angular_conformance/fixtures/schema_trusted_types_sinks_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "trusted_types_sinks_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/schema/trusted_types_sinks_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/schema/trusted_types_sinks_spec.ts",
   "test_groups": [
     {
       "name": "isTrustedTypesSink",
diff --git a/crates/angular_conformance/fixtures/selector_selector_spec.json b/crates/angular_conformance/fixtures/selector_selector_spec.json
index 2f9fb9207..cd971ba5a 100644
--- a/crates/angular_conformance/fixtures/selector_selector_spec.json
+++ b/crates/angular_conformance/fixtures/selector_selector_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "selector_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/selector/selector_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/selector/selector_spec.ts",
   "test_groups": [
     {
       "name": "SelectorMatcher",
diff --git a/crates/angular_conformance/fixtures/shadow_css_at_rules_spec.json b/crates/angular_conformance/fixtures/shadow_css_at_rules_spec.json
index 911889638..181ae5ba4 100644
--- a/crates/angular_conformance/fixtures/shadow_css_at_rules_spec.json
+++ b/crates/angular_conformance/fixtures/shadow_css_at_rules_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "at_rules_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/at_rules_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/at_rules_spec.ts",
   "test_groups": [
     {
       "name": "ShadowCss, at-rules",
diff --git a/crates/angular_conformance/fixtures/shadow_css_host_and_host_context_spec.json b/crates/angular_conformance/fixtures/shadow_css_host_and_host_context_spec.json
index e7973930b..1c8ff13ce 100644
--- a/crates/angular_conformance/fixtures/shadow_css_host_and_host_context_spec.json
+++ b/crates/angular_conformance/fixtures/shadow_css_host_and_host_context_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "host_and_host_context_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/host_and_host_context_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/host_and_host_context_spec.ts",
   "test_groups": [
     {
       "name": "ShadowCss, :host and :host-context",
@@ -87,28 +87,6 @@
                 }
               ]
             },
-            {
-              "name": "should handle multiple tag selectors",
-              "path": "ShadowCss, :host and :host-context/:host/should handle multiple tag selectors",
-              "assertions": [
-                {
-                  "type": "ShimCss",
-                  "input": ":host(ul,li) {}",
-                  "content_attr": "contenta",
-                  "host_attr": "a-host",
-                  "expected": "ul[a-host], li[a-host] {}",
-                  "normalized": true
-                },
-                {
-                  "type": "ShimCss",
-                  "input": ":host(ul,li) > .z {}",
-                  "content_attr": "contenta",
-                  "host_attr": "a-host",
-                  "expected": "ul[a-host] > .z[contenta], li[a-host] > .z[contenta] {}",
-                  "normalized": true
-                }
-              ]
-            },
             {
               "name": "should handle compound class selectors",
               "path": "ShadowCss, :host and :host-context/:host/should handle compound class selectors",
@@ -124,37 +102,23 @@
               ]
             },
             {
-              "name": "should handle multiple class selectors",
-              "path": "ShadowCss, :host and :host-context/:host/should handle multiple class selectors",
+              "name": "should ignore :host with a selector list containing top-level commas",
+              "path": "ShadowCss, :host and :host-context/:host/should ignore :host with a selector list containing top-level commas",
               "assertions": [
                 {
                   "type": "ShimCss",
-                  "input": ":host(.x,.y) {}",
+                  "input": ":host(.a, .b) {}",
                   "content_attr": "contenta",
                   "host_attr": "a-host",
-                  "expected": ".x[a-host], .y[a-host] {}",
+                  "expected": "[contenta]:host(.a, .b) {}",
                   "normalized": true
                 },
                 {
                   "type": "ShimCss",
-                  "input": ":host(.x,.y) > .z {}",
-                  "content_attr": "contenta",
-                  "host_attr": "a-host",
-                  "expected": ".x[a-host] > .z[contenta], .y[a-host] > .z[contenta] {}",
-                  "normalized": true
-                }
-              ]
-            },
-            {
-              "name": "should handle multiple attribute selectors",
-              "path": "ShadowCss, :host and :host-context/:host/should handle multiple attribute selectors",
-              "assertions": [
-                {
-                  "type": "ShimCss",
-                  "input": ":host([a=\"b\"],[c=d]) {}",
+                  "input": ".outer :host(.a, .b) .inner {}",
                   "content_attr": "contenta",
                   "host_attr": "a-host",
-                  "expected": "[a=\"b\"][a-host], [c=d][a-host] {}",
+                  "expected": ".outer[contenta] [contenta]:host(.a, .b) .inner[contenta] {}",
                   "normalized": true
                 }
               ]
@@ -546,7 +510,7 @@
                   "input": ":host-context .inner {}",
                   "content_attr": "contenta",
                   "host_attr": "a-host",
-                  "expected": "[a-host] .inner[contenta] {}",
+                  "expected": "[contenta]:host-context .inner[contenta] {}",
                   "normalized": true
                 },
                 {
@@ -554,7 +518,7 @@
                   "input": ":host-context() .inner {}",
                   "content_attr": "contenta",
                   "host_attr": "a-host",
-                  "expected": "[a-host] .inner[contenta] {}",
+                  "expected": "[contenta]:host-context() .inner[contenta] {}",
                   "normalized": true
                 },
                 {
@@ -562,7 +526,7 @@
                   "input": ":host-context :host-context(.a) {}",
                   "content_attr": "contenta",
                   "host_attr": "host-a",
-                  "expected": ".a[host-a], .a [host-a] {}",
+                  "expected": ":host-context .a[host-a], .a [host-a] {}",
                   "normalized": true
                 }
               ]
diff --git a/crates/angular_conformance/fixtures/shadow_css_keyframes_spec.json b/crates/angular_conformance/fixtures/shadow_css_keyframes_spec.json
index c40b48732..6fea6b244 100644
--- a/crates/angular_conformance/fixtures/shadow_css_keyframes_spec.json
+++ b/crates/angular_conformance/fixtures/shadow_css_keyframes_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "keyframes_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/keyframes_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/keyframes_spec.ts",
   "test_groups": [
     {
       "name": "ShadowCss, keyframes and animations",
@@ -51,11 +51,6 @@
           "path": "ShadowCss, keyframes and animations/should handle (scope or not) animation definition containing some names which do not have a preceding space",
           "assertions": []
         },
-        {
-          "name": "should handle (scope or not) animation definitions preceded by an erroneous comma",
-          "path": "ShadowCss, keyframes and animations/should handle (scope or not) animation definitions preceded by an erroneous comma",
-          "assertions": []
-        },
         {
           "name": "should handle (scope or not) multiple animation definitions in a single declaration",
           "path": "ShadowCss, keyframes and animations/should handle (scope or not) multiple animation definitions in a single declaration",
diff --git a/crates/angular_conformance/fixtures/shadow_css_ng_deep_spec.json b/crates/angular_conformance/fixtures/shadow_css_ng_deep_spec.json
index 221ebc19e..a58836a98 100644
--- a/crates/angular_conformance/fixtures/shadow_css_ng_deep_spec.json
+++ b/crates/angular_conformance/fixtures/shadow_css_ng_deep_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "ng_deep_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/ng_deep_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/ng_deep_spec.ts",
   "test_groups": [
     {
       "name": "ShadowCss, ng-deep",
diff --git a/crates/angular_conformance/fixtures/shadow_css_polyfills_spec.json b/crates/angular_conformance/fixtures/shadow_css_polyfills_spec.json
deleted file mode 100644
index 80e62fa73..000000000
--- a/crates/angular_conformance/fixtures/shadow_css_polyfills_spec.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "name": "polyfills_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/polyfills_spec.ts",
-  "test_groups": [
-    {
-      "name": "ShadowCss, polyfills",
-      "groups": [],
-      "tests": [
-        {
-          "name": "should support polyfill-next-selector",
-          "path": "ShadowCss, polyfills/should support polyfill-next-selector",
-          "assertions": []
-        },
-        {
-          "name": "should support polyfill-unscoped-rule",
-          "path": "ShadowCss, polyfills/should support polyfill-unscoped-rule",
-          "assertions": []
-        },
-        {
-          "name": "should support multiple instances polyfill-unscoped-rule",
-          "path": "ShadowCss, polyfills/should support multiple instances polyfill-unscoped-rule",
-          "assertions": []
-        },
-        {
-          "name": "should support polyfill-rule",
-          "path": "ShadowCss, polyfills/should support polyfill-rule",
-          "assertions": []
-        }
-      ]
-    }
-  ]
-}
diff --git a/crates/angular_conformance/fixtures/shadow_css_process_rules_spec.json b/crates/angular_conformance/fixtures/shadow_css_process_rules_spec.json
index 967b81995..600c98bb7 100644
--- a/crates/angular_conformance/fixtures/shadow_css_process_rules_spec.json
+++ b/crates/angular_conformance/fixtures/shadow_css_process_rules_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "process_rules_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/process_rules_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/process_rules_spec.ts",
   "test_groups": [
     {
       "name": "ShadowCss, processRules",
diff --git a/crates/angular_conformance/fixtures/shadow_css_repeat_groups_spec.json b/crates/angular_conformance/fixtures/shadow_css_repeat_groups_spec.json
index c58581ea9..2cd669a09 100644
--- a/crates/angular_conformance/fixtures/shadow_css_repeat_groups_spec.json
+++ b/crates/angular_conformance/fixtures/shadow_css_repeat_groups_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "repeat_groups_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/repeat_groups_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/repeat_groups_spec.ts",
   "test_groups": [
     {
       "name": "ShadowCss, repeatGroups()",
diff --git a/crates/angular_conformance/fixtures/shadow_css_shadow_css_spec.json b/crates/angular_conformance/fixtures/shadow_css_shadow_css_spec.json
index dede81855..1d92513e8 100644
--- a/crates/angular_conformance/fixtures/shadow_css_shadow_css_spec.json
+++ b/crates/angular_conformance/fixtures/shadow_css_shadow_css_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "shadow_css_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/shadow_css_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/shadow_css/shadow_css_spec.ts",
   "test_groups": [
     {
       "name": "ShadowCss",
@@ -10,43 +10,43 @@
           "groups": [],
           "tests": [
             {
-              "name": "should replace multiline comments with newline",
-              "path": "ShadowCss/comments/should replace multiline comments with newline",
+              "name": "should remove inline comments without adding extra lines",
+              "path": "ShadowCss/comments/should remove inline comments without adding extra lines",
               "assertions": [
                 {
                   "type": "ShimCss",
-                  "input": "/* b {c} */ b {c}",
+                  "input": "/* b {} */ b {}",
                   "content_attr": "contenta",
                   "host_attr": null,
-                  "expected": "\n b[contenta] {c}",
+                  "expected": " b[contenta] {}",
                   "normalized": false
                 }
               ]
             },
             {
-              "name": "should replace multiline comments with newline in the original position",
-              "path": "ShadowCss/comments/should replace multiline comments with newline in the original position",
+              "name": "should preserve internal newlines from multiline comments",
+              "path": "ShadowCss/comments/should preserve internal newlines from multiline comments",
               "assertions": [
                 {
                   "type": "ShimCss",
-                  "input": "/* b {c}\n */ b {c}",
+                  "input": "/* b {}\n */ b {}",
                   "content_attr": "contenta",
                   "host_attr": null,
-                  "expected": "\n\n b[contenta] {c}",
+                  "expected": "\n b[contenta] {}",
                   "normalized": false
                 }
               ]
             },
             {
-              "name": "should replace comments with newline in the original position",
-              "path": "ShadowCss/comments/should replace comments with newline in the original position",
+              "name": "should remove multiple inline comments without adding extra lines",
+              "path": "ShadowCss/comments/should remove multiple inline comments without adding extra lines",
               "assertions": [
                 {
                   "type": "ShimCss",
-                  "input": "/* b {c} */ b {c} /* a {c} */ a {c}",
+                  "input": "/* b {} */ b {} /* a {} */ a {}",
                   "content_attr": "contenta",
                   "host_attr": null,
-                  "expected": "\n b[contenta] {c} \n a[contenta] {c}",
+                  "expected": " b[contenta] {}  a[contenta] {}",
                   "normalized": false
                 }
               ]
@@ -57,18 +57,18 @@
               "assertions": [
                 {
                   "type": "ShimCss",
-                  "input": "b {c} /*# sourceMappingURL=data:x */",
+                  "input": "b {} /*# sourceMappingURL=data:x */",
                   "content_attr": "contenta",
                   "host_attr": null,
-                  "expected": "b[contenta] {c} /*# sourceMappingURL=data:x */",
+                  "expected": "b[contenta] {} /*# sourceMappingURL=data:x */",
                   "normalized": false
                 },
                 {
                   "type": "ShimCss",
-                  "input": "b {c}/* #sourceMappingURL=data:x */",
+                  "input": "b {}/* #sourceMappingURL=data:x */",
                   "content_attr": "contenta",
                   "host_attr": null,
-                  "expected": "b[contenta] {c}/* #sourceMappingURL=data:x */",
+                  "expected": "b[contenta] {}/* #sourceMappingURL=data:x */",
                   "normalized": false
                 }
               ]
@@ -79,10 +79,10 @@
               "assertions": [
                 {
                   "type": "ShimCss",
-                  "input": "/* comment 1 */ /* comment 2 */ b {c}",
+                  "input": "/* comment 1 */ /* comment 2 */ b {}",
                   "content_attr": "contenta",
                   "host_attr": null,
-                  "expected": "\n \n b[contenta] {c}",
+                  "expected": "  b[contenta] {}",
                   "normalized": false
                 }
               ]
@@ -934,11 +934,6 @@
             }
           ]
         },
-        {
-          "name": "should handle ::shadow",
-          "path": "ShadowCss/should handle ::shadow",
-          "assertions": []
-        },
         {
           "name": "should leave calc() unchanged",
           "path": "ShadowCss/should leave calc() unchanged",
diff --git a/crates/angular_conformance/fixtures/style_url_resolver_spec.json b/crates/angular_conformance/fixtures/style_url_resolver_spec.json
index cdd85ee34..81ac58c6e 100644
--- a/crates/angular_conformance/fixtures/style_url_resolver_spec.json
+++ b/crates/angular_conformance/fixtures/style_url_resolver_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "style_url_resolver_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/style_url_resolver_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/style_url_resolver_spec.ts",
   "test_groups": [
     {
       "name": "isStyleUrlResolvable",
diff --git a/crates/angular_conformance/fixtures/util_spec.json b/crates/angular_conformance/fixtures/util_spec.json
index 564faad32..55e65f022 100644
--- a/crates/angular_conformance/fixtures/util_spec.json
+++ b/crates/angular_conformance/fixtures/util_spec.json
@@ -1,6 +1,6 @@
 {
   "name": "util_spec.ts",
-  "file_path": "/Users/brooklyn/workspace/github/oxc/crates/oxc_angular_compiler/angular/packages/compiler/test/util_spec.ts",
+  "file_path": "crates/oxc_angular_compiler/angular/packages/compiler/test/util_spec.ts",
   "test_groups": [
     {
       "name": "util",
diff --git a/crates/angular_conformance/snapshots/angular.snap.md b/crates/angular_conformance/snapshots/angular.snap.md
index 5147021cc..a627e954a 100644
--- a/crates/angular_conformance/snapshots/angular.snap.md
+++ b/crates/angular_conformance/snapshots/angular.snap.md
@@ -7,13 +7,13 @@
 | ast_serializer | 6 | 0 | 0 | 0 | 6 | 100.0% |
 | ast_spans | 55 | 0 | 0 | 0 | 55 | 100.0% |
 | expression_lexer | 137 | 0 | 0 | 0 | 137 | 100.0% |
-| expression_parser | 267 | 0 | 0 | 0 | 267 | 100.0% |
+| expression_parser | 270 | 0 | 0 | 0 | 270 | 100.0% |
 | expression_serializer | 38 | 0 | 0 | 0 | 38 | 100.0% |
-| html_lexer | 284 | 0 | 0 | 0 | 284 | 100.0% |
-| html_parser | 85 | 0 | 0 | 0 | 85 | 100.0% |
+| html_lexer | 289 | 0 | 0 | 0 | 289 | 100.0% |
+| html_parser | 87 | 0 | 0 | 0 | 87 | 100.0% |
 | html_whitespace | 21 | 0 | 0 | 0 | 21 | 100.0% |
-| r3_transform | 172 | 0 | 0 | 0 | 172 | 100.0% |
-| shadow_css | 172 | 0 | 0 | 0 | 172 | 100.0% |
+| r3_transform | 177 | 0 | 0 | 0 | 177 | 100.0% |
+| shadow_css | 169 | 0 | 0 | 0 | 169 | 100.0% |
 | style_parser | 15 | 0 | 0 | 0 | 15 | 100.0% |
-| **Total** | **1252** | **0** | **0** | **0** | **1252** | **100.0%** |
+| **Total** | **1264** | **0** | **0** | **0** | **1264** | **100.0%** |
 
diff --git a/crates/angular_conformance/src/extractor/mod.rs b/crates/angular_conformance/src/extractor/mod.rs
index ff9ca7a4f..97fc8c589 100644
--- a/crates/angular_conformance/src/extractor/mod.rs
+++ b/crates/angular_conformance/src/extractor/mod.rs
@@ -127,11 +127,15 @@ impl SpecExtractor {
         let file_name =
             spec_path.file_name().map(|s| s.to_string_lossy().to_string()).unwrap_or_default();
 
-        TestSuite {
-            name: file_name,
-            file_path: spec_path.to_string_lossy().to_string(),
-            test_groups: root_group.groups,
-        }
+        // Store a repo-relative path so fixtures are reproducible across machines
+        // (absolute paths would leak the generating developer's home directory).
+        let file_path = spec_path
+            .strip_prefix(project_root::get_project_root().unwrap_or_default())
+            .unwrap_or(spec_path)
+            .to_string_lossy()
+            .to_string();
+
+        TestSuite { name: file_name, file_path, test_groups: root_group.groups }
     }
 }
 
diff --git a/crates/angular_conformance/src/runner.rs b/crates/angular_conformance/src/runner.rs
index e31f3dd99..cf745fa59 100644
--- a/crates/angular_conformance/src/runner.rs
+++ b/crates/angular_conformance/src/runner.rs
@@ -75,7 +75,7 @@ impl ConformanceRunner {
             // Write to JSON file
             let fixture_path = fixtures_dir.join(format!("{spec_name}.json"));
             let json = serde_json::to_string_pretty(&suite).expect("Failed to serialize");
-            fs::write(&fixture_path, json).expect("Failed to write fixture");
+            fs::write(&fixture_path, format!("{json}\n")).expect("Failed to write fixture");
 
             if self.options.debug {
                 println!("  Written to: {}", fixture_path.display());
diff --git a/crates/angular_conformance/src/subsystems/r3_transform/humanizer.rs b/crates/angular_conformance/src/subsystems/r3_transform/humanizer.rs
index 37ff77b02..5fb24fcdb 100644
--- a/crates/angular_conformance/src/subsystems/r3_transform/humanizer.rs
+++ b/crates/angular_conformance/src/subsystems/r3_transform/humanizer.rs
@@ -78,6 +78,8 @@ impl<'s> R3Humanizer<'s> {
         if let Some(trigger) = &triggers.idle {
             let row = if self.mode == HumanizeMode::SourceSpans {
                 vec!["IdleDeferredTrigger".to_string(), self.span_text(&trigger.source_span)]
+            } else if let Some(timeout) = trigger.timeout {
+                vec!["IdleDeferredTrigger".to_string(), timeout.to_string()]
             } else {
                 vec!["IdleDeferredTrigger".to_string()]
             };
@@ -542,10 +544,8 @@ impl<'a> R3Visitor<'a> for R3Humanizer<'_> {
     ) {
         if self.mode == HumanizeMode::SourceSpans {
             // Source spans mode: [LetDeclaration, sourceSpan, name, value]
-            // Note: The source span doesn't include the trailing semicolon
+            // The source span includes the trailing semicolon (Angular v22).
             let source_span = self.span_text(&decl.source_span);
-            // Strip trailing semicolon from source span if present
-            let source_span = source_span.trim_end_matches(';').to_string();
             let name = self.span_text(&decl.name_span);
             let value = self.span_text(&decl.value_span);
             self.result.push(vec!["LetDeclaration".to_string(), source_span, name, value]);
@@ -675,6 +675,16 @@ impl<'a> R3Visitor<'a> for R3Humanizer<'_> {
         for group in &block.groups {
             self.visit_switch_block_case_group(group);
         }
+        if let Some(check) = &block.exhaustive_check {
+            let row = if self.mode == HumanizeMode::SourceSpans {
+                let source_span = self.span_text(&check.source_span);
+                let start_span = self.span_text(&check.start_source_span);
+                vec!["SwitchExhaustiveCheck".to_string(), source_span, start_span]
+            } else {
+                vec!["SwitchExhaustiveCheck".to_string()]
+            };
+            self.result.push(row);
+        }
     }
 
     fn visit_switch_block_case_group(
diff --git a/crates/oxc_angular_compiler/angular b/crates/oxc_angular_compiler/angular
index b2b903957..ebd698b90 160000
--- a/crates/oxc_angular_compiler/angular
+++ b/crates/oxc_angular_compiler/angular
@@ -1 +1 @@
-Subproject commit b2b903957a5bafc343f8970e0562d3d812a121af
+Subproject commit ebd698b90f097bafb6a9696bc4f14f9ef1a7da05
diff --git a/crates/oxc_angular_compiler/src/ast/r3.rs b/crates/oxc_angular_compiler/src/ast/r3.rs
index 38372cc02..c78ac9593 100644
--- a/crates/oxc_angular_compiler/src/ast/r3.rs
+++ b/crates/oxc_angular_compiler/src/ast/r3.rs
@@ -913,6 +913,26 @@ pub struct R3SwitchBlock<'a> {
     pub groups: Vec<'a, R3SwitchBlockCaseGroup<'a>>,
     /// Unknown blocks for error recovery.
     pub unknown_blocks: Vec<'a, R3UnknownBlock<'a>>,
+    /// Optional exhaustive check (`@default never;`, v22+).
+    pub exhaustive_check: Option<R3SwitchExhaustiveCheck<'a>>,
+    /// Source span.
+    pub source_span: Span,
+    /// Start span.
+    pub start_source_span: Span,
+    /// End span.
+    pub end_source_span: Option<Span>,
+    /// Name span.
+    pub name_span: Span,
+}
+
+/// A switch exhaustive check (`@default never;`, v22+).
+///
+/// Marks a `@switch` as exhaustive for type-narrowing purposes. It carries no
+/// body and emits no runtime output.
+#[derive(Debug)]
+pub struct R3SwitchExhaustiveCheck<'a> {
+    /// Optional expression (`@default never(expr);`).
+    pub expression: Option<AngularExpression<'a>>,
     /// Source span.
     pub source_span: Span,
     /// Start span.
@@ -1038,6 +1058,9 @@ pub struct R3NeverDeferredTrigger {
 /// An idle deferred trigger.
 #[derive(Debug)]
 pub struct R3IdleDeferredTrigger {
+    /// Optional timeout in milliseconds (v22+: `on idle(100)`). `f64` to
+    /// preserve fractional precision, mirroring the timer trigger's delay.
+    pub timeout: Option<f64>,
     /// Source span.
     pub source_span: Span,
     /// Name span.
@@ -1508,8 +1531,14 @@ pub trait R3Visitor<'a> {
         for group in &block.groups {
             self.visit_switch_block_case_group(group);
         }
+        if let Some(check) = &block.exhaustive_check {
+            self.visit_switch_exhaustive_check(check);
+        }
     }
 
+    /// Visit a switch exhaustive check (`@default never;`).
+    fn visit_switch_exhaustive_check(&mut self, _check: &R3SwitchExhaustiveCheck<'a>) {}
+
     /// Visit a switch block case group.
     fn visit_switch_block_case_group(&mut self, group: &R3SwitchBlockCaseGroup<'a>) {
         for case in &group.cases {
diff --git a/crates/oxc_angular_compiler/src/component/metadata.rs b/crates/oxc_angular_compiler/src/component/metadata.rs
index e1177c90c..67c956960 100644
--- a/crates/oxc_angular_compiler/src/component/metadata.rs
+++ b/crates/oxc_angular_compiler/src/component/metadata.rs
@@ -72,6 +72,32 @@ impl AngularVersion {
         self.major >= 22
     }
 
+    /// Check if this version emits control instructions for the extended set of
+    /// control properties (v22.0.0+).
+    ///
+    /// Angular v22 broadened `specializeControlProperties` beyond `formField`:
+    /// `formControl`, `formControlName`, and `ngModel` (including two-way
+    /// `[(ngModel)]`) now also emit the paired `ɵɵcontrolCreate()` /
+    /// `ɵɵcontrol()` instructions. Earlier versions only do this for `formField`,
+    /// so emitting the extra instructions against a < v22 runtime would diverge.
+    pub fn supports_extended_control_properties(&self) -> bool {
+        self.major >= 22
+    }
+
+    /// Check if this version uses modern optional-chaining semantics (v22.0.0+).
+    ///
+    /// Angular v22 changed the safe-navigation operator (`?.`) in template
+    /// expressions to yield `undefined` (native optional chaining) instead of the
+    /// legacy `null`. Earlier versions default to the legacy `== null ? null`
+    /// expansion. Users can opt back into legacy behavior with the
+    /// `legacyOptionalChaining` compiler option, or per-expression by wrapping it
+    /// in the `$safeNavigationMigration(...)` magic function.
+    ///
+    /// See `angular/angular@2896c93cc1`.
+    pub fn supports_modern_optional_chaining(&self) -> bool {
+        self.major >= 22
+    }
+
     /// Check if this version's runtime supports chained query instructions
     /// (`ɵɵviewQuery(p1)(p2)`, `ɵɵcontentQuerySignal(...)(...)`).
     ///
diff --git a/crates/oxc_angular_compiler/src/component/transform.rs b/crates/oxc_angular_compiler/src/component/transform.rs
index 111f2ce31..b76b2fdaa 100644
--- a/crates/oxc_angular_compiler/src/component/transform.rs
+++ b/crates/oxc_angular_compiler/src/component/transform.rs
@@ -110,6 +110,17 @@ pub struct TransformOptions {
     /// When `None`, assumes latest Angular version (v19+ behavior).
     pub angular_version: Option<AngularVersion>,
 
+    /// Override for the `legacyOptionalChaining` Angular compiler option.
+    ///
+    /// Controls how the safe-navigation operator (`?.`) in template expressions is
+    /// emitted. When `Some(true)`, always uses the legacy `== null ? null` ternary;
+    /// when `Some(false)`, always emits native optional chaining (yielding
+    /// `undefined`). When `None`, the default is derived from `angular_version`
+    /// (legacy for < v22, modern for >= v22, legacy when the version is unknown).
+    ///
+    /// See `angular/angular@2896c93cc1`.
+    pub legacy_optional_chaining: Option<bool>,
+
     // Component metadata overrides for template-only compilation.
     // These allow the build tool to pass component metadata when compiling
     // templates in isolation (e.g., for testing or compare tool).
@@ -227,8 +238,9 @@ impl Default for TransformOptions {
             jit: false,
             hmr: false,
             advanced_optimizations: false,
-            i18n_use_external_ids: true, // Angular's JIT default
-            angular_version: None,       // None means assume latest (v19+ behavior)
+            i18n_use_external_ids: true,    // Angular's JIT default
+            angular_version: None,          // None means assume latest (v19+ behavior)
+            legacy_optional_chaining: None, // None: derive default from angular_version
             // Metadata overrides default to None (use extracted/default values)
             selector: None,
             standalone: None,
@@ -3764,6 +3776,7 @@ fn compile_component_full<'a>(
         pool_starting_index,
         // Pass Angular version for feature-gated instruction selection
         angular_version: options.angular_version,
+        legacy_optional_chaining: options.legacy_optional_chaining,
     };
 
     let mut job = ingest_component_with_options(
@@ -3827,6 +3840,7 @@ fn compile_component_full<'a>(
         metadata,
         template_pool_index,
         options.angular_version,
+        options.legacy_optional_chaining,
     );
 
     // Extract the result and update pool index if host bindings were compiled
@@ -4217,6 +4231,7 @@ pub fn compile_template_to_js_with_options<'a>(
         all_deferrable_deps_fn: None,
         pool_starting_index: 0, // Standalone template compilation starts from 0
         angular_version: options.angular_version,
+        legacy_optional_chaining: options.legacy_optional_chaining,
     };
 
     // Stage 3-5: Ingest and compile
@@ -4271,6 +4286,7 @@ pub fn compile_template_to_js_with_options<'a>(
             options.selector.as_deref(),
             host_pool_starting_index,
             options.angular_version,
+            options.legacy_optional_chaining,
         ) {
             // Add host binding pool declarations (pure functions, etc.)
             for decl in host_result.declarations {
@@ -4390,6 +4406,7 @@ pub fn compile_template_for_hmr<'a>(
         all_deferrable_deps_fn: None,
         pool_starting_index: 0, // HMR template compilation starts from 0
         angular_version: options.angular_version,
+        legacy_optional_chaining: options.legacy_optional_chaining,
     };
 
     // Stage 3-5: Ingest and compile
@@ -4535,6 +4552,7 @@ fn compile_component_host_bindings<'a>(
     metadata: &ComponentMetadata<'a>,
     pool_starting_index: u32,
     angular_version: Option<AngularVersion>,
+    legacy_optional_chaining: Option<bool>,
 ) -> Option<HostBindingCompilationOutput<'a>> {
     let host = metadata.host.as_ref()?;
 
@@ -4558,8 +4576,13 @@ fn compile_component_host_bindings<'a>(
 
     // Ingest and compile the host bindings with the pool starting index
     // This ensures constant names continue from where template compilation left off
-    let mut job =
-        ingest_host_binding_with_version(allocator, input, pool_starting_index, angular_version);
+    let mut job = ingest_host_binding_with_version(
+        allocator,
+        input,
+        pool_starting_index,
+        angular_version,
+        legacy_optional_chaining,
+    );
     let result = compile_host_bindings(&mut job);
 
     // Get the next pool index after host binding compilation
@@ -4883,6 +4906,7 @@ fn compile_host_bindings_from_input<'a>(
     selector: Option<&str>,
     pool_starting_index: u32,
     angular_version: Option<crate::AngularVersion>,
+    legacy_optional_chaining: Option<bool>,
 ) -> Option<HostBindingCompilationResult<'a>> {
     use oxc_allocator::FromIn;
 
@@ -4908,8 +4932,13 @@ fn compile_host_bindings_from_input<'a>(
     // Convert to HostBindingInput and compile
     let input =
         convert_host_metadata_to_input(allocator, &host, component_name_atom, component_selector);
-    let mut job =
-        ingest_host_binding_with_version(allocator, input, pool_starting_index, angular_version);
+    let mut job = ingest_host_binding_with_version(
+        allocator,
+        input,
+        pool_starting_index,
+        angular_version,
+        legacy_optional_chaining,
+    );
     let result = compile_host_bindings(&mut job);
 
     Some(result)
@@ -4945,6 +4974,7 @@ pub fn compile_host_bindings_for_linker(
         selector,
         pool_starting_index,
         None, // Linker always targets latest Angular version
+        None, // legacyOptionalChaining: derive from (absent) version
     )?;
 
     let emitter = JsEmitter::new();
@@ -5064,6 +5094,7 @@ pub fn compile_template_for_linker<'a>(
         all_deferrable_deps_fn: None,
         pool_starting_index: 0,
         angular_version: None,
+        legacy_optional_chaining: None,
     };
 
     let component_name_atom = Ident::from_in(component_name, allocator);
diff --git a/crates/oxc_angular_compiler/src/ir/expression.rs b/crates/oxc_angular_compiler/src/ir/expression.rs
index e5fc56e16..926060a21 100644
--- a/crates/oxc_angular_compiler/src/ir/expression.rs
+++ b/crates/oxc_angular_compiler/src/ir/expression.rs
@@ -592,6 +592,7 @@ impl<'a> IrExpression<'a> {
                     ResolvedPropertyReadExpr {
                         receiver: Box::new_in(e.receiver.clone_in(allocator), allocator),
                         name: e.name.clone(),
+                        optional: e.optional,
                         source_span: e.source_span,
                     },
                     allocator,
@@ -615,6 +616,7 @@ impl<'a> IrExpression<'a> {
                     ResolvedCallExpr {
                         receiver: Box::new_in(e.receiver.clone_in(allocator), allocator),
                         args,
+                        optional: e.optional,
                         source_span: e.source_span,
                     },
                     allocator,
@@ -624,6 +626,7 @@ impl<'a> IrExpression<'a> {
                 ResolvedKeyedReadExpr {
                     receiver: Box::new_in(e.receiver.clone_in(allocator), allocator),
                     key: Box::new_in(e.key.clone_in(allocator), allocator),
+                    optional: e.optional,
                     source_span: e.source_span,
                 },
                 allocator,
@@ -923,6 +926,12 @@ pub struct ResolvedPropertyReadExpr<'a> {
     pub receiver: Box<'a, IrExpression<'a>>,
     /// Property name to read.
     pub name: Ident<'a>,
+    /// Whether to read via native optional chaining (`receiver?.name`).
+    ///
+    /// Set to `true` when a safe property read (`a?.b`) is expanded under modern
+    /// (Angular v22+) optional-chaining semantics, where `?.` yields `undefined`.
+    /// Legacy reads and plain (non-safe) reads leave this `false`.
+    pub optional: bool,
     /// Source span.
     pub source_span: Option<Span>,
 }
@@ -955,6 +964,12 @@ pub struct ResolvedCallExpr<'a> {
     pub receiver: Box<'a, IrExpression<'a>>,
     /// The call arguments (resolved or original).
     pub args: Vec<'a, IrExpression<'a>>,
+    /// Whether to invoke via native optional chaining (`receiver?.()`).
+    ///
+    /// Set to `true` when a safe call (`a?.()`) is expanded under modern
+    /// (Angular v22+) optional-chaining semantics. Legacy and plain calls
+    /// leave this `false`.
+    pub optional: bool,
     /// Source span.
     pub source_span: Option<Span>,
 }
@@ -970,6 +985,12 @@ pub struct ResolvedKeyedReadExpr<'a> {
     pub receiver: Box<'a, IrExpression<'a>>,
     /// The key expression (original, e.g., a number or expression).
     pub key: Box<'a, IrExpression<'a>>,
+    /// Whether to read via native optional chaining (`receiver?.[key]`).
+    ///
+    /// Set to `true` when a safe keyed read (`a?.[k]`) is expanded under modern
+    /// (Angular v22+) optional-chaining semantics. Legacy and plain keyed reads
+    /// leave this `false`.
+    pub optional: bool,
     /// Source span.
     pub source_span: Option<Span>,
 }
diff --git a/crates/oxc_angular_compiler/src/parser/expression/parser.rs b/crates/oxc_angular_compiler/src/parser/expression/parser.rs
index 29f0983d8..0b11d94ad 100644
--- a/crates/oxc_angular_compiler/src/parser/expression/parser.rs
+++ b/crates/oxc_angular_compiler/src/parser/expression/parser.rs
@@ -1235,6 +1235,10 @@ impl<'a> Parser<'a> {
             } else {
                 format!("{} at column {} in [{}]", message, column, self.source)
             }
+        } else if message.starts_with("Unexpected end of expression") {
+            // Angular renders this (always at EOF) as
+            // "{message} at the end of the expression [{source}]".
+            format!("{message} at the end of the expression [{}]", self.source)
         } else {
             let location = if at_end {
                 "at the end of the expression".to_string()
@@ -2501,29 +2505,13 @@ impl<'a> Parser<'a> {
                         ));
                     }
                     _ => {
-                        // Treat as identifier
-                        // ImplicitReceiver spans from previous token end to current token start
-                        // This covers any whitespace between tokens (Angular behavior)
-                        let prev_end = self.previous_end();
-                        let implicit_span = ParseSpan::new(prev_end, token.index);
-                        let implicit_source_span = implicit_span.to_absolute(self.absolute_offset);
-                        let implicit = ImplicitReceiver {
-                            span: implicit_span,
-                            source_span: implicit_source_span,
-                        };
-                        let receiver = AngularExpression::ImplicitReceiver(Box::new_in(
-                            implicit,
-                            self.allocator,
-                        ));
-                        let name_span = source_span;
-                        let read = PropertyRead {
-                            span,
-                            source_span,
-                            name_span,
-                            receiver,
-                            name: token.str_value.clone(),
-                        };
-                        return AngularExpression::PropertyRead(Box::new_in(read, self.allocator));
+                        // Keywords such as `in`, `instanceof`, `as`, `if`, `else`,
+                        // `var`, and `let` are not valid primary expressions. Angular
+                        // treats only identifier tokens as reads here, so a bare
+                        // keyword reports "Unexpected token <kw>".
+                        self.error(&format!("Unexpected token {}", token.str_value));
+                        let empty = EmptyExpr { span, source_span };
+                        return AngularExpression::Empty(Box::new_in(empty, self.allocator));
                     }
                 }
             }
@@ -2567,6 +2555,14 @@ impl<'a> Parser<'a> {
             }
         }
 
+        // Nothing matched a primary expression. If the input ran out partway
+        // through an expression (e.g. the right operand of `'foo' in`), Angular
+        // reports "Unexpected end of expression: {input}". Truly empty input has
+        // no tokens at all and must stay error-free (`checkAction('')`).
+        if self.peek().is_none() && !self.tokens.is_empty() {
+            self.error(&format!("Unexpected end of expression: {}", self.source));
+        }
+
         // Empty expression - use make_span to handle the case where start > current_end_index
         // This matches Angular's workaround for empty expressions after commas, etc.
         let span = self.make_span(start, self.current_end_index());
diff --git a/crates/oxc_angular_compiler/src/parser/html/lexer.rs b/crates/oxc_angular_compiler/src/parser/html/lexer.rs
index bf1da1478..7779650f6 100644
--- a/crates/oxc_angular_compiler/src/parser/html/lexer.rs
+++ b/crates/oxc_angular_compiler/src/parser/html/lexer.rs
@@ -1162,6 +1162,17 @@ impl<'a> HtmlLexer<'a> {
         // Skip whitespace before {
         self.skip_whitespace();
 
+        // v22: `@default never;` (optionally `@default never(expr);`) is a switch
+        // exhaustive check terminated by `;` rather than a `{ ... }` body. Emit
+        // BlockOpenEnd + BlockClose so it parses as an empty, self-closed block.
+        if !params_unclosed && name == "default never" && self.peek() == ';' {
+            let semi = self.index;
+            self.advance(); // consume ;
+            self.tokens.push(HtmlToken::empty(HtmlTokenType::BlockOpenEnd, semi, self.index));
+            self.tokens.push(HtmlToken::empty(HtmlTokenType::BlockClose, self.index, self.index));
+            return;
+        }
+
         // Expect { to end the block header
         if !params_unclosed && self.peek() == '{' {
             let brace_start = self.index;
diff --git a/crates/oxc_angular_compiler/src/parser/html/parser.rs b/crates/oxc_angular_compiler/src/parser/html/parser.rs
index ffb8a3a46..27508c52e 100644
--- a/crates/oxc_angular_compiler/src/parser/html/parser.rs
+++ b/crates/oxc_angular_compiler/src/parser/html/parser.rs
@@ -1273,12 +1273,13 @@ impl<'a> HtmlParser<'a> {
             (String::new(), self.make_span(start_end, start_end))
         };
 
-        // Skip LetEnd or IncompleteLet token
-        // For sourceSpan, we want to end BEFORE the semicolon (at tok.start), not after it
+        // Skip LetEnd or IncompleteLet token.
+        // The sourceSpan ends at the end of the LetEnd token, i.e. *after* the
+        // terminating semicolon (Angular v22: `end = endToken.sourceSpan.end`).
         let end = if let Some(tok) = self.peek() {
             if tok.token_type == HtmlTokenType::LetEnd {
-                // LetEnd is the semicolon - span should end before it
-                let e = tok.start;
+                // LetEnd is the semicolon - span should include it
+                let e = tok.end;
                 self.advance();
                 e
             } else if tok.token_type == HtmlTokenType::IncompleteLet {
diff --git a/crates/oxc_angular_compiler/src/pipeline/compilation.rs b/crates/oxc_angular_compiler/src/pipeline/compilation.rs
index 9978ca4ec..12e0c625e 100644
--- a/crates/oxc_angular_compiler/src/pipeline/compilation.rs
+++ b/crates/oxc_angular_compiler/src/pipeline/compilation.rs
@@ -191,6 +191,14 @@ pub struct ComponentCompilationJob<'a> {
     /// `ɵɵconditionalCreate`/`ɵɵconditionalBranchCreate` for `@if`/`@switch` blocks.
     /// When `None`, assumes latest Angular version (v20+ behavior).
     pub angular_version: Option<AngularVersion>,
+    /// Explicit override for the `legacyOptionalChaining` compiler option.
+    ///
+    /// When `Some(true)`, safe navigation (`?.`) always expands to the legacy
+    /// `== null ? null` ternary. When `Some(false)`, it always emits native
+    /// optional chaining (`?.`, yielding `undefined`). When `None`, the default
+    /// is derived from `angular_version` (legacy for < v22, modern for >= v22,
+    /// legacy when the version is unknown). See `legacy_optional_chaining()`.
+    pub legacy_optional_chaining: Option<bool>,
     /// Diagnostics collected during compilation.
     pub diagnostics: std::vec::Vec<OxcDiagnostic>,
 }
@@ -241,6 +249,7 @@ impl<'a> ComponentCompilationJob<'a> {
             all_deferrable_deps_fn: None,
             content_selectors: None,
             angular_version: None,
+            legacy_optional_chaining: None,
             diagnostics: std::vec::Vec::new(),
         }
     }
@@ -279,6 +288,21 @@ impl<'a> ComponentCompilationJob<'a> {
         self.angular_version.map_or(true, |v: AngularVersion| v.supports_dom_property())
     }
 
+    /// Resolve whether safe navigation (`?.`) should use legacy null semantics.
+    ///
+    /// Returns `true` when `?.` must expand to the legacy `== null ? null` ternary,
+    /// `false` when it should emit native optional chaining (yielding `undefined`).
+    ///
+    /// An explicit `legacy_optional_chaining` override wins. Otherwise the default
+    /// follows the Angular version: legacy for < v22, modern for >= v22, and legacy
+    /// when the version is unknown (the safe, conservative fallback Angular itself
+    /// uses for partial-compiled libraries targeting older runtimes).
+    pub fn legacy_optional_chaining(&self) -> bool {
+        self.legacy_optional_chaining.unwrap_or_else(|| {
+            self.angular_version.map_or(true, |v| !v.supports_modern_optional_chaining())
+        })
+    }
+
     /// Allocates a new cross-reference ID.
     pub fn allocate_xref_id(&mut self) -> XrefId {
         let id = XrefId::new(self.next_xref_id);
@@ -621,6 +645,11 @@ pub struct HostBindingCompilationJob<'a> {
     pub diagnostics: std::vec::Vec<OxcDiagnostic>,
     /// Angular version for version-gated instruction emission.
     pub angular_version: Option<AngularVersion>,
+    /// Explicit override for the `legacyOptionalChaining` compiler option.
+    ///
+    /// See [`ComponentCompilationJob::legacy_optional_chaining`] for the resolution
+    /// rules; `None` derives the default from `angular_version`.
+    pub legacy_optional_chaining: Option<bool>,
 }
 
 impl<'a> HostBindingCompilationJob<'a> {
@@ -667,6 +696,7 @@ impl<'a> HostBindingCompilationJob<'a> {
             fn_suffix: Ident::from("HostBindings"),
             diagnostics: std::vec::Vec::new(),
             angular_version: None,
+            legacy_optional_chaining: None,
         }
     }
 
@@ -685,6 +715,15 @@ impl<'a> HostBindingCompilationJob<'a> {
         self.angular_version.map_or(true, |v| v.supports_dom_property())
     }
 
+    /// Resolve whether safe navigation (`?.`) should use legacy null semantics.
+    ///
+    /// See [`ComponentCompilationJob::legacy_optional_chaining`] for the rules.
+    pub fn legacy_optional_chaining(&self) -> bool {
+        self.legacy_optional_chaining.unwrap_or_else(|| {
+            self.angular_version.map_or(true, |v| !v.supports_modern_optional_chaining())
+        })
+    }
+
     /// Allocates a new cross-reference ID.
     pub fn allocate_xref_id(&mut self) -> XrefId {
         let id = XrefId::new(self.next_xref_id);
diff --git a/crates/oxc_angular_compiler/src/pipeline/conversion.rs b/crates/oxc_angular_compiler/src/pipeline/conversion.rs
index 0ddd0240e..2a99c8ad0 100644
--- a/crates/oxc_angular_compiler/src/pipeline/conversion.rs
+++ b/crates/oxc_angular_compiler/src/pipeline/conversion.rs
@@ -345,6 +345,7 @@ pub fn convert_ast<'a>(
                             allocator,
                         ),
                         name: pr.name.clone(),
+                        optional: false,
                         source_span: convert_source_span(pr.source_span),
                     },
                     allocator,
diff --git a/crates/oxc_angular_compiler/src/pipeline/ingest.rs b/crates/oxc_angular_compiler/src/pipeline/ingest.rs
index efae25b02..7a1cb19a4 100644
--- a/crates/oxc_angular_compiler/src/pipeline/ingest.rs
+++ b/crates/oxc_angular_compiler/src/pipeline/ingest.rs
@@ -122,6 +122,13 @@ pub struct IngestOptions<'a> {
     /// `ɵɵconditionalCreate`/`ɵɵconditionalBranchCreate` for `@if`/`@switch` blocks.
     /// When `None`, assumes latest Angular version (v20+ behavior).
     pub angular_version: Option<crate::AngularVersion>,
+
+    /// Explicit override for the `legacyOptionalChaining` compiler option.
+    ///
+    /// When `None`, the safe-navigation default is derived from `angular_version`
+    /// (legacy `null` for < v22, native optional chaining for >= v22, legacy when
+    /// the version is unknown).
+    pub legacy_optional_chaining: Option<bool>,
 }
 
 impl Default for IngestOptions<'_> {
@@ -137,6 +144,7 @@ impl Default for IngestOptions<'_> {
             all_deferrable_deps_fn: None,
             pool_starting_index: 0,
             angular_version: None,
+            legacy_optional_chaining: None,
         }
     }
 }
@@ -432,6 +440,7 @@ fn convert_ast_to_ir<'a>(
                                 allocator,
                             ),
                             name: prop.name,
+                            optional: false,
                             source_span: Some(prop.source_span.to_span()),
                         },
                         allocator,
@@ -447,6 +456,7 @@ fn convert_ast_to_ir<'a>(
                         ResolvedPropertyReadExpr {
                             receiver,
                             name: prop.name,
+                            optional: false,
                             source_span: Some(prop.source_span.to_span()),
                         },
                         allocator,
@@ -467,6 +477,7 @@ fn convert_ast_to_ir<'a>(
                     ResolvedKeyedReadExpr {
                         receiver,
                         key,
+                        optional: false,
                         source_span: Some(keyed.source_span.to_span()),
                     },
                     allocator,
@@ -490,6 +501,7 @@ fn convert_ast_to_ir<'a>(
                     ResolvedCallExpr {
                         receiver,
                         args,
+                        optional: false,
                         source_span: Some(call.source_span.to_span()),
                     },
                     allocator,
@@ -793,6 +805,7 @@ pub fn ingest_component_with_options<'a>(
 
     // Set Angular version for feature-gated instruction selection
     job.angular_version = options.angular_version;
+    job.legacy_optional_chaining = options.legacy_optional_chaining;
 
     let root_xref = job.root.xref;
 
@@ -1093,19 +1106,46 @@ fn ingest_element<'a>(
     // Process local references
     let local_refs = ingest_references_owned(allocator, element.references);
 
-    // Check for formField property binding to create ControlCreateOp.
-    // This matches TypeScript's ingest.ts which checks:
-    // const fieldInput = element.inputs.find(
-    //   (input) => input.name === 'formField' && input.type === e.BindingType.Property
-    // );
+    // Check for a control property binding to create a ControlCreateOp, matching
+    // Angular v22's `specializeControlProperties`. The eligible properties and the
+    // binding kinds they accept are:
+    //   - formField / formControl: `[..]` property binding
+    //   - formControlName:          property binding or static attribute
+    //   - ngModel:                  property, two-way `[(ngModel)]`, or static attribute
+    // (v21 only emitted this for `formField`; v22 broadened it, notably to
+    // two-way `[(ngModel)]`, which now also emits `ɵɵcontrolCreate()`.)
     use crate::ast::expression::BindingType;
-    let field_input_span = element.inputs.iter().find_map(|input| {
-        if input.name.as_str() == "formField" && input.binding_type == BindingType::Property {
-            Some(input.source_span)
-        } else {
-            None
-        }
-    });
+    // `formField` is the v21 baseline; the extended set (formControl/
+    // formControlName/ngModel) was added in v22. Default to latest when unknown.
+    let extended_controls =
+        job.angular_version.map_or(true, |v| v.supports_extended_control_properties());
+    let field_input_span = element
+        .inputs
+        .iter()
+        .find_map(|input| {
+            let eligible = match input.name.as_str() {
+                "formField" => input.binding_type == BindingType::Property,
+                "formControl" if extended_controls => input.binding_type == BindingType::Property,
+                "formControlName" if extended_controls => {
+                    input.binding_type == BindingType::Property
+                }
+                "ngModel" if extended_controls => {
+                    matches!(input.binding_type, BindingType::Property | BindingType::TwoWay)
+                }
+                _ => false,
+            };
+            eligible.then_some(input.source_span)
+        })
+        .or_else(|| {
+            // Static attributes (`formControlName="name"`, `ngModel`) -> Attribute op (v22+).
+            if !extended_controls {
+                return None;
+            }
+            element.attributes.iter().find_map(|attr| {
+                matches!(attr.name.as_str(), "formControlName" | "ngModel")
+                    .then_some(attr.source_span)
+            })
+        });
 
     // Always create ElementStart/ElementEnd pairs, even for void/self-closing elements.
     // The empty_elements phase will collapse them to Element when appropriate.
@@ -3819,6 +3859,7 @@ fn host_convert_ast_to_ir<'a>(
                         ResolvedPropertyReadExpr {
                             receiver,
                             name: prop.name,
+                            optional: false,
                             source_span: Some(prop.source_span.to_span()),
                         },
                         allocator,
@@ -3838,6 +3879,7 @@ fn host_convert_ast_to_ir<'a>(
                     ResolvedKeyedReadExpr {
                         receiver,
                         key,
+                        optional: false,
                         source_span: Some(keyed.source_span.to_span()),
                     },
                     allocator,
@@ -3860,6 +3902,7 @@ fn host_convert_ast_to_ir<'a>(
                     ResolvedCallExpr {
                         receiver,
                         args,
+                        optional: false,
                         source_span: Some(call.source_span.to_span()),
                     },
                     allocator,
@@ -3994,7 +4037,7 @@ pub fn ingest_host_binding<'a>(
     input: HostBindingInput<'a>,
     pool_starting_index: u32,
 ) -> HostBindingCompilationJob<'a> {
-    ingest_host_binding_with_version(allocator, input, pool_starting_index, None)
+    ingest_host_binding_with_version(allocator, input, pool_starting_index, None, None)
 }
 
 /// Ingest host bindings into a `HostBindingCompilationJob` with a specific Angular version.
@@ -4003,6 +4046,7 @@ pub fn ingest_host_binding_with_version<'a>(
     input: HostBindingInput<'a>,
     pool_starting_index: u32,
     angular_version: Option<crate::AngularVersion>,
+    legacy_optional_chaining: Option<bool>,
 ) -> HostBindingCompilationJob<'a> {
     let mut job = HostBindingCompilationJob::with_pool_starting_index(
         allocator,
@@ -4011,6 +4055,7 @@ pub fn ingest_host_binding_with_version<'a>(
         pool_starting_index,
     );
     job.angular_version = angular_version;
+    job.legacy_optional_chaining = legacy_optional_chaining;
 
     // Ingest host properties
     for property in input.properties {
diff --git a/crates/oxc_angular_compiler/src/pipeline/phases/binding_specialization.rs b/crates/oxc_angular_compiler/src/pipeline/phases/binding_specialization.rs
index 38dffe0d5..f63972e4a 100644
--- a/crates/oxc_angular_compiler/src/pipeline/phases/binding_specialization.rs
+++ b/crates/oxc_angular_compiler/src/pipeline/phases/binding_specialization.rs
@@ -88,6 +88,10 @@ fn split_ns_name(name: &str) -> (Option<&str>, &str) {
 pub fn specialize_bindings(job: &mut ComponentCompilationJob<'_>) {
     let allocator = job.allocator;
     let mode = job.mode;
+    // v22 broadened control-property specialization beyond `formField`. Default to
+    // the latest behaviour when the target version is unknown.
+    let extended_controls =
+        job.angular_version.map_or(true, |v| v.supports_extended_control_properties());
 
     // First pass: Build element map from create operations
     let mut elements: FxHashMap<XrefId, ElementInfo> = FxHashMap::default();
@@ -112,12 +116,14 @@ pub fn specialize_bindings(job: &mut ComponentCompilationJob<'_>) {
     let mut all_non_bindable: Vec<XrefId> = Vec::new();
 
     // Process root view
-    let root_non_bindable = specialize_in_view(&mut job.root.update, allocator, &elements, mode);
+    let root_non_bindable =
+        specialize_in_view(&mut job.root.update, allocator, &elements, mode, extended_controls);
     all_non_bindable.extend(root_non_bindable);
 
     // Process embedded views
     for view in job.views.values_mut() {
-        let view_non_bindable = specialize_in_view(&mut view.update, allocator, &elements, mode);
+        let view_non_bindable =
+            specialize_in_view(&mut view.update, allocator, &elements, mode, extended_controls);
         all_non_bindable.extend(view_non_bindable);
     }
 
@@ -185,6 +191,7 @@ fn specialize_in_view<'a>(
     allocator: &'a oxc_allocator::Allocator,
     _elements: &FxHashMap<XrefId, ElementInfo>,
     mode: TemplateCompilationMode,
+    extended_controls: bool,
 ) -> Vec<XrefId> {
     // Track ops to remove (ngNonBindable)
     let mut to_remove: Vec<std::ptr::NonNull<UpdateOp<'a>>> = Vec::new();
@@ -300,9 +307,18 @@ fn specialize_in_view<'a>(
                             });
                             cursor.replace_current(new_op);
                         }
-                    } else if name.as_str() == "formField" {
-                        // [formField] still binds as a regular property, but Angular also emits
-                        // a separate control instruction after the property update.
+                    } else if name.as_str() == "formField"
+                        || (extended_controls
+                            && matches!(
+                                name.as_str(),
+                                "formControl" | "formControlName" | "ngModel"
+                            ))
+                    {
+                        // A control property (`[formField]`, `[formControl]`,
+                        // `[formControlName]`, `[ngModel]`) still binds as a regular property,
+                        // but Angular also emits a separate control instruction
+                        // (`ɵɵcontrol()`) after the property update. `formField` is the v21
+                        // baseline; the rest were added in v22 (`extended_controls`).
                         if let Some(UpdateOp::Binding(binding)) = cursor.current_mut() {
                             let expression = std::mem::replace(
                                 &mut binding.expression,
@@ -360,6 +376,7 @@ fn specialize_in_view<'a>(
                 BindingKind::TwoWayProperty => {
                     // Two-way property binding
                     if let Some(UpdateOp::Binding(binding)) = cursor.current_mut() {
+                        let name = binding.name.clone();
                         let expression = std::mem::replace(
                             &mut binding.expression,
                             create_placeholder_expression(allocator),
@@ -367,12 +384,26 @@ fn specialize_in_view<'a>(
                         let new_op = UpdateOp::TwoWayProperty(TwoWayPropertyOp {
                             base: UpdateOpBase { source_span, ..Default::default() },
                             target,
-                            name: binding.name.clone(),
+                            name: name.clone(),
                             expression,
                             security_context,
                             sanitizer: None,
                         });
                         cursor.replace_current(new_op);
+                        // Angular v22: a two-way `[(ngModel)]` is a control property, so it
+                        // also emits a control update instruction (`ɵɵcontrol()`) after the
+                        // two-way property update (paired with the `ɵɵcontrolCreate()` added
+                        // during ingest). Gated to v22+ via `extended_controls`.
+                        if extended_controls && name.as_str() == "ngModel" {
+                            let control_op = UpdateOp::Control(ControlOp {
+                                base: UpdateOpBase { source_span, ..Default::default() },
+                                target,
+                                name,
+                                expression: create_placeholder_expression(allocator),
+                                security_context,
+                            });
+                            cursor.insert_after(control_op);
+                        }
                     }
                 }
                 BindingKind::I18n | BindingKind::ClassName | BindingKind::StyleProperty => {
diff --git a/crates/oxc_angular_compiler/src/pipeline/phases/expand_safe_reads.rs b/crates/oxc_angular_compiler/src/pipeline/phases/expand_safe_reads.rs
index 18d4f653c..2b211041d 100644
--- a/crates/oxc_angular_compiler/src/pipeline/phases/expand_safe_reads.rs
+++ b/crates/oxc_angular_compiler/src/pipeline/phases/expand_safe_reads.rs
@@ -5,9 +5,23 @@
 //! finds all unresolved safe read expressions and converts them into the appropriate output AST
 //! reads, guarded by null checks.
 //!
+//! ## Optional-chaining semantics
+//!
+//! Since Angular v22, safe reads default to **native optional chaining** (`a?.b`),
+//! which yields `undefined`. Earlier versions (and projects that opt in via the
+//! `legacyOptionalChaining` compiler option) use the **legacy** `== null ? null`
+//! expansion, which yields `null`. The choice per compilation is resolved by
+//! [`ComponentCompilationJob::legacy_optional_chaining`].
+//!
+//! A single expression can opt back into legacy semantics on a modern target by
+//! wrapping it in the `$safeNavigationMigration(...)` magic function — this phase
+//! detects that wrapper, forces the legacy expansion on the wrapped subtree, and
+//! strips the wrapper. Mirrors Angular's `removeSafeNavigationMigration` +
+//! `expandSafeReads` phases (`angular/angular@2896c93cc1`).
+//!
 //! ## Algorithm
 //!
-//! This phase performs two transformations:
+//! **Legacy** mode performs two transformations:
 //!
 //! 1. **Safe Transform**: Converts safe access expressions to `SafeTernaryExpr`
 //!    - `a?.b` → `SafeTernaryExpr { guard: a, expr: a.b }`
@@ -17,6 +31,12 @@
 //! 2. **Ternary Transform**: Converts `SafeTernaryExpr` to `ConditionalExpr`
 //!    - `SafeTernaryExpr { guard, expr }` → `(guard == null ? null : expr)`
 //!
+//! **Modern** mode instead rewrites each safe access into the equivalent resolved
+//! read flagged as optional, which reifies to native `?.`:
+//!    - `a?.b` → `ResolvedPropertyRead { receiver: a, name: b, optional: true }`
+//!    - `a?.[k]` → `ResolvedKeyedRead { receiver: a, key: k, optional: true }`
+//!    - `a?.()` → `ResolvedCall { receiver: a, optional: true }`
+//!
 //! ## Temporary Variables
 //!
 //! When the guard expression has side effects (e.g., function calls), a temporary
@@ -54,7 +74,8 @@ use oxc_str::Ident;
 use crate::ir::expression::{
     AssignTemporaryExpr, IrExpression, ReadTemporaryExpr, ResolvedCallExpr, ResolvedKeyedReadExpr,
     ResolvedPropertyReadExpr, SafeTernaryExpr, VisitorContextFlag,
-    transform_expressions_in_create_op, transform_expressions_in_update_op,
+    transform_expressions_in_create_op, transform_expressions_in_expression,
+    transform_expressions_in_update_op,
 };
 use crate::ir::ops::XrefId;
 use crate::pipeline::compilation::{ComponentCompilationJob, HostBindingCompilationJob};
@@ -95,6 +116,10 @@ impl<'a> SafeTransformContext<'a> {
 pub fn expand_safe_reads(job: &mut ComponentCompilationJob<'_>) {
     let allocator = job.allocator;
 
+    // Resolve whether `?.` uses legacy (`== null ? null`) or modern (native `?.`)
+    // semantics for this compilation. Read before borrowing views mutably.
+    let legacy = job.legacy_optional_chaining();
+
     // Get the current xref counter value - we'll track allocations ourselves
     // and sync back at the end
     let starting_xref = job.allocate_xref_id().0;
@@ -104,12 +129,35 @@ pub fn expand_safe_reads(job: &mut ComponentCompilationJob<'_>) {
     for view in job.all_views_mut() {
         let ctx = SafeTransformContext { allocator, next_xref: xref_counter.clone() };
 
-        // Transform safe access expressions to SafeTernary
+        // Pass 1: resolve `$safeNavigationMigration(...)` markers. This forces the
+        // legacy expansion on the wrapped subtree and strips the wrapper. Runs in
+        // both modes (the wrapper must always be removed so it never reifies as a
+        // real call).
+        for op in view.create.iter_mut() {
+            transform_expressions_in_create_op(
+                op,
+                &|expr, _flags| {
+                    resolve_safe_navigation_migration(expr, &ctx);
+                },
+                VisitorContextFlag::NONE,
+            );
+        }
+        for op in view.update.iter_mut() {
+            transform_expressions_in_update_op(
+                op,
+                &|expr, _flags| {
+                    resolve_safe_navigation_migration(expr, &ctx);
+                },
+                VisitorContextFlag::NONE,
+            );
+        }
+
+        // Pass 2: expand the remaining safe access expressions per the resolved mode.
         for op in view.create.iter_mut() {
             transform_expressions_in_create_op(
                 op,
                 &|expr, _flags| {
-                    safe_transform(expr, &ctx);
+                    expand_safe_access(expr, &ctx, legacy);
                 },
                 VisitorContextFlag::NONE,
             );
@@ -118,7 +166,7 @@ pub fn expand_safe_reads(job: &mut ComponentCompilationJob<'_>) {
             transform_expressions_in_update_op(
                 op,
                 &|expr, _flags| {
-                    safe_transform(expr, &ctx);
+                    expand_safe_access(expr, &ctx, legacy);
                 },
                 VisitorContextFlag::NONE,
             );
@@ -126,6 +174,121 @@ pub fn expand_safe_reads(job: &mut ComponentCompilationJob<'_>) {
     }
 }
 
+/// Dispatch a single node to the legacy or modern safe-read expansion.
+fn expand_safe_access<'a>(
+    expr: &mut IrExpression<'a>,
+    ctx: &SafeTransformContext<'a>,
+    legacy: bool,
+) {
+    if legacy {
+        safe_transform(expr, ctx);
+    } else {
+        safe_transform_modern(expr, ctx);
+    }
+}
+
+/// Rewrites `$safeNavigationMigration(arg)` into `arg`, expanding any safe reads
+/// inside `arg` with legacy (`== null ? null`) semantics.
+///
+/// After name resolution the wrapper appears as a `ResolvedCall` whose receiver is
+/// a `ResolvedPropertyRead` of the magic name `$safeNavigationMigration` on the
+/// component context. The wrapped argument's receivers are already resolved at this
+/// point, so it is safe to run the legacy expansion on the detached subtree here.
+///
+/// Mirrors Angular's `removeSafeNavigationMigration` phase combined with the
+/// `InSafeNavigationMigration` flag handling in `expandSafeReads`.
+fn resolve_safe_navigation_migration<'a>(
+    expr: &mut IrExpression<'a>,
+    ctx: &SafeTransformContext<'a>,
+) {
+    let allocator = ctx.allocator;
+
+    let is_marker = match expr {
+        IrExpression::ResolvedCall(call) => {
+            call.args.len() == 1
+                && matches!(
+                    call.receiver.as_ref(),
+                    IrExpression::ResolvedPropertyRead(p)
+                        if p.name.as_str() == "$safeNavigationMigration"
+                )
+        }
+        _ => false,
+    };
+    if !is_marker {
+        return;
+    }
+
+    let IrExpression::ResolvedCall(call) = expr else { return };
+    let mut arg = std::mem::replace(&mut call.args[0], make_placeholder(allocator));
+
+    // Force legacy null semantics on the wrapped subtree.
+    transform_expressions_in_expression(
+        &mut arg,
+        &|e: &mut IrExpression<'a>, _flags| {
+            safe_transform(e, ctx);
+        },
+        VisitorContextFlag::NONE,
+    );
+
+    *expr = arg;
+}
+
+/// Modern (Angular v22+) safe-read expansion: rewrite each safe access into the
+/// equivalent resolved read flagged as optional, which reifies to native `?.`.
+///
+/// Unlike the legacy expansion this needs no temporaries or ternary restructuring:
+/// each safe node becomes optional independently, and the post-order visitor has
+/// already converted any nested safe receivers.
+fn safe_transform_modern<'a>(expr: &mut IrExpression<'a>, ctx: &SafeTransformContext<'a>) {
+    let allocator = ctx.allocator;
+
+    match expr {
+        IrExpression::SafePropertyRead(p) => {
+            let receiver = std::mem::replace(p.receiver.as_mut(), make_placeholder(allocator));
+            let name = p.name.clone();
+            let source_span = p.source_span;
+            *expr = IrExpression::ResolvedPropertyRead(ArenaBox::new_in(
+                ResolvedPropertyReadExpr {
+                    receiver: ArenaBox::new_in(receiver, allocator),
+                    name,
+                    optional: true,
+                    source_span,
+                },
+                allocator,
+            ));
+        }
+        IrExpression::SafeKeyedRead(k) => {
+            let receiver = std::mem::replace(k.receiver.as_mut(), make_placeholder(allocator));
+            let key = std::mem::replace(k.index.as_mut(), make_placeholder(allocator));
+            let source_span = k.source_span;
+            *expr = IrExpression::ResolvedKeyedRead(ArenaBox::new_in(
+                ResolvedKeyedReadExpr {
+                    receiver: ArenaBox::new_in(receiver, allocator),
+                    key: ArenaBox::new_in(key, allocator),
+                    optional: true,
+                    source_span,
+                },
+                allocator,
+            ));
+        }
+        IrExpression::SafeInvokeFunction(c) => {
+            let receiver = std::mem::replace(c.receiver.as_mut(), make_placeholder(allocator));
+            let args = std::mem::replace(&mut c.args, ArenaVec::new_in(allocator));
+            let source_span = c.source_span;
+            *expr = IrExpression::ResolvedCall(ArenaBox::new_in(
+                ResolvedCallExpr {
+                    receiver: ArenaBox::new_in(receiver, allocator),
+                    args,
+                    optional: true,
+                    source_span,
+                },
+                allocator,
+            ));
+        }
+        _ => {}
+    }
+}
+
 /// Checks if an IR expression requires a temporary variable to avoid re-evaluation.
 ///
 /// Returns true for expressions with side effects (function calls, pipe bindings),
@@ -402,6 +565,9 @@ fn create_access_expr<'a>(
                 ResolvedPropertyReadExpr {
                     receiver: ArenaBox::new_in(receiver, allocator),
                     name,
+                    // Legacy expansion produces a plain read inside the `== null ? null`
+                    // ternary, not native optional chaining.
+                    optional: false,
                     source_span,
                 },
                 allocator,
@@ -412,13 +578,19 @@ fn create_access_expr<'a>(
                 ResolvedKeyedReadExpr {
                     receiver: ArenaBox::new_in(receiver, allocator),
                     key: ArenaBox::new_in(key, allocator),
+                    optional: false,
                     source_span,
                 },
                 allocator,
             ))
         }
         AccessInfo::Call { args, source_span } => IrExpression::ResolvedCall(ArenaBox::new_in(
-            ResolvedCallExpr { receiver: ArenaBox::new_in(receiver, allocator), args, source_span },
+            ResolvedCallExpr {
+                receiver: ArenaBox::new_in(receiver, allocator),
+                args,
+                optional: false,
+                source_span,
+            },
             allocator,
         )),
     }
@@ -559,17 +731,39 @@ fn safe_transform<'a>(expr: &mut IrExpression<'a>, ctx: &SafeTransformContext<'a
 pub fn expand_safe_reads_for_host(job: &mut HostBindingCompilationJob<'_>) {
     let allocator = job.allocator;
 
+    let legacy = job.legacy_optional_chaining();
+
     // Get the current xref counter value
     let starting_xref = job.allocate_xref_id().0;
     let xref_counter = RefCell::new(starting_xref);
     let ctx = SafeTransformContext { allocator, next_xref: xref_counter };
 
-    // Transform safe access expressions to SafeTernary
+    // Pass 1: resolve `$safeNavigationMigration(...)` markers.
+    for op in job.root.create.iter_mut() {
+        transform_expressions_in_create_op(
+            op,
+            &|expr, _flags| {
+                resolve_safe_navigation_migration(expr, &ctx);
+            },
+            VisitorContextFlag::NONE,
+        );
+    }
+    for op in job.root.update.iter_mut() {
+        transform_expressions_in_update_op(
+            op,
+            &|expr, _flags| {
+                resolve_safe_navigation_migration(expr, &ctx);
+            },
+            VisitorContextFlag::NONE,
+        );
+    }
+
+    // Pass 2: expand the remaining safe access expressions per the resolved mode.
     for op in job.root.create.iter_mut() {
         transform_expressions_in_create_op(
             op,
             &|expr, _flags| {
-                safe_transform(expr, &ctx);
+                expand_safe_access(expr, &ctx, legacy);
             },
             VisitorContextFlag::NONE,
         );
@@ -578,7 +772,7 @@ pub fn expand_safe_reads_for_host(job: &mut HostBindingCompilationJob<'_>) {
         transform_expressions_in_update_op(
             op,
             &|expr, _flags| {
-                safe_transform(expr, &ctx);
+                expand_safe_access(expr, &ctx, legacy);
             },
             VisitorContextFlag::NONE,
         );
diff --git a/crates/oxc_angular_compiler/src/pipeline/phases/generate_variables.rs b/crates/oxc_angular_compiler/src/pipeline/phases/generate_variables.rs
index c68147544..28743ed01 100644
--- a/crates/oxc_angular_compiler/src/pipeline/phases/generate_variables.rs
+++ b/crates/oxc_angular_compiler/src/pipeline/phases/generate_variables.rs
@@ -717,6 +717,7 @@ fn create_context_read_variable<'a>(
             ResolvedPropertyReadExpr {
                 receiver: Box::new_in(context_expr, allocator),
                 name: context_value,
+                optional: false,
                 source_span: None,
             },
             allocator,
diff --git a/crates/oxc_angular_compiler/src/pipeline/phases/reify/ir_expression.rs b/crates/oxc_angular_compiler/src/pipeline/phases/reify/ir_expression.rs
index 9b4d26ba0..17e32fcb2 100644
--- a/crates/oxc_angular_compiler/src/pipeline/phases/reify/ir_expression.rs
+++ b/crates/oxc_angular_compiler/src/pipeline/phases/reify/ir_expression.rs
@@ -493,7 +493,7 @@ pub fn convert_ir_expression<'a>(
                 ReadPropExpr {
                     receiver: Box::new_in(receiver, allocator),
                     name: resolved.name.clone(),
-                    optional: false,
+                    optional: resolved.optional,
                     source_span: resolved.source_span,
                 },
                 allocator,
@@ -571,7 +571,7 @@ pub fn convert_ir_expression<'a>(
                     fn_expr: Box::new_in(receiver, allocator),
                     args,
                     pure: false,
-                    optional: false,
+                    optional: resolved.optional,
                     source_span: resolved.source_span,
                 },
                 allocator,
@@ -589,7 +589,7 @@ pub fn convert_ir_expression<'a>(
                 ReadKeyExpr {
                     receiver: Box::new_in(receiver, allocator),
                     index: Box::new_in(index, allocator),
-                    optional: false,
+                    optional: resolved.optional,
                     source_span: resolved.source_span,
                 },
                 allocator,
diff --git a/crates/oxc_angular_compiler/src/pipeline/phases/resolve_names.rs b/crates/oxc_angular_compiler/src/pipeline/phases/resolve_names.rs
index 84f618d1a..394927a40 100644
--- a/crates/oxc_angular_compiler/src/pipeline/phases/resolve_names.rs
+++ b/crates/oxc_angular_compiler/src/pipeline/phases/resolve_names.rs
@@ -428,6 +428,7 @@ fn resolve_expression<'a>(
                                 allocator,
                             ),
                             name: lexical.name.clone(),
+                            optional: false,
                             source_span: lexical.source_span,
                         },
                         allocator,
@@ -519,6 +520,7 @@ fn resolve_expression<'a>(
                                 allocator,
                             ),
                             name: name.clone(),
+                            optional: false,
                             source_span,
                         },
                         allocator,
@@ -937,6 +939,7 @@ fn resolve_angular_expression<'a>(
                             allocator,
                         ),
                         name: name.clone(),
+                        optional: false,
                         source_span,
                     },
                     allocator,
@@ -952,6 +955,7 @@ fn resolve_angular_expression<'a>(
                         ResolvedPropertyReadExpr {
                             receiver: Box::new_in(resolved_receiver, allocator),
                             name: prop_read.name.clone(),
+                            optional: false,
                             source_span: Some(prop_read.source_span.to_span()),
                         },
                         allocator,
@@ -1009,6 +1013,7 @@ fn resolve_angular_expression<'a>(
                     ResolvedCallExpr {
                         receiver: Box::new_in(receiver, allocator),
                         args: resolved_args,
+                        optional: false,
                         source_span: Some(call.source_span.to_span()),
                     },
                     allocator,
@@ -1044,6 +1049,7 @@ fn resolve_angular_expression<'a>(
                     ResolvedKeyedReadExpr {
                         receiver: Box::new_in(receiver, allocator),
                         key: Box::new_in(key, allocator),
+                        optional: false,
                         source_span: Some(keyed.source_span.to_span()),
                     },
                     allocator,
diff --git a/crates/oxc_angular_compiler/src/pipeline/phases/track_fn_optimization.rs b/crates/oxc_angular_compiler/src/pipeline/phases/track_fn_optimization.rs
index f1bff218d..740d6ad8f 100644
--- a/crates/oxc_angular_compiler/src/pipeline/phases/track_fn_optimization.rs
+++ b/crates/oxc_angular_compiler/src/pipeline/phases/track_fn_optimization.rs
@@ -318,6 +318,7 @@ mod tests {
             ResolvedPropertyReadExpr {
                 receiver: oxc_allocator::Box::new_in(ctx, alloc),
                 name: Ident::from(method_name),
+                optional: false,
                 source_span: None,
             },
             alloc,
@@ -335,6 +336,7 @@ mod tests {
             ResolvedCallExpr {
                 receiver: oxc_allocator::Box::new_in(prop_read, alloc),
                 args,
+                optional: false,
                 source_span: None,
             },
             alloc,
diff --git a/crates/oxc_angular_compiler/src/pipeline/phases/track_variables.rs b/crates/oxc_angular_compiler/src/pipeline/phases/track_variables.rs
index e9e24e440..6c0ce8382 100644
--- a/crates/oxc_angular_compiler/src/pipeline/phases/track_variables.rs
+++ b/crates/oxc_angular_compiler/src/pipeline/phases/track_variables.rs
@@ -219,6 +219,7 @@ fn transform_angular_expression_for_track<'a>(
                     ResolvedPropertyReadExpr {
                         receiver: Box::new_in(transformed_receiver, allocator),
                         name: prop_read.name.clone(),
+                        optional: false,
                         source_span: None,
                     },
                     allocator,
diff --git a/crates/oxc_angular_compiler/src/pipeline/phases/variable_optimization.rs b/crates/oxc_angular_compiler/src/pipeline/phases/variable_optimization.rs
index 21dcf89b6..6a8ac3328 100644
--- a/crates/oxc_angular_compiler/src/pipeline/phases/variable_optimization.rs
+++ b/crates/oxc_angular_compiler/src/pipeline/phases/variable_optimization.rs
@@ -3501,6 +3501,7 @@ where
                         allocator,
                     ),
                     name: rpr.name.clone(),
+                    optional: rpr.optional,
                     source_span: rpr.source_span,
                 },
                 allocator,
@@ -3537,6 +3538,7 @@ where
                         allocator,
                     ),
                     args,
+                    optional: rc.optional,
                     source_span: rc.source_span,
                 },
                 allocator,
@@ -3554,6 +3556,7 @@ where
                         transform_expression(&rkr.key, allocator, transform),
                         allocator,
                     ),
+                    optional: rkr.optional,
                     source_span: rkr.source_span,
                 },
                 allocator,
diff --git a/crates/oxc_angular_compiler/src/styles/encapsulation.rs b/crates/oxc_angular_compiler/src/styles/encapsulation.rs
index b2b015a1e..251abfaff 100644
--- a/crates/oxc_angular_compiler/src/styles/encapsulation.rs
+++ b/crates/oxc_angular_compiler/src/styles/encapsulation.rs
@@ -357,13 +357,14 @@ fn extract_comments(css: &str) -> (String, Vec<String>) {
             if is_sourcemap {
                 comments.push(comment.to_string());
             } else {
-                // Count newlines in the comment to preserve line count for sourcemaps
+                // Preserve only the newlines that were inside the comment. Angular
+                // v22 no longer appends an extra trailing newline (the old `+ '\n'`),
+                // so removing a comment doesn't insert blank lines.
                 let newline_count = comment.bytes().filter(|&b| b == b'\n').count();
                 let mut preserved = String::new();
                 for _ in 0..newline_count {
                     preserved.push('\n');
                 }
-                preserved.push('\n');
                 comments.push(preserved);
             }
 
@@ -1010,6 +1011,31 @@ fn split_by_top_level_comma_str(s: &str) -> Vec<&str> {
 }
 
 /// Process :host-context in a single selector part.
+/// Returns true if `after` (the text following a `:host-context` token) begins a
+/// non-empty argument list — `(` then, ignoring whitespace, a character other than
+/// `)`. Mirrors Angular v22's `/:host-context(?=\(\s*[^)\s])/`.
+fn is_nonempty_host_context_arg(after: &str) -> bool {
+    let Some(rest) = after.strip_prefix('(') else {
+        return false;
+    };
+    matches!(rest.trim_start().chars().next(), Some(c) if c != ')')
+}
+
+/// Finds the byte offset of the first `:host-context` that is a real context
+/// selector (followed by a non-empty argument list).
+fn find_valid_host_context(s: &str) -> Option<usize> {
+    let marker = ":host-context";
+    let mut from = 0;
+    while let Some(rel) = s[from..].find(marker) {
+        let pos = from + rel;
+        if is_nonempty_host_context_arg(&s[pos + marker.len()..]) {
+            return Some(pos);
+        }
+        from = pos + marker.len();
+    }
+    None
+}
+
 fn convert_colon_host_context_in_part(css: &str, content_attr: &str, host_attr: &str) -> String {
     let attr = if host_attr.is_empty() {
         format!("[{}]", content_attr)
@@ -1017,9 +1043,12 @@ fn convert_colon_host_context_in_part(css: &str, content_attr: &str, host_attr:
         format!("[{}]", host_attr)
     };
 
-    // Find the first :host-context
+    // Find the first :host-context that is actually a context selector, i.e. one
+    // followed by a non-empty argument list. Angular v22 leaves bare
+    // `:host-context`, `:host-context()` and `:host-context( )` literal, so any
+    // such occurrence before the first real one is preserved as a prefix.
     let host_context_marker = ":host-context";
-    let Some(hc_global_start) = css.find(host_context_marker) else {
+    let Some(hc_global_start) = find_valid_host_context(css) else {
         return css.to_string();
     };
 
@@ -1095,12 +1124,13 @@ fn convert_colon_host_context_in_part(css: &str, content_attr: &str, host_attr:
         current_pos = paren_end + 1;
     }
 
-    // Handle edge cases: :host-context with no selectors
-    // e.g., ":host-context .inner" or ":host-context() .inner"
+    // Angular v22: a `:host-context` that is not followed by a non-empty argument
+    // list (bare `:host-context`, `:host-context()`, `:host-context( )`) is no longer
+    // treated as a context selector. It is left literal so the regular selector
+    // scoping prefixes it with the content attribute, e.g.
+    // `:host-context .inner` -> `[contenta]:host-context .inner[contenta]`.
     if selector_groups.is_empty() || selector_groups[0].is_empty() {
-        // Remove the :host-context (with or without empty parens) and replace with host marker
-        let result = replace_host_context_patterns(css, &attr);
-        return result;
+        return css.to_string();
     }
 
     // The "other selectors" are everything after the last :host-context()
@@ -1265,9 +1295,31 @@ fn combine_host_context_selectors(context_selectors: &[String]) -> Vec<String> {
 ///
 /// Key insight: matching stops at COMMAS, not closing parens of pseudo-functions.
 /// This ensures `:host:not(:host.foo, :host.bar)` is processed correctly.
+/// Replace `:host` with the polyfill marker, skipping the `:host` that begins a
+/// `:host-context` token (mirrors Angular's `_colonHostRe = /:host(?!\-context)/`).
+fn replace_colon_host_marker(css: &str) -> String {
+    let mut result = String::with_capacity(css.len());
+    let mut rest = css;
+    while let Some(pos) = rest.find(":host") {
+        let after = &rest[pos + ":host".len()..];
+        result.push_str(&rest[..pos]);
+        if after.starts_with("-context") {
+            // Leave `:host-context` literal; copy `:host` through unchanged.
+            result.push_str(":host");
+        } else {
+            result.push_str(POLYFILL_HOST);
+        }
+        rest = after;
+    }
+    result.push_str(rest);
+    result
+}
+
 fn convert_colon_host(css: &str, _host_attr: &str) -> String {
-    // Step 1: Replace all :host with marker
-    let mut result = css.replace(":host", POLYFILL_HOST);
+    // Step 1: Replace `:host` with the marker, but NOT the `:host` inside
+    // `:host-context` (Angular v22's `/:host(?!\-context)/`). A bare/empty
+    // `:host-context` is left literal here and scoped with the content attr later.
+    let mut result = replace_colon_host_marker(css);
 
     // Step 2: Process POLYFILL_HOST(...) patterns - direct parens after marker
     result = process_host_with_parens(&result);
@@ -1325,22 +1377,29 @@ fn process_host_with_parens(css: &str) -> String {
         // Split inner by top-level commas
         let inner_selectors = split_by_top_level_comma(inner_content);
 
-        // Process each inner selector
-        let converted: Vec<String> = inner_selectors
-            .iter()
-            .map(|sel| {
-                let trimmed = sel.trim();
-                if trimmed.is_empty() {
-                    return String::new();
-                }
-                // Use POLYFILL_HOST_NO_COMBINATOR + trimmed (with marker stripped) + other
-                let stripped = trimmed.replace(POLYFILL_HOST, "");
-                format!("{}{}{}", POLYFILL_HOST_NO_COMBINATOR, stripped, other_selectors)
-            })
-            .filter(|s| !s.is_empty())
-            .collect();
-
-        let replacement = converted.join(",");
+        let replacement = if inner_selectors.len() > 1 {
+            // Angular v22: a `:host(...)` whose argument is a selector list (top-level
+            // commas) is left untouched as a literal `:host(...)`. The later selector
+            // scoping then prefixes it with the content attribute, e.g.
+            // `:host(.a, .b)` -> `[contenta]:host(.a, .b)`.
+            let restored = inner_content.replace(POLYFILL_HOST, ":host");
+            format!(":host({restored}){other_selectors}")
+        } else {
+            // Single selector: convert to the no-combinator host form.
+            inner_selectors
+                .iter()
+                .map(|sel| {
+                    let trimmed = sel.trim();
+                    if trimmed.is_empty() {
+                        return String::new();
+                    }
+                    let stripped = trimmed.replace(POLYFILL_HOST, "");
+                    format!("{}{}{}", POLYFILL_HOST_NO_COMBINATOR, stripped, other_selectors)
+                })
+                .filter(|s| !s.is_empty())
+                .collect::<Vec<_>>()
+                .join(",")
+        };
         result = format!("{}{}{}", &result[..host_start], replacement, &after_host[other_end..]);
     }
 
@@ -2572,43 +2631,6 @@ fn find_where_or_is(s: &str, start_from: usize) -> Option<PseudoFunctionMatch> {
     None
 }
 
-/// Replace `:host-context` patterns (with or without empty parens) with a replacement string.
-/// Matches `:host-context` or `:host-context()` (with optional whitespace inside parens).
-fn replace_host_context_patterns(s: &str, replacement: &str) -> String {
-    let mut result = String::with_capacity(s.len());
-    let bytes = s.as_bytes();
-    let len = bytes.len();
-    let mut i = 0;
-
-    while i < len {
-        // Check for `:host-context`
-        if i + 13 <= len && &s[i..i + 13] == ":host-context" {
-            let after = i + 13;
-            // Check if followed by `(` with optional whitespace and `)`
-            if after < len && bytes[after] == b'(' {
-                // Skip whitespace inside parens
-                let mut j = after + 1;
-                while j < len && bytes[j].is_ascii_whitespace() {
-                    j += 1;
-                }
-                if j < len && bytes[j] == b')' {
-                    // Found :host-context() - replace entire thing
-                    result.push_str(replacement);
-                    i = j + 1;
-                    continue;
-                }
-            }
-            // Just :host-context without () or with non-empty ()
-            result.push_str(replacement);
-            i = after;
-            continue;
-        }
-        i += push_utf8_char(&mut result, s, i);
-    }
-
-    result
-}
-
 /// Check if a selector is a keyframe selector (from, to, or percentage).
 fn is_keyframe_selector(selector: &str) -> bool {
     let trimmed = selector.trim();
diff --git a/crates/oxc_angular_compiler/src/transform/control_flow.rs b/crates/oxc_angular_compiler/src/transform/control_flow.rs
index 6af05d6eb..ca44ce4dc 100644
--- a/crates/oxc_angular_compiler/src/transform/control_flow.rs
+++ b/crates/oxc_angular_compiler/src/transform/control_flow.rs
@@ -1299,15 +1299,29 @@ fn parse_single_on_trigger<'a>(
 
     match name {
         "idle" => {
-            if params.is_some() {
-                errors.push("'idle' trigger cannot have parameters".to_string());
-                return;
-            }
+            // v22+: `idle` accepts an optional timeout parameter, e.g. `on idle(100)`.
+            let timeout = if let Some(param_str) = params {
+                if param_str.contains(',') {
+                    errors
+                        .push("\"idle\" trigger can only have zero or one parameters".to_string());
+                    return;
+                }
+                match parse_deferred_time(param_str) {
+                    Some(t) => Some(t),
+                    None => {
+                        errors.push("Could not parse time value of trigger \"idle\"".to_string());
+                        return;
+                    }
+                }
+            } else {
+                None
+            };
             if triggers.idle.is_some() {
                 errors.push("Duplicate 'idle' trigger is not allowed".to_string());
                 return;
             }
             triggers.idle = Some(R3IdleDeferredTrigger {
+                timeout,
                 source_span,
                 name_span: Some(trigger_span),
                 prefetch_span,
diff --git a/crates/oxc_angular_compiler/src/transform/html_to_r3.rs b/crates/oxc_angular_compiler/src/transform/html_to_r3.rs
index ec4cd6e76..be6055211 100644
--- a/crates/oxc_angular_compiler/src/transform/html_to_r3.rs
+++ b/crates/oxc_angular_compiler/src/transform/html_to_r3.rs
@@ -308,11 +308,15 @@ impl<'a> HtmlToR3Transform<'a> {
     fn visit_element(&mut self, element: &HtmlElement<'a>) -> Option<R3Node<'a>> {
         let raw_name = element.name.as_str();
 
-        // Check for special elements
-        if raw_name == "script" {
+        // Check for special elements. `<script>`/`<style>` are only treated
+        // specially in the HTML namespace: Angular classifies them by the
+        // lowercased element name, so a namespaced SVG `<style>` (`:svg:style`)
+        // is a normal element, not a stylesheet to extract (v22 conformance).
+        let in_html_namespace = self.current_namespace() == ElementNamespace::Html;
+        if in_html_namespace && raw_name == "script" {
             return None;
         }
-        if raw_name == "style" {
+        if in_html_namespace && raw_name == "style" {
             // Extract style content
             if let Some(content) = self.get_text_content(element) {
                 self.styles.push(content);
@@ -2363,7 +2367,7 @@ impl<'a> HtmlToR3Transform<'a> {
     /// Consecutive cases without bodies are grouped together into a single `SwitchBlockCaseGroup`.
     fn visit_switch_block(&mut self, block: &HtmlBlock<'a>) -> Option<R3Node<'a>> {
         use crate::ast::html::{BlockType, HtmlNode};
-        use crate::ast::r3::{R3SwitchBlockCase, R3SwitchBlockCaseGroup};
+        use crate::ast::r3::{R3SwitchBlockCase, R3SwitchBlockCaseGroup, R3SwitchExhaustiveCheck};
 
         // Validation: @switch must have exactly one parameter.
         // Match Angular's createSwitchBlock: always parse the first parameter when present
@@ -2385,6 +2389,7 @@ impl<'a> HtmlToR3Transform<'a> {
         let mut collected_cases: std::vec::Vec<R3SwitchBlockCase<'a>> = std::vec::Vec::new();
         let mut first_case_start: Option<Span> = None;
         let mut has_default = false;
+        let mut exhaustive_check: Option<R3SwitchExhaustiveCheck<'a>> = None;
 
         for child in &block.children {
             // Skip comments and whitespace-only text nodes (same as Angular)
@@ -2405,6 +2410,37 @@ impl<'a> HtmlToR3Transform<'a> {
                 continue;
             };
 
+            // v22: `@default never;` is an exhaustive check, not a case. Its block
+            // name is the literal "default never". It carries an optional expression
+            // (`@default never(expr);`), no body, and produces no runtime output.
+            if child_block.name.as_str() == "default never" {
+                let check_expression = if child_block.parameters.is_empty() {
+                    None
+                } else {
+                    let expr_str = child_block.parameters[0].expression.as_str();
+                    Some(
+                        self.binding_parser
+                            .parse_binding(expr_str, child_block.parameters[0].span)
+                            .ast,
+                    )
+                };
+                if exhaustive_check.is_some() {
+                    self.report_error(
+                        "@default block with \"never\" parameter must be the last case in a switch",
+                        child_block.span,
+                    );
+                } else {
+                    exhaustive_check = Some(R3SwitchExhaustiveCheck {
+                        expression: check_expression,
+                        source_span: child_block.span,
+                        start_source_span: child_block.start_span,
+                        end_source_span: child_block.end_span,
+                        name_span: child_block.name_span,
+                    });
+                }
+                continue;
+            }
+
             // Validate: only @case and @default are allowed inside @switch
             if child_block.block_type != BlockType::Case
                 && child_block.block_type != BlockType::Default
@@ -2549,6 +2585,7 @@ impl<'a> HtmlToR3Transform<'a> {
             expression,
             groups,
             unknown_blocks,
+            exhaustive_check,
             source_span: block.span,
             start_source_span: block.start_span,
             end_source_span: block.end_span,
@@ -2890,9 +2927,10 @@ impl<'a> HtmlToR3Transform<'a> {
 
         for attr in attrs {
             let raw_name = attr.name.as_str();
-            // Normalize name early (case-insensitive data- prefix stripping)
-            // This must happen before ANY binding syntax checks
-            let name = self.normalize_attribute_name(raw_name);
+            // Angular v22 removed the `data-` prefix normalization: binding syntax
+            // (`bind-`, `on-`, `bindon-`, `ref-`, `let-`, `*`, `@`) is matched against
+            // the raw attribute name, so e.g. `data-ref-a` is a plain text attribute.
+            let name = raw_name;
 
             // Skip i18n-* attributes early - they are metadata for other attributes, not bindings.
             // In Angular's TypeScript compiler, these are filtered out by I18nMetaVisitor before
@@ -3131,18 +3169,10 @@ impl<'a> HtmlToR3Transform<'a> {
 
     /// Normalizes an attribute name by stripping the data- prefix (case-insensitive).
     /// This matches TypeScript's behavior: /^data-/i.test(attrName) ? attrName.substring(5) : attrName
-    fn normalize_attribute_name<'b>(&self, name: &'b str) -> &'b str {
-        // Case-insensitive data- prefix stripping
-        if name.len() > 5 && name[..5].eq_ignore_ascii_case("data-") { &name[5..] } else { name }
-    }
-
-    /// Parses a binding prefix from an attribute name.
-    /// Handles the data- prefix as per Angular's normalization:
-    /// `data-bind-*`, `data-on-*`, `data-ref-*`, `data-let-*`, `data-bindon-*`
+    /// Parses a binding prefix (`bind-`, `let-`, `ref-`, `on-`, `bindon-`) from an
+    /// attribute name. Angular v22 matches these against the raw name; a `data-`
+    /// prefix is no longer stripped, so `data-on-x` is not an event binding.
     fn parse_binding_prefix<'b>(&self, name: &'b str) -> Option<(BindingPrefix, &'b str)> {
-        // Strip data- prefix if present (case-insensitive)
-        let name = self.normalize_attribute_name(name);
-
         for (prefix, kind) in BIND_NAME_PREFIXES {
             if let Some(rest) = name.strip_prefix(prefix) {
                 return Some((*kind, rest));
diff --git a/crates/oxc_angular_compiler/tests/integration_test.rs b/crates/oxc_angular_compiler/tests/integration_test.rs
index 7047820e7..8bfaca032 100644
--- a/crates/oxc_angular_compiler/tests/integration_test.rs
+++ b/crates/oxc_angular_compiler/tests/integration_test.rs
@@ -2038,6 +2038,83 @@ fn test_pipe_in_binary_with_safe_property_read() {
     insta::assert_snapshot!("pipe_in_binary_with_safe_property_read", js);
 }
 
+// ----------------------------------------------------------------------------
+// legacyOptionalChaining (Angular v22+): native `?.` vs legacy `== null ? null`
+// See issue #317 and angular/angular@2896c93cc1.
+// ----------------------------------------------------------------------------
+
+#[test]
+fn test_safe_navigation_modern_interpolation_v22() {
+    // Angular v22+ emits native optional chaining, which yields `undefined`.
+    let js = compile_template_to_js_with_version(
+        r"<div>{{user?.name}}</div>",
+        "TestComponent",
+        Some(AngularVersion::new(22, 0, 0)),
+    );
+    assert!(js.contains("ctx.user?.name"), "expected native optional chaining, got:\n{js}");
+    assert!(!js.contains("== null"), "modern mode must not emit the legacy null ternary:\n{js}");
+}
+
+#[test]
+fn test_safe_navigation_modern_chain_v22() {
+    let js = compile_template_to_js_with_version(
+        r"<div>{{user?.address?.city}}</div>",
+        "TestComponent",
+        Some(AngularVersion::new(22, 0, 0)),
+    );
+    assert!(js.contains("ctx.user?.address?.city"), "expected chained native `?.`, got:\n{js}");
+}
+
+#[test]
+fn test_safe_navigation_modern_mixed_chain_v22() {
+    // Only the safe steps become optional; the plain `.b` stays a normal read.
+    let js = compile_template_to_js_with_version(
+        r"<div>{{a?.b.c?.d}}</div>",
+        "TestComponent",
+        Some(AngularVersion::new(22, 0, 0)),
+    );
+    assert!(js.contains("ctx.a?.b.c?.d"), "expected mixed optional/plain chain, got:\n{js}");
+}
+
+#[test]
+fn test_safe_call_modern_v22() {
+    let js = compile_template_to_js_with_version(
+        r"<div>{{getData?.()}}</div>",
+        "TestComponent",
+        Some(AngularVersion::new(22, 0, 0)),
+    );
+    assert!(js.contains("ctx.getData?.()"), "expected native optional call, got:\n{js}");
+}
+
+#[test]
+fn test_safe_navigation_legacy_on_v21() {
+    // Pre-v22 keeps the legacy `== null ? null` expansion.
+    let js = compile_template_to_js_with_version(
+        r"<div>{{user?.name}}</div>",
+        "TestComponent",
+        Some(AngularVersion::new(21, 0, 0)),
+    );
+    assert!(js.contains("== null"), "v21 must use the legacy null ternary, got:\n{js}");
+    assert!(!js.contains("ctx.user?.name"), "v21 must not emit native optional chaining:\n{js}");
+}
+
+#[test]
+fn test_safe_navigation_migration_forces_legacy_on_v22() {
+    // The `$safeNavigationMigration(...)` magic function opts a subtree back into
+    // legacy null semantics even on a modern (v22) target, and is stripped from
+    // the output.
+    let js = compile_template_to_js_with_version(
+        r"<div>{{ $safeNavigationMigration(user?.name) }}</div>",
+        "TestComponent",
+        Some(AngularVersion::new(22, 0, 0)),
+    );
+    assert!(js.contains("== null"), "wrapped subtree must use the legacy null ternary, got:\n{js}");
+    assert!(
+        !js.contains("$safeNavigationMigration"),
+        "the migration wrapper must be stripped from the output:\n{js}"
+    );
+}
+
 // ============================================================================
 // Event Modifier Tests
 // ============================================================================
@@ -6084,6 +6161,48 @@ export class LoginFormComponent {
     }
 }
 
+/// The control instructions (`ɵɵcontrolCreate()` / `ɵɵcontrol()`) for a
+/// two-way `[(ngModel)]` were added in Angular v22
+/// (`supports_extended_control_properties`); v21 only emitted control
+/// instructions for `[formField]`. Pre-v22 targets must therefore emit only the
+/// `ɵɵtwoWayProperty` for `[(ngModel)]`, while v22+ — and `None`, which assumes
+/// latest — also emit the paired control instructions.
+#[test]
+fn test_ng_model_control_instructions_obey_angular_version_gate() {
+    let template = r#"<input [(ngModel)]="name">"#;
+
+    // Pre-v22: no control instructions, just the two-way property.
+    for version in [
+        AngularVersion::new(19, 0, 0),
+        AngularVersion::new(20, 0, 0),
+        AngularVersion::new(21, 2, 0),
+    ] {
+        let code = compile_template_to_js_with_version(template, "TestComponent", Some(version));
+        assert!(
+            code.contains("ɵɵtwoWayProperty("),
+            "v{version:?}: expected ɵɵtwoWayProperty. Output:\n{code}"
+        );
+        assert!(
+            !code.contains("ɵɵcontrolCreate("),
+            "v{version:?}: must NOT emit ɵɵcontrolCreate (v22+ only). Output:\n{code}"
+        );
+        assert!(
+            !code.contains("ɵɵcontrol("),
+            "v{version:?}: must NOT emit ɵɵcontrol (v22+ only). Output:\n{code}"
+        );
+    }
+
+    // v22+ and `None` (assume latest): emit the paired control instructions.
+    for version in [Some(AngularVersion::new(22, 0, 0)), None] {
+        let code = compile_template_to_js_with_version(template, "TestComponent", version);
+        assert!(
+            code.contains("ɵɵcontrolCreate("),
+            "v{version:?}: expected ɵɵcontrolCreate. Output:\n{code}"
+        );
+        assert!(code.contains("ɵɵcontrol("), "v{version:?}: expected ɵɵcontrol. Output:\n{code}");
+    }
+}
+
 #[test]
 fn test_for_loop_multiple_index_aliases_in_track() {
     // When multiple aliases reference $index (e.g., `let i = $index, j = $index`),
diff --git a/crates/oxc_angular_compiler/tests/shadow_css_test.rs b/crates/oxc_angular_compiler/tests/shadow_css_test.rs
index 73a0af5a8..53b050d47 100644
--- a/crates/oxc_angular_compiler/tests/shadow_css_test.rs
+++ b/crates/oxc_angular_compiler/tests/shadow_css_test.rs
@@ -524,9 +524,10 @@ fn test_not_selector() {
 // ============================================================================
 
 #[test]
-fn test_replace_comments_with_newline() {
+fn test_replace_comments_without_adding_lines() {
+    // Angular v22 removes inline comments without inserting an extra newline.
     let result = shim("/* b {c} */ b {c}", "contenta");
-    assert_eq!(result, "\n b[contenta] {c}");
+    assert_eq!(result, " b[contenta] {c}");
 }
 
 #[test]
@@ -538,7 +539,7 @@ fn test_keep_sourcemapping_url_comments() {
 #[test]
 fn test_handle_adjacent_comments() {
     let result = shim("/* comment 1 */ /* comment 2 */ b {c}", "contenta");
-    assert_eq!(result, "\n \n b[contenta] {c}");
+    assert_eq!(result, "  b[contenta] {c}");
 }
 
 // ============================================================================
diff --git a/crates/oxc_angular_compiler/tests/snapshots/integration_test__for_two_way_binding_with_index.snap b/crates/oxc_angular_compiler/tests/snapshots/integration_test__for_two_way_binding_with_index.snap
index 2db493a4b..cb3434599 100644
--- a/crates/oxc_angular_compiler/tests/snapshots/integration_test__for_two_way_binding_with_index.snap
+++ b/crates/oxc_angular_compiler/tests/snapshots/integration_test__for_two_way_binding_with_index.snap
@@ -14,6 +14,7 @@ function TestComponent_For_1_Template(rf,ctx) {
       return i0.ɵɵresetView($event);
     });
     i0.ɵɵelementEnd();
+    i0.ɵɵcontrolCreate();
     i0.ɵɵtext(2," ");
   }
   if ((rf & 2)) {
@@ -21,6 +22,7 @@ function TestComponent_For_1_Template(rf,ctx) {
     const ctx_r2 = i0.ɵɵnextContext();
     i0.ɵɵadvance();
     i0.ɵɵtwoWayProperty("ngModel",ctx_r2.items[$index_r2].value);
+    i0.ɵɵcontrol();
   }
 }
 function TestComponent_Template(rf,ctx) {
diff --git a/crates/oxc_angular_compiler/tests/snapshots/integration_test__todo_list.snap b/crates/oxc_angular_compiler/tests/snapshots/integration_test__todo_list.snap
index 222653fc6..cdc0a7019 100644
--- a/crates/oxc_angular_compiler/tests/snapshots/integration_test__todo_list.snap
+++ b/crates/oxc_angular_compiler/tests/snapshots/integration_test__todo_list.snap
@@ -16,6 +16,7 @@ function TodoListComponent_For_7_Template(rf,ctx) {
       return i0.ɵɵresetView($event);
     });
     i0.ɵɵelementEnd();
+    i0.ɵɵcontrolCreate();
     i0.ɵɵtext(4,"\n                ");
     i0.ɵɵelementStart(5,"span");
     i0.ɵɵtext(6);
@@ -39,6 +40,7 @@ function TodoListComponent_For_7_Template(rf,ctx) {
     i0.ɵɵclassProp("completed",todo_r2.done);
     i0.ɵɵadvance(2);
     i0.ɵɵtwoWayProperty("ngModel",todo_r2.done);
+    i0.ɵɵcontrol();
     i0.ɵɵadvance(3);
     i0.ɵɵtextInterpolate(todo_r2.text);
   }
@@ -68,6 +70,7 @@ function TodoListComponent_Template(rf,ctx) {
       return ctx.addTodo();
     });
     i0.ɵɵelementEnd();
+    i0.ɵɵcontrolCreate();
     i0.ɵɵtext(5,"\n        ");
     i0.ɵɵrepeaterCreate(6,TodoListComponent_For_7_Template,12,4,null,null,_forTrack0,
         false,TodoListComponent_ForEmpty_8_Template,4,0);
@@ -77,6 +80,7 @@ function TodoListComponent_Template(rf,ctx) {
     i0.ɵɵtextInterpolate(ctx.title);
     i0.ɵɵadvance(2);
     i0.ɵɵtwoWayProperty("ngModel",ctx.newTodo);
+    i0.ɵɵcontrol();
     i0.ɵɵadvance(2);
     i0.ɵɵrepeater(ctx.todos);
   }
diff --git a/crates/oxc_angular_compiler/tests/snapshots/integration_test__two_way_binding.snap b/crates/oxc_angular_compiler/tests/snapshots/integration_test__two_way_binding.snap
index f2b28bc04..14f4c5254 100644
--- a/crates/oxc_angular_compiler/tests/snapshots/integration_test__two_way_binding.snap
+++ b/crates/oxc_angular_compiler/tests/snapshots/integration_test__two_way_binding.snap
@@ -10,6 +10,10 @@ function TestComponent_Template(rf,ctx) {
       return $event;
     });
     i0.ɵɵelementEnd();
+    i0.ɵɵcontrolCreate();
+  }
+  if ((rf & 2)) {
+    i0.ɵɵtwoWayProperty("ngModel",ctx.name);
+    i0.ɵɵcontrol();
   }
-  if ((rf & 2)) { i0.ɵɵtwoWayProperty("ngModel",ctx.name); }
 }
diff --git a/napi/angular-compiler/e2e/compare/package.json b/napi/angular-compiler/e2e/compare/package.json
index 643943483..01aeb602a 100644
--- a/napi/angular-compiler/e2e/compare/package.json
+++ b/napi/angular-compiler/e2e/compare/package.json
@@ -14,14 +14,14 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@angular/cdk": "^21.2.1",
-    "@angular/common": "^21.2.2",
-    "@angular/compiler": "^21.2.2",
-    "@angular/compiler-cli": "^21.2.2",
-    "@angular/core": "^21.2.2",
-    "@angular/forms": "^21.2.2",
-    "@angular/platform-browser": "^21.2.2",
-    "@angular/router": "^21.2.2",
+    "@angular/cdk": "^22.0.0-rc.2",
+    "@angular/common": "^22.0.0-rc.2",
+    "@angular/compiler": "^22.0.0-rc.2",
+    "@angular/compiler-cli": "^22.0.0-rc.2",
+    "@angular/core": "^22.0.0-rc.2",
+    "@angular/forms": "^22.0.0-rc.2",
+    "@angular/platform-browser": "^22.0.0-rc.2",
+    "@angular/router": "^22.0.0-rc.2",
     "diff": "^9.0.0",
     "fast-glob": "^3.3.3",
     "p-limit": "^7.3.0",
diff --git a/napi/angular-compiler/e2e/compare/src/compilers/oxc.ts b/napi/angular-compiler/e2e/compare/src/compilers/oxc.ts
index 0f1332f7f..08a88d304 100644
--- a/napi/angular-compiler/e2e/compare/src/compilers/oxc.ts
+++ b/napi/angular-compiler/e2e/compare/src/compilers/oxc.ts
@@ -1,5 +1,6 @@
 import * as path from 'path'
 
+import { VERSION as ANGULAR_VERSION } from '@angular/compiler'
 import {
   transformAngularFileSync,
   compileClassMetadata,
@@ -14,6 +15,16 @@ import {
 
 import type { CompilerOutput, ProjectCompilationResult } from '../types.js'
 
+// Target the same Angular version the comparison baseline (@angular/compiler)
+// is on, so version-gated emit (e.g. modern vs legacy safe-navigation `?.`,
+// gated at major >= 22) matches. Without this, OXC falls back to its
+// conservative legacy default and diverges from a newer Angular.
+const OXC_ANGULAR_VERSION = {
+  major: Number.parseInt(ANGULAR_VERSION.major, 10) || 0,
+  minor: Number.parseInt(ANGULAR_VERSION.minor, 10) || 0,
+  patch: Number.parseInt(ANGULAR_VERSION.patch, 10) || 0,
+}
+
 // Re-export ResolvedResources type for use in runner
 export type { ResolvedResources } from '@oxc-angular/vite/api'
 
@@ -63,6 +74,8 @@ export function compileWithOxcFullFileRaw(
     jit: false,
     hmr: false,
     advancedOptimizations: false,
+    // Match the installed @angular/compiler so version-gated emit aligns.
+    angularVersion: OXC_ANGULAR_VERSION,
     // Enable cross-file analysis for barrel export tracing
     crossFileElision: true,
     baseDir: path.dirname(filePath),
diff --git a/napi/angular-compiler/index.d.ts b/napi/angular-compiler/index.d.ts
index 5e13671d3..97a18ff1f 100644
--- a/napi/angular-compiler/index.d.ts
+++ b/napi/angular-compiler/index.d.ts
@@ -768,6 +768,17 @@ export interface TransformOptions {
    * When not set, assumes latest Angular version (v19+ behavior).
    */
   angularVersion?: AngularVersion
+  /**
+   * Override for the `legacyOptionalChaining` Angular compiler option
+   * (`angularCompilerOptions.legacyOptionalChaining` in `tsconfig.json`).
+   *
+   * Controls the safe-navigation operator (`?.`) in template expressions.
+   * When `true`, always emits the legacy `== null ? null` form; when `false`,
+   * emits native optional chaining (yielding `undefined`). When unset, the
+   * default is derived from `angularVersion` (legacy for < v22, modern for
+   * >= v22, legacy when the version is unknown).
+   */
+  legacyOptionalChaining?: boolean
   /** The CSS selector that identifies this component in a template. */
   selector?: string
   /**
diff --git a/napi/angular-compiler/package.json b/napi/angular-compiler/package.json
index 2458a82ee..d9a6b06de 100644
--- a/napi/angular-compiler/package.json
+++ b/napi/angular-compiler/package.json
@@ -68,8 +68,8 @@
     "obug": "^2.1.1"
   },
   "devDependencies": {
-    "@angular/compiler": "^21.2.2",
-    "@angular/compiler-cli": "^21.2.2",
+    "@angular/compiler": "^22.0.0-rc.2",
+    "@angular/compiler-cli": "^22.0.0-rc.2",
     "@napi-rs/cli": "catalog:",
     "@oxc-node/cli": "catalog:",
     "@playwright/test": "^1.58.0",
diff --git a/napi/angular-compiler/src/lib.rs b/napi/angular-compiler/src/lib.rs
index eb06ffa8c..e658a9e2c 100644
--- a/napi/angular-compiler/src/lib.rs
+++ b/napi/angular-compiler/src/lib.rs
@@ -138,6 +138,16 @@ pub struct TransformOptions {
     /// When not set, assumes latest Angular version (v19+ behavior).
     pub angular_version: Option<AngularVersion>,
 
+    /// Override for the `legacyOptionalChaining` Angular compiler option
+    /// (`angularCompilerOptions.legacyOptionalChaining` in `tsconfig.json`).
+    ///
+    /// Controls the safe-navigation operator (`?.`) in template expressions.
+    /// When `true`, always emits the legacy `== null ? null` form; when `false`,
+    /// emits native optional chaining (yielding `undefined`). When unset, the
+    /// default is derived from `angularVersion` (legacy for < v22, modern for
+    /// >= v22, legacy when the version is unknown).
+    pub legacy_optional_chaining: Option<bool>,
+
     // Component metadata fields for full compilation testing
     // These mirror Angular's @Component decorator options.
     /// The CSS selector that identifies this component in a template.
@@ -229,6 +239,7 @@ impl From<TransformOptions> for RustTransformOptions {
             advanced_optimizations: options.advanced_optimizations.unwrap_or(false),
             i18n_use_external_ids: options.i18n_use_external_ids.unwrap_or(true),
             angular_version: options.angular_version.map(Into::into),
+            legacy_optional_chaining: options.legacy_optional_chaining,
             // Component metadata overrides
             selector: options.selector,
             standalone: options.standalone,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c5fb0bd1e..82a647d4a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -67,11 +67,11 @@ importers:
         version: 2.1.1
     devDependencies:
       '@angular/compiler':
-        specifier: ^21.2.2
-        version: 21.2.15
+        specifier: ^22.0.0-rc.2
+        version: 22.0.0-rc.2
       '@angular/compiler-cli':
-        specifier: ^21.2.2
-        version: 21.2.15(@angular/compiler@21.2.15)(typescript@6.0.3)
+        specifier: ^22.0.0-rc.2
+        version: 22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(typescript@6.0.3)
       '@napi-rs/cli':
         specifier: 'catalog:'
         version: 3.7.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@24.1.0)(node-addon-api@7.1.1)
@@ -340,29 +340,29 @@ importers:
   napi/angular-compiler/e2e/compare:
     dependencies:
       '@angular/cdk':
-        specifier: ^21.2.1
-        version: 21.2.13(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.15(@angular/animations@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
+        specifier: ^22.0.0-rc.2
+        version: 22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
       '@angular/common':
-        specifier: ^21.2.2
-        version: 21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+        specifier: ^22.0.0-rc.2
+        version: 22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
       '@angular/compiler':
-        specifier: ^21.2.2
-        version: 21.2.15
+        specifier: ^22.0.0-rc.2
+        version: 22.0.0-rc.2
       '@angular/compiler-cli':
-        specifier: ^21.2.2
-        version: 21.2.15(@angular/compiler@21.2.15)(typescript@6.0.3)
+        specifier: ^22.0.0-rc.2
+        version: 22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(typescript@6.0.3)
       '@angular/core':
-        specifier: ^21.2.2
-        version: 21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)
+        specifier: ^22.0.0-rc.2
+        version: 22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)
       '@angular/forms':
-        specifier: ^21.2.2
-        version: 21.2.15(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.15(@angular/animations@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
+        specifier: ^22.0.0-rc.2
+        version: 22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
       '@angular/platform-browser':
-        specifier: ^21.2.2
-        version: 21.2.15(@angular/animations@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))
+        specifier: ^22.0.0-rc.2
+        version: 22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))
       '@angular/router':
-        specifier: ^21.2.2
-        version: 21.2.15(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.15(@angular/animations@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
+        specifier: ^22.0.0-rc.2
+        version: 22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
       diff:
         specifier: ^9.0.0
         version: 9.0.0
@@ -539,6 +539,14 @@ packages:
       '@angular/platform-browser': ^21.0.0 || ^22.0.0
       rxjs: ^6.5.3 || ^7.4.0
 
+  '@angular/cdk@22.0.0-rc.2':
+    resolution: {integrity: sha512-KiQInxX5WrPgsNjqqaD3/voRXNNsp0cuvH8VZerIeRUrOxsuqsyU8bUk6q6GWobL4LDj7afiqjDTEdwnq9KVww==}
+    peerDependencies:
+      '@angular/common': ^22.0.0-0 || ^22.1.0-0 || ^22.2.0-0 || ^22.3.0-0 || ^23.0.0-0
+      '@angular/core': ^22.0.0-0 || ^22.1.0-0 || ^22.2.0-0 || ^22.3.0-0 || ^23.0.0-0
+      '@angular/platform-browser': ^22.0.0-0 || ^22.1.0-0 || ^22.2.0-0 || ^22.3.0-0 || ^23.0.0-0
+      rxjs: ^6.5.3 || ^7.4.0
+
   '@angular/common@21.2.15':
     resolution: {integrity: sha512-PHbICQe4YCXnax2FcmKUpiffs8XPW9A0KlZF35qgJoQyBMBZx5F8c8geCh25jxtq77n3eBTmOa/WIAdSqiitkQ==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
@@ -546,6 +554,13 @@ packages:
       '@angular/core': 21.2.15
       rxjs: ^6.5.3 || ^7.4.0
 
+  '@angular/common@22.0.0-rc.2':
+    resolution: {integrity: sha512-RRLQPS19whiCATcKZPegAxgncwKDezwKqr5Jsgdv5jD44VqzsCB7FsUWZk9sUsdF3NmzK0FUjlvqAn8PnzYzlg==}
+    engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
+    peerDependencies:
+      '@angular/core': 22.0.0-rc.2
+      rxjs: ^6.5.3 || ^7.4.0
+
   '@angular/compiler-cli@21.2.15':
     resolution: {integrity: sha512-/MU7OA9d/e9P5SthR+N6JJObBmzcGsgNQaeQ2YfSUnU0lCRVQweTWwxLFDbfU6UX8MZFWB6pdI57zod8r5kXUw==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
@@ -557,10 +572,25 @@ packages:
       typescript:
         optional: true
 
+  '@angular/compiler-cli@22.0.0-rc.2':
+    resolution: {integrity: sha512-GeFujbuSgUsCGjshs2BQN+C85vNVkaFkpWDhRqGHmtSZlDis4/C8aQTw08mpDMx+0N4hvJiiF3zvzs4fjn3AqQ==}
+    engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
+    hasBin: true
+    peerDependencies:
+      '@angular/compiler': 22.0.0-rc.2
+      typescript: '>=6.0 <6.1'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
   '@angular/compiler@21.2.15':
     resolution: {integrity: sha512-nwpNb+NbVUNzR3cck0QXbU/oFK7BpmXOXVnN/w7+P4+TsFUYeTtO1Ojbc15jkqe6mSM0lBvGlcoztVblHQkqcw==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
 
+  '@angular/compiler@22.0.0-rc.2':
+    resolution: {integrity: sha512-URPbTubtOPtx5nSUbb5gG2JNeJabLglsxa4iyBENdTLwI2OTmRmxSBlU5mF9xwevOYsJpbr7pWnSpwttT+Jovg==}
+    engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
+
   '@angular/core@21.2.15':
     resolution: {integrity: sha512-J5JsUnNtQURdeA7EA3DoCsMBizW3l01gfqM326Al72Ou3woFWmRb5P3LOXpIOzAeMQhO6Z5tW+B1t+4qmoq7uw==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
@@ -574,6 +604,19 @@ packages:
       zone.js:
         optional: true
 
+  '@angular/core@22.0.0-rc.2':
+    resolution: {integrity: sha512-6d97Dgh3G6/ZwwEzY6hkl8VsAodRrOvmOtqOnbGBMEG0eCo0uQDcu8oMKm+DdaSmy2+PEXSmdkIARj5Ux1SNFg==}
+    engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
+    peerDependencies:
+      '@angular/compiler': 22.0.0-rc.2
+      rxjs: ^6.5.3 || ^7.4.0
+      zone.js: ~0.15.0 || ~0.16.0
+    peerDependenciesMeta:
+      '@angular/compiler':
+        optional: true
+      zone.js:
+        optional: true
+
   '@angular/forms@21.2.15':
     resolution: {integrity: sha512-swGUHgbBrPNvODPR9qBP6+vT2EHiyW361iEgS3HpTmvDhF/kD4l8NE0vh3P5N0DnEtGh4umOCKfQ1w6hPJ7lqA==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
@@ -583,6 +626,15 @@ packages:
       '@angular/platform-browser': 21.2.15
       rxjs: ^6.5.3 || ^7.4.0
 
+  '@angular/forms@22.0.0-rc.2':
+    resolution: {integrity: sha512-eOHVPpmjcoCbIdIonhjH2JH6vv8oFyxTlO4Enf2pAdzjYzFTCfrR+w6zBG8El4SF0G7OVSaJfsqjpNipBqqfag==}
+    engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
+    peerDependencies:
+      '@angular/common': 22.0.0-rc.2
+      '@angular/core': 22.0.0-rc.2
+      '@angular/platform-browser': 22.0.0-rc.2
+      rxjs: ^6.5.3 || ^7.4.0
+
   '@angular/material@21.2.13':
     resolution: {integrity: sha512-6gWFb9LNh4cRIvkdocktej6MUVuGa9HQvap+j9gbZOtiveD7ER+FByUPlLlypreRebF29G2MRZeshKSdmv4NbA==}
     peerDependencies:
@@ -613,6 +665,17 @@ packages:
       '@angular/animations':
         optional: true
 
+  '@angular/platform-browser@22.0.0-rc.2':
+    resolution: {integrity: sha512-Y6wrhH7n+b8Jjpfi8KhJlrZZ/o6mPY6VymNtNoB07K5EAPe2omqi7F+gJdoNwgJ2czDgB/L1oLzHwoXSjWheuw==}
+    engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
+    peerDependencies:
+      '@angular/animations': 22.0.0-rc.2
+      '@angular/common': 22.0.0-rc.2
+      '@angular/core': 22.0.0-rc.2
+    peerDependenciesMeta:
+      '@angular/animations':
+        optional: true
+
   '@angular/router@21.2.15':
     resolution: {integrity: sha512-Cej4hYkmaTB6wXn1xQPlr4O1wHgUD0WLv//Oue1IssKqL8vkzic5f5x/H/bxtxxGlSnc+i6uIUF/lvjdGoWk/A==}
     engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
@@ -622,6 +685,15 @@ packages:
       '@angular/platform-browser': 21.2.15
       rxjs: ^6.5.3 || ^7.4.0
 
+  '@angular/router@22.0.0-rc.2':
+    resolution: {integrity: sha512-vdMST+ZUOYjKcEnYIalx8QnVbICriBFp8j9e50mm1DM5kA2Ewdx3oiHanP0yI2826uNjwoVn5nwxDfRCPciJsQ==}
+    engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0}
+    peerDependencies:
+      '@angular/common': 22.0.0-rc.2
+      '@angular/core': 22.0.0-rc.2
+      '@angular/platform-browser': 22.0.0-rc.2
+      rxjs: ^6.5.3 || ^7.4.0
+
   '@babel/code-frame@7.29.7':
     resolution: {integrity: sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==}
     engines: {node: '>=6.9.0'}
@@ -4869,6 +4941,9 @@ packages:
     resolution: {integrity: sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw==}
     engines: {node: '>=18'}
 
+  zod@4.4.3:
+    resolution: {integrity: sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==}
+
   zone.js@0.16.2:
     resolution: {integrity: sha512-Eky7p2Z1Ig3NnbfodSPoARCjKBSTFMnE/ACsP1L/XJEfY4SdOFce19BsUCWVwL6K5ABZFy5J3bjcMWffX+YM3Q==}
 
@@ -4966,12 +5041,27 @@ snapshots:
       rxjs: 7.8.2
       tslib: 2.8.1
 
+  '@angular/cdk@22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)':
+    dependencies:
+      '@angular/common': 22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/platform-browser': 22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))
+      parse5: 8.0.1
+      rxjs: 7.8.2
+      tslib: 2.8.1
+
   '@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)':
     dependencies:
       '@angular/core': 21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)
       rxjs: 7.8.2
       tslib: 2.8.1
 
+  '@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)':
+    dependencies:
+      '@angular/core': 22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)
+      rxjs: 7.8.2
+      tslib: 2.8.1
+
   '@angular/compiler-cli@21.2.15(@angular/compiler@21.2.15)(typescript@6.0.3)':
     dependencies:
       '@angular/compiler': 21.2.15
@@ -4988,10 +5078,30 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@angular/compiler-cli@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(typescript@6.0.3)':
+    dependencies:
+      '@angular/compiler': 22.0.0-rc.2
+      '@babel/core': 7.29.0
+      '@jridgewell/sourcemap-codec': 1.5.5
+      chokidar: 5.0.0
+      convert-source-map: 1.9.0
+      reflect-metadata: 0.2.2
+      semver: 7.8.1
+      tslib: 2.8.1
+      yargs: 18.0.0
+    optionalDependencies:
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@angular/compiler@21.2.15':
     dependencies:
       tslib: 2.8.1
 
+  '@angular/compiler@22.0.0-rc.2':
+    dependencies:
+      tslib: 2.8.1
+
   '@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)':
     dependencies:
       rxjs: 7.8.2
@@ -5000,6 +5110,14 @@ snapshots:
       '@angular/compiler': 21.2.15
       zone.js: 0.16.2
 
+  '@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)':
+    dependencies:
+      rxjs: 7.8.2
+      tslib: 2.8.1
+    optionalDependencies:
+      '@angular/compiler': 22.0.0-rc.2
+      zone.js: 0.16.2
+
   '@angular/forms@21.2.15(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.15(@angular/animations@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)':
     dependencies:
       '@angular/common': 21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
@@ -5009,6 +5127,16 @@ snapshots:
       rxjs: 7.8.2
       tslib: 2.8.1
 
+  '@angular/forms@22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)':
+    dependencies:
+      '@angular/common': 22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/platform-browser': 22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))
+      '@standard-schema/spec': 1.1.0
+      rxjs: 7.8.2
+      tslib: 2.8.1
+      zod: 4.4.3
+
   '@angular/material@21.2.13(43e6423eb9d255a637c08fd0c9ec3bba)':
     dependencies:
       '@angular/cdk': 21.2.13(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.15(@angular/animations@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)
@@ -5035,6 +5163,12 @@ snapshots:
     optionalDependencies:
       '@angular/animations': 21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))
 
+  '@angular/platform-browser@22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))':
+    dependencies:
+      '@angular/common': 22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)
+      tslib: 2.8.1
+
   '@angular/router@21.2.15(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@21.2.15(@angular/animations@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(@angular/common@21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)':
     dependencies:
       '@angular/common': 21.2.15(@angular/core@21.2.15(@angular/compiler@21.2.15)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
@@ -5043,6 +5177,14 @@ snapshots:
       rxjs: 7.8.2
       tslib: 2.8.1
 
+  '@angular/router@22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(@angular/platform-browser@22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)))(rxjs@7.8.2)':
+    dependencies:
+      '@angular/common': 22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2)
+      '@angular/core': 22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2)
+      '@angular/platform-browser': 22.0.0-rc.2(@angular/common@22.0.0-rc.2(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))(rxjs@7.8.2))(@angular/core@22.0.0-rc.2(@angular/compiler@22.0.0-rc.2)(rxjs@7.8.2)(zone.js@0.16.2))
+      rxjs: 7.8.2
+      tslib: 2.8.1
+
   '@babel/code-frame@7.29.7':
     dependencies:
       '@babel/helper-validator-identifier': 7.29.7
@@ -8631,4 +8773,6 @@ snapshots:
 
   yoctocolors-cjs@2.1.3: {}
 
+  zod@4.4.3: {}
+
   zone.js@0.16.2: {}