@fedify/fedify 2.0.0-pr.412.1692 → 2.0.0-pr.412.1794

package/dist/{context-C5BsZkDr.d.cts → context-DJ8aSy2Q.d.cts}

@@ -1,13 +1,13 @@
-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 { MessageQueue } from "./mq-B7R1Q-M5.cjs";
+import { GetNodeInfoOptions, JsonValue, NodeInfo } from "./client-94iWEfQa.cjs";
+import { Activity, Collection, CryptographicKey, Hashtag, Link, Multikey, Object as Object$1 } from "./vocab-CeDBzu-f.cjs";
+import { Actor, Recipient } from "./actor-f2NtjyCg.cjs";
+import { HttpMessageSignaturesSpec } from "./http-M8k5mKc0.cjs";
+import { GetKeyOwnerOptions } from "./owner-B4HbyP8s.cjs";
+import { LookupObjectOptions, TraverseCollectionOptions } from "./mod-BxRCHTz-.cjs";
+import { Link as Link$1, LookupWebFingerOptions, ResourceDescriptor } from "./mod-C58MZ7Wx.cjs";
+import { KvKey, KvStore } from "./kv-Bxr0Q87_.cjs";
+import { MessageQueue } from "./mq-DcJPkXD5.cjs";
+import { AuthenticatedDocumentLoaderFactory, DocumentLoader, DocumentLoaderFactory, GetUserAgentOptions } from "@fedify/vocab-runtime";
 import { Span, TracerProvider } from "@opentelemetry/api";
 
 //#region src/compat/types.d.ts
@@ -281,7 +281,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 +291,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,7 +304,7 @@ 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
 
@@ -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.
    *
