From 44670a96c9cf60731e2f9c7df4c83a0921aaa621 Mon Sep 17 00:00:00 2001
From: Adam Fowler <adamfowler71@gmail.com>
Date: Wed, 23 Oct 2024 19:53:34 +0100
Subject: [PATCH] Fix issues with discerning Handler types in
 ThrowingContextTransform

---
 Sources/HummingbirdRouter/ContextTransform.swift | 6 +++---
 Sources/HummingbirdRouter/RouteGroup.swift       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sources/HummingbirdRouter/ContextTransform.swift b/Sources/HummingbirdRouter/ContextTransform.swift
index a4515c41..757d6180 100644
--- a/Sources/HummingbirdRouter/ContextTransform.swift
+++ b/Sources/HummingbirdRouter/ContextTransform.swift
@@ -64,7 +64,7 @@ public struct ContextTransform<Context: RouterRequestContext, HandlerContext: Ro
 
 /// Router middleware that transforms the ``Hummingbird/RequestContext`` and uses it with the contained
 /// Middleware chain. ``Used by RouteGroup/init(_:context:builder:)``
-public struct ThrowingContextTransform<Context: RouterRequestContext, Handler: MiddlewareProtocol>: RouterMiddleware where Handler.Input == Request, Handler.Output == Response, Handler.Context: RouterRequestContext & ChildRequestContext, Handler.Context.ParentContext == Context {
+public struct ThrowingContextTransform<Context: RouterRequestContext, HandlerContext: RouterRequestContext & ChildRequestContext, Handler: MiddlewareProtocol>: RouterMiddleware where Handler.Input == Request, Handler.Output == Response, Handler.Context == HandlerContext, HandlerContext.ParentContext == Context {
     public typealias Input = Request
     public typealias Output = Response
 
@@ -77,8 +77,8 @@ public struct ThrowingContextTransform<Context: RouterRequestContext, Handler: M
     ///   - context: RequestContext to convert to
     ///   - builder: RouteGroup builder
     public init(
-        to context: Handler.Context.Type,
-        @MiddlewareFixedTypeBuilder<Request, Response, Handler.Context> builder: () -> Handler
+        to context: HandlerContext.Type,
+        @MiddlewareFixedTypeBuilder<Request, Response, HandlerContext> builder: () -> Handler
     ) {
         self.handler = builder()
     }
diff --git a/Sources/HummingbirdRouter/RouteGroup.swift b/Sources/HummingbirdRouter/RouteGroup.swift
index 06e01042..59c2ad17 100644
--- a/Sources/HummingbirdRouter/RouteGroup.swift
+++ b/Sources/HummingbirdRouter/RouteGroup.swift
@@ -72,7 +72,7 @@ public struct RouteGroup<Context: RouterRequestContext, Handler: MiddlewareProto
         _ routerPath: RouterPath,
         context: ChildContext.Type,
         @MiddlewareFixedTypeBuilder<Request, Response, ChildContext> builder: () -> ChildHandler
-    ) where ChildHandler.Context == ChildContext, Handler == ThrowingContextTransform<Context, ChildHandler> {
+    ) where ChildContext == ChildContext, Handler == ThrowingContextTransform<Context, ChildContext, ChildHandler> {
         var routerPath = routerPath
         // Get builder state from service context
         var routerBuildState = RouterBuilderState.current ?? .init(options: [])