fix: script's now follow the Script structure

maclong9 · maclong9 · commit 9028f921ab22 · 2025-05-17T00:09:48.000+01:00
diff --git a/Sources/WebUI/Core/Document.swift b/Sources/WebUI/Core/Document.swift
@@ -41,7 +41,7 @@ public struct Document {
     private let logger = Logger(label: "com.webui.document")
     public let path: String?
     public var metadata: Metadata
-    public var scripts: [String: ScriptAttribute?]?
+    public var scripts: [Script]?
     public var stylesheets: [String]?
     public var theme: Theme?
     public let head: String?
@@ -84,7 +84,7 @@ public struct Document {
     public init(
         path: String? = nil,
         metadata: Metadata,
-        scripts: [String: ScriptAttribute?]? = nil,
+        scripts: [Script]? = nil,
         stylesheets: [String]? = nil,
         theme: Theme? = nil,
         head: String? = nil,
@@ -131,7 +131,7 @@ public struct Document {
             logger.trace("Adding \(scripts.count) script tags")
             for script in scripts {
                 optionalTags.append(
-                    "<script \(script.value?.rawValue ?? "") src=\"\(script.key)\"></script>"
+                    "<script \(script.attribute?.rawValue ?? "") src=\"\(script.src)\"></script>"
                 )
             }
         }
@@ -156,7 +156,7 @@ public struct Document {
                 \(optionalTags.joined(separator: "\n"))
                 <script src="https://unpkg.com/@tailwindcss/browser@4"></script>
                 \(head ?? "")
-            </head> 
+            </head>
             <body>
               \(content.map { $0.render() }.joined())
             </body>
diff --git a/Sources/WebUI/Core/Website.swift b/Sources/WebUI/Core/Website.swift
@@ -20,7 +20,7 @@ public struct Website {
     public let stylesheets: [String]?
 
     /// Optional JavaScript sources with their loading attributes applied to all routes.
-    public let scripts: [String: ScriptAttribute?]?
+    public let scripts: [Script]?
 
     /// Optional custom HTML to append to all document head sections.
     public let head: String?
@@ -76,7 +76,7 @@ public struct Website {
         metadata: Metadata? = nil,
         theme: Theme? = nil,
         stylesheets: [String]? = nil,
-        scripts: [String: ScriptAttribute?]? = nil,
+        scripts: [Script]? = nil,
         head: String? = nil,
         routes: [Document],
         baseURL: String? = nil,
@@ -97,10 +97,9 @@ public struct Website {
         self.robotsRules = robotsRules
         self.routes = routes.map { document in
             // Merge scripts: Website scripts + Document scripts (Document scripts override duplicates)
-            var mergedScripts = scripts ?? [:]
-            if let documentScripts = document.scripts {
-                mergedScripts.merge(documentScripts) { _, new in new }
-            }
+            let mergedScripts = Array(
+                (scripts ?? []) + (document.scripts ?? [])
+            )
 
             // Merge stylesheets: Website stylesheets + Document stylesheets (combine, remove duplicates)
             let mergedStylesheets = Array(
diff --git a/Tests/WebUITests/Core/DocumentTests.swift b/Tests/WebUITests/Core/DocumentTests.swift
@@ -152,8 +152,8 @@ import Testing
                 description: "Testing script inclusion"
             ),
             scripts: [
-                "https://cdn.example.com/script1.js": .async,
-                "/public/script2.js": .defer,
+                Script(src: "https://cdn.example.com/script1.js", attribute: .async),
+                Script(src: "/public/script2.js", attribute: .defer),
             ]
         ) {
             "Script Test"
