@fedify/vocab 2.4.0-dev.2247 → 2.4.0-dev.2256

package/dist-tests/vocab.test.mjs

@@ -1,14 +1,15 @@
 import { Temporal } from "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { A as Object$1, B as QuoteAuthorization, C as Intent, D as Measure, E as Link, F as Person, G as Tombstone, H as Reject, I as Place, L as PropertyValue, N as OrderedCollectionPage, O as Multikey, P as Organization, R as Proposal, S as Image, T as InteractionRule, U as Service, V as QuoteRequest, W as Source, X as vocab_exports, _ as FeaturedCollection, a as Application, b as Group, d as CryptographicKey, f as Delete, g as FeatureRequest, h as FeatureAuthorization, i as Announce, j as Offer, k as Note, l as Commitment, m as Endpoints, n as Activity, p as Document, r as Agreement, s as Collection, t as Accept, u as Create, v as FeaturedItem, w as InteractionPolicy, x as Hashtag, y as Follow, z as Question } from "./vocab-D3C791xF.mjs";
-import { t as esm_default } from "./esm-2_Uqq_my.mjs";
+import { A as Object$1, B as QuoteAuthorization, C as Intent, D as Measure, E as Link, F as Person, G as Tombstone, H as Reject, I as Place, L as PropertyValue, N as OrderedCollectionPage, O as Multikey, P as Organization, R as Proposal, S as Image, T as InteractionRule, U as Service, V as QuoteRequest, W as Source, X as vocab_exports, _ as FeaturedCollection, a as Application, b as Group, d as CryptographicKey, f as Delete, g as FeatureRequest, h as FeatureAuthorization, i as Announce, j as Offer, k as Note, l as Commitment, m as Endpoints, n as Activity, p as Document, r as Agreement, s as Collection, t as Accept, u as Create, v as FeaturedItem, w as InteractionPolicy, x as Hashtag, y as Follow, z as Question } from "./vocab-qCLWHa7T.mjs";
+import { t as esm_default } from "./esm-CS5DInHn.mjs";
 import { t as assertInstanceOf } from "./utils-Df2odC27.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { deepStrictEqual, notDeepStrictEqual, ok, rejects, throws } from "node:assert/strict";
-import { FetchError, LanguageString, decodeMultibase, getDocumentLoader, parseDecimal } from "@fedify/vocab-runtime";
+import { FetchError, LanguageString, decodeMultibase, getDocumentLoader, parseDecimal, parseIri } from "@fedify/vocab-runtime";
 import { configure, reset } from "@logtape/logtape";
 import { pascalCase } from "es-toolkit";
 import { areAllScalarTypes, loadSchemaFiles } from "@fedify/vocab-tools";
+import { inspect } from "node:util";
 //#region src/vocab.test.ts
 const NOTE_QUOTE_CONTEXT = [
 	"https://www.w3.org/ns/activitystreams",
@@ -444,17 +445,112 @@ test("FEP-ef61: actor gateways round-trip as an ordered URI list", async () => {
 			gateways: gateways.map((gateway) => gateway.href)
 		});
 		deepStrictEqual(actor.gateways, gateways);
-		const jsonLd = await actor.toJsonLd();
+		const jsonLd = await actor.toJsonLd({ format: "compact" });
 		deepStrictEqual(jsonLd.type, ActorClass.name);
-		deepStrictEqual(jsonLd.gateways, gateways.map((gateway) => gateway.href));
+		deepStrictEqual(jsonLd.gateways, gateways.map((gateway) => gateway.origin));
 		deepStrictEqual((await ActorClass.fromJsonLd(jsonLd)).gateways, gateways);
 	}
 });
