@kizunajs/kotlin 2.0.0-beta.21 → 2.0.0-beta.23

package/dist/cli.cjs

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

package/dist/{generator-Dft2DL-3.cjs → generator-CNG65QK6.cjs}

@@ -184,6 +184,8 @@ const mapUnbrandedType = (schema, registry, hint) => {
 		expression: "ByteArray",
 		optional: false
 	};
+	const model = (0, kizunajs_generator.readModelSchema)(schema);
+	if (model !== void 0 && model !== schema) return mapUnbrandedType(model, registry, hint);
 	const id = (0, kizunajs_generator.readMetaId)(schema);
 	const def = (0, kizunajs_generator.readDef)(schema);
 	const discriminated = (0, kizunajs_generator.readDiscriminatedUnion)(schema);
@@ -551,18 +553,23 @@ const buildRouteMethod = (routeKey, route, registry, deprecated, deprecationMess
 			successResponses.push({
 				status,
 				type: stream.messageType ?? "Event",
-				responseHeaders: headersSchema ? collectObjectFields(headersSchema, registry, `${baseHint}ResponseHeaders`) : []
+				responseHeaders: headersSchema ? collectObjectFields(headersSchema, registry, `${baseHint}ResponseHeaders`) : [],
+				isText: false
 			});
 			continue;
 		}
