@fedify/vocab 2.5.0-dev.2568 → 2.5.0-dev.2597

package/dist-tests/vocab.test.mjs

@@ -2,7 +2,7 @@ import { Temporal } from "temporal-polyfill";
 globalThis.addEventListener = () => {};
 import { i as __toESM } from "./rolldown-runtime-BWJg4WE8.mjs";
 import { t as esm_default } from "./esm-BIqRhjGA.mjs";
-import { A as Note, B as Question, C as Image, D as Link, E as InteractionRule, F as Organization, G as Source, H as QuoteRequest, I as Person, K as Tombstone, L as Place, M as Offer, O as Measure, P as OrderedCollectionPage, Q as vocab_exports, R as PropertyValue, S as Hashtag, T as InteractionPolicy, U as Reject, V as QuoteAuthorization, W as Service, _ as FeatureRequest, a as Application, b as Follow, d as CryptographicKey, g as FeatureAuthorization, h as Endpoints, i as Announce, j as Object$1, k as Multikey, l as Commitment, m as Document, n as Activity, p as Delete, r as Agreement, s as Collection, t as Accept, u as Create, v as FeaturedCollection, w as Intent, x as Group, y as FeaturedItem, z as Proposal } from "./vocab-D1YJL9OP.mjs";
+import { A as Note, B as Question, C as Image, D as Link, E as InteractionRule, F as Organization, G as Source, H as QuoteRequest, I as Person, K as Tombstone, L as Place, M as Offer, O as Measure, P as OrderedCollectionPage, Q as vocab_exports, R as PropertyValue, S as Hashtag, T as InteractionPolicy, U as Reject, V as QuoteAuthorization, W as Service, _ as FeatureRequest, a as Application, b as Follow, d as CryptographicKey, g as FeatureAuthorization, h as Endpoints, i as Announce, j as Object$1, k as Multikey, l as Commitment, m as Document, n as Activity, p as Delete, r as Agreement, s as Collection, t as Accept, u as Create, v as FeaturedCollection, w as Intent, x as Group, y as FeaturedItem, z as Proposal } from "./vocab-BcGkZqeH.mjs";
 import { t as assertInstanceOf } from "./utils-Df2odC27.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { deepStrictEqual, notDeepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";
@@ -17,7 +17,7 @@ import { areAllScalarTypes, loadSchemaFiles } from "@fedify/vocab-tools";
 import { inspect } from "node:util";
 //#region ../vocab-runtime/deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.5.0-dev.2568+889927c4";
