@fedify/vocab-runtime 2.4.0-dev.2122 → 2.4.0-dev.2127

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.4.0-dev.2122+bdc0ce8d",
+  "version": "2.4.0-dev.2127+c41ce2eb",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",

package/dist/{docloader-Dr8wEkif.d.cts → docloader-oRpq1nQ8.d.cts}

@@ -100,6 +100,12 @@ interface DocumentLoaderOptions {
   * @since 1.8.0
   */
   signal?: AbortSignal;
+  /**
+  * Whether to lower error-level logs for recoverable document loading
+  * failures to warning-level logs.  The loader still throws the error.
+  * @default `false`
+  */
+  suppressError?: boolean;
 }
 /**
 * A JSON-LD document loader that fetches documents from the Web.
@@ -160,11 +166,12 @@ type AuthenticatedDocumentLoaderFactory = (identity: {
 * @param url The URL of the document to load.
 * @param response The response to get the document from.
 * @param fetch The function to fetch the document.
+* @param options The options for loading the document.
 * @returns The loaded remote document.
 * @throws {FetchError} If the response is not OK.
 * @internal
 */
-declare function getRemoteDocument(url: string, response: Response, fetch: (url: string, options?: DocumentLoaderOptions) => Promise<RemoteDocument>): Promise<RemoteDocument>;
+declare function getRemoteDocument(url: string, response: Response, fetch: (url: string, options?: DocumentLoaderOptions) => Promise<RemoteDocument>, options?: DocumentLoaderOptions): Promise<RemoteDocument>;
 /**
 * Options for {@link getDocumentLoader}.
 * @since 1.3.0

package/dist/{docloader-Dr8wEkif.d.ts → docloader-oRpq1nQ8.d.ts}

@@ -100,6 +100,12 @@ interface DocumentLoaderOptions {
   * @since 1.8.0
   */
   signal?: AbortSignal;
+  /**
+  * Whether to lower error-level logs for recoverable document loading
+  * failures to warning-level logs.  The loader still throws the error.
+  * @default `false`
+  */
+  suppressError?: boolean;
 }
 /**
 * A JSON-LD document loader that fetches documents from the Web.
@@ -160,11 +166,12 @@ type AuthenticatedDocumentLoaderFactory = (identity: {
 * @param url The URL of the document to load.
 * @param response The response to get the document from.
 * @param fetch The function to fetch the document.
+* @param options The options for loading the document.
 * @returns The loaded remote document.
 * @throws {FetchError} If the response is not OK.
 * @internal
 */
