@kizunajs/fetch 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/server.cjs

@@ -27,6 +27,15 @@ var TypeCollector = class {
 	}
 };
 const quote = (value) => JSON.stringify(value);
+/**
+* A literal as the type the JSON carries, so `z.literal(true)` is `true`.
+*/
+const literalType = (value) => {
+	if (typeof value === "string") return quote(value);
+	if (typeof value === "bigint") return `${value}n`;
+	if (value === void 0) return "undefined";
+	return String(value);
+};
 const indent$1 = (text, depth = 1) => text.split("\n").map((line) => line.length > 0 ? "    ".repeat(depth) + line : line).join("\n");
 /**
 * A property name, quoted only when it is not a plain identifier.
@@ -159,24 +168,27 @@ const typeOf = (schema, collector, hint) => {
 	const def = (0, kizunajs_generator.readDef)(schema);
 	if (def.type === "nullable" && def.innerType) return `${typeOf(def.innerType, collector, hint)} | null`;
 	if (def.type === "nullish" && def.innerType) return `${typeOf(def.innerType, collector, hint)} | null`;
-	if (def.innerType && def.type !== "object") {
-		const { inner } = (0, kizunajs_generator.unwrapOptionalWrappers)(schema);
-		if (inner !== schema) return typeOf(inner, collector, hint);
-		return typeOf(def.innerType, collector, hint);
-	}
+	if (def.innerType && def.type !== "object") return typeOf(def.innerType, collector, hint);
 	if (def.type === "pipe") {
 		const side = def.out ?? def.in;
 		return side ? typeOf(side, collector, hint) : "unknown";
 	}
 	const modelName = (0, kizunajs_generator.readMetaId)(schema);
-	if (modelName !== void 0 && def.type === "object") {
+	if (modelName !== void 0) {
 		if (collector.claim(modelName)) collector.add({
 			name: modelName,
 			description: (0, kizunajs_generator.readMetaDescription)(schema),
-			body: objectBody(schema, collector, modelName)
+			body: structuralType(schema, collector, modelName)
 		});
 		return modelName;
 	}
+	return structuralType(schema, collector, hint);
+};
+/**
+* The type a schema describes by its shape, its name already spent by the caller.
+*/
+const structuralType = (schema, collector, hint) => {
+	const def = (0, kizunajs_generator.readDef)(schema);
 	switch (def.type) {
 		case "string": return "string";
 		case "number":
@@ -192,11 +204,11 @@ const typeOf = (schema, collector, hint) => {
 		case "undefined": return "undefined";
 		case "literal": {
 			const values = def.values ?? [];
-			return values.length > 0 ? values.map((value) => quote(String(value))).join(" | ") : "never";
+			return values.length > 0 ? values.map(literalType).join(" | ") : "never";
 		}
 		case "enum": {
 			const values = Object.values(def.entries ?? {});
-			return values.length > 0 ? values.map((value) => quote(String(value))).join(" | ") : "never";
+			return values.length > 0 ? values.map(literalType).join(" | ") : "never";
 		}
 		case "array": return def.element ? `Array<${typeOf(def.element, collector, `${hint}Item`)}>` : "unknown[]";
 		case "object": return objectBody(schema, collector, hint);
@@ -247,7 +259,7 @@ const exampleCall = (routeKey, route) => {
 		entries.push(`params: {\n${indent(fields.join("\n"))}\n},`);
 	}
 	if (route.query && requiresArgument(route.query)) entries.push(`query: ${sampleObject(route.query)},`);
-	if (route.body && requiresArgument(route.body)) entries.push(`body: ${sampleValue(route.body)},`);
+	if (route.body && !(0, kizunajs_generator.isVoidSchema)(route.body) && requiresArgument(route.body)) entries.push(`body: ${sampleValue(route.body)},`);
 	return `const result = await client.${routeKey}(${entries.length > 0 ? `{\n${indent(entries.join("\n"))}\n}` : ""});`;
 };
 /**
@@ -293,7 +305,7 @@ const emitRoute = (routeKey, key, route, collector) => {
 		members.push(`export type Query = ${typeOf(route.query, collector, `${namespace}Query`)};`);
 		args.push(`query?: API.${namespace}.Query`);
 	}
-	if (route.body) {
+	if (route.body && !(0, kizunajs_generator.isVoidSchema)(route.body)) {
 		members.push(`export type Body = ${typeOf(route.body, collector, `${namespace}Body`)};`);
 		args.push(`body: API.${namespace}.Body`);
 	}

package/dist/server.mjs

@@ -1,5 +1,5 @@
 import { ValidationErrorSchema } from "kizunajs/schemas";
-import { isBinarySchema, isFileSchema, isStreamResponse, readDef, readDeprecation, readDiscriminatedUnion, readMetaDescription, readMetaExamples, readMetaId, readObjectShape, resolveResponseBody, resolveResponseHeaders, streamContentType, toPascalCase, unwrapOptionalWrappers } from "kizunajs/generator";
+import { isBinarySchema, isFileSchema, isStreamResponse, isVoidSchema, readDef, readDeprecation, readDiscriminatedUnion, readMetaDescription, readMetaExamples, readMetaId, readObjectShape, resolveResponseBody, resolveResponseHeaders, streamContentType, toPascalCase, unwrapOptionalWrappers } from "kizunajs/generator";
 //#region src/zod-to-typescript.ts
 /**
 * Collects the named types a walk produces, so a model shared by many routes is
@@ -26,6 +26,15 @@ var TypeCollector = class {
 	}
 };
 const quote = (value) => JSON.stringify(value);
+/**
+* A literal as the type the JSON carries, so `z.literal(true)` is `true`.
+*/
+const literalType = (value) => {
+	if (typeof value === "string") return quote(value);
+	if (typeof value === "bigint") return `${value}n`;
+	if (value === void 0) return "undefined";
+	return String(value);
+};
 const indent$1 = (text, depth = 1) => text.split("\n").map((line) => line.length > 0 ? "    ".repeat(depth) + line : line).join("\n");
 /**
 * A property name, quoted only when it is not a plain identifier.
@@ -158,24 +167,27 @@ const typeOf = (schema, collector, hint) => {
 	const def = readDef(schema);
 	if (def.type === "nullable" && def.innerType) return `${typeOf(def.innerType, collector, hint)} | null`;
 	if (def.type === "nullish" && def.innerType) return `${typeOf(def.innerType, collector, hint)} | null`;
-	if (def.innerType && def.type !== "object") {
-		const { inner } = unwrapOptionalWrappers(schema);
-		if (inner !== schema) return typeOf(inner, collector, hint);
-		return typeOf(def.innerType, collector, hint);
-	}
+	if (def.innerType && def.type !== "object") return typeOf(def.innerType, collector, hint);
 	if (def.type === "pipe") {
 		const side = def.out ?? def.in;
 		return side ? typeOf(side, collector, hint) : "unknown";
 	}
 	const modelName = readMetaId(schema);
-	if (modelName !== void 0 && def.type === "object") {
+	if (modelName !== void 0) {
 		if (collector.claim(modelName)) collector.add({
 			name: modelName,
 			description: readMetaDescription(schema),
-			body: objectBody(schema, collector, modelName)
+			body: structuralType(schema, collector, modelName)
 		});
 		return modelName;
 	}
+	return structuralType(schema, collector, hint);
+};
+/**
+* The type a schema describes by its shape, its name already spent by the caller.
+*/
+const structuralType = (schema, collector, hint) => {
+	const def = readDef(schema);
 	switch (def.type) {
 		case "string": return "string";
 		case "number":
@@ -191,11 +203,11 @@ const typeOf = (schema, collector, hint) => {
 		case "undefined": return "undefined";
 		case "literal": {
 			const values = def.values ?? [];
-			return values.length > 0 ? values.map((value) => quote(String(value))).join(" | ") : "never";
+			return values.length > 0 ? values.map(literalType).join(" | ") : "never";
 		}
 		case "enum": {
 			const values = Object.values(def.entries ?? {});
-			return values.length > 0 ? values.map((value) => quote(String(value))).join(" | ") : "never";
+			return values.length > 0 ? values.map(literalType).join(" | ") : "never";
 		}
 		case "array": return def.element ? `Array<${typeOf(def.element, collector, `${hint}Item`)}>` : "unknown[]";
 		case "object": return objectBody(schema, collector, hint);
@@ -246,7 +258,7 @@ const exampleCall = (routeKey, route) => {
 		entries.push(`params: {\n${indent(fields.join("\n"))}\n},`);
 	}
 	if (route.query && requiresArgument(route.query)) entries.push(`query: ${sampleObject(route.query)},`);
-	if (route.body && requiresArgument(route.body)) entries.push(`body: ${sampleValue(route.body)},`);
+	if (route.body && !isVoidSchema(route.body) && requiresArgument(route.body)) entries.push(`body: ${sampleValue(route.body)},`);
 	return `const result = await client.${routeKey}(${entries.length > 0 ? `{\n${indent(entries.join("\n"))}\n}` : ""});`;
 };
 /**
@@ -292,7 +304,7 @@ const emitRoute = (routeKey, key, route, collector) => {
 		members.push(`export type Query = ${typeOf(route.query, collector, `${namespace}Query`)};`);
 		args.push(`query?: API.${namespace}.Query`);
 	}
-	if (route.body) {
+	if (route.body && !isVoidSchema(route.body)) {
 		members.push(`export type Body = ${typeOf(route.body, collector, `${namespace}Body`)};`);
 		args.push(`body: API.${namespace}.Body`);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kizunajs/fetch",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "description": "Typed fetch client for Kizuna.js APIs",
   "keywords": [
     "kizunajs",
@@ -68,7 +68,7 @@
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "kizunajs": "2.0.0-beta.2"
+    "kizunajs": "2.0.0-beta.4"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",
@@ -76,8 +76,8 @@
     "tsdown": "^0.21.0",
     "typescript": "^6.0.3",
     "zod": "^4.0.0",
-    "kizunajs": "2.0.0-beta.2",
-    "@kizunajs/express": "2.0.0-beta.2"
+    "kizunajs": "2.0.0-beta.4",
+    "@kizunajs/express": "2.0.0-beta.4"
   },
   "scripts": {
     "build": "tsdown src/index.ts src/server.ts --format esm,cjs --dts --clean --external kizunajs --external zod",