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

package/dist/cli.cjs

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

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

@@ -58,7 +58,6 @@ 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;
@@ -128,13 +127,11 @@ const propertyName = (key, camelCase) => {
 	if (!camel) return "field";
 	return /^[0-9]/.test(camel) ? `_${camel}` : camel;
 };
-const objectFields = (schema, registry, hint, nullishTriState = true, shape = (0, kizunajs_generator.readObjectShape)(schema) ?? {}) => {
+const objectFields = (schema, registry, hint, 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);
@@ -143,10 +140,9 @@ const objectFields = (schema, registry, hint, nullishTriState = true, shape = (0
 		fields.push({
 			name: kotlinName,
 			wireName: key,
-			type: nullish ? `Nullish<${result.expression.replace(/\?$/, "")}>` : result.expression,
-			optional: result.optional && !nullish,
+			type: result.expression,
+			optional: result.optional,
 			requiredNullable: result.requiredNullable,
-			nullish,
 			description: (0, kizunajs_generator.readMetaDescription)(value),
 			isFile: result.isFile,
 			deprecated: deprecation !== void 0,
@@ -270,7 +266,6 @@ const mapUnbrandedType = (schema, registry, hint) => {
 			expression: innerResult.expression.endsWith("?") ? innerResult.expression : `${innerResult.expression}?`,
 			optional: true,
 			requiredNullable: nullable && !optional,
-			nullish: nullable && optional,
 			isFile: innerResult.isFile
 		};
 	}
@@ -452,13 +447,10 @@ const sanitizeCaseName = (literal) => {
 	if (/^[0-9]/.test(cleaned)) return `_${cleaned}`;
 	return cleaned.charAt(0).toUpperCase() + cleaned.slice(1);
 };
-/**
-* 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 collectObjectFields = (schema, registry, hint) => {
+	return objectFields(schema, registry, hint);
 };
-const hasDefault = (field) => field.optional && field.requiredNullable !== true || field.nullish === true;
+const hasDefault = (field) => field.optional && field.requiredNullable !== true;
 const objectFieldCount = (schema) => {
 	return Object.keys((0, kizunajs_generator.readObjectShape)(schema) ?? {}).length;
 };
@@ -523,7 +515,7 @@ const buildRouteMethod = (routeKey, route, registry, deprecated, deprecationMess
 				else bodyDescriptor = {
 					kind: "json-flat",
 					structName,
-					flattened: collectObjectFields(route.body, registry, bodyHint, true),
+					flattened: collectObjectFields(route.body, registry, bodyHint),
 					multipartFields: []
 				};
 			}
@@ -689,48 +681,9 @@ 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";
+	return " = null";
 };
 const optionalize = (type, optional) => {
 	if (!optional) return type;
@@ -752,8 +705,6 @@ 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;
@@ -876,8 +827,6 @@ 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(">");
@@ -893,15 +842,12 @@ 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) {
-		if (adjustedFields.some((field) => field.nullish)) writer.line("@OptIn(ExperimentalSerializationApi::class)");
-		writer.line("@Serializable");
-	}
+	if (!hasFile) writer.line("@Serializable");
 	const params = adjustedFields.map((field) => {
 		const typeExpression = optionalize(field.type, field.optional);
 		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}${field.nullish ? "@EncodeDefault(EncodeDefault.Mode.NEVER) " : ""}val ${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
+		return `${field.deprecated ? `${deprecatedAnnotation(field.deprecationMessage)} ` : ""}${serialNameAnnotation}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)`);
@@ -943,8 +889,6 @@ 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);
@@ -1837,7 +1781,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) || registry.usesNullish) {
+	if (registry.all().some((type) => type.kind === "enum-class" && type.unknownCase)) {
 		writer.line("import kotlinx.serialization.descriptors.*");
 		writer.line("import kotlinx.serialization.encoding.*");
 	}
@@ -1855,7 +1799,6 @@ 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-D2GCSZwz.mjs → generator-DT7c2Vo3.mjs}

@@ -58,7 +58,6 @@ 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;
@@ -128,13 +127,11 @@ const propertyName = (key, camelCase) => {
 	if (!camel) return "field";
 	return /^[0-9]/.test(camel) ? `_${camel}` : camel;
 };
-const objectFields = (schema, registry, hint, nullishTriState = true, shape = readObjectShape(schema) ?? {}) => {
+const objectFields = (schema, registry, hint, 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);
@@ -143,10 +140,9 @@ const objectFields = (schema, registry, hint, nullishTriState = true, shape = re
 		fields.push({
 			name: kotlinName,
 			wireName: key,
-			type: nullish ? `Nullish<${result.expression.replace(/\?$/, "")}>` : result.expression,
-			optional: result.optional && !nullish,
+			type: result.expression,
+			optional: result.optional,
 			requiredNullable: result.requiredNullable,
-			nullish,
 			description: readMetaDescription(value),
 			isFile: result.isFile,
 			deprecated: deprecation !== void 0,
@@ -270,7 +266,6 @@ const mapUnbrandedType = (schema, registry, hint) => {
 			expression: innerResult.expression.endsWith("?") ? innerResult.expression : `${innerResult.expression}?`,
 			optional: true,
 			requiredNullable: nullable && !optional,
-			nullish: nullable && optional,
 			isFile: innerResult.isFile
 		};
 	}
@@ -452,13 +447,10 @@ const sanitizeCaseName = (literal) => {
 	if (/^[0-9]/.test(cleaned)) return `_${cleaned}`;
 	return cleaned.charAt(0).toUpperCase() + cleaned.slice(1);
 };
-/**
-* 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 collectObjectFields = (schema, registry, hint) => {
+	return objectFields(schema, registry, hint);
 };
-const hasDefault = (field) => field.optional && field.requiredNullable !== true || field.nullish === true;
+const hasDefault = (field) => field.optional && field.requiredNullable !== true;
 const objectFieldCount = (schema) => {
 	return Object.keys(readObjectShape(schema) ?? {}).length;
 };
@@ -523,7 +515,7 @@ const buildRouteMethod = (routeKey, route, registry, deprecated, deprecationMess
 				else bodyDescriptor = {
 					kind: "json-flat",
 					structName,
-					flattened: collectObjectFields(route.body, registry, bodyHint, true),
+					flattened: collectObjectFields(route.body, registry, bodyHint),
 					multipartFields: []
 				};
 			}
@@ -689,48 +681,9 @@ 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";
+	return " = null";
 };
 const optionalize = (type, optional) => {
 	if (!optional) return type;
@@ -752,8 +705,6 @@ 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;
@@ -876,8 +827,6 @@ 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(">");
@@ -893,15 +842,12 @@ 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) {
-		if (adjustedFields.some((field) => field.nullish)) writer.line("@OptIn(ExperimentalSerializationApi::class)");
-		writer.line("@Serializable");
-	}
+	if (!hasFile) writer.line("@Serializable");
 	const params = adjustedFields.map((field) => {
 		const typeExpression = optionalize(field.type, field.optional);
 		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}${field.nullish ? "@EncodeDefault(EncodeDefault.Mode.NEVER) " : ""}val ${escapeKeyword(field.name)}: ${typeExpression}${defaultPart}`;
+		return `${field.deprecated ? `${deprecatedAnnotation(field.deprecationMessage)} ` : ""}${serialNameAnnotation}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)`);
@@ -943,8 +889,6 @@ 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);
@@ -1837,7 +1781,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) || registry.usesNullish) {
+	if (registry.all().some((type) => type.kind === "enum-class" && type.unknownCase)) {
 		writer.line("import kotlinx.serialization.descriptors.*");
 		writer.line("import kotlinx.serialization.encoding.*");
 	}
@@ -1855,7 +1799,6 @@ 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-CeUS3C_6.cjs");
+const require_generator = require("./generator-D4SnsG2Q.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-D2GCSZwz.mjs";
+import { n as kotlinClientWalk, t as generateKotlinClient } from "./generator-DT7c2Vo3.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.18",
+  "version": "2.0.0-beta.19",
   "description": "Kotlin client generation for Kizuna.js APIs",
   "keywords": [
     "kizunajs",
@@ -60,14 +60,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@kizunajs/cli": "2.0.0-beta.18"
+    "@kizunajs/cli": "2.0.0-beta.19"
   },
   "peerDependencies": {
-    "kizunajs": "2.0.0-beta.18",
+    "kizunajs": "2.0.0-beta.19",
     "zod": "^4.0.0"
   },
   "devDependencies": {
-    "kizunajs": "2.0.0-beta.18",
+    "kizunajs": "2.0.0-beta.19",
     "@types/node": "^22.9.0",
     "tsdown": "^0.21.0",
     "typescript": "^6.0.3",