@fedify/fedify 2.0.0-pr.445.1694 → 2.0.0-pr.451.1730

package/dist/{assert_rejects-DiIiJbZn.js → assert_rejects-Ce45JcFg.js}

@@ -4,7 +4,7 @@
       globalThis.addEventListener = () => {};
     
 import { AssertionError } from "./assert_equals-DSbWqCm3.js";
-import { assertIsError } from "./assert_is_error-BPGph1Jx.js";
+import { assertIsError } from "./assert_throws-BNXdRGWP.js";
 
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_false.js
 /**

package/dist/{assert_is_error-BPGph1Jx.js → assert_throws-BNXdRGWP.js}

@@ -45,4 +45,34 @@ import { AssertionError, stripAnsiCode } from "./assert_equals-DSbWqCm3.js";
 }
 
 //#endregion
-export { assertIsError };
+//#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_throws.js
+function assertThrows(fn, errorClassOrMsg, msgIncludesOrMsg, msg) {
+	let ErrorClass = void 0;
+	let msgIncludes = void 0;
+	let err;
+	if (typeof errorClassOrMsg !== "string") if (errorClassOrMsg === void 0 || errorClassOrMsg?.prototype instanceof Error || errorClassOrMsg?.prototype === Error.prototype) {
+		ErrorClass = errorClassOrMsg;
+		msgIncludes = msgIncludesOrMsg;
+	} else msg = msgIncludesOrMsg;
+	else msg = errorClassOrMsg;
+	let doesThrow = false;
+	const msgSuffix = msg ? `: ${msg}` : ".";
+	try {
+		fn();
+	} catch (error) {
+		if (ErrorClass) {
+			if (error instanceof Error === false) throw new AssertionError(`A non-Error object was thrown${msgSuffix}`);
+			assertIsError(error, ErrorClass, msgIncludes, msg);
+		}
+		err = error;
+		doesThrow = true;
+	}
+	if (!doesThrow) {
+		msg = `Expected function to throw${msgSuffix}`;
+		throw new AssertionError(msg);
+	}
+	return err;
+}
+
+//#endregion
+export { assertIsError, assertThrows };

package/dist/{builder-1_skw-d2.js → builder-Dn87hy75.js}

@@ -3,9 +3,8 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default, getTypeId } from "./type-DaUr3Il7.js";
-import { Router, RouterError } from "./lookup-CbtuFbtg.js";
-import { InboxListenerSet } from "./inbox-IETv_Qez.js";
+import { Router, RouterError, deno_default, getTypeId } from "./lookup-BbEekiru.js";
+import { InboxListenerSet } from "./inbox-CgGy7Hzc.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 
@@ -43,7 +42,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-BpR6186a.js");
+		const { FederationImpl } = await import("./middleware-VpoC5jyA.js");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -496,11 +495,11 @@ var FederationBuilderImpl = class {
 		};
 		return setters;
 	}
-	setCollectionDispatcher(name, ...args) {
-		return this.#setCustomCollectionDispatcher(name, "collection", ...args);
+	setCollectionDispatcher(name, itemType, path, dispatcher) {
+		return this.#setCustomCollectionDispatcher(name, "collection", itemType, path, dispatcher);
 	}
-	setOrderedCollectionDispatcher(name, ...args) {
-		return this.#setCustomCollectionDispatcher(name, "orderedCollection", ...args);
+	setOrderedCollectionDispatcher(name, itemType, path, dispatcher) {
+		return this.#setCustomCollectionDispatcher(name, "orderedCollection", itemType, path, dispatcher);
 	}
 	#setCustomCollectionDispatcher(name, collectionType, itemType, path, dispatcher) {
 		const strName = String(name);

package/dist/{client-bgSdkFa2.d.ts → client-Bkaw0_PR.d.ts}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { GetUserAgentOptions } from "./docloader-CxWcuWqQ.js";
+import { GetUserAgentOptions } from "./request-U1t6zZtk.js";
 
 //#region src/nodeinfo/types.d.ts
 /**

package/dist/{client-CegPX0Rn.d.cts → client-Cle5j1T1.d.cts}

@@ -1,4 +1,4 @@
-import { GetUserAgentOptions } from "./docloader-D-MrRyHl.cjs";
+import { GetUserAgentOptions } from "./request-BbHkedIU.cjs";
 
 //#region src/nodeinfo/types.d.ts
 /**

package/dist/{client-D5CBsPrc.js → client-D6-5okV1.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { getUserAgent } from "./type-DaUr3Il7.js";
+import { getUserAgent } from "./lookup-BbEekiru.js";
 import { getLogger } from "@logtape/logtape";
 
 //#region src/nodeinfo/client.ts

package/dist/compat/mod.d.cts

@@ -1,13 +1,13 @@
-import "../kv-63Cil1MD.cjs";
-import "../docloader-D-MrRyHl.cjs";
-import "../client-CegPX0Rn.cjs";
-import "../vocab-Dw1-yVGg.cjs";
-import "../actor-D6K058Tb.cjs";
-import "../http-D-e6AFwR.cjs";
-import "../owner-BN_tO3cY.cjs";
-import "../mod-CxkWO3Mg.cjs";
-import "../mod-jQ4OODsl.cjs";
-import { ActivityTransformer } from "../context-DiqjMRef.cjs";
+import "../request-BbHkedIU.cjs";
+import "../client-Cle5j1T1.cjs";
+import "../vocab-DCBw44JZ.cjs";
+import "../actor-DDhZuMGl.cjs";
+import "../http-B6SKO6NJ.cjs";
+import "../owner-dkg5OpSC.cjs";
+import "../mod--K7l84wp.cjs";
+import "../mod-DuclhZjh.cjs";
+import { ActivityTransformer } from "../context-BOYzcFSe.cjs";
+import "../kv-BMKIFXNW.cjs";
 import "../mq-B7R1Q-M5.cjs";
-import { actorDehydrator, autoIdAssigner, getDefaultActivityTransformers } from "../mod-Bpb5QLaZ.cjs";
+import { actorDehydrator, autoIdAssigner, getDefaultActivityTransformers } from "../mod-D9XZsft2.cjs";
 export { ActivityTransformer, actorDehydrator, autoIdAssigner, getDefaultActivityTransformers };

package/dist/compat/mod.d.ts

@@ -1,15 +1,15 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import "../kv-C7sopW2E.js";
-import "../docloader-CxWcuWqQ.js";
-import "../client-bgSdkFa2.js";
-import "../vocab-BI0Ak5lL.js";
-import "../actor-T6RyhRgk.js";
-import "../http-D6Uj2x2y.js";
-import "../owner-hd9lvQcP.js";
-import "../mod-DlU8ISoa.js";
-import "../mod-DBzN0aCM.js";
-import { ActivityTransformer } from "../context-DBKpNBnc.js";
-import "../mq-CRGm1e_F.js";
-import { actorDehydrator, autoIdAssigner, getDefaultActivityTransformers } from "../mod-D_y2y32N.js";
+import "../request-U1t6zZtk.js";
+import "../client-Bkaw0_PR.js";
+import "../vocab-ivDKb439.js";
+import "../actor-Cd2CREO0.js";
+import "../http-BE7aFuqn.js";
+import "../owner-CktUdA0h.js";
+import "../mod-CRENK2dd.js";
+import "../mod-CB80AlIA.js";
+import { ActivityTransformer } from "../context-DqFifMwj.js";
+import "../kv-Dt06smFt.js";
+import "../mq-CPRJk4mZ.js";
+import { actorDehydrator, autoIdAssigner, getDefaultActivityTransformers } from "../mod-CaWbCg0N.js";
 export { ActivityTransformer, actorDehydrator, autoIdAssigner, getDefaultActivityTransformers };

package/dist/compat/transformers.test.js

@@ -3,30 +3,30 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Follow, Person } from "../type-DaUr3Il7.js";
+import { Follow, Person } from "../lookup-BbEekiru.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
 import { assertInstanceOf } from "../assert_instance_of-DHz7EHNU.js";
 import { MemoryKvStore } from "../kv-CRZrzyXm.js";
-import { FederationImpl, actorDehydrator, autoIdAssigner } from "../middleware-DQYscW90.js";
-import "../client-D5CBsPrc.js";
-import "../lookup-CbtuFbtg.js";
-import "../types-BSuWJsOm.js";
-import "../actor-D8gCwLzv.js";
-import "../key-DnqhSgAv.js";
-import "../http-CuS-d4U0.js";
-import "../authdocloader-DYTNpaMA.js";
-import "../ld-Isot0tiW.js";
-import "../owner-ChSL4aJ7.js";
-import "../proof-x3IBewan.js";
-import "../inbox-IETv_Qez.js";
-import "../builder-1_skw-d2.js";
-import "../collection-CcnIw1qY.js";
-import "../keycache-CSBkusP8.js";
-import "../negotiation-5NPJL6zp.js";
-import "../retry-D4GJ670a.js";
-import "../send-D5fjmUEj.js";
-import { test } from "../testing-tWr1VQxx.js";
+import { FederationImpl, actorDehydrator, autoIdAssigner } from "../middleware-Dm8sXYUr.js";
+import "../client-D6-5okV1.js";
+import "../types-C2XVl6gj.js";
+import "../actor-Cg8ZhoVF.js";
+import "../key-jSvnymAk.js";
+import "../http-DN0v2zoF.js";
+import "../ld-CcsryBo0.js";
+import "../owner-n5c_oZ_M.js";
+import "../proof-CsFR7fiS.js";
+import "../docloader-B2BFBGqv.js";
+import "../kv-cache-DNvS-egZ.js";
+import "../inbox-CgGy7Hzc.js";
+import "../builder-Dn87hy75.js";
+import "../collection-BzWsN9pB.js";
+import "../keycache-IVLjlAK9.js";
+import "../negotiation-C4nFufNk.js";
+import "../retry-CfF8Gn4d.js";
+import "../send-eW9JIzQV.js";
+import { test } from "../testing-ClYSmXdi.js";
 
 //#region src/compat/transformers.test.ts
 const federation = new FederationImpl({ kv: new MemoryKvStore() });

package/dist/{context-DiqjMRef.d.cts → context-BOYzcFSe.d.cts}

@@ -1,13 +1,14 @@
-import { KvKey, KvStore } from "./kv-63Cil1MD.cjs";
-import { AuthenticatedDocumentLoaderFactory, DocumentLoader, DocumentLoaderFactory, GetUserAgentOptions } from "./docloader-D-MrRyHl.cjs";
-import { GetNodeInfoOptions, JsonValue, NodeInfo } from "./client-CegPX0Rn.cjs";
-import { Activity, Collection, CryptographicKey, Hashtag, Link, Multikey, Object as Object$1 } from "./vocab-Dw1-yVGg.cjs";
-import { Actor, Recipient } from "./actor-D6K058Tb.cjs";
-import { HttpMessageSignaturesSpec } from "./http-D-e6AFwR.cjs";
-import { GetKeyOwnerOptions } from "./owner-BN_tO3cY.cjs";
-import { LookupObjectOptions, TraverseCollectionOptions } from "./mod-CxkWO3Mg.cjs";
-import { Link as Link$1, LookupWebFingerOptions, ResourceDescriptor } from "./mod-jQ4OODsl.cjs";
+import { GetUserAgentOptions } from "./request-BbHkedIU.cjs";
+import { GetNodeInfoOptions, JsonValue, NodeInfo } from "./client-Cle5j1T1.cjs";
+import { Activity, Collection, CryptographicKey, Hashtag, Link, Multikey, Object as Object$1 } from "./vocab-DCBw44JZ.cjs";
+import { Actor, Recipient } from "./actor-DDhZuMGl.cjs";
+import { HttpMessageSignaturesSpec } from "./http-B6SKO6NJ.cjs";
+import { GetKeyOwnerOptions } from "./owner-dkg5OpSC.cjs";
+import { LookupObjectOptions, TraverseCollectionOptions } from "./mod--K7l84wp.cjs";
+import { Link as Link$1, LookupWebFingerOptions, ResourceDescriptor } from "./mod-DuclhZjh.cjs";
+import { KvKey, KvStore } from "./kv-BMKIFXNW.cjs";
 import { MessageQueue } from "./mq-B7R1Q-M5.cjs";
+import { AuthenticatedDocumentLoaderFactory, DocumentLoader, DocumentLoaderFactory } from "@fedify/vocab-runtime";
 import { Span, TracerProvider } from "@opentelemetry/api";
 
 //#region src/compat/types.d.ts
@@ -281,7 +282,7 @@ type ObjectAuthorizePredicate<TContextData, TParam extends string> = (context: R
  *               the entire collection without pagination.
  * @since 1.8.0
  */
