@elysiajs/openapi 1.4.3 → 1.4.4

package/dist/cjs/gen/index.js

@@ -8315,6 +8315,35 @@ var import_child_process = require("child_process");
 var matchRoute = /: Elysia<(.*)>/gs;
 var matchStatus = /(\d{3}):/g;
 var wrapStatusInQuote = (value) => value.replace(matchStatus, '"$1":');
+function extractRootObjects(code) {
+  const results = [];
+  let i = 0;
+  while (i < code.length) {
+    const colonIdx = code.indexOf(":", i);
+    if (colonIdx === -1) break;
+    let keyEnd = colonIdx - 1;
+    while (keyEnd >= 0 && /\s/.test(code[keyEnd])) keyEnd--;
+    let keyStart = keyEnd;
+    while (keyStart >= 0 && /\w/.test(code[keyStart])) keyStart--;
+    const braceIdx = code.indexOf("{", colonIdx);
+    if (braceIdx === -1) break;
+    let depth = 0;
+    let end = braceIdx;
+    for (; end < code.length; end++) {
+      if (code[end] === "{") depth++;
+      else if (code[end] === "}") {
+        depth--;
+        if (depth === 0) {
+          end++;
+          break;
+        }
+      }
+    }
+    results.push(`{${code.slice(keyStart + 1, end)};}`);
+    i = end;
+  }
+  return results;
+}
 var fromTypes = (targetFilePath, {
   tsconfigPath = "tsconfig.json",
   instanceName,
@@ -8322,7 +8351,8 @@ var fromTypes = (targetFilePath, {
   overrideOutputPath,
   debug = false,
   compilerOptions,
-  tmpRoot = (0, import_path2.join)((0, import_os.tmpdir)(), ".ElysiaAutoOpenAPI")
+  tmpRoot = (0, import_path2.join)((0, import_os.tmpdir)(), ".ElysiaAutoOpenAPI"),
+  silent = false
 } = {}) => () => {
   try {
     if (!targetFilePath.endsWith(".ts") && !targetFilePath.endsWith(".tsx"))
@@ -8369,7 +8399,7 @@ var fromTypes = (targetFilePath, {
       (0, import_child_process.spawnSync)(`tsc`, {
         shell: true,
         cwd: tmpRoot,
-        stdio: debug ? "inherit" : void 0
+        stdio: silent ? void 0 : "inherit"
       });
       const fileName = targetFilePath.replace(/.tsx$/, ".ts").replace(/.ts$/, ".d.ts");
       targetFile = (overrideOutputPath ? typeof overrideOutputPath === "string" ? overrideOutputPath.startsWith("/") ? overrideOutputPath : (0, import_path2.join)(tmpRoot, "dist", overrideOutputPath) : overrideOutputPath(tmpRoot) : void 0) ?? (0, import_path2.join)(
@@ -8405,7 +8435,7 @@ var fromTypes = (targetFilePath, {
             console.warn(tempFiles);
           }
         } else {
-          console.log(
+          console.warn(
             "reason: root folder doesn't exists",
             (0, import_path2.join)(tmpRoot, "dist")
           );
@@ -8414,7 +8444,7 @@ var fromTypes = (targetFilePath, {
       }
     }
     const declaration = (0, import_fs.readFileSync)(targetFile, "utf8");
-    if ((0, import_fs.existsSync)(tmpRoot))
+    if (!debug && (0, import_fs.existsSync)(tmpRoot))
       (0, import_fs.rmSync)(tmpRoot, { recursive: true, force: true });
     let instance = declaration.match(
       instanceName ? new RegExp(`${instanceName}: Elysia<(.*)`, "gs") : matchRoute
@@ -8434,8 +8464,8 @@ var fromTypes = (targetFilePath, {
       instance.slice(3, instance.indexOf("}, {", 4))
     );
     const routes = {};
-    for (const route of routesString.slice(1).split("} & {")) {
-      let schema = TypeBox(`{${route}}`);
+    for (const route of extractRootObjects(routesString)) {
+      let schema = TypeBox(route);
       if (schema.type !== "object") continue;
       const paths = [];
       while (true) {
@@ -8446,6 +8476,7 @@ var fromTypes = (targetFilePath, {
         if (!schema?.properties) break;
       }
       const method = paths.pop();
+      if (!method) continue;
       const path = "/" + paths.join("/");
       schema = schema.properties;
       if (schema?.response?.type === "object") {

package/dist/cjs/index.js

@@ -340,7 +340,8 @@ openapi({
     zod: zodToJsonSchema
   }
 })`,
-  valibot: `import { toJsonSchema } from '@valibot/to-json-schema'
+  valibot: `import openapi from '@elysiajs/openapi'
+import { toJsonSchema } from '@valibot/to-json-schema'
 
 openapi({
   mapJsonSchema: {
@@ -418,11 +419,12 @@ var unwrapSchema = (schema, mapJsonSchema) => {
   return schema.toJSONSchema?.() ?? schema?.toJsonSchema?.();
 };
 function toOpenAPISchema(app, exclude, references, vendors) {
-  const {
-    methods: excludeMethods = ["OPTIONS"],
+  let {
+    methods: excludeMethods = ["options"],
     staticFile: excludeStaticFile = true,
     tags: excludeTags
   } = exclude ?? {};
+  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;
@@ -440,6 +442,9 @@ function toOpenAPISchema(app, exclude, references, vendors) {
     if (excludeStaticFile && route.path.includes(".") || excludePaths.includes(route.path) || excludeMethods.includes(method))
       continue;
     const hooks = route.hooks ?? {};
+    if (route.path === "/a") {
+      console.log("H");
+    }
     if (references?.length)
       for (const reference of references) {
         if (!reference) continue;
@@ -488,7 +493,10 @@ function toOpenAPISchema(app, exclude, references, vendors) {
           });
     }
     if (hooks.query) {
-      const query = unwrapReference(unwrapSchema(hooks.query, vendors), definitions);
+      const query = unwrapReference(
+        unwrapSchema(hooks.query, vendors),
+        definitions
+      );
       if (query && query.type === "object" && query.properties) {
         const required = query.required || [];
         for (const [queryName, querySchema] of Object.entries(
@@ -503,7 +511,10 @@ function toOpenAPISchema(app, exclude, references, vendors) {
       }
     }
     if (hooks.headers) {
-      const headers = unwrapReference(unwrapSchema(hooks.query, vendors), definitions);
+      const headers = unwrapReference(
+        unwrapSchema(hooks.query, vendors),
+        definitions
+      );
       if (headers && headers.type === "object" && headers.properties) {
         const required = headers.required || [];
         for (const [headerName, headerSchema] of Object.entries(
@@ -518,7 +529,10 @@ function toOpenAPISchema(app, exclude, references, vendors) {
       }
     }
     if (hooks.cookie) {
-      const cookie = unwrapReference(unwrapSchema(hooks.cookie, vendors), definitions);
+      const cookie = unwrapReference(
+        unwrapSchema(hooks.cookie, vendors),
+        definitions
+      );
       if (cookie && cookie.type === "object" && cookie.properties) {
         const required = cookie.required || [];
         for (const [cookieName, cookieSchema] of Object.entries(

package/dist/cjs/openapi.js

@@ -83,7 +83,8 @@ openapi({
     zod: zodToJsonSchema
   }
 })`,
-  valibot: `import { toJsonSchema } from '@valibot/to-json-schema'
+  valibot: `import openapi from '@elysiajs/openapi'
+import { toJsonSchema } from '@valibot/to-json-schema'
 
 openapi({
   mapJsonSchema: {
@@ -161,11 +162,12 @@ var unwrapSchema = (schema, mapJsonSchema) => {
   return schema.toJSONSchema?.() ?? schema?.toJsonSchema?.();
 };
 function toOpenAPISchema(app, exclude, references, vendors) {
-  const {
-    methods: excludeMethods = ["OPTIONS"],
+  let {
+    methods: excludeMethods = ["options"],
     staticFile: excludeStaticFile = true,
     tags: excludeTags
   } = exclude ?? {};
+  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;
@@ -183,6 +185,9 @@ function toOpenAPISchema(app, exclude, references, vendors) {
     if (excludeStaticFile && route.path.includes(".") || excludePaths.includes(route.path) || excludeMethods.includes(method))
       continue;
     const hooks = route.hooks ?? {};
+    if (route.path === "/a") {
+      console.log("H");
+    }
     if (references?.length)
       for (const reference of references) {
         if (!reference) continue;
@@ -231,7 +236,10 @@ function toOpenAPISchema(app, exclude, references, vendors) {
           });
     }
     if (hooks.query) {
-      const query = unwrapReference(unwrapSchema(hooks.query, vendors), definitions);
+      const query = unwrapReference(
+        unwrapSchema(hooks.query, vendors),
+        definitions
+      );
       if (query && query.type === "object" && query.properties) {
         const required = query.required || [];
         for (const [queryName, querySchema] of Object.entries(
@@ -246,7 +254,10 @@ function toOpenAPISchema(app, exclude, references, vendors) {
       }
     }
     if (hooks.headers) {
-      const headers = unwrapReference(unwrapSchema(hooks.query, vendors), definitions);
+      const headers = unwrapReference(
+        unwrapSchema(hooks.query, vendors),
+        definitions
+      );
       if (headers && headers.type === "object" && headers.properties) {
         const required = headers.required || [];
         for (const [headerName, headerSchema] of Object.entries(
@@ -261,7 +272,10 @@ function toOpenAPISchema(app, exclude, references, vendors) {
       }
     }
     if (hooks.cookie) {
-      const cookie = unwrapReference(unwrapSchema(hooks.cookie, vendors), definitions);
+      const cookie = unwrapReference(
+        unwrapSchema(hooks.cookie, vendors),
+        definitions
+      );
       if (cookie && cookie.type === "object" && cookie.properties) {
         const required = cookie.required || [];
         for (const [cookieName, cookieSchema] of Object.entries(

package/dist/gen/index.d.ts

@@ -46,6 +46,11 @@ interface OpenAPIGeneratorOptions {
      * ! be careful that the folder will be removed after the process ends
      */
     tmpRoot?: string;
+    /**
+     * disable log
+     * @default false
+     */
+    silent?: boolean;
 }
 /**
  * Auto generate OpenAPI schema from Elysia instance
@@ -60,5 +65,5 @@ export declare const fromTypes: (
  *
  * The path must export an Elysia instance
  */
-targetFilePath: string, { tsconfigPath, instanceName, projectRoot, overrideOutputPath, debug, compilerOptions, tmpRoot }?: OpenAPIGeneratorOptions) => () => AdditionalReference | undefined;
+targetFilePath: string, { tsconfigPath, instanceName, projectRoot, overrideOutputPath, debug, compilerOptions, tmpRoot, silent }?: OpenAPIGeneratorOptions) => () => AdditionalReference | undefined;
 export {};

package/dist/gen/index.mjs

@@ -8304,6 +8304,35 @@ import { spawnSync } from "child_process";
 var matchRoute = /: Elysia<(.*)>/gs;
 var matchStatus = /(\d{3}):/g;
 var wrapStatusInQuote = (value) => value.replace(matchStatus, '"$1":');
+function extractRootObjects(code) {
+  const results = [];
+  let i = 0;
+  while (i < code.length) {
+    const colonIdx = code.indexOf(":", i);
+    if (colonIdx === -1) break;
+    let keyEnd = colonIdx - 1;
+    while (keyEnd >= 0 && /\s/.test(code[keyEnd])) keyEnd--;
+    let keyStart = keyEnd;
+    while (keyStart >= 0 && /\w/.test(code[keyStart])) keyStart--;
+    const braceIdx = code.indexOf("{", colonIdx);
+    if (braceIdx === -1) break;
+    let depth = 0;
+    let end = braceIdx;
+    for (; end < code.length; end++) {
+      if (code[end] === "{") depth++;
+      else if (code[end] === "}") {
+        depth--;
+        if (depth === 0) {
+          end++;
+          break;
+        }
+      }
+    }
+    results.push(`{${code.slice(keyStart + 1, end)};}`);
+    i = end;
+  }
+  return results;
+}
 var fromTypes = (targetFilePath, {
   tsconfigPath = "tsconfig.json",
   instanceName,
@@ -8311,7 +8340,8 @@ var fromTypes = (targetFilePath, {
   overrideOutputPath,
   debug = false,
   compilerOptions,
-  tmpRoot = join(tmpdir(), ".ElysiaAutoOpenAPI")
+  tmpRoot = join(tmpdir(), ".ElysiaAutoOpenAPI"),
+  silent = false
 } = {}) => () => {
   try {
     if (!targetFilePath.endsWith(".ts") && !targetFilePath.endsWith(".tsx"))
@@ -8358,7 +8388,7 @@ var fromTypes = (targetFilePath, {
       spawnSync(`tsc`, {
         shell: true,
         cwd: tmpRoot,
-        stdio: debug ? "inherit" : void 0
+        stdio: silent ? void 0 : "inherit"
       });
       const fileName = targetFilePath.replace(/.tsx$/, ".ts").replace(/.ts$/, ".d.ts");
       targetFile = (overrideOutputPath ? typeof overrideOutputPath === "string" ? overrideOutputPath.startsWith("/") ? overrideOutputPath : join(tmpRoot, "dist", overrideOutputPath) : overrideOutputPath(tmpRoot) : void 0) ?? join(
@@ -8394,7 +8424,7 @@ var fromTypes = (targetFilePath, {
             console.warn(tempFiles);
           }
         } else {
-          console.log(
+          console.warn(
             "reason: root folder doesn't exists",
             join(tmpRoot, "dist")
           );
@@ -8403,7 +8433,7 @@ var fromTypes = (targetFilePath, {
       }
     }
     const declaration = readFileSync(targetFile, "utf8");
-    if (existsSync(tmpRoot))
+    if (!debug && existsSync(tmpRoot))
       rmSync(tmpRoot, { recursive: true, force: true });
     let instance = declaration.match(
       instanceName ? new RegExp(`${instanceName}: Elysia<(.*)`, "gs") : matchRoute
@@ -8423,8 +8453,8 @@ var fromTypes = (targetFilePath, {
       instance.slice(3, instance.indexOf("}, {", 4))
     );
     const routes = {};
-    for (const route of routesString.slice(1).split("} & {")) {
-      let schema = TypeBox(`{${route}}`);
+    for (const route of extractRootObjects(routesString)) {
+      let schema = TypeBox(route);
       if (schema.type !== "object") continue;
       const paths = [];
       while (true) {
@@ -8435,6 +8465,7 @@ var fromTypes = (targetFilePath, {
         if (!schema?.properties) break;
       }
       const method = paths.pop();
+      if (!method) continue;
       const path = "/" + paths.join("/");
       schema = schema.properties;
       if (schema?.response?.type === "object") {

package/dist/index.mjs

@@ -313,7 +313,8 @@ openapi({
     zod: zodToJsonSchema
   }
 })`,
-  valibot: `import { toJsonSchema } from '@valibot/to-json-schema'
+  valibot: `import openapi from '@elysiajs/openapi'
+import { toJsonSchema } from '@valibot/to-json-schema'
 
 openapi({
   mapJsonSchema: {
@@ -391,11 +392,12 @@ var unwrapSchema = (schema, mapJsonSchema) => {
   return schema.toJSONSchema?.() ?? schema?.toJsonSchema?.();
 };
 function toOpenAPISchema(app, exclude, references, vendors) {
-  const {
-    methods: excludeMethods = ["OPTIONS"],
+  let {
+    methods: excludeMethods = ["options"],
     staticFile: excludeStaticFile = true,
     tags: excludeTags
   } = exclude ?? {};
+  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;
@@ -413,6 +415,9 @@ function toOpenAPISchema(app, exclude, references, vendors) {
     if (excludeStaticFile && route.path.includes(".") || excludePaths.includes(route.path) || excludeMethods.includes(method))
       continue;
     const hooks = route.hooks ?? {};
+    if (route.path === "/a") {
+      console.log("H");
+    }
     if (references?.length)
       for (const reference of references) {
         if (!reference) continue;
@@ -461,7 +466,10 @@ function toOpenAPISchema(app, exclude, references, vendors) {
           });
     }
     if (hooks.query) {
-      const query = unwrapReference(unwrapSchema(hooks.query, vendors), definitions);
+      const query = unwrapReference(
+        unwrapSchema(hooks.query, vendors),
+        definitions
+      );
       if (query && query.type === "object" && query.properties) {
         const required = query.required || [];
         for (const [queryName, querySchema] of Object.entries(
@@ -476,7 +484,10 @@ function toOpenAPISchema(app, exclude, references, vendors) {
       }
     }
     if (hooks.headers) {
-      const headers = unwrapReference(unwrapSchema(hooks.query, vendors), definitions);
+      const headers = unwrapReference(
+        unwrapSchema(hooks.query, vendors),
+        definitions
+      );
       if (headers && headers.type === "object" && headers.properties) {
         const required = headers.required || [];
         for (const [headerName, headerSchema] of Object.entries(
@@ -491,7 +502,10 @@ function toOpenAPISchema(app, exclude, references, vendors) {
       }
     }
     if (hooks.cookie) {
-      const cookie = unwrapReference(unwrapSchema(hooks.cookie, vendors), definitions);
+      const cookie = unwrapReference(
+        unwrapSchema(hooks.cookie, vendors),
+        definitions
+      );
       if (cookie && cookie.type === "object" && cookie.properties) {
         const required = cookie.required || [];
         for (const [cookieName, cookieSchema] of Object.entries(

package/dist/openapi.mjs

@@ -54,7 +54,8 @@ openapi({
     zod: zodToJsonSchema
   }
 })`,
-  valibot: `import { toJsonSchema } from '@valibot/to-json-schema'
+  valibot: `import openapi from '@elysiajs/openapi'
+import { toJsonSchema } from '@valibot/to-json-schema'
 
 openapi({
   mapJsonSchema: {
@@ -132,11 +133,12 @@ var unwrapSchema = (schema, mapJsonSchema) => {
   return schema.toJSONSchema?.() ?? schema?.toJsonSchema?.();
 };
 function toOpenAPISchema(app, exclude, references, vendors) {
-  const {
-    methods: excludeMethods = ["OPTIONS"],
+  let {
+    methods: excludeMethods = ["options"],
     staticFile: excludeStaticFile = true,
     tags: excludeTags
   } = exclude ?? {};
+  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;
@@ -154,6 +156,9 @@ function toOpenAPISchema(app, exclude, references, vendors) {
     if (excludeStaticFile && route.path.includes(".") || excludePaths.includes(route.path) || excludeMethods.includes(method))
       continue;
     const hooks = route.hooks ?? {};
+    if (route.path === "/a") {
+      console.log("H");
+    }
     if (references?.length)
       for (const reference of references) {
         if (!reference) continue;
@@ -202,7 +207,10 @@ function toOpenAPISchema(app, exclude, references, vendors) {
           });
     }
     if (hooks.query) {
-      const query = unwrapReference(unwrapSchema(hooks.query, vendors), definitions);
+      const query = unwrapReference(
+        unwrapSchema(hooks.query, vendors),
+        definitions
+      );
       if (query && query.type === "object" && query.properties) {
         const required = query.required || [];
         for (const [queryName, querySchema] of Object.entries(
@@ -217,7 +225,10 @@ function toOpenAPISchema(app, exclude, references, vendors) {
       }
     }
     if (hooks.headers) {
-      const headers = unwrapReference(unwrapSchema(hooks.query, vendors), definitions);
+      const headers = unwrapReference(
+        unwrapSchema(hooks.query, vendors),
+        definitions
+      );
       if (headers && headers.type === "object" && headers.properties) {
         const required = headers.required || [];
         for (const [headerName, headerSchema] of Object.entries(
@@ -232,7 +243,10 @@ function toOpenAPISchema(app, exclude, references, vendors) {
       }
     }
     if (hooks.cookie) {
-      const cookie = unwrapReference(unwrapSchema(hooks.cookie, vendors), definitions);
+      const cookie = unwrapReference(
+        unwrapSchema(hooks.cookie, vendors),
+        definitions
+      );
       if (cookie && cookie.type === "object" && cookie.properties) {
         const required = cookie.required || [];
         for (const [cookieName, cookieSchema] of Object.entries(

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@elysiajs/openapi",
-    "version": "1.4.3",
+    "version": "1.4.4",
     "description": "Plugin for Elysia to auto-generate API documentation",
     "author": {
         "name": "saltyAom",