refactor: use swift-concurrency-extras

Package.swift

@@ -28,15 +28,23 @@ let package = Package(
     .package(url: "https://github.com/kishikawakatsumi/KeychainAccess", from: "4.2.2"),
     .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.8.1"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.0.0"),
+    .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.0.0"),
   ],
   targets: [
     .target(name: "_Helpers"),
     .target(name: "Functions", dependencies: ["_Helpers"]),
-    .testTarget(name: "FunctionsTests", dependencies: ["Functions"]),
+    .testTarget(
+      name: "FunctionsTests",
+      dependencies: [
+        "Functions",
+        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
+      ]
+    ),
     .target(
       name: "GoTrue",
       dependencies: [
         "_Helpers",
+        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
         .product(name: "KeychainAccess", package: "KeychainAccess"),
       ]
     ),
@@ -49,7 +57,13 @@ let package = Package(
       ],
       resources: [.process("Resources")]
     ),
-    .target(name: "PostgREST", dependencies: ["_Helpers"]),
+    .target(
+      name: "PostgREST",
+      dependencies: [
+        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
+        "_Helpers",
+      ]
+    ),
     .testTarget(
       name: "PostgRESTTests",
       dependencies: [
@@ -60,13 +74,20 @@ let package = Package(
       exclude: ["__Snapshots__"]
     ),
     .testTarget(name: "PostgRESTIntegrationTests", dependencies: ["PostgREST"]),
-    .target(name: "Realtime", dependencies: ["_Helpers"]),
+    .target(
+      name: "Realtime",
+      dependencies: [
+        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
+        "_Helpers",
+      ]
+    ),
     .testTarget(name: "RealtimeTests", dependencies: ["Realtime"]),
     .target(name: "Storage", dependencies: ["_Helpers"]),
     .testTarget(name: "StorageTests", dependencies: ["Storage"]),
     .target(
       name: "Supabase",
       dependencies: [
+        .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
         "GoTrue",
         "Storage",
         "Realtime",

Sources/GoTrue/Internal/Dependencies.swift

@@ -1,5 +1,5 @@
+import ConcurrencyExtras
 import Foundation
-@_spi(Internal) import _Helpers
 
 struct Dependencies: Sendable {
   static let current = LockIsolated(Dependencies?.none)

Sources/GoTrue/Internal/EventEmitter.swift

@@ -1,5 +1,5 @@
+import ConcurrencyExtras
 import Foundation
-@_spi(Internal) import _Helpers
 
 struct EventEmitter: Sendable {
   var attachListener: @Sendable () -> (

Sources/PostgREST/PostgrestBuilder.swift

@@ -1,3 +1,4 @@
+import ConcurrencyExtras
 import Foundation
 @_spi(Internal) import _Helpers
 
@@ -18,7 +19,7 @@ public class PostgrestBuilder: @unchecked Sendable {
     var fetchOptions: FetchOptions
   }
 
-  let mutableState: ActorIsolated<MutableState>
+  let mutableState: LockIsolated<MutableState>
 
   init(
     configuration: PostgrestClient.Configuration,
@@ -27,7 +28,7 @@ public class PostgrestBuilder: @unchecked Sendable {
     self.configuration = configuration
     http = HTTPClient(fetchHandler: configuration.fetch)
 
-    mutableState = ActorIsolated(
+    mutableState = LockIsolated(
       MutableState(
         request: request,
         fetchOptions: FetchOptions()

Sources/Realtime/RealtimeChannel.swift

@@ -21,6 +21,7 @@
 import Foundation
 import Swift
 @_spi(Internal) import _Helpers
+import ConcurrencyExtras
 
 /// Container class of bindings to the channel
 struct Binding {
@@ -439,7 +440,7 @@ public class RealtimeChannel {
           }
         }
 
-        self.bindings.withValue {
+        self.bindings.withValue { [newPostgresBindings] in
           $0["postgres_changes"] = newPostgresBindings
         }
         callback?(.subscribed, nil)

Sources/Realtime/RealtimeClient.swift

@@ -20,6 +20,7 @@
 
 import Foundation
 @_spi(Internal) import _Helpers
+import ConcurrencyExtras
 
 public enum SocketError: Error {
   case abnormalClosureError
@@ -396,7 +397,7 @@ public class RealtimeClient: PhoenixTransportDelegate {
     var delegated = Delegated<URLResponse?, Void>()
     delegated.manuallyDelegate(with: callback)
 
-    return stateChangeCallbacks.open.withValue {
+    return stateChangeCallbacks.open.withValue { [delegated] in
       self.append(callback: delegated, to: &$0)
     }
   }
@@ -439,7 +440,7 @@ public class RealtimeClient: PhoenixTransportDelegate {
     var delegated = Delegated<URLResponse?, Void>()
     delegated.delegate(to: owner, with: callback)
 
-    return stateChangeCallbacks.open.withValue {
+    return stateChangeCallbacks.open.withValue { [delegated] in
       self.append(callback: delegated, to: &$0)
     }
   }
@@ -474,7 +475,7 @@ public class RealtimeClient: PhoenixTransportDelegate {
     var delegated = Delegated<(Int, String?), Void>()
     delegated.manuallyDelegate(with: callback)
 
-    return stateChangeCallbacks.close.withValue {
+    return stateChangeCallbacks.close.withValue { [delegated] in
       self.append(callback: delegated, to: &$0)
     }
   }
@@ -517,7 +518,7 @@ public class RealtimeClient: PhoenixTransportDelegate {
     var delegated = Delegated<(Int, String?), Void>()
     delegated.delegate(to: owner, with: callback)
 
-    return stateChangeCallbacks.close.withValue {
+    return stateChangeCallbacks.close.withValue { [delegated] in
       self.append(callback: delegated, to: &$0)
     }
   }
@@ -537,7 +538,7 @@ public class RealtimeClient: PhoenixTransportDelegate {
     var delegated = Delegated<(Error, URLResponse?), Void>()
     delegated.manuallyDelegate(with: callback)
 
-    return stateChangeCallbacks.error.withValue {
+    return stateChangeCallbacks.error.withValue { [delegated] in
       self.append(callback: delegated, to: &$0)
     }
   }
@@ -561,7 +562,7 @@ public class RealtimeClient: PhoenixTransportDelegate {
     var delegated = Delegated<(Error, URLResponse?), Void>()
     delegated.delegate(to: owner, with: callback)
 
-    return stateChangeCallbacks.error.withValue {
+    return stateChangeCallbacks.error.withValue { [delegated] in
       self.append(callback: delegated, to: &$0)
     }
   }
@@ -582,7 +583,7 @@ public class RealtimeClient: PhoenixTransportDelegate {
     var delegated = Delegated<Message, Void>()
     delegated.manuallyDelegate(with: callback)
 
-    return stateChangeCallbacks.message.withValue {
+    return stateChangeCallbacks.message.withValue { [delegated] in
       append(callback: delegated, to: &$0)
     }
   }
@@ -606,7 +607,7 @@ public class RealtimeClient: PhoenixTransportDelegate {
     var delegated = Delegated<Message, Void>()
     delegated.delegate(to: owner, with: callback)
 
-    return stateChangeCallbacks.message.withValue {
+    return stateChangeCallbacks.message.withValue { [delegated] in
       self.append(callback: delegated, to: &$0)
     }
   }

Sources/Supabase/SupabaseClient.swift

@@ -1,3 +1,4 @@
+import ConcurrencyExtras
 import Foundation
 @_spi(Internal) import _Helpers
 @_exported import Functions

Tests/FunctionsTests/FunctionsClientTests.swift

@@ -1,5 +1,5 @@
 import XCTest
-
+import ConcurrencyExtras
 @_spi(Internal) import _Helpers
 @testable import Functions
 
@@ -14,7 +14,7 @@ final class FunctionsClientTests: XCTestCase {
     let _request = ActorIsolated(URLRequest?.none)
 
     let sut = FunctionsClient(url: self.url, headers: ["apikey": apiKey]) { request in
-      _request.setValue(request)
+      await _request.setValue(request)
       return (
         Data(), HTTPURLResponse(url: url, statusCode: 200, httpVersion: nil, headerFields: nil)!
       )
@@ -27,7 +27,7 @@ final class FunctionsClientTests: XCTestCase {
       options: .init(headers: ["X-Custom-Key": "value"], body: body)
     )
 
-    let request = _request.value
+    let request = await _request.value
 
     XCTAssertEqual(request?.url, url)
     XCTAssertEqual(request?.httpMethod, "POST")

Tests/GoTrueTests/GoTrueClientTests.swift

@@ -7,6 +7,7 @@
 
 import XCTest
 @_spi(Internal) import _Helpers
+import ConcurrencyExtras
 
 @testable import GoTrue
 
@@ -28,7 +29,7 @@ final class GoTrueClientTests: XCTestCase {
 
       let streamTask = Task {
         for await (event, _) in authStateStream {
-          events.withValue {
+          await events.withValue {
             $0.append(event)
           }
 
@@ -38,7 +39,8 @@ final class GoTrueClientTests: XCTestCase {
 
       await fulfillment(of: [expectation])
 
-      XCTAssertEqual(events.value, [.initialSession])
+      let events = await events.value
+      XCTAssertEqual(events, [.initialSession])
 
       streamTask.cancel()
     }

Tests/GoTrueTests/Mocks/Mocks.swift

@@ -72,7 +72,7 @@ func withDependencies(
   let current = Dependencies.current.value ?? .mock
   var copy = current
   mutation(&copy)
-  Dependencies.current.withValue { $0 = copy }
+  Dependencies.current.withValue { [copy] in $0 = copy }
   defer { Dependencies.current.setValue(current) }
   try await operation()
 }