Create TypedNeoDateTimeFormatter and DateTimePattern types

components/datetime/Cargo.toml

@@ -116,7 +116,7 @@ required-features = ["compiled_data"]
 
 [[test]]
 name = "resolved_components"
-required-features = ["experimental"]
+required-features = ["experimental", "compiled_data"]
 
 [[test]]
 name = "skeleton_serialization"

components/datetime/src/any/datetime.rs

@@ -575,6 +575,7 @@ where {
 }
 
 #[cfg(test)]
+#[cfg(feature = "compiled_data")]
 mod tests {
     use icu::calendar::{AnyCalendar, DateTime};
     use icu::datetime::{options::length, DateTimeFormatter};

components/datetime/src/calendar.rs

@@ -62,6 +62,10 @@ pub trait CldrCalendar: InternalCldrCalendar {
     /// The data marker for loading month symbols for this calendar.
     type MonthNamesV1Marker: KeyedDataMarker<Yokeable = MonthNamesV1<'static>>;
 
+    #[cfg(feature = "experimental")]
+    /// The data marker for loading a single date pattern for this calendar.
+    type DatePatternV1Marker: KeyedDataMarker<Yokeable = DatePatternV1<'static>>;
+
     /// Checks if a given BCP 47 identifier is allowed to be used with this calendar
     ///
     /// By default, just checks against DEFAULT_BCP_47_IDENTIFIER
@@ -91,6 +95,8 @@ impl CldrCalendar for Buddhist {
     type YearNamesV1Marker = BuddhistYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = BuddhistMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = BuddhistDatePatternV1Marker;
 }
 
 impl CldrCalendar for Chinese {
@@ -101,6 +107,8 @@ impl CldrCalendar for Chinese {
     type YearNamesV1Marker = ChineseYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = ChineseMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = ChineseDatePatternV1Marker;
 }
 
 impl CldrCalendar for Coptic {
@@ -111,6 +119,8 @@ impl CldrCalendar for Coptic {
     type YearNamesV1Marker = CopticYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = CopticMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = CopticDatePatternV1Marker;
 }
 
 impl CldrCalendar for Dangi {
@@ -121,6 +131,8 @@ impl CldrCalendar for Dangi {
     type YearNamesV1Marker = DangiYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = DangiMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = DangiDatePatternV1Marker;
 }
 
 impl CldrCalendar for Ethiopian {
@@ -131,6 +143,8 @@ impl CldrCalendar for Ethiopian {
     type YearNamesV1Marker = EthiopianYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = EthiopianMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = EthiopianDatePatternV1Marker;
     fn is_identifier_allowed_for_calendar(value: &Value) -> bool {
         *value == value!("ethiopic") || *value == value!("ethioaa")
     }
@@ -144,6 +158,8 @@ impl CldrCalendar for Gregorian {
     type YearNamesV1Marker = GregorianYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = GregorianMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = GregorianDatePatternV1Marker;
 }
 
 impl CldrCalendar for Hebrew {
@@ -154,6 +170,8 @@ impl CldrCalendar for Hebrew {
     type YearNamesV1Marker = HebrewYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = HebrewMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = HebrewDatePatternV1Marker;
 }
 
 impl CldrCalendar for Indian {
@@ -164,6 +182,8 @@ impl CldrCalendar for Indian {
     type YearNamesV1Marker = IndianYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = IndianMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = IndianDatePatternV1Marker;
 }
 
 impl CldrCalendar for IslamicCivil {
@@ -177,6 +197,8 @@ impl CldrCalendar for IslamicCivil {
     type YearNamesV1Marker = IslamicYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = IslamicMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = IslamicDatePatternV1Marker;
     fn is_identifier_allowed_for_calendar(value: &Value) -> bool {
         *value == value!("islamicc") || is_islamic_subcal(value, tinystr!(8, "civil"))
     }
@@ -190,6 +212,8 @@ impl CldrCalendar for IslamicObservational {
     type YearNamesV1Marker = IslamicYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = IslamicMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = IslamicDatePatternV1Marker;
 }
 
 impl CldrCalendar for IslamicTabular {
@@ -203,6 +227,8 @@ impl CldrCalendar for IslamicTabular {
     type YearNamesV1Marker = IslamicYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = IslamicMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = IslamicDatePatternV1Marker;
     fn is_identifier_allowed_for_calendar(value: &Value) -> bool {
         is_islamic_subcal(value, tinystr!(8, "tbla"))
     }
@@ -219,6 +245,8 @@ impl CldrCalendar for IslamicUmmAlQura {
     type YearNamesV1Marker = IslamicYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = IslamicMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = IslamicDatePatternV1Marker;
     fn is_identifier_allowed_for_calendar(value: &Value) -> bool {
         is_islamic_subcal(value, tinystr!(8, "umalqura"))
     }
@@ -232,6 +260,8 @@ impl CldrCalendar for Japanese {
     type YearNamesV1Marker = JapaneseYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = JapaneseMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = JapaneseDatePatternV1Marker;
 }
 
 impl CldrCalendar for JapaneseExtended {
@@ -242,6 +272,8 @@ impl CldrCalendar for JapaneseExtended {
     type YearNamesV1Marker = JapaneseExtendedYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = JapaneseExtendedMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = JapaneseExtendedDatePatternV1Marker;
 }
 
 impl CldrCalendar for Persian {
@@ -252,6 +284,8 @@ impl CldrCalendar for Persian {
     type YearNamesV1Marker = PersianYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = PersianMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = PersianDatePatternV1Marker;
 }
 
 impl CldrCalendar for Roc {
@@ -262,6 +296,8 @@ impl CldrCalendar for Roc {
     type YearNamesV1Marker = RocYearNamesV1Marker;
     #[cfg(feature = "experimental")]
     type MonthNamesV1Marker = RocMonthNamesV1Marker;
+    #[cfg(feature = "experimental")]
+    type DatePatternV1Marker = RocDatePatternV1Marker;
 }
 
 impl InternalCldrCalendar for Buddhist {}

components/datetime/src/datetime.rs

@@ -781,6 +781,7 @@ where {
 
 #[cfg(test)]
 #[cfg(feature = "serde")]
+#[cfg(feature = "compiled_data")]
 mod tests {
     use super::*;
     use icu_calendar::DateTime;

components/datetime/src/format/datetime.rs

@@ -495,7 +495,7 @@ where
                         .datetime()
                         .hour()
                         .ok_or(Error::MissingInputField(Some("hour")))?,
-                    pattern.time_granularity.is_top_of_hour(
+                    pattern.metadata.time_granularity().is_top_of_hour(
                         datetime.datetime().minute().map(u8::from).unwrap_or(0),
                         datetime.datetime().second().map(u8::from).unwrap_or(0),
                         datetime.datetime().nanosecond().map(u32::from).unwrap_or(0),
@@ -591,6 +591,7 @@ pub fn analyze_patterns(
 
 #[cfg(test)]
 #[allow(unused_imports)]
+#[cfg(feature = "compiled_data")]
 mod tests {
     use super::*;
     use icu_decimal::options::{FixedDecimalFormatterOptions, GroupingStrategy};

components/datetime/src/format/neo.rs

@@ -582,7 +582,7 @@ impl<C: CldrCalendar> TypedDateTimeNames<C> {
     /// Associates this [`TypedDateTimeNames`] with a pattern
     /// and includes all data required for that pattern.
     ///
-    /// Does not duplicate textual field symbols. See #4337
+    /// Does not support duplicate textual field symbols. See #4337
     ///
     /// # Examples
     ///
@@ -1273,6 +1273,7 @@ impl<'data> TimeSymbols for RawDateTimeNamesBorrowed<'data> {
 }
 
 #[cfg(test)]
+#[cfg(feature = "compiled_data")]
 mod tests {
     use super::*;
     use crate::pattern::reference;

components/datetime/src/pattern/common/serde.rs

@@ -119,7 +119,7 @@ mod reference {
 
 mod runtime {
     use super::*;
-    use crate::pattern::{runtime::Pattern, PatternItem};
+    use crate::pattern::{runtime::Pattern, runtime::PatternMetadata, PatternItem};
     use zerovec::ZeroVec;
 
     /// A helper struct that is shaped exactly like `runtime::Pattern`
@@ -136,7 +136,7 @@ mod runtime {
         fn from(pfs: PatternForSerde<'data>) -> Self {
             Self {
                 items: pfs.items,
-                time_granularity: pfs.time_granularity,
+                metadata: PatternMetadata::from_time_granularity(pfs.time_granularity),
             }
         }
     }
@@ -188,7 +188,7 @@ mod runtime {
             } else {
                 let pfs = PatternForSerde {
                     items: self.items.clone(),
-                    time_granularity: self.time_granularity,
+                    time_granularity: self.metadata.time_granularity(),
                 };
                 pfs.serialize(serializer)
             }

components/datetime/src/pattern/mod.rs

@@ -6,6 +6,8 @@ mod common;
 mod error;
 pub mod hour_cycle;
 mod item;
+#[cfg(feature = "experimental")]
+pub mod neo;
 pub mod reference;
 pub mod runtime;
 
@@ -54,6 +56,30 @@ impl TimeGranularity {
             Self::Nanoseconds => minute as u32 + second as u32 + nanosecond == 0,
         }
     }
+
+    #[inline]
+    pub(crate) fn from_ordinal(ordinal: u8) -> TimeGranularity {
+        use TimeGranularity::*;
+        match ordinal {
+            1 => Hours,
+            2 => Minutes,
+            3 => Seconds,
+            4 => Nanoseconds,
+            _ => None,
+        }
+    }
+
+    #[inline]
+    pub(crate) const fn ordinal(self) -> u8 {
+        use TimeGranularity::*;
+        match self {
+            None => 0,
+            Hours => 1,
+            Minutes => 2,
+            Seconds => 3,
+            Nanoseconds => 4,
+        }
+    }
 }
 
 impl From<&PatternItem> for TimeGranularity {