@fedify/vocab-runtime 2.1.0 → 2.1.2

package/dist/mod.d.cts

@@ -363,7 +363,6 @@ declare class LanguageString extends String {
 //#endregion
 //#region src/multibase/types.d.ts
 type BaseCode = "\x00" | "0" | "7" | "9" | "f" | "F" | "v" | "V" | "t" | "T" | "b" | "B" | "c" | "C" | "h" | "k" | "K" | "z" | "Z" | "m" | "M" | "u" | "U";
-
 /**
  * - Names of the supported encodings
  */
@@ -427,4 +426,4 @@ declare function isValidPublicIPv4Address(address: string): boolean;
 declare function isValidPublicIPv6Address(address: string): boolean;
 declare function expandIPv6Address(address: string): string;
 //#endregion
-export { AuthenticatedDocumentLoaderFactory, CreateRequestOptions, Decimal, DocumentLoader, DocumentLoaderFactory, DocumentLoaderFactoryOptions, DocumentLoaderOptions, FetchError, GetDocumentLoaderOptions, GetUserAgentOptions, LanguageString, RemoteDocument, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportMultibaseKey, exportSpki, getDocumentLoader, getRemoteDocument, getUserAgent, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, preloadedContexts, validatePublicUrl };
+export { type AuthenticatedDocumentLoaderFactory, type CreateRequestOptions, type Decimal, type DocumentLoader, type DocumentLoaderFactory, type DocumentLoaderFactoryOptions, type DocumentLoaderOptions, FetchError, type GetDocumentLoaderOptions, type GetUserAgentOptions, LanguageString, type RemoteDocument, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportMultibaseKey, exportSpki, getDocumentLoader, getRemoteDocument, getUserAgent, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, preloadedContexts, validatePublicUrl };

package/dist/mod.d.ts

@@ -363,7 +363,6 @@ declare class LanguageString extends String {
 //#endregion
 //#region src/multibase/types.d.ts
 type BaseCode = "\x00" | "0" | "7" | "9" | "f" | "F" | "v" | "V" | "t" | "T" | "b" | "B" | "c" | "C" | "h" | "k" | "K" | "z" | "Z" | "m" | "M" | "u" | "U";
-
 /**
  * - Names of the supported encodings
  */
@@ -427,4 +426,4 @@ declare function isValidPublicIPv4Address(address: string): boolean;
 declare function isValidPublicIPv6Address(address: string): boolean;
 declare function expandIPv6Address(address: string): string;
 //#endregion
-export { AuthenticatedDocumentLoaderFactory, CreateRequestOptions, Decimal, DocumentLoader, DocumentLoaderFactory, DocumentLoaderFactoryOptions, DocumentLoaderOptions, FetchError, GetDocumentLoaderOptions, GetUserAgentOptions, LanguageString, RemoteDocument, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportMultibaseKey, exportSpki, getDocumentLoader, getRemoteDocument, getUserAgent, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, preloadedContexts, validatePublicUrl };
+export { type AuthenticatedDocumentLoaderFactory, type CreateRequestOptions, type Decimal, type DocumentLoader, type DocumentLoaderFactory, type DocumentLoaderFactoryOptions, type DocumentLoaderOptions, FetchError, type GetDocumentLoaderOptions, type GetUserAgentOptions, LanguageString, type RemoteDocument, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportMultibaseKey, exportSpki, getDocumentLoader, getRemoteDocument, getUserAgent, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, preloadedContexts, validatePublicUrl };

package/dist/mod.js

@@ -9,9 +9,8 @@ import { decodeBase64Url } from "byte-encodings/base64url";
 import { createPublicKey } from "node:crypto";
 import { PublicKeyInfo } from "pkijs";
 import baseX from "@multiformats/base-x";
-
 //#region src/contexts/activitystreams.json
-var __context$11 = {
+var activitystreams_default = { "@context": {
 	"@vocab": "_:",
 	"xsd": "http://www.w3.org/2001/XMLSchema#",
 	"as": "https://www.w3.org/ns/activitystreams#",
@@ -387,12 +386,10 @@ var __context$11 = {
 		"@id": "as:alsoKnownAs",
 		"@type": "@id"
 	}
-};
-var activitystreams_default = { "@context": __context$11 };
-
+} };
 //#endregion
 //#region src/contexts/did-v1.json
-var __context$10 = {
+var did_v1_default = { "@context": {
 	"@protected": true,
 	"id": "@id",
 	"type": "@type",
@@ -446,12 +443,10 @@ var __context$10 = {
 		"@id": "https://w3id.org/security#verificationMethod",
 		"@type": "@id"
 	}
-};
-var did_v1_default = { "@context": __context$10 };
-
+} };
 //#endregion
 //#region src/contexts/fep-5711.json
-var __context$9 = {
+var fep_5711_default = { "@context": {
 	"likesOf": {
 		"@id": "https://w3id.org/fep/5711#likesOf",
 		"@type": "@id"
@@ -484,12 +479,10 @@ var __context$9 = {
 		"@id": "https://w3id.org/fep/5711#likedOf",
 		"@type": "@id"
 	}
-};
-var fep_5711_default = { "@context": __context$9 };
-
+} };
 //#endregion
 //#region src/contexts/gotosocial.json
-var __context$8 = {
+var gotosocial_default = { "@context": {
 	"xsd": "http://www.w3.org/2001/XMLSchema#",
 	"gts": "https://gotosocial.org/ns#",
 	"LikeRequest": "gts:LikeRequest",
@@ -572,12 +565,10 @@ var __context$8 = {
 		"@id": "gts:approvedBy",
 		"@type": "@id"
 	}
-};
-var gotosocial_default = { "@context": __context$8 };
-
+} };
 //#endregion
 //#region src/contexts/identity-v1.json
-var __context$7 = {
+var identity_v1_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"cred": "https://w3id.org/credentials#",
@@ -726,12 +717,10 @@ var __context$7 = {
 		"@id": "perm:writePermission",
 		"@type": "@id"
 	}
-};
-var identity_v1_default = { "@context": __context$7 };
-
+} };
 //#endregion
 //#region src/contexts/joinmastodon.json
-var __context$6 = {
+var joinmastodon_default = { "@context": {
 	"toot": "http://joinmastodon.org/ns#",
 	"Emoji": "toot:Emoji",
 	"featured": {
@@ -756,12 +745,10 @@ var __context$6 = {
 		"@id": "toot:attributionDomains",
 		"@type": "@id"
 	}
-};
-var joinmastodon_default = { "@context": __context$6 };
-
+} };
 //#endregion
 //#region src/contexts/schemaorg.json
-var __context$5 = {
+var schemaorg_default = { "@context": {
 	"type": "@type",
 	"id": "@id",
 	"HTML": { "@id": "rdf:HTML" },
@@ -4063,12 +4050,10 @@ var __context$5 = {
 	"yearlyRevenue": { "@id": "schema:yearlyRevenue" },
 	"yearsInOperation": { "@id": "schema:yearsInOperation" },
 	"yield": { "@id": "schema:yield" }
-};
-var schemaorg_default = { "@context": __context$5 };
-
+} };
 //#endregion
 //#region src/contexts/security-data-integrity-v1.json
-var __context$4 = {
+var security_data_integrity_v1_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"@protected": true,
@@ -4143,12 +4128,10 @@ var __context$4 = {
 			}
 		}
 	}
-};
-var security_data_integrity_v1_default = { "@context": __context$4 };
-
+} };
 //#endregion
 //#region src/contexts/security-data-integrity-v2.json
