@fedify/testing 2.4.0-dev.2093 → 2.4.0-dev.2103

package/dist/mod.cjs

@@ -39,7 +39,7 @@ const noopMeterProvider$1 = { getMeter: () => ({
 	removeBatchObservableCallback: () => void 0
 }) };
 function createContext(values) {
-	const { federation, url = new URL("http://example.com/"), canonicalOrigin, data, documentLoader, contextLoader, meterProvider, tracerProvider, clone, getNodeInfoUri, getActorUri, getObjectUri, getPortableObjectUri, getPortableInboxUri, getCollectionUri, getOutboxUri, getMediaUploaderUri, getInboxUri, getFollowingUri, getFollowersUri, getLikedUri, getFeaturedUri, getFeaturedTagsUri, parseUri, getActorKeyPairs, getDocumentLoader, lookupObject, traverseCollection, lookupNodeInfo, lookupWebFinger, sendActivity, routeActivity, enqueueTask, enqueueTaskMany } = values;
+	const { federation, url = new URL("http://example.com/"), canonicalOrigin, data, documentLoader, contextLoader, meterProvider, tracerProvider, clone, getNodeInfoUri, getActorUri, getPortableActorUri, getObjectUri, getPortableObjectUri, getPortableInboxUri, getCollectionUri, getOutboxUri, getMediaUploaderUri, getInboxUri, getFollowingUri, getFollowersUri, getLikedUri, getFeaturedUri, getFeaturedTagsUri, parseUri, getActorKeyPairs, getDocumentLoader, lookupObject, traverseCollection, lookupNodeInfo, lookupWebFinger, sendActivity, routeActivity, enqueueTask, enqueueTaskMany } = values;
 	function throwRouterError() {
 		throw new _fedify_fedify_federation.RouterError("Not implemented");
 	}
@@ -60,6 +60,7 @@ function createContext(values) {
 		})),
 		getNodeInfoUri: getNodeInfoUri ?? throwRouterError,
 		getActorUri: getActorUri ?? throwRouterError,
+		getPortableActorUri: getPortableActorUri ?? throwRouterError,
 		getObjectUri: getObjectUri ?? throwRouterError,
 		getPortableObjectUri: getPortableObjectUri ?? throwRouterError,
 		getPortableInboxUri: getPortableInboxUri ?? throwRouterError,
@@ -230,6 +231,16 @@ function expandUriTemplate(template, values) {
 		}
 	});
 }
+/**
+* Builds an FEP-ef61 portable ID from a DID authority and a path, validating
+* the authority the same way as `@fedify/fedify` does.
+*/
+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.");
+	return (0, _fedify_vocab_runtime.parseIri)(`ap+ef61://${did}${path}`);
+}
 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.");
@@ -837,15 +848,17 @@ var MockContext = class MockContext {
 		const path = globalThis.Object.entries(values).map(([key, value]) => `${key}/${value}`).join("/");
 		return new URL(`/objects/${cls.name.toLowerCase()}/${path}`, this.origin);
 	}
