@kizunajs/fetch 2.0.0-beta.1 → 2.0.0-beta.11

package/dist/server.cjs

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let kizunajs_schemas = require("kizunajs/schemas");
 let kizunajs_generator = require("kizunajs/generator");
+let zod = require("zod");
 //#region src/zod-to-typescript.ts
 /**
 * Collects the named types a walk produces, so a model shared by many routes is
@@ -27,6 +28,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 +169,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 +205,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 +260,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}` : ""});`;
 };
 /**
@@ -279,7 +292,7 @@ const routeDoc = (routeKey, route) => {
 	lines.push("@example", exampleCall(routeKey, route));
 	return docComment(lines);
 };
-const emitRoute = (routeKey, key, route, collector) => {
+const emitRoute = (routeKey, key, route, collector, namespaceName) => {
 	const namespace = routeKey.split(".").map(kizunajs_generator.toPascalCase).join("");
 	const members = [];
 	const args = [];
@@ -287,19 +300,19 @@ const emitRoute = (routeKey, key, route, collector) => {
 	if (params.length > 0) {
 		const body = route.pathParams ? typeOf(route.pathParams, collector, `${namespace}Params`) : `{\n${indent(params.map((name) => `${name}: string;`).join("\n"))}\n}`;
 		members.push(`export type Params = ${body};`);
-		args.push(`params: API.${namespace}.Params`);
+		args.push(`params: ${namespaceName}.${namespace}.Params`);
 	}
 	if (route.query) {
 		members.push(`export type Query = ${typeOf(route.query, collector, `${namespace}Query`)};`);
-		args.push(`query?: API.${namespace}.Query`);
+		args.push(`query?: ${namespaceName}.${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`);
+		args.push(`body: ${namespaceName}.${namespace}.Body`);
 	}
 	if (route.headers) {
 		members.push(`export type Headers = ${typeOf(route.headers, collector, `${namespace}Headers`)};`);
-		args.push(`headers?: API.${namespace}.Headers`);
+		args.push(`headers?: ${namespaceName}.${namespace}.Headers`);
 	} else args.push("headers?: Record<string, string>");
 	args.push("fetchOptions?: RequestInit");
 	const validates = route.body !== void 0 || route.query !== void 0;
@@ -323,13 +336,13 @@ const emitRoute = (routeKey, key, route, collector) => {
 	const streams = Object.values(route.responses).some((response) => (0, kizunajs_generator.isStreamResponse)(response));
 	return {
 		namespace,
-		signature: `${routeDoc(routeKey, route)}${key}: ClientMethod<'${route.method}', ${streams}, ${argsType}, API.${namespace}.Result>;`,
+		signature: `${routeDoc(routeKey, route)}${key}: ClientMethod<'${route.method}', ${streams}, ${argsType}, ${namespaceName}.${namespace}.Result>;`,
 		declaration: `export namespace ${namespace} {\n${indent(members.join("\n\n"))}\n}`,
 		table: `${key}: {\n${indent(tableEntries.map((entry) => `${entry},`).join("\n"))}\n},`
 	};
 };
 const isRoute = (value) => !!value && typeof value === "object" && typeof value.method === "string";
-const emitTree = (routes, prefix, collector) => {
+const emitTree = (routes, prefix, collector, namespaceName) => {
 	const signatures = [];
 	const tables = [];
 	const declarations = [];
@@ -337,14 +350,14 @@ const emitTree = (routes, prefix, collector) => {
 		const node = routes[key];
 		const routeKey = prefix ? `${prefix}.${key}` : key;
 		if (isRoute(node)) {
-			const emitted = emitRoute(routeKey, key, node, collector);
+			const emitted = emitRoute(routeKey, key, node, collector, namespaceName);
 			signatures.push(emitted.signature);
 			tables.push(emitted.table);
 			declarations.push(emitted.declaration);
 			continue;
 		}
 		if (node && typeof node === "object") {
-			const group = emitTree(node, routeKey, collector);
+			const group = emitTree(node, routeKey, collector, namespaceName);
 			signatures.push(`${key}: {\n${indent(group.signatures)}\n};`);
 			tables.push(`${key}: {\n${indent(group.table)}\n},`);
 			declarations.push(...group.declarations);
@@ -376,9 +389,9 @@ const emitRequestContext = (contract, collector) => {
 	return fields.length > 0 ? `export interface RequestContext {\n${indent(fields.join("\n"))}\n}` : void 0;
 };
 const generateFetchClient = (contract, options = {}) => {
-	const { runtimeModule = "@kizunajs/fetch", regenerateCommand = "kizuna generate", source } = options;
+	const { namespace: namespaceName = "API", runtimeModule = "@kizunajs/fetch", regenerateCommand = "kizuna generate", source } = options;
 	const collector = new TypeCollector();
-	const tree = emitTree(contract.routes, "", collector);
+	const tree = emitTree((0, kizunajs_generator.listedRoutes)(contract), "", collector, namespaceName);
 	const api = [...collector.all().map((model) => {
 		return `${model.description ? `/**\n * ${model.description}\n */\n` : ""}export type ${model.name} = ${model.body};`;
 	}), ...tree.declarations].join("\n\n");
