Add default instances for NonEmptyList

scala-steward · Aug 25, 2023 · 73706ae · 73706ae
1 parent 7d05b9c
commit 73706ae
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/src/main/scala/com/melvinlow/formify/instances.scala b/src/main/scala/com/melvinlow/formify/instances.scala
@@ -76,6 +76,12 @@ object instances {
         encoded.zipWithIndex.map { case (value, idx) => (idx.toString, value) }.toMap
       }
 
+    given neListFormEncoder_F[T: FormDataEncoder]: FormDataEncoder[NonEmptyList[T]] =
+      FormDataEncoder[List[T]].contramap(_.toList)
+
+    given neListFormEncoder_V[T: FormValueEncoder]: FormDataEncoder[NonEmptyList[T]] =
+      FormDataEncoder[List[T]].contramap(_.toList)
+
     given neChainFormEncoder_F[T: FormDataEncoder]: FormDataEncoder[NonEmptyChain[T]] =
       FormDataEncoder[List[T]].contramap(_.toList)
 

diff --git a/src/test/scala/com/melvinlow/formify/FormDataEncoderSpec.scala b/src/test/scala/com/melvinlow/formify/FormDataEncoderSpec.scala
@@ -511,4 +511,39 @@ object FormDataEncoderSpec extends weaver.FunSuite {
       )
     }
   }
+
+  test("should encode a NonEmptyList[Int]") {
+    import com.melvinlow.formify.instances.auto.given
+
+    val instance = NonEmptyList(1, List(2, 3))
+    val encoded  = FormDataEncoder[NonEmptyList[Int]].encode(instance)
+
+    given FormFieldComposer = FormFieldComposer.make(_.toList.mkString("."))
+
+    expect {
+      encoded.compile == Chain(
+        ("0", "1"),
+        ("1", "2"),
+        ("2", "3")
+      )
+    }
+  }
+
+  test("should encode a NonEmptyList[List[Int]]") {
+    import com.melvinlow.formify.instances.auto.given
+
+    val instance = NonEmptyList(List(1, 2), List(List(3, 4)))
+    val encoded  = FormDataEncoder[NonEmptyList[List[Int]]].encode(instance)
+
+    given FormFieldComposer = FormFieldComposer.make(_.toList.mkString("."))
+
+    expect {
+      encoded.compile == Chain(
+        ("0.0", "1"),
+        ("0.1", "2"),
+        ("1.0", "3"),
+        ("1.1", "4")
+      )
+    }
+  }
 }
diff --git a/...nlow/formify/FormFieldFragmentSpec$.scala → ...inlow/formify/FormFieldFragmentSpec.scala b/...nlow/formify/FormFieldFragmentSpec$.scala → ...inlow/formify/FormFieldFragmentSpec.scala
@@ -1,6 +1,6 @@
 package com.melvinlow.formify
 
-object FormFieldFragmentSpec$ extends weaver.FunSuite {
+object FormFieldFragmentSpec extends weaver.FunSuite {
   test("should wrap and unwrap") {
     expect(FormFieldFragment("hello").underlying == "hello")
   }

diff --git a/...om/melvinlow/formify/FormFieldSpec$.scala → ...com/melvinlow/formify/FormFieldSpec.scala b/...om/melvinlow/formify/FormFieldSpec$.scala → ...com/melvinlow/formify/FormFieldSpec.scala
@@ -3,7 +3,7 @@ package com.melvinlow.formify
 import cats.data.*
 import cats.syntax.all.*
 
-object FormFieldSpec$ extends weaver.FunSuite {
+object FormFieldSpec extends weaver.FunSuite {
   test("should wrap and unwrap") {
     val fragment = FormFieldFragment("hello")
     expect(FormField.one(fragment).underlying == NonEmptyChain(fragment))