Tidy up a bit

Author: mattesmohr

Sources/HTMLKit/Abstraction/Attributes/BasicAttributes.swift

@@ -3205,6 +3205,7 @@ public protocol ShapeAttribute: Attribute {
     /// ```
     ///
     /// - Parameter value: The shape used to interpret the coordinates.
+    /// - Parameter coordinates: The coordinates on which to base the shape.
     ///
     /// - Returns: The element
     func shape(_ value: Values.Shape, coordinates: String) -> Self
@@ -4338,14 +4339,14 @@ public protocol PopoverTargetAttribute: Attribute {
     /// Button {
     ///     "Lorem ipsum"
     /// }
-    /// .popoverTarget("id", as: .hide)
+    /// .popoverTarget("id", action: .hide)
     /// ```
     ///
     /// - Parameter id: The identifier of the target to bind the popover to.
     /// - Parameter action: The action to perform when triggered.
     ///
     /// - Returns: The element
-    func popoverTarget(_ id: String, as action: Values.Popover.Action) -> Self
+    func popoverTarget(_ id: String, action: Values.Popover.Action?) -> Self
 }
 
 extension PopoverTargetAttribute where Self: ContentNode {
@@ -4354,8 +4355,13 @@ extension PopoverTargetAttribute where Self: ContentNode {
         return self.mutate(key: "popovertarget", value: value)
     }
 
-    internal func mutate(popovertargetaction value: String) -> Self {
-        return self.mutate(key: "popovertargetaction", value: value)
+    internal func mutate(popovertargetaction value: String?) -> Self {
+        
+        if let value = value {
+            return self.mutate(key: "popovertargetaction", value: value)
+        }
+        
+        return self
     }
 }
 
@@ -4365,8 +4371,13 @@ extension PopoverTargetAttribute where Self: EmptyNode {
         return self.mutate(key: "popovertarget", value: value)
     }
 
-    internal func mutate(popovertargetaction value: String) -> Self {
-        return self.mutate(key: "popovertargetaction", value: value)
+    internal func mutate(popovertargetaction value: String?) -> Self {
+        
+        if let value = value {
+            return self.mutate(key: "popovertargetaction", value: value)
+        }
+        
+        return self
     }
 }
 

Sources/HTMLKit/Abstraction/Elements/FormElements.swift

@@ -403,11 +403,11 @@ extension Input: GlobalAttributes, GlobalEventAttributes, AcceptAttribute, Alter
         return mutate(popover: value.rawValue)
     }
 
-    public func popoverTarget(_ value: String, as action: Values.Popover.Action = .toggle) -> Input {
-        return mutate(popovertarget: value).mutate(popovertargetaction: action.rawValue)
+    public func popoverTarget(_ value: String, action: Values.Popover.Action? = nil) -> Input {
+        return mutate(popovertarget: value).mutate(popovertargetaction: action?.rawValue)
     }
 
-    @available(*, deprecated, message: "Use the popoverTarget(_:as:) modifier instead.")
+    @available(*, deprecated, message: "Use the popoverTarget(_:action:) modifier instead.")
     public func popoverAction(_ value: Values.Popover.Action) -> Input {
         return mutate(popoveraction: value.rawValue)
     }
@@ -1767,11 +1767,11 @@ extension Button: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes,
         return mutate(popover: value.rawValue)
     }
 
-    public func popoverTarget(_ value: String, as action: Values.Popover.Action = .toggle) -> Button {
-        return mutate(popovertarget: value).mutate(popovertargetaction: action.rawValue)
+    public func popoverTarget(_ value: String, action: Values.Popover.Action? = nil) -> Button {
+        return mutate(popovertarget: value).mutate(popovertargetaction: action?.rawValue)
     }
 
-    @available(*, deprecated, message: "Use the popoverTarget(_:as:) modifier instead.")
+    @available(*, deprecated, message: "Use the popoverTarget(_:action:) modifier instead.")
     public func popoverAction(_ value: Values.Popover.Action) -> Button {
         return mutate(popoveraction: value.rawValue)
     }

Sources/HTMLKit/Abstraction/Elements/MapElements.swift

@@ -242,6 +242,11 @@ extension Area: GlobalAttributes, GlobalEventAttributes, GlobalAriaAttributes, A
         return mutate(coords: value)
     }
 
+    @available(*, deprecated, message: "Use the shape(_:coordinates:) modifier instead.")
+    public func shape(_ value: Values.Shape) -> Area {
+        return mutate(shape: value.rawValue)
+    }
+    
     public func shape() -> Area {
         return mutate(shape: "default")
     }

Sources/HTMLKit/Abstraction/Tokens/ValueTokens.swift

@@ -1943,7 +1943,7 @@ public enum Values {
         /// Button {
         ///     "Lorem ipsum"
         /// }
-        /// .popoverTarget("id", as: .hide)
+        /// .popoverTarget("id", action: .hide)
         /// ```
         public enum Action: String {
 

Tests/HTMLKitTests/AttributesTests.swift

@@ -750,8 +750,8 @@ final class AttributesTests: XCTestCase {
             return self.mutate(popover: value.rawValue)
         }
 
-        func popoverTarget(_ id: String, as action: Values.Popover.Action = .toggle) -> Tag {
-            return self.mutate(popovertarget: id).mutate(popovertargetaction: action.rawValue)
+        func popoverTarget(_ id: String, action: Values.Popover.Action? = nil) -> Tag {
+            return self.mutate(popovertarget: id).mutate(popovertargetaction: action?.rawValue)
         }
 
         func popoverAction(_ value: Values.Popover.Action) -> Tag {
@@ -2420,12 +2420,12 @@ final class AttributesTests: XCTestCase {
 
         let view = TestView {
             Tag {}.popoverTarget("id")
-            Tag {}.popoverTarget("id", as: .hide)
+            Tag {}.popoverTarget("id", action: .hide)
         }
 
         XCTAssertEqual(try renderer.render(view: view),
                        """
-                       <tag popovertarget="id" popovertargetaction="toggle"></tag>\
+                       <tag popovertarget="id"></tag>\
                        <tag popovertarget="id" popovertargetaction="hide"></tag>
                        """
         )