+test("FEP-ef61: actor gateways serialize as origins", async () => {
+	const actorClasses = [
+		Application,
+		Group,
+		Organization,
+		Person,
+		Service
+	];
+	const gateways = [
+		new URL("https://first.example:443/"),
+		new URL("http://second.example:80/"),
+		new URL("https://third.example:8443/"),
+		new URL("http://fourth.example:8080/")
+	];
+	const origins = [
+		"https://first.example",
+		"http://second.example",
+		"https://third.example:8443",
+		"http://fourth.example:8080"
+	];
+	for (const ActorClass of actorClasses) {
+		const actor = new ActorClass({
+			id: parseIri("ap://did:key:z6Mkabc/actor"),
+			gateways
+		});
+		const compact = await actor.toJsonLd();
+		deepStrictEqual(compact.gateways, origins);
+		const expanded = await actor.toJsonLd({ format: "expand" });
+		deepStrictEqual(expanded[0]["https://w3id.org/fep/ef61/gateways"], [{ "@list": origins.map((origin) => ({ "@id": origin })) }]);
+		deepStrictEqual(actor.gateways, gateways);
+		deepStrictEqual(actor.gateways.map((gateway) => gateway.href), origins.map((origin) => `${origin}/`));
+		deepStrictEqual((await ActorClass.fromJsonLd(compact)).gateways, gateways);
+		deepStrictEqual((await ActorClass.fromJsonLd(expanded)).gateways, gateways);
+	}
+});
+test("FEP-ef61: portable actors parse unmapped gateway lists", async () => {
+	const actorClasses = [
+		Application,
+		Group,
+		Organization,
+		Person,
+		Service
+	];
+	const gateways = ["https://first.example", "https://second.example"];
+	const ids = ["ap://did:key:z6Mkabc/actor", "https://first.example/.well-known/apgateway/did:key:z6Mkabc/actor"];
+	for (const ActorClass of actorClasses) for (const id of ids) deepStrictEqual((await ActorClass.fromJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		type: ActorClass.name,
+		id,
+		inbox: `${id}/inbox`,
+		outbox: `${id}/outbox`,
+		gateways
+	})).gateways, gateways.map((g) => new URL(g)));
+});
+test("FEP-ef61: unmapped gateways retain their context meaning", async () => {
+	const actorClasses = [
+		Application,
+		Group,
+		Organization,
+		Person,
+		Service
+	];
+	const id = "ap://did:key:z6Mkabc/actor";
+	for (const ActorClass of actorClasses) {
+		const document = {
+			type: ActorClass.name,
+			id,
+			inbox: `${id}/inbox`,
+			outbox: `${id}/outbox`,
+			gateways: ["https://unmapped.example"]
+		};
+		for (const context of [
+			{ gateways: "https://example.com/unrelated" },
+			{ gateways: null },
+			{ "@vocab": "https://example.com/" },
+			{ [ActorClass.name]: {
+				"@id": `https://www.w3.org/ns/activitystreams#${ActorClass.name}`,
+				"@context": { gateways: "https://example.com/scoped" }
+			} }
+		]) deepStrictEqual((await ActorClass.fromJsonLd({
+			"@context": ["https://www.w3.org/ns/activitystreams", context],
+			...document
+		})).gateways, []);
+		deepStrictEqual((await ActorClass.fromJsonLd({
+			"@context": "https://www.w3.org/ns/activitystreams",
+			...document,
+			id: "https://ordinary.example/actor"
+		})).gateways, []);
+		deepStrictEqual((await ActorClass.fromJsonLd({
+			"@context": "https://www.w3.org/ns/activitystreams",
+			...document,
+			"https://w3id.org/fep/ef61/gateways": { "@list": [{ "@id": "https://canonical.example" }] }
+		})).gateways, [new URL("https://canonical.example")]);
+	}
+});
 test("FEP-ef61: actor gateways preserve single, empty, and invalid cases", async () => {
 	deepStrictEqual((await new Person({
 		id: new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor"),
 		gateways: [new URL("https://server.example/")]
-	}).toJsonLd()).gateways, ["https://server.example/"]);
+	}).toJsonLd()).gateways, ["https://server.example"]);
 	ok(!("gateways" in await new Person({
 		id: new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor"),
 		gateways: []
@@ -1442,6 +1538,21 @@ test({
 		}), "Deno" in globalThis ? "Object {\n  attribution: URL \"https://example.com/foo\",\n  contents: [\n    <en> \"Hello\",\n    <zh> \"你好\"\n  ],\n  id: URL \"https://example.com/\",\n  name: \"Test\"\n}" : "Object {\n  attribution: URL 'https://example.com/foo',\n  contents: [\n    <en> 'Hello',\n    <zh> '你好'\n  ],\n  id: URL 'https://example.com/',\n  name: 'Test'\n}");
 	}
 });
