Revert JsonPath change

Author: jan-tennert

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

@@ -9,5 +9,4 @@ data class ColumnOptions(
     val function: String?,
     val cast: String?,
     val innerColumns: String,
-    val jsonKey: String?
 )

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

@@ -101,7 +101,6 @@ class SelectableSymbolProcessor(
         val isForeign = parameter.annotations.getAnnotationOrNull(Foreign::class.java.simpleName) != null
         val jsonPathArguments = parameter.annotations.getAnnotationOrNull(JsonPath::class.java.simpleName)?.arguments
         val jsonPath = jsonPathArguments?.getParameterValue<ArrayList<String>>(JsonPath.PATH_PARAMETER_NAME)
-        val jsonKey = jsonPathArguments?.getParameterValue<String>(JsonPath.KEY_PARAMETER_NAME)
         val returnAsText = jsonPathArguments?.getParameterValue<Boolean>(JsonPath.RETURN_AS_TEXT_PARAMETER_NAME) == true
         val function = parameter.annotations.getAnnotationOrNull(ApplyFunction::class.java.simpleName)
             ?.arguments?.getParameterValue<String>(ApplyFunction.FUNCTION_PARAMETER_NAME)
@@ -112,7 +111,6 @@ class SelectableSymbolProcessor(
             columnName = columnName,
             isForeign = isForeign,
             jsonPath = jsonPath,
-            jsonKey = jsonKey,
             returnAsText = returnAsText,
             function = function,
             cast = cast,
@@ -145,9 +143,12 @@ class SelectableSymbolProcessor(
         if(options.jsonPath != null && options.function != null) {
             logger.error("Parameter $parameterName can't have both @JsonPath and @ApplyFunction annotation", symbol)
         }
-        if(options.jsonKey != null && options.columnName == null) {
+        if(options.jsonPath != null && options.columnName == null) {
             logger.error("Parameter $parameterName must have a @ColumnName annotation when using @JsonPath", symbol)
         }
+        if(options.jsonPath != null && options.jsonPath.isEmpty()) {
+            logger.error("Parameter $parameterName must have at least one path in @JsonPath annotation", symbol)
+        }
     }
 
     private fun buildColumns(
@@ -158,10 +159,10 @@ class SelectableSymbolProcessor(
     ): String {
         return buildString {
             if(options.jsonPath != null) {
-                if(options.alias != options.jsonKey) {
+                if(options.alias != options.jsonPath.last()) {
                     append("${options.alias}:")
                 }
-                append(buildJsonPath(options.columnName, options.jsonKey, options.jsonPath, options.returnAsText))
+                append(buildJsonPath(options.columnName, options.jsonPath, options.returnAsText))
                 return@buildString
             }
 
@@ -195,20 +196,19 @@ class SelectableSymbolProcessor(
 
     private fun buildJsonPath(
         columnName: String?,
-        jsonKey: String?,
         jsonPath: List<String>,
         returnAsText: Boolean
     ): String {
         val operator = if(returnAsText) "->>" else "->"
         return buildString {
             append(columnName)
-            if(jsonPath.isNotEmpty()) {
-                jsonPath.forEach {
+            if(jsonPath.size > 1) {
+                jsonPath.dropLast(1).forEach {
                     append("->$it")
                 }
             }
             append(operator)
-            append(jsonKey)
+            append(jsonPath.last())
         }
     }
 

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

@@ -9,26 +9,32 @@ import io.github.jan.supabase.annotations.SupabaseInternal
  * Table with a JSON column `data`:
  * ```json
  * {
- *    "id": 1
+ *    "id": 1,
+ *    "nested": {
+ *        "name": "John"
+ *    }
  * }
  * ```
  * ```kotlin
  * @Selectable
  * data class Example(
  *     @ColumnName("data")
  *     @JsonPath("id")
- *     val id: Int
+ *     val id: Int,
+ *
+ *     @ColumnName("data")
+ *     @JsonPath("nested", "name")
+ *     val name: String
  * )
  * ```
  *
- * @param key The key of the JSON property.
- * @param path Additional path to the JSON property. If the JSON property is nested, you can specify the path to the property.
+ * @param path The path to the JSON property. At least one path must be specified.
  * @param returnAsText Whether to return the JSON property as text. If `true`, the JSON property will be returned as a string. If `false`, the JSON property will be returned as JSON.
  *
  */
 @Target(AnnotationTarget.VALUE_PARAMETER)
 @Retention(AnnotationRetention.SOURCE)
-annotation class JsonPath(val key: String, vararg val path: String, val returnAsText: Boolean = false) {
+annotation class JsonPath(vararg val path: String, val returnAsText: Boolean = false) {
 
     companion object {
         @SupabaseInternal const val PATH_PARAMETER_NAME = "path"