-declare function getRemoteDocument(url: string, response: Response, fetch: (url: string, options?: DocumentLoaderOptions) => Promise<RemoteDocument>): Promise<RemoteDocument>;
+declare function getRemoteDocument(url: string, response: Response, fetch: (url: string, options?: DocumentLoaderOptions) => Promise<RemoteDocument>, options?: DocumentLoaderOptions): Promise<RemoteDocument>;
 /**
 * Options for {@link getDocumentLoader}.
 * @since 1.3.0

package/dist/internal/jsonld-cache.cjs

@@ -4,6 +4,53 @@ const require_url = require("../url-Cke4irYD.cjs");
 const require_jsonld = require("../jsonld.cjs");
 //#region src/internal/jsonld-cache.ts
 const noJsonLdContext = Symbol("noJsonLdContext");
+const documentLoaderWrappers = /* @__PURE__ */ new WeakMap();
+/**
+* Registers a loader wrapper with the shared released-wrapper registry.
+* Both suppression and snapshot wrappers must use this registry so mixed
+* chains can be unwrapped.  The caller updates the state on release.
+* @internal Not a public API.
+*/
+function registerDocumentLoaderWrapper(loader, state) {
+	documentLoaderWrappers.set(loader, state);
+}
+/**
+* Removes released loader wrappers, stopping at the first active wrapper.
+* Active wrappers retain their operation's suppression or snapshot cache.
+* @internal Not a public API.
+*/
+function unwrapReleasedDocumentLoader(base) {
+	for (let state = documentLoaderWrappers.get(base); state?.released; state = documentLoaderWrappers.get(base)) base = state.base;
+	return base;
+}
+/**
+* Lowers context loading failure logs for one accessor operation.  Parsed
+* objects retain the loader, so release it before returning to the caller.
+* Released wrappers are unwrapped to avoid accumulating loader chains.
+* @internal Used by generated vocabulary accessors; not a public API.
+*/
+function createScopedContextLoader(base, suppressError) {
+	base = unwrapReleasedDocumentLoader(base);
+	if (!suppressError) return {
+		loader: base,
+		release: () => {}
+	};
+	const state = {
+		base,
+		released: false
+	};
+	const loader = (url, options) => base(url, state.released ? options : {
+		...options,
+		suppressError: true
+	});
+	registerDocumentLoaderWrapper(loader, state);
+	return {
+		loader,
+		release: () => {
+			state.released = true;
+		}
+	};
+}
 /**
 * Checks whether an IRI is trusted relative to another IRI.
 *
@@ -274,6 +321,9 @@ function combineContexts(inheritedContext, ownContext) {
 }
 //#endregion
 exports.compactJsonLdCache = compactJsonLdCache;
+exports.createScopedContextLoader = createScopedContextLoader;
 exports.getJsonLdContext = getJsonLdContext;
 exports.isTrustedIriOrigin = isTrustedIriOrigin;
 exports.normalizeJsonLdIris = normalizeJsonLdIris;
+exports.registerDocumentLoaderWrapper = registerDocumentLoaderWrapper;
+exports.unwrapReleasedDocumentLoader = unwrapReleasedDocumentLoader;

package/dist/internal/jsonld-cache.d.cts

@@ -1,8 +1,34 @@
 /// <reference lib="esnext.temporal" />
-import { n as DocumentLoader } from "../docloader-Dr8wEkif.cjs";
+import { n as DocumentLoader } from "../docloader-oRpq1nQ8.cjs";
 
 //#region src/internal/jsonld-cache.d.ts
 /**
+* Registers a loader wrapper with the shared released-wrapper registry.
+* Both suppression and snapshot wrappers must use this registry so mixed
+* chains can be unwrapped.  The caller updates the state on release.
+* @internal Not a public API.
+*/
+declare function registerDocumentLoaderWrapper(loader: DocumentLoader, state: {
+  readonly base: DocumentLoader;
+  released: boolean;
+}): void;
+/**
+* Removes released loader wrappers, stopping at the first active wrapper.
+* Active wrappers retain their operation's suppression or snapshot cache.
+* @internal Not a public API.
+*/
+declare function unwrapReleasedDocumentLoader(base: DocumentLoader): DocumentLoader;
+/**
+* Lowers context loading failure logs for one accessor operation.  Parsed
+* objects retain the loader, so release it before returning to the caller.
+* Released wrappers are unwrapped to avoid accumulating loader chains.
+* @internal Used by generated vocabulary accessors; not a public API.
+*/
+declare function createScopedContextLoader(base: DocumentLoader, suppressError?: boolean): {
+  loader: DocumentLoader;
+  release: () => void;
+};
+/**
 * Options for deciding whether two IRIs should be treated as same-origin.
 *
 * @internal Technically exported for generated vocabulary classes, but not
@@ -45,4 +71,4 @@ declare function getJsonLdContext(value: unknown, depth?: number): unknown;
 */
 declare function compactJsonLdCache(normalized: unknown, original: unknown, documentLoader?: DocumentLoader, depth?: number, inheritedContext?: unknown): Promise<unknown>;
 //#endregion
-export { IriTrustOptions, compactJsonLdCache, getJsonLdContext, isTrustedIriOrigin, normalizeJsonLdIris };
+export { IriTrustOptions, compactJsonLdCache, createScopedContextLoader, getJsonLdContext, isTrustedIriOrigin, normalizeJsonLdIris, registerDocumentLoaderWrapper, unwrapReleasedDocumentLoader };

package/dist/internal/jsonld-cache.d.ts

@@ -1,8 +1,34 @@
 /// <reference lib="esnext.temporal" />
