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

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.1.0-dev.406+61a21e4e",
+  "version": "2.1.0-dev.408+5c3c9d78",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"

package/dist/actor.test.js

@@ -3,8 +3,8 @@
       globalThis.addEventListener = () => {};
     
 import { __export } from "./chunk-BeeFIeNn.js";
-import { Application, Group, Organization, Person, Service, test } from "./vocab-D_VpV6k4.js";
-import { deno_default, esm_default } from "./deno-C_9tl6Bv.js";
+import { Application, Group, Organization, Person, Service, test } from "./vocab-DNa6QysH.js";
+import { deno_default, esm_default } from "./deno-C1T-ELP0.js";
 import { getTypeId } from "./type-Dnf0m2yO.js";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";

package/dist/{deno-C_9tl6Bv.js → deno-C1T-ELP0.js}

@@ -1240,7 +1240,7 @@ var esm_default = FetchMock_default;
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.1.0-dev.406+61a21e4e";
+var version = "2.1.0-dev.408+5c3c9d78";
 var license = "MIT";
 var exports = { ".": "./src/mod.ts" };
 var description = "Vocabularies library for @fedify/fedify";

package/dist/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/dist/lookup.test.js

@@ -2,8 +2,8 @@
       import { Temporal } from "@js-temporal/polyfill";
       globalThis.addEventListener = () => {};
     
-import { Collection, Note, Object as Object$1, Person, createTestTracerProvider, mockDocumentLoader, test } from "./vocab-D_VpV6k4.js";
-import { deno_default, esm_default } from "./deno-C_9tl6Bv.js";
+import { Collection, Note, Object as Object$1, Person, createTestTracerProvider, mockDocumentLoader, test } from "./vocab-DNa6QysH.js";
+import { deno_default, esm_default } from "./deno-C1T-ELP0.js";
 import { getTypeId } from "./type-Dnf0m2yO.js";
 import { assertInstanceOf } from "./utils-Dm0Onkcz.js";
 import { getLogger } from "@logtape/logtape";

package/dist/mod.cjs

@@ -34,7 +34,7 @@ const es_toolkit = __toESM(require("es-toolkit"));
 
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.1.0-dev.406+61a21e4e";
+var version = "2.1.0-dev.408+5c3c9d78";
 var license = "MIT";
 var exports$1 = { ".": "./src/mod.ts" };
 var description = "Vocabularies library for @fedify/fedify";
@@ -19197,7 +19197,6 @@ var Endpoints = class {
 				compactItems.push(item);
 			}
 			if (compactItems.length > 0) result["sharedInbox"] = compactItems.length > 1 ? compactItems : compactItems[0];
-			result["type"] = "as:Endpoints";
 			if (this.id != null) result["id"] = this.id.href;
 			result["@context"] = "https://www.w3.org/ns/activitystreams";
 			return result;
@@ -19258,7 +19257,6 @@ var Endpoints = class {
 			const propValue = array;
 			values["https://www.w3.org/ns/activitystreams#sharedInbox"] = propValue;
 		}
-		values["@type"] = ["https://www.w3.org/ns/activitystreams#Endpoints"];
 		if (this.id != null) values["@id"] = this.id.href;
 		if (options.format === "expand") return await jsonld.default.expand(values, { documentLoader: options.contextLoader });
 		const docContext = options.context ?? "https://www.w3.org/ns/activitystreams";
@@ -40028,7 +40026,6 @@ var Source = class {
 				compactItems.push(item);
 			}
 			if (compactItems.length > 0) result["mediaType"] = compactItems.length > 1 ? compactItems : compactItems[0];
-			result["type"] = "as:Source";
 			if (this.id != null) result["id"] = this.id.href;
 			result["@context"] = "https://www.w3.org/ns/activitystreams";
 			return result;
@@ -40056,7 +40053,6 @@ var Source = class {
 			const propValue = array;
 			values["https://www.w3.org/ns/activitystreams#mediaType"] = propValue;
 		}
-		values["@type"] = ["https://www.w3.org/ns/activitystreams#Source"];
 		if (this.id != null) values["@id"] = this.id.href;
 		if (options.format === "expand") return await jsonld.default.expand(values, { documentLoader: options.contextLoader });
 		const docContext = options.context ?? "https://www.w3.org/ns/activitystreams";

package/dist/mod.js

