@fedify/vocab 2.0.29-dev.2062 → 2.0.29-dev.2096

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.0.29-dev.2062+34489455",
+  "version": "2.0.29-dev.2096+a1659cb1",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"

package/dist/mod.cjs

@@ -33,7 +33,7 @@ let _fedify_vocab_runtime_temporal = require("@fedify/vocab-runtime/temporal");
 let es_toolkit = require("es-toolkit");
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.0.29-dev.2062+34489455";
+var version = "2.0.29-dev.2096+a1659cb1";
 //#endregion
 //#region src/type.ts
 function getTypeId(object) {
@@ -42,6 +42,12 @@ function getTypeId(object) {
 }
 //#endregion
 //#region src/vocab.ts
+function canDecodeIri(iri) {
+	return URL.canParse(iri) || iri.startsWith("at://");
+}
+function decodeIri(iri) {
+	return !URL.canParse(iri) && iri.startsWith("at://") ? new URL("at://" + encodeURIComponent(iri.substring(5))) : new URL(iri);
+}
 function isValidLanguageTag(language) {
 	try {
 		new Intl.Locale(language);
@@ -6142,7 +6148,11 @@ var ChatMessage = class ChatMessage extends Object$1 {
 		if (_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null || _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length < 1) _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array = values["http://fedibird.com/ns#quoteUri"];
 		for (const v of _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null ? [] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length === 1 && "@list" in _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0] ? _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0]["@list"] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array) {
 			if (v == null) continue;
-			const decoded = new URL(v["@value"]);
+			const decoded = typeof v === "object" && (typeof v["@id"] === "string" && canDecodeIri(v["@id"]) || typeof v["@value"] === "string" && canDecodeIri(v["@value"])) ? decodeIri(typeof v["@id"] === "string" ? v["@id"] : v["@value"]) : void 0;
+			if (typeof decoded === "undefined") {
+				shouldCacheJsonLd = false;
+				continue;
+			}
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl.push(decoded);
 		}
@@ -14350,7 +14360,11 @@ var Article = class Article extends Object$1 {
 		if (_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null || _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length < 1) _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array = values["http://fedibird.com/ns#quoteUri"];
 		for (const v of _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null ? [] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length === 1 && "@list" in _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0] ? _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0]["@list"] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array) {
 			if (v == null) continue;
-			const decoded = new URL(v["@value"]);
+			const decoded = typeof v === "object" && (typeof v["@id"] === "string" && canDecodeIri(v["@id"]) || typeof v["@value"] === "string" && canDecodeIri(v["@value"])) ? decodeIri(typeof v["@id"] === "string" ? v["@id"] : v["@value"]) : void 0;
+			if (typeof decoded === "undefined") {
+				shouldCacheJsonLd = false;
+				continue;
+			}
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl.push(decoded);
 		}
@@ -25415,7 +25429,11 @@ var Note = class Note extends Object$1 {
 		if (_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null || _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length < 1) _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array = values["http://fedibird.com/ns#quoteUri"];
 		for (const v of _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null ? [] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length === 1 && "@list" in _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0] ? _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0]["@list"] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array) {
 			if (v == null) continue;
-			const decoded = new URL(v["@value"]);
+			const decoded = typeof v === "object" && (typeof v["@id"] === "string" && canDecodeIri(v["@id"]) || typeof v["@value"] === "string" && canDecodeIri(v["@value"])) ? decodeIri(typeof v["@id"] === "string" ? v["@id"] : v["@value"]) : void 0;
+			if (typeof decoded === "undefined") {
+				shouldCacheJsonLd = false;
+				continue;
+			}
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl.push(decoded);
 		}
