Include bound path segments in request

This makes it possible to access raw path parameters in a decorator.
com-lihaoyi · Nov 2, 2024 · 54395ba · 54395ba
1 parent e7fcba1
commit 54395ba
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/build.mill b/build.mill
@@ -11,7 +11,7 @@ import de.tobiasroeser.mill.vcs.version.VcsVersion
 
 val scala213 = "2.13.10"
 val scala212 = "2.12.17"
-val scala3 = "3.2.2"
+val scala3 = "3.3.4"
 val scalaJS = "1.13.0"
 val communityBuildDottyVersion = sys.props.get("dottyVersion").toList
 

diff --git a/cask/src/cask/main/Main.scala b/cask/src/cask/main/Main.scala
@@ -107,18 +107,17 @@ object Main{
         .toList
 
       dispatchTrie.lookup(decodedSegments, Vector()) match {
-        case None => Main.writeResponse(exchange, handleNotFound(Request(exchange, decodedSegments)))
+        case None => Main.writeResponse(exchange, handleNotFound(Request(exchange, decodedSegments, Map())))
         case Some((methodMap, routeBindings, remaining)) =>
           methodMap.get(effectiveMethod) match {
-            case None => Main.writeResponse(exchange, handleMethodNotAllowed(Request(exchange, remaining)))
+            case None => Main.writeResponse(exchange, handleMethodNotAllowed(Request(exchange, remaining, routeBindings)))
             case Some((routes, metadata)) =>
-              val req = Request(exchange, remaining)
+              val req = Request(exchange, remaining, routeBindings)
               Decorator.invoke(
                 req,
                 metadata.endpoint,
                 metadata.entryPoint.asInstanceOf[EntryPoint[Routes, _]],
                 routes,
-                routeBindings,
                 (mainDecorators ++ routes.decorators ++ metadata.decorators).toList,
                 Nil
               ) match {

diff --git a/cask/src/cask/model/Params.scala b/cask/src/cask/model/Params.scala
@@ -9,7 +9,7 @@ import io.undertow.server.handlers.CookieImpl
 case class QueryParams(value: Map[String, collection.Seq[String]])
 case class RemainingPathSegments(value: Seq[String])
 
-case class Request(exchange: HttpServerExchange, remainingPathSegments: Seq[String])
+case class Request(exchange: HttpServerExchange, remainingPathSegments: Seq[String], boundPathSegments: Map[String, String])
 extends geny.ByteData with geny.Readable {
   import collection.JavaConverters._
   lazy val cookies: Map[String, Cookie] = {

diff --git a/cask/src/cask/router/Decorators.scala b/cask/src/cask/router/Decorators.scala
@@ -37,20 +37,19 @@ object Decorator{
                 endpoint: Endpoint[_, _, _],
                 entryPoint: EntryPoint[T, _],
                 routes: T,
-                routeBindings: Map[String, String],
                 remainingDecorators: List[Decorator[_, _, _]],
                 bindings: List[Map[String, Any]]): Result[Any] = try {
     remainingDecorators match {
       case head :: rest =>
         head.asInstanceOf[Decorator[Any, Any, Any]].wrapFunction(
           ctx,
-          args => invoke(ctx, endpoint, entryPoint, routes, routeBindings, rest, args :: bindings)
+          args => invoke(ctx, endpoint, entryPoint, routes, rest, args :: bindings)
             .asInstanceOf[Result[Nothing]]
         )
 
       case Nil =>
         endpoint.wrapFunction(ctx, { (endpointBindings: Map[String, Any]) =>
-          val mergedEndpointBindings = endpointBindings ++ routeBindings.mapValues(endpoint.wrapPathSegment)
+          val mergedEndpointBindings = endpointBindings ++ ctx.boundPathSegments.mapValues(endpoint.wrapPathSegment)
           val finalBindings = mergedEndpointBindings :: bindings
 
           entryPoint