-import { n as DocumentLoader } from "../docloader-Dr8wEkif.js";
+import { n as DocumentLoader } from "../docloader-oRpq1nQ8.js";
 
 //#region src/internal/jsonld-cache.d.ts
 /**
+* Registers a loader wrapper with the shared released-wrapper registry.
+* Both suppression and snapshot wrappers must use this registry so mixed
+* chains can be unwrapped.  The caller updates the state on release.
+* @internal Not a public API.
+*/
+declare function registerDocumentLoaderWrapper(loader: DocumentLoader, state: {
+  readonly base: DocumentLoader;
+  released: boolean;
+}): void;
+/**
+* Removes released loader wrappers, stopping at the first active wrapper.
+* Active wrappers retain their operation's suppression or snapshot cache.
+* @internal Not a public API.
+*/
+declare function unwrapReleasedDocumentLoader(base: DocumentLoader): DocumentLoader;
+/**
+* Lowers context loading failure logs for one accessor operation.  Parsed
+* objects retain the loader, so release it before returning to the caller.
+* Released wrappers are unwrapped to avoid accumulating loader chains.
+* @internal Used by generated vocabulary accessors; not a public API.
+*/
+declare function createScopedContextLoader(base: DocumentLoader, suppressError?: boolean): {
+  loader: DocumentLoader;
+  release: () => void;
+};
+/**
 * Options for deciding whether two IRIs should be treated as same-origin.
 *
 * @internal Technically exported for generated vocabulary classes, but not
@@ -45,4 +71,4 @@ declare function getJsonLdContext(value: unknown, depth?: number): unknown;
 */
 declare function compactJsonLdCache(normalized: unknown, original: unknown, documentLoader?: DocumentLoader, depth?: number, inheritedContext?: unknown): Promise<unknown>;
 //#endregion
-export { IriTrustOptions, compactJsonLdCache, getJsonLdContext, isTrustedIriOrigin, normalizeJsonLdIris };
+export { IriTrustOptions, compactJsonLdCache, createScopedContextLoader, getJsonLdContext, isTrustedIriOrigin, normalizeJsonLdIris, registerDocumentLoaderWrapper, unwrapReleasedDocumentLoader };

package/dist/internal/jsonld-cache.js

@@ -3,6 +3,53 @@ import { a as formatIri, c as haveSameFe34Origin, l as haveSameIriOrigin } from
 import jsonld_default from "../jsonld.js";
 //#region src/internal/jsonld-cache.ts
 const noJsonLdContext = Symbol("noJsonLdContext");
