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

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-CefUI7SC.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-Ct5OmESk.mjs";
 import { mkdirSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { parseArgs } from "node:util";

package/dist/{generator-s2pn7vqP.cjs → generator-CefUI7SC.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
 			};
 		}
@@ -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})`);

package/dist/{generator-BvNpSarY.mjs → generator-Ct5OmESk.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 { createGenerator, 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 } 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
 			};
 		}
@@ -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})`);

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-s2pn7vqP.cjs");
+const require_generator = require("./generator-CefUI7SC.cjs");
 //#region src/client-target.ts
 /**
 * A Kotlin client target for `kizuna.config.ts`.

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as generateKotlinClient } from "./generator-BvNpSarY.mjs";
+import { t as generateKotlinClient } from "./generator-Ct5OmESk.mjs";
 //#region src/client-target.ts
 /**
 * A Kotlin client target for `kizuna.config.ts`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kizunajs/kotlin",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.10",
   "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.10"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "kizunajs": "2.0.0-beta.1"
+    "kizunajs": "2.0.0-beta.10"
   },
   "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.10"
   },
   "scripts": {
     "build": "tsdown src/index.ts src/cli.ts --format esm,cjs --dts --clean --external kizunajs --external @kizunajs/cli --external zod",