feat: use structs instead of enums for value types

Author: alephao

Sources/HTTPTypesHtmx/HtmxResponseHeaders.swift

@@ -223,13 +223,7 @@ extension HTTPFields {
   ///
   /// [https://htmx.org/headers/hx-push-url/](https://htmx.org/headers/hx-push-url/)
   public var hxPushUrl: HxPushUrl? {
-    guard let value = self[.hxPushUrl] else {
-      return nil
-    }
-    switch value {
-    case "false": return .false
-    default: return .url(value)
-    }
+    self[.hxPushUrl].map(HxPushUrl.init(_:))
   }
 
   /// Returns the value of an HX-Redirect response header
@@ -256,13 +250,7 @@ extension HTTPFields {
   ///
   /// [https://htmx.org/headers/hx-replace-url/](https://htmx.org/headers/hx-replace-url/)
   public var hxReplaceUrl: HxReplaceUrl? {
-    guard let value = self[.hxReplaceUrl] else {
-      return nil
-    }
-    switch value {
-    case "false": return .false
-    default: return .url(value)
-    }
+    self[.hxReplaceUrl].map(HxReplaceUrl.init(_:))
   }
 
   /// Returns the value of an HX-Reswap response header
@@ -271,7 +259,7 @@ extension HTTPFields {
   ///
   /// [https://htmx.org/reference/#response_headers](https://htmx.org/reference/#response_headers)
   public var hxReswap: HxSwap? {
-    return self[.hxReswap].flatMap(HxSwap.init(rawValue:))
+    return self[.hxReswap].map(HxSwap.init(_:))
   }
 
   /// Returns the value of an HX-Retarget response header

Sources/HTTPTypesHtmx/Values/HxPushUrl.swift

@@ -1,15 +1,18 @@
 /// Possible values for the HX-Push-URL header
-public enum HxPushUrl: Equatable, CustomStringConvertible {
+public struct HxPushUrl: Equatable, CustomStringConvertible {
+  public let description: String
+
+  init(_ description: String) {
+    self.description = description
+  }
+}
+
+extension HxPushUrl {
   /// prevents the browser’s history from being updated.
-  case `false`
+  public static let `false` = HxPushUrl("false")
 
   /// A URL to be pushed into the location bar. This may be relative or absolute, as per [`history.pushState()`](https://developer.mozilla.org/en-US/docs/Web/API/History/pushState).
-  case url(String)
-
-  public var description: String {
-    switch self {
-    case .false: return "false"
-    case .url(let raw): return raw
-    }
+  public static func url(_ string: String) -> HxPushUrl {
+    return HxPushUrl(string)
   }
 }

Sources/HTTPTypesHtmx/Values/HxReplaceUrl.swift

@@ -1,15 +1,18 @@
 /// Possible values for the HX-Replace-URL header
-public enum HxReplaceUrl: Equatable, CustomStringConvertible {
-  /// false, which prevents the browser’s current URL from being updated.
-  case `false`
+public struct HxReplaceUrl: Equatable, CustomStringConvertible {
+  public let description: String
 
-  /// A URL to replace the current URL in the location bar. This may be relative or absolute, as per [`history.replaceState()`](https://developer.mozilla.org/en-US/docs/Web/API/History/replaceState), but must have the same origin as the current URL.
-  case url(String)
+  init(_ description: String) {
+    self.description = description
+  }
+}
 
-  public var description: String {
-    switch self {
-    case .false: return "false"
-    case .url(let raw): return raw
-    }
+extension HxReplaceUrl {
+  /// false, prevents the browser’s current URL from being updated.
+  public static let `false` = HxReplaceUrl("false")
+
+  /// A URL to replace the current URL in the location bar. This may be relative or absolute, as per [`history.replaceState()`](https://developer.mozilla.org/en-US/docs/Web/API/History/replaceState), but must have the same origin as the current URL.
+  public static func url(_ string: String) -> HxReplaceUrl {
+    return HxReplaceUrl(string)
   }
 }

Sources/HTTPTypesHtmx/Values/HxSwap.swift

@@ -1,63 +1,40 @@
 /// Possible values for HX-Reswap header
 ///
 /// [https://htmx.org/attributes/hx-swap/](https://htmx.org/attributes/hx-swap/)
-public enum HxSwap: RawRepresentable, Equatable, CustomStringConvertible {
-  public typealias RawValue = String
+public struct HxSwap: Equatable, CustomStringConvertible, ExpressibleByStringLiteral {
+  public let description: String
 
+  public init(_ description: String) {
+    self.description = description
+  }
+
+  public init(stringLiteral value: StringLiteralType) {
+    self.description = value
+  }
+}
+
+extension HxSwap {
   /// Replace the inner html of the target element
-  case innerHTML
+  public static let innerHTML = HxSwap("innerHTML")
 
   /// Replace the entire target element with the response
-  case outerHTML
+  public static let outerHTML = HxSwap("outerHTML")
 
   /// Insert the response before the target element
-  case beforebegin
+  public static let beforebegin = HxSwap("beforebegin")
 
   /// Insert the response before the first child of the target element
-  case afterbegin
+  public static let afterbegin = HxSwap("afterbegin")
 
   /// Insert the response after the last child of the target element
-  case beforeend
+  public static let beforeend = HxSwap("beforeend")
 
   /// Insert the response after the target element
-  case afterend
+  public static let afterend = HxSwap("afterend")
 
   /// Deletes the target element regardless of the response
-  case delete
+  public static let delete = HxSwap("delete")
 
   /// Does not append content from response (out of band items will still be processed).
-  case none
-
-  /// Fallback if you need a value other than the ones avaiable
-  case raw(String)
-
-  public var rawValue: String {
-    switch self {
-    case .innerHTML: return "innerHTML"
-    case .outerHTML: return "outerHTML"
-    case .beforebegin: return "beforebegin"
-    case .afterbegin: return "afterbegin"
-    case .beforeend: return "beforeend"
-    case .afterend: return "afterend"
-    case .delete: return "delete"
-    case .none: return "none"
-    case .raw(let string): return string
-    }
-  }
-
-  public var description: String { rawValue }
-
-  public init(rawValue: String) {
-    switch rawValue {
-    case "innerHTML": self = .innerHTML
-    case "outerHTML": self = .outerHTML
-    case "beforebegin": self = .beforebegin
-    case "afterbegin": self = .afterbegin
-    case "beforeend": self = .beforeend
-    case "afterend": self = .afterend
-    case "delete": self = .delete
-    case "none": self = .none
-    default: self = .raw(rawValue)
-    }
-  }
+  public static let none = HxSwap("none")
 }

Tests/HTTPTypesHtmxTests/HtmxResponseHeadersTests.swift

@@ -36,7 +36,7 @@ final class ResponseHeadersTests: XCTestCase {
     XCTAssertEqual(HTTPField.hxReswap(.delete).description, "HX-Reswap: delete")
     XCTAssertEqual(HTTPField.hxReswap(.none).description, "HX-Reswap: none")
     XCTAssertEqual(
-      HTTPField.hxReswap(.raw("raw this can be anything")).description,
+      HTTPField.hxReswap("raw this can be anything").description,
       "HX-Reswap: raw this can be anything"
     )
     XCTAssertEqual(HTTPField.hxRetarget("cssSelector").description, "HX-Retarget: cssSelector")
@@ -114,7 +114,7 @@ final class ResponseHeadersTests: XCTestCase {
       (HTTPField.hxReswap(.afterend), .afterend),
       (HTTPField.hxReswap(.delete), .delete),
       (HTTPField.hxReswap(.none), .none),
-      (HTTPField.hxReswap(.raw("any value")), .raw("any value")),
+      (HTTPField.hxReswap("any value"), "any value"),
     ]
     for (header, value) in headersHxReswap {
       XCTAssertEqual(HTTPFields([header]).hxReswap, value)