@kizunajs/swift 2.0.0-beta.12 → 2.0.0-beta.14

package/dist/cli.cjs

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

package/dist/{generator-CqKvXynF.mjs → generator-CxUzLmbK.mjs}

@@ -1,4 +1,4 @@
-import { isBinarySchema, isDiscriminatedUnionSchema, isFileSchema, isHintPrefix, isIntegerSchema, isJsonMediaType, isNamedStream, isObjectSchema, isStreamResponse, isSuccessStatus, isVoidSchema, localTypeName, mergeHeaderFields, parsePath, readDef, readDefType, readDeprecation, readDiscriminatedUnion, readDiscriminatorStringLiteral, readMetaDescription, readMetaId, readObjectShape, resolveResponseBody, resolveResponseContentType, 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, isVoidSchema, localTypeName, mergeHeaderFields, parsePath, readDef, readDefType, readDeprecation, readDiscriminatedUnion, readDiscriminatorStringLiteral, readMetaBrand, readMetaDescription, readMetaId, readObjectShape, resolveResponseBody, resolveResponseContentType, resolveResponseHeaders, routeStreams, sanitizeFieldName, sanitizeIdentifier, shortTypeName, soleStreamResponse, statusToCamelCase, streamMode, toCamelCase, toPascalCase, unwrapOptionalWrappers, walkApi } from "kizunajs/generator";
 //#region src/emit.ts
 var SwiftWriter = class {
 	lines = [];
@@ -45,6 +45,7 @@ var TypeRegistry = class {
 	warningSet = /* @__PURE__ */ new Set();
 	explicitIds = /* @__PURE__ */ new Set();
 	unionVariantOwners = /* @__PURE__ */ new Map();
+	brands = /* @__PURE__ */ new Map();
 	usesAnyCodable = false;
 	constructor(camelCaseProperties = false, unknownEnumCase = false) {
 		this.camelCaseProperties = camelCaseProperties;
@@ -82,6 +83,15 @@ var TypeRegistry = class {
 	unionVariantOwner(payloadName) {
 		return this.unionVariantOwners.get(payloadName);
 	}
+	addBrand(brand) {
+		const existing = this.brands.get(brand.name);
+		if (existing !== void 0 && existing.rawType !== brand.rawType) throw new Error(`@kizunajs/swift: 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/swift: 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());
+	}
 	warnAnyCodable(hint, reason) {
 		this.usesAnyCodable = true;
 		this.warningSet.add(`${hint}: ${reason}`);
@@ -124,7 +134,29 @@ const objectFields = (schema, registry, hint, shape = readObjectShape(schema) ??
 	return fields;
 };
 const stringify = (value) => JSON.stringify(value);
+const BRANDABLE_TYPES = new Set([
+	"String",
+	"Int",
+	"Int64",
+	"Double",
+	"Bool",
+	"Date"
+]);
 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,
@@ -862,6 +894,31 @@ const emitStruct = (writer, type, context, ownedTypeMap, ownedTypeLookup, regist
 		emitMemberwiseInit(writer, adjustedFields, (field) => field.deprecated ? deprecatedStorageName(field, type.fields) : escapeKeyword(field.name));
 	});
 };
+/**
+* A brand as a struct around its value, encoded as the bare value.
+*/
+const emitBrand = (writer, brand) => {
+	writer.block(`public struct ${brand.name}: RawRepresentable, Codable, Hashable, Sendable`, () => {
+		writer.line(`public let rawValue: ${brand.rawType}`);
+		writer.blank();
+		writer.block(`public init(rawValue: ${brand.rawType})`, () => {
+			writer.line("self.rawValue = rawValue");
+		});
+		writer.blank();
+		writer.block(`public init(_ rawValue: ${brand.rawType})`, () => {
+			writer.line("self.rawValue = rawValue");
+		});
+		writer.blank();
+		writer.block("public init(from decoder: Decoder) throws", () => {
+			writer.line(`rawValue = try decoder.singleValueContainer().decode(${brand.rawType}.self)`);
+		});
+		writer.blank();
+		writer.block("public func encode(to encoder: Encoder) throws", () => {
+			writer.line("var container = encoder.singleValueContainer()");
+			writer.line("try container.encode(rawValue)");
+		});
+	});
+};
 const emitDiscriminatedEnum = (writer, type, context, registryName, ownedTypeMap, ownedTypeLookup) => {
 	const lookupName = registryName ?? type.name;
 	writer.block(`public enum ${type.name}: Codable, Sendable, Equatable`, () => {
@@ -2058,6 +2115,10 @@ const renderSwiftClient = (api, partition, registry, options) => {
 	};
 	writer.block(`public enum ${namespaceName}`, () => {
 		emitTypes(writer, topLevelSharedTypes, context, ownedTypeMap, ownedTypeLookup);
+		for (const brand of registry.allBrands()) {
+			writer.blank();
+			emitBrand(writer, brand);
+		}
 	});
 	emitClient(writer, {
 		clientName,

package/dist/{generator-BmO3raeP.cjs → generator-E0WQFf92.cjs}

@@ -45,6 +45,7 @@ var TypeRegistry = class {
 	warningSet = /* @__PURE__ */ new Set();
 	explicitIds = /* @__PURE__ */ new Set();
 	unionVariantOwners = /* @__PURE__ */ new Map();
+	brands = /* @__PURE__ */ new Map();
 	usesAnyCodable = false;
 	constructor(camelCaseProperties = false, unknownEnumCase = false) {
 		this.camelCaseProperties = camelCaseProperties;
@@ -82,6 +83,15 @@ var TypeRegistry = class {
 	unionVariantOwner(payloadName) {
 		return this.unionVariantOwners.get(payloadName);
 	}
+	addBrand(brand) {
+		const existing = this.brands.get(brand.name);
+		if (existing !== void 0 && existing.rawType !== brand.rawType) throw new Error(`@kizunajs/swift: 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/swift: 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());
+	}
 	warnAnyCodable(hint, reason) {
 		this.usesAnyCodable = true;
 		this.warningSet.add(`${hint}: ${reason}`);
@@ -124,7 +134,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",
+	"Int64",
+	"Double",
+	"Bool",
+	"Date"
+]);
 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,
@@ -862,6 +894,31 @@ const emitStruct = (writer, type, context, ownedTypeMap, ownedTypeLookup, regist
 		emitMemberwiseInit(writer, adjustedFields, (field) => field.deprecated ? deprecatedStorageName(field, type.fields) : escapeKeyword(field.name));
 	});
 };
+/**
+* A brand as a struct around its value, encoded as the bare value.
+*/
+const emitBrand = (writer, brand) => {
+	writer.block(`public struct ${brand.name}: RawRepresentable, Codable, Hashable, Sendable`, () => {
+		writer.line(`public let rawValue: ${brand.rawType}`);
+		writer.blank();
+		writer.block(`public init(rawValue: ${brand.rawType})`, () => {
+			writer.line("self.rawValue = rawValue");
+		});
+		writer.blank();
+		writer.block(`public init(_ rawValue: ${brand.rawType})`, () => {
+			writer.line("self.rawValue = rawValue");
+		});
+		writer.blank();
+		writer.block("public init(from decoder: Decoder) throws", () => {
+			writer.line(`rawValue = try decoder.singleValueContainer().decode(${brand.rawType}.self)`);
+		});
+		writer.blank();
+		writer.block("public func encode(to encoder: Encoder) throws", () => {
+			writer.line("var container = encoder.singleValueContainer()");
+			writer.line("try container.encode(rawValue)");
+		});
+	});
+};
 const emitDiscriminatedEnum = (writer, type, context, registryName, ownedTypeMap, ownedTypeLookup) => {
 	const lookupName = registryName ?? type.name;
 	writer.block(`public enum ${type.name}: Codable, Sendable, Equatable`, () => {
@@ -2058,6 +2115,10 @@ const renderSwiftClient = (api, partition, registry, options) => {
 	};
 	writer.block(`public enum ${namespaceName}`, () => {
 		emitTypes(writer, topLevelSharedTypes, context, ownedTypeMap, ownedTypeLookup);
+		for (const brand of registry.allBrands()) {
+			writer.blank();
+			emitBrand(writer, brand);
+		}
 	});
 	emitClient(writer, {
 		clientName,

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-BmO3raeP.cjs");
+const require_generator = require("./generator-E0WQFf92.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 swiftClientWalk, t as generateSwiftClient } from "./generator-CqKvXynF.mjs";
+import { n as swiftClientWalk, t as generateSwiftClient } from "./generator-CxUzLmbK.mjs";
 import { defineClient } from "kizunajs/generator";
 import { z } from "zod";
 /**

package/package.json

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