-		const typeExpression = mapType((0, kizunajs_generator.resolveResponseBody)(responseValue), registry, responseHint).expression;
+		const bodySchema = (0, kizunajs_generator.resolveResponseBody)(responseValue);
+		const responseContentType = (0, kizunajs_generator.resolveResponseContentType)(responseValue);
+		const isText = !(0, kizunajs_generator.isBinarySchema)(bodySchema) && responseContentType !== void 0 && !(0, kizunajs_generator.isJsonMediaType)(responseContentType);
+		const typeExpression = mapType(bodySchema, registry, responseHint).expression;
 		if ((0, kizunajs_generator.isSuccessStatus)(status)) {
 			const headersSchema = (0, kizunajs_generator.resolveResponseHeaders)(responseValue);
 			const perStatusHeaderFields = headersSchema ? collectObjectFields(headersSchema, registry, `${baseHint}ResponseHeaders`) : [];
 			successResponses.push({
 				status,
 				type: typeExpression,
-				responseHeaders: perStatusHeaderFields
+				responseHeaders: perStatusHeaderFields,
+				isText
 			});
 		} else errorCases.push({
 			caseName: (0, kizunajs_generator.statusToCamelCase)(status),
@@ -700,9 +707,12 @@ const KOTLIN_PRIMITIVE_TYPES = new Set([
 	"ByteArray"
 ]);
 /**
-* How a response body is read. Raw bytes are the body already.
+* How a response body is read. Raw bytes are the body already, and text is its decoded bytes.
 */
-const decodeBody = (resolved) => resolved === "ByteArray" ? "data" : `json.decodeFromString<${resolved}>(data.decodeToString())`;
+const decodeBody = (resolved, isText = false) => {
+	if (resolved === "ByteArray") return "data";
+	return isText ? "data.decodeToString()" : `json.decodeFromString<${resolved}>(data.decodeToString())`;
+};
 const resolveType = (typeName, currentOperation, context, scope = "client") => {
 	const { operationTypeMap, namespaceName, clientName, fileLevelTypeNames } = context;
 	const optional = typeName.endsWith("?");
@@ -1413,7 +1423,7 @@ const emitMethodBody = (writer, method, context) => {
 				writer.indent(() => {
 					const resolved = resolveType(successResponse.type, method.operationName, context);
 					writer.block("try", () => {
-						writer.line(`val payload = ${decodeBody(resolved)}`);
+						writer.line(`val payload = ${decodeBody(resolved, successResponse.isText)}`);
 						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)})`);

package/dist/{generator-DHi8XSWb.mjs → generator-Dzx9o6tA.mjs}

@@ -1,4 +1,4 @@
-import { isBinarySchema, isDiscriminatedUnionSchema, isFileSchema, isHintPrefix, isIntegerSchema, isNamedStream, isObjectSchema, isStreamResponse, isSuccessStatus, localTypeName, mergeHeaderFields, parsePath, readDef, readDefType, readDeprecation, readDiscriminatedUnion, readDiscriminatorStringLiteral, readMetaBrand, readMetaDescription, readMetaId, readObjectShape, resolveResponseBody, resolveResponseHeaders, routeStreams, sanitizeFieldName, sanitizeIdentifier, shortTypeName, soleStreamResponse, statusToCamelCase, streamMode, toCamelCase, toPascalCase, unwrapOptionalWrappers, walkApi } from "kizunajs/generator";
+import { isBinarySchema, isDiscriminatedUnionSchema, isFileSchema, isHintPrefix, isIntegerSchema, isJsonMediaType, isNamedStream, isObjectSchema, isStreamResponse, isSuccessStatus, localTypeName, mergeHeaderFields, parsePath, readDef, readDefType, readDeprecation, readDiscriminatedUnion, readDiscriminatorStringLiteral, readMetaBrand, readMetaDescription, readMetaId, readModelSchema, readObjectShape, resolveResponseBody, resolveResponseContentType, resolveResponseHeaders, routeStreams, sanitizeFieldName, sanitizeIdentifier, shortTypeName, soleStreamResponse, statusToCamelCase, streamMode, toCamelCase, toPascalCase, unwrapOptionalWrappers, walkApi } from "kizunajs/generator";
 //#region src/emit.ts
 var KotlinWriter = class {
 	lines = [];
@@ -184,6 +184,8 @@ const mapUnbrandedType = (schema, registry, hint) => {
 		expression: "ByteArray",
 		optional: false
 	};
+	const model = readModelSchema(schema);
+	if (model !== void 0 && model !== schema) return mapUnbrandedType(model, registry, hint);
 	const id = readMetaId(schema);
 	const def = readDef(schema);
 	const discriminated = readDiscriminatedUnion(schema);
@@ -551,18 +553,23 @@ const buildRouteMethod = (routeKey, route, registry, deprecated, deprecationMess
 			successResponses.push({
 				status,
 				type: stream.messageType ?? "Event",
-				responseHeaders: headersSchema ? collectObjectFields(headersSchema, registry, `${baseHint}ResponseHeaders`) : []
+				responseHeaders: headersSchema ? collectObjectFields(headersSchema, registry, `${baseHint}ResponseHeaders`) : [],
+				isText: false
 			});
 			continue;
 		}
-		const typeExpression = mapType(resolveResponseBody(responseValue), registry, responseHint).expression;
+		const bodySchema = resolveResponseBody(responseValue);
+		const responseContentType = resolveResponseContentType(responseValue);
+		const isText = !isBinarySchema(bodySchema) && responseContentType !== void 0 && !isJsonMediaType(responseContentType);
+		const typeExpression = mapType(bodySchema, registry, responseHint).expression;
 		if (isSuccessStatus(status)) {
 			const headersSchema = resolveResponseHeaders(responseValue);
 			const perStatusHeaderFields = headersSchema ? collectObjectFields(headersSchema, registry, `${baseHint}ResponseHeaders`) : [];
 			successResponses.push({
 				status,
 				type: typeExpression,
-				responseHeaders: perStatusHeaderFields
+				responseHeaders: perStatusHeaderFields,
+				isText
 			});
 		} else errorCases.push({
 			caseName: statusToCamelCase(status),
@@ -700,9 +707,12 @@ const KOTLIN_PRIMITIVE_TYPES = new Set([
 	"ByteArray"
 ]);
 /**
-* How a response body is read. Raw bytes are the body already.
+* How a response body is read. Raw bytes are the body already, and text is its decoded bytes.
 */
-const decodeBody = (resolved) => resolved === "ByteArray" ? "data" : `json.decodeFromString<${resolved}>(data.decodeToString())`;
+const decodeBody = (resolved, isText = false) => {
+	if (resolved === "ByteArray") return "data";
+	return isText ? "data.decodeToString()" : `json.decodeFromString<${resolved}>(data.decodeToString())`;
+};
 const resolveType = (typeName, currentOperation, context, scope = "client") => {
 	const { operationTypeMap, namespaceName, clientName, fileLevelTypeNames } = context;
 	const optional = typeName.endsWith("?");
@@ -1413,7 +1423,7 @@ const emitMethodBody = (writer, method, context) => {
 				writer.indent(() => {
 					const resolved = resolveType(successResponse.type, method.operationName, context);
 					writer.block("try", () => {
-						writer.line(`val payload = ${decodeBody(resolved)}`);
+						writer.line(`val payload = ${decodeBody(resolved, successResponse.isText)}`);
 						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)})`);

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-Dft2DL-3.cjs");
+const require_generator = require("./generator-CNG65QK6.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-DHi8XSWb.mjs";
+import { n as kotlinClientWalk, t as generateKotlinClient } from "./generator-Dzx9o6tA.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.21",
+  "version": "2.0.0-beta.23",
   "description": "Kotlin client generation for Kizuna.js APIs",
   "keywords": [
     "kizunajs",
@@ -60,14 +60,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@kizunajs/cli": "2.0.0-beta.21"
+    "@kizunajs/cli": "2.0.0-beta.23"
   },
   "peerDependencies": {
-    "kizunajs": "2.0.0-beta.21",
+    "kizunajs": "2.0.0-beta.23",
     "zod": "^4.0.0"
   },
   "devDependencies": {
-    "kizunajs": "2.0.0-beta.21",
+    "kizunajs": "2.0.0-beta.23",
     "@types/node": "^22.9.0",
     "tsdown": "^0.21.0",
     "typescript": "^6.0.3",