more

Author: Brooooooklyn

crates/oxc_angular_compiler/src/pipeline/phases/naming.rs

@@ -601,11 +601,32 @@ fn process_create_ops_with_child_recursion<'a>(
             }
         } // Borrow of job ends here
 
-        // Process track_by_ops IMMEDIATELY after the create op, BEFORE child view recursion.
-        // This matches Angular's ops() generator which yields track_by_ops inline with the
-        // RepeaterCreate op. The switch statement in naming.ts processes the RepeaterCreate,
-        // then the generator yields track_by_ops (processed as Variable ops), and only then
-        // does the iteration continue to child views.
+        // Recurse into any child views at this index BEFORE processing track_by_ops.
+        // This matches TypeScript's naming.ts behavior:
+        // 1. ops() yields RepeaterCreate
+        // 2. switch case handles RepeaterCreate → IMMEDIATELY recurses into child views
+        // 3. switch case ends, control returns to for loop
+        // 4. ops() yields track_by_ops (which are processed in subsequent for iterations)
+        //
+        // So the order is: recurse into children FIRST, then name track_by_ops variables.
+        if let Some(children) = child_views_by_index.remove(&index) {
+            for (child_xref, child_base_name) in children {
+                add_names_to_child_view(
+                    job,
+                    child_xref,
+                    &child_base_name,
+                    allocator,
+                    state,
+                    var_names,
+                    semantic_var_names,
+                );
+            }
+        }
+
+        // Process track_by_ops AFTER child view recursion.
+        // In TypeScript, the ops() generator yields track_by_ops after the RepeaterCreate,
+        // and the switch statement has already recursed into child views during the
+        // RepeaterCreate case. So track_by_ops are named AFTER all child view variables.
         if is_repeater_with_track_by {
             let create_ops = match view_xref {
                 None => &mut job.root.create,
@@ -634,22 +655,6 @@ fn process_create_ops_with_child_recursion<'a>(
                 }
             }
         }
-
-        // After processing the create op and its track_by_ops, recurse into any child views
-        // at this index. This is the key to depth-first processing!
-        if let Some(children) = child_views_by_index.remove(&index) {
-            for (child_xref, child_base_name) in children {
-                add_names_to_child_view(
-                    job,
-                    child_xref,
-                    &child_base_name,
-                    allocator,
-                    state,
-                    var_names,
-                    semantic_var_names,
-                );
-            }
-        }
     }
 }