Merge pull request #157 from ESchouten/input-type

InputValue KType

Author: jeggy

gradle.properties

@@ -1,5 +1,5 @@
 # KGraphQL version
-version=0.17.11
+version=0.17.12-SNAPSHOT
 
 # Dependencies
 coroutine_version=1.5.0

kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValueDSL.kt

@@ -3,9 +3,10 @@ package com.apurebase.kgraphql.schema.dsl.types
 import com.apurebase.kgraphql.schema.dsl.DepreciableItemDSL
 import com.apurebase.kgraphql.schema.model.InputValueDef
 import kotlin.reflect.KClass
+import kotlin.reflect.KType
 
 
-class InputValueDSL<T : Any>(val kClass: KClass<T>) : DepreciableItemDSL() {
+class InputValueDSL<T : Any>(val kClass: KClass<T>, val kType: KType? = null) : DepreciableItemDSL() {
 
     lateinit var name : String
 
@@ -17,6 +18,7 @@ class InputValueDSL<T : Any>(val kClass: KClass<T>) : DepreciableItemDSL() {
             defaultValue = defaultValue,
             isDeprecated = isDeprecated,
             description = description,
-            deprecationReason = deprecationReason
+            deprecationReason = deprecationReason,
+            kType = kType
     )
-}
+}

kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValuesDSL.kt

@@ -1,19 +1,21 @@
 package com.apurebase.kgraphql.schema.dsl.types
 
 import kotlin.reflect.KClass
+import kotlin.reflect.KType
+import kotlin.reflect.typeOf
 
 
 class InputValuesDSL {
 
     val inputValues = mutableListOf<InputValueDSL<*>>()
 
-
-    fun <T : Any> arg(kClass: KClass<T>, block : InputValueDSL<T>.() -> Unit){
-        inputValues.add(InputValueDSL(kClass).apply(block))
+    fun <T : Any> arg(kClass: KClass<T>, kType: KType? = null, block : InputValueDSL<T>.() -> Unit){
+        inputValues.add(InputValueDSL(kClass, kType).apply(block))
     }
 
+    @OptIn(ExperimentalStdlibApi::class)
     inline fun <reified T : Any> arg(noinline block : InputValueDSL<T>.() -> Unit){
-        arg(T::class, block)
+        arg(T::class, typeOf<T>(), block)
     }
 
-}
+}

kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/InputValueDef.kt

@@ -1,6 +1,7 @@
 package com.apurebase.kgraphql.schema.model
 
 import kotlin.reflect.KClass
+import kotlin.reflect.KType
 
 
 class InputValueDef<T : Any>(
@@ -9,5 +10,6 @@ class InputValueDef<T : Any>(
         val defaultValue : T? = null,
         override val isDeprecated: Boolean = false,
         override val description: String? = null,
-        override val deprecationReason: String? = null
-) : DescribedDef, Depreciable
+        override val deprecationReason: String? = null,
+        val kType : KType? = null
+) : DescribedDef, Depreciable

kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/structure/SchemaCompilation.kt

@@ -332,8 +332,9 @@ class SchemaCompilation(
         }
 
         return operation.argumentsDescriptor.map { (name, kType) ->
-            val kqlInput = inputValues.find { it.name == name } ?: InputValueDef(kType.jvmErasure, name)
-            val inputType = handlePossiblyWrappedType(kType, TypeCategory.INPUT)
+            val inputValue = inputValues.find { it.name == name }
+            val kqlInput = inputValue ?: InputValueDef(kType.jvmErasure, name)
+            val inputType = handlePossiblyWrappedType(inputValue?.kType ?: kType, TypeCategory.INPUT)
             InputValue(kqlInput, inputType)
         }
     }