@fedify/fedify 2.3.0-dev.1131 → 2.3.0-dev.1137

package/README.md

@@ -123,6 +123,7 @@ Here is the list of packages:
 | [@fedify/sqlite](/packages/sqlite/)               | [JSR][jsr:@fedify/sqlite]        | [npm][npm:@fedify/sqlite]        | SQLite driver                            |
 | [@fedify/sveltekit](/packages/sveltekit/)         | [JSR][jsr:@fedify/sveltekit]     | [npm][npm:@fedify/sveltekit]     | SvelteKit integration                    |
 | [@fedify/testing](/packages/testing/)             | [JSR][jsr:@fedify/testing]       | [npm][npm:@fedify/testing]       | Testing utilities                        |
+| [@fedify/uri-template](/packages/uri-template/)   | [JSR][jsr:@fedify/uri-template]  | [npm][npm:@fedify/uri-template]  | RFC 6570 URI Template library            |
 | [@fedify/vocab](/packages/vocab/)                 | [JSR][jsr:@fedify/vocab]         | [npm][npm:@fedify/vocab]         | Activity Vocabulary library              |
 | [@fedify/vocab-runtime](/packages/vocab-runtime/) | [JSR][jsr:@fedify/vocab-runtime] | [npm][npm:@fedify/vocab-runtime] | Runtime library for code-generated vocab |
 | [@fedify/vocab-tools](/packages/vocab-tools/)     | [JSR][jsr:@fedify/vocab-tools]   | [npm][npm:@fedify/vocab-tools]   | Code generation tools for Activity Vocab |
@@ -176,6 +177,8 @@ Here is the list of packages:
 [npm:@fedify/sveltekit]: https://www.npmjs.com/package/@fedify/sveltekit
 [jsr:@fedify/testing]: https://jsr.io/@fedify/testing
 [npm:@fedify/testing]: https://www.npmjs.com/package/@fedify/testing
+[jsr:@fedify/uri-template]: https://jsr.io/@fedify/uri-template
+[npm:@fedify/uri-template]: https://www.npmjs.com/package/@fedify/uri-template
 [jsr:@fedify/vocab]: https://jsr.io/@fedify/vocab
 [npm:@fedify/vocab]: https://www.npmjs.com/package/@fedify/vocab
 [jsr:@fedify/vocab-runtime]: https://jsr.io/@fedify/vocab-runtime

