fix: re-export Helpers module (#724)

Guilherme Souza · web-flow · commit fd97d99d780c · 2025-05-31T06:01:36.000-03:00
diff --git a/Sources/Auth/AuthAdmin.swift b/Sources/Auth/AuthAdmin.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import HTTPTypes
-import Helpers
 
 public struct AuthAdmin: Sendable {
   let clientID: AuthClientID
diff --git a/Sources/Auth/AuthClient.swift b/Sources/Auth/AuthClient.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 #if canImport(AuthenticationServices)
   import AuthenticationServices
diff --git a/Sources/Auth/AuthClientConfiguration.swift b/Sources/Auth/AuthClientConfiguration.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Auth/AuthError.swift b/Sources/Auth/AuthError.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Auth/AuthMFA.swift b/Sources/Auth/AuthMFA.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 /// Contains the full multi-factor authentication API.
 public struct AuthMFA: Sendable {
diff --git a/Sources/Auth/AuthStateChangeListener.swift b/Sources/Auth/AuthStateChangeListener.swift
@@ -7,7 +7,7 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
+
 
 /// A listener that can be removed by calling ``AuthStateChangeListenerRegistration/remove()``.
 ///
diff --git a/Sources/Auth/Defaults.swift b/Sources/Auth/Defaults.swift
@@ -7,7 +7,6 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 extension AuthClient.Configuration {
   /// The default JSONEncoder instance used by the ``AuthClient``.
diff --git a/Sources/Auth/Deprecated.swift b/Sources/Auth/Deprecated.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Auth/Exports.swift b/Sources/Auth/Exports.swift
@@ -0,0 +1,8 @@
+//
+//  Exports.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 30/05/25.
+//
+
+@_exported import Helpers
diff --git a/Sources/Auth/Internal/APIClient.swift b/Sources/Auth/Internal/APIClient.swift
@@ -1,6 +1,5 @@
 import Foundation
 import HTTPTypes
-import Helpers
 
 extension HTTPClient {
   init(configuration: AuthClient.Configuration) {
diff --git a/Sources/Auth/Internal/CodeVerifierStorage.swift b/Sources/Auth/Internal/CodeVerifierStorage.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 struct CodeVerifierStorage: Sendable {
   var get: @Sendable () -> String?
diff --git a/Sources/Auth/Internal/Dependencies.swift b/Sources/Auth/Internal/Dependencies.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 struct Dependencies: Sendable {
   var configuration: AuthClient.Configuration
diff --git a/Sources/Auth/Internal/EventEmitter.swift b/Sources/Auth/Internal/EventEmitter.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 struct AuthStateChangeEventEmitter {
   var emitter = EventEmitter<(AuthChangeEvent, Session?)?>(initialEvent: nil, emitsLastEventWhenAttaching: false)
diff --git a/Sources/Auth/Internal/Helpers.swift b/Sources/Auth/Internal/Helpers.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 /// Extracts parameters encoded in the URL both in the query and fragment.
 func extractParams(from url: URL) -> [String: String] {
diff --git a/Sources/Auth/Internal/SessionManager.swift b/Sources/Auth/Internal/SessionManager.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 struct SessionManager: Sendable {
   var session: @Sendable () async throws -> Session
diff --git a/Sources/Auth/Internal/SessionStorage.swift b/Sources/Auth/Internal/SessionStorage.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 struct SessionStorage {
   var get: @Sendable () -> Session?
diff --git a/Sources/Auth/Types.swift b/Sources/Auth/Types.swift
@@ -1,8 +1,4 @@
 import Foundation
-import Helpers
-
-public typealias AnyJSON = Helpers.AnyJSON
-public typealias JSONObject = Helpers.JSONObject
 
 public enum AuthChangeEvent: String, Sendable {
   case initialSession = "INITIAL_SESSION"
diff --git a/Sources/Functions/Exports.swift b/Sources/Functions/Exports.swift
@@ -0,0 +1,8 @@
+//
+//  Exports.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 30/05/25.
+//
+
+@_exported import Helpers
diff --git a/Sources/Functions/FunctionsClient.swift b/Sources/Functions/FunctionsClient.swift
@@ -1,7 +1,6 @@
 import ConcurrencyExtras
 import Foundation
 import HTTPTypes
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Functions/Types.swift b/Sources/Functions/Types.swift
@@ -1,6 +1,5 @@
 import Foundation
 import HTTPTypes
-import Helpers
 
 /// An error type representing various errors that can occur while invoking functions.
 public enum FunctionsError: Error, LocalizedError {
diff --git a/Sources/PostgREST/Defaults.swift b/Sources/PostgREST/Defaults.swift
@@ -7,7 +7,6 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 let version = Helpers.version
 
diff --git a/Sources/PostgREST/Exports.swift b/Sources/PostgREST/Exports.swift
@@ -0,0 +1,8 @@
+//
+//  Exports.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 30/05/25.
+//
+
+@_exported import Helpers
diff --git a/Sources/PostgREST/PostgrestBuilder.swift b/Sources/PostgREST/PostgrestBuilder.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 import HTTPTypes
 
 #if canImport(FoundationNetworking)
diff --git a/Sources/PostgREST/PostgrestClient.swift b/Sources/PostgREST/PostgrestClient.swift
@@ -1,11 +1,6 @@
 import ConcurrencyExtras
 import Foundation
 import HTTPTypes
-import Helpers
-
-public typealias PostgrestError = Helpers.PostgrestError
-public typealias HTTPError = Helpers.HTTPError
-public typealias AnyJSON = Helpers.AnyJSON
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/PostgREST/PostgrestFilterBuilder.swift b/Sources/PostgREST/PostgrestFilterBuilder.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 public class PostgrestFilterBuilder: PostgrestTransformBuilder, @unchecked Sendable {
   public enum Operator: String, CaseIterable, Sendable {
diff --git a/Sources/PostgREST/PostgrestFilterValue.swift b/Sources/PostgREST/PostgrestFilterValue.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 /// A value that can be used to filter Postgrest queries.
 public protocol PostgrestFilterValue {
diff --git a/Sources/PostgREST/PostgrestQueryBuilder.swift b/Sources/PostgREST/PostgrestQueryBuilder.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 public final class PostgrestQueryBuilder: PostgrestBuilder, @unchecked Sendable {
   /// Perform a SELECT query on the table or view.
diff --git a/Sources/PostgREST/PostgrestTransformBuilder.swift b/Sources/PostgREST/PostgrestTransformBuilder.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 public class PostgrestTransformBuilder: PostgrestBuilder, @unchecked Sendable {
   /// Perform a SELECT on the query result.
diff --git a/Sources/Realtime/CallbackManager.swift b/Sources/Realtime/CallbackManager.swift
@@ -1,6 +1,5 @@
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 final class CallbackManager: Sendable {
   struct MutableState {
diff --git a/Sources/Realtime/Deprecated/Deprecated.swift b/Sources/Realtime/Deprecated/Deprecated.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 @available(*, deprecated, renamed: "RealtimeMessage")
 public typealias Message = RealtimeMessage
diff --git a/Sources/Realtime/Deprecated/RealtimeChannel.swift b/Sources/Realtime/Deprecated/RealtimeChannel.swift
@@ -20,7 +20,6 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
 import Swift
 import HTTPTypes
 
diff --git a/Sources/Realtime/Deprecated/RealtimeClient.swift b/Sources/Realtime/Deprecated/RealtimeClient.swift
@@ -20,7 +20,6 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Realtime/Deprecated/RealtimeMessage.swift b/Sources/Realtime/Deprecated/RealtimeMessage.swift
@@ -19,7 +19,6 @@
 // THE SOFTWARE.
 
 import Foundation
-import Helpers
 
 /// Data that is received from the Server.
 public struct RealtimeMessage {
diff --git a/Sources/Realtime/Exports.swift b/Sources/Realtime/Exports.swift
@@ -0,0 +1,8 @@
+//
+//  Exports.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 30/05/25.
+//
+
+@_exported import Helpers
diff --git a/Sources/Realtime/PostgresAction.swift b/Sources/Realtime/PostgresAction.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 public struct Column: Equatable, Codable, Sendable {
   public let name: String
diff --git a/Sources/Realtime/PostgresActionData.swift b/Sources/Realtime/PostgresActionData.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 struct PostgresActionData: Codable {
   var type: String
diff --git a/Sources/Realtime/PresenceAction.swift b/Sources/Realtime/PresenceAction.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 public struct PresenceV2: Hashable, Sendable {
   /// The presence reference of the object.
diff --git a/Sources/Realtime/PushV2.swift b/Sources/Realtime/PushV2.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 /// Represents the different status of a push
 public enum PushStatus: String, Sendable {
diff --git a/Sources/Realtime/RealtimeChannelV2.swift b/Sources/Realtime/RealtimeChannelV2.swift
@@ -1,7 +1,6 @@
 import ConcurrencyExtras
 import Foundation
 import HTTPTypes
-import Helpers
 import IssueReporting
 
 #if canImport(FoundationNetworking)
diff --git a/Sources/Realtime/RealtimeClientV2.swift b/Sources/Realtime/RealtimeClientV2.swift
@@ -7,14 +7,11 @@
 
 import ConcurrencyExtras
 import Foundation
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
 #endif
 
-public typealias JSONObject = Helpers.JSONObject
-
 /// Factory function for returning a new WebSocket connection.
 typealias WebSocketTransport = @Sendable (_ url: URL, _ headers: [String: String]) async throws ->
   any WebSocket
diff --git a/Sources/Realtime/RealtimeMessageV2.swift b/Sources/Realtime/RealtimeMessageV2.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 public struct RealtimeMessageV2: Hashable, Codable, Sendable {
   public let joinRef: String?
diff --git a/Sources/Realtime/Types.swift b/Sources/Realtime/Types.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import HTTPTypes
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Storage/Exports.swift b/Sources/Storage/Exports.swift
@@ -0,0 +1,8 @@
+//
+//  Exports.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 30/05/25.
+//
+
+@_exported import Helpers
diff --git a/Sources/Storage/Helpers.swift b/Sources/Storage/Helpers.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 #if canImport(MobileCoreServices)
   import MobileCoreServices
diff --git a/Sources/Storage/MultipartFormData.swift b/Sources/Storage/MultipartFormData.swift
@@ -26,7 +26,6 @@
 
 import Foundation
 import HTTPTypes
-import Helpers
 
 #if canImport(MobileCoreServices)
   import MobileCoreServices
diff --git a/Sources/Storage/StorageApi.swift b/Sources/Storage/StorageApi.swift
@@ -1,6 +1,5 @@
 import Foundation
 import HTTPTypes
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Storage/StorageBucketApi.swift b/Sources/Storage/StorageBucketApi.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Storage/StorageFileApi.swift b/Sources/Storage/StorageFileApi.swift
@@ -1,6 +1,5 @@
 import Foundation
 import HTTPTypes
-import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
diff --git a/Sources/Storage/SupabaseStorage.swift b/Sources/Storage/SupabaseStorage.swift
@@ -1,8 +1,4 @@
 import Foundation
-import Helpers
-
-public typealias SupabaseLogger = Helpers.SupabaseLogger
-public typealias SupabaseLogMessage = Helpers.SupabaseLogMessage
 
 public struct StorageClientConfiguration: Sendable {
   public let url: URL
diff --git a/Sources/Storage/Types.swift b/Sources/Storage/Types.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Helpers
 
 public struct SearchOptions: Encodable, Sendable {
   var prefix: String
diff --git a/Sources/Supabase/Constants.swift b/Sources/Supabase/Constants.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Helpers
 
 let defaultHeaders: [String: String] = {
   var headers = [
diff --git a/Sources/Supabase/Exports.swift b/Sources/Supabase/Exports.swift
diff --git a/Sources/Supabase/SupabaseClient.swift b/Sources/Supabase/SupabaseClient.swift
diff --git a/Sources/Supabase/Types.swift b/Sources/Supabase/Types.swift
diff --git a/Sources/TestHelpers/Exports.swift b/Sources/TestHelpers/Exports.swift
diff --git a/Sources/TestHelpers/HTTPClientMock.swift b/Sources/TestHelpers/HTTPClientMock.swift
diff --git a/Tests/AuthTests/AuthClientTests.swift b/Tests/AuthTests/AuthClientTests.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/HelpersTests/AnyJSONTests.swift b/Tests/HelpersTests/AnyJSONTests.swift
diff --git a/Tests/HelpersTests/EventEmitterTests.swift b/Tests/HelpersTests/EventEmitterTests.swift
diff --git a/Tests/HelpersTests/JWTTests.swift b/Tests/HelpersTests/JWTTests.swift
diff --git a/Tests/HelpersTests/WithTimeoutTests.swift b/Tests/HelpersTests/WithTimeoutTests.swift
diff --git a/Tests/IntegrationTests/RealtimeIntegrationTests.swift b/Tests/IntegrationTests/RealtimeIntegrationTests.swift
diff --git a/Tests/IntegrationTests/StorageFileIntegrationTests.swift b/Tests/IntegrationTests/StorageFileIntegrationTests.swift
diff --git a/Tests/PostgRESTTests/BuildURLRequestTests.swift b/Tests/PostgRESTTests/BuildURLRequestTests.swift
diff --git a/Tests/PostgRESTTests/PostgrestRpcBuilderTests.swift b/Tests/PostgRESTTests/PostgrestRpcBuilderTests.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
diff --git a/Tests/RealtimeTests/_PushTests.swift b/Tests/RealtimeTests/_PushTests.swift
diff --git a/Tests/StorageTests/FileOptionsTests.swift b/Tests/StorageTests/FileOptionsTests.swift
diff --git a/Tests/StorageTests/StorageFileAPITests.swift b/Tests/StorageTests/StorageFileAPITests.swift

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import Foundation`
`2`		`-import Helpers`
`3`	`2`
`4`	`3`	`#if canImport(FoundationNetworking)`
`5`	`4`	`import FoundationNetworking`