@aklinker1/zeta 1.0.3 → 1.1.1

package/README.md

@@ -1,8 +1,8 @@
 # Zeta
 
-[![JSR](https://jsr.io/badges/@aklinker1/zeta)](https://jsr.io/@aklinker1/zeta) [![Docs](https://img.shields.io/badge/Docs-blue?logo=readme&logoColor=white)](https://jsr.io/@aklinker1/zeta) [![API Reference](https://img.shields.io/badge/API%20Reference-blue?logo=readme&logoColor=white)](https://jsr.io/@aklinker1/zeta/doc) [![License](https://img.shields.io/github/license/aklinker1/zeta)](https://github.com/aklinker1/zeta/blob/main/LICENSE) [![Changelog](https://img.shields.io/badge/Changelog-blue?logo=github&logoColor=white)](https://github.com/aklinker1/zeta/blob/main/CHANGELOG.md)
+[![JSR](https://jsr.io/badges/@aklinker1/zeta)](https://jsr.io/@aklinker1/zeta) [![NPM Version](https://img.shields.io/npm/v/%40aklinker1%2Fzeta?logo=npm&labelColor=red&color=white)](https://www.npmjs.com/package/@aklinker1/zeta) [![Docs](https://img.shields.io/badge/Docs-blue?logo=readme&logoColor=white)](https://jsr.io/@aklinker1/zeta) [![API Reference](https://img.shields.io/badge/API%20Reference-blue?logo=readme&logoColor=white)](https://jsr.io/@aklinker1/zeta/doc) [![License](https://img.shields.io/github/license/aklinker1/zeta)](https://github.com/aklinker1/zeta/blob/main/LICENSE) [![Changelog](https://img.shields.io/badge/Changelog-blue?logo=github&logoColor=white)](https://github.com/aklinker1/zeta/blob/main/CHANGELOG.md)
 
-Personal alternative to [Elysia](https://elysiajs.com/) with better validation support.
+Composable, testable, OpenAPI-first backend framework with validation built-in.
 
 **Features**
 
@@ -268,7 +268,9 @@ When a response schema(s) are defined, the return value from the function is typ
 
 #### Custom Content Types
 
-By default, Zeta will use `application/json` as the content type in the OpenAPI docs. you can override this by setting the `contentType` metadata on your schema:
+By default, Zeta will use `application/json` as the content type in the OpenAPI docs and infer the content type of the response at runtime based on the response type.
+
+You can override both the docs and the response content type by setting the `contentType` metadata on your schema:
 
 ```ts
 app.get(
@@ -282,24 +284,6 @@ app.get(
 );
 ```
 
-> [!WARNING]
->
-> Zeta ignores this metadata when building the response. Make sure to set the `Content-Type` header in your handler:
->
-> ```ts
-> app.get(
->   "/csv",
->   {
->     responses: z.string().meta({ contentType: "text/csv" }),
->   },
->   ({ set }) => {
->     // ...
->     set.headers["Content-Type"] = "text/csv";
->     return "...";
->   },
-> );
-> ```
-
 ## Life Cycle Hooks
 
 ## `App#decorate`

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@aklinker1/zeta",
-  "version": "1.0.3",
+  "description": "Composable, testable, OpenAPI-first backend framework with validation built-in",
+  "version": "1.1.1",
   "type": "module",
   "license": "MIT",
   "packageManager": "bun@1.2.17",
@@ -24,6 +25,12 @@
   "repository": {
     "url": "https://github.com/aklinker1/zeta"
   },
+  "keywords": [
+    "backend",
+    "server",
+    "validation",
+    "openapi"
+  ],
   "scripts": {
     "dev": "bun test --watch",
     "build": "echo 'Noop - nothing to build.'",

package/src/adapters/zod-schema-adapter.ts

@@ -21,7 +21,7 @@ const { z } = await import(zod);
 export const zodSchemaAdapter: SchemaAdapter = {
   toJsonSchema: (schema) => {
     if (!("_zod" in schema)) throw Error("input schema is not a Zod schema");
-    const res = z.toJSONSchema(schema, { target: "draft-7" });
+    const res = z.toJSONSchema(schema, { target: "openapi-3.0" });
     delete res.$schema;
     return res;
   },

package/src/app.ts

@@ -168,7 +168,11 @@ export function createApp<TPrefix extends BasePrefix = "">(
             return onGlobalRequestResponse;
           }
 
-          const response = await callHandler(ctx, getRoute);
+          const response = await callHandler(
+            ctx,
+            getRoute,
+            options?.schemaAdapter,
+          );
           ctx.response = response;
 
           return response;

package/src/internal/call-handler.ts

@@ -1,5 +1,5 @@
 import type { MatchedRoute } from "rou3";
-import type { RouterData } from "../types";
+import type { RouterData, SchemaAdapter } from "../types";
 import { NotFoundHttpError } from "../errors";
 import {
   callCtxModifierHooks,
@@ -11,6 +11,7 @@ import {
   validateOutputSchema,
 } from "./utils";
 import { smartDeserialize, smartSerialize } from "./serialization";
+import { getMeta } from "../meta";
 
 export async function callHandler(
   ctx: any,
@@ -18,6 +19,7 @@ export async function callHandler(
     method: string,
     path: string,
   ) => MatchedRoute<RouterData> | undefined,
+  schemaAdapter: SchemaAdapter | undefined,
 ): Promise<Response> {
   const route = getRoute(ctx.method, ctx.path);
   if (route == null) {
@@ -69,10 +71,12 @@ export async function callHandler(
     body,
   });
 
-  let response: any = route.data.handler(ctx);
-  if (response instanceof Promise) response = await response;
+  {
+    let response: any = route.data.handler(ctx);
+    if (response instanceof Promise) response = await response;
 
-  ctx.response = response;
+    ctx.response = response;
+  }
 
   for (const hook of route.data.hooks.onAfterHandle) {
     let res = hook.callback(ctx);
@@ -81,6 +85,7 @@ export async function callHandler(
     ctx.response = res;
   }
 
+  let responseMeta: Record<string, any> | undefined;
   if (!(ctx.response instanceof Response)) {
     if (route.data.def?.responses) {
       if ("~standard" in route.data.def.responses) {
@@ -88,10 +93,11 @@ export async function callHandler(
           route.data.def.responses,
           ctx.response,
         );
+        responseMeta = getMeta(schemaAdapter, route.data.def.responses);
       } else {
         if (!ctx.response || !isStatusResult(ctx.response)) {
           throw new Error(
-            "When `responses` is a record of schemas, you must return a value from `ctx.status()`.",
+            "When `responses` is a record of schemas, you must return a value from `ctx.status(...)`.",
           );
         }
         const { status, body } = ctx.response;
@@ -102,11 +108,12 @@ export async function callHandler(
         }
         ctx.set.status = status;
         ctx.response = validateOutputSchema(schema, body);
+        responseMeta = getMeta(schemaAdapter, schema);
       }
     }
   }
 
-  if (response instanceof Response) return response;
+  if (ctx.response instanceof Response) return ctx.response;
 
   for (const hook of route.data.hooks.onMapResponse) {
     let res = hook.callback(ctx);
@@ -125,7 +132,7 @@ export async function callHandler(
   return new Response(resBody.serialized, {
     status: ctx.set.status,
     headers: {
-      "Content-Type": resBody.contentType,
+      "Content-Type": responseMeta?.contentType ?? resBody.contentType,
       ...ctx.set.headers,
     },
   });

package/src/meta.ts

@@ -0,0 +1,14 @@
+import type { StandardSchemaV1 } from "@standard-schema/spec";
+import type { SchemaAdapter } from "./types";
+import type { ZetaSchema } from "./custom-responses";
+
+/** Get metadata for either a ZetaSchema or a StandardSchemaV1. */
+export function getMeta(
+  adapter: SchemaAdapter | undefined,
+  schema: StandardSchemaV1 | ZetaSchema,
+): Record<string, any> {
+  if ("~zeta" in schema) return schema.meta;
+
+  if (!adapter) return {};
+  return adapter.getMeta(schema) ?? {};
+}

package/src/open-api.ts

@@ -4,6 +4,7 @@ import type { CreateAppOptions } from "./app";
 import type { StandardSchemaV1 } from "@standard-schema/spec";
 import { getHttpStatusName } from "./status";
 import { ErrorResponseJsonSchema, type ZetaSchema } from "./custom-responses";
+import { getMeta } from "./meta";
 
 export function buildOpenApiDocs(
   options: CreateAppOptions<any> | undefined,
@@ -45,7 +46,7 @@ export function buildOpenApiDocs(
           requestBody: body
             ? {
                 content: {
-                  [adapter.getMeta(body)?.contentType ?? "application/json"]: {
+                  [getMeta(adapter, body)?.contentType ?? "application/json"]: {
                     schema: adapter.toJsonSchema(body),
                   },
                 },
@@ -151,16 +152,18 @@ function buildResponse(
   schema: StandardSchemaV1 | ZetaSchema,
   adapter: SchemaAdapter,
 ): NonNullable<OpenAPI.Operation["responses"]>[string] {
+  const meta = getMeta(adapter, schema);
+
   if ("~zeta" in schema) {
     const description =
-      schema["~zeta"].meta?.responseDescription ??
-      getHttpStatusName(status) ??
-      "";
+      meta?.responseDescription ?? getHttpStatusName(status) ?? "";
+
     if (schema["~zeta"].type === "NoResponse") {
       return {
         description,
       };
     }
+
     if (schema["~zeta"].type === "ErrorResponse") {
       return {
         description,
@@ -175,7 +178,6 @@ function buildResponse(
     }
   }
 
-  const meta = adapter.getMeta(schema);
   return {
     description: meta?.responseDescription ?? getHttpStatusName(status),
     content: {