@fedify/vocab-runtime 2.4.0-dev.2228 → 2.4.0-dev.2240

package/dist/tests/docloader.test.mjs

@@ -1,12 +1,12 @@
-import { t as FetchError } from "./request-2GDEEJng.mjs";
+import { t as FetchError } from "./request-BRPiDcmG.mjs";
 import { n as cid_v1_default, t as preloadedContexts } from "./contexts-CIKsin4e.mjs";
-import { t as UrlError } from "./url-R9TTZ67B.mjs";
-import { i as withDocumentLoaderTimeout, n as getRemoteDocument, r as resolveDocumentLoaderTimeout, t as getDocumentLoader } from "./docloader-ButlYQxr.mjs";
-import { test } from "node:test";
+import { n as UrlError } from "./url-CWC-NI3a.mjs";
+import { i as withDocumentLoaderTimeout, n as getRemoteDocument, r as resolveDocumentLoaderTimeout, t as getDocumentLoader } from "./docloader-Bi982uOa.mjs";
 import { gzipSync } from "node:zlib";
 import { configure, reset } from "@logtape/logtape";
 import { deepStrictEqual, ok, rejects, throws } from "node:assert";
 import dns from "node:dns/promises";
+import { test } from "@fedify/fixture";
 import { createServer } from "node:http";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