-var __context$3 = {
+var security_data_integrity_v2_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"@protected": true,
@@ -4226,12 +4209,10 @@ var __context$3 = {
 			}
 		}
 	}
-};
-var security_data_integrity_v2_default = { "@context": __context$3 };
-
+} };
 //#endregion
 //#region src/contexts/security-multikey-v1.json
-var __context$2 = {
+var security_multikey_v1_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"@protected": true,
@@ -4263,12 +4244,10 @@ var __context$2 = {
 			}
 		}
 	}
-};
-var security_multikey_v1_default = { "@context": __context$2 };
-
+} };
 //#endregion
 //#region src/contexts/security-v1.json
-var __context$1 = {
+var security_v1_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"dc": "http://purl.org/dc/terms/",
@@ -4339,21 +4318,17 @@ var __context$1 = {
 	"signature": "sec:signature",
 	"signatureAlgorithm": "sec:signingAlgorithm",
 	"signatureValue": "sec:signatureValue"
-};
-var security_v1_default = { "@context": __context$1 };
-
+} };
 //#endregion
 //#region src/contexts/webfinger.json
-var __context = {
+var webfinger_default = { "@context": {
 	"wf": "https://purl.archive.org/socialweb/webfinger#",
 	"xsd": "http://www.w3.org/2001/XMLSchema#",
 	"webfinger": {
 		"@id": "wf:webfinger",
 		"@type": "xsd:string"
 	}
-};
-var webfinger_default = { "@context": __context };
-
+} };
 //#endregion
 //#region src/contexts.ts
 const preloadedContexts = {
@@ -4370,50 +4345,10 @@ const preloadedContexts = {
 	"https://w3id.org/fep/5711": fep_5711_default,
 	"http://joinmastodon.org/ns": joinmastodon_default
 };
-var contexts_default = preloadedContexts;
-
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.1.0";
-var license = "MIT";
-var exports = {
-	".": "./src/mod.ts",
-	"./jsonld": "./src/jsonld.ts"
-};
-var description = "Runtime library for @fedify/vocab";
-var author = {
-	"name": "Hong Minhee",
-	"email": "hong@minhee.org",
-	"url": "https://hongminhee.org/"
-};
-var imports = {
-	"@multiformats/base-x": "npm:@multiformats/base-x@^4.0.1",
-	"asn1js": "npm:asn1js@^3.0.6",
-	"byte-encodings": "npm:byte-encodings@^1.0.11",
-	"fetch-mock": "npm:fetch-mock@^12.5.4",
-	"jsonld": "npm:jsonld@^9.0.0",
-	"pkijs": "npm:pkijs@^3.2.5"
-};
-var exclude = ["dist", "node_modules"];
-var publish = { "exclude": ["**/*.test.ts", "tsdown.config.ts"] };
-var tasks = {
-	"check": "deno fmt --check && deno lint && deno check src/*.ts",
-	"test": "deno test"
-};
-var deno_default = {
-	name,
-	version,
-	license,
-	exports,
-	description,
-	author,
-	imports,
-	exclude,
-	publish,
-	tasks
-};
-
+var version = "2.1.2";
 //#endregion
 //#region src/link.ts
 const parametersNeedLowerCase = ["rel", "type"];
@@ -4595,7 +4530,6 @@ var HttpHeaderLink = class HttpHeaderLink {
 		return new this(...inputs).toString();
 	}
 };
