Rename var content to var body

.swift-version

@@ -0,0 +1 @@
+6.2.1

Benchmarks/Benchmarks/ElementaryBenchmarks/Benchmarks.swift

@@ -252,15 +252,15 @@ struct MyCustomElement<H: HTML>: HTML {
         myContent = content()
     }
 
-    var content: some HTML {
+    var body: some HTML {
         myContent
     }
 }
 
 struct MyListItem: HTML {
     let number: Int
 
-    var content: some HTML {
+    var body: some HTML {
         let isEven = number.isMultiple(of: 2)
 
         li(.id("\(number)")) {

Examples/HummingbirdDemo/.swift-version

@@ -0,0 +1 @@
+6.2.1

Examples/HummingbirdDemo/Sources/App/Pages.swift

@@ -25,7 +25,7 @@ struct MainLayout<Body: HTML>: HTMLDocument {
 }
 
 struct WelcomePage: HTML {
-    var content: some HTML {
+    var body: some HTML {
         div(.class("flex flex-col gap-4")) {
             p {
                 "This is a simple example of using "
@@ -52,7 +52,7 @@ struct GreetingPage: HTML {
     @Environment(requiring: EnvironmentValues.$name) var name
     var greetingCount: Int
 
-    var content: some HTML {
+    var body: some HTML {
         if greetingCount < 1 {
             p(.class("text-red-500")) {
                 "No greetings to show."

README.md

@@ -35,7 +35,7 @@ struct MainPage: HTMLDocument {
 struct FeatureList: HTML {
     var features: [String]
 
-    var content: some HTML {
+    var body: some HTML {
         ul {
             for feature in features {
                 li { feature }
@@ -122,7 +122,7 @@ struct List: HTML {
     var items: [String]
     var importantIndex: Int
 
-    var content: some HTML {
+    var body: some HTML {
         // conditional rendering
         if items.isEmpty {
             p { "No items" }
@@ -142,7 +142,7 @@ struct ListItem: HTML {
     var text: String
     var isImportant: Bool = false
 
-    var content: some HTML {
+    var body: some HTML {
         // conditional attributes
         li { text }
             .attributes(.class("important"), when: isImportant)
@@ -183,7 +183,7 @@ struct Button: HTML {
     var text: String
 
     // by exposing the HTMLTag type information...
-    var content: some HTML<HTMLTag.input> {
+    var body: some HTML<HTMLTag.input> {
         input(.type(.button), .value(text))
     }
 }
@@ -209,7 +209,7 @@ div {
 }
 
 struct MyComponent: HTML {
-    var content: some HTML {
+    var body: some HTML {
         AsyncContent {
             "So does this: \(await getMoreData())"
         }
@@ -245,7 +245,7 @@ struct MyComponent: HTML {
     // ... their values can be accessed ...
     @Environment(MyValues.$userName) var userName
 
-    var content: some HTML {
+    var body: some HTML {
         p { "Hello, \(userName)!" }
     }
 }

Sources/Elementary/Core/AsyncContent.swift

@@ -3,9 +3,11 @@
 /// The this element can only be rendered in an async context (ie: by calling ``HTML/render(into:chunkSize:)`` or ``HTML/renderAsync()``).
 /// All HTML tag types (``HTMLElement``) support async content closures in their initializers, so you don't need to use this element directly in most cases.
 public struct AsyncContent<Content: HTML>: HTML, Sendable {
+    public typealias Body = Never
+    public typealias Tag = Content.Tag
+
     @usableFromInline
     var content: @Sendable () async throws -> Content
-    public typealias Tag = Content.Tag
 
     /// Creates a new async HTML element with the specified content.
     ///

Sources/Elementary/Core/AsyncForEach.swift

@@ -12,6 +12,8 @@
 /// }
 /// ```
 public struct AsyncForEach<Source: AsyncSequence, Content: HTML>: HTML {
+    public typealias Body = Never
+
     @usableFromInline
     var sequence: Source
     @usableFromInline

Sources/Elementary/Core/CoreModel.swift

@@ -7,7 +7,7 @@
 /// struct FeatureList: HTML {
 ///   var features: [String]
 ///
-///   var content: some HTML {
+///   var body: some HTML {
 ///     ul {
 ///       for feature in features {
 ///         li { feature }
@@ -22,13 +22,18 @@ public protocol HTML<Tag> {
     /// The Tag type defines which attributes can be attached to an HTML element.
     /// If an element does not represent a specific HTML tag, the Tag type will
     /// be ``Swift/Never`` and the element cannot be attributed.
-    associatedtype Tag: HTMLTagDefinition = Content.Tag
+    associatedtype Tag: HTMLTagDefinition = Body.Tag
 
     /// The type of the HTML content this component represents.
-    associatedtype Content: HTML = Never
+    associatedtype Body: HTML
 
     /// The HTML content of this component.
-    @HTMLBuilder var content: Content { get }
+    @HTMLBuilder var body: Body { get }
+
+    /// The HTML content of this component.
+    @HTMLBuilder
+    @available(*, deprecated, message: "`var content` is deprecated, use `var body` instead")
+    var content: Body { get }
 
     static func _render<Renderer: _HTMLRendering>(
         _ html: consuming Self,
@@ -42,6 +47,21 @@ public protocol HTML<Tag> {
     ) async throws
 }
 
+extension HTML {
+    @available(*, deprecated, message: "`var content` is deprecated, use `var body` instead")
+    public var body: Body {
+        // NOTE: sorry for the change
+        content
+    }
+
+    @available(*, deprecated, message: "Content was renamed, use Body instead")
+    public typealias Content = Body
+
+    public var content: Body {
+        fatalError("Please make sure to add a `var body` implementation to your HTML type.")
+    }
+}
+
 /// A type that represents an HTML tag.
 public protocol HTMLTagDefinition: Sendable {
     /// The name of the HTML tag as it is rendered in an HTML document.
@@ -93,7 +113,7 @@ public extension HTML {
         into renderer: inout Renderer,
         with context: consuming _RenderingContext
     ) {
-        Content._render(html.content, into: &renderer, with: context)
+        Body._render(html.body, into: &renderer, with: context)
     }
 
     @inlinable
@@ -102,7 +122,7 @@ public extension HTML {
         into renderer: inout Renderer,
         with context: consuming _RenderingContext
     ) async throws {
-        try await Content._render(html.content, into: &renderer, with: context)
+        try await Body._render(html.body, into: &renderer, with: context)
     }
 }
 

Sources/Elementary/Core/Environment.swift

@@ -11,7 +11,7 @@
 /// struct MyNumber: HTML {
 ///     @Environment(Values.$myNumber) var number
 ///
-///     var content: some HTML {
+///     var body: some HTML {
 ///         p { "\(number)" }
 ///     }
 /// }

Sources/Elementary/Core/Html+Attributes.swift

@@ -64,6 +64,9 @@ extension HTMLAttribute {
 }
 
 public struct _AttributedElement<Content: HTML>: HTML {
+    public typealias Body = Never
+    public typealias Tag = Content.Tag
+
     public var content: Content
     public var attributes: _AttributeStorage
 

Sources/Elementary/Core/Html+Elements.swift

@@ -2,6 +2,9 @@
 public struct HTMLElement<Tag: HTMLTagDefinition, Content: HTML>: HTML where Tag: HTMLTrait.Paired {
     /// The type of the HTML tag this element represents.
     public typealias Tag = Tag
+    public typealias Body = Never
+    public typealias Content = Content
+
     public var _attributes: _AttributeStorage
 
     // The content of the element.

Sources/Elementary/Core/HtmlBuilder.swift

@@ -49,8 +49,8 @@
     }
 }
 
-public extension HTML where Content == Never {
-    var content: Never {
+public extension HTML where Body == Never {
+    var body: Never {
         #if hasFeature(Embedded)
         fatalError("content was called on an unsupported type")
         #else
@@ -61,7 +61,7 @@ public extension HTML where Content == Never {
 
 extension Never: HTML {
     public typealias Tag = Never
-    public typealias Content = Never
+    public typealias Body = Never
 }
 
 extension Optional: HTML where Wrapped: HTML {

Sources/Elementary/HtmlDocument.swift

@@ -41,8 +41,50 @@ public protocol HTMLDocument: HTML {
     @HTMLBuilder var body: HTMLBody { get }
 }
 
+// NOTE: The default implementation uses an empty string as the "magic value" for undefined.
+// This is to avoid the need for an optional `lang` or `dir`` property on the protocol,
+// which would cause confusing issues when adopters provide a property of a non-optional type.
+private let defaultUndefinedLanguage = ""
+private let defaultUndefinedDirection = ""
+
 public extension HTMLDocument {
-    @HTMLBuilder var content: some HTML {
+    /// The default value for the `lang` property is an empty string and will not be rendered in the HTML.
+    var lang: String { defaultUndefinedLanguage }
+    /// The default value for the `dir` property is an empty string and will not be rendered in the HTML.
+    var dir: HTMLAttributeValue.Direction { .init(value: defaultUndefinedDirection) }
+}
+
+// NOTE: this is a bit messy after the renaming of var content to var body
+public extension HTMLDocument {
+    static func _render<Renderer: _HTMLRendering>(
+        _ html: consuming Self,
+        into renderer: inout Renderer,
+        with context: consuming _RenderingContext
+    ) {
+        func render<H: HTML>(_ html: H, into renderer: inout some _HTMLRendering, with context: consuming _RenderingContext) {
+            H._render(html, into: &renderer, with: context)
+        }
+
+        render(html.__body, into: &renderer, with: context)
+    }
+
+    static func _render<Renderer: _AsyncHTMLRendering>(
+        _ html: consuming Self,
+        into renderer: inout Renderer,
+        with context: consuming _RenderingContext
+    ) async throws {
+        func render<H: HTML>(
+            _ html: H,
+            into renderer: inout some _AsyncHTMLRendering,
+            with context: consuming _RenderingContext
+        ) async throws {
+            try await H._render(html, into: &renderer, with: context)
+        }
+
+        try await render(html.__body, into: &renderer, with: context)
+    }
+
+    @HTMLBuilder var __body: some HTML {
         HTMLRaw("<!DOCTYPE html>")
         html {
             Elementary.head {
@@ -55,16 +97,3 @@ public extension HTMLDocument {
         .attributes(.dir(dir), when: dir.value != defaultUndefinedDirection)
     }
 }
-
-// NOTE: The default implementation uses an empty string as the "magic value" for undefined.
-// This is to avoid the need for an optional `lang` or `dir`` property on the protocol,
-// which would cause confusing issues when adopters provide a property of a non-optional type.
-private let defaultUndefinedLanguage = ""
-private let defaultUndefinedDirection = ""
-
-public extension HTMLDocument {
-    /// The default value for the `lang` property is an empty string and will not be rendered in the HTML.
-    var lang: String { defaultUndefinedLanguage }
-    /// The default value for the `dir` property is an empty string and will not be rendered in the HTML.
-    var dir: HTMLAttributeValue.Direction { .init(value: defaultUndefinedDirection) }
-}

Tests/ElementaryTests/AsyncRenderingTests.swift

@@ -92,7 +92,7 @@ final class AsyncRenderingTests: XCTestCase {
 
 private struct AwaitedP: HTML {
     var number: Int
-    var content: some HTML {
+    var body: some HTML {
         AsyncContent {
             let _ = try await Task.sleep(for: .milliseconds(1))
             p { "\(number)" }

Tests/ElementaryTests/CompositionRenderingTest.swift

@@ -65,7 +65,7 @@ struct MyList: HTML {
     var items: [String]
     var selectedIndex: Int
 
-    var content: some HTML {
+    var body: some HTML {
         ul {
             for (index, item) in items.enumerated() {
                 MyListItem(text: item, isSelected: index == selectedIndex)
@@ -79,7 +79,7 @@ struct MyListItem: HTML {
     var text: String
     var isSelected: Bool = false
 
-    var content: some HTML<HTMLTag.li> {
+    var body: some HTML<HTMLTag.li> {
         li { text }
             .attributes(.class("selected"), when: isSelected)
     }

Tests/ElementaryTests/EnvironmentRenderingTests.swift

@@ -28,14 +28,14 @@ final class EnvironmentRenderingTests: XCTestCase {
 struct MyNumber: HTML {
     @Environment(Values.$number) var number
 
-    var content: some HTML {
+    var body: some HTML {
         "\(number)"
     }
 }
 
 struct MyDatabaseValue: HTML {
     @Environment(requiring: Values.$database) var database
-    var content: some HTML {
+    var body: some HTML {
         p {
             await database.value
         }

Tests/ElementaryTests/SendableAnyHTMLBox.swift

@@ -29,7 +29,7 @@ class NonSendable {
 
 struct MyComponent: HTML {
     let ns = NonSendable()
-    var content: some HTML {
+    var body: some HTML {
         div { "\(ns.x)" }
     }
 }

Tests/ElementaryTests/TextRenderingTests.swift

@@ -71,7 +71,7 @@ class Bar {
 class JO: HTML {
     var bar: Bar = .init()
 
-    var content: some HTML {
+    var body: some HTML {
         "Hello, World!"
     }
 }