@kizunajs/fetch 2.0.0-beta.10 → 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
@@ -390,7 +391,7 @@ const emitRequestContext = (contract, collector) => {
 const generateFetchClient = (contract, options = {}) => {
 	const { namespace: namespaceName = "API", runtimeModule = "@kizunajs/fetch", regenerateCommand = "kizuna generate", source } = options;
 	const collector = new TypeCollector();
-	const tree = emitTree(contract.routes, "", collector, namespaceName);
+	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");
@@ -433,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,4 +1,7 @@
-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
 /**
@@ -34,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,4 +1,7 @@
-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
 /**
@@ -34,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, isVoidSchema, 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
@@ -389,7 +390,7 @@ const emitRequestContext = (contract, collector) => {
 const generateFetchClient = (contract, options = {}) => {
 	const { namespace: namespaceName = "API", runtimeModule = "@kizunajs/fetch", regenerateCommand = "kizuna generate", source } = options;
 	const collector = new TypeCollector();
-	const tree = emitTree(contract.routes, "", collector, namespaceName);
+	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");
@@ -430,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.10",
+  "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.10"
+    "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/express": "2.0.0-beta.10",
-    "kizunajs": "2.0.0-beta.10"
+    "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",