query wrok

ValdemarGr · Sep 3, 2023 · efe9741 · efe9741
1 parent 6a3a3d7
commit efe9741
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/modules/relational/src/main/scala/gql/relational/QueryAlgebra.scala b/modules/relational/src/main/scala/gql/relational/QueryAlgebra.scala
@@ -117,17 +117,20 @@ trait QueryAlgebra {
         fa: Query[G, A],
         f: A => Query[H, B]
     ) extends Query[Lambda[X => G[H[X]]], B]
+    case class ToList[G[_], A](fa: Query[G, A]) extends Query[List, A]
     case class MapK[G[_], H[_], A](
         fa: Query[G, A],
         f: G ~> H
     ) extends Query[H, A]
     case class Select[A](cols: Chain[Frag], decoder: Decoder[A]) extends Query[Lambda[X => X], Select[A]]
-    implicit lazy val applicativeForSelect: Applicative[Select] = new Applicative[Select] {
-      override def pure[A](x: A): Select[A] = 
-        Select(Chain.empty, Applicative[Decoder].pure(x))
+    object Select {
+      implicit lazy val applicativeForSelect: Applicative[Select] = new Applicative[Select] {
+        override def pure[A](x: A): Select[A] = 
+          Select(Chain.empty, Applicative[Decoder].pure(x))
 
-      override def ap[A, B](ff: Select[A => B])(fa: Select[A]): Select[B] =
-        Select(ff.cols ++ fa.cols, ff.decoder ap fa.decoder)
+        override def ap[A, B](ff: Select[A => B])(fa: Select[A]): Select[B] =
+          Select(ff.cols ++ fa.cols, ff.decoder ap fa.decoder)
+      }
     }
   }
 
@@ -446,6 +449,16 @@ trait QueryAlgebra {
       case p: Query.Pure[a]              => Effect.pure(QueryStateImpl(JoinType.One.reassoc[Unit], ().pure[Decoder], p.a, FunctionK.id[G]))
       case s: Query.Select[a]            => Effect.pure(QueryStateImpl(JoinType.One.reassoc[Unit], ().pure[Decoder], s, FunctionK.id[G]))
       case fm: Query.FlatMap[g, h, a, b] => handleFlatMap(fm)
+      case toList: Query.ToList[g, a] => 
+        collapseQuery(toList.fa).map{ qs =>
+          QueryStateImpl(
+            JoinType.joinTypeList.reassoc[Unit],
+            ().pure[Decoder],
+            qs.value,
+            FunctionK.id[List]
+          )
+        }
+        ???
       case j: Query.Join[g, t] =>
         for {
           n <- nextId

diff --git a/modules/relational/src/main/scala/gql/relational/QueryDsl.scala b/modules/relational/src/main/scala/gql/relational/QueryDsl.scala
@@ -120,16 +120,20 @@ trait QueryDsl extends QueryAlgebra { self =>
     )(f: (A, C) => Query[G, Query.Select[B]])(g: Resolver[F, G[B], G[B]] => Resolver[F, G[B], D])(implicit
         tpe: => Out[F, D]
     ): Field[F, QueryResult[A], D] =
-/*      queryFull(EmptyableArg.Lift(a))((a, c) => f(a, c), g(Resolver.id[F, G[B]]))(tpe)
-
-    def contBoundary[G[_], B, C, D](connection: Connection[F])(f: A => Query[G, Query.Select[B]])(
-      continue: NonEmptyList[B] => Query[G, C]
-    )(implicit F: Applicative[F], Q: Queryable[F], tpe: => Out[F, G[QueryResult[B]]]) = 
-      Field(
-        queryFull(EmptyableArg.Empty)((i, _) => q(a), Resolver.id[F, G[B]])(tpe)
-      )
-      Field(queryAndThen(f)(_.andThen(resolveQuery(EmptyableArg.Empty, (i, _) => q(i), connection))), Eval.later(tpe))
-*/
+      queryFull(EmptyableArg.Lift(a))((a, c) => f(a, c), g(Resolver.id[F, G[B]]))(tpe)
+
+    def contBoundary[G[_], H[_], B, C, D](connection: Connection[F])(f: A => Query[G, Query.Select[B]])(
+      continue: NonEmptyList[List[B]] => Query[H, (Query.Select[List[B]], C)]
+    )(implicit F: Applicative[F], Q: Queryable[F], tpe: => Out[F, H[QueryResult[C]]]) = 
+        queryFull[F, List, A, B, Unit, H[QueryResult[C]]](EmptyableArg.Empty)((i, _) => Query.ToList(f(i)), Resolver.id[F, List[B]].andThen(
+          resolveQuery[F, H, List[B], C, Unit](
+            EmptyableArg.Empty, 
+            (i, _) => continue(i), 
+            connection
+          )
+        )
+      )(tpe)
+
     def query[G[_], B](f: A => Query[G, Query.Select[B]])(implicit
         tpe: => Out[F, G[B]]
     ): Field[F, QueryResult[A], G[B]] =