+test("inspecting an object prints portable IRIs in their canonical form", () => {
+	const did = "did:key:z6MkrJVnaZkeFzdQyMZu1cgjg7k1pZZ6pvBQ7XJPt4swbTQ2";
+	const obj = new Object$1({
+		id: parseIri(`ap://${did}/note`),
+		attribution: parseIri(`ap://${did}/actor`)
+	});
+	const inspected = [inspect(obj, { colors: false })];
+	if ("Deno" in globalThis) inspected.push(Deno.inspect(obj, { colors: false }));
+	for (const text of inspected) {
+		ok(text.includes(`ap+ef61://${did}/note`), text);
+		ok(text.includes(`ap+ef61://${did}/actor`), text);
+		ok(!text.includes("%3A"), text);
+	}
+	ok(inspect(new Object$1({ id: new URL("ap://not-a-did/note") })).includes("ap://not-a-did/note"));
+});
 test("Person.fromJsonLd()", async () => {
 	const person = await Person.fromJsonLd({
 		"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.4.0-dev.2247+4fe1b8c3",
+  "version": "2.4.0-dev.2256+683c50ba",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -43,9 +43,9 @@
     "jsonld": "^9.0.0",
     "pkijs": "^3.3.3",
     "temporal-polyfill": "^1.0.1",
-    "@fedify/webfinger": "2.4.0-dev.2247+4fe1b8c3",
-    "@fedify/vocab-tools": "2.4.0-dev.2247+4fe1b8c3",
-    "@fedify/vocab-runtime": "2.4.0-dev.2247+4fe1b8c3"
+    "@fedify/vocab-tools": "2.4.0-dev.2256+683c50ba",
+    "@fedify/vocab-runtime": "2.4.0-dev.2256+683c50ba",
+    "@fedify/webfinger": "2.4.0-dev.2256+683c50ba"
   },
   "devDependencies": {
     "@types/node": "^24.12.2",

package/src/vocab.test.ts

@@ -6,6 +6,7 @@ import {
   getDocumentLoader,
   LanguageString,
   parseDecimal,
+  parseIri,
   type RemoteDocument,
 } from "@fedify/vocab-runtime";
 import {
@@ -24,6 +25,7 @@ import {
   rejects,
   throws,
 } from "node:assert/strict";
+import { inspect } from "node:util";
 import { assertInstanceOf } from "./utils.ts";
 import * as vocab from "./vocab.ts";
 import {
@@ -711,15 +713,123 @@ test("FEP-ef61: actor gateways round-trip as an ordered URI list", async () => {
     });
     deepStrictEqual(actor.gateways, gateways);
 
-    const jsonLd = await actor.toJsonLd() as Record<string, unknown>;
+    const jsonLd = await actor.toJsonLd({
+      format: "compact",
+    }) as Record<string, unknown>;
     deepStrictEqual(jsonLd.type, ActorClass.name);
-    deepStrictEqual(jsonLd.gateways, gateways.map((gateway) => gateway.href));
+    deepStrictEqual(jsonLd.gateways, gateways.map((gateway) => gateway.origin));
 
     const restored = await ActorClass.fromJsonLd(jsonLd);
     deepStrictEqual(restored.gateways, gateways);
   }
 });
 
+test("FEP-ef61: actor gateways serialize as origins", async () => {
+  const actorClasses = [Application, Group, Organization, Person, Service];
+  const gateways = [
+    new URL("https://first.example:443/"),
+    new URL("http://second.example:80/"),
+    new URL("https://third.example:8443/"),
+    new URL("http://fourth.example:8080/"),
+  ];
+  const origins = [
+    "https://first.example",
+    "http://second.example",
+    "https://third.example:8443",
+    "http://fourth.example:8080",
+  ];
+  for (const ActorClass of actorClasses) {
+    const actor = new ActorClass({
+      id: parseIri("ap://did:key:z6Mkabc/actor"),
+      gateways,
+    });
+    const compact = await actor.toJsonLd() as Record<string, unknown>;
+    deepStrictEqual(compact.gateways, origins);
+    const expanded = await actor.toJsonLd({
+      format: "expand",
+    }) as Record<string, unknown>[];
+    deepStrictEqual(expanded[0]["https://w3id.org/fep/ef61/gateways"], [
+      { "@list": origins.map((origin) => ({ "@id": origin })) },
+    ]);
+    deepStrictEqual(actor.gateways, gateways);
+    deepStrictEqual(
+      actor.gateways.map((gateway) => gateway.href),
+      origins.map((origin) => `${origin}/`),
+    );
+    deepStrictEqual((await ActorClass.fromJsonLd(compact)).gateways, gateways);
+    deepStrictEqual((await ActorClass.fromJsonLd(expanded)).gateways, gateways);
+  }
+});
+
+test("FEP-ef61: portable actors parse unmapped gateway lists", async () => {
+  const actorClasses = [Application, Group, Organization, Person, Service];
+  const gateways = ["https://first.example", "https://second.example"];
+  const ids = [
+    "ap://did:key:z6Mkabc/actor",
+    "https://first.example/.well-known/apgateway/did:key:z6Mkabc/actor",
+  ];
+  for (const ActorClass of actorClasses) {
+    for (const id of ids) {
+      const actor = await ActorClass.fromJsonLd({
+        "@context": "https://www.w3.org/ns/activitystreams",
+        type: ActorClass.name,
+        id,
+        inbox: `${id}/inbox`,
+        outbox: `${id}/outbox`,
+        gateways,
+      });
+      deepStrictEqual(actor.gateways, gateways.map((g) => new URL(g)));
+    }
+  }
+});
+
+test("FEP-ef61: unmapped gateways retain their context meaning", async () => {
+  const actorClasses = [Application, Group, Organization, Person, Service];
+  const id = "ap://did:key:z6Mkabc/actor";
+  for (const ActorClass of actorClasses) {
+    const document = {
+      type: ActorClass.name,
+      id,
+      inbox: `${id}/inbox`,
+      outbox: `${id}/outbox`,
+      gateways: ["https://unmapped.example"],
+    };
+    for (
+      const context of [
+        { gateways: "https://example.com/unrelated" },
+        { gateways: null },
+        { "@vocab": "https://example.com/" },
+        {
+          [ActorClass.name]: {
+            "@id": `https://www.w3.org/ns/activitystreams#${ActorClass.name}`,
+            "@context": { gateways: "https://example.com/scoped" },
+          },
+        },
+      ]
+    ) {
+      const actor = await ActorClass.fromJsonLd({
+        "@context": ["https://www.w3.org/ns/activitystreams", context],
+        ...document,
+      });
+      deepStrictEqual(actor.gateways, []);
+    }
+    const ordinary = await ActorClass.fromJsonLd({
+      "@context": "https://www.w3.org/ns/activitystreams",
+      ...document,
+      id: "https://ordinary.example/actor",
+    });
+    deepStrictEqual(ordinary.gateways, []);
+    const canonical = await ActorClass.fromJsonLd({
+      "@context": "https://www.w3.org/ns/activitystreams",
+      ...document,
+      "https://w3id.org/fep/ef61/gateways": {
+        "@list": [{ "@id": "https://canonical.example" }],
+      },
+    });
+    deepStrictEqual(canonical.gateways, [new URL("https://canonical.example")]);
+  }
+});
+
 test("FEP-ef61: actor gateways preserve single, empty, and invalid cases", async () => {
   const singleGateway = new Person({
     id: new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor"),
@@ -727,7 +837,7 @@ test("FEP-ef61: actor gateways preserve single, empty, and invalid cases", async
   });
   deepStrictEqual(
     (await singleGateway.toJsonLd() as Record<string, unknown>).gateways,
-    ["https://server.example/"],
+    ["https://server.example"],
   );
 
   const noGateways = new Person({
@@ -2212,6 +2322,26 @@ test({
   },
 });
 
+test("inspecting an object prints portable IRIs in their canonical form", () => {
+  const did = "did:key:z6MkrJVnaZkeFzdQyMZu1cgjg7k1pZZ6pvBQ7XJPt4swbTQ2";
+  const obj = new Object({
+    id: parseIri(`ap://${did}/note`),
+    attribution: parseIri(`ap://${did}/actor`),
+  });
+  const inspected = [inspect(obj, { colors: false })];
+  if ("Deno" in globalThis) {
+    inspected.push(Deno.inspect(obj, { colors: false }));
+  }
+  for (const text of inspected) {
+    ok(text.includes(`ap+ef61://${did}/note`), text);
+    ok(text.includes(`ap+ef61://${did}/actor`), text);
+    ok(!text.includes("%3A"), text);
+  }
+  // A URL that cannot be formatted as an IRI does not break inspection:
+  const malformed = new Object({ id: new URL("ap://not-a-did/note") });
+  ok(inspect(malformed).includes("ap://not-a-did/note"));
+});
+
 test("Person.fromJsonLd()", async () => {
   const person = await Person.fromJsonLd({
     "@context": [