typed-openapi 1.5.1 → 2.0.1

package/dist/chunk-GD55PFNE.js

@@ -0,0 +1,208 @@
+import {
+  DEFAULT_ERROR_STATUS_CODES,
+  DEFAULT_SUCCESS_STATUS_CODES,
+  allowedRuntimes,
+  generateFile,
+  generateTanstackQueryFile,
+  mapOpenApiEndpoints
+} from "./chunk-4EZJSCLI.js";
+import {
+  prettify
+} from "./chunk-KAEXXJ7X.js";
+
+// src/generate-client-files.ts
+import SwaggerParser from "@apidevtools/swagger-parser";
+import { basename, join, dirname, isAbsolute } from "pathe";
+import { type } from "arktype";
+import { mkdir, writeFile } from "fs/promises";
+
+// src/default-fetcher.generator.ts
+var generateDefaultFetcher = (options) => {
+  const {
+    envApiBaseUrl = "API_BASE_URL",
+    clientPath = "./openapi.client.ts",
+    fetcherName = "defaultFetcher",
+    apiName = "api"
+  } = options;
+  return `/**
+ * Generic API Client for typed-openapi generated code
+ *
+ * This is a simple, production-ready wrapper that you can copy and customize.
+ * It handles:
+ * - Path parameter replacement
+ * - Query parameter serialization
+ * - JSON request/response handling
+ * - Basic error handling
+ *
+ * Usage:
+ * 1. Replace './generated/api' with your actual generated file path
+ * 2. Set your ${envApiBaseUrl}
+ * 3. Customize error handling and headers as needed
+ */
+
+// @ts-ignore
+import { type Fetcher, createApiClient } from "./${clientPath}";
+
+// Basic configuration
+const ${envApiBaseUrl} = process.env["${envApiBaseUrl}"] || "https://api.example.com";
+
+/**
+ * Simple fetcher implementation without external dependencies
+ */
+export const ${fetcherName}: Fetcher = async (method, apiUrl, params) => {
+  const headers = new Headers();
+
+  // Replace path parameters (supports both {param} and :param formats)
+  const actualUrl = replacePathParams(apiUrl, (params?.path ?? {}) as Record<string, string>);
+  const url = new URL(actualUrl);
+
+  // Handle query parameters
+  if (params?.query) {
+    const searchParams = new URLSearchParams();
+    Object.entries(params.query).forEach(([key, value]) => {
+      if (value != null) {
+        // Skip null/undefined values
+        if (Array.isArray(value)) {
+          value.forEach((val) => val != null && searchParams.append(key, String(val)));
+        } else {
+          searchParams.append(key, String(value));
+        }
+      }
+    });
+    url.search = searchParams.toString();
+  }
+
+  // Handle request body for mutation methods
+  const body = ["post", "put", "patch", "delete"].includes(method.toLowerCase())
+    ? JSON.stringify(params?.body)
+    : undefined;
+
+  if (body) {
+    headers.set("Content-Type", "application/json");
+  }
+
+  // Add custom headers
+  if (params?.header) {
+    Object.entries(params.header).forEach(([key, value]) => {
+      if (value != null) {
+        headers.set(key, String(value));
+      }
+    });
+  }
+
+  const response = await fetch(url, {
+    method: method.toUpperCase(),
+    ...(body && { body }),
+    headers,
+  });
+
+  return response;
+};
+
+/**
+ * Replace path parameters in URL
+ * Supports both OpenAPI format {param} and Express format :param
+ */
+export function replacePathParams(url: string, params: Record<string, string>): string {
+  return url
+    .replace(/{(\\w+)}/g, function(_, key) { return params[key] || '{' + key + '}'; })
+    .replace(/:([a-zA-Z0-9_]+)/g, function(_, key) { return params[key] || ':' + key; });
+}
+
+export const ${apiName} = createApiClient(${fetcherName}, API_BASE_URL);
+`;
+};
+
+// src/generate-client-files.ts
+var cwd = process.cwd();
+var now = /* @__PURE__ */ new Date();
+async function ensureDir(dirPath) {
+  try {
+    await mkdir(dirPath, { recursive: true });
+  } catch (error) {
+    console.error(`Error ensuring directory: ${error.message}`);
+  }
+}
+var optionsSchema = type({
+  "output?": "string",
+  runtime: allowedRuntimes,
+  tanstack: "boolean | string",
+  "defaultFetcher?": type({
+    "envApiBaseUrl?": "string",
+    "clientPath?": "string",
+    "fetcherName?": "string",
+    "apiName?": "string"
+  }),
+  schemasOnly: "boolean",
+  "includeClient?": "boolean | 'true' | 'false'",
+  "successStatusCodes?": "string",
+  "errorStatusCodes?": "string"
+});
+async function generateClientFiles(input, options) {
+  const openApiDoc = await SwaggerParser.bundle(input);
+  const ctx = mapOpenApiEndpoints(openApiDoc, options);
+  console.log(`Found ${ctx.endpointList.length} endpoints`);
+  const successStatusCodes = options.successStatusCodes ? options.successStatusCodes.split(",").map((code) => parseInt(code.trim(), 10)) : void 0;
+  const errorStatusCodes = options.errorStatusCodes ? options.errorStatusCodes.split(",").map((code) => parseInt(code.trim(), 10)) : void 0;
+  const includeClient = options.includeClient === "false" ? false : options.includeClient === "true" ? true : options.includeClient;
+  const generatorOptions = {
+    ...ctx,
+    runtime: options.runtime,
+    schemasOnly: options.schemasOnly,
+    nameTransform: options.nameTransform,
+    includeClient: includeClient ?? true,
+    successStatusCodes: successStatusCodes ?? DEFAULT_SUCCESS_STATUS_CODES,
+    errorStatusCodes: errorStatusCodes ?? DEFAULT_ERROR_STATUS_CODES
+  };
+  const content = await prettify(generateFile(generatorOptions));
+  const outputPath = join(
+    cwd,
+    options.output ?? input + `.${options.runtime === "none" ? "client" : options.runtime}.ts`
+  );
+  console.log("Generating client...", outputPath);
+  await ensureDir(dirname(outputPath));
+  await writeFile(outputPath, content);
+  if (options.tanstack) {
+    const tanstackContent = await generateTanstackQueryFile({
+      ...generatorOptions,
+      relativeApiClientPath: "./" + basename(outputPath)
+    });
+    let tanstackOutputPath;
+    if (typeof options.tanstack === "string" && isAbsolute(options.tanstack)) {
+      tanstackOutputPath = options.tanstack;
+    } else {
+      tanstackOutputPath = join(
+        dirname(outputPath),
+        typeof options.tanstack === "string" ? options.tanstack : `tanstack.client.ts`
+      );
+    }
+    console.log("Generating tanstack client...", tanstackOutputPath);
+    await ensureDir(dirname(tanstackOutputPath));
+    await writeFile(tanstackOutputPath, tanstackContent);
+  }
+  if (options.defaultFetcher) {
+    const defaultFetcherContent = generateDefaultFetcher({
+      envApiBaseUrl: options.defaultFetcher.envApiBaseUrl,
+      clientPath: options.defaultFetcher.clientPath ?? basename(outputPath),
+      fetcherName: options.defaultFetcher.fetcherName,
+      apiName: options.defaultFetcher.apiName
+    });
+    let defaultFetcherOutputPath;
+    if (typeof options.defaultFetcher === "string" && isAbsolute(options.defaultFetcher)) {
+      defaultFetcherOutputPath = options.defaultFetcher;
+    } else {
+      defaultFetcherOutputPath = join(
+        dirname(outputPath),
+        typeof options.defaultFetcher === "string" ? options.defaultFetcher : `api.client.ts`
+      );
+    }
+    console.log("Generating default fetcher...", defaultFetcherOutputPath);
+    await ensureDir(dirname(defaultFetcherOutputPath));
+    await writeFile(defaultFetcherOutputPath, defaultFetcherContent);
+  }
+  console.log(`Done in ${(/* @__PURE__ */ new Date()).getTime() - now.getTime()}ms !`);
+}
+
+export {
+  generateClientFiles
+};

