@fedify/fedify 1.11.0-dev.92 → 2.0.0-dev.109

package/dist/{actor-B6ovE-4c.js → actor-Cm25mX8I.js}

@@ -2,20 +2,11 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import { deno_default, getDocumentLoader } from "./docloader-CgESja7v.js";
-import { lookupWebFinger } from "./lookup-Fk5eyxDk.js";
+import { deno_default, lookupWebFinger } from "./lookup-Cj543vD4.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import jsonld from "jsonld";
-import { LanguageTag, parseLanguageTag } from "@phensley/language-tag";
-import baseX from "@multiformats/base-x";
-import { Integer, Sequence } from "asn1js";
-import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
-import { decodeBase64Url } from "byte-encodings/base64url";
-import { decodeHex } from "byte-encodings/hex";
-import { addPrefix, getCodeFromData, rmPrefix } from "multicodec";
-import { createPublicKey } from "node:crypto";
-import { PublicKeyInfo } from "pkijs";
+import { LanguageString, decodeMultibase, encodeMultibase, exportMultibaseKey, exportSpki, getDocumentLoader, importMultibaseKey, importPem } from "@fedify/vocab-runtime";
 import { domainToASCII, domainToUnicode } from "node:url";
 
 //#region src/vocab/type.ts
@@ -25,482 +16,6 @@ function getTypeId(object) {
 	return cls.typeId;
 }
 
