Add null to jsonBody

lhwdev · May 5, 2022 · ff37e40 · ff37e40
1 parent 9db6d58
commit ff37e40
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/api-base/src/jvmMain/kotlin/com/lhwdev/fetch/jsonUtils.kt b/api-base/src/jvmMain/kotlin/com/lhwdev/fetch/jsonUtils.kt
@@ -1,9 +1,6 @@
 package com.lhwdev.fetch
 
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.*
 
 
 @StructureBuilder
@@ -14,15 +11,23 @@ class JsonObjectScope {
 	infix fun String.set(value: Number) {
 		content[this] = JsonPrimitive(value)
 	}
+
 	infix fun String.set(value: String) {
 		content[this] = JsonPrimitive(value)
 	}
+
 	infix fun String.set(value: Boolean) {
 		content[this] = JsonPrimitive(value)
 	}
+
+	infix fun String.set(value: Nothing?) {
+		content[this] = JsonNull
+	}
+
 	inline infix fun String.jsonObject(block: JsonObjectScope.() -> Unit) {
 		content[this] = com.lhwdev.fetch.jsonObject(block)
 	}
+
 	infix fun String.jsonArray(block: JsonArrayScope.() -> Unit) {
 		content[this] = com.lhwdev.fetch.jsonArray(block)
 	}
@@ -38,15 +43,23 @@ class JsonArrayScope {
 	fun add(value: Number) {
 		content += JsonPrimitive(value)
 	}
+
 	fun add(value: String) {
 		content += JsonPrimitive(value)
 	}
+
 	fun add(value: Boolean) {
 		content += JsonPrimitive(value)
 	}
+
+	fun add(value: Nothing?) {
+		content += JsonNull
+	}
+
 	inline fun addJsonObject(block: JsonObjectScope.() -> Unit) {
 		content += jsonObject(block)
 	}
+
 	inline fun addJsonArray(block: JsonArrayScope.() -> Unit) {
 		content += jsonArray(block) as JsonElement
 	}

diff --git a/api-base/src/jvmMain/kotlin/com/lhwdev/fetch/utils.kt b/api-base/src/jvmMain/kotlin/com/lhwdev/fetch/utils.kt
@@ -20,7 +20,7 @@ operator fun URL.get(childPath: String? = null) = URL(
 	this,
 	buildString {
 		append(path.removeSuffix("/"))
-		if(childPath != null) append("/$childPath")
+		if(childPath != null) append("/${childPath.removePrefix("/")}")
 	}
 )