better-call 1.1.3 → 1.1.5

package/dist/index.js

@@ -115,6 +115,17 @@ var InternalAPIError = class extends Error {
 		} : void 0;
 	}
 };
+var ValidationError = class extends InternalAPIError {
+	constructor(message, issues) {
+		super(400, {
+			message,
+			code: "VALIDATION_ERROR"
+		});
+		this.message = message;
+		this.issues = issues;
+		this.issues = issues;
+	}
+};
 var BetterCallError = class extends Error {
 	constructor(message) {
 		super(message);
@@ -179,6 +190,19 @@ function tryDecode(str) {
 		return str;
 	}
 }
+async function tryCatch(promise) {
+	try {
+		return {
+			data: await promise,
+			error: null
+		};
+	} catch (error) {
+		return {
+			data: null,
+			error
+		};
+	}
+}
 
 //#endregion
 //#region src/to-response.ts
@@ -300,11 +324,17 @@ async function runValidation(options, context = {}) {
 	}
 	if (options.requireHeaders && !context.headers) return {
 		data: null,
-		error: { message: "Headers is required" }
+		error: {
+			message: "Headers is required",
+			issues: []
+		}
 	};
 	if (options.requireRequest && !context.request) return {
 		data: null,
-		error: { message: "Request is required" }
+		error: {
+			message: "Request is required",
+			issues: []
+		}
 	};
 	return {
 		data: request,
@@ -312,12 +342,12 @@ async function runValidation(options, context = {}) {
 	};
 }
 function fromError(error, validating) {
-	const errorMessages = [];
-	for (const issue of error) {
-		const message = issue.message;
-		errorMessages.push(message);
-	}
-	return { message: `Invalid ${validating} parameters` };
+	return {
+		message: error.map((e) => {
+			return `[${e.path?.length ? `${validating}.` + e.path.map((x) => typeof x === "object" ? x.key : x).join(".") : validating}] ${e.message}`;
+		}).join("; "),
+		issues: error
+	};
 }
 
 //#endregion
@@ -437,10 +467,7 @@ 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"
-	});
+	if (error) throw new ValidationError(error.message, error.issues);
 	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 parsedCookies = requestCookies ? parseCookies(requestCookies) : void 0;
@@ -536,12 +563,24 @@ function createEndpoint(pathOrOptions, handlerOrOptions, handlerOrNever) {
 	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");
+	if (path && /\/{2,}/.test(path)) throw new BetterCallError("Path cannot contain consecutive slashes");
 	const internalHandler = async (...inputCtx) => {
 		const context = inputCtx[0] || {};
-		const internalContext = await createInternalContext(context, {
+		const { data: internalContext, error: validationError } = await tryCatch(createInternalContext(context, {
 			options,
 			path
-		});
+		}));
+		if (validationError) {
+			if (!(validationError instanceof ValidationError)) throw validationError;
+			if (options.onValidationError) await options.onValidationError({
+				message: validationError.message,
+				issues: validationError.issues
+			});
+			throw new APIError(400, {
+				message: validationError.message,
+				code: "VALIDATION_ERROR"
+			});
+		}
 		const response = await handler(internalContext).catch(async (e) => {
 			if (isAPIError(e)) {
 				const onAPIError = options.onAPIError;
@@ -823,7 +862,8 @@ const createRouter = (endpoints, config) => {
 	if (config?.routerMiddleware?.length) for (const { path, middleware } of config.routerMiddleware) addRoute(middlewareRouter, "*", path, middleware);
 	const processRequest = async (request) => {
 		const url = new URL(request.url);
-		const path = config?.basePath ? url.pathname.split(config.basePath).reduce((acc, curr, index) => {
+		const pathname = url.pathname;
+		const path = config?.basePath && config.basePath !== "/" ? pathname.split(config.basePath).reduce((acc, curr, index) => {
 			if (index !== 0) if (index > 1) acc.push(`${config.basePath}${curr}`);
 			else acc.push(curr);
 			return acc;
@@ -832,7 +872,15 @@ const createRouter = (endpoints, config) => {
 			status: 404,
 			statusText: "Not Found"
 		});
+		if (/\/{2,}/.test(path)) return new Response(null, {
+			status: 404,
+			statusText: "Not Found"
+		});
 		const route = findRoute(router, request.method, path);
+		if (path.endsWith("/") !== route?.data?.path?.endsWith("/") && !config?.skipTrailingSlashes) return new Response(null, {
+			status: 404,
+			statusText: "Not Found"
+		});
 		if (!route?.data) return new Response(null, {
 			status: 404,
 			statusText: "Not Found"
@@ -899,5 +947,5 @@ const createRouter = (endpoints, config) => {
 };
 
 //#endregion
-export { APIError, BetterCallError, createEndpoint, createInternalContext, createMiddleware, createRouter, generator, getCookieKey, getHTML, hideInternalStackFrames, makeErrorForHideStackFrame, parseCookies, serializeCookie, serializeSignedCookie, statusCodes, toResponse };
+export { APIError, BetterCallError, ValidationError, createEndpoint, createInternalContext, createMiddleware, createRouter, generator, getCookieKey, getHTML, hideInternalStackFrames, makeErrorForHideStackFrame, parseCookies, serializeCookie, serializeSignedCookie, statusCodes, toResponse };
 //# sourceMappingURL=index.js.map