@@ -34535,7 +34553,11 @@ var Question = class Question extends IntransitiveActivity {
 		if (_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null || _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length < 1) _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array = values["http://fedibird.com/ns#quoteUri"];
 		for (const v of _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null ? [] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length === 1 && "@list" in _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0] ? _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0]["@list"] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array) {
 			if (v == null) continue;
-			const decoded = new URL(v["@value"]);
+			const decoded = typeof v === "object" && (typeof v["@id"] === "string" && canDecodeIri(v["@id"]) || typeof v["@value"] === "string" && canDecodeIri(v["@value"])) ? decodeIri(typeof v["@id"] === "string" ? v["@id"] : v["@value"]) : void 0;
+			if (typeof decoded === "undefined") {
+				shouldCacheJsonLd = false;
+				continue;
+			}
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl.push(decoded);
 		}

package/dist/mod.js

@@ -9,7 +9,7 @@ import { isTemporalDuration, isTemporalInstant } from "@fedify/vocab-runtime/tem
 import { delay } from "es-toolkit";
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.0.29-dev.2062+34489455";
+var version = "2.0.29-dev.2096+a1659cb1";
 //#endregion
 //#region src/type.ts
 function getTypeId(object) {
@@ -18,6 +18,12 @@ function getTypeId(object) {
 }
 //#endregion
 //#region src/vocab.ts
+function canDecodeIri(iri) {
+	return URL.canParse(iri) || iri.startsWith("at://");
+}
+function decodeIri(iri) {
+	return !URL.canParse(iri) && iri.startsWith("at://") ? new URL("at://" + encodeURIComponent(iri.substring(5))) : new URL(iri);
+}
 function isValidLanguageTag(language) {
 	try {
 		new Intl.Locale(language);
@@ -6118,7 +6124,11 @@ var ChatMessage = class ChatMessage extends Object$1 {
 		if (_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null || _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length < 1) _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array = values["http://fedibird.com/ns#quoteUri"];
 		for (const v of _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null ? [] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length === 1 && "@list" in _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0] ? _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0]["@list"] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array) {
 			if (v == null) continue;
-			const decoded = new URL(v["@value"]);
+			const decoded = typeof v === "object" && (typeof v["@id"] === "string" && canDecodeIri(v["@id"]) || typeof v["@value"] === "string" && canDecodeIri(v["@value"])) ? decodeIri(typeof v["@id"] === "string" ? v["@id"] : v["@value"]) : void 0;
+			if (typeof decoded === "undefined") {
+				shouldCacheJsonLd = false;
+				continue;
+			}
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl.push(decoded);
 		}
@@ -14326,7 +14336,11 @@ var Article = class Article extends Object$1 {
 		if (_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null || _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length < 1) _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array = values["http://fedibird.com/ns#quoteUri"];
 		for (const v of _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null ? [] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length === 1 && "@list" in _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0] ? _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0]["@list"] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array) {
 			if (v == null) continue;
-			const decoded = new URL(v["@value"]);
+			const decoded = typeof v === "object" && (typeof v["@id"] === "string" && canDecodeIri(v["@id"]) || typeof v["@value"] === "string" && canDecodeIri(v["@value"])) ? decodeIri(typeof v["@id"] === "string" ? v["@id"] : v["@value"]) : void 0;
+			if (typeof decoded === "undefined") {
+				shouldCacheJsonLd = false;
+				continue;
+			}
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl.push(decoded);
 		}
@@ -25391,7 +25405,11 @@ var Note = class Note extends Object$1 {
 		if (_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null || _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length < 1) _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array = values["http://fedibird.com/ns#quoteUri"];
 		for (const v of _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null ? [] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length === 1 && "@list" in _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0] ? _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0]["@list"] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array) {
 			if (v == null) continue;
-			const decoded = new URL(v["@value"]);
+			const decoded = typeof v === "object" && (typeof v["@id"] === "string" && canDecodeIri(v["@id"]) || typeof v["@value"] === "string" && canDecodeIri(v["@value"])) ? decodeIri(typeof v["@id"] === "string" ? v["@id"] : v["@value"]) : void 0;
+			if (typeof decoded === "undefined") {
+				shouldCacheJsonLd = false;
+				continue;
+			}
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl.push(decoded);
 		}
