@kizunajs/swift 2.0.0-beta.17 → 2.0.0-beta.18

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_generator = require("./generator-E0WQFf92.cjs");
+const require_generator = require("./generator-SM_Zrp0p.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 generateSwiftClient } from "./generator-CxUzLmbK.mjs";
+import { t as generateSwiftClient } from "./generator-CZr33FgN.mjs";
 import { mkdirSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { parseArgs } from "node:util";

package/dist/{generator-CxUzLmbK.mjs → generator-CZr33FgN.mjs}

@@ -47,6 +47,7 @@ var TypeRegistry = class {
 	unionVariantOwners = /* @__PURE__ */ new Map();
 	brands = /* @__PURE__ */ new Map();
 	usesAnyCodable = false;
+	usesNullish = false;
 	constructor(camelCaseProperties = false, unknownEnumCase = false) {
 		this.camelCaseProperties = camelCaseProperties;
 		this.unknownEnumCase = unknownEnumCase;
@@ -110,11 +111,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 swiftName = propertyName(key, registry.camelCaseProperties);
 		const previousWireName = seen.get(swiftName);
@@ -123,8 +126,10 @@ const objectFields = (schema, registry, hint, shape = readObjectShape(schema) ??
 		fields.push({
 			name: swiftName,
 			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,
@@ -236,6 +241,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
 		};
 	}
@@ -417,9 +424,13 @@ const sanitizeCaseName = (literal) => {
 	if (/^[0-9]/.test(cleaned)) return `_${cleaned}`;
 	return cleaned.charAt(0).toLowerCase() + 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;
 };
@@ -476,7 +487,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: []
 				};
 			}
@@ -696,6 +707,63 @@ const sanitizeEnumCaseName = (value) => {
 	if (!camel) return "_";
 	return /^[0-9]/.test(camel) ? `_${camel}` : camel;
 };
+const NULLISH_TYPE = /^Nullish<(.+)>$/;
+const emitNullish = (writer) => {
+	writer.blank();
+	writer.docComment("A `.nullish()` field: left out, sent as `null`, or sent with a value.");
+	writer.block("public enum Nullish<Wrapped>", () => {
+		writer.line("case absent");
+		writer.line("case null");
+		writer.line("case some(Wrapped)");
+		writer.blank();
+		writer.block("public var value: Wrapped?", () => {
+			writer.line("if case .some(let value) = self { return value }");
+			writer.line("return nil");
+		});
+	});
+	writer.blank();
+	writer.line("extension Nullish: Sendable where Wrapped: Sendable {}");
+	writer.line("extension Nullish: Equatable where Wrapped: Equatable {}");
+	writer.line("extension Nullish: Hashable where Wrapped: Hashable {}");
+	writer.blank();
+	writer.block("extension Nullish: Encodable where Wrapped: Encodable", () => {
+		writer.block("public func encode(to encoder: Encoder) throws", () => {
+			writer.line("var container = encoder.singleValueContainer()");
+			writer.line("switch self {");
+			writer.line("case .absent, .null: try container.encodeNil()");
+			writer.line("case .some(let value): try container.encode(value)");
+			writer.line("}");
+		});
+	});
+	writer.blank();
+	writer.block("extension Nullish: Decodable where Wrapped: Decodable", () => {
+		writer.block("public init(from decoder: Decoder) throws", () => {
+			writer.line("let container = try decoder.singleValueContainer()");
+			writer.line("self = container.decodeNil() ? .null : .some(try container.decode(Wrapped.self))");
+		});
+	});
+	writer.blank();
+	writer.block("extension KeyedEncodingContainer", () => {
+		writer.block("public mutating func encode<Wrapped: Encodable>(_ value: Nullish<Wrapped>, forKey key: Key) throws", () => {
+			writer.line("switch value {");
+			writer.line("case .absent: return");
+			writer.line("case .null: try encodeNil(forKey: key)");
+			writer.line("case .some(let wrapped): try encode(wrapped, forKey: key)");
+			writer.line("}");
+		});
+	});
+	writer.blank();
+	writer.block("extension KeyedDecodingContainer", () => {
+		writer.block("public func decode<Wrapped: Decodable>(_ type: Nullish<Wrapped>.Type, forKey key: Key) throws -> Nullish<Wrapped>", () => {
+			writer.line("guard contains(key) else { return .absent }");
+			writer.line("return try decodeNil(forKey: key) ? .null : .some(try decode(Wrapped.self, forKey: key))");
+		});
+	});
+};
+const defaultArgument = (field) => {
+	if (!hasDefault(field)) return "";
+	return field.nullish ? " = .absent" : " = nil";
+};
 const optionalize = (type, optional) => {
 	if (!optional) return type;
 	return type.endsWith("?") ? type : `${type}?`;
@@ -710,7 +778,7 @@ const emitNamedFactory = (writer, factoryName, fields, buildExpression) => {
 	}
 	const params = fields.map((field) => {
 		const typeExpression = optionalize(field.type, field.optional);
-		const defaultPart = field.optional ? " = nil" : "";
+		const defaultPart = defaultArgument(field);
 		return `${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
 	});
 	const args = fields.map((field) => `${field.name}: ${escapeKeyword(field.name)}`).join(", ");
@@ -733,7 +801,7 @@ const emitMemberwiseInit = (writer, fields, assignmentTarget = (field) => escape
 	}
 	const params = fields.map((field) => {
 		const typeExpression = optionalize(field.type, field.optional);
-		const defaultPart = field.optional ? " = nil" : "";
+		const defaultPart = defaultArgument(field);
 		return `${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
 	});
 	if (params.length === 1) {
@@ -851,6 +919,8 @@ const emitStruct = (writer, type, context, ownedTypeMap, ownedTypeLookup, regist
 	const hasFile = type.fields.some((field) => field.isFile);
 	const conformances = hasFile ? "Sendable, Equatable" : "Codable, Sendable, Equatable";
 	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 isArray = stripped.startsWith("[") && stripped.endsWith("]");
@@ -867,7 +937,9 @@ const emitStruct = (writer, type, context, ownedTypeMap, ownedTypeLookup, regist
 		...field,
 		type: resolveOwnedType(field.type)
 	}));
-	const needsCodingKeys = !hasFile && type.fields.some((field) => field.name !== field.wireName || SWIFT_KEYWORDS.has(field.name) || field.deprecated === true);
+	const needsEncode = !hasFile && type.fields.some((field) => field.requiredNullable === true);
+	const needsCodingKeys = needsEncode || !hasFile && type.fields.some((field) => field.name !== field.wireName || SWIFT_KEYWORDS.has(field.name) || field.deprecated === true);
+	const storageName = (field) => field.deprecated ? deprecatedStorageName(field, type.fields) : escapeKeyword(field.name);
 	writer.block(`public struct ${type.name}: ${conformances}`, () => {
 		emitOwnedTypes(writer, lookupName, context, ownedTypeMap, ownedTypeLookup);
 		for (const field of type.fields) {
@@ -890,8 +962,18 @@ const emitStruct = (writer, type, context, ownedTypeMap, ownedTypeLookup, regist
 				else writer.line(`case ${escapeKeyword(field.name)} = ${stringLiteral(field.wireName)}`);
 			});
 		}
+		if (needsEncode) {
+			writer.blank();
+			writer.block("public func encode(to encoder: Encoder) throws", () => {
+				writer.line("var container = encoder.container(keyedBy: CodingKeys.self)");
+				for (const field of type.fields) {
+					const encodeCall = field.optional && field.requiredNullable !== true ? "encodeIfPresent" : "encode";
+					writer.line(`try container.${encodeCall}(${storageName(field)}, forKey: .${storageName(field)})`);
+				}
+			});
+		}
 		writer.blank();
-		emitMemberwiseInit(writer, adjustedFields, (field) => field.deprecated ? deprecatedStorageName(field, type.fields) : escapeKeyword(field.name));
+		emitMemberwiseInit(writer, adjustedFields, storageName);
 	});
 };
 /**
@@ -929,7 +1011,7 @@ const emitDiscriminatedEnum = (writer, type, context, registryName, ownedTypeMap
 			if (!payloadStruct) continue;
 			const isDiscriminator = (field) => field.wireName === type.discriminator || field.name === type.discriminator;
 			const factoryParams = payloadStruct.fields.filter((field) => !isDiscriminator(field)).map((field) => {
-				const defaultPart = field.optional ? " = nil" : "";
+				const defaultPart = defaultArgument(field);
 				const fieldType = (ownedTypeMap && relativeOwnedPath(field.type, ownedTypeMap, lookupName)) ?? resolveType(field.type, void 0, context);
 				return `${escapeKeyword(field.name)}: ${optionalize(fieldType, field.optional)}${defaultPart}`;
 			}).join(", ");
@@ -1027,6 +1109,8 @@ const dictionarySeparator = (inner) => {
 };
 const resolveType = (typeName, currentOperation, context, scope = "actor") => {
 	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 (SWIFT_PRIMITIVE_TYPES.has(base)) return typeName;
@@ -1652,13 +1736,13 @@ const methodGroups = (method, context) => {
 		varName: "query",
 		type: groupTypeRef(operationName, "Query", context),
 		factory: "query",
-		required: method.query.some((field) => !field.optional)
+		required: method.query.some((field) => !hasDefault(field))
 	});
 	if (method.headers.length > 0) groups.push({
 		varName: "headers",
 		type: groupTypeRef(operationName, "Headers", context),
 		factory: "headers",
-		required: method.headers.some((field) => !field.optional)
+		required: method.headers.some((field) => !hasDefault(field))
 	});
 	return [...groups.filter((group) => group.required), ...groups.filter((group) => !group.required)];
 };
@@ -1874,9 +1958,15 @@ const emitBodyEncoding = (writer, method, context, receiver = "") => {
 		writer.line("var multipart = Kizuna.MultipartBuilder()");
 		for (const field of body.multipartFields) {
 			const flattenedField = body.flattened.find((candidate) => candidate.name === field.name);
-			const accessor = `body.${escapeKeyword(field.name)}`;
-			if (field.isFile || flattenedField?.isFile === true) writer.line(`multipart.appendFile(name: ${stringLiteral(field.wireName)}, file: ${accessor})`);
-			else writer.line(`multipart.appendField(name: ${stringLiteral(field.wireName)}, value: String(describing: ${accessor}))`);
+			const isFile = field.isFile || flattenedField?.isFile === true;
+			const append = (accessor) => {
+				if (isFile) writer.line(`multipart.appendFile(name: ${stringLiteral(field.wireName)}, file: ${accessor})`);
+				else writer.line(`multipart.appendField(name: ${stringLiteral(field.wireName)}, value: String(describing: ${accessor}))`);
+			};
+			if (flattenedField?.optional === true) writer.block(`if let value = body.${escapeKeyword(field.name)}`, () => {
+				append("value");
+			});
+			else append(`body.${escapeKeyword(field.name)}`);
 		}
 		writer.line("request.httpBody = multipart.finalize()");
 		writer.line("request.setValue(multipart.contentType, forHTTPHeaderField: \"Content-Type\")");
@@ -1895,7 +1985,7 @@ const emitClient = (writer, config, partition, context, typesByOperation) => {
 	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));
 	writer.blank();
 	writer.block(`public final class ${clientName}: Sendable`, () => {
 		if (contextFields.length > 0) {
@@ -1904,7 +1994,7 @@ const emitClient = (writer, config, partition, context, typesByOperation) => {
 			writer.block("public struct RequestContext: Sendable, Equatable", () => {
 				for (const field of contextFields) writer.line(`public var ${escapeKeyword(field.name)}: ${field.type}`);
 				writer.blank();
-				const initParams = contextFields.map((field) => `${escapeKeyword(field.name)}: ${field.type}${field.optional ? " = nil" : ""}`).join(", ");
+				const initParams = contextFields.map((field) => `${escapeKeyword(field.name)}: ${field.type}${defaultArgument(field)}`).join(", ");
 				writer.block(`public init(${initParams})`, () => {
 					for (const field of contextFields) writer.line(`self.${escapeKeyword(field.name)} = ${escapeKeyword(field.name)}`);
 				});
@@ -2125,6 +2215,7 @@ const renderSwiftClient = (api, partition, registry, options) => {
 		anyCodable: registry.usesAnyCodable
 	}, partition, context, typesByOperation);
 	for (const group of partition.groups) emitSubClientStruct(writer, group, clientName, context);
+	if (registry.usesNullish) emitNullish(writer);
 	emitKizunaFailureProtocols(writer);
 	emitKizunaNamespace(writer, {
 		multipart: usesMultipart,

package/dist/{generator-E0WQFf92.cjs → generator-SM_Zrp0p.cjs}

@@ -47,6 +47,7 @@ var TypeRegistry = class {
 	unionVariantOwners = /* @__PURE__ */ new Map();
 	brands = /* @__PURE__ */ new Map();
 	usesAnyCodable = false;
+	usesNullish = false;
 	constructor(camelCaseProperties = false, unknownEnumCase = false) {
 		this.camelCaseProperties = camelCaseProperties;
 		this.unknownEnumCase = unknownEnumCase;
@@ -110,11 +111,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 swiftName = propertyName(key, registry.camelCaseProperties);
 		const previousWireName = seen.get(swiftName);
@@ -123,8 +126,10 @@ const objectFields = (schema, registry, hint, shape = (0, kizunajs_generator.rea
 		fields.push({
 			name: swiftName,
 			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,
@@ -236,6 +241,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
 		};
 	}
@@ -417,9 +424,13 @@ const sanitizeCaseName = (literal) => {
 	if (/^[0-9]/.test(cleaned)) return `_${cleaned}`;
 	return cleaned.charAt(0).toLowerCase() + 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;
 };
@@ -476,7 +487,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: []
 				};
 			}
@@ -696,6 +707,63 @@ const sanitizeEnumCaseName = (value) => {
 	if (!camel) return "_";
 	return /^[0-9]/.test(camel) ? `_${camel}` : camel;
 };
+const NULLISH_TYPE = /^Nullish<(.+)>$/;
+const emitNullish = (writer) => {
+	writer.blank();
+	writer.docComment("A `.nullish()` field: left out, sent as `null`, or sent with a value.");
+	writer.block("public enum Nullish<Wrapped>", () => {
+		writer.line("case absent");
+		writer.line("case null");
+		writer.line("case some(Wrapped)");
+		writer.blank();
+		writer.block("public var value: Wrapped?", () => {
+			writer.line("if case .some(let value) = self { return value }");
+			writer.line("return nil");
+		});
+	});
+	writer.blank();
+	writer.line("extension Nullish: Sendable where Wrapped: Sendable {}");
+	writer.line("extension Nullish: Equatable where Wrapped: Equatable {}");
+	writer.line("extension Nullish: Hashable where Wrapped: Hashable {}");
+	writer.blank();
+	writer.block("extension Nullish: Encodable where Wrapped: Encodable", () => {
+		writer.block("public func encode(to encoder: Encoder) throws", () => {
+			writer.line("var container = encoder.singleValueContainer()");
+			writer.line("switch self {");
+			writer.line("case .absent, .null: try container.encodeNil()");
+			writer.line("case .some(let value): try container.encode(value)");
+			writer.line("}");
+		});
+	});
+	writer.blank();
+	writer.block("extension Nullish: Decodable where Wrapped: Decodable", () => {
+		writer.block("public init(from decoder: Decoder) throws", () => {
+			writer.line("let container = try decoder.singleValueContainer()");
+			writer.line("self = container.decodeNil() ? .null : .some(try container.decode(Wrapped.self))");
+		});
+	});
+	writer.blank();
+	writer.block("extension KeyedEncodingContainer", () => {
+		writer.block("public mutating func encode<Wrapped: Encodable>(_ value: Nullish<Wrapped>, forKey key: Key) throws", () => {
+			writer.line("switch value {");
+			writer.line("case .absent: return");
+			writer.line("case .null: try encodeNil(forKey: key)");
+			writer.line("case .some(let wrapped): try encode(wrapped, forKey: key)");
+			writer.line("}");
+		});
+	});
+	writer.blank();
+	writer.block("extension KeyedDecodingContainer", () => {
+		writer.block("public func decode<Wrapped: Decodable>(_ type: Nullish<Wrapped>.Type, forKey key: Key) throws -> Nullish<Wrapped>", () => {
+			writer.line("guard contains(key) else { return .absent }");
+			writer.line("return try decodeNil(forKey: key) ? .null : .some(try decode(Wrapped.self, forKey: key))");
+		});
+	});
+};
+const defaultArgument = (field) => {
+	if (!hasDefault(field)) return "";
+	return field.nullish ? " = .absent" : " = nil";
+};
 const optionalize = (type, optional) => {
 	if (!optional) return type;
 	return type.endsWith("?") ? type : `${type}?`;
@@ -710,7 +778,7 @@ const emitNamedFactory = (writer, factoryName, fields, buildExpression) => {
 	}
 	const params = fields.map((field) => {
 		const typeExpression = optionalize(field.type, field.optional);
-		const defaultPart = field.optional ? " = nil" : "";
+		const defaultPart = defaultArgument(field);
 		return `${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
 	});
 	const args = fields.map((field) => `${field.name}: ${escapeKeyword(field.name)}`).join(", ");
@@ -733,7 +801,7 @@ const emitMemberwiseInit = (writer, fields, assignmentTarget = (field) => escape
 	}
 	const params = fields.map((field) => {
 		const typeExpression = optionalize(field.type, field.optional);
-		const defaultPart = field.optional ? " = nil" : "";
+		const defaultPart = defaultArgument(field);
 		return `${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
 	});
 	if (params.length === 1) {
@@ -851,6 +919,8 @@ const emitStruct = (writer, type, context, ownedTypeMap, ownedTypeLookup, regist
 	const hasFile = type.fields.some((field) => field.isFile);
 	const conformances = hasFile ? "Sendable, Equatable" : "Codable, Sendable, Equatable";
 	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 isArray = stripped.startsWith("[") && stripped.endsWith("]");
@@ -867,7 +937,9 @@ const emitStruct = (writer, type, context, ownedTypeMap, ownedTypeLookup, regist
 		...field,
 		type: resolveOwnedType(field.type)
 	}));
-	const needsCodingKeys = !hasFile && type.fields.some((field) => field.name !== field.wireName || SWIFT_KEYWORDS.has(field.name) || field.deprecated === true);
+	const needsEncode = !hasFile && type.fields.some((field) => field.requiredNullable === true);
+	const needsCodingKeys = needsEncode || !hasFile && type.fields.some((field) => field.name !== field.wireName || SWIFT_KEYWORDS.has(field.name) || field.deprecated === true);
+	const storageName = (field) => field.deprecated ? deprecatedStorageName(field, type.fields) : escapeKeyword(field.name);
 	writer.block(`public struct ${type.name}: ${conformances}`, () => {
 		emitOwnedTypes(writer, lookupName, context, ownedTypeMap, ownedTypeLookup);
 		for (const field of type.fields) {
@@ -890,8 +962,18 @@ const emitStruct = (writer, type, context, ownedTypeMap, ownedTypeLookup, regist
 				else writer.line(`case ${escapeKeyword(field.name)} = ${stringLiteral(field.wireName)}`);
 			});
 		}
+		if (needsEncode) {
+			writer.blank();
+			writer.block("public func encode(to encoder: Encoder) throws", () => {
+				writer.line("var container = encoder.container(keyedBy: CodingKeys.self)");
+				for (const field of type.fields) {
+					const encodeCall = field.optional && field.requiredNullable !== true ? "encodeIfPresent" : "encode";
+					writer.line(`try container.${encodeCall}(${storageName(field)}, forKey: .${storageName(field)})`);
+				}
+			});
+		}
 		writer.blank();
-		emitMemberwiseInit(writer, adjustedFields, (field) => field.deprecated ? deprecatedStorageName(field, type.fields) : escapeKeyword(field.name));
+		emitMemberwiseInit(writer, adjustedFields, storageName);
 	});
 };
 /**
@@ -929,7 +1011,7 @@ const emitDiscriminatedEnum = (writer, type, context, registryName, ownedTypeMap
 			if (!payloadStruct) continue;
 			const isDiscriminator = (field) => field.wireName === type.discriminator || field.name === type.discriminator;
 			const factoryParams = payloadStruct.fields.filter((field) => !isDiscriminator(field)).map((field) => {
-				const defaultPart = field.optional ? " = nil" : "";
+				const defaultPart = defaultArgument(field);
 				const fieldType = (ownedTypeMap && relativeOwnedPath(field.type, ownedTypeMap, lookupName)) ?? resolveType(field.type, void 0, context);
 				return `${escapeKeyword(field.name)}: ${optionalize(fieldType, field.optional)}${defaultPart}`;
 			}).join(", ");
@@ -1027,6 +1109,8 @@ const dictionarySeparator = (inner) => {
 };
 const resolveType = (typeName, currentOperation, context, scope = "actor") => {
 	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 (SWIFT_PRIMITIVE_TYPES.has(base)) return typeName;
@@ -1652,13 +1736,13 @@ const methodGroups = (method, context) => {
 		varName: "query",
 		type: groupTypeRef(operationName, "Query", context),
 		factory: "query",
-		required: method.query.some((field) => !field.optional)
+		required: method.query.some((field) => !hasDefault(field))
 	});
 	if (method.headers.length > 0) groups.push({
 		varName: "headers",
 		type: groupTypeRef(operationName, "Headers", context),
 		factory: "headers",
-		required: method.headers.some((field) => !field.optional)
+		required: method.headers.some((field) => !hasDefault(field))
 	});
 	return [...groups.filter((group) => group.required), ...groups.filter((group) => !group.required)];
 };
@@ -1874,9 +1958,15 @@ const emitBodyEncoding = (writer, method, context, receiver = "") => {
 		writer.line("var multipart = Kizuna.MultipartBuilder()");
 		for (const field of body.multipartFields) {
 			const flattenedField = body.flattened.find((candidate) => candidate.name === field.name);
-			const accessor = `body.${escapeKeyword(field.name)}`;
-			if (field.isFile || flattenedField?.isFile === true) writer.line(`multipart.appendFile(name: ${stringLiteral(field.wireName)}, file: ${accessor})`);
-			else writer.line(`multipart.appendField(name: ${stringLiteral(field.wireName)}, value: String(describing: ${accessor}))`);
+			const isFile = field.isFile || flattenedField?.isFile === true;
+			const append = (accessor) => {
+				if (isFile) writer.line(`multipart.appendFile(name: ${stringLiteral(field.wireName)}, file: ${accessor})`);
+				else writer.line(`multipart.appendField(name: ${stringLiteral(field.wireName)}, value: String(describing: ${accessor}))`);
+			};
+			if (flattenedField?.optional === true) writer.block(`if let value = body.${escapeKeyword(field.name)}`, () => {
+				append("value");
+			});
+			else append(`body.${escapeKeyword(field.name)}`);
 		}
 		writer.line("request.httpBody = multipart.finalize()");
 		writer.line("request.setValue(multipart.contentType, forHTTPHeaderField: \"Content-Type\")");
@@ -1895,7 +1985,7 @@ const emitClient = (writer, config, partition, context, typesByOperation) => {
 	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));
 	writer.blank();
 	writer.block(`public final class ${clientName}: Sendable`, () => {
 		if (contextFields.length > 0) {
@@ -1904,7 +1994,7 @@ const emitClient = (writer, config, partition, context, typesByOperation) => {
 			writer.block("public struct RequestContext: Sendable, Equatable", () => {
 				for (const field of contextFields) writer.line(`public var ${escapeKeyword(field.name)}: ${field.type}`);
 				writer.blank();
-				const initParams = contextFields.map((field) => `${escapeKeyword(field.name)}: ${field.type}${field.optional ? " = nil" : ""}`).join(", ");
+				const initParams = contextFields.map((field) => `${escapeKeyword(field.name)}: ${field.type}${defaultArgument(field)}`).join(", ");
 				writer.block(`public init(${initParams})`, () => {
 					for (const field of contextFields) writer.line(`self.${escapeKeyword(field.name)} = ${escapeKeyword(field.name)}`);
 				});
@@ -2125,6 +2215,7 @@ const renderSwiftClient = (api, partition, registry, options) => {
 		anyCodable: registry.usesAnyCodable
 	}, partition, context, typesByOperation);
 	for (const group of partition.groups) emitSubClientStruct(writer, group, clientName, context);
+	if (registry.usesNullish) emitNullish(writer);
 	emitKizunaFailureProtocols(writer);
 	emitKizunaNamespace(writer, {
 		multipart: usesMultipart,

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-E0WQFf92.cjs");
+const require_generator = require("./generator-SM_Zrp0p.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 swiftClientWalk, t as generateSwiftClient } from "./generator-CxUzLmbK.mjs";
+import { n as swiftClientWalk, t as generateSwiftClient } from "./generator-CZr33FgN.mjs";
 import { defineClient } from "kizunajs/generator";
 import { z } from "zod";
 /**

package/package.json

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