@@ -11,7 +11,7 @@ import { delay } from "es-toolkit";
 
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.1.0-dev.406+61a21e4e";
+var version = "2.1.0-dev.408+5c3c9d78";
 var license = "MIT";
 var exports = { ".": "./src/mod.ts" };
 var description = "Vocabularies library for @fedify/fedify";
@@ -19174,7 +19174,6 @@ var Endpoints = class {
 				compactItems.push(item);
 			}
 			if (compactItems.length > 0) result["sharedInbox"] = compactItems.length > 1 ? compactItems : compactItems[0];
-			result["type"] = "as:Endpoints";
 			if (this.id != null) result["id"] = this.id.href;
 			result["@context"] = "https://www.w3.org/ns/activitystreams";
 			return result;
@@ -19235,7 +19234,6 @@ var Endpoints = class {
 			const propValue = array;
 			values["https://www.w3.org/ns/activitystreams#sharedInbox"] = propValue;
 		}
-		values["@type"] = ["https://www.w3.org/ns/activitystreams#Endpoints"];
 		if (this.id != null) values["@id"] = this.id.href;
 		if (options.format === "expand") return await jsonld.expand(values, { documentLoader: options.contextLoader });
 		const docContext = options.context ?? "https://www.w3.org/ns/activitystreams";
@@ -40005,7 +40003,6 @@ var Source = class {
 				compactItems.push(item);
 			}
 			if (compactItems.length > 0) result["mediaType"] = compactItems.length > 1 ? compactItems : compactItems[0];
-			result["type"] = "as:Source";
 			if (this.id != null) result["id"] = this.id.href;
 			result["@context"] = "https://www.w3.org/ns/activitystreams";
 			return result;
@@ -40033,7 +40030,6 @@ var Source = class {
 			const propValue = array;
 			values["https://www.w3.org/ns/activitystreams#mediaType"] = propValue;
 		}
-		values["@type"] = ["https://www.w3.org/ns/activitystreams#Source"];
 		if (this.id != null) values["@id"] = this.id.href;
 		if (options.format === "expand") return await jsonld.expand(values, { documentLoader: options.contextLoader });
 		const docContext = options.context ?? "https://www.w3.org/ns/activitystreams";

package/dist/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"
 

package/dist/type.test.js

@@ -2,7 +2,7 @@
       import { Temporal } from "@js-temporal/polyfill";
       globalThis.addEventListener = () => {};
     
-import { Person, test } from "./vocab-D_VpV6k4.js";
+import { Person, test } from "./vocab-DNa6QysH.js";
 import { getTypeId } from "./type-Dnf0m2yO.js";
 import { deepStrictEqual } from "node:assert/strict";
 

package/dist/{vocab-D_VpV6k4.js → vocab-DNa6QysH.js}

@@ -25453,7 +25453,6 @@ var Endpoints = class {
 				compactItems.push(item);
 			}
 			if (compactItems.length > 0) result["sharedInbox"] = compactItems.length > 1 ? compactItems : compactItems[0];
-			result["type"] = "as:Endpoints";
 			if (this.id != null) result["id"] = this.id.href;
 			result["@context"] = "https://www.w3.org/ns/activitystreams";
 			return result;
@@ -25514,7 +25513,6 @@ var Endpoints = class {
 			const propValue = array;
 			values["https://www.w3.org/ns/activitystreams#sharedInbox"] = propValue;
 		}
-		values["@type"] = ["https://www.w3.org/ns/activitystreams#Endpoints"];
 		if (this.id != null) values["@id"] = this.id.href;
 		if (options.format === "expand") return await jsonld.expand(values, { documentLoader: options.contextLoader });
 		const docContext = options.context ?? "https://www.w3.org/ns/activitystreams";
@@ -46284,7 +46282,6 @@ var Source = class {
 				compactItems.push(item);
 			}
 			if (compactItems.length > 0) result["mediaType"] = compactItems.length > 1 ? compactItems : compactItems[0];
-			result["type"] = "as:Source";
 			if (this.id != null) result["id"] = this.id.href;
 			result["@context"] = "https://www.w3.org/ns/activitystreams";
 			return result;
@@ -46312,7 +46309,6 @@ var Source = class {
 			const propValue = array;
 			values["https://www.w3.org/ns/activitystreams#mediaType"] = propValue;
 		}
-		values["@type"] = ["https://www.w3.org/ns/activitystreams#Source"];
 		if (this.id != null) values["@id"] = this.id.href;
 		if (options.format === "expand") return await jsonld.expand(values, { documentLoader: options.contextLoader });
 		const docContext = options.context ?? "https://www.w3.org/ns/activitystreams";