@@ -34511,7 +34529,11 @@ var Question = class Question extends IntransitiveActivity {
 		if (_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null || _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length < 1) _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array = values["http://fedibird.com/ns#quoteUri"];
 		for (const v of _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null ? [] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length === 1 && "@list" in _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0] ? _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0]["@list"] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array) {
 			if (v == null) continue;
-			const decoded = new URL(v["@value"]);
+			const decoded = typeof v === "object" && (typeof v["@id"] === "string" && canDecodeIri(v["@id"]) || typeof v["@value"] === "string" && canDecodeIri(v["@value"])) ? decodeIri(typeof v["@id"] === "string" ? v["@id"] : v["@value"]) : void 0;
+			if (typeof decoded === "undefined") {
+				shouldCacheJsonLd = false;
+				continue;
+			}
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl.push(decoded);
 		}

package/dist-tests/actor.test.mjs

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { C as __exportAll, c as Group, h as Person, m as Organization, r as Application, y as Service } from "./vocab-CQpPUXBn.mjs";
-import { n as version, r as esm_default, t as name } from "./deno-3eEok4vS.mjs";
+import { C as __exportAll, c as Group, h as Person, m as Organization, r as Application, y as Service } from "./vocab-C_YFgzlY.mjs";
+import { n as version, r as esm_default, t as name } from "./deno-C95bHg56.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { test } from "@fedify/fixture";
 import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";

package/dist-tests/{deno-3eEok4vS.mjs → deno-C95bHg56.mjs}

@@ -1,6 +1,6 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { S as __commonJSMin, w as __toESM } from "./vocab-CQpPUXBn.mjs";
+import { S as __commonJSMin, w as __toESM } from "./vocab-C_YFgzlY.mjs";
 //#region ../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js
 var require_glob_to_regexp = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = function(glob, opts) {
@@ -1204,6 +1204,6 @@ var esm_default = new class FetchMock {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.0.29-dev.2062+34489455";
+var version = "2.0.29-dev.2096+a1659cb1";
 //#endregion
 export { version as n, esm_default as r, name as t };

package/dist-tests/lookup.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { d as Note, f as Object$1, h as Person, i as Collection } from "./vocab-CQpPUXBn.mjs";
-import { n as version, r as esm_default, t as name } from "./deno-3eEok4vS.mjs";
+import { d as Note, f as Object$1, h as Person, i as Collection } from "./vocab-C_YFgzlY.mjs";
+import { n as version, r as esm_default, t as name } from "./deno-C95bHg56.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { t as assertInstanceOf } from "./utils-CE8Dk5hm.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
@@ -271,7 +271,7 @@ test("lookupObject()", {
 			name: "Hong Gildong"
 		}));
 	});
