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

package/dist/tests/docloader.test.mjs

@@ -1,12 +1,12 @@
-import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-BV7yaWdl.mjs";
-import { n as MAX_BODY_SIZE, r as readBoundedText } from "./body-Bx6-vXo_.mjs";
+import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-BD0HpfwZ.mjs";
+import { n as MAX_BODY_SIZE, r as readBoundedText } from "./body-PONsC2hg.mjs";
 import { t as HttpHeaderLink } from "./link-NUUWCdnK.mjs";
 import { o as validatePublicUrl, t as UrlError } from "./url-DzlMS01z.mjs";
-import { test } from "node:test";
 import { gzipSync } from "node:zlib";
 import { configure, getLogger, reset } from "@logtape/logtape";
 import { deepStrictEqual, ok, rejects } from "node:assert";
 import dns from "node:dns/promises";
+import { test } from "@fedify/fixture";
 import { createServer } from "node:http";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import jsonld from "jsonld/dist/jsonld.esm.js";
@@ -5712,7 +5712,7 @@ const preloadedContexts = {
 		"suspended": "toot:suspended",
 		"attributionDomains": {
 			"@id": "toot:attributionDomains",
-			"@type": "@id"
+			"@container": "@set"
 		}
 	} },
 	"https://purl.archive.org/miscellany": miscellany_default
@@ -5941,7 +5941,7 @@ test("getDocumentLoader()", async (t) => {
 		name: "Fetched object",
 		type: "Object"
 	} });