@@ -47833,4 +47829,4 @@ View.prototype[Symbol.for("nodejs.util.inspect.custom")] = function(_depth, opti
 };
 
 //#endregion
-export { Activity, Announce, Application, Collection, Create, CryptographicKey, Follow, Group, Hashtag, Link, Note, Object$1 as Object, OrderedCollectionPage, Organization, Person, Place, Question, Service, Source, createTestTracerProvider, mockDocumentLoader, test, vocab_exports };
+export { Activity, Announce, Application, Collection, Create, CryptographicKey, Endpoints, Follow, Group, Hashtag, Link, Note, Object$1 as Object, OrderedCollectionPage, Organization, Person, Place, Question, Service, Source, createTestTracerProvider, mockDocumentLoader, test, vocab_exports };

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-D_VpV6k4.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.406+61a21e4e",
+  "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/webfinger": "2.1.0-dev.406+61a21e4e",
-    "@fedify/vocab-runtime": "2.1.0-dev.406+61a21e4e",
-    "@fedify/vocab-tools": "2.1.0-dev.406+61a21e4e"
+    "@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"
 

package/src/vocab.test.ts

@@ -23,6 +23,7 @@ import {
   Create,
   CryptographicKey,
   type DataIntegrityProof,
+  Endpoints,
   Follow,
   Hashtag,
   Link,
@@ -656,6 +657,388 @@ test("Person.toJsonLd()", async () => {
   });
 });
 
