better-call 0.2.13-beta.2 → 0.2.13-beta.4

package/dist/index.cjs

@@ -1,27 +1,14 @@
 'use strict';
 
 const crypto = require('uncrypto');
+const zodToOpenapi = require('@asteasolutions/zod-to-openapi');
+const zod = require('zod');
 const rou3 = require('rou3');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const crypto__default = /*#__PURE__*/_interopDefaultCompat(crypto);
 
-function createJSON({
-  asResponse,
-  response
-}) {
-  return async function json(json, routerResponse) {
-    if (!asResponse) {
-      return json;
-    }
-    return {
-      body: json,
-      routerResponse,
-      _flag: "json"
-    };
-  };
-}
 function runValidation(options, context) {
   let request = {
     body: void 0,
@@ -332,6 +319,17 @@ const getSignedCookie = async (header, secret, key, prefix) => {
   return obj[finalKey];
 };
 
+function paramToZod(path) {
+  const parts = path.split("/");
+  const params = parts.filter((part) => part.startsWith(":"));
+  const zod$1 = zod.z.object({});
+  for (const param of params) {
+    zod$1.merge(zod.z.object({ [param.slice(1)]: zod.z.string() }));
+  }
+  return zod$1;
+}
+
+zodToOpenapi.extendZodWithOpenApi(zod.z);
 const createResponse = (handlerResponse, response) => {
   if (handlerResponse instanceof Response) {
     response.headers.forEach((value, key) => {
@@ -384,10 +382,16 @@ const createEndpoint = (path, options, handler) => {
       throw new APIError(error.message, 400);
     }
     const context = {
-      json: createJSON({
-        asResponse,
-        response
-      }),
+      json: (json, routerResponse) => {
+        if (!asResponse) {
+          return json;
+        }
+        return {
+          body: json,
+          routerResponse,
+          _flag: "json"
+        };
+      },
       body: "body" in data ? data.body : void 0,
       path,
       method: "method" in ctx ? ctx.method : void 0,
@@ -450,8 +454,66 @@ const createEndpoint = (path, options, handler) => {
   };
   internalHandler.path = path;
   internalHandler.options = options;
+  const registry = new zodToOpenapi.OpenAPIRegistry();
+  registry.registerPath({
+    path,
+    method: Array.isArray(options.method) ? options.method[0].toLowerCase() : options.method.toLowerCase(),
+    request: {
+      ...options.body ? {
+        body: {
+          content: {
+            "application/json": {
+              schema: options.body
+            }
+          }
+        }
+      } : {},
+      ...options.query ? {
+        query: options.query
+      } : {},
+      params: paramToZod(path)
+    },
+    responses: {
+      200: {
+        description: "Successful response",
+        content: {
+          "application/json": {
+            schema: zod.z.record(zod.z.unknown())
+          }
+        }
+      },
+      400: {
+        description: "Bad request",
+        content: {
+          "application/json": {
+            schema: zod.z.object({
+              message: zod.z.string()
+            })
+          }
+        }
+      },
+      ...options.openAPI?.responses
+    }
+  });
+  internalHandler.openAPI = {
+    definitions: registry.definitions
+  };
   return internalHandler;
 };
+function createEndpointCreator(opts) {
+  return (path, options, handler) => {
+    const res = createEndpoint(
+      path,
+      {
+        ...options,
+        use: [...options?.use || [], ...opts?.use || []]
+      },
+      handler
+    );
+    return res;
+  };
+}
+createEndpoint.creator = createEndpointCreator;
 
 async function getBody(request) {
   const contentType = request.headers.get("content-type") || "";
@@ -648,10 +710,22 @@ function createMiddleware(optionsOrHandler, handler) {
   );
   return endpoint;
 }
+function createMiddlewareCreator(opts) {
+  return (handler) => {
+    const res = createMiddleware(
+      {
+        method: "*",
+        use: opts.use
+      },
+      handler
+    );
+    return res;
+  };
+}
+createMiddleware.creator = createMiddlewareCreator;
 
 exports.createEndpoint = createEndpoint;
 exports.createGetHeader = createGetHeader;
-exports.createJSON = createJSON;
 exports.createMiddleware = createMiddleware;
 exports.createRouter = createRouter;
 exports.createSetHeader = createSetHeader;

package/dist/index.d.cts

@@ -1,11 +1,28 @@
-import { E as EndpointOptions, a as EndpointResponse, b as Endpoint, c as EndpointContext, C as CookiePrefixOptions, d as CookieOptions } from './shared/better-call.342be6c5.cjs';
-export { i as Context, o as Cookie, p as CookieConstraint, H as HasRequiredKeys, l as InferResponse, I as Input, h as IsEmptyObject, J as JSONResponse, P as Prettify, g as RequiredKeysOf, R as Router, S as SignedCookie, U as UnionToIntersection, e as createEndpoint, k as createGetHeader, m as createJSON, f as createRouter, j as createSetHeader, n as fromError, q as parse, s as parseSigned, r as runValidation, t as serialize, u as serializeSigned } from './shared/better-call.342be6c5.cjs';
+import { E as EndpointOptions, a as EndpointResponse, b as Endpoint, c as EndpointContext, I as InferUse, C as CookiePrefixOptions, d as CookieOptions } from './shared/better-call.7c5f7404.cjs';
+export { j as Context, o as Cookie, p as CookieConstraint, H as HasRequiredKeys, m as InferResponse, g as Input, i as IsEmptyObject, J as JSONResponse, P as Prettify, h as RequiredKeysOf, R as Router, S as SignedCookie, U as UnionToIntersection, e as createEndpoint, l as createGetHeader, f as createRouter, k as createSetHeader, n as fromError, q as parse, s as parseSigned, r as runValidation, t as serialize, u as serializeSigned } from './shared/better-call.7c5f7404.cjs';
 import { BufferSource } from 'stream/web';
 import 'zod';
+import '@asteasolutions/zod-to-openapi/dist/zod-extensions';
+import '@asteasolutions/zod-to-openapi';
+import '@asteasolutions/zod-to-openapi/dist/openapi-registry';
 
 type MiddlewareHandler<Options extends EndpointOptions, R extends EndpointResponse> = (context: EndpointContext<any, Options>) => Promise<R>;
 declare function createMiddleware<Opts extends EndpointOptions, R extends EndpointResponse>(optionsOrHandler: MiddlewareHandler<Opts, R>): Endpoint<MiddlewareHandler<Opts, R>, Opts>;
 declare function createMiddleware<Opts extends EndpointOptions, R extends EndpointResponse>(optionsOrHandler: Opts, handler: MiddlewareHandler<Opts, R>): Endpoint<MiddlewareHandler<Opts, R>, Opts>;
+declare namespace createMiddleware {
+    var creator: typeof createMiddlewareCreator;
+}
+declare function createMiddlewareCreator<E extends {
+    use: Endpoint[];
+}>(opts: E): <R extends EndpointResponse>(handler: <InferE extends EndpointContext<any, any>>(ctx: Omit<InferE, "context"> & {
+    context: InferUse<E["use"]>;
+}) => Promise<R>) => Endpoint<MiddlewareHandler<{
+    method: "*";
+    use: Endpoint[];
+}, R>, {
+    method: "*";
+    use: Endpoint[];
+}>;
 
 declare const getCookie: (cookie: string, key: string, prefix?: CookiePrefixOptions) => string | undefined;
 declare const setCookie: (header: Headers, name: string, value: string, opt?: CookieOptions) => void;

package/dist/index.d.mts

@@ -1,11 +1,28 @@
-import { E as EndpointOptions, a as EndpointResponse, b as Endpoint, c as EndpointContext, C as CookiePrefixOptions, d as CookieOptions } from './shared/better-call.342be6c5.mjs';
-export { i as Context, o as Cookie, p as CookieConstraint, H as HasRequiredKeys, l as InferResponse, I as Input, h as IsEmptyObject, J as JSONResponse, P as Prettify, g as RequiredKeysOf, R as Router, S as SignedCookie, U as UnionToIntersection, e as createEndpoint, k as createGetHeader, m as createJSON, f as createRouter, j as createSetHeader, n as fromError, q as parse, s as parseSigned, r as runValidation, t as serialize, u as serializeSigned } from './shared/better-call.342be6c5.mjs';
+import { E as EndpointOptions, a as EndpointResponse, b as Endpoint, c as EndpointContext, I as InferUse, C as CookiePrefixOptions, d as CookieOptions } from './shared/better-call.7c5f7404.mjs';
+export { j as Context, o as Cookie, p as CookieConstraint, H as HasRequiredKeys, m as InferResponse, g as Input, i as IsEmptyObject, J as JSONResponse, P as Prettify, h as RequiredKeysOf, R as Router, S as SignedCookie, U as UnionToIntersection, e as createEndpoint, l as createGetHeader, f as createRouter, k as createSetHeader, n as fromError, q as parse, s as parseSigned, r as runValidation, t as serialize, u as serializeSigned } from './shared/better-call.7c5f7404.mjs';
 import { BufferSource } from 'stream/web';
 import 'zod';
+import '@asteasolutions/zod-to-openapi/dist/zod-extensions';
+import '@asteasolutions/zod-to-openapi';
+import '@asteasolutions/zod-to-openapi/dist/openapi-registry';
 
 type MiddlewareHandler<Options extends EndpointOptions, R extends EndpointResponse> = (context: EndpointContext<any, Options>) => Promise<R>;
 declare function createMiddleware<Opts extends EndpointOptions, R extends EndpointResponse>(optionsOrHandler: MiddlewareHandler<Opts, R>): Endpoint<MiddlewareHandler<Opts, R>, Opts>;
 declare function createMiddleware<Opts extends EndpointOptions, R extends EndpointResponse>(optionsOrHandler: Opts, handler: MiddlewareHandler<Opts, R>): Endpoint<MiddlewareHandler<Opts, R>, Opts>;
+declare namespace createMiddleware {
+    var creator: typeof createMiddlewareCreator;
+}
+declare function createMiddlewareCreator<E extends {
+    use: Endpoint[];
+}>(opts: E): <R extends EndpointResponse>(handler: <InferE extends EndpointContext<any, any>>(ctx: Omit<InferE, "context"> & {
+    context: InferUse<E["use"]>;
+}) => Promise<R>) => Endpoint<MiddlewareHandler<{
+    method: "*";
+    use: Endpoint[];
+}, R>, {
+    method: "*";
+    use: Endpoint[];
+}>;
 
 declare const getCookie: (cookie: string, key: string, prefix?: CookiePrefixOptions) => string | undefined;
 declare const setCookie: (header: Headers, name: string, value: string, opt?: CookieOptions) => void;

package/dist/index.d.ts

@@ -1,11 +1,28 @@
-import { E as EndpointOptions, a as EndpointResponse, b as Endpoint, c as EndpointContext, C as CookiePrefixOptions, d as CookieOptions } from './shared/better-call.342be6c5.js';
-export { i as Context, o as Cookie, p as CookieConstraint, H as HasRequiredKeys, l as InferResponse, I as Input, h as IsEmptyObject, J as JSONResponse, P as Prettify, g as RequiredKeysOf, R as Router, S as SignedCookie, U as UnionToIntersection, e as createEndpoint, k as createGetHeader, m as createJSON, f as createRouter, j as createSetHeader, n as fromError, q as parse, s as parseSigned, r as runValidation, t as serialize, u as serializeSigned } from './shared/better-call.342be6c5.js';
+import { E as EndpointOptions, a as EndpointResponse, b as Endpoint, c as EndpointContext, I as InferUse, C as CookiePrefixOptions, d as CookieOptions } from './shared/better-call.7c5f7404.js';
+export { j as Context, o as Cookie, p as CookieConstraint, H as HasRequiredKeys, m as InferResponse, g as Input, i as IsEmptyObject, J as JSONResponse, P as Prettify, h as RequiredKeysOf, R as Router, S as SignedCookie, U as UnionToIntersection, e as createEndpoint, l as createGetHeader, f as createRouter, k as createSetHeader, n as fromError, q as parse, s as parseSigned, r as runValidation, t as serialize, u as serializeSigned } from './shared/better-call.7c5f7404.js';
 import { BufferSource } from 'stream/web';
 import 'zod';
+import '@asteasolutions/zod-to-openapi/dist/zod-extensions';
+import '@asteasolutions/zod-to-openapi';
+import '@asteasolutions/zod-to-openapi/dist/openapi-registry';
 
 type MiddlewareHandler<Options extends EndpointOptions, R extends EndpointResponse> = (context: EndpointContext<any, Options>) => Promise<R>;
 declare function createMiddleware<Opts extends EndpointOptions, R extends EndpointResponse>(optionsOrHandler: MiddlewareHandler<Opts, R>): Endpoint<MiddlewareHandler<Opts, R>, Opts>;
 declare function createMiddleware<Opts extends EndpointOptions, R extends EndpointResponse>(optionsOrHandler: Opts, handler: MiddlewareHandler<Opts, R>): Endpoint<MiddlewareHandler<Opts, R>, Opts>;
+declare namespace createMiddleware {
+    var creator: typeof createMiddlewareCreator;
+}
+declare function createMiddlewareCreator<E extends {
+    use: Endpoint[];
+}>(opts: E): <R extends EndpointResponse>(handler: <InferE extends EndpointContext<any, any>>(ctx: Omit<InferE, "context"> & {
+    context: InferUse<E["use"]>;
+}) => Promise<R>) => Endpoint<MiddlewareHandler<{
+    method: "*";
+    use: Endpoint[];
+}, R>, {
+    method: "*";
+    use: Endpoint[];
+}>;
 
 declare const getCookie: (cookie: string, key: string, prefix?: CookiePrefixOptions) => string | undefined;
 declare const setCookie: (header: Headers, name: string, value: string, opt?: CookieOptions) => void;

package/dist/index.mjs

@@ -1,21 +1,8 @@
 import crypto from 'uncrypto';
+import { extendZodWithOpenApi, OpenAPIRegistry } from '@asteasolutions/zod-to-openapi';
+import { z } from 'zod';
 import { createRouter as createRouter$1, addRoute, findRoute, findAllRoutes } from 'rou3';
 
-function createJSON({
-  asResponse,
-  response
-}) {
-  return async function json(json, routerResponse) {
-    if (!asResponse) {
-      return json;
-    }
-    return {
-      body: json,
-      routerResponse,
-      _flag: "json"
-    };
-  };
-}
 function runValidation(options, context) {
   let request = {
     body: void 0,
@@ -326,6 +313,17 @@ const getSignedCookie = async (header, secret, key, prefix) => {
   return obj[finalKey];
 };
 
+function paramToZod(path) {
+  const parts = path.split("/");
+  const params = parts.filter((part) => part.startsWith(":"));
+  const zod = z.object({});
+  for (const param of params) {
+    zod.merge(z.object({ [param.slice(1)]: z.string() }));
+  }
+  return zod;
+}
+
+extendZodWithOpenApi(z);
 const createResponse = (handlerResponse, response) => {
   if (handlerResponse instanceof Response) {
     response.headers.forEach((value, key) => {
@@ -378,10 +376,16 @@ const createEndpoint = (path, options, handler) => {
       throw new APIError(error.message, 400);
     }
     const context = {
-      json: createJSON({
-        asResponse,
-        response
-      }),
+      json: (json, routerResponse) => {
+        if (!asResponse) {
+          return json;
+        }
+        return {
+          body: json,
+          routerResponse,
+          _flag: "json"
+        };
+      },
       body: "body" in data ? data.body : void 0,
       path,
       method: "method" in ctx ? ctx.method : void 0,
@@ -444,8 +448,66 @@ const createEndpoint = (path, options, handler) => {
   };
   internalHandler.path = path;
   internalHandler.options = options;
+  const registry = new OpenAPIRegistry();
+  registry.registerPath({
+    path,
+    method: Array.isArray(options.method) ? options.method[0].toLowerCase() : options.method.toLowerCase(),
+    request: {
+      ...options.body ? {
+        body: {
+          content: {
+            "application/json": {
+              schema: options.body
+            }
+          }
+        }
+      } : {},
+      ...options.query ? {
+        query: options.query
+      } : {},
+      params: paramToZod(path)
+    },
+    responses: {
+      200: {
+        description: "Successful response",
+        content: {
+          "application/json": {
+            schema: z.record(z.unknown())
+          }
+        }
+      },
+      400: {
+        description: "Bad request",
+        content: {
+          "application/json": {
+            schema: z.object({
+              message: z.string()
+            })
+          }
+        }
+      },
+      ...options.openAPI?.responses
+    }
+  });
+  internalHandler.openAPI = {
+    definitions: registry.definitions
+  };
   return internalHandler;
 };
+function createEndpointCreator(opts) {
+  return (path, options, handler) => {
+    const res = createEndpoint(
+      path,
+      {
+        ...options,
+        use: [...options?.use || [], ...opts?.use || []]
+      },
+      handler
+    );
+    return res;
+  };
+}
+createEndpoint.creator = createEndpointCreator;
 
 async function getBody(request) {
   const contentType = request.headers.get("content-type") || "";
@@ -642,5 +704,18 @@ function createMiddleware(optionsOrHandler, handler) {
   );
   return endpoint;
 }
+function createMiddlewareCreator(opts) {
+  return (handler) => {
+    const res = createMiddleware(
+      {
+        method: "*",
+        use: opts.use
+      },
+      handler
+    );
+    return res;
+  };
+}
+createMiddleware.creator = createMiddlewareCreator;
 
-export { createEndpoint, createGetHeader, createJSON, createMiddleware, createRouter, createSetHeader, fromError, getCookie, getSignedCookie, parse, parseSigned, runValidation, serialize, serializeSigned, setCookie, setSignedCookie };
+export { createEndpoint, createGetHeader, createMiddleware, createRouter, createSetHeader, fromError, getCookie, getSignedCookie, parse, parseSigned, runValidation, serialize, serializeSigned, setCookie, setSignedCookie };