typed-openapi 2.0.0 → 2.0.2

package/dist/{chunk-E6A7N4ND.js → chunk-KF4JBLDM.js}

@@ -150,7 +150,9 @@ var openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }) => {
             meta
           });
         }
-        additionalProperties = t.object({ [t.string().value]: additionalPropertiesType });
+        additionalProperties = t.literal(
+          `Record<string, ${additionalPropertiesType ? additionalPropertiesType.value : t.any().value}>`
+        );
       }
       const hasRequiredArray = schema.required && schema.required.length > 0;
       const isPartial = !schema.required?.length;
@@ -428,8 +430,18 @@ var generateSchemaList = ({ refs, runtime }) => {
     ${runtime === "none" ? "}" : ""}
   `;
 };
-var parameterObjectToString = (parameters) => {
-  if (parameters instanceof Box) return parameters.value;
+var parameterObjectToString = (parameters, ctx) => {
+  if (parameters instanceof Box) {
+    if (ctx.runtime === "none") {
+      return parameters.recompute((box) => {
+        if (Box.isReference(box) && !box.params.generics && box.value !== "null") {
+          box.value = `Schemas.${box.value}`;
+        }
+        return box;
+      }).value;
+    }
+    return parameters.value;
+  }
   let str = "{";
   for (const [key, box] of Object.entries(parameters)) {
     str += `${wrapWithQuotesIfNeeded(key)}${box.type === "optional" ? "?" : ""}: ${box.value},
@@ -478,16 +490,17 @@ var generateEndpointSchemaList = (ctx) => {
       path: "${endpoint.path}",
       requestFormat: "${endpoint.requestFormat}",
       ${endpoint.meta.hasParameters ? `parameters: {
-            ${parameters.query ? `query:  ${parameterObjectToString(parameters.query)},` : ""}
-        ${parameters.path ? `path:  ${parameterObjectToString(parameters.path)},` : ""}
-        ${parameters.header ? `header:  ${parameterObjectToString(parameters.header)},` : ""}
+            ${parameters.query ? `query:  ${parameterObjectToString(parameters.query, ctx)},` : ""}
+        ${parameters.path ? `path:  ${parameterObjectToString(parameters.path, ctx)},` : ""}
+        ${parameters.header ? `header:  ${parameterObjectToString(parameters.header, ctx)},` : ""}
         ${parameters.body ? `body:  ${parameterObjectToString(
       ctx.runtime === "none" ? parameters.body.recompute((box) => {
         if (Box.isReference(box) && !box.params.generics) {
           box.value = `Schemas.${box.value}`;
         }
         return box;
-      }) : parameters.body
+      }) : parameters.body,
+      ctx
     )},` : ""}
           }` : "parameters: never,"}
       response: ${ctx.runtime === "none" ? endpoint.response.recompute((box) => {
@@ -708,13 +721,7 @@ export class ApiClient {
           return withResponse ? typedResponse : data;
         });
 
-        return promise ${match(ctx.runtime).with("zod", "yup", () => `as Promise<${infer(`TEndpoint["response"]`)}>`).with(
-      "arktype",
-      "io-ts",
-      "typebox",
-      "valibot",
-      () => `as Promise<${infer(`TEndpoint`) + `["response"]`}>`
-    ).otherwise(() => `as Promise<TEndpoint["response"]>`)}
+        return promise ${match(ctx.runtime).with("zod", "yup", () => `as Promise<${infer(`TEndpoint["response"]`)}>`).with("arktype", "io-ts", "typebox", "valibot", () => `as Promise<${infer(`TEndpoint`) + `["response"]`}>`).otherwise(() => `as Promise<TEndpoint["response"]>`)}
     }
     // </ApiClient.${method}>
     ` : "";
@@ -1128,10 +1135,17 @@ var mapOpenApiEndpoints = (doc, options) => {
         endpoint.requestFormat = match2(matchingMediaType).with("application/octet-stream", () => "binary").with("multipart/form-data", () => "form-data").with("application/x-www-form-urlencoded", () => "form-url").with(P.string.includes("json"), () => "json").otherwise(() => "text");
       }
       if (params) {
-        const t = createBoxFactory({}, ctx);
         const filtered_params = ["query", "path", "header"];
         for (const k of filtered_params) {
           if (params[k] && lists[k].length) {
+            const properties = Object.entries(params[k]).reduce(
+              (acc, [key, value]) => {
+                if (value.schema) acc[key] = value.schema;
+                return acc;
+              },
+              {}
+            );
+            const t = createBoxFactory({ type: "object", properties }, ctx);
             if (lists[k].every((param) => !param.required)) {
               params[k] = t.reference("Partial", [t.object(params[k])]);
             } else {
@@ -1219,7 +1233,7 @@ var allowedParamMediaTypes = [
   "*/*"
 ];
 var isAllowedParamMediaTypes = (mediaType) => mediaType.includes("application/") && mediaType.includes("json") || allowedParamMediaTypes.includes(mediaType) || mediaType.includes("text/");
-var isResponseMediaType = (mediaType) => mediaType === "application/json";
+var isResponseMediaType = (mediaType) => mediaType === "*/*" || mediaType.includes("application/") && mediaType.includes("json");
 var getAlias = ({ path, method, operation }) => sanitizeName(
   (method + "_" + capitalize3(operation.operationId ?? pathToVariableName(path))).replace(/-/g, "__"),
   "endpoint"

package/dist/chunk-Q6LQYDKL.js

@@ -0,0 +1,208 @@
+import {
+  DEFAULT_ERROR_STATUS_CODES,
+  DEFAULT_SUCCESS_STATUS_CODES,
+  allowedRuntimes,
+  generateFile,
+  generateTanstackQueryFile,
+  mapOpenApiEndpoints
+} from "./chunk-KF4JBLDM.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-MCVYB63W.js";
+} from "./chunk-Q6LQYDKL.js";
 import {
   allowedRuntimes
-} from "./chunk-E6A7N4ND.js";
+} from "./chunk-KF4JBLDM.js";
 import "./chunk-KAEXXJ7X.js";
 
 // src/cli.ts
@@ -20,7 +20,10 @@ cli.command("<input>", "Generate").option("-o, --output <path>", "Output path fo
   "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.js

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

package/dist/node.export.d.ts

@@ -8,6 +8,12 @@ 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;

package/dist/node.export.js

@@ -1,7 +1,7 @@
 import {
   generateClientFiles
-} from "./chunk-MCVYB63W.js";
-import "./chunk-E6A7N4ND.js";
+} from "./chunk-Q6LQYDKL.js";
+import "./chunk-KF4JBLDM.js";
 import "./chunk-KAEXXJ7X.js";
 export {
   generateClientFiles

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typed-openapi",
   "type": "module",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "exports": {
@@ -66,9 +66,9 @@
     "dev": "tsup --watch",
     "build": "tsup",
     "test": "vitest",
-    "generate:runtime": "node bin.js ./tests/samples/petstore.yaml --output ./tmp/generated-client.ts --tanstack generated-tanstack.ts",
+    "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 generate:runtime && pnpm run test:runtime:run",
+    "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

@@ -23,7 +23,11 @@ cli
   .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: 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,6 +1,6 @@
 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 {
@@ -14,6 +14,7 @@ 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();
@@ -30,6 +31,12 @@ 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",
@@ -41,6 +48,7 @@ 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);
@@ -85,14 +93,40 @@ export async function generateClientFiles(input: string, options: GenerateClient
       ...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 !`);
 }

