@kizunajs/kotlin 2.0.0-beta.16 → 2.0.0-beta.18

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_generator = require("./generator-D2dgwOZe.cjs");
+const require_generator = require("./generator-CeUS3C_6.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 let node_util = require("node:util");

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as generateKotlinClient } from "./generator-BYxosxwy.mjs";
+import { t as generateKotlinClient } from "./generator-D2GCSZwz.mjs";
 import { mkdirSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { parseArgs } from "node:util";

package/dist/{generator-D2dgwOZe.cjs → generator-CeUS3C_6.cjs}

@@ -58,6 +58,7 @@ var TypeRegistry = class {
 	sealedVariantPaths = /* @__PURE__ */ new Map();
 	brands = /* @__PURE__ */ new Map();
 	usesJsonElement = false;
+	usesNullish = false;
 	constructor(camelCaseProperties = false, unknownEnumCase = false) {
 		this.camelCaseProperties = camelCaseProperties;
 		this.unknownEnumCase = unknownEnumCase;
@@ -127,11 +128,13 @@ const propertyName = (key, camelCase) => {
 	if (!camel) return "field";
 	return /^[0-9]/.test(camel) ? `_${camel}` : camel;
 };
-const objectFields = (schema, registry, hint, shape = (0, kizunajs_generator.readObjectShape)(schema) ?? {}) => {
+const objectFields = (schema, registry, hint, nullishTriState = true, shape = (0, kizunajs_generator.readObjectShape)(schema) ?? {}) => {
 	const fields = [];
 	const seen = /* @__PURE__ */ new Map();
 	for (const [key, value] of Object.entries(shape)) {
 		const result = mapType(value, registry, `${hint}${(0, kizunajs_generator.toPascalCase)(key)}`);
+		const nullish = nullishTriState && result.nullish === true;
+		if (nullish) registry.usesNullish = true;
 		const deprecation = (0, kizunajs_generator.readDeprecation)(value);
 		const kotlinName = propertyName(key, registry.camelCaseProperties);
 		const previousWireName = seen.get(kotlinName);
@@ -140,8 +143,10 @@ const objectFields = (schema, registry, hint, shape = (0, kizunajs_generator.rea
 		fields.push({
 			name: kotlinName,
 			wireName: key,
-			type: result.expression,
-			optional: result.optional,
+			type: nullish ? `Nullish<${result.expression.replace(/\?$/, "")}>` : result.expression,
+			optional: result.optional && !nullish,
+			requiredNullable: result.requiredNullable,
+			nullish,
 			description: (0, kizunajs_generator.readMetaDescription)(value),
 			isFile: result.isFile,
 			deprecated: deprecation !== void 0,
@@ -264,6 +269,8 @@ const mapUnbrandedType = (schema, registry, hint) => {
 		return {
 			expression: innerResult.expression.endsWith("?") ? innerResult.expression : `${innerResult.expression}?`,
 			optional: true,
+			requiredNullable: nullable && !optional,
+			nullish: nullable && optional,
 			isFile: innerResult.isFile
 		};
 	}
@@ -445,9 +452,13 @@ const sanitizeCaseName = (literal) => {
 	if (/^[0-9]/.test(cleaned)) return `_${cleaned}`;
 	return cleaned.charAt(0).toUpperCase() + cleaned.slice(1);
 };
-const collectObjectFields = (schema, registry, hint) => {
-	return objectFields(schema, registry, hint);
+/**
+* A JSON body keeps `.nullish()` as `Nullish`. A query, path, header or form field has no null, so it takes an optional.
+*/
+const collectObjectFields = (schema, registry, hint, json = false) => {
+	return objectFields(schema, registry, hint, json);
 };
+const hasDefault = (field) => field.optional && field.requiredNullable !== true || field.nullish === true;
 const objectFieldCount = (schema) => {
 	return Object.keys((0, kizunajs_generator.readObjectShape)(schema) ?? {}).length;
 };
@@ -512,7 +523,7 @@ const buildRouteMethod = (routeKey, route, registry, deprecated, deprecationMess
 				else bodyDescriptor = {
 					kind: "json-flat",
 					structName,
-					flattened: collectObjectFields(route.body, registry, bodyHint),
+					flattened: collectObjectFields(route.body, registry, bodyHint, true),
 					multipartFields: []
 				};
 			}
@@ -678,6 +689,49 @@ const KOTLIN_KEYWORDS = new Set([
 const escapeKeyword = (name) => {
 	return KOTLIN_KEYWORDS.has(name) ? `\`${name}\`` : name;
 };
+const NULLISH_TYPE = /^Nullish<(.+)>$/;
+const emitNullish = (writer) => {
+	writer.line("/** A `.nullish()` field: left out, sent as `null`, or sent with a value. */");
+	writer.line("@Serializable(with = NullishSerializer::class)");
+	writer.block("sealed interface Nullish<out T>", () => {
+		writer.line("val value: T?");
+		writer.blank();
+		writer.block("data object Absent : Nullish<Nothing>", () => {
+			writer.line("override val value: Nothing? get() = null");
+		});
+		writer.blank();
+		writer.block("data object Null : Nullish<Nothing>", () => {
+			writer.line("override val value: Nothing? get() = null");
+		});
+		writer.blank();
+		writer.line("data class Some<out T>(override val value: T) : Nullish<T>");
+	});
+	writer.blank();
+	writer.block("class NullishSerializer<T>(private val valueSerializer: KSerializer<T>) : KSerializer<Nullish<T>>", () => {
+		writer.line("override val descriptor: SerialDescriptor = valueSerializer.descriptor.nullable");
+		writer.blank();
+		writer.line("@OptIn(ExperimentalSerializationApi::class)");
+		writer.block("override fun serialize(encoder: Encoder, value: Nullish<T>)", () => {
+			writer.line("when (value) {");
+			writer.line("    is Nullish.Some -> encoder.encodeSerializableValue(valueSerializer, value.value)");
+			writer.line("    Nullish.Null -> encoder.encodeNull()");
+			writer.line("    Nullish.Absent -> throw SerializationException(\"An absent field has no value to write, so its key is left out\")");
+			writer.line("}");
+		});
+		writer.blank();
+		writer.line("@OptIn(ExperimentalSerializationApi::class)");
+		writer.block("override fun deserialize(decoder: Decoder): Nullish<T>", () => {
+			writer.line("if (decoder.decodeNotNullMark()) return Nullish.Some(decoder.decodeSerializableValue(valueSerializer))");
+			writer.line("decoder.decodeNull()");
+			writer.line("return Nullish.Null");
+		});
+	});
+	writer.blank();
+};
+const defaultArgument = (field) => {
+	if (!hasDefault(field)) return "";
+	return field.nullish ? " = Nullish.Absent" : " = null";
+};
 const optionalize = (type, optional) => {
 	if (!optional) return type;
 	return type.endsWith("?") ? type : `${type}?`;
@@ -698,6 +752,8 @@ const KOTLIN_PRIMITIVE_TYPES = new Set([
 const decodeBody = (resolved) => resolved === "ByteArray" ? "data" : `json.decodeFromString<${resolved}>(data.decodeToString())`;
 const resolveType = (typeName, currentOperation, context, scope = "client") => {
 	const { operationTypeMap, namespaceName, clientName, fileLevelTypeNames } = context;
+	const nullish = NULLISH_TYPE.exec(typeName);
+	if (nullish) return `Nullish<${resolveType(nullish[1], currentOperation, context, scope)}>`;
 	const optional = typeName.endsWith("?");
 	const base = optional ? typeName.slice(0, -1) : typeName;
 	if (KOTLIN_PRIMITIVE_TYPES.has(base)) return typeName;
@@ -820,6 +876,8 @@ const emitDataClass = (writer, type, ownedTypeMap, ownedTypeLookup, registryName
 	const baseFields = type.discriminatorWireName ? type.fields.filter((field) => field.wireName !== type.discriminatorWireName) : type.fields;
 	const hasFile = baseFields.some((field) => field.isFile);
 	const resolveOwnedType = (raw) => {
+		const nullish = NULLISH_TYPE.exec(raw);
+		if (nullish) return `Nullish<${resolveOwnedType(nullish[1])}>`;
 		const optional = raw.endsWith("?");
 		const stripped = optional ? raw.slice(0, -1) : raw;
 		const isList = stripped.startsWith("List<") && stripped.endsWith(">");
@@ -835,12 +893,15 @@ const emitDataClass = (writer, type, ownedTypeMap, ownedTypeLookup, registryName
 	}));
 	const needsSerialName = !hasFile && baseFields.some((field) => field.name !== field.wireName || KOTLIN_KEYWORDS.has(field.name));
 	if (type.serialName !== void 0) writer.line(`@SerialName(${stringLiteral(type.serialName)})`);
-	if (!hasFile) writer.line("@Serializable");
+	if (!hasFile) {
+		if (adjustedFields.some((field) => field.nullish)) writer.line("@OptIn(ExperimentalSerializationApi::class)");
+		writer.line("@Serializable");
+	}
 	const params = adjustedFields.map((field) => {
 		const typeExpression = optionalize(field.type, field.optional);
-		const defaultPart = field.optional ? " = null" : "";
+		const defaultPart = defaultArgument(field);
 		const serialNameAnnotation = needsSerialName && (field.name !== field.wireName || KOTLIN_KEYWORDS.has(field.name)) ? `@SerialName(${stringLiteral(field.wireName)}) ` : "";
-		return `${field.deprecated ? `${deprecatedAnnotation(field.deprecationMessage)} ` : ""}${serialNameAnnotation}val ${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
+		return `${field.deprecated ? `${deprecatedAnnotation(field.deprecationMessage)} ` : ""}${serialNameAnnotation}${field.nullish ? "@EncodeDefault(EncodeDefault.Mode.NEVER) " : ""}val ${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
 	});
 	const hasOwnedTypes = Array.from(ownedTypeMap.entries()).some(([, owner]) => owner === lookupName);
 	if (params.length === 0) writer.line(`data class ${type.name}(private val unused: Unit = Unit)`);
@@ -882,6 +943,8 @@ const relativeOwnedPath = (typeName, ownedTypeMap, enclosingPath, registry) => {
 	return path.startsWith(prefix) ? path.slice(prefix.length) : void 0;
 };
 const ownedTypePath = (typeName, ownedTypeMap, registry) => {
+	const nullish = NULLISH_TYPE.exec(typeName);
+	if (nullish) return `Nullish<${ownedTypePath(nullish[1], ownedTypeMap, registry)}>`;
 	const sealedPath = registry?.sealedVariantPath(typeName);
 	if (sealedPath !== void 0) return sealedPath;
 	const owningClass = ownedTypeMap.get(typeName);
@@ -931,7 +994,7 @@ const emitSealedClass = (writer, type, registry, ownedTypeMap, ownedTypeLookup)
 					const params = fields.map((field) => {
 						const variantPath = registry.sealedVariantPath(variant.payloadType) ?? variant.payloadType;
 						const typeExpression = optionalize(relativeOwnedPath(field.type, ownedTypeMap, variantPath, registry) ?? ownedTypePath(field.type, ownedTypeMap, registry), field.optional);
-						const defaultPart = field.optional ? " = null" : "";
+						const defaultPart = defaultArgument(field);
 						return `val ${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
 					});
 					if (params.length === 1) writer.line(`data class ${variant.caseName}(${params[0]}) : ${type.name}`);
@@ -1130,7 +1193,7 @@ const groupTypeRef = (operationName, className, context) => `${context.clientNam
 const groupMemberAccessor = (groupLabel, field) => `${groupLabel}.${escapeKeyword(field.name)}`;
 const groupClassField = (field) => {
 	const typeExpression = optionalize(field.type, field.optional);
-	const defaultPart = field.optional ? " = null" : "";
+	const defaultPart = defaultArgument(field);
 	return `val ${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
 };
 const emitGroupClass = (writer, className, fields, method, context) => {
@@ -1189,13 +1252,13 @@ const methodChannels = (method) => {
 	if (method.query.length > 0) channels.push({
 		varName: "query",
 		className: "Query",
-		required: method.query.some((field) => !field.optional),
+		required: method.query.some((field) => !hasDefault(field)),
 		fields: method.query
 	});
 	if (method.headers.length > 0) channels.push({
 		varName: "headers",
 		className: "Headers",
-		required: method.headers.some((field) => !field.optional),
+		required: method.headers.some((field) => !hasDefault(field)),
 		fields: method.headers
 	});
 	if (hasBodyGroup(method)) {
@@ -1244,7 +1307,7 @@ const emitArgsScaffolding = (writer, method, context) => {
 	};
 	const factorySignature = (channel) => channel.fields.map((field) => {
 		const typeExpression = optionalize(field.type, field.optional);
-		const defaultPart = field.optional ? " = null" : "";
+		const defaultPart = defaultArgument(field);
 		return `${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
 	}).join(", ");
 	const factoryConstruction = (channel) => {
@@ -1301,10 +1364,16 @@ const emitBodyEncoding = (writer, method, context) => {
 	if (body.kind === "multipart") {
 		writer.line("val multipartBuilder = MultipartBody.Builder().setType(MultipartBody.FORM)");
 		for (const field of body.multipartFields) {
-			const accessor = groupMemberAccessor("body", field);
-			const isFlattenedFile = body.flattened.find((flatField) => flatField.name === field.name)?.isFile === true;
-			if (field.isFile || isFlattenedFile) writer.line(`multipartBuilder.addFormDataPart(${stringLiteral(field.wireName)}, ${accessor}.filename, ${accessor}.data.toRequestBody(${accessor}.mimeType.toMediaType()))`);
-			else writer.line(`multipartBuilder.addFormDataPart(${stringLiteral(field.wireName)}, ${accessor}.toString())`);
+			const flattenedField = body.flattened.find((flatField) => flatField.name === field.name);
+			const isFile = field.isFile || flattenedField?.isFile === true;
+			const append = (accessor) => {
+				if (isFile) writer.line(`multipartBuilder.addFormDataPart(${stringLiteral(field.wireName)}, ${accessor}.filename, ${accessor}.data.toRequestBody(${accessor}.mimeType.toMediaType()))`);
+				else writer.line(`multipartBuilder.addFormDataPart(${stringLiteral(field.wireName)}, ${accessor}.toString())`);
+			};
+			if (flattenedField?.optional === true) writer.block(`if (${groupMemberAccessor("body", field)} != null)`, () => {
+				append(groupMemberAccessor("body", field));
+			});
+			else append(groupMemberAccessor("body", field));
 		}
 		writer.line("requestBody = multipartBuilder.build()");
 		return;
@@ -1664,14 +1733,14 @@ const emitClient = (writer, config, partition, context, typesByOperation, regist
 	const allMethods = [...flatMethods, ...groups.flatMap((group) => group.methods)];
 	const usesMultipart = allMethods.some((method) => method.body?.kind === "multipart");
 	const contextFields = context.requestContextFields;
-	const contextRequired = contextFields.some((field) => !field.optional);
+	const contextRequired = contextFields.some((field) => !hasDefault(field));
 	const contextParam = contextFields.length > 0 ? `requestContext: RequestContext${contextRequired ? "" : " = RequestContext()"}, ` : "";
 	writer.blank();
 	writer.block(`class ${clientName}(private val baseUrl: String, ${contextParam}private val client: OkHttpClient = OkHttpClient(), private val json: Json = Json { ignoreUnknownKeys = true }, private val requestInterceptor: (suspend (Request.Builder) -> Unit)? = null, private val responseInterceptor: (suspend (Request, Response) -> Unit)? = null)`, () => {
 		if (contextFields.length > 0) {
 			writer.blank();
 			writer.line("/** Values sent as headers on every request, from the api's request context. */");
-			emitConstructorClass(writer, "data class RequestContext", contextFields.map((field) => `val ${escapeKeyword(field.name)}: ${field.type}${field.optional ? " = null" : ""}`));
+			emitConstructorClass(writer, "data class RequestContext", contextFields.map((field) => `val ${escapeKeyword(field.name)}: ${field.type}${defaultArgument(field)}`));
 			writer.blank();
 			writer.block("private val requestContextHeaders: Map<String, String> = buildMap", () => {
 				for (const field of contextFields) if (field.optional) writer.line(`if (requestContext.${escapeKeyword(field.name)} != null) put(${stringLiteral(field.wireName)}, requestContext.${escapeKeyword(field.name)}!!)`);
@@ -1768,7 +1837,7 @@ const renderKotlinClient = (api, partition, registry, config) => {
 	}
 	writer.line("import kotlinx.serialization.*");
 	writer.line("import kotlinx.serialization.json.*");
-	if (registry.all().some((type) => type.kind === "enum-class" && type.unknownCase)) {
+	if (registry.all().some((type) => type.kind === "enum-class" && type.unknownCase) || registry.usesNullish) {
 		writer.line("import kotlinx.serialization.descriptors.*");
 		writer.line("import kotlinx.serialization.encoding.*");
 	}
@@ -1786,6 +1855,7 @@ const renderKotlinClient = (api, partition, registry, config) => {
 		});
 		writer.blank();
 	}
+	if (registry.usesNullish) emitNullish(writer);
 	const sharedTypes = [];
 	const typesByOperation = /* @__PURE__ */ new Map();
 	for (const type of registry.all()) {

package/dist/{generator-BYxosxwy.mjs → generator-D2GCSZwz.mjs}

@@ -58,6 +58,7 @@ var TypeRegistry = class {
 	sealedVariantPaths = /* @__PURE__ */ new Map();
 	brands = /* @__PURE__ */ new Map();
 	usesJsonElement = false;
+	usesNullish = false;
 	constructor(camelCaseProperties = false, unknownEnumCase = false) {
 		this.camelCaseProperties = camelCaseProperties;
 		this.unknownEnumCase = unknownEnumCase;
@@ -127,11 +128,13 @@ const propertyName = (key, camelCase) => {
 	if (!camel) return "field";
 	return /^[0-9]/.test(camel) ? `_${camel}` : camel;
 };
-const objectFields = (schema, registry, hint, shape = readObjectShape(schema) ?? {}) => {
+const objectFields = (schema, registry, hint, nullishTriState = true, shape = readObjectShape(schema) ?? {}) => {
 	const fields = [];
 	const seen = /* @__PURE__ */ new Map();
 	for (const [key, value] of Object.entries(shape)) {
 		const result = mapType(value, registry, `${hint}${toPascalCase(key)}`);
+		const nullish = nullishTriState && result.nullish === true;
+		if (nullish) registry.usesNullish = true;
 		const deprecation = readDeprecation(value);
 		const kotlinName = propertyName(key, registry.camelCaseProperties);
 		const previousWireName = seen.get(kotlinName);
@@ -140,8 +143,10 @@ const objectFields = (schema, registry, hint, shape = readObjectShape(schema) ??
 		fields.push({
 			name: kotlinName,
 			wireName: key,
-			type: result.expression,
-			optional: result.optional,
+			type: nullish ? `Nullish<${result.expression.replace(/\?$/, "")}>` : result.expression,
+			optional: result.optional && !nullish,
+			requiredNullable: result.requiredNullable,
+			nullish,
 			description: readMetaDescription(value),
 			isFile: result.isFile,
 			deprecated: deprecation !== void 0,
@@ -264,6 +269,8 @@ const mapUnbrandedType = (schema, registry, hint) => {
 		return {
 			expression: innerResult.expression.endsWith("?") ? innerResult.expression : `${innerResult.expression}?`,
 			optional: true,
+			requiredNullable: nullable && !optional,
+			nullish: nullable && optional,
 			isFile: innerResult.isFile
 		};
 	}
@@ -445,9 +452,13 @@ const sanitizeCaseName = (literal) => {
 	if (/^[0-9]/.test(cleaned)) return `_${cleaned}`;
 	return cleaned.charAt(0).toUpperCase() + cleaned.slice(1);
 };
-const collectObjectFields = (schema, registry, hint) => {
-	return objectFields(schema, registry, hint);
+/**
+* A JSON body keeps `.nullish()` as `Nullish`. A query, path, header or form field has no null, so it takes an optional.
+*/
+const collectObjectFields = (schema, registry, hint, json = false) => {
+	return objectFields(schema, registry, hint, json);
 };
+const hasDefault = (field) => field.optional && field.requiredNullable !== true || field.nullish === true;
 const objectFieldCount = (schema) => {
 	return Object.keys(readObjectShape(schema) ?? {}).length;
 };
@@ -512,7 +523,7 @@ const buildRouteMethod = (routeKey, route, registry, deprecated, deprecationMess
 				else bodyDescriptor = {
 					kind: "json-flat",
 					structName,
-					flattened: collectObjectFields(route.body, registry, bodyHint),
+					flattened: collectObjectFields(route.body, registry, bodyHint, true),
 					multipartFields: []
 				};
 			}
@@ -678,6 +689,49 @@ const KOTLIN_KEYWORDS = new Set([
 const escapeKeyword = (name) => {
 	return KOTLIN_KEYWORDS.has(name) ? `\`${name}\`` : name;
 };
+const NULLISH_TYPE = /^Nullish<(.+)>$/;
+const emitNullish = (writer) => {
+	writer.line("/** A `.nullish()` field: left out, sent as `null`, or sent with a value. */");
+	writer.line("@Serializable(with = NullishSerializer::class)");
+	writer.block("sealed interface Nullish<out T>", () => {
+		writer.line("val value: T?");
+		writer.blank();
+		writer.block("data object Absent : Nullish<Nothing>", () => {
+			writer.line("override val value: Nothing? get() = null");
+		});
+		writer.blank();
+		writer.block("data object Null : Nullish<Nothing>", () => {
+			writer.line("override val value: Nothing? get() = null");
+		});
+		writer.blank();
+		writer.line("data class Some<out T>(override val value: T) : Nullish<T>");
+	});
+	writer.blank();
+	writer.block("class NullishSerializer<T>(private val valueSerializer: KSerializer<T>) : KSerializer<Nullish<T>>", () => {
+		writer.line("override val descriptor: SerialDescriptor = valueSerializer.descriptor.nullable");
+		writer.blank();
+		writer.line("@OptIn(ExperimentalSerializationApi::class)");
+		writer.block("override fun serialize(encoder: Encoder, value: Nullish<T>)", () => {
+			writer.line("when (value) {");
+			writer.line("    is Nullish.Some -> encoder.encodeSerializableValue(valueSerializer, value.value)");
+			writer.line("    Nullish.Null -> encoder.encodeNull()");
+			writer.line("    Nullish.Absent -> throw SerializationException(\"An absent field has no value to write, so its key is left out\")");
+			writer.line("}");
+		});
+		writer.blank();
+		writer.line("@OptIn(ExperimentalSerializationApi::class)");
+		writer.block("override fun deserialize(decoder: Decoder): Nullish<T>", () => {
+			writer.line("if (decoder.decodeNotNullMark()) return Nullish.Some(decoder.decodeSerializableValue(valueSerializer))");
+			writer.line("decoder.decodeNull()");
+			writer.line("return Nullish.Null");
+		});
+	});
+	writer.blank();
+};
+const defaultArgument = (field) => {
+	if (!hasDefault(field)) return "";
+	return field.nullish ? " = Nullish.Absent" : " = null";
+};
 const optionalize = (type, optional) => {
 	if (!optional) return type;
 	return type.endsWith("?") ? type : `${type}?`;
@@ -698,6 +752,8 @@ const KOTLIN_PRIMITIVE_TYPES = new Set([
 const decodeBody = (resolved) => resolved === "ByteArray" ? "data" : `json.decodeFromString<${resolved}>(data.decodeToString())`;
 const resolveType = (typeName, currentOperation, context, scope = "client") => {
 	const { operationTypeMap, namespaceName, clientName, fileLevelTypeNames } = context;
+	const nullish = NULLISH_TYPE.exec(typeName);
+	if (nullish) return `Nullish<${resolveType(nullish[1], currentOperation, context, scope)}>`;
 	const optional = typeName.endsWith("?");
 	const base = optional ? typeName.slice(0, -1) : typeName;
 	if (KOTLIN_PRIMITIVE_TYPES.has(base)) return typeName;
@@ -820,6 +876,8 @@ const emitDataClass = (writer, type, ownedTypeMap, ownedTypeLookup, registryName
 	const baseFields = type.discriminatorWireName ? type.fields.filter((field) => field.wireName !== type.discriminatorWireName) : type.fields;
 	const hasFile = baseFields.some((field) => field.isFile);
 	const resolveOwnedType = (raw) => {
+		const nullish = NULLISH_TYPE.exec(raw);
+		if (nullish) return `Nullish<${resolveOwnedType(nullish[1])}>`;
 		const optional = raw.endsWith("?");
 		const stripped = optional ? raw.slice(0, -1) : raw;
 		const isList = stripped.startsWith("List<") && stripped.endsWith(">");
@@ -835,12 +893,15 @@ const emitDataClass = (writer, type, ownedTypeMap, ownedTypeLookup, registryName
 	}));
 	const needsSerialName = !hasFile && baseFields.some((field) => field.name !== field.wireName || KOTLIN_KEYWORDS.has(field.name));
 	if (type.serialName !== void 0) writer.line(`@SerialName(${stringLiteral(type.serialName)})`);
-	if (!hasFile) writer.line("@Serializable");
+	if (!hasFile) {
+		if (adjustedFields.some((field) => field.nullish)) writer.line("@OptIn(ExperimentalSerializationApi::class)");
+		writer.line("@Serializable");
+	}
 	const params = adjustedFields.map((field) => {
 		const typeExpression = optionalize(field.type, field.optional);
-		const defaultPart = field.optional ? " = null" : "";
+		const defaultPart = defaultArgument(field);
 		const serialNameAnnotation = needsSerialName && (field.name !== field.wireName || KOTLIN_KEYWORDS.has(field.name)) ? `@SerialName(${stringLiteral(field.wireName)}) ` : "";
-		return `${field.deprecated ? `${deprecatedAnnotation(field.deprecationMessage)} ` : ""}${serialNameAnnotation}val ${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
+		return `${field.deprecated ? `${deprecatedAnnotation(field.deprecationMessage)} ` : ""}${serialNameAnnotation}${field.nullish ? "@EncodeDefault(EncodeDefault.Mode.NEVER) " : ""}val ${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
 	});
 	const hasOwnedTypes = Array.from(ownedTypeMap.entries()).some(([, owner]) => owner === lookupName);
 	if (params.length === 0) writer.line(`data class ${type.name}(private val unused: Unit = Unit)`);
@@ -882,6 +943,8 @@ const relativeOwnedPath = (typeName, ownedTypeMap, enclosingPath, registry) => {
 	return path.startsWith(prefix) ? path.slice(prefix.length) : void 0;
 };
 const ownedTypePath = (typeName, ownedTypeMap, registry) => {
+	const nullish = NULLISH_TYPE.exec(typeName);
+	if (nullish) return `Nullish<${ownedTypePath(nullish[1], ownedTypeMap, registry)}>`;
 	const sealedPath = registry?.sealedVariantPath(typeName);
 	if (sealedPath !== void 0) return sealedPath;
 	const owningClass = ownedTypeMap.get(typeName);
@@ -931,7 +994,7 @@ const emitSealedClass = (writer, type, registry, ownedTypeMap, ownedTypeLookup)
 					const params = fields.map((field) => {
 						const variantPath = registry.sealedVariantPath(variant.payloadType) ?? variant.payloadType;
 						const typeExpression = optionalize(relativeOwnedPath(field.type, ownedTypeMap, variantPath, registry) ?? ownedTypePath(field.type, ownedTypeMap, registry), field.optional);
-						const defaultPart = field.optional ? " = null" : "";
+						const defaultPart = defaultArgument(field);
 						return `val ${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
 					});
 					if (params.length === 1) writer.line(`data class ${variant.caseName}(${params[0]}) : ${type.name}`);
@@ -1130,7 +1193,7 @@ const groupTypeRef = (operationName, className, context) => `${context.clientNam
 const groupMemberAccessor = (groupLabel, field) => `${groupLabel}.${escapeKeyword(field.name)}`;
 const groupClassField = (field) => {
 	const typeExpression = optionalize(field.type, field.optional);
-	const defaultPart = field.optional ? " = null" : "";
+	const defaultPart = defaultArgument(field);
 	return `val ${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
 };
 const emitGroupClass = (writer, className, fields, method, context) => {
@@ -1189,13 +1252,13 @@ const methodChannels = (method) => {
 	if (method.query.length > 0) channels.push({
 		varName: "query",
 		className: "Query",
-		required: method.query.some((field) => !field.optional),
+		required: method.query.some((field) => !hasDefault(field)),
 		fields: method.query
 	});
 	if (method.headers.length > 0) channels.push({
 		varName: "headers",
 		className: "Headers",
-		required: method.headers.some((field) => !field.optional),
+		required: method.headers.some((field) => !hasDefault(field)),
 		fields: method.headers
 	});
 	if (hasBodyGroup(method)) {
@@ -1244,7 +1307,7 @@ const emitArgsScaffolding = (writer, method, context) => {
 	};
 	const factorySignature = (channel) => channel.fields.map((field) => {
 		const typeExpression = optionalize(field.type, field.optional);
-		const defaultPart = field.optional ? " = null" : "";
+		const defaultPart = defaultArgument(field);
 		return `${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
 	}).join(", ");
 	const factoryConstruction = (channel) => {
@@ -1301,10 +1364,16 @@ const emitBodyEncoding = (writer, method, context) => {
 	if (body.kind === "multipart") {
 		writer.line("val multipartBuilder = MultipartBody.Builder().setType(MultipartBody.FORM)");
 		for (const field of body.multipartFields) {
-			const accessor = groupMemberAccessor("body", field);
-			const isFlattenedFile = body.flattened.find((flatField) => flatField.name === field.name)?.isFile === true;
-			if (field.isFile || isFlattenedFile) writer.line(`multipartBuilder.addFormDataPart(${stringLiteral(field.wireName)}, ${accessor}.filename, ${accessor}.data.toRequestBody(${accessor}.mimeType.toMediaType()))`);
-			else writer.line(`multipartBuilder.addFormDataPart(${stringLiteral(field.wireName)}, ${accessor}.toString())`);
+			const flattenedField = body.flattened.find((flatField) => flatField.name === field.name);
+			const isFile = field.isFile || flattenedField?.isFile === true;
+			const append = (accessor) => {
+				if (isFile) writer.line(`multipartBuilder.addFormDataPart(${stringLiteral(field.wireName)}, ${accessor}.filename, ${accessor}.data.toRequestBody(${accessor}.mimeType.toMediaType()))`);
+				else writer.line(`multipartBuilder.addFormDataPart(${stringLiteral(field.wireName)}, ${accessor}.toString())`);
+			};
+			if (flattenedField?.optional === true) writer.block(`if (${groupMemberAccessor("body", field)} != null)`, () => {
+				append(groupMemberAccessor("body", field));
+			});
+			else append(groupMemberAccessor("body", field));
 		}
 		writer.line("requestBody = multipartBuilder.build()");
 		return;
@@ -1664,14 +1733,14 @@ const emitClient = (writer, config, partition, context, typesByOperation, regist
 	const allMethods = [...flatMethods, ...groups.flatMap((group) => group.methods)];
 	const usesMultipart = allMethods.some((method) => method.body?.kind === "multipart");
 	const contextFields = context.requestContextFields;
-	const contextRequired = contextFields.some((field) => !field.optional);
+	const contextRequired = contextFields.some((field) => !hasDefault(field));
 	const contextParam = contextFields.length > 0 ? `requestContext: RequestContext${contextRequired ? "" : " = RequestContext()"}, ` : "";
 	writer.blank();
 	writer.block(`class ${clientName}(private val baseUrl: String, ${contextParam}private val client: OkHttpClient = OkHttpClient(), private val json: Json = Json { ignoreUnknownKeys = true }, private val requestInterceptor: (suspend (Request.Builder) -> Unit)? = null, private val responseInterceptor: (suspend (Request, Response) -> Unit)? = null)`, () => {
 		if (contextFields.length > 0) {
 			writer.blank();
 			writer.line("/** Values sent as headers on every request, from the api's request context. */");
-			emitConstructorClass(writer, "data class RequestContext", contextFields.map((field) => `val ${escapeKeyword(field.name)}: ${field.type}${field.optional ? " = null" : ""}`));
+			emitConstructorClass(writer, "data class RequestContext", contextFields.map((field) => `val ${escapeKeyword(field.name)}: ${field.type}${defaultArgument(field)}`));
 			writer.blank();
 			writer.block("private val requestContextHeaders: Map<String, String> = buildMap", () => {
 				for (const field of contextFields) if (field.optional) writer.line(`if (requestContext.${escapeKeyword(field.name)} != null) put(${stringLiteral(field.wireName)}, requestContext.${escapeKeyword(field.name)}!!)`);
@@ -1768,7 +1837,7 @@ const renderKotlinClient = (api, partition, registry, config) => {
 	}
 	writer.line("import kotlinx.serialization.*");
 	writer.line("import kotlinx.serialization.json.*");
-	if (registry.all().some((type) => type.kind === "enum-class" && type.unknownCase)) {
+	if (registry.all().some((type) => type.kind === "enum-class" && type.unknownCase) || registry.usesNullish) {
 		writer.line("import kotlinx.serialization.descriptors.*");
 		writer.line("import kotlinx.serialization.encoding.*");
 	}
@@ -1786,6 +1855,7 @@ const renderKotlinClient = (api, partition, registry, config) => {
 		});
 		writer.blank();
 	}
+	if (registry.usesNullish) emitNullish(writer);
 	const sharedTypes = [];
 	const typesByOperation = /* @__PURE__ */ new Map();
 	for (const type of registry.all()) {

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-D2dgwOZe.cjs");
+const require_generator = require("./generator-CeUS3C_6.cjs");
 let kizunajs_generator = require("kizunajs/generator");
 let zod = require("zod");
 //#region src/client-target.ts

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { n as kotlinClientWalk, t as generateKotlinClient } from "./generator-BYxosxwy.mjs";
+import { n as kotlinClientWalk, t as generateKotlinClient } from "./generator-D2GCSZwz.mjs";
 import { defineClient } from "kizunajs/generator";
 import { z } from "zod";
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kizunajs/kotlin",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.0-beta.18",
   "description": "Kotlin client generation for Kizuna.js APIs",
   "keywords": [
     "kizunajs",
@@ -60,14 +60,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@kizunajs/cli": "2.0.0-beta.16"
+    "@kizunajs/cli": "2.0.0-beta.18"
   },
   "peerDependencies": {
-    "kizunajs": "2.0.0-beta.16",
+    "kizunajs": "2.0.0-beta.18",
     "zod": "^4.0.0"
   },
   "devDependencies": {
-    "kizunajs": "2.0.0-beta.16",
+    "kizunajs": "2.0.0-beta.18",
     "@types/node": "^22.9.0",
     "tsdown": "^0.21.0",
     "typescript": "^6.0.3",