+test("Endpoints.toJsonLd() omits type", async () => {
+  const ep = new Endpoints({
+    sharedInbox: new URL("https://example.com/inbox"),
+  });
+
+  // Compact heuristic path (format == null)
+  const compact = await ep.toJsonLd() as Record<string, unknown>;
+  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");
+
+  // Expanded format
+  const expanded = await ep.toJsonLd({
+    format: "expand",
+    contextLoader: mockDocumentLoader,
+  }) as Record<string, unknown>[];
+  ok(
+    !("@type" in expanded[0]),
+    "expanded output should not have '@type'",
+  );
+
+  // Compact via JSON-LD library
+  const compactLib = await ep.toJsonLd({
+    format: "compact",
+    contextLoader: mockDocumentLoader,
+  }) as Record<string, unknown>;
+  ok(
+    !("type" in compactLib),
+    "compact (library) output should not have 'type'",
+  );
+
+  // Round-trip: compact heuristic → fromJsonLd → compare
+  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",
+  });
+
+  // Compact heuristic path (format == null)
+  const compact = await src.toJsonLd() as Record<string, unknown>;
+  ok(!("type" in compact), "compact heuristic output should not have 'type'");
+  deepStrictEqual(compact["mediaType"], "text/plain");
+
+  // Expanded format
+  const expanded = await src.toJsonLd({
+    format: "expand",
+    contextLoader: mockDocumentLoader,
+  }) as Record<string, unknown>[];
+  ok(
+    !("@type" in expanded[0]),
+    "expanded output should not have '@type'",
+  );
+
+  // Round-trip: compact heuristic → fromJsonLd → compare
+  const restored = await Source.fromJsonLd(compact, {
+    documentLoader: mockDocumentLoader,
+    contextLoader: mockDocumentLoader,
+  });
+  deepStrictEqual(restored, src);
+});
+
+test("Endpoints.fromJsonLd() accepts input with @type (backward compat)", async () => {
+  // Older Fedify instances may still send @type for Endpoints
+  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"),
+  });
+
+  // Compact heuristic path
+  const compact = await ep.toJsonLd() as Record<string, unknown>;
+  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");
+
+  // Round-trip all three formats
+  for (
+    const format of [undefined, "compact" as const, "expand" as const]
+  ) {
+    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() as Record<string, unknown>;
+  ok(!("type" in compact), "empty compact output should not have 'type'");
+
+  const expanded = await ep.toJsonLd({
+    format: "expand",
+    contextLoader: mockDocumentLoader,
+  }) as Record<string, unknown>[];
+  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() as Record<string, unknown>;
+  ok(!("type" in compact), "empty compact output should not have 'type'");
+
+  const expanded = await src.toJsonLd({
+    format: "expand",
+    contextLoader: mockDocumentLoader,
+  }) as Record<string, unknown>[];
+  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"),
+    }),
+  });
+
+  // Compact heuristic path (the real-world code path)
+  const compact = await person.toJsonLd() as Record<string, unknown>;
+  const endpoints = compact["endpoints"] as Record<string, unknown>;
+  ok(endpoints != null, "endpoints should be present");
+  ok(
+    !("type" in endpoints),
+    "embedded endpoints should not have 'type'",
+  );
+  deepStrictEqual(endpoints["sharedInbox"], "https://example.com/inbox");
+
+  // Round-trip
+  const restored = await Person.fromJsonLd(compact, {
+    documentLoader: mockDocumentLoader,
+    contextLoader: mockDocumentLoader,
+  });
+  deepStrictEqual(restored.id, person.id);
+  deepStrictEqual(
+    restored.endpoints?.sharedInbox,
+    person.endpoints?.sharedInbox,
+  );
+
+  // Expanded format
+  const expanded = await person.toJsonLd({
+    format: "expand",
+    contextLoader: mockDocumentLoader,
+  }) as Record<string, unknown>[];
+  const expandedEndpoints =
+    (expanded[0]["https://www.w3.org/ns/activitystreams#endpoints"] as Record<
+      string,
+      unknown
+    >[])?.[0];
+  ok(expandedEndpoints != null, "expanded endpoints should be present");
+  ok(
+    !("@type" in expandedEndpoints),
+    "expanded embedded endpoints should not have '@type'",
+  );
+
+  // Expanded round-trip
+  const restored2 = await Person.fromJsonLd(expanded, {
+    documentLoader: mockDocumentLoader,
+    contextLoader: mockDocumentLoader,
+  });
+  deepStrictEqual(
+    restored2.endpoints?.sharedInbox,
+    person.endpoints?.sharedInbox,
+  );
+
+  // Compact via JSON-LD library
+  const compactLib = await person.toJsonLd({
+    format: "compact",
+    contextLoader: mockDocumentLoader,
+    context: "https://www.w3.org/ns/activitystreams",
+  }) as Record<string, unknown>;
+  const endpointsLib = compactLib["endpoints"] as Record<string, unknown>;
+  ok(endpointsLib != null, "compact-lib endpoints should be present");
+  ok(
+    !("type" in endpointsLib),
+    "compact-lib endpoints should not have 'type'",
+  );
+
+  // Compact library round-trip
+  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({
+    id: new URL("https://example.com/object/1"),
+    source: new Source({
+      content: "Hello, world!",
+      mediaType: "text/plain",
+    }),
+  });
+
+  // Compact heuristic path
+  const compact = await obj.toJsonLd() as Record<string, unknown>;
+  const source = compact["source"] as Record<string, unknown>;
+  ok(source != null, "source should be present");
+  ok(!("type" in source), "embedded source should not have 'type'");
+  deepStrictEqual(source["mediaType"], "text/plain");
+
+  // Round-trip
+  const restored = await Object.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 () => {
+  // Mastodon serializes endpoints without a type field
+  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 () => {
+  // Older Fedify versions serialized endpoints with type: "as:Endpoints"
+  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() as Record<string, unknown>;
+  ok(!("type" in compact), "source with LanguageString should not have 'type'");
+
+  // Round-trip
+  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"),
+  });
+
+  // compact heuristic → expanded → compact heuristic
+  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": [
@@ -1860,18 +2243,29 @@ for (const typeUri in types) {
         "@type": typeUri,
       },
     );
-    deepStrictEqual(
-      await instance.toJsonLd({
+    if (type.typeless) {
+      const compactJsonLd = await instance.toJsonLd({
         format: "compact",
         contextLoader: mockDocumentLoader,
-      }),
-      {
-        "@context": type.defaultContext,
-        "id": "https://example.com/",
-        "type": type.compactName ??
-          (type.name === "DataIntegrityProof" ? type.name : type.uri),
-      },
-    );
+      }) as Record<string, unknown>;
+      ok(
+        !("type" in compactJsonLd),
+        `${type.name} is typeless; compact output should not have 'type'`,
+      );
+    } else {
+      deepStrictEqual(
+        await instance.toJsonLd({
+          format: "compact",
+          contextLoader: mockDocumentLoader,
+        }),
+        {
+          "@context": type.defaultContext,
+          "id": "https://example.com/",
+          "type": type.compactName ??
+            (type.name === "DataIntegrityProof" ? type.name : type.uri),
+        },
+      );
+    }
 
     if (type.extends != null) {
       await rejects(() =>