Update to swift-rfc-3339 0.3.0 with rawValue API

- Update swift-rfc-3339 dependency to 0.3.0
- Update tests to use new Int comparison operators for Time.Month/Day

Author: coenttb

Package.swift

@@ -9,7 +9,9 @@ extension String {
 extension Target.Dependency {
     static var rfc4287: Self { .target(name: .rfc4287) }
     static var rfc2822: Self { .product(name: "RFC 2822", package: "swift-rfc-2822") }
+    static var rfc3339: Self { .product(name: "RFC 3339", package: "swift-rfc-3339") }
     static var rfc3987: Self { .product(name: "RFC 3987", package: "swift-rfc-3987") }
+    static var rfc4648: Self { .product(name: "RFC 4648", package: "swift-rfc-4648") }
 }
 
 let package = Package(
@@ -27,13 +29,15 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/swift-standards/swift-rfc-2822.git", from: "0.1.0"),
-        .package(url: "https://github.com/swift-standards/swift-rfc-3987.git", from: "0.1.0")
+        .package(url: "https://github.com/swift-standards/swift-rfc-2822.git", from: "0.4.0"),
+        .package(url: "https://github.com/swift-standards/swift-rfc-3339.git", from: "0.3.0"),
+        .package(url: "https://github.com/swift-standards/swift-rfc-3987.git", from: "0.1.0"),
+        .package(url: "https://github.com/swift-standards/swift-rfc-4648.git", from: "0.1.0")
     ],
     targets: [
         .target(
             name: .rfc4287,
-            dependencies: [.rfc2822, .rfc3987],
+            dependencies: [.rfc2822, .rfc3339, .rfc3987, .rfc4648],
             swiftSettings: [
                 .swiftLanguageMode(.v6),
                 .enableExperimentalFeature("StrictConcurrency")

Sources/RFC 4287/Content.swift

@@ -83,23 +83,24 @@ extension RFC_4287 {
             self.lang = lang
         }
 
-        /// Creates inline binary content from data
+        /// Creates inline binary content from raw bytes
         ///
         /// - Parameters:
-        ///   - data: The binary content data (will be base64-encoded)
+        ///   - rawBytes: The raw binary content bytes (will be base64-encoded per RFC 4287)
         ///   - mediaType: The MIME type of the content
         ///   - base: Base IRI for resolving relative references
         ///   - lang: Language of the content
         ///
-        /// This initializer automatically base64-encodes the data as required by RFC 4287
-        /// for binary media types.
+        /// This initializer automatically base64-encodes the bytes as required by RFC 4287
+        /// for binary media types. If you already have a base64-encoded string, use
+        /// `init(value:type:base:lang:)` instead with `type: .media(mediaType)`.
         public init(
-            data: Data,
+            rawBytes: [UInt8],
             mediaType: String,
             base: (any RFC_3987.IRI.Representable)? = nil,
             lang: String? = nil
         ) {
-            self.value = data.base64EncodedString()
+            self.value = rawBytes.base64()
             self.type = .media(mediaType)
             self.src = nil
             self.base = base?.iri

Sources/RFC 4287/Date+Atom.swift

@@ -27,10 +27,10 @@ extension RFC_4287 {
         public let links: [Link]
 
         /// Timestamp of last significant modification (required)
-        public let updated: Date
+        public let updated: RFC_3339.DateTime
 
         /// Timestamp of initial creation or publication (optional)
-        public let published: Date?
+        public let published: RFC_3339.DateTime?
 
         /// Copyright and licensing information (optional)
         public let rights: Rights?
@@ -76,13 +76,13 @@ extension RFC_4287 {
         public init?(
             id: RFC_3987.IRI,
             title: Title,
-            updated: Date,
+            updated: RFC_3339.DateTime,
             authors: [Author] = [],
             content: Content? = nil,
             links: [Link] = [],
             categories: [Category] = [],
             contributors: [Contributor] = [],
-            published: Date? = nil,
+            published: RFC_3339.DateTime? = nil,
             rights: Rights? = nil,
             source: Source? = nil,
             summary: Summary? = nil,
@@ -147,13 +147,13 @@ extension RFC_4287 {
         public init?(
             id: any RFC_3987.IRI.Representable,
             title: Title,
-            updated: Date,
+            updated: RFC_3339.DateTime,
             authors: [Author] = [],
             content: Content? = nil,
             links: [Link] = [],
             categories: [Category] = [],
             contributors: [Contributor] = [],
-            published: Date? = nil,
+            published: RFC_3339.DateTime? = nil,
             rights: Rights? = nil,
             source: Source? = nil,
             summary: Summary? = nil,
@@ -182,13 +182,13 @@ extension RFC_4287 {
         internal static func makeUnchecked(
             id: String,
             title: Title,
-            updated: Date,
+            updated: RFC_3339.DateTime,
             authors: [Author],
             content: Content?,
             links: [Link],
             categories: [Category],
             contributors: [Contributor],
-            published: Date?,
+            published: RFC_3339.DateTime?,
             rights: Rights?,
             source: Source?,
             summary: Summary?,
@@ -216,13 +216,13 @@ extension RFC_4287 {
         private init(
             uncheckedId id: RFC_3987.IRI,
             uncheckedTitle title: Title,
-            uncheckedUpdated updated: Date,
+            uncheckedUpdated updated: RFC_3339.DateTime,
             uncheckedAuthors authors: [Author],
             uncheckedContent content: Content?,
             uncheckedLinks links: [Link],
             uncheckedCategories categories: [Category],
             uncheckedContributors contributors: [Contributor],
-            uncheckedPublished published: Date?,
+            uncheckedPublished published: RFC_3339.DateTime?,
             uncheckedRights rights: Rights?,
             uncheckedSource source: Source?,
             uncheckedSummary summary: Summary?,

Sources/RFC 4287/Entry.swift

@@ -46,7 +46,7 @@ extension RFC_4287 {
         public let title: Title
 
         /// Timestamp of last significant modification (required)
-        public let updated: Date
+        public let updated: RFC_3339.DateTime
 
         /// Base IRI for resolving relative references (xml:base)
         ///
@@ -84,7 +84,7 @@ extension RFC_4287 {
         public init?(
             id: RFC_3987.IRI,
             title: Title,
-            updated: Date,
+            updated: RFC_3339.DateTime,
             authors: [Author] = [],
             entries: [Entry] = [],
             links: [Link] = [],
@@ -148,7 +148,7 @@ extension RFC_4287 {
         public init?(
             id: any RFC_3987.IRI.Representable,
             title: Title,
-            updated: Date,
+            updated: RFC_3339.DateTime,
             authors: [Author] = [],
             entries: [Entry] = [],
             links: [Link] = [],
@@ -185,7 +185,7 @@ extension RFC_4287 {
         internal static func makeUnchecked(
             id: String,
             title: Title,
-            updated: Date,
+            updated: RFC_3339.DateTime,
             authors: [Author],
             entries: [Entry],
             links: [Link],
@@ -221,7 +221,7 @@ extension RFC_4287 {
         private init(
             uncheckedId id: RFC_3987.IRI,
             uncheckedTitle title: Title,
-            uncheckedUpdated updated: Date,
+            uncheckedUpdated updated: RFC_3339.DateTime,
             uncheckedAuthors authors: [Author],
             uncheckedEntries entries: [Entry],
             uncheckedLinks links: [Link],

Sources/RFC 4287/Feed.swift

@@ -80,23 +80,16 @@ extension RFC_4287 {
         ///   - emailString: Email address as string (will be parsed as local@domain)
         ///   - base: Base IRI string for resolving relative references
         ///   - lang: Language of the person construct
-        /// - Throws: RFC_2822.ValidationError if email is invalid
+        /// - Throws: RFC_2822.AddrSpec.Error if email is invalid
         public init(
             name: String,
             uri: String? = nil,
             emailString: String,
             base: String? = nil,
             lang: String? = nil
         ) throws {
-            // Parse email into local-part and domain
-            let components = emailString.split(separator: "@", maxSplits: 1)
-            guard components.count == 2 else {
-                throw RFC_2822.ValidationError.invalidFieldValue("email", emailString)
-            }
-            let addrSpec = try RFC_2822.AddrSpec(
-                localPart: String(components[0]),
-                domain: String(components[1])
-            )
+            // Parse email using RFC 2822 canonical byte parsing
+            let addrSpec = try RFC_2822.AddrSpec(ascii: emailString.utf8)
             let iri: RFC_3987.IRI? = uri.map { RFC_3987.IRI(unchecked: $0) }
             let baseIRI: RFC_3987.IRI? = base.map { RFC_3987.IRI(unchecked: $0) }
             self.init(name: name, uri: iri, email: addrSpec, base: baseIRI, lang: lang)
@@ -123,18 +116,15 @@ extension RFC_4287.Person: Codable {
 
         // Decode email as string and convert to AddrSpec
         if let emailString = try container.decodeIfPresent(String.self, forKey: .email) {
-            let components = emailString.split(separator: "@", maxSplits: 1)
-            guard components.count == 2 else {
+            do {
+                email = try RFC_2822.AddrSpec(ascii: emailString.utf8)
+            } catch {
                 throw DecodingError.dataCorruptedError(
                     forKey: .email,
                     in: container,
                     debugDescription: "Invalid email format: \(emailString)"
                 )
             }
-            email = try RFC_2822.AddrSpec(
-                localPart: String(components[0]),
-                domain: String(components[1])
-            )
         } else {
             email = nil
         }

Sources/RFC 4287/Person.swift

@@ -1,4 +1,6 @@
+@_exported import RFC_3339
 @_exported import RFC_3987
+@_exported import RFC_4648
 
 /// RFC 4287: The Atom Syndication Format
 ///

Sources/RFC 4287/RFC_4287.swift

@@ -39,7 +39,7 @@ extension RFC_4287 {
         public let title: Title?
 
         /// Last updated timestamp
-        public let updated: Date?
+        public let updated: RFC_3339.DateTime?
 
         /// Base IRI for resolving relative references (xml:base)
         ///
@@ -80,7 +80,7 @@ extension RFC_4287 {
             rights: Rights? = nil,
             subtitle: Subtitle? = nil,
             title: Title? = nil,
-            updated: Date? = nil,
+            updated: RFC_3339.DateTime? = nil,
             base: RFC_3987.IRI? = nil,
             lang: String? = nil
         ) {
@@ -131,7 +131,7 @@ extension RFC_4287 {
             rights: Rights? = nil,
             subtitle: Subtitle? = nil,
             title: Title? = nil,
-            updated: Date? = nil,
+            updated: RFC_3339.DateTime? = nil,
             base: (any RFC_3987.IRI.Representable)? = nil,
             lang: String? = nil
         ) {

Sources/RFC 4287/Source.swift

@@ -3,51 +3,51 @@ import Testing
 @testable import RFC_4287
 
 @Suite
-struct `Date Formatting Tests` {
-    @Test func dateToAtomString() async throws {
-        let date = Date(timeIntervalSince1970: 1_609_459_200)  // 2021-01-01 00:00:00 UTC
-
-        let formatted = date.atomFormatted()
-
-        // Should be ISO 8601 format
-        #expect(formatted.contains("2021-01-01"))
-        #expect(formatted.contains("T"))
-        #expect(formatted.contains("Z"))
+struct `RFC 3339 DateTime Tests` {
+    @Test func createDateTimeFromComponents() async throws {
+        let time = try Time(year: 2021, month: 1, day: 1, hour: 0, minute: 0, second: 0)
+        let dateTime = RFC_3339.DateTime(time: time, offset: .utc)
+
+        #expect(dateTime.time.year == 2021)
+        #expect(dateTime.time.month == 1)
+        #expect(dateTime.time.day == 1)
+        #expect(dateTime.offset == .utc)
     }
 
-    @Test func atomStringToDate() async throws {
+    @Test func parseRFC3339String() async throws {
         let dateString = "2021-01-01T00:00:00Z"
+        let dateTime = try RFC_3339.Parser.parse(dateString)
 
-        let date = try Date(atomString: dateString)
-
-        #expect(date.timeIntervalSince1970 == 1_609_459_200)
+        #expect(dateTime.time.year == 2021)
+        #expect(dateTime.time.month == 1)
+        #expect(dateTime.time.day == 1)
+        #expect(dateTime.offset == .utc)
     }
 
-    @Test func atomStringWithFractionalSeconds() async throws {
-        let dateString = "2021-01-01T00:00:00.123Z"
+    @Test func formatRFC3339String() async throws {
+        let time = try Time(year: 2021, month: 1, day: 1, hour: 12, minute: 30, second: 45)
+        let dateTime = RFC_3339.DateTime(time: time, offset: .utc)
 
-        let date = try Date(atomString: dateString)
+        let formatted = RFC_3339.Formatter.format(dateTime)
 
-        #expect(date.timeIntervalSince1970 > 0)
+        // Should be ISO 8601 format
+        #expect(formatted.contains("2021-01-01"))
+        #expect(formatted.contains("T"))
+        #expect(formatted.contains("12:30:45"))
     }
 
-    @Test func roundTripDateFormatting() async throws {
-        let originalDate = Date(timeIntervalSince1970: 1_609_459_200)
-
-        let formatted = originalDate.atomFormatted()
-        let parsedDate = try Date(atomString: formatted)
+    @Test func roundTripDateTimeFormatting() async throws {
+        let time = try Time(year: 2021, month: 6, day: 15, hour: 14, minute: 30, second: 0)
+        let original = RFC_3339.DateTime(time: time, offset: .utc)
 
-        // Should be equal within a second (accounting for fractional seconds)
-        let difference = abs(originalDate.timeIntervalSince1970 - parsedDate.timeIntervalSince1970)
-        #expect(difference < 1.0)
-    }
-
-    @Test func invalidDateStringThrows() async throws {
-        let invalidString = "not a date"
+        let formatted = RFC_3339.Formatter.format(original)
+        let parsed = try RFC_3339.Parser.parse(formatted)
 
-        #expect(throws: RFC_4287.ValidationError.self) {
-            try Date(atomString: invalidString)
-        }
+        #expect(parsed.time.year == original.time.year)
+        #expect(parsed.time.month == original.time.month)
+        #expect(parsed.time.day == original.time.day)
+        #expect(parsed.time.hour == original.time.hour)
+        #expect(parsed.time.minute == original.time.minute)
     }
 
     @Test func variousRFC3339Formats() async throws {
@@ -59,8 +59,8 @@ struct `Date Formatting Tests` {
         ]
 
         for format in formats {
-            let date = try Date(atomString: format)
-            #expect(date.timeIntervalSince1970 > 0)
+            let dateTime = try RFC_3339.Parser.parse(format)
+            #expect(dateTime.time.year > 0)
         }
     }
 }