refactor: use package access control (#298)

grdsdev · web-flow · commit 1622efc00e00 · 2024-04-01T20:07:52.000Z
diff --git a/Sources/Auth/AuthAdmin.swift b/Sources/Auth/AuthAdmin.swift
@@ -5,8 +5,8 @@
 //  Created by Guilherme Souza on 25/01/24.
 //
 
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 public actor AuthAdmin {
   @Dependency(\.configuration)
diff --git a/Sources/Auth/AuthClient.swift b/Sources/Auth/AuthClient.swift
@@ -1,5 +1,5 @@
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Auth/AuthMFA.swift b/Sources/Auth/AuthMFA.swift
@@ -1,5 +1,5 @@
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 /// Contains the full multi-factor authentication API.
 public actor AuthMFA {
diff --git a/Sources/Auth/Defaults.swift b/Sources/Auth/Defaults.swift
@@ -5,7 +5,7 @@
 //  Created by Guilherme Souza on 14/12/23.
 //
 
-@_spi(Internal) import _Helpers
+import _Helpers
 import Foundation
 
 extension AuthClient.Configuration {
diff --git a/Sources/Auth/Internal/APIClient.swift b/Sources/Auth/Internal/APIClient.swift
@@ -1,5 +1,5 @@
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 struct APIClient: Sendable {
   var execute: @Sendable (_ request: Request) async throws -> Response
diff --git a/Sources/Auth/Internal/CodeVerifierStorage.swift b/Sources/Auth/Internal/CodeVerifierStorage.swift
@@ -1,6 +1,6 @@
+import _Helpers
 import ConcurrencyExtras
 import Foundation
-@_spi(Internal) import _Helpers
 
 struct CodeVerifierStorage: Sendable {
   var get: @Sendable () -> String?
diff --git a/Sources/Auth/Internal/Dependencies.swift b/Sources/Auth/Internal/Dependencies.swift
@@ -1,4 +1,4 @@
-@_spi(Internal) import _Helpers
+import _Helpers
 import ConcurrencyExtras
 import Foundation
 
diff --git a/Sources/Auth/Internal/EventEmitter.swift b/Sources/Auth/Internal/EventEmitter.swift
@@ -1,6 +1,6 @@
+import _Helpers
 import ConcurrencyExtras
 import Foundation
-@_spi(Internal) import _Helpers
 
 struct EventEmitter: Sendable {
   var attachListener: @Sendable (
diff --git a/Sources/Auth/Internal/SessionManager.swift b/Sources/Auth/Internal/SessionManager.swift
@@ -1,5 +1,5 @@
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 struct SessionRefresher: Sendable {
   var refreshSession: @Sendable (_ refreshToken: String) async throws -> Session
diff --git a/Sources/Auth/Internal/SessionStorage.swift b/Sources/Auth/Internal/SessionStorage.swift
@@ -5,8 +5,8 @@
 //  Created by Guilherme Souza on 24/10/23.
 //
 
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 /// A locally stored ``Session``, it contains metadata such as `expirationDate`.
 struct StoredSession: Codable {
diff --git a/Sources/Auth/Types.swift b/Sources/Auth/Types.swift
@@ -1,5 +1,5 @@
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 public typealias AnyJSON = _Helpers.AnyJSON
 public typealias JSONObject = _Helpers.JSONObject
diff --git a/Sources/Functions/FunctionsClient.swift b/Sources/Functions/FunctionsClient.swift
@@ -1,5 +1,5 @@
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/PostgREST/Defaults.swift b/Sources/PostgREST/Defaults.swift
@@ -5,8 +5,8 @@
 //  Created by Guilherme Souza on 14/12/23.
 //
 
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 let version = _Helpers.version
 
diff --git a/Sources/PostgREST/PostgrestBuilder.swift b/Sources/PostgREST/PostgrestBuilder.swift
@@ -1,6 +1,6 @@
+import _Helpers
 import ConcurrencyExtras
 import Foundation
-@_spi(Internal) import _Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/PostgREST/PostgrestClient.swift b/Sources/PostgREST/PostgrestClient.swift
@@ -1,6 +1,6 @@
-import Foundation
-@_spi(Internal) import _Helpers
+import _Helpers
 import ConcurrencyExtras
+import Foundation
 
 public typealias PostgrestError = _Helpers.PostgrestError
 
diff --git a/Sources/PostgREST/PostgrestFilterBuilder.swift b/Sources/PostgREST/PostgrestFilterBuilder.swift
@@ -1,5 +1,5 @@
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 public class PostgrestFilterBuilder: PostgrestTransformBuilder {
   public enum Operator: String, CaseIterable, Sendable {
diff --git a/Sources/PostgREST/PostgrestQueryBuilder.swift b/Sources/PostgREST/PostgrestQueryBuilder.swift
@@ -1,5 +1,5 @@
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 public final class PostgrestQueryBuilder: PostgrestBuilder {
   /// Performs a vertical filtering with SELECT.
diff --git a/Sources/PostgREST/PostgrestRpcBuilder.swift b/Sources/PostgREST/PostgrestRpcBuilder.swift
@@ -1,5 +1,5 @@
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 struct NoParams: Encodable {}
 
diff --git a/Sources/PostgREST/PostgrestTransformBuilder.swift b/Sources/PostgREST/PostgrestTransformBuilder.swift
@@ -1,4 +1,4 @@
-@_spi(Internal) import _Helpers
+import _Helpers
 import Foundation
 
 public class PostgrestTransformBuilder: PostgrestBuilder {
diff --git a/Sources/Realtime/RealtimeChannel.swift b/Sources/Realtime/RealtimeChannel.swift
@@ -18,10 +18,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import _Helpers
+import ConcurrencyExtras
 import Foundation
 import Swift
-@_spi(Internal) import _Helpers
-import ConcurrencyExtras
 
 /// Container class of bindings to the channel
 struct Binding {
diff --git a/Sources/Realtime/RealtimeClient.swift b/Sources/Realtime/RealtimeClient.swift
@@ -18,9 +18,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import Foundation
-@_spi(Internal) import _Helpers
+import _Helpers
 import ConcurrencyExtras
+import Foundation
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Realtime/RealtimeMessage.swift b/Sources/Realtime/RealtimeMessage.swift
@@ -18,8 +18,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 /// Data that is received from the Server.
 public struct RealtimeMessage {
diff --git a/Sources/Realtime/V2/CallbackManager.swift b/Sources/Realtime/V2/CallbackManager.swift
@@ -5,9 +5,9 @@
 //  Created by Guilherme Souza on 24/12/23.
 //
 
-import Foundation
-@_spi(Internal) import _Helpers
+import _Helpers
 import ConcurrencyExtras
+import Foundation
 
 final class CallbackManager: @unchecked Sendable {
   struct MutableState {
diff --git a/Sources/Realtime/V2/PostgresAction.swift b/Sources/Realtime/V2/PostgresAction.swift
@@ -5,8 +5,8 @@
 //  Created by Guilherme Souza on 23/12/23.
 //
 
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 public struct Column: Equatable, Codable, Sendable {
   public let name: String
diff --git a/Sources/Realtime/V2/PostgresActionData.swift b/Sources/Realtime/V2/PostgresActionData.swift
@@ -5,8 +5,8 @@
 //  Created by Guilherme Souza on 26/12/23.
 //
 
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 struct PostgresActionData: Codable {
   var type: String
diff --git a/Sources/Realtime/V2/PresenceAction.swift b/Sources/Realtime/V2/PresenceAction.swift
@@ -5,8 +5,8 @@
 //  Created by Guilherme Souza on 24/12/23.
 //
 
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 public struct PresenceV2: Hashable, Sendable {
   /// The presence reference of the object.
diff --git a/Sources/Realtime/V2/PushV2.swift b/Sources/Realtime/V2/PushV2.swift
@@ -5,8 +5,8 @@
 //  Created by Guilherme Souza on 02/01/24.
 //
 
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 actor PushV2 {
   private weak var channel: RealtimeChannelV2?
diff --git a/Sources/Realtime/V2/RealtimeChannelV2.swift b/Sources/Realtime/V2/RealtimeChannelV2.swift
@@ -5,7 +5,7 @@
 //  Created by Guilherme Souza on 26/12/23.
 //
 
-@_spi(Internal) import _Helpers
+import _Helpers
 import ConcurrencyExtras
 import Foundation
 
diff --git a/Sources/Realtime/V2/RealtimeClientV2.swift b/Sources/Realtime/V2/RealtimeClientV2.swift
@@ -5,9 +5,9 @@
 //  Created by Guilherme Souza on 26/12/23.
 //
 
+import _Helpers
 import ConcurrencyExtras
 import Foundation
-@_spi(Internal) import _Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Realtime/V2/WebSocketClient.swift b/Sources/Realtime/V2/WebSocketClient.swift
@@ -5,9 +5,9 @@
 //  Created by Guilherme Souza on 29/12/23.
 //
 
+import _Helpers
 import ConcurrencyExtras
 import Foundation
-@_spi(Internal) import _Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Storage/StorageApi.swift b/Sources/Storage/StorageApi.swift
@@ -1,5 +1,5 @@
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Storage/StorageBucketApi.swift b/Sources/Storage/StorageBucketApi.swift
@@ -1,5 +1,5 @@
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Storage/StorageFileApi.swift b/Sources/Storage/StorageFileApi.swift
@@ -1,5 +1,5 @@
+import _Helpers
 import Foundation
-@_spi(Internal) import _Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Supabase/SupabaseClient.swift b/Sources/Supabase/SupabaseClient.swift
@@ -1,7 +1,7 @@
+import _Helpers
+@_exported import Auth
 import ConcurrencyExtras
 import Foundation
-@_spi(Internal) import _Helpers
-@_exported import Auth
 @_exported import Functions
 @_exported import PostgREST
 @_exported import Realtime
diff --git a/Sources/_Helpers/EventEmitter.swift b/Sources/_Helpers/EventEmitter.swift
@@ -27,8 +27,7 @@ public final class ObservationToken: Sendable {
   }
 }
 
-@_spi(Internal)
-public final class EventEmitter<Event: Sendable>: Sendable {
+package final class EventEmitter<Event: Sendable>: Sendable {
   public typealias Listener = @Sendable (Event) -> Void
 
   let listeners = LockIsolated<[ObjectIdentifier: Listener]>([:])
diff --git a/Sources/_Helpers/Request.swift b/Sources/_Helpers/Request.swift
@@ -4,23 +4,22 @@ import Foundation
   import FoundationNetworking
 #endif
 
-@_spi(Internal)
-public struct HTTPClient: Sendable {
+package struct HTTPClient: Sendable {
   public typealias FetchHandler = @Sendable (URLRequest) async throws -> (Data, URLResponse)
 
   let logger: (any SupabaseLogger)?
   let fetchHandler: FetchHandler
 
-  public init(logger: (any SupabaseLogger)?, fetchHandler: @escaping FetchHandler) {
+  package init(logger: (any SupabaseLogger)?, fetchHandler: @escaping FetchHandler) {
     self.logger = logger
     self.fetchHandler = fetchHandler
   }
 
-  public func fetch(_ request: Request, baseURL: URL) async throws -> Response {
+  package func fetch(_ request: Request, baseURL: URL) async throws -> Response {
     try await rawFetch(request.urlRequest(withBaseURL: baseURL))
   }
 
-  public func rawFetch(_ request: URLRequest) async throws -> Response {
+  package func rawFetch(_ request: URLRequest) async throws -> Response {
     let id = UUID().uuidString
     logger?
       .verbose(
@@ -78,15 +77,14 @@ public struct HTTPClient: Sendable {
   }
 }
 
-@_spi(Internal)
-public struct Request: Sendable {
+package struct Request: Sendable {
   public var path: String
   public var method: Method
   public var query: [URLQueryItem]
   public var headers: [String: String]
   public var body: Data?
 
-  public enum Method: String, Sendable {
+  package enum Method: String, Sendable {
     case get = "GET"
     case post = "POST"
     case put = "PUT"
@@ -95,7 +93,7 @@ public struct Request: Sendable {
     case head = "HEAD"
   }
 
-  public init(
+  package init(
     path: String,
     method: Method,
     query: [URLQueryItem] = [],
@@ -109,7 +107,7 @@ public struct Request: Sendable {
     self.body = body
   }
 
-  public func urlRequest(withBaseURL baseURL: URL) throws -> URLRequest {
+  package func urlRequest(withBaseURL baseURL: URL) throws -> URLRequest {
     var url = baseURL.appendingPathComponent(path)
     if !query.isEmpty {
       guard var components = URLComponents(url: url, resolvingAgainstBaseURL: false) else {
@@ -184,21 +182,20 @@ extension CharacterSet {
   }()
 }
 
-@_spi(Internal)
-public struct Response: Sendable {
-  public let data: Data
-  public let response: HTTPURLResponse
+package struct Response: Sendable {
+  package let data: Data
+  package let response: HTTPURLResponse
 
   public var statusCode: Int {
     response.statusCode
   }
 
-  public init(data: Data, response: HTTPURLResponse) {
+  package init(data: Data, response: HTTPURLResponse) {
     self.data = data
     self.response = response
   }
 
-  public func decoded<T: Decodable>(as _: T.Type = T.self, decoder: JSONDecoder) throws -> T {
+  package func decoded<T: Decodable>(as _: T.Type = T.self, decoder: JSONDecoder) throws -> T {
     try decoder.decode(T.self, from: data)
   }
 }
diff --git a/Sources/_Helpers/Version.swift b/Sources/_Helpers/Version.swift
@@ -1 +1 @@
-@_spi(Internal) public let version = "2.5.1"
+package let version = "2.5.1"
diff --git a/Tests/AuthTests/AuthClientTests.swift b/Tests/AuthTests/AuthClientTests.swift
diff --git a/Tests/AuthTests/Mocks/MockAPIClient.swift b/Tests/AuthTests/Mocks/MockAPIClient.swift
diff --git a/Tests/AuthTests/Mocks/MockEventEmitter.swift b/Tests/AuthTests/Mocks/MockEventEmitter.swift
diff --git a/Tests/AuthTests/Mocks/Mocks.swift b/Tests/AuthTests/Mocks/Mocks.swift
diff --git a/Tests/AuthTests/RequestsTests.swift b/Tests/AuthTests/RequestsTests.swift
diff --git a/Tests/AuthTests/SessionManagerTests.swift b/Tests/AuthTests/SessionManagerTests.swift
diff --git a/Tests/FunctionsTests/FunctionsClientTests.swift b/Tests/FunctionsTests/FunctionsClientTests.swift
diff --git a/Tests/PostgRESTTests/BuildURLRequestTests.swift b/Tests/PostgRESTTests/BuildURLRequestTests.swift
diff --git a/Tests/RealtimeTests/CallbackManagerTests.swift b/Tests/RealtimeTests/CallbackManagerTests.swift
diff --git a/Tests/RealtimeTests/RealtimeTests.swift b/Tests/RealtimeTests/RealtimeTests.swift

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@_spi(Internal) import _Helpers`
	`1`	`+import _Helpers`
`2`	`2`	`import ConcurrencyExtras`
`3`	`3`	`import Foundation`
`4`	`4`