@fedify/vocab 2.1.0-dev.405 → 2.1.0-dev.408

package/dist/vocab.test.js

@@ -2,7 +2,7 @@
       import { Temporal } from "@js-temporal/polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, Announce, Collection, Create, CryptographicKey, Follow, Hashtag, Link, Note, Object as Object$1, OrderedCollectionPage, Person, Place, Question, Source, mockDocumentLoader, test, vocab_exports } from "./vocab-BoHbeM38.js";
+import { Activity, Announce, Collection, Create, CryptographicKey, Endpoints, Follow, Hashtag, Link, Note, Object as Object$1, OrderedCollectionPage, Person, Place, Question, Source, mockDocumentLoader, test, vocab_exports } from "./vocab-DNa6QysH.js";
 import { assertInstanceOf } from "./utils-Dm0Onkcz.js";
 import { deepStrictEqual, notDeepStrictEqual, ok, rejects, throws } from "node:assert/strict";
 import { LanguageString, decodeMultibase } from "@fedify/vocab-runtime";
@@ -432,6 +432,258 @@ test("Person.toJsonLd()", async () => {
 		type: "Person"
 	});
 });
+test("Endpoints.toJsonLd() omits type", async () => {
+	const ep = new Endpoints({ sharedInbox: new URL("https://example.com/inbox") });
+	const compact = await ep.toJsonLd();
+	ok(!("type" in compact), "compact heuristic output should not have 'type'");
+	deepStrictEqual(compact["sharedInbox"], "https://example.com/inbox");
+	deepStrictEqual(compact["@context"], "https://www.w3.org/ns/activitystreams");
+	const expanded = await ep.toJsonLd({
+		format: "expand",
+		contextLoader: mockDocumentLoader
+	});
+	ok(!("@type" in expanded[0]), "expanded output should not have '@type'");
+	const compactLib = await ep.toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader
+	});
+	ok(!("type" in compactLib), "compact (library) output should not have 'type'");
+	const restored = await Endpoints.fromJsonLd(compact, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	deepStrictEqual(restored, ep);
+});
+test("Source.toJsonLd() omits type", async () => {
+	const src = new Source({
+		content: "Hello, world!",
+		mediaType: "text/plain"
+	});
+	const compact = await src.toJsonLd();
+	ok(!("type" in compact), "compact heuristic output should not have 'type'");
+	deepStrictEqual(compact["mediaType"], "text/plain");
+	const expanded = await src.toJsonLd({
+		format: "expand",
+		contextLoader: mockDocumentLoader
+	});
+	ok(!("@type" in expanded[0]), "expanded output should not have '@type'");
+	const restored = await Source.fromJsonLd(compact, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	deepStrictEqual(restored, src);
+});
+test("Endpoints.fromJsonLd() accepts input with @type (backward compat)", async () => {
+	const ep = await Endpoints.fromJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		"type": "as:Endpoints",
+		"sharedInbox": "https://example.com/inbox"
+	}, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	assertInstanceOf(ep, Endpoints);
+	deepStrictEqual(ep.sharedInbox?.href, "https://example.com/inbox");
+});
+test("Source.fromJsonLd() accepts input with @type (backward compat)", async () => {
+	const src = await Source.fromJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		"type": "as:Source",
+		"content": "Hello",
+		"mediaType": "text/plain"
+	}, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	assertInstanceOf(src, Source);
+	deepStrictEqual(src.content, "Hello");
+	deepStrictEqual(src.mediaType, "text/plain");
+});
+test("Endpoints with all properties set omits type", async () => {
+	const ep = new Endpoints({
+		proxyUrl: new URL("https://example.com/proxy"),
+		oauthAuthorizationEndpoint: new URL("https://example.com/oauth/authorize"),
+		oauthTokenEndpoint: new URL("https://example.com/oauth/token"),
+		provideClientKey: new URL("https://example.com/provide-key"),
+		signClientKey: new URL("https://example.com/sign-key"),
+		sharedInbox: new URL("https://example.com/inbox")
+	});
+	const compact = await ep.toJsonLd();
+	ok(!("type" in compact), "compact output should not have 'type'");
+	deepStrictEqual(compact["proxyUrl"], "https://example.com/proxy");
+	deepStrictEqual(compact["oauthAuthorizationEndpoint"], "https://example.com/oauth/authorize");
+	deepStrictEqual(compact["oauthTokenEndpoint"], "https://example.com/oauth/token");
+	deepStrictEqual(compact["provideClientKey"], "https://example.com/provide-key");
+	deepStrictEqual(compact["signClientKey"], "https://example.com/sign-key");
+	deepStrictEqual(compact["sharedInbox"], "https://example.com/inbox");
+	for (const format of [
+		void 0,
+		"compact",
+		"expand"
+	]) {
+		const jsonLd = await ep.toJsonLd({
+			format,
+			contextLoader: mockDocumentLoader
+		});
+		const restored = await Endpoints.fromJsonLd(jsonLd, {
+			documentLoader: mockDocumentLoader,
+			contextLoader: mockDocumentLoader
+		});
+		deepStrictEqual(restored, ep, `round-trip failed for format=${format ?? "heuristic"}`);
+	}
+});
+test("Empty Endpoints omits type", async () => {
+	const ep = new Endpoints({});
+	const compact = await ep.toJsonLd();
+	ok(!("type" in compact), "empty compact output should not have 'type'");
+	const expanded = await ep.toJsonLd({
+		format: "expand",
+		contextLoader: mockDocumentLoader
+	});
+	ok(!("@type" in (expanded[0] ?? {})), "empty expanded output should not have '@type'");
+});
+test("Empty Source omits type", async () => {
+	const src = new Source({});
+	const compact = await src.toJsonLd();
+	ok(!("type" in compact), "empty compact output should not have 'type'");
+	const expanded = await src.toJsonLd({
+		format: "expand",
+		contextLoader: mockDocumentLoader
+	});
+	ok(!("@type" in (expanded[0] ?? {})), "empty expanded output should not have '@type'");
+});
+test("Person.toJsonLd() embeds Endpoints without type", async () => {
+	const person = new Person({
+		id: new URL("https://example.com/person/1"),
+		endpoints: new Endpoints({ sharedInbox: new URL("https://example.com/inbox") })
+	});
+	const compact = await person.toJsonLd();
+	const endpoints = compact["endpoints"];
+	ok(endpoints != null, "endpoints should be present");
+	ok(!("type" in endpoints), "embedded endpoints should not have 'type'");
+	deepStrictEqual(endpoints["sharedInbox"], "https://example.com/inbox");
+	const restored = await Person.fromJsonLd(compact, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	deepStrictEqual(restored.id, person.id);
+	deepStrictEqual(restored.endpoints?.sharedInbox, person.endpoints?.sharedInbox);
+	const expanded = await person.toJsonLd({
+		format: "expand",
+		contextLoader: mockDocumentLoader
+	});
+	const expandedEndpoints = expanded[0]["https://www.w3.org/ns/activitystreams#endpoints"]?.[0];
+	ok(expandedEndpoints != null, "expanded endpoints should be present");
+	ok(!("@type" in expandedEndpoints), "expanded embedded endpoints should not have '@type'");
+	const restored2 = await Person.fromJsonLd(expanded, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	deepStrictEqual(restored2.endpoints?.sharedInbox, person.endpoints?.sharedInbox);
+	const compactLib = await person.toJsonLd({
+		format: "compact",
+		contextLoader: mockDocumentLoader,
+		context: "https://www.w3.org/ns/activitystreams"
+	});
+	const endpointsLib = compactLib["endpoints"];
+	ok(endpointsLib != null, "compact-lib endpoints should be present");
+	ok(!("type" in endpointsLib), "compact-lib endpoints should not have 'type'");
+	const restored3 = await Person.fromJsonLd(compactLib, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	deepStrictEqual(restored3.endpoints?.sharedInbox, person.endpoints?.sharedInbox);
+});
+test("Object.toJsonLd() embeds Source without type", async () => {
+	const obj = new Object$1({
+		id: new URL("https://example.com/object/1"),
+		source: new Source({
+			content: "Hello, world!",
+			mediaType: "text/plain"
+		})
+	});
+	const compact = await obj.toJsonLd();
+	const source = compact["source"];
+	ok(source != null, "source should be present");
+	ok(!("type" in source), "embedded source should not have 'type'");
+	deepStrictEqual(source["mediaType"], "text/plain");
+	const restored = await Object$1.fromJsonLd(compact, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	deepStrictEqual(restored.source?.content, "Hello, world!");
+	deepStrictEqual(restored.source?.mediaType, "text/plain");
+});
+test("Person.fromJsonLd() with Mastodon-style endpoints (no type)", async () => {
+	const person = await Person.fromJsonLd({
+		"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+		"id": "https://mastodon.social/users/testuser",
+		"type": "Person",
+		"preferredUsername": "testuser",
+		"inbox": "https://mastodon.social/users/testuser/inbox",
+		"outbox": "https://mastodon.social/users/testuser/outbox",
+		"endpoints": { "sharedInbox": "https://mastodon.social/inbox" }
+	}, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	assertInstanceOf(person, Person);
+	deepStrictEqual(person.endpoints?.sharedInbox?.href, "https://mastodon.social/inbox");
+});
+test("Person.fromJsonLd() with old Fedify-style endpoints (with type)", async () => {
+	const person = await Person.fromJsonLd({
+		"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+		"id": "https://example.com/users/testuser",
+		"type": "Person",
+		"endpoints": {
+			"type": "as:Endpoints",
+			"sharedInbox": "https://example.com/inbox"
+		}
+	}, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	assertInstanceOf(person, Person);
+	deepStrictEqual(person.endpoints?.sharedInbox?.href, "https://example.com/inbox");
+});
+test("Source with LanguageString content omits type", async () => {
+	const src = new Source({
+		contents: [new LanguageString("Hello", "en"), new LanguageString("Bonjour", "fr")],
+		mediaType: "text/plain"
+	});
+	const compact = await src.toJsonLd();
+	ok(!("type" in compact), "source with LanguageString should not have 'type'");
+	const restored = await Source.fromJsonLd(compact, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	deepStrictEqual(restored, src);
+});
+test("Cross-format round-trip for Endpoints", async () => {
+	const ep = new Endpoints({
+		sharedInbox: new URL("https://example.com/inbox"),
+		proxyUrl: new URL("https://example.com/proxy")
+	});
+	const compact1 = await ep.toJsonLd();
+	const restored1 = await Endpoints.fromJsonLd(compact1, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	const expanded = await restored1.toJsonLd({
+		format: "expand",
+		contextLoader: mockDocumentLoader
+	});
+	const restored2 = await Endpoints.fromJsonLd(expanded, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	const compact2 = await restored2.toJsonLd({ contextLoader: mockDocumentLoader });
+	const restored3 = await Endpoints.fromJsonLd(compact2, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	deepStrictEqual(restored3, ep);
+});
 test("Collection.fromJsonLd()", async () => {
 	const collection = await Collection.fromJsonLd({
 		"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/fep/5711"],
@@ -1212,7 +1464,13 @@ for (const typeUri in types) {
 			"@id": "https://example.com/",
 			"@type": typeUri
 		});
-		deepStrictEqual(await instance.toJsonLd({
+		if (type.typeless) {
+			const compactJsonLd = await instance.toJsonLd({
+				format: "compact",
+				contextLoader: mockDocumentLoader
+			});
+			ok(!("type" in compactJsonLd), `${type.name} is typeless; compact output should not have 'type'`);
+		} else deepStrictEqual(await instance.toJsonLd({
 			format: "compact",
 			contextLoader: mockDocumentLoader
 		}), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.1.0-dev.405+f4e278ae",
+  "version": "2.1.0-dev.408+5c3c9d78",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -47,9 +47,9 @@
     "jsonld": "^9.0.0",
     "multicodec": "^3.2.1",
     "pkijs": "^3.3.3",
-    "@fedify/vocab-tools": "2.1.0-dev.405+f4e278ae",
-    "@fedify/webfinger": "2.1.0-dev.405+f4e278ae",
-    "@fedify/vocab-runtime": "2.1.0-dev.405+f4e278ae"
+    "@fedify/vocab-tools": "2.1.0-dev.408+5c3c9d78",
+    "@fedify/vocab-runtime": "2.1.0-dev.408+5c3c9d78",
+    "@fedify/webfinger": "2.1.0-dev.408+5c3c9d78"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",

package/src/endpoints.yaml

@@ -3,6 +3,7 @@ name: Endpoints
 compactName: as:Endpoints
 uri: "https://www.w3.org/ns/activitystreams#Endpoints"
 entity: false
+typeless: true
 description: Contents of {@link Actor}'s `endpoints`.
 defaultContext: "https://www.w3.org/ns/activitystreams"
 

package/src/source.yaml

@@ -3,6 +3,7 @@ name: Source
 compactName: as:Source
 uri: "https://www.w3.org/ns/activitystreams#Source"
 entity: false
+typeless: true
 description: Contents of {@link Object}'s `source`.
 defaultContext: "https://www.w3.org/ns/activitystreams"