BREAKING: Remove ValidationBuilder.has (#163)

konform-kt · Nov 11, 2024 · d921b3a · d921b3a
1 parent 52ed85e
commit d921b3a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git a/api/konform.api b/api/konform.api
@@ -53,8 +53,6 @@ public final class io/konform/validation/ValidationBuilder {
 	public fun <init> ()V
 	public final fun addConstraint (Ljava/lang/String;[Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lio/konform/validation/Constraint;
 	public final fun build ()Lio/konform/validation/Validation;
-	public final fun getHas (Lkotlin/reflect/KFunction;)Lio/konform/validation/ValidationBuilder;
-	public final fun getHas (Lkotlin/reflect/KProperty1;)Lio/konform/validation/ValidationBuilder;
 	public final fun hint (Lio/konform/validation/Constraint;Ljava/lang/String;)Lio/konform/validation/Constraint;
 	public final fun ifPresent (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
 	public final fun ifPresent (Lkotlin/reflect/KFunction;Lkotlin/jvm/functions/Function1;)V

diff --git a/src/commonMain/kotlin/io/konform/validation/ValidationBuilder.kt b/src/commonMain/kotlin/io/konform/validation/ValidationBuilder.kt
@@ -165,11 +165,6 @@ public class ValidationBuilder<T> {
             "'$name' is not a valid kotlin identifier or getter name."
         }
 
-    public val <R> KProperty1<T, R>.has: ValidationBuilder<R>
-        get() = toPropKey(name, NonNull).getOrCreateBuilder()
-    public val <R> KFunction1<T, R>.has: ValidationBuilder<R>
-        get() = toPropKey(name, NonNull).getOrCreateBuilder()
-
     public inline fun <reified SubT : T & Any> ifInstanceOf(init: ValidationBuilder<SubT>.() -> Unit): Unit =
         run(IsClassValidation<SubT, T>(SubT::class, required = false, buildWithNew(init)))
 

diff --git a/src/commonTest/kotlin/io/konform/validation/ValidationBuilderTest.kt b/src/commonTest/kotlin/io/konform/validation/ValidationBuilderTest.kt
@@ -167,26 +167,6 @@ class ValidationBuilderTest {
         "poweruser@".let { assertEquals(1, countErrors(nullableRequiredValidation(it))) }
     }
 
-    @Test
-    fun alternativeSyntax() {
-        val splitDoubleValidation =
-            Validation<Register> {
-                Register::password.has.minLength(1)
-                Register::password.has.maxLength(10)
-                Register::email.has.matches(".+@.+".toRegex())
-            }
-
-        Register(email = "[email protected]", password = "a").let { assertEquals(Valid(it), splitDoubleValidation(it)) }
-        Register(
-            email = "[email protected]",
-            password = "",
-        ).let { assertEquals(1, countErrors(splitDoubleValidation(it), Register::password)) }
-        Register(email = "[email protected]", password = "aaaaaaaaaaa").let {
-            assertEquals(1, countErrors(splitDoubleValidation(it), Register::password))
-        }
-        Register(email = "tester@").let { assertEquals(2, countFieldsWithErrors(splitDoubleValidation(it))) }
-    }
-
     @Test
     fun functionAccessorSyntax() {
         val splitDoubleValidation =
@@ -479,7 +459,9 @@ class ValidationBuilderTest {
     fun composeValidations() {
         val addressValidation =
             Validation<Address> {
-                Address::address.has.minLength(1)
+                Address::address {
+                    minLength(1)
+                }
             }
 
         val validation =
@@ -496,7 +478,9 @@ class ValidationBuilderTest {
     fun replacePlaceholderInString() {
         val validation =
             Validation<Register> {
-                Register::password.has.minLength(8)
+                Register::password {
+                    minLength(8)
+                }
             }
         assertTrue(validation(Register(password = ""))[Register::password]!![0].contains("8"))
     }