@kizunajs/kotlin 2.0.0-beta.1 → 2.0.0-beta.11

package/README.md

@@ -10,8 +10,25 @@ pnpm add -D @kizunajs/kotlin
 
 ## Usage
 
+Name the client in your config, and `kizuna generate` writes it with the rest:
+
+```ts
+import { kotlinClient } from '@kizunajs/kotlin';
+
+export default defineConfig({
+    routes,
+    clients: [
+        kotlinClient({
+            output: '../android/app/src/main/kotlin/com/example/APIClient.kt',
+            namespace: 'API',
+            package: 'com.example',
+        }),
+    ],
+});
+```
+
 ```sh
-kizuna-kotlin generate --config kizuna.config.ts --out android/app/src/main/kotlin/com/example/APIClient.kt --namespace-name API --package com.example
+kizuna generate
 ```
 
 ## Documentation

package/dist/cli.cjs

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

package/dist/{generator-s2pn7vqP.cjs → generator-Cs9NkTCg.cjs}

@@ -117,8 +117,7 @@ const propertyName = (key, camelCase) => {
 	if (!camel) return "field";
 	return /^[0-9]/.test(camel) ? `_${camel}` : camel;
 };
-const objectFields = (schema, registry, hint) => {
-	const 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)) {
@@ -148,6 +147,10 @@ const mapType = (schema, registry, hint) => {
 		optional: false,
 		isFile: true
 	};
+	if ((0, kizunajs_generator.isBinarySchema)(schema)) return {
+		expression: "ByteArray",
+		optional: false
+	};
 	const id = (0, kizunajs_generator.readMetaId)(schema);
 	const def = (0, kizunajs_generator.readDef)(schema);
 	const discriminated = (0, kizunajs_generator.readDiscriminatedUnion)(schema);
@@ -223,8 +226,8 @@ const mapType = (schema, registry, hint) => {
 			optional: false
 		};
 	}
-	const { inner, optional } = (0, kizunajs_generator.unwrapOptionalWrappers)(schema);
-	if (optional) {
+	const { inner, optional, nullable } = (0, kizunajs_generator.unwrapOptionalWrappers)(schema);
+	if (optional || nullable) {
 		const innerResult = mapType(inner, registry, hint);
 		return {
 			expression: innerResult.expression.endsWith("?") ? innerResult.expression : `${innerResult.expression}?`,
@@ -277,8 +280,9 @@ const mapType = (schema, registry, hint) => {
 					optional: false
 				};
 			}
+			const elementType = mapType(element, registry, `${hint}Item`).expression.replace(/\?$/, "");
 			return {
-				expression: `List<${mapType(element, registry, `${hint}Item`).expression.replace(/\?$/, "")}>`,
+				expression: `List<${(0, kizunajs_generator.unwrapOptionalWrappers)(element).nullable ? `${elementType}?` : elementType}>`,
 				optional: false
 			};
 		}
@@ -576,7 +580,7 @@ const buildRouteMethod = (routeKey, route, registry, deprecated, deprecationMess
 		stream
 	};
 };
