@fedify/fedify 1.8.1-pr.315.1091 → 1.8.1-pr.315.1275

package/dist/{docloader-BindvZ7y.js → docloader-BLgRerm3.js}

@@ -10,22 +10,23 @@ import { isIP } from "node:net";
 
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "1.8.1-pr.315.1091+6219e632";
+var version = "1.8.1-pr.315.1275+37d811f6";
 var license = "MIT";
 var exports = {
-	".": "./mod.ts",
-	"./compat": "./compat/mod.ts",
-	"./federation": "./federation/mod.ts",
-	"./nodeinfo": "./nodeinfo/mod.ts",
-	"./runtime": "./runtime/mod.ts",
-	"./sig": "./sig/mod.ts",
-	"./vocab": "./vocab/mod.ts",
-	"./webfinger": "./webfinger/mod.ts",
-	"./x/cfworkers": "./x/cfworkers.ts",
-	"./x/denokv": "./x/denokv.ts",
-	"./x/fresh": "./x/fresh.ts",
-	"./x/hono": "./x/hono.ts",
-	"./x/sveltekit": "./x/sveltekit.ts"
+	".": "./src/mod.ts",
+	"./compat": "./src/compat/mod.ts",
+	"./federation": "./src/federation/mod.ts",
+	"./nodeinfo": "./src/nodeinfo/mod.ts",
+	"./runtime": "./src/runtime/mod.ts",
+	"./sig": "./src/sig/mod.ts",
+	"./testing": "./src/testing/mod.ts",
+	"./vocab": "./src/vocab/mod.ts",
+	"./webfinger": "./src/webfinger/mod.ts",
+	"./x/cfworkers": "./src/x/cfworkers.ts",
+	"./x/denokv": "./src/x/denokv.ts",
+	"./x/fresh": "./src/x/fresh.ts",
+	"./x/hono": "./src/x/hono.ts",
+	"./x/sveltekit": "./src/x/sveltekit.ts"
 };
 var imports = {
 	"@cfworker/json-schema": "npm:@cfworker/json-schema@^4.1.1",
@@ -50,33 +51,33 @@ var imports = {
 	"uri-template-router": "npm:uri-template-router@^0.0.17",
 	"url-template": "npm:url-template@^3.1.1"
 };
-var include = ["vocab/vocab.ts"];
+var include = ["src/vocab/vocab.ts"];
 var exclude = [
 	".test-report.xml",
 	"apidoc/",
-	"cfworkers/dist/",
-	"cfworkers/fixtures/",
-	"cfworkers/imports.ts",
-	"cfworkers/README.md",
-	"cfworkers/server.ts",
-	"cfworkers/server.js",
-	"cfworkers/server.js.map",
-	"codegen/schema.yaml",
 	"dist/",
 	"node_modules/",
 	"npm/",
 	"pnpm-lock.yaml",
-	"vocab/*.yaml",
-	"!vocab/vocab.ts"
+	"src/cfworkers/dist/",
+	"src/cfworkers/fixtures/",
+	"src/cfworkers/imports.ts",
+	"src/cfworkers/README.md",
+	"src/cfworkers/server.ts",
+	"src/cfworkers/server.js",
+	"src/cfworkers/server.js.map",
+	"src/codegen/schema.yaml",
+	"src/vocab/*.yaml",
+	"!src/vocab/vocab.ts"
 ];
 var tasks = {
-	"codegen": "deno run --allow-read --allow-write --check codegen/main.ts vocab/ ../runtime/ > vocab/.vocab.ts && deno fmt vocab/.vocab.ts && mv vocab/.vocab.ts vocab/vocab.ts && deno cache vocab/vocab.ts && deno check vocab/vocab.ts",
+	"codegen": "GENPATH=vocab-$(deno eval \"console.log(crypto.randomUUID());\").ts && deno run --allow-read --allow-write --check src/codegen/main.ts src/vocab/ ../runtime/ src/vocab/$GENPATH && deno fmt src/vocab/$GENPATH && mv src/vocab/$GENPATH src/vocab/vocab.ts && deno cache src/vocab/vocab.ts && deno check src/vocab/vocab.ts",
 	"cache": {
-		"command": "deno cache mod.ts",
+		"command": "deno cache src/mod.ts",
 		"dependencies": ["codegen"]
 	},
 	"check": {
-		"command": "deno fmt --check && deno lint && deno check */*.ts",
+		"command": "deno fmt --check && deno lint && deno check src/**/*.ts",
 		"dependencies": ["codegen"]
 	},
 	"test": {
@@ -89,7 +90,7 @@ var tasks = {
 		"dependencies": ["codegen"]
 	},
 	"apidoc": {
-		"command": "deno doc --html --name=Fedify --output=apidoc/ mod.ts",
+		"command": "deno doc --html --name=Fedify --output=apidoc/ src/mod.ts",
 		"dependencies": ["codegen"]
 	},
 	"publish": {
@@ -110,7 +111,7 @@ var tasks = {
 		"dependencies": ["pnpm:build"]
 	},
 	"test:cfworkers": {
-		"command": "pnpm exec wrangler deploy --dry-run --outdir cfworkers && node --import=tsx cfworkers/client.ts",
+		"command": "pnpm exec wrangler deploy --dry-run --outdir src/cfworkers && node --import=tsx src/cfworkers/client.ts",
 		"dependencies": ["pnpm:build"]
 	},
 	"test-all": { "dependencies": [
@@ -133,7 +134,7 @@ var deno_default = {
 };
 
 //#endregion
-//#region runtime/contexts.ts
+//#region src/runtime/contexts.ts
 const preloadedContexts = {
 	"https://www.w3.org/ns/activitystreams": { "@context": {
 		"@vocab": "_:",
@@ -4244,7 +4245,7 @@ const preloadedContexts = {
 var contexts_default = preloadedContexts;
 
 //#endregion
-//#region runtime/url.ts
+//#region src/runtime/url.ts
 var UrlError = class extends Error {
 	constructor(message) {
 		super(message);
@@ -4303,7 +4304,7 @@ function expandIPv6Address(address) {
 }
 
 //#endregion
-//#region runtime/docloader.ts
+//#region src/runtime/docloader.ts
 const logger = getLogger([
 	"fedify",
 	"runtime",
@@ -4464,8 +4465,8 @@ async function getRemoteDocument(url, response, fetch$1) {
 * @since 1.3.0
 */
 function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAgent } = {}) {
-	async function load(url, _options) {
-		if (_options?.signal?.aborted) throw new DOMException("Aborted", "AbortError");
+	async function load(url, options) {
+		options?.signal?.throwIfAborted();
 		if (!skipPreloadedContexts && url in contexts_default) {
 			logger.debug("Using preloaded context: {url}.", { url });
 			return {
@@ -4487,9 +4488,9 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 		logRequest(request);
 		const response = await fetch(request, {
 			redirect: "manual",
-			signal: _options?.signal
+			signal: options?.signal
 		});
-		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return load(response.headers.get("Location"), _options);
+		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return load(response.headers.get("Location"), options);
 		return getRemoteDocument(url, response, load);
 	}
 	return load;
@@ -4525,9 +4526,9 @@ function kvCache({ loader, kv, prefix, rules }) {
 		}
 		return null;
 	}
-	return async (url, _options) => {
+	return async (url, options) => {
 		const match = matchRule(url);
-		if (match == null) return await loader(url);
+		if (match == null) return await loader(url, options);
 		const key = [...keyPrefix, url];
 		let cache = void 0;
 		try {
@@ -4539,7 +4540,7 @@ function kvCache({ loader, kv, prefix, rules }) {
 			});
 		}
 		if (cache == null) {
-			const remoteDoc = await loader(url);
+			const remoteDoc = await loader(url, options);
 			try {
 				await kv.set(key, remoteDoc, { ttl: match });
 			} catch (error) {

package/dist/{docloader-DtGccyuM.d.ts → docloader-DJT1UZH4.d.ts}

@@ -1,8 +1,8 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { KvKey, KvStore } from "./kv-DDdb1hMa.js";
+import { KvKey, KvStore } from "./kv-C7sopW2E.js";
 
-//#region runtime/docloader.d.ts
+//#region src/runtime/docloader.d.ts
 /**
  * A remote JSON-LD document and its context fetched by
  * a {@link DocumentLoader}.
@@ -26,6 +26,9 @@ interface RemoteDocument {
  * @since 1.8.0
  */
 interface DocumentLoaderOptions {
+  /**
+   * An `AbortSignal` for cancellation.
+   */
   signal?: AbortSignal;
 }
 /**

package/dist/{esm-d-9EVGaP.js → esm-CRotYXVH.js}

@@ -3,10 +3,10 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { __commonJS, __toESM } from "./chunk-HsBuZ-b2.js";
+import { __commonJS, __toESM } from "./type-DHDlfpLg.js";
 
-//#region ../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js
-var require_glob_to_regexp = __commonJS({ "../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js"(exports, module) {
+//#region ../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js
+var require_glob_to_regexp = __commonJS({ "../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js"(exports, module) {
 	module.exports = function(glob$1, opts) {
 		if (typeof glob$1 !== "string") throw new TypeError("Expected a string");
 		var str = String(glob$1);
@@ -83,7 +83,7 @@ var require_glob_to_regexp = __commonJS({ "../node_modules/.pnpm/glob-to-regexp@
 } });
 
 //#endregion
-//#region ../node_modules/.pnpm/regexparam@3.0.0/node_modules/regexparam/dist/index.mjs
+//#region ../../node_modules/.pnpm/regexparam@3.0.0/node_modules/regexparam/dist/index.mjs
 /**
 * @param {string|RegExp} input The route pattern
 * @param {boolean} [loose] Allow open-ended matching. Ignored with `RegExp` input.
@@ -115,7 +115,7 @@ function parse(input, loose) {
 }
 
 //#endregion
-//#region ../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/TypeDescriptor.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/TypeDescriptor.js
 const valueTypes = new Set([
 	"boolean",
 	"number",
@@ -207,7 +207,7 @@ var TypeDescriptor = class TypeDescriptor {
 };
 
 //#endregion
-//#region ../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/IsSubsetOf.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/IsSubsetOf.js
 const allowedTypes = new Set([
 	"array",
 	"object",
@@ -303,7 +303,7 @@ isSubsetOf.structural = function(subset, superset, visited = []) {
 };
 
 //#endregion
-//#region ../node_modules/.pnpm/dequal@2.0.3/node_modules/dequal/dist/index.mjs
+//#region ../../node_modules/.pnpm/dequal@2.0.3/node_modules/dequal/dist/index.mjs
 var has = Object.prototype.hasOwnProperty;
 function find(iter, tar, key) {
 	for (key of iter.keys()) if (dequal(key, tar)) return key;
@@ -366,7 +366,7 @@ function dequal(foo, bar) {
 }
 
 //#endregion
-//#region ../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/RequestUtils.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/RequestUtils.js
 const absoluteUrlRX = new RegExp("^[a-z]+://|^data:", "i");
 const protocolRelativeUrlRX = new RegExp("^//", "i");
 function hasCredentialsInUrl(url) {
@@ -444,7 +444,7 @@ function normalizeHeaders(headers) {
 }
 
 //#endregion
-//#region ../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/Matchers.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/Matchers.js
 var import_glob_to_regexp = __toESM(require_glob_to_regexp(), 1);
 const isUrlMatcher = (matcher) => matcher instanceof RegExp || typeof matcher === "string" || typeof matcher === "object" && "href" in matcher;
 const isFunctionMatcher = (matcher) => typeof matcher === "function";
@@ -627,7 +627,7 @@ const builtInMatchers = [
 ];
 
 //#endregion
-//#region ../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/StatusTextMap.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/StatusTextMap.js
 const statusTextMap = {
 	100: "Continue",
 	101: "Switching Protocols",
@@ -695,7 +695,7 @@ const statusTextMap = {
 var StatusTextMap_default = statusTextMap;
 
 //#endregion
-//#region ../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/Route.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/Route.js
 var __classPrivateFieldSet = void 0 && (void 0).__classPrivateFieldSet || function(receiver, state, value, kind, f) {
 	if (kind === "m") throw new TypeError("Private method is not writable");
 	if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
@@ -829,7 +829,7 @@ builtInMatchers.forEach(Route.defineMatcher);
 var Route_default = Route;
 
 //#endregion
-//#region ../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/Router.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/Router.js
 const responseConfigProps = [
 	"body",
 	"headers",
@@ -1002,7 +1002,7 @@ var Router = class {
 };
 
 //#endregion
-//#region ../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/CallHistory.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/CallHistory.js
 const isName = (filter) => typeof filter === "string" && /^[\da-zA-Z-]+$/.test(filter) && !["matched", "unmatched"].includes(filter);
 const isMatchedOrUnmatched = (filter) => typeof filter === "boolean" || ["matched", "unmatched"].includes(filter);
 var CallHistory = class {
@@ -1087,7 +1087,7 @@ var CallHistory = class {
 var CallHistory_default = CallHistory;
 
 //#endregion
-//#region ../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/FetchMock.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/FetchMock.js
 const defaultFetchMockConfig = {
 	includeContentLength: true,
 	matchPartialBody: false,
@@ -1220,7 +1220,7 @@ const fetchMock = new FetchMock({ ...defaultFetchMockConfig });
 var FetchMock_default = fetchMock;
 
 //#endregion
-//#region ../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/index.js
+//#region ../../node_modules/.pnpm/fetch-mock@12.5.3/node_modules/fetch-mock/dist/esm/index.js
 var esm_default = FetchMock_default;
 
 //#endregion

package/dist/federation/builder.test.js

@@ -3,28 +3,23 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { assertEquals } from "../assert_equals-C5gKCm6A.js";
-import "../assert-DwEa6glZ.js";
-import "../assert_instance_of-C9QtN-X9.js";
-import { MemoryKvStore } from "../kv-D7Yt6pnB.js";
-import "../docloader-CJ7eOrpZ.js";
-import "../url-kTAI6_KP.js";
-import { parseSemVer } from "../semver-DWClQt_5.js";
-import "../router-D3UybECj.js";
-import "../multibase-DeCHcK8L.js";
-import { Activity, Note, Person } from "../vocab-dw0HG0EQ.js";
-import "../langstr-DbWheeIS.js";
-import "../type-D2s5lmbZ.js";
-import "../inbox-BB6ajp8P.js";
-import { createFederationBuilder } from "../builder-Js_TKEl1.js";
-import { test } from "../testing-BZ0dJ4qn.js";
-import { assertExists } from "../std__assert-B3iAixc-.js";
-import "../assert_rejects-DceVjUlD.js";
-import "../assert_is_error-DQdKoRgb.js";
-import "../assert_not_equals-7pyUM3Ib.js";
-import "../assert_throws-DTDC_gwN.js";
+import { Activity, Note, Person } from "../type-DHDlfpLg.js";
+import { assertEquals } from "../assert_equals-DSbWqCm3.js";
+import "../assert-MZs1qjMx.js";
+import "../assert_instance_of-DHz7EHNU.js";
+import { MemoryKvStore } from "../kv-CRZrzyXm.js";
+import { parseSemVer } from "../semver-dArNLkR9.js";
+import "../lookup-BGA_VdZm.js";
+import "../inbox-CpONbSbQ.js";
+import { createFederationBuilder } from "../builder-B-wZuoFJ.js";
+import { test } from "../testing-A4u9tSVX.js";
+import { assertExists } from "../std__assert-X-_kMxKM.js";
+import "../assert_rejects-DiIiJbZn.js";
+import "../assert_is_error-BPGph1Jx.js";
+import "../assert_not_equals-f3m3epl3.js";
+import { assertThrows } from "../assert_throws-BOO88avQ.js";
 
-//#region federation/builder.test.ts
+//#region src/federation/builder.test.ts
 test("FederationBuilder", async (t) => {
 	await t.step("should build a Federation object with registered components", async () => {
 		const builder = createFederationBuilder();
@@ -155,6 +150,25 @@ test("FederationBuilder", async (t) => {
 		assertEquals(personRoute?.name, `object:${Person.typeId.href}`);
 		assertEquals(personRoute?.values.id, "abc");
 	});
+	await t.step("should handle symbol names uniquely in custom collection dispatchers", () => {
+		const builder = createFederationBuilder();
+		const unnamedSymbol1 = Symbol();
+		const unnamedSymbol2 = Symbol();
+		const namedSymbol1 = Symbol.for("");
+		const namedSymbol2 = Symbol.for("");
+		const strId = String(unnamedSymbol1);
+		const dispatcher = (_ctx, _params) => ({ items: [] });
+		builder.setCollectionDispatcher(unnamedSymbol1, Note, "/unnamed-symbol1/{id}", dispatcher);
+		assertThrows(() => {
+			builder.setCollectionDispatcher(unnamedSymbol1, Note, "/unnamed-symbol1-duplicate/{id}", dispatcher);
+		}, Error, "Collection dispatcher for Symbol() already set.");
+		builder.setCollectionDispatcher(unnamedSymbol2, Note, "/unnamed-symbol2/{id}", dispatcher);
+		builder.setCollectionDispatcher(namedSymbol1, Note, "/named-symbol/{id}", dispatcher);
+		assertThrows(() => {
+			builder.setCollectionDispatcher(namedSymbol2, Note, "/named-symbol/{id}", dispatcher);
+		});
+		builder.setCollectionDispatcher(strId, Note, "/string-id/{id}", dispatcher);
+	});
 });
 
 //#endregion

package/dist/federation/collection.test.js

@@ -3,19 +3,21 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { assertEquals } from "../assert_equals-C5gKCm6A.js";
-import "../assert-DwEa6glZ.js";
-import "../assert_instance_of-C9QtN-X9.js";
-import { buildCollectionSynchronizationHeader, digest } from "../collection-Dfb0TPno.js";
-import { test } from "../testing-BZ0dJ4qn.js";
-import "../std__assert-B3iAixc-.js";
-import "../assert_rejects-DceVjUlD.js";
-import "../assert_is_error-DQdKoRgb.js";
-import "../assert_not_equals-7pyUM3Ib.js";
-import "../assert_throws-DTDC_gwN.js";
+import "../type-DHDlfpLg.js";
+import { assertEquals } from "../assert_equals-DSbWqCm3.js";
+import "../assert-MZs1qjMx.js";
+import "../assert_instance_of-DHz7EHNU.js";
+import "../lookup-BGA_VdZm.js";
+import { buildCollectionSynchronizationHeader, digest } from "../collection-CSzG2j1P.js";
+import { test } from "../testing-A4u9tSVX.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 { decodeHex } from "byte-encodings/hex";
 
-//#region federation/collection.test.ts
+//#region src/federation/collection.test.ts
 test("digest()", async () => {
 	const uris = [
 		new URL("https://testing.example.org/users/1"),