@sdk-it/typescript 0.40.0 → 0.42.0

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

@@ -173,7 +173,7 @@ var ZodEmitter = class {
   normal(type, schema, required = false, nullable = false) {
     switch (type) {
       case "string": {
-        const defaultVal = schema.format === "date" && schema.default ? `new Date(${JSON.stringify(schema.default)})` : JSON.stringify(schema.default);
+        const defaultVal = (schema["x-zod-type"] === "date" || schema["x-zod-type"] === "coerce-date") && schema.default ? `new Date(${JSON.stringify(schema.default)})` : JSON.stringify(schema.default);
         return `${this.string(schema)}${this.#suffixes(defaultVal, required, nullable)}`;
       }
       case "number":
@@ -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,7 +253,7 @@ 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)";
       return base;
@@ -261,39 +261,45 @@ var ZodEmitter = class {
     switch (schema.format) {
       case "date-time":
       case "datetime":
-        base = "z.string().datetime()";
+        if (schema["x-zod-type"] === "coerce-date") {
+          base = "z.coerce.date()";
+        } else if (schema["x-zod-type"] === "date") {
+          base = "z.date()";
+        } else {
+          base += ".datetime()";
+        }
         break;
       case "date":
-        base = "z.coerce.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)";
         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;
@@ -307,14 +313,16 @@ var ZodEmitter = class {
    */
   #number(schema) {
     let defaultValue = schema.default;
-    let base = "z.number()";
+    let base;
     if (schema.format === "int64") {
-      base = "z.bigint()";
+      base = schema["x-zod-type"] === "coerce-bigint" ? "z.coerce.bigint()" : "z.bigint()";
       if (schema.default !== void 0) {
         defaultValue = `BigInt(${schema.default})`;
       }
+    } else {
+      base = schema["x-zod-type"] === "coerce-number" ? "z.coerce.number()" : "z.number()";
     }
-    if (schema.format === "int32") {
+    if (schema.type === "integer" && schema.format !== "int64") {
       base += ".int()";
     }
     if (typeof schema.exclusiveMinimum === "number") {
@@ -694,7 +702,7 @@ var TypeScriptEmitter = class {
       case "date-time":
       case "datetime":
       case "date":
-        type = "Date";
+        type = "string";
         break;
       case "binary":
       case "byte":
@@ -1302,7 +1310,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.instanceof(Request))\n  .returns(z.promise(z.instanceof(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    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    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";