@fedify/vocab-runtime 2.4.0-dev.1567 → 2.4.0-dev.1570

package/dist/tests/key.test.mjs

@@ -1,5 +1,4 @@
-import { t as addMulticodecPrefix } from "./multicodec-CyFp54fI.mjs";
-import { a as importMultibaseKey, c as importSpki, d as importJwk, i as importDidKey, l as parseDidKeyVerificationMethod, n as exportMultibaseKey, o as importPem, r as exportSpki, s as importPkcs1, t as exportDidKey, u as exportJwk } from "./key-CDGDH_vC.mjs";
+import { a as importPkcs1, c as importJwk, i as importPem, n as exportSpki, o as importSpki, r as importMultibaseKey, s as exportJwk, t as exportMultibaseKey } from "./key-CrrK9mYh.mjs";
 import { n as encodeMultibase } from "./multibase-B4bvakyA.mjs";
 import { deepStrictEqual, rejects } from "node:assert";
 import { test } from "node:test";
@@ -71,51 +70,5 @@ test("exportMultibaseKey()", async () => {
 		x: "Lm_M42cB3HkUiODQsXRcweM6TByfzEHGO9ND274JcOY"
 	}, "public")), "z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK");
 });
-test("exportDidKey() and importDidKey()", async () => {
-	const did = await exportDidKey(await importJwk(ed25519Jwk, "public"));
-	deepStrictEqual(did, `did:key:${ed25519Multibase}`);
-	deepStrictEqual(await exportJwk(await importDidKey(did)), ed25519Jwk);
-	deepStrictEqual(await exportJwk(await importDidKey(new URL(did))), ed25519Jwk);
-	const rsaKey = await importJwk(rsaJwk, "public");
-	await rejects(() => exportDidKey(rsaKey), TypeError);
-	await rejects(() => importDidKey(`did:key:${rsaMultibase}`), /* @__PURE__ */ new TypeError("Unsupported did:key type: 0x1205"));
-});
-test("parseDidKeyVerificationMethod()", async () => {
-	const verificationMethod = `did:key:${ed25519Multibase}#${ed25519Multibase}`;
-	const parsed = await parseDidKeyVerificationMethod(verificationMethod);
-	deepStrictEqual(parsed.id, new URL(verificationMethod));
-	deepStrictEqual(parsed.controller, new URL(`did:key:${ed25519Multibase}`));
-	deepStrictEqual(parsed.publicKeyMultibase, ed25519Multibase);
-	deepStrictEqual(await exportJwk(parsed.publicKey), ed25519Jwk);
-});
-test("did:key helpers reject malformed values", async () => {
-	const ed25519Key = await importJwk(ed25519Jwk, "public");
-	const raw = new Uint8Array(await crypto.subtle.exportKey("raw", ed25519Key));
-	const shortEd25519 = new TextDecoder().decode(encodeMultibase("base58btc", addMulticodecPrefix(237, raw.slice(0, 31))));
-	const base64UrlEd25519 = new TextDecoder().decode(encodeMultibase("base64url", addMulticodecPrefix(237, raw)));
-	const malformedMulticodec = new TextDecoder().decode(encodeMultibase("base58btc", Uint8Array.from([128])));
-	for (const value of [
-		"did:web:example.com",
-		"did:key:",
-		`did:key:${ed25519Multibase}/path`,
-		`did:key:${ed25519Multibase}?query`,
-		`did:key:${ed25519Multibase}#${ed25519Multibase}`,
-		"did:key:z0",
-		`did:key:${base64UrlEd25519}`,
-		`did:key:${shortEd25519}`,
-		`did:key:${malformedMulticodec}`
-	]) await rejects(() => importDidKey(value), TypeError);
-	for (const value of [
-		`did:key:${ed25519Multibase}`,
-		`did:key:${ed25519Multibase}#`,
-		`did:key:${ed25519Multibase}#z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK`,
-		`did:key:${ed25519Multibase}#${base64UrlEd25519}`,
-		"did:key:z0#z0",
-		`did:key:${rsaMultibase}#${rsaMultibase}`,
-		`did:key:${shortEd25519}#${shortEd25519}`,
-		`did:key:${malformedMulticodec}#${malformedMulticodec}`,
-		"https://example.com/key"
-	]) await rejects(() => parseDidKeyVerificationMethod(value), TypeError);
-});
 //#endregion
 export {};

package/dist/tests/{request-Cn0vP7Hj.mjs → request-BEXkv1ul.mjs}

@@ -1,7 +1,7 @@
 import process from "node:process";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.1567+12e6a3c0";
+var version = "2.4.0-dev.1570+f1b6aaa3";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/{request-DnNWah97.cjs → request-SworbvLc.cjs}

@@ -3,7 +3,7 @@ let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process, 1);
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.1567+12e6a3c0";
+var version = "2.4.0-dev.1570+f1b6aaa3";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/request.test.cjs

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-C2EiDwsr.cjs");
-const require_request = require("./request-DnNWah97.cjs");
+const require_request = require("./request-SworbvLc.cjs");
 let node_assert = require("node:assert");
 let node_test = require("node:test");
 let node_process = require("node:process");

