@elysiajs/openapi 1.4.14 → 2.0.0-exp.0

package/dist/cjs/openapi.d.ts

@@ -1,6 +1,12 @@
-import { type AnyElysia, type TSchema, type InputSchema } from 'elysia';
+import type { AnyElysia } from 'elysia/base';
+import type { InputSchema } from 'elysia/types';
 import type { OpenAPIV3 } from 'openapi-types';
-import { TAnySchema, type TProperties } from '@sinclair/typebox';
+type TSchema = OpenAPIV3.SchemaObject & {
+    $ref?: string;
+    $schema?: string;
+    const?: unknown;
+    [key: string]: any;
+};
 import type { AdditionalReferences, ElysiaOpenAPIConfig, MapJsonSchema } from './types';
 export declare const capitalize: (word: string) => string;
 /**
@@ -16,7 +22,7 @@ export declare const unwrapSchema: (schema: InputSchema["body"], mapJsonSchema?:
  *
  * Otherwise, return the schema as is
  */
-export declare const enumToOpenApi: <T extends TAnySchema | OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject | undefined>(_schema: T) => T;
+export declare const enumToOpenApi: <T extends TSchema | OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject | undefined>(_schema: T) => T;
 /**
  * Converts Elysia routes to OpenAPI 3.0.3 paths schema
  * @param routes Array of Elysia route objects
@@ -28,6 +34,7 @@ export declare function toOpenAPISchema(app: AnyElysia, exclude?: ElysiaOpenAPIC
     };
     paths: OpenAPIV3.PathsObject<{}, {}>;
 };
-export declare const withHeaders: (schema: TSchema, headers: TProperties) => TSchema & {
-    headers: TProperties;
+export declare const withHeaders: <const T, const H>(schema: T, headers: H) => T & {
+    headers: H;
 };
+export {};

package/dist/cjs/openapi.js

@@ -30,15 +30,8 @@ __export(openapi_exports, {
 });
 module.exports = __toCommonJS(openapi_exports);
 var import_elysia = require("elysia");
-
-// node_modules/@sinclair/typebox/build/esm/type/symbols/symbols.mjs
-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(
-  name.startsWith("#/") ? name : `#/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";
@@ -59,12 +52,8 @@ var getPossiblePath = (path) => {
   }
   return paths;
 };
-var isValidSchema = (schema) => schema && typeof schema === "object" && (Kind in schema && schema[Kind] !== "Unknown" || schema.type || schema.properties || schema.items);
-var getLoosePath = (path) => {
-  if (path.charCodeAt(path.length - 1) === 47)
-    return path.slice(0, path.length - 1);
-  return path + "/";
-};
+var isValidSchema = (schema) => schema && typeof schema === "object" && (schema.type || schema.properties || schema.items || schema.anyOf || schema.allOf || schema.oneOf || schema.$ref || schema.enum || schema.const !== void 0);
+var getLoosePath = (path) => path.charCodeAt(path.length - 1) === 47 ? path.slice(0, path.length - 1) : path + "/";
 var warnings = {
   zod4: `import openapi from '@elysiajs/openapi'
 import * as z from 'zod'
@@ -160,12 +149,10 @@ var mergeObjectSchemas = (schemas) => {
 };
 var isTSchema = (value) => {
   if (!value || typeof value !== "object") return false;
-  if (Kind in value) return true;
+  if (value["~standard"]) return false;
   const keys = Object.keys(value);
-  if (keys.length > 0 && keys.every((k) => !isNaN(Number(k)))) {
-    return false;
-  }
-  return false;
+  if (keys.length > 0 && keys.every((k) => !isNaN(Number(k)))) return false;
+  return isValidSchema(value);
 };
 var normalizeSchemaReference = (schema) => {
   if (!schema) return void 0;
@@ -243,8 +230,8 @@ var mergeResponseSchema = (_existing, _incoming, vendors) => {
 };
 var mergeStandaloneValidators = (hooks, vendors) => {
   const merged = { ...hooks };
-  if (!hooks.standaloneValidator?.length) return merged;
-  for (const validator of hooks.standaloneValidator) {
+  if (!hooks.schemas?.length) return merged;
+  for (const validator of hooks.schemas) {
     if (validator.body)
       merged.body = mergeSchemaProperty(
         merged.body,
@@ -297,16 +284,15 @@ var mergeStandaloneValidators = (hooks, vendors) => {
     if ("type" in response || "$ref" in response) {
       if (typeof response === "string")
         merged.response = normalizeSchemaReference(response);
-    } else {
+    } else
       for (const [status, schema] of Object.entries(response))
         if (typeof schema === "string")
           response[status] = normalizeSchemaReference(schema);
-    }
   }
   return merged;
 };
 var flattenRoutes = (routes, vendors) => routes.map((route) => {
-  if (!route.hooks?.standaloneValidator?.length) return route;
+  if (!route.hooks?.schemas?.length) return route;
   return {
     ...route,
     hooks: mergeStandaloneValidators(route.hooks, vendors)
@@ -322,19 +308,19 @@ var unwrapReference = (schema, definitions) => {
 var unwrapSchema = (schema, mapJsonSchema, io = "input") => {
   if (!schema) return;
   if (typeof schema === "string") schema = toRef(schema);
-  if (Kind in schema) return enumToOpenApi(schema);
-  if (!schema?.["~standard"] && // @ts-ignore
-  (schema.$schema || schema.type || schema.properties || schema.items))
-    return schema;
+  if (!schema?.["~standard"] && isValidSchema(schema))
+    return enumToOpenApi(schema);
   if (!schema?.["~standard"]) return;
   const vendor = schema["~standard"].vendor;
   try {
     if (mapJsonSchema?.[vendor] && typeof mapJsonSchema[vendor] === "function")
       return enumToOpenApi(mapJsonSchema[vendor](schema));
     if (schema["~standard"]?.jsonSchema?.[io])
-      return enumToOpenApi(schema["~standard"].jsonSchema[io]({
-        target: "draft-2020-12"
-      }));
+      return enumToOpenApi(
+        schema["~standard"].jsonSchema[io]({
+          target: "draft-2020-12"
+        })
+      );
     switch (vendor) {
       case "zod":
         if (warned.zod4 || warned.zod3) break;
@@ -390,9 +376,9 @@ var unwrapSchema = (schema, mapJsonSchema, io = "input") => {
 };
 var enumToOpenApi = (_schema) => {
   if (!_schema || typeof _schema !== "object") return _schema;
-  if (Kind in _schema) {
+  {
     const schema2 = _schema;
-    if (schema2[Kind] === "Union" && schema2.anyOf && Array.isArray(schema2.anyOf) && schema2.anyOf.length > 0 && schema2.anyOf.every(
+    if (schema2.anyOf && Array.isArray(schema2.anyOf) && schema2.anyOf.length > 0 && schema2.anyOf.every(
       (item) => item && typeof item === "object" && item.const !== void 0
     ))
       return {
@@ -426,7 +412,7 @@ function toOpenAPISchema(app, exclude, references, vendors) {
   excludeMethods = excludeMethods.map((method) => method.toLowerCase());
   const excludePaths = Array.isArray(exclude?.paths) ? exclude.paths : typeof exclude?.paths !== "undefined" ? [exclude.paths] : [];
   const paths = /* @__PURE__ */ Object.create(null);
