@fedify/fedify 2.3.0-dev.1119 → 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-Ond_h57y.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-DVsHS7rA.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-BDKFRjue.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 { kt as ActivityTransformer, n as Context } from "../context-Ch-ZLyTQ.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 { kt as ActivityTransformer, n as Context } from "../context-cSUMk2da.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-t0jC8I99.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