+const documentLoaderWrappers = /* @__PURE__ */ new WeakMap();
+/**
+* Registers a loader wrapper with the shared released-wrapper registry.
+* Both suppression and snapshot wrappers must use this registry so mixed
+* chains can be unwrapped.  The caller updates the state on release.
+* @internal Not a public API.
+*/
+function registerDocumentLoaderWrapper(loader, state) {
+	documentLoaderWrappers.set(loader, state);
+}
+/**
+* Removes released loader wrappers, stopping at the first active wrapper.
+* Active wrappers retain their operation's suppression or snapshot cache.
+* @internal Not a public API.
+*/
+function unwrapReleasedDocumentLoader(base) {
+	for (let state = documentLoaderWrappers.get(base); state?.released; state = documentLoaderWrappers.get(base)) base = state.base;
+	return base;
+}
+/**
+* Lowers context loading failure logs for one accessor operation.  Parsed
+* objects retain the loader, so release it before returning to the caller.
+* Released wrappers are unwrapped to avoid accumulating loader chains.
+* @internal Used by generated vocabulary accessors; not a public API.
+*/
+function createScopedContextLoader(base, suppressError) {
+	base = unwrapReleasedDocumentLoader(base);
+	if (!suppressError) return {
+		loader: base,
+		release: () => {}
+	};
+	const state = {
+		base,
+		released: false
+	};
+	const loader = (url, options) => base(url, state.released ? options : {
+		...options,
+		suppressError: true
+	});
+	registerDocumentLoaderWrapper(loader, state);
+	return {
+		loader,
+		release: () => {
+			state.released = true;
+		}
+	};
+}
 /**
 * Checks whether an IRI is trusted relative to another IRI.
 *
@@ -272,4 +319,4 @@ function combineContexts(inheritedContext, ownContext) {
 	return [...inherited, ...own];
 }
 //#endregion
-export { compactJsonLdCache, getJsonLdContext, isTrustedIriOrigin, normalizeJsonLdIris };
+export { compactJsonLdCache, createScopedContextLoader, getJsonLdContext, isTrustedIriOrigin, normalizeJsonLdIris, registerDocumentLoaderWrapper, unwrapReleasedDocumentLoader };

package/dist/internal/portable-dereference.cjs

@@ -3,6 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_contexts = require("../contexts-2hEbs3Qk.cjs");
 const require_url = require("../url-Cke4irYD.cjs");
 const require_jsonld = require("../jsonld.cjs");
+const require_internal_jsonld_cache = require("./jsonld-cache.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _opentelemetry_api = require("@opentelemetry/api");
 //#region src/internal/portable-dereference.ts
@@ -38,7 +39,15 @@ function getObjectId(object) {
 }
 /**
 * Checks whether a vocabulary object is part of a chain of portable objects,
-* i.e., whether it has a portable ID or was obtained from a portable object.
+* i.e., whether it has a portable ID, has an FEP-ef61 compatible identifier
+* as its ID (even a malformed one, so that it fails closed), or was obtained
+* from a portable object.  Accessors of such objects dereference references
+* as portable objects.
+*
+* Being part of a chain does not mean that the object itself is verified:
+* an object parsed from arbitrary JSON-LD is in a chain just because of its
+* ID.  Only {@link dereferencePortableIri} records that an object was
+* accepted by a verifier.
 *
 * @internal Technically exported for generated vocabulary classes, but not
 * part of the public API contract.  This is not considered public API for
@@ -47,7 +56,7 @@ function getObjectId(object) {
 function isInPortableChain(object) {
 	if (provenances.has(object)) return true;
 	const id = getObjectId(object);
-	return id != null && isPortableIri(id);
+	return id != null && (isPortableIri(id) || isCompatibleEf61Iri(id));
 }
 /**
 * Checks whether a vocabulary object was accepted without an integrity
@@ -393,8 +402,8 @@ function parseGatewayOrigin(gateway) {
 * part of the public API contract.  This is not considered public API for
 * Semantic Versioning decisions.
 */
