@lovrozagar/honey 0.5.2 → 0.6.0

package/src/index.ts

@@ -533,7 +533,7 @@ export class Honey<
 		walkTreeHandlers(
 			this._root,
 			(h) => {
-				if (scopeMatches(entry.prefix, h.rp)) {
+				if (scopeMatches(entry.prefix, h.rp ?? "")) {
 					for (const k of errors) h.ek.add(k)
 				}
 			},
@@ -568,8 +568,8 @@ export class Honey<
 	private _applyScopedEntryMeta(entry: ScopedEntry): void {
 		const meta = (entry.mw as { meta?: Record<string, unknown> }).meta
 		if (!meta) return
-		const apply = (h: { mt: Record<string, unknown> | null; rp: string }): void => {
-			if (!scopeMatches(entry.prefix, h.rp)) return
+		const apply = (h: { mt: Record<string, unknown> | null; rp?: string }): void => {
+			if (!scopeMatches(entry.prefix, h.rp ?? "")) return
 			/* contributed meta never overwrites what the route or chain stated explicitly */
 			h.mt = Object.freeze(h.mt ? { ...meta, ...h.mt } : { ...meta })
 		}
@@ -2314,7 +2314,7 @@ export class Honey<
 			params,
 			path,
 			req: fc.request,
-			routePattern: handler.rp,
+			routePattern: handler.rp ?? "",
 			urlFn: fc.url,
 		})
 		if (this._contextValues) Object.assign(ctx, this._contextValues)
@@ -2404,7 +2404,7 @@ export class Honey<
 
 		/* resolve error factory — pre-computed ef preferred, else build/use global */
 		let errors: Record<string, (...args: never[]) => unknown> | undefined
-		if (handler.ef !== null) {
+		if (handler.ef != null) {
 			errors = handler.ef
 		} else if (this._errorFactory !== null) {
 			if (handler.ek.size > 0) {
@@ -2431,7 +2431,7 @@ export class Honey<
 			params,
 			path,
 			req: request,
-			routePattern: handler.rp,
+			routePattern: handler.rp ?? "",
 			urlFn: fc.url,
 		})
 		if (this._contextValues) Object.assign(ctx, this._contextValues)
@@ -2516,7 +2516,7 @@ export class Honey<
 				return after(result)
 			}
 
-			const scopedForPath = this._filterScopedForPath(handler.rp)
+			const scopedForPath = this._filterScopedForPath(handler.rp ?? "")
 			const chainMw = this._chainMiddlewares
 			const handlerHasChain = chainMw.length > 0 && chainMw.every((mw, i) => handler.mw[i] === mw)
 			/*

package/src/openapi/collect.ts

@@ -0,0 +1,75 @@
+import type { RouteHandler, TreeNode, WSRouteHandler } from "../tree.ts"
+import type { InputSchemaEntry, StandardSchemaLike } from "../types.ts"
+
+export type CollectedRoute = {
+	handler: RouteHandler
+	method: string
+	path: string
+}
+
+export type CollectedWSRoute = {
+	handler: WSRouteHandler
+	path: string
+}
+
+export function extractParams(path: string): string[] {
+	const params: string[] = []
+	for (const seg of path.split("/")) {
+		if (seg.startsWith(":")) {
+			params.push(seg.endsWith("?") ? seg.slice(1, -1) : seg.slice(1))
+		}
+	}
+	return params
+}
+
+export function toOpenApiPath(path: string): string {
+	return path.replace(/:(\w+)\??/g, "{$1}")
+}
+
+export function walkTree(
+	node: TreeNode,
+	currentPath: string,
+	routes: CollectedRoute[],
+	includeSkipped?: boolean,
+): void {
+	if (node.m !== null) {
+		for (const [method, handler] of Object.entries(node.m)) {
+			if (handler._skip && !includeSkipped) continue
+			routes.push({ handler, method, path: currentPath || "/" })
+		}
+	}
+
+	for (const [seg, child] of Object.entries(node.s)) {
+		walkTree(child, `${currentPath}/${seg}`, routes, includeSkipped)
+	}
+
+	if (node.d !== null) {
+		walkTree(node.d.c, `${currentPath}/:${node.d.n}`, routes, includeSkipped)
+	}
+
+	if (node.w !== null) {
+		for (const [method, handler] of Object.entries(node.w.m)) {
+			if (handler._skip && !includeSkipped) continue
+			routes.push({ handler, method, path: `${currentPath}/*${node.w.n}` })
+		}
+	}
+}
+
+export function walkWSRoutes(node: TreeNode, currentPath: string, routes: CollectedWSRoute[]): void {
+	if (node.ws !== null) {
+		routes.push({ handler: node.ws, path: currentPath || "/" })
+	}
+	for (const [seg, child] of Object.entries(node.s)) {
+		walkWSRoutes(child, `${currentPath}/${seg}`, routes)
+	}
+	if (node.d !== null) {
+		walkWSRoutes(node.d.c, `${currentPath}/:${node.d.n}`, routes)
+	}
+}
+
+export function unwrapEntry(entry: InputSchemaEntry): StandardSchemaLike {
+	if ("_tag" in entry) {
+		return entry.schema as StandardSchemaLike
+	}
+	return entry
+}