@fedify/vocab-runtime 2.0.31-dev.2308 → 2.0.31-dev.2316

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.0.31-dev.2308+34090b3a",
+  "version": "2.0.31-dev.2316+06462f7c",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",
@@ -34,6 +34,6 @@
   },
   "tasks": {
     "check": "deno fmt --check && deno lint && deno check src/*.ts",
-    "test": "deno test"
+    "test": "deno test --allow-net --allow-env=LOG"
   }
 }

package/dist/mod.cjs

@@ -4496,7 +4496,7 @@ const preloadedContexts = {
 		"suspended": "toot:suspended",
 		"attributionDomains": {
 			"@id": "toot:attributionDomains",
-			"@type": "@id"
+			"@container": "@set"
 		}
 	} },
 	"https://purl.archive.org/miscellany": miscellany_default
@@ -4504,7 +4504,7 @@ const preloadedContexts = {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.31-dev.2308+34090b3a";
+var version = "2.0.31-dev.2316+06462f7c";
 //#endregion
 //#region src/request.ts
 /**

package/dist/mod.js

@@ -4491,7 +4491,7 @@ const preloadedContexts = {
 		"suspended": "toot:suspended",
 		"attributionDomains": {
 			"@id": "toot:attributionDomains",
-			"@type": "@id"
+			"@container": "@set"
 		}
 	} },
 	"https://purl.archive.org/miscellany": miscellany_default
@@ -4499,7 +4499,7 @@ const preloadedContexts = {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.31-dev.2308+34090b3a";
+var version = "2.0.31-dev.2316+06462f7c";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/{body-DGmcZ1Kz.cjs → body-BLtrczC8.cjs}

@@ -1,5 +1,5 @@
 require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-Ban3HXuI.cjs");
+const require_request = require("./request-BdKDFsbY.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/{body-Bx6-vXo_.mjs → body-PONsC2hg.mjs}

@@ -1,4 +1,4 @@
-import { t as FetchError } from "./request-BV7yaWdl.mjs";
+import { t as FetchError } from "./request-BD0HpfwZ.mjs";
 import { getLogger } from "@logtape/logtape";
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/body.test.cjs

@@ -1,5 +1,5 @@
 require("./chunk-Do9eywBl.cjs");
-const require_body = require("./body-DGmcZ1Kz.cjs");
+const require_body = require("./body-BLtrczC8.cjs");
 let node_assert_strict = require("node:assert/strict");
 let node_test = require("node:test");
 let node_zlib = require("node:zlib");

package/dist/tests/body.test.mjs

@@ -1,4 +1,4 @@
-import { r as readBoundedText, t as BodyTooLargeError } from "./body-Bx6-vXo_.mjs";
+import { r as readBoundedText, t as BodyTooLargeError } from "./body-PONsC2hg.mjs";
 import { deepStrictEqual, ok, rejects } from "node:assert/strict";
 import { test } from "node:test";
 import { gunzipSync, gzipSync } from "node:zlib";

package/dist/tests/docloader.test.cjs

@@ -1,14 +1,14 @@
 const require_chunk = require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-Ban3HXuI.cjs");
-const require_body = require("./body-DGmcZ1Kz.cjs");
+const require_request = require("./request-BdKDFsbY.cjs");
+const require_body = require("./body-BLtrczC8.cjs");
 const require_link = require("./link-FguCydMA.cjs");
 const require_url = require("./url-Qk1svKZU.cjs");
-let node_test = require("node:test");
 let node_zlib = require("node:zlib");
 let _logtape_logtape = require("@logtape/logtape");
 let node_assert = require("node:assert");
 let node_dns_promises = require("node:dns/promises");
 node_dns_promises = require_chunk.__toESM(node_dns_promises);
+let _fedify_fixture = require("@fedify/fixture");
 let node_http = require("node:http");
 let _opentelemetry_api = require("@opentelemetry/api");
 let jsonld_dist_jsonld_esm_js = require("jsonld/dist/jsonld.esm.js");
@@ -5695,7 +5695,7 @@ const preloadedContexts = {
 		"suspended": "toot:suspended",
 		"attributionDomains": {
 			"@id": "toot:attributionDomains",
-			"@type": "@id"
+			"@container": "@set"
 		}
 	} },
 	"https://purl.archive.org/miscellany": miscellany_default
@@ -5906,7 +5906,7 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 //#endregion
 //#region src/docloader.test.ts
-(0, node_test.test)("new FetchError()", () => {
+(0, _fedify_fixture.test)("new FetchError()", () => {
 	const e = new require_request.FetchError("https://example.com/", "An error message.");
 	(0, node_assert.deepStrictEqual)(e.name, "FetchError");
 	(0, node_assert.deepStrictEqual)(e.url, new URL("https://example.com/"));
@@ -5915,7 +5915,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 	(0, node_assert.deepStrictEqual)(e2.url, new URL("https://example.org/"));
 	(0, node_assert.deepStrictEqual)(e2.message, "https://example.org/");
 });
-(0, node_test.test)("getDocumentLoader()", async (t) => {
+(0, _fedify_fixture.test)("getDocumentLoader()", async (t) => {
 	const fetchDocumentLoader = getDocumentLoader();
 	esm_default.spyGlobal();
 	esm_default.get("https://example.com/object", { body: {
@@ -5924,7 +5924,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		name: "Fetched object",
 		type: "Object"
 	} });
-	await t.test("ok", async () => {
+	await t.step("ok", async () => {
 		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader("https://example.com/object"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/object",
@@ -5967,7 +5967,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 			Link: "<https://example.com/object>; rel=\"alternate\"; type=\"application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"\""
 		}
 	});
-	await t.test("Link header", async () => {
+	await t.step("Link header", async () => {
 		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader("https://example.com/link-ctx"), {
 			contextUrl: "https://www.w3.org/ns/activitystreams",
 			documentUrl: "https://example.com/link-ctx",
@@ -5988,7 +5988,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 			}
 		});
 	});
-	await t.test("Link header relative url", async () => {
+	await t.step("Link header relative url", async () => {
 		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader("https://example.com/link-ctx"), {
 			contextUrl: "https://www.w3.org/ns/activitystreams",
 			documentUrl: "https://example.com/link-ctx",
@@ -6009,7 +6009,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 			}
 		});
 	});
-	await t.test("wrong Link header syntax", async () => {
+	await t.step("wrong Link header syntax", async () => {
 		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader("https://example.com/obj-w-wrong-link"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/obj-w-wrong-link",
@@ -6033,7 +6033,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
       </html>`,
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("HTML <link>", async () => {
+	await t.step("HTML <link>", async () => {
 		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader("https://example.com/html-link"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/object",
@@ -6057,7 +6057,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
       </html>`,
 		headers: { "Content-Type": "application/xhtml+xml; charset=utf-8" }
 	});
-	await t.test("XHTML <link>", async () => {
+	await t.step("XHTML <link>", async () => {
 		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader("https://example.com/xhtml-link"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/object",
@@ -6083,7 +6083,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
       </html>`,
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("HTML <a>", async () => {
+	await t.step("HTML <a>", async () => {
 		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader("https://example.com/html-a"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/object",
@@ -6104,7 +6104,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		},
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("Wrong Content-Type", async () => {
+	await t.step("Wrong Content-Type", async () => {
 		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader("https://example.com/wrong-content-type"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/wrong-content-type",
@@ -6117,18 +6117,33 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		});
 	});
 	esm_default.get("https://example.com/404", { status: 404 });
-	await t.test("not ok", async () => {
+	await t.step("not ok", async () => {
 		await (0, node_assert.rejects)(() => fetchDocumentLoader("https://example.com/404"), require_request.FetchError, "HTTP 404: https://example.com/404");
 	});
-	await t.test("preloaded contexts", async () => {
+	await t.step("preloaded contexts", async () => {
 		for (const [url, document] of Object.entries(preloadedContexts)) (0, node_assert.deepStrictEqual)(await fetchDocumentLoader(url), {
 			contextUrl: null,
 			documentUrl: url,
 			document
 		});
 	});
+	await t.step("preloaded Mastodon attribution domains", async () => {
+		const context = ["https://www.w3.org/ns/activitystreams", "http://joinmastodon.org/ns"];
+		const expanded = await jsonld_default.expand({
+			"@context": context,
+			id: "https://social.example/users/alice",
+			type: "Person",
+			attributionDomains: ["blog.example"]
+		}, { documentLoader: fetchDocumentLoader });
+		(0, node_assert.deepStrictEqual)(expanded, [{
+			"@id": "https://social.example/users/alice",
+			"@type": ["https://www.w3.org/ns/activitystreams#Person"],
+			"http://joinmastodon.org/ns#attributionDomains": [{ "@value": "blog.example" }]
+		}]);
+		(0, node_assert.deepStrictEqual)((await jsonld_default.compact(expanded, context, { documentLoader: fetchDocumentLoader })).attributionDomains, ["blog.example"]);
+	});
 	esm_default.get("https://www.w3.org/ns/cid/v1", { status: 503 });
-	await t.test("preloaded CID v1 context", async () => {
+	await t.step("preloaded CID v1 context", async () => {
 		const url = "https://www.w3.org/ns/cid/v1";
 		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader(url), {
 			contextUrl: null,
@@ -6136,7 +6151,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 			document: cid_v1_default
 		});
 	});
-	await t.test("preloaded FEP-ef61 context", async () => {
+	await t.step("preloaded FEP-ef61 context", async () => {
 		const url = "https://w3id.org/fep/ef61";
 		(0, node_assert.ok)(url in preloadedContexts);
 		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader(url), {
@@ -6153,7 +6168,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		});
 	});
 	esm_default.get("https://w3id.org/fep/7aa9", { status: 502 });
-	await t.test("preloaded FEP-7aa9 context", async () => {
+	await t.step("preloaded FEP-7aa9 context", async () => {
 		const url = "https://w3id.org/fep/7aa9";
 		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader(url), {
 			contextUrl: null,
@@ -6184,7 +6199,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		(0, node_assert.deepStrictEqual)(esm_default.callHistory.calls(url).length, 0);
 	});
 	esm_default.get("https://w3id.org/fep/6757", { status: 502 });
-	await t.test("preloaded FEP-6757 context", async () => {
+	await t.step("preloaded FEP-6757 context", async () => {
 		const url = "https://w3id.org/fep/6757";
 		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader(url), {
 			contextUrl: null,
@@ -6213,7 +6228,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		(0, node_assert.deepStrictEqual)(esm_default.callHistory.calls(url).length, 0);
 	});
 	esm_default.get("https://w3id.org/fep/22cd", { status: 502 });
-	await t.test("preloaded FEP-22cd context", async () => {
+	await t.step("preloaded FEP-22cd context", async () => {
 		const url = "https://w3id.org/fep/22cd";
 		const articleId = "https://example.com/articles/1";
 		const translatorId = "https://example.com/users/alice";
@@ -6291,7 +6306,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		(0, node_assert.deepStrictEqual)(esm_default.callHistory.calls(url).length, 0);
 		(0, node_assert.deepStrictEqual)(esm_default.callHistory.calls("https://www.w3.org/ns/activitystreams").length, 0);
 	});
-	await t.test("deny non-HTTP/HTTPS", async () => {
+	await t.step("deny non-HTTP/HTTPS", async () => {
 		await (0, node_assert.rejects)(() => fetchDocumentLoader("ftp://localhost"), require_url.UrlError);
 	});
 	esm_default.get("https://example.com/localhost-redirect", {
@@ -6316,13 +6331,13 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		name: "Fetched object",
 		type: "Object"
 	} });
-	await t.test("allowPrivateAddress: false", async () => {
+	await t.step("allowPrivateAddress: false", async () => {
 		await (0, node_assert.rejects)(() => fetchDocumentLoader("https://localhost/object"), require_url.UrlError);
 		await (0, node_assert.rejects)(() => fetchDocumentLoader("https://example.com/localhost-redirect"), require_url.UrlError);
 		await (0, node_assert.rejects)(() => fetchDocumentLoader("https://example.com/localhost-link"), require_url.UrlError);
 	});
 	const fetchDocumentLoader2 = getDocumentLoader({ allowPrivateAddress: true });
-	await t.test("allowPrivateAddress: true", async () => {
+	await t.step("allowPrivateAddress: true", async () => {
 		const expected = {
 			contextUrl: null,
 			documentUrl: "https://localhost/object",
@@ -6345,7 +6360,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 			headers: { Location: `https://example.com/too-many-redirects/${Number(cl.url.split("/").at(-1)) + 1}` }
 		};
 	});
-	await t.test("too many redirects", async () => {
+	await t.step("too many redirects", async () => {
 		redirectAttempts = 0;
 		await (0, node_assert.rejects)(() => fetchDocumentLoader("https://example.com/too-many-redirects/0"), require_request.FetchError, "Too many redirections");
 		(0, node_assert.deepStrictEqual)(redirectAttempts, 21);
@@ -6365,7 +6380,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 			headers: { Location: "https://example.com/redirect-loop-a" }
 		};
 	});
-	await t.test("redirect loop", async () => {
+	await t.step("redirect loop", async () => {
 		loopAttempts = 0;
 		await (0, node_assert.rejects)(() => fetchDocumentLoader("https://example.com/redirect-loop-a"), require_request.FetchError, "Redirect loop detected");
 		(0, node_assert.deepStrictEqual)(loopAttempts, 2);
@@ -6378,7 +6393,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 			headers: { Location: "/redirect-loop-relative" }
 		};
 	});
-	await t.test("redirect loop with relative location", async () => {
+	await t.step("redirect loop with relative location", async () => {
 		relativeLoopAttempts = 0;
 		await (0, node_assert.rejects)(() => fetchDocumentLoader("https://example.com/redirect-loop-relative"), require_request.FetchError, "Redirect loop detected");
 		(0, node_assert.deepStrictEqual)(relativeLoopAttempts, 1);
@@ -6388,7 +6403,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		body: maliciousPayload,
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("ReDoS resistance (CVE-2025-68475)", async () => {
+	await t.step("ReDoS resistance (CVE-2025-68475)", async () => {
 		const start = performance.now();
 		await (0, node_assert.rejects)(() => fetchDocumentLoader("https://example.com/redos"), SyntaxError);
 		const elapsed = performance.now() - start;
@@ -6396,7 +6411,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 	});
 	esm_default.hardReset();
 });
-(0, node_test.test)("getDocumentLoader() bounds JSON, HTML, and alternate documents", async () => {
+(0, _fedify_fixture.test)("getDocumentLoader() bounds JSON, HTML, and alternate documents", async () => {
 	const url = "https://example.com/bounded";
 	esm_default.mockGlobal();
 	let oversized = true;
@@ -6426,7 +6441,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		esm_default.hardReset();
 	}
 });
-(0, node_test.test)("getDocumentLoader() rejects oversized gzip responses from fetch", async () => {
+(0, _fedify_fixture.test)("getDocumentLoader() rejects oversized gzip responses from fetch", async () => {
 	const document = { name: "a".repeat(16 * 1024 * 1024) };
 	const compressed = (0, node_zlib.gzipSync)(JSON.stringify(document));
 	(0, node_assert.ok)(compressed.byteLength < 64 * 1024);
@@ -6456,7 +6471,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		});
 	}
 });
-(0, node_test.test)("getRemoteDocument() bounds JSON by default", async () => {
+(0, _fedify_fixture.test)("getRemoteDocument() bounds JSON by default", async () => {
 	let canceled = false;
 	let pulls = 0;
 	await (0, node_assert.rejects)(getRemoteDocument("https://example.com/document", new Response(new ReadableStream({
@@ -6473,17 +6488,14 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 	(0, node_assert.deepStrictEqual)(canceled, true);
 	(0, node_assert.deepStrictEqual)(pulls, 257);
 });
-(0, node_test.test)("getDocumentLoader() logs DNS failures as such", async (t) => {
-	if ("Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted") {
-		t.skip("requires the net permission");
-		return;
-	}
+(0, _fedify_fixture.test)("getDocumentLoader() logs DNS failures as such", async (t) => {
+	if ("Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted") throw new Error("This DNS test requires Deno network permission (--allow-net).");
 	const loader = getDocumentLoader();
 	for (const result of [
 		"throws",
 		"empty",
 		"private"
-	]) await t.test(result, async () => {
+	]) await t.step(result, async () => {
 		const originalLookup = node_dns_promises.default.lookup;
 		node_dns_promises.default.lookup = (() => result === "throws" ? Promise.reject(/* @__PURE__ */ new Error("Resolver unavailable")) : Promise.resolve(result === "empty" ? [] : [{
 			address: "127.0.0.1",
@@ -6531,14 +6543,14 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		}
 	});
 });
