Support for more auto casts

Author: jan-tennert

KSP/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+
 plugins {
     id(libs.plugins.kotlin.jvm.get().pluginId)
 }
@@ -11,4 +13,8 @@ dependencies {
     implementation(libs.kotlin.poet)
     implementation(libs.kotlin.poet.ksp)
     implementation(project(":postgrest-kt"))
+}
+
+tasks.named<KotlinCompilationTask<*>>("compileKotlin").configure {
+    compilerOptions.freeCompilerArgs.add("-opt-in=io.github.jan.supabase.annotations.SupabaseInternal")
 }

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

@@ -2,15 +2,23 @@ package io.github.jan.supabase.ksp
 
 val primitiveColumnTypes = mapOf<String, String>(
     "kotlin.String" to "text",
-    "kotlin.Int" to "int",
+    "kotlin.Int" to "int4",
     "kotlin.Long" to "int8",
     "kotlin.Float" to "float4",
     "kotlin.Double" to "float8",
     "kotlin.Boolean" to "bool",
     "kotlin.Byte" to "int2",
     "kotlin.Short" to "int2",
     "kotlin.Char" to "char",
-    //TIMESTAMPS etc.
+    "kotlinx.datetime.Instant" to "timestamptz",
+    "kotlinx.datetime.LocalDateTime" to "timestamp",
+    "kotlin.uuid.Uuid" to "uuid",
+    "kotlinx.datetime.LocalTime" to "time",
+    "kotlinx.datetime.LocalDate" to "date",
+    "kotlinx.serialization.json.JsonElement" to "jsonb",
+    "kotlinx.serialization.json.JsonObject" to "jsonb",
+    "kotlinx.serialization.json.JsonArray" to "jsonb",
+    "kotlinx.serialization.json.JsonPrimitive" to "jsonb",
 )
 
 fun isPrimitive(qualifiedName: String) = primitiveColumnTypes.containsKey(qualifiedName)

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

@@ -1,5 +1,7 @@
 package io.github.jan.supabase.postgrest.annotations
 
+import io.github.jan.supabase.annotations.SupabaseInternal
+
 /**
  * Annotation to apply a function to a column in a PostgREST query.
  * @param function The function to apply to the column.
@@ -9,7 +11,12 @@ package io.github.jan.supabase.postgrest.annotations
 annotation class ApplyFunction(val function: String) {
 
     companion object {
-        const val FUNCTION_PARAMETER_NAME = "function"
+        @SupabaseInternal const val FUNCTION_PARAMETER_NAME = "function"
+        const val AVG = "avg"
+        const val COUNT = "count"
+        const val MAX = "max"
+        const val MIN = "min"
+        const val SUM = "sum"
     }
 
 }

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

@@ -1,5 +1,7 @@
 package io.github.jan.supabase.postgrest.annotations
 
+import io.github.jan.supabase.annotations.SupabaseInternal
+
 /**
  * Annotation to cast a column in a PostgREST query.
  * @param type The type to cast the column to. If empty, the type will be inferred from the parameter type. For example, if the parameter is of type `String`, the column will be cast to `text`.
@@ -9,7 +11,7 @@ package io.github.jan.supabase.postgrest.annotations
 annotation class Cast(val type: String = "") {
 
     companion object {
-        const val TYPE_PARAMETER_NAME = "type"
+        @SupabaseInternal const val TYPE_PARAMETER_NAME = "type"
     }
 
 }

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

@@ -1,5 +1,7 @@
 package io.github.jan.supabase.postgrest.annotations
 
+import io.github.jan.supabase.annotations.SupabaseInternal
+
 /**
  * Annotation to specify the name of a column in a PostgREST query.
  *
@@ -11,7 +13,7 @@ package io.github.jan.supabase.postgrest.annotations
 annotation class ColumnName(val name: String) {
 
     companion object {
-        const val NAME_PARAMETER_NAME = "name"
+        @SupabaseInternal const val NAME_PARAMETER_NAME = "name"
     }
 
 }

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

@@ -3,7 +3,7 @@ package io.github.jan.supabase.postgrest.annotations
 /**
  * Annotation to specify that a column is a foreign key in a PostgREST query.
  *
- * This annotation may be used in combination with [ColumnName] to specify the name of the foreign key column. The type of the parameter must be marked with [Selectable].
+ * This annotation may be used in combination with [ColumnName] to specify the name of the foreign key column. The type of the parameter must be annotated with [Selectable].
  */
 @Target(AnnotationTarget.VALUE_PARAMETER)
 @Retention(AnnotationRetention.SOURCE)

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

@@ -1,5 +1,7 @@
 package io.github.jan.supabase.postgrest.annotations
 
+import io.github.jan.supabase.annotations.SupabaseInternal
+
 /**
  * Annotation to specify a JSON path in a PostgREST query.
  *
@@ -24,8 +26,8 @@ package io.github.jan.supabase.postgrest.annotations
 annotation class JsonPath(vararg val path: String, val returnAsText: Boolean = false) {
 
     companion object {
-        const val PATH_PARAMETER_NAME = "path"
-        const val RETURN_AS_TEXT_PARAMETER_NAME = "returnAsText"
+        @SupabaseInternal const val PATH_PARAMETER_NAME = "path"
+        @SupabaseInternal const val RETURN_AS_TEXT_PARAMETER_NAME = "returnAsText"
     }
 
 }

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

@@ -3,18 +3,18 @@ package io.github.jan.supabase.postgrest.annotations
 import io.github.jan.supabase.postgrest.query.PostgrestQueryBuilder
 
 /**
- * Marks a class as selectable.
+ * Annotates a class as selectable.
  *
  * When using the **ksp-compiler** this annotation will be processed and columns for [PostgrestQueryBuilder.select] will be generated.
  *
  * The columns can be accessed via the generated extension property for the companion object of the class.
  *
  * **Note:**
- * - All classes marked with this annotation must have a companion object, which can be empty, and must be a data class
- * - All parameters in the primary constructor must a primitive type`*` or a type that is also marked with [Selectable]
- * - Parameters may be marked with [ColumnName], [ApplyFunction], [Cast], [JsonPath], [Foreign].
+ * - All classes annotated with this annotation must have a companion object, which can be empty, and must be a data class
+ * - All parameters in the primary constructor must a primitive type¹, a type that is also annotated with [Selectable] or a serializable type.
+ * - Parameters may be annotated with [ColumnName], [ApplyFunction], [Cast], [JsonPath], [Foreign].
  *
- * `*` Available primitive types are: String, Int, Long, Float, Double, Boolean
+ * ¹: Available primitive types are: String, Int, Long, Float, Double, Boolean, Byte, Short, Char, Instant, LocalDateTime, Uuid, LocalTime, LocalDate, JsonElement, JsonObject, JsonArray, JsonPrimitive
  *
  * Example usage:
  * ```kotlin

buildSrc/src/main/kotlin/Modules.kt

@@ -1,3 +1,4 @@
+import org.gradle.kotlin.dsl.DependencyHandlerScope
 import org.jetbrains.compose.desktop.DesktopExtension
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler