Merge 6cf9c8c into 080f2f3

build.sc

@@ -7,6 +7,7 @@ import $file.example.compress3.build
 import $file.example.cookies.build
 import $file.example.decorated.build
 import $file.example.decorated2.build
+import $file.example.decoratedContext.build
 import $file.example.endpoints.build
 import $file.example.formJsonPost.build
 import $file.example.httpMethods.build
@@ -131,6 +132,9 @@ object example extends Module{
   trait Decorated2Module extends millbuild.example.decorated2.build.AppModule with LocalModule
   object decorated2 extends Cross[Decorated2Module](scalaVersions)
 
+  trait DecoratedContextModule extends millbuild.example.decoratedContext.build.AppModule with LocalModule
+  object decoratedContext extends Cross[DecoratedContextModule](scalaVersions)
+
   trait EndpointsModule extends millbuild.example.endpoints.build.AppModule with LocalModule
   object endpoints extends Cross[EndpointsModule](scalaVersions)
 

cask/src-2/cask/main/Routes.scala

@@ -6,7 +6,7 @@ import language.experimental.macros
 
 trait Routes{
 
-  def decorators = Seq.empty[cask.router.Decorator[_, _, _]]
+  def decorators = Seq.empty[cask.router.Decorator[_, _, _, _]]
   private[this] var metadata0: RoutesEndpointsMetadata[this.type] = null
   def caskMetadata =
     if (metadata0 != null) metadata0

cask/src-2/cask/router/Macros.scala

@@ -64,7 +64,7 @@ class Macros[C <: blackbox.Context](val c: C) {
     val ctxSymbol = q"${c.fresh[TermName](TermName("ctx"))}"
     val argData = for(argListIndex <- method.paramLists.indices) yield{
       val annotDeserializeType = annotDeserializeTypes.lift(argListIndex).getOrElse(tq"scala.Any")
-      val argReader = argReaders.lift(argListIndex).getOrElse(q"cask.router.NoOpParser.instanceAny")
+      val argReader = argReaders.lift(argListIndex).getOrElse(q"cask.router.NoOpParser.instanceAnyRequest")
       val flattenedArgLists = method.paramss(argListIndex)
       def hasDefault(i: Int) = {
         // defaults are numbered globally on a class-level, this means that we

cask/src-2/cask/router/RoutesEndpointMetadata.scala

@@ -15,15 +15,15 @@ object RoutesEndpointsMetadata{
 
     val routeParts = for{
       m <- c.weakTypeOf[T].members
-      annotations = m.annotations.filter(_.tree.tpe <:< c.weakTypeOf[Decorator[_, _, _]])
+      annotations = m.annotations.filter(_.tree.tpe <:< c.weakTypeOf[Decorator[_, _, _, _]])
       if annotations.nonEmpty
     } yield {
-      if(!(annotations.last.tree.tpe <:< weakTypeOf[Endpoint[_, _, _]])) c.abort(
+      if(!(annotations.last.tree.tpe <:< weakTypeOf[Endpoint[_, _, _, _]])) c.abort(
         annotations.head.tree.pos,
         s"Last annotation applied to a function must be an instance of Endpoint, " +
           s"not ${annotations.last.tree.tpe}"
       )
-      val allEndpoints = annotations.filter(_.tree.tpe <:< weakTypeOf[Endpoint[_, _, _]])
+      val allEndpoints = annotations.filter(_.tree.tpe <:< weakTypeOf[Endpoint[_, _, _, _]])
       if(allEndpoints.length > 1) c.abort(
         annotations.last.tree.pos,
         s"You can only apply one Endpoint annotation to a function, not " +

cask/src-3/cask/main/Routes.scala

@@ -6,7 +6,7 @@ import language.experimental.macros
 
 trait Routes{
 
-  def decorators = Seq.empty[cask.router.Decorator[_, _, _]]
+  def decorators = Seq.empty[cask.router.Decorator[_, _, _, _]]
   private[this] var metadata0: RoutesEndpointsMetadata[this.type] = null
   def caskMetadata =
     if (metadata0 != null) metadata0

cask/src-3/cask/router/Macros.scala

@@ -9,15 +9,15 @@ object Macros {
     * This replicates EndpointMetadata.seqify, but in a macro where error
     * positions can be controlled.
     */
-  def checkDecorators(using Quotes)(decorators: List[Expr[Decorator[_, _, _]]]): Boolean = {
+  def checkDecorators(using Quotes)(decorators: List[Expr[Decorator[_, _, _, _]]]): Boolean = {
     import quotes.reflect._
 
     var hasErrors = false
 
-    def check(prevOuter: TypeRepr, decorators: List[Expr[Decorator[_, _, _]]]): Unit =
+    def check(prevOuter: TypeRepr, decorators: List[Expr[Decorator[_, _, _, _]]]): Unit =
       decorators match {
         case Nil =>
-        case '{ $d: Decorator[outer, inner, _] } :: tail =>
+        case '{ $d: Decorator[outer, inner, _, _] } :: tail =>
           if (TypeRepr.of[inner] <:< prevOuter) {
             check(TypeRepr.of[outer], tail)
           } else {
@@ -56,7 +56,7 @@ object Macros {
 
   /** Summon the reader for a parameter. */
   def summonReader(using Quotes)(
-    decorator: Expr[Decorator[_,_,_]],
+    decorator: Expr[Decorator[_,_,_,_]],
     param: quotes.reflect.Symbol
   ): Expr[ArgReader[_, _, _]] = {
     import quotes.reflect._
@@ -143,13 +143,13 @@ object Macros {
     */
   def convertToResponse(using Quotes)(
     method: quotes.reflect.Symbol,
-    endpoint: Expr[Endpoint[_, _, _]],
+    endpoint: Expr[Endpoint[_, _, _, _]],
     result: Expr[Any]
   ): Expr[Any] = {
     import quotes.reflect._
 
     val innerReturnedTpt = endpoint.asTerm.tpe.asType match {
-      case '[Endpoint[_, innerReturned, _]] => TypeRepr.of[innerReturned]
+      case '[Endpoint[_, innerReturned, _, _]] => TypeRepr.of[innerReturned]
       case _ => ???
     }
 
@@ -186,9 +186,9 @@ object Macros {
 
   def extractMethod[Cls: Type](using q: Quotes)(
     method: quotes.reflect.Symbol,
-    decorators: List[Expr[Decorator[_, _, _]]], // these must also include the endpoint
-    endpoint: Expr[Endpoint[_, _, _]]
-  ): Expr[EntryPoint[Cls, cask.Request]] = {
+    decorators: List[Expr[Decorator[_, _, _, _]]], // these must also include the endpoint
+    endpoint: Expr[Endpoint[_, _, _, _]]
+  ): Expr[EntryPoint[Cls, Any]] = {
     import quotes.reflect._
 
     val defaults = getDefaultParams(method)
@@ -198,7 +198,7 @@ object Macros {
 
       // sometimes we have more params than annotated decorators, for example if
       // there are global decorators
-      val decorator: Option[Expr[Decorator[_, _, _]]] = decorators.lift(idx)
+      val decorator: Option[Expr[Decorator[_, _, _, _]]] = decorators.lift(idx)
 
       val exprs1 = for (param <- params) yield {
         val paramTree = param.tree.asInstanceOf[ValDef]
@@ -231,35 +231,35 @@ object Macros {
           case Some(deco) => summonReader(deco, param)
           case None =>
             decoTpe match
-              case '[t] => '{ NoOpParser.instanceAny[t] }
+              case '[t] => '{ NoOpParser.instanceAnyRequest[t] } // TODO
         }
 
         '{
-          ArgSig[Any, Cls, Any, cask.Request](
+          ArgSig[Any, Cls, Any, Any](
             ${Expr(param.name)},
             ${Expr(paramTpeName)},
             doc = None, // TODO
             default = ${defaultGetter}
-          )(using ${reader}.asInstanceOf[ArgReader[Any, Any, cask.Request]])
+          )(using ${reader}.asInstanceOf[ArgReader[Any, Any, Any]])
         }
       }
       Expr.ofList(exprs1)
     }
     val sigExprs = Expr.ofList(exprs0)
 
     '{
-      EntryPoint[Cls, cask.Request](
+      EntryPoint[Cls, Any](
         name = ${Expr(method.name)},
         argSignatures = $sigExprs,
         doc = None, // TODO
         invoke0 = (
           clazz: Cls,
-          ctx: cask.Request,
+          ctxs: Seq[Any],
           argss: Seq[Map[String, Any]],
-          sigss: Seq[Seq[ArgSig[Any, _, _, cask.Request]]]
+          sigss: Seq[Seq[ArgSig[Any, _, _, Any]]]
         ) => {
           val parsedArgss: Seq[Seq[Either[Seq[cask.router.Result.ParamError], Any]]] =
-            sigss.zip(argss).map{ case (sigs, args) =>
+            (sigss, argss, ctxs).zipped.map { case (sigs, args, ctx) =>
               sigs.map{ case sig =>
                 Runtime.makeReadCall(
                   args,

cask/src-3/cask/router/RoutesEndpointMetadata.scala

@@ -20,18 +20,18 @@ object RoutesEndpointsMetadata{
 
     val routeParts: List[Expr[EndpointMetadata[T]]] = for {
       m <- TypeRepr.of[T].typeSymbol.memberMethods
-      annotations = m.annotations.filter(_.tpe <:< TypeRepr.of[Decorator[_, _, _]])
+      annotations = m.annotations.filter(_.tpe <:< TypeRepr.of[Decorator[_, _, _, _]])
       if (annotations.nonEmpty)
     } yield {
 
-      if(!(annotations.head.tpe <:< TypeRepr.of[Endpoint[_, _, _]])) {
+      if(!(annotations.head.tpe <:< TypeRepr.of[Endpoint[_, _, _, _]])) {
         report.error(s"Last annotation applied to a function must be an instance of Endpoint, " +
           s"not ${annotations.head.tpe.show}",
           annotations.head.pos
         )
         return '{???} // in this case, we can't continue expansion of this macro
       }
-      val allEndpoints = annotations.filter(_.tpe <:< TypeRepr.of[Endpoint[_, _, _]])
+      val allEndpoints = annotations.filter(_.tpe <:< TypeRepr.of[Endpoint[_, _, _, _]])
       if(allEndpoints.length > 1) {
         report.error(
           s"You can only apply one Endpoint annotation to a function, not " +
@@ -41,16 +41,16 @@ object RoutesEndpointsMetadata{
         return '{???}
       }
 
-      val decorators = annotations.map(_.asExprOf[Decorator[_, _, _]])
+      val decorators = annotations.map(_.asExprOf[Decorator[_, _, _, _]])
 
       if (!Macros.checkDecorators(decorators))
         return '{???} // there was a type mismatch in the decorator chain
 
-      val endpointExpr = decorators.head.asExprOf[Endpoint[_, _, _]]
+      val endpointExpr = decorators.head.asExprOf[Endpoint[_, _, _, _]]
       val entrypointExpr = Macros.extractMethod[T](m, decorators, endpointExpr)
 
       '{
-        val entrypoint: EntryPoint[T, cask.Request] = ${entrypointExpr}
+        val entrypoint: EntryPoint[T, Any] = ${entrypointExpr}
 
         EndpointMetadata[T](
           // the Scala 2 version and non-macro code expects decorators to be reversed

cask/src/cask/decorators/compress.scala

@@ -11,7 +11,7 @@ class compress extends cask.RawDecorator{
       .toSeq
       .flatMap(_.asScala)
       .flatMap(_.split(", "))
-    val finalResult = delegate(Map()).transform{ case v: cask.Response.Raw  =>
+    val finalResult = delegate(ctx, Map()).transform{ case v: cask.Response.Raw  =>
       val (newData, newHeaders) = if (acceptEncodings.exists(_.toLowerCase == "gzip")) {
         new Response.Data {
           def write(out: OutputStream): Unit = {

cask/src/cask/endpoints/FormEndpoint.scala

@@ -57,6 +57,7 @@ class postForm(val path: String, override val subpath: Boolean = false)
     try {
       val formData = FormParserFactory.builder().build().createParser(ctx.exchange).parseBlocking()
       delegate(
+        ctx,
         formData
           .iterator()
           .asScala

cask/src/cask/endpoints/JsonEndpoint.scala

@@ -66,7 +66,7 @@ abstract class postJsonBase(val path: String, override val subpath: Boolean = fa
     } yield obj.toMap
     obj match{
       case Left(r) => Result.Success(r.map(Response.Data.WritableData(_)))
-      case Right(params) => delegate(params)
+      case Right(params) => delegate(ctx, params)
     }
   }
   def wrapPathSegment(s: String): ujson.Value = ujson.Str(s)
@@ -78,7 +78,7 @@ class getJson(val path: String, override val subpath: Boolean = false)
   type InputParser[T] = QueryParamReader[T]
 
   def wrapFunction(ctx: Request, delegate: Delegate): Result[Response.Raw] = {
-    delegate(WebEndpoint.buildMapFromQueryParams(ctx))
+    delegate(ctx, WebEndpoint.buildMapFromQueryParams(ctx))
   }
   def wrapPathSegment(s: String) = Seq(s)
 }

cask/src/cask/endpoints/StaticEndpoints.scala

@@ -19,7 +19,7 @@ class staticFiles(val path: String, headers: Seq[(String, String)] = Nil) extend
   type InputParser[T] = QueryParamReader[T]
   override def subpath = true
   def wrapFunction(ctx: Request, delegate: Delegate) = {
-    delegate(Map()).map{t =>
+    delegate(ctx, Map()).map{t =>
       val (path, contentTypeOpt) = StaticUtil.makePathAndContentType(t, ctx)
       cask.model.StaticFile(path, headers ++ contentTypeOpt.map("Content-Type" -> _))
     }
@@ -36,7 +36,7 @@ class staticResources(val path: String,
   type InputParser[T] = QueryParamReader[T]
   override def subpath = true
   def wrapFunction(ctx: Request, delegate: Delegate) = {
-    delegate(Map()).map { t =>
+    delegate(ctx, Map()).map { t =>
       val (path, contentTypeOpt) = StaticUtil.makePathAndContentType(t, ctx)
       cask.model.StaticResource(path, resourceRoot, headers ++ contentTypeOpt.map("Content-Type" -> _))
     }

cask/src/cask/endpoints/WebEndpoints.scala

@@ -11,7 +11,7 @@ trait WebEndpoint extends HttpEndpoint[Response.Raw, Seq[String]]{
   type InputParser[T] = QueryParamReader[T]
   def wrapFunction(ctx: Request,
                        delegate: Delegate): Result[Response.Raw] = {
-    delegate(WebEndpoint.buildMapFromQueryParams(ctx))
+    delegate(ctx, WebEndpoint.buildMapFromQueryParams(ctx))
   }
   def wrapPathSegment(s: String) = Seq(s)
 }

cask/src/cask/endpoints/WebSocketEndpoint.scala

@@ -21,12 +21,12 @@ object WebsocketResult{
 }
 
 class websocket(val path: String, override val subpath: Boolean = false)
-  extends cask.router.Endpoint[WebsocketResult, WebsocketResult, Seq[String]]{
+  extends cask.router.Endpoint[WebsocketResult, WebsocketResult, Seq[String], Request]{
   val methods = Seq("websocket")
   type InputParser[T] = QueryParamReader[T]
   type OuterReturned = Result[WebsocketResult]
   def wrapFunction(ctx: Request, delegate: Delegate) = {
-    delegate(WebEndpoint.buildMapFromQueryParams(ctx))
+    delegate(ctx, WebEndpoint.buildMapFromQueryParams(ctx))
   }
 
   def wrapPathSegment(s: String): Seq[String] = Seq(s)

cask/src/cask/main/Main.scala

@@ -29,7 +29,7 @@ class MainRoutes extends Main with Routes{
   * application-wide properties.
   */
 abstract class Main{
-  def mainDecorators: Seq[Decorator[_, _, _]] = Nil
+  def mainDecorators: Seq[Decorator[_, _, _, _]] = Nil
   def allRoutes: Seq[Routes]
   def port: Int = 8080
   def host: String = "localhost"
@@ -74,7 +74,7 @@ abstract class Main{
 
 object Main{
   class DefaultHandler(dispatchTrie: DispatchTrie[Map[String, (Routes, EndpointMetadata[_])]],
-                       mainDecorators: Seq[Decorator[_, _, _]],
+                       mainDecorators: Seq[Decorator[_, _, _, _]],
                        debugMode: Boolean,
                        handleNotFound: Request => Response.Raw,
                        handleMethodNotAllowed: Request => Response.Raw,
@@ -120,6 +120,7 @@ object Main{
                 routes,
                 routeBindings,
                 (mainDecorators ++ routes.decorators ++ metadata.decorators).toList,
+                Nil,
                 Nil
               ) match {
                 case Result.Success(res) => runner(res)