@kizunajs/fetch 2.0.0-beta.21 → 2.0.0-beta.23

package/dist/index.cjs

@@ -10,10 +10,13 @@ let zod = require("zod");
 */
 const runtimeSource = String.raw`/**
  * What the client knows about one response: nothing for a body it reads as
- * JSON, the media type for one that streams.
+ * JSON, how to read one that is not, the media type for one that streams.
  */
 export type GeneratedResponse =
     | Record<string, never>
+    | {
+          read: 'bytes' | 'text';
+      }
     | {
           stream: true;
           contentType: string;
@@ -488,6 +491,13 @@ const buildMethod = (route: GeneratedRoute, config: ClientConfig) => {
                 headers: responseHeaders,
             };
         }
+        if (declared !== undefined && 'read' in declared) {
+            return {
+                status: response.status,
+                body: declared.read === 'bytes' ? new Uint8Array(await response.arrayBuffer()) : await response.text(),
+                headers: responseHeaders,
+            };
+        }
         const text = await response.text();
         return {
             status: response.status,
@@ -776,6 +786,8 @@ const unbrandedTypeOf = (schema, collector, hint) => {
 		const side = collector.readsInput() ? def.in : def.out ?? def.in;
 		return side ? typeOf(side, collector, hint) : "unknown";
 	}
+	const model = (0, kizunajs_generator.readModelSchema)(schema);
+	if (model !== void 0 && model !== schema) return unbrandedTypeOf(model, collector, hint);
 	const modelName = (0, kizunajs_generator.readMetaId)(schema);
 	if (modelName !== void 0) {
 		if (collector.claim(modelName)) collector.add({
@@ -940,7 +952,7 @@ const emitRoute = (routeKey, key, route, collector, namespaceName) => {
 	const argsType = `{\n${indent(args.map((arg) => `${arg};`).join("\n"))}\n}`;
 	const tableEntries = [`method: '${route.method}'`, `path: '${route.path}'`];
 	if (route.contentType) tableEntries.push(`contentType: '${route.contentType}'`);
-	const responses = Object.entries(route.responses).map(([status, response]) => (0, kizunajs_generator.isStreamResponse)(response) ? `${status}: { stream: true, contentType: '${(0, kizunajs_generator.streamContentType)(response)}' }` : `${status}: {}`);
+	const responses = Object.entries(route.responses).map(([status, response]) => (0, kizunajs_generator.isStreamResponse)(response) ? `${status}: { stream: true, contentType: '${(0, kizunajs_generator.streamContentType)(response)}' }` : `${status}: ${readEntry(response)}`);
 	if (validationBody && !declaredBadRequest) responses.push("400: {}");
 	tableEntries.push(`responses: {\n${indent(responses.map((entry) => `${entry},`).join("\n"))}\n}`);
 	const streams = Object.values(route.responses).some((response) => (0, kizunajs_generator.isStreamResponse)(response));
@@ -951,6 +963,16 @@ const emitRoute = (routeKey, key, route, collector, namespaceName) => {
 		table: `${key}: {\n${indent(tableEntries.map((entry) => `${entry},`).join("\n"))}\n},`
 	};
 };
+/**
+* How the client reads a body that does not stream: as bytes for a binary schema, as text for any other media type than
+* JSON, as JSON otherwise.
+*/
+const readEntry = (response) => {
+	const schema = (0, kizunajs_generator.resolveResponseBody)(response);
+	if (schema && (0, kizunajs_generator.isBinarySchema)(schema)) return `{ read: 'bytes' }`;
+	const contentType = (0, kizunajs_generator.resolveResponseContentType)(response);
+	return contentType !== void 0 && !(0, kizunajs_generator.isJsonMediaType)(contentType) ? `{ read: 'text' }` : "{}";
+};
 const isRoute = (value) => !!value && typeof value === "object" && typeof value.method === "string";
 const emitTree = (routes, prefix, collector, namespaceName) => {
 	const signatures = [];

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { ValidationErrorSchema } from "kizunajs/schemas";
-import { defineClient, isBinarySchema, isFileSchema, isStreamResponse, isVoidSchema, listedRoutes, readDef, readDeprecation, readDiscriminatedUnion, readMetaBrand, readMetaDescription, readMetaExamples, readMetaId, readObjectShape, resolveResponseBody, resolveResponseHeaders, sanitizeIdentifier, streamContentType, streamMode, toPascalCase, unwrapOptionalWrappers } from "kizunajs/generator";
+import { defineClient, isBinarySchema, isFileSchema, isJsonMediaType, isStreamResponse, isVoidSchema, listedRoutes, readDef, readDeprecation, readDiscriminatedUnion, readMetaBrand, readMetaDescription, readMetaExamples, readMetaId, readModelSchema, readObjectShape, resolveResponseBody, resolveResponseContentType, resolveResponseHeaders, sanitizeIdentifier, streamContentType, streamMode, toPascalCase, unwrapOptionalWrappers } from "kizunajs/generator";
 import { z } from "zod";
 //#region src/runtime.ts
 /**
@@ -9,10 +9,13 @@ import { z } from "zod";
 */
 const runtimeSource = String.raw`/**
  * What the client knows about one response: nothing for a body it reads as
- * JSON, the media type for one that streams.
+ * JSON, how to read one that is not, the media type for one that streams.
  */
 export type GeneratedResponse =
     | Record<string, never>