-
 //#endregion
 //#region src/request.ts
 /**
@@ -4647,27 +4581,25 @@ function createActivityPubRequest(url, options = {}) {
 * @since 1.3.0
 */
 function getUserAgent({ software, url } = {}) {
-	const fedify = `Fedify/${deno_default.version}`;
+	const fedify = `Fedify/${version}`;
 	const runtime = globalThis.Deno?.version?.deno != null ? `Deno/${Deno.version.deno}` : globalThis.process?.versions?.bun != null ? `Bun/${process.versions.bun}` : "navigator" in globalThis && navigator.userAgent === "Cloudflare-Workers" ? navigator.userAgent : globalThis.process?.versions?.node != null ? `Node.js/${process.versions.node}` : null;
 	const userAgent = software == null ? [fedify] : [software, fedify];
 	if (runtime != null) userAgent.push(runtime);
 	if (url != null) userAgent.push(`+${url.toString()}`);
-	const first = userAgent.shift();
-	return `${first} (${userAgent.join("; ")})`;
+	return `${userAgent.shift()} (${userAgent.join("; ")})`;
 }
 /**
 * Logs the request.
 * @param request The request to log.
 * @internal
 */
-function logRequest(logger$1, request) {
-	logger$1.debug("Fetching document: {method} {url} {headers}", {
+function logRequest(logger, request) {
+	logger.debug("Fetching document: {method} {url} {headers}", {
 		method: request.method,
 		url: request.url,
 		headers: Object.fromEntries(request.headers.entries())
 	});
 }
-
 //#endregion
 //#region src/url.ts
 var UrlError = class extends Error {
@@ -4686,8 +4618,7 @@ async function validatePublicUrl(url) {
 	if (hostname.startsWith("[") && hostname.endsWith("]")) hostname = hostname.substring(1, hostname.length - 2);
 	if (hostname === "localhost") throw new UrlError("Localhost is not allowed");
 	if ("Deno" in globalThis && !isIP(hostname)) {
-		const netPermission = await Deno.permissions.query({ name: "net" });
-		if (netPermission.state !== "granted") return;
+		if ((await Deno.permissions.query({ name: "net" })).state !== "granted") return;
 	}
 	if ("Bun" in globalThis) {
 		if (hostname === "example.com" || hostname.endsWith(".example.com")) return;
@@ -4723,10 +4654,8 @@ function expandIPv6Address(address) {
 	if (address.startsWith("::")) address = "0000" + address;
 	if (address.endsWith("::")) address = address + "0000";
 	address = address.replace("::", ":0000".repeat(8 - (address.match(/:/g) || []).length) + ":");
-	const parts = address.split(":");
-	return parts.map((part) => part.padStart(4, "0")).join(":");
+	return address.split(":").map((part) => part.padStart(4, "0")).join(":");
 }
-
 //#endregion
 //#region src/docloader.ts
 const logger = getLogger([
@@ -4734,6 +4663,7 @@ const logger = getLogger([
 	"runtime",
 	"docloader"
 ]);
+const DEFAULT_MAX_REDIRECTION = 20;
 /**
 * Gets a {@link RemoteDocument} from the given response.
 * @param url The URL of the document to load.
@@ -4743,7 +4673,7 @@ const logger = getLogger([
 * @throws {FetchError} If the response is not OK.
 * @internal
 */
-async function getRemoteDocument(url, response, fetch$1) {
+async function getRemoteDocument(url, response, fetch) {
 	const documentUrl = response.url === "" ? url : response.url;
 	const docUrl = new URL(documentUrl);
 	if (!response.ok) {
@@ -4781,7 +4711,7 @@ async function getRemoteDocument(url, response, fetch$1) {
 						alternateUrl: altUri.href,
 						url: documentUrl
 					});
-					return await fetch$1(altUri.href);
+					return await fetch(altUri.href);
 				}
 			}
 		}
@@ -4807,15 +4737,14 @@ async function getRemoteDocument(url, response, fetch$1) {
 				attrPattern.lastIndex = 0;
 				while ((attrMatch = attrPattern.exec(tagContent)) !== null) {
 					const key = attrMatch[1].toLowerCase();
-					const value = attrMatch[2] ?? attrMatch[3] ?? attrMatch[4] ?? "";
-					attribs[key] = value;
+					attribs[key] = attrMatch[2] ?? attrMatch[3] ?? attrMatch[4] ?? "";
 				}
 				if (attribs.rel === "alternate" && "type" in attribs && (attribs.type === "application/activity+json" || attribs.type === "application/ld+json" || attribs.type.startsWith("application/ld+json;")) && "href" in attribs && new URL(attribs.href, docUrl).href !== docUrl.href) {
 					logger.debug("Found alternate document: {alternateUrl} from {url}", {
 						alternateUrl: attribs.href,
 						url: documentUrl
 					});
-					return await fetch$1(new URL(attribs.href, docUrl).href);
+					return await fetch(new URL(attribs.href, docUrl).href);
 				}
 			}
 			document = JSON.parse(html);
@@ -4850,33 +4779,34 @@ async function getRemoteDocument(url, response, fetch$1) {
 * @since 1.3.0
 */
 function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAgent } = {}) {
-	const tracerProvider = trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	async function load(url, options) {
+	const tracer = trace.getTracerProvider().getTracer(name, version);
+	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
 		options?.signal?.throwIfAborted();
-		if (!skipPreloadedContexts && url in contexts_default) {
-			logger.debug("Using preloaded context: {url}.", { url });
+		const currentUrl = new URL(url).href;
+		if (!skipPreloadedContexts && currentUrl in preloadedContexts) {
+			logger.debug("Using preloaded context: {url}.", { url: currentUrl });
 			return {
 				contextUrl: null,
-				document: contexts_default[url],
-				documentUrl: url
+				document: preloadedContexts[currentUrl],
+				documentUrl: currentUrl
 			};
 		}
 		if (!allowPrivateAddress) try {
-			await validatePublicUrl(url);
+			await validatePublicUrl(currentUrl);
 		} catch (error) {
 			if (error instanceof UrlError) logger.error("Disallowed private URL: {url}", {
-				url,
+				url: currentUrl,
 				error
 			});
 			throw error;
 		}
+		visited.add(currentUrl);
 		return await tracer.startActiveSpan("activitypub.fetch_document", {
 			kind: SpanKind.CLIENT,
-			attributes: { "url.full": url }
+			attributes: { "url.full": currentUrl }
 		}, async (span) => {
 			try {
-				const request = createActivityPubRequest(url, { userAgent });
+				const request = createActivityPubRequest(currentUrl, { userAgent });
 				logRequest(logger, request);
 				const response = await fetch(request, {
 					redirect: "manual",
@@ -4884,11 +4814,25 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 				});
 				span.setAttribute("http.response.status_code", response.status);
 				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
-					const redirectUrl = response.headers.get("Location");
+					if (redirected >= DEFAULT_MAX_REDIRECTION) {
+						logger.error("Too many redirections ({redirections}) while fetching document.", {
+							redirections: redirected + 1,
+							url: currentUrl
+						});
+						throw new FetchError(currentUrl, `Too many redirections (${redirected + 1})`);
+					}
+					const redirectUrl = new URL(response.headers.get("Location"), response.url === "" ? currentUrl : response.url).href;
 					span.setAttribute("http.redirect.url", redirectUrl);
-					return await load(redirectUrl, options);
+					if (visited.has(redirectUrl)) {
+						logger.error("Detected a redirect loop while fetching document: {url} -> {redirectUrl}", {
+							url: currentUrl,
+							redirectUrl
+						});
+						throw new FetchError(currentUrl, `Redirect loop detected: ${redirectUrl}`);
+					}
+					return await load(redirectUrl, options, redirected + 1, visited);
 				}
-				const result = await getRemoteDocument(url, response, load);
+				const result = await getRemoteDocument(currentUrl, response, load);
 				span.setAttribute("docloader.document_url", result.documentUrl);
 				if (result.contextUrl != null) span.setAttribute("docloader.context_url", result.contextUrl);
 				return result;
@@ -4906,7 +4850,6 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 	}
 	return load;
 }
-
 //#endregion
 //#region src/internal/multicodec.ts
 const INVALID_MULTICODEC_PREFIX = "Invalid multicodec prefix.";
@@ -4946,7 +4889,6 @@ function addMulticodecPrefix(code, payload) {
 	prefixed.set(payload, prefix.length);
 	return prefixed;
 }
-
 //#endregion
 //#region src/jwk.ts
 function validateCryptoKey(key, type) {
@@ -4954,11 +4896,9 @@ function validateCryptoKey(key, type) {
 	if (!key.extractable) throw new TypeError("The key is not extractable.");
 	if (key.algorithm.name !== "RSASSA-PKCS1-v1_5" && key.algorithm.name !== "Ed25519") throw new TypeError("Currently only RSASSA-PKCS1-v1_5 and Ed25519 keys are supported.  More algorithms will be added in the future!");
 	if (key.algorithm.name === "RSASSA-PKCS1-v1_5") {
-		const algorithm = key.algorithm;
-		if (algorithm.hash.name !== "SHA-256") throw new TypeError("For compatibility with the existing Fediverse software (e.g., Mastodon), hash algorithm for RSASSA-PKCS1-v1_5 keys must be SHA-256.");
+		if (key.algorithm.hash.name !== "SHA-256") throw new TypeError("For compatibility with the existing Fediverse software (e.g., Mastodon), hash algorithm for RSASSA-PKCS1-v1_5 keys must be SHA-256.");
 	}
 }
-
 //#endregion
 //#region src/multibase/util.ts
 const textDecoder = new TextDecoder();
@@ -4974,7 +4914,6 @@ function concat(arrs, length) {
 	}
 	return output;
 }
-
 //#endregion
 //#region src/multibase/base.ts
 /**
@@ -4983,8 +4922,8 @@ function concat(arrs, length) {
 var Base = class {
 	codeBuf;
 	codec;
-	constructor(name$1, code, factory, alphabet) {
-		this.name = name$1;
+	constructor(name, code, factory, alphabet) {
+		this.name = name;
 		this.code = code;
 		this.alphabet = alphabet;
 		this.codeBuf = encodeText(this.code);
@@ -4999,12 +4938,11 @@ var Base = class {
 		return this.codec.decode(string);
 	}
 };
-
 //#endregion
 //#region src/multibase/rfc4648.ts
 const decode = (string, alphabet, bitsPerChar) => {
-	const codes$1 = {};
-	for (let i = 0; i < alphabet.length; ++i) codes$1[alphabet[i]] = i;
+	const codes = {};
+	for (let i = 0; i < alphabet.length; ++i) codes[alphabet[i]] = i;
 	let end = string.length;
 	while (string[end - 1] === "=") --end;
 	const out = new Uint8Array(end * bitsPerChar / 8 | 0);
@@ -5012,7 +4950,7 @@ const decode = (string, alphabet, bitsPerChar) => {
 	let buffer = 0;
 	let written = 0;
 	for (let i = 0; i < end; ++i) {
-		const value = codes$1[string[i]];
+		const value = codes[string[i]];
 		if (value === void 0) throw new SyntaxError("Invalid character " + string[i]);
 		buffer = buffer << bitsPerChar | value;
 		bits += bitsPerChar;
@@ -5055,7 +4993,6 @@ const rfc4648 = (bitsPerChar) => (alphabet) => {
 		}
 	};
 };
-
 //#endregion
 //#region src/multibase/constants.ts
 const identity = () => {
@@ -5217,7 +5154,6 @@ const codes = constants.reduce((prev, tupple) => {
 	prev[tupple[1]] = names[tupple[0]];
 	return prev;
 }, {});
-
 //#endregion
 //#region src/multibase/mod.ts
 /**
@@ -5254,8 +5190,7 @@ function decodeMultibase(data) {
 		"k",
 		"K"
 	].includes(prefix)) data = data.toLowerCase();
-	const enc = encoding(data[0]);
-	return enc.decode(data.substring(1));
+	return encoding(data[0]).decode(data.substring(1));
 }
 /**
 * Get the encoding by name or code
@@ -5277,7 +5212,6 @@ function encodingFromBaseData(data) {
 	if (data instanceof Uint8Array) data = decodeText(data);
 	return encoding(data[0]);
 }
-
 //#endregion
 //#region src/key.ts
 const algorithms = {
@@ -5302,8 +5236,7 @@ async function importSpki(pem) {
 	} catch (_) {
 		throw new TypeError("Invalid PEM-SPKI format.");
 	}
-	const pki = PublicKeyInfo.fromBER(spki);
-	const oid = pki.algorithm.algorithmId;
+	const oid = PublicKeyInfo.fromBER(spki).algorithm.algorithmId;
 	const algorithm = algorithms[oid];
 	if (algorithm == null) throw new TypeError("Unsupported algorithm: " + oid);
 	return await crypto.subtle.importKey("spki", spki, algorithm, true, ["verify"]);
@@ -5317,8 +5250,7 @@ async function importSpki(pem) {
 */
 async function exportSpki(key) {
 	validateCryptoKey(key);
-	const spki = await crypto.subtle.exportKey("spki", key);
-	let pem = encodeBase64(spki);
+	let pem = encodeBase64(await crypto.subtle.exportKey("spki", key));
 	pem = (pem.match(/.{1,64}/g) || []).join("\n");
 	return `-----BEGIN PUBLIC KEY-----\n${pem}\n-----END PUBLIC KEY-----\n`;
 }
@@ -5330,16 +5262,14 @@ async function exportSpki(key) {
 * @since 1.5.0
 */
 function importPkcs1(pem) {
-	const key = createPublicKey({
+	return importSpki(createPublicKey({
 		key: pem,
 		format: "pem",
 		type: "pkcs1"
-	});
-	const spki = key.export({
+	}).export({
 		type: "spki",
 		format: "pem"
-	});
-	return importSpki(spki);
+	}));
 }
 const PKCS1_HEADER = /^\s*-----BEGIN\s+RSA\s+PUBLIC\s+KEY-----\s*\n/;
 /**
@@ -5366,12 +5296,11 @@ async function importMultibaseKey(key) {
 	const { code } = getMulticodecPrefix(decoded);
 	const content = removeMulticodecPrefix(decoded);
 	if (code === 4613) {
-		const keyObject = createPublicKey({
+		const exported = createPublicKey({
 			key: content,
 			format: "der",
 			type: "pkcs1"
-		});
-		const exported = keyObject.export({
+		}).export({
 			type: "spki",
 			format: "der"
 		});
@@ -5403,21 +5332,18 @@ async function exportMultibaseKey(key) {
 		const decodedN = decodeBase64Url(jwk.n);
 		const n = new Uint8Array(decodedN.length + 1);
 		n.set(decodedN, 1);
-		const sequence = new Sequence({ value: [new Integer({
+		content = new Sequence({ value: [new Integer({
 			isHexOnly: true,
 			valueHex: n
 		}), new Integer({
 			isHexOnly: true,
 			valueHex: decodeBase64Url(jwk.e)
-		})] });
-		content = sequence.toBER(false);
+		})] }).toBER(false);
 		code = 4613;
 	} else throw new TypeError("Unsupported key type: " + JSON.stringify(key.algorithm));
-	const prefixed = addMulticodecPrefix(code, new Uint8Array(content));
-	const encoded = encodeMultibase("base58btc", prefixed);
+	const encoded = encodeMultibase("base58btc", addMulticodecPrefix(code, new Uint8Array(content)));
 	return new TextDecoder().decode(encoded);
 }
-
 //#endregion
 //#region src/decimal.ts
 const DECIMAL_PATTERN = /^(\+|-)?([0-9]+(\.[0-9]*)?|\.[0-9]+)$/;
@@ -5493,7 +5419,6 @@ function parseDecimal(value) {
 	if (!isDecimal(normalized)) throw new TypeError(`${JSON.stringify(value)} is not a valid xsd:decimal lexical form.`);
 	return normalized;
 }
-
 //#endregion
 //#region src/langstr.ts
 /**
@@ -5522,6 +5447,5 @@ LanguageString.prototype[Symbol.for("Deno.customInspect")] = function(inspect, o
 LanguageString.prototype[Symbol.for("nodejs.util.inspect.custom")] = function(_depth, options, inspect) {
 	return `<${this.locale.baseName}> ${inspect(this.toString(), options)}`;
 };
-
 //#endregion
-export { FetchError, LanguageString, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportMultibaseKey, exportSpki, getDocumentLoader, getRemoteDocument, getUserAgent, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, contexts_default as preloadedContexts, validatePublicUrl };
+export { FetchError, LanguageString, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportMultibaseKey, exportSpki, getDocumentLoader, getRemoteDocument, getUserAgent, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, preloadedContexts, validatePublicUrl };