@fedify/vocab-runtime 2.1.0 → 2.1.2

package/dist/tests/{chunk-DWy1uDak.cjs → chunk-Do9eywBl.cjs}

@@ -1,13 +1,11 @@
-//#region rolldown:runtime
+//#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function() {
-	return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
+var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __copyProps = (to, from, except, desc) => {
 	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
 		key = keys[i];
@@ -22,18 +20,16 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-
 //#endregion
-
-Object.defineProperty(exports, '__commonJS', {
-  enumerable: true,
-  get: function () {
-    return __commonJS;
-  }
+Object.defineProperty(exports, "__commonJSMin", {
+	enumerable: true,
+	get: function() {
+		return __commonJSMin;
+	}
+});
+Object.defineProperty(exports, "__toESM", {
+	enumerable: true,
+	get: function() {
+		return __toESM;
+	}
 });
-Object.defineProperty(exports, '__toESM', {
-  enumerable: true,
-  get: function () {
-    return __toESM;
-  }
-});

package/dist/tests/decimal.test.cjs

@@ -1,15 +1,10 @@
-const require_chunk = require('./chunk-DWy1uDak.cjs');
-require('./docloader-D3nu2LmR.cjs');
-require('./request-DyrEDYQ-.cjs');
-require('./link-DYNFAdNu.cjs');
-require('./url-DIjOdK8Q.cjs');
-require('./multicodec--6hQ74zI.cjs');
-require('./key-CCPn6TEY.cjs');
-require('./multibase-o_ovPHYJ.cjs');
-require('./langstr-EPh86hXK.cjs');
-const node_assert = require_chunk.__toESM(require("node:assert"));
-const node_test = require_chunk.__toESM(require("node:test"));
-
+require("./chunk-Do9eywBl.cjs");
+require("./docloader-0Yz9aPvU.cjs");
+require("./key-DTTIntwb.cjs");
+require("./multibase-F7LtMMsK.cjs");
+require("./langstr-CbAxaeEZ.cjs");
+let node_assert = require("node:assert");
+let node_test = require("node:test");
 //#region src/decimal.ts
 const DECIMAL_PATTERN = /^(\+|-)?([0-9]+(\.[0-9]*)?|\.[0-9]+)$/;
 const XML_SCHEMA_WHITESPACE_PATTERN = /[\t\n\r ]+/g;
@@ -84,11 +79,10 @@ function parseDecimal(value) {
 	if (!isDecimal(normalized)) throw new TypeError(`${JSON.stringify(value)} is not a valid xsd:decimal lexical form.`);
 	return normalized;
 }
-
 //#endregion
 //#region src/decimal.test.ts
 (0, node_test.test)("parseDecimal() accepts valid xsd:decimal lexical forms", () => {
-	const values = [
+	for (const value of [
 		"-1.23",
 		"12678967.543233",
 		"+100000.00",
@@ -97,8 +91,7 @@ function parseDecimal(value) {
 		"5.",
 		"0",
 		"-0.0"
-	];
-	for (const value of values) (0, node_assert.deepStrictEqual)(parseDecimal(value), value);
+	]) (0, node_assert.deepStrictEqual)(parseDecimal(value), value);
 });
 (0, node_test.test)("isDecimal() reports valid xsd:decimal lexical forms", () => {
 	(0, node_assert.deepStrictEqual)(isDecimal("12.50"), true);
@@ -123,7 +116,7 @@ function parseDecimal(value) {
 	(0, node_assert.deepStrictEqual)(parseDecimal("  .5  "), ".5");
 });
 (0, node_test.test)("parseDecimal() rejects invalid xsd:decimal lexical forms", () => {
-	const values = [
+	for (const value of [
 		"",
 		".",
 		"+",
@@ -135,8 +128,7 @@ function parseDecimal(value) {
 		"1..2",
 		"1 2.3",
 		"1	2.3"
-	];
-	for (const value of values) (0, node_assert.throws)(() => parseDecimal(value), {
+	]) (0, node_assert.throws)(() => parseDecimal(value), {
 		name: "TypeError",
 		message: `${JSON.stringify(value)} is not a valid xsd:decimal lexical form.`
 	});
@@ -150,5 +142,4 @@ function parseDecimal(value) {
 (0, node_test.test)("isDecimal() is exported from the package root", () => {
 	(0, node_assert.deepStrictEqual)(isDecimal("12.50"), true);
 });
-
-//#endregion
+//#endregion

package/dist/tests/{decimal.test.js → decimal.test.mjs}

@@ -1,14 +1,9 @@
-import "./docloader-U31begIa.js";
-import "./request-BH_NlxCL.js";
-import "./link-C3q2TC2G.js";
-import "./url-CWEP9Zs9.js";
-import "./multicodec-Dq3IiOV4.js";
-import "./key-ByCmSI2y.js";
-import "./multibase-B4g8pz6F.js";
-import "./langstr-BsVE3s9u.js";
+import "./docloader-DiLx08rm.mjs";
+import "./key-BeTHFQJK.mjs";
+import "./multibase-BgU9XRf7.mjs";
+import "./langstr-Di5AvKpB.mjs";
 import { deepStrictEqual, throws } from "node:assert";
 import { test } from "node:test";
-
 //#region src/decimal.ts
 const DECIMAL_PATTERN = /^(\+|-)?([0-9]+(\.[0-9]*)?|\.[0-9]+)$/;
 const XML_SCHEMA_WHITESPACE_PATTERN = /[\t\n\r ]+/g;
@@ -83,11 +78,10 @@ function parseDecimal(value) {
 	if (!isDecimal(normalized)) throw new TypeError(`${JSON.stringify(value)} is not a valid xsd:decimal lexical form.`);
 	return normalized;
 }
-
 //#endregion
 //#region src/decimal.test.ts
 test("parseDecimal() accepts valid xsd:decimal lexical forms", () => {
-	const values = [
+	for (const value of [
 		"-1.23",
 		"12678967.543233",
 		"+100000.00",
@@ -96,8 +90,7 @@ test("parseDecimal() accepts valid xsd:decimal lexical forms", () => {
 		"5.",
 		"0",
 		"-0.0"
-	];
-	for (const value of values) deepStrictEqual(parseDecimal(value), value);
+	]) deepStrictEqual(parseDecimal(value), value);
 });
 test("isDecimal() reports valid xsd:decimal lexical forms", () => {
 	deepStrictEqual(isDecimal("12.50"), true);
@@ -122,7 +115,7 @@ test("parseDecimal() normalizes XML Schema whitespace", () => {
 	deepStrictEqual(parseDecimal("  .5  "), ".5");
 });
 test("parseDecimal() rejects invalid xsd:decimal lexical forms", () => {
-	const values = [
+	for (const value of [
 		"",
 		".",
 		"+",
@@ -134,8 +127,7 @@ test("parseDecimal() rejects invalid xsd:decimal lexical forms", () => {
 		"1..2",
 		"1 2.3",
 		"1	2.3"
-	];
-	for (const value of values) throws(() => parseDecimal(value), {
+	]) throws(() => parseDecimal(value), {
 		name: "TypeError",
 		message: `${JSON.stringify(value)} is not a valid xsd:decimal lexical form.`
 	});
@@ -149,5 +141,5 @@ test("canParseDecimal() is exported from the package root", () => {
 test("isDecimal() is exported from the package root", () => {
 	deepStrictEqual(isDecimal("12.50"), true);
 });
-
-//#endregion
+//#endregion
+export {};

package/dist/tests/{docloader-D3nu2LmR.cjs → docloader-0Yz9aPvU.cjs}

@@ -1,12 +1,11 @@
-const require_chunk = require('./chunk-DWy1uDak.cjs');
-const require_request = require('./request-DyrEDYQ-.cjs');
-const require_link = require('./link-DYNFAdNu.cjs');
-const require_url = require('./url-DIjOdK8Q.cjs');
-const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
-const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
-
+require("./chunk-Do9eywBl.cjs");
+const require_request = require("./request-B4BOehn0.cjs");
+const require_link = require("./link-FguCydMA.cjs");
+const require_url = require("./url-pFuSds44.cjs");
+let _logtape_logtape = require("@logtape/logtape");
+let _opentelemetry_api = require("@opentelemetry/api");
 //#region src/contexts/activitystreams.json
-var __context$11 = {
+var activitystreams_default = { "@context": {
 	"@vocab": "_:",
 	"xsd": "http://www.w3.org/2001/XMLSchema#",
 	"as": "https://www.w3.org/ns/activitystreams#",
@@ -382,12 +381,10 @@ var __context$11 = {
 		"@id": "as:alsoKnownAs",
 		"@type": "@id"
 	}
-};
-var activitystreams_default = { "@context": __context$11 };
-
+} };
 //#endregion
 //#region src/contexts/did-v1.json
-var __context$10 = {
+var did_v1_default = { "@context": {
 	"@protected": true,
 	"id": "@id",
 	"type": "@type",
@@ -441,12 +438,10 @@ var __context$10 = {
 		"@id": "https://w3id.org/security#verificationMethod",
 		"@type": "@id"
 	}
-};
-var did_v1_default = { "@context": __context$10 };
-
+} };
 //#endregion
 //#region src/contexts/fep-5711.json
-var __context$9 = {
+var fep_5711_default = { "@context": {
 	"likesOf": {
 		"@id": "https://w3id.org/fep/5711#likesOf",
 		"@type": "@id"
@@ -479,12 +474,10 @@ var __context$9 = {
 		"@id": "https://w3id.org/fep/5711#likedOf",
 		"@type": "@id"
 	}
-};
-var fep_5711_default = { "@context": __context$9 };
-
+} };
 //#endregion
 //#region src/contexts/gotosocial.json
-var __context$8 = {
+var gotosocial_default = { "@context": {
 	"xsd": "http://www.w3.org/2001/XMLSchema#",
 	"gts": "https://gotosocial.org/ns#",
 	"LikeRequest": "gts:LikeRequest",
@@ -567,12 +560,10 @@ var __context$8 = {
 		"@id": "gts:approvedBy",
 		"@type": "@id"
 	}
-};
-var gotosocial_default = { "@context": __context$8 };
-
+} };
 //#endregion
 //#region src/contexts/identity-v1.json
-var __context$7 = {
+var identity_v1_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"cred": "https://w3id.org/credentials#",
@@ -721,12 +712,10 @@ var __context$7 = {
 		"@id": "perm:writePermission",
 		"@type": "@id"
 	}
-};
-var identity_v1_default = { "@context": __context$7 };
-
+} };
 //#endregion
 //#region src/contexts/joinmastodon.json
-var __context$6 = {
+var joinmastodon_default = { "@context": {
 	"toot": "http://joinmastodon.org/ns#",
 	"Emoji": "toot:Emoji",
 	"featured": {
@@ -751,12 +740,10 @@ var __context$6 = {
 		"@id": "toot:attributionDomains",
 		"@type": "@id"
 	}
-};
-var joinmastodon_default = { "@context": __context$6 };
-
+} };
 //#endregion
 //#region src/contexts/schemaorg.json
-var __context$5 = {
+var schemaorg_default = { "@context": {
 	"type": "@type",
 	"id": "@id",
 	"HTML": { "@id": "rdf:HTML" },
@@ -4058,12 +4045,10 @@ var __context$5 = {
 	"yearlyRevenue": { "@id": "schema:yearlyRevenue" },
 	"yearsInOperation": { "@id": "schema:yearsInOperation" },
 	"yield": { "@id": "schema:yield" }
-};
-var schemaorg_default = { "@context": __context$5 };
-
+} };
 //#endregion
 //#region src/contexts/security-data-integrity-v1.json
-var __context$4 = {
+var security_data_integrity_v1_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"@protected": true,
@@ -4138,12 +4123,10 @@ var __context$4 = {
 			}
 		}
 	}
-};
-var security_data_integrity_v1_default = { "@context": __context$4 };
-
+} };
 //#endregion
 //#region src/contexts/security-data-integrity-v2.json
-var __context$3 = {
+var security_data_integrity_v2_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"@protected": true,
@@ -4221,12 +4204,10 @@ var __context$3 = {
 			}
 		}
 	}
-};
-var security_data_integrity_v2_default = { "@context": __context$3 };
-
+} };
 //#endregion
 //#region src/contexts/security-multikey-v1.json
-var __context$2 = {
+var security_multikey_v1_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"@protected": true,
@@ -4258,12 +4239,10 @@ var __context$2 = {
 			}
 		}
 	}
-};
-var security_multikey_v1_default = { "@context": __context$2 };
-
+} };
 //#endregion
 //#region src/contexts/security-v1.json
-var __context$1 = {
+var security_v1_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"dc": "http://purl.org/dc/terms/",
@@ -4334,21 +4313,17 @@ var __context$1 = {
 	"signature": "sec:signature",
 	"signatureAlgorithm": "sec:signingAlgorithm",
 	"signatureValue": "sec:signatureValue"
-};
-var security_v1_default = { "@context": __context$1 };
-
+} };
 //#endregion
 //#region src/contexts/webfinger.json
-var __context = {
+var webfinger_default = { "@context": {
 	"wf": "https://purl.archive.org/socialweb/webfinger#",
 	"xsd": "http://www.w3.org/2001/XMLSchema#",
 	"webfinger": {
 		"@id": "wf:webfinger",
 		"@type": "xsd:string"
 	}
-};
-var webfinger_default = { "@context": __context };
-
+} };
 //#endregion
 //#region src/contexts.ts
 const preloadedContexts = {
@@ -4365,15 +4340,14 @@ const preloadedContexts = {
 	"https://w3id.org/fep/5711": fep_5711_default,
 	"http://joinmastodon.org/ns": joinmastodon_default
 };
-var contexts_default = preloadedContexts;
-
 //#endregion
 //#region src/docloader.ts
-const logger = (0, __logtape_logtape.getLogger)([
+const logger = (0, _logtape_logtape.getLogger)([
 	"fedify",
 	"runtime",
 	"docloader"
 ]);
+const DEFAULT_MAX_REDIRECTION = 20;
 /**
 * Gets a {@link RemoteDocument} from the given response.
 * @param url The URL of the document to load.
@@ -4383,7 +4357,7 @@ const logger = (0, __logtape_logtape.getLogger)([
 * @throws {FetchError} If the response is not OK.
 * @internal
 */
-async function getRemoteDocument(url, response, fetch$1) {
+async function getRemoteDocument(url, response, fetch) {
 	const documentUrl = response.url === "" ? url : response.url;
 	const docUrl = new URL(documentUrl);
 	if (!response.ok) {
@@ -4421,7 +4395,7 @@ async function getRemoteDocument(url, response, fetch$1) {
 						alternateUrl: altUri.href,
 						url: documentUrl
 					});
-					return await fetch$1(altUri.href);
+					return await fetch(altUri.href);
 				}
 			}
 		}
@@ -4447,15 +4421,14 @@ async function getRemoteDocument(url, response, fetch$1) {
 				attrPattern.lastIndex = 0;
 				while ((attrMatch = attrPattern.exec(tagContent)) !== null) {
 					const key = attrMatch[1].toLowerCase();
-					const value = attrMatch[2] ?? attrMatch[3] ?? attrMatch[4] ?? "";
-					attribs[key] = value;
+					attribs[key] = attrMatch[2] ?? attrMatch[3] ?? attrMatch[4] ?? "";
 				}
 				if (attribs.rel === "alternate" && "type" in attribs && (attribs.type === "application/activity+json" || attribs.type === "application/ld+json" || attribs.type.startsWith("application/ld+json;")) && "href" in attribs && new URL(attribs.href, docUrl).href !== docUrl.href) {
 					logger.debug("Found alternate document: {alternateUrl} from {url}", {
 						alternateUrl: attribs.href,
 						url: documentUrl
 					});
-					return await fetch$1(new URL(attribs.href, docUrl).href);
+					return await fetch(new URL(attribs.href, docUrl).href);
 				}
 			}
 			document = JSON.parse(html);
@@ -4490,33 +4463,34 @@ async function getRemoteDocument(url, response, fetch$1) {
 * @since 1.3.0
 */
 function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAgent } = {}) {
-	const tracerProvider = __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_request.deno_default.name, require_request.deno_default.version);
-	async function load(url, options) {
+	const tracer = _opentelemetry_api.trace.getTracerProvider().getTracer(require_request.name, require_request.version);
+	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
 		options?.signal?.throwIfAborted();
-		if (!skipPreloadedContexts && url in contexts_default) {
-			logger.debug("Using preloaded context: {url}.", { url });
+		const currentUrl = new URL(url).href;
+		if (!skipPreloadedContexts && currentUrl in preloadedContexts) {
+			logger.debug("Using preloaded context: {url}.", { url: currentUrl });
 			return {
 				contextUrl: null,
-				document: contexts_default[url],
-				documentUrl: url
+				document: preloadedContexts[currentUrl],
+				documentUrl: currentUrl
 			};
 		}
 		if (!allowPrivateAddress) try {
-			await require_url.validatePublicUrl(url);
+			await require_url.validatePublicUrl(currentUrl);
 		} catch (error) {
 			if (error instanceof require_url.UrlError) logger.error("Disallowed private URL: {url}", {
-				url,
+				url: currentUrl,
 				error
 			});
 			throw error;
 		}
+		visited.add(currentUrl);
 		return await tracer.startActiveSpan("activitypub.fetch_document", {
-			kind: __opentelemetry_api.SpanKind.CLIENT,
-			attributes: { "url.full": url }
+			kind: _opentelemetry_api.SpanKind.CLIENT,
+			attributes: { "url.full": currentUrl }
 		}, async (span) => {
 			try {
-				const request = require_request.createActivityPubRequest(url, { userAgent });
+				const request = require_request.createActivityPubRequest(currentUrl, { userAgent });
 				require_request.logRequest(logger, request);
 				const response = await fetch(request, {
 					redirect: "manual",
@@ -4524,18 +4498,32 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 				});
 				span.setAttribute("http.response.status_code", response.status);
 				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
-					const redirectUrl = response.headers.get("Location");
+					if (redirected >= DEFAULT_MAX_REDIRECTION) {
+						logger.error("Too many redirections ({redirections}) while fetching document.", {
+							redirections: redirected + 1,
+							url: currentUrl
+						});
+						throw new require_request.FetchError(currentUrl, `Too many redirections (${redirected + 1})`);
+					}
+					const redirectUrl = new URL(response.headers.get("Location"), response.url === "" ? currentUrl : response.url).href;
 					span.setAttribute("http.redirect.url", redirectUrl);
-					return await load(redirectUrl, options);
+					if (visited.has(redirectUrl)) {
+						logger.error("Detected a redirect loop while fetching document: {url} -> {redirectUrl}", {
+							url: currentUrl,
+							redirectUrl
+						});
+						throw new require_request.FetchError(currentUrl, `Redirect loop detected: ${redirectUrl}`);
+					}
+					return await load(redirectUrl, options, redirected + 1, visited);
 				}
-				const result = await getRemoteDocument(url, response, load);
+				const result = await getRemoteDocument(currentUrl, response, load);
 				span.setAttribute("docloader.document_url", result.documentUrl);
 				if (result.contextUrl != null) span.setAttribute("docloader.context_url", result.contextUrl);
 				return result;
 			} catch (error) {
 				span.recordException(error);
 				span.setStatus({
-					code: __opentelemetry_api.SpanStatusCode.ERROR,
+					code: _opentelemetry_api.SpanStatusCode.ERROR,
 					message: String(error)
 				});
 				throw error;
@@ -4546,17 +4534,16 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 	}
 	return load;
 }
-
 //#endregion
-Object.defineProperty(exports, 'contexts_default', {
-  enumerable: true,
-  get: function () {
-    return contexts_default;
-  }
+Object.defineProperty(exports, "getDocumentLoader", {
+	enumerable: true,
+	get: function() {
+		return getDocumentLoader;
+	}
+});
+Object.defineProperty(exports, "preloadedContexts", {
+	enumerable: true,
+	get: function() {
+		return preloadedContexts;
+	}
 });
-Object.defineProperty(exports, 'getDocumentLoader', {
-  enumerable: true,
-  get: function () {
-    return getDocumentLoader;
-  }
-});