@fedify/vocab 2.0.29-dev.2107 → 2.0.29-dev.2139

package/dist-tests/vocab.test.mjs

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { _ as PropertyValue, a as Create, b as Source, d as Note, f as Object$1, g as Place, h as Person, i as Collection, l as Hashtag, n as Announce, o as CryptographicKey, p as OrderedCollectionPage, s as Follow, t as Activity, u as Link, v as Question, x as vocab_exports } from "./vocab-C_YFgzlY.mjs";
+import { _ as PropertyValue, a as Create, b as Source, d as Note, f as Object$1, g as Place, h as Person, i as Collection, l as Hashtag, n as Announce, o as CryptographicKey, p as OrderedCollectionPage, s as Follow, t as Activity, u as Link, v as Question, x as vocab_exports } from "./vocab-CLB8P-Fw.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";
@@ -351,6 +351,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" }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.0.29-dev.2107+5ab4c99b",
+  "version": "2.0.29-dev.2139+7e5d091d",
   "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.0.29-dev.2107+5ab4c99b",
-    "@fedify/vocab-tools": "2.0.29-dev.2107+5ab4c99b",
-    "@fedify/vocab-runtime": "2.0.29-dev.2107+5ab4c99b"
+    "@fedify/vocab-tools": "2.0.29-dev.2139+7e5d091d",
+    "@fedify/webfinger": "2.0.29-dev.2139+7e5d091d",
+    "@fedify/vocab-runtime": "2.0.29-dev.2139+7e5d091d"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",

package/src/vocab.test.ts

@@ -538,6 +538,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({