@hono/zod-openapi 0.14.9 → 0.15.1

package/dist/index.d.mts

@@ -1,8 +1,7 @@
 import * as openapi3_ts_oas31 from 'openapi3-ts/oas31';
 import * as openapi3_ts_oas30 from 'openapi3-ts/oas30';
-import { RouteConfig as RouteConfig$1, ZodMediaTypeObject, OpenAPIRegistry, ZodRequestBody, ZodContentObject } from '@asteasolutions/zod-to-openapi';
+import { RouteConfig as RouteConfig$1, ZodMediaTypeObject, OpenAPIRegistry, ZodRequestBody, ZodContentObject, OpenApiGeneratorV3 } from '@asteasolutions/zod-to-openapi';
 export { extendZodWithOpenApi } from '@asteasolutions/zod-to-openapi';
-import { OpenAPIObjectConfig } from '@asteasolutions/zod-to-openapi/dist/v3.0/openapi-generator';
 import { MiddlewareHandler, TypedResponse, Env, Context, Input, Handler, Schema, Hono, ToSchema, ValidationTargets } from 'hono';
 import { MergePath, MergeSchemaPath } from 'hono/types';
 import { JSONParsed, RemoveBlankRecord } from 'hono/utils/types';
@@ -21,7 +20,7 @@ type RequestTypes = {
     cookies?: ZodType;
     headers?: ZodType | ZodType[];
 };
-type IsJson<T> = T extends string ? T extends `application/json${infer _Rest}` ? 'json' : never : never;
+type IsJson<T> = T extends string ? T extends `application/${infer Start}json${infer _End}` ? Start extends '' | `${string}+` | `vnd.${string}+` ? 'json' : never : 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 HasUndefined<T> = undefined extends T ? true : false;
@@ -94,6 +93,7 @@ type RouteHandler<R extends RouteConfig, E extends Env = Env, I extends Input =
     };
 } ? MaybePromise<RouteConfigToTypedResponse<R>> : MaybePromise<RouteConfigToTypedResponse<R>> | MaybePromise<Response>>;
 type RouteHook<R extends RouteConfig, E extends Env = Env, I extends Input = InputTypeParam<R> & InputTypeQuery<R> & InputTypeHeader<R> & InputTypeCookie<R> & InputTypeForm<R> & InputTypeJson<R>, P extends string = ConvertPathType<R['path']>> = Hook<I, E, P, RouteConfigToTypedResponse<R> | Response | Promise<Response> | void | Promise<void>>;
+type OpenAPIObjectConfig = Parameters<InstanceType<typeof OpenApiGeneratorV3>['generateDocument']>[0];
 type OpenAPIObjectConfigure<E extends Env, P extends string> = OpenAPIObjectConfig | ((context: Context<E, P>) => OpenAPIObjectConfig);
 declare class OpenAPIHono<E extends Env = Env, S extends Schema = {}, BasePath extends string = '/'> extends Hono<E, S, BasePath> {
     openAPIRegistry: OpenAPIRegistry;

package/dist/index.d.ts

@@ -1,8 +1,7 @@
 import * as openapi3_ts_oas31 from 'openapi3-ts/oas31';
 import * as openapi3_ts_oas30 from 'openapi3-ts/oas30';
-import { RouteConfig as RouteConfig$1, ZodMediaTypeObject, OpenAPIRegistry, ZodRequestBody, ZodContentObject } from '@asteasolutions/zod-to-openapi';
+import { RouteConfig as RouteConfig$1, ZodMediaTypeObject, OpenAPIRegistry, ZodRequestBody, ZodContentObject, OpenApiGeneratorV3 } from '@asteasolutions/zod-to-openapi';
 export { extendZodWithOpenApi } from '@asteasolutions/zod-to-openapi';
-import { OpenAPIObjectConfig } from '@asteasolutions/zod-to-openapi/dist/v3.0/openapi-generator';
 import { MiddlewareHandler, TypedResponse, Env, Context, Input, Handler, Schema, Hono, ToSchema, ValidationTargets } from 'hono';
 import { MergePath, MergeSchemaPath } from 'hono/types';
 import { JSONParsed, RemoveBlankRecord } from 'hono/utils/types';
@@ -21,7 +20,7 @@ type RequestTypes = {
     cookies?: ZodType;
     headers?: ZodType | ZodType[];
 };
-type IsJson<T> = T extends string ? T extends `application/json${infer _Rest}` ? 'json' : never : never;
+type IsJson<T> = T extends string ? T extends `application/${infer Start}json${infer _End}` ? Start extends '' | `${string}+` | `vnd.${string}+` ? 'json' : never : 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 HasUndefined<T> = undefined extends T ? true : false;
@@ -94,6 +93,7 @@ type RouteHandler<R extends RouteConfig, E extends Env = Env, I extends Input =
     };
 } ? MaybePromise<RouteConfigToTypedResponse<R>> : MaybePromise<RouteConfigToTypedResponse<R>> | MaybePromise<Response>>;
 type RouteHook<R extends RouteConfig, E extends Env = Env, I extends Input = InputTypeParam<R> & InputTypeQuery<R> & InputTypeHeader<R> & InputTypeCookie<R> & InputTypeForm<R> & InputTypeJson<R>, P extends string = ConvertPathType<R['path']>> = Hook<I, E, P, RouteConfigToTypedResponse<R> | Response | Promise<Response> | void | Promise<void>>;
+type OpenAPIObjectConfig = Parameters<InstanceType<typeof OpenApiGeneratorV3>['generateDocument']>[0];
 type OpenAPIObjectConfigure<E extends Env, P extends string> = OpenAPIObjectConfig | ((context: Context<E, P>) => OpenAPIObjectConfig);
 declare class OpenAPIHono<E extends Env = Env, S extends Schema = {}, BasePath extends string = '/'> extends Hono<E, S, BasePath> {
     openAPIRegistry: OpenAPIRegistry;

package/dist/index.js

@@ -99,7 +99,7 @@ var OpenAPIHono = class _OpenAPIHono extends import_hono.Hono {
         if (!(schema instanceof import_zod.ZodType)) {
           continue;
         }
-        if (mediaType.startsWith("application/json")) {
+        if (/^application\/([a-z-\.]+\+)?json/.test(mediaType)) {
           const validator = (0, import_zod_validator.zValidator)("json", schema, hook);
           validators.push(validator);
         }

package/dist/index.mjs

@@ -77,7 +77,7 @@ var OpenAPIHono = class _OpenAPIHono extends Hono {
         if (!(schema instanceof ZodType)) {
           continue;
         }
-        if (mediaType.startsWith("application/json")) {
+        if (/^application\/([a-z-\.]+\+)?json/.test(mediaType)) {
           const validator = zValidator("json", schema, hook);
           validators.push(validator);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hono/zod-openapi",
-  "version": "0.14.9",
+  "version": "0.15.1",
   "description": "A wrapper class of Hono which supports OpenAPI.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",