@fedify/vocab 2.0.31-dev.2297 → 2.0.31-dev.2308

package/deno.json

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

package/dist/mod.cjs

@@ -33,7 +33,7 @@ let _fedify_vocab_runtime_temporal = require("@fedify/vocab-runtime/temporal");
 let es_toolkit = require("es-toolkit");
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.0.31-dev.2297+58cbc917";
+var version = "2.0.31-dev.2308+34090b3a";
 //#endregion
 //#region src/type.ts
 function getTypeId(object) {
@@ -50,7 +50,7 @@ function decodeIri(iri) {
 }
 function isValidLanguageTag(language) {
 	try {
-		new Intl.Locale(language);
+		new Intl.Locale((0, _fedify_vocab_runtime.normalizeLanguageTag)(language));
 		return true;
 	} catch (error) {
 		if (error instanceof RangeError) return false;
@@ -24443,7 +24443,7 @@ var Link = class Link {
 		let _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array = values["https://www.w3.org/ns/activitystreams#hreflang"];
 		for (const v of _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array == null ? [] : _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array.length === 1 && "@list" in _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array[0] ? _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array[0]["@list"] : _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array) {
 			if (v == null) continue;
-			const decoded = new Intl.Locale(v["@value"]);
+			const decoded = new Intl.Locale((0, _fedify_vocab_runtime.normalizeLanguageTag)(v["@value"]));
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang.push(decoded);
 		}

package/dist/mod.js

@@ -4,12 +4,12 @@ import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { domainToASCII, domainToUnicode } from "node:url";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 import { getLogger } from "@logtape/logtape";
-import { LanguageString, LanguageString as LanguageString$1, decodeMultibase, encodeMultibase, exportMultibaseKey, exportSpki, getDocumentLoader, importMultibaseKey, importPem } from "@fedify/vocab-runtime";
+import { LanguageString, LanguageString as LanguageString$1, decodeMultibase, encodeMultibase, exportMultibaseKey, exportSpki, getDocumentLoader, importMultibaseKey, importPem, normalizeLanguageTag } from "@fedify/vocab-runtime";
 import { isTemporalDuration, isTemporalInstant } from "@fedify/vocab-runtime/temporal";
 import { delay } from "es-toolkit";
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.0.31-dev.2297+58cbc917";
+var version = "2.0.31-dev.2308+34090b3a";
 //#endregion
 //#region src/type.ts
 function getTypeId(object) {
@@ -26,7 +26,7 @@ function decodeIri(iri) {
 }
 function isValidLanguageTag(language) {
 	try {
-		new Intl.Locale(language);
+		new Intl.Locale(normalizeLanguageTag(language));
 		return true;
 	} catch (error) {
 		if (error instanceof RangeError) return false;
@@ -24419,7 +24419,7 @@ var Link = class Link {
 		let _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array = values["https://www.w3.org/ns/activitystreams#hreflang"];
 		for (const v of _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array == null ? [] : _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array.length === 1 && "@list" in _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array[0] ? _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array[0]["@list"] : _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array) {
 			if (v == null) continue;
-			const decoded = new Intl.Locale(v["@value"]);
+			const decoded = new Intl.Locale(normalizeLanguageTag(v["@value"]));
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang.push(decoded);
 		}

package/dist-tests/actor.test.mjs

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { b as Service, g as Person, h as Organization, i as Application, l as Group, w as __exportAll } from "./vocab-ChQFW7FV.mjs";
-import { n as version, r as esm_default, t as name } from "./deno-C8GlsHR3.mjs";
+import { b as Service, g as Person, h as Organization, i as Application, l as Group, w as __exportAll } from "./vocab-CDWIsBqv.mjs";
+import { n as version, r as esm_default, t as name } from "./deno-9vYQUuzB.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { test } from "@fedify/fixture";
 import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";

package/dist-tests/{deno-C8GlsHR3.mjs → deno-9vYQUuzB.mjs}

@@ -1,6 +1,6 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { C as __commonJSMin, T as __toESM } from "./vocab-ChQFW7FV.mjs";
+import { C as __commonJSMin, T as __toESM } from "./vocab-CDWIsBqv.mjs";
 //#region ../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js
 var require_glob_to_regexp = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = function(glob, opts) {
@@ -1204,6 +1204,6 @@ var esm_default = new class FetchMock {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.0.31-dev.2297+58cbc917";
+var version = "2.0.31-dev.2308+34090b3a";
 //#endregion
 export { version as n, esm_default as r, name as t };

package/dist-tests/lookup.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { a as Collection, f as Note, g as Person, p as Object$1 } from "./vocab-ChQFW7FV.mjs";
-import { n as version, r as esm_default, t as name } from "./deno-C8GlsHR3.mjs";
+import { a as Collection, f as Note, g as Person, p as Object$1 } from "./vocab-CDWIsBqv.mjs";
+import { n as version, r as esm_default, t as name } from "./deno-9vYQUuzB.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { t as assertInstanceOf } from "./utils-CE8Dk5hm.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/dist-tests/type.test.mjs

@@ -1,6 +1,6 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { g as Person } from "./vocab-ChQFW7FV.mjs";
+import { g as Person } from "./vocab-CDWIsBqv.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { test } from "@fedify/fixture";
 import { deepStrictEqual } from "node:assert/strict";

package/dist-tests/{vocab-ChQFW7FV.mjs → vocab-CDWIsBqv.mjs}

@@ -3,7 +3,7 @@ globalThis.addEventListener = () => {};
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 import { getLogger } from "@logtape/logtape";
-import { LanguageString, decodeMultibase, encodeMultibase, exportMultibaseKey, exportSpki, getDocumentLoader, importMultibaseKey, importPem } from "@fedify/vocab-runtime";
+import { LanguageString, decodeMultibase, encodeMultibase, exportMultibaseKey, exportSpki, getDocumentLoader, importMultibaseKey, importPem, normalizeLanguageTag } from "@fedify/vocab-runtime";
 import { isTemporalDuration, isTemporalInstant } from "@fedify/vocab-runtime/temporal";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
@@ -114,7 +114,7 @@ function decodeIri(iri) {
 }
 function isValidLanguageTag(language) {
 	try {
-		new Intl.Locale(language);
+		new Intl.Locale(normalizeLanguageTag(language));
 		return true;
 	} catch (error) {
 		if (error instanceof RangeError) return false;
@@ -24507,7 +24507,7 @@ var Link = class Link {
 		let _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array = values["https://www.w3.org/ns/activitystreams#hreflang"];
 		for (const v of _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array == null ? [] : _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array.length === 1 && "@list" in _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array[0] ? _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array[0]["@list"] : _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang__array) {
 			if (v == null) continue;
-			const decoded = new Intl.Locale(v["@value"]);
+			const decoded = new Intl.Locale(normalizeLanguageTag(v["@value"]));
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang.push(decoded);
 		}

package/dist-tests/vocab.test.mjs

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { S as vocab_exports, _ as Place, a as Collection, c as Follow, d as Link, f as Note, g as Person, m as OrderedCollectionPage, n as Activity, o as Create, p as Object$1, r as Announce, s as CryptographicKey, t as Accept, u as Hashtag, v as PropertyValue, x as Source, y as Question } from "./vocab-ChQFW7FV.mjs";
+import { S as vocab_exports, _ as Place, a as Collection, c as Follow, d as Link, f as Note, g as Person, m as OrderedCollectionPage, n as Activity, o as Create, p as Object$1, r as Announce, s as CryptographicKey, t as Accept, u as Hashtag, v as PropertyValue, x as Source, y as Question } from "./vocab-CDWIsBqv.mjs";
 import { t as assertInstanceOf } from "./utils-CE8Dk5hm.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { deepStrictEqual, notDeepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";
@@ -189,6 +189,61 @@ test("Note.fromJsonLd() ignores malformed language tags in nested objects", asyn
 	const attachment = (await note.toJsonLd()).attachment;
 	deepStrictEqual(attachment.nameMap, { en: "Valid" });
 });
+test("Note.fromJsonLd() normalizes extlang language tags", async () => {
+	const json = {
+		"@context": "https://www.w3.org/ns/activitystreams",
+		type: "Note",
+		content: "<p>早晨</p>",
+		contentMap: {
+			"zh-YUE": "<p>早晨</p>",
+			"yue": "<p>早晨呀</p>"
+		}
+	};
+	const note = await Note.fromJsonLd(json);
+	deepStrictEqual(note.contents, [
+		"<p>早晨</p>",
+		new LanguageString("<p>早晨呀</p>", "yue"),
+		new LanguageString("<p>早晨</p>", "yue")
+	]);
+	deepStrictEqual(note.contents.map((c) => typeof c === "string" ? null : c.locale.baseName), [
+		null,
+		"yue",
+		"yue"
+	]);
+	deepStrictEqual(await note.toJsonLd(), json);
+	deepStrictEqual((await note.toJsonLd({ format: "compact" })).contentMap, { yue: ["<p>早晨呀</p>", "<p>早晨</p>"] });
+	deepStrictEqual((await note.toJsonLd({ format: "expand" }))[0]["https://www.w3.org/ns/activitystreams#content"], [
+		{ "@value": "<p>早晨</p>" },
+		{
+			"@value": "<p>早晨呀</p>",
+			"@language": "yue"
+		},
+		{
+			"@value": "<p>早晨</p>",
+			"@language": "yue"
+		}
+	]);
+	const expandedNote = await Note.fromJsonLd({
+		"@type": ["https://www.w3.org/ns/activitystreams#Note"],
+		"https://www.w3.org/ns/activitystreams#name": [{
+			"@value": "早晨",
+			"@language": "zh-yue-HK"
+		}]
+	});
+	deepStrictEqual(expandedNote.names, [new LanguageString("早晨", "yue-HK")]);
+	deepStrictEqual(expandedNote.names[0].locale.baseName, "yue-HK");
+});
+test("Note.fromJsonLd() caches original language tags", async () => {
+	const json = {
+		"@context": "https://www.w3.org/ns/activitystreams",
+		type: "Note",
+		contentMap: { "EN-us": "Hello" }
+	};
+	const note = await Note.fromJsonLd(json);
+	deepStrictEqual(note.contents, [new LanguageString("Hello", "en-US")]);
+	deepStrictEqual(note.contents[0].locale.baseName, "en-US");
+	deepStrictEqual(await note.toJsonLd(), json);
+});
 test("Note.toJsonLd()", async () => {
 	const note = new Note({ tags: [new Hashtag({
 		name: "#Fedify",
@@ -763,6 +818,22 @@ test("Link.fromJsonLd()", async () => {
 		"href": "at://did:plc:ia76kvnndjutgedggx2ibrem"
 	})).href, new URL("at://did%3Aplc%3Aia76kvnndjutgedggx2ibrem"));
 });
+test("Link.fromJsonLd() normalizes extlang hreflang", async () => {
+	const link = await Link.fromJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		type: "Link",
+		href: "https://example.com/yue",
+		hreflang: "zh-YUE"
+	});
+	deepStrictEqual(link.language?.baseName, "yue");
+	deepStrictEqual((await link.toJsonLd({ format: "compact" })).hreflang, "yue");
+	await rejects(() => Link.fromJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		type: "Link",
+		href: "https://example.com/en",
+		hreflang: "en-USA"
+	}), RangeError);
+});
 test("Person.fromJsonLd() with relative URLs", async () => {
 	deepStrictEqual((await (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.0.31-dev.2297+58cbc917",
+  "version": "2.0.31-dev.2308+34090b3a",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -46,9 +46,9 @@
     "es-toolkit": "1.43.0",
     "jsonld": "^9.0.0",
     "pkijs": "^3.3.3",
-    "@fedify/vocab-tools": "2.0.31-dev.2297+58cbc917",
-    "@fedify/webfinger": "2.0.31-dev.2297+58cbc917",
-    "@fedify/vocab-runtime": "2.0.31-dev.2297+58cbc917"
+    "@fedify/vocab-tools": "2.0.31-dev.2308+34090b3a",
+    "@fedify/vocab-runtime": "2.0.31-dev.2308+34090b3a",
+    "@fedify/webfinger": "2.0.31-dev.2308+34090b3a"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",

package/src/vocab.test.ts

@@ -305,6 +305,77 @@ test("Note.fromJsonLd() ignores malformed language tags in nested objects", asyn
   deepStrictEqual(attachment.nameMap, { en: "Valid" });
 });
 
+test("Note.fromJsonLd() normalizes extlang language tags", async () => {
+  const json = {
+    "@context": "https://www.w3.org/ns/activitystreams",
+    type: "Note",
+    content: "<p>早晨</p>",
+    contentMap: {
+      "zh-YUE": "<p>早晨</p>",
+      "yue": "<p>早晨呀</p>",
+    },
+  };
+  const note = await Note.fromJsonLd(json);
+  // JSON-LD expansion sorts language map keys, so yue comes before zh-yue:
+  deepStrictEqual(note.contents, [
+    "<p>早晨</p>",
+    new LanguageString("<p>早晨呀</p>", "yue"),
+    new LanguageString("<p>早晨</p>", "yue"),
+  ]);
+  deepStrictEqual(
+    note.contents.map((c) => typeof c === "string" ? null : c.locale.baseName),
+    [null, "yue", "yue"],
+  );
+
+  // The unmodified object is serialized from the cached original document:
+  deepStrictEqual(await note.toJsonLd(), json);
+  const compact = await note.toJsonLd({ format: "compact" }) as Record<
+    string,
+    unknown
+  >;
+  deepStrictEqual(compact.contentMap, {
+    yue: ["<p>早晨呀</p>", "<p>早晨</p>"],
+  });
+  const expanded = await note.toJsonLd({ format: "expand" });
+  deepStrictEqual(
+    (expanded as Record<string, unknown>[])[0][
+      "https://www.w3.org/ns/activitystreams#content"
+    ],
+    [
+      { "@value": "<p>早晨</p>" },
+      { "@value": "<p>早晨呀</p>", "@language": "yue" },
+      { "@value": "<p>早晨</p>", "@language": "yue" },
+    ],
+  );
+
+  const expandedNote = await Note.fromJsonLd({
+    "@type": ["https://www.w3.org/ns/activitystreams#Note"],
+    "https://www.w3.org/ns/activitystreams#name": [
+      { "@value": "早晨", "@language": "zh-yue-HK" },
+    ],
+  });
+  deepStrictEqual(expandedNote.names, [new LanguageString("早晨", "yue-HK")]);
+  deepStrictEqual(
+    (expandedNote.names[0] as LanguageString).locale.baseName,
+    "yue-HK",
+  );
+});
+
+test("Note.fromJsonLd() caches original language tags", async () => {
+  const json = {
+    "@context": "https://www.w3.org/ns/activitystreams",
+    type: "Note",
+    contentMap: { "EN-us": "Hello" },
+  };
+  const note = await Note.fromJsonLd(json);
+  deepStrictEqual(note.contents, [new LanguageString("Hello", "en-US")]);
+  deepStrictEqual(
+    (note.contents[0] as LanguageString).locale.baseName,
+    "en-US",
+  );
+  deepStrictEqual(await note.toJsonLd(), json);
+});
+
 test("Note.toJsonLd()", async () => {
   const note = new Note({
     tags: [
@@ -1151,6 +1222,29 @@ test("Link.fromJsonLd()", async () => {
   );
 });
 
+test("Link.fromJsonLd() normalizes extlang hreflang", async () => {
+  const link = await Link.fromJsonLd({
+    "@context": "https://www.w3.org/ns/activitystreams",
+    type: "Link",
+    href: "https://example.com/yue",
+    hreflang: "zh-YUE",
+  });
+  deepStrictEqual(link.language?.baseName, "yue");
+  const compact = await link.toJsonLd({ format: "compact" }) as Record<
+    string,
+    unknown
+  >;
+  deepStrictEqual(compact.hreflang, "yue");
+
+  await rejects(() =>
+    Link.fromJsonLd({
+      "@context": "https://www.w3.org/ns/activitystreams",
+      type: "Link",
+      href: "https://example.com/en",
+      hreflang: "en-USA",
+    }), RangeError);
+});
+
 test("Person.fromJsonLd() with relative URLs", async () => {
   const json = {
     "@context": [