-type CustomCollectionDispatcher<TItem, TParams extends Record<string, string>, TContext extends Context<TContextData>, TContextData> = (context: TContext, values: TParams, cursor: string | null) => PageItems<TItem> | null | Promise<PageItems<TItem> | null>;
+type CustomCollectionDispatcher<TItem, TParam extends string, TContext extends Context<TContextData>, TContextData> = (context: TContext, values: Record<TParam, string>, cursor: string | null) => PageItems<TItem> | null | Promise<PageItems<TItem> | null>;
 /**
  * A callback that counts the number of items in a custom collection.
  *
@@ -291,7 +292,7 @@ type CustomCollectionDispatcher<TItem, TParams extends Record<string, string>, T
  * @param values The parameters of the requested URL.
  * @since 1.8.0
  */
-type CustomCollectionCounter<TParams extends Record<string, string>, TContextData> = (context: RequestContext<TContextData>, values: TParams) => number | bigint | null | Promise<number | bigint | null>;
+type CustomCollectionCounter<TParam extends string, TContextData> = (context: RequestContext<TContextData>, values: Record<TParam, string>) => number | bigint | null | Promise<number | bigint | null>;
 /**
  * A callback that returns a cursor for a custom collection.
  *
@@ -304,10 +305,9 @@ type CustomCollectionCounter<TParams extends Record<string, string>, TContextDat
  * @param values The parameters of the requested URL.
  * @since 1.8.0
  */
