@fedify/vocab 2.1.23 → 2.1.25

package/dist-tests/vocab.test.mjs

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { S as vocab_exports, _ as Place, a as Create, c as Follow, d as Link, f as Note, g as Person, i as Collection, m as OrderedCollectionPage, n as Announce, o as CryptographicKey, p as Object$1, s as Endpoints, t as Activity, u as Hashtag, v as PropertyValue, x as Source, y as Question } from "./vocab-VQZhfXow.mjs";
+import { S as vocab_exports, _ as Place, a as Create, c as Follow, d as Link, f as Note, g as Person, i as Collection, m as OrderedCollectionPage, n as Announce, o as CryptographicKey, p as Object$1, s as Endpoints, t as Activity, u as Hashtag, v as PropertyValue, x as Source, y as Question } from "./vocab-CyEe0PZp.mjs";
 import { t as assertInstanceOf } from "./utils-CE8Dk5hm.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { deepStrictEqual, notDeepStrictEqual, ok, rejects, throws } from "node:assert/strict";
@@ -354,6 +354,72 @@ test({
 		deepStrictEqual(objects2[0].name, "Second object");
 	}
 });
+function embeddedPropertyDocument(property) {
+	const context = "https://www.w3.org/ns/activitystreams";
+	return {
+		"@context": [context, { CustomImage: `${context}#Image` }],
+		type: property === "attachment" ? "Note" : "Create",
+		[property]: [
+			{
+				"@context": [context, { "@vocab": "https://example.com/" }],
+				type: "CustomImage",
+				name: "Malformed when reparsed"
+			},
+			{
+				"@context": context,
+				type: "Image",
+				name: "Cached image"
+			},
+			{
+				type: "Image",
+				name: "Decoded image"
+			}
+		]
+	};
+}
+for (const suppressError of [
+	void 0,
+	false,
+	true
+]) {
+	test(`Note.getAttachments() cached parse failure (suppressError: ${suppressError})`, async () => {
+		const jsonLd = embeddedPropertyDocument("attachment");
+		const note = await Note.fromJsonLd(jsonLd);
+		if (suppressError) {
+			for (let i = 0; i < 2; i++) deepStrictEqual((await Array.fromAsync(note.getAttachments({ suppressError }))).map((attachment) => attachment.name), ["Cached image", "Decoded image"]);
+			await rejects(() => Array.fromAsync(note.getAttachments()), TypeError);
+		} else await rejects(() => Array.fromAsync(note.getAttachments({ suppressError })), TypeError);
+		deepStrictEqual(await note.toJsonLd(), jsonLd);
+	});
+	test(`Activity.getObject() cached parse failure (suppressError: ${suppressError})`, async () => {
+		const jsonLd = embeddedPropertyDocument("object");
+		const activity = await Activity.fromJsonLd(jsonLd);
+		if (suppressError) {
+			deepStrictEqual(await activity.getObject({ suppressError }), null);
+			deepStrictEqual(await activity.getObject({ suppressError }), null);
+			await rejects(() => activity.getObject(), TypeError);
+		} else await rejects(() => activity.getObject({ suppressError }), TypeError);
+		deepStrictEqual(await activity.toJsonLd(), jsonLd);
+	});
+}
+test("Note.getAttachments() suppresses cached context loader failures", async () => {
+	const note = await Note.fromJsonLd(embeddedPropertyDocument("attachment"));
+	const contextLoader = () => Promise.reject(/* @__PURE__ */ new Error("Context loader failed"));
+	await rejects(() => Array.fromAsync(note.getAttachments({ contextLoader })), (error) => error instanceof Error && !(error instanceof TypeError));
+	deepStrictEqual((await Array.fromAsync(note.getAttachments({
+		contextLoader,
+		suppressError: true
+	}))).map((attachment) => attachment.name), ["Decoded image"]);
+});
+test("Activity.getObject() suppresses cached context loader failures", async () => {
+	const activity = await Activity.fromJsonLd(embeddedPropertyDocument("object"));
+	const contextLoader = () => Promise.reject(/* @__PURE__ */ new Error("Context loader failed"));
+	await rejects(() => activity.getObject({ contextLoader }), (error) => error instanceof Error && !(error instanceof TypeError));
+	deepStrictEqual(await activity.getObject({
+		contextLoader,
+		suppressError: true
+	}), null);
+});
 test("Activity.clone()", async () => {
 	const activity = new Activity({
 		actor: new Person({ name: "John Doe" }),
@@ -767,6 +833,83 @@ test("Note.quoteUrl", async () => {
 	delete jsonLd._misskey_quote;
 	deepStrictEqual((await Note.fromJsonLd(jsonLd)).quoteUrl, new URL("https://example.com/object3"));
 });
+test("Note.quoteUrl (IRI-typed alias terms)", async () => {
+	const jsonLd = {
+		"@context": ["https://www.w3.org/ns/activitystreams", {
+			fedibird: "http://fedibird.com/ns#",
+			misskey: "https://misskey-hub.net/ns#",
+			_misskey_quote: {
+				"@id": "misskey:_misskey_quote",
+				"@type": "@id"
+			},
+			quoteUri: {
+				"@id": "fedibird:quoteUri",
+				"@type": "@id"
+			}
+		}],
+		id: "https://example.com/notes/1",
+		type: "Note",
+		_misskey_quote: "https://example.com/notes/quoted",
+		quoteUri: "https://example.com/notes/quoted2"
+	};
+	deepStrictEqual((await Note.fromJsonLd(jsonLd)).quoteUrl, new URL("https://example.com/notes/quoted"));
+	delete jsonLd._misskey_quote;
+	deepStrictEqual((await Note.fromJsonLd(jsonLd)).quoteUrl, new URL("https://example.com/notes/quoted2"));
+});
+test("Note.quoteUrl (IRI-typed primary term)", async () => {
+	const context = ["https://www.w3.org/ns/activitystreams", {
+		misskey: "https://misskey-hub.net/ns#",
+		quoteUrl: {
+			"@id": "as:quoteUrl",
+			"@type": "@id"
+		},
+		_misskey_quote: "misskey:_misskey_quote"
+	}];
+	deepStrictEqual((await Note.fromJsonLd({
+		"@context": context,
+		type: "Note",
+		quoteUrl: "https://example.com/object"
+	})).quoteUrl, new URL("https://example.com/object"));
+	deepStrictEqual((await Note.fromJsonLd({
+		"@context": context,
+		type: "Note",
+		quoteUrl: "https://example.com/object",
+		_misskey_quote: "https://example.com/object2"
+	})).quoteUrl, new URL("https://example.com/object"));
+});
+test("Note.quoteUrl (unparsable IRI-valued terms)", async () => {
+	const context = ["https://www.w3.org/ns/activitystreams", {
+		misskey: "https://misskey-hub.net/ns#",
+		_misskey_quote: {
+			"@id": "misskey:_misskey_quote",
+			"@type": "@id"
+		}
+	}];
+	for (const quote of [
+		{
+			type: "Note",
+			content: "An inlined quote without an id"
+		},
+		"_:b0",
+		"",
+		"notes/relative"
+	]) {
+		const loaded = await Note.fromJsonLd({
+			"@context": context,
+			id: "https://example.com/notes/1",
+			type: "Note",
+			content: "Hello",
+			_misskey_quote: quote
+		});
+		deepStrictEqual(loaded.quoteUrl, null, JSON.stringify(quote));
+		deepStrictEqual(loaded.content, "Hello");
+	}
+	deepStrictEqual((await Note.fromJsonLd({
+		"@context": context,
+		type: "Note",
+		_misskey_quote: "at://did:plc:abc/app.bsky.feed.post/xyz"
+	})).quoteUrl, new URL("at://" + encodeURIComponent("did:plc:abc/app.bsky.feed.post/xyz")));
+});
 test("Key.publicKey", async () => {
 	const jwk = {
 		kty: "RSA",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.1.23",
+  "version": "2.1.25",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -46,9 +46,9 @@
     "es-toolkit": "1.43.0",
     "jsonld": "^9.0.0",
     "pkijs": "^3.3.3",
-    "@fedify/webfinger": "2.1.23",
-    "@fedify/vocab-runtime": "2.1.23",
-    "@fedify/vocab-tools": "2.1.23"
+    "@fedify/webfinger": "2.1.25",
+    "@fedify/vocab-tools": "2.1.25",
+    "@fedify/vocab-runtime": "2.1.25"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",

package/src/actor.test.ts

@@ -99,45 +99,46 @@ test({
   async fn(t) {
     fetchMock.spyGlobal();
 
+    // Node validates addresses before fetch; public IP literals avoid DNS.
     fetchMock.get(
-      "begin:https://foo.example.com/.well-known/webfinger?",
+      "begin:https://1.1.1.1/.well-known/webfinger?",
       {
-        body: { subject: "acct:johndoe@foo.example.com" },
+        body: { subject: "acct:johndoe@1.1.1.1" },
         headers: { "Content-Type": "application/jrd+json" },
       },
     );
 
-    const actorId = new URL("https://foo.example.com/@john");
+    const actorId = new URL("https://1.1.1.1/@john");
     const actor = new Person({
       id: actorId,
       preferredUsername: "john",
     });
 
     await t.step("WebFinger subject", async () => {
-      deepStrictEqual(await getActorHandle(actor), "@johndoe@foo.example.com");
+      deepStrictEqual(await getActorHandle(actor), "@johndoe@1.1.1.1");
       deepStrictEqual(
         await getActorHandle(actor, { trimLeadingAt: true }),
-        "johndoe@foo.example.com",
+        "johndoe@1.1.1.1",
       );
       deepStrictEqual(
         await getActorHandle(actorId),
-        "@johndoe@foo.example.com",
+        "@johndoe@1.1.1.1",
       );
       deepStrictEqual(
         await getActorHandle(actorId, { trimLeadingAt: true }),
-        "johndoe@foo.example.com",
+        "johndoe@1.1.1.1",
       );
     });
 
     fetchMock.removeRoutes();
     fetchMock.get(
-      "begin:https://foo.example.com/.well-known/webfinger?",
+      "begin:https://1.1.1.1/.well-known/webfinger?",
       {
         body: {
-          subject: "https://foo.example.com/@john",
+          subject: "https://1.1.1.1/@john",
           aliases: [
-            "acct:john@bar.example.com",
-            "acct:johndoe@foo.example.com",
+            "acct:john@8.8.8.8",
+            "acct:johndoe@1.1.1.1",
           ],
         },
         headers: { "Content-Type": "application/jrd+json" },
@@ -145,28 +146,28 @@ test({
     );
 
     await t.step("WebFinger aliases", async () => {
-      deepStrictEqual(await getActorHandle(actor), "@johndoe@foo.example.com");
+      deepStrictEqual(await getActorHandle(actor), "@johndoe@1.1.1.1");
       deepStrictEqual(
         await getActorHandle(actor, { trimLeadingAt: true }),
-        "johndoe@foo.example.com",
+        "johndoe@1.1.1.1",
       );
       deepStrictEqual(
         await getActorHandle(actorId),
-        "@johndoe@foo.example.com",
+        "@johndoe@1.1.1.1",
       );
       deepStrictEqual(
         await getActorHandle(actorId, { trimLeadingAt: true }),
-        "johndoe@foo.example.com",
+        "johndoe@1.1.1.1",
       );
     });
 
     fetchMock.get(
-      "begin:https://bar.example.com/.well-known/webfinger?",
+      "begin:https://8.8.8.8/.well-known/webfinger?",
       {
         body: {
-          subject: "acct:john@bar.example.com",
+          subject: "acct:john@8.8.8.8",
           aliases: [
-            "https://foo.example.com/@john",
+            "https://1.1.1.1/@john",
           ],
         },
         headers: { "Content-Type": "application/jrd+json" },
@@ -174,18 +175,18 @@ test({
     );
 
     await t.step("cross-origin WebFinger resources", async () => {
-      deepStrictEqual(await getActorHandle(actor), "@john@bar.example.com");
+      deepStrictEqual(await getActorHandle(actor), "@john@8.8.8.8");
     });
 
     fetchMock.removeRoutes();
     fetchMock.get(
-      "begin:https://foo.example.com/.well-known/webfinger?",
+      "begin:https://1.1.1.1/.well-known/webfinger?",
       { status: 404 },
     );
 
     await t.step("no WebFinger", async () => {
-      deepStrictEqual(await getActorHandle(actor), "@john@foo.example.com");
-      rejects(() => getActorHandle(actorId), TypeError);
+      deepStrictEqual(await getActorHandle(actor), "@john@1.1.1.1");
+      await rejects(() => getActorHandle(actorId), TypeError);
     });
 
     fetchMock.hardReset();

package/src/lookup.test.ts

@@ -79,7 +79,8 @@ test("lookupObject()", {
     );
   });
 
-  fetchMock.removeRoutes();
+  // Workers load fixtures through fetch(), so keep the spy fallback between steps.
+  fetchMock.removeRoutes({ includeFallback: false });
   fetchMock.get("begin:https://example.com/.well-known/webfinger", {
     subject: "acct:janedoe@example.com",
     links: [
@@ -99,7 +100,7 @@ test("lookupObject()", {
     );
   });
 
-  fetchMock.removeRoutes();
+  fetchMock.removeRoutes({ includeFallback: false });
   fetchMock.get(
     "begin:https://example.com/.well-known/webfinger",
     () =>
@@ -130,7 +131,7 @@ test("lookupObject()", {
     deepStrictEqual(await promise, null);
   });
 
-  fetchMock.removeRoutes();
+  fetchMock.removeRoutes({ includeFallback: false });
   fetchMock.get(
     "begin:https://example.com/.well-known/webfinger",
     {
@@ -155,7 +156,7 @@ test("lookupObject()", {
     deepStrictEqual(person.id, new URL("https://example.com/person"));
   });
 
-  fetchMock.removeRoutes();
+  fetchMock.removeRoutes({ includeFallback: false });
   fetchMock.get(
     "begin:https://example.com/.well-known/webfinger",
     () =>
@@ -186,7 +187,7 @@ test("lookupObject()", {
     deepStrictEqual(result, null);
   });
 
-  fetchMock.removeRoutes();
+  fetchMock.removeRoutes({ includeFallback: false });
   fetchMock.get(
     "https://example.com/slow-object",
     () =>

package/src/vocab.test.ts

@@ -542,6 +542,104 @@ test({
   },
 });
 
+// The alias is inherited during initial expansion, but is unavailable when
+// an embedded value is reparsed standalone from the cached JSON-LD.
+function embeddedPropertyDocument(property: "attachment" | "object") {
+  const context = "https://www.w3.org/ns/activitystreams";
+  return {
+    "@context": [context, { CustomImage: `${context}#Image` }],
+    type: property === "attachment" ? "Note" : "Create",
+    [property]: [
+      {
+        "@context": [context, { "@vocab": "https://example.com/" }],
+        type: "CustomImage",
+        name: "Malformed when reparsed",
+      },
+      { "@context": context, type: "Image", name: "Cached image" },
+      { type: "Image", name: "Decoded image" },
+    ],
+  };
+}
+
+for (const suppressError of [undefined, false, true]) {
+  test(
+    `Note.getAttachments() cached parse failure (suppressError: ${suppressError})`,
+    async () => {
+      const jsonLd = embeddedPropertyDocument("attachment");
+      const note = await Note.fromJsonLd(jsonLd);
+      if (suppressError) {
+        for (let i = 0; i < 2; i++) {
+          const attachments: (Object | Link | PropertyValue)[] = await Array
+            .fromAsync(
+              note.getAttachments({ suppressError }),
+            );
+          deepStrictEqual(
+            attachments.map((attachment) => attachment.name),
+            ["Cached image", "Decoded image"],
+          );
+        }
+        // Suppression must not remove or replace the cached malformed value.
+        await rejects(() => Array.fromAsync(note.getAttachments()), TypeError);
+      } else {
+        await rejects(
+          () => Array.fromAsync(note.getAttachments({ suppressError })),
+          TypeError,
+        );
+      }
+      deepStrictEqual(await note.toJsonLd(), jsonLd);
+    },
+  );
+
+  test(
+    `Activity.getObject() cached parse failure (suppressError: ${suppressError})`,
+    async () => {
+      const jsonLd = embeddedPropertyDocument("object");
+      const activity = await Activity.fromJsonLd(jsonLd);
+      if (suppressError) {
+        deepStrictEqual(await activity.getObject({ suppressError }), null);
+        deepStrictEqual(await activity.getObject({ suppressError }), null);
+        await rejects(() => activity.getObject(), TypeError);
+      } else {
+        await rejects(() => activity.getObject({ suppressError }), TypeError);
+      }
+      deepStrictEqual(await activity.toJsonLd(), jsonLd);
+    },
+  );
+}
+
+test("Note.getAttachments() suppresses cached context loader failures", async () => {
+  const note = await Note.fromJsonLd(embeddedPropertyDocument("attachment"));
+  const contextLoader = () =>
+    Promise.reject(new Error("Context loader failed"));
+  await rejects(
+    () => Array.fromAsync(note.getAttachments({ contextLoader })),
+    (error: unknown) => error instanceof Error && !(error instanceof TypeError),
+  );
+  // Both cached values need the failing loader; the decoded value remains usable.
+  const attachments: (Object | Link | PropertyValue)[] = await Array.fromAsync(
+    note.getAttachments({ contextLoader, suppressError: true }),
+  );
+  deepStrictEqual(attachments.map((attachment) => attachment.name), [
+    "Decoded image",
+  ]);
+});
+
+test("Activity.getObject() suppresses cached context loader failures", async () => {
+  const activity = await Activity.fromJsonLd(
+    embeddedPropertyDocument("object"),
+  );
+  const contextLoader = () =>
+    Promise.reject(new Error("Context loader failed"));
+  await rejects(
+    () => activity.getObject({ contextLoader }),
+    (error: unknown) => error instanceof Error && !(error instanceof TypeError),
+  );
+  deepStrictEqual(
+    await activity.getObject({ contextLoader, suppressError: true }),
+    null,
+  );
+});
+
 test("Activity.clone()", async () => {
   const activity = new Activity({
     actor: new Person({
@@ -1197,6 +1295,105 @@ test("Note.quoteUrl", async () => {
   deepStrictEqual(loaded3.quoteUrl, new URL("https://example.com/object3"));
 });
 
+test("Note.quoteUrl (IRI-typed alias terms)", async () => {
+  const jsonLd: Record<string, unknown> = {
+    "@context": [
+      "https://www.w3.org/ns/activitystreams",
+      {
+        fedibird: "http://fedibird.com/ns#",
+        misskey: "https://misskey-hub.net/ns#",
+        _misskey_quote: {
+          "@id": "misskey:_misskey_quote",
+          "@type": "@id",
+        },
+        quoteUri: {
+          "@id": "fedibird:quoteUri",
+          "@type": "@id",
+        },
+      },
+    ],
+    id: "https://example.com/notes/1",
+    type: "Note",
+    _misskey_quote: "https://example.com/notes/quoted",
+    quoteUri: "https://example.com/notes/quoted2",
+  };
+
+  const loaded = await Note.fromJsonLd(jsonLd);
+  deepStrictEqual(loaded.quoteUrl, new URL("https://example.com/notes/quoted"));
+
+  delete jsonLd._misskey_quote;
+  const loaded2 = await Note.fromJsonLd(jsonLd);
+  deepStrictEqual(
+    loaded2.quoteUrl,
+    new URL("https://example.com/notes/quoted2"),
+  );
+});
+
+test("Note.quoteUrl (IRI-typed primary term)", async () => {
+  const context = [
+    "https://www.w3.org/ns/activitystreams",
+    {
+      misskey: "https://misskey-hub.net/ns#",
+      quoteUrl: { "@id": "as:quoteUrl", "@type": "@id" },
+      _misskey_quote: "misskey:_misskey_quote",
+    },
+  ];
+
+  const loaded = await Note.fromJsonLd({
+    "@context": context,
+    type: "Note",
+    quoteUrl: "https://example.com/object",
+  });
+  deepStrictEqual(loaded.quoteUrl, new URL("https://example.com/object"));
+
+  // An IRI-valued quoteUrl still takes precedence over a plain-string alias:
+  const loaded2 = await Note.fromJsonLd({
+    "@context": context,
+    type: "Note",
+    quoteUrl: "https://example.com/object",
+    _misskey_quote: "https://example.com/object2",
+  });
+  deepStrictEqual(loaded2.quoteUrl, new URL("https://example.com/object"));
+});
+
+test("Note.quoteUrl (unparsable IRI-valued terms)", async () => {
+  const context = [
+    "https://www.w3.org/ns/activitystreams",
+    {
+      misskey: "https://misskey-hub.net/ns#",
+      _misskey_quote: { "@id": "misskey:_misskey_quote", "@type": "@id" },
+    },
+  ];
+  for (
+    const quote of [
+      { type: "Note", content: "An inlined quote without an id" },
+      "_:b0",
+      "",
+      "notes/relative",
+    ]
+  ) {
+    const loaded = await Note.fromJsonLd({
+      "@context": context,
+      id: "https://example.com/notes/1",
+      type: "Note",
+      content: "Hello",
+      _misskey_quote: quote,
+    });
+    deepStrictEqual(loaded.quoteUrl, null, JSON.stringify(quote));
+    deepStrictEqual(loaded.content, "Hello");
+  }
+
+  const atUri = await Note.fromJsonLd({
+    "@context": context,
+    type: "Note",
+    _misskey_quote: "at://did:plc:abc/app.bsky.feed.post/xyz",
+  });
+  deepStrictEqual(
+    atUri.quoteUrl,
+    new URL("at://" + encodeURIComponent("did:plc:abc/app.bsky.feed.post/xyz")),
+  );
+});
+
 test("Key.publicKey", async () => {
   const jwk = {
     kty: "RSA",