+	getPortableActorUri(identifier, authority) {
+		const { pathname } = this.getActorUri(identifier);
+		return buildPortableUri(authority, pathname);
+	}
 	getPortableObjectUri(cls, values, authority) {
-		if (!/^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 { pathname } = this.getObjectUri(cls, values);
-		return (0, _fedify_vocab_runtime.parseIri)(`ap+ef61://${authority}${pathname}`);
+		return buildPortableUri(authority, pathname);
 	}
 	getPortableInboxUri(identifier, authority) {
-		if (!/^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 { pathname } = this.getInboxUri(identifier);
-		return (0, _fedify_vocab_runtime.parseIri)(`ap+ef61://${authority}${pathname}`);
+		return buildPortableUri(authority, pathname);
 	}
 	getOutboxUri(identifier) {
 		if (this.federation instanceof MockFederation && this.federation.outboxPath) {

package/dist/mod.js

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import { hasProofLike, hasSignatureLike } from "@fedify/fedify/sig";
 import { Activity, CryptographicKey, Multikey, lookupObject, traverseCollection } from "@fedify/vocab";
-import { parseIri } from "@fedify/vocab-runtime";
+import { 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";
@@ -38,7 +38,7 @@ const noopMeterProvider$1 = { getMeter: () => ({
 	removeBatchObservableCallback: () => void 0
 }) };
 function createContext(values) {
-	const { federation, url = new URL("http://example.com/"), canonicalOrigin, data, documentLoader, contextLoader, meterProvider, tracerProvider, clone, getNodeInfoUri, getActorUri, getObjectUri, getPortableObjectUri, getPortableInboxUri, getCollectionUri, getOutboxUri, getMediaUploaderUri, getInboxUri, getFollowingUri, getFollowersUri, getLikedUri, getFeaturedUri, getFeaturedTagsUri, parseUri, getActorKeyPairs, getDocumentLoader, lookupObject: lookupObject$1, traverseCollection: traverseCollection$1, lookupNodeInfo, lookupWebFinger, sendActivity, routeActivity, enqueueTask, enqueueTaskMany } = values;
+	const { federation, url = new URL("http://example.com/"), canonicalOrigin, data, documentLoader, contextLoader, meterProvider, tracerProvider, clone, getNodeInfoUri, getActorUri, getPortableActorUri, getObjectUri, getPortableObjectUri, getPortableInboxUri, getCollectionUri, getOutboxUri, getMediaUploaderUri, getInboxUri, getFollowingUri, getFollowersUri, getLikedUri, getFeaturedUri, getFeaturedTagsUri, parseUri, getActorKeyPairs, getDocumentLoader, lookupObject: lookupObject$1, traverseCollection: traverseCollection$1, lookupNodeInfo, lookupWebFinger, sendActivity, routeActivity, enqueueTask, enqueueTaskMany } = values;
 	function throwRouterError() {
 		throw new RouterError("Not implemented");
 	}
@@ -59,6 +59,7 @@ function createContext(values) {
 		})),
 		getNodeInfoUri: getNodeInfoUri ?? throwRouterError,
 		getActorUri: getActorUri ?? throwRouterError,
+		getPortableActorUri: getPortableActorUri ?? throwRouterError,
 		getObjectUri: getObjectUri ?? throwRouterError,
 		getPortableObjectUri: getPortableObjectUri ?? throwRouterError,
 		getPortableInboxUri: getPortableInboxUri ?? throwRouterError,
@@ -229,6 +230,16 @@ function expandUriTemplate(template, values) {
 		}
 	});
 }
+/**
+* Builds an FEP-ef61 portable ID from a DID authority and a path, validating
+* the authority the same way as `@fedify/fedify` does.
+*/
+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.");
+	return parseIri(`ap+ef61://${did}${path}`);
+}
 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.");
@@ -836,15 +847,17 @@ var MockContext = class MockContext {
 		const path = globalThis.Object.entries(values).map(([key, value]) => `${key}/${value}`).join("/");
 		return new URL(`/objects/${cls.name.toLowerCase()}/${path}`, this.origin);
 	}
+	getPortableActorUri(identifier, authority) {
+		const { pathname } = this.getActorUri(identifier);
+		return buildPortableUri(authority, pathname);
+	}
 	getPortableObjectUri(cls, values, authority) {
-		if (!/^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 { pathname } = this.getObjectUri(cls, values);
-		return parseIri(`ap+ef61://${authority}${pathname}`);
+		return buildPortableUri(authority, pathname);
 	}
 	getPortableInboxUri(identifier, authority) {
-		if (!/^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 { pathname } = this.getInboxUri(identifier);
-		return parseIri(`ap+ef61://${authority}${pathname}`);
+		return buildPortableUri(authority, pathname);
 	}
 	getOutboxUri(identifier) {
 		if (this.federation instanceof MockFederation && this.federation.outboxPath) {

package/package.json

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