+var version = "2.5.0-dev.2597+7bed9e2b";
 //#endregion
 //#region ../vocab-runtime/src/url.ts
 var UrlError = class extends Error {
@@ -318,7 +318,8 @@ function createActivityPubRequest(url, options = {}) {
 */
 function getUserAgent({ software, url } = {}) {
 	const fedify = `Fedify/${version}`;
-	const runtime = globalThis.Deno?.version?.deno != null ? `Deno/${Deno.version.deno}` : globalThis.process?.versions?.bun != null ? `Bun/${process.versions.bun}` : "navigator" in globalThis && navigator.userAgent === "Cloudflare-Workers" ? navigator.userAgent : globalThis.process?.versions?.node != null ? `Node.js/${process.versions.node}` : null;
+	const deno = globalThis.Deno;
+	const runtime = deno?.version?.deno != null ? `Deno/${deno.version.deno}` : globalThis.process?.versions?.bun != null ? `Bun/${process.versions.bun}` : "navigator" in globalThis && navigator.userAgent === "Cloudflare-Workers" ? navigator.userAgent : globalThis.process?.versions?.node != null ? `Node.js/${process.versions.node}` : null;
 	const userAgent = software == null ? [fedify] : [software, fedify];
 	if (runtime != null) userAgent.push(runtime);
 	if (url != null) userAgent.push(`+${url.toString()}`);
@@ -7709,6 +7710,10 @@ test("Person.toJsonLd()", async () => {
 					"@id": "toot:featuredTags",
 					"@type": "@id"
 				},
+				attributionDomains: {
+					"@id": "toot:attributionDomains",
+					"@container": "@set"
+				},
 				indexable: "toot:indexable",
 				_misskey_followedMessage: "misskey:_misskey_followedMessage",
 				isCat: "misskey:isCat",
@@ -8209,6 +8214,10 @@ test("InteractionPolicy.canFeature", async () => {
 					"@id": "toot:featuredTags",
 					"@type": "@id"
 				},
+				attributionDomains: {
+					"@id": "toot:attributionDomains",
+					"@container": "@set"
+				},
 				indexable: "toot:indexable",
 				isCat: "misskey:isCat",
 				manuallyApprovesFollowers: "as:manuallyApprovesFollowers",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.5.0-dev.2568+889927c4",
+  "version": "2.5.0-dev.2597+7bed9e2b",
   "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/vocab-tools": "2.5.0-dev.2568+889927c4",
-    "@fedify/webfinger": "2.5.0-dev.2568+889927c4",
-    "@fedify/vocab-runtime": "2.5.0-dev.2568+889927c4"
+    "@fedify/vocab-tools": "2.5.0-dev.2597+7bed9e2b",
+    "@fedify/webfinger": "2.5.0-dev.2597+7bed9e2b",
+    "@fedify/vocab-runtime": "2.5.0-dev.2597+7bed9e2b"
   },
   "devDependencies": {
     "@dprint/formatter": "0.6.0",
@@ -54,7 +54,7 @@
     "fast-check": "^3.22.0",
     "fetch-mock": "^12.5.4",
     "tsdown": "^0.22.0",
-    "typescript": "^6.0.0",
+    "typescript": "^6.0.3",
     "@fedify/fixture": "2.0.0"
   },
   "keywords": [

package/src/__snapshots__/vocab.test.ts.snap

@@ -3628,6 +3628,7 @@ snapshot[`Deno.inspect(Application) [auto] 1`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello" ],
   successor: Application {},
   aliases: [ Application {}, Group {}, Organization {}, Person {}, Service {} ],
   service: DidService {},
@@ -3698,6 +3699,7 @@ snapshot[`Deno.inspect(Application) [auto] 2`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello" ],
   successor: URL "https://example.com/",
   alias: URL "https://example.com/",
   service: URL "https://example.com/",
@@ -3771,6 +3773,7 @@ snapshot[`Deno.inspect(Application) [auto] 3`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello", "hello" ],
   successor: Application {},
   aliases: [ Application {}, Application {} ],
   services: [ DidService {}, DidService {} ],
@@ -5914,6 +5917,7 @@ snapshot[`Deno.inspect(Group) [auto] 1`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello" ],
   successor: Application {},
   aliases: [ Application {}, Group {}, Organization {}, Person {}, Service {} ],
   service: DidService {},
@@ -5984,6 +5988,7 @@ snapshot[`Deno.inspect(Group) [auto] 2`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello" ],
   successor: URL "https://example.com/",
   alias: URL "https://example.com/",
   service: URL "https://example.com/",
@@ -6057,6 +6062,7 @@ snapshot[`Deno.inspect(Group) [auto] 3`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello", "hello" ],
   successor: Application {},
   aliases: [ Application {}, Application {} ],
   services: [ DidService {}, DidService {} ],
@@ -8581,6 +8587,7 @@ snapshot[`Deno.inspect(Organization) [auto] 1`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello" ],
   successor: Application {},
   aliases: [ Application {}, Group {}, Organization {}, Person {}, Service {} ],
   service: DidService {},
@@ -8651,6 +8658,7 @@ snapshot[`Deno.inspect(Organization) [auto] 2`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello" ],
   successor: URL "https://example.com/",
   alias: URL "https://example.com/",
   service: URL "https://example.com/",
@@ -8724,6 +8732,7 @@ snapshot[`Deno.inspect(Organization) [auto] 3`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello", "hello" ],
   successor: Application {},
   aliases: [ Application {}, Application {} ],
   services: [ DidService {}, DidService {} ],
@@ -8941,6 +8950,7 @@ snapshot[`Deno.inspect(Person) [auto] 1`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello" ],
   successor: Application {},
   aliases: [ Application {}, Group {}, Organization {}, Person {}, Service {} ],
   service: DidService {},
@@ -9011,6 +9021,7 @@ snapshot[`Deno.inspect(Person) [auto] 2`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello" ],
   successor: URL "https://example.com/",
   alias: URL "https://example.com/",
   service: URL "https://example.com/",
@@ -9084,6 +9095,7 @@ snapshot[`Deno.inspect(Person) [auto] 3`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello", "hello" ],
   successor: Application {},
   aliases: [ Application {}, Application {} ],
   services: [ DidService {}, DidService {} ],
@@ -10243,6 +10255,7 @@ snapshot[`Deno.inspect(Service) [auto] 1`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello" ],
   successor: Application {},
   aliases: [ Application {}, Group {}, Organization {}, Person {}, Service {} ],
   service: DidService {},
@@ -10313,6 +10326,7 @@ snapshot[`Deno.inspect(Service) [auto] 2`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello" ],
   successor: URL "https://example.com/",
   alias: URL "https://example.com/",
   service: URL "https://example.com/",
@@ -10386,6 +10400,7 @@ snapshot[`Deno.inspect(Service) [auto] 3`] = `
   suspended: true,
   memorial: true,
   indexable: true,
+  attributionDomains: [ "hello", "hello" ],
   successor: Application {},
   aliases: [ Application {}, Application {} ],
   services: [ DidService {}, DidService {} ],

package/src/application.yaml

@@ -36,6 +36,9 @@ defaultContext:
   suspended: "toot:suspended"
   memorial: "toot:memorial"
   indexable: "toot:indexable"
+  attributionDomains:
+    "@id": "toot:attributionDomains"
+    "@container": "@set"
   schema: "http://schema.org#"
   PropertyValue: "schema:PropertyValue"
   value: "schema:value"
@@ -284,6 +287,19 @@ properties:
   range:
   - "http://www.w3.org/2001/XMLSchema#boolean"
 
+- pluralName: attributionDomains
+  singularName: attributionDomain
+  compactName: attributionDomains
+  uri: "http://joinmastodon.org/ns#attributionDomains"
+  description: |
+    Domains this actor claims as its own, so that Mastodon can credit the
+    actor on link preview cards that point at one of them.  Each value is a
+    bare host name, without a scheme, port, path, or leading `*.`.  Fedify
+    treats the values as opaque strings and does not normalize or validate
+    them; applications are responsible for producing normalized host names.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#string"
+
 - singularName: successor
   functional: true
   compactName: movedTo

package/src/attribution-domains.test.ts

@@ -0,0 +1,177 @@
+import { test } from "@fedify/fixture";
+import { deepStrictEqual, ok } from "node:assert/strict";
+import {
+  Application,
+  Group,
+  type Object as ASObject,
+  Organization,
+  Person,
+  Service,
+  Update,
+} from "./mod.ts";
+
+const AS = "https://www.w3.org/ns/activitystreams";
+const MASTODON = "http://joinmastodon.org/ns";
+const aliceId = new URL("https://social.example/users/alice");
+const updateId = new URL("https://social.example/activities/1");
+
+interface ActorLike extends ASObject {
+  attributionDomains: string[];
+}
+
+interface ActorConstructor {
+  new (values: {
+    id: URL;
+    attributionDomains: string[];
+  }): ActorLike;
+  fromJsonLd(
+    document: unknown,
+    options?: { documentLoader?: DocumentLoader },
+  ): Promise<ActorLike>;
+}
+
+interface DocumentLoader {
+  (url: string): Promise<{
+    contextUrl: string | null;
+    documentUrl: string;
+    document: unknown;
+  }>;
+}
+
+function record(value: unknown): Record<string, unknown> {
+  ok(value != null && typeof value === "object" && !Array.isArray(value));
+  return value as Record<string, unknown>;
+}
+
+test("attributionDomains round-trips through every actor type", async () => {
+  const actorTypes: [string, ActorConstructor][] = [
+    ["Application", Application],
+    ["Group", Group],
+    ["Organization", Organization],
+    ["Person", Person],
+    ["Service", Service],
+  ];
+  for (const [name, Actor] of actorTypes) {
+    const id = new URL(`https://social.example/${name.toLowerCase()}/alice`);
+    const actor = new Actor({
+      id,
+      attributionDomains: ["blog.example", "photos.example"],
+    });
+    const json = record(await actor.toJsonLd());
+    deepStrictEqual(json.attributionDomains, [
+      "blog.example",
+      "photos.example",
+    ]);
+
+    const context = json["@context"] as unknown[];
+    deepStrictEqual(record(context.at(-1))["attributionDomains"], {
+      "@id": "toot:attributionDomains",
+      "@container": "@set",
+    });
+
+    const parsed = await Actor.fromJsonLd(json);
+    deepStrictEqual(parsed.id, id);
+    deepStrictEqual(parsed.attributionDomains, [
+      "blog.example",
+      "photos.example",
+    ]);
+  }
+});
+
+test("attributionDomains single value fast path and compact form", async () => {
+  const person = new Person({
+    id: aliceId,
+    attributionDomains: ["blog.example"],
+  });
+  const compactDefault = record(await person.toJsonLd());
+  deepStrictEqual(compactDefault.attributionDomains, "blog.example");
+
+  const compact = record(await person.toJsonLd({ format: "compact" }));
+  deepStrictEqual(compact.attributionDomains, ["blog.example"]);
+});
+
+test("attributionDomains omitted when missing or empty", async () => {
+  for (
+    const person of [
+      new Person({ id: aliceId }),
+      new Person({ id: aliceId, attributionDomains: [] }),
+    ]
+  ) {
+    const json = record(await person.toJsonLd());
+    ok(!("attributionDomains" in json));
+  }
+
+  const parsed = await Person.fromJsonLd({
+    "@context": AS,
+    id: aliceId.href,
+    type: "Person",
+  });
+  deepStrictEqual(parsed.attributionDomains, []);
+});
+
+test("attributionDomains ignores non-string values", async () => {
+  const person = await Person.fromJsonLd({
+    "@context": [AS, MASTODON],
+    id: aliceId.href,
+    type: "Person",
+    attributionDomains: [42, "blog.example", true, { "@value": null }],
+  });
+  deepStrictEqual(person.attributionDomains, ["blog.example"]);
+});
+
+test("Update serializes the bare attributionDomains key in its object", async () => {
+  const alice = new Person({
+    id: aliceId,
+    attributionDomains: ["blog.example"],
+  });
+  const update = new Update({
+    id: updateId,
+    actor: aliceId,
+    object: alice,
+  });
+  const json = record(await update.toJsonLd());
+  const object = record(json.object);
+  deepStrictEqual(object.attributionDomains, ["blog.example"]);
+  ok(!("toot:attributionDomains" in object));
+});
+
+test("parses Mastodon's published actor shape with a single string", async () => {
+  const document = {
+    "@context": [
+      AS,
+      "https://w3id.org/security/v1",
+      {
+        toot: `${MASTODON}#`,
+        attributionDomains: {
+          "@id": "toot:attributionDomains",
+          "@container": "@set",
+        },
+        discoverable: "toot:discoverable",
+        indexable: "toot:indexable",
+      },
+    ],
+    id: aliceId.href,
+    type: "Person",
+    preferredUsername: "alice",
+    inbox: `${aliceId.href}/inbox`,
+    outbox: `${aliceId.href}/outbox`,
+    attributionDomains: "blog.example",
+  };
+
+  const person = await Person.fromJsonLd(document);
+  deepStrictEqual(person.attributionDomains, ["blog.example"]);
+});
+
+test("parses attributionDomains through the preloaded Mastodon context", async () => {
+  const document = {
+    "@context": [AS, MASTODON],
+    id: aliceId.href,
+    type: "Person",
+    attributionDomains: ["blog.example"],
+  };
+  const person = await Person.fromJsonLd(document);
+  deepStrictEqual(person.attributionDomains, ["blog.example"]);
+
+  const json = record(await person.toJsonLd({ format: "compact" }));
+  deepStrictEqual(json.attributionDomains, ["blog.example"]);
+});

package/src/group.yaml

@@ -36,6 +36,9 @@ defaultContext:
   suspended: "toot:suspended"
   memorial: "toot:memorial"
   indexable: "toot:indexable"
+  attributionDomains:
+    "@id": "toot:attributionDomains"
+    "@container": "@set"
   schema: "http://schema.org#"
   PropertyValue: "schema:PropertyValue"
   value: "schema:value"
@@ -284,6 +287,19 @@ properties:
   range:
   - "http://www.w3.org/2001/XMLSchema#boolean"
 
+- pluralName: attributionDomains
+  singularName: attributionDomain
+  compactName: attributionDomains
+  uri: "http://joinmastodon.org/ns#attributionDomains"
+  description: |
+    Domains this actor claims as its own, so that Mastodon can credit the
+    actor on link preview cards that point at one of them.  Each value is a
+    bare host name, without a scheme, port, path, or leading `*.`.  Fedify
+    treats the values as opaque strings and does not normalize or validate
+    them; applications are responsible for producing normalized host names.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#string"
+
 - singularName: successor
   functional: true
   compactName: movedTo

package/src/organization.yaml

@@ -36,6 +36,9 @@ defaultContext:
   suspended: "toot:suspended"
   memorial: "toot:memorial"
   indexable: "toot:indexable"
+  attributionDomains:
+    "@id": "toot:attributionDomains"
+    "@container": "@set"
   schema: "http://schema.org#"
   PropertyValue: "schema:PropertyValue"
   value: "schema:value"
@@ -284,6 +287,19 @@ properties:
   range:
   - "http://www.w3.org/2001/XMLSchema#boolean"
 
+- pluralName: attributionDomains
+  singularName: attributionDomain
+  compactName: attributionDomains
+  uri: "http://joinmastodon.org/ns#attributionDomains"
+  description: |
+    Domains this actor claims as its own, so that Mastodon can credit the
+    actor on link preview cards that point at one of them.  Each value is a
+    bare host name, without a scheme, port, path, or leading `*.`.  Fedify
+    treats the values as opaque strings and does not normalize or validate
+    them; applications are responsible for producing normalized host names.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#string"
+
 - singularName: successor
   functional: true
   compactName: movedTo

package/src/person.yaml

@@ -36,6 +36,9 @@ defaultContext:
   suspended: "toot:suspended"
   memorial: "toot:memorial"
   indexable: "toot:indexable"
+  attributionDomains:
+    "@id": "toot:attributionDomains"
+    "@container": "@set"
   schema: "http://schema.org#"
   PropertyValue: "schema:PropertyValue"
   value: "schema:value"
@@ -284,6 +287,19 @@ properties:
   range:
   - "http://www.w3.org/2001/XMLSchema#boolean"
 
+- pluralName: attributionDomains
+  singularName: attributionDomain
+  compactName: attributionDomains
+  uri: "http://joinmastodon.org/ns#attributionDomains"
+  description: |
+    Domains this actor claims as its own, so that Mastodon can credit the
+    actor on link preview cards that point at one of them.  Each value is a
+    bare host name, without a scheme, port, path, or leading `*.`.  Fedify
+    treats the values as opaque strings and does not normalize or validate
+    them; applications are responsible for producing normalized host names.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#string"
+
 - singularName: successor
   functional: true
   compactName: movedTo

package/src/service.yaml

@@ -36,6 +36,9 @@ defaultContext:
   suspended: "toot:suspended"
   memorial: "toot:memorial"
   indexable: "toot:indexable"
+  attributionDomains:
+    "@id": "toot:attributionDomains"
+    "@container": "@set"
   schema: "http://schema.org#"
   PropertyValue: "schema:PropertyValue"
   value: "schema:value"
@@ -284,6 +287,19 @@ properties:
   range:
   - "http://www.w3.org/2001/XMLSchema#boolean"
 
+- pluralName: attributionDomains
+  singularName: attributionDomain
+  compactName: attributionDomains
+  uri: "http://joinmastodon.org/ns#attributionDomains"
+  description: |
+    Domains this actor claims as its own, so that Mastodon can credit the
+    actor on link preview cards that point at one of them.  Each value is a
+    bare host name, without a scheme, port, path, or leading `*.`.  Fedify
+    treats the values as opaque strings and does not normalize or validate
+    them; applications are responsible for producing normalized host names.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#string"
+
 - singularName: successor
   functional: true
   compactName: movedTo

package/src/update.yaml

@@ -38,6 +38,9 @@ defaultContext:
   suspended: "toot:suspended"
   memorial: "toot:memorial"
   indexable: "toot:indexable"
+  attributionDomains:
+    "@id": "toot:attributionDomains"
+    "@container": "@set"
   votersCount:
     "@id": "toot:votersCount"
     "@type": "http://www.w3.org/2001/XMLSchema#nonNegativeInteger"

package/src/vocab.test.ts

@@ -2527,6 +2527,10 @@ test("Person.toJsonLd()", async () => {
           "@id": "toot:featuredTags",
           "@type": "@id",
         },
+        attributionDomains: {
+          "@id": "toot:attributionDomains",
+          "@container": "@set",
+        },
         indexable: "toot:indexable",
         _misskey_followedMessage: "misskey:_misskey_followedMessage",
         isCat: "misskey:isCat",
@@ -3306,6 +3310,10 @@ test("InteractionPolicy.canFeature", async () => {
           "@id": "toot:featuredTags",
           "@type": "@id",
         },
+        attributionDomains: {
+          "@id": "toot:attributionDomains",
+          "@container": "@set",
+        },
         indexable: "toot:indexable",
         isCat: "misskey:isCat",
         manuallyApprovesFollowers: "as:manuallyApprovesFollowers",

package/tsconfig.check.json

@@ -0,0 +1,14 @@
+{
+  "extends": "../../tsconfig.node.json",
+  "include": ["**/*.ts", "**/*.tsx", "**/*.mts", "**/*.cts"],
+  "exclude": [
+    "dist",
+    "dist-tests",
+    "node_modules",
+    // Uses Deno's @std/testing snapshots; owned by check:types:deno until
+    // #1288.
+    "src/vocab.test.ts",
+    // Deno benchmarks (Deno.bench); owned by check:types:deno.
+    "src/vocab.bench.ts"
+  ]
+}