package/dist/cli.js

@@ -1,9 +1,9 @@
 import {
   generateClientFiles
-} from "./chunk-O7DZWQK4.js";
+} from "./chunk-GD55PFNE.js";
 import {
   allowedRuntimes
-} from "./chunk-OVT6OLBK.js";
+} from "./chunk-4EZJSCLI.js";
 import "./chunk-KAEXXJ7X.js";
 
 // src/cli.ts
@@ -12,12 +12,18 @@ import { readFileSync } from "fs";
 var { name, version } = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
 var cli = cac(name);
 cli.command("<input>", "Generate").option("-o, --output <path>", "Output path for the api client ts file (defaults to `<input>.<runtime>.ts`)").option(
-  "-r, --runtime <name>",
+  "-r, --runtime <n>",
   `Runtime to use for validation; defaults to \`none\`; available: ${allowedRuntimes.toString()}`,
   { default: "none" }
-).option("--schemas-only", "Only generate schemas, skipping client generation (defaults to false)", { default: false }).option(
+).option("--schemas-only", "Only generate schemas, skipping client generation (defaults to false)", { default: false }).option("--include-client", "Include API client types and implementation (defaults to true)", { default: true }).option(
+  "--success-status-codes <codes>",
+  "Comma-separated list of success status codes (defaults to 2xx and 3xx ranges)"
+).option("--error-status-codes <codes>", "Comma-separated list of error status codes (defaults to 4xx and 5xx ranges)").option(
   "--tanstack [name]",
-  "Generate tanstack client, defaults to false, can optionally specify a name for the generated file"
+  "Generate tanstack client, defaults to false, can optionally specify a name (will be generated next to the main file) or absolute path for the generated file"
+).option(
+  "--default-fetcher [name]",
+  "Generate default fetcher, defaults to false, can optionally specify a name (will be generated next to the main file) or absolute path for the generated file"
 ).action(async (input, _options) => {
   return generateClientFiles(input, _options);
 });

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { ReferenceObject } from 'openapi3-ts/oas31';
-import { S as StringOrBox, O as OpenapiSchemaConvertContext, L as LibSchemaObject, B as BoxFactory, m as mapOpenApiEndpoints, N as NameTransformOptions, a as OpenapiSchemaConvertArgs, b as Box, A as AnyBoxDef } from './types-DLE5RaXi.js';
-export { q as AnyBox, j as BoxArray, f as BoxDefinition, i as BoxIntersection, o as BoxKeyword, n as BoxLiteral, p as BoxObject, k as BoxOptional, g as BoxParams, l as BoxRef, h as BoxUnion, c as Endpoint, E as EndpointParameters, F as FactoryCreator, G as GenericFactory, M as Method, R as RefInfo, e as RefResolver, W as WithSchema, d as createRefResolver } from './types-DLE5RaXi.js';
+import { S as StringOrBox, O as OpenapiSchemaConvertContext, L as LibSchemaObject, B as BoxFactory, m as mapOpenApiEndpoints, N as NameTransformOptions, a as OpenapiSchemaConvertArgs, b as Box, A as AnyBoxDef } from './types-DsI2d-HE.js';
+export { q as AnyBox, j as BoxArray, f as BoxDefinition, i as BoxIntersection, o as BoxKeyword, n as BoxLiteral, p as BoxObject, k as BoxOptional, g as BoxParams, l as BoxRef, h as BoxUnion, c as Endpoint, E as EndpointParameters, F as FactoryCreator, G as GenericFactory, M as Method, R as RefInfo, e as RefResolver, W as WithSchema, d as createRefResolver } from './types-DsI2d-HE.js';
 import * as arktype_internal_methods_string_ts from 'arktype/internal/methods/string.ts';
 import * as Codegen from '@sinclair/typebox-codegen';
 import 'openapi3-ts/oas30';
