Fix imports

.eslintrc

@@ -16,6 +16,7 @@
   },
   "plugins": ["@typescript-eslint"],
   "rules": {
+    "@typescript-eslint/ban-types": "off",
     "@typescript-eslint/no-empty-function": "off",
     "@typescript-eslint/no-explicit-any": "off",
     "linebreak-style": ["error", "unix"],

.github/workflows/publish.yml

@@ -1,9 +1,8 @@
 name: Publish
 on:
-  workflow_run:
-    workflows: [CI]
-    branches: [main]
-    types: [completed]
+  push:
+    branches:
+      - "**"
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
@@ -13,7 +12,6 @@ permissions:
 
 jobs:
   publish:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chanfana",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "OpenAPI 3 and 3.1 schema generator and validator for Hono, itty-router and more!",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -74,7 +74,7 @@
     "wrangler": "^3.60.1"
   },
   "dependencies": {
-    "@asteasolutions/zod-to-openapi": "^7.0.0",
+    "@asteasolutions/zod-to-openapi": "^7.1.1",
     "js-yaml": "^4.1.0",
     "openapi3-ts": "^4.3.2",
     "zod": "^3.23.8"

src/openapi.ts

@@ -1,5 +1,5 @@
 import { getReDocUI, getSwaggerUI } from './ui'
-import { type RouterOptions } from './types'
+import { type OpenAPIRouteSchema, type RouterOptions } from './types'
 import {
   OpenApiGeneratorV3,
   OpenApiGeneratorV31,
@@ -135,7 +135,7 @@ export class OpenAPIHandler {
     const parsedRoute = this.parseRoute(params.path)
 
     // @ts-ignore
-    let schema: RouteConfig = undefined
+    let schema: OpenAPIRouteSchema = undefined
     // @ts-ignore
     let operationId: string = undefined
 

src/parameters.ts

@@ -2,10 +2,10 @@ import {
   type RegexParameterType,
   type EnumerationParameterType,
   type ParameterType,
+  type RouteParameter,
 } from './types'
 import { z } from 'zod'
 import { isSpecificZodType, legacyTypeIntoZod } from './zod/utils'
-import { type RouteParameter } from '@asteasolutions/zod-to-openapi/dist/openapi-registry'
 import { extendZodWithOpenApi } from '@asteasolutions/zod-to-openapi'
 
 extendZodWithOpenApi(z)

src/route.ts

@@ -5,10 +5,7 @@ import {
 } from './types'
 import { coerceInputs } from './parameters'
 import { type AnyZodObject, z } from 'zod'
-import {
-  extendZodWithOpenApi,
-  type RouteConfig,
-} from '@asteasolutions/zod-to-openapi'
+import { extendZodWithOpenApi } from '@asteasolutions/zod-to-openapi'
 import { jsonResp } from './utils'
 extendZodWithOpenApi(z)
 
@@ -46,7 +43,7 @@ export class OpenAPIRoute {
     return this.schema
   }
 
-  getSchemaZod(): RouteConfig {
+  getSchemaZod(): OpenAPIRouteSchema {
     // Deep copy
     const schema = { ...this.getSchema() }
 
@@ -104,7 +101,7 @@ export class OpenAPIRoute {
   }
 
   async validateRequest(request: Request) {
-    const schema: RouteConfig = this.getSchemaZod()
+    const schema: OpenAPIRouteSchema = this.getSchemaZod()
     const unvalidatedData: any = {}
 
     const rawSchema: any = {}

src/types.ts

@@ -1,14 +1,56 @@
-import { type AnyZodObject, z, ZodType } from 'zod'
+import { type AnyZodObject, z, type ZodEffects, ZodType } from 'zod'
 import {
-  type ResponseConfig,
-  type ZodRequestBody,
-} from '@asteasolutions/zod-to-openapi/dist/openapi-registry'
-import { type RouteConfig } from '@asteasolutions/zod-to-openapi'
-import { type OpenAPIObjectConfigV31 } from '@asteasolutions/zod-to-openapi/dist/v3.1/openapi-generator'
-import { type OpenAPIObjectConfig } from '@asteasolutions/zod-to-openapi/dist/v3.0/openapi-generator'
+  type RouteConfig,
+  type ZodMediaTypeObject,
+} from '@asteasolutions/zod-to-openapi'
+import {
+  type HeadersObject as HeadersObject30,
+  type LinksObject as LinksObject30,
+  type OpenAPIObject,
+} from 'openapi3-ts/oas30'
+import {
+  type HeadersObject as HeadersObject31,
+  type LinksObject as LinksObject31,
+} from 'openapi3-ts/oas31'
 
 export type Simplify<T> = { [KeyType in keyof T]: T[KeyType] } & {}
 
+// The following types are copied from @asteasolutions/zod-to-openapi as they are not exported
+export type OpenAPIObjectConfig = Omit<
+  OpenAPIObject,
+  'paths' | 'components' | 'webhooks'
+>
+export type OpenAPIObjectConfigV31 = Omit<
+  OpenAPIObject,
+  'paths' | 'components' | 'webhooks'
+>
+
+type HeadersObject = HeadersObject30 | HeadersObject31
+type LinksObject = LinksObject30 | LinksObject31
+
+export type ZodMediaType =
+  | 'application/json'
+  | 'text/html'
+  | 'text/plain'
+  | 'application/xml'
+  | (string & {})
+export type ZodContentObject = Partial<Record<ZodMediaType, ZodMediaTypeObject>>
+export interface ZodRequestBody {
+  description?: string
+  content: ZodContentObject
+  required?: boolean
+}
+export interface ResponseConfig {
+  description: string
+  headers?: AnyZodObject | HeadersObject
+  links?: LinksObject
+  content?: ZodContentObject
+}
+export type RouteParameter =
+  | AnyZodObject
+  | ZodEffects<AnyZodObject, unknown, unknown>
+  | undefined
+
 export interface RouterOptions {
   base?: string
   schema?: Partial<OpenAPIObjectConfigV31 | OpenAPIObjectConfig>

src/zod/registry.ts

@@ -1,9 +1,8 @@
 import { OpenAPIRegistry } from '@asteasolutions/zod-to-openapi'
-import { type OpenAPIDefinitions } from '@asteasolutions/zod-to-openapi/dist/openapi-registry'
 
 // @ts-ignore
 export class OpenAPIRegistryMerger extends OpenAPIRegistry {
-  public _definitions: OpenAPIDefinitions[] = []
+  public _definitions: object[] = []
 
   merge(registry: OpenAPIRegistryMerger): void {
     if (!registry || !registry._definitions) return