Widen type of lifted expressions

Author: danslapman

oolong-core/src/main/scala/oolong/AstParser.scala

@@ -163,10 +163,10 @@ private[oolong] class DefaultAstParser(using quotes: Quotes) extends AstParser {
       case '{ ($x: Option[_]).nonEmpty } =>
         QExpr.Exists(parse(x), QExpr.Constant(true))
 
-      case '{ ($x: Instant).isBefore($s) } =>
+      case '{ ($x: Instant).isBefore($s: Instant) } =>
         QExpr.Lt(parse(x), parse(s))
 
-      case '{ ($x: Instant).isAfter($s) } =>
+      case '{ ($x: Instant).isAfter($s: Instant) } =>
         QExpr.Gt(parse(x), parse(s))
 
       case PropSelector(name, path) if name == paramName =>

oolong-mongo/src/main/scala/oolong/mongo/BsonUtils.scala

@@ -19,8 +19,15 @@ private[oolong] object BsonUtils {
       case '{ $s: t } =>
         Expr.summon[BsonEncoder[t]] match {
           case Some(encoder) => '{ ${ encoder }.bson(${ s }) }
-          case _             => report.errorAndAbort(s"Didn't find bson encoder for type ${TypeRepr.of[t].show}")
+          case None if TypeRepr.of[t].isSingleton =>
+            TypeRepr.of[t].widen.asType match {
+              case '[tx] =>
+                Expr.summon[BsonEncoder[tx]] match {
+                  case Some(encoder) => '{ ${ encoder }.bson(${ s.asExprOf[tx] }) }
+                  case _ => report.errorAndAbort(s"Didn't find bson encoder for type ${TypeRepr.of[t].widen.show}")
+                }
+            }
+          case _ => report.errorAndAbort(s"Didn't find bson encoder for type ${TypeRepr.of[t].widen.show}")
         }
     }
-
 }

oolong-mongo/src/test/scala/oolong/mongo/QuerySpec.scala

@@ -1170,8 +1170,10 @@ class QuerySpec extends AnyFunSuite {
 
   test("Instant.ifBefore is supported") {
     case class InstantTest(field: Instant)
-    val q    = query[InstantTest](_.field.isBefore(lift(Instant.parse("2020-01-01T00:00:00Z"))))
-    val repr = renderQuery[InstantTest](_.field.isBefore(lift(Instant.parse("2020-01-01T00:00:00Z"))))
+
+    val instant = Instant.parse("2020-01-01T00:00:00Z")
+    val q       = query[InstantTest](_.field.isBefore(lift(instant)))
+    val repr    = renderQuery[InstantTest](_.field.isBefore(lift(instant)))
 
     test(
       q,
@@ -1185,8 +1187,10 @@ class QuerySpec extends AnyFunSuite {
 
   test("Instant.isAfter is supported") {
     case class InstantTest(field: Instant)
-    val q    = query[InstantTest](_.field.isAfter(lift(Instant.parse("2020-01-01T00:00:00Z"))))
-    val repr = renderQuery[InstantTest](_.field.isAfter(lift(Instant.parse("2020-01-01T00:00:00Z"))))
+
+    val instant = Instant.parse("2020-01-01T00:00:00Z")
+    val q       = query[InstantTest](_.field.isAfter(lift(instant)))
+    val repr    = renderQuery[InstantTest](_.field.isAfter(lift(instant)))
 
     test(
       q,