@hono/zod-openapi 0.14.1 → 0.14.3

package/dist/index.d.mts

@@ -6,7 +6,7 @@ import { MiddlewareHandler, TypedResponse, Env, Context, Input, Handler, Schema,
 import { MergePath, MergeSchemaPath } from 'hono/types';
 import { StatusCode, InfoStatusCode, SuccessStatusCode, RedirectStatusCode, ClientErrorStatusCode, ServerErrorStatusCode } from 'hono/utils/http-status';
 import { RemoveBlankRecord } from 'hono/utils/types';
-import { ZodError, AnyZodObject, z, ZodSchema, ZodType } from 'zod';
+import { ZodError, ZodType, z, ZodSchema } from 'zod';
 export { z } from 'zod';
 
 type MaybePromise<T> = Promise<T> | T;
@@ -15,15 +15,15 @@ type RouteConfig = RouteConfig$1 & {
 };
 type RequestTypes = {
     body?: ZodRequestBody;
-    params?: AnyZodObject;
-    query?: AnyZodObject;
-    cookies?: AnyZodObject;
-    headers?: AnyZodObject | ZodType<unknown>[];
+    params?: ZodType;
+    query?: ZodType;
+    cookies?: ZodType;
+    headers?: ZodType | ZodType[];
 };
 type IsJson<T> = T extends string ? T extends `application/json${infer _Rest}` ? 'json' : never : never;
 type IsForm<T> = T extends string ? T extends `multipart/form-data${infer _Rest}` | `application/x-www-form-urlencoded${infer _Rest}` ? 'form' : never : never;
 type RequestPart<R extends RouteConfig, Part extends string> = Part extends keyof R['request'] ? R['request'][Part] : {};
-type InputTypeBase<R extends RouteConfig, Part extends string, Type extends string> = R['request'] extends RequestTypes ? RequestPart<R, Part> extends AnyZodObject ? {
+type InputTypeBase<R extends RouteConfig, Part extends string, Type extends string> = R['request'] extends RequestTypes ? RequestPart<R, Part> extends ZodType ? {
     in: {
         [K in Type]: z.input<RequestPart<R, Part>>;
     };
@@ -124,7 +124,7 @@ declare class OpenAPIHono<E extends Env = Env, S extends Schema = {}, BasePath e
      *  }
      *)
      */
-    openapi: <R extends RouteConfig, I extends Input = InputTypeBase<R, "params", "param"> & InputTypeBase<R, "query", "query"> & InputTypeBase<R, "headers", "header"> & InputTypeBase<R, "cookies", "cookie"> & InputTypeForm<R> & InputTypeJson<R>, P extends string = ConvertPathType<R["path"]>>(route: R, handler: Handler<E, P, I, R extends {
+    openapi: <R extends RouteConfig, I extends Input = InputTypeBase<R, "params", "param"> & InputTypeBase<R, "query", "query"> & InputTypeBase<R, "headers", "header"> & InputTypeBase<R, "cookies", "cookie"> & InputTypeForm<R> & InputTypeJson<R>, P extends string = ConvertPathType<R["path"]>>({ middleware: routeMiddleware, ...route }: R, handler: Handler<E, P, I, R extends {
         responses: {
             [statusCode: number]: {
                 content: {

package/dist/index.d.ts

@@ -6,7 +6,7 @@ import { MiddlewareHandler, TypedResponse, Env, Context, Input, Handler, Schema,
 import { MergePath, MergeSchemaPath } from 'hono/types';
 import { StatusCode, InfoStatusCode, SuccessStatusCode, RedirectStatusCode, ClientErrorStatusCode, ServerErrorStatusCode } from 'hono/utils/http-status';
 import { RemoveBlankRecord } from 'hono/utils/types';
-import { ZodError, AnyZodObject, z, ZodSchema, ZodType } from 'zod';
+import { ZodError, ZodType, z, ZodSchema } from 'zod';
 export { z } from 'zod';
 
 type MaybePromise<T> = Promise<T> | T;
@@ -15,15 +15,15 @@ type RouteConfig = RouteConfig$1 & {
 };
 type RequestTypes = {
     body?: ZodRequestBody;
-    params?: AnyZodObject;
-    query?: AnyZodObject;
-    cookies?: AnyZodObject;
-    headers?: AnyZodObject | ZodType<unknown>[];
+    params?: ZodType;
+    query?: ZodType;
+    cookies?: ZodType;
+    headers?: ZodType | ZodType[];
 };
 type IsJson<T> = T extends string ? T extends `application/json${infer _Rest}` ? 'json' : never : never;
 type IsForm<T> = T extends string ? T extends `multipart/form-data${infer _Rest}` | `application/x-www-form-urlencoded${infer _Rest}` ? 'form' : never : never;
 type RequestPart<R extends RouteConfig, Part extends string> = Part extends keyof R['request'] ? R['request'][Part] : {};
-type InputTypeBase<R extends RouteConfig, Part extends string, Type extends string> = R['request'] extends RequestTypes ? RequestPart<R, Part> extends AnyZodObject ? {
+type InputTypeBase<R extends RouteConfig, Part extends string, Type extends string> = R['request'] extends RequestTypes ? RequestPart<R, Part> extends ZodType ? {
     in: {
         [K in Type]: z.input<RequestPart<R, Part>>;
     };
@@ -124,7 +124,7 @@ declare class OpenAPIHono<E extends Env = Env, S extends Schema = {}, BasePath e
      *  }
      *)
      */
-    openapi: <R extends RouteConfig, I extends Input = InputTypeBase<R, "params", "param"> & InputTypeBase<R, "query", "query"> & InputTypeBase<R, "headers", "header"> & InputTypeBase<R, "cookies", "cookie"> & InputTypeForm<R> & InputTypeJson<R>, P extends string = ConvertPathType<R["path"]>>(route: R, handler: Handler<E, P, I, R extends {
+    openapi: <R extends RouteConfig, I extends Input = InputTypeBase<R, "params", "param"> & InputTypeBase<R, "query", "query"> & InputTypeBase<R, "headers", "header"> & InputTypeBase<R, "cookies", "cookie"> & InputTypeForm<R> & InputTypeJson<R>, P extends string = ConvertPathType<R["path"]>>({ middleware: routeMiddleware, ...route }: R, handler: Handler<E, P, I, R extends {
         responses: {
             [statusCode: number]: {
                 content: {

package/dist/index.js

@@ -26,7 +26,6 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_zod_to_openapi = require("@asteasolutions/zod-to-openapi");
-var import_zod_to_openapi2 = require("@asteasolutions/zod-to-openapi");
 var import_zod_validator = require("@hono/zod-validator");
 var import_hono = require("hono");
 var import_url = require("hono/utils/url");
@@ -70,7 +69,7 @@ var OpenAPIHono = class _OpenAPIHono extends import_hono.Hono {
    *  }
    *)
    */
-  openapi = (route, handler, hook = this.defaultHook) => {
+  openapi = ({ middleware: routeMiddleware, ...route }, handler, hook = this.defaultHook) => {
     this.openAPIRegistry.registerPath(route);
     const validators = [];
     if (route.request?.query) {
@@ -109,7 +108,7 @@ var OpenAPIHono = class _OpenAPIHono extends import_hono.Hono {
         }
       }
     }
-    const middleware = route.middleware ? Array.isArray(route.middleware) ? route.middleware : [route.middleware] : [];
+    const middleware = routeMiddleware ? Array.isArray(routeMiddleware) ? routeMiddleware : [routeMiddleware] : [];
     this.on(
       [route.method],
       route.path.replaceAll(/\/{(.+?)}/g, "/:$1"),
@@ -199,7 +198,7 @@ var createRoute = (routeConfig) => {
   };
   return Object.defineProperty(route, "getRoutingPath", { enumerable: false });
 };
-(0, import_zod_to_openapi2.extendZodWithOpenApi)(import_zod.z);
+(0, import_zod_to_openapi.extendZodWithOpenApi)(import_zod.z);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   OpenAPIHono,

package/dist/index.mjs

@@ -1,14 +1,14 @@
 // src/index.ts
 import {
+  OpenAPIRegistry,
   OpenApiGeneratorV3,
   OpenApiGeneratorV31,
-  OpenAPIRegistry
+  extendZodWithOpenApi
 } from "@asteasolutions/zod-to-openapi";
-import { extendZodWithOpenApi } from "@asteasolutions/zod-to-openapi";
 import { zValidator } from "@hono/zod-validator";
 import { Hono } from "hono";
 import { mergePath } from "hono/utils/url";
-import { z, ZodType } from "zod";
+import { ZodType, z } from "zod";
 var OpenAPIHono = class _OpenAPIHono extends Hono {
   openAPIRegistry;
   defaultHook;
@@ -48,7 +48,7 @@ var OpenAPIHono = class _OpenAPIHono extends Hono {
    *  }
    *)
    */
-  openapi = (route, handler, hook = this.defaultHook) => {
+  openapi = ({ middleware: routeMiddleware, ...route }, handler, hook = this.defaultHook) => {
     this.openAPIRegistry.registerPath(route);
     const validators = [];
     if (route.request?.query) {
@@ -87,7 +87,7 @@ var OpenAPIHono = class _OpenAPIHono extends Hono {
         }
       }
     }
-    const middleware = route.middleware ? Array.isArray(route.middleware) ? route.middleware : [route.middleware] : [];
+    const middleware = routeMiddleware ? Array.isArray(routeMiddleware) ? routeMiddleware : [routeMiddleware] : [];
     this.on(
       [route.method],
       route.path.replaceAll(/\/{(.+?)}/g, "/:$1"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hono/zod-openapi",
-  "version": "0.14.1",
+  "version": "0.14.3",
   "description": "A wrapper class of Hono which supports OpenAPI.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -44,15 +44,15 @@
     "@cloudflare/workers-types": "^4.20240117.0",
     "hono": "^4.3.6",
     "jest": "^29.7.0",
-    "openapi3-ts": "^4.1.2",
     "tsup": "^8.0.1",
     "typescript": "^5.4.4",
     "vitest": "^1.4.0",
+    "yaml": "^2.4.3",
     "zod": "^3.22.1"
   },
   "dependencies": {
     "@asteasolutions/zod-to-openapi": "^7.0.0",
-    "@hono/zod-validator": "0.2.1"
+    "@hono/zod-validator": "0.2.2"
   },
   "engines": {
     "node": ">=16.0.0"