Get rid of implicit conversion

Iltotore · Nov 18, 2023 · a6a5b4e · a6a5b4e
1 parent 279f312
commit a6a5b4e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 28 deletions.
diff --git a/docs/_docs/modules/skunk.md b/docs/_docs/modules/skunk.md
@@ -49,14 +49,15 @@ import io.github.iltotore.iron.skunk.given
 
 type Username = String :| Not[Blank]
 
-// refine a codec implicitly
-val a: Query[Void, Username] = sql"SELECT name FROM users".query(varchar)
+// refining a codec at usage site
+val a: Query[Void, Username] = sql"SELECT name FROM users".query(varchar.refined)
 
-// refine a codec explictly
-val b: Query[Void, Username] = sql"SELECT name FROM users".query(varchar.refined)
+// defining a codec for a refined opaque type
+opaque type PositiveInt = Int :| Positive
+object PositiveInt extends RefinedTypeOps[Int, Positive, PositiveInt]:
+  given codec: Codec[PositiveInt] = int4.refined[Positive]
 
 // defining a codec for a refined case class
 final case class User(name: Username, age: Int :| Positive)
-given Codec[User] = (varchar.refined[Not[Blank]] *: int4.refined[Positive]).to[User]
-
+given Codec[User] = (varchar.refined[Not[Blank]] *: PositiveInt.codec).to[User]
 ```
diff --git a/skunk/src/io.github.iltotore.iron/skunk.scala b/skunk/src/io.github.iltotore.iron/skunk.scala
@@ -2,8 +2,6 @@ package io.github.iltotore.iron
 
 import _root_.skunk.*
 
-import scala.Conversion
-
 object skunk:
 
   /**
@@ -15,15 +13,6 @@ object skunk:
     inline def refined[C](using inline constraint: Constraint[A, C]): Codec[A :| C] =
       codec.eimap[A :| C](_.refineEither[C])(_.asInstanceOf[A])
 
-  /**
-   * Implicit conversion for refining a [[Codec]]. Decodes to the underlying type then checks the constraint.
-   *
-   * @param constraint the [[Constraint]] implementation to test the decoded value
-   */
-  inline given [A, C](using inline constraint: Constraint[A, C]): Conversion[Codec[A], Codec[A :| C]] =
-    new Conversion[Codec[A], Codec[A :| C]]:
-      override def apply(codec: Codec[A]): Codec[A :| C] = codec.refined
-
   /**
    * A [[Codec]] for refined types. Decodes to the underlying type then checks the constraint.
    *

diff --git a/skunk/test/src/io/github/iltotore/iron/SkunkExample.scala b/skunk/test/src/io/github/iltotore/iron/SkunkExample.scala
@@ -10,12 +10,14 @@ import io.github.iltotore.iron.skunk.given
 
 type Username = String :| Not[Blank]
 
-// refine a codec implicitly
-val a: Query[Void, Username] = sql"SELECT name FROM users".query(varchar)
+// refining a codec at usage site
+val a: Query[Void, Username] = sql"SELECT name FROM users".query(varchar.refined)
 
-// refine a codec explictly
-val b: Query[Void, Username] = sql"SELECT name FROM users".query(varchar.refined)
+// defining a codec for a refined opaque type
+opaque type PositiveInt = Int :| Positive
+object PositiveInt extends RefinedTypeOps[Int, Positive, PositiveInt]:
+  given codec: Codec[PositiveInt] = int4.refined[Positive]
 
 // defining a codec for a refined case class
 final case class User(name: Username, age: Int :| Positive)
-given Codec[User] = (varchar.refined[Not[Blank]] *: int4.refined[Positive]).to[User]
+given Codec[User] = (varchar.refined[Not[Blank]] *: PositiveInt.codec).to[User]
diff --git a/skunk/test/src/io/github/iltotore/iron/SkunkSuite.scala b/skunk/test/src/io/github/iltotore/iron/SkunkSuite.scala
@@ -1,19 +1,21 @@
 package io.github.iltotore.iron
 
 import _root_.skunk.*
-import _root_.skunk.given
+import _root_.skunk.implicits.*
 import _root_.skunk.codec.all.*
+import io.github.iltotore.iron.*
 import io.github.iltotore.iron.constraint.all.*
+import io.github.iltotore.iron.skunk.*
 import io.github.iltotore.iron.skunk.given
-import io.github.iltotore.iron.*
 import utest.*
 
-opaque type PositiveInt = Int :| Positive
-object PositiveInt extends RefinedTypeOps[Int, Positive, PositiveInt]
+object SkunkSuite extends TestSuite:
 
-given Codec[Int] = int4
+  given Codec[Int] = int4
 
-object SkunkSuite extends TestSuite:
+  opaque type PositiveInt = Int :| Positive
+  object PositiveInt extends RefinedTypeOps[Int, Positive, PositiveInt]:
+    given Codec[PositiveInt] = summon[Codec[Int]].refined
 
   val tests: Tests = Tests {