better-call 1.0.25-beta.2 → 1.0.25

package/README.md

@@ -78,7 +78,27 @@ const items = await client("/item", {
 
 ### Returning non 200 responses
 
-To return a non 200 response, you will need to throw Better Call's `APIError` error. If the endpoint is called as a function, the error will be thrown but if it's mounted to a router, the error will be converted to a response object with the correct status code and headers.
+There are several supported ways to a non 200 response:
+
+You can use the `ctx.setStatus(status)` helper to change the default status code of a successful response:
+
+```ts
+const createItem = createEndpoint("/item", {
+    method: "POST",
+    body: z.object({
+        id: z.string()
+    })
+}, async (ctx) => {
+    ctx.setStatus(201);
+    return {
+        item: {
+            id: ctx.body.id
+        }
+    }
+})
+```
+
+Sometimes, you want to respond with an error, in those cases you will need to throw Better Call's `APIError` error. If the endpoint is called as a function, the error will be thrown but if it's mounted to a router, the error will be converted to a response object with the correct status code and headers.
 
 ```ts
 const createItem = createEndpoint("/item", {
@@ -122,6 +142,23 @@ const createItem = createEndpoint("/item", {
 })
 ```
 
+Finally, you can return a new `Response` object. In this case, the `ctx.setStatus()` call will be ignored, as the `Response` will have completely control over the final status code:
+
+```ts
+const createItem = createEndpoint("/item", {
+    method: "POST",
+    body: z.object({
+        id: z.string()
+    })
+}, async (ctx) => {
+    return Response.json({
+        item: {
+            id: ctx.body.id
+        }
+    }, { status: 201 });
+})
+```
+
 ### Endpoint
 
 Endpoints are building blocks of better-call. 

package/dist/client.d.cts

@@ -1,4 +1,4 @@
-import { Endpoint, HasRequiredKeys, Router, UnionToIntersection } from "./router-BFJOSfmb.cjs";
+import { Endpoint, HasRequiredKeys, Router, UnionToIntersection } from "./router-DeSuoHCx.cjs";
 import { BetterFetchOption, BetterFetchResponse } from "@better-fetch/fetch";
 
 //#region src/client.d.ts

package/dist/client.d.ts

@@ -1,4 +1,4 @@
-import { Endpoint, HasRequiredKeys, Router, UnionToIntersection } from "./router-D0KeMgM6.js";
+import { Endpoint, HasRequiredKeys, Router, UnionToIntersection } from "./router-DRUBbubk.js";
 import { BetterFetchOption, BetterFetchResponse } from "@better-fetch/fetch";
 
 //#region src/client.d.ts

package/dist/index.cjs

@@ -117,6 +117,12 @@ var InternalAPIError = class extends Error {
 		} : void 0;
 	}
 };
+var BetterCallError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "BetterCallError";
+	}
+};
 const APIError = makeErrorForHideStackFrame(InternalAPIError, Error);
 
 //#endregion
