@arrirpc/codegen-kotlin 0.72.0 → 0.74.0

package/dist/index.cjs

@@ -65,7 +65,7 @@ function getClassName(schema, context) {
         normalize: true
       })
     );
-    return `${context.typePrefix}${className2}`;
+    return className2;
   }
   const depth = instanceDepth(context);
   if (depth === 1 && !context.discriminatorKey) {
@@ -74,7 +74,7 @@ function getClassName(schema, context) {
         normalize: true
       })
     );
-    return `${context.typePrefix}${className2}`;
+    return className2;
   }
   if (context.discriminatorParentId && context.discriminatorKey && context.discriminatorValue) {
     const className2 = kotlinClassName(
@@ -83,7 +83,7 @@ function getClassName(schema, context) {
         { normalize: true }
       )
     );
-    return `${context.typePrefix}${className2}`;
+    return className2;
   }
   const className = kotlinClassName(
     codegenUtils.pascalCase(
@@ -93,7 +93,7 @@ function getClassName(schema, context) {
       }
     )
   );
-  return `${context.typePrefix}${className}`;
+  return className;
 }
 function instanceDepth(context) {
   const parts = context.instancePath.split("/");
@@ -130,6 +130,7 @@ function kotlinAnyFromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "JsonNull";
   return {
     typeName: "JsonElement",
+    prefixedTypeName: "JsonElement",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -178,9 +179,10 @@ function kotlinArrayFromSchema(schema, context) {
     schemaPath: `${context.schemaPath}/elements`,
     existingTypeIds: context.existingTypeIds
   });
-  const typeName = `MutableList<${subType.typeName}${subType.isNullable ? "?" : ""}>`;
+  const typeName = `MutableList<${subType.prefixedTypeName}${subType.isNullable ? "?" : ""}>`;
   return {
     typeName,
+    prefixedTypeName: typeName,
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -246,16 +248,18 @@ function kotlinArrayFromSchema(schema, context) {
 
 function kotlinObjectFromSchema(schema, context) {
   const className = getClassName(schema, context);
+  const prefixedClassName = `${context.typePrefix}${className}`;
   const nullable = isNullable(schema, context);
-  const defaultValue = nullable ? "null" : `${className}.new()`;
+  const defaultValue = nullable ? "null" : `${prefixedClassName}.new()`;
   const result = {
     typeName: className,
+    prefixedTypeName: prefixedClassName,
     isNullable: nullable,
     defaultValue,
     fromJson(input, key) {
       if (nullable) {
         return `when (${input}) {
-                    is JsonObject -> ${className}.fromJsonElement(
+                    is JsonObject -> ${prefixedClassName}.fromJsonElement(
                         ${input}!!,
                         "$instancePath/${key}",
                     )
@@ -263,12 +267,12 @@ function kotlinObjectFromSchema(schema, context) {
                 }`;
       }
       return `when (${input}) {
-                is JsonObject -> ${className}.fromJsonElement(
+                is JsonObject -> ${prefixedClassName}.fromJsonElement(
                     ${input}!!,
                     "$instancePath/${key}",
                 )
 
-                else -> ${className}.new()
+                else -> ${prefixedClassName}.new()
             }`;
     },
     toJson(input, target) {
@@ -323,7 +327,7 @@ function kotlinObjectFromSchema(schema, context) {
       subContent.push(type.content);
     }
     fieldParts.push(
-      `${getCodeComment(prop.metadata, "    ", "field")}    val ${kotlinKey}: ${type.typeName}${type.isNullable ? "?" : ""},`
+      `${getCodeComment(prop.metadata, "    ", "field")}    val ${kotlinKey}: ${type.prefixedTypeName}${type.isNullable ? "?" : ""},`
     );
     if (i === 0 && !context.discriminatorKey) {
       toJsonParts.push(`output += "\\"${key}\\":"`);
@@ -333,7 +337,7 @@ function kotlinObjectFromSchema(schema, context) {
     toJsonParts.push(type.toJson(kotlinKey, "output"));
     toQueryParts.push(type.toQueryString(kotlinKey, "queryParts", key));
     fromJsonParts.push(
-      `val ${kotlinKey}: ${type.typeName}${type.isNullable ? "?" : ""} = ${type.fromJson(`__input.jsonObject["${key}"]`, key)}`
+      `val ${kotlinKey}: ${type.prefixedTypeName}${type.isNullable ? "?" : ""} = ${type.fromJson(`__input.jsonObject["${key}"]`, key)}`
     );
     defaultParts.push(
       `                ${kotlinKey} = ${type.defaultValue},`
@@ -361,7 +365,7 @@ function kotlinObjectFromSchema(schema, context) {
         if (hasProperties) output += ","
 `;
     fieldParts.push(
-      `${getCodeComment(schema.optionalProperties[key].metadata, "    ", "field")}    val ${kotlinKey}: ${type.typeName}? = null,`
+      `${getCodeComment(schema.optionalProperties[key].metadata, "    ", "field")}    val ${kotlinKey}: ${type.prefixedTypeName}? = null,`
     );
     if (hasKnownKeys) {
       toJsonParts.push(`if (${kotlinKey} != null) {
@@ -377,20 +381,20 @@ ${isLast ? "" : "    hasProperties = true"}
     }
     toQueryParts.push(type.toQueryString(kotlinKey, "queryParts", key));
     fromJsonParts.push(
-      `val ${kotlinKey}: ${type.typeName}? = ${type.fromJson(`__input.jsonObject["${key}"]`, key)}`
+      `val ${kotlinKey}: ${type.prefixedTypeName}? = ${type.fromJson(`__input.jsonObject["${key}"]`, key)}`
     );
   }
   toJsonParts.push('output += "}"');
   toJsonParts.push("return output");
   toQueryParts.push('return queryParts.joinToString("&")');
-  const implementedClass = context.discriminatorParentId ?? `${context.clientName}Model`;
+  const implementedClass = context.discriminatorParentId ? `${context.typePrefix}${context.discriminatorParentId}` : `${context.clientName}Model`;
   let discriminatorField = "";
   if (context.discriminatorKey && context.discriminatorValue) {
     discriminatorField = `
     override val ${kotlinIdentifier(context.discriminatorKey)} get() = "${context.discriminatorValue}"
 `;
   }
-  const content = `${getCodeComment(schema.metadata, "", "class")}data class ${className}(
+  const content = `${getCodeComment(schema.metadata, "", "class")}data class ${prefixedClassName}(
 ${fieldParts.join("\n")}
 ) : ${implementedClass} {${discriminatorField}
     override fun toJson(): String {
@@ -401,27 +405,27 @@ ${toJsonParts.join("\n")}
 ${toQueryParts.join("\n")}
     }
 
-    companion object Factory : ${context.clientName}ModelFactory<${className}> {
+    companion object Factory : ${context.clientName}ModelFactory<${prefixedClassName}> {
         @JvmStatic
-        override fun new(): ${className} {
-            return ${className}(
+        override fun new(): ${prefixedClassName} {
+            return ${prefixedClassName}(
 ${defaultParts.join("\n")}
             )
         }
 
         @JvmStatic
-        override fun fromJson(input: String): ${className} {
+        override fun fromJson(input: String): ${prefixedClassName} {
             return fromJsonElement(JsonInstance.parseToJsonElement(input))
         }
 
         @JvmStatic
-        override fun fromJsonElement(__input: JsonElement, instancePath: String): ${className} {
+        override fun fromJsonElement(__input: JsonElement, instancePath: String): ${prefixedClassName} {
             if (__input !is JsonObject) {
-                __logError("[WARNING] ${className}.fromJsonElement() expected kotlinx.serialization.json.JsonObject at $instancePath. Got \${__input.javaClass}. Initializing empty ${className}.")
+                __logError("[WARNING] ${prefixedClassName}.fromJsonElement() expected kotlinx.serialization.json.JsonObject at $instancePath. Got \${__input.javaClass}. Initializing empty ${prefixedClassName}.")
                 return new()
             }
 ${fromJsonParts.join("\n")}
-            return ${className}(
+            return ${prefixedClassName}(
                 ${kotlinKeys.join(",\n                ")},
             )
         }
@@ -439,6 +443,7 @@ ${subContent.join("\n\n")}`;
 function kotlinDiscriminatorFromSchema(schema, context) {
   const kotlinDiscriminatorKey = kotlinIdentifier(schema.discriminator);
   const className = getClassName(schema, context);
+  const prefixedClassName = `${context.typePrefix}${className}`;
   const nullable = isNullable(schema, context);
   const subTypes = [];
   const subContent = [];
@@ -457,6 +462,7 @@ function kotlinDiscriminatorFromSchema(schema, context) {
     });
     subTypes.push({
       typeName: subType.typeName,
+      prefixedTypeName: subType.prefixedTypeName,
       discriminatorValue: key
     });
     if (subType.content) {
@@ -466,14 +472,15 @@ function kotlinDiscriminatorFromSchema(schema, context) {
   if (subTypes.length === 0) {
     throw new Error("Discriminator schemas must have at least one mapping");
   }
-  const defaultValue = nullable ? "null" : `${className}.new()`;
+  const defaultValue = nullable ? "null" : `${prefixedClassName}.new()`;
   const result = {
     typeName: className,
+    prefixedTypeName: prefixedClassName,
     isNullable: nullable,
     defaultValue,
     fromJson(input, key) {
       return `when (${input}) {
-                is JsonObject -> ${className}.fromJsonElement(
+                is JsonObject -> ${prefixedClassName}.fromJsonElement(
                     ${input}!!,
                     "$instancePath/${key}",
                 )
@@ -495,29 +502,29 @@ function kotlinDiscriminatorFromSchema(schema, context) {
     return result;
   }
   const codeComment = getCodeComment(schema.metadata, "", "class");
-  const content = `${codeComment}sealed interface ${className} : ${context.clientName}Model {
+  const content = `${codeComment}sealed interface ${prefixedClassName} : ${context.clientName}Model {
     val ${kotlinDiscriminatorKey}: String
 
-    companion object Factory : ${context.clientName}ModelFactory<${className}> {
+    companion object Factory : ${context.clientName}ModelFactory<${prefixedClassName}> {
         @JvmStatic
-        override fun new(): ${className} {
-            return ${subTypes[0].typeName}.new()
+        override fun new(): ${prefixedClassName} {
+            return ${subTypes[0].prefixedTypeName}.new()
         }
 
         @JvmStatic
-        override fun fromJson(input: String): ${className} {
+        override fun fromJson(input: String): ${prefixedClassName} {
             return fromJsonElement(JsonInstance.parseToJsonElement(input))
         }
 
         @JvmStatic
-        override fun fromJsonElement(__input: JsonElement, instancePath: String): ${className} {
+        override fun fromJsonElement(__input: JsonElement, instancePath: String): ${prefixedClassName} {
             if (__input !is JsonObject) {
-                __logError("[WARNING] Discriminator.fromJsonElement() expected kotlinx.serialization.json.JsonObject at $instancePath. Got \${__input.javaClass}. Initializing empty ${className}.")
+                __logError("[WARNING] Discriminator.fromJsonElement() expected kotlinx.serialization.json.JsonObject at $instancePath. Got \${__input.javaClass}. Initializing empty ${prefixedClassName}.")
                 return new()
             }
             return when (__input.jsonObject["${schema.discriminator}"]) {
                 is JsonPrimitive -> when (__input.jsonObject["${schema.discriminator}"]!!.jsonPrimitive.contentOrNull) {
-                    ${subTypes.map((type) => `"${type.discriminatorValue}" -> ${type.typeName}.fromJsonElement(__input, instancePath)`).join("\n")}
+                    ${subTypes.map((type) => `"${type.discriminatorValue}" -> ${type.prefixedTypeName}.fromJsonElement(__input, instancePath)`).join("\n")}
                     else -> new()
                 }
 
@@ -538,6 +545,7 @@ ${subContent.join("\n\n")}`;
 function kotlinEnumFromSchema(schema, context) {
   const nullable = isNullable(schema, context);
   const className = getClassName(schema, context);
+  const prefixedClassName = `${context.typePrefix}${className}`;
   const enumItems = schema.enum.map((val) => {
     return {
       name: codegenUtils.pascalCase(val, { normalize: true }),
@@ -549,24 +557,24 @@ function kotlinEnumFromSchema(schema, context) {
       `Enum schemas must have at least one enum value. At ${context.schemaPath}.`
     );
   }
-  const defaultValue = nullable ? "null" : `${className}.new()`;
+  const defaultValue = nullable ? "null" : `${prefixedClassName}.new()`;
   let content = "";
   if (!context.existingTypeIds.includes(className)) {
-    content = `enum class ${className} {
+    content = `enum class ${prefixedClassName} {
     ${enumItems.map((item) => item.name).join(",\n    ")};
     val serialValue: String
         get() = when (this) {
             ${enumItems.map((item) => `${item.name} -> "${item.value}"`).join("\n            ")}
         }
     
-    companion object Factory : ${context.clientName}ModelFactory<${className}> {
+    companion object Factory : ${context.clientName}ModelFactory<${prefixedClassName}> {
         @JvmStatic
-        override fun new(): ${className} {
+        override fun new(): ${prefixedClassName} {
             return ${enumItems[0].name}
         }
 
         @JvmStatic
-        override fun fromJson(input: String): ${className} {
+        override fun fromJson(input: String): ${prefixedClassName} {
             return when (input) {
                 ${enumItems.map((item) => `${item.name}.serialValue -> ${item.name}`).join("\n                ")}
                 else -> ${enumItems[0].name}
@@ -574,9 +582,9 @@ function kotlinEnumFromSchema(schema, context) {
         }
 
         @JvmStatic
-        override fun fromJsonElement(__input: JsonElement, instancePath: String): ${className} {
+        override fun fromJsonElement(__input: JsonElement, instancePath: String): ${prefixedClassName} {
             if (__input !is JsonPrimitive) {
-                __logError("[WARNING] ${className}.fromJsonElement() expected kotlinx.serialization.json.JsonPrimitive at $instancePath. Got \${__input.javaClass}. Initializing empty ${className}.")
+                __logError("[WARNING] ${prefixedClassName}.fromJsonElement() expected kotlinx.serialization.json.JsonPrimitive at $instancePath. Got \${__input.javaClass}. Initializing empty ${prefixedClassName}.")
                 return new()
             }
             return when (__input.jsonPrimitive.contentOrNull) {
@@ -590,26 +598,27 @@ function kotlinEnumFromSchema(schema, context) {
   }
   return {
     typeName: className,
+    prefixedTypeName: prefixedClassName,
     isNullable: nullable,
     defaultValue,
     fromJson(input, key) {
       if (nullable) {
         return `when (${input}) {
                     is JsonNull -> null
-                    is JsonPrimitive -> ${className}.fromJsonElement(${input}!!, "$instancePath/${key ?? ""}")
+                    is JsonPrimitive -> ${prefixedClassName}.fromJsonElement(${input}!!, "$instancePath/${key ?? ""}")
                     else -> null
                 }`;
       }
       return `when (${input}) {
                 is JsonNull -> ${defaultValue}
-                is JsonPrimitive -> ${className}.fromJsonElement(${input}!!, "$instancePath/${key}")
+                is JsonPrimitive -> ${prefixedClassName}.fromJsonElement(${input}!!, "$instancePath/${key}")
                 else -> ${defaultValue}
             }`;
     },
     toJson(input, target) {
       if (schema.nullable) {
         return `${target} += when (${input}) {
-                    is ${className} -> "\\"\${${input}.serialValue}\\""
+                    is ${prefixedClassName} -> "\\"\${${input}.serialValue}\\""
                     else -> "null"
                 }`;
       }
@@ -640,10 +649,11 @@ function kotlinMapFromSchema(schema, context) {
     schemaPath: `${context.schemaPath}/values`,
     existingTypeIds: context.existingTypeIds
   });
-  const typeName = `MutableMap<String, ${subType.typeName}${subType.isNullable ? "?" : ""}>`;
+  const typeName = `MutableMap<String, ${subType.prefixedTypeName}${subType.isNullable ? "?" : ""}>`;
   const defaultValue = nullable ? "null" : "mutableMapOf()";
   return {
     typeName,
+    prefixedTypeName: typeName,
     isNullable: nullable,
     defaultValue,
     fromJson(input, key) {
@@ -708,6 +718,7 @@ function kotlinStringFromSchema(schema, context) {
   const defaultValue = nullable ? "null" : '""';
   return {
     typeName: "String",
+    prefixedTypeName: "String",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -742,6 +753,7 @@ function kotlinBooleanFromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "false";
   return {
     typeName: "Boolean",
+    prefixedTypeName: "Boolean",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -770,6 +782,7 @@ function kotlinTimestampFromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "Instant.now()";
   return {
     typeName: "Instant",
+    prefixedTypeName: "Instant",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -825,6 +838,7 @@ function kotlinFloat32FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0.0F";
   return {
     typeName: "Float",
+    prefixedTypeName: "Float",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -853,6 +867,7 @@ function kotlinFloat64FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0.0";
   return {
     typeName: "Double",
+    prefixedTypeName: "Double",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -881,6 +896,7 @@ function kotlinInt8FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0";
   return {
     typeName: "Byte",
+    prefixedTypeName: "Byte",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -909,6 +925,7 @@ function kotlinInt16FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0";
   return {
     typeName: "Short",
+    prefixedTypeName: "Short",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -937,6 +954,7 @@ function kotlinInt32FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0";
   return {
     typeName: "Int",
+    prefixedTypeName: "Int",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -965,6 +983,7 @@ function kotlinInt64FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0L";
   return {
     typeName: "Long",
+    prefixedTypeName: "Long",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -999,6 +1018,7 @@ function kotlinUint8FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0u";
   return {
     typeName: "UByte",
+    prefixedTypeName: "UByte",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -1027,6 +1047,7 @@ function kotlinUint16FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0u";
   return {
     typeName: "UShort",
+    prefixedTypeName: "UShort",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -1055,6 +1076,7 @@ function kotlinUint32FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0u";
   return {
     typeName: "UInt",
+    prefixedTypeName: "UInt",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -1083,6 +1105,7 @@ function kotlinUint64FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0UL";
   return {
     typeName: "ULong",
+    prefixedTypeName: "ULong",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -1242,7 +1265,7 @@ function kotlinServiceFromSchema(schema, context) {
     content: `class ${name}(
     private val httpClient: HttpClient,
     private val baseUrl: String,
-    private val headers: headersFn,
+    private val headers: __${context.clientName}HeadersFn,
     private val onError: ((err: Exception) -> Unit) = {},
 ) {
     ${procedureParts.join("\n\n    ")}
@@ -1262,15 +1285,17 @@ function getServiceName(context) {
 
 function kotlinRefFromSchema(schema, context) {
   const typeName = kotlinClassName(schema.ref);
+  const prefixedTypeName = `${context.typePrefix}${typeName}`;
   const nullable = isNullable(schema, context);
-  const defaultValue = nullable ? "null" : `${typeName}.new()`;
+  const defaultValue = nullable ? "null" : `${prefixedTypeName}.new()`;
   return {
     typeName,
+    prefixedTypeName,
     isNullable: nullable,
     defaultValue,
     fromJson(input, key) {
       return `when (${input}) {
-                is JsonObject -> ${typeName}.fromJsonElement(
+                is JsonObject -> ${prefixedTypeName}.fromJsonElement(
                     ${input}!!,
                     "$instancePath/${key}",
                 )
@@ -1372,7 +1397,7 @@ ${getUtilityFunctions(clientName)}`;
 class ${clientName}(
     private val httpClient: HttpClient,
     private val baseUrl: String,
-    private val headers: headersFn,
+    private val headers: __${clientName}HeadersFn,
     private val onError: ((err: Exception) -> Unit) = {},
 ) {
     ${procedureParts.join("\n\n    ")}
@@ -1554,7 +1579,7 @@ data class ${clientName}Error(
 }
 function getUtilityFunctions(clientName) {
   return `// Implementation copied from https://github.com/Kotlin/kotlinx.serialization/blob/d0ae697b9394103879e6c7f836d0f7cf128f4b1e/formats/json/commonMain/src/kotlinx/serialization/json/internal/StringOps.kt#L45
-internal const val STRING = '"'
+private const val STRING = '"'
 
 private fun toHexChar(i: Int): Char {
     val d = i and 0xf
@@ -1562,7 +1587,7 @@ private fun toHexChar(i: Int): Char {
     else (d - 10 + 'a'.code).toChar()
 }
 
-internal val ESCAPE_STRINGS: Array<String?> = arrayOfNulls<String>(93).apply {
+private val ESCAPE_STRINGS: Array<String?> = arrayOfNulls<String>(93).apply {
     for (c in 0..0x1f) {
         val c1 = toHexChar(c shr 12)
         val c2 = toHexChar(c shr 8)
@@ -1579,7 +1604,7 @@ internal val ESCAPE_STRINGS: Array<String?> = arrayOfNulls<String>(93).apply {
     this[0x0c] = "\\\\f"
 }
 
-internal val ESCAPE_MARKERS: ByteArray = ByteArray(93).apply {
+private val ESCAPE_MARKERS: ByteArray = ByteArray(93).apply {
     for (c in 0..0x1f) {
         this[c] = 1.toByte()
     }
@@ -1592,7 +1617,7 @@ internal val ESCAPE_MARKERS: ByteArray = ByteArray(93).apply {
     this[0x0c] = 'f'.code.toByte()
 }
 
-internal fun StringBuilder.printQuoted(value: String) {
+private fun StringBuilder.printQuoted(value: String) {
     append(STRING)
     var lastPos = 0
     for (i in value.indices) {
@@ -1650,7 +1675,7 @@ private suspend fun __prepareRequest(
 }
 
 // SSE_FN_START
-private enum class SseEventLineType {
+private enum class __${clientName}SseEventLineType {
     Id,
     Event,
     Data,
@@ -1658,36 +1683,36 @@ private enum class SseEventLineType {
     None,
 }
 
-private fun __parseSseEventLine(line: String): Pair<SseEventLineType, String> {
+private fun __parseSseEventLine(line: String): Pair<__${clientName}SseEventLineType, String> {
     if (line.startsWith("id:")) {
-        return Pair(SseEventLineType.Id, line.substring(3).trim())
+        return Pair(__${clientName}SseEventLineType.Id, line.substring(3).trim())
     }
     if (line.startsWith("event:")) {
-        return Pair(SseEventLineType.Event, line.substring(6).trim())
+        return Pair(__${clientName}SseEventLineType.Event, line.substring(6).trim())
     }
     if (line.startsWith("data:")) {
-        return Pair(SseEventLineType.Data, line.substring(5).trim())
+        return Pair(__${clientName}SseEventLineType.Data, line.substring(5).trim())
     }
     if (line.startsWith("retry:")) {
-        return Pair(SseEventLineType.Retry, line.substring(6).trim())
+        return Pair(__${clientName}SseEventLineType.Retry, line.substring(6).trim())
     }
-    return Pair(SseEventLineType.None, "")
+    return Pair(__${clientName}SseEventLineType.None, "")
 }
 
-private data class __SseEvent(
+private data class __${clientName}SseEvent(
     val id: String? = null,
     val event: String,
     val data: String,
     val retry: Int? = null
 )
 
-private class __SseEventParsingResult(val events: List<__SseEvent>, val leftover: String)
+private class __${clientName}SseEventParsingResult(val events: List<__${clientName}SseEvent>, val leftover: String)
 
-private fun __parseSseEvents(input: String): __SseEventParsingResult {
-    val events = mutableListOf<__SseEvent>()
+private fun __parseSseEvents(input: String): __${clientName}SseEventParsingResult {
+    val events = mutableListOf<__${clientName}SseEvent>()
     val lines = input.lines()
     if (lines.isEmpty()) {
-        return __SseEventParsingResult(events = listOf(), leftover = "")
+        return __${clientName}SseEventParsingResult(events = listOf(), leftover = "")
     }
     var id: String? = null
     var event: String? = null
@@ -1698,18 +1723,18 @@ private fun __parseSseEvents(input: String): __SseEventParsingResult {
         if (line.isNotEmpty()) {
             val (type, value) = __parseSseEventLine(line)
             when (type) {
-                SseEventLineType.Id -> id = value
-                SseEventLineType.Event -> event = value
-                SseEventLineType.Data -> data = value
-                SseEventLineType.Retry -> retry = value.toInt()
-                SseEventLineType.None -> {}
+                __${clientName}SseEventLineType.Id -> id = value
+                __${clientName}SseEventLineType.Event -> event = value
+                __${clientName}SseEventLineType.Data -> data = value
+                __${clientName}SseEventLineType.Retry -> retry = value.toInt()
+                __${clientName}SseEventLineType.None -> {}
             }
         }
         val isEnd = line == ""
         if (isEnd) {
             if (data != null) {
                 events.add(
-                    __SseEvent(
+                    __${clientName}SseEvent(
                         id = id,
                         event = event ?: "message",
                         data = data!!,
@@ -1724,7 +1749,7 @@ private fun __parseSseEvents(input: String): __SseEventParsingResult {
             lastIndex = if (index + 1 < lines.size) index + 1 else null
         }
     }
-    return __SseEventParsingResult(
+    return __${clientName}SseEventParsingResult(
         events = events,
         leftover = if (lastIndex != null) lines.subList(lastIndex!!, lines.size).joinToString(separator = "\\n") else ""
     )
@@ -1736,7 +1761,7 @@ private suspend fun __handleSseRequest(
     url: String,
     method: HttpMethod,
     params: ${clientName}Model?,
-    headers: headersFn,
+    headers: __${clientName}HeadersFn,
     backoffTime: Long,
     maxBackoffTime: Long,
     lastEventId: String?,
@@ -1977,7 +2002,7 @@ private val JsonInstance = Json {
     encodeDefaults = true
     ignoreUnknownKeys = true
 }
-private typealias headersFn = (() -> MutableMap<String, String>?)?`;
+private typealias __${options.clientName}HeadersFn = (() -> MutableMap<String, String>?)?`;
 }
 
 exports.kotlinClientFromAppDefinition = kotlinClientFromAppDefinition;

package/dist/index.d.cts

@@ -15,6 +15,7 @@ interface CodegenContext {
 }
 interface KotlinProperty {
     typeName: string;
+    prefixedTypeName: string;
     isNullable: boolean;
     content: string;
     defaultValue: string;

package/dist/index.d.mts

@@ -15,6 +15,7 @@ interface CodegenContext {
 }
 interface KotlinProperty {
     typeName: string;
+    prefixedTypeName: string;
     isNullable: boolean;
     content: string;
     defaultValue: string;

package/dist/index.d.ts

@@ -15,6 +15,7 @@ interface CodegenContext {
 }
 interface KotlinProperty {
     typeName: string;
+    prefixedTypeName: string;
     isNullable: boolean;
     content: string;
     defaultValue: string;

package/dist/index.mjs

@@ -59,7 +59,7 @@ function getClassName(schema, context) {
         normalize: true
       })
     );
-    return `${context.typePrefix}${className2}`;
+    return className2;
   }
   const depth = instanceDepth(context);
   if (depth === 1 && !context.discriminatorKey) {
@@ -68,7 +68,7 @@ function getClassName(schema, context) {
         normalize: true
       })
     );
-    return `${context.typePrefix}${className2}`;
+    return className2;
   }
   if (context.discriminatorParentId && context.discriminatorKey && context.discriminatorValue) {
     const className2 = kotlinClassName(
@@ -77,7 +77,7 @@ function getClassName(schema, context) {
         { normalize: true }
       )
     );
-    return `${context.typePrefix}${className2}`;
+    return className2;
   }
   const className = kotlinClassName(
     pascalCase(
@@ -87,7 +87,7 @@ function getClassName(schema, context) {
       }
     )
   );
-  return `${context.typePrefix}${className}`;
+  return className;
 }
 function instanceDepth(context) {
   const parts = context.instancePath.split("/");
@@ -124,6 +124,7 @@ function kotlinAnyFromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "JsonNull";
   return {
     typeName: "JsonElement",
+    prefixedTypeName: "JsonElement",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -172,9 +173,10 @@ function kotlinArrayFromSchema(schema, context) {
     schemaPath: `${context.schemaPath}/elements`,
     existingTypeIds: context.existingTypeIds
   });
-  const typeName = `MutableList<${subType.typeName}${subType.isNullable ? "?" : ""}>`;
+  const typeName = `MutableList<${subType.prefixedTypeName}${subType.isNullable ? "?" : ""}>`;
   return {
     typeName,
+    prefixedTypeName: typeName,
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -240,16 +242,18 @@ function kotlinArrayFromSchema(schema, context) {
 
 function kotlinObjectFromSchema(schema, context) {
   const className = getClassName(schema, context);
+  const prefixedClassName = `${context.typePrefix}${className}`;
   const nullable = isNullable(schema, context);
-  const defaultValue = nullable ? "null" : `${className}.new()`;
+  const defaultValue = nullable ? "null" : `${prefixedClassName}.new()`;
   const result = {
     typeName: className,
+    prefixedTypeName: prefixedClassName,
     isNullable: nullable,
     defaultValue,
     fromJson(input, key) {
       if (nullable) {
         return `when (${input}) {
-                    is JsonObject -> ${className}.fromJsonElement(
+                    is JsonObject -> ${prefixedClassName}.fromJsonElement(
                         ${input}!!,
                         "$instancePath/${key}",
                     )
@@ -257,12 +261,12 @@ function kotlinObjectFromSchema(schema, context) {
                 }`;
       }
       return `when (${input}) {
-                is JsonObject -> ${className}.fromJsonElement(
+                is JsonObject -> ${prefixedClassName}.fromJsonElement(
                     ${input}!!,
                     "$instancePath/${key}",
                 )
 
-                else -> ${className}.new()
+                else -> ${prefixedClassName}.new()
             }`;
     },
     toJson(input, target) {
@@ -317,7 +321,7 @@ function kotlinObjectFromSchema(schema, context) {
       subContent.push(type.content);
     }
     fieldParts.push(
-      `${getCodeComment(prop.metadata, "    ", "field")}    val ${kotlinKey}: ${type.typeName}${type.isNullable ? "?" : ""},`
+      `${getCodeComment(prop.metadata, "    ", "field")}    val ${kotlinKey}: ${type.prefixedTypeName}${type.isNullable ? "?" : ""},`
     );
     if (i === 0 && !context.discriminatorKey) {
       toJsonParts.push(`output += "\\"${key}\\":"`);
@@ -327,7 +331,7 @@ function kotlinObjectFromSchema(schema, context) {
     toJsonParts.push(type.toJson(kotlinKey, "output"));
     toQueryParts.push(type.toQueryString(kotlinKey, "queryParts", key));
     fromJsonParts.push(
-      `val ${kotlinKey}: ${type.typeName}${type.isNullable ? "?" : ""} = ${type.fromJson(`__input.jsonObject["${key}"]`, key)}`
+      `val ${kotlinKey}: ${type.prefixedTypeName}${type.isNullable ? "?" : ""} = ${type.fromJson(`__input.jsonObject["${key}"]`, key)}`
     );
     defaultParts.push(
       `                ${kotlinKey} = ${type.defaultValue},`
@@ -355,7 +359,7 @@ function kotlinObjectFromSchema(schema, context) {
         if (hasProperties) output += ","
 `;
     fieldParts.push(
-      `${getCodeComment(schema.optionalProperties[key].metadata, "    ", "field")}    val ${kotlinKey}: ${type.typeName}? = null,`
+      `${getCodeComment(schema.optionalProperties[key].metadata, "    ", "field")}    val ${kotlinKey}: ${type.prefixedTypeName}? = null,`
     );
     if (hasKnownKeys) {
       toJsonParts.push(`if (${kotlinKey} != null) {
@@ -371,20 +375,20 @@ ${isLast ? "" : "    hasProperties = true"}
     }
     toQueryParts.push(type.toQueryString(kotlinKey, "queryParts", key));
     fromJsonParts.push(
-      `val ${kotlinKey}: ${type.typeName}? = ${type.fromJson(`__input.jsonObject["${key}"]`, key)}`
+      `val ${kotlinKey}: ${type.prefixedTypeName}? = ${type.fromJson(`__input.jsonObject["${key}"]`, key)}`
     );
   }
   toJsonParts.push('output += "}"');
   toJsonParts.push("return output");
   toQueryParts.push('return queryParts.joinToString("&")');
-  const implementedClass = context.discriminatorParentId ?? `${context.clientName}Model`;
+  const implementedClass = context.discriminatorParentId ? `${context.typePrefix}${context.discriminatorParentId}` : `${context.clientName}Model`;
   let discriminatorField = "";
   if (context.discriminatorKey && context.discriminatorValue) {
     discriminatorField = `
     override val ${kotlinIdentifier(context.discriminatorKey)} get() = "${context.discriminatorValue}"
 `;
   }
-  const content = `${getCodeComment(schema.metadata, "", "class")}data class ${className}(
+  const content = `${getCodeComment(schema.metadata, "", "class")}data class ${prefixedClassName}(
 ${fieldParts.join("\n")}
 ) : ${implementedClass} {${discriminatorField}
     override fun toJson(): String {
@@ -395,27 +399,27 @@ ${toJsonParts.join("\n")}
 ${toQueryParts.join("\n")}
     }
 
-    companion object Factory : ${context.clientName}ModelFactory<${className}> {
+    companion object Factory : ${context.clientName}ModelFactory<${prefixedClassName}> {
         @JvmStatic
-        override fun new(): ${className} {
-            return ${className}(
+        override fun new(): ${prefixedClassName} {
+            return ${prefixedClassName}(
 ${defaultParts.join("\n")}
             )
         }
 
         @JvmStatic
-        override fun fromJson(input: String): ${className} {
+        override fun fromJson(input: String): ${prefixedClassName} {
             return fromJsonElement(JsonInstance.parseToJsonElement(input))
         }
 
         @JvmStatic
-        override fun fromJsonElement(__input: JsonElement, instancePath: String): ${className} {
+        override fun fromJsonElement(__input: JsonElement, instancePath: String): ${prefixedClassName} {
             if (__input !is JsonObject) {
-                __logError("[WARNING] ${className}.fromJsonElement() expected kotlinx.serialization.json.JsonObject at $instancePath. Got \${__input.javaClass}. Initializing empty ${className}.")
+                __logError("[WARNING] ${prefixedClassName}.fromJsonElement() expected kotlinx.serialization.json.JsonObject at $instancePath. Got \${__input.javaClass}. Initializing empty ${prefixedClassName}.")
                 return new()
             }
 ${fromJsonParts.join("\n")}
-            return ${className}(
+            return ${prefixedClassName}(
                 ${kotlinKeys.join(",\n                ")},
             )
         }
@@ -433,6 +437,7 @@ ${subContent.join("\n\n")}`;
 function kotlinDiscriminatorFromSchema(schema, context) {
   const kotlinDiscriminatorKey = kotlinIdentifier(schema.discriminator);
   const className = getClassName(schema, context);
+  const prefixedClassName = `${context.typePrefix}${className}`;
   const nullable = isNullable(schema, context);
   const subTypes = [];
   const subContent = [];
@@ -451,6 +456,7 @@ function kotlinDiscriminatorFromSchema(schema, context) {
     });
     subTypes.push({
       typeName: subType.typeName,
+      prefixedTypeName: subType.prefixedTypeName,
       discriminatorValue: key
     });
     if (subType.content) {
@@ -460,14 +466,15 @@ function kotlinDiscriminatorFromSchema(schema, context) {
   if (subTypes.length === 0) {
     throw new Error("Discriminator schemas must have at least one mapping");
   }
-  const defaultValue = nullable ? "null" : `${className}.new()`;
+  const defaultValue = nullable ? "null" : `${prefixedClassName}.new()`;
   const result = {
     typeName: className,
+    prefixedTypeName: prefixedClassName,
     isNullable: nullable,
     defaultValue,
     fromJson(input, key) {
       return `when (${input}) {
-                is JsonObject -> ${className}.fromJsonElement(
+                is JsonObject -> ${prefixedClassName}.fromJsonElement(
                     ${input}!!,
                     "$instancePath/${key}",
                 )
@@ -489,29 +496,29 @@ function kotlinDiscriminatorFromSchema(schema, context) {
     return result;
   }
   const codeComment = getCodeComment(schema.metadata, "", "class");
-  const content = `${codeComment}sealed interface ${className} : ${context.clientName}Model {
+  const content = `${codeComment}sealed interface ${prefixedClassName} : ${context.clientName}Model {
     val ${kotlinDiscriminatorKey}: String
 
-    companion object Factory : ${context.clientName}ModelFactory<${className}> {
+    companion object Factory : ${context.clientName}ModelFactory<${prefixedClassName}> {
         @JvmStatic
-        override fun new(): ${className} {
-            return ${subTypes[0].typeName}.new()
+        override fun new(): ${prefixedClassName} {
+            return ${subTypes[0].prefixedTypeName}.new()
         }
 
         @JvmStatic
-        override fun fromJson(input: String): ${className} {
+        override fun fromJson(input: String): ${prefixedClassName} {
             return fromJsonElement(JsonInstance.parseToJsonElement(input))
         }
 
         @JvmStatic
-        override fun fromJsonElement(__input: JsonElement, instancePath: String): ${className} {
+        override fun fromJsonElement(__input: JsonElement, instancePath: String): ${prefixedClassName} {
             if (__input !is JsonObject) {
-                __logError("[WARNING] Discriminator.fromJsonElement() expected kotlinx.serialization.json.JsonObject at $instancePath. Got \${__input.javaClass}. Initializing empty ${className}.")
+                __logError("[WARNING] Discriminator.fromJsonElement() expected kotlinx.serialization.json.JsonObject at $instancePath. Got \${__input.javaClass}. Initializing empty ${prefixedClassName}.")
                 return new()
             }
             return when (__input.jsonObject["${schema.discriminator}"]) {
                 is JsonPrimitive -> when (__input.jsonObject["${schema.discriminator}"]!!.jsonPrimitive.contentOrNull) {
-                    ${subTypes.map((type) => `"${type.discriminatorValue}" -> ${type.typeName}.fromJsonElement(__input, instancePath)`).join("\n")}
+                    ${subTypes.map((type) => `"${type.discriminatorValue}" -> ${type.prefixedTypeName}.fromJsonElement(__input, instancePath)`).join("\n")}
                     else -> new()
                 }
 
@@ -532,6 +539,7 @@ ${subContent.join("\n\n")}`;
 function kotlinEnumFromSchema(schema, context) {
   const nullable = isNullable(schema, context);
   const className = getClassName(schema, context);
+  const prefixedClassName = `${context.typePrefix}${className}`;
   const enumItems = schema.enum.map((val) => {
     return {
       name: pascalCase(val, { normalize: true }),
@@ -543,24 +551,24 @@ function kotlinEnumFromSchema(schema, context) {
       `Enum schemas must have at least one enum value. At ${context.schemaPath}.`
     );
   }
-  const defaultValue = nullable ? "null" : `${className}.new()`;
+  const defaultValue = nullable ? "null" : `${prefixedClassName}.new()`;
   let content = "";
   if (!context.existingTypeIds.includes(className)) {
-    content = `enum class ${className} {
+    content = `enum class ${prefixedClassName} {
     ${enumItems.map((item) => item.name).join(",\n    ")};
     val serialValue: String
         get() = when (this) {
             ${enumItems.map((item) => `${item.name} -> "${item.value}"`).join("\n            ")}
         }
     
-    companion object Factory : ${context.clientName}ModelFactory<${className}> {
+    companion object Factory : ${context.clientName}ModelFactory<${prefixedClassName}> {
         @JvmStatic
-        override fun new(): ${className} {
+        override fun new(): ${prefixedClassName} {
             return ${enumItems[0].name}
         }
 
         @JvmStatic
-        override fun fromJson(input: String): ${className} {
+        override fun fromJson(input: String): ${prefixedClassName} {
             return when (input) {
                 ${enumItems.map((item) => `${item.name}.serialValue -> ${item.name}`).join("\n                ")}
                 else -> ${enumItems[0].name}
@@ -568,9 +576,9 @@ function kotlinEnumFromSchema(schema, context) {
         }
 
         @JvmStatic
-        override fun fromJsonElement(__input: JsonElement, instancePath: String): ${className} {
+        override fun fromJsonElement(__input: JsonElement, instancePath: String): ${prefixedClassName} {
             if (__input !is JsonPrimitive) {
-                __logError("[WARNING] ${className}.fromJsonElement() expected kotlinx.serialization.json.JsonPrimitive at $instancePath. Got \${__input.javaClass}. Initializing empty ${className}.")
+                __logError("[WARNING] ${prefixedClassName}.fromJsonElement() expected kotlinx.serialization.json.JsonPrimitive at $instancePath. Got \${__input.javaClass}. Initializing empty ${prefixedClassName}.")
                 return new()
             }
             return when (__input.jsonPrimitive.contentOrNull) {
@@ -584,26 +592,27 @@ function kotlinEnumFromSchema(schema, context) {
   }
   return {
     typeName: className,
+    prefixedTypeName: prefixedClassName,
     isNullable: nullable,
     defaultValue,
     fromJson(input, key) {
       if (nullable) {
         return `when (${input}) {
                     is JsonNull -> null
-                    is JsonPrimitive -> ${className}.fromJsonElement(${input}!!, "$instancePath/${key ?? ""}")
+                    is JsonPrimitive -> ${prefixedClassName}.fromJsonElement(${input}!!, "$instancePath/${key ?? ""}")
                     else -> null
                 }`;
       }
       return `when (${input}) {
                 is JsonNull -> ${defaultValue}
-                is JsonPrimitive -> ${className}.fromJsonElement(${input}!!, "$instancePath/${key}")
+                is JsonPrimitive -> ${prefixedClassName}.fromJsonElement(${input}!!, "$instancePath/${key}")
                 else -> ${defaultValue}
             }`;
     },
     toJson(input, target) {
       if (schema.nullable) {
         return `${target} += when (${input}) {
-                    is ${className} -> "\\"\${${input}.serialValue}\\""
+                    is ${prefixedClassName} -> "\\"\${${input}.serialValue}\\""
                     else -> "null"
                 }`;
       }
@@ -634,10 +643,11 @@ function kotlinMapFromSchema(schema, context) {
     schemaPath: `${context.schemaPath}/values`,
     existingTypeIds: context.existingTypeIds
   });
-  const typeName = `MutableMap<String, ${subType.typeName}${subType.isNullable ? "?" : ""}>`;
+  const typeName = `MutableMap<String, ${subType.prefixedTypeName}${subType.isNullable ? "?" : ""}>`;
   const defaultValue = nullable ? "null" : "mutableMapOf()";
   return {
     typeName,
+    prefixedTypeName: typeName,
     isNullable: nullable,
     defaultValue,
     fromJson(input, key) {
@@ -702,6 +712,7 @@ function kotlinStringFromSchema(schema, context) {
   const defaultValue = nullable ? "null" : '""';
   return {
     typeName: "String",
+    prefixedTypeName: "String",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -736,6 +747,7 @@ function kotlinBooleanFromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "false";
   return {
     typeName: "Boolean",
+    prefixedTypeName: "Boolean",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -764,6 +776,7 @@ function kotlinTimestampFromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "Instant.now()";
   return {
     typeName: "Instant",
+    prefixedTypeName: "Instant",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -819,6 +832,7 @@ function kotlinFloat32FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0.0F";
   return {
     typeName: "Float",
+    prefixedTypeName: "Float",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -847,6 +861,7 @@ function kotlinFloat64FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0.0";
   return {
     typeName: "Double",
+    prefixedTypeName: "Double",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -875,6 +890,7 @@ function kotlinInt8FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0";
   return {
     typeName: "Byte",
+    prefixedTypeName: "Byte",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -903,6 +919,7 @@ function kotlinInt16FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0";
   return {
     typeName: "Short",
+    prefixedTypeName: "Short",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -931,6 +948,7 @@ function kotlinInt32FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0";
   return {
     typeName: "Int",
+    prefixedTypeName: "Int",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -959,6 +977,7 @@ function kotlinInt64FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0L";
   return {
     typeName: "Long",
+    prefixedTypeName: "Long",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -993,6 +1012,7 @@ function kotlinUint8FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0u";
   return {
     typeName: "UByte",
+    prefixedTypeName: "UByte",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -1021,6 +1041,7 @@ function kotlinUint16FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0u";
   return {
     typeName: "UShort",
+    prefixedTypeName: "UShort",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -1049,6 +1070,7 @@ function kotlinUint32FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0u";
   return {
     typeName: "UInt",
+    prefixedTypeName: "UInt",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -1077,6 +1099,7 @@ function kotlinUint64FromSchema(schema, context) {
   const defaultValue = nullable ? "null" : "0UL";
   return {
     typeName: "ULong",
+    prefixedTypeName: "ULong",
     isNullable: nullable,
     defaultValue,
     fromJson(input) {
@@ -1236,7 +1259,7 @@ function kotlinServiceFromSchema(schema, context) {
     content: `class ${name}(
     private val httpClient: HttpClient,
     private val baseUrl: String,
-    private val headers: headersFn,
+    private val headers: __${context.clientName}HeadersFn,
     private val onError: ((err: Exception) -> Unit) = {},
 ) {
     ${procedureParts.join("\n\n    ")}
@@ -1256,15 +1279,17 @@ function getServiceName(context) {
 
 function kotlinRefFromSchema(schema, context) {
   const typeName = kotlinClassName(schema.ref);
+  const prefixedTypeName = `${context.typePrefix}${typeName}`;
   const nullable = isNullable(schema, context);
-  const defaultValue = nullable ? "null" : `${typeName}.new()`;
+  const defaultValue = nullable ? "null" : `${prefixedTypeName}.new()`;
   return {
     typeName,
+    prefixedTypeName,
     isNullable: nullable,
     defaultValue,
     fromJson(input, key) {
       return `when (${input}) {
-                is JsonObject -> ${typeName}.fromJsonElement(
+                is JsonObject -> ${prefixedTypeName}.fromJsonElement(
                     ${input}!!,
                     "$instancePath/${key}",
                 )
@@ -1366,7 +1391,7 @@ ${getUtilityFunctions(clientName)}`;
 class ${clientName}(
     private val httpClient: HttpClient,
     private val baseUrl: String,
-    private val headers: headersFn,
+    private val headers: __${clientName}HeadersFn,
     private val onError: ((err: Exception) -> Unit) = {},
 ) {
     ${procedureParts.join("\n\n    ")}
@@ -1548,7 +1573,7 @@ data class ${clientName}Error(
 }
 function getUtilityFunctions(clientName) {
   return `// Implementation copied from https://github.com/Kotlin/kotlinx.serialization/blob/d0ae697b9394103879e6c7f836d0f7cf128f4b1e/formats/json/commonMain/src/kotlinx/serialization/json/internal/StringOps.kt#L45
-internal const val STRING = '"'
+private const val STRING = '"'
 
 private fun toHexChar(i: Int): Char {
     val d = i and 0xf
@@ -1556,7 +1581,7 @@ private fun toHexChar(i: Int): Char {
     else (d - 10 + 'a'.code).toChar()
 }
 
-internal val ESCAPE_STRINGS: Array<String?> = arrayOfNulls<String>(93).apply {
+private val ESCAPE_STRINGS: Array<String?> = arrayOfNulls<String>(93).apply {
     for (c in 0..0x1f) {
         val c1 = toHexChar(c shr 12)
         val c2 = toHexChar(c shr 8)
@@ -1573,7 +1598,7 @@ internal val ESCAPE_STRINGS: Array<String?> = arrayOfNulls<String>(93).apply {
     this[0x0c] = "\\\\f"
 }
 
-internal val ESCAPE_MARKERS: ByteArray = ByteArray(93).apply {
+private val ESCAPE_MARKERS: ByteArray = ByteArray(93).apply {
     for (c in 0..0x1f) {
         this[c] = 1.toByte()
     }
@@ -1586,7 +1611,7 @@ internal val ESCAPE_MARKERS: ByteArray = ByteArray(93).apply {
     this[0x0c] = 'f'.code.toByte()
 }
 
-internal fun StringBuilder.printQuoted(value: String) {
+private fun StringBuilder.printQuoted(value: String) {
     append(STRING)
     var lastPos = 0
     for (i in value.indices) {
@@ -1644,7 +1669,7 @@ private suspend fun __prepareRequest(
 }
 
 // SSE_FN_START
-private enum class SseEventLineType {
+private enum class __${clientName}SseEventLineType {
     Id,
     Event,
     Data,
@@ -1652,36 +1677,36 @@ private enum class SseEventLineType {
     None,
 }
 
-private fun __parseSseEventLine(line: String): Pair<SseEventLineType, String> {
+private fun __parseSseEventLine(line: String): Pair<__${clientName}SseEventLineType, String> {
     if (line.startsWith("id:")) {
-        return Pair(SseEventLineType.Id, line.substring(3).trim())
+        return Pair(__${clientName}SseEventLineType.Id, line.substring(3).trim())
     }
     if (line.startsWith("event:")) {
-        return Pair(SseEventLineType.Event, line.substring(6).trim())
+        return Pair(__${clientName}SseEventLineType.Event, line.substring(6).trim())
     }
     if (line.startsWith("data:")) {
-        return Pair(SseEventLineType.Data, line.substring(5).trim())
+        return Pair(__${clientName}SseEventLineType.Data, line.substring(5).trim())
     }
     if (line.startsWith("retry:")) {
-        return Pair(SseEventLineType.Retry, line.substring(6).trim())
+        return Pair(__${clientName}SseEventLineType.Retry, line.substring(6).trim())
     }
-    return Pair(SseEventLineType.None, "")
+    return Pair(__${clientName}SseEventLineType.None, "")
 }
 
-private data class __SseEvent(
+private data class __${clientName}SseEvent(
     val id: String? = null,
     val event: String,
     val data: String,
     val retry: Int? = null
 )
 
-private class __SseEventParsingResult(val events: List<__SseEvent>, val leftover: String)
+private class __${clientName}SseEventParsingResult(val events: List<__${clientName}SseEvent>, val leftover: String)
 
-private fun __parseSseEvents(input: String): __SseEventParsingResult {
-    val events = mutableListOf<__SseEvent>()
+private fun __parseSseEvents(input: String): __${clientName}SseEventParsingResult {
+    val events = mutableListOf<__${clientName}SseEvent>()
     val lines = input.lines()
     if (lines.isEmpty()) {
-        return __SseEventParsingResult(events = listOf(), leftover = "")
+        return __${clientName}SseEventParsingResult(events = listOf(), leftover = "")
     }
     var id: String? = null
     var event: String? = null
@@ -1692,18 +1717,18 @@ private fun __parseSseEvents(input: String): __SseEventParsingResult {
         if (line.isNotEmpty()) {
             val (type, value) = __parseSseEventLine(line)
             when (type) {
-                SseEventLineType.Id -> id = value
-                SseEventLineType.Event -> event = value
-                SseEventLineType.Data -> data = value
-                SseEventLineType.Retry -> retry = value.toInt()
-                SseEventLineType.None -> {}
+                __${clientName}SseEventLineType.Id -> id = value
+                __${clientName}SseEventLineType.Event -> event = value
+                __${clientName}SseEventLineType.Data -> data = value
+                __${clientName}SseEventLineType.Retry -> retry = value.toInt()
+                __${clientName}SseEventLineType.None -> {}
             }
         }
         val isEnd = line == ""
         if (isEnd) {
             if (data != null) {
                 events.add(
-                    __SseEvent(
+                    __${clientName}SseEvent(
                         id = id,
                         event = event ?: "message",
                         data = data!!,
@@ -1718,7 +1743,7 @@ private fun __parseSseEvents(input: String): __SseEventParsingResult {
             lastIndex = if (index + 1 < lines.size) index + 1 else null
         }
     }
-    return __SseEventParsingResult(
+    return __${clientName}SseEventParsingResult(
         events = events,
         leftover = if (lastIndex != null) lines.subList(lastIndex!!, lines.size).joinToString(separator = "\\n") else ""
     )
@@ -1730,7 +1755,7 @@ private suspend fun __handleSseRequest(
     url: String,
     method: HttpMethod,
     params: ${clientName}Model?,
-    headers: headersFn,
+    headers: __${clientName}HeadersFn,
     backoffTime: Long,
     maxBackoffTime: Long,
     lastEventId: String?,
@@ -1971,7 +1996,7 @@ private val JsonInstance = Json {
     encodeDefaults = true
     ignoreUnknownKeys = true
 }
-private typealias headersFn = (() -> MutableMap<String, String>?)?`;
+private typealias __${options.clientName}HeadersFn = (() -> MutableMap<String, String>?)?`;
 }
 
 export { kotlinClientFromAppDefinition, kotlinClientGenerator, kotlinTypeFromSchema };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arrirpc/codegen-kotlin",
-  "version": "0.72.0",
+  "version": "0.74.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -22,6 +22,6 @@
     "dist"
   ],
   "dependencies": {
-    "@arrirpc/codegen-utils": "0.72.0"
+    "@arrirpc/codegen-utils": "0.74.0"
   }
 }