-//#endregion
-//#region src/runtime/multibase/util.ts
-const textDecoder = new TextDecoder();
-const decodeText = (bytes) => textDecoder.decode(bytes);
-const textEncoder = new TextEncoder();
-const encodeText = (text) => textEncoder.encode(text);
-function concat(arrs, length) {
-	const output = new Uint8Array(length);
-	let offset = 0;
-	for (const arr of arrs) {
-		output.set(arr, offset);
-		offset += arr.length;
-	}
-	return output;
-}
-
-//#endregion
-//#region src/runtime/multibase/base.ts
-/**
-* Class to encode/decode in the supported Bases
-*/
-var Base = class {
-	codeBuf;
-	codec;
-	constructor(name, code, factory, alphabet) {
-		this.name = name;
-		this.code = code;
-		this.alphabet = alphabet;
-		this.codeBuf = encodeText(this.code);
-		this.alphabet = alphabet;
-		this.codec = factory(alphabet);
-	}
-	encode(buf) {
-		return this.codec.encode(buf);
-	}
-	decode(string) {
-		for (const char of string) if (this.alphabet && this.alphabet.indexOf(char) < 0) throw new Error(`invalid character '${char}' in '${string}'`);
-		return this.codec.decode(string);
-	}
-};
-
-//#endregion
-//#region src/runtime/multibase/rfc4648.ts
-const decode$1 = (string, alphabet, bitsPerChar) => {
-	const codes$1 = {};
-	for (let i = 0; i < alphabet.length; ++i) codes$1[alphabet[i]] = i;
-	let end = string.length;
-	while (string[end - 1] === "=") --end;
-	const out = new Uint8Array(end * bitsPerChar / 8 | 0);
-	let bits = 0;
-	let buffer = 0;
-	let written = 0;
-	for (let i = 0; i < end; ++i) {
-		const value = codes$1[string[i]];
-		if (value === void 0) throw new SyntaxError("Invalid character " + string[i]);
-		buffer = buffer << bitsPerChar | value;
-		bits += bitsPerChar;
-		if (bits >= 8) {
-			bits -= 8;
-			out[written++] = 255 & buffer >> bits;
-		}
-	}
-	if (bits >= bitsPerChar || 255 & buffer << 8 - bits) throw new SyntaxError("Unexpected end of data");
-	return out;
-};
-const encode$1 = (data, alphabet, bitsPerChar) => {
-	const pad = alphabet[alphabet.length - 1] === "=";
-	const mask = (1 << bitsPerChar) - 1;
-	let out = "";
-	let bits = 0;
-	let buffer = 0;
-	for (let i = 0; i < data.length; ++i) {
-		buffer = buffer << 8 | data[i];
-		bits += 8;
-		while (bits > bitsPerChar) {
-			bits -= bitsPerChar;
-			out += alphabet[mask & buffer >> bits];
-		}
-	}
-	if (bits) out += alphabet[mask & buffer << bitsPerChar - bits];
-	if (pad) while (out.length * bitsPerChar & 7) out += "=";
-	return out;
-};
-/**
-* RFC4648 Factory
-*/
-const rfc4648 = (bitsPerChar) => (alphabet) => {
-	return {
-		encode(input) {
-			return encode$1(input, alphabet, bitsPerChar);
-		},
-		decode(input) {
-			return decode$1(input, alphabet, bitsPerChar);
-		}
-	};
-};
-
-//#endregion
-//#region src/runtime/multibase/constants.ts
-const identity = () => {
-	return {
-		encode: decodeText,
-		decode: encodeText
-	};
-};
-/**
-* name, code, implementation, alphabet
-*
-* @type {Array<[BaseName, BaseCode, CodecFactory, string]>}
-*/
-const constants = [
-	[
-		"identity",
-		"\0",
-		identity,
-		""
-	],
-	[
-		"base2",
-		"0",
-		rfc4648(1),
-		"01"
-	],
-	[
-		"base8",
-		"7",
-		rfc4648(3),
-		"01234567"
-	],
-	[
-		"base10",
-		"9",
-		baseX,
-		"0123456789"
-	],
-	[
-		"base16",
-		"f",
-		rfc4648(4),
-		"0123456789abcdef"
-	],
-	[
-		"base16upper",
-		"F",
-		rfc4648(4),
-		"0123456789ABCDEF"
-	],
-	[
-		"base32hex",
-		"v",
-		rfc4648(5),
-		"0123456789abcdefghijklmnopqrstuv"
-	],
-	[
-		"base32hexupper",
-		"V",
-		rfc4648(5),
-		"0123456789ABCDEFGHIJKLMNOPQRSTUV"
-	],
-	[
-		"base32hexpad",
-		"t",
-		rfc4648(5),
-		"0123456789abcdefghijklmnopqrstuv="
-	],
-	[
-		"base32hexpadupper",
-		"T",
-		rfc4648(5),
-		"0123456789ABCDEFGHIJKLMNOPQRSTUV="
-	],
-	[
-		"base32",
-		"b",
-		rfc4648(5),
-		"abcdefghijklmnopqrstuvwxyz234567"
-	],
-	[
-		"base32upper",
-		"B",
-		rfc4648(5),
-		"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"
-	],
-	[
-		"base32pad",
-		"c",
-		rfc4648(5),
-		"abcdefghijklmnopqrstuvwxyz234567="
-	],
-	[
-		"base32padupper",
-		"C",
-		rfc4648(5),
-		"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567="
-	],
-	[
-		"base32z",
-		"h",
-		rfc4648(5),
-		"ybndrfg8ejkmcpqxot1uwisza345h769"
-	],
-	[
-		"base36",
-		"k",
-		baseX,
-		"0123456789abcdefghijklmnopqrstuvwxyz"
-	],
-	[
-		"base36upper",
-		"K",
-		baseX,
-		"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	],
-	[
-		"base58btc",
-		"z",
-		baseX,
-		"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
-	],
-	[
-		"base58flickr",
-		"Z",
-		baseX,
-		"123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ"
-	],
-	[
-		"base64",
-		"m",
-		rfc4648(6),
-		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-	],
-	[
-		"base64pad",
-		"M",
-		rfc4648(6),
-		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="
-	],
-	[
-		"base64url",
-		"u",
-		rfc4648(6),
-		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"
-	],
-	[
-		"base64urlpad",
-		"U",
-		rfc4648(6),
-		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_="
-	]
-];
-const names = constants.reduce((prev, tupple) => {
-	prev[tupple[0]] = new Base(tupple[0], tupple[1], tupple[2], tupple[3]);
-	return prev;
-}, {});
-const codes = constants.reduce((prev, tupple) => {
-	prev[tupple[1]] = names[tupple[0]];
-	return prev;
-}, {});
-
-//#endregion
-//#region src/runtime/multibase/index.ts
-/**
-* Encode data with the specified base and add the multibase prefix.
-*
-* @throws {Error} Will throw if the encoding is not supported
-*/
-function encode(nameOrCode, buf) {
-	const enc = encoding(nameOrCode);
-	const data = encodeText(enc.encode(buf));
-	return concat([enc.codeBuf, data], enc.codeBuf.length + data.length);
-}
-/**
-* Takes a Uint8Array or string encoded with multibase header, decodes it and
-* returns the decoded buffer
-*
-* @throws {Error} Will throw if the encoding is not supported
-*/
-function decode(data) {
-	if (data instanceof Uint8Array) data = decodeText(data);
-	const prefix = data[0];
-	if ([
-		"f",
-		"F",
-		"v",
-		"V",
-		"t",
-		"T",
-		"b",
-		"B",
-		"c",
-		"C",
-		"h",
-		"k",
-		"K"
-	].includes(prefix)) data = data.toLowerCase();
-	const enc = encoding(data[0]);
-	return enc.decode(data.substring(1));
-}
-/**
-* Get the encoding by name or code
-* @throws {Error} Will throw if the encoding is not supported
-*/
-function encoding(nameOrCode) {
-	if (Object.prototype.hasOwnProperty.call(names, nameOrCode)) return names[nameOrCode];
-	else if (Object.prototype.hasOwnProperty.call(codes, nameOrCode)) return codes[nameOrCode];
-	else throw new Error(`Unsupported encoding: ${nameOrCode}`);
-}
-
-//#endregion
-//#region src/runtime/key.ts
-const algorithms = {
-	"1.2.840.113549.1.1.1": {
-		name: "RSASSA-PKCS1-v1_5",
-		hash: "SHA-256"
-	},
-	"1.3.101.112": "Ed25519"
-};
-/**
-* Imports a PEM-SPKI formatted public key.
-* @param pem The PEM-SPKI formatted public key.
-* @returns The imported public key.
-* @throws {TypeError} If the key is invalid or unsupported.
-* @since 0.5.0
-*/
-async function importSpki(pem) {
-	pem = pem.replace(/(?:-----(?:BEGIN|END) PUBLIC KEY-----|\s)/g, "");
-	let spki;
-	try {
-		spki = decodeBase64(pem);
-	} catch (_) {
-		throw new TypeError("Invalid PEM-SPKI format.");
-	}
-	const pki = PublicKeyInfo.fromBER(spki);
-	const oid = pki.algorithm.algorithmId;
-	const algorithm = algorithms[oid];
-	if (algorithm == null) throw new TypeError("Unsupported algorithm: " + oid);
-	return await crypto.subtle.importKey("spki", spki, algorithm, true, ["verify"]);
-}
-/**
-* Exports a public key in PEM-SPKI format.
-* @param key The public key to export.
-* @returns The exported public key in PEM-SPKI format.
-* @throws {TypeError} If the key is invalid or unsupported.
-* @since 0.5.0
-*/
-async function exportSpki(key) {
-	const { validateCryptoKey } = await import("./key-zkx54yxw.js");
-	validateCryptoKey(key);
-	const spki = await crypto.subtle.exportKey("spki", key);
-	let pem = encodeBase64(spki);
-	pem = (pem.match(/.{1,64}/g) || []).join("\n");
-	return `-----BEGIN PUBLIC KEY-----\n${pem}\n-----END PUBLIC KEY-----\n`;
-}
-/**
-* Imports a PEM-PKCS#1 formatted public key.
-* @param pem The PEM-PKCS#1 formatted public key.
-* @returns The imported public key.
-* @throws {TypeError} If the key is invalid or unsupported.
-* @since 1.5.0
-*/
-function importPkcs1(pem) {
-	const key = createPublicKey({
-		key: pem,
-		format: "pem",
-		type: "pkcs1"
-	});
-	const spki = key.export({
-		type: "spki",
-		format: "pem"
-	});
-	return importSpki(spki);
-}
-const PKCS1_HEADER = /^\s*-----BEGIN\s+RSA\s+PUBLIC\s+KEY-----\s*\n/;
-/**
-* Imports a PEM formatted public key (SPKI or PKCS#1).
-* @param pem The PEM formatted public key to import (SPKI or PKCS#1).
-* @returns The imported public key.
-* @throws {TypeError} If the key is invalid or unsupported.
-* @since 1.5.0
-*/
-function importPem(pem) {
-	return PKCS1_HEADER.test(pem) ? importPkcs1(pem) : importSpki(pem);
-}
-/**
-* Imports a [Multibase]-encoded public key.
-*
-* [Multibase]: https://www.w3.org/TR/vc-data-integrity/#multibase-0
-* @param key The Multibase-encoded public key.
-* @returns The imported public key.
-* @throws {TypeError} If the key is invalid or unsupported.
-* @since 0.10.0
-*/
-async function importMultibaseKey(key) {
-	const decoded = decode(key);
-	const code = getCodeFromData(decoded);
-	const content = rmPrefix(decoded);
-	if (code === 4613) {
-		const keyObject = createPublicKey({
-			key: content,
-			format: "der",
-			type: "pkcs1"
-		});
-		const exported = keyObject.export({
-			type: "spki",
-			format: "der"
-		});
-		const spki = exported instanceof Uint8Array ? exported : new Uint8Array(exported);
-		return await crypto.subtle.importKey("spki", new Uint8Array(spki), {
-			name: "RSASSA-PKCS1-v1_5",
-			hash: "SHA-256"
-		}, true, ["verify"]);
-	} else if (code === 237) return await crypto.subtle.importKey("raw", content.slice(), "Ed25519", true, ["verify"]);
-	else throw new TypeError("Unsupported key type: 0x" + code.toString(16));
-}
-/**
-* Exports a public key in [Multibase] format.
-*
-* [Multibase]: https://www.w3.org/TR/vc-data-integrity/#multibase-0
-* @param key The public key to export.
-* @returns The exported public key in Multibase format.
-* @throws {TypeError} If the key is invalid or unsupported.
-* @since 0.10.0
-*/
-async function exportMultibaseKey(key) {
-	let content;
-	let code;
-	if (key.algorithm.name === "Ed25519") {
-		content = await crypto.subtle.exportKey("raw", key);
-		code = 237;
-	} else if (key.algorithm.name === "RSASSA-PKCS1-v1_5" && key.algorithm.hash.name === "SHA-256") {
-		const jwk = await crypto.subtle.exportKey("jwk", key);
-		const decodedN = decodeBase64Url(jwk.n);
-		const n = new Uint8Array(decodedN.length + 1);
-		n.set(decodedN, 1);
-		const sequence = new Sequence({ value: [new Integer({
-			isHexOnly: true,
-			valueHex: n
-		}), new Integer({
-			isHexOnly: true,
-			valueHex: decodeBase64Url(jwk.e)
-		})] });
-		content = sequence.toBER(false);
-		code = 4613;
-	} else throw new TypeError("Unsupported key type: " + JSON.stringify(key.algorithm));
-	const codeHex = code.toString(16);
-	const codeBytes = decodeHex(codeHex.length % 2 < 1 ? codeHex : "0" + codeHex);
-	const prefixed = addPrefix(codeBytes, new Uint8Array(content));
-	const encoded = encode("base58btc", prefixed);
-	return new TextDecoder().decode(encoded);
-}
-
-//#endregion
-//#region src/runtime/langstr.ts
-/**
-* A language-tagged string which corresponds to the `rdf:langString` type.
-*/
-var LanguageString = class extends String {
-	language;
-	/**
-	* 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 `LanguageTag`.
-	*/
-	constructor(value, language) {
-		super(value);
-		this.language = typeof language === "string" ? parseLanguageTag(language) : language;
-	}
-	[Symbol.for("Deno.customInspect")](inspect, options) {
-		return `<${this.language.compact()}> ${inspect(this.toString(), options)}`;
-	}
-	[Symbol.for("nodejs.util.inspect.custom")](_depth, options, inspect) {
-		return `<${this.language.compact()}> ${inspect(this.toString(), options)}`;
-	}
-};
-
 //#endregion
 //#region src/vocab/vocab.ts
 /** Describes an object of any kind. The Object type serves as the base type for
@@ -1110,7 +625,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -1257,7 +772,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -1470,7 +985,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -1655,7 +1170,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -1818,7 +1333,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -1949,7 +1464,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -2116,7 +1631,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -2283,7 +1798,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -2458,7 +1973,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -2633,7 +2148,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -2813,7 +2328,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -2935,7 +2450,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -3063,7 +2578,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -3191,7 +2706,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -3337,7 +2852,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -3490,7 +3005,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -3655,7 +3170,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -3820,7 +3335,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -3985,7 +3500,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -4187,7 +3702,7 @@ var Object$1 = class Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -4424,7 +3939,7 @@ var Object$1 = class Object$1 {
 			for (const v of this.#_4HuuRSdSrXq8Jj2J9gcdYfoCzeuz_content) {
 				const item = typeof v === "string" ? v : {
 					"@value": v.toString(),
-					"@language": v.language.compact()
+					"@language": v.locale.baseName
 				};
 				compactItems.push(item);
 			}
@@ -4447,7 +3962,7 @@ var Object$1 = class Object$1 {
 			for (const v of this.#_4ZHbBuK7PrsvGgrjM8wgc6KMWjav_name) {
 				const item = typeof v === "string" ? v : {
 					"@value": v.toString(),
-					"@language": v.language.compact()
+					"@language": v.locale.baseName
 				};
 				compactItems.push(item);
 			}
@@ -4590,7 +4105,7 @@ var Object$1 = class Object$1 {
 			for (const v of this.#_4LqirZspQbFWWQEbFcXAxm7tTDN1_summary) {
 				const item = typeof v === "string" ? v : {
 					"@value": v.toString(),
-					"@language": v.language.compact()
+					"@language": v.locale.baseName
 				};
 				compactItems.push(item);
 			}
@@ -4752,7 +4267,7 @@ var Object$1 = class Object$1 {
 		for (const v of this.#_4HuuRSdSrXq8Jj2J9gcdYfoCzeuz_content) {
 			const element = typeof v === "string" ? { "@value": v } : {
 				"@value": v.toString(),
-				"@language": v.language.compact()
+				"@language": v.locale.baseName
 			};
 			array.push(element);
 		}
@@ -4773,7 +4288,7 @@ var Object$1 = class Object$1 {
 		for (const v of this.#_4ZHbBuK7PrsvGgrjM8wgc6KMWjav_name) {
 			const element = typeof v === "string" ? { "@value": v } : {
 				"@value": v.toString(),
-				"@language": v.language.compact()
+				"@language": v.locale.baseName
 			};
 			array.push(element);
 		}
@@ -4911,7 +4426,7 @@ var Object$1 = class Object$1 {
 		for (const v of this.#_4LqirZspQbFWWQEbFcXAxm7tTDN1_summary) {
 			const element = typeof v === "string" ? { "@value": v } : {
 				"@value": v.toString(),
-				"@language": v.language.compact()
+				"@language": v.locale.baseName
 			};
 			array.push(element);
 		}
@@ -5075,7 +4590,7 @@ var Object$1 = class Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Object__(json, span, options);
@@ -6350,7 +5865,7 @@ var Emoji = class Emoji extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Emoji__(json, span, options);
@@ -6597,7 +6112,7 @@ var ChatMessage = class ChatMessage extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__ChatMessage__(json, span, options);
@@ -6884,7 +6399,7 @@ var Activity = class Activity extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -7097,7 +6612,7 @@ var Activity = class Activity extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -7264,7 +6779,7 @@ var Activity = class Activity extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -7437,7 +6952,7 @@ var Activity = class Activity extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -7604,7 +7119,7 @@ var Activity = class Activity extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -7773,7 +7288,7 @@ var Activity = class Activity extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -8044,7 +7559,7 @@ var Activity = class Activity extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Activity__(json, span, options);
@@ -8378,7 +7893,7 @@ var EmojiReact = class EmojiReact extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__EmojiReact__(json, span, options);
@@ -8560,7 +8075,7 @@ var PropertyValue = class {
 			for (const v of this.#_4ZHbBuK7PrsvGgrjM8wgc6KMWjav_name) {
 				const item = typeof v === "string" ? v : {
 					"@value": v.toString(),
-					"@language": v.language.compact()
+					"@language": v.locale.baseName
 				};
 				compactItems.push(item);
 			}
@@ -8569,7 +8084,7 @@ var PropertyValue = class {
 			for (const v of this.#_2cSy2magg4iZ7zLaG8U7DiJMoCkx_value) {
 				const item = typeof v === "string" ? v : {
 					"@value": v.toString(),
-					"@language": v.language.compact()
+					"@language": v.locale.baseName
 				};
 				compactItems.push(item);
 			}
@@ -8589,7 +8104,7 @@ var PropertyValue = class {
 		for (const v of this.#_4ZHbBuK7PrsvGgrjM8wgc6KMWjav_name) {
 			const element = typeof v === "string" ? { "@value": v } : {
 				"@value": v.toString(),
-				"@language": v.language.compact()
+				"@language": v.locale.baseName
 			};
 			array.push(element);
 		}
@@ -8601,7 +8116,7 @@ var PropertyValue = class {
 		for (const v of this.#_2cSy2magg4iZ7zLaG8U7DiJMoCkx_value) {
 			const element = typeof v === "string" ? { "@value": v } : {
 				"@value": v.toString(),
-				"@language": v.language.compact()
+				"@language": v.locale.baseName
 			};
 			array.push(element);
 		}
@@ -8639,7 +8154,7 @@ var PropertyValue = class {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__PropertyValue__(json, span, options);
@@ -8883,7 +8398,7 @@ var DidService = class {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__DidService__(json, span, options);
@@ -9047,7 +8562,7 @@ var Export = class Export extends DidService {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Export__(json, span, options);
@@ -9227,7 +8742,7 @@ var DataIntegrityProof = class {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -9419,7 +8934,7 @@ var DataIntegrityProof = class {
 		for (const v of this.#_3CjFK5vfKpX4HQuNh2b18TykoVLq_proofValue) {
 			const element = {
 				"@type": "https://w3id.org/security#multibase",
-				"@value": new TextDecoder().decode(encode("base58btc", v))
+				"@value": new TextDecoder().decode(encodeMultibase("base58btc", v))
 			};
 			array.push(element);
 		}
@@ -9463,7 +8978,7 @@ var DataIntegrityProof = class {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__DataIntegrityProof__(json, span, options);
@@ -9540,7 +9055,7 @@ var DataIntegrityProof = class {
 		let _3CjFK5vfKpX4HQuNh2b18TykoVLq_proofValue__array = values["https://w3id.org/security#proofValue"];
 		for (const v of _3CjFK5vfKpX4HQuNh2b18TykoVLq_proofValue__array == null ? [] : _3CjFK5vfKpX4HQuNh2b18TykoVLq_proofValue__array.length === 1 && "@list" in _3CjFK5vfKpX4HQuNh2b18TykoVLq_proofValue__array[0] ? _3CjFK5vfKpX4HQuNh2b18TykoVLq_proofValue__array[0]["@list"] : _3CjFK5vfKpX4HQuNh2b18TykoVLq_proofValue__array) {
 			if (v == null) continue;
-			_3CjFK5vfKpX4HQuNh2b18TykoVLq_proofValue.push(decode(v["@value"]));
+			_3CjFK5vfKpX4HQuNh2b18TykoVLq_proofValue.push(decodeMultibase(v["@value"]));
 		}
 		instance.#_3CjFK5vfKpX4HQuNh2b18TykoVLq_proofValue = _3CjFK5vfKpX4HQuNh2b18TykoVLq_proofValue;
 		const _3qzP3ukEZoUziK5FEiA1RhU4aqac = [];
@@ -9684,7 +9199,7 @@ var CryptographicKey = class {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -9955,7 +9470,7 @@ var CryptographicKey = class {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__CryptographicKey__(json, span, options);
@@ -10157,7 +9672,7 @@ var Multikey = class {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -10434,7 +9949,7 @@ var Multikey = class {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Multikey__(json, span, options);
@@ -10639,7 +10154,7 @@ var Accept = class Accept extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Accept__(json, span, options);
@@ -10801,7 +10316,7 @@ var Add = class Add extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Add__(json, span, options);
@@ -10980,7 +10495,7 @@ var Announce = class Announce extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Announce__(json, span, options);
@@ -11382,7 +10897,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -11545,7 +11060,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -11726,7 +11241,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -11869,7 +11384,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -12009,7 +11524,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -12134,7 +11649,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -12262,7 +11777,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -12388,7 +11903,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -12512,7 +12027,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -12636,7 +12151,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -12799,7 +12314,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -12966,7 +12481,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -13181,7 +12696,7 @@ var Application = class Application extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -13391,7 +12906,7 @@ var Application = class Application extends Object$1 {
 			for (const v of this.#_3isuDgRAKSntq9XdbjiNxjwyPZAf_preferredUsername) {
 				const item = typeof v === "string" ? v : {
 					"@value": v.toString(),
-					"@language": v.language.compact()
+					"@language": v.locale.baseName
 				};
 				compactItems.push(item);
 			}
@@ -13671,7 +13186,7 @@ var Application = class Application extends Object$1 {
 		for (const v of this.#_3isuDgRAKSntq9XdbjiNxjwyPZAf_preferredUsername) {
 			const element = typeof v === "string" ? { "@value": v } : {
 				"@value": v.toString(),
-				"@language": v.language.compact()
+				"@language": v.locale.baseName
 			};
 			array.push(element);
 		}
@@ -13934,7 +13449,7 @@ var Application = class Application extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Application__(json, span, options);
@@ -14510,7 +14025,7 @@ var IntransitiveActivity = class IntransitiveActivity extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__IntransitiveActivity__(json, span, options);
@@ -14673,7 +14188,7 @@ var Arrive = class Arrive extends IntransitiveActivity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Arrive__(json, span, options);
@@ -14918,7 +14433,7 @@ var Article = class Article extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Article__(json, span, options);
@@ -15162,7 +14677,7 @@ var Document = class Document extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Document__(json, span, options);
@@ -15356,7 +14871,7 @@ var Audio = class Audio extends Document {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Audio__(json, span, options);
@@ -15515,7 +15030,7 @@ var Ignore = class Ignore extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Ignore__(json, span, options);
@@ -15677,7 +15192,7 @@ var Block = class Block extends Ignore {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Block__(json, span, options);
@@ -15948,7 +15463,7 @@ var Collection = class Collection extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -16070,7 +15585,7 @@ var Collection = class Collection extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -16192,7 +15707,7 @@ var Collection = class Collection extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -16314,7 +15829,7 @@ var Collection = class Collection extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -16446,7 +15961,7 @@ var Collection = class Collection extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -16567,7 +16082,7 @@ var Collection = class Collection extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -16688,7 +16203,7 @@ var Collection = class Collection extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -16809,7 +16324,7 @@ var Collection = class Collection extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -16930,7 +16445,7 @@ var Collection = class Collection extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -17051,7 +16566,7 @@ var Collection = class Collection extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -17172,7 +16687,7 @@ var Collection = class Collection extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -17293,7 +16808,7 @@ var Collection = class Collection extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -17763,7 +17278,7 @@ var Collection = class Collection extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Collection__(json, span, options);
@@ -18228,7 +17743,7 @@ var CollectionPage = class CollectionPage extends Collection {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -18350,7 +17865,7 @@ var CollectionPage = class CollectionPage extends Collection {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -18471,7 +17986,7 @@ var CollectionPage = class CollectionPage extends Collection {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -18748,7 +18263,7 @@ var CollectionPage = class CollectionPage extends Collection {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__CollectionPage__(json, span, options);
@@ -18987,7 +18502,7 @@ var Create = class Create extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Create__(json, span, options);
@@ -19162,7 +18677,7 @@ var Delete = class Delete extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Delete__(json, span, options);
@@ -19324,7 +18839,7 @@ var Dislike = class Dislike extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Dislike__(json, span, options);
@@ -19698,7 +19213,7 @@ var Endpoints = class {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Endpoints__(json, span, options);
@@ -19935,7 +19450,7 @@ var Event = class Event extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Event__(json, span, options);
@@ -20095,7 +19610,7 @@ var Flag = class Flag extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Flag__(json, span, options);
@@ -20259,7 +19774,7 @@ var Follow = class Follow extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Follow__(json, span, options);
@@ -20661,7 +20176,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -20824,7 +20339,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -21005,7 +20520,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -21148,7 +20663,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -21288,7 +20803,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -21413,7 +20928,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -21541,7 +21056,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -21667,7 +21182,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -21791,7 +21306,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -21915,7 +21430,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -22078,7 +21593,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -22245,7 +21760,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -22460,7 +21975,7 @@ var Group = class Group extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -22670,7 +22185,7 @@ var Group = class Group extends Object$1 {
 			for (const v of this.#_3isuDgRAKSntq9XdbjiNxjwyPZAf_preferredUsername) {
 				const item = typeof v === "string" ? v : {
 					"@value": v.toString(),
-					"@language": v.language.compact()
+					"@language": v.locale.baseName
 				};
 				compactItems.push(item);
 			}
@@ -22950,7 +22465,7 @@ var Group = class Group extends Object$1 {
 		for (const v of this.#_3isuDgRAKSntq9XdbjiNxjwyPZAf_preferredUsername) {
 			const element = typeof v === "string" ? { "@value": v } : {
 				"@value": v.toString(),
-				"@language": v.language.compact()
+				"@language": v.locale.baseName
 			};
 			array.push(element);
 		}
@@ -23213,7 +22728,7 @@ var Group = class Group extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Group__(json, span, options);
@@ -23777,8 +23292,8 @@ var Link = class Link {
 			if (Array.isArray(values.names) && values.names.every((v) => typeof v === "string" || v instanceof LanguageString)) this.#_4ZHbBuK7PrsvGgrjM8wgc6KMWjav_name = values.names;
 			else throw new TypeError("The names must be an array of type string | LanguageString.");
 		}
-		if ("language" in values && values.language != null) if (values.language instanceof LanguageTag) this.#_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang = [values.language];
-		else throw new TypeError("The language must be of type LanguageTag.");
+		if ("language" in values && values.language != null) if (values.language instanceof Intl.Locale) this.#_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang = [values.language];
+		else throw new TypeError("The language must be of type Intl.Locale.");
 		if ("height" in values && values.height != null) if (typeof values.height === "number" && Number.isInteger(values.height) && values.height >= 0) this.#_2cGKFeFJMmiNpGZFEF75mCwFQsKb_height = [values.height];
 		else throw new TypeError("The height must be of type number.");
 		if ("width" in values && values.width != null) if (typeof values.width === "number" && Number.isInteger(values.width) && values.width >= 0) this.#_2e9AP7WdHBJYAgXG6GEyq7nSkNMe_width = [values.width];
@@ -23826,8 +23341,8 @@ var Link = class Link {
 			else throw new TypeError("The names must be an array of type string | LanguageString.");
 		}
 		clone.#_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang = this.#_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang;
-		if ("language" in values && values.language != null) if (values.language instanceof LanguageTag) clone.#_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang = [values.language];
-		else throw new TypeError("The language must be of type LanguageTag.");
+		if ("language" in values && values.language != null) if (values.language instanceof Intl.Locale) clone.#_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang = [values.language];
+		else throw new TypeError("The language must be of type Intl.Locale.");
 		clone.#_2cGKFeFJMmiNpGZFEF75mCwFQsKb_height = this.#_2cGKFeFJMmiNpGZFEF75mCwFQsKb_height;
 		if ("height" in values && values.height != null) if (typeof values.height === "number" && Number.isInteger(values.height) && values.height >= 0) clone.#_2cGKFeFJMmiNpGZFEF75mCwFQsKb_height = [values.height];
 		else throw new TypeError("The height must be of type number.");
@@ -23924,7 +23439,7 @@ var Link = class Link {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -24093,14 +23608,14 @@ var Link = class Link {
 			for (const v of this.#_4ZHbBuK7PrsvGgrjM8wgc6KMWjav_name) {
 				const item = typeof v === "string" ? v : {
 					"@value": v.toString(),
-					"@language": v.language.compact()
+					"@language": v.locale.baseName
 				};
 				compactItems.push(item);
 			}
 			if (compactItems.length > 0) result["name"] = compactItems.length > 1 ? compactItems : compactItems[0];
 			compactItems = [];
 			for (const v of this.#_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang) {
-				const item = v.compact();
+				const item = v.baseName;
 				compactItems.push(item);
 			}
 			if (compactItems.length > 0) result["hreflang"] = compactItems.length > 1 ? compactItems : compactItems[0];
@@ -24168,7 +23683,7 @@ var Link = class Link {
 		for (const v of this.#_4ZHbBuK7PrsvGgrjM8wgc6KMWjav_name) {
 			const element = typeof v === "string" ? { "@value": v } : {
 				"@value": v.toString(),
-				"@language": v.language.compact()
+				"@language": v.locale.baseName
 			};
 			array.push(element);
 		}
@@ -24178,7 +23693,7 @@ var Link = class Link {
 		}
 		array = [];
 		for (const v of this.#_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang) {
-			const element = { "@value": v.compact() };
+			const element = { "@value": v.baseName };
 			array.push(element);
 		}
 		if (array.length > 0) {
@@ -24243,7 +23758,7 @@ var Link = class Link {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Link__(json, span, options);
@@ -24323,7 +23838,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;
-			_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang.push(parseLanguageTag(v["@value"]));
+			_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang.push(new Intl.Locale(v["@value"]));
 		}
 		instance.#_f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang = _f57HKWCp1YRBbTJE8PF12RbDJGf_hreflang;
 		const _2cGKFeFJMmiNpGZFEF75mCwFQsKb_height = [];
@@ -24582,7 +24097,7 @@ var Hashtag = class Hashtag extends Link {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Hashtag__(json, span, options);
@@ -24748,7 +24263,7 @@ var Image = class Image extends Document {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Image__(json, span, options);
@@ -24908,7 +24423,7 @@ var Offer = class Offer extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Offer__(json, span, options);
@@ -25068,7 +24583,7 @@ var Invite = class Invite extends Offer {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Invite__(json, span, options);
@@ -25227,7 +24742,7 @@ var Join = class Join extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Join__(json, span, options);
@@ -25386,7 +24901,7 @@ var Leave = class Leave extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Leave__(json, span, options);
@@ -25549,7 +25064,7 @@ var Like = class Like extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Like__(json, span, options);
@@ -25707,7 +25222,7 @@ var Listen = class Listen extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Listen__(json, span, options);
@@ -25870,7 +25385,7 @@ var Mention = class Mention extends Link {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Mention__(json, span, options);
@@ -26030,7 +25545,7 @@ var Move = class Move extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Move__(json, span, options);
@@ -26276,7 +25791,7 @@ var Note = class Note extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Note__(json, span, options);
@@ -26411,7 +25926,7 @@ var OrderedCollection = class OrderedCollection extends Collection {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -26666,7 +26181,7 @@ var OrderedCollection = class OrderedCollection extends Collection {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__OrderedCollection__(json, span, options);
@@ -26879,7 +26394,7 @@ var OrderedCollectionPage = class OrderedCollectionPage extends CollectionPage {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -27160,7 +26675,7 @@ var OrderedCollectionPage = class OrderedCollectionPage extends CollectionPage {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__OrderedCollectionPage__(json, span, options);
@@ -27659,7 +27174,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -27822,7 +27337,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -28003,7 +27518,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -28146,7 +27661,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -28286,7 +27801,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -28411,7 +27926,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -28539,7 +28054,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -28665,7 +28180,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -28789,7 +28304,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -28913,7 +28428,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -29076,7 +28591,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -29243,7 +28758,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -29458,7 +28973,7 @@ var Organization = class Organization extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -29668,7 +29183,7 @@ var Organization = class Organization extends Object$1 {
 			for (const v of this.#_3isuDgRAKSntq9XdbjiNxjwyPZAf_preferredUsername) {
 				const item = typeof v === "string" ? v : {
 					"@value": v.toString(),
-					"@language": v.language.compact()
+					"@language": v.locale.baseName
 				};
 				compactItems.push(item);
 			}
@@ -29948,7 +29463,7 @@ var Organization = class Organization extends Object$1 {
 		for (const v of this.#_3isuDgRAKSntq9XdbjiNxjwyPZAf_preferredUsername) {
 			const element = typeof v === "string" ? { "@value": v } : {
 				"@value": v.toString(),
-				"@language": v.language.compact()
+				"@language": v.locale.baseName
 			};
 			array.push(element);
 		}
@@ -30211,7 +29726,7 @@ var Organization = class Organization extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Organization__(json, span, options);
@@ -30793,7 +30308,7 @@ var Page = class Page extends Document {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Page__(json, span, options);
@@ -31195,7 +30710,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -31358,7 +30873,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -31539,7 +31054,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -31682,7 +31197,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -31822,7 +31337,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -31947,7 +31462,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -32075,7 +31590,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -32201,7 +31716,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -32325,7 +31840,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -32449,7 +31964,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -32612,7 +32127,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -32779,7 +32294,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -32994,7 +32509,7 @@ var Person = class Person extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -33204,7 +32719,7 @@ var Person = class Person extends Object$1 {
 			for (const v of this.#_3isuDgRAKSntq9XdbjiNxjwyPZAf_preferredUsername) {
 				const item = typeof v === "string" ? v : {
 					"@value": v.toString(),
-					"@language": v.language.compact()
+					"@language": v.locale.baseName
 				};
 				compactItems.push(item);
 			}
@@ -33484,7 +32999,7 @@ var Person = class Person extends Object$1 {
 		for (const v of this.#_3isuDgRAKSntq9XdbjiNxjwyPZAf_preferredUsername) {
 			const element = typeof v === "string" ? { "@value": v } : {
 				"@value": v.toString(),
-				"@language": v.language.compact()
+				"@language": v.locale.baseName
 			};
 			array.push(element);
 		}
@@ -33747,7 +33262,7 @@ var Person = class Person extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Person__(json, span, options);
@@ -34522,7 +34037,7 @@ var Place = class Place extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Place__(json, span, options);
@@ -34719,7 +34234,7 @@ var Profile = class Profile extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -34919,7 +34434,7 @@ var Profile = class Profile extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Profile__(json, span, options);
@@ -35097,7 +34612,7 @@ var Question = class Question extends IntransitiveActivity {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -35220,7 +34735,7 @@ var Question = class Question extends IntransitiveActivity {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -35498,7 +35013,7 @@ var Question = class Question extends IntransitiveActivity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Question__(json, span, options);
@@ -35736,7 +35251,7 @@ var Read = class Read extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Read__(json, span, options);
@@ -35895,7 +35410,7 @@ var Reject = class Reject extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Reject__(json, span, options);
@@ -36075,7 +35590,7 @@ var Relationship = class Relationship extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -36199,7 +35714,7 @@ var Relationship = class Relationship extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -36362,7 +35877,7 @@ var Relationship = class Relationship extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -36645,7 +36160,7 @@ var Relationship = class Relationship extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Relationship__(json, span, options);
@@ -36866,7 +36381,7 @@ var Remove = class Remove extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Remove__(json, span, options);
@@ -37268,7 +36783,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -37431,7 +36946,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -37612,7 +37127,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -37755,7 +37270,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -37895,7 +37410,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -38020,7 +37535,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -38148,7 +37663,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -38274,7 +37789,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -38398,7 +37913,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -38522,7 +38037,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -38685,7 +38200,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -38852,7 +38367,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -39067,7 +38582,7 @@ var Service = class Service extends Object$1 {
 		const documentLoader = options.documentLoader ?? this._documentLoader ?? getDocumentLoader();
 		const contextLoader = options.contextLoader ?? this._contextLoader ?? getDocumentLoader();
 		const tracerProvider = options.tracerProvider ?? this._tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
 			let fetchResult;
 			try {
@@ -39277,7 +38792,7 @@ var Service = class Service extends Object$1 {
 			for (const v of this.#_3isuDgRAKSntq9XdbjiNxjwyPZAf_preferredUsername) {
 				const item = typeof v === "string" ? v : {
 					"@value": v.toString(),
-					"@language": v.language.compact()
+					"@language": v.locale.baseName
 				};
 				compactItems.push(item);
 			}
@@ -39557,7 +39072,7 @@ var Service = class Service extends Object$1 {
 		for (const v of this.#_3isuDgRAKSntq9XdbjiNxjwyPZAf_preferredUsername) {
 			const element = typeof v === "string" ? { "@value": v } : {
 				"@value": v.toString(),
-				"@language": v.language.compact()
+				"@language": v.locale.baseName
 			};
 			array.push(element);
 		}
@@ -39820,7 +39335,7 @@ var Service = class Service extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Service__(json, span, options);
@@ -40433,7 +39948,7 @@ var Source = class {
 			for (const v of this.#_4HuuRSdSrXq8Jj2J9gcdYfoCzeuz_content) {
 				const item = typeof v === "string" ? v : {
 					"@value": v.toString(),
-					"@language": v.language.compact()
+					"@language": v.locale.baseName
 				};
 				compactItems.push(item);
 			}
@@ -40455,7 +39970,7 @@ var Source = class {
 		for (const v of this.#_4HuuRSdSrXq8Jj2J9gcdYfoCzeuz_content) {
 			const element = typeof v === "string" ? { "@value": v } : {
 				"@value": v.toString(),
-				"@language": v.language.compact()
+				"@language": v.locale.baseName
 			};
 			array.push(element);
 		}
@@ -40497,7 +40012,7 @@ var Source = class {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Source__(json, span, options);
@@ -40682,7 +40197,7 @@ var TentativeAccept = class TentativeAccept extends Accept {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__TentativeAccept__(json, span, options);
@@ -40841,7 +40356,7 @@ var TentativeReject = class TentativeReject extends Reject {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__TentativeReject__(json, span, options);
@@ -41041,7 +40556,7 @@ var Tombstone = class Tombstone extends Object$1 {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Tombstone__(json, span, options);
@@ -41214,7 +40729,7 @@ var Travel = class Travel extends IntransitiveActivity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Travel__(json, span, options);
@@ -41387,7 +40902,7 @@ var Undo = class Undo extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Undo__(json, span, options);
@@ -41598,7 +41113,7 @@ var Update = class Update extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Update__(json, span, options);
@@ -41764,7 +41279,7 @@ var Video = class Video extends Document {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__Video__(json, span, options);
@@ -41922,7 +41437,7 @@ var View = class View extends Activity {
 	*/
 	static async fromJsonLd(json, options = {}) {
 		const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-		const tracer = tracerProvider.getTracer("@fedify/fedify", "1.11.0-dev.92+001a241e");
+		const tracer = tracerProvider.getTracer("@fedify/vocab-tools", "2.0.0-dev.109+ecc823d2");
 		return await tracer.startActiveSpan("activitypub.parse_object", async (span) => {
 			try {
 				const object = await this.__fromJsonLd__View__(json, span, options);
@@ -42129,4 +41644,4 @@ function normalizeActorHandle(handle, options = {}) {
 }
 
 //#endregion
-export { Accept, Activity, Add, Announce, Application, Arrive, Article, Audio, Block, ChatMessage, Collection, CollectionPage, Create, CryptographicKey, DataIntegrityProof, Delete, DidService, Dislike, Document, Emoji, EmojiReact, Endpoints, Event, Export, Flag, Follow, Group, Hashtag, Ignore, Image, IntransitiveActivity, Invite, Join, LanguageString, Leave, Like, Link, Listen, Mention, Move, Multikey, Note, Object$1 as Object, Offer, OrderedCollection, OrderedCollectionPage, Organization, Page, Person, Place, Profile, PropertyValue, Question, Read, Reject, Relationship, Remove, Service, Source, TentativeAccept, TentativeReject, Tombstone, Travel, Undo, Update, Video, View, exportMultibaseKey, exportSpki, getActorClassByTypeName, getActorHandle, getActorTypeName, getTypeId, importMultibaseKey, importPem, importPkcs1, importSpki, isActor, normalizeActorHandle };
+export { Accept, Activity, Add, Announce, Application, Arrive, Article, Audio, Block, ChatMessage, Collection, CollectionPage, Create, CryptographicKey, DataIntegrityProof, Delete, DidService, Dislike, Document, Emoji, EmojiReact, Endpoints, Event, Export, Flag, Follow, Group, Hashtag, Ignore, Image, IntransitiveActivity, Invite, Join, Leave, Like, Link, Listen, Mention, Move, Multikey, Note, Object$1 as Object, Offer, OrderedCollection, OrderedCollectionPage, Organization, Page, Person, Place, Profile, PropertyValue, Question, Read, Reject, Relationship, Remove, Service, Source, TentativeAccept, TentativeReject, Tombstone, Travel, Undo, Update, Video, View, getActorClassByTypeName, getActorHandle, getActorTypeName, getTypeId, isActor, normalizeActorHandle };