shelving 1.167.0 → 1.167.1

package/api/util.d.ts

@@ -1,3 +1,4 @@
+import type { AnyCaller } from "../util/function.js";
 import type { Endpoint } from "./Endpoint.js";
 /**
  * A function that handles a endpoint request, with a payload and returns a result.
@@ -32,9 +33,8 @@ export type EndpointHandlers = ReadonlyArray<AnyEndpointHandler>;
  *
  * 1. Define your `Endpoint` objects with a method, path, payload and result validators, e.g. `GET("/test/{id}", PAYLOAD, STRING)`
  * 2. Make an array of `EndpointHandler` objects combining an `Endpoint` with a `callback` function
- * -
  *
  * @returns The resulting `Response` from the first handler that matches the `Request`.
  * @throws `NotFoundError` if no handler matches the `Request`.
  */
-export declare function handleEndpoints(request: Request, endpoints: EndpointHandlers): Promise<Response>;
+export declare function handleEndpoints(request: Request, endpoints: EndpointHandlers, caller?: AnyCaller): Promise<Response>;

package/api/util.js

@@ -9,17 +9,16 @@ import { getURL } from "../util/url.js";
  *
  * 1. Define your `Endpoint` objects with a method, path, payload and result validators, e.g. `GET("/test/{id}", PAYLOAD, STRING)`
  * 2. Make an array of `EndpointHandler` objects combining an `Endpoint` with a `callback` function
- * -
  *
  * @returns The resulting `Response` from the first handler that matches the `Request`.
  * @throws `NotFoundError` if no handler matches the `Request`.
  */
-export function handleEndpoints(request, endpoints) {
+export function handleEndpoints(request, endpoints, caller = handleEndpoints) {
     // Parse the URL of the request.
     const requestUrl = request.url;
     const url = getURL(requestUrl);
     if (!url)
-        throw new RequestError("Invalid request URL", { received: requestUrl, caller: handleEndpoints });
+        throw new RequestError("Invalid request URL", { received: requestUrl, caller });
     const { origin, pathname, searchParams } = url;
     // Iterate over the handlers and return the first one that matches the request.
     for (const { endpoint, callback } of endpoints) {
@@ -28,7 +27,7 @@ export function handleEndpoints(request, endpoints) {
             continue;
         // Ensure the request URL e.g. `/user/123` matches the endpoint path e.g. `/user/{id}`
         // Any `{placeholders}` in the endpoint path are matched against the request URL to extract parameters.
-        const pathParams = matchTemplate(endpoint.url, `${origin}${pathname}`, handleEndpoints);
+        const pathParams = matchTemplate(endpoint.url, `${origin}${pathname}`, caller);
         if (!pathParams)
             continue;
         // Make a simple dictionary object from the `{placeholder}` path params and the `?a=123` query params from the URL.
@@ -37,7 +36,7 @@ export function handleEndpoints(request, endpoints) {
         return handleEndpoint(endpoint, callback, combinedParams, request);
     }
     // No handler matched the request.
-    throw new NotFoundError("No matching endpoint", { received: requestUrl, caller: handleEndpoints });
+    throw new NotFoundError("No matching endpoint", { received: requestUrl, caller });
 }
 /** Handle an individual call to an endpoint callback. */
 async function handleEndpoint(endpoint, callback, params, request) {

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.167.0",
+	"version": "1.167.1",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",