feat(json): better return type for shortcut operators

Author: lsafer-meemer

module-extkt-json/src/commonMain/kotlin/JsonArrayLike.kt

@@ -29,77 +29,77 @@ fun JsonArrayLike.copy(block: MutableJsonArrayLike.() -> Unit): JsonArray {
 //
 
 /** return the combination of [this] and the given [value] */
-operator fun JsonArrayLike.plus(value: JsonObjectLike?): JsonArrayLike {
+operator fun JsonArrayLike.plus(value: JsonObjectLike?): JsonArray {
     val element = value?.toJsonObject().orJsonNull()
-    return this + element
+    return JsonArray(this + element)
 }
 
 /** return the combination of [this] and the given [value] */
-operator fun JsonArrayLike.plus(value: JsonArrayLike?): JsonArrayLike {
+operator fun JsonArrayLike.plus(value: JsonArrayLike?): JsonArray {
     val element = value?.toJsonArray().orJsonNull()
-    return this + element
+    return JsonArray(this + element)
 }
 
 /** return the combination of [this] and the given [value] */
-operator fun JsonArrayLike.plus(value: String?): JsonArrayLike {
+operator fun JsonArrayLike.plus(value: String?): JsonArray {
     val element = JsonPrimitive(value)
-    return this + element
+    return JsonArray(this + element)
 }
 
 /** return the combination of [this] and the given [value] */
-operator fun JsonArrayLike.plus(value: Number?): JsonArrayLike {
+operator fun JsonArrayLike.plus(value: Number?): JsonArray {
     val element = JsonPrimitive(value)
-    return this + element
+    return JsonArray(this + element)
 }
 
 /** return the combination of [this] and the given [value] */
-operator fun JsonArrayLike.plus(value: Boolean?): JsonArrayLike {
+operator fun JsonArrayLike.plus(value: Boolean?): JsonArray {
     val element = JsonPrimitive(value)
-    return this + element
+    return JsonArray(this + element)
 }
 
 /** return the combination of [this] and the given [value] */
-operator fun JsonArrayLike.plus(value: Nothing?): JsonArrayLike {
+operator fun JsonArrayLike.plus(value: Nothing?): JsonArray {
     val element = JsonNull
-    return this + element
+    return JsonArray(this + element)
 }
 
 //
 
 /** return the combination of [this] excluding the first element equivalent to [value] */
-operator fun JsonArrayLike.minus(value: JsonObjectLike?): JsonArrayLike {
+operator fun JsonArrayLike.minus(value: JsonObjectLike?): JsonArray {
     val element = value?.toJsonObject().orJsonNull()
-    return this - element
+    return JsonArray(this - element)
 }
 
 /** return the combination of [this] excluding the first element equivalent to [value] */
-operator fun JsonArrayLike.minus(value: JsonArrayLike?): JsonArrayLike {
+operator fun JsonArrayLike.minus(value: JsonArrayLike?): JsonArray {
     val element = value?.toJsonArray().orJsonNull()
-    return this - element
+    return JsonArray(this - element)
 }
 
 /** return the combination of [this] excluding the first element equivalent to [value] */
-operator fun JsonArrayLike.minus(value: String?): JsonArrayLike {
+operator fun JsonArrayLike.minus(value: String?): JsonArray {
     val element = JsonPrimitive(value)
-    return this - element
+    return JsonArray(this - element)
 }
 
 /** return the combination of [this] excluding the first element equivalent to [value] */
-operator fun JsonArrayLike.minus(value: Number?): JsonArrayLike {
+operator fun JsonArrayLike.minus(value: Number?): JsonArray {
     val element = JsonPrimitive(value)
-    return this - element
+    return JsonArray(this - element)
 }
 
 /** return the combination of [this] excluding the first element equivalent to [value] */
-operator fun JsonArrayLike.minus(value: Boolean?): JsonArrayLike {
+operator fun JsonArrayLike.minus(value: Boolean?): JsonArray {
     val element = JsonPrimitive(value)
-    return this - element
+    return JsonArray(this - element)
 }
 
 /** return the combination of [this] excluding the first element equivalent to [value] */
-operator fun JsonArrayLike.minus(value: Nothing?): JsonArrayLike {
+operator fun JsonArrayLike.minus(value: Nothing?): JsonArray {
     val element = JsonNull
-    return this - element
+    return JsonArray(this - element)
 }
 
 //

module-extkt-json/src/commonMain/kotlin/JsonObjectLike.kt

@@ -31,50 +31,50 @@ fun JsonObjectLike.copy(block: MutableJsonObjectLike.() -> Unit): JsonObject {
 
 /** return the combination of [this] and the given key-value [pair] */
 @JvmName("plusStringMapPair")
-operator fun JsonObjectLike.plus(pair: Pair<String, JsonObjectLike?>): JsonObjectLike {
+operator fun JsonObjectLike.plus(pair: Pair<String, JsonObjectLike?>): JsonObject {
     val (name, value) = pair
     val element = value?.toJsonObject().orJsonNull()
-    return this + (name to element)
+    return JsonObject(this + (name to element))
 }
 
 /** return the combination of [this] and the given key-value [pair] */
 @JvmName("plusStringListPair")
-operator fun JsonObjectLike.plus(pair: Pair<String, JsonArrayLike?>): JsonObjectLike {
+operator fun JsonObjectLike.plus(pair: Pair<String, JsonArrayLike?>): JsonObject {
     val (name, value) = pair
     val element = value?.toJsonArray().orJsonNull()
-    return this + (name to element)
+    return JsonObject(this + (name to element))
 }
 
 /** return the combination of [this] and the given key-value [pair] */
 @JvmName("plusStringStringPair")
-operator fun JsonObjectLike.plus(pair: Pair<String, String?>): JsonObjectLike {
+operator fun JsonObjectLike.plus(pair: Pair<String, String?>): JsonObject {
     val (name, value) = pair
     val element = JsonPrimitive(value)
-    return this + (name to element)
+    return JsonObject(this + (name to element))
 }
 
 /** return the combination of [this] and the given key-value [pair] */
 @JvmName("plusStringNumberPair")
-operator fun JsonObjectLike.plus(pair: Pair<String, Number?>): JsonObjectLike {
+operator fun JsonObjectLike.plus(pair: Pair<String, Number?>): JsonObject {
     val (name, value) = pair
     val element = JsonPrimitive(value)
-    return this + (name to element)
+    return JsonObject(this + (name to element))
 }
 
 /** return the combination of [this] and the given key-value [pair] */
 @JvmName("plusStringBooleanPair")
-operator fun JsonObjectLike.plus(pair: Pair<String, Boolean?>): JsonObjectLike {
+operator fun JsonObjectLike.plus(pair: Pair<String, Boolean?>): JsonObject {
     val (name, value) = pair
     val element = JsonPrimitive(value)
-    return this + (name to element)
+    return JsonObject(this + (name to element))
 }
 
 /** return the combination of [this] and the given key-value [pair] */
 @JvmName("plusStringNothingPair")
-operator fun JsonObjectLike.plus(pair: Pair<String, Nothing?>): JsonObjectLike {
+operator fun JsonObjectLike.plus(pair: Pair<String, Nothing?>): JsonObject {
     val (name, _) = pair
     val element = JsonNull
-    return this + (name to element)
+    return JsonObject(this + (name to element))
 }
 
 //