-	esm_default.removeRoutes();
+	esm_default.removeRoutes({ includeFallback: false });
 	esm_default.get("begin:https://example.com/.well-known/webfinger", {
 		subject: "acct:janedoe@example.com",
 		links: [{
@@ -284,7 +284,7 @@ test("lookupObject()", {
 		deepStrictEqual(await lookupObject("janedoe@example.com", options), null);
 		deepStrictEqual(await lookupObject("https://example.com/404", options), null);
 	});
-	esm_default.removeRoutes();
+	esm_default.removeRoutes({ includeFallback: false });
 	esm_default.get("begin:https://example.com/.well-known/webfinger", () => new Promise((resolve) => {
 		setTimeout(() => {
 			resolve({
@@ -306,7 +306,7 @@ test("lookupObject()", {
 		controller.abort();
 		deepStrictEqual(await promise, null);
 	});
-	esm_default.removeRoutes();
+	esm_default.removeRoutes({ includeFallback: false });
 	esm_default.get("begin:https://example.com/.well-known/webfinger", {
 		subject: "acct:johndoe@example.com",
 		links: [{
@@ -324,7 +324,7 @@ test("lookupObject()", {
 		assertInstanceOf(person, Person);
 		deepStrictEqual(person.id, new URL("https://example.com/person"));
 	});
-	esm_default.removeRoutes();
+	esm_default.removeRoutes({ includeFallback: false });
 	esm_default.get("begin:https://example.com/.well-known/webfinger", () => new Promise((resolve) => {
 		setTimeout(() => {
 			resolve({
@@ -345,7 +345,7 @@ test("lookupObject()", {
 			signal: controller.signal
 		}), null);
 	});
-	esm_default.removeRoutes();
+	esm_default.removeRoutes({ includeFallback: false });
 	esm_default.get("https://example.com/slow-object", () => new Promise((resolve) => {
 		setTimeout(() => {
 			resolve({

package/dist-tests/type.test.mjs

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

package/dist-tests/{vocab-CQpPUXBn.mjs → vocab-C_YFgzlY.mjs}

@@ -106,6 +106,12 @@ var vocab_exports = /* @__PURE__ */ __exportAll({
 	Video: () => Video,
 	View: () => View
 });
+function canDecodeIri(iri) {
+	return URL.canParse(iri) || iri.startsWith("at://");
+}
+function decodeIri(iri) {
+	return !URL.canParse(iri) && iri.startsWith("at://") ? new URL("at://" + encodeURIComponent(iri.substring(5))) : new URL(iri);
+}
 function isValidLanguageTag(language) {
 	try {
 		new Intl.Locale(language);
@@ -6206,7 +6212,11 @@ var ChatMessage = class ChatMessage extends Object$1 {
 		if (_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null || _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length < 1) _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array = values["http://fedibird.com/ns#quoteUri"];
 		for (const v of _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null ? [] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length === 1 && "@list" in _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0] ? _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0]["@list"] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array) {
 			if (v == null) continue;
-			const decoded = new URL(v["@value"]);
+			const decoded = typeof v === "object" && (typeof v["@id"] === "string" && canDecodeIri(v["@id"]) || typeof v["@value"] === "string" && canDecodeIri(v["@value"])) ? decodeIri(typeof v["@id"] === "string" ? v["@id"] : v["@value"]) : void 0;
+			if (typeof decoded === "undefined") {
+				shouldCacheJsonLd = false;
+				continue;
+			}
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl.push(decoded);
 		}
@@ -14414,7 +14424,11 @@ var Article = class Article extends Object$1 {
 		if (_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null || _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length < 1) _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array = values["http://fedibird.com/ns#quoteUri"];
 		for (const v of _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null ? [] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length === 1 && "@list" in _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0] ? _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0]["@list"] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array) {
 			if (v == null) continue;
-			const decoded = new URL(v["@value"]);
+			const decoded = typeof v === "object" && (typeof v["@id"] === "string" && canDecodeIri(v["@id"]) || typeof v["@value"] === "string" && canDecodeIri(v["@value"])) ? decodeIri(typeof v["@id"] === "string" ? v["@id"] : v["@value"]) : void 0;
+			if (typeof decoded === "undefined") {
+				shouldCacheJsonLd = false;
+				continue;
+			}
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl.push(decoded);
 		}
@@ -25479,7 +25493,11 @@ var Note = class Note extends Object$1 {
 		if (_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null || _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length < 1) _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array = values["http://fedibird.com/ns#quoteUri"];
 		for (const v of _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null ? [] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length === 1 && "@list" in _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0] ? _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0]["@list"] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array) {
 			if (v == null) continue;
-			const decoded = new URL(v["@value"]);
+			const decoded = typeof v === "object" && (typeof v["@id"] === "string" && canDecodeIri(v["@id"]) || typeof v["@value"] === "string" && canDecodeIri(v["@value"])) ? decodeIri(typeof v["@id"] === "string" ? v["@id"] : v["@value"]) : void 0;
+			if (typeof decoded === "undefined") {
+				shouldCacheJsonLd = false;
+				continue;
+			}
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl.push(decoded);
 		}
@@ -34599,7 +34617,11 @@ var Question = class Question extends IntransitiveActivity {
 		if (_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null || _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length < 1) _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array = values["http://fedibird.com/ns#quoteUri"];
 		for (const v of _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array == null ? [] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array.length === 1 && "@list" in _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0] ? _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array[0]["@list"] : _K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl__array) {
 			if (v == null) continue;
-			const decoded = new URL(v["@value"]);
+			const decoded = typeof v === "object" && (typeof v["@id"] === "string" && canDecodeIri(v["@id"]) || typeof v["@value"] === "string" && canDecodeIri(v["@value"])) ? decodeIri(typeof v["@id"] === "string" ? v["@id"] : v["@value"]) : void 0;
+			if (typeof decoded === "undefined") {
+				shouldCacheJsonLd = false;
+				continue;
+			}
 			if (!this._shouldCacheDecodedJsonLd(decoded)) shouldCacheJsonLd = false;
 			_K1zrMQkQjmciFAmGdGLfaDbG925_quoteUrl.push(decoded);
 		}

package/dist-tests/vocab.test.mjs

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { _ as PropertyValue, a as Create, b as Source, d as Note, f as Object$1, g as Place, h as Person, i as Collection, l as Hashtag, n as Announce, o as CryptographicKey, p as OrderedCollectionPage, s as Follow, t as Activity, u as Link, v as Question, x as vocab_exports } from "./vocab-CQpPUXBn.mjs";
+import { _ as PropertyValue, a as Create, b as Source, d as Note, f as Object$1, g as Place, h as Person, i as Collection, l as Hashtag, n as Announce, o as CryptographicKey, p as OrderedCollectionPage, s as Follow, t as Activity, u as Link, v as Question, x as vocab_exports } from "./vocab-C_YFgzlY.mjs";
 import { t as assertInstanceOf } from "./utils-CE8Dk5hm.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { deepStrictEqual, notDeepStrictEqual, ok, rejects, throws } from "node:assert/strict";
@@ -527,6 +527,83 @@ test("Note.quoteUrl", async () => {
 	delete jsonLd._misskey_quote;
 	deepStrictEqual((await Note.fromJsonLd(jsonLd)).quoteUrl, new URL("https://example.com/object3"));
 });
+test("Note.quoteUrl (IRI-typed alias terms)", async () => {
+	const jsonLd = {
+		"@context": ["https://www.w3.org/ns/activitystreams", {
+			fedibird: "http://fedibird.com/ns#",
+			misskey: "https://misskey-hub.net/ns#",
+			_misskey_quote: {
+				"@id": "misskey:_misskey_quote",
+				"@type": "@id"
+			},
+			quoteUri: {
+				"@id": "fedibird:quoteUri",
+				"@type": "@id"
+			}
+		}],
+		id: "https://example.com/notes/1",
+		type: "Note",
+		_misskey_quote: "https://example.com/notes/quoted",
+		quoteUri: "https://example.com/notes/quoted2"
+	};
+	deepStrictEqual((await Note.fromJsonLd(jsonLd)).quoteUrl, new URL("https://example.com/notes/quoted"));
+	delete jsonLd._misskey_quote;
+	deepStrictEqual((await Note.fromJsonLd(jsonLd)).quoteUrl, new URL("https://example.com/notes/quoted2"));
+});
+test("Note.quoteUrl (IRI-typed primary term)", async () => {
+	const context = ["https://www.w3.org/ns/activitystreams", {
+		misskey: "https://misskey-hub.net/ns#",
+		quoteUrl: {
+			"@id": "as:quoteUrl",
+			"@type": "@id"
+		},
+		_misskey_quote: "misskey:_misskey_quote"
+	}];
+	deepStrictEqual((await Note.fromJsonLd({
+		"@context": context,
+		type: "Note",
+		quoteUrl: "https://example.com/object"
+	})).quoteUrl, new URL("https://example.com/object"));
+	deepStrictEqual((await Note.fromJsonLd({
+		"@context": context,
+		type: "Note",
+		quoteUrl: "https://example.com/object",
+		_misskey_quote: "https://example.com/object2"
+	})).quoteUrl, new URL("https://example.com/object"));
+});
+test("Note.quoteUrl (unparsable IRI-valued terms)", async () => {
+	const context = ["https://www.w3.org/ns/activitystreams", {
+		misskey: "https://misskey-hub.net/ns#",
+		_misskey_quote: {
+			"@id": "misskey:_misskey_quote",
+			"@type": "@id"
+		}
+	}];
+	for (const quote of [
+		{
+			type: "Note",
+			content: "An inlined quote without an id"
+		},
+		"_:b0",
+		"",
+		"notes/relative"
+	]) {
+		const loaded = await Note.fromJsonLd({
+			"@context": context,
+			id: "https://example.com/notes/1",
+			type: "Note",
+			content: "Hello",
+			_misskey_quote: quote
+		});
+		deepStrictEqual(loaded.quoteUrl, null, JSON.stringify(quote));
+		deepStrictEqual(loaded.content, "Hello");
+	}
+	deepStrictEqual((await Note.fromJsonLd({
+		"@context": context,
+		type: "Note",
+		_misskey_quote: "at://did:plc:abc/app.bsky.feed.post/xyz"
+	})).quoteUrl, new URL("at://" + encodeURIComponent("did:plc:abc/app.bsky.feed.post/xyz")));
+});
 test("Key.publicKey", async () => {
 	const jwk = {
 		kty: "RSA",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.0.29-dev.2062+34489455",
+  "version": "2.0.29-dev.2096+a1659cb1",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -46,9 +46,9 @@
     "es-toolkit": "1.43.0",
     "jsonld": "^9.0.0",
     "pkijs": "^3.3.3",
-    "@fedify/vocab-tools": "2.0.29-dev.2062+34489455",
-    "@fedify/vocab-runtime": "2.0.29-dev.2062+34489455",
-    "@fedify/webfinger": "2.0.29-dev.2062+34489455"
+    "@fedify/vocab-tools": "2.0.29-dev.2096+a1659cb1",
+    "@fedify/webfinger": "2.0.29-dev.2096+a1659cb1",
+    "@fedify/vocab-runtime": "2.0.29-dev.2096+a1659cb1"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",

package/src/lookup.test.ts

@@ -79,7 +79,8 @@ test("lookupObject()", {
     );
   });
 
-  fetchMock.removeRoutes();
+  // Workers load fixtures through fetch(), so keep the spy fallback between steps.
+  fetchMock.removeRoutes({ includeFallback: false });
   fetchMock.get("begin:https://example.com/.well-known/webfinger", {
     subject: "acct:janedoe@example.com",
     links: [
@@ -99,7 +100,7 @@ test("lookupObject()", {
     );
   });
 
-  fetchMock.removeRoutes();
+  fetchMock.removeRoutes({ includeFallback: false });
   fetchMock.get(
     "begin:https://example.com/.well-known/webfinger",
     () =>
@@ -130,7 +131,7 @@ test("lookupObject()", {
     deepStrictEqual(await promise, null);
   });
 
-  fetchMock.removeRoutes();
+  fetchMock.removeRoutes({ includeFallback: false });
   fetchMock.get(
     "begin:https://example.com/.well-known/webfinger",
     {
@@ -155,7 +156,7 @@ test("lookupObject()", {
     deepStrictEqual(person.id, new URL("https://example.com/person"));
   });
 
-  fetchMock.removeRoutes();
+  fetchMock.removeRoutes({ includeFallback: false });
   fetchMock.get(
     "begin:https://example.com/.well-known/webfinger",
     () =>
@@ -186,7 +187,7 @@ test("lookupObject()", {
     deepStrictEqual(result, null);
   });
 
-  fetchMock.removeRoutes();
+  fetchMock.removeRoutes({ includeFallback: false });
   fetchMock.get(
     "https://example.com/slow-object",
     () =>

package/src/vocab.test.ts

@@ -809,6 +809,105 @@ test("Note.quoteUrl", async () => {
   deepStrictEqual(loaded3.quoteUrl, new URL("https://example.com/object3"));
 });
 
+test("Note.quoteUrl (IRI-typed alias terms)", async () => {
+  const jsonLd: Record<string, unknown> = {
+    "@context": [
+      "https://www.w3.org/ns/activitystreams",
+      {
+        fedibird: "http://fedibird.com/ns#",
+        misskey: "https://misskey-hub.net/ns#",
+        _misskey_quote: {
+          "@id": "misskey:_misskey_quote",
+          "@type": "@id",
+        },
+        quoteUri: {
+          "@id": "fedibird:quoteUri",
+          "@type": "@id",
+        },
+      },
+    ],
+    id: "https://example.com/notes/1",
+    type: "Note",
+    _misskey_quote: "https://example.com/notes/quoted",
+    quoteUri: "https://example.com/notes/quoted2",
+  };
+
+  const loaded = await Note.fromJsonLd(jsonLd);
+  deepStrictEqual(loaded.quoteUrl, new URL("https://example.com/notes/quoted"));
+
+  delete jsonLd._misskey_quote;
+  const loaded2 = await Note.fromJsonLd(jsonLd);
+  deepStrictEqual(
+    loaded2.quoteUrl,
+    new URL("https://example.com/notes/quoted2"),
+  );
+});
+
+test("Note.quoteUrl (IRI-typed primary term)", async () => {
+  const context = [
+    "https://www.w3.org/ns/activitystreams",
+    {
+      misskey: "https://misskey-hub.net/ns#",
+      quoteUrl: { "@id": "as:quoteUrl", "@type": "@id" },
+      _misskey_quote: "misskey:_misskey_quote",
+    },
+  ];
+
+  const loaded = await Note.fromJsonLd({
+    "@context": context,
+    type: "Note",
+    quoteUrl: "https://example.com/object",
+  });
+  deepStrictEqual(loaded.quoteUrl, new URL("https://example.com/object"));
+
+  // An IRI-valued quoteUrl still takes precedence over a plain-string alias:
+  const loaded2 = await Note.fromJsonLd({
+    "@context": context,
+    type: "Note",
+    quoteUrl: "https://example.com/object",
+    _misskey_quote: "https://example.com/object2",
+  });
+  deepStrictEqual(loaded2.quoteUrl, new URL("https://example.com/object"));
+});
+
+test("Note.quoteUrl (unparsable IRI-valued terms)", async () => {
+  const context = [
+    "https://www.w3.org/ns/activitystreams",
+    {
+      misskey: "https://misskey-hub.net/ns#",
+      _misskey_quote: { "@id": "misskey:_misskey_quote", "@type": "@id" },
+    },
+  ];
+  for (
+    const quote of [
+      { type: "Note", content: "An inlined quote without an id" },
+      "_:b0",
+      "",
+      "notes/relative",
+    ]
+  ) {
+    const loaded = await Note.fromJsonLd({
+      "@context": context,
+      id: "https://example.com/notes/1",
+      type: "Note",
+      content: "Hello",
+      _misskey_quote: quote,
+    });
+    deepStrictEqual(loaded.quoteUrl, null, JSON.stringify(quote));
+    deepStrictEqual(loaded.content, "Hello");
+  }
+
+  const atUri = await Note.fromJsonLd({
+    "@context": context,
+    type: "Note",
+    _misskey_quote: "at://did:plc:abc/app.bsky.feed.post/xyz",
+  });
+  deepStrictEqual(
+    atUri.quoteUrl,
+    new URL("at://" + encodeURIComponent("did:plc:abc/app.bsky.feed.post/xyz")),
+  );
+});
+
 test("Key.publicKey", async () => {
   const jwk = {
     kty: "RSA",