@fedify/vocab-runtime 2.0.31-dev.2273 → 2.0.31-dev.2297

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.0.31-dev.2273+bf0ebffc",
+  "version": "2.0.31-dev.2297+58cbc917",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",

package/dist/mod.cjs

@@ -128,6 +128,18 @@ var cid_v1_default = { "@context": {
 	}
 } };
 //#endregion
+//#region src/contexts/fep-6757.json
+var fep_6757_default = { "@context": {
+	"license": {
+		"@id": "http://purl.org/dc/terms/license",
+		"@type": "@id"
+	},
+	"preferredLicense": {
+		"@id": "https://w3id.org/fep/6757#preferredLicense",
+		"@type": "@id"
+	}
+} };
+//#endregion
 //#region src/contexts/fep-7aa9.json
 var fep_7aa9_default = { "@context": {
 	"FeaturedCollection": "https://w3id.org/fep/7aa9#FeaturedCollection",
@@ -4428,6 +4440,7 @@ const preloadedContexts = {
 	"https://www.w3.org/ns/cid/v1": cid_v1_default,
 	"https://w3id.org/fep/ef61": fep_ef61_default,
 	"https://w3id.org/fep/7aa9": fep_7aa9_default,
+	"https://w3id.org/fep/6757": fep_6757_default,
 	"https://join-lemmy.org/context.json": join_lemmy_default,
 	"http://joinmastodon.org/ns": { "@context": {
 		"toot": "http://joinmastodon.org/ns#",
@@ -4460,7 +4473,7 @@ const preloadedContexts = {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.31-dev.2273+bf0ebffc";
+var version = "2.0.31-dev.2297+58cbc917";
 //#endregion
 //#region src/request.ts
 /**
@@ -5102,6 +5115,7 @@ async function getRemoteDocument(url, response, fetch) {
 * - <https://w3id.org/security/multikey/v1>
 * - <https://w3id.org/fep/ef61>
 * - <https://w3id.org/fep/7aa9>
+* - <https://w3id.org/fep/6757>
 * - <https://purl.archive.org/socialweb/webfinger>
 * - <http://schema.org/>
 * @param options Options for the document loader.

package/dist/mod.d.cts

@@ -183,6 +183,7 @@ interface GetDocumentLoaderOptions extends DocumentLoaderFactoryOptions {
 * - <https://w3id.org/security/multikey/v1>
 * - <https://w3id.org/fep/ef61>
 * - <https://w3id.org/fep/7aa9>
+* - <https://w3id.org/fep/6757>
 * - <https://purl.archive.org/socialweb/webfinger>
 * - <http://schema.org/>
 * @param options Options for the document loader.

package/dist/mod.d.ts

@@ -182,6 +182,7 @@ interface GetDocumentLoaderOptions extends DocumentLoaderFactoryOptions {
 * - <https://w3id.org/security/multikey/v1>
 * - <https://w3id.org/fep/ef61>
 * - <https://w3id.org/fep/7aa9>
+* - <https://w3id.org/fep/6757>
 * - <https://purl.archive.org/socialweb/webfinger>
 * - <http://schema.org/>
 * @param options Options for the document loader.

package/dist/mod.js

@@ -123,6 +123,18 @@ var cid_v1_default = { "@context": {
 	}
 } };
 //#endregion
+//#region src/contexts/fep-6757.json
+var fep_6757_default = { "@context": {
+	"license": {
+		"@id": "http://purl.org/dc/terms/license",
+		"@type": "@id"
+	},
+	"preferredLicense": {
+		"@id": "https://w3id.org/fep/6757#preferredLicense",
+		"@type": "@id"
+	}
+} };
+//#endregion
 //#region src/contexts/fep-7aa9.json
 var fep_7aa9_default = { "@context": {
 	"FeaturedCollection": "https://w3id.org/fep/7aa9#FeaturedCollection",
@@ -4423,6 +4435,7 @@ const preloadedContexts = {
 	"https://www.w3.org/ns/cid/v1": cid_v1_default,
 	"https://w3id.org/fep/ef61": fep_ef61_default,
 	"https://w3id.org/fep/7aa9": fep_7aa9_default,
+	"https://w3id.org/fep/6757": fep_6757_default,
 	"https://join-lemmy.org/context.json": join_lemmy_default,
 	"http://joinmastodon.org/ns": { "@context": {
 		"toot": "http://joinmastodon.org/ns#",
@@ -4455,7 +4468,7 @@ const preloadedContexts = {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.31-dev.2273+bf0ebffc";
+var version = "2.0.31-dev.2297+58cbc917";
 //#endregion
 //#region src/request.ts
 /**
@@ -5097,6 +5110,7 @@ async function getRemoteDocument(url, response, fetch) {
 * - <https://w3id.org/security/multikey/v1>
 * - <https://w3id.org/fep/ef61>
 * - <https://w3id.org/fep/7aa9>
+* - <https://w3id.org/fep/6757>
 * - <https://purl.archive.org/socialweb/webfinger>
 * - <http://schema.org/>
 * @param options Options for the document loader.

package/dist/tests/{body-CwWI4-VY.cjs → body-B1TX2GGC.cjs}

@@ -1,5 +1,5 @@
 require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-DcF60AOA.cjs");
+const require_request = require("./request-ClhOmVbs.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/{body-wOtDIud6.mjs → body-DkPsw4D7.mjs}

@@ -1,4 +1,4 @@
-import { t as FetchError } from "./request-B112Mks-.mjs";
+import { t as FetchError } from "./request-DlZHvlsq.mjs";
 import { getLogger } from "@logtape/logtape";
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/body.test.cjs

@@ -1,5 +1,5 @@
 require("./chunk-Do9eywBl.cjs");
-const require_body = require("./body-CwWI4-VY.cjs");
+const require_body = require("./body-B1TX2GGC.cjs");
 let node_assert_strict = require("node:assert/strict");
 let node_test = require("node:test");
 let node_zlib = require("node:zlib");

package/dist/tests/body.test.mjs

@@ -1,4 +1,4 @@
-import { r as readBoundedText, t as BodyTooLargeError } from "./body-wOtDIud6.mjs";
+import { r as readBoundedText, t as BodyTooLargeError } from "./body-DkPsw4D7.mjs";
 import { deepStrictEqual, ok, rejects } from "node:assert/strict";
 import { test } from "node:test";
 import { gunzipSync, gzipSync } from "node:zlib";

package/dist/tests/docloader.test.cjs

@@ -1,6 +1,6 @@
 const require_chunk = require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-DcF60AOA.cjs");
-const require_body = require("./body-CwWI4-VY.cjs");
+const require_request = require("./request-ClhOmVbs.cjs");
+const require_body = require("./body-B1TX2GGC.cjs");
 const require_link = require("./link-FguCydMA.cjs");
 const require_url = require("./url-Qk1svKZU.cjs");
 let node_test = require("node:test");
@@ -11,6 +11,8 @@ let node_dns_promises = require("node:dns/promises");
 node_dns_promises = require_chunk.__toESM(node_dns_promises);
 let node_http = require("node:http");
 let _opentelemetry_api = require("@opentelemetry/api");
+let jsonld_dist_jsonld_esm_js = require("jsonld/dist/jsonld.esm.js");
+jsonld_dist_jsonld_esm_js = require_chunk.__toESM(jsonld_dist_jsonld_esm_js);
 //#region ../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js
 var require_glob_to_regexp = /* @__PURE__ */ require_chunk.__commonJSMin(((exports, module) => {
 	module.exports = function(glob, opts) {
@@ -1325,6 +1327,18 @@ var cid_v1_default = { "@context": {
 	}
 } };
 //#endregion
+//#region src/contexts/fep-6757.json
+var fep_6757_default = { "@context": {
+	"license": {
+		"@id": "http://purl.org/dc/terms/license",
+		"@type": "@id"
+	},
+	"preferredLicense": {
+		"@id": "https://w3id.org/fep/6757#preferredLicense",
+		"@type": "@id"
+	}
+} };
+//#endregion
 //#region src/contexts/fep-7aa9.json
 var fep_7aa9_default = { "@context": {
 	"FeaturedCollection": "https://w3id.org/fep/7aa9#FeaturedCollection",
@@ -5625,6 +5639,7 @@ const preloadedContexts = {
 	"https://www.w3.org/ns/cid/v1": cid_v1_default,
 	"https://w3id.org/fep/ef61": fep_ef61_default,
 	"https://w3id.org/fep/7aa9": fep_7aa9_default,
+	"https://w3id.org/fep/6757": fep_6757_default,
 	"https://join-lemmy.org/context.json": join_lemmy_default,
 	"http://joinmastodon.org/ns": { "@context": {
 		"toot": "http://joinmastodon.org/ns#",
@@ -5766,6 +5781,7 @@ async function getRemoteDocument(url, response, fetch) {
 * - <https://w3id.org/security/multikey/v1>
 * - <https://w3id.org/fep/ef61>
 * - <https://w3id.org/fep/7aa9>
+* - <https://w3id.org/fep/6757>
 * - <https://purl.archive.org/socialweb/webfinger>
 * - <http://schema.org/>
 * @param options Options for the document loader.
@@ -5854,6 +5870,9 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 	return (url, options) => load(url, options);
 }
 //#endregion
+//#region src/jsonld.ts
+var jsonld_default = jsonld_dist_jsonld_esm_js.default;
+//#endregion
 //#region src/docloader.test.ts
 (0, node_test.test)("new FetchError()", () => {
 	const e = new require_request.FetchError("https://example.com/", "An error message.");
@@ -6132,6 +6151,35 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 		});
 		(0, node_assert.deepStrictEqual)(esm_default.callHistory.calls(url).length, 0);
 	});
+	esm_default.get("https://w3id.org/fep/6757", { status: 502 });
+	await t.test("preloaded FEP-6757 context", async () => {
+		const url = "https://w3id.org/fep/6757";
+		(0, node_assert.deepStrictEqual)(await fetchDocumentLoader(url), {
+			contextUrl: null,
+			documentUrl: url,
+			document: { "@context": {
+				license: {
+					"@id": "http://purl.org/dc/terms/license",
+					"@type": "@id"
+				},
+				preferredLicense: {
+					"@id": "https://w3id.org/fep/6757#preferredLicense",
+					"@type": "@id"
+				}
+			} }
+		});
+		(0, node_assert.deepStrictEqual)(await jsonld_default.expand({
+			"@context": ["https://www.w3.org/ns/activitystreams", url],
+			type: "Person",
+			license: "https://creativecommons.org/licenses/by/4.0/",
+			preferredLicense: "https://creativecommons.org/licenses/by-nc/4.0/"
+		}, { documentLoader: fetchDocumentLoader }), [{
+			"@type": ["https://www.w3.org/ns/activitystreams#Person"],
+			"http://purl.org/dc/terms/license": [{ "@id": "https://creativecommons.org/licenses/by/4.0/" }],
+			"https://w3id.org/fep/6757#preferredLicense": [{ "@id": "https://creativecommons.org/licenses/by-nc/4.0/" }]
+		}]);
+		(0, node_assert.deepStrictEqual)(esm_default.callHistory.calls(url).length, 0);
+	});
 	await t.test("deny non-HTTP/HTTPS", async () => {
 		await (0, node_assert.rejects)(() => fetchDocumentLoader("ftp://localhost"), require_url.UrlError);
 	});

package/dist/tests/docloader.test.mjs

@@ -1,5 +1,5 @@
-import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-B112Mks-.mjs";
-import { n as MAX_BODY_SIZE, r as readBoundedText } from "./body-wOtDIud6.mjs";
+import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-DlZHvlsq.mjs";
+import { n as MAX_BODY_SIZE, r as readBoundedText } from "./body-DkPsw4D7.mjs";
 import { t as HttpHeaderLink } from "./link-NUUWCdnK.mjs";
 import { o as validatePublicUrl, t as UrlError } from "./url-DzlMS01z.mjs";
 import { test } from "node:test";
@@ -9,6 +9,7 @@ import { deepStrictEqual, ok, rejects } from "node:assert";
 import dns from "node:dns/promises";
 import { createServer } from "node:http";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
+import jsonld from "jsonld/dist/jsonld.esm.js";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -1343,6 +1344,18 @@ var cid_v1_default = { "@context": {
 	}
 } };
 //#endregion
+//#region src/contexts/fep-6757.json
+var fep_6757_default = { "@context": {
+	"license": {
+		"@id": "http://purl.org/dc/terms/license",
+		"@type": "@id"
+	},
+	"preferredLicense": {
+		"@id": "https://w3id.org/fep/6757#preferredLicense",
+		"@type": "@id"
+	}
+} };
+//#endregion
 //#region src/contexts/fep-7aa9.json
 var fep_7aa9_default = { "@context": {
 	"FeaturedCollection": "https://w3id.org/fep/7aa9#FeaturedCollection",
@@ -5643,6 +5656,7 @@ const preloadedContexts = {
 	"https://www.w3.org/ns/cid/v1": cid_v1_default,
 	"https://w3id.org/fep/ef61": fep_ef61_default,
 	"https://w3id.org/fep/7aa9": fep_7aa9_default,
+	"https://w3id.org/fep/6757": fep_6757_default,
 	"https://join-lemmy.org/context.json": join_lemmy_default,
 	"http://joinmastodon.org/ns": { "@context": {
 		"toot": "http://joinmastodon.org/ns#",
@@ -5784,6 +5798,7 @@ async function getRemoteDocument(url, response, fetch) {
 * - <https://w3id.org/security/multikey/v1>
 * - <https://w3id.org/fep/ef61>
 * - <https://w3id.org/fep/7aa9>
+* - <https://w3id.org/fep/6757>
 * - <https://purl.archive.org/socialweb/webfinger>
 * - <http://schema.org/>
 * @param options Options for the document loader.
@@ -5872,6 +5887,9 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 	return (url, options) => load(url, options);
 }
 //#endregion
+//#region src/jsonld.ts
+var jsonld_default = jsonld;
+//#endregion
 //#region src/docloader.test.ts
 test("new FetchError()", () => {
 	const e = new FetchError("https://example.com/", "An error message.");
@@ -6150,6 +6168,35 @@ test("getDocumentLoader()", async (t) => {
 		});
 		deepStrictEqual(esm_default.callHistory.calls(url).length, 0);
 	});
+	esm_default.get("https://w3id.org/fep/6757", { status: 502 });
+	await t.test("preloaded FEP-6757 context", async () => {
+		const url = "https://w3id.org/fep/6757";
+		deepStrictEqual(await fetchDocumentLoader(url), {
+			contextUrl: null,
+			documentUrl: url,
+			document: { "@context": {
+				license: {
+					"@id": "http://purl.org/dc/terms/license",
+					"@type": "@id"
+				},
+				preferredLicense: {
+					"@id": "https://w3id.org/fep/6757#preferredLicense",
+					"@type": "@id"
+				}
+			} }
+		});
+		deepStrictEqual(await jsonld_default.expand({
+			"@context": ["https://www.w3.org/ns/activitystreams", url],
+			type: "Person",
+			license: "https://creativecommons.org/licenses/by/4.0/",
+			preferredLicense: "https://creativecommons.org/licenses/by-nc/4.0/"
+		}, { documentLoader: fetchDocumentLoader }), [{
+			"@type": ["https://www.w3.org/ns/activitystreams#Person"],
+			"http://purl.org/dc/terms/license": [{ "@id": "https://creativecommons.org/licenses/by/4.0/" }],
+			"https://w3id.org/fep/6757#preferredLicense": [{ "@id": "https://creativecommons.org/licenses/by-nc/4.0/" }]
+		}]);
+		deepStrictEqual(esm_default.callHistory.calls(url).length, 0);
+	});
 	await t.test("deny non-HTTP/HTTPS", async () => {
 		await rejects(() => fetchDocumentLoader("ftp://localhost"), UrlError);
 	});

package/dist/tests/{request-DcF60AOA.cjs → request-ClhOmVbs.cjs}

@@ -3,7 +3,7 @@ let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.31-dev.2273+bf0ebffc";
+var version = "2.0.31-dev.2297+58cbc917";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/{request-B112Mks-.mjs → request-DlZHvlsq.mjs}

@@ -1,7 +1,7 @@
 import process from "node:process";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.31-dev.2273+bf0ebffc";
+var version = "2.0.31-dev.2297+58cbc917";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/request.test.cjs

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-DcF60AOA.cjs");
+const require_request = require("./request-ClhOmVbs.cjs");
 let node_test = require("node:test");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);

package/dist/tests/request.test.mjs

@@ -1,4 +1,4 @@
-import { o as version, r as getUserAgent } from "./request-B112Mks-.mjs";
+import { o as version, r as getUserAgent } from "./request-DlZHvlsq.mjs";
 import { test } from "node:test";
 import process from "node:process";
 import { deepStrictEqual } from "node:assert";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.0.31-dev.2273+bf0ebffc",
+  "version": "2.0.31-dev.2297+58cbc917",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",

package/src/contexts/fep-6757.json

@@ -0,0 +1,12 @@
+{
+  "@context": {
+    "license": {
+      "@id": "http://purl.org/dc/terms/license",
+      "@type": "@id"
+    },
+    "preferredLicense": {
+      "@id": "https://w3id.org/fep/6757#preferredLicense",
+      "@type": "@id"
+    }
+  }
+}

package/src/contexts.ts

@@ -3,6 +3,7 @@
 // cSpell: disable
 
 import cidV1Context from "./contexts/cid-v1.json" with { type: "json" };
+import fep6757 from "./contexts/fep-6757.json" with { type: "json" };
 import fep7aa9 from "./contexts/fep-7aa9.json" with { type: "json" };
 import fepEf61 from "./contexts/fep-ef61.json" with { type: "json" };
 import joinLemmyContext from "./contexts/join-lemmy.json" with { type: "json" };
@@ -4345,6 +4346,13 @@ const preloadedContexts: Record<string, unknown> = {
   //      https://github.com/fedify-dev/fedify/issues/1078
   "https://w3id.org/fep/7aa9": fep7aa9,
 
+  // The FEP-6757 context is hosted on Codeberg Pages, whose outages can
+  // prevent documents with license metadata from being parsed.  Resolve it
+  // locally so parsing does not depend on the remote context server.
+  // See: https://w3id.org/fep/6757
+  //      https://github.com/fedify-dev/fedify/issues/1211
+  "https://w3id.org/fep/6757": fep6757,
+
   // Lemmy's context document is served as application/json without the JSON-LD
   // context Link header.  The default document loader treats that as a regular
   // JSON response instead of a JSON-LD context, so every Lemmy activity that

package/src/docloader.test.ts

@@ -8,6 +8,7 @@ import { gzipSync } from "node:zlib";
 import preloadedContexts from "./contexts.ts";
 import cidV1Context from "./contexts/cid-v1.json" with { type: "json" };
 import { getDocumentLoader, getRemoteDocument } from "./docloader.ts";
+import jsonld from "./jsonld.ts";
 import { FetchError } from "./request.ts";
 import { UrlError } from "./url.ts";
 
@@ -367,6 +368,47 @@ test("getDocumentLoader()", async (t) => {
     deepStrictEqual(fetchMock.callHistory.calls(url).length, 0);
   });
 
+  // A Codeberg Pages outage must not prevent loading or expanding FEP-6757.
+  // See: https://github.com/fedify-dev/fedify/issues/1211
+  fetchMock.get("https://w3id.org/fep/6757", { status: 502 });
+  await t.test("preloaded FEP-6757 context", async () => {
+    const url = "https://w3id.org/fep/6757";
+    deepStrictEqual(await fetchDocumentLoader(url), {
+      contextUrl: null,
+      documentUrl: url,
+      document: {
+        "@context": {
+          license: {
+            "@id": "http://purl.org/dc/terms/license",
+            "@type": "@id",
+          },
+          preferredLicense: {
+            "@id": "https://w3id.org/fep/6757#preferredLicense",
+            "@type": "@id",
+          },
+        },
+      },
+    });
+    deepStrictEqual(
+      await jsonld.expand({
+        "@context": ["https://www.w3.org/ns/activitystreams", url],
+        type: "Person",
+        license: "https://creativecommons.org/licenses/by/4.0/",
+        preferredLicense: "https://creativecommons.org/licenses/by-nc/4.0/",
+      }, { documentLoader: fetchDocumentLoader }),
+      [{
+        "@type": ["https://www.w3.org/ns/activitystreams#Person"],
+        "http://purl.org/dc/terms/license": [{
+          "@id": "https://creativecommons.org/licenses/by/4.0/",
+        }],
+        "https://w3id.org/fep/6757#preferredLicense": [{
+          "@id": "https://creativecommons.org/licenses/by-nc/4.0/",
+        }],
+      }],
+    );
+    deepStrictEqual(fetchMock.callHistory.calls(url).length, 0);
+  });
+
   await t.test("deny non-HTTP/HTTPS", async () => {
     await rejects(
       () => fetchDocumentLoader("ftp://localhost"),

package/src/docloader.ts

@@ -280,6 +280,7 @@ export interface GetDocumentLoaderOptions extends DocumentLoaderFactoryOptions {
  * - <https://w3id.org/security/multikey/v1>
  * - <https://w3id.org/fep/ef61>
  * - <https://w3id.org/fep/7aa9>
+ * - <https://w3id.org/fep/6757>
  * - <https://purl.archive.org/socialweb/webfinger>
  * - <http://schema.org/>
  * @param options Options for the document loader.