Disable day of year for in-progress Gregorian calendar implementation

Author: parkera

Sources/FoundationEssentials/Calendar/Calendar_Cache.swift

@@ -21,18 +21,22 @@ struct CalendarCache : Sendable {
     // MARK: - Concrete Classes
 
     // _CalendarICU, if present
-    static var calendarICUClass: _CalendarProtocol.Type = {
+    static func calendarICUClass(identifier: Calendar.Identifier) -> _CalendarProtocol.Type? {
 #if FOUNDATION_FRAMEWORK && canImport(FoundationICU)
         _CalendarICU.self
 #else
         if let name = _typeByName("FoundationInternationalization._CalendarICU"), let t = name as? _CalendarProtocol.Type {
             return t
         } else {
-            // Use the default gregorian class
-            return _CalendarGregorian.self
+            if identifier == .gregorian {
+                // Use the default gregorian class
+                return _CalendarGregorian.self
+            } else {
+                return nil
+            }
         }
 #endif
-    }()
+    }
 
     // MARK: - State
 
@@ -71,7 +75,9 @@ struct CalendarCache : Sendable {
                 return currentCalendar
             } else {
                 let id = Locale.current._calendarIdentifier
-                let calendar = CalendarCache.calendarICUClass.init(identifier: id, timeZone: nil, locale: Locale.current, firstWeekday: nil, minimumDaysInFirstWeek: nil, gregorianStartDate: nil)
+                // If we cannot create the right kind of class, we fail immediately here
+                let calendarClass = CalendarCache.calendarICUClass(identifier: id)!
+                let calendar = calendarClass.init(identifier: id, timeZone: nil, locale: Locale.current, firstWeekday: nil, minimumDaysInFirstWeek: nil, gregorianStartDate: nil)
                 currentCalendar = calendar
                 return calendar
             }
@@ -92,7 +98,9 @@ struct CalendarCache : Sendable {
             if let cached = fixedCalendars[id] {
                 return cached
             } else {
-                let new = CalendarCache.calendarICUClass.init(identifier: id, timeZone: nil, locale: nil, firstWeekday: nil, minimumDaysInFirstWeek: nil, gregorianStartDate: nil)
+                // If we cannot create the right kind of class, we fail immediately here
+                let calendarClass = CalendarCache.calendarICUClass(identifier: id)!
+                let new = calendarClass.init(identifier: id, timeZone: nil, locale: nil, firstWeekday: nil, minimumDaysInFirstWeek: nil, gregorianStartDate: nil)
                 fixedCalendars[id] = new
                 return new
             }
@@ -129,6 +137,8 @@ struct CalendarCache : Sendable {
 
     func fixed(identifier: Calendar.Identifier, locale: Locale?, timeZone: TimeZone?, firstWeekday: Int?, minimumDaysInFirstWeek: Int?, gregorianStartDate: Date?) -> any _CalendarProtocol {
         // Note: Only the ObjC NSCalendar initWithCoder supports gregorian start date values. For Swift it is always nil.
-        return CalendarCache.calendarICUClass.init(identifier: identifier, timeZone: timeZone, locale: locale, firstWeekday: firstWeekday, minimumDaysInFirstWeek: minimumDaysInFirstWeek, gregorianStartDate: gregorianStartDate)
+        // If we cannot create the right kind of class, we fail immediately here
+        let calendarClass = CalendarCache.calendarICUClass(identifier: identifier)!
+        return calendarClass.init(identifier: identifier, timeZone: timeZone, locale: locale, firstWeekday: firstWeekday, minimumDaysInFirstWeek: minimumDaysInFirstWeek, gregorianStartDate: gregorianStartDate)
     }
 }

Sources/FoundationEssentials/Calendar/Calendar_Gregorian.swift

@@ -56,7 +56,8 @@ extension Date {
 /// This helper records which components should take precedence.
 enum ResolvedDateComponents {
 
-    case dayOfYear(year: Int, dayOfYear: Int)
+    // TODO: Day of Year
+    // case dayOfYear(year: Int, dayOfYear: Int)
     case day(year: Int, month: Int, day: Int?, weekOfYear: Int?)
     case weekdayOrdinal(year: Int, month: Int, weekdayOrdinal: Int, weekday: Int?)
     case weekOfYear(year: Int, weekOfYear: Int?, weekday: Int?)
@@ -114,7 +115,7 @@ enum ResolvedDateComponents {
         var (year, month) = Self.yearMonth(forDateComponent: components)
         let minWeekdayOrdinal = 1
 
-        // TODO: Handle day of year
+        // TODO: Check day of year value here
         if let d = components.day {
             if components.yearForWeekOfYear != nil, let weekOfYear = components.weekOfYear {
                 if components.month == nil && weekOfYear >= 52 {
@@ -1509,8 +1510,6 @@ internal final class _CalendarGregorian: _CalendarProtocol, @unchecked Sendable
 
         var rawYear: Int
         switch resolvedComponents {
-        case .dayOfYear(_, _):
-            fatalError("TODO - day of year calculation")
         case .day(let year, let month, _, _):
             rawMonth = month
             rawYear = year
@@ -1534,8 +1533,6 @@ internal final class _CalendarGregorian: _CalendarProtocol, @unchecked Sendable
 
         let julianDay: Int
         switch resolvedComponents {
-        case .dayOfYear(_, _):
-            fatalError("TODO - day of year calculation")
         case .day(_, _, let day, _):
             julianDay = julianDayAtBeginningOfYear + (day ?? 1)
         case .weekdayOrdinal(_, _, let weekdayOrdinal, let weekday):
@@ -1603,7 +1600,6 @@ internal final class _CalendarGregorian: _CalendarProtocol, @unchecked Sendable
             useJulianReference = year == gregorianStartYear
         case .weekOfMonth(_, _, _, _): break
         case .day(_, _, _, _): break
-        case .dayOfYear(_, _): break
         case .weekdayOrdinal(_, _, _, _): break
         }
 

Sources/FoundationInternationalization/Calendar/Calendar_ICU.swift

@@ -1800,7 +1800,11 @@ internal final class _CalendarICU: _CalendarProtocol, @unchecked Sendable {
             } while ucal_get(ucalendar, UCAL_ERA, &status) < targetEra
         }
 
-        let useDayOfMonth = startAtUnit == .day || startAtUnit == .weekday || startAtUnit == .weekdayOrdinal
+        let useDayOfMonth = if #available(FoundationPreview 0.4, *) {
+            startAtUnit == .day || startAtUnit == .weekday || startAtUnit == .weekdayOrdinal || startAtUnit == .dayOfYear
+        } else {
+            startAtUnit == .day || startAtUnit == .weekday || startAtUnit == .weekdayOrdinal
+        }
 
         if useDayOfMonth {
             let targetDay = ucal_get(ucalendar, UCAL_DAY_OF_MONTH, &status)