From f6eaed91c344b21f1dd8f1b9a4304d1d76bbc11e Mon Sep 17 00:00:00 2001
From: Skwiggs <6209874+MrSkwiggs@users.noreply.github.com>
Date: Mon, 11 May 2026 11:51:08 +0200
Subject: [PATCH 1/8] Refactor Markup to conform to StringInterpolation

---
 Sources/Ignite/Framework/Markup.swift | 84 ++++++++++++++++++++++++---
 1 file changed, 77 insertions(+), 7 deletions(-)

diff --git a/Sources/Ignite/Framework/Markup.swift b/Sources/Ignite/Framework/Markup.swift
index 96b2b3300..fd14a5978 100644
--- a/Sources/Ignite/Framework/Markup.swift
+++ b/Sources/Ignite/Framework/Markup.swift
@@ -6,7 +6,7 @@
 //
 
 /// A structure that represents HTML markup content.
-public struct Markup: Sendable {
+public struct Markup: Sendable, ExpressibleByStringLiteral, ExpressibleByStringInterpolation {
     /// The raw HTML string content.
     var string: String
 
@@ -15,10 +15,80 @@ public struct Markup: Sendable {
         return string.isEmpty
     }
 
-    /// Creates a markup instance with the given string.
-    /// - Parameter string: The string to use as HTML markup.
-    init(_ string: String = "") {
-        self.string = string
+    /// Creates an empty markup instance.
+    init() {
+        self.string = ""
+    }
+
+    /// Creates a markup instance from another markup value.
+    /// - Parameter markup: The markup value to copy.
+    init(_ markup: Markup) {
+        self = markup
+    }
+
+    /// Creates a markup instance from a raw string without interpolation handling.
+    /// - Parameter value: The string to use as HTML markup.
+    init(verbatim value: String) {
+        self.string = value
+    }
+
+    /// Creates a markup instance from a static string literal.
+    /// - Parameter value: The string literal to use as HTML markup.
+    public init(stringLiteral value: String) {
+        self.string = value
+    }
+
+    /// Creates a markup instance from an interpolated string literal.
+    /// - Parameter stringInterpolation: The accumulated interpolation state.
+    public init(stringInterpolation: StringInterpolation) {
+        if let context = PublishingContext.current {
+            for registration in stringInterpolation.pendingRegistrations {
+                registration.apply(to: context)
+            }
+        }
+        self.string = stringInterpolation.output
+    }
+
+    /// Accumulator type used by Swift's string-interpolation machinery to build a `Markup`.
+    public struct StringInterpolation: StringInterpolationProtocol {
+        /// The interpolated HTML string assembled so far.
+        var output: String = ""
+
+        /// Any pending publishing-time registrations to be applied.
+        var pendingRegistrations: [PublishingRegistration] = []
+
+        /// Creates a fresh interpolation accumulator with reserved capacity for the literal segments.
+        /// - Parameters:
+        ///   - literalCapacity: The total length of the literal segments in the string.
+        ///   - interpolationCount: The number of interpolations in the string.
+        public init(literalCapacity: Int, interpolationCount: Int) {
+            output.reserveCapacity(literalCapacity)
+        }
+
+        /// Appends a literal segment of the interpolated string.
+        /// - Parameter literal: The literal text between interpolations.
+        public mutating func appendLiteral(_ literal: String) {
+            output += literal
+        }
+
+        /// Appends a set of HTML attributes and queues their publishing-time registrations.
+        /// - Parameter attributes: The attributes to render and harvest from.
+        public mutating func appendInterpolation(_ attributes: CoreAttributes) {
+            pendingRegistrations.append(contentsOf: attributes.publishingRegistrations)
+            output += attributes.description
+        }
+
+        /// Appends another markup value into the interpolation.
+        /// - Parameter markup: The markup whose contents should be appended.
+        public mutating func appendInterpolation(_ markup: Markup) {
+            output += markup.string
+        }
+
+        /// Appends any other value by converting it to a string.
+        /// - Parameter value: The value to render via `String(describing:)`.
+        public mutating func appendInterpolation<T>(_ value: T) {
+            output += String(describing: value)
+        }
     }
 }
 
@@ -29,7 +99,7 @@ extension Array where Element == Markup {
     /// - Returns: A new Markup object with all strings joined
     func joined(separator: String = "") -> Markup {
         let joinedString = self.map { $0.string }.joined(separator: separator)
-        return Markup(joinedString)
+        return Markup(verbatim: joinedString)
     }
 }
 
@@ -40,7 +110,7 @@ extension Markup {
     ///   - rhs: Right-hand side Markup
     /// - Returns: A new Markup with the combined strings
     static func + (lhs: Markup, rhs: Markup) -> Markup {
-        return Markup(lhs.string + rhs.string)
+        return Markup(verbatim: lhs.string + rhs.string)
     }
 
     /// Allows for compound assignment (+=) with another Markup

From c83a3382a0960ad18f821f01cf3302f0ada4f50b Mon Sep 17 00:00:00 2001
From: Skwiggs <6209874+MrSkwiggs@users.noreply.github.com>
Date: Mon, 11 May 2026 11:51:36 +0200
Subject: [PATCH 2/8] Accommodate for Markup refactor

---
 Sources/Ignite/Elements/Image.swift                |  4 ++--
 Sources/Ignite/Elements/Include.swift              |  2 +-
 Sources/Ignite/Elements/List.swift                 |  6 +++---
 Sources/Ignite/Elements/PlainDocument.swift        |  8 ++++----
 Sources/Ignite/Elements/String.swift               |  2 +-
 Sources/Ignite/Elements/Table.swift                |  6 +++---
 Sources/Ignite/Elements/Text.swift                 |  6 +-----
 Sources/Ignite/Elements/Video.swift                |  4 ++--
 Sources/Ignite/Framework/Analytics/Analytics.swift | 12 ++++++------
 9 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/Sources/Ignite/Elements/Image.swift b/Sources/Ignite/Elements/Image.swift
index 670787cfb..69916a80f 100644
--- a/Sources/Ignite/Elements/Image.swift
+++ b/Sources/Ignite/Elements/Image.swift
@@ -120,7 +120,7 @@ public struct Image: InlineElement, LazyLoadable {
             return Markup("<img\(attributes) />")
         }
 
-        var output = "<picture>"
+        var output = Markup("<picture>")
 
         if let darkSourceSet = generateSourceSet(darkVariants), let value = darkSourceSet.value {
             output += "<source media=\"(prefers-color-scheme: dark)\" srcset=\"\(value)\">"
@@ -129,7 +129,7 @@ public struct Image: InlineElement, LazyLoadable {
         // Add the fallback img tag
         output += "<img\(attributes) />"
         output += "</picture>"
-        return Markup(output)
+        return output
     }
 
     /// Renders this element using publishing context passed in.
diff --git a/Sources/Ignite/Elements/Include.swift b/Sources/Ignite/Elements/Include.swift
index 09c6899c3..7d5859100 100644
--- a/Sources/Ignite/Elements/Include.swift
+++ b/Sources/Ignite/Elements/Include.swift
@@ -34,7 +34,7 @@ public struct Include: HTML {
 
         do {
             let string = try String(contentsOf: fileURL)
-            return Markup(string)
+            return Markup(verbatim: string)
         } catch {
             publishingContext.addWarning("""
             Failed to find \(filename) in Includes folder; \
diff --git a/Sources/Ignite/Elements/List.swift b/Sources/Ignite/Elements/List.swift
index eeb4b43b9..a93266cc5 100644
--- a/Sources/Ignite/Elements/List.swift
+++ b/Sources/Ignite/Elements/List.swift
@@ -162,7 +162,7 @@ public struct List: HTML {
     public func markup() -> Markup {
         let listAttributes = getAttributes()
 
-        var output = "<\(listElementName)\(listAttributes)>"
+        var output: Markup = "<\(listElementName)\(listAttributes)>"
 
         for originalItem in items {
             var item = originalItem
@@ -173,7 +173,7 @@ public struct List: HTML {
                 if listStyle != .automatic {
                     listableItem.attributes.append(classes: "list-group-item")
                 }
-                output += listableItem.listMarkup().string
+                output += listableItem.listMarkup()
             } else {
                 let styleClass = listStyle == .automatic ? "" : " class=\"list-group-item\""
                 item.attributes.append(classes: "m-0")
@@ -183,6 +183,6 @@ public struct List: HTML {
 
         output += "</\(listElementName)>"
 
-        return Markup(output)
+        return output
     }
 }
diff --git a/Sources/Ignite/Elements/PlainDocument.swift b/Sources/Ignite/Elements/PlainDocument.swift
index 4224097c3..682c38b88 100644
--- a/Sources/Ignite/Elements/PlainDocument.swift
+++ b/Sources/Ignite/Elements/PlainDocument.swift
@@ -42,11 +42,11 @@ public struct PlainDocument: Document, HTML {
         // Deferred head rendering to accommodate for context updates during body rendering
         let headMarkup = head.markup()
 
-        var output = "<!doctype html>"
+        var output: Markup = "<!doctype html>"
         output += "<html\(attributes)>"
-        output += headMarkup.string
-        output += bodyMarkup.string
+        output += headMarkup
+        output += bodyMarkup
         output += "</html>"
-        return Markup(output)
+        return output
     }
 }
diff --git a/Sources/Ignite/Elements/String.swift b/Sources/Ignite/Elements/String.swift
index a93dcc41e..df33a80bc 100644
--- a/Sources/Ignite/Elements/String.swift
+++ b/Sources/Ignite/Elements/String.swift
@@ -14,6 +14,6 @@ extension String: InlineElement, FormItem {
     /// Renders this element using publishing context passed in.
     /// - Returns: The HTML for this element.
     public func markup() -> Markup {
-        Markup(self)
+        Markup(verbatim: self)
     }
 }
diff --git a/Sources/Ignite/Elements/Table.swift b/Sources/Ignite/Elements/Table.swift
index 2a87a0cba..1f495bf87 100644
--- a/Sources/Ignite/Elements/Table.swift
+++ b/Sources/Ignite/Elements/Table.swift
@@ -164,7 +164,7 @@ public struct Table: HTML {
             tableAttributes.append(classes: ["table-striped-columns"])
         }
 
-        var output = ""
+        var output = Markup()
 
         if let filterTitle {
             tableAttributes.id = "table-\(UUID().uuidString.truncatedHash)"
@@ -190,9 +190,9 @@ public struct Table: HTML {
         }
 
         output += "<tbody>"
-        output += rows.markupString()
+        output += Markup(verbatim: rows.markupString())
         output += "</tbody>"
         output += "</table>"
-        return Markup(output)
+        return output
     }
 }
diff --git a/Sources/Ignite/Elements/Text.swift b/Sources/Ignite/Elements/Text.swift
index 8cd4d39e2..4dc904bfc 100644
--- a/Sources/Ignite/Elements/Text.swift
+++ b/Sources/Ignite/Elements/Text.swift
@@ -160,11 +160,7 @@ public struct Text: HTML, DropdownItem {
                 .attributes(attributes)
                 .markup()
         } else {
-            Markup(
-                "<\(font.rawValue)\(attributes)>" +
-                content.markupString() +
-                "</\(font.rawValue)>"
-            )
+            Markup("<\(font.rawValue)\(attributes)>\(content.markupString())</\(font.rawValue)>")
         }
     }
 }
diff --git a/Sources/Ignite/Elements/Video.swift b/Sources/Ignite/Elements/Video.swift
index e41d24229..1cfbfc500 100644
--- a/Sources/Ignite/Elements/Video.swift
+++ b/Sources/Ignite/Elements/Video.swift
@@ -34,7 +34,7 @@ public struct Video: InlineElement, LazyLoadable {
     ///   - files: The user videos to render.
     /// - Returns: The HTML for this element.
     private func render(files: [String]) -> Markup {
-        var output = "<video controls\(attributes)>"
+        var output: Markup = "<video controls\(attributes)>"
 
         for filename in files {
             if let fileType = videoType(for: filename) {
@@ -44,7 +44,7 @@ public struct Video: InlineElement, LazyLoadable {
 
         output += "Your browser does not support the video tag."
         output += "</video>"
-        return Markup(output)
+        return output
     }
 
     /// Renders this element using publishing context passed in.
diff --git a/Sources/Ignite/Framework/Analytics/Analytics.swift b/Sources/Ignite/Framework/Analytics/Analytics.swift
index f255f79bb..e6a11c93d 100644
--- a/Sources/Ignite/Framework/Analytics/Analytics.swift
+++ b/Sources/Ignite/Framework/Analytics/Analytics.swift
@@ -27,22 +27,22 @@ public struct Analytics: HeadElement {
     public func markup() -> Markup {
         switch service {
         case .googleAnalytics(let measurementID):
-            Markup(googleAnalyticsCode(for: measurementID))
+            Markup(verbatim: googleAnalyticsCode(for: measurementID))
 
         case .plausible(let domain, let measurements):
-            Markup(plausibleCode(for: domain, using: measurements))
+            Markup(verbatim: plausibleCode(for: domain, using: measurements))
 
         case .fathom(let siteID):
-            Markup(fathomCode(for: siteID))
+            Markup(verbatim: fathomCode(for: siteID))
 
         case .clicky(let siteID):
-            Markup(clickyCode(for: siteID))
+            Markup(verbatim: clickyCode(for: siteID))
 
         case .telemetryDeck(let siteID):
-            Markup(telemetryDeckCode(for: siteID))
+            Markup(verbatim: telemetryDeckCode(for: siteID))
 
         case .custom(let code):
-            Markup(code)
+            Markup(verbatim: code)
         }
     }
 

From c0711ef77d8d0e45f690287e6a17a83baf3cb3bc Mon Sep 17 00:00:00 2001
From: Skwiggs <6209874+MrSkwiggs@users.noreply.github.com>
Date: Mon, 11 May 2026 11:52:00 +0200
Subject: [PATCH 3/8] Remove registration side-effect

This is now handled by Markup directly
---
 Sources/Ignite/Framework/CoreAttributes.swift | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/Sources/Ignite/Framework/CoreAttributes.swift b/Sources/Ignite/Framework/CoreAttributes.swift
index 41e18c32f..cc5d013b7 100644
--- a/Sources/Ignite/Framework/CoreAttributes.swift
+++ b/Sources/Ignite/Framework/CoreAttributes.swift
@@ -77,8 +77,7 @@ public struct CoreAttributes: Equatable, Sendable, CustomStringConvertible {
 
     /// All core attributes collapsed down to a single string for easy application.
     public var description: String {
-        registerPublishingRequirements()
-        return "\(idString)\(customAttributeString)\(classString)\(styleString)\(dataString)\(ariaString)\(eventString)"
+        "\(idString)\(customAttributeString)\(classString)\(styleString)\(dataString)\(ariaString)\(eventString)"
     }
 
     /// The ID of this element, if set.
@@ -337,12 +336,4 @@ public struct CoreAttributes: Equatable, Sendable, CustomStringConvertible {
         publishingRegistrations.formUnion(other.publishingRegistrations)
     }
 
-    /// Applies publishing-time registrations when a publishing context is active.
-    private func registerPublishingRequirements() {
-        guard let context = PublishingContext.current else { return }
-
-        for registration in publishingRegistrations {
-            registration.apply(to: context)
-        }
-    }
 }

From 4a44848e50c6f0a273f8f6719696acb003765668 Mon Sep 17 00:00:00 2001
From: Skwiggs <6209874+MrSkwiggs@users.noreply.github.com>
Date: Mon, 11 May 2026 11:54:20 +0200
Subject: [PATCH 4/8] Add tests to validate markup context registration

---
 .../PublishingContextPreconstruction.swift    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/Tests/IgniteTesting/Publishing/PublishingContextPreconstruction.swift b/Tests/IgniteTesting/Publishing/PublishingContextPreconstruction.swift
index c3224b6ca..8925080fa 100644
--- a/Tests/IgniteTesting/Publishing/PublishingContextPreconstruction.swift
+++ b/Tests/IgniteTesting/Publishing/PublishingContextPreconstruction.swift
@@ -65,6 +65,34 @@ struct PublishingContextPreconstructionTests {
         #expect(responsiveCSS.contains("display: none"))
     }
 
+    @Test("CoreAttributes.description is pure inside a context")
+    func descriptionIsPureInsideContext() throws {
+        let context = try PublishingContext.initialize(for: TestSite(), from: #filePath)
+        let font = Font.custom("DescriptionOnlyFont", size: .px(12))
+        var attrs = CoreAttributes()
+        attrs.append(publishingRegistration: .fontFamily(font))
+
+        PublishingContext.withCurrent(context) {
+            _ = String(describing: attrs)
+        }
+
+        #expect(!context.cssManager.customFonts.contains(font))
+    }
+
+    @Test("Markup string-interpolation registers publishing context")
+    func markupInterpolationRegistersPublishingContext() throws {
+        let context = try PublishingContext.initialize(for: TestSite(), from: #filePath)
+        let font = Font.custom("SomeFont", size: .px(12))
+        var attrs = CoreAttributes()
+        attrs.append(publishingRegistration: .fontFamily(font))
+
+        PublishingContext.withCurrent(context) {
+            let _: Markup = "<p\(attrs)>hello</p>"
+        }
+
+        #expect(context.cssManager.customFonts.contains(font))
+    }
+
     @Test("Animated elements can be rendered before a publishing context")
     func animatedElementsCanBeRenderedBeforePublishingContext() throws {
         let element = Text("Animate me")

From 9ca3112db272c929f368101465d0b7e925903e6e Mon Sep 17 00:00:00 2001
From: Skwiggs <6209874+MrSkwiggs@users.noreply.github.com>
Date: Mon, 11 May 2026 13:17:16 +0200
Subject: [PATCH 5/8] Deprecate conformance to CustomStringConvertible

Use internal name for rendered markup contents
---
 Sources/Ignite/Framework/CoreAttributes.swift      | 14 +++++++++++---
 Sources/Ignite/Framework/Markup.swift              |  2 +-
 Tests/IgniteTesting/Framework/CoreAttributes.swift |  6 +++---
 .../PublishingContextPreconstruction.swift         | 14 --------------
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/Sources/Ignite/Framework/CoreAttributes.swift b/Sources/Ignite/Framework/CoreAttributes.swift
index cc5d013b7..b77292ee5 100644
--- a/Sources/Ignite/Framework/CoreAttributes.swift
+++ b/Sources/Ignite/Framework/CoreAttributes.swift
@@ -46,7 +46,7 @@ enum PublishingRegistration: Hashable, Equatable, Sendable {
 
 /// A handful of attributes that all HTML types must support, either for
 /// rendering or for publishing purposes.
-public struct CoreAttributes: Equatable, Sendable, CustomStringConvertible {
+public struct CoreAttributes: Equatable, Sendable {
     /// A unique identifier. Can be empty.
     var id = ""
 
@@ -75,8 +75,9 @@ public struct CoreAttributes: Equatable, Sendable, CustomStringConvertible {
     /// Whether this set of attributes is empty.
     var isEmpty: Bool { self == CoreAttributes() }
 
-    /// All core attributes collapsed down to a single string for easy application.
-    public var description: String {
+    /// All core attributes collapsed down to a single string for inclusion
+    /// in HTML markup output.
+    var markupAttributeString: String {
         "\(idString)\(customAttributeString)\(classString)\(styleString)\(dataString)\(ariaString)\(eventString)"
     }
 
@@ -337,3 +338,10 @@ public struct CoreAttributes: Equatable, Sendable, CustomStringConvertible {
     }
 
 }
+
+extension String.StringInterpolation {
+    @available(*, deprecated, message: "Interpolate CoreAttributes into Markup, not String — String interpolation drops publishing-time registrations.")
+    public mutating func appendInterpolation(_ attributes: CoreAttributes) {
+        appendLiteral(attributes.markupAttributeString)
+    }
+}
diff --git a/Sources/Ignite/Framework/Markup.swift b/Sources/Ignite/Framework/Markup.swift
index fd14a5978..806b967c5 100644
--- a/Sources/Ignite/Framework/Markup.swift
+++ b/Sources/Ignite/Framework/Markup.swift
@@ -75,7 +75,7 @@ public struct Markup: Sendable, ExpressibleByStringLiteral, ExpressibleByStringI
         /// - Parameter attributes: The attributes to render and harvest from.
         public mutating func appendInterpolation(_ attributes: CoreAttributes) {
             pendingRegistrations.append(contentsOf: attributes.publishingRegistrations)
-            output += attributes.description
+            output += attributes.markupAttributeString
         }
 
         /// Appends another markup value into the interpolation.
diff --git a/Tests/IgniteTesting/Framework/CoreAttributes.swift b/Tests/IgniteTesting/Framework/CoreAttributes.swift
index 5c72ed538..4dc7e8131 100644
--- a/Tests/IgniteTesting/Framework/CoreAttributes.swift
+++ b/Tests/IgniteTesting/Framework/CoreAttributes.swift
@@ -228,13 +228,13 @@ struct CoreAttributesTests {
         #expect(attrs.styleString == " style=\"color: red\"")
     }
 
-    @Test("Description combines all attribute components", .publishingContext())
-    func descriptionCombinesAll() async throws {
+    @Test("Markup attribute string combines all attribute components", .publishingContext())
+    func attributeStringCombinesAll() async throws {
         var attrs = CoreAttributes()
         attrs.id = "test"
         attrs.append(classes: "foo")
         attrs.append(styles: InlineStyle(.color, value: "red"))
-        let desc = attrs.description
+        let desc = attrs.markupAttributeString
         #expect(desc.contains("id=\"test\""))
         #expect(desc.contains("class=\"foo\""))
         #expect(desc.contains("style=\"color: red\""))
diff --git a/Tests/IgniteTesting/Publishing/PublishingContextPreconstruction.swift b/Tests/IgniteTesting/Publishing/PublishingContextPreconstruction.swift
index 8925080fa..b18318266 100644
--- a/Tests/IgniteTesting/Publishing/PublishingContextPreconstruction.swift
+++ b/Tests/IgniteTesting/Publishing/PublishingContextPreconstruction.swift
@@ -65,20 +65,6 @@ struct PublishingContextPreconstructionTests {
         #expect(responsiveCSS.contains("display: none"))
     }
 
-    @Test("CoreAttributes.description is pure inside a context")
-    func descriptionIsPureInsideContext() throws {
-        let context = try PublishingContext.initialize(for: TestSite(), from: #filePath)
-        let font = Font.custom("DescriptionOnlyFont", size: .px(12))
-        var attrs = CoreAttributes()
-        attrs.append(publishingRegistration: .fontFamily(font))
-
-        PublishingContext.withCurrent(context) {
-            _ = String(describing: attrs)
-        }
-
-        #expect(!context.cssManager.customFonts.contains(font))
-    }
-
     @Test("Markup string-interpolation registers publishing context")
     func markupInterpolationRegistersPublishingContext() throws {
         let context = try PublishingContext.initialize(for: TestSite(), from: #filePath)

From 3e4d658061e1988efa084f03f0ad734d9a10fea2 Mon Sep 17 00:00:00 2001
From: Skwiggs <6209874+MrSkwiggs@users.noreply.github.com>
Date: Mon, 11 May 2026 13:17:32 +0200
Subject: [PATCH 6/8] Split up into individual declaration files

---
 Sources/Ignite/Framework/CoreAttributes.swift | 37 -------------------
 .../Framework/PublishingRegistration.swift    | 26 +++++++++++++
 .../StringInterpolation+CoreAttributes.swift  |  7 ++++
 Sources/Ignite/Framework/Typealii.swift       | 27 ++++++++++++++
 4 files changed, 60 insertions(+), 37 deletions(-)
 create mode 100644 Sources/Ignite/Framework/PublishingRegistration.swift
 create mode 100644 Sources/Ignite/Framework/StringInterpolation+CoreAttributes.swift
 create mode 100644 Sources/Ignite/Framework/Typealii.swift

diff --git a/Sources/Ignite/Framework/CoreAttributes.swift b/Sources/Ignite/Framework/CoreAttributes.swift
index b77292ee5..fdf73dbbe 100644
--- a/Sources/Ignite/Framework/CoreAttributes.swift
+++ b/Sources/Ignite/Framework/CoreAttributes.swift
@@ -6,43 +6,6 @@
 //
 
 import Foundation
-import OrderedCollections
-
-// A typealias that allows us to use `OrderedSet` without importing OrderedCollections
-public typealias OrderedSet<Element: Hashable> = OrderedCollections.OrderedSet<Element>
-
-// A typealias that allows us to use `OrderedDictionary` without importing OrderedCollections
-public typealias OrderedDictionary<Key: Hashable, Value> = OrderedCollections.OrderedDictionary<Key, Value>
-
-// A typealias that allows us to use `UUID` without importing Foundation
-public typealias UUID = Foundation.UUID
-
-// A typealias that allows us to use `URL` without importing Foundation
-public typealias URL = Foundation.URL
-
-// A typealias that allows us to use `Data` without importing Foundation
-public typealias Data = Foundation.Data
-
-// A typealias that allows us to use `Date` without importing Foundation
-public typealias Date = Foundation.Date
-
-/// A publishing-time registration required by rendered attributes.
-enum PublishingRegistration: Hashable, Equatable, Sendable {
-    case fontFamily(Font)
-    case responsiveFont(ResponsiveValues<LengthUnit>)
-    case responsiveVisibility(ResponsiveValues<Bool>)
-
-    func apply(to context: PublishingContext) {
-        switch self {
-        case .fontFamily(let font):
-            context.cssManager.registerFontFamily(font)
-        case .responsiveFont(let values):
-            _ = context.cssManager.registerFont(values)
-        case .responsiveVisibility(let values):
-            _ = context.cssManager.registerStyles(values)
-        }
-    }
-}
 
 /// A handful of attributes that all HTML types must support, either for
 /// rendering or for publishing purposes.
diff --git a/Sources/Ignite/Framework/PublishingRegistration.swift b/Sources/Ignite/Framework/PublishingRegistration.swift
new file mode 100644
index 000000000..3f9d5d53c
--- /dev/null
+++ b/Sources/Ignite/Framework/PublishingRegistration.swift
@@ -0,0 +1,26 @@
+//
+// PublishingRegistration.swift
+// Ignite
+// https://www.github.com/twostraws/Ignite
+// See LICENSE for license information.
+//
+
+import Foundation
+
+/// A publishing-time registration required by rendered attributes.
+enum PublishingRegistration: Hashable, Equatable, Sendable {
+    case fontFamily(Font)
+    case responsiveFont(ResponsiveValues<LengthUnit>)
+    case responsiveVisibility(ResponsiveValues<Bool>)
+
+    func apply(to context: PublishingContext) {
+        switch self {
+        case .fontFamily(let font):
+            context.cssManager.registerFontFamily(font)
+        case .responsiveFont(let values):
+            _ = context.cssManager.registerFont(values)
+        case .responsiveVisibility(let values):
+            _ = context.cssManager.registerStyles(values)
+        }
+    }
+}
diff --git a/Sources/Ignite/Framework/StringInterpolation+CoreAttributes.swift b/Sources/Ignite/Framework/StringInterpolation+CoreAttributes.swift
new file mode 100644
index 000000000..ef9765e80
--- /dev/null
+++ b/Sources/Ignite/Framework/StringInterpolation+CoreAttributes.swift
@@ -0,0 +1,7 @@
+//
+// StringInterpolation+CoreAttributes.swift
+// Ignite
+// https://www.github.com/twostraws/Ignite
+// See LICENSE for license information.
+//
+
diff --git a/Sources/Ignite/Framework/Typealii.swift b/Sources/Ignite/Framework/Typealii.swift
new file mode 100644
index 000000000..40a1bb6a1
--- /dev/null
+++ b/Sources/Ignite/Framework/Typealii.swift
@@ -0,0 +1,27 @@
+//
+// Typealii.swift
+// Ignite
+// https://www.github.com/twostraws/Ignite
+// See LICENSE for license information.
+//
+
+import Foundation
+import OrderedCollections
+
+// A typealias that allows us to use `OrderedSet` without importing OrderedCollections
+public typealias OrderedSet<Element: Hashable> = OrderedCollections.OrderedSet<Element>
+
+// A typealias that allows us to use `OrderedDictionary` without importing OrderedCollections
+public typealias OrderedDictionary<Key: Hashable, Value> = OrderedCollections.OrderedDictionary<Key, Value>
+
+// A typealias that allows us to use `UUID` without importing Foundation
+public typealias UUID = Foundation.UUID
+
+// A typealias that allows us to use `URL` without importing Foundation
+public typealias URL = Foundation.URL
+
+// A typealias that allows us to use `Data` without importing Foundation
+public typealias Data = Foundation.Data
+
+// A typealias that allows us to use `Date` without importing Foundation
+public typealias Date = Foundation.Date

From 261f8bd85bd7c266e316ed5aee4c67ec641d92a9 Mon Sep 17 00:00:00 2001
From: Skwiggs <6209874+MrSkwiggs@users.noreply.github.com>
Date: Mon, 11 May 2026 13:20:29 +0200
Subject: [PATCH 7/8] Remove empty file

---
 .../Framework/StringInterpolation+CoreAttributes.swift     | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 Sources/Ignite/Framework/StringInterpolation+CoreAttributes.swift

diff --git a/Sources/Ignite/Framework/StringInterpolation+CoreAttributes.swift b/Sources/Ignite/Framework/StringInterpolation+CoreAttributes.swift
deleted file mode 100644
index ef9765e80..000000000
--- a/Sources/Ignite/Framework/StringInterpolation+CoreAttributes.swift
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// StringInterpolation+CoreAttributes.swift
-// Ignite
-// https://www.github.com/twostraws/Ignite
-// See LICENSE for license information.
-//
-

From 5ab5f5a8ba39549096849ff96f7aa881258f56af Mon Sep 17 00:00:00 2001
From: Skwiggs <6209874+MrSkwiggs@users.noreply.github.com>
Date: Mon, 11 May 2026 13:40:42 +0200
Subject: [PATCH 8/8] Rename to typealiases

---
 Sources/Ignite/Framework/{Typealii.swift => Typealiases.swift} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename Sources/Ignite/Framework/{Typealii.swift => Typealiases.swift} (97%)

diff --git a/Sources/Ignite/Framework/Typealii.swift b/Sources/Ignite/Framework/Typealiases.swift
similarity index 97%
rename from Sources/Ignite/Framework/Typealii.swift
rename to Sources/Ignite/Framework/Typealiases.swift
index 40a1bb6a1..6ef1fb783 100644
--- a/Sources/Ignite/Framework/Typealii.swift
+++ b/Sources/Ignite/Framework/Typealiases.swift
@@ -1,5 +1,5 @@
 //
-// Typealii.swift
+// Typealiases.swift
 // Ignite
 // https://www.github.com/twostraws/Ignite
 // See LICENSE for license information.