@@ -716,9 +716,7 @@ interface Federatable<TContextData> {
    *             must have one or more variables.
    * @param dispatcher An object dispatcher callback to register.
    */
-  setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: (new (...args: any[]) => TObject) & {
-    typeId: URL;
-  }, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
+  setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
    * Registers an object dispatcher.
    *
@@ -732,9 +730,7 @@ interface Federatable<TContextData> {
    *             must have one or more variables.
    * @param dispatcher An object dispatcher callback to register.
    */
-  setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: (new (...args: any[]) => TObject) & {
-    typeId: URL;
-  }, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
+  setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
    * Registers an object dispatcher.
    *
@@ -748,9 +744,7 @@ interface Federatable<TContextData> {
    *             must have one or more variables.
    * @param dispatcher An object dispatcher callback to register.
    */
-  setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: (new (...args: any[]) => TObject) & {
-    typeId: URL;
-  }, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
+  setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
    * Registers an object dispatcher.
    *
@@ -764,9 +758,7 @@ interface Federatable<TContextData> {
    *             must have one or more variables.
    * @param dispatcher An object dispatcher callback to register.
    */
-  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>;
+  setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
    * Registers an object dispatcher.
    *
@@ -780,9 +772,7 @@ interface Federatable<TContextData> {
    *             must have one or more variables.
    * @param dispatcher An object dispatcher callback to register.
    */
-  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>;
+  setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
    * Registers an object dispatcher.
    *
@@ -796,9 +786,7 @@ interface Federatable<TContextData> {
    *             must have one or more variables.
    * @param dispatcher An object dispatcher callback to register.
    */
-  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>;
+  setObjectDispatcher<TObject extends Object$1, TParam extends string>(cls: ConstructorWithTypeId<TObject>, path: `${string}${Rfc6570Expression<TParam>}${string}`, dispatcher: ObjectDispatcher<TContextData, TObject, TParam>): ObjectCallbackSetters<TContextData, TObject, TParam>;
   /**
    * Registers an inbox dispatcher.
    *
@@ -810,7 +798,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 +822,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 +834,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 +846,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 +858,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 +870,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 +882,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 +912,7 @@ 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.
    *
@@ -939,7 +927,37 @@ 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: ConstructorWithTypeId<TObject>, 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: ConstructorWithTypeId<TObject>, 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.
+   *
+   * @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: ConstructorWithTypeId<TObject>, path: `${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 +972,37 @@ 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: ConstructorWithTypeId<TObject>, 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: ConstructorWithTypeId<TObject>, 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.
+   *
+   * @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: ConstructorWithTypeId<TObject>, 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
@@ -1090,12 +1138,6 @@ interface FederationOptions<TContextData> {
    * @since 1.4.0
    */
   contextLoaderFactory?: DocumentLoaderFactory;
-  /**
-   * A custom JSON-LD context loader.  By default, this uses the same loader
-   * as the document loader.
-   * @deprecated Use {@link contextLoaderFactory} instead.
-   */
-  contextLoader?: DocumentLoader;
   /**
    * A factory function that creates an authenticated document loader for a
    * given identity.  This is used for fetching documents that require
@@ -1432,38 +1474,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
@@ -1475,73 +1517,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.
+ *
+ * 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.
  *
- * @template U - The union type to convert.
- * @returns The intersection type of the union.
+ * 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
 /**
@@ -1630,9 +1633,7 @@ interface Context<TContextData> {
    * @throws {TypeError} If values are invalid.
    * @since 0.7.0
    */
-  getObjectUri<TObject extends Object$1>(cls: (new (...args: any[]) => TObject) & {
-    typeId: URL;
-  }, values: Record<string, string>): URL;
+  getObjectUri<TObject extends Object$1>(cls: ConstructorWithTypeId<TObject>, values: Record<string, string>): URL;
   /**
    * Builds the URI of an actor's outbox with the given identifier.
    * @param identifier The actor's identifier.
@@ -1946,9 +1947,7 @@ interface RequestContext<TContextData> extends Context<TContextData> {
    * @throws {TypeError} If values are invalid.
    * @since 0.7.0
    */
-  getObject<TObject extends Object$1>(cls: (new (...args: any[]) => TObject) & {
-    typeId: URL;
-  }, values: Record<string, string>): Promise<TObject | null>;
+  getObject<TObject extends Object$1>(cls: ConstructorWithTypeId<TObject>, values: Record<string, string>): Promise<TObject | null>;
   /**
    * Gets the public key of the sender, if any exists and it is verified.
    * Otherwise, `null` is returned.
@@ -2092,9 +2091,7 @@ type ParseUriResult =
  * The case of an object URI.
  */ | {
   readonly type: "object";
-  readonly class: (new (...args: any[]) => Object$1) & {
-    typeId: URL;
-  };
+  readonly class: ConstructorWithTypeId<Object$1>;
   readonly typeId: URL;
   readonly values: Record<string, string>;
 }
@@ -2312,4 +2309,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 };

package/dist/{authdocloader-SjwloJUA.js → docloader-CrbAy9Oc.js}

@@ -3,15 +3,16 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { UrlError, createRequest, getRemoteDocument, logRequest, validatePublicUrl } from "./type-NEA09tSC.js";
-import { validateCryptoKey } from "./key-IxRhZpOF.js";
-import { doubleKnock } from "./http-DGjdMiLc.js";
+import { validateCryptoKey } from "./key-CxdLUFS6.js";
+import { doubleKnock } from "./http-D2kIm9la.js";
+import { curry } from "es-toolkit";
+import { UrlError, createActivityPubRequest, getDocumentLoader, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";
 
-//#region src/runtime/authdocloader.ts
+//#region src/utils/docloader.ts
 const logger = getLogger([
 	"fedify",
-	"runtime",
+	"utils",
 	"docloader"
 ]);
 /**
@@ -37,10 +38,10 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, userAge
 			});
 			throw error;
 		}
-		const originalRequest = createRequest(url, { userAgent });
+		const originalRequest = createActivityPubRequest(url, { userAgent });
 		const response = await doubleKnock(originalRequest, identity, {
 			specDeterminer,
-			log: logRequest,
+			log: curry(logRequest)(logger),
 			tracerProvider,
 			signal: options?.signal
 		});
@@ -48,6 +49,14 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, userAge
 	}
 	return load;
 }
+const _fetchDocumentLoader = getDocumentLoader();
+const _fetchDocumentLoader_allowPrivateAddress = getDocumentLoader({ allowPrivateAddress: true });
+function fetchDocumentLoader(url, arg = false) {
+	const allowPrivateAddress = typeof arg === "boolean" ? arg : false;
+	logger.warn("fetchDocumentLoader() function is deprecated.  Use getDocumentLoader() function instead.");
+	const loader = allowPrivateAddress ? _fetchDocumentLoader_allowPrivateAddress : _fetchDocumentLoader;
+	return loader(url);
+}
 
 //#endregion
-export { getAuthenticatedDocumentLoader };
+export { fetchDocumentLoader, getAuthenticatedDocumentLoader };

package/dist/{esm-CwHz8Y8t.js → esm-C-Qa1zEM.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { __commonJS, __toESM } from "./type-NEA09tSC.js";
+import { __commonJS, __toESM } from "./lookup-DQRtjvb1.js";
 
 //#region ../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js
 var require_glob_to_regexp = __commonJS({ "../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js"(exports, module) {
@@ -115,7 +115,7 @@ function parse(input, loose) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/TypeDescriptor.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.4/node_modules/fetch-mock/dist/esm/TypeDescriptor.js
 const valueTypes = new Set([
 	"boolean",
 	"number",
@@ -207,7 +207,7 @@ var TypeDescriptor = class TypeDescriptor {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/IsSubsetOf.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.4/node_modules/fetch-mock/dist/esm/IsSubsetOf.js
 const allowedTypes = new Set([
 	"array",
 	"object",
@@ -366,7 +366,7 @@ function dequal(foo, bar) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/RequestUtils.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.4/node_modules/fetch-mock/dist/esm/RequestUtils.js
 const absoluteUrlRX = new RegExp("^[a-z]+://|^data:", "i");
 const protocolRelativeUrlRX = new RegExp("^//", "i");
 function hasCredentialsInUrl(url) {
@@ -444,7 +444,7 @@ function normalizeHeaders(headers) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/Matchers.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.4/node_modules/fetch-mock/dist/esm/Matchers.js
 var import_glob_to_regexp = __toESM(require_glob_to_regexp(), 1);
 const isUrlMatcher = (matcher) => matcher instanceof RegExp || typeof matcher === "string" || typeof matcher === "object" && "href" in matcher;
 const isFunctionMatcher = (matcher) => typeof matcher === "function";
@@ -627,7 +627,7 @@ const builtInMatchers = [
 ];
 
 //#endregion
-//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/StatusTextMap.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.4/node_modules/fetch-mock/dist/esm/StatusTextMap.js
 const statusTextMap = {
 	100: "Continue",
 	101: "Switching Protocols",
@@ -695,7 +695,7 @@ const statusTextMap = {
 var StatusTextMap_default = statusTextMap;
 
 //#endregion
-//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/Route.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.4/node_modules/fetch-mock/dist/esm/Route.js
 var __classPrivateFieldSet = void 0 && (void 0).__classPrivateFieldSet || function(receiver, state, value, kind, f) {
 	if (kind === "m") throw new TypeError("Private method is not writable");
 	if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
@@ -829,7 +829,7 @@ builtInMatchers.forEach(Route.defineMatcher);
 var Route_default = Route;
 
 //#endregion
-//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/Router.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.4/node_modules/fetch-mock/dist/esm/Router.js
 const responseConfigProps = [
 	"body",
 	"headers",
@@ -1002,7 +1002,7 @@ var Router = class {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/CallHistory.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.4/node_modules/fetch-mock/dist/esm/CallHistory.js
 const isName = (filter) => typeof filter === "string" && /^[\da-zA-Z-]+$/.test(filter) && !["matched", "unmatched"].includes(filter);
 const isMatchedOrUnmatched = (filter) => typeof filter === "boolean" || ["matched", "unmatched"].includes(filter);
 var CallHistory = class {
@@ -1087,7 +1087,7 @@ var CallHistory = class {
 var CallHistory_default = CallHistory;
 
 //#endregion
-//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/FetchMock.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.4/node_modules/fetch-mock/dist/esm/FetchMock.js
 const defaultFetchMockConfig = {
 	includeContentLength: true,
 	matchPartialBody: false,
@@ -1220,7 +1220,7 @@ const fetchMock = new FetchMock({ ...defaultFetchMockConfig });
 var FetchMock_default = fetchMock;
 
 //#endregion
-//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/index.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.4/node_modules/fetch-mock/dist/esm/index.js
 var esm_default = FetchMock_default;
 
 //#endregion