@fedify/relay 2.5.0-dev.2314 → 2.5.0-dev.2327

package/dist/litepub.test.js

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-C7AtHk_U.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-C-Wo6k82.js";
 import { MemoryKvStore, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { deepStrictEqual, ok, strictEqual } from "node:assert";

package/dist/mastodon.test.js

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-C7AtHk_U.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-C-Wo6k82.js";
 import { MemoryKvStore, signJsonLd, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { deepStrictEqual, ok, strictEqual } from "node:assert";

package/dist/mod.d.cts

@@ -1,7 +1,7 @@
 /// <reference lib="esnext.temporal" />
 import { Context, KvStore, MessageQueue } from "@fedify/fedify";
 import { Actor } from "@fedify/vocab";
-//#region ../vocab-runtime/dist/docloader-CYwqh5Df.d.ts
+//#region ../vocab-runtime/dist/docloader-BMHljyYb.d.ts
 /**
 * Options for making `User-Agent` string.
 * @see {@link getUserAgent}

package/dist/mod.d.ts

@@ -1,7 +1,7 @@
 /// <reference lib="esnext.temporal" />
 import { Context, KvStore, MessageQueue } from "@fedify/fedify";
 import { Actor } from "@fedify/vocab";
-//#region ../vocab-runtime/dist/docloader-CYwqh5Df.d.ts
+//#region ../vocab-runtime/dist/docloader-BMHljyYb.d.ts
 /**
 * Options for making `User-Agent` string.
 * @see {@link getUserAgent}

package/dist/{types-C7AtHk_U.js → types-C-Wo6k82.js}

@@ -31,7 +31,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
-//#region ../vocab-runtime/dist/contexts-DPuJ4UYL.js
+//#region ../vocab-runtime/dist/contexts-DWrj4AGR.js
 const preloadedContexts = {
 	"https://www.w3.org/ns/activitystreams": { "@context": {
 		"@vocab": "_:",
@@ -4469,6 +4469,16 @@ const preloadedContexts = {
 			"@type": "@id"
 		}
 	} },
+	"https://w3id.org/fep/6757": { "@context": {
+		"license": {
+			"@id": "http://purl.org/dc/terms/license",
+			"@type": "@id"
+		},
+		"preferredLicense": {
+			"@id": "https://w3id.org/fep/6757#preferredLicense",
+			"@type": "@id"
+		}
+	} },
 	"https://join-lemmy.org/context.json": { "@context": ["https://w3id.org/security/v1", {
 		"as": "https://www.w3.org/ns/activitystreams#",
 		"lemmy": "https://join-lemmy.org/ns#",
@@ -4520,7 +4530,7 @@ const preloadedContexts = {
 		"suspended": "toot:suspended",
 		"attributionDomains": {
 			"@id": "toot:attributionDomains",
-			"@type": "@id"
+			"@container": "@set"
 		}
 	} },
 	"https://purl.archive.org/miscellany": { "@context": {
@@ -26114,7 +26124,7 @@ var require_src = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 require_build();
 var import_src = /* @__PURE__ */ __toESM(require_src(), 1);
 var name = "@fedify/vocab-runtime";
-var version = "2.5.0-dev.2314+d73be480";
+var version = "2.5.0-dev.2327+3a7ba490";
 /**
 * Error thrown when fetching a JSON-LD document failed.
 */
@@ -26764,6 +26774,8 @@ function withDocumentLoaderTimeout(loader, timeout) {
 * - <https://w3id.org/security/multikey/v1>
 * - <https://w3id.org/fep/ef61>
 * - <https://w3id.org/fep/7aa9>
+* - <https://w3id.org/fep/6757>
+* - <https://w3id.org/fep/22cd>
 * - <https://purl.archive.org/socialweb/webfinger>
 * - <http://schema.org/>
 * @param options Options for the document loader.
@@ -27120,6 +27132,43 @@ async function exportSpki(key) {
 }
 new TextDecoder();
 Object.getOwnPropertyDescriptor(ArrayBuffer.prototype, "byteLength")?.get;
+const EXTLANG_PAIRS = new Set(Object.entries({
+	ar: "aao abh abv acm acq acw acx acy adf aeb aec afb ajp apc apd arb arq ars ary arz auz avl ayh ayl ayn ayp bbz pga shu ssh",
+	kok: "gom knn",
+	lv: "ltg lvs",
+	ms: "bjn btj bve bvu coa dup hji jak jax kvb kvr kxd lce lcf liw max meo mfa mfb min mqg msi mui orn ors pel pse tmw urk vkk vkt xmm zlm zmi zsm",
+	sgn: "ads aed aen afg ajs ase asf asp asq asw bfi bfk bog bqn bqy bvl bzs cds csc csd cse csf csg csl csn csq csr csx doq dse dsl dsz dyl ecs ehs esl esn eso eth fcs fse fsl fss gds gse gsg gsm gss gus hab haf hds hks hos hps hsh hsl icl iks ils inl ins ise isg isr jcs jhs jks jls jos jsl jus kgi kvk lbs lgs lls lsb lsc lsg lsl lsn lso lsp lst lsv lsw lsy lws mdl mfs mre msd msr mzc mzg mzy nbs ncs nsi nsl nsp nsr nzs okl pgz pks prl prz psc psd psg psl pso psp psr pys rib rms rnb rsi rsl rsm rsn sdl sfb sfs sgg sgx slf sls sqk sqs sqx ssp ssr svk swl syy szs tse tsm tsq tss tsy tza ugn ugy ukl uks vgt vsi vsl vsv wbs xki xml xms yds ygs yhs ysl ysm zhk zib zsl",
+	sw: "swc swh",
+	uz: "uzn uzs",
+	zh: "cdo cjy cmn cnp cpx csp czh czo gan hak hnm hsn luh lzh mnp nan sjc wuu yue"
+}).flatMap(([prefix, extlangs]) => extlangs.split(" ").map((extlang) => `${prefix}-${extlang}`)));
+const PREFIX_PATTERN = /^[A-Za-z]{2,3}$/;
+const EXTLANG_PATTERN = /^[A-Za-z]{3}$/;
+/**
+* Normalizes a BCP 47 language tag that has an extended language subtag
+* (extlang), such as `zh-yue`, into its canonical form, such as `yue`, as
+* described in [RFC 5646, Section 4.5][1].  `Intl.Locale` rejects extlang
+* tags, so tags should be normalized before being passed to it.
+*
+* Only registered extlangs that follow their registered prefix are removed;
+* any other tag is returned unchanged, so the result still needs to be
+* validated, e.g., by `Intl.Locale`.
+*
+* [1]: https://www.rfc-editor.org/rfc/rfc5646.html#section-4.5
+*
+* @param tag The BCP 47 language tag to normalize.
+* @returns The normalized language tag.
+* @since 2.5.0
+*/
+function normalizeLanguageTag(tag) {
+	const subtags = tag.split("-");
+	if (subtags.length < 2) return tag;
+	const [prefix, extlang, ...rest] = subtags;
+	if (!PREFIX_PATTERN.test(prefix) || !EXTLANG_PATTERN.test(extlang)) return tag;
+	const language = extlang.toLowerCase();
+	if (!EXTLANG_PAIRS.has(`${prefix.toLowerCase()}-${language}`)) return tag;
+	return [language, ...rest].join("-");
+}
 /**
 * A language-tagged string which corresponds to the `rdf:langString` type.
 */
@@ -27133,11 +27182,13 @@ var LanguageString = class extends String {
 	* Constructs a new `LanguageString`.
 	* @param value A string value written in the given language.
 	* @param language The language of the string.  If a string is given, it will
-	*                 be parsed as a `Intl.Locale` object.
+	*                 be parsed as a `Intl.Locale` object.  Extended language
+	*                 subtags are normalized first, e.g., `zh-yue` is parsed as
+	*                 `yue`.
 	*/
 	constructor(value, language) {
 		super(value);
-		this.locale = typeof language === "string" ? new Intl.Locale(language) : language;
+		this.locale = typeof language === "string" ? new Intl.Locale(normalizeLanguageTag(language)) : language;
 	}
 };
 LanguageString.prototype[Symbol.for("Deno.customInspect")] = function(inspect, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/relay",
-  "version": "2.5.0-dev.2314+d73be480",
+  "version": "2.5.0-dev.2327+3a7ba490",
   "description": "ActivityPub relay support for Fedify",
   "keywords": [
     "Fedify",
@@ -47,14 +47,14 @@
   "dependencies": {
     "@logtape/logtape": "^2.2.0",
     "temporal-polyfill": "^1.0.1",
-    "@fedify/fedify": "^2.5.0-dev.2314+d73be480",
-    "@fedify/vocab": "2.5.0-dev.2314+d73be480"
+    "@fedify/fedify": "^2.5.0-dev.2327+3a7ba490",
+    "@fedify/vocab": "2.5.0-dev.2327+3a7ba490"
   },
   "devDependencies": {
     "tsdown": "^0.22.0",
     "typescript": "^6.0.0",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab-runtime": "^2.5.0-dev.2314+d73be480"
+    "@fedify/vocab-runtime": "^2.5.0-dev.2327+3a7ba490"
   },
   "scripts": {
     "build:self": "tsdown",