package/dist/{assert-DikXweDx.mjs → assert-OguE97r2.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { l as AssertionError } from "./assert_equals-Ew3jOFa3.mjs";
+import { l as AssertionError } from "./assert_equals-C-ZRDbaf.mjs";
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert.js
 /**
 * Make an assertion, error will be thrown if `expr` does not have truthy value.

package/dist/{assert_instance_of-C4Ri6VuN.mjs → assert_instance_of-DBC5X09g.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { l as AssertionError } from "./assert_equals-Ew3jOFa3.mjs";
+import { l as AssertionError } from "./assert_equals-C-ZRDbaf.mjs";
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_instance_of.js
 /**
 * Make an assertion that `obj` is an instance of `type`.

package/dist/{assert_not_equals--wG9hV7u.mjs → assert_not_equals-DkVK8oqV.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as equal, l as AssertionError } from "./assert_equals-Ew3jOFa3.mjs";
+import { c as equal, l as AssertionError } from "./assert_equals-C-ZRDbaf.mjs";
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_not_equals.js
 /**
 * Make an assertion that `actual` and `expected` are not equal, deeply.

package/dist/{assert_rejects-DQP-q39h.mjs → assert_rejects-DN60FHPX.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { l as AssertionError, s as format } from "./assert_equals-Ew3jOFa3.mjs";
-import { n as assertIsError } from "./assert_throws-4NwKEy2q.mjs";
+import { l as AssertionError, s as format } from "./assert_equals-C-ZRDbaf.mjs";
+import { n as assertIsError } from "./assert_throws-BOkhLGYc.mjs";
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_false.js
 /**
 * Make an assertion, error will be thrown if `expr` have truthy value.

package/dist/{assert_strict_equals-Dmjbg-bA.mjs → assert_strict_equals-XEgZAlrj.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { a as red, i as buildMessage, l as AssertionError, n as diffStr, r as diff, s as format } from "./assert_equals-Ew3jOFa3.mjs";
+import { a as red, i as buildMessage, l as AssertionError, n as diffStr, r as diff, s as format } from "./assert_equals-C-ZRDbaf.mjs";
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_strict_equals.js
 /**
 * Make an assertion that `actual` and `expected` are equal using

package/dist/{assert_throws-4NwKEy2q.mjs → assert_throws-BOkhLGYc.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { l as AssertionError, o as stripAnsiCode } from "./assert_equals-Ew3jOFa3.mjs";
+import { l as AssertionError, o as stripAnsiCode } from "./assert_equals-C-ZRDbaf.mjs";
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_is_error.js
 /**
 * Make an assertion that `error` is an `Error`.

package/dist/{builder-DckAhD27.mjs → builder-BCkBXxky.mjs}

@@ -1,25 +1,39 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as RouterError, t as Router } from "./router-BT_F5748.mjs";
-import { n as version, t as name } from "./deno--CS-SBS9.mjs";
-import { t as ActivityListenerSet } from "./activity-listener-BeTGV3wc.mjs";
+import { n as version, t as name } from "./deno-B_9yJW3w.mjs";
+import { t as ActivityListenerSet } from "./activity-listener-tztVvlNb.mjs";
 import { getLogger } from "@logtape/logtape";
+import { Router, RouterError, assertPath } from "@fedify/uri-template";
 import { Tombstone, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#region src/federation/builder.ts
 const ACTOR_ALIAS_PREFIX = "actorAlias:";
-function validateSingleIdentifierVariablePath(path, errorMessage) {
-	const operatorMatches = globalThis.Array.from(path.matchAll(/{([+#./;?&]?)([A-Za-z_][A-Za-z0-9_]*)}/g));
-	if (operatorMatches.length !== 1 || operatorMatches[0]?.[2] !== "identifier") throw new RouterError(errorMessage);
-	if (operatorMatches.some((match) => [
-		"?",
-		"&",
-		"#"
-	].includes(match[1]) && match[2] === "identifier")) throw new RouterError(errorMessage);
-	const variables = new Router().add(path, "outbox");
-	if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError(errorMessage);
-}
+/**
+* Route options shared by every dispatcher whose path must expose exactly
+* one `{identifier}` variable bound to a single, non-empty value
+* for `setOutboxDispatcher/Listener()`.
+*/
+const identifierSingular = {
+	exact: true,
+	variables: { identifier: { operatables: [""] } }
+};
+/**
+* Route options shared by every dispatcher whose path must expose
+* `{identifier}` and `{+identifier}` variables bound to the same single,
+* non-empty value for following setters:
+* - `setActorDispatcher()` (actor path)
+* - `setInboxDispatcher/Listener()` (inbox path)
+* - `setFollowingDispatcher()` (following path)
+* - `setFollowersDispatcher()` (followers path)
+* - `setLikedDispatcher()` (liked path)
+* - `setFeaturedDispatcher()` (featured path)
+* - `setFeaturedTagsDispatcher()` (featured tags path)
+*/
+const identifierSingularAllowPlus = {
+	exact: true,
+	variables: { identifier: { operatables: ["", "+"] } }
+};
 var FederationBuilderImpl = class {
 	router;
 	actorCallbacks;
@@ -59,7 +73,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-Dnql59Y8.mjs");
+		const { FederationImpl } = await import("./middleware-CztxpARM.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -95,8 +109,8 @@ var FederationBuilderImpl = class {
 	}
 	setActorDispatcher(path, dispatcher) {
 		if (this.router.has("actor")) throw new RouterError("Actor dispatcher already set.");
-		const variables = this.router.add(path, "actor");
-		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for actor dispatcher must have one variable: {identifier}");
+		assertPath(path);
+		this.router.add(path, "actor", identifierSingularAllowPlus);
 		const callbacks = { dispatcher: async (context, identifier) => {
 			const actor = await this._getTracer().startActiveSpan("activitypub.dispatch_actor", {
 				kind: SpanKind.SERVER,
@@ -198,7 +212,7 @@ var FederationBuilderImpl = class {
 			mapActorAlias: (path, identifier) => {
 				if (identifier === "") throw new RouterError("Identifier cannot be empty.");
 				if (this.router.has(`actorAlias:${identifier}`)) throw new RouterError(`Actor alias for "${identifier}" already set.`);
-				if (new Router().add(path, "temp").size > 0) throw new RouterError("Path for actor alias must have no variables.");
+				if (Router.variables(path).size > 0) throw new RouterError("Path for actor alias must have no variables.");
 				const existingRoute = this.router.route(path);
 				if (existingRoute != null) throw new RouterError(`Actor alias path "${path}" conflicts with existing route "${existingRoute.name}".`);
 				this.router.add(path, `${ACTOR_ALIAS_PREFIX}${identifier}`);
@@ -213,7 +227,8 @@ var FederationBuilderImpl = class {
 	}
 	setNodeInfoDispatcher(path, dispatcher) {
 		if (this.router.has("nodeInfo")) throw new RouterError("NodeInfo dispatcher already set.");
-		if (this.router.add(path, "nodeInfo").size !== 0) throw new RouterError("Path for NodeInfo dispatcher must have no variables.");
+		if (Router.variables(path).size !== 0) throw new RouterError("Path for NodeInfo dispatcher must have no variables.");
+		this.router.add(path, "nodeInfo");
 		this.nodeInfoDispatcher = dispatcher;
 	}
 	setWebFingerLinksDispatcher(dispatcher) {
@@ -222,8 +237,9 @@ var FederationBuilderImpl = class {
 	setObjectDispatcher(cls, path, dispatcher) {
 		const routeName = `object:${cls.typeId.href}`;
 		if (this.router.has(routeName)) throw new RouterError(`Object dispatcher for ${cls.name} already set.`);
-		const variables = this.router.add(path, routeName);
-		if (variables.size < 1) throw new RouterError("Path for object dispatcher must have at least one variable.");
+		assertPath(path);
+		const variables = Router.variables(path);
+		this.router.add(path, routeName);
 		const callbacks = {
 			dispatcher: (ctx, values) => {
 				return this._getTracer().startActiveSpan("activitypub.dispatch_object", {
@@ -265,8 +281,8 @@ var FederationBuilderImpl = class {
 		if (this.router.has("inbox")) {
 			if (this.inboxPath !== path) throw new RouterError("Inbox dispatcher path must match inbox listener path.");
 		} else {
-			const variables = this.router.add(path, "inbox");
-			if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for inbox dispatcher must have one variable: {identifier}");
+			assertPath(path);
+			this.router.add(path, "inbox", identifierSingularAllowPlus);
 			this.inboxPath = path;
 		}
 		const callbacks = { dispatcher };
@@ -296,8 +312,8 @@ var FederationBuilderImpl = class {
 		if (this.router.has("outbox")) {
 			if (this.outboxPath !== path) throw new RouterError("Outbox dispatcher path must match outbox listener path.");
 		} else {
-			validateSingleIdentifierVariablePath(path, "Path for outbox dispatcher must have one variable: {identifier}");
-			this.router.add(path, "outbox");
+			assertPath(path);
+			this.router.add(path, "outbox", identifierSingular);
 			this.outboxPath = path;
 		}
 		const callbacks = { dispatcher };
@@ -327,8 +343,8 @@ var FederationBuilderImpl = class {
 		if (this.router.has("outbox")) {
 			if (this.outboxPath !== outboxPath) throw new RouterError("Outbox listener path must match outbox dispatcher path.");
 		} else {
-			validateSingleIdentifierVariablePath(outboxPath, "Path for outbox must have one variable: {identifier}");
-			this.router.add(outboxPath, "outbox");
+			assertPath(outboxPath);
+			this.router.add(outboxPath, "outbox", identifierSingular);
 			this.outboxPath = outboxPath;
 		}
 		const listeners = this.outboxListeners = new ActivityListenerSet();
@@ -350,8 +366,8 @@ var FederationBuilderImpl = class {
 	}
 	setFollowingDispatcher(path, dispatcher) {
 		if (this.router.has("following")) throw new RouterError("Following collection dispatcher already set.");
-		const variables = this.router.add(path, "following");
-		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for following collection dispatcher must have one variable: {identifier}");
+		assertPath(path);
+		this.router.add(path, "following", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.followingCallbacks = callbacks;
 		const setters = {
@@ -376,8 +392,8 @@ var FederationBuilderImpl = class {
 	}
 	setFollowersDispatcher(path, dispatcher) {
 		if (this.router.has("followers")) throw new RouterError("Followers collection dispatcher already set.");
-		const variables = this.router.add(path, "followers");
-		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for followers collection dispatcher must have one variable: {identifier}");
+		assertPath(path);
+		this.router.add(path, "followers", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.followersCallbacks = callbacks;
 		const setters = {
@@ -402,8 +418,8 @@ var FederationBuilderImpl = class {
 	}
 	setLikedDispatcher(path, dispatcher) {
 		if (this.router.has("liked")) throw new RouterError("Liked collection dispatcher already set.");
-		const variables = this.router.add(path, "liked");
-		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for liked collection dispatcher must have one variable: {identifier}");
+		assertPath(path);
+		this.router.add(path, "liked", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.likedCallbacks = callbacks;
 		const setters = {
@@ -428,8 +444,8 @@ var FederationBuilderImpl = class {
 	}
 	setFeaturedDispatcher(path, dispatcher) {
 		if (this.router.has("featured")) throw new RouterError("Featured collection dispatcher already set.");
-		const variables = this.router.add(path, "featured");
-		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for featured collection dispatcher must have one variable: {identifier}");
+		assertPath(path);
+		this.router.add(path, "featured", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.featuredCallbacks = callbacks;
 		const setters = {
@@ -454,8 +470,8 @@ var FederationBuilderImpl = class {
 	}
 	setFeaturedTagsDispatcher(path, dispatcher) {
 		if (this.router.has("featuredTags")) throw new RouterError("Featured tags collection dispatcher already set.");
-		const variables = this.router.add(path, "featuredTags");
-		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for featured tags collection dispatcher must have one variable: {identifier}");
+		assertPath(path);
+		this.router.add(path, "featuredTags", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.featuredTagsCallbacks = callbacks;
 		const setters = {
@@ -483,12 +499,13 @@ var FederationBuilderImpl = class {
 		if (this.router.has("inbox")) {
 			if (this.inboxPath !== inboxPath) throw new RouterError("Inbox listener path must match inbox dispatcher path.");
 		} else {
-			const variables = this.router.add(inboxPath, "inbox");
-			if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for inbox must have one variable: {identifier}");
+			assertPath(inboxPath);
+			this.router.add(inboxPath, "inbox", identifierSingularAllowPlus);
 			this.inboxPath = inboxPath;
 		}
 		if (sharedInboxPath != null) {
-			if (this.router.add(sharedInboxPath, "sharedInbox").size !== 0) throw new RouterError("Path for shared inbox must have no variables.");
+			if (Router.variables(sharedInboxPath).size !== 0) throw new RouterError("Path for shared inbox must have no variables.");
+			this.router.add(sharedInboxPath, "sharedInbox");
 		}
 		const listeners = this.inboxListeners = new ActivityListenerSet();
 		const setters = {
@@ -526,7 +543,9 @@ var FederationBuilderImpl = class {
 		const routeName = `${collectionType}:${this.#uniqueCollectionId(name)}`;
 		if (this.router.has(routeName)) throw new RouterError(`Collection dispatcher for ${strName} already set.`);
 		if (this.collectionCallbacks[name] != null) throw new RouterError(`Collection dispatcher for ${strName} already set.`);
-		if (this.router.add(path, routeName).size < 1) throw new RouterError("Path for collection dispatcher must have at least one variable.");
+		assertPath(path);
+		if (Router.variables(path).size < 1) throw new RouterError("Path for collection dispatcher must have at least one variable.");
+		this.router.add(path, routeName);
 		const callbacks = { dispatcher };
 		this.collectionCallbacks[name] = callbacks;
 		this.collectionTypeIds[name] = itemType;

package/dist/compat/mod.d.cts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { St as ActivityTransformer, n as Context } from "../context-tc6VOOOL.cjs";
+import { n as Context, vt as ActivityTransformer } from "../context-DI2gRbyN.cjs";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { St as ActivityTransformer, n as Context } from "../context-Cq18Gplu.js";
+import { n as Context, vt as ActivityTransformer } from "../context-DCtsSHDv.js";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/outgoing-jsonld.test.mjs

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
-import { n as normalizeAttachmentArrays, r as normalizeOutgoingActivityJsonLd, t as isPreloadedContextAttachmentSafe } from "../outgoing-jsonld-BNL8AC14.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import { t as assertStrictEquals } from "../assert_strict_equals-XEgZAlrj.mjs";
+import { n as normalizeAttachmentArrays, r as normalizeOutgoingActivityJsonLd, t as isPreloadedContextAttachmentSafe } from "../outgoing-jsonld-BgFLCJQ_.mjs";
 import { Create, Document, Note, PUBLIC_COLLECTION } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/compat/outgoing-jsonld.test.ts

package/dist/compat/public-audience.test.mjs

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
-import { t as normalizePublicAudience } from "../public-audience-c9zmYKgA.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
+import { t as normalizePublicAudience } from "../public-audience-N3pyOx2p.mjs";
 import { Create, Note, PUBLIC_COLLECTION } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 import { getDocumentLoader, preloadedContexts } from "@fedify/vocab-runtime";

package/dist/compat/transformers.test.mjs

@@ -1,11 +1,11 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
-import { t as assert } from "../assert-DikXweDx.mjs";
-import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
-import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-BB0IbDow.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
+import { t as assert } from "../assert-OguE97r2.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-DQEgdr83.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/compat/transformers.test.ts

package/dist/{context-Cq18Gplu.d.ts → context-DCtsSHDv.d.ts}

@@ -4,6 +4,7 @@ import { o as VerifyRequestFailureReason, t as HttpMessageSignaturesSpec } from
 import { n as GetKeyOwnerOptions } from "./owner-CnngXDNJ.js";
 import { n as KvStore, t as KvKey } from "./kv-D6hNiMTK.js";
 import { r as MessageQueue } from "./mq-D-nlpY04.js";
+import { Router } from "@fedify/uri-template";
 import { Activity, Actor, Collection, CryptographicKey, Hashtag, Link, LookupObjectOptions, Multikey, Object as Object$1, Recipient, Tombstone, TraverseCollectionOptions } from "@fedify/vocab";
 import { MeterProvider, Span, Tracer, TracerProvider } from "@opentelemetry/api";
 import { AuthenticatedDocumentLoaderFactory, DocumentLoader, DocumentLoaderFactory, GetUserAgentOptions } from "@fedify/vocab-runtime";
@@ -414,91 +415,6 @@ declare function respondWithObject(object: Object$1, options?: RespondWithObject
 */
 declare function respondWithObjectIfAcceptable(object: Object$1, request: Request, options?: RespondWithObjectOptions): Promise<Response | null>;
 //#endregion
-//#region src/federation/router.d.ts
-/**
-* Options for the {@link Router}.
-* @since 0.12.0
-*/
-interface RouterOptions {
-  /**
-  * Whether to ignore trailing slashes when matching paths.
-  */
-  trailingSlashInsensitive?: boolean;
-}
-/**
-* The result of {@link Router.route} method.
-* @since 1.3.0
-*/
-interface RouterRouteResult {
-  /**
-  * The matched route name.
-  */
-  name: string;
-  /**
-  * The URL template of the matched route.
-  */
-  template: string;
-  /**
-  * The values extracted from the URL.
-  */
-  values: Record<string, string>;
-}
-/**
-* URL router and constructor based on URI Template
-* ([RFC 6570](https://tools.ietf.org/html/rfc6570)).
-*/
-declare class Router {
-  #private;
-  /**
-  * Whether to ignore trailing slashes when matching paths.
-  * @since 1.6.0
-  */
-  trailingSlashInsensitive: boolean;
-  /**
-  * Create a new {@link Router}.
-  * @param options Options for the router.
-  */
-  constructor(options?: RouterOptions);
-  clone(): Router;
-  /**
-  * Checks if a path name exists in the router.
-  * @param name The name of the path.
-  * @returns `true` if the path name exists, otherwise `false`.
-  */
-  has(name: string): boolean;
-  /**
-  * Adds a new path rule to the router.
-  * @param template The path pattern.
-  * @param name The name of the path.
-  * @returns The names of the variables in the path pattern.
-  */
-  add(template: string, name: string): Set<string>;
-  /**
-  * Resolves a path name and values from a URL, if any match.
-  * @param url The URL to resolve.
-  * @returns The name of the path and its values, if any match.  Otherwise,
-  *          `null`.
-  */
-  route(url: string): RouterRouteResult | null;
-  /**
-  * Constructs a URL/path from a path name and values.
-  * @param name The name of the path.
-  * @param values The values to expand the path with.
-  * @returns The URL/path, if the name exists.  Otherwise, `null`.
-  */
-  build(name: string, values: Record<string, string>): string | null;
-}
-/**
-* An error thrown by the {@link Router}.
-*/
-declare class RouterError extends Error {
-  /**
-  * Create a new {@link RouterError}.
-  * @param message The error message.
-  */
-  constructor(message: string);
-}
-//#endregion
 //#region src/federation/builder.d.ts
 /**
 * Creates a new {@link FederationBuilder} instance.
@@ -2665,4 +2581,4 @@ interface ActorKeyPair extends CryptoKeyPair {
   readonly multikey: Multikey;
 }
 //#endregion
-export { CollectionCursor as $, FederationKvPrefixes as A, Router as B, IdempotencyKeyCallback as C, ObjectCallbackSetters as D, InboxListenerSetters as E, RetryContext as F, respondWithObject as G, RouterOptions as H, RetryPolicy as I, ActorDispatcher as J, respondWithObjectIfAcceptable as K, createExponentialBackoffPolicy as L, FederationQueueOptions as M, createFederation as N, OutboxListenerSetters as O, CreateExponentialBackoffPolicyOptions as P, CollectionCounter as Q, Message as R, FederationStartQueueOptions as S, ActivityTransformer as St, InboxChallengePolicy as T, RouterRouteResult as U, RouterError as V, RespondWithObjectOptions as W, ActorKeyPairsDispatcher as X, ActorHandleMapper as Y, AuthorizePredicate as Z, Federatable as _, SendActivityError as _t, GetSignedKeyOptions as a, InboxListener as at, FederationFetchOptions as b, buildCollectionSynchronizationHeader as bt, ParseUriResult as c, ObjectDispatcher as ct, SendActivityOptions as d, OutboxListenerErrorHandler as dt, CollectionDispatcher as et, SendActivityOptionsForCollection as f, OutboxPermanentFailureHandler as ft, CustomCollectionCallbackSetters as g, WebFingerLinksDispatcher as gt, ConstructorWithTypeId as h, UnverifiedActivityReason as ht, GetActorOptions as i, InboxErrorHandler as it, FederationOrigin as j, Rfc6570Expression as k, RequestContext as l, OutboxErrorHandler as lt, CollectionCallbackSetters as m, UnverifiedActivityHandler as mt, Context as n, CustomCollectionCursor as nt, InboxContext as o, NodeInfoDispatcher as ot, ActorCallbackSetters as p, SharedInboxKeyDispatcher as pt, ActorAliasMapper as q, ForwardActivityOptions as r, CustomCollectionDispatcher as rt, OutboxContext as s, ObjectAuthorizePredicate as st, ActorKeyPair as t, CustomCollectionCounter as tt, RouteActivityOptions as u, OutboxListener as ut, Federation as v, SenderKeyPair as vt, IdempotencyStrategy as w, FederationOptions as x, digest as xt, FederationBuilder as y, PageItems as yt, createFederationBuilder as z };
+export { CustomCollectionDispatcher as $, FederationKvPrefixes as A, RespondWithObjectOptions as B, IdempotencyKeyCallback as C, ObjectCallbackSetters as D, InboxListenerSetters as E, RetryContext as F, ActorHandleMapper as G, respondWithObjectIfAcceptable as H, RetryPolicy as I, CollectionCounter as J, ActorKeyPairsDispatcher as K, createExponentialBackoffPolicy as L, FederationQueueOptions as M, createFederation as N, OutboxListenerSetters as O, CreateExponentialBackoffPolicyOptions as P, CustomCollectionCursor as Q, Message as R, FederationStartQueueOptions as S, InboxChallengePolicy as T, ActorAliasMapper as U, respondWithObject as V, ActorDispatcher as W, CollectionDispatcher as X, CollectionCursor as Y, CustomCollectionCounter as Z, Federatable as _, digest as _t, GetSignedKeyOptions as a, OutboxErrorHandler as at, FederationFetchOptions as b, ParseUriResult as c, OutboxPermanentFailureHandler as ct, SendActivityOptions as d, UnverifiedActivityReason as dt, InboxErrorHandler as et, SendActivityOptionsForCollection as f, WebFingerLinksDispatcher as ft, CustomCollectionCallbackSetters as g, buildCollectionSynchronizationHeader as gt, ConstructorWithTypeId as h, PageItems as ht, GetActorOptions as i, ObjectDispatcher as it, FederationOrigin as j, Rfc6570Expression as k, RequestContext as l, SharedInboxKeyDispatcher as lt, CollectionCallbackSetters as m, SenderKeyPair as mt, Context as n, NodeInfoDispatcher as nt, InboxContext as o, OutboxListener as ot, ActorCallbackSetters as p, SendActivityError as pt, AuthorizePredicate as q, ForwardActivityOptions as r, ObjectAuthorizePredicate as rt, OutboxContext as s, OutboxListenerErrorHandler as st, ActorKeyPair as t, InboxListener as tt, RouteActivityOptions as u, UnverifiedActivityHandler as ut, Federation as v, ActivityTransformer as vt, IdempotencyStrategy as w, FederationOptions as x, FederationBuilder as y, createFederationBuilder as z };

package/dist/{context-tc6VOOOL.d.cts → context-DI2gRbyN.d.cts}

@@ -8,7 +8,6 @@ import { Activity, Actor, Collection, CryptographicKey, Hashtag, Link, LookupObj
 import { AuthenticatedDocumentLoaderFactory, DocumentLoader, DocumentLoaderFactory, GetUserAgentOptions } from "@fedify/vocab-runtime";
 import { Link as Link$1, LookupWebFingerOptions, ResourceDescriptor } from "@fedify/webfinger";
 import { MeterProvider, Span, Tracer, TracerProvider } from "@opentelemetry/api";
-
 //#region src/compat/types.d.ts
 /**
 * A function that transforms an activity object.
@@ -414,91 +413,6 @@ declare function respondWithObject(object: Object$1, options?: RespondWithObject
 */
 declare function respondWithObjectIfAcceptable(object: Object$1, request: Request, options?: RespondWithObjectOptions): Promise<Response | null>;
 //#endregion
-//#region src/federation/router.d.ts
-/**
-* Options for the {@link Router}.
-* @since 0.12.0
-*/
-interface RouterOptions {
-  /**
-  * Whether to ignore trailing slashes when matching paths.
-  */
-  trailingSlashInsensitive?: boolean;
-}
-/**
-* The result of {@link Router.route} method.
-* @since 1.3.0
-*/
-interface RouterRouteResult {
-  /**
-  * The matched route name.
-  */
-  name: string;
-  /**
-  * The URL template of the matched route.
-  */
-  template: string;
-  /**
-  * The values extracted from the URL.
-  */
-  values: Record<string, string>;
-}
-/**
-* URL router and constructor based on URI Template
-* ([RFC 6570](https://tools.ietf.org/html/rfc6570)).
-*/
-declare class Router {
-  #private;
-  /**
-  * Whether to ignore trailing slashes when matching paths.
-  * @since 1.6.0
-  */
-  trailingSlashInsensitive: boolean;
-  /**
-  * Create a new {@link Router}.
-  * @param options Options for the router.
-  */
-  constructor(options?: RouterOptions);
-  clone(): Router;
-  /**
-  * Checks if a path name exists in the router.
-  * @param name The name of the path.
-  * @returns `true` if the path name exists, otherwise `false`.
-  */
-  has(name: string): boolean;
-  /**
-  * Adds a new path rule to the router.
-  * @param template The path pattern.
-  * @param name The name of the path.
-  * @returns The names of the variables in the path pattern.
-  */
-  add(template: string, name: string): Set<string>;
-  /**
-  * Resolves a path name and values from a URL, if any match.
-  * @param url The URL to resolve.
-  * @returns The name of the path and its values, if any match.  Otherwise,
-  *          `null`.
-  */
-  route(url: string): RouterRouteResult | null;
-  /**
-  * Constructs a URL/path from a path name and values.
-  * @param name The name of the path.
-  * @param values The values to expand the path with.
-  * @returns The URL/path, if the name exists.  Otherwise, `null`.
-  */
-  build(name: string, values: Record<string, string>): string | null;
-}
-/**
-* An error thrown by the {@link Router}.
-*/
-declare class RouterError extends Error {
-  /**
-  * Create a new {@link RouterError}.
-  * @param message The error message.
-  */
-  constructor(message: string);
-}
-//#endregion
 //#region src/federation/builder.d.ts
 /**
 * Creates a new {@link FederationBuilder} instance.
@@ -2665,4 +2579,4 @@ interface ActorKeyPair extends CryptoKeyPair {
   readonly multikey: Multikey;
 }
 //#endregion
-export { CollectionCursor as $, FederationKvPrefixes as A, Router as B, IdempotencyKeyCallback as C, ObjectCallbackSetters as D, InboxListenerSetters as E, RetryContext as F, respondWithObject as G, RouterOptions as H, RetryPolicy as I, ActorDispatcher as J, respondWithObjectIfAcceptable as K, createExponentialBackoffPolicy as L, FederationQueueOptions as M, createFederation as N, OutboxListenerSetters as O, CreateExponentialBackoffPolicyOptions as P, CollectionCounter as Q, Message as R, FederationStartQueueOptions as S, ActivityTransformer as St, InboxChallengePolicy as T, RouterRouteResult as U, RouterError as V, RespondWithObjectOptions as W, ActorKeyPairsDispatcher as X, ActorHandleMapper as Y, AuthorizePredicate as Z, Federatable as _, SendActivityError as _t, GetSignedKeyOptions as a, InboxListener as at, FederationFetchOptions as b, buildCollectionSynchronizationHeader as bt, ParseUriResult as c, ObjectDispatcher as ct, SendActivityOptions as d, OutboxListenerErrorHandler as dt, CollectionDispatcher as et, SendActivityOptionsForCollection as f, OutboxPermanentFailureHandler as ft, CustomCollectionCallbackSetters as g, WebFingerLinksDispatcher as gt, ConstructorWithTypeId as h, UnverifiedActivityReason as ht, GetActorOptions as i, InboxErrorHandler as it, FederationOrigin as j, Rfc6570Expression as k, RequestContext as l, OutboxErrorHandler as lt, CollectionCallbackSetters as m, UnverifiedActivityHandler as mt, Context as n, CustomCollectionCursor as nt, InboxContext as o, NodeInfoDispatcher as ot, ActorCallbackSetters as p, SharedInboxKeyDispatcher as pt, ActorAliasMapper as q, ForwardActivityOptions as r, CustomCollectionDispatcher as rt, OutboxContext as s, ObjectAuthorizePredicate as st, ActorKeyPair as t, CustomCollectionCounter as tt, RouteActivityOptions as u, OutboxListener as ut, Federation as v, SenderKeyPair as vt, IdempotencyStrategy as w, FederationOptions as x, digest as xt, FederationBuilder as y, PageItems as yt, createFederationBuilder as z };
+export { CustomCollectionDispatcher as $, FederationKvPrefixes as A, RespondWithObjectOptions as B, IdempotencyKeyCallback as C, ObjectCallbackSetters as D, InboxListenerSetters as E, RetryContext as F, ActorHandleMapper as G, respondWithObjectIfAcceptable as H, RetryPolicy as I, CollectionCounter as J, ActorKeyPairsDispatcher as K, createExponentialBackoffPolicy as L, FederationQueueOptions as M, createFederation as N, OutboxListenerSetters as O, CreateExponentialBackoffPolicyOptions as P, CustomCollectionCursor as Q, Message as R, FederationStartQueueOptions as S, InboxChallengePolicy as T, ActorAliasMapper as U, respondWithObject as V, ActorDispatcher as W, CollectionDispatcher as X, CollectionCursor as Y, CustomCollectionCounter as Z, Federatable as _, digest as _t, GetSignedKeyOptions as a, OutboxErrorHandler as at, FederationFetchOptions as b, ParseUriResult as c, OutboxPermanentFailureHandler as ct, SendActivityOptions as d, UnverifiedActivityReason as dt, InboxErrorHandler as et, SendActivityOptionsForCollection as f, WebFingerLinksDispatcher as ft, CustomCollectionCallbackSetters as g, buildCollectionSynchronizationHeader as gt, ConstructorWithTypeId as h, PageItems as ht, GetActorOptions as i, ObjectDispatcher as it, FederationOrigin as j, Rfc6570Expression as k, RequestContext as l, SharedInboxKeyDispatcher as lt, CollectionCallbackSetters as m, SenderKeyPair as mt, Context as n, NodeInfoDispatcher as nt, InboxContext as o, OutboxListener as ot, ActorCallbackSetters as p, SendActivityError as pt, AuthorizePredicate as q, ForwardActivityOptions as r, ObjectAuthorizePredicate as rt, OutboxContext as s, OutboxListenerErrorHandler as st, ActorKeyPair as t, InboxListener as tt, RouteActivityOptions as u, UnverifiedActivityHandler as ut, Federation as v, ActivityTransformer as vt, IdempotencyStrategy as w, FederationOptions as x, FederationBuilder as y, createFederationBuilder as z };

package/dist/{context-BAE7AKLA.mjs → context-DVoTs_wM.mjs}

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as RouterError } from "./router-BT_F5748.mjs";
 import { getLogger } from "@logtape/logtape";
 import "@opentelemetry/sdk-trace-base";
 import "@opentelemetry/core";
+import { RouterError } from "@fedify/uri-template";
 import { lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { metrics, trace } from "@opentelemetry/api";

package/dist/{deno--CS-SBS9.mjs → deno-B_9yJW3w.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1131+553b59b8";
+var version = "2.3.0-dev.1137+53a1f26d";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-k6huZLQL.mjs → docloader-BT89tyFr.mjs}

@@ -1,11 +1,11 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { o as validateCryptoKey } from "./key-Df3tMleh.mjs";
-import { n as doubleKnock } from "./http-IywnQdiX.mjs";
+import { o as validateCryptoKey } from "./key-CkkMJBjF.mjs";
+import { n as doubleKnock } from "./http-Cyx5SNuu.mjs";
 import { getLogger } from "@logtape/logtape";
-import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
+import { curry } from "es-toolkit";
 //#region src/utils/docloader.ts
 const logger = getLogger([
 	"fedify",