@fedify/testing 2.4.0-dev.2157 → 2.4.0-dev.2159

package/dist/mod.cjs

@@ -248,9 +248,56 @@ function expandUriTemplate(template, values) {
 function buildPortableUri(authority, path) {
 	if (typeof authority !== "string" || !/^did:[a-z0-9]+:[^/?#]+$/i.test(authority)) throw new TypeError("The authority of a portable ID must be a DID without a path, query, or fragment.");
 	const did = (0, _fedify_vocab_runtime.getFe34Origin)(authority);
-	if (did.startsWith("did:key:") && !/^z[1-9A-HJ-NP-Za-km-z]+$/.test(did.slice(8))) throw new TypeError("The did:key authority of a portable ID must be encoded in base58-btc, i.e., start with z.");
+	if (!isBase58BtcDidKey(did)) throw new TypeError("The did:key authority of a portable ID must be encoded in base58-btc, i.e., start with z.");
 	return (0, _fedify_vocab_runtime.parseIri)(`ap+ef61://${did}${path}`);
 }
+/**
+* Checks that a normalized DID, if it is a `did:key` DID, is encoded in
+* base58-btc, as `@fedify/fedify` requires of portable IDs.
+*/
+function isBase58BtcDidKey(did) {
+	return !did.startsWith("did:key:") || /^z[1-9A-HJ-NP-Za-km-z]+$/.test(did.slice(8));
+}
+/**
+* Recognizes an FEP-ef61 portable ID, i.e., an `ap:` or `ap+ef61:` URI, or
+* a compatible identifier on any gateway, validating it the same way as
+* `Context.parseUri()` of `@fedify/fedify` does.
+* @returns The DID and the path of the portable ID, `null` if it is
+*          malformed, or `undefined` if the URI is not a portable ID.
+*/
+function parseMockPortableId(uri) {
+	const portable = uri.protocol === "ap:" || uri.protocol === "ap+ef61:";
+	if (!portable && !((uri.protocol === "http:" || uri.protocol === "https:") && /^\/\.well-known\/apgateway\/did(?::|%3A)/i.test(uri.pathname))) return;
+	if (uri.username !== "" || uri.password !== "") return null;
+	try {
+		const id = portable ? (0, _fedify_vocab_runtime.parseIri)(uri) : (0, _fedify_vocab_runtime.fromCompatibleEf61Id)(uri.origin + uri.pathname);
+		if (id == null) return null;
+		(0, _fedify_vocab_runtime.canonicalizePortableUri)((0, _fedify_vocab_runtime.formatIri)(id));
+		const authority = (0, _fedify_vocab_runtime.getFe34Origin)(id);
+		if (!isBase58BtcDidKey(authority)) return null;
+		return {
+			authority,
+			path: id.pathname
+		};
+	} catch (error) {
+		if (error instanceof TypeError) return null;
+		throw error;
+	}
+}
+/**
+* Parses a path in the way {@link MockContext.parseUri} does, i.e., only
+* `/users/{identifier}` and its subpaths are recognized, as actors.
+*/
+function parseMockPath(path) {
+	if (path.startsWith("/users/")) {
+		const parts = path.split("/");
+		if (parts.length >= 3) return {
+			type: "actor",
+			identifier: parts[2]
+		};
+	}
+	return null;
+}
 function validateOutboxListenerPath(path, dispatcherPath) {
 	if (!path.startsWith("/")) throw new TypeError("Path must start with a slash.");
 	if (dispatcherPath != null && dispatcherPath !== path) throw new TypeError("Outbox listener path and outbox dispatcher path must match.");
@@ -978,15 +1025,16 @@ var MockContext = class MockContext {
 		const path = globalThis.Object.entries(values).map(([key, value]) => `${key}/${value}`).join("/");
 		return new URL(`/collections/${String(_name)}/${path}`, this.origin);
 	}
-	parseUri(uri) {
-		if (uri.pathname.startsWith("/users/")) {
-			const parts = uri.pathname.split("/");
-			if (parts.length >= 3) return {
-				type: "actor",
-				identifier: parts[2]
-			};
-		}
-		return null;
+	parseUri(uri, options = {}) {
+		if (uri == null) return null;
+		const portable = parseMockPortableId(uri);
+		if (portable === void 0) return parseMockPath(uri.pathname);
+		if (portable === null || !options.portable) return null;
+		const result = parseMockPath(portable.path);
+		return result == null ? null : {
+			...result,
+			authority: portable.authority
+		};
 	}
 	async getActorKeyPairs(identifier) {
 		if (this.federation instanceof MockFederation && this.federation.actorKeyPairsDispatcher) {

package/dist/mod.js

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import { hasProofLike, hasSignatureLike } from "@fedify/fedify/sig";
 import { Activity, CryptographicKey, Multikey, Tombstone, lookupObject, traverseCollection } from "@fedify/vocab";
-import { getFe34Origin, parseIri } from "@fedify/vocab-runtime";
+import { canonicalizePortableUri, formatIri, fromCompatibleEf61Id, getFe34Origin, parseIri } from "@fedify/vocab-runtime";
 import { RouterError } from "@fedify/fedify/federation";
 import { delay } from "es-toolkit";
 import { deepStrictEqual, ok, strictEqual } from "node:assert/strict";
@@ -247,9 +247,56 @@ function expandUriTemplate(template, values) {
 function buildPortableUri(authority, path) {
 	if (typeof authority !== "string" || !/^did:[a-z0-9]+:[^/?#]+$/i.test(authority)) throw new TypeError("The authority of a portable ID must be a DID without a path, query, or fragment.");
 	const did = getFe34Origin(authority);
-	if (did.startsWith("did:key:") && !/^z[1-9A-HJ-NP-Za-km-z]+$/.test(did.slice(8))) throw new TypeError("The did:key authority of a portable ID must be encoded in base58-btc, i.e., start with z.");
+	if (!isBase58BtcDidKey(did)) throw new TypeError("The did:key authority of a portable ID must be encoded in base58-btc, i.e., start with z.");
 	return parseIri(`ap+ef61://${did}${path}`);
 }
+/**
+* Checks that a normalized DID, if it is a `did:key` DID, is encoded in
+* base58-btc, as `@fedify/fedify` requires of portable IDs.
+*/
+function isBase58BtcDidKey(did) {
+	return !did.startsWith("did:key:") || /^z[1-9A-HJ-NP-Za-km-z]+$/.test(did.slice(8));
+}
+/**
+* Recognizes an FEP-ef61 portable ID, i.e., an `ap:` or `ap+ef61:` URI, or
+* a compatible identifier on any gateway, validating it the same way as
+* `Context.parseUri()` of `@fedify/fedify` does.
+* @returns The DID and the path of the portable ID, `null` if it is
+*          malformed, or `undefined` if the URI is not a portable ID.
+*/
+function parseMockPortableId(uri) {
+	const portable = uri.protocol === "ap:" || uri.protocol === "ap+ef61:";
+	if (!portable && !((uri.protocol === "http:" || uri.protocol === "https:") && /^\/\.well-known\/apgateway\/did(?::|%3A)/i.test(uri.pathname))) return;
+	if (uri.username !== "" || uri.password !== "") return null;
+	try {
+		const id = portable ? parseIri(uri) : fromCompatibleEf61Id(uri.origin + uri.pathname);
+		if (id == null) return null;
+		canonicalizePortableUri(formatIri(id));
+		const authority = getFe34Origin(id);
+		if (!isBase58BtcDidKey(authority)) return null;
+		return {
+			authority,
+			path: id.pathname
+		};
+	} catch (error) {
+		if (error instanceof TypeError) return null;
+		throw error;
+	}
+}
+/**
+* Parses a path in the way {@link MockContext.parseUri} does, i.e., only
+* `/users/{identifier}` and its subpaths are recognized, as actors.
+*/
+function parseMockPath(path) {
+	if (path.startsWith("/users/")) {
+		const parts = path.split("/");
+		if (parts.length >= 3) return {
+			type: "actor",
+			identifier: parts[2]
+		};
+	}
+	return null;
+}
 function validateOutboxListenerPath(path, dispatcherPath) {
 	if (!path.startsWith("/")) throw new TypeError("Path must start with a slash.");
 	if (dispatcherPath != null && dispatcherPath !== path) throw new TypeError("Outbox listener path and outbox dispatcher path must match.");
@@ -977,15 +1024,16 @@ var MockContext = class MockContext {
 		const path = globalThis.Object.entries(values).map(([key, value]) => `${key}/${value}`).join("/");
 		return new URL(`/collections/${String(_name)}/${path}`, this.origin);
 	}
-	parseUri(uri) {
-		if (uri.pathname.startsWith("/users/")) {
-			const parts = uri.pathname.split("/");
-			if (parts.length >= 3) return {
-				type: "actor",
-				identifier: parts[2]
-			};
-		}
-		return null;
+	parseUri(uri, options = {}) {
+		if (uri == null) return null;
+		const portable = parseMockPortableId(uri);
+		if (portable === void 0) return parseMockPath(uri.pathname);
+		if (portable === null || !options.portable) return null;
+		const result = parseMockPath(portable.path);
+		return result == null ? null : {
+			...result,
+			authority: portable.authority
+		};
 	}
 	async getActorKeyPairs(identifier) {
 		if (this.federation instanceof MockFederation && this.federation.actorKeyPairsDispatcher) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/testing",
-  "version": "2.4.0-dev.2157+b76e5888",
+  "version": "2.4.0-dev.2159+bb072eda",
   "description": "Testing utilities for Fedify applications",
   "keywords": [
     "fedify",
@@ -47,13 +47,13 @@
     "package.json"
   ],
   "peerDependencies": {
-    "@fedify/fedify": "^2.4.0-dev.2157+b76e5888"
+    "@fedify/fedify": "^2.4.0-dev.2159+bb072eda"
   },
   "dependencies": {
     "es-toolkit": "1.46.1",
     "temporal-polyfill": "^1.0.1",
-    "@fedify/vocab-runtime": "^2.4.0-dev.2157+b76e5888",
-    "@fedify/vocab": "2.4.0-dev.2157+b76e5888"
+    "@fedify/vocab": "2.4.0-dev.2159+bb072eda",
+    "@fedify/vocab-runtime": "^2.4.0-dev.2159+bb072eda"
   },
   "devDependencies": {
     "@standard-schema/spec": "^1.1.0",