Add typed reference filter (#53)

Co-authored-by: hfhbd <[email protected]>

Author: hfhbd

cloudkitclient-core/api/cloudkitclient-core.api

@@ -212,6 +212,7 @@ public final class app/softwork/cloudkitclient/Filter$$serializer : kotlinx/seri
 public final class app/softwork/cloudkitclient/Filter$Builder {
 	public fun <init> ()V
 	public final fun build ()Ljava/util/List;
+	public final fun eq (Lkotlin/reflect/KProperty1;Lapp/softwork/cloudkitclient/Record;)V
 	public final fun eq (Lkotlin/reflect/KProperty1;Ljava/lang/String;)V
 }
 
@@ -1076,6 +1077,7 @@ public final class app/softwork/cloudkitclient/types/Reference {
 	public static final field Companion Lapp/softwork/cloudkitclient/types/Reference$Companion;
 	public synthetic fun <init> (ILjava/lang/String;Lapp/softwork/cloudkitclient/ZoneID;Lapp/softwork/cloudkitclient/types/Reference$Action;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> (Ljava/lang/String;Lapp/softwork/cloudkitclient/ZoneID;Lapp/softwork/cloudkitclient/types/Reference$Action;)V
+	public synthetic fun <init> (Ljava/lang/String;Lapp/softwork/cloudkitclient/ZoneID;Lapp/softwork/cloudkitclient/types/Reference$Action;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/lang/String;
 	public final fun component2 ()Lapp/softwork/cloudkitclient/ZoneID;
 	public final fun component3 ()Lapp/softwork/cloudkitclient/types/Reference$Action;
@@ -1090,8 +1092,8 @@ public final class app/softwork/cloudkitclient/types/Reference {
 }
 
 public final class app/softwork/cloudkitclient/types/Reference$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lapp/softwork/cloudkitclient/types/Reference$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public synthetic fun <init> (Lkotlinx/serialization/KSerializer;Lkotlinx/serialization/KSerializer;)V
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lapp/softwork/cloudkitclient/types/Reference;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -1127,7 +1129,7 @@ public final class app/softwork/cloudkitclient/types/Reference$Action$Companion
 }
 
 public final class app/softwork/cloudkitclient/types/Reference$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+	public final fun serializer (Lkotlinx/serialization/KSerializer;Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
 }
 
 public abstract class app/softwork/cloudkitclient/values/Value {
@@ -1383,8 +1385,8 @@ public final class app/softwork/cloudkitclient/values/Value$Reference : app/soft
 }
 
 public final class app/softwork/cloudkitclient/values/Value$Reference$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lapp/softwork/cloudkitclient/values/Value$Reference$$serializer;
-	public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public synthetic fun <init> (Lkotlinx/serialization/KSerializer;Lkotlinx/serialization/KSerializer;)V
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lapp/softwork/cloudkitclient/values/Value$Reference;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
@@ -1395,7 +1397,7 @@ public final class app/softwork/cloudkitclient/values/Value$Reference$$serialize
 }
 
 public final class app/softwork/cloudkitclient/values/Value$Reference$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+	public final fun serializer (Lkotlinx/serialization/KSerializer;Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer;
 }
 
 public final class app/softwork/cloudkitclient/values/Value$String : app/softwork/cloudkitclient/values/Value {

cloudkitclient-core/src/commonMain/kotlin/app/softwork/cloudkitclient/Filter.kt

@@ -1,5 +1,6 @@
 package app.softwork.cloudkitclient
 
+import app.softwork.cloudkitclient.types.*
 import app.softwork.cloudkitclient.values.*
 import kotlinx.serialization.*
 import kotlin.reflect.*
@@ -48,10 +49,20 @@ public data class Filter(
 
     public class Builder<F : Record.Fields> {
 
-        public infix fun KProperty1<F, Value.String?>.eq(value: kotlin.String) {
+        public infix fun KProperty1<F, Value.String?>.eq(value: String) {
             filters.add(Filter(fieldName = name, comparator = Comparator.EQUALS, fieldValue = Value.String(value)))
         }
 
+        public infix fun <TF : Record.Fields, TR : Record<TF>> KProperty1<F, Value.Reference<TF, TR>>.eq(value: TR) {
+            filters.add(
+                Filter(
+                    fieldName = name, comparator = Comparator.EQUALS, fieldValue = Value.Reference<TF, TR>(
+                        Reference(value.recordName, action = Reference.Action.None)
+                    )
+                )
+            )
+        }
+
         private val filters = mutableListOf<Filter>()
 
         public fun build(): List<Filter> = filters

cloudkitclient-core/src/commonMain/kotlin/app/softwork/cloudkitclient/types/Reference.kt

@@ -1,11 +1,14 @@
 package app.softwork.cloudkitclient.types
 
-import app.softwork.cloudkitclient.ZoneID
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import app.softwork.cloudkitclient.*
+import kotlinx.serialization.*
 
 @Serializable
-public data class Reference(val recordName: String, val zoneID: ZoneID, val action: Action) {
+public data class Reference<F : Record.Fields, TargetRecord : Record<F>>(
+    val recordName: String,
+    val zoneID: ZoneID? = null,
+    val action: Action
+) {
     @Serializable
     public enum class Action {
         @SerialName("None")

cloudkitclient-core/src/commonMain/kotlin/app/softwork/cloudkitclient/values/Value.kt

@@ -1,5 +1,6 @@
 package app.softwork.cloudkitclient.values
 
+import app.softwork.cloudkitclient.*
 import app.softwork.cloudkitclient.internal.*
 import kotlinx.datetime.*
 import kotlinx.serialization.*
@@ -45,7 +46,9 @@ public sealed class Value {
 
     @Serializable
     @SerialName("REFERENCE")
-    public data class Reference(val value: app.softwork.cloudkitclient.types.Reference) : Value()
+    public data class Reference<F : Record.Fields, TargetRecord : Record<F>>(
+        val value: app.softwork.cloudkitclient.types.Reference<F, TargetRecord>
+    ) : Value()
 
 
     @Serializable

cloudkitclient-testing/src/commonMain/kotlin/app/softwork/cloudkitclient/Storage.kt

@@ -225,11 +225,11 @@ public class Storage(
                 }
             }
             is Value.Location -> TODO()
-            is Value.Reference -> {
-                require(otherValue is Reference)
+            is Value.Reference<*, *> -> {
+                require(otherValue is Reference<*, *>)
                 when (comparator) {
-                    EQUALS -> TODO()
-                    NOT_EQUALS -> TODO()
+                    EQUALS -> value.recordName == otherValue.value.recordName
+                    NOT_EQUALS -> value.recordName != otherValue.value.recordName
                     LESS_THAN -> TODO()
                     LESS_THAN_OR_EQUALS -> TODO()
                     GREATER_THAN -> TODO()