@@ -394,7 +407,7 @@ ${[
  */
 import { createGeneratedClient, type ClientConfig, type ClientMethod, type GeneratedRoutes } from '${runtimeModule}';
 
-export namespace API {
+export namespace ${namespaceName} {
 ${indent(api)}
 }
 
@@ -421,16 +434,45 @@ export const createClient = (config: ClientConfig & { requestContext?: RequestCo
 };
 //#endregion
 //#region src/client-target.ts
+const FetchClientOptionsSchema = zod.z.object({
+	/**
+	* Name of the generated namespace holding every model and every route's
+	* `Params`, `Query`, `Body`, `Headers` and `Result`.
+	*
+	* @default 'API'
+	*/
+	namespace: zod.z.string().optional(),
+	/**
+	* Module the generated file imports its runtime from.
+	*
+	* @default '@kizunajs/fetch'
+	*/
+	runtimeModule: zod.z.string().optional(),
+	/**
+	* Command the file's header tells a reader to run.
+	*
+	* @default 'kizuna generate'
+	*/
+	regenerateCommand: zod.z.string().optional(),
+	/**
+	* Path to the api this was generated from, relative to the generated
+	* file. Named in the header so tooling can tell when the client has fallen
+	* behind, and so a reader knows where the API is declared.
+	*/
+	source: zod.z.string().optional()
+});
 /**
-* A TypeScript client target for `kizuna.config.ts`.
+* A TypeScript client for `kizuna.config.ts`.
 *
 * @example
-* fetchClient({ output: './packages/api-client/src/generated.ts' });
+* fetchClient({
+*     output: './packages/api-client/src/generated.ts',
+* });
 */
-const fetchClient = ({ output, ...options }) => ({
-	kind: "fetch",
-	output,
-	generate: (contract) => generateFetchClient(contract, options)
+const fetchClient = (0, kizunajs_generator.defineClient)({
+	target: "fetch",
+	options: FetchClientOptionsSchema,
+	generate: ({ options, api }) => ({ finalize: () => generateFetchClient(api, options) })
 });
 //#endregion
 exports.fetchClient = fetchClient;

package/dist/server.d.cts

@@ -1,10 +1,20 @@
-import { ApiDefinition, ClientTarget } from "kizunajs";
+import { z } from "zod";
+import * as _$kizunajs from "kizunajs";
+import { ApiDefinition } from "kizunajs";
+import { GeneratedFileOptions } from "kizunajs/generator";
 
 //#region src/generator.d.ts
 /**
  * What a generated client is called and where its runtime comes from.
  */
 interface FetchClientOptions {
+  /**
+   * Name of the generated namespace holding every model and every route's
+   * `Params`, `Query`, `Body`, `Headers` and `Result`.
+   *
+   * @default 'API'
+   */
+  namespace?: string;
   /**
    * Module the generated file imports its runtime from.
    *
@@ -27,24 +37,29 @@ interface FetchClientOptions {
 declare const generateFetchClient: (contract: ApiDefinition, options?: FetchClientOptions) => string;
 //#endregion
 //#region src/client-target.d.ts
+declare const FetchClientOptionsSchema: z.ZodObject<{
+  namespace: z.ZodOptional<z.ZodString>;
+  runtimeModule: z.ZodOptional<z.ZodString>;
+  regenerateCommand: z.ZodOptional<z.ZodString>;
+  source: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
 /**
  * Where a generated TypeScript client is written.
  */
-interface FetchClientTargetOptions extends FetchClientOptions {
-  /**
-   * Path the generated file is written to.
-   */
-  output: string;
-}
+type FetchClientTargetOptions = z.input<typeof FetchClientOptionsSchema> & GeneratedFileOptions;
 /**
- * A TypeScript client target for `kizuna.config.ts`.
+ * A TypeScript client for `kizuna.config.ts`.
  *
  * @example
- * fetchClient({ output: './packages/api-client/src/generated.ts' });
+ * fetchClient({
+ *     output: './packages/api-client/src/generated.ts',
+ * });
  */
-declare const fetchClient: ({
-  output,
-  ...options
-}: FetchClientTargetOptions) => ClientTarget;
+declare const fetchClient: (options: {
+  namespace?: string | undefined;
+  runtimeModule?: string | undefined;
+  regenerateCommand?: string | undefined;
+  source?: string | undefined;
+} & GeneratedFileOptions) => _$kizunajs.GeneratedFile;
 //#endregion
 export { type FetchClientOptions, type FetchClientTargetOptions, fetchClient, generateFetchClient };

package/dist/server.d.mts

@@ -1,10 +1,20 @@
-import { ApiDefinition, ClientTarget } from "kizunajs";
+import * as _$kizunajs from "kizunajs";
+import { ApiDefinition } from "kizunajs";
+import { GeneratedFileOptions } from "kizunajs/generator";
+import { z } from "zod";
 
 //#region src/generator.d.ts
 /**
  * What a generated client is called and where its runtime comes from.
  */
 interface FetchClientOptions {
+  /**
+   * Name of the generated namespace holding every model and every route's
+   * `Params`, `Query`, `Body`, `Headers` and `Result`.
+   *
+   * @default 'API'
+   */
+  namespace?: string;
   /**
    * Module the generated file imports its runtime from.
    *
@@ -27,24 +37,29 @@ interface FetchClientOptions {
 declare const generateFetchClient: (contract: ApiDefinition, options?: FetchClientOptions) => string;
 //#endregion
 //#region src/client-target.d.ts
+declare const FetchClientOptionsSchema: z.ZodObject<{
+  namespace: z.ZodOptional<z.ZodString>;
+  runtimeModule: z.ZodOptional<z.ZodString>;
+  regenerateCommand: z.ZodOptional<z.ZodString>;
+  source: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
 /**
  * Where a generated TypeScript client is written.
  */
-interface FetchClientTargetOptions extends FetchClientOptions {
-  /**
-   * Path the generated file is written to.
-   */
-  output: string;
-}
+type FetchClientTargetOptions = z.input<typeof FetchClientOptionsSchema> & GeneratedFileOptions;
 /**
- * A TypeScript client target for `kizuna.config.ts`.
+ * A TypeScript client for `kizuna.config.ts`.
  *
  * @example
- * fetchClient({ output: './packages/api-client/src/generated.ts' });
+ * fetchClient({
+ *     output: './packages/api-client/src/generated.ts',
+ * });
  */
-declare const fetchClient: ({
-  output,
-  ...options
-}: FetchClientTargetOptions) => ClientTarget;
+declare const fetchClient: (options: {
+  namespace?: string | undefined;
+  runtimeModule?: string | undefined;
+  regenerateCommand?: string | undefined;
+  source?: string | undefined;
+} & GeneratedFileOptions) => _$kizunajs.GeneratedFile;
 //#endregion
 export { type FetchClientOptions, type FetchClientTargetOptions, fetchClient, generateFetchClient };

package/dist/server.mjs

@@ -1,5 +1,6 @@
 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 { defineClient, isBinarySchema, isFileSchema, isStreamResponse, isVoidSchema, listedRoutes, readDef, readDeprecation, readDiscriminatedUnion, readMetaDescription, readMetaExamples, readMetaId, readObjectShape, resolveResponseBody, resolveResponseHeaders, streamContentType, toPascalCase, unwrapOptionalWrappers } from "kizunajs/generator";
+import { z } from "zod";
 //#region src/zod-to-typescript.ts
 /**
 * Collects the named types a walk produces, so a model shared by many routes is
@@ -26,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.
@@ -158,24 +168,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 +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);
@@ -246,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 && !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}` : ""});`;
 };
 /**
@@ -278,7 +291,7 @@ const routeDoc = (routeKey, route) => {
 	lines.push("@example", exampleCall(routeKey, route));
 	return docComment(lines);
 };
-const emitRoute = (routeKey, key, route, collector) => {
+const emitRoute = (routeKey, key, route, collector, namespaceName) => {
 	const namespace = routeKey.split(".").map(toPascalCase).join("");
 	const members = [];
 	const args = [];
@@ -286,19 +299,19 @@ const emitRoute = (routeKey, key, route, collector) => {
 	if (params.length > 0) {
 		const body = route.pathParams ? typeOf(route.pathParams, collector, `${namespace}Params`) : `{\n${indent(params.map((name) => `${name}: string;`).join("\n"))}\n}`;
 		members.push(`export type Params = ${body};`);
-		args.push(`params: API.${namespace}.Params`);
+		args.push(`params: ${namespaceName}.${namespace}.Params`);
 	}
 	if (route.query) {
 		members.push(`export type Query = ${typeOf(route.query, collector, `${namespace}Query`)};`);
-		args.push(`query?: API.${namespace}.Query`);
+		args.push(`query?: ${namespaceName}.${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`);
+		args.push(`body: ${namespaceName}.${namespace}.Body`);
 	}
 	if (route.headers) {
 		members.push(`export type Headers = ${typeOf(route.headers, collector, `${namespace}Headers`)};`);
-		args.push(`headers?: API.${namespace}.Headers`);
+		args.push(`headers?: ${namespaceName}.${namespace}.Headers`);
 	} else args.push("headers?: Record<string, string>");
 	args.push("fetchOptions?: RequestInit");
 	const validates = route.body !== void 0 || route.query !== void 0;
@@ -322,13 +335,13 @@ const emitRoute = (routeKey, key, route, collector) => {
 	const streams = Object.values(route.responses).some((response) => isStreamResponse(response));
 	return {
 		namespace,
-		signature: `${routeDoc(routeKey, route)}${key}: ClientMethod<'${route.method}', ${streams}, ${argsType}, API.${namespace}.Result>;`,
+		signature: `${routeDoc(routeKey, route)}${key}: ClientMethod<'${route.method}', ${streams}, ${argsType}, ${namespaceName}.${namespace}.Result>;`,
 		declaration: `export namespace ${namespace} {\n${indent(members.join("\n\n"))}\n}`,
 		table: `${key}: {\n${indent(tableEntries.map((entry) => `${entry},`).join("\n"))}\n},`
 	};
 };
 const isRoute = (value) => !!value && typeof value === "object" && typeof value.method === "string";
-const emitTree = (routes, prefix, collector) => {
+const emitTree = (routes, prefix, collector, namespaceName) => {
 	const signatures = [];
 	const tables = [];
 	const declarations = [];
@@ -336,14 +349,14 @@ const emitTree = (routes, prefix, collector) => {
 		const node = routes[key];
 		const routeKey = prefix ? `${prefix}.${key}` : key;
 		if (isRoute(node)) {
-			const emitted = emitRoute(routeKey, key, node, collector);
+			const emitted = emitRoute(routeKey, key, node, collector, namespaceName);
 			signatures.push(emitted.signature);
 			tables.push(emitted.table);
 			declarations.push(emitted.declaration);
 			continue;
 		}
 		if (node && typeof node === "object") {
-			const group = emitTree(node, routeKey, collector);
+			const group = emitTree(node, routeKey, collector, namespaceName);
 			signatures.push(`${key}: {\n${indent(group.signatures)}\n};`);
 			tables.push(`${key}: {\n${indent(group.table)}\n},`);
 			declarations.push(...group.declarations);
@@ -375,9 +388,9 @@ const emitRequestContext = (contract, collector) => {
 	return fields.length > 0 ? `export interface RequestContext {\n${indent(fields.join("\n"))}\n}` : void 0;
 };
 const generateFetchClient = (contract, options = {}) => {
-	const { runtimeModule = "@kizunajs/fetch", regenerateCommand = "kizuna generate", source } = options;
+	const { namespace: namespaceName = "API", runtimeModule = "@kizunajs/fetch", regenerateCommand = "kizuna generate", source } = options;
 	const collector = new TypeCollector();
-	const tree = emitTree(contract.routes, "", collector);
+	const tree = emitTree(listedRoutes(contract), "", collector, namespaceName);
 	const api = [...collector.all().map((model) => {
 		return `${model.description ? `/**\n * ${model.description}\n */\n` : ""}export type ${model.name} = ${model.body};`;
 	}), ...tree.declarations].join("\n\n");
@@ -393,7 +406,7 @@ ${[
  */
 import { createGeneratedClient, type ClientConfig, type ClientMethod, type GeneratedRoutes } from '${runtimeModule}';
 
-export namespace API {
+export namespace ${namespaceName} {
 ${indent(api)}
 }
 
@@ -418,18 +431,44 @@ export const createClient = (config: ClientConfig & { requestContext?: RequestCo
     createGeneratedClient(routes, config) as unknown as Client;`}
 `;
 };
-//#endregion
-//#region src/client-target.ts
 /**
-* A TypeScript client target for `kizuna.config.ts`.
+* A TypeScript client for `kizuna.config.ts`.
 *
 * @example
-* fetchClient({ output: './packages/api-client/src/generated.ts' });
+* fetchClient({
+*     output: './packages/api-client/src/generated.ts',
+* });
 */
-const fetchClient = ({ output, ...options }) => ({
-	kind: "fetch",
-	output,
-	generate: (contract) => generateFetchClient(contract, options)
+const fetchClient = defineClient({
+	target: "fetch",
+	options: z.object({
+		/**
+		* Name of the generated namespace holding every model and every route's
+		* `Params`, `Query`, `Body`, `Headers` and `Result`.
+		*
+		* @default 'API'
+		*/
+		namespace: z.string().optional(),
+		/**
+		* Module the generated file imports its runtime from.
+		*
+		* @default '@kizunajs/fetch'
+		*/
+		runtimeModule: z.string().optional(),
+		/**
+		* Command the file's header tells a reader to run.
+		*
+		* @default 'kizuna generate'
+		*/
+		regenerateCommand: z.string().optional(),
+		/**
+		* Path to the api this was generated from, relative to the generated
+		* file. Named in the header so tooling can tell when the client has fallen
+		* behind, and so a reader knows where the API is declared.
+		*/
+		source: z.string().optional()
+	}),
+	generate: ({ options, api }) => ({ finalize: () => generateFetchClient(api, options) })
 });
 //#endregion
 export { fetchClient, generateFetchClient };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kizunajs/fetch",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.11",
   "description": "Typed fetch client for Kizuna.js APIs",
   "keywords": [
     "kizunajs",
@@ -68,7 +68,7 @@
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "kizunajs": "2.0.0-beta.1"
+    "kizunajs": "2.0.0-beta.11"
   },
   "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.1",
-    "@kizunajs/express": "2.0.0-beta.1"
+    "kizunajs": "2.0.0-beta.11",
+    "@kizunajs/express": "2.0.0-beta.11"
   },
   "scripts": {
     "build": "tsdown src/index.ts src/server.ts --format esm,cjs --dts --clean --external kizunajs --external zod",