@kizunajs/swift 2.0.0-beta.18 → 2.0.0-beta.19

package/dist/cli.cjs

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

package/dist/{generator-CZr33FgN.mjs → generator-CjCPSdEz.mjs}

@@ -47,7 +47,6 @@ var TypeRegistry = class {
 	unionVariantOwners = /* @__PURE__ */ new Map();
 	brands = /* @__PURE__ */ new Map();
 	usesAnyCodable = false;
-	usesNullish = false;
 	constructor(camelCaseProperties = false, unknownEnumCase = false) {
 		this.camelCaseProperties = camelCaseProperties;
 		this.unknownEnumCase = unknownEnumCase;
@@ -111,13 +110,11 @@ const propertyName = (key, camelCase) => {
 	if (!camel) return "field";
 	return /^[0-9]/.test(camel) ? `_${camel}` : camel;
 };
-const objectFields = (schema, registry, hint, nullishTriState = true, 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)) {
 		const result = mapType(value, registry, `${hint}${toPascalCase(key)}`);
-		const nullish = nullishTriState && result.nullish === true;
-		if (nullish) registry.usesNullish = true;
 		const deprecation = readDeprecation(value);
 		const swiftName = propertyName(key, registry.camelCaseProperties);
 		const previousWireName = seen.get(swiftName);
@@ -126,10 +123,9 @@ const objectFields = (schema, registry, hint, nullishTriState = true, shape = re
 		fields.push({
 			name: swiftName,
 			wireName: key,
-			type: nullish ? `Nullish<${result.expression.replace(/\?$/, "")}>` : result.expression,
-			optional: result.optional && !nullish,
+			type: result.expression,
+			optional: result.optional,
 			requiredNullable: result.requiredNullable,
-			nullish,
 			description: readMetaDescription(value),
 			isFile: result.isFile,
 			deprecated: deprecation !== void 0,
@@ -242,7 +238,6 @@ const mapUnbrandedType = (schema, registry, hint) => {
 			expression: innerResult.expression.endsWith("?") ? innerResult.expression : `${innerResult.expression}?`,
 			optional: true,
 			requiredNullable: nullable && !optional,
-			nullish: nullable && optional,
 			isFile: innerResult.isFile
 		};
 	}
@@ -424,13 +419,10 @@ const sanitizeCaseName = (literal) => {
 	if (/^[0-9]/.test(cleaned)) return `_${cleaned}`;
 	return cleaned.charAt(0).toLowerCase() + cleaned.slice(1);
 };
-/**
-* A JSON body keeps `.nullish()` as `Nullish`. A query, path, header or form field has no null, so it takes an optional.
-*/
-const collectObjectFields = (schema, registry, hint, json = false) => {
-	return objectFields(schema, registry, hint, json);
+const collectObjectFields = (schema, registry, hint) => {
+	return objectFields(schema, registry, hint);
 };
-const hasDefault = (field) => field.optional && field.requiredNullable !== true || field.nullish === true;
+const hasDefault = (field) => field.optional && field.requiredNullable !== true;
 const objectFieldCount = (schema) => {
 	return Object.keys(readObjectShape(schema) ?? {}).length;
 };
@@ -487,7 +479,7 @@ const buildRouteMethod = (routeKey, route, registry, deprecated, deprecationMess
 				else bodyDescriptor = {
 					kind: "json-flat",
 					structName,
-					flattened: collectObjectFields(route.body, registry, bodyHint, true),
+					flattened: collectObjectFields(route.body, registry, bodyHint),
 					multipartFields: []
 				};
 			}
@@ -707,62 +699,9 @@ const sanitizeEnumCaseName = (value) => {
 	if (!camel) return "_";
 	return /^[0-9]/.test(camel) ? `_${camel}` : camel;
 };
-const NULLISH_TYPE = /^Nullish<(.+)>$/;
-const emitNullish = (writer) => {
-	writer.blank();
-	writer.docComment("A `.nullish()` field: left out, sent as `null`, or sent with a value.");
-	writer.block("public enum Nullish<Wrapped>", () => {
-		writer.line("case absent");
-		writer.line("case null");
-		writer.line("case some(Wrapped)");
-		writer.blank();
-		writer.block("public var value: Wrapped?", () => {
-			writer.line("if case .some(let value) = self { return value }");
-			writer.line("return nil");
-		});
-	});
-	writer.blank();
-	writer.line("extension Nullish: Sendable where Wrapped: Sendable {}");
-	writer.line("extension Nullish: Equatable where Wrapped: Equatable {}");
-	writer.line("extension Nullish: Hashable where Wrapped: Hashable {}");
-	writer.blank();
-	writer.block("extension Nullish: Encodable where Wrapped: Encodable", () => {
-		writer.block("public func encode(to encoder: Encoder) throws", () => {
-			writer.line("var container = encoder.singleValueContainer()");
-			writer.line("switch self {");
-			writer.line("case .absent, .null: try container.encodeNil()");
-			writer.line("case .some(let value): try container.encode(value)");
-			writer.line("}");
-		});
-	});
-	writer.blank();
-	writer.block("extension Nullish: Decodable where Wrapped: Decodable", () => {
-		writer.block("public init(from decoder: Decoder) throws", () => {
-			writer.line("let container = try decoder.singleValueContainer()");
-			writer.line("self = container.decodeNil() ? .null : .some(try container.decode(Wrapped.self))");
-		});
-	});
-	writer.blank();
-	writer.block("extension KeyedEncodingContainer", () => {
-		writer.block("public mutating func encode<Wrapped: Encodable>(_ value: Nullish<Wrapped>, forKey key: Key) throws", () => {
-			writer.line("switch value {");
-			writer.line("case .absent: return");
-			writer.line("case .null: try encodeNil(forKey: key)");
-			writer.line("case .some(let wrapped): try encode(wrapped, forKey: key)");
-			writer.line("}");
-		});
-	});
-	writer.blank();
-	writer.block("extension KeyedDecodingContainer", () => {
-		writer.block("public func decode<Wrapped: Decodable>(_ type: Nullish<Wrapped>.Type, forKey key: Key) throws -> Nullish<Wrapped>", () => {
-			writer.line("guard contains(key) else { return .absent }");
-			writer.line("return try decodeNil(forKey: key) ? .null : .some(try decode(Wrapped.self, forKey: key))");
-		});
-	});
-};
 const defaultArgument = (field) => {
 	if (!hasDefault(field)) return "";
-	return field.nullish ? " = .absent" : " = nil";
+	return " = nil";
 };
 const optionalize = (type, optional) => {
 	if (!optional) return type;
@@ -919,8 +858,6 @@ const emitStruct = (writer, type, context, ownedTypeMap, ownedTypeLookup, regist
 	const hasFile = type.fields.some((field) => field.isFile);
 	const conformances = hasFile ? "Sendable, Equatable" : "Codable, Sendable, Equatable";
 	const resolveOwnedType = (raw) => {
-		const nullish = NULLISH_TYPE.exec(raw);
-		if (nullish) return `Nullish<${resolveOwnedType(nullish[1])}>`;
 		const optional = raw.endsWith("?");
 		const stripped = optional ? raw.slice(0, -1) : raw;
 		const isArray = stripped.startsWith("[") && stripped.endsWith("]");
@@ -1109,8 +1046,6 @@ const dictionarySeparator = (inner) => {
 };
 const resolveType = (typeName, currentOperation, context, scope = "actor") => {
 	const { operationTypeMap, namespaceName, clientName, fileLevelTypeNames } = context;
-	const nullish = NULLISH_TYPE.exec(typeName);
-	if (nullish) return `Nullish<${resolveType(nullish[1], currentOperation, context, scope)}>`;
 	const optional = typeName.endsWith("?");
 	const base = optional ? typeName.slice(0, -1) : typeName;
 	if (SWIFT_PRIMITIVE_TYPES.has(base)) return typeName;
@@ -1406,7 +1341,7 @@ const emitKizunaStreaming = (writer) => {
 		writer.line("let retry: Int?");
 	});
 	writer.blank();
-	writer.block("static func open<Failure: KizunaFailure>(_ request: inout URLRequest, session: URLSession, requestMiddleware: (@Sendable (inout URLRequest) async throws -> Void)?, failure: Failure.Type) async throws(Failure) -> (URLSession.AsyncBytes, Int, HTTPURLResponse)", () => {
+	writer.block("static func open<Failure: KizunaFailure>(_ request: inout URLRequest, session: URLSession, requestMiddleware: (@Sendable (inout URLRequest) async throws -> Void)?, responseMiddleware: (@Sendable (URLRequest, Foundation.Data, URLResponse) async -> Void)?, failure: Failure.Type) async throws(Failure) -> (URLSession.AsyncBytes, Int, HTTPURLResponse)", () => {
 		writer.line("if let requestMiddleware {");
 		writer.line("    do { try await requestMiddleware(&request) }");
 		writer.line("    catch is CancellationError { throw Failure.cancelled }");
@@ -1419,6 +1354,7 @@ const emitKizunaStreaming = (writer) => {
 		writer.line("catch is CancellationError { throw Failure.cancelled }");
 		writer.line("catch let error as URLError where error.code == .cancelled { throw Failure.cancelled }");
 		writer.line("catch { throw Failure.requestFailed(error) }");
+		writer.line("if let responseMiddleware { await responseMiddleware(request, Foundation.Data(), response) }");
 		writer.line("guard let httpResponse = response as? HTTPURLResponse else { throw Failure.invalidResponse }");
 		writer.line("return (bytes, httpResponse.statusCode, httpResponse)");
 	});
@@ -1873,7 +1809,7 @@ const emitStreamMethodTail = (writer, method, context, receiver, responseBinding
 	const qualifiedResult = `${context.clientName}.${method.operationName}.${method.resultWrapperName}`;
 	const hasHeaders = method.resultHeaderFields.length > 0;
 	const collect = `let data = try await Kizuna.collect(bytes, failure: ${failure}.self)`;
-	writer.line(`let (bytes, statusCode, ${responseBinding}) = try await Kizuna.open(&request, session: ${receiver}session, requestMiddleware: ${receiver}requestMiddleware, failure: ${failure}.self)`);
+	writer.line(`let (bytes, statusCode, ${responseBinding}) = try await Kizuna.open(&request, session: ${receiver}session, requestMiddleware: ${receiver}requestMiddleware, responseMiddleware: ${receiver}responseMiddleware, failure: ${failure}.self)`);
 	writer.line("switch statusCode {");
 	writer.line(`case ${stream.status}:`);
 	writer.indent(() => {
@@ -2215,7 +2151,6 @@ const renderSwiftClient = (api, partition, registry, options) => {
 		anyCodable: registry.usesAnyCodable
 	}, partition, context, typesByOperation);
 	for (const group of partition.groups) emitSubClientStruct(writer, group, clientName, context);
-	if (registry.usesNullish) emitNullish(writer);
 	emitKizunaFailureProtocols(writer);
 	emitKizunaNamespace(writer, {
 		multipart: usesMultipart,

package/dist/{generator-SM_Zrp0p.cjs → generator-DBNFuaBB.cjs}

@@ -47,7 +47,6 @@ var TypeRegistry = class {
 	unionVariantOwners = /* @__PURE__ */ new Map();
 	brands = /* @__PURE__ */ new Map();
 	usesAnyCodable = false;
-	usesNullish = false;
 	constructor(camelCaseProperties = false, unknownEnumCase = false) {
 		this.camelCaseProperties = camelCaseProperties;
 		this.unknownEnumCase = unknownEnumCase;
@@ -111,13 +110,11 @@ const propertyName = (key, camelCase) => {
 	if (!camel) return "field";
 	return /^[0-9]/.test(camel) ? `_${camel}` : camel;
 };
-const objectFields = (schema, registry, hint, nullishTriState = true, 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)) {
 		const result = mapType(value, registry, `${hint}${(0, kizunajs_generator.toPascalCase)(key)}`);
-		const nullish = nullishTriState && result.nullish === true;
-		if (nullish) registry.usesNullish = true;
 		const deprecation = (0, kizunajs_generator.readDeprecation)(value);
 		const swiftName = propertyName(key, registry.camelCaseProperties);
 		const previousWireName = seen.get(swiftName);
@@ -126,10 +123,9 @@ const objectFields = (schema, registry, hint, nullishTriState = true, shape = (0
 		fields.push({
 			name: swiftName,
 			wireName: key,
-			type: nullish ? `Nullish<${result.expression.replace(/\?$/, "")}>` : result.expression,
-			optional: result.optional && !nullish,
+			type: result.expression,
+			optional: result.optional,
 			requiredNullable: result.requiredNullable,
-			nullish,
 			description: (0, kizunajs_generator.readMetaDescription)(value),
 			isFile: result.isFile,
 			deprecated: deprecation !== void 0,
@@ -242,7 +238,6 @@ const mapUnbrandedType = (schema, registry, hint) => {
 			expression: innerResult.expression.endsWith("?") ? innerResult.expression : `${innerResult.expression}?`,
 			optional: true,
 			requiredNullable: nullable && !optional,
-			nullish: nullable && optional,
 			isFile: innerResult.isFile
 		};
 	}
@@ -424,13 +419,10 @@ const sanitizeCaseName = (literal) => {
 	if (/^[0-9]/.test(cleaned)) return `_${cleaned}`;
 	return cleaned.charAt(0).toLowerCase() + cleaned.slice(1);
 };
-/**
-* A JSON body keeps `.nullish()` as `Nullish`. A query, path, header or form field has no null, so it takes an optional.
-*/
-const collectObjectFields = (schema, registry, hint, json = false) => {
-	return objectFields(schema, registry, hint, json);
+const collectObjectFields = (schema, registry, hint) => {
+	return objectFields(schema, registry, hint);
 };
-const hasDefault = (field) => field.optional && field.requiredNullable !== true || field.nullish === true;
+const hasDefault = (field) => field.optional && field.requiredNullable !== true;
 const objectFieldCount = (schema) => {
 	return Object.keys((0, kizunajs_generator.readObjectShape)(schema) ?? {}).length;
 };
@@ -487,7 +479,7 @@ const buildRouteMethod = (routeKey, route, registry, deprecated, deprecationMess
 				else bodyDescriptor = {
 					kind: "json-flat",
 					structName,
-					flattened: collectObjectFields(route.body, registry, bodyHint, true),
+					flattened: collectObjectFields(route.body, registry, bodyHint),
 					multipartFields: []
 				};
 			}
@@ -707,62 +699,9 @@ const sanitizeEnumCaseName = (value) => {
 	if (!camel) return "_";
 	return /^[0-9]/.test(camel) ? `_${camel}` : camel;
 };
-const NULLISH_TYPE = /^Nullish<(.+)>$/;
-const emitNullish = (writer) => {
-	writer.blank();
-	writer.docComment("A `.nullish()` field: left out, sent as `null`, or sent with a value.");
-	writer.block("public enum Nullish<Wrapped>", () => {
-		writer.line("case absent");
-		writer.line("case null");
-		writer.line("case some(Wrapped)");
-		writer.blank();
-		writer.block("public var value: Wrapped?", () => {
-			writer.line("if case .some(let value) = self { return value }");
-			writer.line("return nil");
-		});
-	});
-	writer.blank();
-	writer.line("extension Nullish: Sendable where Wrapped: Sendable {}");
-	writer.line("extension Nullish: Equatable where Wrapped: Equatable {}");
-	writer.line("extension Nullish: Hashable where Wrapped: Hashable {}");
-	writer.blank();
-	writer.block("extension Nullish: Encodable where Wrapped: Encodable", () => {
-		writer.block("public func encode(to encoder: Encoder) throws", () => {
-			writer.line("var container = encoder.singleValueContainer()");
-			writer.line("switch self {");
-			writer.line("case .absent, .null: try container.encodeNil()");
-			writer.line("case .some(let value): try container.encode(value)");
-			writer.line("}");
-		});
-	});
-	writer.blank();
-	writer.block("extension Nullish: Decodable where Wrapped: Decodable", () => {
-		writer.block("public init(from decoder: Decoder) throws", () => {
-			writer.line("let container = try decoder.singleValueContainer()");
-			writer.line("self = container.decodeNil() ? .null : .some(try container.decode(Wrapped.self))");
-		});
-	});
-	writer.blank();
-	writer.block("extension KeyedEncodingContainer", () => {
-		writer.block("public mutating func encode<Wrapped: Encodable>(_ value: Nullish<Wrapped>, forKey key: Key) throws", () => {
-			writer.line("switch value {");
-			writer.line("case .absent: return");
-			writer.line("case .null: try encodeNil(forKey: key)");
-			writer.line("case .some(let wrapped): try encode(wrapped, forKey: key)");
-			writer.line("}");
-		});
-	});
-	writer.blank();
-	writer.block("extension KeyedDecodingContainer", () => {
-		writer.block("public func decode<Wrapped: Decodable>(_ type: Nullish<Wrapped>.Type, forKey key: Key) throws -> Nullish<Wrapped>", () => {
-			writer.line("guard contains(key) else { return .absent }");
-			writer.line("return try decodeNil(forKey: key) ? .null : .some(try decode(Wrapped.self, forKey: key))");
-		});
-	});
-};
 const defaultArgument = (field) => {
 	if (!hasDefault(field)) return "";
-	return field.nullish ? " = .absent" : " = nil";
+	return " = nil";
 };
 const optionalize = (type, optional) => {
 	if (!optional) return type;
@@ -919,8 +858,6 @@ const emitStruct = (writer, type, context, ownedTypeMap, ownedTypeLookup, regist
 	const hasFile = type.fields.some((field) => field.isFile);
 	const conformances = hasFile ? "Sendable, Equatable" : "Codable, Sendable, Equatable";
 	const resolveOwnedType = (raw) => {
-		const nullish = NULLISH_TYPE.exec(raw);
-		if (nullish) return `Nullish<${resolveOwnedType(nullish[1])}>`;
 		const optional = raw.endsWith("?");
 		const stripped = optional ? raw.slice(0, -1) : raw;
 		const isArray = stripped.startsWith("[") && stripped.endsWith("]");
@@ -1109,8 +1046,6 @@ const dictionarySeparator = (inner) => {
 };
 const resolveType = (typeName, currentOperation, context, scope = "actor") => {
 	const { operationTypeMap, namespaceName, clientName, fileLevelTypeNames } = context;
-	const nullish = NULLISH_TYPE.exec(typeName);
-	if (nullish) return `Nullish<${resolveType(nullish[1], currentOperation, context, scope)}>`;
 	const optional = typeName.endsWith("?");
 	const base = optional ? typeName.slice(0, -1) : typeName;
 	if (SWIFT_PRIMITIVE_TYPES.has(base)) return typeName;
@@ -1406,7 +1341,7 @@ const emitKizunaStreaming = (writer) => {
 		writer.line("let retry: Int?");
 	});
 	writer.blank();
-	writer.block("static func open<Failure: KizunaFailure>(_ request: inout URLRequest, session: URLSession, requestMiddleware: (@Sendable (inout URLRequest) async throws -> Void)?, failure: Failure.Type) async throws(Failure) -> (URLSession.AsyncBytes, Int, HTTPURLResponse)", () => {
+	writer.block("static func open<Failure: KizunaFailure>(_ request: inout URLRequest, session: URLSession, requestMiddleware: (@Sendable (inout URLRequest) async throws -> Void)?, responseMiddleware: (@Sendable (URLRequest, Foundation.Data, URLResponse) async -> Void)?, failure: Failure.Type) async throws(Failure) -> (URLSession.AsyncBytes, Int, HTTPURLResponse)", () => {
 		writer.line("if let requestMiddleware {");
 		writer.line("    do { try await requestMiddleware(&request) }");
 		writer.line("    catch is CancellationError { throw Failure.cancelled }");
@@ -1419,6 +1354,7 @@ const emitKizunaStreaming = (writer) => {
 		writer.line("catch is CancellationError { throw Failure.cancelled }");
 		writer.line("catch let error as URLError where error.code == .cancelled { throw Failure.cancelled }");
 		writer.line("catch { throw Failure.requestFailed(error) }");
+		writer.line("if let responseMiddleware { await responseMiddleware(request, Foundation.Data(), response) }");
 		writer.line("guard let httpResponse = response as? HTTPURLResponse else { throw Failure.invalidResponse }");
 		writer.line("return (bytes, httpResponse.statusCode, httpResponse)");
 	});
@@ -1873,7 +1809,7 @@ const emitStreamMethodTail = (writer, method, context, receiver, responseBinding
 	const qualifiedResult = `${context.clientName}.${method.operationName}.${method.resultWrapperName}`;
 	const hasHeaders = method.resultHeaderFields.length > 0;
 	const collect = `let data = try await Kizuna.collect(bytes, failure: ${failure}.self)`;
-	writer.line(`let (bytes, statusCode, ${responseBinding}) = try await Kizuna.open(&request, session: ${receiver}session, requestMiddleware: ${receiver}requestMiddleware, failure: ${failure}.self)`);
+	writer.line(`let (bytes, statusCode, ${responseBinding}) = try await Kizuna.open(&request, session: ${receiver}session, requestMiddleware: ${receiver}requestMiddleware, responseMiddleware: ${receiver}responseMiddleware, failure: ${failure}.self)`);
 	writer.line("switch statusCode {");
 	writer.line(`case ${stream.status}:`);
 	writer.indent(() => {
@@ -2215,7 +2151,6 @@ const renderSwiftClient = (api, partition, registry, options) => {
 		anyCodable: registry.usesAnyCodable
 	}, partition, context, typesByOperation);
 	for (const group of partition.groups) emitSubClientStruct(writer, group, clientName, context);
-	if (registry.usesNullish) emitNullish(writer);
 	emitKizunaFailureProtocols(writer);
 	emitKizunaNamespace(writer, {
 		multipart: usesMultipart,

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-SM_Zrp0p.cjs");
+const require_generator = require("./generator-DBNFuaBB.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-CZr33FgN.mjs";
+import { n as swiftClientWalk, t as generateSwiftClient } from "./generator-CjCPSdEz.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.18",
+  "version": "2.0.0-beta.19",
   "description": "Swift client generation for Kizuna.js APIs",
   "keywords": [
     "kizunajs",
@@ -59,14 +59,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@kizunajs/cli": "2.0.0-beta.18"
+    "@kizunajs/cli": "2.0.0-beta.19"
   },
   "peerDependencies": {
-    "kizunajs": "2.0.0-beta.18",
+    "kizunajs": "2.0.0-beta.19",
     "zod": "^4.0.0"
   },
   "devDependencies": {
-    "kizunajs": "2.0.0-beta.18",
+    "kizunajs": "2.0.0-beta.19",
     "@types/node": "^24",
     "tsdown": "^0.21.0",
     "typescript": "^6.0.3",