package/dist/tests/request.test.mjs

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

package/dist/tests/{url-2XwVbUS_.cjs → url-C20FhC7p.cjs}

@@ -8,90 +8,6 @@ var UrlError = class extends Error {
 		this.name = "UrlError";
 	}
 };
-const PORTABLE_IRI_PATTERN = /^(ap|ap\+ef61):\/\/([^/?#]*)([^?#]*)(\?[^#]*)?(#.*)?$/i;
-const INVALID_PERCENT_ENCODING_PATTERN = /%(?![0-9A-Fa-f]{2})/;
-const DID_SCHEME_PATTERN = /^did:/i;
-const DID_PATTERN = /^did:[a-z0-9]+:[-A-Za-z0-9._%]+(?::[-A-Za-z0-9._%]+)*$/i;
-/**
-* Parses a JSON-LD `@id` value as an IRI.
-*/
-function parseJsonLdId(id, base) {
-	if (id == null || id.startsWith("_:")) return void 0;
-	try {
-		return parseIri(id, base);
-	} catch {
-		throw new TypeError("Invalid @id: " + id);
-	}
-}
-/**
-* Parses an IRI as a URL, including FEP-ef61 portable ActivityPub IRIs.
-*/
-function parseIri(iri, base) {
-	if (iri instanceof URL) return normalizePortableUrl(iri) ?? new URL(iri.href);
-	const portable = parsePortableIri(iri);
-	if (portable != null) return portable;
-	base = normalizeBaseIri(base);
-	if (!URL.canParse(iri, base) && iri.startsWith("at://")) return parseAtUri(iri);
-	const parsed = new URL(iri, base);
-	return normalizePortableUrl(parsed) ?? parsed;
-}
-/**
-* Formats a URL as an IRI, including FEP-ef61 portable ActivityPub IRIs.
-*/
-function formatIri(iri) {
-	const parsed = parsePortableIri(iri instanceof URL ? iri.href : iri);
-	if (parsed == null) return iri instanceof URL ? iri.href : URL.canParse(iri) ? new URL(iri).href : iri;
-	return `ap+ef61://${decodePortableAuthority(parsed.host)}${parsed.pathname}${parsed.search}${parsed.hash}`;
-}
-/**
-* Checks whether two IRIs have the same origin.
-*/
-function haveSameIriOrigin(left, right) {
-	return getComparableIriOrigin(left) === getComparableIriOrigin(right);
-}
-function getComparableIriOrigin(iri) {
-	iri = normalizePortableUrl(iri) ?? iri;
-	if (iri.origin !== "null") return iri.origin;
-	if (iri.host !== "") {
-		const host = iri.protocol === "ap+ef61:" ? encodeURIComponent(decodePortableAuthority(iri.host).replace(DID_SCHEME_PATTERN, "did:")) : iri.host;
-		return `${iri.protocol}//${host}`;
-	}
-	return iri.href;
-}
-function parsePortableIri(iri) {
-	const match = iri.match(PORTABLE_IRI_PATTERN);
-	if (match == null) return null;
-	const authority = decodePortableAuthority(match[2]);
-	if (!DID_PATTERN.test(authority)) throw new TypeError("Invalid portable ActivityPub IRI authority.");
-	if (match[3] === "") throw new TypeError("Invalid portable ActivityPub IRI path.");
-	return new URL(`ap+ef61://${encodeURIComponent(authority)}${match[3]}${match[4] ?? ""}${match[5] ?? ""}`);
-}
-function normalizePortableUrl(iri) {
-	if (iri.protocol !== "ap:" && iri.protocol !== "ap+ef61:") return null;
-	return parsePortableIri(`ap+ef61://${iri.host}${iri.pathname}${iri.search}${iri.hash}`);
-}
-function normalizeBaseIri(base) {
-	if (base == null) return void 0;
-	if (base instanceof URL) return normalizePortableUrl(base) ?? base;
-	return parsePortableIri(base) ?? (base.startsWith("at://") && !URL.canParse(".", base) ? parseAtUri(base) : base);
-}
-function decodePortableAuthority(authority) {
-	if (INVALID_PERCENT_ENCODING_PATTERN.test(authority)) throw new TypeError("Invalid portable ActivityPub IRI authority.");
-	if (DID_SCHEME_PATTERN.test(authority)) {
-		const decoded = authority.replace(/%25/gi, "%");
-		if (INVALID_PERCENT_ENCODING_PATTERN.test(decoded)) throw new TypeError("Invalid portable ActivityPub IRI authority.");
-		return decoded;
-	}
-	const decoded = authority.replace(/%(25|3A)/gi, (match) => match.toLowerCase() === "%3a" ? ":" : "%");
-	if (INVALID_PERCENT_ENCODING_PATTERN.test(decoded)) throw new TypeError("Invalid portable ActivityPub IRI authority.");
-	return decoded;
-}
-function parseAtUri(uri) {
-	const index = uri.indexOf("/", 5);
-	const authority = index >= 0 ? uri.slice(5, index) : uri.slice(5);
-	const path = index >= 0 ? uri.slice(index) : "";
-	return new URL("at://" + encodeURIComponent(authority) + path);
-}
 /**
 * Validates a URL to prevent SSRF attacks.
 */
@@ -270,18 +186,6 @@ Object.defineProperty(exports, "expandIPv6Address", {
 		return expandIPv6Address;
 	}
 });
-Object.defineProperty(exports, "formatIri", {
-	enumerable: true,
-	get: function() {
-		return formatIri;
-	}
-});
-Object.defineProperty(exports, "haveSameIriOrigin", {
-	enumerable: true,
-	get: function() {
-		return haveSameIriOrigin;
-	}
-});
 Object.defineProperty(exports, "isValidPublicIPv4Address", {
 	enumerable: true,
 	get: function() {
@@ -294,18 +198,6 @@ Object.defineProperty(exports, "isValidPublicIPv6Address", {
 		return isValidPublicIPv6Address;
 	}
 });
-Object.defineProperty(exports, "parseIri", {
-	enumerable: true,
-	get: function() {
-		return parseIri;
-	}
-});
-Object.defineProperty(exports, "parseJsonLdId", {
-	enumerable: true,
-	get: function() {
-		return parseJsonLdId;
-	}
-});
 Object.defineProperty(exports, "validatePublicUrl", {
 	enumerable: true,
 	get: function() {

package/dist/tests/{url-YWJbnRlf.mjs → url-m9Qzxy-Y.mjs}

@@ -7,90 +7,6 @@ var UrlError = class extends Error {
 		this.name = "UrlError";
 	}
 };
-const PORTABLE_IRI_PATTERN = /^(ap|ap\+ef61):\/\/([^/?#]*)([^?#]*)(\?[^#]*)?(#.*)?$/i;
-const INVALID_PERCENT_ENCODING_PATTERN = /%(?![0-9A-Fa-f]{2})/;
-const DID_SCHEME_PATTERN = /^did:/i;
-const DID_PATTERN = /^did:[a-z0-9]+:[-A-Za-z0-9._%]+(?::[-A-Za-z0-9._%]+)*$/i;
-/**
-* Parses a JSON-LD `@id` value as an IRI.
-*/
-function parseJsonLdId(id, base) {
-	if (id == null || id.startsWith("_:")) return void 0;
-	try {
-		return parseIri(id, base);
-	} catch {
-		throw new TypeError("Invalid @id: " + id);
-	}
-}
-/**
-* Parses an IRI as a URL, including FEP-ef61 portable ActivityPub IRIs.
-*/
-function parseIri(iri, base) {
-	if (iri instanceof URL) return normalizePortableUrl(iri) ?? new URL(iri.href);
-	const portable = parsePortableIri(iri);
-	if (portable != null) return portable;
-	base = normalizeBaseIri(base);
-	if (!URL.canParse(iri, base) && iri.startsWith("at://")) return parseAtUri(iri);
-	const parsed = new URL(iri, base);
-	return normalizePortableUrl(parsed) ?? parsed;
-}
-/**
-* Formats a URL as an IRI, including FEP-ef61 portable ActivityPub IRIs.
-*/
-function formatIri(iri) {
-	const parsed = parsePortableIri(iri instanceof URL ? iri.href : iri);
-	if (parsed == null) return iri instanceof URL ? iri.href : URL.canParse(iri) ? new URL(iri).href : iri;
-	return `ap+ef61://${decodePortableAuthority(parsed.host)}${parsed.pathname}${parsed.search}${parsed.hash}`;
-}
-/**
-* Checks whether two IRIs have the same origin.
-*/
-function haveSameIriOrigin(left, right) {
-	return getComparableIriOrigin(left) === getComparableIriOrigin(right);
-}
-function getComparableIriOrigin(iri) {
-	iri = normalizePortableUrl(iri) ?? iri;
-	if (iri.origin !== "null") return iri.origin;
-	if (iri.host !== "") {
-		const host = iri.protocol === "ap+ef61:" ? encodeURIComponent(decodePortableAuthority(iri.host).replace(DID_SCHEME_PATTERN, "did:")) : iri.host;
-		return `${iri.protocol}//${host}`;
-	}
-	return iri.href;
-}
-function parsePortableIri(iri) {
-	const match = iri.match(PORTABLE_IRI_PATTERN);
-	if (match == null) return null;
-	const authority = decodePortableAuthority(match[2]);
-	if (!DID_PATTERN.test(authority)) throw new TypeError("Invalid portable ActivityPub IRI authority.");
-	if (match[3] === "") throw new TypeError("Invalid portable ActivityPub IRI path.");
-	return new URL(`ap+ef61://${encodeURIComponent(authority)}${match[3]}${match[4] ?? ""}${match[5] ?? ""}`);
-}
-function normalizePortableUrl(iri) {
-	if (iri.protocol !== "ap:" && iri.protocol !== "ap+ef61:") return null;
-	return parsePortableIri(`ap+ef61://${iri.host}${iri.pathname}${iri.search}${iri.hash}`);
-}
-function normalizeBaseIri(base) {
-	if (base == null) return void 0;
-	if (base instanceof URL) return normalizePortableUrl(base) ?? base;
-	return parsePortableIri(base) ?? (base.startsWith("at://") && !URL.canParse(".", base) ? parseAtUri(base) : base);
-}
-function decodePortableAuthority(authority) {
-	if (INVALID_PERCENT_ENCODING_PATTERN.test(authority)) throw new TypeError("Invalid portable ActivityPub IRI authority.");
-	if (DID_SCHEME_PATTERN.test(authority)) {
-		const decoded = authority.replace(/%25/gi, "%");
-		if (INVALID_PERCENT_ENCODING_PATTERN.test(decoded)) throw new TypeError("Invalid portable ActivityPub IRI authority.");
-		return decoded;
-	}
-	const decoded = authority.replace(/%(25|3A)/gi, (match) => match.toLowerCase() === "%3a" ? ":" : "%");
-	if (INVALID_PERCENT_ENCODING_PATTERN.test(decoded)) throw new TypeError("Invalid portable ActivityPub IRI authority.");
-	return decoded;
-}
-function parseAtUri(uri) {
-	const index = uri.indexOf("/", 5);
-	const authority = index >= 0 ? uri.slice(5, index) : uri.slice(5);
-	const path = index >= 0 ? uri.slice(index) : "";
-	return new URL("at://" + encodeURIComponent(authority) + path);
-}
 /**
 * Validates a URL to prevent SSRF attacks.
 */
@@ -257,4 +173,4 @@ function matchesIPv6Prefix(address, prefixWords, prefixLength) {
 	return true;
 }
 //#endregion
-export { isValidPublicIPv4Address as a, parseJsonLdId as c, haveSameIriOrigin as i, validatePublicUrl as l, expandIPv6Address as n, isValidPublicIPv6Address as o, formatIri as r, parseIri as s, UrlError as t };
+export { validatePublicUrl as a, isValidPublicIPv6Address as i, expandIPv6Address as n, isValidPublicIPv4Address as r, UrlError as t };

package/dist/tests/url.test.cjs

@@ -1,111 +1,8 @@
 require("./chunk-C2EiDwsr.cjs");
-const require_url = require("./url-2XwVbUS_.cjs");
+const require_url = require("./url-C20FhC7p.cjs");
 let node_assert = require("node:assert");
 let node_test = require("node:test");
 //#region src/url.test.ts
-(0, node_test.test)("parseIri() accepts portable ActivityPub URI schemes", () => {
-	for (const iri of [
-		"ap://did:key:z6Mkabc/actor",
-		"ap://did%3Akey%3Az6Mkabc/actor",
-		"ap+ef61://did:key:z6Mkabc/actor",
-		"ap+ef61://did%3Akey%3Az6Mkabc/actor",
-		"AP+EF61://did:key:z6Mkabc/actor"
-	]) (0, node_assert.deepStrictEqual)(require_url.parseIri(iri), new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor"));
-});
-(0, node_test.test)("parseIri() accepts DID schemes case-insensitively", () => {
-	for (const iri of ["ap://DID:key:z6Mkabc/actor", "ap://DID%3Akey%3Az6Mkabc/actor"]) (0, node_assert.deepStrictEqual)(require_url.parseIri(iri), new URL("ap+ef61://DID%3Akey%3Az6Mkabc/actor"));
-});
-(0, node_test.test)("parseIri() accepts DID method names that start with digits", () => {
-	(0, node_assert.deepStrictEqual)(require_url.parseIri("ap://did:3:abc/actor"), new URL("ap+ef61://did%3A3%3Aabc/actor"));
-});
-(0, node_test.test)("parseIri() accepts hyphens in DID method-specific IDs", () => {
-	(0, node_assert.deepStrictEqual)(require_url.parseIri("ap+ef61://did:web:foo-bar.example/actor"), new URL("ap+ef61://did%3Aweb%3Afoo-bar.example/actor"));
-});
-(0, node_test.test)("parseIri() preserves existing URL parsing behavior", () => {
-	(0, node_assert.deepStrictEqual)(require_url.parseIri("/actor", new URL("https://example.com/users/alice")), new URL("https://example.com/actor"));
-	(0, node_assert.deepStrictEqual)(require_url.parseIri("at://did:plc:example/record"), new URL("at://did%3Aplc%3Aexample/record"));
-	(0, node_assert.throws)(() => require_url.parseIri("ap://not-a-did/actor"), TypeError);
-});
-(0, node_test.test)("parseJsonLdId() parses JSON-LD ids", () => {
-	(0, node_assert.deepStrictEqual)(require_url.parseJsonLdId(void 0), void 0);
-	(0, node_assert.deepStrictEqual)(require_url.parseJsonLdId("_:blank"), void 0);
-	(0, node_assert.deepStrictEqual)(require_url.parseJsonLdId("/actor", new URL("https://example.com/users/alice")), new URL("https://example.com/actor"));
-	(0, node_assert.deepStrictEqual)(require_url.parseJsonLdId("ap://did:key:z6Mkabc/actor"), new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor"));
-	(0, node_assert.throws)(() => require_url.parseJsonLdId("/actor"), {
-		name: "TypeError",
-		message: "Invalid @id: /actor"
-	});
-});
-(0, node_test.test)("parseIri() resolves relative IRIs against portable string bases", () => {
-	(0, node_assert.deepStrictEqual)(require_url.parseIri("/actor", "ap://did:key:z6Mkabc/objects/1"), new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor"));
-	(0, node_assert.deepStrictEqual)(require_url.parseIri("attachments/1", "ap://did:key:z6Mkabc/objects/1"), new URL("ap+ef61://did%3Akey%3Az6Mkabc/objects/attachments/1"));
-	(0, node_assert.throws)(() => require_url.parseIri("//example.com/outbox", "ap://did:key:z6Mkabc/objects/1"), TypeError);
-});
-(0, node_test.test)("parseIri() resolves relative IRIs against at:// string bases", () => {
-	(0, node_assert.deepStrictEqual)(require_url.parseIri("/record", "at://did:plc:example/collection/item"), new URL("at://did%3Aplc%3Aexample/record"));
-	(0, node_assert.deepStrictEqual)(require_url.parseIri("reply", "at://did:plc:example/collection/item"), new URL("at://did%3Aplc%3Aexample/collection/reply"));
-	(0, node_assert.deepStrictEqual)(require_url.parseIri("reply", "at://did%3Aplc%3Aexample/collection/item"), new URL("at://did%3Aplc%3Aexample/collection/reply"));
-});
-(0, node_test.test)("parseIri() rejects portable IRIs without paths", () => {
-	(0, node_assert.throws)(() => require_url.parseIri("ap://did:key:z6Mkabc"), TypeError);
-	(0, node_assert.throws)(() => require_url.parseIri("ap://did:key:z6Mkabc?gateways=https%3A%2F%2Fserver.example"), TypeError);
-	(0, node_assert.throws)(() => require_url.parseIri("ap://did:key:z6Mkabc#actor"), TypeError);
-});
-(0, node_test.test)("parseIri() rejects malformed portable DID authorities", () => {
-	for (const iri of [
-		"ap://did:/actor",
-		"ap://did:key/actor",
-		"ap://did%3Akey%3Aabc%25zz/actor",
-		"ap://did:key:abc%25zz/actor"
-	]) (0, node_assert.throws)(() => require_url.parseIri(iri), TypeError);
-});
-(0, node_test.test)("haveSameIriOrigin() compares portable IRI authorities", () => {
-	(0, node_assert.ok)(require_url.haveSameIriOrigin(require_url.parseIri("ap://did:key:z6Mkabc/actor"), require_url.parseIri("ap://did:key:z6Mkabc/outbox")));
-	(0, node_assert.ok)(require_url.haveSameIriOrigin(new URL("ap://did%3Akey%3Az6Mkabc/actor"), new URL("ap+ef61://did%3Akey%3Az6Mkabc/outbox")));
-	(0, node_assert.ok)(require_url.haveSameIriOrigin(require_url.parseIri("ap://DID:key:z6Mkabc/actor"), require_url.parseIri("ap://did:key:z6Mkabc/outbox")));
-	(0, node_assert.ok)(require_url.haveSameIriOrigin(new URL("ap+ef61://DID%3Akey%3Az6Mkabc/actor"), new URL("ap+ef61://did%3Akey%3Az6Mkabc/outbox")));
-	(0, node_assert.ok)(!require_url.haveSameIriOrigin(require_url.parseIri("ap://did:key:z6Mkabc/actor"), require_url.parseIri("ap://did:key:z6Mkdef/actor")));
-});
-(0, node_test.test)("parseIri() normalizes portable URL instances", () => {
-	(0, node_assert.deepStrictEqual)(require_url.parseIri(new URL("ap+ef61://did%3Aexample%3Aabc%2Fdef/actor")), new URL("ap+ef61://did%3Aexample%3Aabc%252Fdef/actor"));
-	(0, node_assert.throws)(() => require_url.parseIri("ap+ef61://not-a-did/actor"), TypeError);
-});
-(0, node_test.test)("formatIri() emits canonical portable ActivityPub URI syntax", () => {
-	const cases = [new URL("ap://did%3Akey%3Az6Mkabc/actor"), new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor")];
-	for (const iri of cases) (0, node_assert.deepStrictEqual)(require_url.formatIri(iri), "ap+ef61://did:key:z6Mkabc/actor");
-	(0, node_assert.deepStrictEqual)(require_url.formatIri(new URL("https://example.com/actor")), "https://example.com/actor");
-	(0, node_assert.deepStrictEqual)(require_url.formatIri("/actor"), "/actor");
-});
-(0, node_test.test)("formatIri() preserves DID authority pct-encoded delimiters", () => {
-	const parsed = require_url.parseIri("ap://did:example:abc%2Fdef/actor");
-	(0, node_assert.deepStrictEqual)(parsed, new URL("ap+ef61://did%3Aexample%3Aabc%252Fdef/actor"));
-	(0, node_assert.deepStrictEqual)(require_url.formatIri(parsed), "ap+ef61://did:example:abc%2Fdef/actor");
-	(0, node_assert.deepStrictEqual)(require_url.parseIri(require_url.formatIri(parsed)), parsed);
-	(0, node_assert.deepStrictEqual)(require_url.formatIri(new URL("ap+ef61://did%3Aexample%3Aabc%2Fdef/actor")), "ap+ef61://did:example:abc%2Fdef/actor");
-});
-(0, node_test.test)("parseIri() normalizes equivalent encoded DID authorities", () => {
-	(0, node_assert.deepStrictEqual)(require_url.parseIri("ap://did:example:abc%252Fdef/actor"), require_url.parseIri("ap://did%3Aexample%3Aabc%252Fdef/actor"));
-});
-(0, node_test.test)("formatIri() preserves DID-internal pct-encoded authority characters", () => {
-	const parsed = require_url.parseIri("ap://did:web:example.com%3A3000/actor");
-	(0, node_assert.deepStrictEqual)(parsed, new URL("ap+ef61://did%3Aweb%3Aexample.com%253A3000/actor"));
-	(0, node_assert.deepStrictEqual)(require_url.formatIri(parsed), "ap+ef61://did:web:example.com%3A3000/actor");
-});
-(0, node_test.test)("parseIri() accepts portable DID URLs with encoded DID delimiters", () => {
-	const parsed = require_url.parseIri("ap://did:web:example.com%3A3000/u/1");
-	(0, node_assert.deepStrictEqual)(parsed, new URL("ap+ef61://did%3Aweb%3Aexample.com%253A3000/u/1"));
-	(0, node_assert.deepStrictEqual)(require_url.formatIri(parsed), "ap+ef61://did:web:example.com%3A3000/u/1");
-});
-(0, node_test.test)("parseIri() decodes pct-encoded DID delimiters in order", () => {
-	const parsed = require_url.parseIri("ap://did%3Aweb%3Aexample.com%253A3000/u/1");
-	(0, node_assert.deepStrictEqual)(parsed, new URL("ap+ef61://did%3Aweb%3Aexample.com%253A3000/u/1"));
-	(0, node_assert.deepStrictEqual)(require_url.formatIri(parsed), "ap+ef61://did:web:example.com%3A3000/u/1");
-});
-(0, node_test.test)("parseIri() preserves encoded percent signs while decoding delimiters", () => {
-	const parsed = require_url.parseIri("ap://did%3Aweb%3Aexample.com%2500/u/1");
-	(0, node_assert.deepStrictEqual)(parsed, new URL("ap+ef61://did%3Aweb%3Aexample.com%2500/u/1"));
-	(0, node_assert.deepStrictEqual)(require_url.formatIri(parsed), "ap+ef61://did:web:example.com%00/u/1");
-});
 (0, node_test.test)("validatePublicUrl()", async () => {
 	await (0, node_assert.rejects)(() => require_url.validatePublicUrl("ftp://localhost"), require_url.UrlError);
 	await (0, node_assert.rejects)(() => require_url.validatePublicUrl("data:text/plain;base64,SGVsbG8sIFdvcmxkIQ=="), require_url.UrlError);

package/dist/tests/url.test.mjs

@@ -1,110 +1,7 @@
-import { a as isValidPublicIPv4Address, c as parseJsonLdId, i as haveSameIriOrigin, l as validatePublicUrl, n as expandIPv6Address, o as isValidPublicIPv6Address, r as formatIri, s as parseIri, t as UrlError } from "./url-YWJbnRlf.mjs";
-import { deepStrictEqual, ok, rejects, throws } from "node:assert";
+import { a as validatePublicUrl, i as isValidPublicIPv6Address, n as expandIPv6Address, r as isValidPublicIPv4Address, t as UrlError } from "./url-m9Qzxy-Y.mjs";
+import { deepStrictEqual, ok, rejects } from "node:assert";
 import { test } from "node:test";
 //#region src/url.test.ts
-test("parseIri() accepts portable ActivityPub URI schemes", () => {
-	for (const iri of [
-		"ap://did:key:z6Mkabc/actor",
-		"ap://did%3Akey%3Az6Mkabc/actor",
-		"ap+ef61://did:key:z6Mkabc/actor",
-		"ap+ef61://did%3Akey%3Az6Mkabc/actor",
-		"AP+EF61://did:key:z6Mkabc/actor"
-	]) deepStrictEqual(parseIri(iri), new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor"));
-});
-test("parseIri() accepts DID schemes case-insensitively", () => {
-	for (const iri of ["ap://DID:key:z6Mkabc/actor", "ap://DID%3Akey%3Az6Mkabc/actor"]) deepStrictEqual(parseIri(iri), new URL("ap+ef61://DID%3Akey%3Az6Mkabc/actor"));
-});
-test("parseIri() accepts DID method names that start with digits", () => {
-	deepStrictEqual(parseIri("ap://did:3:abc/actor"), new URL("ap+ef61://did%3A3%3Aabc/actor"));
-});
-test("parseIri() accepts hyphens in DID method-specific IDs", () => {
-	deepStrictEqual(parseIri("ap+ef61://did:web:foo-bar.example/actor"), new URL("ap+ef61://did%3Aweb%3Afoo-bar.example/actor"));
-});
-test("parseIri() preserves existing URL parsing behavior", () => {
-	deepStrictEqual(parseIri("/actor", new URL("https://example.com/users/alice")), new URL("https://example.com/actor"));
-	deepStrictEqual(parseIri("at://did:plc:example/record"), new URL("at://did%3Aplc%3Aexample/record"));
-	throws(() => parseIri("ap://not-a-did/actor"), TypeError);
-});
-test("parseJsonLdId() parses JSON-LD ids", () => {
-	deepStrictEqual(parseJsonLdId(void 0), void 0);
-	deepStrictEqual(parseJsonLdId("_:blank"), void 0);
-	deepStrictEqual(parseJsonLdId("/actor", new URL("https://example.com/users/alice")), new URL("https://example.com/actor"));
-	deepStrictEqual(parseJsonLdId("ap://did:key:z6Mkabc/actor"), new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor"));
-	throws(() => parseJsonLdId("/actor"), {
-		name: "TypeError",
-		message: "Invalid @id: /actor"
-	});
-});
-test("parseIri() resolves relative IRIs against portable string bases", () => {
-	deepStrictEqual(parseIri("/actor", "ap://did:key:z6Mkabc/objects/1"), new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor"));
-	deepStrictEqual(parseIri("attachments/1", "ap://did:key:z6Mkabc/objects/1"), new URL("ap+ef61://did%3Akey%3Az6Mkabc/objects/attachments/1"));
-	throws(() => parseIri("//example.com/outbox", "ap://did:key:z6Mkabc/objects/1"), TypeError);
-});
-test("parseIri() resolves relative IRIs against at:// string bases", () => {
-	deepStrictEqual(parseIri("/record", "at://did:plc:example/collection/item"), new URL("at://did%3Aplc%3Aexample/record"));
-	deepStrictEqual(parseIri("reply", "at://did:plc:example/collection/item"), new URL("at://did%3Aplc%3Aexample/collection/reply"));
-	deepStrictEqual(parseIri("reply", "at://did%3Aplc%3Aexample/collection/item"), new URL("at://did%3Aplc%3Aexample/collection/reply"));
-});
-test("parseIri() rejects portable IRIs without paths", () => {
-	throws(() => parseIri("ap://did:key:z6Mkabc"), TypeError);
-	throws(() => parseIri("ap://did:key:z6Mkabc?gateways=https%3A%2F%2Fserver.example"), TypeError);
-	throws(() => parseIri("ap://did:key:z6Mkabc#actor"), TypeError);
-});
-test("parseIri() rejects malformed portable DID authorities", () => {
-	for (const iri of [
-		"ap://did:/actor",
-		"ap://did:key/actor",
-		"ap://did%3Akey%3Aabc%25zz/actor",
-		"ap://did:key:abc%25zz/actor"
-	]) throws(() => parseIri(iri), TypeError);
-});
-test("haveSameIriOrigin() compares portable IRI authorities", () => {
-	ok(haveSameIriOrigin(parseIri("ap://did:key:z6Mkabc/actor"), parseIri("ap://did:key:z6Mkabc/outbox")));
-	ok(haveSameIriOrigin(new URL("ap://did%3Akey%3Az6Mkabc/actor"), new URL("ap+ef61://did%3Akey%3Az6Mkabc/outbox")));
-	ok(haveSameIriOrigin(parseIri("ap://DID:key:z6Mkabc/actor"), parseIri("ap://did:key:z6Mkabc/outbox")));
-	ok(haveSameIriOrigin(new URL("ap+ef61://DID%3Akey%3Az6Mkabc/actor"), new URL("ap+ef61://did%3Akey%3Az6Mkabc/outbox")));
-	ok(!haveSameIriOrigin(parseIri("ap://did:key:z6Mkabc/actor"), parseIri("ap://did:key:z6Mkdef/actor")));
-});
-test("parseIri() normalizes portable URL instances", () => {
-	deepStrictEqual(parseIri(new URL("ap+ef61://did%3Aexample%3Aabc%2Fdef/actor")), new URL("ap+ef61://did%3Aexample%3Aabc%252Fdef/actor"));
-	throws(() => parseIri("ap+ef61://not-a-did/actor"), TypeError);
-});
-test("formatIri() emits canonical portable ActivityPub URI syntax", () => {
-	const cases = [new URL("ap://did%3Akey%3Az6Mkabc/actor"), new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor")];
-	for (const iri of cases) deepStrictEqual(formatIri(iri), "ap+ef61://did:key:z6Mkabc/actor");
-	deepStrictEqual(formatIri(new URL("https://example.com/actor")), "https://example.com/actor");
-	deepStrictEqual(formatIri("/actor"), "/actor");
-});
-test("formatIri() preserves DID authority pct-encoded delimiters", () => {
-	const parsed = parseIri("ap://did:example:abc%2Fdef/actor");
-	deepStrictEqual(parsed, new URL("ap+ef61://did%3Aexample%3Aabc%252Fdef/actor"));
-	deepStrictEqual(formatIri(parsed), "ap+ef61://did:example:abc%2Fdef/actor");
-	deepStrictEqual(parseIri(formatIri(parsed)), parsed);
-	deepStrictEqual(formatIri(new URL("ap+ef61://did%3Aexample%3Aabc%2Fdef/actor")), "ap+ef61://did:example:abc%2Fdef/actor");
-});
-test("parseIri() normalizes equivalent encoded DID authorities", () => {
-	deepStrictEqual(parseIri("ap://did:example:abc%252Fdef/actor"), parseIri("ap://did%3Aexample%3Aabc%252Fdef/actor"));
-});
-test("formatIri() preserves DID-internal pct-encoded authority characters", () => {
-	const parsed = parseIri("ap://did:web:example.com%3A3000/actor");
-	deepStrictEqual(parsed, new URL("ap+ef61://did%3Aweb%3Aexample.com%253A3000/actor"));
-	deepStrictEqual(formatIri(parsed), "ap+ef61://did:web:example.com%3A3000/actor");
-});
-test("parseIri() accepts portable DID URLs with encoded DID delimiters", () => {
-	const parsed = parseIri("ap://did:web:example.com%3A3000/u/1");
-	deepStrictEqual(parsed, new URL("ap+ef61://did%3Aweb%3Aexample.com%253A3000/u/1"));
-	deepStrictEqual(formatIri(parsed), "ap+ef61://did:web:example.com%3A3000/u/1");
-});
-test("parseIri() decodes pct-encoded DID delimiters in order", () => {
-	const parsed = parseIri("ap://did%3Aweb%3Aexample.com%253A3000/u/1");
-	deepStrictEqual(parsed, new URL("ap+ef61://did%3Aweb%3Aexample.com%253A3000/u/1"));
-	deepStrictEqual(formatIri(parsed), "ap+ef61://did:web:example.com%3A3000/u/1");
-});
-test("parseIri() preserves encoded percent signs while decoding delimiters", () => {
-	const parsed = parseIri("ap://did%3Aweb%3Aexample.com%2500/u/1");
-	deepStrictEqual(parsed, new URL("ap+ef61://did%3Aweb%3Aexample.com%2500/u/1"));
-	deepStrictEqual(formatIri(parsed), "ap+ef61://did:web:example.com%00/u/1");
-});
 test("validatePublicUrl()", async () => {
 	await rejects(() => validatePublicUrl("ftp://localhost"), UrlError);
 	await rejects(() => validatePublicUrl("data:text/plain;base64,SGVsbG8sIFdvcmxkIQ=="), UrlError);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.4.0-dev.1567+12e6a3c0",
+  "version": "2.4.0-dev.1570+f1b6aaa3",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -42,16 +42,6 @@
       "require": "./dist/jsonld.cjs",
       "default": "./dist/jsonld.js"
     },
-    "./internal/jsonld-cache": {
-      "types": {
-        "import": "./dist/internal/jsonld-cache.d.ts",
-        "require": "./dist/internal/jsonld-cache.d.cts",
-        "default": "./dist/internal/jsonld-cache.d.ts"
-      },
-      "import": "./dist/internal/jsonld-cache.js",
-      "require": "./dist/internal/jsonld-cache.cjs",
-      "default": "./dist/internal/jsonld-cache.js"
-    },
     "./temporal": {
       "types": {
         "import": "./dist/temporal.d.ts",

package/src/contexts.ts

@@ -7,7 +7,6 @@ import activitystreams from "./contexts/activitystreams.json" with {
 };
 import didV1 from "./contexts/did-v1.json" with { type: "json" };
 import fep5711 from "./contexts/fep-5711.json" with { type: "json" };
-import fep7aa9 from "./contexts/fep-7aa9.json" with { type: "json" };
 import gotosocial from "./contexts/gotosocial.json" with { type: "json" };
 import identityV1 from "./contexts/identity-v1.json" with { type: "json" };
 import joinLemmyContext from "./contexts/join-lemmy.json" with { type: "json" };
@@ -36,7 +35,6 @@ const preloadedContexts: Record<string, unknown> = {
   "http://schema.org/": schemaorg,
   "https://gotosocial.org/ns": gotosocial,
   "https://w3id.org/fep/5711": fep5711,
-  "https://w3id.org/fep/7aa9": fep7aa9,
 
   // Lemmy's context document is served as application/json without the JSON-LD
   // context Link header.  The default document loader treats that as a regular