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

package/dist/cli.cjs

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

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

@@ -1,4 +1,4 @@
-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";
+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";
 //#region src/emit.ts
 var KotlinWriter = class {
 	lines = [];
@@ -56,6 +56,7 @@ var TypeRegistry = class {
 	explicitIds = /* @__PURE__ */ new Set();
 	sealedVariantPayloads = /* @__PURE__ */ new Set();
 	sealedVariantPaths = /* @__PURE__ */ new Map();
+	brands = /* @__PURE__ */ new Map();
 	usesJsonElement = false;
 	constructor(camelCaseProperties = false, unknownEnumCase = false) {
 		this.camelCaseProperties = camelCaseProperties;
@@ -99,6 +100,15 @@ var TypeRegistry = class {
 	sealedVariantPath(name) {
 		return this.sealedVariantPaths.get(name);
 	}
+	addBrand(brand) {
+		const existing = this.brands.get(brand.name);
+		if (existing !== void 0 && existing.rawType !== brand.rawType) throw new Error(`@kizunajs/kotlin: brand ${stringify(brand.name)} wraps both ${existing.rawType} and ${brand.rawType}. Give each its own name.`);
+		if (this.types.has(brand.name)) throw new Error(`@kizunajs/kotlin: brand ${stringify(brand.name)} has the same name as a model. Give each its own name.`);
+		this.brands.set(brand.name, brand);
+	}
+	allBrands() {
+		return Array.from(this.brands.values());
+	}
 	warnJsonElement(hint, reason) {
 		this.usesJsonElement = true;
 		this.warningSet.add(`${hint}: ${reason}`);
@@ -141,7 +151,29 @@ const objectFields = (schema, registry, hint, shape = readObjectShape(schema) ??
 	return fields;
 };
 const stringify = (value) => JSON.stringify(value);
+const BRANDABLE_TYPES = new Set([
+	"String",
+	"Int",
+	"Long",
+	"Double",
+	"Boolean",
+	"Instant"
+]);
 const mapType = (schema, registry, hint) => {
+	const result = mapUnbrandedType(schema, registry, hint);
+	const brand = readMetaBrand(schema);
+	if (brand === void 0 || !BRANDABLE_TYPES.has(result.expression)) return result;
+	const name = sanitizeIdentifier(brand);
+	registry.addBrand({
+		name,
+		rawType: result.expression
+	});
+	return {
+		expression: name,
+		optional: false
+	};
+};
+const mapUnbrandedType = (schema, registry, hint) => {
 	if (isFileSchema(schema)) return {
 		expression: "MultipartFile",
 		optional: false,
@@ -936,6 +968,16 @@ const emitType = (writer, type, ownedTypeMap = /* @__PURE__ */ new Map(), ownedT
 	else if (type.kind === "enum-class") emitEnumClass(writer, type.name, type.cases, type.unknownCase, type.description);
 	else if (registry) emitSealedClass(writer, type, registry, ownedTypeMap, ownedTypeLookup);
 };
+/**
+* A brand as a value class that serializes and prints as the bare value.
+*/
+const emitBrand = (writer, brand) => {
+	writer.line("@Serializable");
+	writer.line("@JvmInline");
+	writer.block(`value class ${brand.name}(val value: ${brand.rawType})`, () => {
+		writer.line(`override fun toString(): String = ${brand.rawType === "String" ? "value" : "value.toString()"}`);
+	});
+};
 const emitTypes = (writer, types, ownedTypeMap = /* @__PURE__ */ new Map(), ownedTypeLookup = /* @__PURE__ */ new Map(), registry) => {
 	for (const type of types) emitType(writer, type, ownedTypeMap, ownedTypeLookup, void 0, registry);
 };
@@ -1785,6 +1827,10 @@ const renderKotlinClient = (api, partition, registry, config) => {
 	};
 	writer.block(`object ${namespaceName}`, () => {
 		emitTypes(writer, topLevelSharedTypes, ownedTypeMap, ownedTypeLookup, registry);
+		for (const brand of registry.allBrands()) {
+			writer.blank();
+			emitBrand(writer, brand);
+		}
 	});
 	emitClient(writer, { clientName }, partition, context, typesByOperation, registry);
 	for (const group of partition.groups) emitSubClientClass(writer, group, clientName, context);

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

@@ -56,6 +56,7 @@ var TypeRegistry = class {
 	explicitIds = /* @__PURE__ */ new Set();
 	sealedVariantPayloads = /* @__PURE__ */ new Set();
 	sealedVariantPaths = /* @__PURE__ */ new Map();
+	brands = /* @__PURE__ */ new Map();
 	usesJsonElement = false;
 	constructor(camelCaseProperties = false, unknownEnumCase = false) {
 		this.camelCaseProperties = camelCaseProperties;
@@ -99,6 +100,15 @@ var TypeRegistry = class {
 	sealedVariantPath(name) {
 		return this.sealedVariantPaths.get(name);
 	}
+	addBrand(brand) {
+		const existing = this.brands.get(brand.name);
+		if (existing !== void 0 && existing.rawType !== brand.rawType) throw new Error(`@kizunajs/kotlin: brand ${stringify(brand.name)} wraps both ${existing.rawType} and ${brand.rawType}. Give each its own name.`);
+		if (this.types.has(brand.name)) throw new Error(`@kizunajs/kotlin: brand ${stringify(brand.name)} has the same name as a model. Give each its own name.`);
+		this.brands.set(brand.name, brand);
+	}
+	allBrands() {
+		return Array.from(this.brands.values());
+	}
 	warnJsonElement(hint, reason) {
 		this.usesJsonElement = true;
 		this.warningSet.add(`${hint}: ${reason}`);
@@ -141,7 +151,29 @@ const objectFields = (schema, registry, hint, shape = (0, kizunajs_generator.rea
 	return fields;
 };
 const stringify = (value) => JSON.stringify(value);
+const BRANDABLE_TYPES = new Set([
+	"String",
+	"Int",
+	"Long",
+	"Double",
+	"Boolean",
+	"Instant"
+]);
 const mapType = (schema, registry, hint) => {
+	const result = mapUnbrandedType(schema, registry, hint);
+	const brand = (0, kizunajs_generator.readMetaBrand)(schema);
+	if (brand === void 0 || !BRANDABLE_TYPES.has(result.expression)) return result;
+	const name = (0, kizunajs_generator.sanitizeIdentifier)(brand);
+	registry.addBrand({
+		name,
+		rawType: result.expression
+	});
+	return {
+		expression: name,
+		optional: false
+	};
+};
+const mapUnbrandedType = (schema, registry, hint) => {
 	if ((0, kizunajs_generator.isFileSchema)(schema)) return {
 		expression: "MultipartFile",
 		optional: false,
@@ -936,6 +968,16 @@ const emitType = (writer, type, ownedTypeMap = /* @__PURE__ */ new Map(), ownedT
 	else if (type.kind === "enum-class") emitEnumClass(writer, type.name, type.cases, type.unknownCase, type.description);
 	else if (registry) emitSealedClass(writer, type, registry, ownedTypeMap, ownedTypeLookup);
 };
+/**
+* A brand as a value class that serializes and prints as the bare value.
+*/
+const emitBrand = (writer, brand) => {
+	writer.line("@Serializable");
+	writer.line("@JvmInline");
+	writer.block(`value class ${brand.name}(val value: ${brand.rawType})`, () => {
+		writer.line(`override fun toString(): String = ${brand.rawType === "String" ? "value" : "value.toString()"}`);
+	});
+};
 const emitTypes = (writer, types, ownedTypeMap = /* @__PURE__ */ new Map(), ownedTypeLookup = /* @__PURE__ */ new Map(), registry) => {
 	for (const type of types) emitType(writer, type, ownedTypeMap, ownedTypeLookup, void 0, registry);
 };
@@ -1785,6 +1827,10 @@ const renderKotlinClient = (api, partition, registry, config) => {
 	};
 	writer.block(`object ${namespaceName}`, () => {
 		emitTypes(writer, topLevelSharedTypes, ownedTypeMap, ownedTypeLookup, registry);
+		for (const brand of registry.allBrands()) {
+			writer.blank();
+			emitBrand(writer, brand);
+		}
 	});
 	emitClient(writer, { clientName }, partition, context, typesByOperation, registry);
 	for (const group of partition.groups) emitSubClientClass(writer, group, clientName, context);

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-Cs9NkTCg.cjs");
+const require_generator = require("./generator-D2dgwOZe.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-uzHpr6im.mjs";
+import { n as kotlinClientWalk, t as generateKotlinClient } from "./generator-BYxosxwy.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.11",
+  "version": "2.0.0-beta.13",
   "description": "Kotlin client generation for Kizuna.js APIs",
   "keywords": [
     "kizunajs",
@@ -60,18 +60,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@kizunajs/cli": "2.0.0-beta.11"
+    "@kizunajs/cli": "2.0.0-beta.13"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "kizunajs": "2.0.0-beta.11"
+    "kizunajs": "2.0.0-beta.13"
   },
   "devDependencies": {
     "@types/node": "^22.9.0",
     "tsdown": "^0.21.0",
     "typescript": "^6.0.3",
     "zod": "^4.0.0",
-    "kizunajs": "2.0.0-beta.11"
+    "kizunajs": "2.0.0-beta.13"
   },
   "scripts": {
     "build": "tsdown src/index.ts src/cli.ts --format esm,cjs --dts --clean --external kizunajs --external @kizunajs/cli --external zod",