@aklinker1/zeta 1.3.2 → 2.0.0

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

@@ -2,11 +2,9 @@
  * Contains a schema adapter for app's using [`zod`](https://npmjs.com/package/zod).
  * @module
  */
+import { z } from "zod";
 import type { SchemaAdapter } from "../types";
 
-const zod = "zod";
-const { z } = await import(zod);
-
 /**
  * Usage:
  *
@@ -25,21 +23,6 @@ export const zodSchemaAdapter: SchemaAdapter = {
     delete res.$schema;
     return res;
   },
-  parseParamsRecord: (params: any) => {
-    if (params?._zod?.def?.type !== "object")
-      throw Error(
-        "Query, params, and header schemas must be simple Zode objects defined with z.object({ ... })",
-      );
-
-    return Object.entries(params._zod.def.shape).map(
-      ([key, schema]: [string, any]) => ({
-        name: key,
-        schema,
-        optional: schema.safeParse(undefined).success,
-        ...z.globalRegistry.get(schema),
-      }),
-    );
-  },
   getMeta: (schema: any) => {
     return z.globalRegistry.get(schema);
   },

package/src/app.ts

@@ -1,28 +1,23 @@
-import { callHandler } from "./internal/call-handler";
-import { HttpError } from "./errors";
-import { HttpStatus } from "./status";
 import type {
   App,
   RouterData,
   RouteDef,
   BasePath,
   ServerSideFetch,
-  OnGlobalRequestContext,
-  LifeCycleHooks,
   LifeCycleHook,
   DefaultAppData,
   BasePrefix,
   SchemaAdapter,
   Transport,
+  LifeCycleHookName,
 } from "./types";
-import { addRoute, createRouter, findRoute } from "rou3";
-import {
-  callCtxModifierHooks,
-  detectTransport,
-  serializeErrorResponse,
-} from "./internal/utils";
+import { addRoute, createRouter } from "rou3";
+import { compileRouter } from "rou3/compiler";
+import { detectTransport } from "./internal/utils";
 import type { OpenAPIV3_1 } from "openapi-types";
 import { buildOpenApiDocs, buildScalarHtml } from "./open-api";
+import { compileRouteHandler } from "./internal/compile-route-handler";
+import { compileFetchFunction } from "./internal/compile-fetch-function";
 
 let appIdInc = 0;
 const nextAppId = () => `app-${appIdInc++}`;
@@ -68,15 +63,7 @@ export function createApp<TPrefix extends BasePrefix = "">(
   const appId = nextAppId();
 
   const { origin = "http://localhost", prefix = "" } = options ?? {};
-  const hooks: App["~zeta"]["hooks"] = {
-    onAfterHandle: [],
-    onGlobalAfterResponse: [],
-    onBeforeHandle: [],
-    onMapResponse: [],
-    onGlobalError: [],
-    onGlobalRequest: [],
-    onTransform: [],
-  };
+  const hooks: App["~zeta"]["hooks"] = {};
   const routes: App["~zeta"]["routes"] = {};
 
   const addRoutesEntry = (method: string, route: string, data: RouterData) => {
@@ -87,15 +74,13 @@ export function createApp<TPrefix extends BasePrefix = "">(
     routes[method][route] = data;
   };
 
-  const cloneHooks = () => ({
-    onAfterHandle: [...hooks.onAfterHandle],
-    onGlobalAfterResponse: [...hooks.onGlobalAfterResponse],
-    onBeforeHandle: [...hooks.onBeforeHandle],
-    onMapResponse: [...hooks.onMapResponse],
-    onGlobalError: [...hooks.onGlobalError],
-    onGlobalRequest: [...hooks.onGlobalRequest],
-    onTransform: [...hooks.onTransform],
-  });
+  const cloneHooks = (): App["~zeta"]["hooks"] => {
+    const cloned: App["~zeta"]["hooks"] = {};
+    for (const key of Object.keys(hooks) as LifeCycleHookName[]) {
+      if (hooks[key]) cloned[key] = [...hooks[key]] as any;
+    }
+    return cloned;
+  };
 
   const app: App<DefaultAppData> = {
     // @ts-expect-error
@@ -146,77 +131,8 @@ export function createApp<TPrefix extends BasePrefix = "">(
         }
       }
 
-      // const getRoute = compileRouter(router);
-      const getRoute = (method: string, path: string) =>
-        findRoute(router, method, path);
-
-      return async (request) => {
-        const url = new URL(request.url, origin);
-        const ctx: any = {
-          path: url.pathname,
-          url,
-          request,
-          method: request.method,
-          set: {
-            status: HttpStatus.Ok,
-            headers: {},
-          },
-        } satisfies OnGlobalRequestContext;
-
-        try {
-          const onGlobalRequestResponse = await callCtxModifierHooks(
-            ctx,
-            hooks.onGlobalRequest,
-          );
-          if (onGlobalRequestResponse) {
-            ctx.response = onGlobalRequestResponse;
-            return onGlobalRequestResponse;
-          }
-
-          const response = await callHandler(
-            ctx,
-            getRoute,
-            options?.schemaAdapter,
-          );
-          ctx.response = response;
-
-          return response;
-        } catch (err) {
-          ctx.error = err;
-
-          for (const hook of hooks.onGlobalError) {
-            const res = hook.callback(ctx);
-            res instanceof Promise ? await res : res;
-          }
-
-          const status =
-            err instanceof HttpError
-              ? err.status
-              : HttpStatus.InternalServerError;
-          const res = Response.json(serializeErrorResponse(err), { status });
-          ctx.response = res;
-          return res;
-        } finally {
-          // Defer calls to the `onGlobalAfterResponse` hooks until after the response is sent
-          if (hooks.onGlobalAfterResponse.length > 0) {
-            setTimeout(async () => {
-              try {
-                for (const hook of hooks.onGlobalAfterResponse) {
-                  let res = hook.callback(ctx);
-                  if (res instanceof Promise) await res;
-                }
-              } catch (err) {
-                ctx.error = err;
-
-                for (const hook of hooks.onGlobalError) {
-                  const res = hook.callback(ctx);
-                  res instanceof Promise ? await res : res;
-                }
-              }
-            }, 0);
-          }
-        }
-      };
+      const getRoute = compileRouter(router);
+      return compileFetchFunction({ getRoute, hooks, origin });
     },
 
     getOpenApiSpec: () => {
@@ -241,6 +157,7 @@ export function createApp<TPrefix extends BasePrefix = "">(
       const obj: Record<string, any> =
         args.length === 2 ? { [args[0]]: args[1] } : args[0];
 
+      hooks.onTransform ??= [];
       hooks.onTransform.push({
         id: nextHookId(appId),
         applyTo: "local",
@@ -251,6 +168,7 @@ export function createApp<TPrefix extends BasePrefix = "">(
     },
 
     onGlobalRequest(callback: any) {
+      hooks.onGlobalRequest ??= [];
       hooks.onGlobalRequest.push({
         id: nextHookId(appId),
         applyTo: "global",
@@ -259,6 +177,7 @@ export function createApp<TPrefix extends BasePrefix = "">(
       return app;
     },
     onTransform(callback: any) {
+      hooks.onTransform ??= [];
       hooks.onTransform.push({
         id: nextHookId(appId),
         applyTo: "local",
@@ -267,6 +186,7 @@ export function createApp<TPrefix extends BasePrefix = "">(
       return app;
     },
     onBeforeHandle(callback: any) {
+      hooks.onBeforeHandle ??= [];
       hooks.onBeforeHandle.push({
         id: nextHookId(appId),
         applyTo: "local",
@@ -275,6 +195,7 @@ export function createApp<TPrefix extends BasePrefix = "">(
       return app;
     },
     onAfterHandle(callback: any) {
+      hooks.onAfterHandle ??= [];
       hooks.onAfterHandle.push({
         id: nextHookId(appId),
         applyTo: "local",
@@ -283,6 +204,7 @@ export function createApp<TPrefix extends BasePrefix = "">(
       return app;
     },
     onMapResponse(callback: any) {
+      hooks.onMapResponse ??= [];
       hooks.onMapResponse.push({
         id: nextHookId(appId),
         applyTo: "local",
@@ -291,6 +213,7 @@ export function createApp<TPrefix extends BasePrefix = "">(
       return app;
     },
     onGlobalError(callback: any) {
+      hooks.onGlobalError ??= [];
       hooks.onGlobalError.push({
         id: nextHookId(appId),
         applyTo: "global",
@@ -299,6 +222,7 @@ export function createApp<TPrefix extends BasePrefix = "">(
       return app;
     },
     onGlobalAfterResponse(callback: any) {
+      hooks.onGlobalAfterResponse ??= [];
       hooks.onGlobalAfterResponse.push({
         id: nextHookId(appId),
         applyTo: "global",
@@ -322,11 +246,21 @@ export function createApp<TPrefix extends BasePrefix = "">(
       const def: RouteDef = args.length === 2 ? args[0] : undefined;
       const handler = args[1] ?? args[0];
       const route = `${prefix}${path}`;
-      addRoutesEntry(method, route, {
+      const hooks = cloneHooks();
+      const compiledHandler = compileRouteHandler({
+        schemaAdapter: options?.schemaAdapter,
         def,
+        hooks,
+        method,
+        route,
         handler,
+      });
+      addRoutesEntry(method, route, {
+        def,
         route,
-        hooks: cloneHooks(),
+        hooks,
+        compiledHandler,
+        handler,
       });
       return app;
     },
@@ -348,11 +282,22 @@ export function createApp<TPrefix extends BasePrefix = "">(
       }
 
       const route = `${prefix}${path}/**`;
+      const hooks = cloneHooks();
+      const compiledHandler = compileRouteHandler({
+        schemaAdapter: options?.schemaAdapter,
+        hooks,
+        method: "ANY",
+        route,
+        fetch,
+        def,
+      });
+
       addRoutesEntry(Method.Any, route, {
         def,
         fetch,
         route,
-        hooks: cloneHooks(),
+        hooks,
+        compiledHandler,
       });
 
       return app as any;
@@ -369,20 +314,23 @@ export function createApp<TPrefix extends BasePrefix = "">(
         }
       }
 
-      // Add global hooks to parent app's hooks
-      for (const _name of Object.keys(hooks)) {
-        const name = _name as keyof LifeCycleHooks;
-        for (const hook of childApp["~zeta"].hooks[name]) {
-          if (hook.applyTo === "global" || childApp["~zeta"].exported) {
-            hooks[name].push(hook as LifeCycleHook<any>);
+      // Add the child's global hooks to parent
+      for (const hookName of Object.keys(
+        childApp["~zeta"].hooks,
+      ) as LifeCycleHookName[]) {
+        for (const hook of childApp["~zeta"].hooks[
+          hookName
+        ]! as LifeCycleHook<any>[]) {
+          if (hook.applyTo !== "global" && !childApp["~zeta"].exported)
+            continue;
+
+          if (hooks[hookName]) {
+            // Don't add a hook if it's already there
+            if (!hooks[hookName].includes(hook)) hooks[hookName].push(hook);
+          } else {
+            hooks[hookName] = [hook];
           }
         }
-        let seen = new Set<string>();
-        hooks[name] = hooks[name].filter((hook) => {
-          if (seen.has(hook.id)) return false;
-          seen.add(hook.id);
-          return true;
-        }) as LifeCycleHook<any>[];
       }
 
       return app as any;

package/src/client.ts

@@ -99,11 +99,12 @@ export function createAppClient<TApp extends App>(
         headers: { ...headers } as Record<string, string>,
       } satisfies RequestInit;
 
-      const body =
+      const serializedBody =
         inputs.body == null ? undefined : smartSerialize(inputs.body);
-      if (body) {
-        init.body = body.serialized;
-        if (body.contentType) init.headers["Content-Type"] = body.contentType;
+      if (serializedBody) {
+        init.body = serializedBody.value;
+        if (serializedBody.contentType)
+          init.headers["Content-Type"] = serializedBody.contentType;
       }
 
       try {

package/src/errors.ts

@@ -1,19 +1,5 @@
-import type { StandardSchemaV1 } from "@standard-schema/spec";
 import { HttpStatus } from "./status";
 
-/**
- * Thrown when validation fails. Refer to `.issues` for details on what went wrong.
- */
-export class ValidationGlobalError extends Error {
-  constructor(
-    readonly input: any,
-    readonly issues: ReadonlyArray<StandardSchemaV1.Issue>,
-  ) {
-    super("Validation error");
-    this.name = "ValidationGlobalError";
-  }
-}
-
 /**
  * Base class of all HTTP errors. You can throw this error or throw any of the
  * subclasses. Zeta will automatically detect and handle these errors, setting

package/src/internal/compile-fetch-function.ts

@@ -0,0 +1,157 @@
+import type { MatchedRoute } from "rou3";
+import type { LifeCycleHooks, RouterData, ServerSideFetch } from "../types";
+import {
+  cleanupCompiledWhitespace,
+  getRawPathname,
+  serializeErrorResponse,
+} from "./utils";
+import { Context } from "./context";
+import { HttpError, NotFoundHttpError } from "../errors";
+import { HttpStatus } from "../status";
+
+export function compileFetchFunction(options: CompileOptions): ServerSideFetch {
+  const onGlobalRequestCount = options.hooks.onGlobalRequest?.length;
+  const onGlobalAfterResponseCount =
+    options.hooks.onGlobalAfterResponse?.length;
+  const onGlobalErrorCount = options.hooks.onGlobalError?.length;
+
+  const js = `
+return (request) => {
+  const path = utils.getRawPathname(request);
+  const ctx = new utils.Context(request, path, utils.origin);
+
+  try {
+${onGlobalRequestCount ? compileOnGlobalRequestHook(onGlobalRequestCount) : ""}
+
+    const matchedRoute = utils.getRoute(request.method, path);
+    if (matchedRoute == null) {
+      throw new utils.NotFoundHttpError(undefined, {
+        method: request.method,
+        path,
+      });
+    } else {
+      ctx.matchedRoute = matchedRoute;
+    }
+
+    ctx.response = matchedRoute.data.compiledHandler(request, ctx);
+    if (typeof ctx.response.then !== utils.FUNCTION) return ctx.response;
+
+    return ctx.response.catch(error => {
+${onGlobalErrorCount ? compileOnGlobalErrorHook(onGlobalErrorCount, 3) : ""}
+
+${compileErrorResponse(3)}
+    })${onGlobalAfterResponseCount ? compileOnGlobalAfterResponsePromiseFinally(onGlobalAfterResponseCount, 2) : ""};
+  } catch (error) {
+${onGlobalErrorCount ? compileOnGlobalErrorHook(onGlobalErrorCount, 2) : ""}
+
+${compileErrorResponse(2)}
+  } ${onGlobalAfterResponseCount ? compileOnGlobalAfterResponseFinally(onGlobalAfterResponseCount, 1) : ""}
+}
+//#sourceURL=zeta-jit-generated://zeta-fetch-fn.js
+  `;
+  return new Function("utils", cleanupCompiledWhitespace(js))({
+    FUNCTION: "function",
+    getRawPathname,
+    hooks: options.hooks,
+    Context,
+    getRoute: options.getRoute,
+    NotFoundHttpError,
+    origin: options.origin,
+    HttpError,
+    HttpStatus,
+    serializeErrorResponse,
+  });
+}
+
+function compileOnGlobalRequestHook(hookCount: number): string {
+  const lines: string[] = [];
+
+  for (let i = 0; i < hookCount; i++) {
+    const resultVar = `onGlobalRequestRes${i}`;
+    lines.push(
+      `    const ${resultVar} = utils.hooks.onGlobalRequest[${i}].callback(ctx);`,
+      ...(process.env.NODE_ENV !== "production"
+        ? [
+            `    if (${resultVar} instanceof Promise)`,
+            `      console.warn("Warning: Promise returned from onGlobalRequest hook. Promises returned from onGlobalRequest are not awaited, ignoring the return value.");`,
+          ]
+        : []),
+      `    if (${resultVar})`,
+      `      if (typeof ${resultVar}.body?.bytes === utils.FUNCTION)`,
+      `        return ${resultVar};`,
+      `      else`,
+      `        for (const key of Object.keys(${resultVar}))`,
+      `          ctx[key] = ${resultVar}[key];`,
+    );
+  }
+
+  return lines.join("\n");
+}
+
+function compileOnGlobalErrorHook(hookCount: number, tabs: number): string {
+  const indent = "  ".repeat(tabs);
+  const lines: string[] = [`${indent}ctx.error = error;`];
+
+  for (let i = 0; i < hookCount; i++) {
+    lines.push(`${indent}utils.hooks.onGlobalError[${i}].callback(ctx);`);
+  }
+
+  return lines.join("\n");
+}
+
+function compileOnGlobalAfterResponseFinally(
+  hookCount: number,
+  tabs: number,
+): string {
+  const indent = "  ".repeat(tabs);
+  return `finally {
+${compileOnGlobalAfterResponseHook(hookCount, tabs + 1)}
+${indent}}
+`;
+}
+
+function compileOnGlobalAfterResponsePromiseFinally(
+  hookCount: number,
+  tabs: number,
+): string {
+  const indent = "  ".repeat(tabs);
+  return `.finally(() => {
+${compileOnGlobalAfterResponseHook(hookCount, tabs + 1)}
+${indent}})`;
+}
+
+function compileOnGlobalAfterResponseHook(
+  hookCount: number,
+  tabs: number,
+): string {
+  const indent = "  ".repeat(tabs);
+  const lines: string[] = [`${indent}setTimeout(() => {`];
+
+  for (let i = 0; i < hookCount; i++) {
+    lines.push(
+      `${indent}  utils.hooks.onGlobalAfterResponse[${i}].callback(ctx);`,
+    );
+  }
+
+  lines.push(`${indent}})`);
+
+  return lines.join("\n");
+}
+
+function compileErrorResponse(tabs: number): string {
+  const indent = "  ".repeat(tabs);
+  return `${indent}const status =
+${indent}  error instanceof utils.HttpError
+${indent}    ? error.status
+${indent}    : utils.HttpStatus.InternalServerError;
+${indent}return (ctx.response = Response.json(utils.serializeErrorResponse(error), { status }));`;
+}
+
+type CompileOptions = {
+  hooks: LifeCycleHooks;
+  getRoute: (
+    method: string,
+    path: string,
+  ) => MatchedRoute<RouterData> | undefined;
+  origin: string;
+};