Update types

Author: ije

server/mod.ts

@@ -6,7 +6,7 @@ import { getContentType } from "../lib/mime.ts";
 import util from "../lib/util.ts";
 import { VERSION } from "../version.ts";
 import { initModuleLoaders, loadImportMap, loadJSXConfig } from "./config.ts";
-import renderer from "./renderer.ts";
+import renderer, { type HTMLRewriterHandlers } from "./renderer.ts";
 import { content, json } from "./response.ts";
 import { importRouteModule, initRoutes } from "./routing.ts";
 import clientModuleTransformer from "./transformer.ts";

server/renderer.ts

@@ -6,6 +6,10 @@ import type { DependencyGraph } from "./graph.ts";
 import { importRouteModule } from "./routing.ts";
 import type { RenderModule, Route, SSRContext } from "./types.ts";
 
+export type HTMLRewriterHandlers = {
+  element?: (element: Element) => void;
+};
+
 export type RenderOptions = {
   indexHtml: string;
   routes: Route[];

server/response.ts

@@ -18,10 +18,19 @@ export type CacheControl = {
 
 export function content(
   content: BodyInit,
-  contentType: string,
-  cacheContorl?: CacheControl | "immutable" | "no-cache",
+  init?: ResponseInit & {
+    contentType?: string;
+    cacheContorl?: CacheControl | "immutable" | "no-cache";
+  },
 ): Response {
-  const headers = new Headers({ "Content-Type": contentType });
+  const headers = new Headers(init?.headers);
+
+  const contentType = init?.contentType;
+  if (contentType) {
+    headers.set("Content-Type", contentType);
+  }
+
+  const cacheContorl = init?.cacheContorl;
   if (cacheContorl) {
     if (cacheContorl === "no-cache") {
       headers.set("Cache-Control", "no-cache, no-store, must-revalidate");
@@ -42,5 +51,6 @@ export function content(
       );
     }
   }
-  return new Response(content, { headers });
+
+  return new Response(content, { ...init, headers });
 }

types.d.ts

@@ -6,13 +6,25 @@ declare type HTMLRewriterHandlers = {
   end?: (end: import("https://deno.land/x/[email protected]/types.d.ts").DocumentEnd) => void;
 };
 
-declare interface FetchContext extends Record<string, unknown> {
+declare interface Context extends Record<string, unknown> {
   readonly params: Record<string, string>;
   readonly HTMLRewriter: {
     on: (selector: string, handlers: HTMLRewriterHandlers) => void;
   };
 }
 
+declare interface Data {
+  get?(request: Request, context: Context): Promise<Response> | Response;
+  post?(request: Request, context: Context): Promise<Response> | Response;
+  put?(request: Request, context: Context): Promise<Response> | Response;
+  patch?(request: Request, context: Context): Promise<Response> | Response;
+  delete?(request: Request, context: Context): Promise<Response> | Response;
+}
+
+declare interface Middleware {
+  fetch(request: Request, context: Context): Promise<Response | void> | Response | void;
+}
+
 declare interface ImportMeta {
   readonly hot?: {
     accept: (callback?: (module: unknown) => void) => void;