save

Author: Brooooooklyn

crates/oxc_angular_compiler/src/ast/expression.rs

@@ -797,3 +797,68 @@ pub enum BindingType {
     /// An animation binding.
     Animation,
 }
+
+// ============================================================================
+// Parsed properties and events (for host bindings)
+// ============================================================================
+
+/// A parsed property binding from a component or directive.
+///
+/// This is used for host bindings in `@HostBinding()` decorators.
+/// Ported from Angular's `expression_parser/ast.ts` ParsedProperty.
+#[derive(Debug)]
+pub struct ParsedProperty<'a> {
+    /// The property name.
+    pub name: Atom<'a>,
+    /// The binding expression.
+    pub expression: ASTWithSource<'a>,
+    /// The type of property binding.
+    pub property_type: ParsedPropertyType,
+    /// The source span of the binding.
+    pub source_span: oxc_span::Span,
+    /// The span of the property name.
+    pub key_span: oxc_span::Span,
+    /// The span of the value expression (if present).
+    pub value_span: Option<oxc_span::Span>,
+}
+
+impl<'a> ParsedProperty<'a> {
+    /// Returns true if this is a literal attribute binding.
+    pub fn is_literal(&self) -> bool {
+        self.property_type == ParsedPropertyType::LiteralAttr
+    }
+
+    /// Returns true if this is a legacy animation binding.
+    pub fn is_legacy_animation(&self) -> bool {
+        self.property_type == ParsedPropertyType::LegacyAnimation
+    }
+
+    /// Returns true if this is an animation binding.
+    pub fn is_animation(&self) -> bool {
+        self.property_type == ParsedPropertyType::Animation
+    }
+}
+
+/// A parsed event binding from a component or directive.
+///
+/// This is used for host listeners in `@HostListener()` decorators.
+/// Ported from Angular's `expression_parser/ast.ts` ParsedEvent.
+#[derive(Debug)]
+pub struct ParsedEvent<'a> {
+    /// The event name.
+    pub name: Atom<'a>,
+    /// The event target or animation phase.
+    /// For regular events: "window", "document", "body", or None.
+    /// For legacy animation events: the animation phase.
+    pub target_or_phase: Option<Atom<'a>>,
+    /// The type of event binding.
+    pub event_type: ParsedEventType,
+    /// The handler expression.
+    pub handler: ASTWithSource<'a>,
+    /// The source span of the binding.
+    pub source_span: oxc_span::Span,
+    /// The span of the handler expression.
+    pub handler_span: oxc_span::Span,
+    /// The span of the event name.
+    pub key_span: oxc_span::Span,
+}

crates/oxc_angular_compiler/src/ast/r3.rs

@@ -5,11 +5,159 @@
 //!
 //! Ported from Angular's `render3/r3_ast.ts`.
 
-use oxc_allocator::{Box, Vec};
+use oxc_allocator::{Box, HashMap, Vec};
 use oxc_span::{Atom, Span};
-use rustc_hash::FxHashMap;
 
 use crate::ast::expression::{ASTWithSource, AngularExpression, BindingType, ParsedEventType};
