@fedify/vocab-runtime 2.4.0-dev.1583 → 2.4.0-dev.1618

package/dist/{url-BAdyyqAa.cjs → url-Ck3dGEwH.cjs}

@@ -11,6 +11,7 @@ var UrlError = class extends Error {
 };
 const PORTABLE_IRI_PATTERN = /^(ap|ap\+ef61):\/\/([^/?#]*)([^?#]*)(\?[^#]*)?(#.*)?$/i;
 const INVALID_PERCENT_ENCODING_PATTERN = /%(?![0-9A-Fa-f]{2})/;
+const PERCENT_ENCODING_PATTERN = /%[0-9A-Fa-f]{2}/g;
 const DID_SCHEME_PATTERN = /^did:/i;
 const DID_PATTERN = /^did:[a-z0-9]+:[-A-Za-z0-9._%]+(?::[-A-Za-z0-9._%]+)*$/i;
 /**
@@ -45,6 +46,88 @@ function formatIri(iri) {
 	return `ap+ef61://${decodePortableAuthority(parsed.host)}${parsed.pathname}${parsed.search}${parsed.hash}`;
 }
 /**
+* Canonicalizes a FEP-ef61 portable ActivityPub URI for comparison.
+*
+* This accepts both `ap:` and `ap+ef61:` URI strings with decoded or
+* percent-encoded DID authorities.  The returned value uses the `ap+ef61:`
+* scheme, a decoded DID authority, and no query component.  Pass the raw URI
+* string, not a `URL` object, because JavaScript `URL` normalizes opaque path
+* segments before Fedify can compare them.
+*
+* @param input The raw portable ActivityPub URI string to canonicalize.
+* @returns The canonical portable ActivityPub URI string.
+* @throws {TypeError} If the input is not a valid portable ActivityPub IRI.
+* @since 2.4.0
+*/
+function canonicalizePortableUri(input) {
+	if (typeof input !== "string") throw new TypeError("Invalid portable ActivityPub IRI.");
+	const parsed = parsePortableIri(input);
+	if (parsed == null) throw new TypeError("Invalid portable ActivityPub IRI.");
+	const match = input.match(PORTABLE_IRI_PATTERN);
+	return `ap+ef61://${normalizePortableAuthority(getDidUrlOrigin(decodePortableAuthority(parsed.host)))}${normalizePortableComponent(match[3])}${match[5] == null ? "" : normalizePortableComponent(match[5])}`;
+}
+/**
+* Checks whether two FEP-ef61 portable ActivityPub URIs identify the same
+* portable object.
+*
+* Non-string inputs return `false`.  Non-portable URI strings use strict string
+* equality.  Portable URI strings are compared through
+* {@link canonicalizePortableUri}; malformed portable URI strings return
+* `false` unless they are exactly equal.
+*
+* @since 2.4.0
+*/
+function arePortableUrisEqual(left, right) {
+	if (typeof left !== "string" || typeof right !== "string") return false;
+	if (left === right) return true;
+	if (!PORTABLE_IRI_PATTERN.test(left) || !PORTABLE_IRI_PATTERN.test(right)) return false;
+	try {
+		return canonicalizePortableUri(left) === canonicalizePortableUri(right);
+	} catch (error) {
+		if (error instanceof TypeError) return false;
+		throw error;
+	}
+}
+/**
+* Computes an IRI's FEP-fe34 origin.
+*
+* HTTP(S) IRIs use their web origin.  FEP-ef61 portable ActivityPub IRIs and
+* DID URLs use their DID as a cryptographic origin.
+*
+* @throws {TypeError} If the IRI does not have a supported FEP-fe34 origin.
+* @since 2.4.0
+*/
+function getFe34Origin(input) {
+	if (input instanceof URL) {
+		const portable = normalizePortableUrl(input);
+		if (portable != null) return getPortableCryptographicOrigin(portable);
+		if (input.protocol === "did:") return getDidUrlOrigin(input.href);
+		if (input.protocol === "http:" || input.protocol === "https:") return input.origin;
+		throw new TypeError("Unsupported FEP-fe34 origin IRI.");
+	}
+	const portable = parsePortableIri(input);
+	if (portable != null) return getPortableCryptographicOrigin(portable);
+	if (DID_SCHEME_PATTERN.test(input)) return getDidUrlOrigin(input);
+	const parsed = new URL(input);
+	if (parsed.protocol === "http:" || parsed.protocol === "https:") return parsed.origin;
+	throw new TypeError("Unsupported FEP-fe34 origin IRI.");
+}
+/**
+* Checks whether two IRIs have the same FEP-fe34 origin.
+*
+* Malformed or unsupported IRIs are treated as non-matching.
+*
+* @since 2.4.0
+*/
+function haveSameFe34Origin(left, right) {
+	try {
+		return getFe34Origin(left) === getFe34Origin(right);
+	} catch (error) {
+		if (error instanceof TypeError) return false;
+		throw error;
+	}
+}
+/**
 * Checks whether two IRIs have the same origin.
 */
 function haveSameIriOrigin(left, right) {
@@ -54,15 +137,25 @@ 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;
+		const host = iri.protocol === "ap+ef61:" ? encodeURIComponent(getDidUrlOrigin(decodePortableAuthority(iri.host))) : iri.host;
 		return `${iri.protocol}//${host}`;
 	}
 	return iri.href;
 }
+function getPortableCryptographicOrigin(iri) {
+	return getDidUrlOrigin(decodePortableAuthority(iri.host));
+}
+function getDidUrlOrigin(iri) {
+	const did = iri.split(/[/?#]/, 1)[0].replace(DID_SCHEME_PATTERN, "did:");
+	if (!DID_PATTERN.test(did)) throw new TypeError("Invalid DID URL.");
+	const parts = did.split(":");
+	parts[1] = parts[1].toLowerCase();
+	return normalizePortableAuthority(parts.join(":"));
+}
 function parsePortableIri(iri) {
 	const match = iri.match(PORTABLE_IRI_PATTERN);
 	if (match == null) return null;
-	const authority = decodePortableAuthority(match[2]);
+	const authority = getDidUrlOrigin(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] ?? ""}`);
@@ -87,6 +180,31 @@ function decodePortableAuthority(authority) {
 	if (INVALID_PERCENT_ENCODING_PATTERN.test(decoded)) throw new TypeError("Invalid portable ActivityPub IRI authority.");
 	return decoded;
 }
+function normalizePercentEncoding(value) {
+	return value.replace(PERCENT_ENCODING_PATTERN, (match) => match.toUpperCase());
+}
+function normalizePortableAuthority(authority) {
+	return normalizePercentEncoding(authority).replace(PERCENT_ENCODING_PATTERN, (match) => {
+		const decoded = String.fromCharCode(Number.parseInt(match.slice(1), 16));
+		return /[A-Za-z0-9._~-]/.test(decoded) ? decoded : match;
+	});
+}
+function normalizePortableComponent(value) {
+	if (INVALID_PERCENT_ENCODING_PATTERN.test(value)) throw new TypeError("Invalid portable ActivityPub IRI component.");
+	return value.replace(/%[0-9A-Fa-f]{2}|[^%]+/g, (match) => {
+		if (match.startsWith("%")) {
+			const upper = match.toUpperCase();
+			const decoded = String.fromCharCode(Number.parseInt(upper.slice(1), 16));
+			return /[A-Za-z0-9._~-]/.test(decoded) ? decoded : upper;
+		}
+		try {
+			return encodeURI(match);
+		} catch (error) {
+			if (error instanceof URIError) throw new TypeError("Invalid portable ActivityPub IRI component.");
+			throw error;
+		}
+	});
+}
 function parseAtUri(uri) {
 	const index = uri.indexOf("/", 5);
 	const authority = index >= 0 ? uri.slice(5, index) : uri.slice(5);
@@ -265,6 +383,18 @@ Object.defineProperty(exports, "UrlError", {
 		return UrlError;
 	}
 });
+Object.defineProperty(exports, "arePortableUrisEqual", {
+	enumerable: true,
+	get: function() {
+		return arePortableUrisEqual;
+	}
+});
+Object.defineProperty(exports, "canonicalizePortableUri", {
+	enumerable: true,
+	get: function() {
+		return canonicalizePortableUri;
+	}
+});
 Object.defineProperty(exports, "expandIPv6Address", {
 	enumerable: true,
 	get: function() {
@@ -277,6 +407,18 @@ Object.defineProperty(exports, "formatIri", {
 		return formatIri;
 	}
 });
+Object.defineProperty(exports, "getFe34Origin", {
+	enumerable: true,
+	get: function() {
+		return getFe34Origin;
+	}
+});
+Object.defineProperty(exports, "haveSameFe34Origin", {
+	enumerable: true,
+	get: function() {
+		return haveSameFe34Origin;
+	}
+});
 Object.defineProperty(exports, "haveSameIriOrigin", {
 	enumerable: true,
 	get: function() {

package/dist/{url-BuxPHxK2.js → url-m1YxGNZ0.js}

@@ -10,6 +10,7 @@ var UrlError = class extends Error {
 };
 const PORTABLE_IRI_PATTERN = /^(ap|ap\+ef61):\/\/([^/?#]*)([^?#]*)(\?[^#]*)?(#.*)?$/i;
 const INVALID_PERCENT_ENCODING_PATTERN = /%(?![0-9A-Fa-f]{2})/;
+const PERCENT_ENCODING_PATTERN = /%[0-9A-Fa-f]{2}/g;
 const DID_SCHEME_PATTERN = /^did:/i;
 const DID_PATTERN = /^did:[a-z0-9]+:[-A-Za-z0-9._%]+(?::[-A-Za-z0-9._%]+)*$/i;
 /**
@@ -44,6 +45,88 @@ function formatIri(iri) {
 	return `ap+ef61://${decodePortableAuthority(parsed.host)}${parsed.pathname}${parsed.search}${parsed.hash}`;
 }
 /**
+* Canonicalizes a FEP-ef61 portable ActivityPub URI for comparison.
+*
+* This accepts both `ap:` and `ap+ef61:` URI strings with decoded or
+* percent-encoded DID authorities.  The returned value uses the `ap+ef61:`
+* scheme, a decoded DID authority, and no query component.  Pass the raw URI
+* string, not a `URL` object, because JavaScript `URL` normalizes opaque path
+* segments before Fedify can compare them.
+*
+* @param input The raw portable ActivityPub URI string to canonicalize.
+* @returns The canonical portable ActivityPub URI string.
+* @throws {TypeError} If the input is not a valid portable ActivityPub IRI.
+* @since 2.4.0
+*/
+function canonicalizePortableUri(input) {
+	if (typeof input !== "string") throw new TypeError("Invalid portable ActivityPub IRI.");
+	const parsed = parsePortableIri(input);
+	if (parsed == null) throw new TypeError("Invalid portable ActivityPub IRI.");
+	const match = input.match(PORTABLE_IRI_PATTERN);
+	return `ap+ef61://${normalizePortableAuthority(getDidUrlOrigin(decodePortableAuthority(parsed.host)))}${normalizePortableComponent(match[3])}${match[5] == null ? "" : normalizePortableComponent(match[5])}`;
+}
+/**
+* Checks whether two FEP-ef61 portable ActivityPub URIs identify the same
+* portable object.
+*
+* Non-string inputs return `false`.  Non-portable URI strings use strict string
+* equality.  Portable URI strings are compared through
+* {@link canonicalizePortableUri}; malformed portable URI strings return
+* `false` unless they are exactly equal.
+*
+* @since 2.4.0
+*/
+function arePortableUrisEqual(left, right) {
+	if (typeof left !== "string" || typeof right !== "string") return false;
+	if (left === right) return true;
+	if (!PORTABLE_IRI_PATTERN.test(left) || !PORTABLE_IRI_PATTERN.test(right)) return false;
+	try {
+		return canonicalizePortableUri(left) === canonicalizePortableUri(right);
+	} catch (error) {
+		if (error instanceof TypeError) return false;
+		throw error;
+	}
+}
+/**
+* Computes an IRI's FEP-fe34 origin.
+*
+* HTTP(S) IRIs use their web origin.  FEP-ef61 portable ActivityPub IRIs and
+* DID URLs use their DID as a cryptographic origin.
+*
+* @throws {TypeError} If the IRI does not have a supported FEP-fe34 origin.
+* @since 2.4.0
+*/
+function getFe34Origin(input) {
+	if (input instanceof URL) {
+		const portable = normalizePortableUrl(input);
+		if (portable != null) return getPortableCryptographicOrigin(portable);
+		if (input.protocol === "did:") return getDidUrlOrigin(input.href);
+		if (input.protocol === "http:" || input.protocol === "https:") return input.origin;
+		throw new TypeError("Unsupported FEP-fe34 origin IRI.");
+	}
+	const portable = parsePortableIri(input);
+	if (portable != null) return getPortableCryptographicOrigin(portable);
+	if (DID_SCHEME_PATTERN.test(input)) return getDidUrlOrigin(input);
+	const parsed = new URL(input);
+	if (parsed.protocol === "http:" || parsed.protocol === "https:") return parsed.origin;
+	throw new TypeError("Unsupported FEP-fe34 origin IRI.");
+}
+/**
+* Checks whether two IRIs have the same FEP-fe34 origin.
+*
+* Malformed or unsupported IRIs are treated as non-matching.
+*
+* @since 2.4.0
+*/
+function haveSameFe34Origin(left, right) {
+	try {
+		return getFe34Origin(left) === getFe34Origin(right);
+	} catch (error) {
+		if (error instanceof TypeError) return false;
+		throw error;
+	}
+}
+/**
 * Checks whether two IRIs have the same origin.
 */
 function haveSameIriOrigin(left, right) {
@@ -53,15 +136,25 @@ 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;
+		const host = iri.protocol === "ap+ef61:" ? encodeURIComponent(getDidUrlOrigin(decodePortableAuthority(iri.host))) : iri.host;
 		return `${iri.protocol}//${host}`;
 	}
 	return iri.href;
 }
+function getPortableCryptographicOrigin(iri) {
+	return getDidUrlOrigin(decodePortableAuthority(iri.host));
+}
+function getDidUrlOrigin(iri) {
+	const did = iri.split(/[/?#]/, 1)[0].replace(DID_SCHEME_PATTERN, "did:");
+	if (!DID_PATTERN.test(did)) throw new TypeError("Invalid DID URL.");
+	const parts = did.split(":");
+	parts[1] = parts[1].toLowerCase();
+	return normalizePortableAuthority(parts.join(":"));
+}
 function parsePortableIri(iri) {
 	const match = iri.match(PORTABLE_IRI_PATTERN);
 	if (match == null) return null;
-	const authority = decodePortableAuthority(match[2]);
+	const authority = getDidUrlOrigin(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] ?? ""}`);
@@ -86,6 +179,31 @@ function decodePortableAuthority(authority) {
 	if (INVALID_PERCENT_ENCODING_PATTERN.test(decoded)) throw new TypeError("Invalid portable ActivityPub IRI authority.");
 	return decoded;
 }
+function normalizePercentEncoding(value) {
+	return value.replace(PERCENT_ENCODING_PATTERN, (match) => match.toUpperCase());
+}
+function normalizePortableAuthority(authority) {
+	return normalizePercentEncoding(authority).replace(PERCENT_ENCODING_PATTERN, (match) => {
+		const decoded = String.fromCharCode(Number.parseInt(match.slice(1), 16));
+		return /[A-Za-z0-9._~-]/.test(decoded) ? decoded : match;
+	});
+}
+function normalizePortableComponent(value) {
+	if (INVALID_PERCENT_ENCODING_PATTERN.test(value)) throw new TypeError("Invalid portable ActivityPub IRI component.");
+	return value.replace(/%[0-9A-Fa-f]{2}|[^%]+/g, (match) => {
+		if (match.startsWith("%")) {
+			const upper = match.toUpperCase();
+			const decoded = String.fromCharCode(Number.parseInt(upper.slice(1), 16));
+			return /[A-Za-z0-9._~-]/.test(decoded) ? decoded : upper;
+		}
+		try {
+			return encodeURI(match);
+		} catch (error) {
+			if (error instanceof URIError) throw new TypeError("Invalid portable ActivityPub IRI component.");
+			throw error;
+		}
+	});
+}
 function parseAtUri(uri) {
 	const index = uri.indexOf("/", 5);
 	const authority = index >= 0 ? uri.slice(5, index) : uri.slice(5);
@@ -258,4 +376,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 { formatIri as a, haveSameIriOrigin as c, parseIri as d, parseJsonLdId as f, expandIPv6Address as i, isValidPublicIPv4Address as l, arePortableUrisEqual as n, getFe34Origin as o, validatePublicUrl as p, canonicalizePortableUri as r, haveSameFe34Origin as s, UrlError as t, isValidPublicIPv6Address as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.4.0-dev.1583+1a6f31cb",
+  "version": "2.4.0-dev.1618+58858243",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",

package/src/internal/jsonld-cache.ts

@@ -1,6 +1,6 @@
 import type { DocumentLoader } from "../docloader.ts";
 import jsonld from "../jsonld.ts";
-import { formatIri, haveSameIriOrigin } from "../url.ts";
+import { formatIri, haveSameFe34Origin, haveSameIriOrigin } from "../url.ts";
 
 const noJsonLdContext = Symbol("noJsonLdContext");
 
@@ -28,7 +28,8 @@ export function isTrustedIriOrigin(
   right: URL | null | undefined,
 ): boolean {
   return options.crossOrigin === "trust" || left == null ||
-    (right != null && haveSameIriOrigin(left, right));
+    (right != null &&
+      (haveSameIriOrigin(left, right) || haveSameFe34Origin(left, right)));
 }
 
 /**

package/src/mod.ts

@@ -54,8 +54,12 @@ export {
   type PropertyPreprocessorContext,
 } from "./preprocessor.ts";
 export {
+  arePortableUrisEqual,
+  canonicalizePortableUri,
   expandIPv6Address,
   formatIri,
+  getFe34Origin,
+  haveSameFe34Origin,
   haveSameIriOrigin,
   isValidPublicIPv4Address,
   isValidPublicIPv6Address,