pass more tests

Author: Brooooooklyn

crates/oxc_angular_compiler/src/ast/html.rs

@@ -8,6 +8,34 @@ use oxc_span::{Atom, Span};
 
 use super::expression::AngularExpression;
 
+// ============================================================================
+// Token Types (ported from Angular's ml_parser/tokens.ts)
+// ============================================================================
+
+/// Token types for text and attribute value tokens.
+/// These are used to preserve the original token structure for transforms.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum InterpolatedTokenType {
+    /// Plain text: parts = [text]
+    Text,
+    /// Interpolation: parts = [startMarker, expression, endMarker]
+    Interpolation,
+    /// Encoded entity: parts = [decoded, encoded]
+    EncodedEntity,
+}
+
+/// A token within interpolated text or attribute values.
+/// Preserves the original lexer tokens for transforms like whitespace removal.
+#[derive(Debug)]
+pub struct InterpolatedToken<'a> {
+    /// The token type.
+    pub token_type: InterpolatedTokenType,
+    /// The token parts (structure depends on token type).
+    pub parts: Vec<'a, Atom<'a>>,
+    /// The source span.
+    pub span: Span,
+}
+
 /// An HTML AST node.
 #[derive(Debug)]
 pub enum HtmlNode<'a> {
@@ -34,10 +62,16 @@ pub enum HtmlNode<'a> {
 /// A text node in the HTML AST.
 #[derive(Debug)]
 pub struct HtmlText<'a> {
-    /// The text value.
+    /// The decoded text value (entities resolved, interpolations joined).
     pub value: Atom<'a>,
-    /// The source span.
+    /// The source span (after stripping leading trivia).
     pub span: Span,
+    /// The full start offset before stripping leading trivia (for source maps).
+    /// If None, there was no leading trivia stripped.
+    pub full_start: Option<u32>,
+    /// The original tokens (text, interpolation, encoded entity).
+    /// Used by transforms like whitespace removal.
+    pub tokens: Vec<'a, InterpolatedToken<'a>>,
 }
 
 /// An element node in the HTML AST.
@@ -83,14 +117,17 @@ pub struct HtmlDirective<'a> {
 pub struct HtmlAttribute<'a> {
     /// The attribute name.
     pub name: Atom<'a>,
-    /// The attribute value (may be empty).
+    /// The decoded attribute value (entities resolved, interpolations joined).
     pub value: Atom<'a>,
     /// The source span.
     pub span: Span,
     /// The name span.
     pub name_span: Span,
     /// The value span (if value exists).
     pub value_span: Option<Span>,
+    /// The original value tokens (text, interpolation, encoded entity).
+    /// Used by transforms. None for valueless attributes.
+    pub value_tokens: Option<Vec<'a, InterpolatedToken<'a>>>,
 }
 
 /// A comment node in the HTML AST.
@@ -438,7 +475,12 @@ mod tests {
     fn test_traverse_all() {
         let allocator = Allocator::default();
 
-        let text = HtmlText { value: Atom::from("Hello"), span: Span::default() };
+        let text = HtmlText {
+            value: Atom::from("Hello"),
+            span: Span::default(),
+            full_start: None,
+            tokens: Vec::new_in(&allocator),
+        };
 
         let mut nodes = Vec::new_in(&allocator);
         nodes.push(HtmlNode::Text(Box::new_in(text, &allocator)));

crates/oxc_angular_compiler/src/i18n/parser.rs

@@ -467,7 +467,7 @@ fn extract_placeholder_name(expression: &str) -> Option<String> {
 mod tests {
     use super::*;
     use crate::ast::html::HtmlText;
-    use oxc_allocator::{Allocator, Box};
+    use oxc_allocator::{Allocator, Box, Vec as AllocVec};
     use oxc_span::Atom;
 
     #[test]
@@ -489,7 +489,12 @@ mod tests {
         let allocator = Allocator::default();
         let factory = create_i18n_message_factory(false, false);
 
-        let text = HtmlText { value: Atom::from("Hello {{name}}!"), span: Span::default() };
+        let text = HtmlText {
+            value: Atom::from("Hello {{name}}!"),
+            span: Span::default(),
+            full_start: None,
+            tokens: AllocVec::new_in(&allocator),
+        };
 
         let nodes = vec![HtmlNode::Text(Box::new_in(text, &allocator))];
         let message = factory.create_message(&nodes, None, None, None, None);
@@ -514,7 +519,12 @@ mod tests {
         let allocator = Allocator::default();
         let factory = create_i18n_message_factory(false, false);
 
-        let text = HtmlText { value: Atom::from("Hello World"), span: Span::default() };
+        let text = HtmlText {
+            value: Atom::from("Hello World"),
+            span: Span::default(),
+            full_start: None,
+            tokens: AllocVec::new_in(&allocator),
+        };
 
         let nodes = vec![HtmlNode::Text(Box::new_in(text, &allocator))];
         let message = factory.create_message(&nodes, None, None, None, None);
@@ -529,7 +539,12 @@ mod tests {
         let allocator = Allocator::default();
         let factory = create_i18n_message_factory(false, false);
 
-        let text = HtmlText { value: Atom::from("{{greeting}} {{name}}!"), span: Span::default() };
+        let text = HtmlText {
+            value: Atom::from("{{greeting}} {{name}}!"),
+            span: Span::default(),
+            full_start: None,
+            tokens: AllocVec::new_in(&allocator),
+        };
 
         let nodes = vec![HtmlNode::Text(Box::new_in(text, &allocator))];
         let message = factory.create_message(&nodes, None, None, None, None);