replace to HTTPTypes.HTTPRequest.Method from HTTPMethod

Author: zunda-pixel

Sources/Functions/Types.swift

@@ -99,7 +99,7 @@ public struct FunctionInvokeOptions: Sendable {
     case delete = "DELETE"
   }
 
-  var httpMethod: HTTPMethod? {
+  var httpMethod: HTTPTypes.HTTPRequest.Method? {
     switch method {
     case .get:
       .get

Sources/Helpers/HTTP/HTTPRequest.swift

@@ -14,14 +14,14 @@ import HTTPTypes
 
 package struct HTTPRequest: Sendable {
   package var url: URL
-  package var method: HTTPMethod
+  package var method: HTTPTypes.HTTPRequest.Method
   package var query: [URLQueryItem]
   package var headers: HTTPFields
   package var body: Data?
 
   package init(
     url: URL,
-    method: HTTPMethod,
+    method: HTTPTypes.HTTPRequest.Method,
     query: [URLQueryItem] = [],
     headers: HTTPFields = [:],
     body: Data? = nil
@@ -35,7 +35,7 @@ package struct HTTPRequest: Sendable {
 
   package init?(
     urlString: String,
-    method: HTTPMethod,
+    method: HTTPTypes.HTTPRequest.Method,
     query: [URLQueryItem] = [],
     headers: HTTPFields = [:],
     body: Data?
@@ -58,18 +58,6 @@ package struct HTTPRequest: Sendable {
   }
 }
 
-package enum HTTPMethod: String, Sendable {
-  case get = "GET"
-  case head = "HEAD"
-  case post = "POST"
-  case put = "PUT"
-  case delete = "DELETE"
-  case connect = "CONNECT"
-  case trace = "TRACE"
-  case patch = "PATCH"
-  case options = "OPTIONS"
-}
-
 extension [URLQueryItem] {
   package mutating func appendOrUpdate(_ queryItem: URLQueryItem) {
     if let index = firstIndex(where: { $0.name == queryItem.name }) {

Sources/Helpers/HTTP/RetryRequestInterceptor.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import HTTPTypes
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
@@ -25,7 +26,7 @@ package actor RetryRequestInterceptor: HTTPClientInterceptor {
   package static let defaultExponentialBackoffScale: Double = 0.5
 
   /// The default set of retryable HTTP methods.
-  package static let defaultRetryableHTTPMethods: Set<HTTPMethod> = [
+  package static let defaultRetryableHTTPMethods: Set<HTTPTypes.HTTPRequest.Method> = [
     .delete, .get, .head, .options, .put, .trace,
   ]
 
@@ -52,7 +53,7 @@ package actor RetryRequestInterceptor: HTTPClientInterceptor {
   /// The scale factor for exponential backoff.
   package let exponentialBackoffScale: Double
   /// The set of retryable HTTP methods.
-  package let retryableHTTPMethods: Set<HTTPMethod>
+  package let retryableHTTPMethods: Set<HTTPTypes.HTTPRequest.Method>
   /// The set of retryable HTTP status codes.
   package let retryableHTTPStatusCodes: Set<Int>
   /// The set of retryable URL error codes.
@@ -71,7 +72,7 @@ package actor RetryRequestInterceptor: HTTPClientInterceptor {
     retryLimit: Int = RetryRequestInterceptor.defaultRetryLimit,
     exponentialBackoffBase: UInt = RetryRequestInterceptor.defaultExponentialBackoffBase,
     exponentialBackoffScale: Double = RetryRequestInterceptor.defaultExponentialBackoffScale,
-    retryableHTTPMethods: Set<HTTPMethod> = RetryRequestInterceptor.defaultRetryableHTTPMethods,
+    retryableHTTPMethods: Set<HTTPTypes.HTTPRequest.Method> = RetryRequestInterceptor.defaultRetryableHTTPMethods,
     retryableHTTPStatusCodes: Set<Int> = RetryRequestInterceptor.defaultRetryableHTTPStatusCodes,
     retryableErrorCodes: Set<URLError.Code> = RetryRequestInterceptor.defaultRetryableURLErrorCodes
   ) {

Sources/Storage/StorageApi.swift

@@ -54,7 +54,7 @@ public class StorageApi: @unchecked Sendable {
 extension Helpers.HTTPRequest {
   init(
     url: URL,
-    method: HTTPMethod,
+    method: HTTPTypes.HTTPRequest.Method,
     query: [URLQueryItem],
     formData: MultipartFormData,
     options: FileOptions,

Sources/Storage/StorageFileApi.swift

@@ -45,7 +45,7 @@ public class StorageFileApi: StorageApi, @unchecked Sendable {
   }
 
   private func _uploadOrUpdate(
-    method: HTTPMethod,
+    method: HTTPTypes.HTTPRequest.Method,
     path: String,
     formData: MultipartFormData,
     options: FileOptions?