package/src/generator.ts

@@ -149,8 +149,19 @@ const generateSchemaList = ({ refs, runtime }: GeneratorContext) => {
   );
 };
 
-const parameterObjectToString = (parameters: Box<AnyBoxDef> | Record<string, AnyBox>) => {
-  if (parameters instanceof Box) return parameters.value;
+const parameterObjectToString = (parameters: Box<AnyBoxDef> | Record<string, AnyBox>, ctx: GeneratorContext) => {
+  if (parameters instanceof Box) {
+    if (ctx.runtime === "none") {
+      return parameters.recompute((box) => {
+        if (Box.isReference(box) && !box.params.generics && box.value !== "null") {
+          box.value = `Schemas.${box.value}`;
+        }
+        return box;
+      }).value;
+    }
+
+    return parameters.value;
+  }
 
   let str = "{";
   for (const [key, box] of Object.entries(parameters)) {
@@ -210,9 +221,9 @@ const generateEndpointSchemaList = (ctx: GeneratorContext) => {
       ${
         endpoint.meta.hasParameters
           ? `parameters: {
-            ${parameters.query ? `query:  ${parameterObjectToString(parameters.query)},` : ""}
-        ${parameters.path ? `path:  ${parameterObjectToString(parameters.path)},` : ""}
-        ${parameters.header ? `header:  ${parameterObjectToString(parameters.header)},` : ""}
+            ${parameters.query ? `query:  ${parameterObjectToString(parameters.query, ctx)},` : ""}
+        ${parameters.path ? `path:  ${parameterObjectToString(parameters.path, ctx)},` : ""}
+        ${parameters.header ? `header:  ${parameterObjectToString(parameters.header, ctx)},` : ""}
         ${
           parameters.body
             ? `body:  ${parameterObjectToString(
@@ -224,6 +235,7 @@ const generateEndpointSchemaList = (ctx: GeneratorContext) => {
                       return box;
                     })
                   : parameters.body,
+                ctx,
               )},`
             : ""
         }
@@ -487,15 +499,9 @@ export class ApiClient {
         });
 
         return promise ${match(ctx.runtime)
-            .with("zod", "yup", () => `as Promise<${infer(`TEndpoint["response"]`)}>`)
-            .with(
-              "arktype",
-              "io-ts",
-              "typebox",
-              "valibot",
-              () => `as Promise<${infer(`TEndpoint`) + `["response"]`}>`,
-            )
-            .otherwise(() => `as Promise<TEndpoint["response"]>`)}
+          .with("zod", "yup", () => `as Promise<${infer(`TEndpoint["response"]`)}>`)
+          .with("arktype", "io-ts", "typebox", "valibot", () => `as Promise<${infer(`TEndpoint`) + `["response"]`}>`)
+          .otherwise(() => `as Promise<TEndpoint["response"]>`)}
     }
     // </ApiClient.${method}>
     `

package/src/map-openapi-endpoints.ts

@@ -105,13 +105,20 @@ export const mapOpenApiEndpoints = (doc: OpenAPIObject, options?: { nameTransfor
 
       // Make parameters optional if all or some of them are not required
       if (params) {
-        const t = createBoxFactory({}, ctx);
         const filtered_params = ["query", "path", "header"] as Array<
           keyof Pick<typeof params, "query" | "path" | "header">
         >;
 
         for (const k of filtered_params) {
           if (params[k] && lists[k].length) {
+            const properties = Object.entries(params[k]!).reduce(
+              (acc, [key, value]) => {
+                if (value.schema) acc[key] = value.schema;
+                return acc;
+              },
+              {} as Record<string, NonNullable<AnyBox["schema"]>>,
+            );
+            const t = createBoxFactory({ type: "object", properties: properties }, ctx);
             if (lists[k].every((param) => !param.required)) {
               params[k] = t.reference("Partial", [t.object(params[k]!)]) as any;
             } else {
@@ -226,7 +233,7 @@ const isAllowedParamMediaTypes = (
   allowedParamMediaTypes.includes(mediaType as any) ||
   mediaType.includes("text/");
 
-const isResponseMediaType = (mediaType: string) => mediaType === "application/json";
+const isResponseMediaType = (mediaType: string) => mediaType === "*/*" || (mediaType.includes("application/") && mediaType.includes("json"));
 const getAlias = ({ path, method, operation }: Endpoint) =>
   sanitizeName(
     (method + "_" + capitalize(operation.operationId ?? pathToVariableName(path))).replace(/-/g, "__"),

package/src/openapi-schema-to-ts.ts

@@ -16,7 +16,6 @@ export const openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }: Openapi
   const getTs = () => {
     if (isReferenceObject(schema)) {
       const refInfo = ctx.refs.getInfosByRef(schema.$ref);
-
       return t.reference(refInfo.normalized);
     }
 
@@ -153,7 +152,9 @@ export const openApiSchemaToTs = ({ schema, meta: _inheritedMeta, ctx }: Openapi
           });
         }
 
-        additionalProperties = t.object({ [t.string().value]: additionalPropertiesType! });
+        additionalProperties = t.literal(
+          `Record<string, ${additionalPropertiesType ? additionalPropertiesType.value : t.any().value}>`,
+        );
       }
 
       const hasRequiredArray = schema.required && schema.required.length > 0;

package/dist/chunk-MCVYB63W.js

@@ -1,78 +0,0 @@
-import {
-  DEFAULT_ERROR_STATUS_CODES,
-  DEFAULT_SUCCESS_STATUS_CODES,
-  allowedRuntimes,
-  generateFile,
-  generateTanstackQueryFile,
-  mapOpenApiEndpoints
-} from "./chunk-E6A7N4ND.js";
-import {
-  prettify
-} from "./chunk-KAEXXJ7X.js";
-
-// src/generate-client-files.ts
-import SwaggerParser from "@apidevtools/swagger-parser";
-import { basename, join, dirname } from "pathe";
-import { type } from "arktype";
-import { mkdir, writeFile } from "fs/promises";
-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",
-  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)
-    });
-    const 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);
-  }
-  console.log(`Done in ${(/* @__PURE__ */ new Date()).getTime() - now.getTime()}ms !`);
-}
-
-export {
-  generateClientFiles
-};