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

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.4.0-dev.1583+1a6f31cb",
+  "version": "2.4.0-dev.1599+7b19967f",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",

package/dist/internal/jsonld-cache.cjs

@@ -1,6 +1,6 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_url = require("../url-BAdyyqAa.cjs");
+const require_url = require("../url-BMDN9GnE.cjs");
 const require_jsonld = require("../jsonld.cjs");
 //#region src/internal/jsonld-cache.ts
 const noJsonLdContext = Symbol("noJsonLdContext");

package/dist/internal/jsonld-cache.js

@@ -1,5 +1,5 @@
 
-import { i as haveSameIriOrigin, r as formatIri } from "../url-BuxPHxK2.js";
+import { a as formatIri, o as haveSameIriOrigin } from "../url-BlFta-Eh.js";
 import jsonld_default from "../jsonld.js";
 //#region src/internal/jsonld-cache.ts
 const noJsonLdContext = Symbol("noJsonLdContext");

package/dist/mod.cjs

@@ -1,7 +1,7 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-M78iaK0I.cjs");
-const require_url = require("./url-BAdyyqAa.cjs");
+const require_url = require("./url-BMDN9GnE.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _opentelemetry_api = require("@opentelemetry/api");
 let node_process = require("node:process");
@@ -4367,7 +4367,7 @@ const preloadedContexts = {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.1583+1a6f31cb";
+var version = "2.4.0-dev.1599+7b19967f";
 //#endregion
 //#region src/link.ts
 const parametersNeedLowerCase = ["rel", "type"];
@@ -5551,7 +5551,9 @@ LanguageString.prototype[Symbol.for("nodejs.util.inspect.custom")] = function(_d
 exports.FetchError = FetchError;
 exports.LanguageString = LanguageString;
 exports.UrlError = require_url.UrlError;
+exports.arePortableUrisEqual = require_url.arePortableUrisEqual;
 exports.canParseDecimal = canParseDecimal;
+exports.canonicalizePortableUri = require_url.canonicalizePortableUri;
 exports.createActivityPubRequest = createActivityPubRequest;
 exports.decodeMultibase = decodeMultibase;
 exports.encodeMultibase = encodeMultibase;

package/dist/mod.d.cts

@@ -326,6 +326,33 @@ declare function parseIri(iri: string | URL, base?: string | URL): URL;
 */
 declare function formatIri(iri: string | URL): string;
 /**
+* 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
+*/
+declare function canonicalizePortableUri(input: string): string;
+/**
+* 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
+*/
+declare function arePortableUrisEqual(left: string, right: string): boolean;
+/**
 * Checks whether two IRIs have the same origin.
 */
 declare function haveSameIriOrigin(left: URL, right: URL): boolean;
@@ -337,4 +364,4 @@ declare function isValidPublicIPv4Address(address: string): boolean;
 declare function isValidPublicIPv6Address(address: string): boolean;
 declare function expandIPv6Address(address: string): string;
 //#endregion
-export { type AuthenticatedDocumentLoaderFactory, type CreateRequestOptions, type Decimal, type DidKeyVerificationMethod, type DocumentLoader, type DocumentLoaderFactory, type DocumentLoaderFactoryOptions, type DocumentLoaderOptions, FetchError, type GetDocumentLoaderOptions, type GetUserAgentOptions, type Json, LanguageString, type PropertyPreprocessor, type PropertyPreprocessorContext, type RemoteDocument, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportDidKey, exportMultibaseKey, exportSpki, formatIri, getDocumentLoader, getRemoteDocument, getUserAgent, haveSameIriOrigin, importDidKey, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, parseDidKeyVerificationMethod, parseIri, parseJsonLdId, preloadedContexts, validatePublicUrl };
+export { type AuthenticatedDocumentLoaderFactory, type CreateRequestOptions, type Decimal, type DidKeyVerificationMethod, type DocumentLoader, type DocumentLoaderFactory, type DocumentLoaderFactoryOptions, type DocumentLoaderOptions, FetchError, type GetDocumentLoaderOptions, type GetUserAgentOptions, type Json, LanguageString, type PropertyPreprocessor, type PropertyPreprocessorContext, type RemoteDocument, UrlError, arePortableUrisEqual, canParseDecimal, canonicalizePortableUri, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportDidKey, exportMultibaseKey, exportSpki, formatIri, getDocumentLoader, getRemoteDocument, getUserAgent, haveSameIriOrigin, importDidKey, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, parseDidKeyVerificationMethod, parseIri, parseJsonLdId, preloadedContexts, validatePublicUrl };

package/dist/mod.d.ts

@@ -326,6 +326,33 @@ declare function parseIri(iri: string | URL, base?: string | URL): URL;
 */
 declare function formatIri(iri: string | URL): string;
 /**
+* 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
+*/
+declare function canonicalizePortableUri(input: string): string;
+/**
+* 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
+*/
+declare function arePortableUrisEqual(left: string, right: string): boolean;
+/**
 * Checks whether two IRIs have the same origin.
 */
 declare function haveSameIriOrigin(left: URL, right: URL): boolean;
@@ -337,4 +364,4 @@ declare function isValidPublicIPv4Address(address: string): boolean;
 declare function isValidPublicIPv6Address(address: string): boolean;
 declare function expandIPv6Address(address: string): string;
 //#endregion
-export { type AuthenticatedDocumentLoaderFactory, type CreateRequestOptions, type Decimal, type DidKeyVerificationMethod, type DocumentLoader, type DocumentLoaderFactory, type DocumentLoaderFactoryOptions, type DocumentLoaderOptions, FetchError, type GetDocumentLoaderOptions, type GetUserAgentOptions, type Json, LanguageString, type PropertyPreprocessor, type PropertyPreprocessorContext, type RemoteDocument, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportDidKey, exportMultibaseKey, exportSpki, formatIri, getDocumentLoader, getRemoteDocument, getUserAgent, haveSameIriOrigin, importDidKey, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, parseDidKeyVerificationMethod, parseIri, parseJsonLdId, preloadedContexts, validatePublicUrl };
+export { type AuthenticatedDocumentLoaderFactory, type CreateRequestOptions, type Decimal, type DidKeyVerificationMethod, type DocumentLoader, type DocumentLoaderFactory, type DocumentLoaderFactoryOptions, type DocumentLoaderOptions, FetchError, type GetDocumentLoaderOptions, type GetUserAgentOptions, type Json, LanguageString, type PropertyPreprocessor, type PropertyPreprocessorContext, type RemoteDocument, UrlError, arePortableUrisEqual, canParseDecimal, canonicalizePortableUri, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportDidKey, exportMultibaseKey, exportSpki, formatIri, getDocumentLoader, getRemoteDocument, getUserAgent, haveSameIriOrigin, importDidKey, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, parseDidKeyVerificationMethod, parseIri, parseJsonLdId, preloadedContexts, validatePublicUrl };

package/dist/mod.js

@@ -1,5 +1,5 @@
 
-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-BuxPHxK2.js";
+import { a as formatIri, c as isValidPublicIPv6Address, d as validatePublicUrl, i as expandIPv6Address, l as parseIri, n as arePortableUrisEqual, o as haveSameIriOrigin, r as canonicalizePortableUri, s as isValidPublicIPv4Address, t as UrlError, u as parseJsonLdId } from "./url-BlFta-Eh.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import process from "node:process";
@@ -4363,7 +4363,7 @@ const preloadedContexts = {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.1583+1a6f31cb";
+var version = "2.4.0-dev.1599+7b19967f";
 //#endregion
 //#region src/link.ts
 const parametersNeedLowerCase = ["rel", "type"];
@@ -5544,4 +5544,4 @@ LanguageString.prototype[Symbol.for("nodejs.util.inspect.custom")] = function(_d
 	return `<${this.locale.baseName}> ${inspect(this.toString(), options)}`;
 };
 //#endregion
-export { FetchError, LanguageString, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportDidKey, exportMultibaseKey, exportSpki, formatIri, getDocumentLoader, getRemoteDocument, getUserAgent, haveSameIriOrigin, importDidKey, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, parseDidKeyVerificationMethod, parseIri, parseJsonLdId, preloadedContexts, validatePublicUrl };
+export { FetchError, LanguageString, UrlError, arePortableUrisEqual, canParseDecimal, canonicalizePortableUri, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportDidKey, exportMultibaseKey, exportSpki, formatIri, getDocumentLoader, getRemoteDocument, getUserAgent, haveSameIriOrigin, importDidKey, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, parseDidKeyVerificationMethod, parseIri, parseJsonLdId, preloadedContexts, validatePublicUrl };

package/dist/tests/decimal.test.cjs

@@ -1,6 +1,6 @@
 require("./chunk-C2EiDwsr.cjs");
-require("./docloader-CSsDIyQU.cjs");
-require("./url-2XwVbUS_.cjs");
+require("./docloader-BiSxywul.cjs");
+require("./url-CtKcX6ma.cjs");
 require("./key-_wXwomh_.cjs");
 require("./multibase-Bz_UUDtL.cjs");
 require("./langstr-CbAxaeEZ.cjs");

package/dist/tests/decimal.test.mjs

@@ -1,5 +1,5 @@
-import "./docloader-z8KkbO2O.mjs";
-import "./url-YWJbnRlf.mjs";
+import "./docloader-CDde_fhH.mjs";
+import "./url-D7ay_5pk.mjs";
 import "./key-CDGDH_vC.mjs";
 import "./multibase-B4bvakyA.mjs";
 import "./langstr-Di5AvKpB.mjs";

package/dist/tests/{docloader-CSsDIyQU.cjs → docloader-BiSxywul.cjs}

@@ -1,7 +1,7 @@
 require("./chunk-C2EiDwsr.cjs");
-const require_request = require("./request-DpegHvk6.cjs");
+const require_request = require("./request-C9VKqYdG.cjs");
 const require_link = require("./link-FguCydMA.cjs");
-const require_url = require("./url-2XwVbUS_.cjs");
+const require_url = require("./url-CtKcX6ma.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _opentelemetry_api = require("@opentelemetry/api");
 //#endregion

package/dist/tests/{docloader-z8KkbO2O.mjs → docloader-CDde_fhH.mjs}

@@ -1,6 +1,6 @@
-import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-CLZQgTNJ.mjs";
+import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-BBw3lNNz.mjs";
 import { t as HttpHeaderLink } from "./link-NUUWCdnK.mjs";
-import { l as validatePublicUrl, t as UrlError } from "./url-YWJbnRlf.mjs";
+import { d as validatePublicUrl, t as UrlError } from "./url-D7ay_5pk.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#endregion

package/dist/tests/docloader.test.cjs

@@ -1,7 +1,7 @@
 const require_chunk = require("./chunk-C2EiDwsr.cjs");
-const require_docloader = require("./docloader-CSsDIyQU.cjs");
-const require_request = require("./request-DpegHvk6.cjs");
-const require_url = require("./url-2XwVbUS_.cjs");
+const require_docloader = require("./docloader-BiSxywul.cjs");
+const require_request = require("./request-C9VKqYdG.cjs");
+const require_url = require("./url-CtKcX6ma.cjs");
 let node_assert = require("node:assert");
 let node_test = require("node:test");
 //#region ../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js

package/dist/tests/docloader.test.mjs

@@ -1,6 +1,6 @@
-import { n as getRemoteDocument, r as preloadedContexts, t as getDocumentLoader } from "./docloader-z8KkbO2O.mjs";
-import { t as FetchError } from "./request-CLZQgTNJ.mjs";
-import { t as UrlError } from "./url-YWJbnRlf.mjs";
+import { n as getRemoteDocument, r as preloadedContexts, t as getDocumentLoader } from "./docloader-CDde_fhH.mjs";
+import { t as FetchError } from "./request-BBw3lNNz.mjs";
+import { t as UrlError } from "./url-D7ay_5pk.mjs";
 import { deepStrictEqual, ok, rejects } from "node:assert";
 import { test } from "node:test";
 //#region \0rolldown/runtime.js

package/dist/tests/jsonld-cache.test.cjs

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-C2EiDwsr.cjs");
-const require_url = require("./url-2XwVbUS_.cjs");
+const require_url = require("./url-CtKcX6ma.cjs");
 let node_assert = require("node:assert");
 let node_test = require("node:test");
 let jsonld_dist_jsonld_esm_js = require("jsonld/dist/jsonld.esm.js");

package/dist/tests/jsonld-cache.test.mjs

@@ -1,4 +1,4 @@
-import { i as haveSameIriOrigin, r as formatIri, s as parseIri } from "./url-YWJbnRlf.mjs";
+import { a as formatIri, l as parseIri, o as haveSameIriOrigin } from "./url-D7ay_5pk.mjs";
 import { deepStrictEqual, ok, strictEqual } from "node:assert";
 import { test } from "node:test";
 import jsonld from "jsonld/dist/jsonld.esm.js";

package/dist/tests/{request-CLZQgTNJ.mjs → request-BBw3lNNz.mjs}

@@ -1,7 +1,7 @@
 import process from "node:process";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.1583+1a6f31cb";
+var version = "2.4.0-dev.1599+7b19967f";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/{request-DpegHvk6.cjs → request-C9VKqYdG.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.1583+1a6f31cb";
+var version = "2.4.0-dev.1599+7b19967f";
 //#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-DpegHvk6.cjs");
+const require_request = require("./request-C9VKqYdG.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-CLZQgTNJ.mjs";
+import { o as version, r as getUserAgent } from "./request-BBw3lNNz.mjs";
 import { deepStrictEqual } from "node:assert";
 import { test } from "node:test";
 import process from "node:process";

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

@@ -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,49 @@ 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(decodePortableAuthority(parsed.host).replace(DID_SCHEME_PATTERN, "did:"))}${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;
+	}
+}
+/**
 * Checks whether two IRIs have the same origin.
 */
 function haveSameIriOrigin(left, right) {
@@ -86,6 +130,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);
@@ -264,6 +333,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() {

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

@@ -9,6 +9,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;
 /**
@@ -43,6 +44,49 @@ 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(decodePortableAuthority(parsed.host).replace(DID_SCHEME_PATTERN, "did:"))}${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;
+	}
+}
+/**
 * Checks whether two IRIs have the same origin.
 */
 function haveSameIriOrigin(left, right) {
@@ -85,6 +129,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);
@@ -257,4 +326,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, isValidPublicIPv6Address as c, validatePublicUrl as d, expandIPv6Address as i, parseIri as l, arePortableUrisEqual as n, haveSameIriOrigin as o, canonicalizePortableUri as r, isValidPublicIPv4Address as s, UrlError as t, parseJsonLdId as u };

package/dist/tests/url.test.cjs

@@ -1,5 +1,5 @@
 require("./chunk-C2EiDwsr.cjs");
-const require_url = require("./url-2XwVbUS_.cjs");
+const require_url = require("./url-CtKcX6ma.cjs");
 let node_assert = require("node:assert");
 let node_test = require("node:test");
 //#region src/url.test.ts
@@ -76,6 +76,86 @@ let node_test = require("node:test");
 	(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)("canonicalizePortableUri() emits comparison forms", () => {
+	for (const iri of [
+		"ap://did:key:z6Mkabc/actor",
+		"ap://did%3Akey%3Az6Mkabc/actor",
+		"ap://did:key:z6Mkabc/actor?gateways=https%3A%2F%2Fa.example",
+		"ap+ef61://did:key:z6Mkabc/actor",
+		"ap+ef61://did%3Akey%3Az6Mkabc/actor?gateways=https%3A%2F%2Fa.example"
+	]) (0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri(iri), "ap+ef61://did:key:z6Mkabc/actor");
+});
+(0, node_test.test)("canonicalizePortableUri() preserves paths and fragments", () => {
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did:key:z6Mkabc/objects/1/attachments/2?gateways=https%3A%2F%2Fa.example#image"), "ap+ef61://did:key:z6Mkabc/objects/1/attachments/2#image");
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did:key:z6Mkabc/objects/1#reply"), "ap+ef61://did:key:z6Mkabc/objects/1#reply");
+});
+(0, node_test.test)("canonicalizePortableUri() preserves DID-internal pct-encoded characters", () => {
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did:example:abc%2Fdef/actor?x=1"), "ap+ef61://did:example:abc%2Fdef/actor");
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did%3Aweb%3Aexample.com%253A3000/u/1"), "ap+ef61://did:web:example.com%3A3000/u/1");
+});
+(0, node_test.test)("canonicalizePortableUri() normalizes authority pct-encoding casing", () => {
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did:example:abc%2fdef/actor"), "ap+ef61://did:example:abc%2Fdef/actor");
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did:example:abc%2fdef%3abar/actor"), "ap+ef61://did:example:abc%2Fdef%3Abar/actor");
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did%3Aexample%3Aabc%252fdef/actor"), "ap+ef61://did:example:abc%2Fdef/actor");
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did%3Akey%3Az6Mk%2Dabc/actor"), "ap+ef61://did:key:z6Mk-abc/actor");
+	(0, node_assert.ok)(require_url.arePortableUrisEqual("ap://did:example:abc%2fdef/actor", "ap://did:example:abc%2Fdef/actor"));
+	(0, node_assert.ok)(require_url.arePortableUrisEqual("ap://did%3Akey%3Az6Mk%2Dabc/actor", "ap://did:key:z6Mk-abc/actor"));
+});
+(0, node_test.test)("canonicalizePortableUri() normalizes path and fragment pct-encoding casing", () => {
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did:key:z6Mkabc/actor%2fprofile#part%2ftwo"), "ap+ef61://did:key:z6Mkabc/actor%2Fprofile#part%2Ftwo");
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did:key:z6Mkabc/actor%2fprofile%3aimage"), "ap+ef61://did:key:z6Mkabc/actor%2Fprofile%3Aimage");
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did:key:z6Mkabc/actor%2Dprofile#part%7Etwo"), "ap+ef61://did:key:z6Mkabc/actor-profile#part~two");
+	(0, node_assert.ok)(require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/actor%2fprofile#part%2ftwo", "ap://did:key:z6Mkabc/actor%2Fprofile#part%2Ftwo"));
+	(0, node_assert.ok)(require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/actor%2Dprofile#part%7Etwo", "ap://did:key:z6Mkabc/actor-profile#part~two"));
+});
+(0, node_test.test)("canonicalizePortableUri() encodes raw path and fragment characters", () => {
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did:key:z6Mkabc/é#é"), "ap+ef61://did:key:z6Mkabc/%C3%A9#%C3%A9");
+	(0, node_assert.ok)(require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/é#é", "ap://did:key:z6Mkabc/%C3%A9#%C3%A9"));
+});
+(0, node_test.test)("canonicalizePortableUri() normalizes DID scheme casing", () => {
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://DID:key:z6Mkabc/actor"), "ap+ef61://did:key:z6Mkabc/actor");
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://DID%3Akey%3Az6Mkabc/actor"), "ap+ef61://did:key:z6Mkabc/actor");
+});
+(0, node_test.test)("canonicalizePortableUri() preserves opaque path segments", () => {
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did:key:z6Mkabc/a/../b?gateways=x"), "ap+ef61://did:key:z6Mkabc/a/../b");
+	(0, node_assert.deepStrictEqual)(require_url.canonicalizePortableUri("ap://did:key:z6Mkabc/a/%2e%2e/b"), "ap+ef61://did:key:z6Mkabc/a/../b");
+	(0, node_assert.ok)(!require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/a/../b", "ap://did:key:z6Mkabc/b"));
+	(0, node_assert.ok)(!require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/a/%2e%2e/b", "ap://did:key:z6Mkabc/b"));
+});
+(0, node_test.test)("canonicalizePortableUri() rejects non-portable URIs", () => {
+	for (const iri of [
+		"https://example.com/actor",
+		"at://did:plc:example/record",
+		"/actor",
+		"ap://not-a-did/actor",
+		"ap://did:key:z6Mkabc"
+	]) (0, node_assert.throws)(() => require_url.canonicalizePortableUri(iri), TypeError);
+	(0, node_assert.throws)(() => require_url.canonicalizePortableUri(new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor")), TypeError);
+});
+(0, node_test.test)("canonicalizePortableUri() rejects invalid path and fragment pct-encoding", () => {
+	(0, node_assert.throws)(() => require_url.canonicalizePortableUri("ap://did:key:z6Mkabc/a%zz"), TypeError);
+	(0, node_assert.throws)(() => require_url.canonicalizePortableUri("ap://did:key:z6Mkabc/actor#part%zz"), TypeError);
+	(0, node_assert.throws)(() => require_url.canonicalizePortableUri("ap://did:key:z6Mkabc/\ud800"), TypeError);
+	(0, node_assert.throws)(() => require_url.canonicalizePortableUri("ap://did:key:z6Mkabc/actor#\ud800"), TypeError);
+});
+(0, node_test.test)("arePortableUrisEqual() compares canonical portable URI forms", () => {
+	(0, node_assert.ok)(require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/actor", "ap+ef61://did%3Akey%3Az6Mkabc/actor?gateways=https%3A%2F%2Fa.example"));
+	(0, node_assert.ok)(require_url.arePortableUrisEqual("ap://DID:key:z6Mkabc/actor", "ap://did:key:z6Mkabc/actor"));
+	(0, node_assert.ok)(!require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/actor", "ap://did:key:z6Mkdef/actor"));
+	(0, node_assert.ok)(!require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/actor", "ap://did:key:z6Mkabc/outbox"));
+	(0, node_assert.ok)(!require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/actor#one", "ap://did:key:z6Mkabc/actor#two"));
+});
+(0, node_test.test)("arePortableUrisEqual() handles non-portable URI strings", () => {
+	(0, node_assert.ok)(require_url.arePortableUrisEqual("https://example.com/actor", "https://example.com/actor"));
+	(0, node_assert.ok)(!require_url.arePortableUrisEqual("https://example.com/actor", "https://example.com/outbox"));
+	(0, node_assert.ok)(!require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/actor", "https://example.com/actor"));
+	(0, node_assert.ok)(require_url.arePortableUrisEqual("ap://not-a-did/actor", "ap://not-a-did/actor"));
+	(0, node_assert.ok)(!require_url.arePortableUrisEqual("ap://not-a-did/actor", "ap://not-a-did/outbox"));
+	(0, node_assert.ok)(!require_url.arePortableUrisEqual("ap://not-a-did/actor", "ap://did:key:z6Mkabc/actor"));
+	(0, node_assert.ok)(!require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/a%zz", "ap://did:key:z6Mkabc/a%25zz"));
+	(0, node_assert.ok)(!require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/\ud800", "ap://did:key:z6Mkabc/%EF%BF%BD"));
+	(0, node_assert.ok)(!require_url.arePortableUrisEqual("ap://did:key:z6Mkabc/actor#\ud800", "ap://did:key:z6Mkabc/actor#%EF%BF%BD"));
+});
 (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"));