-type CustomCollectionCursor<TParams extends Record<string, string>, TContext extends Context<TContextData>, TContextData> = (context: TContext, values: TParams) => string | null | Promise<string | null>;
+type CustomCollectionCursor<TParam extends string, TContext extends Context<TContextData>, TContextData> = (context: TContext, values: Record<TParam, string>) => string | null | Promise<string | null>;
 //#endregion
 //#region src/federation/handler.d.ts
-
 /**
  * Options for the {@link respondWithObject} and
  * {@link respondWithObjectIfAcceptable} functions.
@@ -702,7 +702,7 @@ interface Federatable<TContextData> {
    * @returns An object with methods to set other actor dispatcher callbacks.
    * @throws {RouterError} Thrown if the path pattern is invalid.
    */
-  setActorDispatcher(path: `${string}{identifier}${string}` | `${string}{handle}${string}`, dispatcher: ActorDispatcher<TContextData>): ActorCallbackSetters<TContextData>;
+  setActorDispatcher(path: `${string}${Rfc6570Expression<"identifier">}${string}` | `${string}${Rfc6570Expression<"handle">}${string}`, dispatcher: ActorDispatcher<TContextData>): ActorCallbackSetters<TContextData>;
   /**
    * Registers an object dispatcher.
    *
@@ -766,7 +766,7 @@ interface Federatable<TContextData> {
    */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: (new (...args: any[]) => TObject) & {
     typeId: URL;
-  }, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
+  }, path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
    * Registers an object dispatcher.
    *
