Refactored the StaticFile enumeration in the Website library target into a structure.

2026-08-24 22:37:13 +02:00
parent d8cf1abf6a
commit 74e81e1517
6 changed files with 153 additions and 155 deletions
@@ -1,72 +0,0 @@
-import Infrastructure
-
-/// A static file shipped with the website service.
-///
-/// Each case identifies a file name stored under the static files root (the `Resources/Static` directory) and served by Hummingbird's
-/// `FileMiddleware` middleware. A name can be available with more than one extension (see ``fileExtensions``), each resolving to its own file.
-enum StaticFile: Asset, CaseIterable {
-    /// The `apple-touch-icon.png` icon.
-    case appleTouchIcon
-    /// The `favicon.ico` icon.
-    case favicon
-    /// The `icon.svg` icon.
-    case icon
-    /// The `icon-192.png` icon for the web manifest.
-    case icon192
-    /// The `icon-512.png` icon for the web manifest.
-    case icon512
-    /// The `css/index.css` stylesheet and `js/index.js` script for the landing page.
-    case index
-    /// The `css/not-found.css` stylesheet and `js/not-found.js` script for the not-found page.
-    case notFound
-    /// The `robots.txt` crawler directives.
-    case robots
-    /// The `css/shared.css` stylesheet and `js/shared.js` script shared across pages.
-    case shared
-    /// The `site.webmanifest` web application manifest.
-    case site
-    /// The `sitemap.xml` crawler sitemap.
-    case sitemap
-}
-
-// MARK: - Extensions
-
-extension StaticFile {
-
-    // MARK: Computed
-    
-    /// The file extensions the file is available with.
-    var fileExtensions: [AssetExtension] {
-        switch self {
-        case .appleTouchIcon,
-             .icon192,
-             .icon512: [.png]
-        case .index,
-             .notFound,
-             .shared: [.css, .js]
-        case .favicon: [.ico]
-        case .icon: [.svg]
-        case .robots: [.txt]
-        case .site: [.webmanifest]
-        case .sitemap: [.xml]
-        }
-    }
-
-    /// The file's name, without extension.
-    var fileName: String {
-        switch self {
-        case .appleTouchIcon: "apple-touch-icon"
-        case .favicon: "favicon"
-        case .icon: "icon"
-        case .icon192: "icon-192"
-        case .icon512: "icon-512"
-        case .index: "index"
-        case .notFound: "not-found"
-        case .robots: "robots"
-        case .shared: "shared"
-        case .site: "site"
-        case .sitemap: "sitemap"
-        }
-    }
-
-}
@@ -0,0 +1,93 @@
+import Infrastructure
+
+/// A static file shipped with the website service.
+///
+/// Each constant declares one file stored under the static files root (the `Resources/Static` directory) and served by Hummingbird's
+/// `FileMiddleware` middleware. A file can be available with more than one extension (see ``fileExtensions``), each resolving to its own file.
+struct StaticFile: Asset {
+
+    // MARK: Properties
+
+    /// The file extensions the file is available with.
+    let fileExtensions: [AssetExtension]
+
+    /// The file's name, without extension.
+    let fileName: String
+
+    // MARK: Initializers
+
+    /// Declares a static file.
+    /// - Parameters:
+    ///   - fileName: the file's name, without extension.
+    ///   - fileExtensions: the extensions the file is available with, one file each.
+    init(
+        _ fileName: String,
+        as fileExtensions: AssetExtension...
+    ) {
+        self.fileExtensions = fileExtensions
+        self.fileName = fileName
+    }
+
+}
+
+// MARK: - Extensions
+
+extension StaticFile {
+
+    // MARK: - Constants
+
+    /// Every file the service ships.
+    ///
+    /// Spelled out because Swift cannot enumerate a type's own constants: a file missing here is still served, but goes untested.
+    static let all: [Self] = [
+        .appleTouchIcon,
+        .favicon,
+        .icon,
+        .icon192,
+        .icon512,
+        .index,
+        .notFound,
+        .robots,
+        .shared,
+        .site,
+        .sitemap,
+    ]
+
+}
+
+// MARK: - Constants
+
+extension StaticFile {
+    /// The `apple-touch-icon.png` icon.
+    static let appleTouchIcon = Self("apple-touch-icon", as: .png)
+
+    /// The `favicon.ico` icon.
+    static let favicon = Self("favicon", as: .ico)
+
+    /// The `icon.svg` icon.
+    static let icon = Self("icon", as: .svg)
+
+    /// The `icon-192.png` icon for the web manifest.
+    static let icon192 = Self("icon-192", as: .png)
+
+    /// The `icon-512.png` icon for the web manifest.
+    static let icon512 = Self("icon-512", as: .png)
+
+    /// The `css/index.css` stylesheet and `js/index.js` script for the landing page.
+    static let index = Self("index", as: .css, .js)
+
+    /// The `css/not-found.css` stylesheet and `js/not-found.js` script for the not-found page.
+    static let notFound = Self("not-found", as: .css, .js)
+
+    /// The `robots.txt` crawler directives.
+    static let robots = Self("robots", as: .txt)
+
+    /// The `css/shared.css` stylesheet and `js/shared.js` script shared across pages.
+    static let shared = Self("shared", as: .css, .js)
+
+    /// The `site.webmanifest` web application manifest.
+    static let site = Self("site", as: .webmanifest)
+
+    /// The `sitemap.xml` crawler sitemap.
+    static let sitemap = Self("sitemap", as: .xml)
+}