@kaito-http/core 4.0.0-beta.11 → 4.0.0-beta.14

package/dist/index.js

@@ -1,9 +1,25 @@
-// src/router/router.ts
-import { z } from "zod";
 import {
-  createDocument
-} from "zod-openapi";
-import "zod-openapi/extend";
+  BaseSchema,
+  KArray,
+  KBoolean,
+  KLiteral,
+  KNull,
+  KNumber,
+  KObject,
+  KObjectFromURLSearchParams,
+  KRef,
+  KScalar,
+  KString,
+  KUnion,
+  ParseContext,
+  STRING_FORMAT_REGEXES,
+  SchemaError,
+  isPrimitiveJSONValue,
+  k
+} from "./chunk-THVWVAMX.js";
+
+// src/router/router.ts
+import "openapi3-ts/oas31";
 
 // src/error.ts
 var WrappedError = class _WrappedError extends Error {
@@ -116,20 +132,19 @@ var isNodeLikeDev = typeof process !== "undefined" && typeof process.env !== "un
 
 // src/router/router.ts
 var Router = class _Router {
-  state;
-  static create = (config) => {
+  #state;
+  static create = (config = {}) => {
     return new _Router({
-      through: async (context) => context,
+      through: (context) => context,
       routes: /* @__PURE__ */ new Set(),
-      config,
-      paramsSchema: null
+      config
     });
   };
   constructor(state) {
-    this.state = state;
+    this.#state = state;
   }
   get routes() {
-    return this.state.routes;
+    return this.#state.routes;
   }
   add = (method, path, route) => {
     const merged = {
@@ -139,16 +154,13 @@ var Router = class _Router {
       router: this
     };
     return new _Router({
-      ...this.state,
-      routes: /* @__PURE__ */ new Set([...this.state.routes, merged])
+      ...this.#state,
+      routes: /* @__PURE__ */ new Set([...this.#state.routes, merged])
     });
   };
-  params = (spec) => new _Router({
-    ...this.state,
-    paramsSchema: z.object(spec)
-  });
+  params = () => this;
   merge = (pathPrefix, other) => {
-    const newRoutes = [...other.state.routes].map((route) => ({
+    const newRoutes = [...other.#state.routes].map((route) => ({
       ...route,
       // handle pathPrefix = / & route.path = / case causing //
       // we intentionally are replacing on the joining path and not the pathPrefix, in case of
@@ -156,8 +168,8 @@ var Router = class _Router {
       path: `${pathPrefix}${route.path === "/" ? "" : route.path}`
     }));
     return new _Router({
-      ...this.state,
-      routes: /* @__PURE__ */ new Set([...this.state.routes, ...newRoutes])
+      ...this.#state,
+      routes: /* @__PURE__ */ new Set([...this.#state.routes, ...newRoutes])
     });
   };
   static getFindRoute = (routes) => (method, path) => {
@@ -185,25 +197,15 @@ var Router = class _Router {
     }
     return {};
   };
-  static buildQuerySchema = (schema) => {
-    const keys = Object.keys(schema);
-    return z.instanceof(URLSearchParams).transform((params) => {
-      const result = {};
-      for (const key of keys) {
-        result[key] = params.get(key);
-      }
-      return result;
-    }).pipe(z.object(schema));
-  };
   serve = () => {
     const methodToRoutesMap = /* @__PURE__ */ new Map();
-    for (const route of this.state.routes) {
+    for (const route of this.#state.routes) {
       if (!methodToRoutesMap.has(route.method)) {
         methodToRoutesMap.set(route.method, /* @__PURE__ */ new Map());
       }
       methodToRoutesMap.get(route.method).set(route.path, {
         ...route,
-        fastQuerySchema: route.query ? _Router.buildQuerySchema(route.query) : void 0
+        fastQuerySchema: route.query ? k.objectFromURLSearchParams(route.query) : void 0
       });
     }
     const findRoute = _Router.getFindRoute(methodToRoutesMap);
@@ -222,18 +224,17 @@ var Router = class _Router {
       const request = new KaitoRequest(url, req);
       const head = new KaitoHead();
       try {
-        const body = route.body ? await route.body.parseAsync(await req.json()) : void 0;
-        const query = route.fastQuerySchema ? await route.fastQuerySchema.parseAsync(url.searchParams) : {};
-        const params = route.router.state.paramsSchema ? route.router.state.paramsSchema.parse(rawParams) : rawParams;
-        const ctx = await route.router.state.through(
-          await this.state.config.getContext?.(request, head, ...args) ?? null,
-          params
+        const body = route.body ? await route.body.parse(await req.json()) : void 0;
+        const query = route.fastQuerySchema ? route.fastQuerySchema.parse(url.searchParams) : {};
+        const ctx = await route.router.#state.through(
+          await this.#state.config.getContext?.(request, head, ...args) ?? null,
+          rawParams
         );
         const result = await route.run({
           ctx,
           body,
           query,
-          params
+          params: rawParams
         });
         if (result instanceof Response) {
           if (isNodeLikeDev) {
@@ -262,7 +263,7 @@ var Router = class _Router {
             message: error.message
           });
         }
-        if (!this.state.config.onError) {
+        if (!this.#state.config.onError) {
           return head.status(500).toResponse({
             success: false,
             data: null,
@@ -270,14 +271,14 @@ var Router = class _Router {
           });
         }
         try {
-          const { status, message } = await this.state.config.onError(error, request);
+          const { status, message } = await this.#state.config.onError(error, request);
           return head.status(status).toResponse({
             success: false,
             data: null,
             message
           });
         } catch (e2) {
-          console.error("KAITO - Failed to handle error inside `.onError()`, returning 500 and Internal Server Error");
+          console.error("[Kaito] Failed to handle error inside `.onError()`, returning 500 and Internal Server Error");
           console.error(e2);
           return head.status(500).toResponse({
             success: false,
@@ -288,11 +289,11 @@ var Router = class _Router {
       }
     };
     return async (request, ...args) => {
-      if (this.state.config.before) {
-        const result = await this.state.config.before(request);
+      if (this.#state.config.before) {
+        const result = await this.#state.config.before(request);
         if (result instanceof Response) {
-          if (this.state.config.transform) {
-            const transformed = await this.state.config.transform(request, result);
+          if (this.#state.config.transform) {
+            const transformed = await this.#state.config.transform(request, result);
             if (transformed instanceof Response) {
               return result;
             }
@@ -301,8 +302,8 @@ var Router = class _Router {
         }
       }
       const response = await handle(request, ...args);
-      if (this.state.config.transform) {
-        const transformed = await this.state.config.transform(request, response);
+      if (this.#state.config.transform) {
+        const transformed = await this.#state.config.transform(request, response);
         if (transformed instanceof Response) {
           return transformed;
         }
@@ -310,10 +311,13 @@ var Router = class _Router {
       return response;
     };
   };
-  openapi = (highLevelSpec) => {
-    const OPENAPI_VERSION = "3.0.0";
+  openapi = ({
+    info,
+    servers
+  }) => {
+    const OPENAPI_VERSION = "3.1.0";
     const paths = {};
-    for (const route of this.state.routes) {
+    for (const route of this.#state.routes) {
       const path = route.path;
       if (!route.openapi) {
         continue;
@@ -324,18 +328,18 @@ var Router = class _Router {
       }
       const content = route.openapi.body.type === "json" ? {
         "application/json": {
-          schema: z.object({
-            success: z.literal(true).openapi({
-              type: "boolean",
-              enum: [true]
-              // Need this as zod-openapi doesn't properly work with literals
-            }),
-            data: route.openapi.body.schema
-          })
+          // schema: z.object({
+          // 	success: z.literal(true).openapi({
+          // 		type: 'boolean',
+          // 		enum: [true], // Need this as zod-openapi doesn't properly work with literals
+          // 	}),
+          // 	data: route.openapi.body.schema,
+          // }),
+          schema: route.openapi.body.schema.toOpenAPI()
         }
       } : {
         "text/event-stream": {
-          schema: route.openapi.body.schema
+          schema: route.openapi.body.schema.toOpenAPI()
         }
       };
       const item = {
@@ -350,37 +354,24 @@ var Router = class _Router {
       if (route.body) {
         item.requestBody = {
           content: {
-            "application/json": { schema: route.body }
+            "application/json": { schema: route.body.toOpenAPI() }
           }
         };
       }
-      const params = {};
-      if (route.query) {
-        params.query = z.object(route.query);
-      }
-      const urlParams = path.match(/:(\w+)/g);
-      if (urlParams) {
-        const pathParams = {};
-        for (const param of urlParams) {
-          pathParams[param.slice(1)] = z.string();
-        }
-        params.path = z.object(pathParams);
-      }
-      item.requestParams = params;
       paths[pathWithColonParamsReplaceWithCurlyBraces][route.method.toLowerCase()] = item;
     }
-    const doc = createDocument({
+    const doc = {
       openapi: OPENAPI_VERSION,
+      info,
       paths,
-      ...highLevelSpec,
-      servers: Object.entries(highLevelSpec.servers ?? {}).map((entry) => {
+      servers: Object.entries(servers ?? {}).map((entry) => {
         const [url, description] = entry;
         return {
           url,
           description
         };
       })
-    });
+    };
     return this.get("/openapi.json", () => Response.json(doc));
   };
   method = (method) => {
@@ -395,27 +386,43 @@ var Router = class _Router {
   options = this.method("OPTIONS");
   through = (through) => {
     return new _Router({
-      ...this.state,
-      through: async (context, params) => await through(await this.state.through(context, params), params)
+      ...this.#state,
+      through: (context, params) => {
+        const next = this.#state.through(context, params);
+        if (next instanceof Promise) {
+          return next.then((next2) => through(next2, params));
+        }
+        return through(next, params);
+      }
     });
   };
 };
 
-// src/create.ts
-function create(config = {}) {
-  return Router.create(config);
-}
-create.withInput = () => {
-  return {
-    create: (config = {}) => Router.create(config)
-  };
-};
+// src/index.ts
+var create = Router.create;
 export {
+  BaseSchema,
+  KArray,
+  KBoolean,
+  KLiteral,
+  KNull,
+  KNumber,
+  KObject,
+  KObjectFromURLSearchParams,
+  KRef,
+  KScalar,
+  KString,
+  KUnion,
   KaitoError,
   KaitoHead,
   KaitoRequest,
+  ParseContext,
   Router,
+  STRING_FORMAT_REGEXES,
+  SchemaError,
   WrappedError,
   create,
-  isNodeLikeDev
+  isNodeLikeDev,
+  isPrimitiveJSONValue,
+  k
 };