-(0, node_test.test)("getDocumentLoader() bounds alternate document chains", async (t) => {
+(0, _fedify_fixture.test)("getDocumentLoader() bounds alternate document chains", async (t) => {
 	const base = "https://example.com/alternate-chain/";
 	const loader = getDocumentLoader({ allowPrivateAddress: true });
 	for (const mode of [
 		"header",
 		"html",
 		"mixed"
-	]) for (const hops of [20, 21]) await t.test(`${mode}: ${hops} hops`, async () => {
+	]) for (const hops of [20, 21]) await t.step(`${mode}: ${hops} hops`, async () => {
 		esm_default.mockGlobal();
 		let requests = 0;
 		esm_default.get(`begin:${base}`, ({ url }) => {
@@ -6567,7 +6579,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		"alternate-redirect",
 		"redirect-alternate",
 		"redirect-intermediate"
-	]) await t.test(`${mode}: cycle`, async () => {
+	]) await t.step(`${mode}: cycle`, async () => {
 		esm_default.mockGlobal();
 		let requests = 0;
 		esm_default.get(`begin:${base}`, ({ url }) => {
@@ -6589,7 +6601,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 			esm_default.hardReset();
 		}
 	});
-	await t.test("alternate followed by 20 redirects shares the limit", async () => {
+	await t.step("alternate followed by 20 redirects shares the limit", async () => {
 		esm_default.mockGlobal();
 		let requests = 0;
 		esm_default.get(`begin:${base}`, ({ url }) => {
@@ -6609,7 +6621,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 			esm_default.hardReset();
 		}
 	});
-	await t.test("relative alternate after redirect and isolated calls", async () => {
+	await t.step("relative alternate after redirect and isolated calls", async () => {
 		esm_default.mockGlobal();
 		esm_default.get(`${base}start`, Response.redirect(`${base}html`, 302));
 		esm_default.get(`${base}html`, alternate("./document", true));
@@ -6633,10 +6645,10 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		} });
 	}
 });
-(0, node_test.test)("getDocumentLoader() preserves cancellation across alternates", async (t) => {
+(0, _fedify_fixture.test)("getDocumentLoader() preserves cancellation across alternates", async (t) => {
 	const base = "https://example.com/alternate-abort/";
 	const loader = getDocumentLoader({ allowPrivateAddress: true });
-	for (const html of [false, true]) await t.test(html ? "HTML" : "Link header", async () => {
+	for (const html of [false, true]) await t.step(html ? "HTML" : "Link header", async () => {
 		esm_default.mockGlobal();
 		const controller = new AbortController();
 		let requests = 0;
@@ -6659,7 +6671,7 @@ var jsonld_default = jsonld_dist_jsonld_esm_js.default;
 		}
 	});
 });
-(0, node_test.test)("getDocumentLoader() rejects cancellation before fetching", async () => {
+(0, _fedify_fixture.test)("getDocumentLoader() rejects cancellation before fetching", async () => {
 	esm_default.mockGlobal();
 	let requests = 0;
 	const url = "https://example.com/pre-aborted-alternate";