@fedify/vocab-runtime 2.4.0-dev.1508 → 2.4.0-dev.1528

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

@@ -8,6 +8,90 @@ 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.
 */
@@ -186,6 +270,18 @@ 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() {
@@ -198,6 +294,18 @@ 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-m9Qzxy-Y.mjs → url-YWJbnRlf.mjs}

@@ -7,6 +7,90 @@ 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.
 */
@@ -173,4 +257,4 @@ function matchesIPv6Prefix(address, prefixWords, prefixLength) {
 	return true;
 }
 //#endregion
-export { validatePublicUrl as a, isValidPublicIPv6Address as i, expandIPv6Address as n, isValidPublicIPv4Address as r, UrlError as t };
+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 };

package/dist/tests/url.test.cjs

@@ -1,8 +1,111 @@
 require("./chunk-C2EiDwsr.cjs");
-const require_url = require("./url-C20FhC7p.cjs");
+const require_url = require("./url-2XwVbUS_.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,7 +1,110 @@
-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 { 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 { 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);