@fedify/fedify 1.7.11 → 1.7.13

package/dist/vocab/lookup.test.js

@@ -3,25 +3,25 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { assertEquals } from "../assert_equals-CTYbeopb.js";
-import "../assert-DmFG7ppO.js";
-import { assertInstanceOf } from "../assert_instance_of-CF09JHYM.js";
-import "../docloader-D4wl8z_4.js";
-import "../url-kTAI6_KP.js";
-import "../multibase-DeCHcK8L.js";
-import { Collection, Note, Object as Object$1, Person } from "../vocab-BojAnGjI.js";
+import { assertEquals } from "../assert_equals-B44MxcIj.js";
+import "../assert-LOEeCUK5.js";
+import { assertInstanceOf } from "../assert_instance_of-XtuFevV_.js";
+import "../docloader-Qfs9nPiy.js";
+import "../url-C2xuoQD1.js";
+import "../multibase-CnLHszip.js";
+import { Collection, Note, Object as Object$1, Person } from "../vocab-S7fEn6XO.js";
 import "../langstr-DbWheeIS.js";
-import "../lookup-BGqnk7rW.js";
-import "../type-D2s5lmbZ.js";
-import { lookupObject, traverseCollection } from "../lookup-C8ZpflGI.js";
-import { test } from "../testing-BZ0dJ4qn.js";
-import "../std__assert-vp0TKMS1.js";
-import "../assert_rejects-C-sxEMM5.js";
-import "../assert_is_error-nrwA1GeT.js";
-import "../assert_not_equals-Dc7y-V5Q.js";
-import "../assert_throws-Cn9C6Jur.js";
+import "../lookup-CkOdKyYR.js";
+import "../type-CFuiGLz9.js";
+import { lookupObject, traverseCollection } from "../lookup-CnkkF4Rf.js";
+import { test } from "../testing-DLyvtiiW.js";
+import "../std__assert-o_r9vqm1.js";
+import "../assert_rejects-DWQ4jaf9.js";
+import "../assert_is_error-BTlryvT0.js";
+import "../assert_not_equals-C685gKx6.js";
+import "../assert_throws-YetpVSc-.js";
 import { mockDocumentLoader } from "../docloader-09nVWLAZ.js";
