@elysiajs/openapi 1.4.12 → 1.4.13

package/dist/cjs/index.js

@@ -2696,7 +2696,9 @@ function Void(options) {
 
 // src/openapi.ts
 var capitalize = (word) => word.charAt(0).toUpperCase() + word.slice(1);
-var toRef = (name) => import_elysia.t.Ref(`#/components/schemas/${name}`);
+var toRef = (name) => import_elysia.t.Ref(
+  name.startsWith("#/") ? name : `#/components/schemas/${name}`
+);
 var toOperationId = (method, paths) => {
   let operationId = method.toLowerCase();
   if (!paths || paths === "/") return operationId + "Index";
@@ -2828,18 +2830,21 @@ var isTSchema = (value) => {
 var normalizeSchemaReference = (schema) => {
   if (!schema) return void 0;
   if (typeof schema !== "string") return schema;
-  return import_elysia.t.Ref(schema);
+  return toRef(schema);
 };
 var mergeSchemaProperty = (existing, incoming, vendors) => {
   if (!existing) return incoming;
   if (!incoming) return existing;
-  const existingSchema = normalizeSchemaReference(existing);
+  let existingSchema = normalizeSchemaReference(existing);
   let incomingSchema = normalizeSchemaReference(incoming);
   if (!existingSchema) return incoming;
   if (!incomingSchema) return existing;
   if (!isTSchema(incomingSchema) && incomingSchema["~standard"])
     incomingSchema = unwrapSchema(incomingSchema, vendors);
-  if (!incomingSchema) return existing;
+  if (!isTSchema(existingSchema) && existingSchema["~standard"])
+    existingSchema = unwrapSchema(existingSchema, vendors);
+  if (!incomingSchema) return existingSchema;
+  if (!existingSchema) return incomingSchema;
   const { schema: mergedSchema, notObjects } = mergeObjectSchemas([
     existingSchema,
     incomingSchema
@@ -2855,7 +2860,11 @@ var unwrapResponseSchema = (schema, vendors) => typeof schema === "string" ? nor
   schema["~standard"] ? unwrapSchema(schema, vendors, "output") : Object.fromEntries(
     Object.entries(schema).map(([status, schema2]) => [
       status,
-      typeof schema2 === "string" ? normalizeSchemaReference(schema2) : isTSchema(schema2) ? schema2 : unwrapSchema(schema2, vendors, "output")
+      typeof schema2 === "string" ? normalizeSchemaReference(schema2) : isTSchema(schema2) ? schema2 : unwrapSchema(
+        schema2,
+        vendors,
+        "output"
+      )
     ])
   )
 );
@@ -2974,11 +2983,16 @@ var unwrapSchema = (schema, mapJsonSchema, io = "input") => {
   if (!schema) return;
   if (typeof schema === "string") schema = toRef(schema);
   if (Kind in schema) return enumToOpenApi(schema);
-  if (Kind in schema || !schema?.["~standard"]) return;
+  if (!schema?.["~standard"] && // @ts-ignore
+  (schema.$schema || schema.type || schema.properties || schema.items))
+    return schema;
+  if (!schema?.["~standard"]) return;
   const vendor = schema["~standard"].vendor;
   try {
     if (schema["~standard"]?.jsonSchema?.[io])
-      return schema["~standard"]?.jsonSchema?.[io]?.();
+      return schema["~standard"]?.jsonSchema?.[io]?.({
+        target: "draft-2020-12"
+      });
     if (mapJsonSchema?.[vendor] && typeof mapJsonSchema[vendor] === "function")
       return enumToOpenApi(mapJsonSchema[vendor](schema));
     switch (vendor) {
@@ -3287,7 +3301,11 @@ function toOpenAPISchema(app, exclude, references, vendors) {
           };
         }
       } else {
-        const response = unwrapSchema(hooks.response, vendors, "output");
+        const response = unwrapSchema(
+          hooks.response,
+          vendors,
+          "output"
+        );
         if (response) {
           const {
             type: _type,

package/dist/cjs/openapi.d.ts

@@ -11,6 +11,11 @@ export declare const capitalize: (word: string) => string;
 export declare const getPossiblePath: (path: string) => string[];
 export declare const getLoosePath: (path: string) => string;
 export declare const unwrapSchema: (schema: InputSchema["body"], mapJsonSchema?: MapJsonSchema, io?: "input" | "output") => OpenAPIV3.SchemaObject | undefined;
+/**
+ * Convert TypeBox enum-like Union schemas to OpenAPI enum schemas
+ *
+ * Otherwise, return the schema as is
+ */
 export declare const enumToOpenApi: <T extends TAnySchema | OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject | undefined>(_schema: T) => T;
 /**
  * Converts Elysia routes to OpenAPI 3.0.3 paths schema

package/dist/cjs/openapi.js

@@ -36,7 +36,9 @@ var Kind = /* @__PURE__ */ Symbol.for("TypeBox.Kind");
 
 // src/openapi.ts
 var capitalize = (word) => word.charAt(0).toUpperCase() + word.slice(1);
-var toRef = (name) => import_elysia.t.Ref(`#/components/schemas/${name}`);
+var toRef = (name) => import_elysia.t.Ref(
+  name.startsWith("#/") ? name : `#/components/schemas/${name}`
+);
 var toOperationId = (method, paths) => {
   let operationId = method.toLowerCase();
   if (!paths || paths === "/") return operationId + "Index";
@@ -168,18 +170,21 @@ var isTSchema = (value) => {
 var normalizeSchemaReference = (schema) => {
   if (!schema) return void 0;
   if (typeof schema !== "string") return schema;
-  return import_elysia.t.Ref(schema);
+  return toRef(schema);
 };
 var mergeSchemaProperty = (existing, incoming, vendors) => {
   if (!existing) return incoming;
   if (!incoming) return existing;
-  const existingSchema = normalizeSchemaReference(existing);
+  let existingSchema = normalizeSchemaReference(existing);
   let incomingSchema = normalizeSchemaReference(incoming);
   if (!existingSchema) return incoming;
   if (!incomingSchema) return existing;
   if (!isTSchema(incomingSchema) && incomingSchema["~standard"])
     incomingSchema = unwrapSchema(incomingSchema, vendors);
-  if (!incomingSchema) return existing;
+  if (!isTSchema(existingSchema) && existingSchema["~standard"])
+    existingSchema = unwrapSchema(existingSchema, vendors);
+  if (!incomingSchema) return existingSchema;
+  if (!existingSchema) return incomingSchema;
   const { schema: mergedSchema, notObjects } = mergeObjectSchemas([
     existingSchema,
     incomingSchema
@@ -195,7 +200,11 @@ var unwrapResponseSchema = (schema, vendors) => typeof schema === "string" ? nor
   schema["~standard"] ? unwrapSchema(schema, vendors, "output") : Object.fromEntries(
     Object.entries(schema).map(([status, schema2]) => [
       status,
-      typeof schema2 === "string" ? normalizeSchemaReference(schema2) : isTSchema(schema2) ? schema2 : unwrapSchema(schema2, vendors, "output")
+      typeof schema2 === "string" ? normalizeSchemaReference(schema2) : isTSchema(schema2) ? schema2 : unwrapSchema(
+        schema2,
+        vendors,
+        "output"
+      )
     ])
   )
 );
@@ -314,11 +323,16 @@ var unwrapSchema = (schema, mapJsonSchema, io = "input") => {
   if (!schema) return;
   if (typeof schema === "string") schema = toRef(schema);
   if (Kind in schema) return enumToOpenApi(schema);
-  if (Kind in schema || !schema?.["~standard"]) return;
+  if (!schema?.["~standard"] && // @ts-ignore
+  (schema.$schema || schema.type || schema.properties || schema.items))
+    return schema;
+  if (!schema?.["~standard"]) return;
   const vendor = schema["~standard"].vendor;
   try {
     if (schema["~standard"]?.jsonSchema?.[io])
-      return schema["~standard"]?.jsonSchema?.[io]?.();
+      return schema["~standard"]?.jsonSchema?.[io]?.({
+        target: "draft-2020-12"
+      });
     if (mapJsonSchema?.[vendor] && typeof mapJsonSchema[vendor] === "function")
       return enumToOpenApi(mapJsonSchema[vendor](schema));
     switch (vendor) {
@@ -627,7 +641,11 @@ function toOpenAPISchema(app, exclude, references, vendors) {
           };
         }
       } else {
-        const response = unwrapSchema(hooks.response, vendors, "output");
+        const response = unwrapSchema(
+          hooks.response,
+          vendors,
+          "output"
+        );
         if (response) {
           const {
             type: _type,

package/dist/index.mjs

@@ -2674,7 +2674,9 @@ function Void(options) {
 
 // src/openapi.ts
 var capitalize = (word) => word.charAt(0).toUpperCase() + word.slice(1);
-var toRef = (name) => t.Ref(`#/components/schemas/${name}`);
+var toRef = (name) => t.Ref(
+  name.startsWith("#/") ? name : `#/components/schemas/${name}`
+);
 var toOperationId = (method, paths) => {
   let operationId = method.toLowerCase();
   if (!paths || paths === "/") return operationId + "Index";
@@ -2806,18 +2808,21 @@ var isTSchema = (value) => {
 var normalizeSchemaReference = (schema) => {
   if (!schema) return void 0;
   if (typeof schema !== "string") return schema;
-  return t.Ref(schema);
+  return toRef(schema);
 };
 var mergeSchemaProperty = (existing, incoming, vendors) => {
   if (!existing) return incoming;
   if (!incoming) return existing;
-  const existingSchema = normalizeSchemaReference(existing);
+  let existingSchema = normalizeSchemaReference(existing);
   let incomingSchema = normalizeSchemaReference(incoming);
   if (!existingSchema) return incoming;
   if (!incomingSchema) return existing;
   if (!isTSchema(incomingSchema) && incomingSchema["~standard"])
     incomingSchema = unwrapSchema(incomingSchema, vendors);
-  if (!incomingSchema) return existing;
+  if (!isTSchema(existingSchema) && existingSchema["~standard"])
+    existingSchema = unwrapSchema(existingSchema, vendors);
+  if (!incomingSchema) return existingSchema;
+  if (!existingSchema) return incomingSchema;
   const { schema: mergedSchema, notObjects } = mergeObjectSchemas([
     existingSchema,
     incomingSchema
@@ -2833,7 +2838,11 @@ var unwrapResponseSchema = (schema, vendors) => typeof schema === "string" ? nor
   schema["~standard"] ? unwrapSchema(schema, vendors, "output") : Object.fromEntries(
     Object.entries(schema).map(([status, schema2]) => [
       status,
-      typeof schema2 === "string" ? normalizeSchemaReference(schema2) : isTSchema(schema2) ? schema2 : unwrapSchema(schema2, vendors, "output")
+      typeof schema2 === "string" ? normalizeSchemaReference(schema2) : isTSchema(schema2) ? schema2 : unwrapSchema(
+        schema2,
+        vendors,
+        "output"
+      )
     ])
   )
 );
@@ -2952,11 +2961,16 @@ var unwrapSchema = (schema, mapJsonSchema, io = "input") => {
   if (!schema) return;
   if (typeof schema === "string") schema = toRef(schema);
   if (Kind in schema) return enumToOpenApi(schema);
-  if (Kind in schema || !schema?.["~standard"]) return;
+  if (!schema?.["~standard"] && // @ts-ignore
+  (schema.$schema || schema.type || schema.properties || schema.items))
+    return schema;
+  if (!schema?.["~standard"]) return;
   const vendor = schema["~standard"].vendor;
   try {
     if (schema["~standard"]?.jsonSchema?.[io])
-      return schema["~standard"]?.jsonSchema?.[io]?.();
+      return schema["~standard"]?.jsonSchema?.[io]?.({
+        target: "draft-2020-12"
+      });
     if (mapJsonSchema?.[vendor] && typeof mapJsonSchema[vendor] === "function")
       return enumToOpenApi(mapJsonSchema[vendor](schema));
     switch (vendor) {
@@ -3265,7 +3279,11 @@ function toOpenAPISchema(app, exclude, references, vendors) {
           };
         }
       } else {
-        const response = unwrapSchema(hooks.response, vendors, "output");
+        const response = unwrapSchema(
+          hooks.response,
+          vendors,
+          "output"
+        );
         if (response) {
           const {
             type: _type,

package/dist/openapi.d.ts

@@ -11,6 +11,11 @@ export declare const capitalize: (word: string) => string;
 export declare const getPossiblePath: (path: string) => string[];
 export declare const getLoosePath: (path: string) => string;
 export declare const unwrapSchema: (schema: InputSchema["body"], mapJsonSchema?: MapJsonSchema, io?: "input" | "output") => OpenAPIV3.SchemaObject | undefined;
+/**
+ * Convert TypeBox enum-like Union schemas to OpenAPI enum schemas
+ *
+ * Otherwise, return the schema as is
+ */
 export declare const enumToOpenApi: <T extends TAnySchema | OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject | undefined>(_schema: T) => T;
 /**
  * Converts Elysia routes to OpenAPI 3.0.3 paths schema

package/dist/openapi.mjs

@@ -6,7 +6,9 @@ var Kind = /* @__PURE__ */ Symbol.for("TypeBox.Kind");
 
 // src/openapi.ts
 var capitalize = (word) => word.charAt(0).toUpperCase() + word.slice(1);
-var toRef = (name) => t.Ref(`#/components/schemas/${name}`);
+var toRef = (name) => t.Ref(
+  name.startsWith("#/") ? name : `#/components/schemas/${name}`
+);
 var toOperationId = (method, paths) => {
   let operationId = method.toLowerCase();
   if (!paths || paths === "/") return operationId + "Index";
@@ -138,18 +140,21 @@ var isTSchema = (value) => {
 var normalizeSchemaReference = (schema) => {
   if (!schema) return void 0;
   if (typeof schema !== "string") return schema;
-  return t.Ref(schema);
+  return toRef(schema);
 };
 var mergeSchemaProperty = (existing, incoming, vendors) => {
   if (!existing) return incoming;
   if (!incoming) return existing;
-  const existingSchema = normalizeSchemaReference(existing);
+  let existingSchema = normalizeSchemaReference(existing);
   let incomingSchema = normalizeSchemaReference(incoming);
   if (!existingSchema) return incoming;
   if (!incomingSchema) return existing;
   if (!isTSchema(incomingSchema) && incomingSchema["~standard"])
     incomingSchema = unwrapSchema(incomingSchema, vendors);
-  if (!incomingSchema) return existing;
+  if (!isTSchema(existingSchema) && existingSchema["~standard"])
+    existingSchema = unwrapSchema(existingSchema, vendors);
+  if (!incomingSchema) return existingSchema;
+  if (!existingSchema) return incomingSchema;
   const { schema: mergedSchema, notObjects } = mergeObjectSchemas([
     existingSchema,
     incomingSchema
@@ -165,7 +170,11 @@ var unwrapResponseSchema = (schema, vendors) => typeof schema === "string" ? nor
   schema["~standard"] ? unwrapSchema(schema, vendors, "output") : Object.fromEntries(
     Object.entries(schema).map(([status, schema2]) => [
       status,
-      typeof schema2 === "string" ? normalizeSchemaReference(schema2) : isTSchema(schema2) ? schema2 : unwrapSchema(schema2, vendors, "output")
+      typeof schema2 === "string" ? normalizeSchemaReference(schema2) : isTSchema(schema2) ? schema2 : unwrapSchema(
+        schema2,
+        vendors,
+        "output"
+      )
     ])
   )
 );
@@ -284,11 +293,16 @@ var unwrapSchema = (schema, mapJsonSchema, io = "input") => {
   if (!schema) return;
   if (typeof schema === "string") schema = toRef(schema);
   if (Kind in schema) return enumToOpenApi(schema);
-  if (Kind in schema || !schema?.["~standard"]) return;
+  if (!schema?.["~standard"] && // @ts-ignore
+  (schema.$schema || schema.type || schema.properties || schema.items))
+    return schema;
+  if (!schema?.["~standard"]) return;
   const vendor = schema["~standard"].vendor;
   try {
     if (schema["~standard"]?.jsonSchema?.[io])
-      return schema["~standard"]?.jsonSchema?.[io]?.();
+      return schema["~standard"]?.jsonSchema?.[io]?.({
+        target: "draft-2020-12"
+      });
     if (mapJsonSchema?.[vendor] && typeof mapJsonSchema[vendor] === "function")
       return enumToOpenApi(mapJsonSchema[vendor](schema));
     switch (vendor) {
@@ -597,7 +611,11 @@ function toOpenAPISchema(app, exclude, references, vendors) {
           };
         }
       } else {
-        const response = unwrapSchema(hooks.response, vendors, "output");
+        const response = unwrapSchema(
+          hooks.response,
+          vendors,
+          "output"
+        );
         if (response) {
           const {
             type: _type,

package/package.json

@@ -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,6 @@
         "build": "bun build.ts",
         "release": "npm run build && npm run test && npm publish --access public"
     },
-    "dependencies": {},
     "devDependencies": {
         "@apidevtools/swagger-parser": "^12.0.0",
         "@scalar/types": "^0.2.13",