Merge branch 'main' into update/endpoint/custom-validation-error

Author: ping-maxwell

package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-call",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "packageManager": "pnpm@9.15.0",
   "type": "module",
   "repository": {
@@ -34,7 +34,7 @@
     "typescript": "^5.6.0-beta",
     "valibot": "1.0.0-beta.15",
     "vitest": "^3.1.1",
-    "zod": "^3.24.1"
+    "zod": "^4.0.1"
   },
   "dependencies": {
     "@better-fetch/fetch": "^1.1.4",

pnpm-lock.yaml

@@ -143,7 +143,7 @@ describe("types", async () => {
 			"/path",
 			{
 				method: "POST",
-				body: z.record(z.string()),
+				body: z.record(z.string(), z.string()),
 				metadata: {
 					$Infer: {
 						body: {} as {
@@ -206,7 +206,7 @@ describe("types", async () => {
 			"/path",
 			{
 				method: "POST",
-				body: z.record(z.string()),
+				body: z.record(z.string(), z.string()),
 				metadata: {
 					$Infer: {
 						query: {} as {
@@ -366,6 +366,51 @@ describe("response", () => {
 				test: "response",
 			});
 		});
+
+		it("should return a js object response with 201 status", async () => {
+			const endpoint = createEndpoint(
+				"/path",
+				{
+					method: "POST",
+					status: 201,
+				},
+				async (ctx) => {
+					return ctx.json(
+						{ test: "response" },
+						{
+							status: 201,
+						},
+					);
+				},
+			);
+			const response = await endpoint({
+				asResponse: true,
+			});
+			await expect(response.json()).resolves.toMatchObject({
+				test: "response",
+			});
+			expect(response.status).toBe(201);
+		});
+	});
+
+	it("should return a js object response (asResponse)", async () => {
+		const endpoint = createEndpoint(
+			"/path",
+			{
+				method: "POST",
+				status: 200,
+			},
+			async (ctx) => {
+				return ctx.json({ test: "response" });
+			},
+		);
+		const response = await endpoint({
+			asResponse: true,
+		});
+		await expect(response.json()).resolves.toMatchObject({
+			test: "response",
+		});
+		expect(response.status).toBe(200);
 	});
 
 	describe("as-response", () => {

src/endpoint.test.ts

@@ -1,4 +1,4 @@
-import { ZodObject, ZodOptional, ZodSchema } from "zod";
+import { ZodObject, ZodOptional, ZodType } from "zod";
 import type { Endpoint, EndpointOptions } from "./endpoint";
 
 export type OpenAPISchemaType = "string" | "number" | "integer" | "boolean" | "array" | "object";
@@ -82,7 +82,7 @@ export interface Path {
 }
 const paths: Record<string, Path> = {};
 
-function getTypeFromZodType(zodType: ZodSchema) {
+function getTypeFromZodType(zodType: ZodType<any>) {
 	switch (zodType.constructor.name) {
 		case "ZodString":
 			return "string";
@@ -107,7 +107,7 @@ function getParameters(options: EndpointOptions) {
 	}
 	if (options.query instanceof ZodObject) {
 		Object.entries(options.query.shape).forEach(([key, value]) => {
-			if (value instanceof ZodSchema) {
+			if (value instanceof ZodObject) {
 				parameters.push({
 					name: key,
 					in: "query",
@@ -139,7 +139,7 @@ function getRequestBody(options: EndpointOptions): any {
 		const properties: Record<string, any> = {};
 		const required: string[] = [];
 		Object.entries(shape).forEach(([key, value]) => {
-			if (value instanceof ZodSchema) {
+			if (value instanceof ZodObject) {
 				properties[key] = {
 					type: getTypeFromZodType(value),
 					description: value.description,