@sdk-it/typescript 0.41.0 → 0.42.1

package/README.md

@@ -50,7 +50,7 @@ await generate(spec, {
 
 ### Format Generated Code
 
-You can format the generated code using the `formatCode` option. This is especially useful if you include the generated code in source control.
+You can format the generated code using the `formatCode` option. Useful when committing generated code to source control.
 
 ```typescript
 import { generate } from '@sdk-it/typescript';
@@ -86,7 +86,7 @@ bun ./openapi.ts
 ```typescript
 import { OpenStatus } from './client';
 
-const client = new Client({
+const client = new OpenStatus({
   baseUrl: 'https://api.openstatus.dev/v1/',
 });
 
@@ -95,9 +95,9 @@ const [result, error] = await client.request('GET /status_report', {});
 
 ## Using with Your Favorite Frameworks
 
-The SDK works great on its own, but you might want to native integration with your frameworks:
+The SDK works on its own, but you might want native integration with your frameworks:
 
 - [React Query](../../docs/react-query.md)
 - [Angular](../../docs/angular.md)
 
-Let us know what are you using, and we will help you integrate it.
+Let us know what you're using, and we'll help you integrate it.

package/dist/index.js

@@ -182,7 +182,7 @@ var ZodEmitter = class {
         return `${base}${this.#suffixes(defaultValue, required, nullable)}`;
       }
       case "boolean":
-        return `z.boolean()${this.#suffixes(schema.default, required, nullable)}`;
+        return `${schema["x-zod-type"] === "coerce-boolean" ? "z.coerce.boolean()" : "z.boolean()"}${this.#suffixes(schema.default, required, nullable)}`;
       case "object":
         return `${this.#object(schema)}${this.#suffixes(JSON.stringify(schema.default), required, nullable)}`;
       // required always
@@ -253,9 +253,9 @@ var ZodEmitter = class {
    * Handle a `string` schema with possible format keywords (JSON Schema).
    */
   string(schema) {
-    let base = "z.string()";
+    let base = schema["x-zod-type"] === "coerce-string" ? "z.coerce.string()" : "z.string()";
     if (schema.contentEncoding === "binary") {
-      base = "z.instanceof(Blob)";
+      base = "z.custom<Blob>()";
       return base;
     }
     switch (schema.format) {
@@ -266,40 +266,40 @@ var ZodEmitter = class {
         } else if (schema["x-zod-type"] === "date") {
           base = "z.date()";
         } else {
-          base = "z.string().datetime()";
+          base += ".datetime()";
         }
         break;
       case "date":
-        base = "z.string().date()";
+        base += ".date()";
         break;
       case "time":
-        base = "z.string() /* optionally add .regex(...) for HH:MM:SS format */";
+        base += " /* optionally add .regex(...) for HH:MM:SS format */";
         break;
       case "email":
-        base = "z.string().email()";
+        base += ".email()";
         break;
       case "uuid":
-        base = "z.string().uuid()";
+        base += ".uuid()";
         break;
       case "url":
       case "uri":
-        base = "z.string().url()";
+        base += ".url()";
         break;
       case "ipv4":
-        base = 'z.string().ip({version: "v4"})';
+        base += '.ip({version: "v4"})';
         break;
       case "ipv6":
-        base = 'z.string().ip({version: "v6"})';
+        base += '.ip({version: "v6"})';
         break;
       case "phone":
-        base = "z.string() /* or add .regex(...) for phone formats */";
+        base += " /* or add .regex(...) for phone formats */";
         break;
       case "byte":
       case "binary":
-        base = "z.instanceof(Blob)";
+        base = "z.custom<Blob>()";
         break;
       case "int64":
-        base = "z.string() /* or z.bigint() if your app can handle it */";
+        base += " /* or z.bigint() if your app can handle it */";
         break;
       default:
         break;
@@ -402,6 +402,7 @@ function toZod(schema, required) {
 
 // packages/typescript/src/lib/client.ts
 var client_default = (spec) => {
+  const baseUrlSchema = `z.union([z.string(),z.function().returns(z.union([z.string(), z.promise(z.string())])),])${spec.servers.length ? ".default(servers[0])" : ""}`;
   const defaultHeaders = `{${spec.options.filter((value) => value.in === "header").map(
     (value) => `'${value.name}': options['${value["x-optionName"] ?? value.name}']`
   ).join(",\n")}}`;
@@ -432,7 +433,12 @@ var client_default = (spec) => {
       schema: `fetchType.describe('Custom fetch implementation. Defaults to globalThis.fetch.')`
     },
     baseUrl: {
-      schema: spec.servers.length ? `z.enum(servers).default(servers[0]).describe('Base URL of the API server.')` : `z.string().describe('Base URL of the API server.')`
+      schema: `${baseUrlSchema}.transform(async (baseUrl) => {
+      if (typeof baseUrl === 'function') {
+        return Promise.resolve(baseUrl());
+      }
+      return baseUrl;
+    }).describe('Base URL of the API server. Can be a string or a function that returns a string.')`
     },
     headers: {
       schema: `z.record(z.string()).optional().describe('Default headers to include in all requests.')`
@@ -484,7 +490,7 @@ export class ${spec.name} {
   async prepare<const E extends keyof typeof schemas>(
     endpoint: E,
     input: z.input<(typeof schemas)[E]['schema']>,
-    options?: { headers?: HeadersInit },
+    options?: { signal?: AbortSignal; headers?: HeadersInit },
   ) {
     return prepare(this, endpoint, input, options);
   }
@@ -565,7 +571,7 @@ export async function prepare<const E extends keyof typeof schemas>(
   client: ${spec.name},
   endpoint: E,
   input: z.input<(typeof schemas)[E]['schema']>,
-  requestOptions?: { headers?: HeadersInit },
+  requestOptions?: { signal?: AbortSignal; headers?: HeadersInit },
 ): Promise<RequestConfig & {
   parse: (response: Response) => ReturnType<typeof parse>;
 }> {
@@ -586,6 +592,15 @@ export async function prepare<const E extends keyof typeof schemas>(
   ];
 
   let config = route.toRequest(parsedInput as never);
+  if (requestOptions?.signal) {
+    config = {
+      ...config,
+      init: {
+        ...config.init,
+        signal: requestOptions.signal,
+      },
+    };
+  }
   for (const interceptor of interceptors) {
     if (interceptor.before) {
       config = await interceptor.before(config);
@@ -873,12 +888,12 @@ function paginationOperation(operation) {
     const sameInputNames = pagination.limitParamName === "limit" && pagination.offsetParamName === "offset";
     const initialParams = sameInputNames ? "input" : `{...input, limit: input.${pagination.limitParamName}, offset: input.${pagination.offsetParamName}}`;
     const nextPageParams = sameInputNames ? "...nextPageParams" : `${pagination.offsetParamName}: nextPageParams.offset, ${pagination.limitParamName}: nextPageParams.limit`;
-    const logic = `const pagination = new OffsetPagination(${initialParams}, async (nextPageParams) => {
+    const logic = `const pagination = new OffsetPagination(${initialParams}, async (nextPageParams, requestOptions) => {
         const dispatcher = new Dispatcher(options.interceptors, options.fetch);
         const result = await dispatcher.send(
           this.toRequest({...input, ${nextPageParams}}),
           this.output,
-          options.signal,
+          requestOptions?.signal ?? options.signal,
         );
         return {
           data: ${data}.${pagination.items},
@@ -886,7 +901,7 @@ function paginationOperation(operation) {
             hasMore: Boolean(${data}.${pagination.hasMore}),
           },
         };
-      });
+      }, { signal: options.signal });
       await pagination.getNextPage();
       return ${returnValue}
       `;
@@ -897,12 +912,12 @@ function paginationOperation(operation) {
     const initialParams = sameInputNames ? "input" : `{...input, cursor: input.${pagination.cursorParamName}}`;
     const nextPageParams = sameInputNames ? "...nextPageParams" : `${pagination.cursorParamName}: nextPageParams.cursor`;
     const logic = `
-      const pagination = new CursorPagination(${initialParams}, async (nextPageParams) => {
+      const pagination = new CursorPagination(${initialParams}, async (nextPageParams, requestOptions) => {
         const dispatcher = new Dispatcher(options.interceptors, options.fetch);
         const result = await dispatcher.send(
           this.toRequest({...input, ${nextPageParams}}),
           this.output,
-          options.signal,
+          requestOptions?.signal ?? options.signal,
         );
         return {
           data: ${data}.${pagination.items},
@@ -910,7 +925,7 @@ function paginationOperation(operation) {
             hasMore: Boolean(${data}.${pagination.hasMore}),
           },
         };
-      });
+      }, { signal: options.signal });
       await pagination.getNextPage();
       return ${returnValue}
       `;
@@ -921,12 +936,12 @@ function paginationOperation(operation) {
     const initialParams = sameInputNames ? "input" : `{...input, page: input.${pagination.pageNumberParamName}, pageSize: input.${pagination.pageSizeParamName}}`;
     const nextPageParams = sameInputNames ? "...nextPageParams" : `${pagination.pageNumberParamName}: nextPageParams.page, ${pagination.pageSizeParamName}: nextPageParams.pageSize`;
     const logic = `
-      const pagination = new Pagination(${initialParams}, async (nextPageParams) => {
+      const pagination = new Pagination(${initialParams}, async (nextPageParams, requestOptions) => {
         const dispatcher = new Dispatcher(options.interceptors, options.fetch);
         const result = await dispatcher.send(
           this.toRequest({...input, ${nextPageParams}}),
           this.output,
-          options.signal,
+          requestOptions?.signal ?? options.signal,
         );
         return {
           data: ${data}.${pagination.items},
@@ -934,7 +949,8 @@ function paginationOperation(operation) {
             hasMore: Boolean(${data}.${pagination.hasMore}),
           },
         };
-      });
+      }, { signal: options.signal });
+      await pagination.getNextPage();
       return ${returnValue}
       `;
     return `{${logic}}}`;
@@ -1310,7 +1326,7 @@ function operationSchema(ir, operation, type) {
 }
 
 // packages/typescript/src/lib/http/dispatcher.txt
-var dispatcher_default = "export type Unionize<T> = T extends [infer Single extends OutputType]\n  ? InstanceType<Single>\n  : T extends readonly [...infer Tuple extends OutputType[]]\n    ? { [I in keyof Tuple]: InstanceType<Tuple[I]> }[number]\n    : never;\n\nexport type InstanceType<T> =\n  T extends Type<infer U>\n    ? U\n    : T extends { type: Type<infer U> }\n      ? U\n      : T extends Array<unknown>\n        ? Unionize<T>\n        : never;\n\ntype ResponseData<T extends OutputType[]> =\n  Extract<InstanceType<T>, SuccessfulResponse> extends SuccessfulResponse<\n    infer P\n  >\n    ? P\n    : unknown;\n\ntype ResponseMapper<T extends OutputType[], R> = (data: ResponseData<T>) => R;\n\nexport interface Type<T> {\n  new (...args: any[]): T;\n}\nexport type Parser = (\n  response: Response,\n) => Promise<unknown> | ReadableStream<any> | SSEListener;\nexport type OutputType =\n  | Type<APIResponse>\n  | { parser: Parser; type: Type<APIResponse> };\n\nexport const fetchType = z\n  .function()\n  .args(z.instanceof(Request))\n  .returns(z.promise(z.instanceof(Response)))\n  .optional();\n\nexport async function parse<T extends OutputType[], R = ResponseData<T>>(\n  outputs: T,\n  response: Response,\n  mapper: ResponseMapper<T, R>,\n) {\n  let output: typeof APIResponse | null = null;\n  let parser: Parser = buffered;\n  for (const outputType of outputs) {\n    if ('parser' in outputType) {\n      parser = outputType.parser;\n      if (isTypeOf(outputType.type, APIResponse)) {\n        if (response.status === outputType.type.status) {\n          output = outputType.type;\n          break;\n        }\n      }\n    } else if (isTypeOf(outputType, APIResponse)) {\n      if (response.status === outputType.status) {\n        output = outputType;\n        break;\n      }\n    }\n  }\n\n  if (response.ok) {\n    const apiresponse = (output || APIResponse).create(\n      response.status,\n      response.headers,\n      mapper((await parser(response)) as ResponseData<T>),\n    );\n\n    return apiresponse as RebindSuccessPayload<Extract<InstanceType<T>, SuccessfulResponse<unknown>>, R>;\n  }\n\n  throw (output || APIError).create(\n    response.status,\n    response.headers,\n    await parser(response),\n  );\n}\n\nexport function isTypeOf<T extends Type<APIResponse>>(\n  instance: any,\n  baseType: T,\n): instance is T {\n  if (instance === baseType) {\n    return true;\n  }\n  const prototype = Object.getPrototypeOf(instance);\n  if (prototype === null) {\n    return false;\n  }\n  return isTypeOf(prototype, baseType);\n}\n\nexport class Dispatcher {\n  #interceptors: Interceptor[] = [];\n  #fetch: z.infer<typeof fetchType>;\n  constructor(interceptors: Interceptor[], fetch?: z.infer<typeof fetchType>) {\n    this.#interceptors = interceptors;\n    this.#fetch = fetch;\n  }\n\n  async send<T extends OutputType[], R = ResponseData<T>>(\n    config: RequestConfig,\n    outputs: T,\n    signal?: AbortSignal,\n    mapper?: ResponseMapper<T, R>,\n  ) {\n    for (const interceptor of this.#interceptors) {\n      if (interceptor.before) {\n        config = await interceptor.before(config);\n      }\n    }\n\n    let response = await (this.#fetch ?? fetch)(\n      new Request(config.url, config.init),\n      {\n        ...config.init,\n        signal: signal,\n      },\n    );\n\n    for (let i = this.#interceptors.length - 1; i >= 0; i--) {\n      const interceptor = this.#interceptors[i];\n      if (interceptor.after) {\n        response = await interceptor.after(response.clone());\n      }\n    }\n\n    return await parse(\n      outputs,\n      response,\n      mapper ?? ((data: ResponseData<T>) => data as unknown as R),\n    );\n  }\n}\n";
+var dispatcher_default = "export type Unionize<T> = T extends [infer Single extends OutputType]\n  ? InstanceType<Single>\n  : T extends readonly [...infer Tuple extends OutputType[]]\n    ? { [I in keyof Tuple]: InstanceType<Tuple[I]> }[number]\n    : never;\n\nexport type InstanceType<T> =\n  T extends Type<infer U>\n    ? U\n    : T extends { type: Type<infer U> }\n      ? U\n      : T extends Array<unknown>\n        ? Unionize<T>\n        : never;\n\ntype ResponseData<T extends OutputType[]> =\n  Extract<InstanceType<T>, SuccessfulResponse> extends SuccessfulResponse<\n    infer P\n  >\n    ? P\n    : unknown;\n\ntype ResponseMapper<T extends OutputType[], R> = (data: ResponseData<T>) => R;\n\nexport interface Type<T> {\n  new (...args: any[]): T;\n}\nexport type Parser = (\n  response: Response,\n) => Promise<unknown> | ReadableStream<any> | SSEListener;\nexport type OutputType =\n  | Type<APIResponse>\n  | { parser: Parser; type: Type<APIResponse> };\n\nexport const fetchType = z\n  .function()\n  .args(z.custom<Request>())\n  .returns(z.promise(z.custom<Response>()))\n  .optional();\n\nexport async function parse<T extends OutputType[]>(\n  outputs: T,\n  response: Response,\n): Promise<Extract<Unionize<T>, SuccessfulResponse<unknown>>>;\nexport async function parse<T extends OutputType[], R>(\n  outputs: T,\n  response: Response,\n  mapper: ResponseMapper<T, R>,\n): Promise<RebindSuccessPayload<Extract<Unionize<T>, SuccessfulResponse<unknown>>, R>>;\nexport async function parse<T extends OutputType[], R = ResponseData<T>>(\n  outputs: T,\n  response: Response,\n  mapper?: ResponseMapper<T, R>,\n) {\n  let output: typeof APIResponse | null = null;\n  let parser: Parser = buffered;\n  for (const outputType of outputs) {\n    if ('parser' in outputType) {\n      parser = outputType.parser;\n      if (isTypeOf(outputType.type, APIResponse)) {\n        if (response.status === outputType.type.status) {\n          output = outputType.type;\n          break;\n        }\n      }\n    } else if (isTypeOf(outputType, APIResponse)) {\n      if (response.status === outputType.status) {\n        output = outputType;\n        break;\n      }\n    }\n  }\n\n  if (response.ok) {\n    const data = (await parser(response)) as ResponseData<T>;\n    const mapped = mapper ? mapper(data) : data;\n    const apiresponse = (output || APIResponse).create(\n      response.status,\n      response.headers,\n      mapped,\n    );\n\n    return apiresponse as any;\n  }\n\n  throw (output || APIError).create(\n    response.status,\n    response.headers,\n    await parser(response),\n  );\n}\n\nexport function isTypeOf<T extends Type<APIResponse>>(\n  instance: any,\n  baseType: T,\n): instance is T {\n  if (instance === baseType) {\n    return true;\n  }\n  const prototype = Object.getPrototypeOf(instance);\n  if (prototype === null) {\n    return false;\n  }\n  return isTypeOf(prototype, baseType);\n}\n\nexport class Dispatcher {\n  #interceptors: Interceptor[] = [];\n  #fetch: z.infer<typeof fetchType>;\n  constructor(interceptors: Interceptor[], fetch?: z.infer<typeof fetchType>) {\n    this.#interceptors = interceptors;\n    this.#fetch = fetch;\n  }\n\n  async send<T extends OutputType[]>(\n    config: RequestConfig,\n    outputs: T,\n    signal?: AbortSignal,\n  ): Promise<Extract<Unionize<T>, SuccessfulResponse<unknown>>>;\n  async send<T extends OutputType[], R>(\n    config: RequestConfig,\n    outputs: T,\n    signal?: AbortSignal,\n    mapper?: ResponseMapper<T, R>,\n  ): Promise<RebindSuccessPayload<Extract<Unionize<T>, SuccessfulResponse<unknown>>, R>>;\n  async send<T extends OutputType[], R = ResponseData<T>>(\n    config: RequestConfig,\n    outputs: T,\n    signal?: AbortSignal,\n    mapper?: ResponseMapper<T, R>,\n  ) {\n    for (const interceptor of this.#interceptors) {\n      if (interceptor.before) {\n        config = await interceptor.before(config);\n      }\n    }\n\n    const init = signal === undefined ? config.init : { ...config.init, signal };\n\n    let response = await (this.#fetch ?? fetch)(new Request(config.url, init));\n\n    for (let i = this.#interceptors.length - 1; i >= 0; i--) {\n      const interceptor = this.#interceptors[i];\n      if (interceptor.after) {\n        response = await interceptor.after(response.clone());\n      }\n    }\n\n    if (mapper) {\n      return await parse(outputs, response, mapper);\n    }\n    return await parse(outputs, response);\n  }\n}\n";
 
 // packages/typescript/src/lib/http/interceptors.txt
 var interceptors_default = "export interface Interceptor {\n  before?: (config: RequestConfig) => Promise<RequestConfig> | RequestConfig;\n  after?: (response: Response) => Promise<Response> | Response;\n}\n\nexport const createHeadersInterceptor = (\n  headers: Record<string, string | undefined>,\n  requestHeaders: HeadersInit,\n):Interceptor => {\n  return {\n    before({init, url}) {\n      // Priority Levels\n      // 1. Headers Input\n      // 2. Request Headers\n      // 3. Default Headers\n\n      for (const [key, value] of new Headers(requestHeaders)) {\n        // Only set the header if it doesn't already exist and has a value\n        // even though these headers are passed at operation level\n        // still they are lower priority compared to the headers input\n        if (value !== undefined && !init.headers.has(key)) {\n          init.headers.set(key, value);\n        }\n      }\n\n      for (const [key, value] of Object.entries(headers)) {\n        // Only set the header if it doesn't already exist and has a value\n        if (value !== undefined && !init.headers.has(key)) {\n          init.headers.set(key, value);\n        }\n      }\n\n      return {init, url};\n    },\n  };\n};\n\nexport const createBaseUrlInterceptor = (baseUrl: string): Interceptor => {\n  return {\n    before({ init, url }) {\n      if (url.protocol === 'local:') {\n        return {\n          init,\n          url: new URL(url.href.replace('local://', baseUrl))\n        };\n      }\n      return { init, url };\n    },\n  };\n};\n\nexport const logInterceptor: Interceptor = {\n  before({ url, init }) {\n    console.log('Request:', { url, init });\n    return { url, init };\n  },\n  after(response) {\n    console.log('Response:', response);\n    return response;\n  },\n};\n\n/**\n * Creates an interceptor that logs detailed information about requests and responses.\n * @param options Configuration options for the logger\n * @returns An interceptor object with before and after handlers\n */\nexport const createDetailedLogInterceptor = (options?: {\n  logLevel?: 'debug' | 'info' | 'warn' | 'error';\n  includeRequestBody?: boolean;\n  includeResponseBody?: boolean;\n}) => {\n  const logLevel = options?.logLevel || 'info';\n  const includeRequestBody = options?.includeRequestBody || false;\n  const includeResponseBody = options?.includeResponseBody || false;\n\n  return {\n    async before(request: Request) {\n      const logData = {\n        url: request.url,\n        method: request.method,\n        contentType: request.headers.get('Content-Type'),\n        headers: Object.fromEntries([...request.headers.entries()]),\n      };\n\n      console[logLevel]('\u{1F680} Outgoing Request:', logData);\n\n      if (includeRequestBody) {\n        try {\n          // Clone the request to avoid consuming the body stream\n          const clonedRequest = request.clone();\n          if (clonedRequest.headers.get('Content-Type')?.includes('application/json')) {\n            const body = await clonedRequest.json().catch(() => null);\n            console[logLevel]('Request Body:', body);\n          } else {\n            const body = await clonedRequest.text().catch(() => null);\n            console[logLevel]('Request Body:', body);\n          }\n        } catch (error) {\n          console.error('Could not log request body:', error);\n        }\n      }\n\n      return request;\n    },\n\n    async after(response: Response) {\n      const logData = {\n        status: response.status,\n        statusText: response.statusText,\n        url: response.url,\n        headers: Object.fromEntries([...response.headers.entries()]),\n      };\n\n      console[logLevel]('\u{1F4E5} Incoming Response:', logData);\n\n      if (includeResponseBody && response.body) {\n        try {\n          // Clone the response to avoid consuming the body stream\n          const clonedResponse = response.clone();\n          if (clonedResponse.headers.get('Content-Type')?.includes('application/json')) {\n            const body = await clonedResponse.json().catch(() => null);\n            console[logLevel]('Response Body:', body);\n          } else {\n            const body = await clonedResponse.text().catch(() => null);\n            if (body) {\n              console[logLevel]('Response Body:', body.substring(0, 500) + (body.length > 500 ? '...' : ''));\n            } else {\n              console[logLevel]('No response body');\n            }\n          }\n        } catch (error) {\n          console.error('Could not log response body:', error);\n        }\n      }\n\n      return response;\n    },\n  };\n};\n";
@@ -1331,13 +1347,13 @@ var response_default = "export class APIResponse<Body = unknown, Status extends
 var sse_default = 'export type SSEListener = (eventType: string) => AsyncIterable<string>;\n\nexport function sse(response: Response): SSEListener {\n	const subscribers = new Map<\n		string,\n		{ queue: string[]; resolve: (() => void) | null }\n	>();\n	let started = false;\n	let streamDone = false;\n\n	function dispatch(eventType: string, data: string) {\n		const sub = subscribers.get(eventType);\n		if (sub) {\n			sub.queue.push(data);\n			sub.resolve?.();\n			sub.resolve = null;\n		}\n	}\n\n	function endAll() {\n		streamDone = true;\n		for (const sub of subscribers.values()) {\n			sub.resolve?.();\n		}\n	}\n\n	function startReading() {\n		if (started) return;\n		started = true;\n		const decoder = new TextDecoder();\n		let buffer = "";\n\n		(async () => {\n			try {\n				for await (const value of response.body!) {\n					buffer += decoder.decode(value, { stream: true });\n					const parts = buffer.split("\\n\\n");\n					buffer = parts.pop()!;\n\n					for (const part of parts) {\n						if (!part.trim()) continue;\n						let eventType = "message";\n						let data = "";\n						for (const line of part.split("\\n")) {\n							if (line.startsWith("event:")) {\n								eventType = line.slice(6).trim();\n							} else if (line.startsWith("data:")) {\n								data += (data ? "\\n" : "") + line.slice(5).trim();\n							}\n						}\n						if (data) dispatch(eventType, data);\n					}\n				}\n			} catch {}\n			endAll();\n		})();\n	}\n\n	return function listen(eventType: string): AsyncIterable<string> {\n		if (!subscribers.has(eventType)) {\n			subscribers.set(eventType, { queue: [], resolve: null });\n		}\n		const sub = subscribers.get(eventType)!;\n		startReading();\n\n		return {\n			[Symbol.asyncIterator]() {\n				return {\n					async next(): Promise<IteratorResult<string>> {\n						while (sub.queue.length === 0) {\n							if (streamDone) return { value: undefined as any, done: true };\n							const { promise, resolve } = Promise.withResolvers<void>();\n							sub.resolve = resolve;\n							await promise;\n						}\n						return { value: sub.queue.shift()!, done: false };\n					},\n					async return(): Promise<IteratorResult<string>> {\n						return { value: undefined as any, done: true };\n					},\n				};\n			},\n		};\n	};\n}\n';
 
 // packages/typescript/src/lib/paginations/cursor-pagination.txt
-var cursor_pagination_default = "type CursorPaginationParams = {\n  cursor?: string;\n};\n\ninterface CursorMetadata extends Metadata {\n  nextCursor?: string;\n}\n\ninterface Metadata {\n  hasMore?: boolean;\n}\n\ntype PaginationResult<T, M extends CursorMetadata> = {\n  data: T[];\n  meta: M;\n};\n\ntype FetchFn<T, M extends CursorMetadata> = (\n  input: CursorPaginationParams,\n) => Promise<PaginationResult<T, M>>;\n\n/**\n * @experimental\n */\nexport class CursorPagination<T, M extends CursorMetadata> {\n  #meta: PaginationResult<T, M>['meta'] | null = null;\n  #params: CursorPaginationParams;\n  #currentPage: Page<T> | null = null;\n  readonly #fetchFn: FetchFn<T, M>;\n\n  constructor(\n    initialParams: PartialNullable<CursorPaginationParams>,\n    fetchFn: FetchFn<T, M>,\n  ) {\n    this.#fetchFn = fetchFn;\n    this.#params = {\n      cursor: initialParams.cursor ?? undefined,\n    };\n  }\n\n  async getNextPage() {\n    const result = await this.#fetchFn(this.#params);\n    this.#currentPage = new Page(result.data);\n    this.#meta = result.meta;\n    this.#params = {\n      ...this.#params,\n      cursor: result.meta.nextCursor,\n    };\n    return this;\n  }\n\n  getCurrentPage() {\n    if (!this.#currentPage) {\n      throw new Error(\n        'No page data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#currentPage;\n  }\n\n  get hasMore() {\n    if (!this.#meta) {\n      throw new Error(\n        'No meta data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#meta.hasMore;\n  }\n\n  async *[Symbol.asyncIterator]() {\n    for await (const page of this.iter()) {\n      yield page.getCurrentPage();\n    }\n  }\n\n  async *iter() {\n    if (!this.#currentPage) {\n      yield await this.getNextPage();\n    }\n\n    while (this.hasMore) {\n      yield await this.getNextPage();\n    }\n  }\n\n  get metadata() {\n    if (!this.#meta) {\n      throw new Error(\n        'No meta data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#meta;\n  }\n}\n\nclass Page<T> {\n  data: T[];\n  constructor(data: T[]) {\n    this.data = data;\n  }\n}\n\ntype PartialNullable<T> = {\n  [K in keyof T]?: T[K] | null;\n};\n";
+var cursor_pagination_default = "type CursorPaginationParams = {\n  cursor?: string;\n};\n\ninterface CursorMetadata extends Metadata {\n  nextCursor?: string;\n}\n\ninterface Metadata {\n  hasMore?: boolean;\n}\n\ntype PaginationRequestOptions = {\n  signal?: AbortSignal;\n};\n\ntype PaginationResult<T, M extends CursorMetadata> = {\n  data: T[];\n  meta: M;\n};\n\ntype FetchFn<T, M extends CursorMetadata> = (\n  input: CursorPaginationParams,\n  requestOptions?: PaginationRequestOptions,\n) => Promise<PaginationResult<T, M>>;\n\n/**\n * @experimental\n */\nexport class CursorPagination<T, M extends CursorMetadata> {\n  #meta: PaginationResult<T, M>['meta'] | null = null;\n  #params: CursorPaginationParams;\n  #currentPage: Page<T> | null = null;\n  readonly #fetchFn: FetchFn<T, M>;\n  readonly #requestOptions: PaginationRequestOptions;\n\n  constructor(\n    initialParams: PartialNullable<CursorPaginationParams>,\n    fetchFn: FetchFn<T, M>,\n    requestOptions: PaginationRequestOptions = {},\n  ) {\n    this.#fetchFn = fetchFn;\n    this.#requestOptions = requestOptions;\n    this.#params = {\n      cursor: initialParams.cursor ?? undefined,\n    };\n  }\n\n  async getNextPage(requestOptions?: PaginationRequestOptions) {\n    const result = await this.#fetchFn(this.#params, {\n      ...this.#requestOptions,\n      ...requestOptions,\n    });\n    this.#currentPage = new Page(result.data);\n    this.#meta = result.meta;\n    this.#params = {\n      ...this.#params,\n      cursor: result.meta.nextCursor,\n    };\n    return this;\n  }\n\n  getCurrentPage() {\n    if (!this.#currentPage) {\n      throw new Error(\n        'No page data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#currentPage;\n  }\n\n  get hasMore() {\n    if (!this.#meta) {\n      throw new Error(\n        'No meta data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#meta.hasMore;\n  }\n\n  async *[Symbol.asyncIterator]() {\n    for await (const page of this.iter()) {\n      yield page.getCurrentPage();\n    }\n  }\n\n  async *iter(requestOptions?: PaginationRequestOptions) {\n    if (!this.#currentPage) {\n      yield await this.getNextPage(requestOptions);\n    }\n\n    while (this.hasMore) {\n      yield await this.getNextPage(requestOptions);\n    }\n  }\n\n  get metadata() {\n    if (!this.#meta) {\n      throw new Error(\n        'No meta data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#meta;\n  }\n}\n\nclass Page<T> {\n  data: T[];\n  constructor(data: T[]) {\n    this.data = data;\n  }\n}\n\ntype PartialNullable<T> = {\n  [K in keyof T]?: T[K] | null;\n};\n";
 
 // packages/typescript/src/lib/paginations/offset-pagination.txt
-var offset_pagination_default = "type OffsetPaginationParams = {\n  offset: number;\n  limit: number;\n};\n\ninterface Metadata {\n  hasMore?: boolean;\n}\n\ntype PaginationResult<T, M extends Metadata> = {\n  data: T[];\n  meta: M;\n};\n\ntype FetchFn<T, M extends Metadata> = (\n  input: OffsetPaginationParams,\n) => Promise<PaginationResult<T, M>>;\n\n/**\n * @experimental\n */\nexport class OffsetPagination<T, M extends Metadata> {\n  #meta: PaginationResult<T, M>['meta'] | null = null;\n  #params: OffsetPaginationParams;\n  #currentPage: Page<T> | null = null;\n  readonly #fetchFn: FetchFn<T, M>;\n\n  constructor(\n    initialParams: Partial<OffsetPaginationParams>,\n    fetchFn: FetchFn<T, M>,\n  ) {\n    this.#fetchFn = fetchFn;\n    this.#params = {\n      limit: initialParams.limit ?? 0,\n      offset: initialParams.offset ?? 0,\n    };\n  }\n\n  async getNextPage() {\n    const result = await this.#fetchFn(this.#params);\n    this.#currentPage = new Page(result.data);\n    this.#meta = result.meta;\n    this.#params = {\n      ...this.#params,\n      offset: this.#params.offset + this.#params.limit,\n    };\n    return this;\n  }\n\n  getCurrentPage() {\n    if (!this.#currentPage) {\n      throw new Error(\n        'No page data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#currentPage;\n  }\n\n  get hasMore() {\n    if (!this.#meta) {\n      throw new Error(\n        'No meta data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#meta.hasMore;\n  }\n\n  async *[Symbol.asyncIterator]() {\n    for await (const page of this.iter()) {\n      yield page.getCurrentPage();\n    }\n  }\n\n  async *iter() {\n    if (!this.#currentPage) {\n      yield await this.getNextPage();\n    }\n\n    while (this.hasMore) {\n      yield await this.getNextPage();\n    }\n  }\n\n  get metadata() {\n    if (!this.#meta) {\n      throw new Error(\n        'No meta data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#meta;\n  }\n\n  reset(params?: Partial<OffsetPaginationParams>) {\n    this.#meta = null;\n    this.#currentPage = null;\n    if (params) {\n      this.#params = { ...this.#params, ...params };\n    } else {\n      this.#params.offset = 0;\n    }\n    return this;\n  }\n}\n\nclass Page<T> {\n  data: T[];\n  constructor(data: T[]) {\n    this.data = data;\n  }\n}\n";
+var offset_pagination_default = "type OffsetPaginationParams = {\n  offset: number;\n  limit: number;\n};\n\ninterface Metadata {\n  hasMore?: boolean;\n}\n\ntype PaginationRequestOptions = {\n  signal?: AbortSignal;\n};\n\ntype PaginationResult<T, M extends Metadata> = {\n  data: T[];\n  meta: M;\n};\n\ntype FetchFn<T, M extends Metadata> = (\n  input: OffsetPaginationParams,\n  requestOptions?: PaginationRequestOptions,\n) => Promise<PaginationResult<T, M>>;\n\n/**\n * @experimental\n */\nexport class OffsetPagination<T, M extends Metadata> {\n  #meta: PaginationResult<T, M>['meta'] | null = null;\n  #params: OffsetPaginationParams;\n  #currentPage: Page<T> | null = null;\n  readonly #fetchFn: FetchFn<T, M>;\n  readonly #requestOptions: PaginationRequestOptions;\n\n  constructor(\n    initialParams: Partial<OffsetPaginationParams>,\n    fetchFn: FetchFn<T, M>,\n    requestOptions: PaginationRequestOptions = {},\n  ) {\n    this.#fetchFn = fetchFn;\n    this.#requestOptions = requestOptions;\n    this.#params = {\n      limit: initialParams.limit ?? 0,\n      offset: initialParams.offset ?? 0,\n    };\n  }\n\n  async getNextPage(requestOptions?: PaginationRequestOptions) {\n    const result = await this.#fetchFn(this.#params, {\n      ...this.#requestOptions,\n      ...requestOptions,\n    });\n    this.#currentPage = new Page(result.data);\n    this.#meta = result.meta;\n    this.#params = {\n      ...this.#params,\n      offset: this.#params.offset + this.#params.limit,\n    };\n    return this;\n  }\n\n  getCurrentPage() {\n    if (!this.#currentPage) {\n      throw new Error(\n        'No page data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#currentPage;\n  }\n\n  get hasMore() {\n    if (!this.#meta) {\n      throw new Error(\n        'No meta data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#meta.hasMore;\n  }\n\n  async *[Symbol.asyncIterator]() {\n    for await (const page of this.iter()) {\n      yield page.getCurrentPage();\n    }\n  }\n\n  async *iter(requestOptions?: PaginationRequestOptions) {\n    if (!this.#currentPage) {\n      yield await this.getNextPage(requestOptions);\n    }\n\n    while (this.hasMore) {\n      yield await this.getNextPage(requestOptions);\n    }\n  }\n\n  get metadata() {\n    if (!this.#meta) {\n      throw new Error(\n        'No meta data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#meta;\n  }\n\n  reset(params?: Partial<OffsetPaginationParams>) {\n    this.#meta = null;\n    this.#currentPage = null;\n    if (params) {\n      this.#params = { ...this.#params, ...params };\n    } else {\n      this.#params.offset = 0;\n    }\n    return this;\n  }\n}\n\nclass Page<T> {\n  data: T[];\n  constructor(data: T[]) {\n    this.data = data;\n  }\n}\n";
 
 // packages/typescript/src/lib/paginations/page-pagination.txt
-var page_pagination_default = "type InferPage<T> = T extends Page<infer U> ? U : never;\ntype PaginationParams<P extends number | bigint, S extends number | bigint> = {\n  page?: P;\n  pageSize?: S;\n};\n\ninterface Metadata {\n  hasMore?: boolean;\n}\n\ntype PaginationResult<T, M extends Metadata> = {\n  data: T[];\n  meta: M;\n};\n\ntype FetchFn<\n  T,\n  M extends Metadata,\n  P extends number | bigint,\n  S extends number | bigint,\n> = (input: Partial<PaginationParams<P, S>>) => Promise<PaginationResult<T, M>>;\n\n/**\n * @experimental\n */\nexport class Pagination<\n  T,\n  M extends Metadata,\n  P extends number | bigint,\n  S extends number | bigint,\n> {\n  #meta: PaginationResult<T, M>['meta'] | null = null;\n  #params: PaginationParams<P, S>;\n  #currentPage: Page<T> | null = null;\n  readonly #fetchFn: FetchFn<T, M, P, S>;\n\n  constructor(\n    initialParams: Partial<PaginationParams<P, S>>,\n    fetchFn: FetchFn<T, M, P, S>,\n  ) {\n    this.#fetchFn = fetchFn;\n    this.#params = { ...initialParams, page: initialParams.page };\n  }\n\n  async getNextPage() {\n    const result = await this.#fetchFn(this.#params);\n    this.#currentPage = new Page(result.data);\n    this.#meta = result.meta;\n    this.#params = {\n      ...this.#params,\n      page: ((this.#params.page as number) || 0 + 1) as never,\n    };\n    return this;\n  }\n\n  getCurrentPage() {\n    if (!this.#currentPage) {\n      throw new Error(\n        'No page data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#currentPage;\n  }\n\n  get hasMore() {\n    if (!this.#meta) {\n      throw new Error(\n        'No meta data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#meta.hasMore;\n  }\n\n  async *[Symbol.asyncIterator]() {\n    for await (const page of this.iter()) {\n      yield page.getCurrentPage();\n    }\n  }\n\n  async *iter() {\n    if (!this.#currentPage) {\n      yield await this.getNextPage();\n    }\n\n    while (this.hasMore) {\n      yield await this.getNextPage();\n    }\n  }\n\n  get metadata() {\n    if (!this.#meta) {\n      throw new Error(\n        'No meta data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#meta;\n  }\n}\n\nclass Page<T> {\n  data: T[];\n  constructor(data: T[]) {\n    this.data = data;\n  }\n}\n";
+var page_pagination_default = "type InferPage<T> = T extends Page<infer U> ? U : never;\ntype PaginationParams<P extends number | bigint, S extends number | bigint> = {\n  page?: P;\n  pageSize?: S;\n};\n\ninterface Metadata {\n  hasMore?: boolean;\n}\n\ntype PaginationRequestOptions = {\n  signal?: AbortSignal;\n};\n\ntype PaginationResult<T, M extends Metadata> = {\n  data: T[];\n  meta: M;\n};\n\ntype FetchFn<\n  T,\n  M extends Metadata,\n  P extends number | bigint,\n  S extends number | bigint,\n> = (\n  input: Partial<PaginationParams<P, S>>,\n  requestOptions?: PaginationRequestOptions,\n) => Promise<PaginationResult<T, M>>;\n\n/**\n * @experimental\n */\nexport class Pagination<\n  T,\n  M extends Metadata,\n  P extends number | bigint,\n  S extends number | bigint,\n> {\n  #meta: PaginationResult<T, M>['meta'] | null = null;\n  #params: PaginationParams<P, S>;\n  #currentPage: Page<T> | null = null;\n  readonly #fetchFn: FetchFn<T, M, P, S>;\n  readonly #requestOptions: PaginationRequestOptions;\n\n  constructor(\n    initialParams: Partial<PaginationParams<P, S>>,\n    fetchFn: FetchFn<T, M, P, S>,\n    requestOptions: PaginationRequestOptions = {},\n  ) {\n    this.#fetchFn = fetchFn;\n    this.#requestOptions = requestOptions;\n    this.#params = { ...initialParams, page: initialParams.page };\n  }\n\n  async getNextPage(requestOptions?: PaginationRequestOptions) {\n    const result = await this.#fetchFn(this.#params, {\n      ...this.#requestOptions,\n      ...requestOptions,\n    });\n    this.#currentPage = new Page(result.data);\n    this.#meta = result.meta;\n    this.#params = {\n      ...this.#params,\n      page: (((this.#params.page as number) || 0) + 1) as never,\n    };\n    return this;\n  }\n\n  getCurrentPage() {\n    if (!this.#currentPage) {\n      throw new Error(\n        'No page data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#currentPage;\n  }\n\n  get hasMore() {\n    if (!this.#meta) {\n      throw new Error(\n        'No meta data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#meta.hasMore;\n  }\n\n  async *[Symbol.asyncIterator]() {\n    for await (const page of this.iter()) {\n      yield page.getCurrentPage();\n    }\n  }\n\n  async *iter(requestOptions?: PaginationRequestOptions) {\n    if (!this.#currentPage) {\n      yield await this.getNextPage(requestOptions);\n    }\n\n    while (this.hasMore) {\n      yield await this.getNextPage(requestOptions);\n    }\n  }\n\n  get metadata() {\n    if (!this.#meta) {\n      throw new Error(\n        'No meta data available. Please call getNextPage() first.',\n      );\n    }\n    return this.#meta;\n  }\n}\n\nclass Page<T> {\n  data: T[];\n  constructor(data: T[]) {\n    this.data = data;\n  }\n}\n";
 
 // packages/typescript/src/lib/readme/readme.ts
 import { isEmpty as isEmpty3 } from "@sdk-it/core";
@@ -2035,22 +2051,25 @@ var TypeScriptSnippet = class {
     switch (pagination.type) {
       case "page":
         return {
-          content: `const result = ${this.#toRequest(entry, payload)}`,
-          footer: `for await (const page of result) {
+          content: `const controller = new AbortController();
+const result = await ${camelcase5(this.#clientName)}.request('${entry.method.toUpperCase()} ${entry.path}', ${payload}, { signal: controller.signal });`,
+          footer: `for await (const page of result.iter({ signal: controller.signal })) {
 		console.log(page);
 }`
         };
       case "offset":
         return {
-          content: `const result = ${this.#toRequest(entry, payload)}`,
-          footer: `for await (const page of result) {
+          content: `const controller = new AbortController();
+const result = await ${camelcase5(this.#clientName)}.request('${entry.method.toUpperCase()} ${entry.path}', ${payload}, { signal: controller.signal });`,
+          footer: `for await (const page of result.iter({ signal: controller.signal })) {
 		console.log(page);
 }`
         };
       case "cursor":
         return {
-          content: `const result = ${this.#toRequest(entry, payload)}`,
-          footer: `for await (const page of result) {
+          content: `const controller = new AbortController();
+const result = await ${camelcase5(this.#clientName)}.request('${entry.method.toUpperCase()} ${entry.path}', ${payload}, { signal: controller.signal });`,
+          footer: `for await (const page of result.iter({ signal: controller.signal })) {
 		console.log(page);
 }`
         };
@@ -2156,7 +2175,7 @@ ${client.use}`;
     );
     if (hasServers) {
       sections.push(
-        "| `baseUrl` | `string` | No | API base URL (default: `" + baseUrl + "`) |"
+        "| `baseUrl` | `string | (() => string | Promise<string>)` | No | API base URL (default: `" + baseUrl + "`) |"
       );
     }
     for (const authOption of authOptions) {
@@ -2230,10 +2249,10 @@ ${client.use}`;
         "",
         "// Check if more pages exist",
         "if (result.hasMore) {",
-        "  await result.getNextPage();",
+        "  await result.getNextPage({ signal: controller.signal });",
         "}",
         "",
-        "// Or iterate through all pages automatically",
+        "// Or iterate through all pages with cancellable page fetches",
         paginationExample.footer
       ])
     );
@@ -2897,12 +2916,9 @@ ${utils_default}`
               skipLibCheck: true,
               skipDefaultLibCheck: true,
               target: "ESNext",
-              module: "ESNext",
               noEmit: true,
-              strict: true,
               allowImportingTsExtensions: true,
               verbatimModuleSyntax: true,
-              baseUrl: ".",
               moduleResolution: "bundler"
             },
             include: ["**/*.ts"]