@@ -411,19 +417,20 @@ const serializeSignedCookie = async (key, value, secret, opt) => {
 //#region src/context.ts
 const createInternalContext = async (context, { options, path }) => {
 	const headers = new Headers();
+	let responseStatus = void 0;
 	const { data, error } = await runValidation(options, context);
 	if (error) throw new APIError(400, {
 		message: error.message,
 		code: "VALIDATION_ERROR"
 	});
-	const requestHeaders = "headers" in context ? context.headers instanceof Headers ? context.headers : new Headers(context.headers) : "request" in context && context.request instanceof Request ? context.request.headers : null;
-	const requestCookies = requestHeaders?.get("cookie");
+	const requestHeaders = "headers" in context ? context.headers instanceof Headers ? context.headers : new Headers(context.headers) : "request" in context && context.request instanceof Request ? context.request.headers : new Headers();
+	const requestCookies = requestHeaders.get("cookie");
 	const parsedCookies = requestCookies ? parseCookies(requestCookies) : void 0;
 	const internalContext = {
 		...context,
 		body: data.body,
 		query: data.query,
-		path: context.path || path,
+		path,
 		context: "context" in context && context.context ? context.context : {},
 		returned: void 0,
 		headers: context?.headers,
@@ -471,6 +478,9 @@ const createInternalContext = async (context, { options, path }) => {
 		error: (status, body, headers$1) => {
 			return new APIError(status, body, headers$1);
 		},
+		setStatus: (status) => {
+			responseStatus = status;
+		},
 		json: (json, routerResponse) => {
 			if (!context.asResponse) return json;
 			return {
@@ -479,7 +489,10 @@ const createInternalContext = async (context, { options, path }) => {
 				_flag: "json"
 			};
 		},
-		responseHeaders: headers
+		responseHeaders: headers,
+		get responseStatus() {
+			return responseStatus;
+		}
 	};
 	for (const middleware of options.use || []) {
 		const response = await middleware({
@@ -498,43 +511,10 @@ const createInternalContext = async (context, { options, path }) => {
 	return internalContext;
 };
 
-//#endregion
-//#region src/middleware.ts
-function createMiddleware(optionsOrHandler, handler) {
-	const internalHandler = async (inputCtx) => {
-		const context = inputCtx;
-		const _handler = typeof optionsOrHandler === "function" ? optionsOrHandler : handler;
-		const internalContext = await createInternalContext(context, {
-			options: typeof optionsOrHandler === "function" ? {} : optionsOrHandler,
-			path: "/"
-		});
-		if (!_handler) throw new Error("handler must be defined");
-		const response = await _handler(internalContext);
-		const headers = internalContext.responseHeaders;
-		return context.returnHeaders ? {
-			headers,
-			response
-		} : response;
-	};
-	internalHandler.options = typeof optionsOrHandler === "function" ? {} : optionsOrHandler;
-	return internalHandler;
-}
-createMiddleware.create = (opts) => {
-	function fn(optionsOrHandler, handler) {
-		if (typeof optionsOrHandler === "function") return createMiddleware({ use: opts?.use }, optionsOrHandler);
-		if (!handler) throw new Error("Middleware handler is required");
-		return createMiddleware({
-			...optionsOrHandler,
-			method: "*",
-			use: [...opts?.use || [], ...optionsOrHandler.use || []]
-		}, handler);
-	}
-	return fn;
-};
-
 //#endregion
 //#region src/endpoint.ts
 const createEndpoint = (path, options, handler) => {
+	if ((options.method === "GET" || options.method === "HEAD") && options.body) throw new BetterCallError("Body is not allowed with GET or HEAD methods");
 	const internalHandler = async (...inputCtx) => {
 		const context = inputCtx[0] || {};
 		const internalContext = await createInternalContext(context, {
@@ -550,9 +530,20 @@ const createEndpoint = (path, options, handler) => {
 			throw e;
 		});
 		const headers = internalContext.responseHeaders;
-		return context.asResponse ? toResponse(response, { headers }) : context.returnHeaders ? {
+		const status = internalContext.responseStatus;
+		return context.asResponse ? toResponse(response, {
+			headers,
+			status
+		}) : context.returnHeaders ? context.returnStatus ? {
+			headers,
+			response,
+			status
+		} : {
 			headers,
 			response
+		} : context.returnStatus ? {
+			response,
+			status
 		} : response;
 	};
 	internalHandler.options = options;
@@ -568,6 +559,40 @@ createEndpoint.create = (opts) => {
 	};
 };
 
+//#endregion
+//#region src/middleware.ts
+function createMiddleware(optionsOrHandler, handler) {
+	const internalHandler = async (inputCtx) => {
+		const context = inputCtx;
+		const _handler = typeof optionsOrHandler === "function" ? optionsOrHandler : handler;
+		const internalContext = await createInternalContext(context, {
+			options: typeof optionsOrHandler === "function" ? {} : optionsOrHandler,
+			path: "/"
+		});
+		if (!_handler) throw new Error("handler must be defined");
+		const response = await _handler(internalContext);
+		const headers = internalContext.responseHeaders;
+		return context.returnHeaders ? {
+			headers,
+			response
+		} : response;
+	};
+	internalHandler.options = typeof optionsOrHandler === "function" ? {} : optionsOrHandler;
+	return internalHandler;
+}
+createMiddleware.create = (opts) => {
+	function fn(optionsOrHandler, handler) {
+		if (typeof optionsOrHandler === "function") return createMiddleware({ use: opts?.use }, optionsOrHandler);
+		if (!handler) throw new Error("Middleware handler is required");
+		return createMiddleware({
+			...optionsOrHandler,
+			method: "*",
+			use: [...opts?.use || [], ...optionsOrHandler.use || []]
+		}, handler);
+	}
+	return fn;
+};
+
 //#endregion
 //#region node_modules/.pnpm/zod@4.0.1/node_modules/zod/v4/core/core.js
 /** A special constant with type `never` */
@@ -2521,6 +2546,7 @@ const createRouter = (endpoints, config$1) => {
 
 //#endregion
 exports.APIError = APIError;
+exports.BetterCallError = BetterCallError;
 exports._statusCode = _statusCode;
 exports.createEndpoint = createEndpoint;
 exports.createInternalContext = createInternalContext;