@@ -16,6 +16,9 @@ type GeneratorOptions$1 = ReturnType<typeof mapOpenApiEndpoints> & {
     runtime?: "none" | keyof typeof runtimeValidationGenerator;
     schemasOnly?: boolean;
     nameTransform?: NameTransformOptions | undefined;
+    successStatusCodes?: readonly number[];
+    errorStatusCodes?: readonly number[];
+    includeClient?: boolean;
 };
 declare const allowedRuntimes: arktype_internal_methods_string_ts.StringType<"none" | "arktype" | "io-ts" | "typebox" | "valibot" | "yup" | "zod", {}>;
 type OutputRuntime = typeof allowedRuntimes.infer;
@@ -30,7 +33,9 @@ declare const runtimeValidationGenerator: {
 declare const generateFile: (options: GeneratorOptions$1) => string;
 
 type GeneratorOptions = ReturnType<typeof mapOpenApiEndpoints>;
-type GeneratorContext = Required<GeneratorOptions>;
+type GeneratorContext = Required<GeneratorOptions> & {
+    errorStatusCodes?: readonly number[];
+};
 declare const generateTanstackQueryFile: (ctx: GeneratorContext & {
     relativeApiClientPath: string;
 }) => Promise<string>;

package/dist/index.js

@@ -8,7 +8,7 @@ import {
   openApiSchemaToTs,
   tsFactory,
   unwrap
-} from "./chunk-OVT6OLBK.js";
+} from "./chunk-4EZJSCLI.js";
 import "./chunk-KAEXXJ7X.js";
 export {
   createBoxFactory,

package/dist/node.export.d.ts

@@ -1,5 +1,5 @@
 import * as arktype_internal_methods_object_ts from 'arktype/internal/methods/object.ts';
-import { N as NameTransformOptions } from './types-DLE5RaXi.js';
+import { N as NameTransformOptions } from './types-DsI2d-HE.js';
 import 'openapi3-ts/oas31';
 import 'openapi3-ts/oas30';
 
@@ -8,6 +8,15 @@ declare const optionsSchema: arktype_internal_methods_object_ts.ObjectType<{
     tanstack: string | boolean;
     schemasOnly: boolean;
     output?: string;
+    defaultFetcher?: {
+        envApiBaseUrl?: string;
+        clientPath?: string;
+        fetcherName?: string;
+        apiName?: string;
+    };
+    includeClient?: boolean | "false" | "true";
+    successStatusCodes?: string;
+    errorStatusCodes?: string;
 }, {}>;
 type GenerateClientFilesOptions = typeof optionsSchema.infer & {
     nameTransform?: NameTransformOptions;

package/dist/node.export.js

@@ -1,7 +1,7 @@
 import {
   generateClientFiles
-} from "./chunk-O7DZWQK4.js";
-import "./chunk-OVT6OLBK.js";
+} from "./chunk-GD55PFNE.js";
+import "./chunk-4EZJSCLI.js";
 import "./chunk-KAEXXJ7X.js";
 export {
   generateClientFiles

package/dist/{types-DLE5RaXi.d.ts → types-DsI2d-HE.d.ts}

@@ -100,6 +100,7 @@ type RequestFormat = "json" | "form-data" | "form-url" | "binary" | "text";
 type DefaultEndpoint = {
     parameters?: EndpointParameters | undefined;
     response: AnyBox;
+    responses?: Record<string, AnyBox>;
     responseHeaders?: Record<string, AnyBox>;
 };
 type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
@@ -114,6 +115,7 @@ type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
         areParametersRequired: boolean;
     };
     response: TConfig["response"];
+    responses?: TConfig["responses"];
     responseHeaders?: TConfig["responseHeaders"];
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typed-openapi",
   "type": "module",
-  "version": "1.5.1",
+  "version": "2.0.1",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "exports": {
@@ -30,8 +30,10 @@
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.4",
+    "@tanstack/react-query": "5.85.0",
     "@types/node": "^22.15.17",
     "@types/prettier": "3.0.0",
+    "msw": "2.10.5",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
     "vitest": "^3.1.3"
@@ -64,6 +66,9 @@
     "dev": "tsup --watch",
     "build": "tsup",
     "test": "vitest",
+    "gen:runtime": "node bin.js ./tests/samples/petstore.yaml --output ./tmp/generated-client.ts --tanstack generated-tanstack.ts --default-fetcher",
+    "test:runtime:run": "vitest run tests/integration-runtime-msw.test.ts",
+    "test:runtime": "pnpm run gen:runtime && pnpm run test:runtime:run",
     "fmt": "prettier --write src",
     "typecheck": "tsc -b ./tsconfig.build.json"
   }

package/src/cli.ts

@@ -1,5 +1,4 @@
 import { cac } from "cac";
-
 import { readFileSync } from "fs";
 import { generateClientFiles } from "./generate-client-files.ts";
 import { allowedRuntimes } from "./generator.ts";
@@ -11,16 +10,26 @@ cli
   .command("<input>", "Generate")
   .option("-o, --output <path>", "Output path for the api client ts file (defaults to `<input>.<runtime>.ts`)")
   .option(
-    "-r, --runtime <name>",
+    "-r, --runtime <n>",
     `Runtime to use for validation; defaults to \`none\`; available: ${allowedRuntimes.toString()}`,
     { default: "none" },
   )
   .option("--schemas-only", "Only generate schemas, skipping client generation (defaults to false)", { default: false })
+  .option("--include-client", "Include API client types and implementation (defaults to true)", { default: true })
+  .option(
+    "--success-status-codes <codes>",
+    "Comma-separated list of success status codes (defaults to 2xx and 3xx ranges)",
+  )
+  .option("--error-status-codes <codes>", "Comma-separated list of error status codes (defaults to 4xx and 5xx ranges)")
   .option(
     "--tanstack [name]",
-    "Generate tanstack client, defaults to false, can optionally specify a name for the generated file",
+    "Generate tanstack client, defaults to false, can optionally specify a name (will be generated next to the main file) or absolute path for the generated file",
+  )
+  .option(
+    "--default-fetcher [name]",
+    "Generate default fetcher, defaults to false, can optionally specify a name (will be generated next to the main file) or absolute path for the generated file",
   )
-  .action(async (input, _options) => {
+  .action(async (input: string, _options: any) => {
     return generateClientFiles(input, _options);
   });
 

package/src/default-fetcher.generator.ts

@@ -0,0 +1,101 @@
+// The contents of api-client.example.ts (kept in sync with the file)
+export const generateDefaultFetcher = (options: {
+  envApiBaseUrl?: string | undefined;
+  clientPath?: string | undefined;
+  fetcherName?: string | undefined;
+  apiName?: string | undefined;
+}) => {
+  const {
+    envApiBaseUrl = "API_BASE_URL",
+    clientPath = "./openapi.client.ts",
+    fetcherName = "defaultFetcher",
+    apiName = "api",
+  } = options;
+  return `/**
+ * Generic API Client for typed-openapi generated code
+ *
+ * This is a simple, production-ready wrapper that you can copy and customize.
+ * It handles:
+ * - Path parameter replacement
+ * - Query parameter serialization
+ * - JSON request/response handling
+ * - Basic error handling
+ *
+ * Usage:
+ * 1. Replace './generated/api' with your actual generated file path
+ * 2. Set your ${envApiBaseUrl}
+ * 3. Customize error handling and headers as needed
+ */
+
+// @ts-ignore
+import { type Fetcher, createApiClient } from "./${clientPath}";
+
+// Basic configuration
+const ${envApiBaseUrl} = process.env["${envApiBaseUrl}"] || "https://api.example.com";
+
+/**
+ * Simple fetcher implementation without external dependencies
+ */
+export const ${fetcherName}: Fetcher = async (method, apiUrl, params) => {
+  const headers = new Headers();
+
+  // Replace path parameters (supports both {param} and :param formats)
+  const actualUrl = replacePathParams(apiUrl, (params?.path ?? {}) as Record<string, string>);
+  const url = new URL(actualUrl);
+
+  // Handle query parameters
+  if (params?.query) {
+    const searchParams = new URLSearchParams();
+    Object.entries(params.query).forEach(([key, value]) => {
+      if (value != null) {
+        // Skip null/undefined values
+        if (Array.isArray(value)) {
+          value.forEach((val) => val != null && searchParams.append(key, String(val)));
+        } else {
+          searchParams.append(key, String(value));
+        }
+      }
+    });
+    url.search = searchParams.toString();
+  }
+
+  // Handle request body for mutation methods
+  const body = ["post", "put", "patch", "delete"].includes(method.toLowerCase())
+    ? JSON.stringify(params?.body)
+    : undefined;
+
+  if (body) {
+    headers.set("Content-Type", "application/json");
+  }
+
+  // Add custom headers
+  if (params?.header) {
+    Object.entries(params.header).forEach(([key, value]) => {
+      if (value != null) {
+        headers.set(key, String(value));
+      }
+    });
+  }
+
+  const response = await fetch(url, {
+    method: method.toUpperCase(),
+    ...(body && { body }),
+    headers,
+  });
+
+  return response;
+};
+
+/**
+ * Replace path parameters in URL
+ * Supports both OpenAPI format {param} and Express format :param
+ */
+export function replacePathParams(url: string, params: Record<string, string>): string {
+  return url
+    .replace(/\{(\\w+)\}/g, function(_, key) { return params[key] || '{' + key + '}'; })
+    .replace(/:([a-zA-Z0-9_]+)/g, function(_, key) { return params[key] || ':' + key; });
+}
+
+export const ${apiName} = createApiClient(${fetcherName}, API_BASE_URL);
+`;
+};

package/src/generate-client-files.ts

@@ -1,13 +1,20 @@
 import SwaggerParser from "@apidevtools/swagger-parser";
 import type { OpenAPIObject } from "openapi3-ts/oas31";
-import { basename, join, dirname } from "pathe";
+import { basename, join, dirname, isAbsolute } from "pathe";
 import { type } from "arktype";
 import { mkdir, writeFile } from "fs/promises";
-import { allowedRuntimes, generateFile } from "./generator.ts";
+import {
+  allowedRuntimes,
+  generateFile,
+  DEFAULT_SUCCESS_STATUS_CODES,
+  DEFAULT_ERROR_STATUS_CODES,
+  type GeneratorOptions,
+} from "./generator.ts";
 import { mapOpenApiEndpoints } from "./map-openapi-endpoints.ts";
 import { generateTanstackQueryFile } from "./tanstack-query.generator.ts";
 import { prettify } from "./format.ts";
 import type { NameTransformOptions } from "./types.ts";
+import { generateDefaultFetcher } from "./default-fetcher.generator.ts";
 
 const cwd = process.cwd();
 const now = new Date();
@@ -24,7 +31,16 @@ export const optionsSchema = type({
   "output?": "string",
   runtime: allowedRuntimes,
   tanstack: "boolean | string",
+  "defaultFetcher?": type({
+    "envApiBaseUrl?": "string",
+    "clientPath?": "string",
+    "fetcherName?": "string",
+    "apiName?": "string",
+  }),
   schemasOnly: "boolean",
+  "includeClient?": "boolean | 'true' | 'false'",
+  "successStatusCodes?": "string",
+  "errorStatusCodes?": "string",
 });
 
 type GenerateClientFilesOptions = typeof optionsSchema.infer & {
@@ -32,19 +48,37 @@ type GenerateClientFilesOptions = typeof optionsSchema.infer & {
 };
 
 export async function generateClientFiles(input: string, options: GenerateClientFilesOptions) {
+  // TODO CLI option to save that file?
   const openApiDoc = (await SwaggerParser.bundle(input)) as OpenAPIObject;
 
   const ctx = mapOpenApiEndpoints(openApiDoc, options);
   console.log(`Found ${ctx.endpointList.length} endpoints`);
 
-  const content = await prettify(
-    generateFile({
-      ...ctx,
-      runtime: options.runtime,
-      schemasOnly: options.schemasOnly,
-      nameTransform: options.nameTransform,
-    }),
-  );
+  // Parse success status codes if provided
+  const successStatusCodes = options.successStatusCodes
+    ? (options.successStatusCodes.split(",").map((code) => parseInt(code.trim(), 10)) as readonly number[])
+    : undefined;
+
+  // Parse error status codes if provided
+  const errorStatusCodes = options.errorStatusCodes
+    ? (options.errorStatusCodes.split(",").map((code) => parseInt(code.trim(), 10)) as readonly number[])
+    : undefined;
+
+  // Convert string boolean to actual boolean
+  const includeClient =
+    options.includeClient === "false" ? false : options.includeClient === "true" ? true : options.includeClient;
+
+  const generatorOptions: GeneratorOptions = {
+    ...ctx,
+    runtime: options.runtime,
+    schemasOnly: options.schemasOnly,
+    nameTransform: options.nameTransform,
+    includeClient: includeClient ?? true,
+    successStatusCodes: successStatusCodes ?? DEFAULT_SUCCESS_STATUS_CODES,
+    errorStatusCodes: errorStatusCodes ?? DEFAULT_ERROR_STATUS_CODES,
+  };
+
+  const content = await prettify(generateFile(generatorOptions));
   const outputPath = join(
     cwd,
     options.output ?? input + `.${options.runtime === "none" ? "client" : options.runtime}.ts`,
@@ -56,17 +90,43 @@ export async function generateClientFiles(input: string, options: GenerateClient
 
   if (options.tanstack) {
     const tanstackContent = await generateTanstackQueryFile({
-      ...ctx,
+      ...generatorOptions,
       relativeApiClientPath: "./" + basename(outputPath),
     });
-    const tanstackOutputPath = join(
-      dirname(outputPath),
-      typeof options.tanstack === "string" ? options.tanstack : `tanstack.client.ts`,
-    );
+    let tanstackOutputPath: string;
+    if (typeof options.tanstack === "string" && isAbsolute(options.tanstack)) {
+      tanstackOutputPath = options.tanstack;
+    } else {
+      tanstackOutputPath = join(
+        dirname(outputPath),
+        typeof options.tanstack === "string" ? options.tanstack : `tanstack.client.ts`,
+      );
+    }
     console.log("Generating tanstack client...", tanstackOutputPath);
     await ensureDir(dirname(tanstackOutputPath));
     await writeFile(tanstackOutputPath, tanstackContent);
   }
 
+  if (options.defaultFetcher) {
+    const defaultFetcherContent = generateDefaultFetcher({
+      envApiBaseUrl: options.defaultFetcher.envApiBaseUrl,
+      clientPath: options.defaultFetcher.clientPath ?? basename(outputPath),
+      fetcherName: options.defaultFetcher.fetcherName,
+      apiName: options.defaultFetcher.apiName,
+    });
+    let defaultFetcherOutputPath: string;
+    if (typeof options.defaultFetcher === "string" && isAbsolute(options.defaultFetcher)) {
+      defaultFetcherOutputPath = options.defaultFetcher;
+    } else {
+      defaultFetcherOutputPath = join(
+        dirname(outputPath),
+        typeof options.defaultFetcher === "string" ? options.defaultFetcher : `api.client.ts`,
+      );
+    }
+    console.log("Generating default fetcher...", defaultFetcherOutputPath);
+    await ensureDir(dirname(defaultFetcherOutputPath));
+    await writeFile(defaultFetcherOutputPath, defaultFetcherContent);
+  }
+
   console.log(`Done in ${new Date().getTime() - now.getTime()}ms !`);
 }