+use crate::i18n::ast::IcuType;
+
+// ============================================================================
+// i18n Metadata
+// ============================================================================
+
+/// i18n metadata attached to R3 nodes.
+#[derive(Debug)]
+pub enum I18nMeta<'a> {
+    /// Root of an i18n message.
+    Message(I18nMessage<'a>),
+    /// Part of a containing message.
+    Node(I18nNode<'a>),
+}
+
+/// An i18n message containing translatable content.
+#[derive(Debug)]
+pub struct I18nMessage<'a> {
+    /// Message AST nodes.
+    pub nodes: Vec<'a, I18nNode<'a>>,
+    /// The meaning of the message (for disambiguation).
+    pub meaning: Atom<'a>,
+    /// Description of the message for translators.
+    pub description: Atom<'a>,
+    /// Custom ID specified by the developer.
+    pub custom_id: Atom<'a>,
+    /// The computed message ID.
+    pub id: Atom<'a>,
+    /// Legacy IDs for backwards compatibility.
+    pub legacy_ids: Vec<'a, Atom<'a>>,
+}
+
+/// i18n AST node.
+#[derive(Debug)]
+pub enum I18nNode<'a> {
+    /// Plain text content.
+    Text(I18nText<'a>),
+    /// Container for child nodes.
+    Container(I18nContainer<'a>),
+    /// ICU expression (plural, select, selectordinal).
+    Icu(I18nIcu<'a>),
+    /// HTML tag placeholder.
+    TagPlaceholder(I18nTagPlaceholder<'a>),
+    /// Expression placeholder.
+    Placeholder(I18nPlaceholder<'a>),
+    /// ICU placeholder (nested ICU reference).
+    IcuPlaceholder(I18nIcuPlaceholder<'a>),
+    /// Control flow block placeholder.
+    BlockPlaceholder(I18nBlockPlaceholder<'a>),
+}
+
+/// Plain text content.
+#[derive(Debug)]
+pub struct I18nText<'a> {
+    /// The text value.
+    pub value: Atom<'a>,
+    /// Source span.
+    pub source_span: Span,
+}
+
+/// Container for child nodes.
+#[derive(Debug)]
+pub struct I18nContainer<'a> {
+    /// Child nodes.
+    pub children: Vec<'a, I18nNode<'a>>,
+    /// Source span.
+    pub source_span: Span,
+}
+
+/// ICU expression (plural, select, selectordinal).
+#[derive(Debug)]
+pub struct I18nIcu<'a> {
+    /// The expression being evaluated.
+    pub expression: Atom<'a>,
+    /// ICU type (plural, select, selectordinal).
+    pub icu_type: IcuType,
+    /// Case branches.
+    pub cases: HashMap<'a, Atom<'a>, I18nNode<'a>>,
+    /// Source span.
+    pub source_span: Span,
+    /// Expression placeholder name (for message serialization).
+    pub expression_placeholder: Option<Atom<'a>>,
+}
+
+/// HTML tag placeholder.
+#[derive(Debug)]
+pub struct I18nTagPlaceholder<'a> {
+    /// Tag name.
+    pub tag: Atom<'a>,
+    /// Tag attributes.
+    pub attrs: HashMap<'a, Atom<'a>, Atom<'a>>,
+    /// Start tag placeholder name.
+    pub start_name: Atom<'a>,
+    /// Close tag placeholder name.
+    pub close_name: Atom<'a>,
+    /// Child nodes.
+    pub children: Vec<'a, I18nNode<'a>>,
+    /// Whether this is a void element.
+    pub is_void: bool,
+    /// Source span (overall).
+    pub source_span: Span,
+    /// Start tag source span.
+    pub start_source_span: Option<Span>,
+    /// End tag source span.
+    pub end_source_span: Option<Span>,
+}
+
+/// Expression placeholder.
+#[derive(Debug)]
+pub struct I18nPlaceholder<'a> {
+    /// The expression value.
+    pub value: Atom<'a>,
+    /// Placeholder name.
+    pub name: Atom<'a>,
+    /// Source span.
+    pub source_span: Span,
+}
+
+/// ICU placeholder (reference to a nested ICU).
+#[derive(Debug)]
+pub struct I18nIcuPlaceholder<'a> {
+    /// The ICU expression.
+    pub value: Box<'a, I18nIcu<'a>>,
+    /// Placeholder name.
+    pub name: Atom<'a>,
+    /// Source span.
+    pub source_span: Span,
+}
+
+/// Control flow block placeholder.
+#[derive(Debug)]
+pub struct I18nBlockPlaceholder<'a> {
+    /// Block name.
+    pub name: Atom<'a>,
+    /// Block parameters.
+    pub parameters: Vec<'a, Atom<'a>>,
+    /// Start block placeholder name.
+    pub start_name: Atom<'a>,
+    /// End block placeholder name.
+    pub close_name: Atom<'a>,
+    /// Child nodes.
+    pub children: Vec<'a, I18nNode<'a>>,
+    /// Source span (overall).
+    pub source_span: Span,
+    /// Start block source span.
+    pub start_source_span: Option<Span>,
+    /// End block source span.
+    pub end_source_span: Option<Span>,
+}
 
 // ============================================================================
 // Core Node Enum
@@ -873,9 +1021,9 @@ pub struct R3Directive<'a> {
 #[derive(Debug)]
 pub struct R3Icu<'a> {
     /// Variable expressions.
-    pub vars: FxHashMap<Atom<'a>, R3BoundText<'a>>,
+    pub vars: HashMap<'a, Atom<'a>, R3BoundText<'a>>,
     /// Placeholder expressions.