@@ -782,7 +782,7 @@ interface Federatable<TContextData> {
    */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: (new (...args: any[]) => TObject) & {
     typeId: URL;
-  }, path: `${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
+  }, path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
    * Registers an object dispatcher.
    *
@@ -798,7 +798,7 @@ interface Federatable<TContextData> {
    */
   setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: (new (...args: any[]) => TObject) & {
     typeId: URL;
-  }, path: `${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
+  }, path: `${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
    * Registers an inbox dispatcher.
    *
@@ -810,7 +810,7 @@ interface Federatable<TContextData> {
    * @param dispatcher An inbox dispatcher callback to register.
    * @throws {@link RouterError} Thrown if the path pattern is invalid.
    */
-  setInboxDispatcher(path: `${string}{identifier}${string}` | `${string}{handle}${string}`, dispatcher: CollectionDispatcher<Activity, RequestContext<TContextData>, TContextData, void>): CollectionCallbackSetters<RequestContext<TContextData>, TContextData, void>;
+  setInboxDispatcher(path: `${string}${Rfc6570Expression<"identifier">}${string}` | `${string}${Rfc6570Expression<"handle">}${string}`, dispatcher: CollectionDispatcher<Activity, RequestContext<TContextData>, TContextData, void>): CollectionCallbackSetters<RequestContext<TContextData>, TContextData, void>;
   /**
    * Registers an outbox dispatcher.
    *
@@ -834,7 +834,7 @@ interface Federatable<TContextData> {
    * @param dispatcher An outbox dispatcher callback to register.
    * @throws {@link RouterError} Thrown if the path pattern is invalid.
    */
-  setOutboxDispatcher(path: `${string}{identifier}${string}` | `${string}{handle}${string}`, dispatcher: CollectionDispatcher<Activity, RequestContext<TContextData>, TContextData, void>): CollectionCallbackSetters<RequestContext<TContextData>, TContextData, void>;
+  setOutboxDispatcher(path: `${string}${Rfc6570Expression<"identifier">}${string}` | `${string}${Rfc6570Expression<"handle">}${string}`, dispatcher: CollectionDispatcher<Activity, RequestContext<TContextData>, TContextData, void>): CollectionCallbackSetters<RequestContext<TContextData>, TContextData, void>;
   /**
    * Registers a following collection dispatcher.
    * @param path The URI path pattern for the following collection.  The syntax
@@ -846,7 +846,7 @@ interface Federatable<TContextData> {
    *          callbacks.
    * @throws {RouterError} Thrown if the path pattern is invalid.
    */
-  setFollowingDispatcher(path: `${string}{identifier}${string}` | `${string}{handle}${string}`, dispatcher: CollectionDispatcher<Actor | URL, RequestContext<TContextData>, TContextData, void>): CollectionCallbackSetters<RequestContext<TContextData>, TContextData, void>;
+  setFollowingDispatcher(path: `${string}${Rfc6570Expression<"identifier">}${string}` | `${string}${Rfc6570Expression<"handle">}${string}`, dispatcher: CollectionDispatcher<Actor | URL, RequestContext<TContextData>, TContextData, void>): CollectionCallbackSetters<RequestContext<TContextData>, TContextData, void>;
   /**
    * Registers a followers collection dispatcher.
    * @param path The URI path pattern for the followers collection.  The syntax
@@ -858,7 +858,7 @@ interface Federatable<TContextData> {
    *          callbacks.
    * @throws {@link RouterError} Thrown if the path pattern is invalid.
    */
-  setFollowersDispatcher(path: `${string}{identifier}${string}` | `${string}{handle}${string}`, dispatcher: CollectionDispatcher<Recipient, Context<TContextData>, TContextData, URL>): CollectionCallbackSetters<Context<TContextData>, TContextData, URL>;
+  setFollowersDispatcher(path: `${string}${Rfc6570Expression<"identifier">}${string}` | `${string}${Rfc6570Expression<"handle">}${string}`, dispatcher: CollectionDispatcher<Recipient, Context<TContextData>, TContextData, URL>): CollectionCallbackSetters<Context<TContextData>, TContextData, URL>;
   /**
    * Registers a liked collection dispatcher.
    * @param path The URI path pattern for the liked collection.  The syntax
@@ -870,7 +870,7 @@ interface Federatable<TContextData> {
    *          callbacks.
    * @throws {@link RouterError} Thrown if the path pattern is invalid.
    */
-  setLikedDispatcher(path: `${string}{identifier}${string}` | `${string}{handle}${string}`, dispatcher: CollectionDispatcher<Object$1 | URL, RequestContext<TContextData>, TContextData, void>): CollectionCallbackSetters<RequestContext<TContextData>, TContextData, void>;
+  setLikedDispatcher(path: `${string}${Rfc6570Expression<"identifier">}${string}` | `${string}${Rfc6570Expression<"handle">}${string}`, dispatcher: CollectionDispatcher<Object$1 | URL, RequestContext<TContextData>, TContextData, void>): CollectionCallbackSetters<RequestContext<TContextData>, TContextData, void>;
   /**
    * Registers a featured collection dispatcher.
    * @param path The URI path pattern for the featured collection.  The syntax
@@ -882,7 +882,7 @@ interface Federatable<TContextData> {
    *          callbacks.
    * @throws {@link RouterError} Thrown if the path pattern is invalid.
    */
-  setFeaturedDispatcher(path: `${string}{identifier}${string}` | `${string}{handle}${string}`, dispatcher: CollectionDispatcher<Object$1, RequestContext<TContextData>, TContextData, void>): CollectionCallbackSetters<RequestContext<TContextData>, TContextData, void>;
+  setFeaturedDispatcher(path: `${string}${Rfc6570Expression<"identifier">}${string}` | `${string}${Rfc6570Expression<"handle">}${string}`, dispatcher: CollectionDispatcher<Object$1, RequestContext<TContextData>, TContextData, void>): CollectionCallbackSetters<RequestContext<TContextData>, TContextData, void>;
   /**
    * Registers a featured tags collection dispatcher.
    * @param path The URI path pattern for the featured tags collection.
@@ -894,7 +894,7 @@ interface Federatable<TContextData> {
    *          callbacks.
    * @throws {@link RouterError} Thrown if the path pattern is invalid.
    */
-  setFeaturedTagsDispatcher(path: `${string}{identifier}${string}` | `${string}{handle}${string}`, dispatcher: CollectionDispatcher<Hashtag, RequestContext<TContextData>, TContextData, void>): CollectionCallbackSetters<RequestContext<TContextData>, TContextData, void>;
+  setFeaturedTagsDispatcher(path: `${string}${Rfc6570Expression<"identifier">}${string}` | `${string}${Rfc6570Expression<"handle">}${string}`, dispatcher: CollectionDispatcher<Hashtag, RequestContext<TContextData>, TContextData, void>): CollectionCallbackSetters<RequestContext<TContextData>, TContextData, void>;
   /**
    * Assigns the URL path for the inbox and starts setting inbox listeners.
    *
@@ -924,7 +924,41 @@ interface Federatable<TContextData> {
    * @returns An object to register inbox listeners.
    * @throws {RouteError} Thrown if the path pattern is invalid.
    */
-  setInboxListeners(inboxPath: `${string}{identifier}${string}` | `${string}{handle}${string}`, sharedInboxPath?: string): InboxListenerSetters<TContextData>;
+  setInboxListeners(inboxPath: `${string}${Rfc6570Expression<"identifier">}${string}` | `${string}${Rfc6570Expression<"handle">}${string}`, sharedInboxPath?: string): InboxListenerSetters<TContextData>;
+  /**
+   * Registers a collection of objects dispatcher.
+   *
+   * @template TContextData The context data to pass to the {@link Context}.
+   * @template TObject The type of objects to dispatch.
+   * @template TParam The parameter names of the requested URL.
+   * @param name A unique name for the collection dispatcher.
+   * @param itemType The Activity Vocabulary class of the object to dispatch.
+   * @param path The URI path pattern for the collection dispatcher.
+   *             The syntax is based on URI Template
+   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).
+   *             The path must have one or more variables.
+   * @param dispatcher A collection dispatcher callback to register.
+   */
+  setCollectionDispatcher<TObject extends Object$1, TParam extends string>(name: string | symbol, itemType: (new (...args: any[]) => TObject) & {
+    typeId: URL;
+  }, path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: CustomCollectionDispatcher<TObject, TParam, RequestContext<TContextData>, TContextData>): CustomCollectionCallbackSetters<TParam, RequestContext<TContextData>, TContextData>;
+  /**
+   * Registers a collection of objects dispatcher.
+   *
+   * @template TContextData The context data to pass to the {@link Context}.
+   * @template TObject The type of objects to dispatch.
+   * @template TParam The parameter names of the requested URL.
+   * @param name A unique name for the collection dispatcher.
+   * @param itemType The Activity Vocabulary class of the object to dispatch.
+   * @param path The URI path pattern for the collection dispatcher.
+   *             The syntax is based on URI Template
+   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).
+   *             The path must have one or more variables.
+   * @param dispatcher A collection dispatcher callback to register.
+   */
+  setCollectionDispatcher<TObject extends Object$1, TParam extends string>(name: string | symbol, itemType: (new (...args: any[]) => TObject) & {
+    typeId: URL;
+  }, path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: CustomCollectionDispatcher<TObject, TParam, RequestContext<TContextData>, TContextData>): CustomCollectionCallbackSetters<TParam, RequestContext<TContextData>, TContextData>;
   /**
    * Registers a collection of objects dispatcher.
    *
@@ -939,7 +973,43 @@ interface Federatable<TContextData> {
    *             The path must have one or more variables.
    * @param dispatcher A collection dispatcher callback to register.
    */
-  setCollectionDispatcher<TObject extends Object$1, TParams extends Record<string, string>>(name: string | symbol, itemType: ConstructorWithTypeId<TObject>, path: ParamsKeyPath<TParams>, dispatcher: CustomCollectionDispatcher<TObject, TParams, RequestContext<TContextData>, TContextData>): CustomCollectionCallbackSetters<TParams, RequestContext<TContextData>, TContextData>;
+  setCollectionDispatcher<TObject extends Object$1, TParam extends string>(name: string | symbol, itemType: (new (...args: any[]) => TObject) & {
+    typeId: URL;
+  }, path: `${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: CustomCollectionDispatcher<TObject, TParam, RequestContext<TContextData>, TContextData>): CustomCollectionCallbackSetters<TParam, RequestContext<TContextData>, TContextData>;
+  /**
+   * Registers an ordered collection of objects dispatcher.
+   *
+   * @template TContextData The context data to pass to the {@link Context}.
+   * @template TObject The type of objects to dispatch.
+   * @template TParam The parameter names of the requested URL.
+   * @param name A unique name for the collection dispatcher.
+   * @param itemType The Activity Vocabulary class of the object to dispatch.
+   * @param path The URI path pattern for the collection dispatcher.
+   *             The syntax is based on URI Template
+   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).
+   *             The path must have one or more variables.
+   * @param dispatcher A collection dispatcher callback to register.
+   */
+  setOrderedCollectionDispatcher<TObject extends Object$1, TParam extends string>(name: string | symbol, itemType: (new (...args: any[]) => TObject) & {
+    typeId: URL;
+  }, path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: CustomCollectionDispatcher<TObject, TParam, RequestContext<TContextData>, TContextData>): CustomCollectionCallbackSetters<TParam, RequestContext<TContextData>, TContextData>;
+  /**
+   * Registers an ordered collection of objects dispatcher.
+   *
+   * @template TContextData The context data to pass to the {@link Context}.
+   * @template TObject The type of objects to dispatch.
+   * @template TParam The parameter names of the requested URL.
+   * @param name A unique name for the collection dispatcher.
+   * @param itemType The Activity Vocabulary class of the object to dispatch.
+   * @param path The URI path pattern for the collection dispatcher.
+   *             The syntax is based on URI Template
+   *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).
+   *             The path must have one or more variables.
+   * @param dispatcher A collection dispatcher callback to register.
+   */
+  setOrderedCollectionDispatcher<TObject extends Object$1, TParam extends string>(name: string | symbol, itemType: (new (...args: any[]) => TObject) & {
+    typeId: URL;
+  }, path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: CustomCollectionDispatcher<TObject, TParam, RequestContext<TContextData>, TContextData>): CustomCollectionCallbackSetters<TParam, RequestContext<TContextData>, TContextData>;
   /**
    * Registers an ordered collection of objects dispatcher.
    *
@@ -954,7 +1024,9 @@ interface Federatable<TContextData> {
    *             The path must have one or more variables.
    * @param dispatcher A collection dispatcher callback to register.
    */
-  setOrderedCollectionDispatcher<TObject extends Object$1, TParams extends Record<string, string>>(name: string | symbol, itemType: ConstructorWithTypeId<TObject>, path: ParamsKeyPath<TParams>, dispatcher: CustomCollectionDispatcher<TObject, TParams, RequestContext<TContextData>, TContextData>): CustomCollectionCallbackSetters<TParams, RequestContext<TContextData>, TContextData>;
+  setOrderedCollectionDispatcher<TObject extends Object$1, TParam extends string>(name: string | symbol, itemType: (new (...args: any[]) => TObject) & {
+    typeId: URL;
+  }, path: `${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: CustomCollectionDispatcher<TObject, TParam, RequestContext<TContextData>, TContextData>): CustomCollectionCallbackSetters<TParam, RequestContext<TContextData>, TContextData>;
 }
 /**
  * An object that registers federation-related business logic and dispatches
@@ -1426,38 +1498,38 @@ interface FederationFetchOptions<TContextData> {
 /**
  * Additional settings for a custom collection dispatcher.
  *
- * @template TParams The type of the parameters in the URL path.
+ * @template TParam The type of the parameters in the URL path.
  * @template TContext The type of the context.  {@link Context} or
  *                     {@link RequestContext}.
  * @template TContextData The context data to pass to the {@link Context}.
  * @template TFilter The type of filter for the collection.
  */
-interface CustomCollectionCallbackSetters<TParams extends Record<string, string>, TContext extends Context<TContextData>, TContextData> {
+interface CustomCollectionCallbackSetters<TParam extends string, TContext extends Context<TContextData>, TContextData> {
   /**
    * Sets the counter for the custom collection.
    * @param counter A callback that returns the number of items in the custom collection.
    * @returns The setters object so that settings can be chained.
    */
-  setCounter(counter: CustomCollectionCounter<TParams, TContextData>): CustomCollectionCallbackSetters<TParams, TContext, TContextData>;
+  setCounter(counter: CustomCollectionCounter<TParam, TContextData>): CustomCollectionCallbackSetters<TParam, TContext, TContextData>;
   /**
    * Sets the first cursor for the custom collection.
    * @param cursor The cursor for the first item in the custom collection.
    * @returns The setters object so that settings can be chained.
    */
-  setFirstCursor(cursor: CustomCollectionCursor<TParams, TContext, TContextData>): CustomCollectionCallbackSetters<TParams, TContext, TContextData>;
+  setFirstCursor(cursor: CustomCollectionCursor<TParam, TContext, TContextData>): CustomCollectionCallbackSetters<TParam, TContext, TContextData>;
   /**
    * Sets the last cursor for the custom collection.
    * @param cursor The cursor for the last item in the custom collection.
    * @returns The setters object so that settings can be chained.
    */
-  setLastCursor(cursor: CustomCollectionCursor<TParams, TContext, TContextData>): CustomCollectionCallbackSetters<TParams, TContext, TContextData>;
+  setLastCursor(cursor: CustomCollectionCursor<TParam, TContext, TContextData>): CustomCollectionCallbackSetters<TParam, TContext, TContextData>;
   /**
    * Specifies the conditions under which requests are authorized.
    * @param predicate A callback that returns whether a request is authorized.
    * @returns The setters object so that settings can be chained.
    * @since 0.7.0
    */
-  authorize(predicate: ObjectAuthorizePredicate<TContextData, string>): CustomCollectionCallbackSetters<TParams, TContext, TContextData>;
+  authorize(predicate: ObjectAuthorizePredicate<TContextData, string>): CustomCollectionCallbackSetters<TParam, TContext, TContextData>;
 }
 /**
  * Represents an object with a type ID, which is either a constructor or an
@@ -1469,73 +1541,34 @@ type ConstructorWithTypeId<TObject extends Object$1> = (new (...args: any[]) =>
   typeId: URL;
 };
 /**
- * Represents a path from the key of parameter objects.
- * @param Params - A record of parameters where keys are parameter names and
- *                 values are their string representations.
- * @returns A string representing the path with all parameters.
- * @example
- * ```ts
- * type UserPostPath = ParamsKeyPath<{ userId: string; postId: string }>;
- * let userPostPath: UserPostPath;
- * // userPostPath = "/posts/{postId}"; // invalid - does not contain `{userId}`
- * // userPostPath = "/users/{userId}"; // invalid - does not contain `{postId}`
- * userPostPath = "/users/{userId}/posts/{postId}"; // valid
- * userPostPath = "/posts/{postId}/users/{userId}"; // valid
- * ```
- */
-type ParamsKeyPath<Params extends Record<string, string>> = ParamsPath<Extract<keyof Params, string>> & string;
-/**
- * Represents a path with multiple parameters.
- * All permutations of the parameters are included in the union type.
- * The path must have all parameters in the form of `{paramName}`.
- * @param Params - A union of parameter names.
- * @returns A string representing the path with all parameters.
- * @example
- * ```ts
- * type UserPostPath = ParamsPath<"userId" | "postId">;
- * // = `${string}{userId}${string}` & `${string}{postId}${string}`
- * // =
- * //  | `${string}{userId}${string}{postId}${string}`
- * //  | `${string}{postId}${string}{userId}${string}`
- * let userPostPath: UserPostPath;
- * userPostPath = "/users/posts"; // ❌ invalid
- * userPostPath = "/users/{userId}"; // ❌ invalid
- * userPostPath = "/posts/{postId}"; // ❌ invalid
- * userPostPath = "/users/{userId}/posts/{postId}"; // ✅ valid
- * userPostPath = "/posts/{postId}/users/{userId}"; // ✅ valid
- */
-type ParamsPath<Params extends string> = UnionToIntersection<ParamPath<Params>>;
-/**
- * Represents a path with a single parameter.
- * The path must have at least one of the parameters in the form of `{paramName}`.
- * @param Param - The name of the parameter.
- * @returns A string representing the path with the parameter.
- * @example
- * ```ts
- * type UserPostPath = ParamPath<"userId" | "postId">;
- * // = `${string}{userId}${string}` | `${string}{postId}${string}`
- * let userPostPath: UserPostPath;
- * userPostPath = "/users/posts"; // ❌ invalid
- * userPostPath = "/users/{userId}"; // ✅ valid
- * userPostPath = "/posts/{postId}"; // ✅ valid
- * userPostPath = "/users/{userId}/posts/{postId}"; // ✅ valid
- * userPostPath = "/posts/{postId}/users/{userId}"; // ✅ valid
- */
-type ParamPath<Param extends string> = `${string}{${Param}}${string}`;
-/**
- * Converts union types to intersection types.
+ * Defines a union of all valid RFC 6570 URI Template expressions for a given
+ * parameter name.
  *
- * @template U - The union type to convert.
- * @returns The intersection type of the union.
+ * RFC 6570 specifies a syntax for URI templates, allowing for variable
+ * expansion. This type captures all Level 1-4 operator expressions for a
+ * single, named variable.
+ *
+ * The supported expression types are:
+ * - `{Param}`: Simple string expansion
+ * - `+{Param}`: Reserved string expansion
+ * - `#{Param}`: Fragment expansion
+ * - `{.Param}`: Label expansion with a dot-prefix
+ * - `{/Param}`: Path segment expansion
+ * - `{;Param}`: Path-style parameter expansion
+ * - `{?Param}`: Query component expansion
+ * - `{&Param}`: Query continuation expansion
+ *
+ * @template Param The name of the parameter to be used in the expressions.
  * @example
  * ```ts
- * type A = { a: string };
- * type B = { b: number };
- * type AorB = A | B;
- * type AandB = UnionToIntersection<AorB>;
- * // AandB = { a: string; b: number }
+ * type UserIdExpression = Rfc6570Expression<"userId">;
+ *
+ * // The variable `userPath` can be assigned any of the valid expressions.
+ * const userPath: UserIdExpression = "{/userId}";
+ * ```
+ * @see {@link https://tools.ietf.org/html/rfc6570} for the full specification.
  */
-type UnionToIntersection<U> = (U extends unknown ? (x: U) => void : never) extends ((x: infer I) => void) ? I : never;
+type Rfc6570Expression<Param extends string> = `{${Param}}` | `{+${Param}}` | `{#${Param}}` | `{.${Param}}` | `{/${Param}}` | `{;${Param}}` | `{?${Param}}` | `{&${Param}}`;
 //#endregion
 //#region src/federation/context.d.ts
 /**
@@ -2306,4 +2339,4 @@ interface ActorKeyPair extends CryptoKeyPair {
   multikey: Multikey;
 }
 //#endregion
-export { ActivityTransformer, ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CreateFederationOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, Message, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, PageItems, ParamsKeyPath, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, respondWithObject, respondWithObjectIfAcceptable };
+export { ActivityTransformer, ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CreateFederationOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, Message, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, PageItems, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, respondWithObject, respondWithObjectIfAcceptable };