@lovrozagar/honey 0.1.0 → 0.2.0

package/src/secure-headers.ts

@@ -1,3 +1,4 @@
+import { namedMiddleware } from "./middleware.ts"
 import type { MiddlewareFn } from "./middleware.ts"
 
 type SecureHeadersOptions = {
@@ -65,5 +66,5 @@ export function secureHeaders(options?: SecureHeadersOptions): MiddlewareFn<{},
 		return response
 	}
 
-	return mw
+	return namedMiddleware("secureHeaders", mw)
 }

package/src/serve.ts

@@ -87,25 +87,16 @@ export async function startHoneyServer(
 			}
 		).Deno
 		const ac = new AbortController()
-		const server = DenoNs.serve(
-			{ hostname, port, signal: ac.signal },
-			(req) => listening.fetch(req, env),
-		)
+		const server = DenoNs.serve({ hostname, port, signal: ac.signal }, (req) => listening.fetch(req, env))
 		const bound = server.addr?.port ?? port
 		return {
 			async close() {
 				ac.abort()
 				if (server.shutdown) {
-					await Promise.race([
-						server.shutdown(),
-						new Promise<void>((r) => setTimeout(r, 1_000)),
-					])
+					await Promise.race([server.shutdown(), new Promise<void>((r) => setTimeout(r, 1_000))])
 					return
 				}
-				await Promise.race([
-					server.finished ?? Promise.resolve(),
-					new Promise<void>((r) => setTimeout(r, 1_000)),
-				])
+				await Promise.race([server.finished ?? Promise.resolve(), new Promise<void>((r) => setTimeout(r, 1_000))])
 			},
 			hostname,
 			port: bound,

package/src/server-timing.ts

@@ -1,3 +1,4 @@
+import { namedMiddleware } from "./middleware.ts"
 import type { MiddlewareFn } from "./middleware.ts"
 
 export type Timing = {
@@ -62,5 +63,5 @@ export function serverTiming(): MiddlewareFn<{}, { timing: Timing }> {
 		return response
 	}
 
-	return mw
+	return namedMiddleware("serverTiming", mw)
 }

package/src/static.ts

@@ -1,3 +1,4 @@
+import { namedMiddleware } from "./middleware.ts"
 import type { MiddlewareFn } from "./middleware.ts"
 
 type StaticConfig<TCtx> = {
@@ -9,9 +10,7 @@ type StaticConfig<TCtx> = {
 
 const TRAVERSAL = /(?:^|\/)\.\.\//
 
-export function staticFiles<TCtx extends { req: Request }>(
-	config: StaticConfig<TCtx>,
-): MiddlewareFn<TCtx, {}> {
+export function staticFiles<TCtx extends { req: Request }>(config: StaticConfig<TCtx>): MiddlewareFn<TCtx, {}> {
 	const prefix = config.prefix ?? "/"
 
 	const mw: MiddlewareFn<TCtx, {}> = async (ctx, next) => {
@@ -56,5 +55,5 @@ export function staticFiles<TCtx extends { req: Request }>(
 		return response
 	}
 
-	return mw
+	return namedMiddleware("staticFiles", mw)
 }

package/src/telemetry/otel.ts

@@ -18,12 +18,7 @@ type TelemetryAdapter = {
 	onNotFound?(ctx: { method: string; path: string; req: Request }): void
 	onRequest?(ctx: { env: unknown; req: Request }): void
 	onResponse?(ctx: { duration: number; req: Request; status: number }): void
-	onRoute?(ctx: {
-		method: string
-		params: Record<string, string>
-		path: string
-		req: Request
-	}): void
+	onRoute?(ctx: { method: string; params: Record<string, string>; path: string; req: Request }): void
 }
 
 export function otelAdapter(options: { tracer: Tracer }): TelemetryAdapter {

package/src/testing.ts

@@ -18,12 +18,7 @@ type TestClient = {
 	request(method: string, path: string, opts?: TestRequestOptions): Promise<Response>
 }
 
-function buildRequest(
-	method: string,
-	path: string,
-	baseUrl: string,
-	opts?: TestRequestOptions,
-): Request {
+function buildRequest(method: string, path: string, baseUrl: string, opts?: TestRequestOptions): Request {
 	const url = new URL(path, baseUrl)
 
 	if (opts?.search) {
@@ -70,11 +65,7 @@ export function testClient<TEnv>(
 	const baseUrl = "http://localhost"
 	const jar = new Map<string, string>()
 
-	async function doRequest(
-		method: string,
-		path: string,
-		opts?: TestRequestOptions,
-	): Promise<Response> {
+	async function doRequest(method: string, path: string, opts?: TestRequestOptions): Promise<Response> {
 		const mergedHeaders = { ...opts?.headers }
 
 		if (options.cookies && jar.size > 0) {

package/src/timeout.ts

@@ -1,3 +1,4 @@
+import { namedMiddleware } from "./middleware.ts"
 import { HoneyError } from "./error.ts"
 import type { MiddlewareFn } from "./middleware.ts"
 import { EK, SK } from "./types.ts"
@@ -32,5 +33,5 @@ export function timeout(opts: TimeoutOptions): MiddlewareFn<{}, {}> {
 		})
 	}
 
-	return mw
+	return namedMiddleware("timeout", mw)
 }

package/src/tree.ts

@@ -112,18 +112,12 @@ function splitSegments(path: string): string[] {
 	return path.split("/").filter((s) => s.length > 0)
 }
 
-export function insertRoute(
-	root: TreeNode,
-	method: HttpMethod | "ALL",
-	path: string,
-	handler: RouteHandler,
-): void {
+export function insertRoute(root: TreeNode, method: HttpMethod | "ALL", path: string, handler: RouteHandler): void {
 	bumpGeneration(root)
 	const segments = splitSegments(path)
 	let node = root
 
 	for (const seg of segments) {
-
 		if (seg.startsWith("*")) {
 			const name = seg.length > 1 ? seg.slice(1) : "*"
 			if (node.w !== null && node.w.n !== name) {
@@ -145,9 +139,7 @@ export function insertRoute(
 		if (seg.startsWith(":")) {
 			const name = seg.endsWith("?") ? seg.slice(1, -1) : seg.slice(1)
 			if (node.d !== null && node.d.n !== name) {
-				throw new Error(
-					`Route "${path}": param name conflict — expected ":${node.d.n}" but got ":${name}"`,
-				)
+				throw new Error(`Route "${path}": param name conflict — expected ":${node.d.n}" but got ":${name}"`)
 			}
 			if (node.d === null) {
 				node.d = { c: createNode(), n: name }
@@ -270,7 +262,6 @@ export function insertWsRoute(root: TreeNode, path: string, handler: WSRouteHand
 	let node = root
 
 	for (const seg of segments) {
-
 		if (seg.startsWith("*")) {
 			throw new Error("Wildcard segments not supported for WebSocket routes")
 		}
@@ -278,9 +269,7 @@ export function insertWsRoute(root: TreeNode, path: string, handler: WSRouteHand
 		if (seg.startsWith(":")) {
 			const name = seg.slice(1)
 			if (node.d !== null && node.d.n !== name) {
-				throw new Error(
-					`Route "${path}": param name conflict — expected ":${node.d.n}" but got ":${name}"`,
-				)
+				throw new Error(`Route "${path}": param name conflict — expected ":${node.d.n}" but got ":${name}"`)
 			}
 			if (node.d === null) {
 				node.d = { c: createNode(), n: name }
@@ -364,13 +353,13 @@ function mergeNodes(target: TreeNode, source: TreeNode, path: string): void {
 	}
 
 	/* merge static children — shallow-copy s to avoid mutating shared empty objects */
-		if (source.s && Object.keys(source.s).length > 0) {
-			let detached = false
-			for (const [seg, child] of Object.entries(source.s)) {
-				const targetChild = target.s[seg]
-				if (targetChild !== undefined) {
-					mergeNodes(targetChild, child, `${path}/${seg}`)
-				} else {
+	if (source.s && Object.keys(source.s).length > 0) {
+		let detached = false
+		for (const [seg, child] of Object.entries(source.s)) {
+			const targetChild = target.s[seg]
+			if (targetChild !== undefined) {
+				mergeNodes(targetChild, child, `${path}/${seg}`)
+			} else {
 				if (!detached) {
 					target.s = Object.assign(Object.create(null) as Record<string, TreeNode>, target.s)
 					detached = true
@@ -384,9 +373,7 @@ function mergeNodes(target: TreeNode, source: TreeNode, path: string): void {
 	if (source.d !== null && source.d !== undefined) {
 		if (target.d !== null && target.d !== undefined) {
 			if (target.d.n !== source.d.n) {
-				throw new Error(
-					`Merge conflict: param name mismatch at ${path}: "${target.d.n}" vs "${source.d.n}"`,
-				)
+				throw new Error(`Merge conflict: param name mismatch at ${path}: "${target.d.n}" vs "${source.d.n}"`)
 			}
 			mergeNodes(target.d.c, source.d.c, `${path}/:${target.d.n}`)
 		} else {
@@ -398,9 +385,7 @@ function mergeNodes(target: TreeNode, source: TreeNode, path: string): void {
 	if (source.w !== null && source.w !== undefined) {
 		if (target.w !== null && target.w !== undefined) {
 			if (target.w.n !== source.w.n) {
-				throw new Error(
-					`Merge conflict: wildcard name mismatch at ${path}: "${target.w.n}" vs "${source.w.n}"`,
-				)
+				throw new Error(`Merge conflict: wildcard name mismatch at ${path}: "${target.w.n}" vs "${source.w.n}"`)
 			}
 			for (const [method, handler] of Object.entries(source.w.m)) {
 				if (method in target.w.m) {

package/src/ts-type-emitter.ts

@@ -4,16 +4,75 @@ import type { IRSchema } from "./codegen-ir.ts"
 
 /* TS keywords that are valid identifiers but require quoting as object property keys */
 const TS_RESERVED = new Set([
-	"break", "case", "catch", "class", "const", "continue", "debugger",
-	"default", "delete", "do", "else", "enum", "export", "extends", "false",
-	"finally", "for", "function", "if", "import", "in", "instanceof", "new",
-	"null", "return", "super", "switch", "this", "throw", "true", "try",
-	"typeof", "var", "void", "while", "with", "yield", "let", "static",
-	"implements", "interface", "package", "private", "protected", "public",
-	"abstract", "as", "async", "await", "constructor", "declare", "from",
-	"get", "infer", "is", "keyof", "module", "namespace", "never", "of",
-	"readonly", "require", "set", "satisfies", "symbol", "type", "unique",
-	"unknown", "override",
+	"break",
+	"case",
+	"catch",
+	"class",
+	"const",
+	"continue",
+	"debugger",
+	"default",
+	"delete",
+	"do",
+	"else",
+	"enum",
+	"export",
+	"extends",
+	"false",
+	"finally",
+	"for",
+	"function",
+	"if",
+	"import",
+	"in",
+	"instanceof",
+	"new",
+	"null",
+	"return",
+	"super",
+	"switch",
+	"this",
+	"throw",
+	"true",
+	"try",
+	"typeof",
+	"var",
+	"void",
+	"while",
+	"with",
+	"yield",
+	"let",
+	"static",
+	"implements",
+	"interface",
+	"package",
+	"private",
+	"protected",
+	"public",
+	"abstract",
+	"as",
+	"async",
+	"await",
+	"constructor",
+	"declare",
+	"from",
+	"get",
+	"infer",
+	"is",
+	"keyof",
+	"module",
+	"namespace",
+	"never",
+	"of",
+	"readonly",
+	"require",
+	"set",
+	"satisfies",
+	"symbol",
+	"type",
+	"unique",
+	"unknown",
+	"override",
 ])
 
 export function irToTs(ir: IRSchema, depth = 0): string {
@@ -66,9 +125,7 @@ export function irToTs(ir: IRSchema, depth = 0): string {
 
 function emitScalar(ir: Extract<IRSchema, { kind: "scalar" }>): string {
 	if (ir.enum) {
-		return ir.enum
-			.map((v) => (typeof v === "string" ? JSON.stringify(v) : String(v)))
-			.join(" | ")
+		return ir.enum.map((v) => (typeof v === "string" ? JSON.stringify(v) : String(v))).join(" | ")
 	}
 
 	if (ir.type === "string") return "string"
@@ -92,8 +149,7 @@ function emitObject(ir: Extract<IRSchema, { kind: "object" }>, depth: number): s
 
 	const entries = sortedFields.map((field) => {
 		const opt = field.required ? "" : "?"
-		const needsQuote =
-			!/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(field.name) || TS_RESERVED.has(field.name)
+		const needsQuote = !/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(field.name) || TS_RESERVED.has(field.name)
 		const key = needsQuote ? JSON.stringify(field.name) : field.name
 		return `${key}${opt}: ${irToTs(field.schema, depth + 1)}`
 	})