-import { esm_default } from "../esm-Db4De7AS.js";
+import { esm_default } from "../esm-DO9PrujO.js";
 
 //#region vocab/lookup.test.ts
 test("lookupObject()", async (t) => {

package/dist/vocab/mod.js

@@ -2,9 +2,9 @@
       import { Temporal } from "@js-temporal/polyfill";
       import { URLPattern } from "urlpattern-polyfill";
     
-import "../docloader-BcyuO_kK.js";
-import { Accept, Activity, Add, Announce, Application, Arrive, Article, Audio, Block, ChatMessage, Collection, CollectionPage, Create, CryptographicKey, DataIntegrityProof, Delete, DidService, Dislike, Document, Emoji, EmojiReact, Endpoints, Event, Export, Flag, Follow, Group, Hashtag, Ignore, Image, IntransitiveActivity, Invite, Join, Leave, Like, Link, Listen, Mention, Move, Multikey, Note, Object as Object$1, Offer, OrderedCollection, OrderedCollectionPage, Organization, Page, Person, Place, Profile, PropertyValue, Question, Read, Reject, Relationship, Remove, Service, Source, TentativeAccept, TentativeReject, Tombstone, Travel, Undo, Update, Video, View, getActorClassByTypeName, getActorHandle, getActorTypeName, getTypeId, isActor, normalizeActorHandle } from "../actor-DgWryCk8.js";
-import "../lookup-BlPHJ-Ff.js";
-import { PUBLIC_COLLECTION, lookupObject, traverseCollection } from "../vocab-Cy9XhW_T.js";
+import "../docloader-CchlnLWb.js";
+import { Accept, Activity, Add, Announce, Application, Arrive, Article, Audio, Block, ChatMessage, Collection, CollectionPage, Create, CryptographicKey, DataIntegrityProof, Delete, DidService, Dislike, Document, Emoji, EmojiReact, Endpoints, Event, Export, Flag, Follow, Group, Hashtag, Ignore, Image, IntransitiveActivity, Invite, Join, Leave, Like, Link, Listen, Mention, Move, Multikey, Note, Object as Object$1, Offer, OrderedCollection, OrderedCollectionPage, Organization, Page, Person, Place, Profile, PropertyValue, Question, Read, Reject, Relationship, Remove, Service, Source, TentativeAccept, TentativeReject, Tombstone, Travel, Undo, Update, Video, View, getActorClassByTypeName, getActorHandle, getActorTypeName, getTypeId, isActor, normalizeActorHandle } from "../actor-CsmPeeHG.js";
+import "../lookup-CN-LpF5e.js";
+import { PUBLIC_COLLECTION, lookupObject, traverseCollection } from "../vocab-C_pE4SvE.js";
 
 export { Accept, Activity, Add, Announce, Application, Arrive, Article, Audio, Block, ChatMessage, Collection, CollectionPage, Create, CryptographicKey, DataIntegrityProof, Delete, DidService, Dislike, Document, Emoji, EmojiReact, Endpoints, Event, Export, Flag, Follow, Group, Hashtag, Ignore, Image, IntransitiveActivity, Invite, Join, Leave, Like, Link, Listen, Mention, Move, Multikey, Note, Object$1 as Object, Offer, OrderedCollection, OrderedCollectionPage, Organization, PUBLIC_COLLECTION, Page, Person, Place, Profile, PropertyValue, Question, Read, Reject, Relationship, Remove, Service, Source, TentativeAccept, TentativeReject, Tombstone, Travel, Undo, Update, Video, View, getActorClassByTypeName, getActorHandle, getActorTypeName, getTypeId, isActor, lookupObject, normalizeActorHandle, traverseCollection };

package/dist/vocab/type.test.js

@@ -3,27 +3,23 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { assertEquals } from "../assert_equals-CTYbeopb.js";
-import "../docloader-D4wl8z_4.js";
-import "../url-kTAI6_KP.js";
-import "../multibase-DeCHcK8L.js";
-import { Person } from "../vocab-BojAnGjI.js";
+import { assertEquals } from "../assert_equals-B44MxcIj.js";
+import "../docloader-Qfs9nPiy.js";
+import "../url-C2xuoQD1.js";
+import "../multibase-CnLHszip.js";
+import { Person } from "../vocab-S7fEn6XO.js";
 import "../langstr-DbWheeIS.js";
-import { getTypeId } from "../type-D2s5lmbZ.js";
-import { test } from "../testing-BZ0dJ4qn.js";
+import { getTypeId } from "../type-CFuiGLz9.js";
+import { test } from "../testing-DLyvtiiW.js";
 
 //#region vocab/type.test.ts
 test("getTypeId()", () => {
 	const obj = new Person({});
 	assertEquals(getTypeId(obj), new URL("https://www.w3.org/ns/activitystreams#Person"));
-	const obj2 = null;
-	assertEquals(getTypeId(obj2), null);
-	const obj3 = void 0;
-	assertEquals(getTypeId(obj3), void 0);
-	const obj4 = null;
-	assertEquals(getTypeId(obj4), null);
-	const obj5 = void 0;
-	assertEquals(getTypeId(obj5), void 0);
+	assertEquals(getTypeId(null), null);
+	assertEquals(getTypeId(void 0), void 0);
+	assertEquals(getTypeId(null), null);
+	assertEquals(getTypeId(void 0), void 0);
 });
 
 //#endregion

package/dist/vocab/vocab.test.js

@@ -3,22 +3,22 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { assertEquals, isWindows } from "../assert_equals-CTYbeopb.js";
-import { assert } from "../assert-DmFG7ppO.js";
-import { assertInstanceOf } from "../assert_instance_of-CF09JHYM.js";
-import "../docloader-D4wl8z_4.js";
-import "../url-kTAI6_KP.js";
-import { decode } from "../multibase-DeCHcK8L.js";
-import { Activity, Announce, Create, CryptographicKey, Follow, Hashtag, Note, Object as Object$1, OrderedCollectionPage, Person, Place, Question, Source, vocab_exports } from "../vocab-BojAnGjI.js";
+import { assertEquals, isWindows } from "../assert_equals-B44MxcIj.js";
+import { assert } from "../assert-LOEeCUK5.js";
+import { assertInstanceOf } from "../assert_instance_of-XtuFevV_.js";
+import "../docloader-Qfs9nPiy.js";
+import "../url-C2xuoQD1.js";
+import { decode } from "../multibase-CnLHszip.js";
+import { Activity, Announce, Create, CryptographicKey, Follow, Hashtag, Link, Note, Object as Object$1, OrderedCollectionPage, Person, Place, Question, Source, vocab_exports } from "../vocab-S7fEn6XO.js";
 import { LanguageString } from "../langstr-DbWheeIS.js";
-import { test } from "../testing-BZ0dJ4qn.js";
-import "../std__assert-vp0TKMS1.js";
-import { assertFalse, assertRejects } from "../assert_rejects-C-sxEMM5.js";
-import "../assert_is_error-nrwA1GeT.js";
-import { assertNotEquals } from "../assert_not_equals-Dc7y-V5Q.js";
-import { assertThrows } from "../assert_throws-Cn9C6Jur.js";
+import { test } from "../testing-DLyvtiiW.js";
+import "../std__assert-o_r9vqm1.js";
+import { assertFalse, assertRejects } from "../assert_rejects-DWQ4jaf9.js";
+import "../assert_is_error-BTlryvT0.js";
+import { assertNotEquals } from "../assert_not_equals-C685gKx6.js";
+import { assertThrows } from "../assert_throws-YetpVSc-.js";
 import { mockDocumentLoader } from "../docloader-09nVWLAZ.js";
-import { ed25519PublicKey, rsaPublicKey1 } from "../keys-DJ5t4jB4.js";
+import { ed25519PublicKey, rsaPublicKey1 } from "../keys-DGJec4-R.js";
 import { pascalCase } from "@es-toolkit/es-toolkit";
 import { parseLanguageTag } from "@phensley/language-tag";
 import { Validator } from "@cfworker/json-schema";
@@ -548,16 +548,13 @@ const bool = {
 	resolve: (data) => YAML_BOOLEANS.includes(data),
 	represent: {
 		lowercase: (object) => {
-			const value = object instanceof Boolean ? object.valueOf() : object;
-			return value ? "true" : "false";
+			return (object instanceof Boolean ? object.valueOf() : object) ? "true" : "false";
 		},
 		uppercase: (object) => {
-			const value = object instanceof Boolean ? object.valueOf() : object;
-			return value ? "TRUE" : "FALSE";
+			return (object instanceof Boolean ? object.valueOf() : object) ? "TRUE" : "FALSE";
 		},
 		camelcase: (object) => {
-			const value = object instanceof Boolean ? object.valueOf() : object;
-			return value ? "True" : "False";
+			return (object instanceof Boolean ? object.valueOf() : object) ? "True" : "False";
 		}
 	}
 };
@@ -725,8 +722,7 @@ const int = {
 			return value >= 0 ? `0${value.toString(8)}` : `-0${value.toString(8).slice(1)}`;
 		},
 		decimal(object) {
-			const value = object instanceof Number ? object.valueOf() : object;
-			return value.toString(10);
+			return (object instanceof Number ? object.valueOf() : object).toString(10);
 		},
 		hexadecimal(object) {
 			const value = object instanceof Number ? object.valueOf() : object;
@@ -929,9 +925,7 @@ const undefinedType = {
 	resolve() {
 		return true;
 	},
-	construct() {
-		return void 0;
-	},
+	construct() {},
 	predicate(object) {
 		return typeof object === "undefined";
 	},
@@ -951,8 +945,7 @@ function createTypeMap(implicitTypes, explicitTypes) {
 	};
 	const fallbackMap = result.fallback;
 	for (const type of [...implicitTypes, ...explicitTypes]) {
-		const map$1 = result[type.kind];
-		map$1.set(type.tag, type);
+		result[type.kind].set(type.tag, type);
 		fallbackMap.set(type.tag, type);
 	}
 	return result;
@@ -1835,8 +1828,7 @@ var LoaderState = class {
 		} else allowBlockCollections = false;
 		if (allowBlockCollections) allowBlockCollections = atNewLine || allowCompact;
 		if (indentStatus === 1 || CONTEXT_BLOCK_OUT === nodeContext) {
-			const cond = CONTEXT_FLOW_IN === nodeContext || CONTEXT_FLOW_OUT === nodeContext;
-			const flowIndent = cond ? parentIndent : parentIndent + 1;
+			const flowIndent = CONTEXT_FLOW_IN === nodeContext || CONTEXT_FLOW_OUT === nodeContext ? parentIndent : parentIndent + 1;
 			const blockIndent = this.position - this.lineStart;
 			if (indentStatus === 1) if (allowBlockCollections && (this.readBlockSequence(blockIndent) || this.readBlockMapping(blockIndent, flowIndent)) || this.readFlowCollection(flowIndent)) hasContent = true;
 			else {
@@ -1862,8 +1854,7 @@ var LoaderState = class {
 			}
 		}
 		else if (this.typeMap[this.kind ?? "fallback"].has(this.tag)) {
-			const map$1 = this.typeMap[this.kind ?? "fallback"];
-			type = map$1.get(this.tag);
+			type = this.typeMap[this.kind ?? "fallback"].get(this.tag);
 			if (this.result !== null && type.kind !== this.kind) throw this.#createError(`Unacceptable node kind for !<${this.tag}> tag: it should be "${type.kind}", not "${this.kind}"`);
 			if (!type.resolve(this.result)) throw this.#createError(`Cannot resolve a node with !<${this.tag}> explicit tag`);
 			else {
@@ -1981,11 +1972,10 @@ function sanitizeInput(input) {
 * @returns Parsed document.
 */ function parse(content, options = {}) {
 	content = sanitizeInput(content);
-	const state = new LoaderState(content, {
+	const documentGenerator = new LoaderState(content, {
 		...options,
 		schema: SCHEMA_MAP.get(options.schema)
-	});
-	const documentGenerator = state.readDocuments();
+	}).readDocuments();
 	const document = documentGenerator.next().value;
 	if (!documentGenerator.next().done) throw new SyntaxError("Found more than 1 document in the stream: expected a single document");
 	return document ?? null;
@@ -2030,10 +2020,8 @@ async function loadSchemaValidator() {
 	const thisFile = new URL(import.meta.url);
 	const schemaFile = join$2(dirname$1(thisFile), "schema.yaml");
 	let content;
-	if (schemaFile.protocol !== "file:") {
-		const response = await fetch(schemaFile);
-		content = await response.text();
-	} else content = await readFile(fromFileUrl(schemaFile), { encoding: "utf-8" });
+	if (schemaFile.protocol !== "file:") content = await (await fetch(schemaFile)).text();
+	else content = await readFile(fromFileUrl(schemaFile), { encoding: "utf-8" });
 	const schemaObject = parse(content);
 	return new Validator(schemaObject);
 }
@@ -2208,7 +2196,20 @@ const scalarTypes = {
         && ${v}["@id"] !== "" && ${v}["@id"] !== "/"`;
 		},
 		decoder(v) {
-			return `new URL(${v}["@id"])`;
+			return `${v}["@id"].startsWith("at://")
+        ? new URL("at://" +
+          encodeURIComponent(
+            ${v}["@id"].includes("/", 5)
+              ? ${v}["@id"].slice(5, ${v}["@id"].indexOf("/", 5))
+              : ${v}["@id"].slice(5)
+          ) +
+          (
+            ${v}["@id"].includes("/", 5)
+              ? ${v}["@id"].slice(${v}["@id"].indexOf("/", 5))
+              : ""
+          )
+        )
+        : new URL(${v}["@id"])`;
 		}
 	},
 	"http://www.w3.org/1999/02/22-rdf-syntax-ns#langString": {
@@ -2722,7 +2723,7 @@ test("Activity.getObject()", async () => {
 	});
 	const activity2 = new Activity({ object: new URL("https://example.com/not-found") });
 	assertEquals(await activity2.getObject({ suppressError: true }), null);
-	const activity3 = await Activity.fromJsonLd({
+	const object3 = await (await Activity.fromJsonLd({
 		"@context": "https://www.w3.org/ns/activitystreams",
 		type: "Create",
 		object: {
@@ -2730,8 +2731,7 @@ test("Activity.getObject()", async () => {
 			type: "Note",
 			content: "Hello world"
 		}
-	});
-	const object3 = await activity3.getObject();
+	})).getObject();
 	assertInstanceOf(object3, Note);
 	assertEquals(await object3.toJsonLd(), {
 		"@context": "https://www.w3.org/ns/activitystreams",
@@ -2782,8 +2782,7 @@ test("Activity.clone()", async () => {
 	}), TypeError, "Cannot update both summary and summaries at the same time.");
 });
 test("Question.voters", async () => {
-	const question = new Question({ voters: 123 });
-	const json = await question.toJsonLd({ format: "compact" });
+	const json = await new Question({ voters: 123 }).toJsonLd({ format: "compact" });
 	assert(typeof json === "object" && json != null);
 	assert("votersCount" in json);
 	assertEquals(json["votersCount"], 123);
@@ -2936,11 +2935,10 @@ test("Key.publicKey", async () => {
 		key_ops: ["verify"],
 		ext: true
 	};
-	const key = new CryptographicKey({ publicKey: await crypto.subtle.importKey("jwk", jwk, {
+	const jsonLd = await new CryptographicKey({ publicKey: await crypto.subtle.importKey("jwk", jwk, {
 		name: "RSASSA-PKCS1-v1_5",
 		hash: "SHA-256"
-	}, true, ["verify"]) });
-	const jsonLd = await key.toJsonLd({ contextLoader: mockDocumentLoader });
+	}, true, ["verify"]) }).toJsonLd({ contextLoader: mockDocumentLoader });
 	assertEquals(jsonLd, {
 		"@context": "https://w3id.org/security/v1",
 		publicKeyPem: "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxsRuvCkgJtflBTl4OVsm\nnt/J1mQfZasfJtN33dcZ3d1lJroxmgmMu69zjGEAwkNbMQaWNLqC4eogkJaeJ4RR\n5MHYXkL9nNilVoTkjX5BVit3puzs7XJ7WQnKQgQMI+ezn24GHsZ/v1JIo77lerX5\nk4HNwTNVt+yaZVQWaOMR3+6FwziQR6kd0VuG9/a9dgAnz2cEoORRC1i4W7IZaB1s\nZnh1WbHbevlGd72HSXll5rocPIHn8gq6xpBgpHwRphlRsgn4KHaJ6brXDIJjrnQh\nIe/YUBOGj/ImSEXhRwlFerKsoAVnZ0Hwbfa46qk44TAt8CyoPMWmpK6pt0ng4pQ2\nuwIDAQAB\n-----END PUBLIC KEY-----\n",
@@ -2997,11 +2995,32 @@ test("Place.fromJsonLd()", async () => {
 	});
 });
 test("Actor.getOutbox()", async () => {
-	const person = new Person({ outbox: new URL("https://example.com/orderedcollectionpage") });
-	const outbox = await person.getOutbox({ documentLoader: mockDocumentLoader });
+	const outbox = await new Person({ outbox: new URL("https://example.com/orderedcollectionpage") }).getOutbox({ documentLoader: mockDocumentLoader });
 	assertInstanceOf(outbox, OrderedCollectionPage);
 	assertEquals(outbox.totalItems, 1);
 });
+test("Link.fromJsonLd()", async () => {
+	const link = await Link.fromJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		"type": "Link",
+		"rel": "canonical",
+		"href": "at://did:plc:ia76kvnndjutgedggx2ibrem/app.bsky.feed.post/3lyxjjs27jkqg"
+	});
+	assertEquals(link.rel, "canonical");
+	assertEquals(link.href, new URL("at://did%3Aplc%3Aia76kvnndjutgedggx2ibrem/app.bsky.feed.post/3lyxjjs27jkqg"));
+	const link2 = await Link.fromJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		"type": "Link",
+		"href": "at://bnewbold.bsky.team/app.bsky.feed.post/3jwdwj2ctlk26"
+	});
+	assertEquals(link2.href, new URL("at://bnewbold.bsky.team/app.bsky.feed.post/3jwdwj2ctlk26"));
+	const link3 = await Link.fromJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		"type": "Link",
+		"href": "at://did:plc:ia76kvnndjutgedggx2ibrem"
+	});
+	assertEquals(link3.href, new URL("at://did%3Aplc%3Aia76kvnndjutgedggx2ibrem"));
+});
 function getAllProperties(type, types$1) {
 	const props = type.properties;
 	if (type.extends != null) props.push(...getAllProperties(types$1[type.extends], types$1));

package/dist/{vocab-Cy9XhW_T.js → vocab-C_pE4SvE.js}

@@ -2,9 +2,9 @@
       import { Temporal } from "@js-temporal/polyfill";
       import { URLPattern } from "urlpattern-polyfill";
     
-import { deno_default, getDocumentLoader } from "./docloader-BcyuO_kK.js";
-import { Object as Object$1, getTypeId } from "./actor-DgWryCk8.js";
-import { lookupWebFinger } from "./lookup-BlPHJ-Ff.js";
+import { deno_default, getDocumentLoader } from "./docloader-CchlnLWb.js";
+import { Object as Object$1, getTypeId } from "./actor-CsmPeeHG.js";
+import { lookupWebFinger } from "./lookup-CN-LpF5e.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { delay } from "@es-toolkit/es-toolkit";
@@ -49,9 +49,7 @@ const handleRegexp = /^@?((?:[-A-Za-z0-9._~!$&'()*+,;=]|%[A-Fa-f0-9]{2})+)@([^@]
 * @since 0.2.0
 */
 async function lookupObject(identifier, options = {}) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(deno_default.name, deno_default.version).startActiveSpan("activitypub.lookup_object", async (span) => {
 		try {
 			const result = await lookupObjectInternal(identifier, options);
 			if (result == null) span.setStatus({ code: SpanStatusCode.ERROR });
@@ -81,8 +79,7 @@ async function lookupObjectInternal(identifier, options = {}) {
 	}
 	let document = null;
 	if (identifier.protocol === "http:" || identifier.protocol === "https:") try {
-		const remoteDoc = await documentLoader(identifier.href);
-		document = remoteDoc.document;
+		document = (await documentLoader(identifier.href)).document;
 	} catch (error) {
 		logger.debug("Failed to fetch remote document:\n{error}", { error });
 	}
@@ -96,8 +93,7 @@ async function lookupObjectInternal(identifier, options = {}) {
 		for (const l of jrd.links) {
 			if (l.type !== "application/activity+json" && !l.type?.match(/application\/ld\+json;\s*profile="https:\/\/www.w3.org\/ns\/activitystreams"/) || l.rel !== "self") continue;
 			try {
-				const remoteDoc = await documentLoader(l.href);
-				document = remoteDoc.document;
+				document = (await documentLoader(l.href)).document;
 				break;
 			} catch (error) {
 				logger.debug("Failed to fetch remote document:\n{error}", { error });