-  const definitions = app.getGlobalDefinitions?.().type;
+  const definitions = app.models;
   if (references) {
     if (!Array.isArray(references)) references = [references];
     for (let i = 0; i < references.length; i++) {
@@ -434,7 +420,7 @@ function toOpenAPISchema(app, exclude, references, vendors) {
       if (typeof reference === "function") references[i] = reference();
     }
   }
-  const routes = flattenRoutes(app.getGlobalRoutes(), vendors);
+  const routes = flattenRoutes(app.routes, vendors);
   for (const route of routes) {
     if (route.hooks?.detail?.hide) continue;
     const method = route.method.toLowerCase();
@@ -476,7 +462,7 @@ function toOpenAPISchema(app, exclude, references, vendors) {
             }
         }
       }
-    if (excludeTags && hooks.detail.tags?.some((tag) => excludeTags?.includes(tag)))
+    if (excludeTags && hooks.detail?.tags?.some((tag) => excludeTags?.includes(tag)))
       continue;
     const operation = {
       ...hooks.detail
@@ -673,7 +659,7 @@ function toOpenAPISchema(app, exclude, references, vendors) {
       path = path.replace(/:([^/]+)/g, "{$1}");
       if (!paths[path]) paths[path] = {};
       const current = paths[path];
-      if (method !== "all") {
+      if (method !== "all" && method !== "*") {
         current[method] = {
           ...operation,
           operationId
@@ -700,7 +686,11 @@ function toOpenAPISchema(app, exclude, references, vendors) {
   if (definitions)
     for (const [name, schema] of Object.entries(definitions)) {
       const jsonSchema = unwrapSchema(schema, vendors);
-      if (jsonSchema) schemas[name] = jsonSchema;
+      if (jsonSchema)
+        schemas[name] = {
+          ...jsonSchema,
+          $id: `#/components/schemas/${name}`
+        };
     }
   return {
     components: {

package/dist/cjs/scalar/index.js

@@ -24,29 +24,30 @@ __export(scalar_exports, {
 });
 module.exports = __toCommonJS(scalar_exports);
 var elysiaCSS = `.light-mode {
-  --scalar-color-1: #2a2f45;
-  --scalar-color-2: #757575;
-  --scalar-color-3: #8e8e8e;
-  --scalar-color-accent: #f06292;
+  --scalar-color-1: oklch(43.5% 0.029 321.78);
+  --scalar-color-2: oklch(54.2% 0.034 322.5);
+  --scalar-color-3: oklch(71.1% 0.019 323.02);
+  --scalar-color-accent: oklch(71.2% 0.194 13.428);
 
-  --scalar-background-1: #fff;
-  --scalar-background-2: #f6f6f6;
-  --scalar-background-3: #e7e7e7;
+  --scalar-background-1: oklch(98.5% 0 0);
+  --scalar-background-2: oklch(96% 0.003 325.6);
+  --scalar-background-3: oklch(92.2% 0.005 325.62);
 
-  --scalar-border-color: rgba(0, 0, 0, 0.1);
+  --scalar-border-color: oklch(92.2% 0.005 325.62);
 }
+
 .dark-mode {
-  --scalar-color-1: rgba(255, 255, 255, 0.9);
-  --scalar-color-2: rgba(156, 163, 175, 1);
-  --scalar-color-3: rgba(255, 255, 255, 0.44);
-  --scalar-color-accent: #f06292;
+  --scalar-color-1: oklch(98.5% 0 0);
+  --scalar-color-2: oklch(71.1% 0.019 323.02);
+  --scalar-color-3: oklch(86.5% 0.012 325.68);
+  --scalar-color-accent: oklch(89.2% 0.058 10.001);
 
-  --scalar-background-1: #111728;
-  --scalar-background-2: #1e293b;
-  --scalar-background-3: #334155;
-  --scalar-background-accent: #f062921f;
+  --scalar-background-1: oklch(21.2% 0.019 322.12);
+  --scalar-background-2: oklch(26.3% 0.024 320.12);
+  --scalar-background-3: oklch(36.4% 0.029 323.89);
+  --scalar-background-accent: oklch(43.5% 0.029 321.78);
 
-  --scalar-border-color: rgba(255, 255, 255, 0.1);
+  --scalar-border-color: oklch(36.4% 0.029 323.89);
 }
 
 /* Document Sidebar */

package/dist/cjs/types.d.ts

@@ -1,4 +1,4 @@
-import type { TSchema } from 'elysia';
+import type { TSchema } from 'typebox';
 import type { OpenAPIV3 } from 'openapi-types';
 import type { ApiReferenceConfiguration } from '@scalar/types';
 import type { SwaggerUIOptions } from './swagger/types';
@@ -102,7 +102,7 @@ export interface ElysiaOpenAPIConfig<Enabled extends boolean = true, Path extend
      *'
      * @see https://github.com/scalar/scalar/blob/main/documentation/configuration.md
      */
-    scalar?: ApiReferenceConfiguration & {
+    scalar?: Partial<ApiReferenceConfiguration> & {
         /**
          * Version to use for Scalar cdn bundle
          *

package/dist/gen/index.d.ts

@@ -54,12 +54,17 @@ export interface OpenAPIGeneratorOptions {
 }
 export declare function extractRootObjects(code: string): string[];
 export declare function declarationToJSONSchema(declaration: string): AdditionalReference;
+/**
+ * Collect top-level `type X = ...` aliases and `interface X ...` declarations
+ * from a `.d.ts` into a name -> type-string map.
+ */
+export declare function extractTypeContext(declaration: string): Record<string, string>;
+export declare function resolveTypeRefs(schema: any, context: Record<string, any>, chain?: Set<string>): any;
+export declare function declarationToReference(declaration: string, instanceName?: string): AdditionalReference | undefined;
 /**
  * Auto generate OpenAPI schema from Elysia instance
  *
  * It's expected that this command should run in project root
- *
- * @experimental use at your own risk
  */
 export declare const fromTypes: (
 /**