@@ -1305,7 +1305,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",
@@ -1348,7 +1348,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",
@@ -1369,7 +1369,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",
@@ -1390,7 +1390,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",
@@ -1414,7 +1414,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",
@@ -1438,7 +1438,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",
@@ -1464,7 +1464,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",
@@ -1486,7 +1486,7 @@ test("getDocumentLoader()", async (t) => {
       </html>`,
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("HTML without ActivityPub alternate link", async () => {
+	await t.step("HTML without ActivityPub alternate link", async () => {
 		await rejects(() => fetchDocumentLoader("https://example.com/html-no-alternate"), (error) => {
 			ok(error instanceof FetchError);
 			ok(error.message.includes("HTML document has no ActivityPub alternate link"));
@@ -1506,7 +1506,7 @@ test("getDocumentLoader()", async (t) => {
 		},
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("wrong Content-Type with JSON body", async () => {
+	await t.step("wrong Content-Type with JSON body", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/wrong-content-type"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/wrong-content-type",
@@ -1525,7 +1525,7 @@ test("getDocumentLoader()", async (t) => {
 			"Content-Type": "text/html; charset=utf-8"
 		}
 	});
-	await t.test("HTML Content-Length over limit", async () => {
+	await t.step("HTML Content-Length over limit", async () => {
 		await rejects(() => fetchDocumentLoader("https://example.com/large-html"), (error) => {
 			ok(error instanceof FetchError);
 			ok(error.message.includes("HTML document is too large to scan for an ActivityPub alternate link"));
@@ -1535,7 +1535,7 @@ test("getDocumentLoader()", async (t) => {
 			return true;
 		});
 	});
-	await t.test("HTML Content-Length over limit cancels body", async () => {
+	await t.step("HTML Content-Length over limit cancels body", async () => {
 		let canceled = false;
 		const response = new Response("<!DOCTYPE html>", { headers: {
 			"Content-Length": String(1048577),
@@ -1550,10 +1550,10 @@ test("getDocumentLoader()", async (t) => {
 		deepStrictEqual(canceled, true);
 	});
 	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,
@@ -1561,7 +1561,7 @@ test("getDocumentLoader()", async (t) => {
 		});
 	});
 	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,
@@ -1569,7 +1569,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), {
@@ -1586,7 +1586,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,
@@ -1616,7 +1616,7 @@ test("getDocumentLoader()", async (t) => {
 		});
 		deepStrictEqual(esm_default.callHistory.calls(url).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", {
@@ -1641,13 +1641,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",
@@ -1670,12 +1670,12 @@ 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);
 	});
-	await t.test("custom max redirection", async () => {
+	await t.step("custom max redirection", async () => {
 		redirectAttempts = 0;
 		const loader = getDocumentLoader({ maxRedirection: 1 });
 		await rejects(() => loader("https://example.com/too-many-redirects/0"), FetchError, "Too many redirections");
@@ -1696,7 +1696,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);
@@ -1709,7 +1709,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);
@@ -1719,7 +1719,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"), FetchError);
 		const elapsed = performance.now() - start;
@@ -1805,16 +1805,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",
@@ -1869,7 +1866,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 }) => {
@@ -1898,7 +1895,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 }) => {
@@ -1920,7 +1917,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 }) => {
@@ -1940,7 +1937,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));
@@ -1967,7 +1964,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;
@@ -2097,7 +2094,7 @@ test("getDocumentLoader() shares the timeout across redirects", async () => {
 	});
 });
 test("getDocumentLoader() shares the timeout across alternates", async (t) => {
-	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 () => {
 		await withServer((request, response) => {
 			const index = Number(request.url?.split("/").at(-1));
 			setTimeout(() => {
@@ -2155,11 +2152,8 @@ test("getDocumentLoader() lets the caller's signal abort a request", async () =>
 		});
 	});
 });
-test("getDocumentLoader() bounds DNS lookups that ignore the timeout", async (t) => {
-	if ("Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted") {
-		t.skip("requires the net permission");
-		return;
-	}
+test("getDocumentLoader() bounds DNS lookups that ignore the timeout", async () => {
+	if ("Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted") throw new Error("This DNS test requires Deno network permission (--allow-net).");
 	esm_default.mockGlobal();
 	let requests = 0;
 	const url = "https://slow-dns.example/object";

package/dist/tests/internal/portable-dereference.test.cjs

@@ -1,157 +1,20 @@
-const require_contexts = require("../contexts-DizzBjz4.cjs");
-const require_url = require("../url-B6WlNhra.cjs");
-const require_jsonld_cache = require("../jsonld-cache-CXA76Xi6.cjs");
+const require_url = require("../url-DsMBGqCc.cjs");
+const require_jsonld_cache = require("../jsonld-cache-DzxT9IXH.cjs");
+const require_portable_dereference = require("../portable-dereference-CyFYTBnr.cjs");
 let node_assert_strict = require("node:assert/strict");
 let node_test = require("node:test");
-let _logtape_logtape = require("@logtape/logtape");
-require("@opentelemetry/api");
-//#region src/internal/portable-dereference.ts
-const logger = (0, _logtape_logtape.getLogger)([
-	"fedify",
-	"vocab",
-	"gateway"
-]);
-/**
-* The maximum number of `@gateway` location hints to try for one reference.
-* Hints come from possibly untrusted documents, so they are bounded to keep
-* a single accessor call from fanning out to many servers.
-*/
-const MAX_GATEWAY_HINTS = 5;
-const LOCATION_HINT_PARAMETER = "@gateway";
-const BASELINE_CONTEXT_URLS = /* @__PURE__ */ new Set([
-	"https://w3id.org/identity/v1",
-	"https://www.w3.org/ns/activitystreams",
-	"https://w3id.org/security/v1",
-	"https://w3id.org/security/data-integrity/v1"
-]);
-/**
-* Checks whether a URL is an FEP-ef61 portable ActivityPub IRI.
-*
-* @internal Technically exported for generated vocabulary classes, but not
-* part of the public API contract.  This is not considered public API for
-* Semantic Versioning decisions.
-*/
-function isPortableIri(url) {
-	return url.protocol === "ap+ef61:" || url.protocol === "ap:";
-}
-/**
-* Picks the ordered list of FEP-ef61 gateways to fetch a portable IRI from.
-*
-* If `gateways` is given, it is used as is (even when empty), and `@gateway`
-* location hints in the IRI are ignored.  Otherwise, up to
-* {@link MAX_GATEWAY_HINTS} valid `@gateway` hints are used.  Duplicate
-* gateways are dropped in both cases.
-*
-* @throws {TypeError} If an explicit gateway is not an HTTP(S) origin.
-* @internal
-*/
-function getPortableGatewayCandidates(url, gateways) {
-	const candidates = [];
-	const seen = /* @__PURE__ */ new Set();
-	const add = (gateway) => {
-		if (seen.has(gateway.href)) return;
-		seen.add(gateway.href);
-		candidates.push(gateway);
-	};
-	if (gateways != null) {
-		for (const gateway of gateways) {
-			const parsed = parseGatewayOrigin(gateway);
-			if (parsed == null) throw new TypeError("FEP-ef61 gateways must be HTTP(S) origins with no credentials, path, query, or fragment: " + String(gateway));
-			add(parsed);
-		}
-		return candidates;
-	}
-	for (const hint of new URLSearchParams(url.search).getAll(LOCATION_HINT_PARAMETER)) {
-		if (candidates.length >= MAX_GATEWAY_HINTS) break;
-		const parsed = parseGatewayOrigin(hint);
-		if (parsed == null) {
-			logger.debug("Ignoring an invalid FEP-ef61 gateway hint {hint} in {url}.", {
-				hint,
-				url: require_url.formatIri(url)
-			});
-			continue;
-		}
-		add(parsed);
-	}
-	return candidates;
-}
-function parseGatewayOrigin(gateway) {
-	let url;
-	if (gateway instanceof URL) url = new URL(gateway.href);
-	else if (typeof gateway === "string" && URL.canParse(gateway)) url = new URL(gateway);
-	else return null;
-	if (!require_url.isGatewayUrl(url)) return null;
-	return url;
-}
-/**
-* Creates a context loader that returns the same context documents for the
-* whole dereference operation, so that the identity check, the proof
-* verifier, and the parser interpret the fetched document identically even
-* if the underlying loader is nondeterministic.  Failed loads are not
-* remembered, so a transient failure does not affect the next gateway.
-*
-* The parsed object keeps the loader for its own later dereferences, so
-* `release()` turns it into a plain pass-through to the underlying loader
-* once the operation is over.
-*
-* @internal Technically exported for generated vocabulary classes, but not
-* part of the public API contract.  This is not considered public API for
-* Semantic Versioning decisions.
-*/
-function createSnapshotContextLoader(contextLoader, suppressError) {
-	contextLoader = require_jsonld_cache.unwrapReleasedDocumentLoader(contextLoader);
-	const cache = /* @__PURE__ */ new Map();
-	let released = false;
-	const release = () => {
-		released = true;
-		state.released = true;
-		cache.clear();
-	};
-	const loader = async (url, options) => {
-		if (released) return await contextLoader(url, options);
-		const key = URL.canParse(url) ? new URL(url).href : url;
-		if (BASELINE_CONTEXT_URLS.has(key)) return {
-			contextUrl: null,
-			document: structuredClone(require_contexts.preloadedContexts[key]),
-			documentUrl: key
-		};
-		let promise = cache.get(key);
-		if (promise == null) {
-			const loading = contextLoader(url, suppressError ? {
-				...options,
-				suppressError: true
-			} : options).then((document) => structuredClone(document));
-			promise = loading;
-			cache.set(key, loading);
-			loading.catch(() => {
-				if (cache.get(key) === loading) cache.delete(key);
-			});
-		}
-		return structuredClone(await promise);
-	};
-	const state = {
-		base: contextLoader,
-		released: false
-	};
-	require_jsonld_cache.registerDocumentLoaderWrapper(loader, state);
-	return {
-		loader,
-		release
-	};
-}
-//#endregion
 //#region src/internal/portable-dereference.test.ts
 const hrefs = (urls) => urls.map((url) => url.href);
 (0, node_test.test)("isPortableIri()", () => {
-	(0, node_assert_strict.ok)(isPortableIri(require_url.parseIri("ap://did:key:z6Mkabc/actor")));
-	(0, node_assert_strict.ok)(isPortableIri(require_url.parseIri("ap+ef61://did:key:z6Mkabc/actor")));
-	(0, node_assert_strict.ok)(isPortableIri(new URL("ap://did%3Akey%3Az6Mkabc/actor")));
-	(0, node_assert_strict.ok)(!isPortableIri(new URL("https://example.com/actor")));
-	(0, node_assert_strict.ok)(!isPortableIri(new URL("did:key:z6Mkabc")));
+	(0, node_assert_strict.ok)(require_portable_dereference.isPortableIri(require_url.parseIri("ap://did:key:z6Mkabc/actor")));
+	(0, node_assert_strict.ok)(require_portable_dereference.isPortableIri(require_url.parseIri("ap+ef61://did:key:z6Mkabc/actor")));
+	(0, node_assert_strict.ok)(require_portable_dereference.isPortableIri(new URL("ap://did%3Akey%3Az6Mkabc/actor")));
+	(0, node_assert_strict.ok)(!require_portable_dereference.isPortableIri(new URL("https://example.com/actor")));
+	(0, node_assert_strict.ok)(!require_portable_dereference.isPortableIri(new URL("did:key:z6Mkabc")));
 });
 (0, node_test.test)("getPortableGatewayCandidates() uses explicit gateways", () => {
 	const url = require_url.parseIri("ap://did:key:z6Mkabc/actor?@gateway=https%3A%2F%2Fhint.example");
-	(0, node_assert_strict.deepStrictEqual)(hrefs(getPortableGatewayCandidates(url, [
+	(0, node_assert_strict.deepStrictEqual)(hrefs(require_portable_dereference.getPortableGatewayCandidates(url, [
 		"https://b.example",
 		new URL("https://a.example/"),
 		"https://b.example/",
@@ -161,7 +24,7 @@ const hrefs = (urls) => urls.map((url) => url.href);
 		"https://a.example/",
 		"http://c.example:8080/"
 	]);
-	(0, node_assert_strict.deepStrictEqual)(getPortableGatewayCandidates(url, []), []);
+	(0, node_assert_strict.deepStrictEqual)(require_portable_dereference.getPortableGatewayCandidates(url, []), []);
 	for (const gateway of [
 		"https://a.example/path",
 		"https://a.example/?",
@@ -169,13 +32,23 @@ const hrefs = (urls) => urls.map((url) => url.href);
 		"https://user:pass@a.example",
 		"ftp://a.example",
 		"a.example"
-	]) (0, node_assert_strict.throws)(() => getPortableGatewayCandidates(url, [gateway]), TypeError);
+	]) (0, node_assert_strict.throws)(() => require_portable_dereference.getPortableGatewayCandidates(url, [gateway]), TypeError);
 });
 (0, node_test.test)("getPortableGatewayCandidates() reads @gateway hints", () => {
-	(0, node_assert_strict.deepStrictEqual)(hrefs(getPortableGatewayCandidates(require_url.parseIri("ap://did:key:z6Mkabc/actor?page=1&@gateway=https%3A%2F%2Fa.example&gateways=https%3A%2F%2Flegacy.example&@gateway=not%20a%20URL&@gateway=https%3A%2F%2Fb.example%2Fpath&@gateway=https%3A%2F%2Fquery.example%2F%3F&@gateway=https%3A%2F%2Ffragment.example%2F%23&%40gateway=https%3A%2F%2Fb.example&@gateway=https%3A%2F%2Fa.example%2F"))), ["https://a.example/", "https://b.example/"]);
-	(0, node_assert_strict.deepStrictEqual)(getPortableGatewayCandidates(require_url.parseIri("ap://did:key:z6Mkabc/actor")), []);
+	(0, node_assert_strict.deepStrictEqual)(hrefs(require_portable_dereference.getPortableGatewayCandidates(require_url.parseIri("ap://did:key:z6Mkabc/actor?page=1&@gateway=https%3A%2F%2Fa.example&gateways=https%3A%2F%2Flegacy.example&@gateway=not%20a%20URL&@gateway=https%3A%2F%2Fb.example%2Fpath&@gateway=https%3A%2F%2Fquery.example%2F%3F&@gateway=https%3A%2F%2Ffragment.example%2F%23&%40gateway=https%3A%2F%2Fb.example&@gateway=https%3A%2F%2Fa.example%2F"))), ["https://a.example/", "https://b.example/"]);
+	(0, node_assert_strict.deepStrictEqual)(require_portable_dereference.getPortableGatewayCandidates(require_url.parseIri("ap://did:key:z6Mkabc/actor")), []);
 	const hints = Array.from({ length: 7 }, (_, i) => `@gateway=https%3A%2F%2Fg${i}.example`);
-	(0, node_assert_strict.deepStrictEqual)(hrefs(getPortableGatewayCandidates(require_url.parseIri(`ap://did:key:z6Mkabc/actor?${hints.join("&")}`))), [
+	(0, node_assert_strict.deepStrictEqual)(hrefs(require_portable_dereference.getPortableGatewayCandidates(require_url.parseIri(`ap://did:key:z6Mkabc/actor?${hints.join("&")}`))), [
+		0,
+		1,
+		2,
+		3,
+		4
+	].map((i) => `https://g${i}.example/`));
+});
+(0, node_test.test)("getPortableGatewayCandidates() reads hints from withGatewayHints()", () => {
+	const gateways = Array.from({ length: 7 }, (_, i) => `https://g${i}.example`);
+	(0, node_assert_strict.deepStrictEqual)(hrefs(require_portable_dereference.getPortableGatewayCandidates(require_url.withGatewayHints("ap://did:key:z6Mkabc/actor?page=1", gateways))), [
 		0,
 		1,
 		2,
@@ -195,15 +68,15 @@ const hrefs = (urls) => urls.map((url) => url.href);
 	};
 	let loader = base;
 	for (let i = 0; i < 1e4; i++) {
-		const snapshot = createSnapshotContextLoader(loader);
+		const snapshot = require_portable_dereference.createSnapshotContextLoader(loader);
 		snapshot.release();
 		loader = snapshot.loader;
 	}
 	await loader("https://example.com/context");
 	(0, node_assert_strict.deepStrictEqual)(calls, ["https://example.com/context"]);
-	const outer = createSnapshotContextLoader(base);
+	const outer = require_portable_dereference.createSnapshotContextLoader(base);
 	await outer.loader("https://example.com/context");
-	const inner = createSnapshotContextLoader(outer.loader);
+	const inner = require_portable_dereference.createSnapshotContextLoader(outer.loader);
 	await inner.loader("https://example.com/context");
 	(0, node_assert_strict.deepStrictEqual)(calls.length, 2);
 	inner.release();
@@ -222,7 +95,7 @@ const hrefs = (urls) => urls.map((url) => url.href);
 	for (const snapshotFirst of [false, true]) {
 		let loader = base;
 		for (let i = 0; i < 1e4; i++) {
-			const wrapper = i % 2 === 0 === snapshotFirst ? createSnapshotContextLoader(loader, true) : require_jsonld_cache.createScopedContextLoader(loader, true);
+			const wrapper = i % 2 === 0 === snapshotFirst ? require_portable_dereference.createSnapshotContextLoader(loader, true) : require_jsonld_cache.createScopedContextLoader(loader, true);
 			wrapper.release();
 			loader = wrapper.loader;
 		}
@@ -243,10 +116,10 @@ const hrefs = (urls) => urls.map((url) => url.href);
 				document: { "@context": {} }
 			});
 		};
-		const active = activeSnapshot ? createSnapshotContextLoader(base, true) : require_jsonld_cache.createScopedContextLoader(base, true);
+		const active = activeSnapshot ? require_portable_dereference.createSnapshotContextLoader(base, true) : require_jsonld_cache.createScopedContextLoader(base, true);
 		let loader = active.loader;
 		for (let i = 0; i < 4; i++) {
-			const wrapper = i % 2 === 0 ? require_jsonld_cache.createScopedContextLoader(loader, true) : createSnapshotContextLoader(loader, true);
+			const wrapper = i % 2 === 0 ? require_jsonld_cache.createScopedContextLoader(loader, true) : require_portable_dereference.createSnapshotContextLoader(loader, true);
 			wrapper.release();
 			loader = wrapper.loader;
 		}