-function createSnapshotContextLoader(contextLoader) {
-	for (let wrapped = snapshotLoaders.get(contextLoader); wrapped?.released; wrapped = snapshotLoaders.get(contextLoader)) contextLoader = wrapped.base;
+function createSnapshotContextLoader(contextLoader, suppressError) {
+	contextLoader = require_internal_jsonld_cache.unwrapReleasedDocumentLoader(contextLoader);
 	const cache = /* @__PURE__ */ new Map();
 	let released = false;
 	const release = () => {
@@ -412,7 +421,10 @@ function createSnapshotContextLoader(contextLoader) {
 		};
 		let promise = cache.get(key);
 		if (promise == null) {
-			const loading = contextLoader(url, options).then((document) => structuredClone(document));
+			const loading = contextLoader(url, suppressError ? {
+				...options,
+				suppressError: true
+			} : options).then((document) => structuredClone(document));
 			promise = loading;
 			cache.set(key, loading);
 			loading.catch(() => {
@@ -425,13 +437,12 @@ function createSnapshotContextLoader(contextLoader) {
 		base: contextLoader,
 		released: false
 	};
-	snapshotLoaders.set(loader, state);
+	require_internal_jsonld_cache.registerDocumentLoaderWrapper(loader, state);
 	return {
 		loader,
 		release
 	};
 }
-const snapshotLoaders = /* @__PURE__ */ new WeakMap();
 /**
 * The error thrown by {@link dereferencePortableIri} under
 * `crossOrigin: "throw"` when gateways returned objects but none of them
@@ -487,7 +498,7 @@ async function dereferencePortableIri(url, options) {
 			message: String(error)
 		});
 		if (options.suppressError) {
-			logger.error("Failed to dereference {url}: {error}", {
+			logger.warn("Failed to dereference {url}: {error}", {
 				url: lookupUrl,
 				error
 			});
@@ -496,7 +507,7 @@ async function dereferencePortableIri(url, options) {
 		throw error;
 	};
 	const verify = options.verifyPortableObject;
-	if (verify == null) return fail(/* @__PURE__ */ new TypeError("Dereferencing the portable object " + lookupUrl + " requires the verifyPortableObject option, e.g., verifyPortableObjectProof() from @fedify/fedify."));
+	if (verify == null) return fail(/* @__PURE__ */ new TypeError("Dereferencing the portable object " + lookupUrl + " requires the verifyPortableObject option, e.g., verifyPortableObject() from @fedify/fedify.  Passing a Fedify Context as the options gives it, and objects parsed with the option use it by default."));
 	const requestUrls = [];
 	let expectedId;
 	try {
@@ -517,8 +528,9 @@ async function dereferencePortableIri(url, options) {
 		url: lookupUrl,
 		gateway: null
 	});
-	const snapshot = createSnapshotContextLoader(options.contextLoader);
+	const snapshot = createSnapshotContextLoader(options.contextLoader, options.suppressError);
 	const contextLoader = snapshot.loader;
+	const scopedDocument = require_internal_jsonld_cache.createScopedContextLoader(options.documentLoader, options.suppressError);
 	const attempts = [];
 	const { signal } = options;
 	const gatewayHints = explicitGateways == null && inferredGateways.length > 0 ? inferredGateways : void 0;
@@ -528,7 +540,10 @@ async function dereferencePortableIri(url, options) {
 			signal?.throwIfAborted();
 			let remoteDocument;
 			try {
-				remoteDocument = response ?? await options.documentLoader(requestUrl, signal == null ? void 0 : { signal });
+				remoteDocument = response ?? await options.documentLoader(requestUrl, {
+					signal,
+					suppressError: options.suppressError
+				});
 			} catch (error) {
 				signal?.throwIfAborted();
 				logger.debug("Failed to fetch {url} from {requestUrl}: {error}", {
@@ -554,7 +569,7 @@ async function dereferencePortableIri(url, options) {
 				let result;
 				try {
 					result = await verify(document, {
-						documentLoader: options.documentLoader,
+						documentLoader: scopedDocument.loader,
 						contextLoader,
 						tracerProvider: options.tracerProvider,
 						...documentUrl == null ? {} : { documentUrl },
@@ -604,6 +619,7 @@ async function dereferencePortableIri(url, options) {
 			}
 		}
 	} finally {
+		scopedDocument.release();
 		snapshot.release();
 	}
 	const rejected = attempts.filter((a) => a.type === "rejected");

package/dist/internal/portable-dereference.d.cts

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
-import { n as DocumentLoader, s as RemoteDocument } from "../docloader-Dr8wEkif.cjs";
-import { r as PortableObjectVerifier } from "../portable-comBI05Y.cjs";
+import { n as DocumentLoader, s as RemoteDocument } from "../docloader-oRpq1nQ8.cjs";
+import { r as PortableObjectVerifier } from "../portable-Drfl02vZ.cjs";
 import { Span, TracerProvider } from "@opentelemetry/api";
 
 //#region src/internal/portable-dereference.d.ts
@@ -16,7 +16,15 @@ interface PortableReferrerLink {
 }
 /**
 * Checks whether a vocabulary object is part of a chain of portable objects,
-* i.e., whether it has a portable ID or was obtained from a portable object.
+* i.e., whether it has a portable ID, has an FEP-ef61 compatible identifier
+* as its ID (even a malformed one, so that it fails closed), or was obtained
+* from a portable object.  Accessors of such objects dereference references
+* as portable objects.
+*
+* Being part of a chain does not mean that the object itself is verified:
+* an object parsed from arbitrary JSON-LD is in a chain just because of its
+* ID.  Only {@link dereferencePortableIri} records that an object was
+* accepted by a verifier.
 *
 * @internal Technically exported for generated vocabulary classes, but not
 * part of the public API contract.  This is not considered public API for
@@ -236,7 +244,7 @@ declare function getPortableGatewayCandidates(url: URL, gateways?: readonly (str
 * part of the public API contract.  This is not considered public API for
 * Semantic Versioning decisions.
 */
-declare function createSnapshotContextLoader(contextLoader: DocumentLoader): {
+declare function createSnapshotContextLoader(contextLoader: DocumentLoader, suppressError?: boolean): {
   loader: DocumentLoader;
   release: () => void;
 };

package/dist/internal/portable-dereference.d.ts

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
-import { n as DocumentLoader, s as RemoteDocument } from "../docloader-Dr8wEkif.js";
-import { r as PortableObjectVerifier } from "../portable-DH3947GK.js";
+import { n as DocumentLoader, s as RemoteDocument } from "../docloader-oRpq1nQ8.js";
+import { r as PortableObjectVerifier } from "../portable-rwhiyMvY.js";
 import { Span, TracerProvider } from "@opentelemetry/api";
 
 //#region src/internal/portable-dereference.d.ts
@@ -16,7 +16,15 @@ interface PortableReferrerLink {
 }
 /**
 * Checks whether a vocabulary object is part of a chain of portable objects,
-* i.e., whether it has a portable ID or was obtained from a portable object.
+* i.e., whether it has a portable ID, has an FEP-ef61 compatible identifier
+* as its ID (even a malformed one, so that it fails closed), or was obtained
+* from a portable object.  Accessors of such objects dereference references
+* as portable objects.
+*
+* Being part of a chain does not mean that the object itself is verified:
+* an object parsed from arbitrary JSON-LD is in a chain just because of its
+* ID.  Only {@link dereferencePortableIri} records that an object was
+* accepted by a verifier.
 *
 * @internal Technically exported for generated vocabulary classes, but not
 * part of the public API contract.  This is not considered public API for
@@ -236,7 +244,7 @@ declare function getPortableGatewayCandidates(url: URL, gateways?: readonly (str
 * part of the public API contract.  This is not considered public API for
 * Semantic Versioning decisions.
 */
-declare function createSnapshotContextLoader(contextLoader: DocumentLoader): {
+declare function createSnapshotContextLoader(contextLoader: DocumentLoader, suppressError?: boolean): {
   loader: DocumentLoader;
   release: () => void;
 };

package/dist/internal/portable-dereference.js

@@ -2,6 +2,7 @@
 import { t as preloadedContexts } from "../contexts-DoZUIW7y.js";
 import { a as formatIri, c as haveSameFe34Origin, g as toCompatibleEf61Id, m as parseIri, o as fromCompatibleEf61Id, r as canonicalizePortableUri } from "../url-CEhi4hb4.js";
 import jsonld_default from "../jsonld.js";
+import { createScopedContextLoader, registerDocumentLoaderWrapper, unwrapReleasedDocumentLoader } from "./jsonld-cache.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode } from "@opentelemetry/api";
 //#region src/internal/portable-dereference.ts
@@ -37,7 +38,15 @@ function getObjectId(object) {
 }
 /**
 * Checks whether a vocabulary object is part of a chain of portable objects,
-* i.e., whether it has a portable ID or was obtained from a portable object.
+* i.e., whether it has a portable ID, has an FEP-ef61 compatible identifier
+* as its ID (even a malformed one, so that it fails closed), or was obtained
+* from a portable object.  Accessors of such objects dereference references
+* as portable objects.
+*
+* Being part of a chain does not mean that the object itself is verified:
+* an object parsed from arbitrary JSON-LD is in a chain just because of its
+* ID.  Only {@link dereferencePortableIri} records that an object was
+* accepted by a verifier.
 *
 * @internal Technically exported for generated vocabulary classes, but not
 * part of the public API contract.  This is not considered public API for
@@ -46,7 +55,7 @@ function getObjectId(object) {
 function isInPortableChain(object) {
 	if (provenances.has(object)) return true;
 	const id = getObjectId(object);
-	return id != null && isPortableIri(id);
+	return id != null && (isPortableIri(id) || isCompatibleEf61Iri(id));
 }
 /**
 * Checks whether a vocabulary object was accepted without an integrity
@@ -392,8 +401,8 @@ function parseGatewayOrigin(gateway) {
 * part of the public API contract.  This is not considered public API for
 * Semantic Versioning decisions.
 */
-function createSnapshotContextLoader(contextLoader) {
-	for (let wrapped = snapshotLoaders.get(contextLoader); wrapped?.released; wrapped = snapshotLoaders.get(contextLoader)) contextLoader = wrapped.base;
+function createSnapshotContextLoader(contextLoader, suppressError) {
+	contextLoader = unwrapReleasedDocumentLoader(contextLoader);
 	const cache = /* @__PURE__ */ new Map();
 	let released = false;
 	const release = () => {
@@ -411,7 +420,10 @@ function createSnapshotContextLoader(contextLoader) {
 		};
 		let promise = cache.get(key);
 		if (promise == null) {
-			const loading = contextLoader(url, options).then((document) => structuredClone(document));
+			const loading = contextLoader(url, suppressError ? {
+				...options,
+				suppressError: true
+			} : options).then((document) => structuredClone(document));
 			promise = loading;
 			cache.set(key, loading);
 			loading.catch(() => {
@@ -424,13 +436,12 @@ function createSnapshotContextLoader(contextLoader) {
 		base: contextLoader,
 		released: false
 	};
-	snapshotLoaders.set(loader, state);
+	registerDocumentLoaderWrapper(loader, state);
 	return {
 		loader,
 		release
 	};
 }
-const snapshotLoaders = /* @__PURE__ */ new WeakMap();
 /**
 * The error thrown by {@link dereferencePortableIri} under
 * `crossOrigin: "throw"` when gateways returned objects but none of them
@@ -486,7 +497,7 @@ async function dereferencePortableIri(url, options) {
 			message: String(error)
 		});
 		if (options.suppressError) {
-			logger.error("Failed to dereference {url}: {error}", {
+			logger.warn("Failed to dereference {url}: {error}", {
 				url: lookupUrl,
 				error
 			});
@@ -495,7 +506,7 @@ async function dereferencePortableIri(url, options) {
 		throw error;
 	};
 	const verify = options.verifyPortableObject;
-	if (verify == null) return fail(/* @__PURE__ */ new TypeError("Dereferencing the portable object " + lookupUrl + " requires the verifyPortableObject option, e.g., verifyPortableObjectProof() from @fedify/fedify."));
+	if (verify == null) return fail(/* @__PURE__ */ new TypeError("Dereferencing the portable object " + lookupUrl + " requires the verifyPortableObject option, e.g., verifyPortableObject() from @fedify/fedify.  Passing a Fedify Context as the options gives it, and objects parsed with the option use it by default."));
 	const requestUrls = [];
 	let expectedId;
 	try {
@@ -516,8 +527,9 @@ async function dereferencePortableIri(url, options) {
 		url: lookupUrl,
 		gateway: null
 	});
-	const snapshot = createSnapshotContextLoader(options.contextLoader);
+	const snapshot = createSnapshotContextLoader(options.contextLoader, options.suppressError);
 	const contextLoader = snapshot.loader;
+	const scopedDocument = createScopedContextLoader(options.documentLoader, options.suppressError);
 	const attempts = [];
 	const { signal } = options;
 	const gatewayHints = explicitGateways == null && inferredGateways.length > 0 ? inferredGateways : void 0;
@@ -527,7 +539,10 @@ async function dereferencePortableIri(url, options) {
 			signal?.throwIfAborted();
 			let remoteDocument;
 			try {
-				remoteDocument = response ?? await options.documentLoader(requestUrl, signal == null ? void 0 : { signal });
+				remoteDocument = response ?? await options.documentLoader(requestUrl, {
+					signal,
+					suppressError: options.suppressError
+				});
 			} catch (error) {
 				signal?.throwIfAborted();
 				logger.debug("Failed to fetch {url} from {requestUrl}: {error}", {
@@ -553,7 +568,7 @@ async function dereferencePortableIri(url, options) {
 				let result;
 				try {
 					result = await verify(document, {
-						documentLoader: options.documentLoader,
+						documentLoader: scopedDocument.loader,
 						contextLoader,
 						tracerProvider: options.tracerProvider,
 						...documentUrl == null ? {} : { documentUrl },
@@ -603,6 +618,7 @@ async function dereferencePortableIri(url, options) {
 			}
 		}
 	} finally {
+		scopedDocument.release();
 		snapshot.release();
 	}
 	const rejected = attempts.filter((a) => a.type === "rejected");