@fedify/vocab 2.2.0-dev.731 → 2.2.0-dev.766

package/dist-tests/vocab.test.mjs

@@ -1,13 +1,90 @@
 import { Temporal } from "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { _ as Place, a as Create, b as Source, 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 Question, x as vocab_exports } from "./vocab-CGZuHaxe.mjs";
+import { C as QuoteRequest, E as Tombstone, S as QuoteAuthorization, T as Source, _ as OrderedCollectionPage, a as Create, b as Place, c as Endpoints, d as Hashtag, f as InteractionPolicy, g as Object$1, h as Note, i as Collection, k as vocab_exports, l as Follow, m as Link, n as Announce, o as CryptographicKey, p as InteractionRule, s as Delete, t as Activity, x as Question, y as Person } from "./vocab-DKp-OcRQ.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";
+import { configure, reset } from "@logtape/logtape";
 import { LanguageString, decodeMultibase, parseDecimal } from "@fedify/vocab-runtime";
 import { pascalCase } from "es-toolkit";
 import { areAllScalarTypes, loadSchemaFiles } from "@fedify/vocab-tools";
 //#region src/vocab.test.ts
+const NOTE_QUOTE_CONTEXT = [
+	"https://www.w3.org/ns/activitystreams",
+	"https://w3id.org/security/data-integrity/v1",
+	"https://gotosocial.org/ns",
+	{
+		Emoji: "toot:Emoji",
+		Hashtag: "as:Hashtag",
+		_misskey_quote: "misskey:_misskey_quote",
+		QuoteAuthorization: "https://w3id.org/fep/044f#QuoteAuthorization",
+		fedibird: "http://fedibird.com/ns#",
+		misskey: "https://misskey-hub.net/ns#",
+		quote: {
+			"@id": "https://w3id.org/fep/044f#quote",
+			"@type": "@id"
+		},
+		quoteAuthorization: {
+			"@id": "https://w3id.org/fep/044f#quoteAuthorization",
+			"@type": "@id"
+		},
+		quoteUri: "fedibird:quoteUri",
+		quoteUrl: "as:quoteUrl",
+		sensitive: "as:sensitive",
+		toot: "http://joinmastodon.org/ns#",
+		emojiReactions: {
+			"@id": "fedibird:emojiReactions",
+			"@type": "@id"
+		}
+	}
+];
+const QUOTE_REQUEST_CONTEXT = [
+	"https://w3id.org/identity/v1",
+	"https://www.w3.org/ns/activitystreams",
+	"https://w3id.org/security/data-integrity/v1",
+	"https://gotosocial.org/ns",
+	{
+		...NOTE_QUOTE_CONTEXT[3],
+		ChatMessage: "http://litepub.social/ns#ChatMessage",
+		QuoteRequest: "https://w3id.org/fep/044f#QuoteRequest",
+		votersCount: {
+			"@id": "toot:votersCount",
+			"@type": "http://www.w3.org/2001/XMLSchema#nonNegativeInteger"
+		}
+	}
+];
+const DELETE_QUOTE_REQUEST_CONTEXT = [
+	"https://w3id.org/identity/v1",
+	"https://www.w3.org/ns/activitystreams",
+	"https://w3id.org/security/data-integrity/v1",
+	"https://gotosocial.org/ns",
+	{
+		ChatMessage: "http://litepub.social/ns#ChatMessage",
+		Emoji: "toot:Emoji",
+		Hashtag: "as:Hashtag",
+		QuoteAuthorization: "https://w3id.org/fep/044f#QuoteAuthorization",
+		QuoteRequest: "https://w3id.org/fep/044f#QuoteRequest",
+		_misskey_quote: "misskey:_misskey_quote",
+		fedibird: "http://fedibird.com/ns#",
+		misskey: "https://misskey-hub.net/ns#",
+		quote: {
+			"@id": "https://w3id.org/fep/044f#quote",
+			"@type": "@id"
+		},
+		quoteAuthorization: {
+			"@id": "https://w3id.org/fep/044f#quoteAuthorization",
+			"@type": "@id"
+		},
+		quoteUri: "fedibird:quoteUri",
+		quoteUrl: "as:quoteUrl",
+		sensitive: "as:sensitive",
+		toot: "http://joinmastodon.org/ns#",
+		votersCount: {
+			"@id": "toot:votersCount",
+			"@type": "http://www.w3.org/2001/XMLSchema#nonNegativeInteger"
+		}
+	}
+];
 test("new Object()", () => {
 	const obj = new Object$1({
 		name: "Test",
@@ -150,26 +227,7 @@ test("Note.toJsonLd()", async () => {
 		href: new URL("https://fedify.dev/")
 	})] });
 	deepStrictEqual(await note.toJsonLd({ contextLoader: mockDocumentLoader }), {
-		"@context": [
-			"https://www.w3.org/ns/activitystreams",
-			"https://w3id.org/security/data-integrity/v1",
-			"https://gotosocial.org/ns",
-			{
-				Emoji: "toot:Emoji",
-				Hashtag: "as:Hashtag",
-				_misskey_quote: "misskey:_misskey_quote",
-				fedibird: "http://fedibird.com/ns#",
-				misskey: "https://misskey-hub.net/ns#",
-				quoteUri: "fedibird:quoteUri",
-				quoteUrl: "as:quoteUrl",
-				sensitive: "as:sensitive",
-				toot: "http://joinmastodon.org/ns#",
-				emojiReactions: {
-					"@id": "fedibird:emojiReactions",
-					"@type": "@id"
-				}
-			}
-		],
+		"@context": NOTE_QUOTE_CONTEXT,
 		tag: {
 			"@context": ["https://www.w3.org/ns/activitystreams", { Hashtag: "as:Hashtag" }],
 			href: "https://fedify.dev/",
@@ -427,6 +485,96 @@ test("Person.toJsonLd()", async () => {
 		type: "Person"
 	});
 });
+test("Tombstone.toJsonLd() serializes formerType", async () => {
+	const deleted = Temporal.Instant.from("2024-01-15T00:00:00Z");
+	const tombstone = new Tombstone({
+		id: new URL("https://example.com/users/alice"),
+		formerType: Person,
+		deleted
+	});
+	deepStrictEqual(await tombstone.toJsonLd({ contextLoader: mockDocumentLoader }), {
+		"@context": [
+			"https://www.w3.org/ns/activitystreams",
+			"https://w3id.org/security/data-integrity/v1",
+			"https://gotosocial.org/ns"
+		],
+		id: "https://example.com/users/alice",
+		type: "Tombstone",
+		formerType: "as:Person",
+		deleted: "2024-01-15T00:00:00Z"
+	});
+	deepStrictEqual(await tombstone.toJsonLd({
+		format: "expand",
+		contextLoader: mockDocumentLoader
+	}), [{
+		"@id": "https://example.com/users/alice",
+		"@type": ["https://www.w3.org/ns/activitystreams#Tombstone"],
+		"https://www.w3.org/ns/activitystreams#formerType": [{ "@id": "https://www.w3.org/ns/activitystreams#Person" }],
+		"https://www.w3.org/ns/activitystreams#deleted": [{
+			"@type": "http://www.w3.org/2001/XMLSchema#dateTime",
+			"@value": "2024-01-15T00:00:00Z"
+		}]
+	}]);
+});
+test("Tombstone.fromJsonLd() restores formerType", async () => {
+	const tombstone = await Tombstone.fromJsonLd({
+		"@context": [
+			"https://www.w3.org/ns/activitystreams",
+			"https://w3id.org/security/data-integrity/v1",
+			"https://gotosocial.org/ns"
+		],
+		id: "https://example.com/users/alice",
+		type: "Tombstone",
+		formerType: "as:Person",
+		deleted: "2024-01-15T00:00:00Z"
+	}, { contextLoader: mockDocumentLoader });
+	deepStrictEqual(tombstone.formerType, Person);
+	deepStrictEqual(tombstone.formerTypes, [Person]);
+	deepStrictEqual(tombstone.deleted, Temporal.Instant.from("2024-01-15T00:00:00Z"));
+});
+test("Tombstone.fromJsonLd() ignores unknown formerType values", async () => {
+	const records = [];
+	await reset();
+	try {
+		await configure({
+			sinks: { buffer(record) {
+				records.push(record);
+			} },
+			filters: {},
+			loggers: [{
+				category: [],
+				sinks: ["buffer"]
+			}]
+		});
+		const tombstone = await Tombstone.fromJsonLd({
+			"@id": "https://example.com/users/alice",
+			"@type": ["https://www.w3.org/ns/activitystreams#Tombstone"],
+			"https://www.w3.org/ns/activitystreams#formerType": [{ "@id": "https://example.com/ns#Widget" }],
+			"https://www.w3.org/ns/activitystreams#deleted": [{
+				"@type": "http://www.w3.org/2001/XMLSchema#dateTime",
+				"@value": "2024-01-15T00:00:00Z"
+			}]
+		});
+		deepStrictEqual(tombstone.formerTypes, []);
+		deepStrictEqual(tombstone.deleted, Temporal.Instant.from("2024-01-15T00:00:00Z"));
+		deepStrictEqual(records.some((record) => record.rawMessage === "Ignoring unknown vocabulary entity type reference: {typeId}" && record.properties.typeId === "https://example.com/ns#Widget"), true);
+	} finally {
+		await reset();
+	}
+});
+test("Tombstone.fromJsonLd() ignores malformed formerType values", async () => {
+	const tombstone = await Tombstone.fromJsonLd({
+		"@id": "https://example.com/users/alice",
+		"@type": ["https://www.w3.org/ns/activitystreams#Tombstone"],
+		"https://www.w3.org/ns/activitystreams#formerType": [{ "@value": "Widget" }],
+		"https://www.w3.org/ns/activitystreams#deleted": [{
+			"@type": "http://www.w3.org/2001/XMLSchema#dateTime",
+			"@value": "2024-01-15T00:00:00Z"
+		}]
+	});
+	deepStrictEqual(tombstone.formerTypes, []);
+	deepStrictEqual(tombstone.deleted, Temporal.Instant.from("2024-01-15T00:00:00Z"));
+});
 test("Endpoints.toJsonLd() omits type", async () => {
 	const ep = new Endpoints({ sharedInbox: new URL("https://example.com/inbox") });
 	const compact = await ep.toJsonLd();
@@ -675,26 +823,7 @@ test("Collection.fromJsonLd()", async () => {
 test("Note.quoteUrl", async () => {
 	const note = new Note({ quoteUrl: new URL("https://example.com/object") });
 	const expected = {
-		"@context": [
-			"https://www.w3.org/ns/activitystreams",
-			"https://w3id.org/security/data-integrity/v1",
-			"https://gotosocial.org/ns",
-			{
-				Emoji: "toot:Emoji",
-				Hashtag: "as:Hashtag",
-				_misskey_quote: "misskey:_misskey_quote",
-				fedibird: "http://fedibird.com/ns#",
-				misskey: "https://misskey-hub.net/ns#",
-				quoteUri: "fedibird:quoteUri",
-				quoteUrl: "as:quoteUrl",
-				sensitive: "as:sensitive",
-				toot: "http://joinmastodon.org/ns#",
-				emojiReactions: {
-					"@id": "fedibird:emojiReactions",
-					"@type": "@id"
-				}
-			}
-		],
+		"@context": NOTE_QUOTE_CONTEXT,
 		_misskey_quote: "https://example.com/object",
 		quoteUri: "https://example.com/object",
 		quoteUrl: "https://example.com/object",
@@ -721,6 +850,190 @@ test("Note.quoteUrl", async () => {
 	delete jsonLd._misskey_quote;
 	deepStrictEqual((await Note.fromJsonLd(jsonLd)).quoteUrl, new URL("https://example.com/object3"));
 });
+test("Note.quote", async () => {
+	const note = new Note({ quote: new URL("https://example.com/object") });
+	const expected = {
+		"@context": NOTE_QUOTE_CONTEXT,
+		quote: "https://example.com/object",
+		type: "Note"
+	};
+	deepStrictEqual(await note.toJsonLd(), expected);
+	deepStrictEqual(await note.toJsonLd({ format: "compact" }), expected);
+	deepStrictEqual((await Note.fromJsonLd({
+		"@context": ["https://www.w3.org/ns/activitystreams", { quote: {
+			"@id": "https://w3id.org/fep/044f#quote",
+			"@type": "@id"
+		} }],
+		type: "Note",
+		quote: "https://example.com/object"
+	})).quoteId, new URL("https://example.com/object"));
+});
+test("Note.quoteAuthorization", async () => {
+	const note = new Note({ quoteAuthorization: new URL("https://example.com/authorizations/1") });
+	const expected = {
+		"@context": NOTE_QUOTE_CONTEXT,
+		quoteAuthorization: "https://example.com/authorizations/1",
+		type: "Note"
+	};
+	deepStrictEqual(await note.toJsonLd(), expected);
+	deepStrictEqual(await note.toJsonLd({ format: "compact" }), expected);
+	deepStrictEqual((await Note.fromJsonLd({
+		"@context": ["https://www.w3.org/ns/activitystreams", {
+			QuoteAuthorization: "https://w3id.org/fep/044f#QuoteAuthorization",
+			quoteAuthorization: {
+				"@id": "https://w3id.org/fep/044f#quoteAuthorization",
+				"@type": "@id"
+			}
+		}],
+		type: "Note",
+		quoteAuthorization: "https://example.com/authorizations/1"
+	})).quoteAuthorizationId, new URL("https://example.com/authorizations/1"));
+	deepStrictEqual((await Note.fromJsonLd({
+		"@context": ["https://www.w3.org/ns/activitystreams", "https://gotosocial.org/ns"],
+		type: "Note",
+		quoteAuthorization: "https://example.com/authorizations/2"
+	}, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	})).quoteAuthorizationId, new URL("https://example.com/authorizations/2"));
+});
+test("InteractionPolicy.canQuote", async () => {
+	const note = new Note({ interactionPolicy: new InteractionPolicy({ canQuote: new InteractionRule({ automaticApproval: new URL("https://www.w3.org/ns/activitystreams#Public") }) }) });
+	const expected = {
+		"@context": NOTE_QUOTE_CONTEXT,
+		interactionPolicy: { canQuote: { automaticApproval: "as:Public" } },
+		type: "Note"
+	};
+	deepStrictEqual(await note.toJsonLd({ contextLoader: mockDocumentLoader }), expected);
+	deepStrictEqual(await (await Note.fromJsonLd(expected, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	})).toJsonLd({ contextLoader: mockDocumentLoader }), expected);
+});
+test("QuoteAuthorization.fromJsonLd()", async () => {
+	const jsonLd = {
+		"@context": [
+			"https://www.w3.org/ns/activitystreams",
+			"https://w3id.org/security/data-integrity/v1",
+			"https://gotosocial.org/ns",
+			{ QuoteAuthorization: "https://w3id.org/fep/044f#QuoteAuthorization" }
+		],
+		type: "QuoteAuthorization",
+		id: "https://example.com/users/alice/stamps/1",
+		attributedTo: "https://example.com/users/alice",
+		interactingObject: "https://example.com/users/bob/statuses/1",
+		interactionTarget: "https://example.com/users/alice/statuses/1"
+	};
+	const authorization = await QuoteAuthorization.fromJsonLd(jsonLd, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	assertInstanceOf(authorization, QuoteAuthorization);
+	deepStrictEqual(await authorization.toJsonLd({ contextLoader: mockDocumentLoader }), jsonLd);
+	const loadedFromGoToSocialContext = await QuoteAuthorization.fromJsonLd({
+		"@context": ["https://www.w3.org/ns/activitystreams", "https://gotosocial.org/ns"],
+		type: "QuoteAuthorization",
+		id: "https://example.com/users/alice/stamps/2",
+		attributedTo: "https://example.com/users/alice",
+		interactingObject: "https://example.com/users/bob/statuses/2",
+		interactionTarget: "https://example.com/users/alice/statuses/2"
+	}, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	assertInstanceOf(loadedFromGoToSocialContext, QuoteAuthorization);
+	deepStrictEqual(loadedFromGoToSocialContext.id, new URL("https://example.com/users/alice/stamps/2"));
+});
+test("QuoteRequest.toJsonLd()", async () => {
+	const request = new QuoteRequest({
+		object: new URL("https://example.com/users/alice/statuses/1"),
+		instrument: new Note({
+			id: new URL("https://example.com/users/bob/statuses/1"),
+			content: "I am quoting alice's post",
+			quote: new URL("https://example.com/users/alice/statuses/1")
+		})
+	});
+	const expected = {
+		"@context": QUOTE_REQUEST_CONTEXT,
+		type: "QuoteRequest",
+		object: "https://example.com/users/alice/statuses/1",
+		instrument: {
+			type: "Note",
+			id: "https://example.com/users/bob/statuses/1",
+			content: "I am quoting alice's post",
+			quote: "https://example.com/users/alice/statuses/1"
+		}
+	};
+	deepStrictEqual(await request.toJsonLd({ contextLoader: mockDocumentLoader }), expected);
+	const loaded = await QuoteRequest.fromJsonLd(expected, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	assertInstanceOf(loaded, QuoteRequest);
+	deepStrictEqual(await loaded.toJsonLd({ contextLoader: mockDocumentLoader }), expected);
+	const loadedFromGoToSocialContext = await QuoteRequest.fromJsonLd({
+		"@context": ["https://www.w3.org/ns/activitystreams", "https://gotosocial.org/ns"],
+		type: "QuoteRequest",
+		object: "https://example.com/users/alice/statuses/3"
+	}, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	assertInstanceOf(loadedFromGoToSocialContext, QuoteRequest);
+	deepStrictEqual(loadedFromGoToSocialContext.objectId, new URL("https://example.com/users/alice/statuses/3"));
+});
+test("Collection.toJsonLd() compacts embedded QuoteRequest", async () => {
+	deepStrictEqual(await new Collection({ items: [new QuoteRequest({ object: new URL("https://example.com/users/alice/statuses/1") })] }).toJsonLd({ contextLoader: mockDocumentLoader }), {
+		"@context": [
+			"https://www.w3.org/ns/activitystreams",
+			"https://w3id.org/security/data-integrity/v1",
+			"https://gotosocial.org/ns",
+			{
+				ChatMessage: "http://litepub.social/ns#ChatMessage",
+				Emoji: "toot:Emoji",
+				Hashtag: "as:Hashtag",
+				QuoteAuthorization: "https://w3id.org/fep/044f#QuoteAuthorization",
+				QuoteRequest: "https://w3id.org/fep/044f#QuoteRequest",
+				_misskey_quote: "misskey:_misskey_quote",
+				fedibird: "http://fedibird.com/ns#",
+				misskey: "https://misskey-hub.net/ns#",
+				quote: {
+					"@id": "https://w3id.org/fep/044f#quote",
+					"@type": "@id"
+				},
+				quoteAuthorization: {
+					"@id": "https://w3id.org/fep/044f#quoteAuthorization",
+					"@type": "@id"
+				},
+				quoteUri: "fedibird:quoteUri",
+				quoteUrl: "as:quoteUrl",
+				sensitive: "as:sensitive",
+				toot: "http://joinmastodon.org/ns#",
+				votersCount: "toot:votersCount",
+				emojiReactions: {
+					"@id": "fedibird:emojiReactions",
+					"@type": "@id"
+				}
+			}
+		],
+		items: {
+			"@context": QUOTE_REQUEST_CONTEXT,
+			object: "https://example.com/users/alice/statuses/1",
+			type: "QuoteRequest"
+		},
+		type: "Collection"
+	});
+});
+test("Delete.toJsonLd() compacts embedded QuoteRequest", async () => {
+	deepStrictEqual(await new Delete({ object: new QuoteRequest({ object: new URL("https://example.com/users/alice/statuses/1") }) }).toJsonLd({ contextLoader: mockDocumentLoader }), {
+		"@context": DELETE_QUOTE_REQUEST_CONTEXT,
+		object: {
+			object: "https://example.com/users/alice/statuses/1",
+			type: "QuoteRequest"
+		},
+		type: "Delete"
+	});
+});
 test("Key.publicKey", async () => {
 	const jwk = {
 		kty: "RSA",
@@ -1300,7 +1613,8 @@ const sampleValues = {
 	"fedify:publicKey": rsaPublicKey.publicKey,
 	"fedify:multibaseKey": ed25519PublicKey.publicKey,
 	"fedify:proofPurpose": "assertionMethod",
-	"fedify:units": "m"
+	"fedify:units": "m",
+	"fedify:vocabEntityType": Person
 };
 const types = navigator?.userAgent === "Cloudflare-Workers" ? {} : await loadSchemaFiles(import.meta.dirname);
 for (const typeUri in types) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.2.0-dev.731+3d1ca85e",
+  "version": "2.2.0-dev.766+e04e54aa",
   "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/vocab-tools": "2.2.0-dev.731+3d1ca85e",
-    "@fedify/webfinger": "2.2.0-dev.731+3d1ca85e",
-    "@fedify/vocab-runtime": "2.2.0-dev.731+3d1ca85e"
+    "@fedify/vocab-tools": "2.2.0-dev.766+e04e54aa",
+    "@fedify/webfinger": "2.2.0-dev.766+e04e54aa",
+    "@fedify/vocab-runtime": "2.2.0-dev.766+e04e54aa"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",