Small improvements

Author: jan-tennert

KSP/src/main/kotlin/io/github/jan/supabase/ksp/SelectableSymbolProcessor.kt

@@ -30,8 +30,8 @@ class SelectableSymbolProcessor(
     private val options: Map<String, String>
 ) : SymbolProcessor {
 
-    val packageName = options["packageName"] ?: "io.github.jan.supabase.postgrest"
-    val fileName = options["fileName"] ?: "PostgrestColumns"
+    val packageName = options["selectablePackageName"] ?: "io.github.jan.supabase.postgrest"
+    val fileName = options["selectableFileName"] ?: "PostgrestColumns"
 
     override fun process(resolver: Resolver): List<KSAnnotated> {
         val symbols = resolver.getSymbolsWithAnnotation(Selectable::class.java.name).filterIsInstance<KSClassDeclaration>()

Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/ColumnRegistry.kt

@@ -3,15 +3,26 @@ package io.github.jan.supabase.postgrest
 import io.github.jan.supabase.annotations.SupabaseInternal
 import kotlin.reflect.KClass
 
+@OptIn(ExperimentalSubclassOptIn::class)
 @SupabaseInternal
-class ColumnRegistry(
+@SubclassOptInRequired(SupabaseInternal::class)
+interface ColumnRegistry {
+
+    fun <T : Any> getColumns(kClass: KClass<T>): String
+
+    fun registerColumns(name: String, columns: String)
+
+}
+
+@SupabaseInternal
+class MapColumnRegistry(
     private val map: MutableMap<String, String> = mutableMapOf()
-) {
+): ColumnRegistry {
 
-    fun <T : Any> getColumns(kClass: KClass<T>): String = map[kClass.simpleName] ?: error("No columns registered for $kClass")
+    override fun <T : Any> getColumns(kClass: KClass<T>): String = map[kClass.simpleName] ?: error("No columns registered for $kClass")
 
-    fun registerColumns(qualifiedName: String, columns: String) {
-        map[qualifiedName] = columns
+    override fun registerColumns(name: String, columns: String) {
+        map[name] = columns
     }
 
 }

Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/Postgrest.kt

@@ -102,7 +102,7 @@ interface Postgrest : MainPlugin<Postgrest.Config>, CustomSerializationPlugin {
     data class Config(
         var defaultSchema: String = "public",
         var propertyConversionMethod: PropertyConversionMethod = PropertyConversionMethod.CAMEL_CASE_TO_SNAKE_CASE,
-        @property:SupabaseInternal var columnRegistry: ColumnRegistry = ColumnRegistry()
+        @property:SupabaseInternal var columnRegistry: ColumnRegistry = MapColumnRegistry()
     ): MainConfig(), CustomSerializationConfig {
 
         override var serializer: SupabaseSerializer? = null

Postgrest/src/commonTest/kotlin/Utils.kt

@@ -1,12 +1,13 @@
 import io.github.jan.supabase.annotations.SupabaseInternal
 import io.github.jan.supabase.postgrest.ColumnRegistry
+import io.github.jan.supabase.postgrest.MapColumnRegistry
 import io.github.jan.supabase.postgrest.PropertyConversionMethod
 import io.github.jan.supabase.postgrest.query.PostgrestRequestBuilder
 
 @SupabaseInternal
 inline fun postgrestRequest(
     propertyConversionMethod: PropertyConversionMethod = PropertyConversionMethod.CAMEL_CASE_TO_SNAKE_CASE,
-    columnRegistry: ColumnRegistry = ColumnRegistry(),
+    columnRegistry: ColumnRegistry = MapColumnRegistry(),
     block: PostgrestRequestBuilder.() -> Unit
 ): PostgrestRequestBuilder {
     val filter = PostgrestRequestBuilder(propertyConversionMethod, columnRegistry)