Merge branch 'main' into fix-open-standard-schema-calls

Author: SaltyAom

CHANGELOG.md

@@ -1,4 +1,9 @@
+# 1.4.13 - 26 Dec 2025
+Bug fix:
+- merge multiple standalone standard schema
+
 # 1.4.12 - 18 Dec 2025
+Improvement:
 - support standard json schema conversion
 - [#300](https://github.com/elysiajs/elysia-openapi/pull/300) support standalone schema by @MarcelOlsen
 

bun.lock

@@ -1,21 +1,37 @@
 import { Elysia, t } from 'elysia'
-import z from 'zod'
-import { JSONSchema, Schema } from 'effect'
+import { fromTypes, openapi } from '../src'
+import * as z from 'zod'
 
-import { openapi } from '../src/index'
-
-const app = new Elysia()
-	.use(openapi())
-	.post('/', ({ body }) => body, {
-		body: z.object({
-			name: z.string()
+new Elysia()
+	.use(
+		openapi({
+			references: fromTypes(),
+			mapJsonSchema: {
+				zod: z.toJSONSchema
+			}
 		})
+	)
+	.macro('fooBar', {
+		query: z.object({
+			foo: z.optional(z.string())
+		}),
+		resolve({ query }) {
+			return { test: query.foo ? 'foo' : 'bar' }
+		}
 	})
-	.get('/test', ({ status }) => {}, {
-		response: {
-			403: t.Object({
-				name: t.String()
-			})
+	.get(
+		'/',
+		({ test, query }) => {
+			const { foo, bar } = query
+			return { ok: true, test, foo, bar }
+		},
+		{
+			query: z.object({
+				bar: z.optional(z.string())
+			}),
+			fooBar: true
 		}
+	)
+	.listen(3000, () => {
+		console.log('server started')
 	})
-	.listen(3000)

example/index.ts

@@ -1,6 +1,6 @@
 {
     "name": "@elysiajs/openapi",
-    "version": "1.4.12",
+    "version": "1.4.13",
     "description": "Plugin for Elysia to auto-generate API documentation",
     "author": {
         "name": "saltyAom",
@@ -73,7 +73,9 @@
         "build": "bun build.ts",
         "release": "npm run build && npm run test && npm publish --access public"
     },
-    "dependencies": {},
+    "dependencies": {
+        "elysia": "https://pkg.pr.new/elysiajs/elysia@1637"
+    },
     "devDependencies": {
         "@apidevtools/swagger-parser": "^12.0.0",
         "@scalar/types": "^0.2.13",

package.json

@@ -26,7 +26,11 @@ import { defineConfig } from 'tsup'
 export const capitalize = (word: string) =>
 	word.charAt(0).toUpperCase() + word.slice(1)
 
-const toRef = (name: string) => t.Ref(`#/components/schemas/${name}`)
+const toRef = (name: string) => t.Ref(
+	name.startsWith('#/')
+		? name
+		: `#/components/schemas/${name}`
+)
 
 const toOperationId = (method: string, paths: string) => {
 	let operationId = method.toLowerCase()
@@ -237,7 +241,7 @@ const normalizeSchemaReference = (
 
 	// Convert string reference to t.Ref node
 	// This allows string aliases to participate in schema composition
-	return t.Ref(schema)
+	return toRef(schema)
 }
 
 /**
@@ -252,7 +256,7 @@ const mergeSchemaProperty = (
 	if (!incoming) return existing
 
 	// Normalize string references to TRef nodes so they can be merged
-	const existingSchema = normalizeSchemaReference(existing)
+	let existingSchema = normalizeSchemaReference(existing)
 	let incomingSchema = normalizeSchemaReference(incoming)
 
 	if (!existingSchema) return incoming
@@ -261,7 +265,11 @@ const mergeSchemaProperty = (
 	if (!isTSchema(incomingSchema) && incomingSchema['~standard'])
 		incomingSchema = unwrapSchema(incomingSchema, vendors) as any
 
-	if (!incomingSchema) return existing
+	if (!isTSchema(existingSchema) && existingSchema['~standard'])
+		existingSchema = unwrapSchema(existingSchema, vendors) as any
+
+	if (!incomingSchema) return existingSchema
+	if (!existingSchema) return incomingSchema
 
 	// If both are object schemas, merge them
 	const { schema: mergedSchema, notObjects } = mergeObjectSchemas([
@@ -306,7 +314,11 @@ const unwrapResponseSchema = (
 									? normalizeSchemaReference(schema)
 									: isTSchema(schema)
 										? schema
-										: unwrapSchema(schema as any, vendors, 'output')
+										: unwrapSchema(
+												schema as any,
+												vendors,
+												'output'
+											)
 							])
 						)
 
@@ -506,7 +518,15 @@ export const unwrapSchema = (
 	if (typeof schema === 'string') schema = toRef(schema)
 	if (Kind in schema) return enumToOpenApi(schema)
 
-	if (Kind in schema || !schema?.['~standard']) return
+	// Already unwrapped by merging standalone validators
+	if (
+		!schema?.['~standard'] &&
+		// @ts-ignore
+		(schema.$schema || schema.type || schema.properties || schema.items)
+	)
+		return schema as OpenAPIV3.SchemaObject
+
+	if (!schema?.['~standard']) return
 
 	// @ts-ignore
 	const vendor = schema['~standard'].vendor
@@ -592,6 +612,11 @@ export const unwrapSchema = (
 	}
 }
 
+/**
+ * Convert TypeBox enum-like Union schemas to OpenAPI enum schemas
+ *
+ * Otherwise, return the schema as is
+ */
 export const enumToOpenApi = <
 	T extends
 		| TAnySchema
@@ -995,7 +1020,11 @@ export function toOpenAPISchema(
 					}
 				}
 			} else {
-				const response = unwrapSchema(hooks.response as any, vendors, 'output')
+				const response = unwrapSchema(
+					hooks.response as any,
+					vendors,
+					'output'
+				)
 
 				if (response) {
 					// @ts-ignore

src/openapi.ts

@@ -2,6 +2,7 @@ import { describe, it, expect } from 'bun:test'
 import { AnyElysia, Elysia, t } from 'elysia'
 
 import { toOpenAPISchema } from '../../src/openapi'
+import { z } from 'zod'
 
 const is = <T extends AnyElysia>(
 	app: T,
@@ -1219,4 +1220,60 @@ describe('OpenAPI > toOpenAPISchema', () => {
 			}
 		})
 	})
+
+	it('merge multiple standard standalone schema', () => {
+		const app = new Elysia()
+			.macro('fooBar', {
+				query: z.object({
+					foo: z.optional(z.string())
+				}),
+				resolve({ query }) {
+					return { test: query.foo ? 'foo' : 'bar' }
+				}
+			})
+			.get(
+				'/',
+				({ test, query }) => {
+					const { foo, bar } = query
+					return { ok: true, test, foo, bar }
+				},
+				{
+					query: z.object({
+						bar: z.optional(z.string())
+					}),
+					fooBar: true
+				}
+			)
+
+		is(app, {
+			components: {
+				schemas: {}
+			},
+			paths: {
+				'/': {
+					get: {
+						operationId: 'getIndex',
+						parameters: [
+							{
+								in: 'query',
+								name: 'bar',
+								required: false,
+								schema: {
+									type: 'string'
+								}
+							},
+							{
+								in: 'query',
+								name: 'foo',
+								required: false,
+								schema: {
+									type: 'string'
+								}
+							}
+						]
+					}
+				}
+			}
+		})
+	})
 })