Fix detekt and JS

Author: jan-tennert

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

@@ -87,12 +87,13 @@ class SelectableSymbolProcessor(
     }
 
     private fun processParameters(parameter: KSValueParameter, resolver: Resolver): String {
-        val parameterClass = resolver.getClassDeclarationByName(parameter.type.resolve().declaration.qualifiedName!!)
-        val innerColumns = if(!isPrimitive(parameterClass!!.qualifiedName!!.asString())) {
+        val parameterClass = resolver.getClassDeclarationByName(parameter.type.resolve().declaration.qualifiedKSName)
+        requireNotNull(parameterClass) { "Parameter class is null" }
+        val innerColumns = if(!isPrimitive(parameterClass.qualifiedNameAsString)) {
             val annotation = parameterClass.annotations.getAnnotationOrNull(Selectable::class.java.simpleName)
             if(annotation == null) {
                 //Could be a JSON column or a custom type, so don't throw an error
-                logger.info("Type of parameter ${parameter.name!!.getShortName()} is not a primitive type and does not have @Selectable annotation", parameter)
+                logger.info("Type of parameter ${parameter.nameAsString} is not a primitive type and does not have @Selectable annotation", parameter)
                 ""
             } else {
                 val columns = parameterClass.primaryConstructor?.parameters
@@ -103,7 +104,7 @@ class SelectableSymbolProcessor(
                 columns.map { processParameters(it, resolver) }.joinToString(",")
             }
         } else ""
-        val alias = parameter.name!!.getShortName()
+        val alias = parameter.nameAsString
         val columnName = parameter.annotations.getAnnotationOrNull(ColumnName::class.java.simpleName)
             ?.arguments?.getParameterValue<String>(ColumnName.NAME_PARAMETER_NAME)
         val isForeign = parameter.annotations.getAnnotationOrNull(Foreign::class.java.simpleName) != null
@@ -125,15 +126,15 @@ class SelectableSymbolProcessor(
             innerColumns = innerColumns
         )
         checkValidCombinations(
-            parameterName = parameter.name!!.asString(),
+            parameterName = parameter.nameAsString,
             options = options,
             symbol = parameter
         )
         return buildColumns(
             options = options,
-            parameterName = parameter.name!!.asString(),
+            parameterName = parameter.nameAsString,
             symbol = parameter,
-            qualifiedTypeName = parameterClass.qualifiedName!!.asString()
+            qualifiedTypeName = parameterClass.simpleName.asString() //Qualified names are not supported in Kotlin JS
         )
     }
 

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

@@ -2,7 +2,9 @@ package io.github.jan.supabase.ksp
 
 import com.google.devtools.ksp.symbol.KSAnnotation
 import com.google.devtools.ksp.symbol.KSClassDeclaration
+import com.google.devtools.ksp.symbol.KSDeclaration
 import com.google.devtools.ksp.symbol.KSValueArgument
+import com.google.devtools.ksp.symbol.KSValueParameter
 
 fun Sequence<KSAnnotation>.getAnnotation(target: String): KSAnnotation {
     return getAnnotationOrNull(target) ?:
@@ -26,4 +28,10 @@ fun <T> List<KSValueArgument>.getParameterValue(target: String): T {
 fun <T> List<KSValueArgument>.getParameterValueIfExist(target: String): T? {
     for (element in this) if (element.name?.asString() == target) (element.value as? T)?.let { return it }
     return null
-}
+}
+
+val KSValueParameter.nameAsString: String get() = name?.asString() ?: error("Parameter name is null")
+
+val KSDeclaration.qualifiedNameAsString get() = qualifiedKSName.asString()
+val KSDeclaration.qualifiedKSName get() = qualifiedName ?: error("Qualified name is null")
+val KSDeclaration.simpleNameAsString get() = simpleName.asString()

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

@@ -8,7 +8,7 @@ class ColumnRegistry(
     private val map: MutableMap<String, String> = mutableMapOf()
 ) {
 
-    fun <T : Any> getColumns(kClass: KClass<T>): String = map[kClass.qualifiedName] ?: error("No columns registered for $kClass")
+    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

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

@@ -12,10 +12,30 @@ annotation class ApplyFunction(val function: String) {
 
     companion object {
         @SupabaseInternal const val FUNCTION_PARAMETER_NAME = "function"
+
+        /**
+         * Apply the `avg` function to a column.
+         */
         const val AVG = "avg"
+
+        /**
+         * Apply the `count` function to a column.
+         */
         const val COUNT = "count"
+
+        /**
+         * Apply the `max` function to a column.
+         */
         const val MAX = "max"
+
+        /**
+         * Apply the `min` function to a column.
+         */
         const val MIN = "min"
+
+        /**
+         * Apply the `sum` function to a column.
+         */
         const val SUM = "sum"
     }
 

Postgrest/src/commonTest/kotlin/Utils.kt

@@ -1,10 +1,15 @@
 import io.github.jan.supabase.annotations.SupabaseInternal
+import io.github.jan.supabase.postgrest.ColumnRegistry
 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, block: PostgrestRequestBuilder.() -> Unit): PostgrestRequestBuilder {
-    val filter = PostgrestRequestBuilder(propertyConversionMethod)
+inline fun postgrestRequest(
+    propertyConversionMethod: PropertyConversionMethod = PropertyConversionMethod.CAMEL_CASE_TO_SNAKE_CASE,
+    columnRegistry: ColumnRegistry = ColumnRegistry(),
+    block: PostgrestRequestBuilder.() -> Unit
+): PostgrestRequestBuilder {
+    val filter = PostgrestRequestBuilder(propertyConversionMethod, columnRegistry)
     filter.block()
     return filter
 }

detekt.yml

@@ -75,7 +75,7 @@ comments:
     allowParamOnConstructorProperties: false
   UndocumentedPublicClass:
     active: true
-    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**', '**/mingwX64Test/**', '**/macosTest/**', '**/appleTest/**', '**/linuxTest/**', '**/wasmJsTest/**']
+    excludes: ['**/KSP/**', '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**', '**/mingwX64Test/**', '**/macosTest/**', '**/appleTest/**', '**/linuxTest/**', '**/wasmJsTest/**']
     searchInNestedClass: true
     searchInInnerClass: true
     searchInInnerObject: false
@@ -86,14 +86,14 @@ comments:
       - 'SupabaseExperimental'
   UndocumentedPublicFunction:
     active: true
-    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**', '**/mingwX64Test/**', '**/macosTest/**', '**/appleTest/**', '**/linuxTest/**', '**/wasmJsTest/**']
+    excludes: ['**/KSP/**', '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**', '**/mingwX64Test/**', '**/macosTest/**', '**/appleTest/**', '**/linuxTest/**', '**/wasmJsTest/**']
     searchProtectedFunction: false
     ignoreAnnotated:
       - 'SupabaseInternal'
       - 'SupabaseExperimental'
   UndocumentedPublicProperty:
     active: true
-    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**', '**/mingwX64Test/**', '**/macosTest/**', '**/appleTest/**', '**/linuxTest/**', '**/wasmJsTest/**']
+    excludes: ['**/KSP/**', '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**', '**/mingwX64Test/**', '**/macosTest/**', '**/appleTest/**', '**/linuxTest/**', '**/wasmJsTest/**']
     searchProtectedProperty: false
     ignoreAnnotated:
       - 'SupabaseInternal'