Remove MiddlewareController in favor of just RouterController.

Author: connor-ricks

Sources/Hummingbird/Middleware/MiddlewareController.swift

@@ -14,9 +14,8 @@
 
 // MARK: - RouterController
 
-/// A type that represents part of your app's middleware and routes where their ``MiddlewareController/Input`` is
-/// ``Request`` and ``MiddlewareController/Output`` is ``Response``.
-///
+/// A type that represents part of your app's middleware and routes
+/// 
 /// You create custom controllers by declaring types that conform to the `RouterController`
 /// protocol. Implement the required ``RouterController/body-swift.property`` computed
 /// property to provide the content for your custom controller.
@@ -31,6 +30,32 @@
 ///
 /// Assemble the controller's body by combining one or more of the built-in controllers or middleware.
 /// provided by Hummingbird, plus other custom controllers that you define, into a hierarchy of controllers.
-public protocol RouterController<Context>: MiddlewareController where Body: RouterMiddleware<Context> {
+public protocol RouterController<Context> {
     associatedtype Context
+    associatedtype Body: RouterMiddleware<Context>
+    @MiddlewareFixedTypeBuilder<Request, Response, Context> var body: Body { get }
+}
+
+
+// MARK: MiddlewareFixedTypeBuilder + RouterController Builders
+
+extension MiddlewareFixedTypeBuilder {
+    public static func buildExpression<C0: RouterController>(_ c0: C0) -> C0.Body where C0.Body.Input == Input, C0.Body.Output == Output, C0.Body.Context == Context {
+        return c0.body
+    }
+
+    public static func buildBlock<C0: RouterController>(_ c0: C0) -> C0.Body {
+        return c0.body
+    }
+
+    public static func buildPartialBlock<C0: RouterController>(first: C0) -> C0.Body {
+        first.body
+    }
+
+    public static func buildPartialBlock<M0: MiddlewareProtocol, C0: RouterController>(
+        accumulated m0: M0,
+        next c0: C0
+    ) -> _Middleware2<M0, C0.Body> where M0.Input == C0.Body.Input, M0.Output == C0.Body.Output, M0.Context == C0.Body.Context {
+        _Middleware2(m0, c0.body)
+    }
 }

Sources/Hummingbird/Router/RouterController.swift

@@ -18,39 +18,6 @@ import HummingbirdTesting
 import XCTest
 
 final class ControllerTests: XCTestCase {
-
-    // MARK: MiddlewareController
-
-    func testMiddlewareController() async throws {
-        struct TestController: MiddlewareController {
-            typealias Input = Request
-            typealias Output = Response
-            typealias Context = BasicRouterRequestContext
-
-            var body: some MiddlewareProtocol<Input, Output, Context> {
-                Get("foo") { _,_ in "foo" }
-                Get("bar") { _,_ in "bar" }
-            }
-        }
-
-        let router = RouterBuilder(context: BasicRouterRequestContext.self) {
-            TestController()
-        }
-
-        let app = Application(responder: router)
-        try await app.test(.router) { client in
-            try await client.execute(uri: "/foo", method: .get) {
-                XCTAssertEqual(String(buffer: $0.body), "foo")
-            }
-
-            try await client.execute(uri: "/bar", method: .get) {
-                XCTAssertEqual(String(buffer: $0.body), "bar")
-            }
-        }
-    }
-
-    // MARK: RouterController
-
     func testRouterController() async throws {
         struct TestController: RouterController {
             typealias Context = BasicRouterRequestContext