Replace url-template and uri-template-router with @fedify/uri-template

CHANGES.md

@@ -41,7 +41,13 @@ To be released.
     attributes, and `TraceActivityRecord.activityJson` is present only when the
     span event includes full activity JSON.  [[#316], [#619], [#755]]
 
+ -  Replaced Fedify's internal federation routing with
+    *@fedify/uri-template* for stricter RFC 6570 URI Template expansion and
+    matching.  The deprecated `Router` export from *@fedify/fedify* remains
+    available for compatibility.  [[#418]]
+
 [#316]: https://github.com/fedify-dev/fedify/issues/316
+[#418]: https://github.com/fedify-dev/fedify/issues/418
 [#619]: https://github.com/fedify-dev/fedify/issues/619
 [#735]: https://github.com/fedify-dev/fedify/issues/735
 [#748]: https://github.com/fedify-dev/fedify/pull/748
@@ -60,6 +66,13 @@ To be released.
  -  Added a `meterProvider` option to `createFederation()` so mock contexts can
     expose a test OpenTelemetry meter provider.  [[#316], [#619], [#755]]
 
+### @fedify/uri-template
+
+ -  Added *@fedify/uri-template*, a dependency-free RFC 6570 URI Template
+    implementation for expansion, variable extraction, and round-trip route
+    matching.  This package replaces Fedify's previous direct use of
+    *url-template* and *uri-template-router*.  [[#418]]
+
 ### @fedify/amqp
 
  -  Added `AmqpMessageQueue.getDepth()` for reporting queued, ready, and

cspell.json

@@ -121,6 +121,11 @@
     "urlpattern",
     "uuidv7",
     "valueparser",
+    "varspec",
+    "varname",
+    "varnames",
+    "varchar",
+    "varchars",
     "Vinxi",
     "vitepress",
     "vtsls",

deno.json

@@ -25,6 +25,7 @@
     "./packages/sqlite",
     "./packages/sveltekit",
     "./packages/testing",
+    "./packages/uri-template",
     "./packages/vocab",
     "./packages/vocab-runtime",
     "./packages/vocab-tools",

packages/fedify/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

packages/fedify/package.json

@@ -139,6 +139,7 @@
     }
   },
   "dependencies": {
+    "@fedify/uri-template": "workspace:*",
     "@fedify/vocab": "workspace:*",
     "@fedify/vocab-runtime": "workspace:*",
     "@fedify/webfinger": "workspace:*",

packages/fedify/src/federation/builder.test.ts

@@ -1,4 +1,5 @@
 import { test } from "@fedify/fixture";
+import { RouterError } from "@fedify/uri-template";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { assertEquals, assertExists, assertThrows } from "@std/assert";
 import type { Protocol } from "../nodeinfo/types.ts";
@@ -13,7 +14,6 @@ import type {
 } from "./callback.ts";
 import { MemoryKvStore } from "./kv.ts";
 import type { FederationImpl } from "./middleware.ts";
-import { RouterError } from "./router.ts";
 
 test("FederationBuilder", async (t) => {
   await t.step(
@@ -211,6 +211,27 @@ test("FederationBuilder", async (t) => {
         ),
       RouterError,
     );
+    assertThrows(
+      () =>
+        builderAfterInvalid.setOutboxListeners(
+          "/users/{identifier:3}/outbox" as `${string}{identifier}${string}`,
+        ),
+      RouterError,
+    );
+    assertThrows(
+      () =>
+        builderAfterInvalid.setOutboxListeners(
+          "/users/{identifier*}/outbox" as `${string}{identifier}${string}`,
+        ),
+      RouterError,
+    );
+    assertThrows(
+      () =>
+        builderAfterInvalid.setOutboxListeners(
+          "/users/{identifier,identifier}/outbox" as `${string}{identifier}${string}`,
+        ),
+      RouterError,
+    );
     builderAfterInvalid.setOutboxListeners("/users/{identifier}/outbox");
 
     const builder2 = createFederationBuilder<void>();
@@ -240,6 +261,16 @@ test("FederationBuilder", async (t) => {
         ),
       RouterError,
     );
+
+    const builder5 = createFederationBuilder<void>();
+    assertThrows(
+      () =>
+        builder5.setOutboxDispatcher(
+          "/users/{identifier:3}/outbox" as `${string}{identifier}${string}`,
+          () => ({ items: [] }),
+        ),
+      RouterError,
+    );
   });
 
   await t.step("should pass build options correctly", async () => {