save

.gitignore

@@ -1,3 +1,5 @@
 target/
 .bsp/
 .metals/
+.bloop/
+project/metals.sbt

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.10.5

project/project/metals.sbt

@@ -0,0 +1,8 @@
+// format: off
+// DO NOT EDIT! This file is auto-generated.
+
+// This file enables sbt-bloop to create bloop config files.
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.6.0")
+
+// format: on

src/main/scala/minisql/ast/Ast.scala

@@ -386,34 +386,15 @@ sealed trait ScalarLift extends Lift
 case class ScalarValueLift(
   name: String,
   liftId: String
-) extends ScalarLift {
+) extends ScalarLift
-
-  def expandedLiftId: Option[(String, Int)] = {
-    val idxStart = liftId.indexOf('[')
-    val idxEnd = liftId.indexOf(']')
-    if (idxStart != -1 && idxEnd != -1) {
-      val idx = liftId.substring(idxStart + 1, idxEnd).toIntOption
-      idx.map(i => liftId.substring(0, idxStart) -> i)
-    } else None
-  }
-}
-
-case class ScalarQueryLift(name: String, liftId: String) extends ScalarLift {
-  def at(idx: Int): ScalarValueLift =
-    ScalarValueLift(s"${name}[$idx]", s"${liftId}[${idx}]")
-}
 
 object ScalarLift {
   given ToExpr[ScalarLift] with {
     def apply(l: ScalarLift)(using Quotes) = l match {
       case ScalarValueLift(n, id) =>
         '{ ScalarValueLift(${ Expr(n) }, ${ Expr(id) }) }
-      case ScalarQueryLift(n, id) =>
-        '{ ScalarQueryLift(${ Expr(n) }, ${ Expr(id) }) }
     }
   }
 }
 
 sealed trait CaseClassLift extends Lift
-case class CaseClassQueryLift(name: String, liftId: String)
-    extends CaseClassLift

src/main/scala/minisql/dsl.scala

@@ -1,39 +1,46 @@
 package minisql.dsl
 
+import minisql.ast.{Ast, Entity, given}
 import scala.quoted.*
 import scala.compiletime.*
 import scala.compiletime.ops.string.*
 
-trait Quoted[E] {
+sealed trait Dsl {
-  type Ast
   def ast: Ast
-  def liftings: Map[String, Any]
 }
 
-object Quoted {
+trait Query[E] extends Dsl
-  def apply[_Ast <: String, E](
+
-    _ast: Ast,
+class EntityQuery[E](val ast: Ast) extends Query
-    _liftings: Map[String, Any]
+
-  ): Quoted[_Ast, E] =
+given FromExpr[EntityQuery[?]] with {
-    new Quoted[_Ast] {
+  def unapply(x: Expr[EntityQuery[?]])(using Quotes): Option[EntityQuery[?]] = {
-      type Ast = _Ast
+    x match {
-      def ast      = _ast
+      case '{ EntityQuery(${ Expr(ast) }) } =>
-      def liftings = _liftings
+        Some(EntityQuery(ast))
+      case _ =>
+        import quotes.reflect.*
+        println(s"cannot unlift ${x.asTerm}")
+        None
+    }
+  }
+}
+given FromExpr[Dsl] with {
+  def unapply(d: Expr[Dsl])(using Quotes): Option[Dsl] = d match {
+    case '{ ($x: EntityQuery[?]) } => x.value
+  }
 }
 
-  inline def transform[A1 <: String, A2 <: String, A3 <: String](
+inline def query[E](inline table: String) =
-    inline q1: Quoted[A1],
+  EntityQuery[E](Entity(table, Nil))
-    inline q2: Quoted[A2]
-  )(inline f: (A1, A2) => A3): Quoted[A3] =
-    Quoted[A3](q1.liftings ++ q2.liftings)
 
+inline def compile(inline x: Dsl): Option[String] = ${ compileImpl('x) }
+
+private def compileImpl(x: Expr[Dsl])(using Quotes): Expr[Option[String]] = {
+  import quotes.reflect.*
+  x.value match {
+    case Some(xv) => '{ Some(${ Expr(xv.ast.toString()) }) }
+    case None     => '{ None }
   }
 
-case class Foo()
-
-opaque type Query[E] <: Quoted[E]                  = Quoted[E]
-opaque type EntityQuery[E] <: Quoted[E] & Query[E] = Quoted[E]
-
-extension [E](e: EntityQuery[E]) {
-  inline def map[E1](inline f: E => E1): EntityQuery[E1] = Quoted[]()
 }