better-call 1.0.28 → 1.1.0-beta.1

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { APIError, BetterCallError, CookieOptions, CookiePrefixOptions, Endpoint, EndpointBaseOptions, EndpointBodyMethodOptions, EndpointContext, EndpointOptions, HTTPMethod, HasRequiredKeys, InferBody, InferBodyInput, InferHeaders, InferHeadersInput, InferInputMethod, InferMethod, InferMiddlewareBody, InferMiddlewareQuery, InferParam, InferParamInput, InferParamPath, InferParamWildCard, InferQuery, InferQueryInput, InferRequest, InferRequestInput, InferUse, InputContext, IsEmptyObject, MergeObject, Method, Middleware, MiddlewareContext, MiddlewareInputContext, MiddlewareOptions, MiddlewareResponse, OpenAPIParameter, OpenAPISchemaType, Path, Prettify, RequiredKeysOf, Router, RouterConfig, StandardSchemaV1, Status, StrictEndpoint, UnionToIntersection, createEndpoint, createInternalContext, createMiddleware, createRouter, generator, getCookieKey, getHTML, hideInternalStackFrames, makeErrorForHideStackFrame, parseCookies, serializeCookie, serializeSignedCookie, statusCodes } from "./router-rGV6mTr8.cjs";
+import { APIError, BetterCallError, CookieOptions, CookiePrefixOptions, Endpoint, EndpointBaseOptions, EndpointBodyMethodOptions, EndpointContext, EndpointOptions, HTTPMethod, HasRequiredKeys, InferBody, InferBodyInput, InferHeaders, InferHeadersInput, InferInputMethod, InferMethod, InferMiddlewareBody, InferMiddlewareQuery, InferParam, InferParamInput, InferParamPath, InferParamWildCard, InferQuery, InferQueryInput, InferRequest, InferRequestInput, InferUse, InputContext, IsEmptyObject, MergeObject, Method, Middleware, MiddlewareContext, MiddlewareInputContext, MiddlewareOptions, MiddlewareResponse, OpenAPIParameter, OpenAPISchemaType, Path, Prettify, RequiredKeysOf, Router, RouterConfig, StandardSchemaV1, Status, StrictEndpoint, UnionToIntersection, createEndpoint, createInternalContext, createMiddleware, createRouter, generator, getCookieKey, getHTML, hideInternalStackFrames, makeErrorForHideStackFrame, parseCookies, serializeCookie, serializeSignedCookie, statusCodes } from "./router-DguGh6Qa.cjs";
 
 //#region src/to-response.d.ts
 type JSONResponse = {

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { APIError, BetterCallError, CookieOptions, CookiePrefixOptions, Endpoint, EndpointBaseOptions, EndpointBodyMethodOptions, EndpointContext, EndpointOptions, HTTPMethod, HasRequiredKeys, InferBody, InferBodyInput, InferHeaders, InferHeadersInput, InferInputMethod, InferMethod, InferMiddlewareBody, InferMiddlewareQuery, InferParam, InferParamInput, InferParamPath, InferParamWildCard, InferQuery, InferQueryInput, InferRequest, InferRequestInput, InferUse, InputContext, IsEmptyObject, MergeObject, Method, Middleware, MiddlewareContext, MiddlewareInputContext, MiddlewareOptions, MiddlewareResponse, OpenAPIParameter, OpenAPISchemaType, Path, Prettify, RequiredKeysOf, Router, RouterConfig, StandardSchemaV1, Status, StrictEndpoint, UnionToIntersection, createEndpoint, createInternalContext, createMiddleware, createRouter, generator, getCookieKey, getHTML, hideInternalStackFrames, makeErrorForHideStackFrame, parseCookies, serializeCookie, serializeSignedCookie, statusCodes } from "./router-NaFkuy-s.js";
+import { APIError, BetterCallError, CookieOptions, CookiePrefixOptions, Endpoint, EndpointBaseOptions, EndpointBodyMethodOptions, EndpointContext, EndpointOptions, HTTPMethod, HasRequiredKeys, InferBody, InferBodyInput, InferHeaders, InferHeadersInput, InferInputMethod, InferMethod, InferMiddlewareBody, InferMiddlewareQuery, InferParam, InferParamInput, InferParamPath, InferParamWildCard, InferQuery, InferQueryInput, InferRequest, InferRequestInput, InferUse, InputContext, IsEmptyObject, MergeObject, Method, Middleware, MiddlewareContext, MiddlewareInputContext, MiddlewareOptions, MiddlewareResponse, OpenAPIParameter, OpenAPISchemaType, Path, Prettify, RequiredKeysOf, Router, RouterConfig, StandardSchemaV1, Status, StrictEndpoint, UnionToIntersection, createEndpoint, createInternalContext, createMiddleware, createRouter, generator, getCookieKey, getHTML, hideInternalStackFrames, makeErrorForHideStackFrame, parseCookies, serializeCookie, serializeSignedCookie, statusCodes } from "./router-EvGJRGFD.js";
 
 //#region src/to-response.d.ts
 type JSONResponse = {

package/dist/index.js

@@ -133,10 +133,16 @@ async function getBody(request, allowedMediaTypes) {
 			const normalizedContentTypeBase = normalizedContentType.split(";")[0].trim();
 			const normalizedAllowed = allowed.toLowerCase().trim();
 			return normalizedContentTypeBase === normalizedAllowed || normalizedContentTypeBase.includes(normalizedAllowed);
-		})) throw new APIError(415, {
-			message: `Content-Type "${contentType}" is not allowed. Allowed types: ${allowedMediaTypes.join(", ")}`,
-			code: "UNSUPPORTED_MEDIA_TYPE"
-		});
+		})) {
+			if (!normalizedContentType) throw new APIError(415, {
+				message: `Content-Type is required. Allowed types: ${allowedMediaTypes.join(", ")}`,
+				code: "UNSUPPORTED_MEDIA_TYPE"
+			});
+			throw new APIError(415, {
+				message: `Content-Type "${contentType}" is not allowed. Allowed types: ${allowedMediaTypes.join(", ")}`,
+				code: "UNSUPPORTED_MEDIA_TYPE"
+			});
+		}
 	}
 	if (normalizedContentType.includes("application/json")) return await request.json();
 	if (normalizedContentType.includes("application/x-www-form-urlencoded")) {
@@ -212,12 +218,14 @@ function toResponse(data, init) {
 		const body$1 = data.body;
 		const routerResponse = data.routerResponse;
 		if (routerResponse instanceof Response) return routerResponse;
-		const headers$1 = new Headers({
-			...routerResponse?.headers,
-			...data.headers,
-			...init?.headers,
-			"Content-Type": "application/json"
-		});
+		const headers$1 = new Headers();
+		if (routerResponse?.headers) {
+			const headers$2 = new Headers(routerResponse.headers);
+			for (const [key, value] of headers$2.entries()) headers$2.set(key, value);
+		}
+		if (data.headers) for (const [key, value] of new Headers(data.headers).entries()) headers$1.set(key, value);
+		if (init?.headers) for (const [key, value] of new Headers(init.headers).entries()) headers$1.set(key, value);
+		headers$1.set("Content-Type", "application/json");
 		return new Response(JSON.stringify(body$1), {
 			...routerResponse,
 			headers: headers$1,
@@ -438,7 +446,7 @@ const createInternalContext = async (context, { options, path }) => {
 		...context,
 		body: data.body,
 		query: data.query,
-		path: context.path || path,
+		path: context.path || path || "virtual:",
 		context: "context" in context && context.context ? context.context : {},
 		returned: void 0,
 		headers: context?.headers,
@@ -521,7 +529,10 @@ const createInternalContext = async (context, { options, path }) => {
 
 //#endregion
 //#region src/endpoint.ts
-const createEndpoint = (path, options, handler) => {
+function createEndpoint(pathOrOptions, handlerOrOptions, handlerOrNever) {
+	const path = typeof pathOrOptions === "string" ? pathOrOptions : void 0;
+	const options = typeof handlerOrOptions === "object" ? handlerOrOptions : pathOrOptions;
+	const handler = typeof handlerOrOptions === "function" ? handlerOrOptions : handlerOrNever;
 	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] || {};
@@ -557,7 +568,7 @@ const createEndpoint = (path, options, handler) => {
 	internalHandler.options = options;
 	internalHandler.path = path;
 	return internalHandler;
-};
+}
 createEndpoint.create = (opts) => {
 	return (path, options, handler) => {
 		return createEndpoint(path, {
@@ -2381,7 +2392,7 @@ async function generator(endpoints, config$1) {
 	const components = { schemas: {} };
 	Object.entries(endpoints).forEach(([_, value]) => {
 		const options = value.options;
-		if (options.metadata?.SERVER_ONLY) return;
+		if (!value.path || options.metadata?.SERVER_ONLY) return;
 		if (options.method === "GET") paths[value.path] = { get: {
 			tags: ["Default", ...options.metadata?.openapi?.tags || []],
 			description: options.metadata?.openapi?.description,
@@ -2470,7 +2481,7 @@ const createRouter = (endpoints, config$1) => {
 	const router = createRouter$1();
 	const middlewareRouter = createRouter$1();
 	for (const endpoint of Object.values(endpoints)) {
-		if (!endpoint.options) continue;
+		if (!endpoint.options || !endpoint.path) continue;
 		if (endpoint.options?.metadata?.SERVER_ONLY) continue;
 		const methods = Array.isArray(endpoint.options?.method) ? endpoint.options.method : [endpoint.options?.method];
 		for (const method of methods) addRoute(router, method, endpoint.path, endpoint);