hhe/vapor-po
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Begins view controller integration into app target.

Browse Source
This commit is contained in:
Michael Housh
2025-01-24 09:37:54 -05:00
parent 94f0c660ff
commit ce9cbe168e
3 changed files with 66 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Sources/ViewControllerLive/Routes+view.swift
View File

@@ -4,9 +4,11 @@ import Elementary
import SharedModels
import Vapor
extension SharedModels.ViewRoute {
public typealias AnySendableHTML = (any HTML & Sendable)
func view(isHtmxRequest: Bool, authenticate: @escaping @Sendable (User) -> Void) async throws -> (any HTML)? {
public extension SharedModels.ViewRoute {
func view(isHtmxRequest: Bool, authenticate: @escaping @Sendable (User) -> Void) async throws -> AnySendableHTML? {
@Dependency(\.database.users) var users
switch self {
case .index:
@@ -60,7 +62,7 @@ extension SharedModels.ViewRoute.EmployeeRoute {
}
}
func view(isHtmxRequest: Bool) async throws -> (any HTML)? {
func view(isHtmxRequest: Bool) async throws -> AnySendableHTML? {
@Dependency(\.database.employees) var employees
switch self {
@@ -110,7 +112,7 @@ extension SharedModels.ViewRoute.PurchaseOrderRoute {
}
}
func view(isHtmxRequest: Bool) async throws -> (any HTML)? {
func view(isHtmxRequest: Bool) async throws -> AnySendableHTML? {
@Dependency(\.database.purchaseOrders) var purchaseOrders
switch self {
@@ -163,7 +165,7 @@ extension SharedModels.ViewRoute.PurchaseOrderRoute.Search {
}
}
func view(isHtmxRequest: Bool) async throws -> any HTML {
func view(isHtmxRequest: Bool) async throws -> AnySendableHTML {
@Dependency(\.database) var database
switch self {
case let .index(context: context, table: table):
@@ -193,7 +195,7 @@ extension SharedModels.ViewRoute.UserRoute {
}
}
func view(isHtmxRequest: Bool) async throws -> (any HTML)? {
func view(isHtmxRequest: Bool) async throws -> AnySendableHTML? {
@Dependency(\.database.users) var users
switch self {
@@ -235,7 +237,7 @@ extension SharedModels.ViewRoute.VendorRoute {
}
}
func view(isHtmxRequest: Bool) async throws -> (any HTML)? {
func view(isHtmxRequest: Bool) async throws -> AnySendableHTML? {
@Dependency(\.database) var database
switch self {
@@ -277,7 +279,7 @@ extension SharedModels.ViewRoute.VendorRoute {
extension SharedModels.ViewRoute.VendorBranchRoute {
func view(isHtmxRequest: Bool) async throws -> (any HTML)? {
func view(isHtmxRequest: Bool) async throws -> AnySendableHTML? {
@Dependency(\.database) var database
switch self {
@@ -350,7 +352,7 @@ private func render<C: HTML>(
_ mainPage: (C) async throws -> any SendableHTMLDocument,
_ isHtmxRequest: Bool,
@HTMLBuilder html: () -> C
) async rethrows -> any HTML {
) async rethrows -> AnySendableHTML where C: Sendable {
guard isHtmxRequest else {
return try await mainPage(html())
}
@@ -361,6 +363,6 @@ private func render<C: HTML>(
_ mainPage: (C) async throws -> any SendableHTMLDocument,
_ isHtmxRequest: Bool,
_ html: @autoclosure @escaping () -> C
) async rethrows -> any HTML {
) async rethrows -> AnySendableHTML where C: Sendable {
try await render(mainPage, isHtmxRequest) { html() }
}