Skip to content

Commit 33ae99f

Browse files
committed
Elements tests for all non-legacy/deprecated elements
Workaround for direct HTML conformance not compiling for Input: extension HTMLVoidElement where Self: HTMLElementTypes.HTMLElement & HTML { public func callAsFunction( ) -> some PointFreeHTML.HTML { self } } KNOWN ISSUE: have to a call void elements with ()()
1 parent e5bb9d3 commit 33ae99f

File tree

100 files changed

+3909
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+3909
-181
lines changed

Package.resolved

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sources/HTMLElements+PointFreeHTML/<br> Line Break.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@
88
import HTMLElementTypes
99
import PointFreeHTML
1010

11-
extension HTMLElementTypes.BR: @retroactive PointFreeHTML.HTML {}
11+
extension HTMLElementTypes.BR: @retroactive PointFreeHTML.HTML {
12+
public var body: PointFreeHTML.HTMLElement<HTMLEmpty> {
13+
PointFreeHTML.HTMLElement(tag: Self.tag) { PointFreeHTML.HTMLEmpty() }
14+
}
15+
}

Sources/HTMLElements+PointFreeHTML/<frameset> Frameset.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extension HTMLElementTypes.Frameset {
1313
@HTMLBuilder _ content: () -> some PointFreeHTML.HTML
1414
) -> some PointFreeHTML.HTML {
1515
HTMLElement(tag: Self.tag) { content() }
16-
.attribute("cols", self.cols)
17-
.attribute("rows", self.rows)
16+
.cols(self.cols)
17+
.rows(self.rows)
1818
}
1919
}

Sources/HTMLElements+PointFreeHTML/<hr> Thematic Break (Horizontal Rule).swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@
88
import HTMLElementTypes
99
import PointFreeHTML
1010

11-
extension HTMLElementTypes.ThematicBreak: @retroactive PointFreeHTML.HTML {}
11+
extension HTMLElementTypes.ThematicBreak: @retroactive PointFreeHTML.HTML {
12+
public var body: PointFreeHTML.HTMLElement<HTMLEmpty> {
13+
PointFreeHTML.HTMLElement(tag: Self.tag) { PointFreeHTML.HTMLEmpty() }
14+
}
15+
}

Sources/HTMLElements+PointFreeHTML/<img> Image Embed.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ extension HTMLElementTypes.Image: PointFreeHTML.HTML {
1313
HTMLElement(tag: Self.tag)
1414
.src(self.src)
1515
.alt(self.alt)
16-
.attribute("loading", self.loading?.rawValue)
16+
.loading(self.loading)
1717
}
1818
}

Sources/HTMLElements+PointFreeHTML/<input> Input.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77
//
88

9+
import HTMLAttributes_PointFreeHTML
910
import HTMLElementTypes
1011
import PointFreeHTML
1112

Sources/HTMLElements+PointFreeHTML/<link> External Resource Link.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77

88
import HTMLAttributes_PointFreeHTML
99
import HTMLElementTypes
10+
import PointFreeHTML
1011

11-
extension HTMLElementTypes.Link {
12-
public func callAsFunction(
13-
@HTMLBuilder _ content: () -> some PointFreeHTML.HTML
14-
) -> some PointFreeHTML.HTML {
15-
HTMLElement(tag: Self.tag) { content() }
12+
extension HTMLElementTypes.Link: PointFreeHTML.HTML {
13+
public var body: some PointFreeHTML.HTML {
14+
HTMLElement(tag: Self.tag) { HTMLEmpty() }
1615
.`as`(self.`as`)
1716
.blocking(self.blocking)
1817
.crossorigin(self.crossorigin)

Sources/HTMLElements+PointFreeHTML/<meta> Metadata.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77

88
import HTMLAttributes_PointFreeHTML
99
import HTMLElementTypes
10+
import PointFreeHTML
1011

11-
extension HTMLElementTypes.Meta {
12-
public func callAsFunction(
13-
@HTMLBuilder _ content: () -> some PointFreeHTML.HTML
14-
) -> some PointFreeHTML.HTML {
15-
HTMLElement(tag: Self.tag) { content() }
12+
extension HTMLElementTypes.Meta: PointFreeHTML.HTML {
13+
public var body: some PointFreeHTML.HTML {
14+
HTMLElement(tag: Self.tag) { HTMLEmpty() }
1615
.charset(self.charset)
1716
.content(self.content)
1817
.httpEquiv(self.httpEquiv)

Sources/HTMLElements+PointFreeHTML/<option> Option.swift

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,17 @@
77

88
import HTMLAttributes_PointFreeHTML
99
import HTMLElementTypes
10+
import PointFreeHTML
1011

11-
extension HTMLElementTypes.Option {
12+
extension HTMLElementTypes.Option: PointFreeHTML.HTML {
13+
public var body: some HTML {
14+
HTMLElement(tag: Self.tag)
15+
.disabled(self.disabled)
16+
.label(self.label)
17+
.selected(self.selected)
18+
.value(self.value)
19+
}
20+
1221
public func callAsFunction(
1322
@HTMLBuilder _ content: () -> some PointFreeHTML.HTML
1423
) -> some PointFreeHTML.HTML {

Sources/HTMLElements+PointFreeHTML/<param> Object Parameter.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77

88
import HTMLAttributes_PointFreeHTML
99
import HTMLElementTypes
10+
import PointFreeHTML
1011

11-
extension HTMLElementTypes.Param {
12-
public func callAsFunction(
13-
@HTMLBuilder _ content: () -> some PointFreeHTML.HTML
14-
) -> some PointFreeHTML.HTML {
15-
HTMLElement(tag: Self.tag) { content() }
12+
extension HTMLElementTypes.Param: PointFreeHTML.HTML {
13+
public var body: some PointFreeHTML.HTML {
14+
HTMLElement(tag: Self.tag) { HTMLEmpty() }
1615
.name(self.name)
1716
.value(self.value)
1817
}

0 commit comments

Comments
 (0)