@kizunajs/swift 2.0.0-beta.3 → 2.0.0-beta.4

package/README.md

@@ -10,8 +10,24 @@ pnpm add -D @kizunajs/swift
 
 ## Usage
 
+Name the client in your config, and `kizuna generate` writes it with the rest:
+
+```ts
+import { swiftClient } from '@kizunajs/swift';
+
+export default defineConfig({
+    routes,
+    clients: [
+        swiftClient({
+            output: '../ios/MyApp/Generated/APIClient.swift',
+            namespace: 'API',
+        }),
+    ],
+});
+```
+
 ```sh
-kizuna-swift generate --config kizuna.config.ts --output ios/MyApp/Generated/APIClient.swift --namespace-name API
+kizuna generate
 ```
 
 ## Documentation

package/dist/cli.cjs

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

package/dist/{generator-BpGEeivv.cjs → generator-BAginTbM.cjs}

@@ -100,8 +100,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)) {
@@ -253,8 +252,9 @@ const mapType = (schema, registry, hint) => {
 					optional: false
 				};
 			}
+			const elementType = mapType(element, registry, `${hint}Item`).expression.replace(/\?$/, "");
 			return {
-				expression: `[${mapType(element, registry, `${hint}Item`).expression.replace(/\?$/, "")}]`,
+				expression: `[${(0, kizunajs_generator.unwrapOptionalWrappers)(element).nullable ? `${elementType}?` : elementType}]`,
 				optional: false
 			};
 		}
@@ -955,13 +955,33 @@ const SWIFT_PRIMITIVE_TYPES = new Set([
 	"Void",
 	"Foundation.Data"
 ]);
+/**
+* Where a dictionary's key ends and its value begins, or -1 for an array.
+*/
+const dictionarySeparator = (inner) => {
+	let depth = 0;
+	for (let index = 0; index < inner.length; index += 1) {
+		const character = inner[index];
+		if (character === "[") depth += 1;
+		else if (character === "]") depth -= 1;
+		else if (character === ":" && depth === 0) return index;
+	}
+	return -1;
+};
 const resolveType = (typeName, currentOperation, context, scope = "actor") => {
 	const { operationTypeMap, namespaceName, clientName, fileLevelTypeNames } = context;
 	const optional = typeName.endsWith("?");
 	const base = optional ? typeName.slice(0, -1) : typeName;
 	if (SWIFT_PRIMITIVE_TYPES.has(base)) return typeName;
 	if (base.startsWith("[") && base.endsWith("]")) {
-		const resolved = resolveType(base.slice(1, -1), currentOperation, context, scope);
+		const inner = base.slice(1, -1);
+		const separator = dictionarySeparator(inner);
+		if (separator !== -1) {
+			const key = resolveType(inner.slice(0, separator).trim(), currentOperation, context, scope);
+			const value = resolveType(inner.slice(separator + 1).trim(), currentOperation, context, scope);
+			return optional ? `[${key}: ${value}]?` : `[${key}: ${value}]`;
+		}
+		const resolved = resolveType(inner, currentOperation, context, scope);
 		return optional ? `[${resolved}]?` : `[${resolved}]`;
 	}
 	if (base === "MultipartFile" || base === "ValidationError" || base === "ValidationIssue") {

package/dist/{generator-DfFjWZhf.mjs → generator-DXJbInzN.mjs}

@@ -100,8 +100,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)) {
@@ -253,8 +252,9 @@ const mapType = (schema, registry, hint) => {
 					optional: false
 				};
 			}
+			const elementType = mapType(element, registry, `${hint}Item`).expression.replace(/\?$/, "");
 			return {
-				expression: `[${mapType(element, registry, `${hint}Item`).expression.replace(/\?$/, "")}]`,
+				expression: `[${unwrapOptionalWrappers(element).nullable ? `${elementType}?` : elementType}]`,
 				optional: false
 			};
 		}
@@ -955,13 +955,33 @@ const SWIFT_PRIMITIVE_TYPES = new Set([
 	"Void",
 	"Foundation.Data"
 ]);
+/**
+* Where a dictionary's key ends and its value begins, or -1 for an array.
+*/
+const dictionarySeparator = (inner) => {
+	let depth = 0;
+	for (let index = 0; index < inner.length; index += 1) {
+		const character = inner[index];
+		if (character === "[") depth += 1;
+		else if (character === "]") depth -= 1;
+		else if (character === ":" && depth === 0) return index;
+	}
+	return -1;
+};
 const resolveType = (typeName, currentOperation, context, scope = "actor") => {
 	const { operationTypeMap, namespaceName, clientName, fileLevelTypeNames } = context;
 	const optional = typeName.endsWith("?");
 	const base = optional ? typeName.slice(0, -1) : typeName;
 	if (SWIFT_PRIMITIVE_TYPES.has(base)) return typeName;
 	if (base.startsWith("[") && base.endsWith("]")) {
-		const resolved = resolveType(base.slice(1, -1), currentOperation, context, scope);
+		const inner = base.slice(1, -1);
+		const separator = dictionarySeparator(inner);
+		if (separator !== -1) {
+			const key = resolveType(inner.slice(0, separator).trim(), currentOperation, context, scope);
+			const value = resolveType(inner.slice(separator + 1).trim(), currentOperation, context, scope);
+			return optional ? `[${key}: ${value}]?` : `[${key}: ${value}]`;
+		}
+		const resolved = resolveType(inner, currentOperation, context, scope);
 		return optional ? `[${resolved}]?` : `[${resolved}]`;
 	}
 	if (base === "MultipartFile" || base === "ValidationError" || base === "ValidationIssue") {

package/dist/index.cjs

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

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as generateSwiftClient } from "./generator-DfFjWZhf.mjs";
+import { t as generateSwiftClient } from "./generator-DXJbInzN.mjs";
 //#region src/client-target.ts
 /**
 * A Swift client target for `kizuna.config.ts`.

package/package.json

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