-const kotlinGenerator = (0, kizunajs_generator.createGenerator)((options, _api) => {
+const kotlinRoutesWalk = (options) => {
 	const flatMethods = [];
 	const groupMap = /* @__PURE__ */ new Map();
 	return {
@@ -608,7 +612,7 @@ const kotlinGenerator = (0, kizunajs_generator.createGenerator)((options, _api)
 			};
 		}
 	};
-});
+};
 const KOTLIN_KEYWORDS = new Set([
 	"as",
 	"break",
@@ -653,8 +657,13 @@ const KOTLIN_PRIMITIVE_TYPES = new Set([
 	"Long",
 	"Boolean",
 	"Instant",
-	"Unit"
+	"Unit",
+	"ByteArray"
 ]);
+/**
+* How a response body is read. Raw bytes are the body already.
+*/
+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 optional = typeName.endsWith("?");
@@ -1002,7 +1011,7 @@ const emitOperationResultTypes = (writer, method, context) => {
 			writer.line(") {");
 			writer.indent(() => {
 				writer.line("/** How far along the call is. */");
-				writer.line("enum class State { Running, Done, Failed }");
+				writer.line("enum class State { Running, NeedsApproval, Done, Failed }");
 			});
 			writer.line("}");
 			writer.blank();
@@ -1012,7 +1021,12 @@ const emitOperationResultTypes = (writer, method, context) => {
 				writer.block("for (event in events)", () => {
 					writer.line("when (event) {");
 					writer.indent(() => {
-						writer.line("is Event.ToolCall -> calls[event.data.id] = (calls[event.data.id] ?: ToolCallRecord(event.data.id, event.data.name)).copy(call = event.data)");
+						writer.line("is Event.ToolCall -> {");
+						writer.indent(() => {
+							writer.line("val tracked = (calls[event.data.id] ?: ToolCallRecord(event.data.id, event.data.name)).copy(call = event.data)");
+							writer.line("calls[event.data.id] = if (event.data.needsApproval == true && tracked.state == ToolCallRecord.State.Running) tracked.copy(state = ToolCallRecord.State.NeedsApproval) else tracked");
+						});
+						writer.line("}");
 						writer.line("is Event.ToolResult -> calls[event.data.id] = (calls[event.data.id] ?: ToolCallRecord(event.data.id, event.data.name)).copy(state = ToolCallRecord.State.Done, result = event.data)");
 						if (eventNames.has("tool_error")) writer.line("is Event.ToolError -> calls[event.data.id] = (calls[event.data.id] ?: ToolCallRecord(event.data.id, event.data.name.wireValue)).copy(state = ToolCallRecord.State.Failed, message = event.data.message)");
 						writer.line("else -> Unit");
@@ -1344,7 +1358,7 @@ const emitMethodBody = (writer, method, context) => {
 				writer.indent(() => {
 					const resolved = resolveType(successResponse.type, method.operationName, context);
 					writer.block("try", () => {
-						writer.line(`val payload = json.decodeFromString<${resolved}>(data.decodeToString())`);
+						writer.line(`val payload = ${decodeBody(resolved)}`);
 						const bodyExpr = isMultiSuccess ? `${operationRef}.Success.Status${successResponse.status}(payload)` : "payload";
 						if (hasHeaders) {
 							for (const field of successResponse.responseHeaders) writer.line(`val ${escapeKeyword(field.name)} = httpResponse.header(${stringLiteral(field.wireName)})`);
@@ -1381,7 +1395,7 @@ const emitErrorBranches = (writer, method, context) => {
 					const resolved = resolveType(errorCase.type, method.operationName, context);
 					writer.line("val payload = try {");
 					writer.indent(() => {
-						writer.line(`json.decodeFromString<${resolved}>(data.decodeToString())`);
+						writer.line(decodeBody(resolved));
 					});
 					writer.line(`} catch (error: Exception) { throw ${failureRef}.Decoding(error, statusCode, data) }`);
 					writer.line(`throw ${failureRef}.${caseName}(body = payload)`);
@@ -1394,7 +1408,7 @@ const emitErrorBranches = (writer, method, context) => {
 						const resolved = resolveType(errorCase.type, method.operationName, context);
 						writer.line(`val ${errorCase.caseName} = try {`);
 						writer.indent(() => {
-							writer.line(`json.decodeFromString<${resolved}>(data.decodeToString())`);
+							writer.line(decodeBody(resolved));
 						});
 						writer.line("} catch (_: Exception) { null }");
 						writer.line(`if (${errorCase.caseName} != null) throw ${failureRef}.${caseName}(body = ${errorCase.caseName})`);
@@ -1685,21 +1699,8 @@ const emitClient = (writer, config, partition, context, typesByOperation, regist
 		}
 	});
 };
-/**
-* Generate a Kotlin API client from a Kizuna api.
-*
-* @param api - What `defineConfig` assembled.
-* @param config - Override the generated names:
-*   - `namespaceName`: the object wrapping shared types.
-*   - `packageName`: optional package declaration for the generated file.
-*/
-const generateKotlinClient = (api, config) => {
-	const { namespaceName, packageName, camelCaseProperties = false, unknownEnumCase = false } = config;
-	const registry = new TypeRegistry(camelCaseProperties, unknownEnumCase);
-	const partition = kotlinGenerator(api, {
-		namespaceName,
-		registry
-	});
+const renderKotlinClient = (api, partition, registry, config) => {
+	const { namespaceName, packageName, camelCaseProperties = false } = config;
 	const allMethods = [...partition.flatMethods, ...partition.groups.flatMap((group) => group.methods)];
 	const operationTypeMap = buildOperationTypeMap(allMethods, registry);
 	const clientName = `${namespaceName}Client`;
@@ -1791,6 +1792,29 @@ const generateKotlinClient = (api, config) => {
 	for (const warning of registry.warnings()) process.stderr.write(`[kizuna/kotlin] JsonElement fallback at ${warning}\n`);
 	return writer.toString();
 };
+/**
+* The Kotlin client's walk: the routes into a partition, then the file.
+*/
+const kotlinClientWalk = (api, config) => {
+	const registry = new TypeRegistry(config.camelCaseProperties ?? false, config.unknownEnumCase ?? false);
+	const routes = kotlinRoutesWalk({
+		namespaceName: config.namespaceName,
+		registry
+	});
+	return {
+		processRoute: routes.processRoute,
+		finalize: () => renderKotlinClient(api, routes.finalize(), registry, config)
+	};
+};
+/**
+* Generate a Kotlin API client from a Kizuna api.
+*
+* @param api - What `defineConfig` assembled.
+* @param config - Override the generated names:
+*   - `namespaceName`: the object wrapping shared types.
+*   - `packageName`: optional package declaration for the generated file.
+*/
+const generateKotlinClient = (api, config) => (0, kizunajs_generator.walkApi)(api, kotlinClientWalk(api, config), { skipHidden: true });
 //#endregion
 Object.defineProperty(exports, "generateKotlinClient", {
 	enumerable: true,
@@ -1798,3 +1822,9 @@ Object.defineProperty(exports, "generateKotlinClient", {
 		return generateKotlinClient;
 	}
 });
+Object.defineProperty(exports, "kotlinClientWalk", {
+	enumerable: true,
+	get: function() {
+		return kotlinClientWalk;
+	}
+});

package/dist/{generator-BvNpSarY.mjs → generator-uzHpr6im.mjs}

@@ -1,4 +1,4 @@
-import { createGenerator, isDiscriminatedUnionSchema, isFileSchema, isHintPrefix, isIntegerSchema, isNamedStream, isObjectSchema, isStreamResponse, isSuccessStatus, localTypeName, mergeHeaderFields, parsePath, readDef, readDefType, readDeprecation, readDiscriminatedUnion, readDiscriminatorStringLiteral, readMetaDescription, readMetaId, readObjectShape, resolveResponseBody, resolveResponseHeaders, routeStreams, sanitizeFieldName, sanitizeIdentifier, shortTypeName, soleStreamResponse, statusToCamelCase, streamMode, toCamelCase, toPascalCase, unwrapOptionalWrappers } from "kizunajs/generator";
+import { isBinarySchema, isDiscriminatedUnionSchema, isFileSchema, isHintPrefix, isIntegerSchema, isNamedStream, isObjectSchema, isStreamResponse, isSuccessStatus, localTypeName, mergeHeaderFields, parsePath, readDef, readDefType, readDeprecation, readDiscriminatedUnion, readDiscriminatorStringLiteral, readMetaDescription, readMetaId, readObjectShape, resolveResponseBody, resolveResponseHeaders, routeStreams, sanitizeFieldName, sanitizeIdentifier, shortTypeName, soleStreamResponse, statusToCamelCase, streamMode, toCamelCase, toPascalCase, unwrapOptionalWrappers, walkApi } from "kizunajs/generator";
 //#region src/emit.ts
 var KotlinWriter = class {
 	lines = [];
@@ -117,8 +117,7 @@ const propertyName = (key, camelCase) => {
 	if (!camel) return "field";
 	return /^[0-9]/.test(camel) ? `_${camel}` : camel;
 };
-const objectFields = (schema, registry, hint) => {
-	const 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)) {
@@ -148,6 +147,10 @@ const mapType = (schema, registry, hint) => {
 		optional: false,
 		isFile: true
 	};
+	if (isBinarySchema(schema)) return {
+		expression: "ByteArray",
+		optional: false
+	};
 	const id = readMetaId(schema);
 	const def = readDef(schema);
 	const discriminated = readDiscriminatedUnion(schema);
@@ -223,8 +226,8 @@ const mapType = (schema, registry, hint) => {
 			optional: false
 		};
 	}
-	const { inner, optional } = unwrapOptionalWrappers(schema);
-	if (optional) {
+	const { inner, optional, nullable } = unwrapOptionalWrappers(schema);
+	if (optional || nullable) {
 		const innerResult = mapType(inner, registry, hint);
 		return {
 			expression: innerResult.expression.endsWith("?") ? innerResult.expression : `${innerResult.expression}?`,
@@ -277,8 +280,9 @@ const mapType = (schema, registry, hint) => {
 					optional: false
 				};
 			}
+			const elementType = mapType(element, registry, `${hint}Item`).expression.replace(/\?$/, "");
 			return {
-				expression: `List<${mapType(element, registry, `${hint}Item`).expression.replace(/\?$/, "")}>`,
+				expression: `List<${unwrapOptionalWrappers(element).nullable ? `${elementType}?` : elementType}>`,
 				optional: false
 			};
 		}
@@ -576,7 +580,7 @@ const buildRouteMethod = (routeKey, route, registry, deprecated, deprecationMess
 		stream
 	};
 };
-const kotlinGenerator = createGenerator((options, _api) => {
+const kotlinRoutesWalk = (options) => {
 	const flatMethods = [];
 	const groupMap = /* @__PURE__ */ new Map();
 	return {
@@ -608,7 +612,7 @@ const kotlinGenerator = createGenerator((options, _api) => {
 			};
 		}
 	};
-});
+};
 const KOTLIN_KEYWORDS = new Set([
 	"as",
 	"break",
@@ -653,8 +657,13 @@ const KOTLIN_PRIMITIVE_TYPES = new Set([
 	"Long",
 	"Boolean",
 	"Instant",
-	"Unit"
+	"Unit",
+	"ByteArray"
 ]);
+/**
+* How a response body is read. Raw bytes are the body already.
+*/
+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 optional = typeName.endsWith("?");
@@ -1002,7 +1011,7 @@ const emitOperationResultTypes = (writer, method, context) => {
 			writer.line(") {");
 			writer.indent(() => {
 				writer.line("/** How far along the call is. */");
-				writer.line("enum class State { Running, Done, Failed }");
+				writer.line("enum class State { Running, NeedsApproval, Done, Failed }");
 			});
 			writer.line("}");
 			writer.blank();
@@ -1012,7 +1021,12 @@ const emitOperationResultTypes = (writer, method, context) => {
 				writer.block("for (event in events)", () => {
 					writer.line("when (event) {");
 					writer.indent(() => {
-						writer.line("is Event.ToolCall -> calls[event.data.id] = (calls[event.data.id] ?: ToolCallRecord(event.data.id, event.data.name)).copy(call = event.data)");
+						writer.line("is Event.ToolCall -> {");
+						writer.indent(() => {
+							writer.line("val tracked = (calls[event.data.id] ?: ToolCallRecord(event.data.id, event.data.name)).copy(call = event.data)");
+							writer.line("calls[event.data.id] = if (event.data.needsApproval == true && tracked.state == ToolCallRecord.State.Running) tracked.copy(state = ToolCallRecord.State.NeedsApproval) else tracked");
+						});
+						writer.line("}");
 						writer.line("is Event.ToolResult -> calls[event.data.id] = (calls[event.data.id] ?: ToolCallRecord(event.data.id, event.data.name)).copy(state = ToolCallRecord.State.Done, result = event.data)");
 						if (eventNames.has("tool_error")) writer.line("is Event.ToolError -> calls[event.data.id] = (calls[event.data.id] ?: ToolCallRecord(event.data.id, event.data.name.wireValue)).copy(state = ToolCallRecord.State.Failed, message = event.data.message)");
 						writer.line("else -> Unit");
@@ -1344,7 +1358,7 @@ const emitMethodBody = (writer, method, context) => {
 				writer.indent(() => {
 					const resolved = resolveType(successResponse.type, method.operationName, context);
 					writer.block("try", () => {
-						writer.line(`val payload = json.decodeFromString<${resolved}>(data.decodeToString())`);
+						writer.line(`val payload = ${decodeBody(resolved)}`);
 						const bodyExpr = isMultiSuccess ? `${operationRef}.Success.Status${successResponse.status}(payload)` : "payload";
 						if (hasHeaders) {
 							for (const field of successResponse.responseHeaders) writer.line(`val ${escapeKeyword(field.name)} = httpResponse.header(${stringLiteral(field.wireName)})`);
@@ -1381,7 +1395,7 @@ const emitErrorBranches = (writer, method, context) => {
 					const resolved = resolveType(errorCase.type, method.operationName, context);
 					writer.line("val payload = try {");
 					writer.indent(() => {
-						writer.line(`json.decodeFromString<${resolved}>(data.decodeToString())`);
+						writer.line(decodeBody(resolved));
 					});
 					writer.line(`} catch (error: Exception) { throw ${failureRef}.Decoding(error, statusCode, data) }`);
 					writer.line(`throw ${failureRef}.${caseName}(body = payload)`);
@@ -1394,7 +1408,7 @@ const emitErrorBranches = (writer, method, context) => {
 						const resolved = resolveType(errorCase.type, method.operationName, context);
 						writer.line(`val ${errorCase.caseName} = try {`);
 						writer.indent(() => {
-							writer.line(`json.decodeFromString<${resolved}>(data.decodeToString())`);
+							writer.line(decodeBody(resolved));
 						});
 						writer.line("} catch (_: Exception) { null }");
 						writer.line(`if (${errorCase.caseName} != null) throw ${failureRef}.${caseName}(body = ${errorCase.caseName})`);
@@ -1685,21 +1699,8 @@ const emitClient = (writer, config, partition, context, typesByOperation, regist
 		}
 	});
 };
-/**
-* Generate a Kotlin API client from a Kizuna api.
-*
-* @param api - What `defineConfig` assembled.
-* @param config - Override the generated names:
-*   - `namespaceName`: the object wrapping shared types.
-*   - `packageName`: optional package declaration for the generated file.
-*/
-const generateKotlinClient = (api, config) => {
-	const { namespaceName, packageName, camelCaseProperties = false, unknownEnumCase = false } = config;
-	const registry = new TypeRegistry(camelCaseProperties, unknownEnumCase);
-	const partition = kotlinGenerator(api, {
-		namespaceName,
-		registry
-	});
+const renderKotlinClient = (api, partition, registry, config) => {
+	const { namespaceName, packageName, camelCaseProperties = false } = config;
 	const allMethods = [...partition.flatMethods, ...partition.groups.flatMap((group) => group.methods)];
 	const operationTypeMap = buildOperationTypeMap(allMethods, registry);
 	const clientName = `${namespaceName}Client`;
@@ -1791,5 +1792,28 @@ const generateKotlinClient = (api, config) => {
 	for (const warning of registry.warnings()) process.stderr.write(`[kizuna/kotlin] JsonElement fallback at ${warning}\n`);
 	return writer.toString();
 };
+/**
+* The Kotlin client's walk: the routes into a partition, then the file.
+*/
+const kotlinClientWalk = (api, config) => {
+	const registry = new TypeRegistry(config.camelCaseProperties ?? false, config.unknownEnumCase ?? false);
+	const routes = kotlinRoutesWalk({
+		namespaceName: config.namespaceName,
+		registry
+	});
+	return {
+		processRoute: routes.processRoute,
+		finalize: () => renderKotlinClient(api, routes.finalize(), registry, config)
+	};
+};
+/**
+* Generate a Kotlin API client from a Kizuna api.
+*
+* @param api - What `defineConfig` assembled.
+* @param config - Override the generated names:
+*   - `namespaceName`: the object wrapping shared types.
+*   - `packageName`: optional package declaration for the generated file.
+*/
+const generateKotlinClient = (api, config) => walkApi(api, kotlinClientWalk(api, config), { skipHidden: true });
 //#endregion
-export { generateKotlinClient as t };
+export { kotlinClientWalk as n, generateKotlinClient as t };

package/dist/index.cjs

@@ -1,17 +1,48 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-s2pn7vqP.cjs");
+const require_generator = require("./generator-Cs9NkTCg.cjs");
+let kizunajs_generator = require("kizunajs/generator");
+let zod = require("zod");
 //#region src/client-target.ts
+const KotlinClientOptionsSchema = zod.z.object({
+	/**
+	* Name of the generated namespace object.
+	*
+	* @default 'API'
+	*/
+	namespace: zod.z.string().default("API"),
+	/**
+	* Package declaration for the generated file, e.g. `com.example.api`.
+	*/
+	package: zod.z.string().optional(),
+	/**
+	* Convert wire field names to camelCase properties, mapping the wire name
+	* back via `@SerialName`.
+	*
+	* @default false
+	*/
+	camelCaseProperties: zod.z.boolean().optional(),
+	/**
+	* Give every enum an `unknown` case, so a value the client has not been
+	* generated for decodes instead of throwing.
+	*
+	* @default false
+	*/
+	unknownEnumCase: zod.z.boolean().optional()
+});
 /**
-* A Kotlin client target for `kizuna.config.ts`.
+* A Kotlin client for `kizuna.config.ts`.
 *
 * @example
-* kotlinClient({ output: './api/APIClient.kt', package: 'com.example.api' });
+* kotlinClient({
+*     output: './api/APIClient.kt',
+*     package: 'com.example.api',
+* });
 */
-const kotlinClient = (options) => ({
-	kind: "kotlin",
-	output: options.output,
-	generate: (contract) => require_generator.generateKotlinClient(contract, {
-		namespaceName: options.namespace ?? "API",
+const kotlinClient = (0, kizunajs_generator.defineClient)({
+	target: "kotlin",
+	options: KotlinClientOptionsSchema,
+	generate: ({ options, api }) => require_generator.kotlinClientWalk(api, {
+		namespaceName: options.namespace,
 		packageName: options.package,
 		camelCaseProperties: options.camelCaseProperties,
 		unknownEnumCase: options.unknownEnumCase

package/dist/index.d.cts

@@ -1,4 +1,7 @@
-import { ApiDefinition, ClientTarget } from "kizunajs";
+import { GeneratedFileOptions } from "kizunajs/generator";
+import * as _$kizunajs from "kizunajs";
+import { ApiDefinition } from "kizunajs";
+import { z } from "zod";
 
 //#region src/generator.d.ts
 interface KotlinConfig {
@@ -38,45 +41,30 @@ interface KotlinConfig {
 declare const generateKotlinClient: (api: ApiDefinition, config: KotlinConfig) => string;
 //#endregion
 //#region src/client-target.d.ts
+declare const KotlinClientOptionsSchema: z.ZodObject<{
+  namespace: z.ZodDefault<z.ZodString>;
+  package: z.ZodOptional<z.ZodString>;
+  camelCaseProperties: z.ZodOptional<z.ZodBoolean>;
+  unknownEnumCase: z.ZodOptional<z.ZodBoolean>;
+}, z.core.$strip>;
 /**
  * Where a generated Kotlin client is written, and what it is called there.
  */
-interface KotlinClientOptions {
-  /**
-   * Path the generated file is written to.
-   */
-  output: string;
-  /**
-   * Name of the generated namespace object.
-   *
-   * @default 'API'
-   */
-  namespace?: string;
-  /**
-   * Package declaration for the generated file, e.g. `com.example.api`.
-   */
-  package?: string;
-  /**
-   * Convert wire field names to camelCase properties, mapping the wire name
-   * back via `@SerialName`.
-   *
-   * @default false
-   */
-  camelCaseProperties?: boolean;
-  /**
-   * Give every enum an `unknown` case, so a value the client has not been
-   * generated for decodes instead of throwing.
-   *
-   * @default false
-   */
-  unknownEnumCase?: boolean;
-}
+type KotlinClientOptions = z.input<typeof KotlinClientOptionsSchema> & GeneratedFileOptions;
 /**
- * A Kotlin client target for `kizuna.config.ts`.
+ * A Kotlin client for `kizuna.config.ts`.
  *
  * @example
- * kotlinClient({ output: './api/APIClient.kt', package: 'com.example.api' });
+ * kotlinClient({
+ *     output: './api/APIClient.kt',
+ *     package: 'com.example.api',
+ * });
  */
-declare const kotlinClient: (options: KotlinClientOptions) => ClientTarget;
+declare const kotlinClient: (options: {
+  namespace?: string | undefined;
+  package?: string | undefined;
+  camelCaseProperties?: boolean | undefined;
+  unknownEnumCase?: boolean | undefined;
+} & GeneratedFileOptions) => _$kizunajs.GeneratedFile;
 //#endregion
 export { type KotlinClientOptions, type KotlinConfig, generateKotlinClient, kotlinClient };

package/dist/index.d.mts

@@ -1,4 +1,7 @@
-import { ApiDefinition, ClientTarget } from "kizunajs";
+import { GeneratedFileOptions } from "kizunajs/generator";
+import { z } from "zod";
+import * as _$kizunajs from "kizunajs";
+import { ApiDefinition } from "kizunajs";
 
 //#region src/generator.d.ts
 interface KotlinConfig {
@@ -38,45 +41,30 @@ interface KotlinConfig {
 declare const generateKotlinClient: (api: ApiDefinition, config: KotlinConfig) => string;
 //#endregion
 //#region src/client-target.d.ts
+declare const KotlinClientOptionsSchema: z.ZodObject<{
+  namespace: z.ZodDefault<z.ZodString>;
+  package: z.ZodOptional<z.ZodString>;
+  camelCaseProperties: z.ZodOptional<z.ZodBoolean>;
+  unknownEnumCase: z.ZodOptional<z.ZodBoolean>;
+}, z.core.$strip>;
 /**
  * Where a generated Kotlin client is written, and what it is called there.
  */
-interface KotlinClientOptions {
-  /**
-   * Path the generated file is written to.
-   */
-  output: string;
-  /**
-   * Name of the generated namespace object.
-   *
-   * @default 'API'
-   */
-  namespace?: string;
-  /**
-   * Package declaration for the generated file, e.g. `com.example.api`.
-   */
-  package?: string;
-  /**
-   * Convert wire field names to camelCase properties, mapping the wire name
-   * back via `@SerialName`.
-   *
-   * @default false
-   */
-  camelCaseProperties?: boolean;
-  /**
-   * Give every enum an `unknown` case, so a value the client has not been
-   * generated for decodes instead of throwing.
-   *
-   * @default false
-   */
-  unknownEnumCase?: boolean;
-}
+type KotlinClientOptions = z.input<typeof KotlinClientOptionsSchema> & GeneratedFileOptions;
 /**
- * A Kotlin client target for `kizuna.config.ts`.
+ * A Kotlin client for `kizuna.config.ts`.
  *
  * @example
- * kotlinClient({ output: './api/APIClient.kt', package: 'com.example.api' });
+ * kotlinClient({
+ *     output: './api/APIClient.kt',
+ *     package: 'com.example.api',
+ * });
  */
-declare const kotlinClient: (options: KotlinClientOptions) => ClientTarget;
+declare const kotlinClient: (options: {
+  namespace?: string | undefined;
+  package?: string | undefined;
+  camelCaseProperties?: boolean | undefined;
+  unknownEnumCase?: boolean | undefined;
+} & GeneratedFileOptions) => _$kizunajs.GeneratedFile;
 //#endregion
 export { type KotlinClientOptions, type KotlinConfig, generateKotlinClient, kotlinClient };

package/dist/index.mjs

@@ -1,16 +1,45 @@
-import { t as generateKotlinClient } from "./generator-BvNpSarY.mjs";
-//#region src/client-target.ts
+import { n as kotlinClientWalk, t as generateKotlinClient } from "./generator-uzHpr6im.mjs";
+import { defineClient } from "kizunajs/generator";
+import { z } from "zod";
 /**
-* A Kotlin client target for `kizuna.config.ts`.
+* A Kotlin client for `kizuna.config.ts`.
 *
 * @example
-* kotlinClient({ output: './api/APIClient.kt', package: 'com.example.api' });
+* kotlinClient({
+*     output: './api/APIClient.kt',
+*     package: 'com.example.api',
+* });
 */
-const kotlinClient = (options) => ({
-	kind: "kotlin",
-	output: options.output,
-	generate: (contract) => generateKotlinClient(contract, {
-		namespaceName: options.namespace ?? "API",
+const kotlinClient = defineClient({
+	target: "kotlin",
+	options: z.object({
+		/**
+		* Name of the generated namespace object.
+		*
+		* @default 'API'
+		*/
+		namespace: z.string().default("API"),
+		/**
+		* Package declaration for the generated file, e.g. `com.example.api`.
+		*/
+		package: z.string().optional(),
+		/**
+		* Convert wire field names to camelCase properties, mapping the wire name
+		* back via `@SerialName`.
+		*
+		* @default false
+		*/
+		camelCaseProperties: z.boolean().optional(),
+		/**
+		* Give every enum an `unknown` case, so a value the client has not been
+		* generated for decodes instead of throwing.
+		*
+		* @default false
+		*/
+		unknownEnumCase: z.boolean().optional()
+	}),
+	generate: ({ options, api }) => kotlinClientWalk(api, {
+		namespaceName: options.namespace,
 		packageName: options.package,
 		camelCaseProperties: options.camelCaseProperties,
 		unknownEnumCase: options.unknownEnumCase

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kizunajs/kotlin",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.11",
   "description": "Kotlin client generation for Kizuna.js APIs",
   "keywords": [
     "kizunajs",
@@ -60,18 +60,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@kizunajs/cli": "2.0.0-beta.1"
+    "@kizunajs/cli": "2.0.0-beta.11"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "kizunajs": "2.0.0-beta.1"
+    "kizunajs": "2.0.0-beta.11"
   },
   "devDependencies": {
     "@types/node": "^22.9.0",
     "tsdown": "^0.21.0",
     "typescript": "^6.0.3",
     "zod": "^4.0.0",
-    "kizunajs": "2.0.0-beta.1"
+    "kizunajs": "2.0.0-beta.11"
   },
   "scripts": {
     "build": "tsdown src/index.ts src/cli.ts --format esm,cjs --dts --clean --external kizunajs --external @kizunajs/cli --external zod",