@fedify/fedify 2.0.0-dev.1690 → 2.0.0-dev.1736

package/dist/testing/docloader.test.js

@@ -3,17 +3,15 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "../type-C69ZBu7f.js";
+import "../lookup-NXjB7xUj.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
-import "../lookup-pV0JOsuV.js";
-import { mockDocumentLoader, test } from "../testing-BWNCAbL-.js";
-import "../std__assert-X-_kMxKM.js";
-import "../assert_rejects-DiIiJbZn.js";
-import "../assert_is_error-BPGph1Jx.js";
-import "../assert_not_equals-f3m3epl3.js";
-import "../assert_throws-BOO88avQ.js";
+import { mockDocumentLoader, test } from "../testing-u2cUPQLp.js";
+import "../std__assert-DWivtrGR.js";
+import "../assert_rejects-Ce45JcFg.js";
+import "../assert_throws-BNXdRGWP.js";
+import "../assert_not_equals-C80BG-_5.js";
 
 //#region src/testing/docloader.test.ts
 test("mockDocumentLoader()", async () => {

package/dist/testing/mod.d.ts

@@ -1,75 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
+import { DocumentLoader, GetUserAgentOptions, LanguageString } from "@fedify/vocab-runtime";
 import { Span, TracerProvider } from "@opentelemetry/api";
 
-//#region src/runtime/docloader.d.ts
-/**
- * A remote JSON-LD document and its context fetched by
- * a {@link DocumentLoader}.
- */
-interface RemoteDocument {
-  /**
-   * The URL of the context document.
-   */
-  contextUrl: string | null;
-  /**
-   * The fetched JSON-LD document.
-   */
-  document: unknown;
-  /**
-   * The URL of the fetched document.
-   */
-  documentUrl: string;
-}
-/**
- * Options for {@link DocumentLoader}.
- * @since 1.8.0
- */
-interface DocumentLoaderOptions {
-  /**
-   * An `AbortSignal` for cancellation.
-   * @since 1.8.0
-   */
-  signal?: AbortSignal;
-}
-/**
- * A JSON-LD document loader that fetches documents from the Web.
- * @param url The URL of the document to load.
- * @param options The options for the document loader.
- * @returns The loaded remote document.
- */
-type DocumentLoader = (url: string, options?: DocumentLoaderOptions) => Promise<RemoteDocument>;
-/**
- * A factory function that creates a {@link DocumentLoader} with options.
- * @param options The options for the document loader.
- * @returns The document loader.
- * @since 1.4.0
- */
-
-/**
- * Options for making `User-Agent` string.
- * @see {@link getUserAgent}
- * @since 1.3.0
- */
-interface GetUserAgentOptions {
-  /**
-   * An optional software name and version, e.g., `"Hollo/1.0.0"`.
-   */
-  software?: string | null;
-  /**
-   * An optional URL to append to the user agent string.
-   * Usually the URL of the ActivityPub instance.
-   */
-  url?: string | URL | null;
-}
-/**
- * Gets the user agent string for the given application and URL.
- * @param options The options for making the user agent string.
- * @returns The user agent string.
- * @since 1.3.0
- */
-//#endregion
 //#region src/nodeinfo/types.d.ts
 /**
  * The type of the result of parsing JSON.
@@ -248,25 +182,6 @@ interface GetNodeInfoOptions {
  * @since 1.2.0
  */
 //#endregion
-//#region src/runtime/langstr.d.ts
-/**
- * A language-tagged string which corresponds to the `rdf:langString` type.
- */
-declare class LanguageString extends String {
-  /**
-   * The locale of the string.
-   * @since 2.0.0
-   */
-  readonly locale: Intl.Locale;
-  /**
-   * Constructs a new `LanguageString`.
-   * @param value A string value written in the given language.
-   * @param locale The language of the string.  If a string is given, it will
-   *               be parsed as a `Intl.Locale` object.
-   */
-  constructor(value: string, language: Intl.Locale | string);
-}
-//#endregion
 //#region src/vocab/vocab.d.ts
 /** Describes an object of any kind. The Object type serves as the base type for
  * most of the other kinds of objects defined in the Activity Vocabulary,
@@ -7479,7 +7394,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.
  *
@@ -7489,7 +7404,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.
  *
@@ -7502,7 +7417,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/queue.d.ts
 interface SenderKeyJwkPair {
@@ -7623,7 +7538,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.
    *
@@ -7687,7 +7602,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.
    *
@@ -7703,7 +7618,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.
    *
@@ -7719,7 +7634,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.
    *
@@ -7731,7 +7646,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.
    *
@@ -7755,7 +7670,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
@@ -7767,7 +7682,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
@@ -7779,7 +7694,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
@@ -7791,7 +7706,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
@@ -7803,7 +7718,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.
@@ -7815,7 +7730,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.
    *
@@ -7845,7 +7760,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.
    *
@@ -7860,7 +7809,9 @@ 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.
    *
@@ -7875,7 +7826,43 @@ 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}${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.
+   *
+   * @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}`, dispatcher: CustomCollectionDispatcher<TObject, TParam, RequestContext<TContextData>, TContextData>): CustomCollectionCallbackSetters<TParam, RequestContext<TContextData>, TContextData>;
 }
 /**
  * An object that registers federation-related business logic and dispatches
@@ -8174,38 +8161,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
@@ -8217,73 +8204,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
 /**

package/dist/testing/mod.js

@@ -3,8 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "../type-C69ZBu7f.js";
-import "../lookup-pV0JOsuV.js";
-import { createInboxContext, createRequestContext, test, testDefinitions } from "../testing-BWNCAbL-.js";
+import "../lookup-NXjB7xUj.js";
+import { createInboxContext, createRequestContext, test, testDefinitions } from "../testing-u2cUPQLp.js";
 
 export { createInboxContext, createRequestContext, test, testDefinitions };

package/dist/{testing-BWNCAbL-.js → testing-u2cUPQLp.js}

@@ -3,8 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { __require, lookupWebFinger } from "./type-C69ZBu7f.js";
-import { RouterError, lookupObject, traverseCollection } from "./lookup-pV0JOsuV.js";
+import { RouterError, __require, lookupObject, lookupWebFinger, traverseCollection } from "./lookup-NXjB7xUj.js";
 import { configure, getConsoleSink, getLogger, reset } from "@logtape/logtape";
 import { trace } from "@opentelemetry/api";
 

package/dist/{types-DqxyTxOf.js → types-BtUjyi5y.js}

@@ -2,8 +2,8 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import { getUserAgent } from "./docloader-XK3y2jn5.js";
 import { getLogger } from "@logtape/logtape";
+import { getUserAgent } from "@fedify/vocab-runtime";
 
 //#region src/nodeinfo/client.ts
 const logger = getLogger([

package/dist/{types-zqdWZh4O.cjs → types-CWgzGaqk.cjs}

@@ -3,8 +3,8 @@
           const { URLPattern } = require("urlpattern-polyfill");
         
 const require_chunk = require('./chunk-DqRYRqnO.cjs');
-const require_docloader = require('./docloader-CCqXeagZ.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
+const __fedify_vocab_runtime = require_chunk.__toESM(require("@fedify/vocab-runtime"));
 
 //#region src/nodeinfo/client.ts
 const logger = (0, __logtape_logtape.getLogger)([
@@ -19,7 +19,7 @@ async function getNodeInfo(url, options = {}) {
 			const wellKnownUrl = new URL("/.well-known/nodeinfo", url);
 			const wellKnownResponse = await fetch(wellKnownUrl, { headers: {
 				Accept: "application/json",
-				"User-Agent": typeof options.userAgent === "string" ? options.userAgent : require_docloader.getUserAgent(options.userAgent)
+				"User-Agent": typeof options.userAgent === "string" ? options.userAgent : (0, __fedify_vocab_runtime.getUserAgent)(options.userAgent)
 			} });
 			if (!wellKnownResponse.ok) {
 				logger.error("Failed to fetch {url}: {status} {statusText}", {
@@ -42,7 +42,7 @@ async function getNodeInfo(url, options = {}) {
 		}
 		const response = await fetch(nodeInfoUrl, { headers: {
 			Accept: "application/json",
-			"User-Agent": typeof options.userAgent === "string" ? options.userAgent : require_docloader.getUserAgent(options.userAgent)
+			"User-Agent": typeof options.userAgent === "string" ? options.userAgent : (0, __fedify_vocab_runtime.getUserAgent)(options.userAgent)
 		} });
 		if (!response.ok) {
 			logger.error("Failed to fetch NodeInfo document from {url}: {status} {statusText}", {

package/dist/{runtime/authdocloader.test.js → utils/docloader.test.js}

@@ -3,25 +3,24 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { UrlError } from "../type-C69ZBu7f.js";
+import "../lookup-NXjB7xUj.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
-import "../lookup-pV0JOsuV.js";
-import "../actor-DuCeRiNh.js";
-import "../key-1KXru8Ug.js";
-import { verifyRequest } from "../http-BNOYnVsU.js";
-import { getAuthenticatedDocumentLoader } from "../authdocloader-Brax1A32.js";
-import { mockDocumentLoader, test } from "../testing-BWNCAbL-.js";
-import "../std__assert-X-_kMxKM.js";
-import { assertRejects } from "../assert_rejects-DiIiJbZn.js";
-import "../assert_is_error-BPGph1Jx.js";
-import "../assert_not_equals-f3m3epl3.js";
-import "../assert_throws-BOO88avQ.js";
-import { rsaPrivateKey2 } from "../keys-BPdFKgiy.js";
-import { esm_default } from "../esm-DnIzfEj0.js";
+import "../actor-BLq4KEGR.js";
+import "../key-CgKiloJr.js";
+import { verifyRequest } from "../http-B9npZ3Md.js";
+import { getAuthenticatedDocumentLoader } from "../docloader-DtYIz2Pb.js";
+import { mockDocumentLoader, test } from "../testing-u2cUPQLp.js";
+import "../std__assert-DWivtrGR.js";
+import { assertRejects } from "../assert_rejects-Ce45JcFg.js";
+import "../assert_throws-BNXdRGWP.js";
+import "../assert_not_equals-C80BG-_5.js";
+import { rsaPrivateKey2 } from "../keys-B3O7b5eB.js";
+import { esm_default } from "../esm-CQ9nlHuI.js";
+import { UrlError } from "@fedify/vocab-runtime";
 
-//#region src/runtime/authdocloader.test.ts
+//#region src/utils/docloader.test.ts
 test("getAuthenticatedDocumentLoader()", async (t) => {
 	esm_default.spyGlobal();
 	esm_default.get("begin:https://example.com/object", async (cl) => {