-	await t.test("ok", async () => {
+	await t.step("ok", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/object"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/object",
@@ -5984,7 +5984,7 @@ test("getDocumentLoader()", async (t) => {
 			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 () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/link-ctx"), {
 			contextUrl: "https://www.w3.org/ns/activitystreams",
 			documentUrl: "https://example.com/link-ctx",
@@ -6005,7 +6005,7 @@ test("getDocumentLoader()", async (t) => {
 			}
 		});
 	});
-	await t.test("Link header relative url", async () => {
+	await t.step("Link header relative url", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/link-ctx"), {
 			contextUrl: "https://www.w3.org/ns/activitystreams",
 			documentUrl: "https://example.com/link-ctx",
@@ -6026,7 +6026,7 @@ test("getDocumentLoader()", async (t) => {
 			}
 		});
 	});
-	await t.test("wrong Link header syntax", async () => {
+	await t.step("wrong Link header syntax", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/obj-w-wrong-link"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/obj-w-wrong-link",
@@ -6050,7 +6050,7 @@ test("getDocumentLoader()", async (t) => {
       </html>`,
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("HTML <link>", async () => {
+	await t.step("HTML <link>", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/html-link"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/object",
@@ -6074,7 +6074,7 @@ test("getDocumentLoader()", async (t) => {
       </html>`,
 		headers: { "Content-Type": "application/xhtml+xml; charset=utf-8" }
 	});
-	await t.test("XHTML <link>", async () => {
+	await t.step("XHTML <link>", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/xhtml-link"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/object",
@@ -6100,7 +6100,7 @@ test("getDocumentLoader()", async (t) => {
       </html>`,
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("HTML <a>", async () => {
+	await t.step("HTML <a>", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/html-a"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/object",
@@ -6121,7 +6121,7 @@ test("getDocumentLoader()", async (t) => {
 		},
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("Wrong Content-Type", async () => {
+	await t.step("Wrong Content-Type", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/wrong-content-type"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/wrong-content-type",
@@ -6134,18 +6134,33 @@ test("getDocumentLoader()", async (t) => {
 		});
 	});
 	esm_default.get("https://example.com/404", { status: 404 });
-	await t.test("not ok", async () => {
+	await t.step("not ok", async () => {
 		await rejects(() => fetchDocumentLoader("https://example.com/404"), 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)) 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 });
+		deepStrictEqual(expanded, [{
+			"@id": "https://social.example/users/alice",
+			"@type": ["https://www.w3.org/ns/activitystreams#Person"],
+			"http://joinmastodon.org/ns#attributionDomains": [{ "@value": "blog.example" }]
+		}]);
+		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";
 		deepStrictEqual(await fetchDocumentLoader(url), {
 			contextUrl: null,
@@ -6153,7 +6168,7 @@ test("getDocumentLoader()", async (t) => {
 			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";
 		ok(url in preloadedContexts);
 		deepStrictEqual(await fetchDocumentLoader(url), {
@@ -6170,7 +6185,7 @@ test("getDocumentLoader()", async (t) => {
 		});
 	});
 	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";
 		deepStrictEqual(await fetchDocumentLoader(url), {
 			contextUrl: null,
@@ -6201,7 +6216,7 @@ test("getDocumentLoader()", async (t) => {
 		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";
 		deepStrictEqual(await fetchDocumentLoader(url), {
 			contextUrl: null,
@@ -6230,7 +6245,7 @@ test("getDocumentLoader()", async (t) => {
 		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";
@@ -6308,7 +6323,7 @@ test("getDocumentLoader()", async (t) => {
 		deepStrictEqual(esm_default.callHistory.calls(url).length, 0);
 		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 rejects(() => fetchDocumentLoader("ftp://localhost"), UrlError);
 	});
 	esm_default.get("https://example.com/localhost-redirect", {
@@ -6333,13 +6348,13 @@ test("getDocumentLoader()", async (t) => {
 		name: "Fetched object",
 		type: "Object"
 	} });
-	await t.test("allowPrivateAddress: false", async () => {
+	await t.step("allowPrivateAddress: false", async () => {
 		await rejects(() => fetchDocumentLoader("https://localhost/object"), UrlError);
 		await rejects(() => fetchDocumentLoader("https://example.com/localhost-redirect"), UrlError);
 		await rejects(() => fetchDocumentLoader("https://example.com/localhost-link"), 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",
@@ -6362,7 +6377,7 @@ test("getDocumentLoader()", async (t) => {
 			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 rejects(() => fetchDocumentLoader("https://example.com/too-many-redirects/0"), FetchError, "Too many redirections");
 		deepStrictEqual(redirectAttempts, 21);
@@ -6382,7 +6397,7 @@ test("getDocumentLoader()", async (t) => {
 			headers: { Location: "https://example.com/redirect-loop-a" }
 		};
 	});
-	await t.test("redirect loop", async () => {
+	await t.step("redirect loop", async () => {
 		loopAttempts = 0;
 		await rejects(() => fetchDocumentLoader("https://example.com/redirect-loop-a"), FetchError, "Redirect loop detected");
 		deepStrictEqual(loopAttempts, 2);
@@ -6395,7 +6410,7 @@ test("getDocumentLoader()", async (t) => {
 			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 rejects(() => fetchDocumentLoader("https://example.com/redirect-loop-relative"), FetchError, "Redirect loop detected");
 		deepStrictEqual(relativeLoopAttempts, 1);
@@ -6405,7 +6420,7 @@ test("getDocumentLoader()", async (t) => {
 		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 rejects(() => fetchDocumentLoader("https://example.com/redos"), SyntaxError);
 		const elapsed = performance.now() - start;
@@ -6491,16 +6506,13 @@ test("getRemoteDocument() bounds JSON by default", async () => {
 	deepStrictEqual(pulls, 257);
 });
 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;
-	}
+	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 = dns.lookup;
 		dns.lookup = (() => result === "throws" ? Promise.reject(/* @__PURE__ */ new Error("Resolver unavailable")) : Promise.resolve(result === "empty" ? [] : [{
 			address: "127.0.0.1",
@@ -6555,7 +6567,7 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
 		"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 }) => {
@@ -6584,7 +6596,7 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
 		"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 }) => {
@@ -6606,7 +6618,7 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
 			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 }) => {
@@ -6626,7 +6638,7 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
 			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));
@@ -6653,7 +6665,7 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
 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;

package/dist/tests/multibase/multibase.test.cjs

@@ -1,9 +1,9 @@
 require("../chunk-Do9eywBl.cjs");
 const require_multibase = require("../multibase-CnmModw0.cjs");
-let node_test = require("node:test");
 let node_assert = require("node:assert");
+let _fedify_fixture = require("@fedify/fixture");
 //#region src/multibase/multibase.test.ts
-(0, node_test.test)("multibase.encode and decode", async (t) => {
+(0, _fedify_fixture.test)("multibase.encode and decode", async (t) => {
 	const testCases = [
 		[
 			"base16",
@@ -316,22 +316,22 @@ let node_assert = require("node:assert");
 			"Uw7fDr8O_8J-lsMO3w6_Dv_CfmI7wn6W28J-krw=="
 		]
 	];
-	for (const [name, input, expectedOutput] of testCases) await t.test(`Encoding/Decoding ${name} with ${input}`, () => {
+	for (const [name, input, expectedOutput] of testCases) await t.step(`Encoding/Decoding ${name} with ${input}`, () => {
 		(0, node_assert.deepStrictEqual)(require_multibase.decodeText(require_multibase.encodeMultibase(name, require_multibase.encodeText(input))), expectedOutput, `Encoding ${name} failed`);
 		(0, node_assert.deepStrictEqual)(require_multibase.decodeMultibase(expectedOutput), require_multibase.encodeText(input), `Decoding ${name} failed`);
 		(0, node_assert.deepStrictEqual)(require_multibase.decodeMultibase(require_multibase.encodeText(expectedOutput)), require_multibase.encodeText(input), `Decoding buffer of ${name} failed`);
 	});
-	await t.test("should allow base32pad full alphabet", () => {
+	await t.step("should allow base32pad full alphabet", () => {
 		const decoded = require_multibase.decodeMultibase("ctimaq4ygg2iegci7");
 		(0, node_assert.deepStrictEqual)(require_multibase.decodeMultibase(require_multibase.encodeMultibase("c", decoded)), decoded);
 	});
 });
-(0, node_test.test)("constants", async (t) => {
-	await t.test("constants indexed by name", () => {
+(0, _fedify_fixture.test)("constants", async (t) => {
+	await t.step("constants indexed by name", () => {
 		const names$1 = require_multibase.names;
 		(0, node_assert.deepStrictEqual)(Object.keys(names$1).length, 23);
 	});
-	await t.test("constants indexed by code", () => {
+	await t.step("constants indexed by code", () => {
 		const codes$1 = require_multibase.codes;
 		(0, node_assert.deepStrictEqual)(Object.keys(codes$1).length, 23);
 	});

package/dist/tests/multibase/multibase.test.mjs

@@ -1,6 +1,6 @@
 import { a as decodeText, i as names, n as encodeMultibase, o as encodeText, r as codes, t as decodeMultibase } from "../multibase-DLBufb99.mjs";
-import { test } from "node:test";
 import { deepStrictEqual } from "node:assert";
+import { test } from "@fedify/fixture";
 //#region src/multibase/multibase.test.ts
 test("multibase.encode and decode", async (t) => {
 	const testCases = [
@@ -315,21 +315,21 @@ test("multibase.encode and decode", async (t) => {
 			"Uw7fDr8O_8J-lsMO3w6_Dv_CfmI7wn6W28J-krw=="
 		]
 	];
-	for (const [name, input, expectedOutput] of testCases) await t.test(`Encoding/Decoding ${name} with ${input}`, () => {
+	for (const [name, input, expectedOutput] of testCases) await t.step(`Encoding/Decoding ${name} with ${input}`, () => {
 		deepStrictEqual(decodeText(encodeMultibase(name, encodeText(input))), expectedOutput, `Encoding ${name} failed`);
 		deepStrictEqual(decodeMultibase(expectedOutput), encodeText(input), `Decoding ${name} failed`);
 		deepStrictEqual(decodeMultibase(encodeText(expectedOutput)), encodeText(input), `Decoding buffer of ${name} failed`);
 	});
-	await t.test("should allow base32pad full alphabet", () => {
+	await t.step("should allow base32pad full alphabet", () => {
 		const decoded = decodeMultibase("ctimaq4ygg2iegci7");
 		deepStrictEqual(decodeMultibase(encodeMultibase("c", decoded)), decoded);
 	});
 });
 test("constants", async (t) => {
-	await t.test("constants indexed by name", () => {
+	await t.step("constants indexed by name", () => {
 		deepStrictEqual(Object.keys(names).length, 23);
 	});
-	await t.test("constants indexed by code", () => {
+	await t.step("constants indexed by code", () => {
 		deepStrictEqual(Object.keys(codes).length, 23);
 	});
 });

package/dist/tests/{request-BV7yaWdl.mjs → request-BD0HpfwZ.mjs}

@@ -1,7 +1,7 @@
 import process from "node:process";
 //#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/{request-Ban3HXuI.cjs → request-BdKDFsbY.cjs}

@@ -3,7 +3,7 @@ let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 //#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/request.test.cjs

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-Ban3HXuI.cjs");
+const require_request = require("./request-BdKDFsbY.cjs");
 let node_test = require("node:test");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);

package/dist/tests/request.test.mjs

@@ -1,4 +1,4 @@
-import { o as version, r as getUserAgent } from "./request-BV7yaWdl.mjs";
+import { o as version, r as getUserAgent } from "./request-BD0HpfwZ.mjs";
 import { test } from "node:test";
 import process from "node:process";
 import { deepStrictEqual } from "node:assert";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.0.31-dev.2308+34090b3a",
+  "version": "2.0.31-dev.2316+06462f7c",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -72,7 +72,8 @@
     "@types/node": "^24.2.1",
     "fetch-mock": "^12.5.4",
     "tsdown": "^0.21.6",
-    "typescript": "^6.0.0"
+    "typescript": "^6.0.0",
+    "@fedify/fixture": "2.0.0"
   },
   "dependencies": {
     "@js-temporal/polyfill": "^0.5.1",
@@ -89,6 +90,8 @@
     "build": "pnpm --filter @fedify/vocab-runtime... run build:self",
     "prepublish": "pnpm build",
     "pretest": "pnpm build",
-    "test": "cd dist/tests && node --test"
+    "test": "cd dist/tests && node --test",
+    "pretest:bun": "pnpm build",
+    "test:bun": "node scripts/test-bun.mjs"
   }
 }

package/scripts/test-bun.mjs

@@ -0,0 +1,18 @@
+import { access, glob } from "node:fs/promises";
+import { spawnSync } from "node:child_process";
+import process from "node:process";
+
+const sources = await Array.fromAsync(glob("src/**/*.test.ts"));
+if (sources.length === 0) throw new Error("No vocab-runtime tests found.");
+
+const tests = sources.map((source) =>
+  source.replaceAll("\\", "/").replace(/^src\//, "dist/tests/")
+    .replace(/\.ts$/, ".mjs")
+).sort();
+for (const test of tests) await access(test);
+
+const result = spawnSync("bun", ["test", "--timeout", "60000", ...tests], {
+  stdio: "inherit",
+});
+if (result.error) throw result.error;
+process.exitCode = result.status ?? 1;

package/src/contexts.ts

@@ -4403,7 +4403,7 @@ const preloadedContexts: Record<string, unknown> = {
       "suspended": "toot:suspended",
       "attributionDomains": {
         "@id": "toot:attributionDomains",
-        "@type": "@id",
+        "@container": "@set",
       },
     },
   },