+    | {
+          read: 'bytes' | 'text';
+      }
     | {
           stream: true;
           contentType: string;
@@ -487,6 +490,13 @@ const buildMethod = (route: GeneratedRoute, config: ClientConfig) => {
                 headers: responseHeaders,
             };
         }
+        if (declared !== undefined && 'read' in declared) {
+            return {
+                status: response.status,
+                body: declared.read === 'bytes' ? new Uint8Array(await response.arrayBuffer()) : await response.text(),
+                headers: responseHeaders,
+            };
+        }
         const text = await response.text();
         return {
             status: response.status,
@@ -775,6 +785,8 @@ const unbrandedTypeOf = (schema, collector, hint) => {
 		const side = collector.readsInput() ? def.in : def.out ?? def.in;
 		return side ? typeOf(side, collector, hint) : "unknown";
 	}
+	const model = readModelSchema(schema);
+	if (model !== void 0 && model !== schema) return unbrandedTypeOf(model, collector, hint);
 	const modelName = readMetaId(schema);
 	if (modelName !== void 0) {
 		if (collector.claim(modelName)) collector.add({
@@ -939,7 +951,7 @@ const emitRoute = (routeKey, key, route, collector, namespaceName) => {
 	const argsType = `{\n${indent(args.map((arg) => `${arg};`).join("\n"))}\n}`;
 	const tableEntries = [`method: '${route.method}'`, `path: '${route.path}'`];
 	if (route.contentType) tableEntries.push(`contentType: '${route.contentType}'`);
-	const responses = Object.entries(route.responses).map(([status, response]) => isStreamResponse(response) ? `${status}: { stream: true, contentType: '${streamContentType(response)}' }` : `${status}: {}`);
+	const responses = Object.entries(route.responses).map(([status, response]) => isStreamResponse(response) ? `${status}: { stream: true, contentType: '${streamContentType(response)}' }` : `${status}: ${readEntry(response)}`);
 	if (validationBody && !declaredBadRequest) responses.push("400: {}");
 	tableEntries.push(`responses: {\n${indent(responses.map((entry) => `${entry},`).join("\n"))}\n}`);
 	const streams = Object.values(route.responses).some((response) => isStreamResponse(response));
@@ -950,6 +962,16 @@ const emitRoute = (routeKey, key, route, collector, namespaceName) => {
 		table: `${key}: {\n${indent(tableEntries.map((entry) => `${entry},`).join("\n"))}\n},`
 	};
 };
+/**
+* How the client reads a body that does not stream: as bytes for a binary schema, as text for any other media type than
+* JSON, as JSON otherwise.
+*/
+const readEntry = (response) => {
+	const schema = resolveResponseBody(response);
+	if (schema && isBinarySchema(schema)) return `{ read: 'bytes' }`;
+	const contentType = resolveResponseContentType(response);
+	return contentType !== void 0 && !isJsonMediaType(contentType) ? `{ read: 'text' }` : "{}";
+};
 const isRoute = (value) => !!value && typeof value === "object" && typeof value.method === "string";
 const emitTree = (routes, prefix, collector, namespaceName) => {
 	const signatures = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kizunajs/fetch",
-  "version": "2.0.0-beta.21",
+  "version": "2.0.0-beta.23",
   "description": "Fetch client generation for Kizuna.js APIs",
   "keywords": [
     "kizunajs",
@@ -56,12 +56,12 @@
     "access": "public"
   },
   "peerDependencies": {
-    "kizunajs": "2.0.0-beta.21",
+    "kizunajs": "2.0.0-beta.23",
     "zod": "^4.0.0"
   },
   "devDependencies": {
-    "kizunajs": "2.0.0-beta.21",
-    "@kizunajs/express": "2.0.0-beta.21",
+    "kizunajs": "2.0.0-beta.23",
+    "@kizunajs/express": "2.0.0-beta.23",
     "@types/express": "^5.0.0",
     "express": "^5.0.0",
     "tsdown": "^0.21.0",