@fedify/vocab-runtime 2.0.31-dev.2306 → 2.0.31-dev.2310

package/dist/tests/docloader.test.mjs

@@ -1,12 +1,12 @@
-import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-JVGlYdPG.mjs";
-import { n as MAX_BODY_SIZE, r as readBoundedText } from "./body-CGeu_wlY.mjs";
+import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-DDAEJJqw.mjs";
+import { n as MAX_BODY_SIZE, r as readBoundedText } from "./body-DhJNq-PQ.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";
 import { gzipSync } from "node:zlib";
 import { configure, getLogger, reset } from "@logtape/logtape";
 import { deepStrictEqual, ok, rejects } from "node:assert";
 import dns from "node:dns/promises";
+import { test } from "@fedify/fixture";
 import { createServer } from "node:http";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import jsonld from "jsonld/dist/jsonld.esm.js";
@@ -5941,7 +5941,7 @@ test("getDocumentLoader()", async (t) => {
 		name: "Fetched object",
 		type: "Object"
 	} });
-	await t.test("ok", async () => {
+	await t.step("ok", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/object"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/object",
@@ -5984,7 +5984,7 @@ test("getDocumentLoader()", async (t) => {
 			Link: "<https://example.com/object>; rel=\"alternate\"; type=\"application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"\""
 		}
 	});
-	await t.test("Link header", async () => {
+	await t.step("Link header", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/link-ctx"), {
 			contextUrl: "https://www.w3.org/ns/activitystreams",
 			documentUrl: "https://example.com/link-ctx",
@@ -6005,7 +6005,7 @@ test("getDocumentLoader()", async (t) => {
 			}
 		});
 	});
-	await t.test("Link header relative url", async () => {
+	await t.step("Link header relative url", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/link-ctx"), {
 			contextUrl: "https://www.w3.org/ns/activitystreams",
 			documentUrl: "https://example.com/link-ctx",
@@ -6026,7 +6026,7 @@ test("getDocumentLoader()", async (t) => {
 			}
 		});
 	});
-	await t.test("wrong Link header syntax", async () => {
+	await t.step("wrong Link header syntax", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/obj-w-wrong-link"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/obj-w-wrong-link",
@@ -6050,7 +6050,7 @@ test("getDocumentLoader()", async (t) => {
       </html>`,
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("HTML <link>", async () => {
+	await t.step("HTML <link>", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/html-link"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/object",
@@ -6074,7 +6074,7 @@ test("getDocumentLoader()", async (t) => {
       </html>`,
 		headers: { "Content-Type": "application/xhtml+xml; charset=utf-8" }
 	});
-	await t.test("XHTML <link>", async () => {
+	await t.step("XHTML <link>", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/xhtml-link"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/object",
@@ -6100,7 +6100,7 @@ test("getDocumentLoader()", async (t) => {
       </html>`,
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("HTML <a>", async () => {
+	await t.step("HTML <a>", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/html-a"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/object",
@@ -6121,7 +6121,7 @@ test("getDocumentLoader()", async (t) => {
 		},
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("Wrong Content-Type", async () => {
+	await t.step("Wrong Content-Type", async () => {
 		deepStrictEqual(await fetchDocumentLoader("https://example.com/wrong-content-type"), {
 			contextUrl: null,
 			documentUrl: "https://example.com/wrong-content-type",
@@ -6134,10 +6134,10 @@ test("getDocumentLoader()", async (t) => {
 		});
 	});
 	esm_default.get("https://example.com/404", { status: 404 });
-	await t.test("not ok", async () => {
+	await t.step("not ok", async () => {
 		await rejects(() => fetchDocumentLoader("https://example.com/404"), FetchError, "HTTP 404: https://example.com/404");
 	});
-	await t.test("preloaded contexts", async () => {
+	await t.step("preloaded contexts", async () => {
 		for (const [url, document] of Object.entries(preloadedContexts)) deepStrictEqual(await fetchDocumentLoader(url), {
 			contextUrl: null,
 			documentUrl: url,
@@ -6145,7 +6145,7 @@ test("getDocumentLoader()", async (t) => {
 		});
 	});
 	esm_default.get("https://www.w3.org/ns/cid/v1", { status: 503 });
-	await t.test("preloaded CID v1 context", async () => {
+	await t.step("preloaded CID v1 context", async () => {
 		const url = "https://www.w3.org/ns/cid/v1";
 		deepStrictEqual(await fetchDocumentLoader(url), {
 			contextUrl: null,
@@ -6153,7 +6153,7 @@ test("getDocumentLoader()", async (t) => {
 			document: cid_v1_default
 		});
 	});
-	await t.test("preloaded FEP-ef61 context", async () => {
+	await t.step("preloaded FEP-ef61 context", async () => {
 		const url = "https://w3id.org/fep/ef61";
 		ok(url in preloadedContexts);
 		deepStrictEqual(await fetchDocumentLoader(url), {
@@ -6170,7 +6170,7 @@ test("getDocumentLoader()", async (t) => {
 		});
 	});
 	esm_default.get("https://w3id.org/fep/7aa9", { status: 502 });
-	await t.test("preloaded FEP-7aa9 context", async () => {
+	await t.step("preloaded FEP-7aa9 context", async () => {
 		const url = "https://w3id.org/fep/7aa9";
 		deepStrictEqual(await fetchDocumentLoader(url), {
 			contextUrl: null,
@@ -6201,7 +6201,7 @@ 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 () => {
+	await t.step("preloaded FEP-6757 context", async () => {
 		const url = "https://w3id.org/fep/6757";
 		deepStrictEqual(await fetchDocumentLoader(url), {
 			contextUrl: null,
@@ -6230,7 +6230,7 @@ test("getDocumentLoader()", async (t) => {
 		deepStrictEqual(esm_default.callHistory.calls(url).length, 0);
 	});
 	esm_default.get("https://w3id.org/fep/22cd", { status: 502 });
-	await t.test("preloaded FEP-22cd context", async () => {
+	await t.step("preloaded FEP-22cd context", async () => {
 		const url = "https://w3id.org/fep/22cd";
 		const articleId = "https://example.com/articles/1";
 		const translatorId = "https://example.com/users/alice";
@@ -6308,7 +6308,7 @@ test("getDocumentLoader()", async (t) => {
 		deepStrictEqual(esm_default.callHistory.calls(url).length, 0);
 		deepStrictEqual(esm_default.callHistory.calls("https://www.w3.org/ns/activitystreams").length, 0);
 	});
-	await t.test("deny non-HTTP/HTTPS", async () => {
+	await t.step("deny non-HTTP/HTTPS", async () => {
 		await rejects(() => fetchDocumentLoader("ftp://localhost"), UrlError);
 	});
 	esm_default.get("https://example.com/localhost-redirect", {
@@ -6333,13 +6333,13 @@ test("getDocumentLoader()", async (t) => {
 		name: "Fetched object",
 		type: "Object"
 	} });
-	await t.test("allowPrivateAddress: false", async () => {
+	await t.step("allowPrivateAddress: false", async () => {
 		await rejects(() => fetchDocumentLoader("https://localhost/object"), UrlError);
 		await rejects(() => fetchDocumentLoader("https://example.com/localhost-redirect"), UrlError);
 		await rejects(() => fetchDocumentLoader("https://example.com/localhost-link"), UrlError);
 	});
 	const fetchDocumentLoader2 = getDocumentLoader({ allowPrivateAddress: true });
-	await t.test("allowPrivateAddress: true", async () => {
+	await t.step("allowPrivateAddress: true", async () => {
 		const expected = {
 			contextUrl: null,
 			documentUrl: "https://localhost/object",
@@ -6362,7 +6362,7 @@ test("getDocumentLoader()", async (t) => {
 			headers: { Location: `https://example.com/too-many-redirects/${Number(cl.url.split("/").at(-1)) + 1}` }
 		};
 	});
-	await t.test("too many redirects", async () => {
+	await t.step("too many redirects", async () => {
 		redirectAttempts = 0;
 		await rejects(() => fetchDocumentLoader("https://example.com/too-many-redirects/0"), FetchError, "Too many redirections");
 		deepStrictEqual(redirectAttempts, 21);
@@ -6382,7 +6382,7 @@ test("getDocumentLoader()", async (t) => {
 			headers: { Location: "https://example.com/redirect-loop-a" }
 		};
 	});
-	await t.test("redirect loop", async () => {
+	await t.step("redirect loop", async () => {
 		loopAttempts = 0;
 		await rejects(() => fetchDocumentLoader("https://example.com/redirect-loop-a"), FetchError, "Redirect loop detected");
 		deepStrictEqual(loopAttempts, 2);
@@ -6395,7 +6395,7 @@ test("getDocumentLoader()", async (t) => {
 			headers: { Location: "/redirect-loop-relative" }
 		};
 	});
-	await t.test("redirect loop with relative location", async () => {
+	await t.step("redirect loop with relative location", async () => {
 		relativeLoopAttempts = 0;
 		await rejects(() => fetchDocumentLoader("https://example.com/redirect-loop-relative"), FetchError, "Redirect loop detected");
 		deepStrictEqual(relativeLoopAttempts, 1);
@@ -6405,7 +6405,7 @@ test("getDocumentLoader()", async (t) => {
 		body: maliciousPayload,
 		headers: { "Content-Type": "text/html; charset=utf-8" }
 	});
-	await t.test("ReDoS resistance (CVE-2025-68475)", async () => {
+	await t.step("ReDoS resistance (CVE-2025-68475)", async () => {
 		const start = performance.now();
 		await rejects(() => fetchDocumentLoader("https://example.com/redos"), SyntaxError);
 		const elapsed = performance.now() - start;
@@ -6491,16 +6491,13 @@ test("getRemoteDocument() bounds JSON by default", async () => {
 	deepStrictEqual(pulls, 257);
 });
 test("getDocumentLoader() logs DNS failures as such", async (t) => {
-	if ("Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted") {
-		t.skip("requires the net permission");
-		return;
-	}
+	if ("Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted") throw new Error("This DNS test requires Deno network permission (--allow-net).");
 	const loader = getDocumentLoader();
 	for (const result of [
 		"throws",
 		"empty",
 		"private"
-	]) await t.test(result, async () => {
+	]) await t.step(result, async () => {
 		const originalLookup = dns.lookup;
 		dns.lookup = (() => result === "throws" ? Promise.reject(/* @__PURE__ */ new Error("Resolver unavailable")) : Promise.resolve(result === "empty" ? [] : [{
 			address: "127.0.0.1",
@@ -6555,7 +6552,7 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
 		"header",
 		"html",
 		"mixed"
-	]) for (const hops of [20, 21]) await t.test(`${mode}: ${hops} hops`, async () => {
+	]) for (const hops of [20, 21]) await t.step(`${mode}: ${hops} hops`, async () => {
 		esm_default.mockGlobal();
 		let requests = 0;
 		esm_default.get(`begin:${base}`, ({ url }) => {
@@ -6584,7 +6581,7 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
 		"alternate-redirect",
 		"redirect-alternate",
 		"redirect-intermediate"
-	]) await t.test(`${mode}: cycle`, async () => {
+	]) await t.step(`${mode}: cycle`, async () => {
 		esm_default.mockGlobal();
 		let requests = 0;
 		esm_default.get(`begin:${base}`, ({ url }) => {
@@ -6606,7 +6603,7 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
 			esm_default.hardReset();
 		}
 	});
-	await t.test("alternate followed by 20 redirects shares the limit", async () => {
+	await t.step("alternate followed by 20 redirects shares the limit", async () => {
 		esm_default.mockGlobal();
 		let requests = 0;
 		esm_default.get(`begin:${base}`, ({ url }) => {
@@ -6626,7 +6623,7 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
 			esm_default.hardReset();
 		}
 	});
-	await t.test("relative alternate after redirect and isolated calls", async () => {
+	await t.step("relative alternate after redirect and isolated calls", async () => {
 		esm_default.mockGlobal();
 		esm_default.get(`${base}start`, Response.redirect(`${base}html`, 302));
 		esm_default.get(`${base}html`, alternate("./document", true));
@@ -6653,7 +6650,7 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
 test("getDocumentLoader() preserves cancellation across alternates", async (t) => {
 	const base = "https://example.com/alternate-abort/";
 	const loader = getDocumentLoader({ allowPrivateAddress: true });
-	for (const html of [false, true]) await t.test(html ? "HTML" : "Link header", async () => {
+	for (const html of [false, true]) await t.step(html ? "HTML" : "Link header", async () => {
 		esm_default.mockGlobal();
 		const controller = new AbortController();
 		let requests = 0;

package/dist/tests/langstr.test.cjs

@@ -1,4 +1,5 @@
 const require_chunk = require("./chunk-Do9eywBl.cjs");
+const require_langtag = require("./langtag-Bm8oKhIO.cjs");
 let node_test = require("node:test");
 let node_assert = require("node:assert");
 let node_util = require("node:util");
@@ -17,11 +18,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(require_langtag.normalizeLanguageTag(language)) : language;
 	}
 };
 LanguageString.prototype[Symbol.for("Deno.customInspect")] = function(inspect, options) {
@@ -38,6 +41,13 @@ LanguageString.prototype[Symbol.for("nodejs.util.inspect.custom")] = function(_d
 	(0, node_assert.deepStrictEqual)(langStr.locale, new Intl.Locale("en"));
 	(0, node_assert.deepStrictEqual)(new LanguageString("Hello", new Intl.Locale("en")), langStr);
 });
+(0, node_test.test)("new LanguageString() with extlang tags", () => {
+	(0, node_assert.deepStrictEqual)(new LanguageString("你好", "zh-YUE").locale.baseName, "yue");
+	(0, node_assert.deepStrictEqual)(new LanguageString("你好", "zh-yue-HK").locale.baseName, "yue-HK");
+	(0, node_assert.deepStrictEqual)(new LanguageString("你好", "zh-cmn-Hant").locale.baseName, new Intl.Locale("cmn-Hant").baseName);
+	(0, node_assert.throws)(() => new LanguageString("Hello", "en-USA"), RangeError);
+	(0, node_assert.throws)(() => new LanguageString("你好", "zh-yue-"), RangeError);
+});
 (0, node_test.test)("Deno.inspect(LanguageString)", () => {
 	const langStr = new LanguageString("Hello, 'world'", "en");
 	(0, node_assert.deepStrictEqual)(node_util.default.inspect(langStr, { colors: false }), "<en> \"Hello, 'world'\"");

package/dist/tests/langstr.test.mjs

@@ -1,5 +1,6 @@
+import { t as normalizeLanguageTag } from "./langtag-QZZgy903.mjs";
 import { test } from "node:test";
-import { deepStrictEqual } from "node:assert";
+import { deepStrictEqual, throws } from "node:assert";
 import util from "node:util";
 //#region src/langstr.ts
 /**
@@ -15,11 +16,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) {
@@ -36,6 +39,13 @@ test("new LanguageString()", () => {
 	deepStrictEqual(langStr.locale, new Intl.Locale("en"));
 	deepStrictEqual(new LanguageString("Hello", new Intl.Locale("en")), langStr);
 });
+test("new LanguageString() with extlang tags", () => {
+	deepStrictEqual(new LanguageString("你好", "zh-YUE").locale.baseName, "yue");
+	deepStrictEqual(new LanguageString("你好", "zh-yue-HK").locale.baseName, "yue-HK");
+	deepStrictEqual(new LanguageString("你好", "zh-cmn-Hant").locale.baseName, new Intl.Locale("cmn-Hant").baseName);
+	throws(() => new LanguageString("Hello", "en-USA"), RangeError);
+	throws(() => new LanguageString("你好", "zh-yue-"), RangeError);
+});
 test("Deno.inspect(LanguageString)", () => {
 	const langStr = new LanguageString("Hello, 'world'", "en");
 	deepStrictEqual(util.inspect(langStr, { colors: false }), "<en> \"Hello, 'world'\"");

package/dist/tests/langtag-Bm8oKhIO.cjs

@@ -0,0 +1,50 @@
+//#region src/langtag.ts
+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`.
+*
+* NOTE: This function is marked as internal in the 2.0.x–2.4.x patch
+* releases.  When merging it into the *main* branch, remove the `@internal`
+* tag, formalize it as a public API (`@since 2.5.0`), and add it to
+* the changelog fragment.
+*
+* [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.
+* @internal
+*/
+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("-");
+}
+//#endregion
+Object.defineProperty(exports, "normalizeLanguageTag", {
+	enumerable: true,
+	get: function() {
+		return normalizeLanguageTag;
+	}
+});

package/dist/tests/langtag-QZZgy903.mjs

@@ -0,0 +1,45 @@
+//#region src/langtag.ts
+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`.
+*
+* NOTE: This function is marked as internal in the 2.0.x–2.4.x patch
+* releases.  When merging it into the *main* branch, remove the `@internal`
+* tag, formalize it as a public API (`@since 2.5.0`), and add it to
+* the changelog fragment.
+*
+* [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.
+* @internal
+*/
+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("-");
+}
+//#endregion
+export { normalizeLanguageTag as t };

package/dist/tests/langtag.test.cjs

@@ -0,0 +1,46 @@
+require("./chunk-Do9eywBl.cjs");
+const require_langtag = require("./langtag-Bm8oKhIO.cjs");
+let node_test = require("node:test");
+let node_assert = require("node:assert");
+//#region src/langtag.test.ts
+(0, node_test.test)("normalizeLanguageTag() removes extlang subtags", () => {
+	for (const [input, expected] of [
+		["zh-yue", "yue"],
+		["zh-YUE", "yue"],
+		["ZH-Yue-hk", "yue-hk"],
+		["zh-yue-HK", "yue-HK"],
+		["zh-cmn-Hant", "cmn-Hant"],
+		["zh-yue-u-nu-hanidec", "yue-u-nu-hanidec"],
+		["sgn-ase", "ase"],
+		["ar-arz", "arz"],
+		["ms-zlm", "zlm"],
+		["kok-gom", "gom"],
+		["koK-gom", "gom"],
+		["lv-ltg", "ltg"],
+		["sw-swc", "swc"],
+		["uz-uzs", "uzs"],
+		["zh-yue-cmn", "yue-cmn"],
+		["zh-yue-", "yue-"]
+	]) (0, node_assert.deepStrictEqual)(require_langtag.normalizeLanguageTag(input), expected, input);
+});
+(0, node_test.test)("normalizeLanguageTag() leaves other tags unchanged", () => {
+	for (const tag of [
+		"",
+		"en",
+		"en-US",
+		"en-USA",
+		"en-yue",
+		"zh",
+		"zh-Hant-TW",
+		"yue",
+		"yue-HK",
+		"x-private",
+		"i-klingon",
+		"zh-min-nan",
+		"koK-gom",
+		"zh-yuK",
+		"constructor-yue",
+		"toString-yue"
+	]) (0, node_assert.deepStrictEqual)(require_langtag.normalizeLanguageTag(tag), tag, tag);
+});
+//#endregion

package/dist/tests/langtag.test.d.cts

@@ -0,0 +1 @@
+export { };

package/dist/tests/langtag.test.d.mts

@@ -0,0 +1 @@
+export { };

package/dist/tests/langtag.test.mjs

@@ -0,0 +1,46 @@
+import { t as normalizeLanguageTag } from "./langtag-QZZgy903.mjs";
+import { test } from "node:test";
+import { deepStrictEqual } from "node:assert";
+//#region src/langtag.test.ts
+test("normalizeLanguageTag() removes extlang subtags", () => {
+	for (const [input, expected] of [
+		["zh-yue", "yue"],
+		["zh-YUE", "yue"],
+		["ZH-Yue-hk", "yue-hk"],
+		["zh-yue-HK", "yue-HK"],
+		["zh-cmn-Hant", "cmn-Hant"],
+		["zh-yue-u-nu-hanidec", "yue-u-nu-hanidec"],
+		["sgn-ase", "ase"],
+		["ar-arz", "arz"],
+		["ms-zlm", "zlm"],
+		["kok-gom", "gom"],
+		["koK-gom", "gom"],
+		["lv-ltg", "ltg"],
+		["sw-swc", "swc"],
+		["uz-uzs", "uzs"],
+		["zh-yue-cmn", "yue-cmn"],
+		["zh-yue-", "yue-"]
+	]) deepStrictEqual(normalizeLanguageTag(input), expected, input);
+});
+test("normalizeLanguageTag() leaves other tags unchanged", () => {
+	for (const tag of [
+		"",
+		"en",
+		"en-US",
+		"en-USA",
+		"en-yue",
+		"zh",
+		"zh-Hant-TW",
+		"yue",
+		"yue-HK",
+		"x-private",
+		"i-klingon",
+		"zh-min-nan",
+		"koK-gom",
+		"zh-yuK",
+		"constructor-yue",
+		"toString-yue"
+	]) deepStrictEqual(normalizeLanguageTag(tag), tag, tag);
+});
+//#endregion
+export {};

package/dist/tests/multibase/multibase.test.cjs

@@ -1,9 +1,9 @@
 require("../chunk-Do9eywBl.cjs");
 const require_multibase = require("../multibase-CnmModw0.cjs");
-let node_test = require("node:test");
 let node_assert = require("node:assert");
+let _fedify_fixture = require("@fedify/fixture");
 //#region src/multibase/multibase.test.ts
-(0, node_test.test)("multibase.encode and decode", async (t) => {
+(0, _fedify_fixture.test)("multibase.encode and decode", async (t) => {
 	const testCases = [
 		[
 			"base16",
@@ -316,22 +316,22 @@ let node_assert = require("node:assert");
 			"Uw7fDr8O_8J-lsMO3w6_Dv_CfmI7wn6W28J-krw=="
 		]
 	];
-	for (const [name, input, expectedOutput] of testCases) await t.test(`Encoding/Decoding ${name} with ${input}`, () => {
+	for (const [name, input, expectedOutput] of testCases) await t.step(`Encoding/Decoding ${name} with ${input}`, () => {
 		(0, node_assert.deepStrictEqual)(require_multibase.decodeText(require_multibase.encodeMultibase(name, require_multibase.encodeText(input))), expectedOutput, `Encoding ${name} failed`);
 		(0, node_assert.deepStrictEqual)(require_multibase.decodeMultibase(expectedOutput), require_multibase.encodeText(input), `Decoding ${name} failed`);
 		(0, node_assert.deepStrictEqual)(require_multibase.decodeMultibase(require_multibase.encodeText(expectedOutput)), require_multibase.encodeText(input), `Decoding buffer of ${name} failed`);
 	});
-	await t.test("should allow base32pad full alphabet", () => {
+	await t.step("should allow base32pad full alphabet", () => {
 		const decoded = require_multibase.decodeMultibase("ctimaq4ygg2iegci7");
 		(0, node_assert.deepStrictEqual)(require_multibase.decodeMultibase(require_multibase.encodeMultibase("c", decoded)), decoded);
 	});
 });
-(0, node_test.test)("constants", async (t) => {
-	await t.test("constants indexed by name", () => {
+(0, _fedify_fixture.test)("constants", async (t) => {
+	await t.step("constants indexed by name", () => {
 		const names$1 = require_multibase.names;
 		(0, node_assert.deepStrictEqual)(Object.keys(names$1).length, 23);
 	});
-	await t.test("constants indexed by code", () => {
+	await t.step("constants indexed by code", () => {
 		const codes$1 = require_multibase.codes;
 		(0, node_assert.deepStrictEqual)(Object.keys(codes$1).length, 23);
 	});

package/dist/tests/multibase/multibase.test.mjs

@@ -1,6 +1,6 @@
 import { a as decodeText, i as names, n as encodeMultibase, o as encodeText, r as codes, t as decodeMultibase } from "../multibase-DLBufb99.mjs";
-import { test } from "node:test";
 import { deepStrictEqual } from "node:assert";
+import { test } from "@fedify/fixture";
 //#region src/multibase/multibase.test.ts
 test("multibase.encode and decode", async (t) => {
 	const testCases = [
@@ -315,21 +315,21 @@ test("multibase.encode and decode", async (t) => {
 			"Uw7fDr8O_8J-lsMO3w6_Dv_CfmI7wn6W28J-krw=="
 		]
 	];
-	for (const [name, input, expectedOutput] of testCases) await t.test(`Encoding/Decoding ${name} with ${input}`, () => {
+	for (const [name, input, expectedOutput] of testCases) await t.step(`Encoding/Decoding ${name} with ${input}`, () => {
 		deepStrictEqual(decodeText(encodeMultibase(name, encodeText(input))), expectedOutput, `Encoding ${name} failed`);
 		deepStrictEqual(decodeMultibase(expectedOutput), encodeText(input), `Decoding ${name} failed`);
 		deepStrictEqual(decodeMultibase(encodeText(expectedOutput)), encodeText(input), `Decoding buffer of ${name} failed`);
 	});
-	await t.test("should allow base32pad full alphabet", () => {
+	await t.step("should allow base32pad full alphabet", () => {
 		const decoded = decodeMultibase("ctimaq4ygg2iegci7");
 		deepStrictEqual(decodeMultibase(encodeMultibase("c", decoded)), decoded);
 	});
 });
 test("constants", async (t) => {
-	await t.test("constants indexed by name", () => {
+	await t.step("constants indexed by name", () => {
 		deepStrictEqual(Object.keys(names).length, 23);
 	});
-	await t.test("constants indexed by code", () => {
+	await t.step("constants indexed by code", () => {
 		deepStrictEqual(Object.keys(codes).length, 23);
 	});
 });

package/dist/tests/{request-75RoXeN4.cjs → request-CFKB-Yqd.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.2306+e775cf8c";
+var version = "2.0.31-dev.2310+e604de57";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/{request-JVGlYdPG.mjs → request-DDAEJJqw.mjs}

@@ -1,7 +1,7 @@
 import process from "node:process";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.31-dev.2306+e775cf8c";
+var version = "2.0.31-dev.2310+e604de57";
 //#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-75RoXeN4.cjs");
+const require_request = require("./request-CFKB-Yqd.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-JVGlYdPG.mjs";
+import { o as version, r as getUserAgent } from "./request-DDAEJJqw.mjs";
 import { test } from "node:test";
 import process from "node:process";
 import { deepStrictEqual } from "node:assert";