-    pub placeholders: FxHashMap<Atom<'a>, R3IcuPlaceholder<'a>>,
+    pub placeholders: HashMap<'a, Atom<'a>, R3IcuPlaceholder<'a>>,
     /// Source span.
     pub source_span: Span,
     /// i18n metadata.
@@ -891,25 +1039,6 @@ pub enum R3IcuPlaceholder<'a> {
     BoundText(R3BoundText<'a>),
 }
 
-// ============================================================================
-// i18n
-// ============================================================================
-
-/// i18n metadata for internationalization.
-#[derive(Debug)]
-pub struct I18nMeta<'a> {
-    /// Message ID.
-    pub id: Option<Atom<'a>>,
-    /// Custom ID.
-    pub custom_id: Option<Atom<'a>>,
-    /// Legacy ID list.
-    pub legacy_ids: Vec<'a, Atom<'a>>,
-    /// Description.
-    pub description: Option<Atom<'a>>,
-    /// Meaning.
-    pub meaning: Option<Atom<'a>>,
-}
-
 // ============================================================================
 // Visitor
 // ============================================================================

crates/oxc_angular_compiler/src/i18n/ast.rs

@@ -266,7 +266,7 @@ pub struct TagPlaceholder {
 
 impl TagPlaceholder {
     /// Creates a new tag placeholder.
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     pub fn new(
         tag: String,
         attrs: FxHashMap<String, String>,
@@ -353,7 +353,7 @@ pub struct BlockPlaceholder {
 
 impl BlockPlaceholder {
     /// Creates a new block placeholder.
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     pub fn new(
         name: String,
         parameters: Vec<String>,
@@ -587,7 +587,11 @@ impl Visitor for CloneVisitor {
         if let Node::Icu(icu) = icu_node {
             Node::IcuPlaceholder(IcuPlaceholder::new(icu, ph.name.clone(), ph.source_span))
         } else {
-            unreachable!()
+            // visit_icu should always return Node::Icu by design.
+            // This is a compiler bug if we reach here.
+            debug_assert!(false, "visit_icu should return Node::Icu");
+            // Return the original placeholder unchanged as fallback
+            Node::IcuPlaceholder(ph.clone())
         }
     }
 

crates/oxc_angular_compiler/src/i18n/digest.rs

@@ -239,6 +239,7 @@ impl Visitor for SerializerIgnoreIcuExpVisitor {
 ///
 /// WARNING: This function has not been designed or tested with security in mind.
 /// DO NOT USE IT IN A SECURITY SENSITIVE CONTEXT.
+#[expect(clippy::many_single_char_names, clippy::unreadable_literal)]
 pub fn sha1(str: &str) -> String {
     let utf8 = str.as_bytes();
     let words32 = bytes_to_words32(utf8, Endian::Big);
@@ -306,6 +307,7 @@ fn to_hex_u32(value: u32) -> String {
     format!("{:08x}", value)
 }
 
+#[expect(clippy::unreadable_literal)]
 fn fk(index: usize, b: u32, c: u32, d: u32) -> (u32, u32) {
     if index < 20 {
         ((b & c) | (!b & d), 0x5a827999)
@@ -332,11 +334,15 @@ pub fn fingerprint(str: &str) -> u64 {
     let utf8 = str.as_bytes();
 
     let mut hi = hash32(utf8, 0);
+    #[expect(clippy::unreadable_literal)]
     let mut lo = hash32(utf8, 102072);
 
     if hi == 0 && (lo == 0 || lo == 1) {
-        hi ^= 0x130f9bef;
-        lo ^= 0x94a0a928u32; // -0x6b5f56d8 as u32 (two's complement)
+        #[expect(clippy::unreadable_literal)]
+        {
+            hi ^= 0x130f9bef;
+            lo ^= 0x94a0a928u32; // -0x6b5f56d8 as u32 (two's complement)
+        }
     }
 
     ((hi as u64) << 32) | (lo as u64)
@@ -353,9 +359,11 @@ pub fn compute_msg_id(msg: &str, meaning: &str) -> String {
     }
 
     // Return lower 63 bits as decimal string
+    #[expect(clippy::unreadable_literal)]
     (msg_fingerprint & 0x7FFFFFFFFFFFFFFF).to_string()
 }
 
+#[expect(clippy::unreadable_literal)]
 fn hash32(bytes: &[u8], mut c: u32) -> u32 {
     let mut a: u32 = 0x9e3779b9;
     let mut b: u32 = 0x9e3779b9;