ochre-sdk 1.0.52 → 1.0.54

package/dist/parsers/multilingual.mjs

@@ -13,7 +13,8 @@ function normalizeInputText(text) {
 }
 function normalizeAliases(aliases) {
 	const normalizedAliases = [];
-	for (const alias of aliases ?? []) if (alias !== "") normalizedAliases.push(alias);
+	const candidateAliases = aliases ?? [];
+	for (const alias of candidateAliases) if (alias !== "") normalizedAliases.push(alias);
 	return normalizedAliases;
 }
 function entriesFromTexts(texts) {
@@ -27,15 +28,11 @@ function entriesFromTexts(texts) {
 function cloneContent(content) {
 	const clonedContent = {};
 	const entriesByLanguage = Object.entries(content);
-	for (const [language, entries] of entriesByLanguage) {
-		const clonedEntries = [];
-		for (const entry of entries ?? []) clonedEntries.push({
-			text: entry.text,
-			richText: entry.richText,
-			isPrimary: entry.isPrimary
-		});
-		clonedContent[language] = normalizePrimary(clonedEntries);
-	}
+	for (const [language, entries] of entriesByLanguage) clonedContent[language] = normalizePrimary(Array.from(entries ?? [], (entry) => ({
+		text: entry.text,
+		richText: entry.richText,
+		isPrimary: entry.isPrimary
+	})));
 	return clonedContent;
 }
 function normalizePrimary(entries) {
@@ -54,35 +51,18 @@ function getLanguagesWithEntries(content, languages) {
 }
 function getImplicitLanguages(content, options) {
 	const languages = [];
-	for (const language of options.availableLanguages ?? []) if (!languages.includes(language)) languages.push(language);
+	const availableLanguages = options.availableLanguages ?? [];
+	for (const language of availableLanguages) if (!languages.includes(language)) languages.push(language);
 	for (const language of Object.keys(content)) if (!languages.includes(language)) languages.push(language);
 	return languages.length > 0 ? languages : [...DEFAULT_LANGUAGES];
 }
 function isInternalInit(value) {
-	return typeof value === "object" && value != null && MULTILINGUAL_STRING_INTERNAL_INIT in value;
+	return typeof value === "object" && value != null && Object.hasOwn(value, MULTILINGUAL_STRING_INTERNAL_INIT);
 }
 /**
 * Multilingual string
 */
 var MultilingualString = class MultilingualString {
-	_content;
-	_options;
-	_availableLanguages;
-	_aliases;
-	constructor(content = {}, languages, options = {}) {
-		if (isInternalInit(content)) {
-			this._content = Object.freeze(cloneContent(content.content));
-			this._options = Object.freeze({ ...content.options });
-			this._availableLanguages = Object.freeze([...content.availableLanguages]);
-			this._aliases = Object.freeze([...content.options.aliases]);
-			return;
-		}
-		const parsed = languages === void 0 ? MultilingualString.fromObject(content, void 0, options) : MultilingualString.fromObject(content, languages, options);
-		this._content = parsed._content;
-		this._options = parsed._options;
-		this._availableLanguages = parsed._availableLanguages;
-		this._aliases = parsed._aliases;
-	}
 	static fromNormalized(content, options, availableLanguages) {
 		return new MultilingualString({
 			[MULTILINGUAL_STRING_INTERNAL_INIT]: true,
@@ -94,8 +74,8 @@ var MultilingualString = class MultilingualString {
 	static fromObject(content, languages, options = {}) {
 		const entries = {};
 		for (const [language, text] of Object.entries(content)) if (text != null) entries[language] = [text];
-		if (languages === void 0) return MultilingualString.fromEntries(entries, void 0, options);
-		return MultilingualString.fromEntries(entries, languages, options);
+		if (languages === void 0) return this.fromEntries(entries, void 0, options);
+		return this.fromEntries(entries, languages, options);
 	}
 	static fromEntries(content, languages, options = {}) {
 		if (languages === void 0) {
@@ -108,7 +88,7 @@ var MultilingualString = class MultilingualString {
 				availableLanguages: actualLanguages,
 				aliases: normalizeAliases(options.aliases)
 			};
-			return MultilingualString.fromNormalized(normalizedContent, defaultOptions, availableLanguages);
+			return this.fromNormalized(normalizedContent, defaultOptions, availableLanguages);
 		}
 		const normalizedContent = {};
 		for (const language of languages) {
@@ -121,21 +101,21 @@ var MultilingualString = class MultilingualString {
 			availableLanguages: languages,
 			aliases: normalizeAliases(options.aliases)
 		};
-		return MultilingualString.fromNormalized(normalizedContent, defaultOptions, availableLanguages);
+		return this.fromNormalized(normalizedContent, defaultOptions, availableLanguages);
 	}
 	static create(language, text, languages, options = {}) {
-		if (languages === void 0) return MultilingualString.fromObject({ [language]: text }, void 0, {
+		if (languages === void 0) return this.fromObject({ [language]: text }, void 0, {
 			...options,
 			defaultLanguage: language
 		});
-		return MultilingualString.fromObject({ [language]: text }, languages, {
+		return this.fromObject({ [language]: text }, languages, {
 			...options,
 			defaultLanguage: language
 		});
 	}
 	static empty(languages, options = {}) {
-		if (languages === void 0) return MultilingualString.fromObject({}, void 0, options);
-		return MultilingualString.fromObject({}, languages, options);
+		if (languages === void 0) return this.fromObject({}, void 0, options);
+		return this.fromObject({}, languages, options);
 	}
 	static fromJSON(json, languages, options = {}) {
 		const content = json.content;
@@ -143,8 +123,26 @@ var MultilingualString = class MultilingualString {
 			...options,
 			aliases: json.aliases
 		};
-		if (languages === void 0) return MultilingualString.fromEntries(content, void 0, mergedOptions);
-		return MultilingualString.fromEntries(content, languages, mergedOptions);
+		if (languages === void 0) return this.fromEntries(content, void 0, mergedOptions);
+		return this.fromEntries(content, languages, mergedOptions);
+	}
+	_content;
+	_options;
+	_availableLanguages;
+	_aliases;
+	constructor(content = {}, languages, options = {}) {
+		if (isInternalInit(content)) {
+			this._content = Object.freeze(cloneContent(content.content));
+			this._options = Object.freeze({ ...content.options });
+			this._availableLanguages = Object.freeze([...content.availableLanguages]);
+			this._aliases = Object.freeze([...content.options.aliases]);
+			return;
+		}
+		const parsed = languages === void 0 ? MultilingualString.fromObject(content, void 0, options) : MultilingualString.fromObject(content, languages, options);
+		this._content = parsed._content;
+		this._options = parsed._options;
+		this._availableLanguages = parsed._availableLanguages;
+		this._aliases = parsed._aliases;
 	}
 	getPrimaryEntry(language) {
 		const entries = this._content[language] ?? [];
@@ -207,17 +205,13 @@ var MultilingualString = class MultilingualString {
 	* Get all text entries in a specific language without fallback
 	*/
 	getExactTexts(language) {
-		const texts = [];
-		for (const entry of this._content[language] ?? []) texts.push(entry.text);
-		return texts;
+		return Array.from(this._content[language] ?? [], (entry) => entry.text);
 	}
 	/**
 	* Get all rich text entries in a specific language without fallback
 	*/
 	getExactRichTexts(language) {
-		const texts = [];
-		for (const entry of this._content[language] ?? []) texts.push(entry.richText);
-		return texts;
+		return Array.from(this._content[language] ?? [], (entry) => entry.richText);
 	}
 	/**
 	* Get all text entries in a specific language with fallback
@@ -243,13 +237,11 @@ var MultilingualString = class MultilingualString {
 	* Get all entries in a specific language without fallback
 	*/
 	getExactEntries(language) {
-		const entries = [];
-		for (const entry of this._content[language] ?? []) entries.push({
+		return Array.from(this._content[language] ?? [], (entry) => ({
 			text: entry.text,
 			richText: entry.richText,
 			isPrimary: entry.isPrimary
-		});
-		return entries;
+		}));
 	}
 	/**
 	* Get all entries in a specific language with fallback
@@ -301,7 +293,10 @@ var MultilingualString = class MultilingualString {
 	* Check if the multilingual string has any content
 	*/
 	hasContent() {
-		for (const language of this._availableLanguages) for (const entry of this._content[language] ?? []) if (entry.text.trim().length > 0 || entry.richText.trim().length > 0) return true;
+		for (const language of this._availableLanguages) {
+			const entries = this._content[language] ?? [];
+			for (const entry of entries) if (entry.text.trim().length > 0 || entry.richText.trim().length > 0) return true;
+		}
 		return false;
 	}
 	/**
@@ -357,27 +352,24 @@ var MultilingualString = class MultilingualString {
 	/**
 	* Transform all language versions (returns new instance)
 	*/
-	map(fn) {
+	map(function_) {
 		const newContent = {};
-		for (const language of this._availableLanguages) {
-			const mappedEntries = [];
-			for (const entry of this._content[language] ?? []) mappedEntries.push({
-				text: fn(entry.text, language),
-				richText: fn(entry.richText, language),
-				isPrimary: entry.isPrimary
-			});
-			newContent[language] = normalizePrimary(mappedEntries);
-		}
+		for (const language of this._availableLanguages) newContent[language] = normalizePrimary(Array.from(this._content[language] ?? [], (entry) => ({
+			text: function_(entry.text, language),
+			richText: function_(entry.richText, language),
+			isPrimary: entry.isPrimary
+		})));
 		return MultilingualString.fromNormalized(newContent, this._options, this._availableLanguages);
 	}
 	/**
 	* Filter languages based on predicate (returns new instance)
 	*/
-	filter(predicate) {
+	filter(shouldInclude) {
 		const newContent = {};
 		for (const language of this._availableLanguages) {
 			const entries = [];
-			for (const entry of this._content[language] ?? []) if (predicate(entry.text, language)) entries.push(entry);
+			const languageEntries = this._content[language] ?? [];
+			for (const entry of languageEntries) if (shouldInclude(entry.text, language)) entries.push(entry);
 			newContent[language] = normalizePrimary(entries);
 		}
 		const newAvailableLanguages = getLanguagesWithEntries(newContent, this._options.availableLanguages);

package/dist/parsers/string.mjs

@@ -174,12 +174,12 @@ function parsePropertyValueText(property, options) {
 function normalizePropertyToken(value) {
 	return value.trim().toLowerCase().replaceAll(/[\s_]+/g, "-");
 }
-function propertyLabelMatches(property, uuid, tokens, options) {
+function hasMatchingPropertyLabel(property, uuid, tokens, options) {
 	if (uuid !== "" && property.label.uuid === uuid) return true;
 	const label = normalizePropertyToken(parseContentLikeForLanguage(property.label, options));
 	return tokens.includes(label);
 }
-function propertyValueMatches(property, uuid, tokens, options) {
+function hasMatchingPropertyValue(property, uuid, tokens, options) {
 	if (uuid !== "" && getPropertyValueUuid(property) === uuid) return true;
 	const value = normalizePropertyToken(parsePropertyValueText(property, options));
 	return tokens.includes(value);
@@ -191,33 +191,35 @@ function extractAnnotationMetadata(item, options) {
 	};
 	const itemProperty = item.properties?.property[0];
 	if (itemProperty == null) return result;
-	if (!propertyLabelMatches(itemProperty, "f1c131b6-1498-48a4-95bf-a9edae9fd518", ["presentation"], options) || !propertyValueMatches(itemProperty, "b9ca2732-78f4-416e-b77f-dae7647e68a9", [TEXT_ANNOTATION_TOKEN], options)) return result;
-	for (const textAnnotationProperty of itemProperty.property ?? []) {
-		if (propertyValueMatches(textAnnotationProperty, "c7f6a08a-f07b-49b6-bcb1-af485da3c58f", [HOVER_CARD_TOKEN], options)) {
+	if (!hasMatchingPropertyLabel(itemProperty, "f1c131b6-1498-48a4-95bf-a9edae9fd518", ["presentation"], options) || !hasMatchingPropertyValue(itemProperty, "b9ca2732-78f4-416e-b77f-dae7647e68a9", [TEXT_ANNOTATION_TOKEN], options)) return result;
+	const textAnnotationProperties = itemProperty.property ?? [];
+	for (const textAnnotationProperty of textAnnotationProperties) {
+		if (hasMatchingPropertyValue(textAnnotationProperty, "c7f6a08a-f07b-49b6-bcb1-af485da3c58f", [HOVER_CARD_TOKEN], options)) {
 			result.linkVariant = "hover-card";
 			continue;
 		}
-		if (propertyValueMatches(textAnnotationProperty, "bf4476ab-6bc8-40d0-a001-1446213c72ce", [ITEM_PAGE_TOKEN], options)) {
+		if (hasMatchingPropertyValue(textAnnotationProperty, "bf4476ab-6bc8-40d0-a001-1446213c72ce", [ITEM_PAGE_TOKEN], options)) {
 			result.linkVariant = "item-page";
 			continue;
 		}
-		if (propertyValueMatches(textAnnotationProperty, "9d52db95-a9cf-45f7-a0bf-fc9ba9f0aae0", [ENTRY_PAGE_TOKEN], options)) {
+		if (hasMatchingPropertyValue(textAnnotationProperty, "9d52db95-a9cf-45f7-a0bf-fc9ba9f0aae0", [ENTRY_PAGE_TOKEN], options)) {
 			result.linkVariant = "entry-page";
 			continue;
 		}
-		if (propertyValueMatches(textAnnotationProperty, "3e6f86ab-df81-45ae-8257-e2867357df56", [TEXT_STYLING_TOKEN], options)) {
+		if (hasMatchingPropertyValue(textAnnotationProperty, "3e6f86ab-df81-45ae-8257-e2867357df56", [TEXT_STYLING_TOKEN], options)) {
 			let variant = "block";
 			let size = "md";
 			let headingLevel = null;
 			const cssStyles = [];
 			const textStylingProperties = textAnnotationProperty.property ?? [];
 			for (const textStylingProperty of textStylingProperties) {
-				if (propertyLabelMatches(textStylingProperty, "e1647bef-d801-4100-bdde-d081c422f763", [VARIANT_TOKEN], options)) {
+				if (hasMatchingPropertyLabel(textStylingProperty, "e1647bef-d801-4100-bdde-d081c422f763", [VARIANT_TOKEN], options)) {
 					variant = parsePropertyValueText(textStylingProperty, options);
-					for (const nestedProperty of textStylingProperty.property ?? []) if (propertyLabelMatches(nestedProperty, "", ["size"], options)) size = parsePropertyValueText(nestedProperty, options);
+					const nestedProperties = textStylingProperty.property ?? [];
+					for (const nestedProperty of nestedProperties) if (hasMatchingPropertyLabel(nestedProperty, "", ["size"], options)) size = parsePropertyValueText(nestedProperty, options);
 					continue;
 				}
-				if (propertyLabelMatches(textStylingProperty, "d4266f0b-3f8d-4b32-8c15-4b229c8bb11e", [HEADING_LEVEL_TOKEN], options)) {
+				if (hasMatchingPropertyLabel(textStylingProperty, "d4266f0b-3f8d-4b32-8c15-4b229c8bb11e", [HEADING_LEVEL_TOKEN], options)) {
 					headingLevel = parsePropertyValueText(textStylingProperty, options);
 					continue;
 				}
@@ -232,7 +234,6 @@ function extractAnnotationMetadata(item, options) {
 				headingLevel,
 				cssStyles
 			};
-			continue;
 		}
 	}
 	return result;
@@ -243,10 +244,10 @@ function hasRichTextEnvelope(item) {
 function parseXMLStringItem(item, contentItem, options) {
 	if (!(item.payload != null && item.payload !== "" || item.string != null) && getXMLRichTextLinks(item).length === 0) {
 		const hasNewlineWhitespace = item.whitespace?.split(" ").includes("newline") === true;
-		const nextHasNewlineWhitespace = options.nextItem?.whitespace?.split(" ").includes("newline") === true;
-		if (hasNewlineWhitespace && options.rendering === "plain") return nextHasNewlineWhitespace ? "\n" : "\n\n";
-		if (hasNewlineWhitespace && options.rendering === "rawMDX") return nextHasNewlineWhitespace ? "\n<br />" : "\n<br />\n";
-		if (hasNewlineWhitespace && options.rendering === "rich") return nextHasNewlineWhitespace ? "<br />\n" : "<br />\n<br />\n";
+		const isNextContainingNewlineWhitespace = options.nextItem?.whitespace?.split(" ").includes("newline") === true;
+		if (hasNewlineWhitespace && options.rendering === "plain") return isNextContainingNewlineWhitespace ? "\n" : "\n\n";
+		if (hasNewlineWhitespace && options.rendering === "rawMDX") return isNextContainingNewlineWhitespace ? "\n<br />" : "\n<br />\n";
+		if (hasNewlineWhitespace && options.rendering === "rich") return isNextContainingNewlineWhitespace ? "<br />\n" : "<br />\n<br />\n";
 		return applyNewlineWhitespace("", item.whitespace, options.rendering);
 	}
 	if (hasRichTextEnvelope(item)) {
@@ -319,9 +320,11 @@ function createInternalLinkComponent(properties) {
 function getXMLRichTextLinks(item) {
 	const links = [];
 	let fallbackIndex = 0;
-	for (const rawLinks of Object.values(item.links ?? {})) {
+	const linkGroups = Object.values(item.links ?? {});
+	for (const rawLinks of linkGroups) {
 		if (!Array.isArray(rawLinks)) continue;
-		for (const rawLink of rawLinks) if (isXMLRichTextLink(rawLink) && !isTextAnnotationMarkerLink(rawLink)) {
+		for (const rawLink of rawLinks) {
+			if (!(isXMLRichTextLink(rawLink) && !isTextAnnotationMarkerLink(rawLink))) continue;
 			links.push({
 				link: rawLink,
 				fallbackIndex
@@ -350,34 +353,30 @@ function renderRichTextItem(item, linkString, contentItem, options) {
 		const contentText = (rendering === "plain" ? linkContent.getExactText(contentItem.lang) : linkContent.getExactRichText(contentItem.lang)) ?? "";
 		if ("type" in link && link.type != null) switch (link.type) {
 			case "IIIF":
-			case "image":
-				if ("rend" in link && link.rend === "inline") {
-					const component = createMDXComponent("inlineImage", {
-						uuid: getLinkStringProperty(link, "uuid"),
-						href: getLinkStringProperty(link, "href") ?? void 0,
-						height: getLinkStringProperty(link, "height") ?? void 0,
-						width: getLinkStringProperty(link, "width") ?? void 0,
-						content: contentText,
-						text: linkString
-					});
-					result += component;
-				} else if (link.publicationDateTime != null) {
-					const component = createInternalLinkComponent({
-						uuid: getLinkStringProperty(link, "uuid"),
-						text: linkString,
-						content: contentText,
-						annotationMetadata
-					});
-					result += component;
-				} else {
-					const component = createMDXComponent("tooltipSpan", {
-						uuid: getLinkStringProperty(link, "uuid"),
-						text: linkString,
-						content: contentText
-					});
-					result += component;
-				}
+			case "image": {
+				let component;
+				if ("rend" in link && link.rend === "inline") component = createMDXComponent("inlineImage", {
+					uuid: getLinkStringProperty(link, "uuid"),
+					href: getLinkStringProperty(link, "href") ?? void 0,
+					height: getLinkStringProperty(link, "height") ?? void 0,
+					width: getLinkStringProperty(link, "width") ?? void 0,
+					content: contentText,
+					text: linkString
+				});
+				else if (link.publicationDateTime != null) component = createInternalLinkComponent({
+					uuid: getLinkStringProperty(link, "uuid"),
+					text: linkString,
+					content: contentText,
+					annotationMetadata
+				});
+				else component = createMDXComponent("tooltipSpan", {
+					uuid: getLinkStringProperty(link, "uuid"),
+					text: linkString,
+					content: contentText
+				});
+				result += component;
 				break;
+			}
 			case "internalDocument": {
 				const component = createInternalLinkComponent({
 					uuid: getLinkStringProperty(link, "uuid"),
@@ -390,11 +389,7 @@ function renderRichTextItem(item, linkString, contentItem, options) {
 				break;
 			}
 			case "externalDocument": {
-				const component = link.publicationDateTime != null ? createMDXComponent("documentLink", {
-					uuid: getLinkStringProperty(link, "uuid"),
-					text: linkString,
-					content: contentText
-				}) : createMDXComponent("tooltipSpan", {
+				const component = createMDXComponent(link.publicationDateTime != null ? "documentLink" : "tooltipSpan", {
 					uuid: getLinkStringProperty(link, "uuid"),
 					text: linkString,
 					content: contentText
@@ -412,6 +407,18 @@ function renderRichTextItem(item, linkString, contentItem, options) {
 				result += component;
 				break;
 			}
+			default:
+				result += link.publicationDateTime != null ? createInternalLinkComponent({
+					uuid: getLinkStringProperty(link, "uuid"),
+					text: linkString,
+					content: contentText,
+					annotationMetadata
+				}) : createMDXComponent("tooltipSpan", {
+					uuid: getLinkStringProperty(link, "uuid"),
+					text: linkString,
+					content: contentText
+				});
+				break;
 		}
 		else if (link.publicationDateTime != null) {
 			const component = createInternalLinkComponent({
@@ -470,7 +477,7 @@ function parseXMLContentItem(contentItem, options) {
 		rendering: "rich",
 		rawMDXBlocks
 	}));
-	for (const [index, rawMDXBlock] of rawMDXBlocks.entries()) serializedRichText = serializedRichText.replaceAll(`${RAW_MDX_BLOCK_PLACEHOLDER_PREFIX}${index}${RAW_MDX_BLOCK_PLACEHOLDER_SUFFIX}`, rawMDXBlock);
+	for (const [index, rawMDXBlock] of rawMDXBlocks.entries()) serializedRichText = serializedRichText.replaceAll(`${RAW_MDX_BLOCK_PLACEHOLDER_PREFIX}${index}${RAW_MDX_BLOCK_PLACEHOLDER_SUFFIX}`, () => rawMDXBlock);
 	return {
 		text: parseNestedStringItems(contentItem.string, contentItem, {
 			...options,

package/dist/parsers/website/index.mjs

@@ -8,8 +8,8 @@ import * as v from "valibot";
 function isWebsiteLink(link, category) {
 	return link.category === category;
 }
-function findWebsiteLink(links, category, predicate) {
-	for (const link of links) if (isWebsiteLink(link, category) && (predicate == null || predicate(link))) return link;
+function findWebsiteLink(links, category, isMatch) {
+	for (const link of links) if (isWebsiteLink(link, category) && (isMatch == null || isMatch(link))) return link;
 	return null;
 }
 function findWebsiteLinkByCategories(links, categories) {
@@ -26,7 +26,8 @@ function transformPermanentIdentificationUrlToItemLink(url) {
 }
 function normalizeWebsiteResources(resources) {
 	const normalized = [];
-	for (const resource of resources ?? []) {
+	const resourcesToNormalize = resources ?? [];
+	for (const resource of resourcesToNormalize) {
 		if ("identification" in resource) {
 			normalized.push(resource);
 			continue;
@@ -45,7 +46,8 @@ function prefixSlug(slug, slugPrefix) {
 	return `${slugPrefix}/${slug}`;
 }
 function collectWebsitePageSlugs(resources, options, slugPrefix, pageSlugsByUuid = /* @__PURE__ */ new Map(), segmentSlugPrefix = slugPrefix) {
-	for (const resource of resources ?? []) {
+	const slugResources = resources ?? [];
+	for (const resource of slugResources) {
 		if ("segments" in resource) {
 			for (const tree of resource.segments.tree) {
 				const segmentSlug = tree.identification.abbreviation == null ? null : parseStringContent(tree.identification.abbreviation, options);
@@ -124,7 +126,7 @@ function parseResponsiveCssStyles(properties) {
 * @returns Parsed bounds object
 */
 function parseBounds(bounds) {
-	const [southWest, northEast] = bounds.trim().startsWith("[") ? parseJsonBounds(bounds) : bounds.split(";").map((pair) => pair.split(",").map((coordinate) => Number.parseFloat(coordinate.trim())));
+	const [southWest, northEast] = bounds.trim().startsWith("[") ? parseJsonBounds(bounds) : bounds.split(";").map((pair) => pair.split(",").map((coordinate) => Number(coordinate.trim())));
 	if (southWest?.length !== 2 || northEast?.length !== 2 || southWest.some((coordinate) => Number.isNaN(coordinate)) || northEast.some((coordinate) => Number.isNaN(coordinate))) throw new Error(`Invalid bounds: ${bounds}`, { cause: bounds });
 	return [[southWest[0], southWest[1]], [northEast[0], northEast[1]]];
 }
@@ -175,13 +177,11 @@ function parseAllOptionContexts(options, parserOptions) {
 }
 function parseWebsiteScopes(scopes, options) {
 	if (scopes == null) return null;
-	const parsedScopes = [];
-	for (const scope of scopes.scope) parsedScopes.push({
+	return Array.from(scopes.scope, (scope) => ({
 		uuid: scope.uuid.payload,
 		type: scope.uuid.type,
 		identification: parseIdentification(scope.identification, options)
-	});
-	return parsedScopes;
+	}));
 }
 function parseWebsiteOptions(rawOptions, options) {
 	const parsedOptions = {
@@ -189,7 +189,9 @@ function parseWebsiteOptions(rawOptions, options) {
 		contextTree: rawOptions == null ? null : parseAllOptionContexts(rawOptions, options),
 		labels: { title: null }
 	};
-	for (const note of parseNotes(rawOptions?.notes, options)) if (note.title?.getText() === "Title label") {
+	const notes = parseNotes(rawOptions?.notes, options);
+	for (const note of notes) {
+		if (note.title?.getText() !== "Title label") continue;
 		parsedOptions.labels.title = note.content;
 		break;
 	}
@@ -200,7 +202,13 @@ function parseStylesheets(styles) {
 	for (const style of styles) {
 		const defaultStyles = [];
 		for (const [label, value] of Object.entries(style)) {
-			if (label === "variableUuid" || label === "valueUuid" || label === "category" || label === "payload" || label === "content") continue;
+			if ([
+				"variableUuid",
+				"valueUuid",
+				"category",
+				"payload",
+				"content"
+			].includes(label)) continue;
 			const valueString = value?.toString();
 			if (valueString != null) defaultStyles.push({
 				label,
@@ -389,10 +397,8 @@ function parseWebElementProperties(componentProperty, elementResource, options,
 			if (href === null) {
 				href = parseWebsiteLinkTarget(componentReader.valueNode("link-to"), context);
 				if (href === null) throw new Error(formatComponentError("Properties “navigate-to” or “link-to” not found", componentName, elementResource), { cause: componentProperty });
-				else {
-					isExternal = href.startsWith("http");
-					isRelative = !href.startsWith("/");
-				}
+				isExternal = href.startsWith("http");
+				isRelative = !href.startsWith("/");
 			}
 			const startIcon = componentReader.value("start-icon");
 			const endIcon = componentReader.value("end-icon");
@@ -406,6 +412,14 @@ function parseWebElementProperties(componentProperty, elementResource, options,
 				description: imageLink.description,
 				quality: "high"
 			};
+			const childResources = elementResource.resource ? normalizeWebsiteResources(elementResource.resource) : [];
+			const elements = [];
+			for (const childResource of childResources) {
+				const childReader = websitePresentationReader(childResource.properties ? parseSimplifiedProperties(childResource.properties, options) : []);
+				if (childReader.value("presentation") !== "element") continue;
+				if (childReader.nestedByValue("presentation", "element").value("component") === "button") continue;
+				elements.push(parseWebElement(childResource, options, context));
+			}
 			properties = {
 				component: "button",
 				variant,
@@ -415,7 +429,8 @@ function parseWebElementProperties(componentProperty, elementResource, options,
 				label: elementResource.document && "content" in elementResource.document ? parseXMLContent(elementResource.document, options) : null,
 				startIcon,
 				endIcon,
-				image
+				image,
+				elements
 			};
 			break;
 		}
@@ -492,28 +507,27 @@ function parseWebElementProperties(componentProperty, elementResource, options,
 		case "image": {
 			if (websiteLinks.length === 0) throw new Error(formatComponentError("No links found", componentName, elementResource), { cause: componentProperty });
 			const imageQuality = componentReader.valueOr("image-quality", "high");
-			const images = [];
-			for (const link of websiteLinks) images.push({
+			const images = Array.from(websiteLinks, (link) => ({
 				uuid: link.uuid,
 				label: link.identification.label,
 				width: "image" in link ? link.image?.width ?? 0 : 0,
 				height: "image" in link ? link.image?.height ?? 0 : 0,
 				description: link.description,
 				quality: imageQuality
-			});
+			}));
 			const variant = componentReader.valueOr("variant", "default");
 			const captionLayout = componentReader.valueOr("layout-caption", "bottom");
 			let width = null;
 			const widthProperty = componentReader.value("width");
 			if (widthProperty !== null) {
 				if (typeof widthProperty === "number") width = widthProperty;
-				else if (typeof widthProperty === "string") width = Number.parseFloat(widthProperty);
+				else if (typeof widthProperty === "string") width = Number(widthProperty);
 			}
 			let height = null;
 			const heightProperty = componentReader.value("height");
 			if (heightProperty !== null) {
 				if (typeof heightProperty === "number") height = heightProperty;
-				else if (typeof heightProperty === "string") height = Number.parseFloat(heightProperty);
+				else if (typeof heightProperty === "string") height = Number(heightProperty);
 			}
 			const isFullWidth = componentReader.valueOr("is-full-width", true);
 			const isFullHeight = componentReader.valueOr("is-full-height", true);
@@ -529,7 +543,7 @@ function parseWebElementProperties(componentProperty, elementResource, options,
 					const secondsPerImageProperty = variantReader.value("seconds-per-image");
 					if (secondsPerImageProperty !== null) {
 						if (typeof secondsPerImageProperty === "number") secondsPerImage = secondsPerImageProperty;
-						else if (typeof secondsPerImageProperty === "string") secondsPerImage = Number.parseFloat(secondsPerImageProperty);
+						else if (typeof secondsPerImageProperty === "string") secondsPerImage = Number(secondsPerImageProperty);
 					}
 				}
 				carouselOptions = { secondsPerImage };
@@ -601,8 +615,8 @@ function parseWebElementProperties(componentProperty, elementResource, options,
 		case "query": {
 			const setLinks = getWebsiteLinks(websiteLinks, "set");
 			if (setLinks.length === 0) throw new Error(formatComponentError("Set links not found", componentName, elementResource), { cause: componentProperty });
-			const items = [];
 			if (componentProperty.properties.length === 0) throw new Error(formatComponentError("Query properties not found", componentName, elementResource), { cause: componentProperty });
+			const items = [];
 			for (const queryItem of componentProperty.properties) {
 				const queryReader = websitePresentationReader(queryItem.properties);
 				const label = queryReader.multilingualValue("query-prompt", options);
@@ -776,7 +790,11 @@ function parseWebElement(elementResource, options, context) {
 	const properties = parseWebElementProperties(websitePresentationReader(websitePresentationReader(elementProperties).requiredProperty("presentation", `Presentation property not found for element (${formatXMLWebsiteResourceMetadata(elementResource)})`).properties).requiredProperty("component", `Component property not found for element (${formatXMLWebsiteResourceMetadata(elementResource)})`), elementResource, options, context);
 	const cssStyles = parseResponsiveCssStyles(elementProperties);
 	const title = parseWebTitle(elementProperties, identification, {
-		isNameDisplayed: properties.component === "annotated-image" || properties.component === "annotated-document" || properties.component === "collection",
+		isNameDisplayed: [
+			"annotated-image",
+			"annotated-document",
+			"collection"
+		].includes(properties.component),
 		isCountDisplayed: properties.component === "collection"
 	});
 	return {
@@ -816,6 +834,7 @@ function parseWebpage(webpageResource, options, context, slugPrefix) {
 			isSidebarDisplayed: true,
 			isDisplayedInNavbar: true,
 			isNavbarSearchBarDisplayed: true,
+			redirect: null,
 			backgroundImage: null,
 			sidebar: null,
 			cssStyles: {
@@ -859,6 +878,11 @@ function parseWebpage(webpageResource, options, context, slugPrefix) {
 		returnWebpage.properties.isSidebarDisplayed = pageReader.valueOr("sidebar-displayed", true);
 		returnWebpage.properties.isBreadcrumbsDisplayed = pageReader.valueOr("breadcrumbs-displayed", false);
 		returnWebpage.properties.isNavbarSearchBarDisplayed = pageReader.valueOr("navbar-search-bar-displayed", true);
+		const redirectHref = parseWebsiteLinkTarget(pageReader.valueNode("redirect-to"), context);
+		if (redirectHref != null) returnWebpage.properties.redirect = {
+			href: redirectHref,
+			isExternal: redirectHref.startsWith("http")
+		};
 	}
 	if (imageLink != null) returnWebpage.properties.backgroundImage = {
 		uuid: imageLink.uuid,
@@ -890,7 +914,8 @@ function parseWebpageView(view, options, context) {
 }
 function parseWebsiteSegments(resources, context, options, slugPrefix) {
 	const segments = [];
-	for (const resource of resources ?? []) {
+	const segmentResources = resources ?? [];
+	for (const resource of segmentResources) {
 		if (!("segments" in resource)) continue;
 		for (const tree of resource.segments.tree) {
 			const segmentSlug = tree.identification.abbreviation == null ? null : parseStringContent(tree.identification.abbreviation, options);
@@ -1066,7 +1091,7 @@ function parseWebBlock(blockResource, options, context) {
 		}
 	}
 	const blockResources = blockResource.resource ? normalizeWebsiteResources(blockResource.resource) : [];
-	const supportsAccordionItems = returnBlock.properties.default.layout === "accordion" || returnBlock.properties.tablet?.layout === "accordion" || returnBlock.properties.mobile?.layout === "accordion";
+	const isSupportingAccordionItems = returnBlock.properties.default.layout === "accordion" || returnBlock.properties.tablet?.layout === "accordion" || returnBlock.properties.mobile?.layout === "accordion";
 	const blockItems = [];
 	for (const resource of blockResources) {
 		const resourceReader = websitePresentationReader(resource.properties ? parseSimplifiedProperties(resource.properties, options) : []);
@@ -1076,7 +1101,7 @@ function parseWebBlock(blockResource, options, context) {
 			case "element": {
 				const childResources = resource.resource ? normalizeWebsiteResources(resource.resource) : [];
 				const componentType = resourceReader.nestedByValue("presentation", "element").value("component");
-				if (supportsAccordionItems && componentType === "text" && childResources.length > 0) {
+				if (isSupportingAccordionItems && componentType === "text" && childResources.length > 0) {
 					const item = parseWebAccordionItem(resource, childResources, options, context);
 					blockItems.push(item);
 					break;
@@ -1204,7 +1229,8 @@ function parseWebsiteProperties(properties, websiteTree, sidebar, options) {
 function parseContextItem(contextItemToParse, options) {
 	let type = "";
 	const levels = [];
-	for (const level of contextItemToParse.levels?.level ?? []) {
+	const levelsToParse = contextItemToParse.levels?.level ?? [];
+	for (const level of levelsToParse) {
 		const [rawVariableUuid = "", rawValueUuid] = level.payload.split(",");
 		const valueUuid = rawValueUuid == null || rawValueUuid.trim() === "null" ? null : rawValueUuid.trim();
 		type = level.dataType ?? type;