Format

Author: paulhdk

Sources/OpenAPIRuntime/Deprecated/Deprecated.swift

@@ -65,33 +65,31 @@ extension AsyncSequence where Element == ArraySlice<UInt8>, Self: Sendable {
     ///
     /// Use this method if the event's `data` field is not JSON, or if you don't want to parse it using `asDecodedServerSentEventsWithJSONData`.
     /// - Returns: A sequence that provides the events.
-    @available(*, deprecated, renamed: "asDecodedServerSentEvents(while:)")
-    @_disfavoredOverload public func asDecodedServerSentEvents() -> ServerSentEventsDeserializationSequence<
+    @available(*, deprecated, renamed: "asDecodedServerSentEvents(while:)") @_disfavoredOverload
+    public func asDecodedServerSentEvents() -> ServerSentEventsDeserializationSequence<
         ServerSentEventsLineDeserializationSequence<Self>
     > { asDecodedServerSentEvents(while: { _ in true }) }
-    
     /// Returns another sequence that decodes each event's data as the provided type using the provided decoder.
     ///
     /// Use this method if the event's `data` field is JSON.
     /// - Parameters:
     ///   - dataType: The type to decode the JSON data into.
     ///   - decoder: The JSON decoder to use.
     /// - Returns: A sequence that provides the events with the decoded JSON data.
-    @available(*, deprecated, renamed: "asDecodedServerSentEventsWithJSONData(of:decoder:while:)")
-    @_disfavoredOverload public func asDecodedServerSentEventsWithJSONData<JSONDataType: Decodable>(
+    @available(*, deprecated, renamed: "asDecodedServerSentEventsWithJSONData(of:decoder:while:)") @_disfavoredOverload
+    public func asDecodedServerSentEventsWithJSONData<JSONDataType: Decodable>(
         of dataType: JSONDataType.Type = JSONDataType.self,
         decoder: JSONDecoder = .init()
     ) -> AsyncThrowingMapSequence<
         ServerSentEventsDeserializationSequence<ServerSentEventsLineDeserializationSequence<Self>>,
         ServerSentEventWithJSONData<JSONDataType>
-    > {
-        asDecodedServerSentEventsWithJSONData(of: dataType, decoder: decoder, while: { _ in true })
-    }
+    > { asDecodedServerSentEventsWithJSONData(of: dataType, decoder: decoder, while: { _ in true }) }
 }
 
 extension ServerSentEventsDeserializationSequence {
     /// Creates a new sequence.
     /// - Parameter upstream: The upstream sequence of arbitrary byte chunks.
-    @available(*, deprecated, renamed: "init(upstream:while:)")
-    @_disfavoredOverload public init(upstream: Upstream) { self.init(upstream: upstream, while: { _ in true }) }
+    @available(*, deprecated, renamed: "init(upstream:while:)") @_disfavoredOverload public init(upstream: Upstream) {
+        self.init(upstream: upstream, while: { _ in true })
+    }
 }

Sources/OpenAPIRuntime/EventStreams/ServerSentEventsDecoding.swift

@@ -100,10 +100,11 @@ extension AsyncSequence where Element == ArraySlice<UInt8>, Self: Sendable {
     /// Use this method if the event's `data` field is not JSON, or if you don't want to parse it using `asDecodedServerSentEventsWithJSONData`.
     /// - Parameter: A closure that determines whether the given byte chunk should be forwarded to the consumer.
     /// - Returns: A sequence that provides the events.
-    public func asDecodedServerSentEvents(while predicate: @escaping @Sendable (ArraySlice<UInt8>) -> Bool = { _ in true }) -> ServerSentEventsDeserializationSequence<
-        ServerSentEventsLineDeserializationSequence<Self>
-    > { .init(upstream: ServerSentEventsLineDeserializationSequence(upstream: self), while: predicate) }
-    
+    public func asDecodedServerSentEvents(
+        while predicate: @escaping @Sendable (ArraySlice<UInt8>) -> Bool = { _ in true }
+    ) -> ServerSentEventsDeserializationSequence<ServerSentEventsLineDeserializationSequence<Self>> {
+        .init(upstream: ServerSentEventsLineDeserializationSequence(upstream: self), while: predicate)
+    }
     /// Returns another sequence that decodes each event's data as the provided type using the provided decoder.
     ///
     /// Use this method if the event's `data` field is JSON.
@@ -188,7 +189,6 @@ extension ServerSentEventsDeserializationSequence.Iterator {
                     // Dispatch the accumulated event.
                     // If the last character of data is a newline, strip it.
                     if event.data?.hasSuffix("\n") ?? false { event.data?.removeLast() }
-                    
                     if let data = event.data, !predicate(ArraySlice(data.utf8)) {
                         state = .finished
                         return .returnNil

Tests/OpenAPIRuntimeTests/EventStreams/Test_ServerSentEventsDecoding.swift

@@ -16,9 +16,13 @@ import XCTest
 import Foundation
 
 final class Test_ServerSentEventsDecoding: Test_Runtime {
-    func _test(input: String, output: [ServerSentEvent], file: StaticString = #filePath, line: UInt = #line, while predicate: @escaping @Sendable (ArraySlice<UInt8>) -> Bool = { _ in true })
-        async throws
-    {
+    func _test(
+        input: String,
+        output: [ServerSentEvent],
+        file: StaticString = #filePath,
+        line: UInt = #line,
+        while predicate: @escaping @Sendable (ArraySlice<UInt8>) -> Bool = { _ in true }
+    ) async throws {
         let sequence = asOneBytePerElementSequence(ArraySlice(input.utf8)).asDecodedServerSentEvents(while: predicate)
         let events = try await [ServerSentEvent](collecting: sequence)
         XCTAssertEqual(events.count, output.count, file: file, line: line)
@@ -97,12 +101,8 @@ final class Test_ServerSentEventsDecoding: Test_Runtime {
 
 
                 """#,
-            output: [
-                .init(data: "hello\nworld")
-            ],
-            while: { incomingData in
-                incomingData != ArraySlice<UInt8>(Data("[DONE]".utf8))
-            }
+            output: [.init(data: "hello\nworld")],
+            while: { incomingData in incomingData != ArraySlice<UInt8>(Data("[DONE]".utf8)) }
         )
     }
     func _testJSONData<JSONType: Decodable & Hashable & Sendable>(
@@ -162,16 +162,14 @@ final class Test_ServerSentEventsDecoding: Test_Runtime {
                 event: event3
                 id: 1
                 data: {"index":3}
-                
-                
+
+
                 """#,
             output: [
                 .init(event: "event1", data: TestEvent(index: 1), id: "1"),
                 .init(event: "event2", data: TestEvent(index: 2), id: "2"),
             ],
-            while: { incomingData in
-                incomingData != ArraySlice<UInt8>(Data("[DONE]".utf8))
-            }
+            while: { incomingData in incomingData != ArraySlice<UInt8>(Data("[DONE]".utf8)) }
         )
     }
 }