ochre-sdk 0.19.3 → 0.19.5

package/dist/index.mjs

@@ -274,8 +274,8 @@ function parseStringDocumentItem(item) {
 		for (const link of itemLinks) if ("resource" in link) {
 			const linkResource = Array.isArray(link.resource) ? link.resource[0] : link.resource;
 			let linkContent = null;
-			if (linkResource.content != null) linkContent = parseFakeString(linkResource.content).replaceAll("<", String.raw`\<`).replaceAll("{", String.raw`\{`);
-			switch (linkResource.type) {
+			if (linkResource?.content != null) linkContent = parseFakeString(linkResource.content).replaceAll("<", String.raw`\<`).replaceAll("{", String.raw`\{`);
+			switch (linkResource?.type) {
 				case "IIIF":
 				case "image": if (linkResource.rend === "inline") return applyWhitespaceToResult(`<InlineImage uuid="${linkResource.uuid}" ${linkContent !== null ? `content="${linkContent}"` : ""} height={${linkResource.height?.toString() ?? "null"}} width={${linkResource.width?.toString() ?? "null"}} />`, itemWhitespace);
 				else if (linkResource.publicationDateTime != null) {
@@ -328,28 +328,28 @@ function parseStringDocumentItem(item) {
 			}
 		} else if ("spatialUnit" in link) {
 			const linkSpatialUnit = Array.isArray(link.spatialUnit) ? link.spatialUnit[0] : link.spatialUnit;
-			if (linkSpatialUnit.publicationDateTime != null) return applyWhitespaceToResult(`<InternalLink uuid="${linkSpatialUnit.uuid}">${itemString}</InternalLink>`, itemWhitespace);
+			if (linkSpatialUnit?.publicationDateTime != null) return applyWhitespaceToResult(`<InternalLink uuid="${linkSpatialUnit.uuid}">${itemString}</InternalLink>`, itemWhitespace);
 			else return applyWhitespaceToResult(`<TooltipSpan>${itemString}</TooltipSpan>`, itemWhitespace);
 		} else if ("concept" in link) {
 			const linkConcept = Array.isArray(link.concept) ? link.concept[0] : link.concept;
-			if (linkConcept.publicationDateTime != null) return applyWhitespaceToResult(`<InternalLink uuid="${linkConcept.uuid}">${itemString}</InternalLink>`, itemWhitespace);
+			if (linkConcept?.publicationDateTime != null) return applyWhitespaceToResult(`<InternalLink uuid="${linkConcept.uuid}">${itemString}</InternalLink>`, itemWhitespace);
 			else return applyWhitespaceToResult(`<TooltipSpan>${itemString}</TooltipSpan>`, itemWhitespace);
 		} else if ("set" in link) {
 			const linkSet = Array.isArray(link.set) ? link.set[0] : link.set;
-			if (linkSet.publicationDateTime != null) return applyWhitespaceToResult(`<InternalLink uuid="${linkSet.uuid}">${itemString}</InternalLink>`, itemWhitespace);
+			if (linkSet?.publicationDateTime != null) return applyWhitespaceToResult(`<InternalLink uuid="${linkSet.uuid}">${itemString}</InternalLink>`, itemWhitespace);
 			else return applyWhitespaceToResult(`<TooltipSpan>${itemString}</TooltipSpan>`, itemWhitespace);
 		} else if ("person" in link) {
 			const linkPerson = Array.isArray(link.person) ? link.person[0] : link.person;
-			const linkContent = linkPerson.identification ? [
+			const linkContent = linkPerson?.identification != null ? [
 				"string",
 				"number",
 				"boolean"
 			].includes(typeof linkPerson.identification.label) ? parseFakeString(linkPerson.identification.label) : parseStringContent(linkPerson.identification.label) : null;
-			if (linkPerson.publicationDateTime != null) return applyWhitespaceToResult(`<InternalLink uuid="${linkPerson.uuid}">${itemString}</InternalLink>`, itemWhitespace);
+			if (linkPerson?.publicationDateTime != null) return applyWhitespaceToResult(`<InternalLink uuid="${linkPerson.uuid}">${itemString}</InternalLink>`, itemWhitespace);
 			else return applyWhitespaceToResult(`<TooltipSpan${linkContent !== null ? ` content="${linkContent}"` : ""}>${itemString}</TooltipSpan>`, itemWhitespace);
 		} else if ("bibliography" in link) {
 			const linkBibliography = Array.isArray(link.bibliography) ? link.bibliography[0] : link.bibliography;
-			if (linkBibliography.publicationDateTime != null) return applyWhitespaceToResult(`<InternalLink uuid="${linkBibliography.uuid}">${itemString}</InternalLink>`, itemWhitespace);
+			if (linkBibliography?.publicationDateTime != null) return applyWhitespaceToResult(`<InternalLink uuid="${linkBibliography.uuid}">${itemString}</InternalLink>`, itemWhitespace);
 			else return applyWhitespaceToResult(`<TooltipSpan>${itemString}</TooltipSpan>`, itemWhitespace);
 		}
 	}
@@ -722,755 +722,406 @@ const boundsSchema = z.string().transform((str, ctx) => {
 }).pipe(z.tuple([z.tuple([z.number(), z.number()]), z.tuple([z.number(), z.number()])], { message: "Must contain exactly 2 coordinate pairs" }));
 
 //#endregion
-//#region src/utils/getters.ts
-const DEFAULT_OPTIONS = { includeNestedProperties: false };
+//#region src/utils/parse/index.ts
 /**
-* Finds a property by its UUID in an array of properties
+* Parses raw identification data into the standardized Identification type
 *
-* @param properties - Array of properties to search through
-* @param uuid - The UUID to search for
-* @param options - Search options, including whether to include nested properties
-* @returns The matching Property object, or null if not found
+* @param identification - Raw identification data from OCHRE format
+* @returns Parsed Identification object with label and abbreviation
 */
-function getPropertyByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const property = properties.find((property) => property.uuid === uuid);
-	if (property) return property;
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyByUuid(property.properties, uuid, { includeNestedProperties });
-			if (nestedResult) return nestedResult;
+function parseIdentification(identification) {
+	try {
+		const result = {
+			label: parseFakeStringOrContent(identification.label),
+			abbreviation: "",
+			code: identification.code ?? null
+		};
+		for (const key of Object.keys(identification)) {
+			if (key === "label" || key === "code") continue;
+			const raw = identification[key];
+			result[key] = parseFakeStringOrContent(raw);
 		}
+		return result;
+	} catch (error) {
+		console.error(error);
+		return {
+			label: "",
+			abbreviation: "",
+			code: null
+		};
 	}
-	return null;
 }
 /**
-* Retrieves all values for a property with the given UUID
+* Parses raw language data into an array of language codes
 *
-* @param properties - Array of properties to search through
-* @param uuid - The UUID to search for
-* @param options - Search options, including whether to include nested properties
-* @returns Array of property values as strings, or null if property not found
+* @param language - Raw language data, either single or array
+* @returns Array of language codes as strings
 */
-function getPropertyValuesByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const property = properties.find((property) => property.uuid === uuid);
-	if (property) return property.values.map((value) => value.content);
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyValuesByUuid(property.properties, uuid, { includeNestedProperties });
-			if (nestedResult) return nestedResult;
-		}
-	}
-	return null;
+function parseLanguages(language) {
+	if (language == null) return ["eng"];
+	if (typeof language === "string") return [language];
+	if (Array.isArray(language)) return language.map((lang) => typeof lang === "object" ? parseStringContent(lang) : lang);
+	else return [parseStringContent(language)];
 }
 /**
-* Gets the first value of a property with the given UUID
+* Parses raw metadata into the standardized Metadata type
 *
-* @param properties - Array of properties to search through
-* @param uuid - The UUID to search for
-* @param options - Search options, including whether to include nested properties
-* @returns The first property value as string, or null if property not found
+* @param metadata - Raw metadata from OCHRE format
+* @returns Parsed Metadata object
 */
-function getPropertyValueByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const values = getPropertyValuesByUuid(properties, uuid, { includeNestedProperties });
-	if (values !== null && values.length > 0) return values[0];
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyValueByUuid(property.properties, uuid, { includeNestedProperties });
-			if (nestedResult !== null) return nestedResult;
-		}
-	}
-	return null;
+function parseMetadata(metadata) {
+	let identification = {
+		label: "",
+		abbreviation: "",
+		code: null
+	};
+	if (metadata.item) if (metadata.item.label || metadata.item.abbreviation) identification = {
+		label: metadata.item.label ? parseStringContent(metadata.item.label) : "",
+		abbreviation: metadata.item.abbreviation ? parseStringContent(metadata.item.abbreviation) : "",
+		code: metadata.item.identification.code ?? null
+	};
+	else identification = parseIdentification(metadata.item.identification);
+	const projectId = metadata.project?.identification ? parseIdentification(metadata.project.identification) : null;
+	return {
+		project: projectId ? {
+			identification: {
+				...projectId,
+				website: metadata.project?.identification.website ?? null
+			},
+			dateFormat: metadata.project?.dateFormat ?? null,
+			page: metadata.project?.page ?? null
+		} : null,
+		collection: metadata.collection ? {
+			identification: parseIdentification(metadata.collection.identification),
+			page: metadata.collection.page
+		} : null,
+		publication: metadata.publication ? {
+			identification: parseIdentification(metadata.publication.identification),
+			page: metadata.publication.page
+		} : null,
+		item: metadata.item ? {
+			identification,
+			category: metadata.item.category,
+			type: metadata.item.type,
+			maxLength: metadata.item.maxLength ?? null
+		} : null,
+		dataset: parseFakeStringOrContent(metadata.dataset),
+		publisher: parseFakeStringOrContent(metadata.publisher),
+		languages: parseLanguages(metadata.language),
+		identifier: parseFakeStringOrContent(metadata.identifier),
+		description: parseFakeStringOrContent(metadata.description)
+	};
 }
 /**
-* Finds a property by its label in an array of properties
+* Parses raw context item data into the standardized ContextItem type
 *
-* @param properties - Array of properties to search through
-* @param label - The label to search for
-* @param options - Search options, including whether to include nested properties
-* @returns The matching Property object, or null if not found
+* @param contextItem - Raw context item data from OCHRE format
+* @returns Parsed ContextItem object
 */
-function getPropertyByLabel(properties, label, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const property = properties.find((property) => property.label === label);
-	if (property) return property;
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyByLabel(property.properties, label, { includeNestedProperties });
-			if (nestedResult) return nestedResult;
-		}
-	}
-	return null;
+function parseContextItem(contextItem) {
+	return {
+		uuid: contextItem.uuid,
+		publicationDateTime: parseOptionalDate(contextItem.publicationDateTime),
+		number: contextItem.n,
+		content: parseFakeString(contextItem.content)
+	};
 }
 /**
-* Finds a property by its label and all values in an array of properties
+* Parses raw context data into the standardized Context type
 *
-* @param properties - Array of properties to search through
-* @param label - The label to search for
-* @param values - The values to search for
-* @param options - Search options, including whether to include nested properties
-* @returns The matching Property object, or null if not found or all values do not match
+* @param context - Raw context data from OCHRE format
+* @returns Parsed Context object
 */
-function getPropertyByLabelAndValues(properties, label, values, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const property = properties.find((property) => property.label === label && deepEqual(property.values, values));
-	if (property) return property;
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyByLabelAndValues(property.properties, label, values, { includeNestedProperties });
-			if (nestedResult) return nestedResult;
-		}
-	}
-	return null;
+function parseContext(context) {
+	return {
+		nodes: ensureArray(context.context).map((ctx) => ({
+			tree: parseContextItem(ctx.tree),
+			project: parseContextItem(ctx.project),
+			spatialUnit: "spatialUnit" in ctx && ctx.spatialUnit ? ensureArray(ctx.spatialUnit).map((element) => parseContextItem(element)) : []
+		})),
+		displayPath: context.displayPath
+	};
 }
 /**
-* Finds a property by its label and value in an array of properties
+* Parses raw license data into the standardized License type
 *
-* @param properties - Array of properties to search through
-* @param label - The label to search for
-* @param value - The value to search for
-* @param options - Search options, including whether to include nested properties
-* @returns The matching Property object, or null if not found or value does not match
+* @param license - Raw license data from OCHRE format
+* @returns Parsed License object or null if invalid
 */
-function getPropertyByLabelAndValue(properties, label, value, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const property = properties.find((property) => property.label === label && property.values.some((v) => v.content === value));
-	if (property) return property;
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyByLabelAndValue(property.properties, label, value, { includeNestedProperties });
-			if (nestedResult) return nestedResult;
-		}
-	}
-	return null;
+function parseLicense(license) {
+	if (typeof license.license === "string") return null;
+	return {
+		content: license.license.content,
+		url: license.license.target
+	};
 }
 /**
-* Retrieves all values for a property with the given label
+* Parses raw person data into the standardized Person type
 *
-* @param properties - Array of properties to search through
-* @param label - The label to search for
-* @param options - Search options, including whether to include nested properties
-* @returns Array of property values as strings, or null if property not found
+* @param person - Raw person data from OCHRE format
+* @returns Parsed Person object
 */
-function getPropertyValuesByLabel(properties, label, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const property = properties.find((property) => property.label === label);
-	if (property) return property.values.map((value) => value.content);
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyValuesByLabel(property.properties, label, { includeNestedProperties });
-			if (nestedResult) return nestedResult;
-		}
-	}
-	return null;
+function parsePerson(person, metadata, persistentUrl, belongsTo) {
+	return {
+		uuid: person.uuid,
+		category: "person",
+		belongsTo: belongsTo ?? null,
+		metadata: metadata ?? null,
+		publicationDateTime: parseOptionalDate(person.publicationDateTime),
+		persistentUrl: persistentUrl ?? null,
+		type: person.type ?? null,
+		number: person.n ?? null,
+		context: person.context ? parseContext(person.context) : null,
+		date: person.date ?? null,
+		identification: person.identification ? parseIdentification(person.identification) : null,
+		availability: person.availability ? parseLicense(person.availability) : null,
+		image: person.image ? parseImage(person.image) : null,
+		address: person.address ? {
+			country: person.address.country ?? null,
+			city: person.address.city ?? null,
+			state: person.address.state ?? null
+		} : null,
+		description: person.description ? parseFakeStringOrContent(person.description) : null,
+		coordinates: parseCoordinates(person.coordinates),
+		content: person.content != null ? parseFakeString(person.content) : null,
+		notes: person.notes ? parseNotes(ensureArray(person.notes.note)) : [],
+		links: person.links ? parseLinks(ensureArray(person.links)) : [],
+		events: person.events ? parseEvents(ensureArray(person.events.event)) : [],
+		properties: person.properties ? parseProperties(ensureArray(person.properties.property)) : [],
+		bibliographies: person.bibliographies ? parseBibliographies(ensureArray(person.bibliographies.bibliography)) : []
+	};
 }
 /**
-* Gets the first value of a property with the given label
+* Parses raw person data into the standardized Person type
 *
-* @param properties - Array of properties to search through
-* @param label - The label to search for
-* @param options - Search options, including whether to include nested properties
-* @returns The first property value as string, or null if property not found
+* @param persons - Array of raw person data from OCHRE format
+* @returns Array of parsed Person objects
 */
-function getPropertyValueByLabel(properties, label, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const values = getPropertyValuesByLabel(properties, label, { includeNestedProperties });
-	if (values !== null && values.length > 0) return values[0];
-	if (includeNestedProperties) {
-		for (const property of properties) if (property.properties.length > 0) {
-			const nestedResult = getPropertyValueByLabel(property.properties, label, { includeNestedProperties });
-			if (nestedResult !== null) return nestedResult;
-		}
-	}
-	return null;
+function parsePersons(persons) {
+	return persons.map((person) => parsePerson(person));
 }
 /**
-* Gets all unique properties from an array of properties
+* Parses an array of raw links into standardized Link objects
 *
-* @param properties - Array of properties to get unique properties from
-* @param options - Search options, including whether to include nested properties
-* @returns Array of unique properties
+* @param linkRaw - Raw OCHRE link
+* @returns Parsed Link object
 */
-function getUniqueProperties(properties, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const uniqueProperties = new Array();
-	for (const property of properties) {
-		if (uniqueProperties.some((p) => p.uuid === property.uuid)) continue;
-		uniqueProperties.push(property);
-		if (property.properties.length > 0 && includeNestedProperties) {
-			const nestedProperties = getUniqueProperties(property.properties, { includeNestedProperties: true });
-			for (const property of nestedProperties) {
-				if (uniqueProperties.some((p) => p.uuid === property.uuid)) continue;
-				uniqueProperties.push(property);
-			}
-		}
-	}
-	return uniqueProperties;
+function parseLink(linkRaw) {
+	const categoryKey = [
+		"resource",
+		"spatialUnit",
+		"concept",
+		"set",
+		"tree",
+		"person",
+		"bibliography",
+		"propertyVariable",
+		"propertyValue"
+	].find((key) => key in linkRaw);
+	if (!categoryKey) throw new Error(`Invalid link provided: ${JSON.stringify(linkRaw, null, 2)}`);
+	const links = linkRaw[categoryKey];
+	if (links == null) return [];
+	return ensureArray(links).map((link) => {
+		const returnLink = {
+			category: categoryKey,
+			content: "content" in link && link.content != null ? parseFakeString(link.content) : null,
+			href: "href" in link && link.href != null ? link.href : null,
+			fileFormat: "fileFormat" in link && link.fileFormat != null ? link.fileFormat : null,
+			fileSize: "fileSize" in link && link.fileSize != null ? link.fileSize : null,
+			uuid: link.uuid ?? null,
+			type: link.type ?? null,
+			identification: link.identification ? parseIdentification(link.identification) : null,
+			description: "description" in link && link.description != null ? parseStringContent(link.description) : null,
+			image: null,
+			bibliographies: "bibliography" in linkRaw && linkRaw.bibliography != null ? parseBibliographies(ensureArray(linkRaw.bibliography)) : null,
+			publicationDateTime: parseOptionalDate(link.publicationDateTime)
+		};
+		if ("height" in link && link.height != null && link.width != null && link.heightPreview != null && link.widthPreview != null) returnLink.image = {
+			isInline: link.rend === "inline",
+			isPrimary: link.isPrimary ?? false,
+			heightPreview: link.heightPreview,
+			widthPreview: link.widthPreview,
+			height: link.height,
+			width: link.width
+		};
+		return returnLink;
+	});
 }
 /**
-* Gets all unique property labels from an array of properties
+* Parses an array of raw links into standardized Link objects
 *
-* @param properties - Array of properties to get unique property labels from
-* @param options - Search options, including whether to include nested properties
-* @returns Array of unique property labels
-*/
-function getUniquePropertyLabels(properties, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	const uniquePropertyLabels = new Array();
-	for (const property of properties) {
-		if (uniquePropertyLabels.includes(property.label)) continue;
-		uniquePropertyLabels.push(property.label);
-		if (property.properties.length > 0 && includeNestedProperties) {
-			const nestedProperties = getUniquePropertyLabels(property.properties, { includeNestedProperties: true });
-			for (const property of nestedProperties) {
-				if (uniquePropertyLabels.includes(property)) continue;
-				uniquePropertyLabels.push(property);
-			}
-		}
-	}
-	return uniquePropertyLabels;
-}
-/**
-* Get the leaf property values from an array of property values
-* @param propertyValues - The array of property values to get the leaf property values from
-* @returns The array of leaf property values
+* @param links - Array of raw OCHRE links
+* @returns Array of parsed Link objects
 */
-function getLeafPropertyValues(propertyValues) {
-	return propertyValues.filter((value) => value.hierarchy.isLeaf);
+function parseLinks(links) {
+	const result = [];
+	for (const link of links) result.push(...parseLink(link));
+	return result;
 }
 /**
-* Filters a property based on a label and value criteria
+* Parses raw document content into a standardized Document structure
 *
-* @param property - The property to filter
-* @param filter - Filter criteria containing label and value to match
-* @param filter.label - The label to filter by
-* @param filter.value - The value to filter by
-* @param options - Search options, including whether to include nested properties
-* @returns True if the property matches the filter criteria, false otherwise
+* @param document - Raw document content in OCHRE format
+* @param language - Language code to use for content selection (defaults to "eng")
+* @returns Parsed Document object with content and footnotes
 */
-function filterProperties(property, filter, options = DEFAULT_OPTIONS) {
-	const { includeNestedProperties } = options;
-	if (filter.label.toLocaleLowerCase("en-US") === "all fields" || property.label.toLocaleLowerCase("en-US") === filter.label.toLocaleLowerCase("en-US")) {
-		let isFound = property.values.some((value) => {
-			if (value.content === null) return false;
-			if (typeof value.content === "string") {
-				if (typeof filter.value !== "string") return false;
-				return value.content.toLocaleLowerCase("en-US").includes(filter.value.toLocaleLowerCase("en-US"));
-			}
-			if (typeof value.content === "number") {
-				if (typeof filter.value !== "number") return false;
-				return value.content === filter.value;
-			}
-			if (typeof value.content === "boolean") {
-				if (typeof filter.value !== "boolean") return false;
-				return value.content === filter.value;
-			}
-			return false;
-		});
-		if (!isFound && includeNestedProperties) isFound = property.properties.some((property) => filterProperties(property, filter, { includeNestedProperties: true }));
-		return isFound;
-	}
-	return false;
+function parseDocument(document, language = "eng") {
+	const doc = Array.isArray(document) ? document.find((d) => d.lang === language) : document;
+	if (isFakeString(doc.string)) return parseEmail(parseFakeString(doc.string));
+	let result = "";
+	for (const item of ensureArray(doc.string)) result += parseStringDocumentItem(item);
+	return result;
 }
-
-//#endregion
-//#region src/utils/helpers.ts
 /**
-* The default API version to use
-*
-* @remarks
-* Version 1 of the OCHRE API is deprecated and will be removed in the future.
-* It points to the old Tamino server.
+* Parses raw image data into a standardized Image structure
 *
-* Version 2 of the OCHRE API is the current version and is the default.
-* It points to the new MarkLogic server.
-*/
-const DEFAULT_API_VERSION = 2;
-/**
-* The default page size to use for fetching paginated items
-*/
-const DEFAULT_PAGE_SIZE = 48;
-/**
-* Flatten the properties of an item
-* @param item - The item whose properties to flatten
-* @returns The item with the properties flattened
+* @param image - Raw image data in OCHRE format
+* @returns Parsed Image object or null if invalid
 */
-function flattenItemProperties(item) {
-	const allProperties = [];
-	if ("properties" in item) allProperties.push(...item.properties);
-	if ("observations" in item) for (const observation of item.observations) allProperties.push(...observation.properties);
-	if ("interpretations" in item) for (const interpretation of item.interpretations) allProperties.push(...interpretation.properties);
-	if ("bibliographies" in item) for (const bibliography of item.bibliographies) allProperties.push(...bibliography.properties);
+function parseImage(image) {
 	return {
-		...item,
-		properties: flattenProperties(allProperties)
+		publicationDateTime: parseOptionalDate(image.publicationDateTime),
+		identification: image.identification ? parseIdentification(image.identification) : null,
+		url: image.href ?? (image.htmlImgSrcPrefix == null && image.content != null ? parseFakeString(image.content) : null),
+		htmlPrefix: image.htmlImgSrcPrefix ?? null,
+		content: image.htmlImgSrcPrefix != null && image.content != null ? parseFakeString(image.content) : null,
+		widthPreview: image.widthPreview ?? null,
+		heightPreview: image.heightPreview ?? null,
+		width: image.width ?? null,
+		height: image.height ?? null
 	};
 }
-
-//#endregion
-//#region src/utils/parse.ts
 /**
-* Extracts CSS style properties for a given presentation variant.
+* Parses raw notes into standardized Note objects
 *
-* @param properties - Array of properties to parse
-* @param cssVariant - CSS variant to parse
-* @returns Array of CSS styles
+* @param notes - Array of raw notes in OCHRE format
+* @param language - Language code for content selection (defaults to "eng")
+* @returns Array of parsed Note objects
 */
-function parseCssStylesFromProperties(properties, cssVariant) {
-	const cssProperties = getPropertyByLabelAndValue(properties, "presentation", cssVariant != null ? `css-${cssVariant}` : "css")?.properties ?? [];
-	const styles = [];
-	for (const property of cssProperties) {
-		const value = property.values[0]?.content?.toString();
-		if (value != null) styles.push({
-			label: property.label,
-			value
+function parseNotes(notes, language = "eng") {
+	const result = [];
+	for (const note of notes) {
+		if (typeof note === "string") {
+			if (note !== "") result.push({
+				number: -1,
+				title: null,
+				date: null,
+				authors: [],
+				content: note
+			});
+			continue;
+		}
+		const notesToParse = note.content != null ? ensureArray(note.content) : [];
+		if (notesToParse.length === 0) continue;
+		const noteWithLanguage = notesToParse.find((item) => item.lang === language) ?? notesToParse[0];
+		if (!noteWithLanguage) throw new Error(`Note does not have a valid content item: ${JSON.stringify(note, null, 2)}`);
+		const content = isFakeString(noteWithLanguage.string) ? parseEmail(parseFakeString(noteWithLanguage.string)) : parseEmail(parseDocument(noteWithLanguage));
+		result.push({
+			number: note.noteNo,
+			title: noteWithLanguage.title != null ? parseFakeString(noteWithLanguage.title) : null,
+			date: note.date ?? null,
+			authors: note.authors ? parsePersons(ensureArray(note.authors.author)) : [],
+			content
 		});
 	}
-	return styles;
+	return result;
 }
 /**
-* Parses responsive CSS styles (default, tablet, mobile) from properties.
+* Parses raw coordinates data into a standardized array of Coordinate structures
 *
-* @param properties - Array of properties to parse
-* @returns Object containing responsive CSS styles
+* @param coordinates - Raw coordinates data in OCHRE format
+* @returns Parsed array of Coordinate objects
 */
-function parseResponsiveCssStyles(properties) {
-	return {
-		default: parseCssStylesFromProperties(properties),
-		tablet: parseCssStylesFromProperties(properties, "tablet"),
-		mobile: parseCssStylesFromProperties(properties, "mobile")
-	};
-}
-/**
-* Parses all context option arrays from an options object.
-*
-* @param options - Options object containing context options
-* @param options.flattenContexts - Flatten contexts
-* @param options.suppressContexts - Suppress contexts
-* @param options.filterContexts - Filter contexts
-* @param options.sortContexts - Sort contexts
-* @param options.detailContexts - Detail contexts
-* @param options.downloadContexts - Download contexts
-* @param options.labelContexts - Label contexts
-* @param options.prominentContexts - Prominent contexts
-* @returns Parsed context options
-*/
-function parseAllOptionContexts(options) {
-	function handleContexts(v) {
-		return parseContexts(v != null ? ensureArray(v) : []);
-	}
-	return {
-		flatten: handleContexts(options.flattenContexts),
-		suppress: handleContexts(options.suppressContexts),
-		filter: handleContexts(options.filterContexts),
-		sort: handleContexts(options.sortContexts),
-		detail: handleContexts(options.detailContexts),
-		download: handleContexts(options.downloadContexts),
-		label: handleContexts(options.labelContexts),
-		prominent: handleContexts(options.prominentContexts)
-	};
-}
-/**
-* Parses raw identification data into the standardized Identification type
-*
-* @param identification - Raw identification data from OCHRE format
-* @returns Parsed Identification object with label and abbreviation
-*/
-function parseIdentification(identification) {
-	try {
-		const result = {
-			label: parseFakeStringOrContent(identification.label),
-			abbreviation: "",
-			code: identification.code ?? null
-		};
-		for (const key of Object.keys(identification)) {
-			if (key === "label" || key === "code") continue;
-			const raw = identification[key];
-			result[key] = parseFakeStringOrContent(raw);
+function parseCoordinates(coordinates) {
+	if (coordinates == null) return [];
+	const result = [];
+	for (const coord of ensureArray(coordinates.coord)) {
+		const source = "source" in coord && coord.source ? coord.source.context === "self" ? {
+			context: "self",
+			uuid: coord.source.label.uuid,
+			label: parseStringContent(coord.source.label)
+		} : coord.source.context === "related" ? {
+			context: "related",
+			uuid: coord.source.label.uuid,
+			label: parseStringContent(coord.source.label),
+			value: parseStringContent(coord.source.value)
+		} : {
+			context: "inherited",
+			uuid: coord.source.label.uuid,
+			item: {
+				uuid: coord.source.item.label.uuid,
+				label: parseStringContent(coord.source.item.label)
+			},
+			label: parseStringContent(coord.source.label)
+		} : null;
+		switch (coord.type) {
+			case "point":
+				result.push({
+					type: coord.type,
+					latitude: coord.latitude,
+					longitude: coord.longitude,
+					altitude: coord.altitude ?? null,
+					source
+				});
+				break;
+			case "plane":
+				result.push({
+					type: coord.type,
+					minimum: {
+						latitude: coord.minimum.latitude,
+						longitude: coord.minimum.longitude
+					},
+					maximum: {
+						latitude: coord.maximum.latitude,
+						longitude: coord.maximum.longitude
+					},
+					source
+				});
+				break;
 		}
-		return result;
-	} catch (error) {
-		console.error(error);
-		return {
-			label: "",
-			abbreviation: "",
-			code: null
-		};
 	}
+	return result;
 }
 /**
-* Parses raw language data into an array of language codes
-*
-* @param language - Raw language data, either single or array
-* @returns Array of language codes as strings
-*/
-function parseLanguages(language) {
-	if (language == null) return ["eng"];
-	if (typeof language === "string") return [language];
-	if (Array.isArray(language)) return language.map((lang) => typeof lang === "object" ? parseStringContent(lang) : lang);
-	else return [parseStringContent(language)];
-}
-/**
-* Parses raw metadata into the standardized Metadata type
-*
-* @param metadata - Raw metadata from OCHRE format
-* @returns Parsed Metadata object
-*/
-function parseMetadata(metadata) {
-	let identification = {
-		label: "",
-		abbreviation: "",
-		code: null
-	};
-	if (metadata.item) if (metadata.item.label || metadata.item.abbreviation) identification = {
-		label: metadata.item.label ? parseStringContent(metadata.item.label) : "",
-		abbreviation: metadata.item.abbreviation ? parseStringContent(metadata.item.abbreviation) : "",
-		code: metadata.item.identification.code ?? null
-	};
-	else identification = parseIdentification(metadata.item.identification);
-	const projectId = metadata.project?.identification ? parseIdentification(metadata.project.identification) : null;
-	return {
-		project: projectId ? {
-			identification: {
-				...projectId,
-				website: metadata.project?.identification.website ?? null
-			},
-			dateFormat: metadata.project?.dateFormat ?? null,
-			page: metadata.project?.page ?? null
-		} : null,
-		collection: metadata.collection ? {
-			identification: parseIdentification(metadata.collection.identification),
-			page: metadata.collection.page
-		} : null,
-		publication: metadata.publication ? {
-			identification: parseIdentification(metadata.publication.identification),
-			page: metadata.publication.page
-		} : null,
-		item: metadata.item ? {
-			identification,
-			category: metadata.item.category,
-			type: metadata.item.type,
-			maxLength: metadata.item.maxLength ?? null
-		} : null,
-		dataset: parseFakeStringOrContent(metadata.dataset),
-		publisher: parseFakeStringOrContent(metadata.publisher),
-		languages: parseLanguages(metadata.language),
-		identifier: parseFakeStringOrContent(metadata.identifier),
-		description: parseFakeStringOrContent(metadata.description)
-	};
-}
-/**
-* Parses raw context item data into the standardized ContextItem type
-*
-* @param contextItem - Raw context item data from OCHRE format
-* @returns Parsed ContextItem object
-*/
-function parseContextItem(contextItem) {
-	return {
-		uuid: contextItem.uuid,
-		publicationDateTime: parseOptionalDate(contextItem.publicationDateTime),
-		number: contextItem.n,
-		content: parseFakeString(contextItem.content)
-	};
-}
-/**
-* Parses raw context data into the standardized Context type
+* Parses a raw observation into a standardized Observation structure
 *
-* @param context - Raw context data from OCHRE format
-* @returns Parsed Context object
+* @param observation - Raw observation data in OCHRE format
+* @returns Parsed Observation object
 */
-function parseContext(context) {
+function parseObservation(observation) {
 	return {
-		nodes: ensureArray(context.context).map((ctx) => ({
-			tree: parseContextItem(ctx.tree),
-			project: parseContextItem(ctx.project),
-			spatialUnit: "spatialUnit" in ctx && ctx.spatialUnit ? ensureArray(ctx.spatialUnit).map((element) => parseContextItem(element)) : []
-		})),
-		displayPath: context.displayPath
+		number: observation.observationNo,
+		date: observation.date ?? null,
+		observers: observation.observers != null ? isFakeString(observation.observers) ? parseFakeString(observation.observers).split(";").map((observer) => observer.trim()) : parsePersons(ensureArray(observation.observers)) : [],
+		notes: observation.notes ? parseNotes(ensureArray(observation.notes.note)) : [],
+		links: observation.links ? parseLinks(ensureArray(observation.links)) : [],
+		properties: observation.properties ? parseProperties(ensureArray(observation.properties.property)) : [],
+		bibliographies: observation.bibliographies ? parseBibliographies(ensureArray(observation.bibliographies.bibliography)) : []
 	};
 }
 /**
-* Parses raw license data into the standardized License type
+* Parses an array of raw observations into standardized Observation objects
 *
-* @param license - Raw license data from OCHRE format
-* @returns Parsed License object or null if invalid
+* @param observations - Array of raw observations in OCHRE format
+* @returns Array of parsed Observation objects
 */
-function parseLicense(license) {
-	if (typeof license.license === "string") return null;
-	return {
-		content: license.license.content,
-		url: license.license.target
-	};
+function parseObservations(observations) {
+	return observations.map((obs) => parseObservation(obs));
 }
 /**
-* Parses raw person data into the standardized Person type
+* Parses an array of raw events into standardized Event objects
 *
-* @param person - Raw person data from OCHRE format
-* @returns Parsed Person object
+* @param events - Array of raw events in OCHRE format
+* @returns Array of parsed Event objects
 */
-function parsePerson(person, metadata, persistentUrl, belongsTo) {
-	return {
-		uuid: person.uuid,
-		category: "person",
-		belongsTo: belongsTo ?? null,
-		metadata: metadata ?? null,
-		publicationDateTime: parseOptionalDate(person.publicationDateTime),
-		persistentUrl: persistentUrl ?? null,
-		type: person.type ?? null,
-		number: person.n ?? null,
-		context: person.context ? parseContext(person.context) : null,
-		date: person.date ?? null,
-		identification: person.identification ? parseIdentification(person.identification) : null,
-		availability: person.availability ? parseLicense(person.availability) : null,
-		image: person.image ? parseImage(person.image) : null,
-		address: person.address ? {
-			country: person.address.country ?? null,
-			city: person.address.city ?? null,
-			state: person.address.state ?? null
-		} : null,
-		description: person.description ? parseFakeStringOrContent(person.description) : null,
-		coordinates: parseCoordinates(person.coordinates),
-		content: person.content != null ? parseFakeString(person.content) : null,
-		notes: person.notes ? parseNotes(ensureArray(person.notes.note)) : [],
-		links: person.links ? parseLinks(ensureArray(person.links)) : [],
-		events: person.events ? parseEvents(ensureArray(person.events.event)) : [],
-		properties: person.properties ? parseProperties(ensureArray(person.properties.property)) : [],
-		bibliographies: person.bibliographies ? parseBibliographies(ensureArray(person.bibliographies.bibliography)) : []
-	};
-}
-/**
-* Parses raw person data into the standardized Person type
-*
-* @param persons - Array of raw person data from OCHRE format
-* @returns Array of parsed Person objects
-*/
-function parsePersons(persons) {
-	return persons.map((person) => parsePerson(person));
-}
-/**
-* Parses an array of raw links into standardized Link objects
-*
-* @param linkRaw - Raw OCHRE link
-* @returns Parsed Link object
-*/
-function parseLink(linkRaw) {
-	const categoryKey = [
-		"resource",
-		"spatialUnit",
-		"concept",
-		"set",
-		"tree",
-		"person",
-		"bibliography",
-		"propertyVariable",
-		"propertyValue"
-	].find((key) => key in linkRaw);
-	if (!categoryKey) throw new Error(`Invalid link provided: ${JSON.stringify(linkRaw, null, 2)}`);
-	const links = linkRaw[categoryKey];
-	if (links == null) return [];
-	return ensureArray(links).map((link) => {
-		const returnLink = {
-			category: categoryKey,
-			content: "content" in link && link.content != null ? parseFakeString(link.content) : null,
-			href: "href" in link && link.href != null ? link.href : null,
-			fileFormat: "fileFormat" in link && link.fileFormat != null ? link.fileFormat : null,
-			fileSize: "fileSize" in link && link.fileSize != null ? link.fileSize : null,
-			uuid: link.uuid ?? null,
-			type: link.type ?? null,
-			identification: link.identification ? parseIdentification(link.identification) : null,
-			description: "description" in link && link.description != null ? parseStringContent(link.description) : null,
-			image: null,
-			bibliographies: "bibliography" in linkRaw && linkRaw.bibliography != null ? parseBibliographies(ensureArray(linkRaw.bibliography)) : null,
-			publicationDateTime: parseOptionalDate(link.publicationDateTime)
-		};
-		if ("height" in link && link.height != null && link.width != null && link.heightPreview != null && link.widthPreview != null) returnLink.image = {
-			isInline: link.rend === "inline",
-			isPrimary: link.isPrimary ?? false,
-			heightPreview: link.heightPreview,
-			widthPreview: link.widthPreview,
-			height: link.height,
-			width: link.width
-		};
-		return returnLink;
-	});
-}
-/**
-* Parses an array of raw links into standardized Link objects
-*
-* @param links - Array of raw OCHRE links
-* @returns Array of parsed Link objects
-*/
-function parseLinks(links) {
-	const result = [];
-	for (const link of links) result.push(...parseLink(link));
-	return result;
-}
-/**
-* Parses raw document content into a standardized Document structure
-*
-* @param document - Raw document content in OCHRE format
-* @param language - Language code to use for content selection (defaults to "eng")
-* @returns Parsed Document object with content and footnotes
-*/
-function parseDocument(document, language = "eng") {
-	const doc = Array.isArray(document) ? document.find((d) => d.lang === language) : document;
-	if (isFakeString(doc.string)) return parseEmail(parseFakeString(doc.string));
-	let result = "";
-	for (const item of ensureArray(doc.string)) result += parseStringDocumentItem(item);
-	return result;
-}
-/**
-* Parses raw image data into a standardized Image structure
-*
-* @param image - Raw image data in OCHRE format
-* @returns Parsed Image object or null if invalid
-*/
-function parseImage(image) {
-	return {
-		publicationDateTime: parseOptionalDate(image.publicationDateTime),
-		identification: image.identification ? parseIdentification(image.identification) : null,
-		url: image.href ?? (image.htmlImgSrcPrefix == null && image.content != null ? parseFakeString(image.content) : null),
-		htmlPrefix: image.htmlImgSrcPrefix ?? null,
-		content: image.htmlImgSrcPrefix != null && image.content != null ? parseFakeString(image.content) : null,
-		widthPreview: image.widthPreview ?? null,
-		heightPreview: image.heightPreview ?? null,
-		width: image.width ?? null,
-		height: image.height ?? null
-	};
-}
-/**
-* Parses raw notes into standardized Note objects
-*
-* @param notes - Array of raw notes in OCHRE format
-* @param language - Language code for content selection (defaults to "eng")
-* @returns Array of parsed Note objects
-*/
-function parseNotes(notes, language = "eng") {
-	const result = [];
-	for (const note of notes) {
-		if (typeof note === "string") {
-			if (note !== "") result.push({
-				number: -1,
-				title: null,
-				date: null,
-				authors: [],
-				content: note
-			});
-			continue;
-		}
-		const notesToParse = note.content != null ? ensureArray(note.content) : [];
-		if (notesToParse.length === 0) continue;
-		const noteWithLanguage = notesToParse.find((item) => item.lang === language) ?? notesToParse[0];
-		if (!noteWithLanguage) throw new Error(`Note does not have a valid content item: ${JSON.stringify(note, null, 2)}`);
-		const content = isFakeString(noteWithLanguage.string) ? parseEmail(parseFakeString(noteWithLanguage.string)) : parseEmail(parseDocument(noteWithLanguage));
-		result.push({
-			number: note.noteNo,
-			title: noteWithLanguage.title != null ? parseFakeString(noteWithLanguage.title) : null,
-			date: note.date ?? null,
-			authors: note.authors ? parsePersons(ensureArray(note.authors.author)) : [],
-			content
-		});
-	}
-	return result;
-}
-/**
-* Parses raw coordinates data into a standardized array of Coordinate structures
-*
-* @param coordinates - Raw coordinates data in OCHRE format
-* @returns Parsed array of Coordinate objects
-*/
-function parseCoordinates(coordinates) {
-	if (coordinates == null) return [];
-	const result = [];
-	for (const coord of ensureArray(coordinates.coord)) {
-		const source = "source" in coord && coord.source ? coord.source.context === "self" ? {
-			context: "self",
-			uuid: coord.source.label.uuid,
-			label: parseStringContent(coord.source.label)
-		} : coord.source.context === "related" ? {
-			context: "related",
-			uuid: coord.source.label.uuid,
-			label: parseStringContent(coord.source.label),
-			value: parseStringContent(coord.source.value)
-		} : {
-			context: "inherited",
-			uuid: coord.source.label.uuid,
-			item: {
-				uuid: coord.source.item.label.uuid,
-				label: parseStringContent(coord.source.item.label)
-			},
-			label: parseStringContent(coord.source.label)
-		} : null;
-		switch (coord.type) {
-			case "point":
-				result.push({
-					type: coord.type,
-					latitude: coord.latitude,
-					longitude: coord.longitude,
-					altitude: coord.altitude ?? null,
-					source
-				});
-				break;
-			case "plane":
-				result.push({
-					type: coord.type,
-					minimum: {
-						latitude: coord.minimum.latitude,
-						longitude: coord.minimum.longitude
-					},
-					maximum: {
-						latitude: coord.maximum.latitude,
-						longitude: coord.maximum.longitude
-					},
-					source
-				});
-				break;
-		}
-	}
-	return result;
-}
-/**
-* Parses a raw observation into a standardized Observation structure
-*
-* @param observation - Raw observation data in OCHRE format
-* @returns Parsed Observation object
-*/
-function parseObservation(observation) {
-	return {
-		number: observation.observationNo,
-		date: observation.date ?? null,
-		observers: observation.observers != null ? isFakeString(observation.observers) ? parseFakeString(observation.observers).split(";").map((observer) => observer.trim()) : parsePersons(ensureArray(observation.observers)) : [],
-		notes: observation.notes ? parseNotes(ensureArray(observation.notes.note)) : [],
-		links: observation.links ? parseLinks(ensureArray(observation.links)) : [],
-		properties: observation.properties ? parseProperties(ensureArray(observation.properties.property)) : [],
-		bibliographies: observation.bibliographies ? parseBibliographies(ensureArray(observation.bibliographies.bibliography)) : []
-	};
-}
-/**
-* Parses an array of raw observations into standardized Observation objects
-*
-* @param observations - Array of raw observations in OCHRE format
-* @returns Array of parsed Observation objects
-*/
-function parseObservations(observations) {
-	return observations.map((obs) => parseObservation(obs));
-}
-/**
-* Parses an array of raw events into standardized Event objects
-*
-* @param events - Array of raw events in OCHRE format
-* @returns Array of parsed Event objects
-*/
-function parseEvents(events) {
-	return events.map((event) => ({
-		dateTime: event.endDateTime != null ? `${event.dateTime}/${event.endDateTime}` : event.dateTime ?? null,
-		label: parseStringContent(event.label),
-		location: event.location ? {
-			uuid: event.location.uuid,
-			publicationDateTime: parseOptionalDate(event.location.publicationDateTime),
-			content: parseStringContent(event.location)
+function parseEvents(events) {
+	return events.map((event) => ({
+		dateTime: event.endDateTime != null ? `${event.dateTime}/${event.endDateTime}` : event.dateTime ?? null,
+		label: parseStringContent(event.label),
+		location: event.location ? {
+			uuid: event.location.uuid,
+			publicationDateTime: parseOptionalDate(event.location.publicationDateTime),
+			content: parseStringContent(event.location)
 		} : null,
 		agent: event.agent ? {
 			uuid: event.agent.uuid,
@@ -2132,37 +1783,6 @@ function parseConcept(concept, metadata, persistentUrl, belongsTo) {
 	};
 }
 /**
-* Parses raw webpage resources into standardized WebElement or Webpage objects
-*
-* @param webpageResources - Array of raw webpage resources in OCHRE format
-* @param type - Type of resource to parse ("element" or "page")
-* @returns Array of parsed WebElement or Webpage objects
-*/
-const parseWebpageResources = (webpageResources, type) => {
-	const returnElements = [];
-	for (const resource of webpageResources) {
-		if (getPropertyByLabelAndValue(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation", type) === null) continue;
-		switch (type) {
-			case "element": {
-				const element = parseWebElement(resource);
-				returnElements.push(element);
-				break;
-			}
-			case "page": {
-				const webpage = parseWebpage(resource);
-				if (webpage) returnElements.push(webpage);
-				break;
-			}
-			case "block": {
-				const block = parseWebBlock(resource);
-				if (block) returnElements.push(block);
-				break;
-			}
-		}
-	}
-	return returnElements;
-};
-/**
 * Parses raw concept data into standardized Concept objects
 *
 * @param concepts - Array of raw concept data in OCHRE format
@@ -2171,88 +1791,908 @@ const parseWebpageResources = (webpageResources, type) => {
 function parseConcepts(concepts) {
 	return concepts.map((concept) => parseConcept(concept));
 }
-function parseBounds(bounds) {
-	const result = boundsSchema.safeParse(bounds);
-	if (!result.success) throw new Error(`Invalid bounds: ${result.error.message}`);
-	return result.data;
+
+//#endregion
+//#region src/utils/fetchers/gallery.ts
+/**
+* Fetches and parses a gallery from the OCHRE API
+*
+* @param uuid - The UUID of the gallery
+* @param filter - The filter to apply to the gallery
+* @param page - The page number to fetch
+* @param pageSize - The number of items per page
+* @param options - The options for the fetch
+* @param options.fetch - The fetch function to use
+* @param options.version - The version of the OCHRE API to use
+* @returns The parsed gallery or an error message if the fetch/parse fails
+*/
+async function fetchGallery(uuid, filter, page, pageSize, options) {
+	try {
+		const { uuid: parsedUuid, filter: parsedFilter, page: parsedPage, pageSize: parsedPageSize } = gallerySchema.parse({
+			uuid,
+			filter,
+			page,
+			pageSize
+		});
+		const response = await (options?.fetch ?? fetch)(`https://ochre.lib.uchicago.edu/ochre?xquery=${encodeURIComponent(`
+        for $q in input()/ochre[@uuid='${parsedUuid}']
+        let $filtered := $q//items/resource[contains(lower-case(identification/label), lower-case('${parsedFilter}'))]
+        let $maxLength := count($filtered)
+        return <gallery maxLength='{$maxLength}'>
+          {$q/metadata/project}
+          {$q/metadata/item}
+          {$filtered[position() >= ${((parsedPage - 1) * parsedPageSize + 1).toString()} and position() < ${(parsedPage * parsedPageSize + 1).toString()}]}
+        </gallery>
+      `)}&format=json`);
+		if (!response.ok) throw new Error("Error fetching gallery items, please try again later.");
+		const data = await response.json();
+		if (!("gallery" in data.result)) throw new Error("Failed to fetch gallery");
+		return {
+			item: {
+				identification: parseIdentification(data.result.gallery.item.identification),
+				projectIdentification: parseIdentification(data.result.gallery.project.identification),
+				resources: parseResources(data.result.gallery.resource ? Array.isArray(data.result.gallery.resource) ? data.result.gallery.resource : [data.result.gallery.resource] : []),
+				maxLength: data.result.gallery.maxLength
+			},
+			error: null
+		};
+	} catch (error) {
+		console.error(error);
+		return {
+			item: null,
+			error: error instanceof Error ? error.message : "Failed to fetch gallery"
+		};
+	}
 }
+
+//#endregion
+//#region src/utils/helpers.ts
 /**
-* Parses raw web element properties into a standardized WebElementComponent structure
+* The default API version to use
 *
-* @param componentProperty - Raw component property data in OCHRE format
-* @param elementResource - Raw element resource data in OCHRE format
-* @returns Parsed WebElementComponent object
+* @remarks
+* Version 1 of the OCHRE API is deprecated and will be removed in the future.
+* It points to the old Tamino server.
+*
+* Version 2 of the OCHRE API is the current version and is the default.
+* It points to the new MarkLogic server.
 */
-function parseWebElementProperties(componentProperty, elementResource) {
-	const unparsedComponentName = componentProperty.values[0].content;
-	const { data: componentName } = componentSchema.safeParse(unparsedComponentName);
-	let properties = null;
-	const links = elementResource.links ? parseLinks(ensureArray(elementResource.links)) : [];
-	switch (componentName) {
-		case "3d-viewer": {
-			const resourceLink = links.find((link) => link.category === "resource" && link.fileFormat === "model/obj");
-			if (resourceLink?.uuid == null) throw new Error(`Resource link not found for the following component: “${componentName}”`);
-			let isInteractive = getPropertyValueByLabel(componentProperty.properties, "is-interactive");
-			isInteractive ??= true;
-			let isControlsDisplayed = getPropertyValueByLabel(componentProperty.properties, "controls-displayed");
-			isControlsDisplayed ??= true;
-			properties = {
-				component: "3d-viewer",
-				linkUuid: resourceLink.uuid,
-				fileSize: resourceLink.fileSize,
-				isInteractive,
-				isControlsDisplayed
-			};
-			break;
-		}
-		case "advanced-search": {
-			const boundElementPropertyUuid = getPropertyByLabel(componentProperty.properties, "bound-element")?.values[0]?.uuid ?? null;
-			const linkToProperty = getPropertyByLabel(componentProperty.properties, "link-to");
-			const href = linkToProperty?.values[0]?.href ?? linkToProperty?.values[0]?.slug ?? null;
-			if (boundElementPropertyUuid == null && href == null) throw new Error(`Bound element or href not found for the following component: “${componentName}”`);
-			properties = {
-				component: "advanced-search",
-				boundElementUuid: boundElementPropertyUuid,
-				href
-			};
-			break;
-		}
-		case "annotated-document": {
-			const documentLink = links.find((link) => link.type === "internalDocument");
-			if (documentLink?.uuid == null) throw new Error(`Document link not found for the following component: “${componentName}”`);
-			properties = {
-				component: "annotated-document",
-				linkUuid: documentLink.uuid
-			};
-			break;
-		}
-		case "annotated-image": {
-			const imageLinks = links.filter((link) => link.type === "image" || link.type === "IIIF");
-			if (imageLinks.length === 0 || imageLinks[0].uuid == null) throw new Error(`Image link not found for the following component: “${componentName}”`);
-			let isFilterInputDisplayed = getPropertyValueByLabel(componentProperty.properties, "filter-input-displayed");
-			isFilterInputDisplayed ??= true;
-			let isOptionsDisplayed = getPropertyValueByLabel(componentProperty.properties, "options-displayed");
-			isOptionsDisplayed ??= true;
-			let isAnnotationHighlightsDisplayed = getPropertyValueByLabel(componentProperty.properties, "annotation-highlights-displayed");
-			isAnnotationHighlightsDisplayed ??= true;
-			let isAnnotationTooltipsDisplayed = getPropertyValueByLabel(componentProperty.properties, "annotation-tooltips-displayed");
-			isAnnotationTooltipsDisplayed ??= true;
-			properties = {
-				component: "annotated-image",
-				linkUuid: imageLinks[0].uuid,
-				isFilterInputDisplayed,
-				isOptionsDisplayed,
-				isAnnotationHighlightsDisplayed,
-				isAnnotationTooltipsDisplayed
-			};
-			break;
+const DEFAULT_API_VERSION = 2;
+/**
+* The default page size to use for fetching paginated items
+*/
+const DEFAULT_PAGE_SIZE = 48;
+/**
+* Flatten the properties of an item
+* @param item - The item whose properties to flatten
+* @returns The item with the properties flattened
+*/
+function flattenItemProperties(item) {
+	const allProperties = [];
+	if ("properties" in item) allProperties.push(...item.properties);
+	if ("observations" in item) for (const observation of item.observations) allProperties.push(...observation.properties);
+	if ("interpretations" in item) for (const interpretation of item.interpretations) allProperties.push(...interpretation.properties);
+	if ("bibliographies" in item) for (const bibliography of item.bibliographies) allProperties.push(...bibliography.properties);
+	return {
+		...item,
+		properties: flattenProperties(allProperties)
+	};
+}
+
+//#endregion
+//#region src/utils/fetchers/uuid.ts
+/**
+* Fetches raw OCHRE data by UUID from the OCHRE API
+*
+* @param uuid - The UUID of the OCHRE item to fetch
+* @returns A tuple containing either [null, OchreData] on success or [error message, null] on failure
+* @internal
+*/
+async function fetchByUuid(uuid, options) {
+	try {
+		const version = options?.version ?? DEFAULT_API_VERSION;
+		const parsedUuid = uuidSchema.parse(uuid);
+		const response = await (options?.fetch ?? fetch)(version === 2 ? `https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?uuid=${parsedUuid}&format=json&lang="*"` : `https://ochre.lib.uchicago.edu/ochre?uuid=${parsedUuid}&format=json&lang="*"`);
+		if (!response.ok) throw new Error("Failed to fetch OCHRE data");
+		const dataRaw = await response.json();
+		if (version === 2 && (!("result" in dataRaw) || !("ochre" in dataRaw.result)) || version !== 2 && !("ochre" in dataRaw)) throw new Error("Invalid OCHRE data: API response missing 'ochre' key");
+		return [null, "result" in dataRaw && !Array.isArray(dataRaw.result) && "ochre" in dataRaw.result ? dataRaw.result : "ochre" in dataRaw ? dataRaw : null];
+	} catch (error) {
+		return [error instanceof Error ? error.message : "Unknown error", null];
+	}
+}
+
+//#endregion
+//#region src/utils/fetchers/item.ts
+/**
+* Fetches and parses an OCHRE item from the OCHRE API
+*
+* @param uuid - The UUID of the OCHRE item to fetch
+* @returns Object containing the parsed OCHRE item, or an error message if the fetch/parse fails
+*/
+async function fetchItem(uuid, category, itemCategories, options) {
+	try {
+		const version = options?.version ?? DEFAULT_API_VERSION;
+		const [error, data] = await fetchByUuid(uuid, {
+			fetch,
+			version
+		});
+		if (error !== null) throw new Error(error);
+		const categoryKey = category ?? getItemCategory(Object.keys(data.ochre));
+		const belongsTo = {
+			uuid: data.ochre.uuidBelongsTo,
+			abbreviation: parseFakeString(data.ochre.belongsTo)
+		};
+		const metadata = parseMetadata(data.ochre.metadata);
+		let item;
+		switch (categoryKey) {
+			case "resource":
+				if (!("resource" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'resource' key");
+				item = parseResource(data.ochre.resource, metadata, data.ochre.persistentUrl, belongsTo);
+				break;
+			case "spatialUnit":
+				if (!("spatialUnit" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'spatialUnit' key");
+				item = parseSpatialUnit(data.ochre.spatialUnit, metadata, data.ochre.persistentUrl, belongsTo);
+				break;
+			case "concept":
+				if (!("concept" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'concept' key");
+				item = parseConcept(data.ochre.concept, metadata, data.ochre.persistentUrl, belongsTo);
+				break;
+			case "period":
+				if (!("period" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'period' key");
+				item = parsePeriod(data.ochre.period, metadata, data.ochre.persistentUrl, {
+					uuid: data.ochre.uuidBelongsTo,
+					abbreviation: parseFakeString(data.ochre.belongsTo)
+				});
+				break;
+			case "bibliography":
+				if (!("bibliography" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'bibliography' key");
+				item = parseBibliography(data.ochre.bibliography, metadata, data.ochre.persistentUrl, belongsTo);
+				break;
+			case "person":
+				if (!("person" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'person' key");
+				item = parsePerson(data.ochre.person, metadata, data.ochre.persistentUrl, belongsTo);
+				break;
+			case "propertyVariable":
+				if (!("propertyVariable" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'propertyVariable' key");
+				item = parsePropertyVariable(data.ochre.propertyVariable, metadata, data.ochre.persistentUrl, belongsTo);
+				break;
+			case "propertyValue":
+				if (!("propertyValue" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'propertyValue' key");
+				item = parsePropertyValue(data.ochre.propertyValue, metadata, data.ochre.persistentUrl, belongsTo);
+				break;
+			case "text":
+				if (!("text" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'text' key");
+				item = parseText(data.ochre.text, metadata, data.ochre.persistentUrl, belongsTo);
+				break;
+			case "set":
+				if (!("set" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'set' key");
+				item = parseSet(data.ochre.set, itemCategories, metadata, data.ochre.persistentUrl, belongsTo);
+				break;
+			case "tree":
+				if (!("tree" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'tree' key");
+				item = parseTree(data.ochre.tree, itemCategories, metadata, data.ochre.persistentUrl, belongsTo);
+				break;
+			default: throw new Error("Invalid category");
 		}
-		case "audio-player": {
-			const audioLink = links.find((link) => link.type === "audio");
-			if (audioLink?.uuid == null) throw new Error(`Audio link not found for the following component: “${componentName}”`);
-			let isSpeedControlsDisplayed = getPropertyValueByLabel(componentProperty.properties, "speed-controls-displayed");
-			isSpeedControlsDisplayed ??= true;
-			let isVolumeControlsDisplayed = getPropertyValueByLabel(componentProperty.properties, "volume-controls-displayed");
+		return {
+			error: null,
+			item
+		};
+	} catch (error) {
+		return {
+			error: error instanceof Error ? error.message : "Unknown error",
+			item: void 0
+		};
+	}
+}
+
+//#endregion
+//#region src/utils/fetchers/items-by-property-values.ts
+/**
+* Build an XQuery string to fetch items by property values from the OCHRE API
+* @param params - The parameters for the fetch
+* @param params.projectScopeUuid - The UUID of the project scope
+* @param params.belongsToCollectionScopeUuids - An array of collection scope UUIDs to filter by
+* @param params.propertyVariableUuids - An array of property variable UUIDs to fetch
+* @param params.propertyValues - An array of property values to fetch
+* @param params.itemCategory - The category of the items to fetch
+* @param params.page - The page number (1-indexed)
+* @param params.pageSize - The number of items per page
+* @param params.includeChildItems - Whether to include child items of the same category
+* @param options - Options for the fetch
+* @param options.version - The version of the OCHRE API to use
+* @returns An XQuery string
+*/
+function buildXQuery$1(params, options) {
+	const version = options?.version ?? DEFAULT_API_VERSION;
+	const { propertyVariableUuids, propertyValues, projectScopeUuid, belongsToCollectionScopeUuids, itemCategory, page, pageSize, includeChildItems = false } = params;
+	const startPos = (page - 1) * pageSize + 1;
+	const endPos = page * pageSize;
+	let belongsToCollectionScopeFilter = "";
+	if (belongsToCollectionScopeUuids.length > 0) belongsToCollectionScopeFilter = `[.//properties[property[label/@uuid="${BELONGS_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]]`;
+	const propertyVariables = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
+	const propertyValuesFilters = propertyValues.map(({ dataType, value }) => {
+		if (dataType === "IDREF") return `value[@uuid="${value}"]`;
+		if (dataType === "date" || dataType === "dateTime" || dataType === "time" || dataType === "integer" || dataType === "decimal" || dataType === "boolean") return `value[@rawValue="${value}"]`;
+		return `value[.="${value}"]`;
+	}).join(" or ");
+	return `<ochre>{${`let $match-uuids := distinct-values(
+    ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
+        ${belongsToCollectionScopeFilter}
+          //property[label[${propertyVariables}]][${propertyValuesFilters}]]
+        /@uuid
+  )
+
+  let $items := ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
+      /${itemCategory ?? "*"}[@uuid = $match-uuids
+             or bibliographies/bibliography/@uuid = $match-uuids]
+
+  let $unique-uuids := distinct-values($items/@uuid)
+  let $totalCount := count($unique-uuids)
+
+  return <items totalCount="{$totalCount}" page="${page}" pageSize="${pageSize}">{
+    for $uuid in $unique-uuids[position() ge ${startPos} and position() le ${endPos}]
+      let $item := ($items[@uuid = $uuid])[1]
+      let $category := local-name($item)
+      return element { node-name($item) } {
+        $item/@*, ${includeChildItems ? "$item/node()" : "$item/node()[not(local-name(.) = $category)]"}
+      }
+  }</items>`}}</ochre>`;
+}
+/**
+* Fetches and parses items by property values from the OCHRE API
+*
+* @param params - The parameters for the fetch
+* @param params.projectScopeUuid - The UUID of the project scope
+* @param params.belongsToCollectionScopeUuids - The collection scope UUIDs to filter by
+* @param params.propertyVariableUuids - The property variable UUIDs to query by
+* @param params.propertyValues - The property values to query by
+* @param params.page - The page number (1-indexed)
+* @param params.pageSize - The number of items per page
+* @param params.itemCategory - The category of the items to fetch
+* @param params.includeChildItems - Whether to include child items of the same category
+* @param categoryParams - The category parameters for the fetch
+* @param categoryParams.category - The category of the items to fetch
+* @param categoryParams.itemCategories - The categories of the items to fetch
+* @param options - Options for the fetch
+* @param options.fetch - The fetch function to use
+* @param options.version - The version of the OCHRE API to use
+* @returns The parsed items by property values or null if the fetch/parse fails
+*/
+async function fetchItemsByPropertyValues(params, categoryParams, options) {
+	try {
+		const version = options?.version ?? DEFAULT_API_VERSION;
+		const { propertyVariableUuids, propertyValues, projectScopeUuid, belongsToCollectionScopeUuids, page, pageSize = DEFAULT_PAGE_SIZE, itemCategory, includeChildItems } = params;
+		const { category, itemCategories } = categoryParams ?? {};
+		const xquery = buildXQuery$1({
+			projectScopeUuid,
+			belongsToCollectionScopeUuids,
+			propertyVariableUuids,
+			propertyValues,
+			itemCategory,
+			includeChildItems,
+			page,
+			pageSize
+		}, { version });
+		const response = await (options?.fetch ?? fetch)(version === 2 ? `https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?xquery=${encodeURIComponent(xquery)}&format=json&lang="*"` : `https://ochre.lib.uchicago.edu/ochre?xquery=${encodeURIComponent(xquery)}&format=json&lang="*"`);
+		if (!response.ok) throw new Error(`OCHRE API responded with status: ${response.status}`);
+		const data = await response.json();
+		if (Array.isArray(data.result) || Object.keys(data.result.ochre).length === 0) throw new Error("No items found");
+		if (category != null && data.result.ochre.items[category] == null) throw new Error(`No items found for category: ${category}`);
+		if ((category === "set" || category === "tree") && itemCategories != null && "items" in data.result.ochre.items[category] && Array.isArray(data.result.ochre.items[category].items) && data.result.ochre.items[category].items.every((item) => item.category !== itemCategories)) throw new Error(`No items found for category: ${category} and item categories: ${itemCategories}`);
+		const items = [];
+		if ("resource" in data.result.ochre.items && data.result.ochre.items.resource != null) {
+			const resources = parseResources(Array.isArray(data.result.ochre.items.resource) ? data.result.ochre.items.resource : [data.result.ochre.items.resource]);
+			items.push(...resources);
+		}
+		if ("spatialUnit" in data.result.ochre.items && data.result.ochre.items.spatialUnit != null) {
+			const spatialUnits = parseSpatialUnits(Array.isArray(data.result.ochre.items.spatialUnit) ? data.result.ochre.items.spatialUnit : [data.result.ochre.items.spatialUnit]);
+			items.push(...spatialUnits);
+		}
+		if ("concept" in data.result.ochre.items && data.result.ochre.items.concept != null) {
+			const concepts = parseConcepts(Array.isArray(data.result.ochre.items.concept) ? data.result.ochre.items.concept : [data.result.ochre.items.concept]);
+			items.push(...concepts);
+		}
+		if ("period" in data.result.ochre.items && data.result.ochre.items.period != null) {
+			const periods = parsePeriods(Array.isArray(data.result.ochre.items.period) ? data.result.ochre.items.period : [data.result.ochre.items.period]);
+			items.push(...periods);
+		}
+		if ("bibliography" in data.result.ochre.items && data.result.ochre.items.bibliography != null) {
+			const bibliographies = parseBibliographies(Array.isArray(data.result.ochre.items.bibliography) ? data.result.ochre.items.bibliography : [data.result.ochre.items.bibliography]);
+			items.push(...bibliographies);
+		}
+		if ("person" in data.result.ochre.items && data.result.ochre.items.person != null) {
+			const persons = parsePersons(Array.isArray(data.result.ochre.items.person) ? data.result.ochre.items.person : [data.result.ochre.items.person]);
+			items.push(...persons);
+		}
+		if ("propertyVariable" in data.result.ochre.items && data.result.ochre.items.propertyVariable != null) {
+			const propertyVariables = parsePropertyVariables(Array.isArray(data.result.ochre.items.propertyVariable) ? data.result.ochre.items.propertyVariable : [data.result.ochre.items.propertyVariable]);
+			items.push(...propertyVariables);
+		}
+		if ("propertyValue" in data.result.ochre.items && data.result.ochre.items.propertyValue != null) {
+			const propertyValues = parsePropertyValues(Array.isArray(data.result.ochre.items.propertyValue) ? data.result.ochre.items.propertyValue : [data.result.ochre.items.propertyValue]);
+			items.push(...propertyValues);
+		}
+		if ("text" in data.result.ochre.items && data.result.ochre.items.text != null) {
+			const texts = parseTexts(Array.isArray(data.result.ochre.items.text) ? data.result.ochre.items.text : [data.result.ochre.items.text]);
+			items.push(...texts);
+		}
+		if ("set" in data.result.ochre.items && data.result.ochre.items.set != null) {
+			const sets = parseSets(Array.isArray(data.result.ochre.items.set) ? data.result.ochre.items.set : [data.result.ochre.items.set]);
+			items.push(...sets);
+		}
+		if ("tree" in data.result.ochre.items && data.result.ochre.items.tree != null) {
+			const trees = parseTrees(Array.isArray(data.result.ochre.items.tree) ? data.result.ochre.items.tree : [data.result.ochre.items.tree]);
+			items.push(...trees);
+		}
+		return {
+			totalCount: data.result.ochre.items.totalCount,
+			page: data.result.ochre.items.page,
+			pageSize: data.result.ochre.items.pageSize,
+			items,
+			error: null
+		};
+	} catch (error) {
+		console.error(error);
+		return {
+			totalCount: null,
+			page: null,
+			pageSize: null,
+			items: null,
+			error: error instanceof Error ? error.message : "Failed to fetch items by property values"
+		};
+	}
+}
+
+//#endregion
+//#region src/utils/fetchers/property-values-by-property-variables.ts
+/**
+* Schema for a single property value query item in the OCHRE API response
+*/
+const propertyValueQueryItemSchema = z.object({
+	uuid: z.string(),
+	itemUuid: z.string().optional(),
+	dataType: z.string(),
+	rawValue: z.union([
+		z.string(),
+		z.number(),
+		z.boolean()
+	]).optional(),
+	content: z.union([
+		z.string(),
+		z.number(),
+		z.boolean(),
+		richTextStringSchema,
+		z.array(richTextStringSchema)
+	]).optional()
+}).transform((val) => {
+	const returnValue = {
+		itemUuid: val.itemUuid != null && val.itemUuid !== "" ? val.itemUuid : null,
+		dataType: val.dataType,
+		content: null,
+		label: null
+	};
+	switch (val.dataType) {
+		case "IDREF":
+			returnValue.content = val.uuid !== "" ? val.uuid : null;
+			returnValue.label = val.content != null && val.content !== "" ? typeof val.content === "object" ? parseStringContent({ content: val.content }) : parseFakeString(val.content) : null;
+			break;
+		case "integer":
+		case "decimal":
+		case "time":
+			returnValue.content = val.rawValue != null && val.rawValue !== "" ? Number(val.rawValue) : null;
+			returnValue.label = val.content != null && val.content !== "" ? val.content.toString() : null;
+			break;
+		case "boolean":
+			returnValue.content = val.rawValue != null && val.rawValue !== "" ? Boolean(val.rawValue) : null;
+			returnValue.label = val.content != null && val.content !== "" ? val.content.toString() : null;
+			break;
+		default:
+			returnValue.content = val.rawValue != null && val.rawValue !== "" ? val.rawValue.toString() : null;
+			returnValue.label = val.content != null && val.content !== "" ? val.content.toString() : null;
+			break;
+	}
+	return returnValue;
+});
+/**
+* Schema for the property values by property variables OCHRE API response
+*/
+const responseSchema = z.object({ result: z.union([z.object({ ochre: z.object({ propertyValue: z.union([propertyValueQueryItemSchema, z.array(propertyValueQueryItemSchema)]) }) }), z.array(z.unknown()).length(0)]) });
+/**
+* Build an XQuery string to fetch property values by property variables from the OCHRE API
+* @param params - The parameters for the fetch
+* @param params.projectScopeUuid - The UUID of the project scope
+* @param params.belongsToCollectionScopeUuids - An array of collection scope UUIDs to filter by
+* @param params.propertyVariableUuids - An array of property variable UUIDs to fetch
+* @param options - Options for the fetch
+* @param options.version - The version of the OCHRE API to use
+* @returns An XQuery string
+*/
+function buildXQuery(params, options) {
+	const version = options?.version ?? DEFAULT_API_VERSION;
+	const { projectScopeUuid, belongsToCollectionScopeUuids, propertyVariableUuids } = params;
+	let collectionScopeFilter = "";
+	if (belongsToCollectionScopeUuids.length > 0) collectionScopeFilter = `//properties[property[label/@uuid="${BELONGS_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]]`;
+	const propertyVariableFilters = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
+	return `<ochre>{${`let $matching-props := ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
+      ${collectionScopeFilter}
+      /*[not(self::set)]
+      //property[label/(${propertyVariableFilters})]
+
+  for $v in $matching-props/value
+    let $item-uuid := $v/ancestor::*[parent::ochre]/@uuid
+    return <propertyValue uuid="{$v/@uuid}" rawValue="{$v/@rawValue}" dataType="{$v/@dataType}" itemUuid="{$item-uuid}">{
+      if ($v/content) then $v/content else $v/text()
+    }</propertyValue>`}}</ochre>`;
+}
+/**
+* Fetches and parses property values by property variables from the OCHRE API
+*
+* @param params - The parameters for the fetch
+* @param params.projectScopeUuid - The UUID of the project scope
+* @param params.belongsToCollectionScopeUuids - The collection scope UUIDs to filter by
+* @param params.propertyVariableUuids - The property variable UUIDs to query by
+* @param options - Options for the fetch
+* @param options.fetch - The fetch function to use
+* @param options.version - The version of the OCHRE API to use
+* @returns The parsed property values by property variables or null if the fetch/parse fails
+*/
+async function fetchPropertyValuesByPropertyVariables(params, options) {
+	try {
+		const version = options?.version ?? DEFAULT_API_VERSION;
+		const { belongsToCollectionScopeUuids, propertyVariableUuids, projectScopeUuid } = params;
+		const xquery = buildXQuery({
+			projectScopeUuid,
+			belongsToCollectionScopeUuids,
+			propertyVariableUuids
+		}, { version });
+		const response = await (options?.fetch ?? fetch)(version === 2 ? `https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?xquery=${encodeURIComponent(xquery)}&format=json&lang="*"` : `https://ochre.lib.uchicago.edu/ochre?xquery=${encodeURIComponent(xquery)}&format=json&lang="*"`);
+		if (!response.ok) throw new Error(`OCHRE API responded with status: ${response.status}`);
+		const data = await response.json();
+		const parsedResultRaw = responseSchema.parse(data);
+		if (Array.isArray(parsedResultRaw.result)) throw new TypeError("No items found");
+		const parsedItems = Array.isArray(parsedResultRaw.result.ochre.propertyValue) ? parsedResultRaw.result.ochre.propertyValue : [parsedResultRaw.result.ochre.propertyValue];
+		const groupedItemsMap = /* @__PURE__ */ new Map();
+		for (const item of parsedItems) {
+			const existing = groupedItemsMap.get(item.content);
+			if (existing == null) groupedItemsMap.set(item.content, {
+				dataType: item.dataType,
+				content: item.content,
+				label: item.label,
+				itemUuids: new Set([item.itemUuid])
+			});
+			else existing.itemUuids.add(item.itemUuid);
+		}
+		const groupedItems = [];
+		for (const group of groupedItemsMap.values()) groupedItems.push({
+			count: group.itemUuids.size,
+			dataType: group.dataType,
+			content: group.content,
+			label: group.label
+		});
+		return {
+			items: groupedItems.toSorted((a, b) => {
+				if (a.count !== b.count) return b.count - a.count;
+				if (a.label !== b.label) return a.label?.localeCompare(b.label ?? "") ?? 0;
+				return a.content?.toString().localeCompare(b.content?.toString() ?? "") ?? 0;
+			}),
+			error: null
+		};
+	} catch (error) {
+		console.error(error);
+		return {
+			items: null,
+			error: error instanceof Error ? error.message : "Failed to fetch property values by property variables"
+		};
+	}
+}
+
+//#endregion
+//#region src/utils/getters.ts
+const DEFAULT_OPTIONS = { includeNestedProperties: false };
+/**
+* Finds a property by its UUID in an array of properties
+*
+* @param properties - Array of properties to search through
+* @param uuid - The UUID to search for
+* @param options - Search options, including whether to include nested properties
+* @returns The matching Property object, or null if not found
+*/
+function getPropertyByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties } = options;
+	const property = properties.find((property) => property.uuid === uuid);
+	if (property) return property;
+	if (includeNestedProperties) {
+		for (const property of properties) if (property.properties.length > 0) {
+			const nestedResult = getPropertyByUuid(property.properties, uuid, { includeNestedProperties });
+			if (nestedResult) return nestedResult;
+		}
+	}
+	return null;
+}
+/**
+* Retrieves all values for a property with the given UUID
+*
+* @param properties - Array of properties to search through
+* @param uuid - The UUID to search for
+* @param options - Search options, including whether to include nested properties
+* @returns Array of property values as strings, or null if property not found
+*/
+function getPropertyValuesByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties } = options;
+	const property = properties.find((property) => property.uuid === uuid);
+	if (property) return property.values.map((value) => value.content);
+	if (includeNestedProperties) {
+		for (const property of properties) if (property.properties.length > 0) {
+			const nestedResult = getPropertyValuesByUuid(property.properties, uuid, { includeNestedProperties });
+			if (nestedResult) return nestedResult;
+		}
+	}
+	return null;
+}
+/**
+* Gets the first value of a property with the given UUID
+*
+* @param properties - Array of properties to search through
+* @param uuid - The UUID to search for
+* @param options - Search options, including whether to include nested properties
+* @returns The first property value as string, or null if property not found
+*/
+function getPropertyValueByUuid(properties, uuid, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties } = options;
+	const values = getPropertyValuesByUuid(properties, uuid, { includeNestedProperties });
+	if (values !== null && values.length > 0) return values[0];
+	if (includeNestedProperties) {
+		for (const property of properties) if (property.properties.length > 0) {
+			const nestedResult = getPropertyValueByUuid(property.properties, uuid, { includeNestedProperties });
+			if (nestedResult !== null) return nestedResult;
+		}
+	}
+	return null;
+}
+/**
+* Finds a property by its label in an array of properties
+*
+* @param properties - Array of properties to search through
+* @param label - The label to search for
+* @param options - Search options, including whether to include nested properties
+* @returns The matching Property object, or null if not found
+*/
+function getPropertyByLabel(properties, label, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties } = options;
+	const property = properties.find((property) => property.label === label);
+	if (property) return property;
+	if (includeNestedProperties) {
+		for (const property of properties) if (property.properties.length > 0) {
+			const nestedResult = getPropertyByLabel(property.properties, label, { includeNestedProperties });
+			if (nestedResult) return nestedResult;
+		}
+	}
+	return null;
+}
+/**
+* Finds a property by its label and all values in an array of properties
+*
+* @param properties - Array of properties to search through
+* @param label - The label to search for
+* @param values - The values to search for
+* @param options - Search options, including whether to include nested properties
+* @returns The matching Property object, or null if not found or all values do not match
+*/
+function getPropertyByLabelAndValues(properties, label, values, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties } = options;
+	const property = properties.find((property) => property.label === label && deepEqual(property.values, values));
+	if (property) return property;
+	if (includeNestedProperties) {
+		for (const property of properties) if (property.properties.length > 0) {
+			const nestedResult = getPropertyByLabelAndValues(property.properties, label, values, { includeNestedProperties });
+			if (nestedResult) return nestedResult;
+		}
+	}
+	return null;
+}
+/**
+* Finds a property by its label and value in an array of properties
+*
+* @param properties - Array of properties to search through
+* @param label - The label to search for
+* @param value - The value to search for
+* @param options - Search options, including whether to include nested properties
+* @returns The matching Property object, or null if not found or value does not match
+*/
+function getPropertyByLabelAndValue(properties, label, value, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties } = options;
+	const property = properties.find((property) => property.label === label && property.values.some((v) => v.content === value));
+	if (property) return property;
+	if (includeNestedProperties) {
+		for (const property of properties) if (property.properties.length > 0) {
+			const nestedResult = getPropertyByLabelAndValue(property.properties, label, value, { includeNestedProperties });
+			if (nestedResult) return nestedResult;
+		}
+	}
+	return null;
+}
+/**
+* Retrieves all values for a property with the given label
+*
+* @param properties - Array of properties to search through
+* @param label - The label to search for
+* @param options - Search options, including whether to include nested properties
+* @returns Array of property values as strings, or null if property not found
+*/
+function getPropertyValuesByLabel(properties, label, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties } = options;
+	const property = properties.find((property) => property.label === label);
+	if (property) return property.values.map((value) => value.content);
+	if (includeNestedProperties) {
+		for (const property of properties) if (property.properties.length > 0) {
+			const nestedResult = getPropertyValuesByLabel(property.properties, label, { includeNestedProperties });
+			if (nestedResult) return nestedResult;
+		}
+	}
+	return null;
+}
+/**
+* Gets the first value of a property with the given label
+*
+* @param properties - Array of properties to search through
+* @param label - The label to search for
+* @param options - Search options, including whether to include nested properties
+* @returns The first property value as string, or null if property not found
+*/
+function getPropertyValueByLabel(properties, label, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties } = options;
+	const values = getPropertyValuesByLabel(properties, label, { includeNestedProperties });
+	if (values !== null && values.length > 0) return values[0];
+	if (includeNestedProperties) {
+		for (const property of properties) if (property.properties.length > 0) {
+			const nestedResult = getPropertyValueByLabel(property.properties, label, { includeNestedProperties });
+			if (nestedResult !== null) return nestedResult;
+		}
+	}
+	return null;
+}
+/**
+* Gets all unique properties from an array of properties
+*
+* @param properties - Array of properties to get unique properties from
+* @param options - Search options, including whether to include nested properties
+* @returns Array of unique properties
+*/
+function getUniqueProperties(properties, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties } = options;
+	const uniqueProperties = new Array();
+	for (const property of properties) {
+		if (uniqueProperties.some((p) => p.uuid === property.uuid)) continue;
+		uniqueProperties.push(property);
+		if (property.properties.length > 0 && includeNestedProperties) {
+			const nestedProperties = getUniqueProperties(property.properties, { includeNestedProperties: true });
+			for (const property of nestedProperties) {
+				if (uniqueProperties.some((p) => p.uuid === property.uuid)) continue;
+				uniqueProperties.push(property);
+			}
+		}
+	}
+	return uniqueProperties;
+}
+/**
+* Gets all unique property labels from an array of properties
+*
+* @param properties - Array of properties to get unique property labels from
+* @param options - Search options, including whether to include nested properties
+* @returns Array of unique property labels
+*/
+function getUniquePropertyLabels(properties, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties } = options;
+	const uniquePropertyLabels = new Array();
+	for (const property of properties) {
+		if (uniquePropertyLabels.includes(property.label)) continue;
+		uniquePropertyLabels.push(property.label);
+		if (property.properties.length > 0 && includeNestedProperties) {
+			const nestedProperties = getUniquePropertyLabels(property.properties, { includeNestedProperties: true });
+			for (const property of nestedProperties) {
+				if (uniquePropertyLabels.includes(property)) continue;
+				uniquePropertyLabels.push(property);
+			}
+		}
+	}
+	return uniquePropertyLabels;
+}
+/**
+* Get the leaf property values from an array of property values
+* @param propertyValues - The array of property values to get the leaf property values from
+* @returns The array of leaf property values
+*/
+function getLeafPropertyValues(propertyValues) {
+	return propertyValues.filter((value) => value.hierarchy.isLeaf);
+}
+/**
+* Filters a property based on a label and value criteria
+*
+* @param property - The property to filter
+* @param filter - Filter criteria containing label and value to match
+* @param filter.label - The label to filter by
+* @param filter.value - The value to filter by
+* @param options - Search options, including whether to include nested properties
+* @returns True if the property matches the filter criteria, false otherwise
+*/
+function filterProperties(property, filter, options = DEFAULT_OPTIONS) {
+	const { includeNestedProperties } = options;
+	if (filter.label.toLocaleLowerCase("en-US") === "all fields" || property.label.toLocaleLowerCase("en-US") === filter.label.toLocaleLowerCase("en-US")) {
+		let isFound = property.values.some((value) => {
+			if (value.content === null) return false;
+			if (typeof value.content === "string") {
+				if (typeof filter.value !== "string") return false;
+				return value.content.toLocaleLowerCase("en-US").includes(filter.value.toLocaleLowerCase("en-US"));
+			}
+			if (typeof value.content === "number") {
+				if (typeof filter.value !== "number") return false;
+				return value.content === filter.value;
+			}
+			if (typeof value.content === "boolean") {
+				if (typeof filter.value !== "boolean") return false;
+				return value.content === filter.value;
+			}
+			return false;
+		});
+		if (!isFound && includeNestedProperties) isFound = property.properties.some((property) => filterProperties(property, filter, { includeNestedProperties: true }));
+		return isFound;
+	}
+	return false;
+}
+
+//#endregion
+//#region src/utils/parse/website.ts
+/**
+* Extracts CSS style properties for a given presentation variant.
+*
+* @param properties - Array of properties to parse
+* @param cssVariant - CSS variant to parse
+* @returns Array of CSS styles
+*/
+function parseCssStylesFromProperties(properties, cssVariant) {
+	const cssProperties = getPropertyByLabelAndValue(properties, "presentation", cssVariant != null ? `css-${cssVariant}` : "css")?.properties ?? [];
+	const styles = [];
+	for (const property of cssProperties) {
+		const value = property.values[0]?.content?.toString();
+		if (value != null) styles.push({
+			label: property.label,
+			value
+		});
+	}
+	return styles;
+}
+/**
+* Parses responsive CSS styles (default, tablet, mobile) from properties.
+*
+* @param properties - Array of properties to parse
+* @returns Object containing responsive CSS styles
+*/
+function parseResponsiveCssStyles(properties) {
+	return {
+		default: parseCssStylesFromProperties(properties),
+		tablet: parseCssStylesFromProperties(properties, "tablet"),
+		mobile: parseCssStylesFromProperties(properties, "mobile")
+	};
+}
+/**
+* Parses raw bounds data into a standardized bounds structure
+*
+* @param bounds - Raw bounds data in OCHRE format
+* @returns Parsed bounds object
+*/
+function parseBounds(bounds) {
+	const result = boundsSchema.safeParse(bounds);
+	if (!result.success) throw new Error(`Invalid bounds: ${result.error.message}`);
+	return result.data;
+}
+/**
+* Parses all context option arrays from an options object.
+*
+* @param options - Options object containing context options
+* @param options.flattenContexts - Flatten contexts
+* @param options.suppressContexts - Suppress contexts
+* @param options.filterContexts - Filter contexts
+* @param options.sortContexts - Sort contexts
+* @param options.detailContexts - Detail contexts
+* @param options.downloadContexts - Download contexts
+* @param options.labelContexts - Label contexts
+* @param options.prominentContexts - Prominent contexts
+* @returns Parsed context options
+*/
+function parseAllOptionContexts(options) {
+	function handleContexts(v) {
+		return parseContexts(v != null ? ensureArray(v) : []);
+	}
+	return {
+		flatten: handleContexts(options.flattenContexts),
+		suppress: handleContexts(options.suppressContexts),
+		filter: handleContexts(options.filterContexts),
+		sort: handleContexts(options.sortContexts),
+		detail: handleContexts(options.detailContexts),
+		download: handleContexts(options.downloadContexts),
+		label: handleContexts(options.labelContexts),
+		prominent: handleContexts(options.prominentContexts)
+	};
+}
+/**
+* Parses raw web element properties into a standardized WebElementComponent structure
+*
+* @param componentProperty - Raw component property data in OCHRE format
+* @param elementResource - Raw element resource data in OCHRE format
+* @returns Parsed WebElementComponent object
+*/
+function parseWebElementProperties(componentProperty, elementResource) {
+	const unparsedComponentName = componentProperty.values[0].content;
+	const { data: componentName } = componentSchema.safeParse(unparsedComponentName);
+	let properties = null;
+	const links = elementResource.links ? parseLinks(ensureArray(elementResource.links)) : [];
+	switch (componentName) {
+		case "3d-viewer": {
+			const resourceLink = links.find((link) => link.category === "resource" && link.fileFormat === "model/obj");
+			if (resourceLink?.uuid == null) throw new Error(`Resource link not found for the following component: “${componentName}”`);
+			let isInteractive = getPropertyValueByLabel(componentProperty.properties, "is-interactive");
+			isInteractive ??= true;
+			let isControlsDisplayed = getPropertyValueByLabel(componentProperty.properties, "controls-displayed");
+			isControlsDisplayed ??= true;
+			properties = {
+				component: "3d-viewer",
+				linkUuid: resourceLink.uuid,
+				fileSize: resourceLink.fileSize,
+				isInteractive,
+				isControlsDisplayed
+			};
+			break;
+		}
+		case "advanced-search": {
+			const boundElementPropertyUuid = getPropertyByLabel(componentProperty.properties, "bound-element")?.values[0]?.uuid ?? null;
+			const linkToProperty = getPropertyByLabel(componentProperty.properties, "link-to");
+			const href = linkToProperty?.values[0]?.href ?? linkToProperty?.values[0]?.slug ?? null;
+			if (boundElementPropertyUuid == null && href == null) throw new Error(`Bound element or href not found for the following component: “${componentName}”`);
+			properties = {
+				component: "advanced-search",
+				boundElementUuid: boundElementPropertyUuid,
+				href
+			};
+			break;
+		}
+		case "annotated-document": {
+			const documentLink = links.find((link) => link.type === "internalDocument");
+			if (documentLink?.uuid == null) throw new Error(`Document link not found for the following component: “${componentName}”`);
+			properties = {
+				component: "annotated-document",
+				linkUuid: documentLink.uuid
+			};
+			break;
+		}
+		case "annotated-image": {
+			const imageLinks = links.filter((link) => link.type === "image" || link.type === "IIIF");
+			if (imageLinks.length === 0 || imageLinks[0].uuid == null) throw new Error(`Image link not found for the following component: “${componentName}”`);
+			let isFilterInputDisplayed = getPropertyValueByLabel(componentProperty.properties, "filter-input-displayed");
+			isFilterInputDisplayed ??= true;
+			let isOptionsDisplayed = getPropertyValueByLabel(componentProperty.properties, "options-displayed");
+			isOptionsDisplayed ??= true;
+			let isAnnotationHighlightsDisplayed = getPropertyValueByLabel(componentProperty.properties, "annotation-highlights-displayed");
+			isAnnotationHighlightsDisplayed ??= true;
+			let isAnnotationTooltipsDisplayed = getPropertyValueByLabel(componentProperty.properties, "annotation-tooltips-displayed");
+			isAnnotationTooltipsDisplayed ??= true;
+			properties = {
+				component: "annotated-image",
+				linkUuid: imageLinks[0].uuid,
+				isFilterInputDisplayed,
+				isOptionsDisplayed,
+				isAnnotationHighlightsDisplayed,
+				isAnnotationTooltipsDisplayed
+			};
+			break;
+		}
+		case "audio-player": {
+			const audioLink = links.find((link) => link.type === "audio");
+			if (audioLink?.uuid == null) throw new Error(`Audio link not found for the following component: “${componentName}”`);
+			let isSpeedControlsDisplayed = getPropertyValueByLabel(componentProperty.properties, "speed-controls-displayed");
+			isSpeedControlsDisplayed ??= true;
+			let isVolumeControlsDisplayed = getPropertyValueByLabel(componentProperty.properties, "volume-controls-displayed");
 			isVolumeControlsDisplayed ??= true;
 			let isSeekBarDisplayed = getPropertyValueByLabel(componentProperty.properties, "seek-bar-displayed");
 			isSeekBarDisplayed ??= true;
@@ -2604,1172 +3044,741 @@ function parseWebElementProperties(componentProperty, elementResource) {
 					endIcon
 				});
 			}
-			if (queries.length === 0) throw new Error(`No queries found for the following component: “${componentName}”`);
-			const displayedProperties = getPropertyByLabel(componentProperty.properties, "use-property");
-			let itemVariant = getPropertyValueByLabel(componentProperty.properties, "item-variant");
-			itemVariant ??= "detailed";
-			let paginationVariant = getPropertyValueByLabel(componentProperty.properties, "pagination-variant");
-			paginationVariant ??= "default";
-			let layout = getPropertyValueByLabel(componentProperty.properties, "layout");
-			layout ??= "image-start";
-			properties = {
-				component: "query",
-				itemCategory,
-				queries,
-				displayedProperties: displayedProperties?.values.filter((value) => value.uuid !== null).map((value) => ({
-					uuid: value.uuid,
-					label: value.content?.toString() ?? ""
-				})) ?? null,
-				itemVariant,
-				paginationVariant,
-				layout
-			};
-			break;
-		}
-		case "table": {
-			const tableLink = links.find((link) => link.category === "set");
-			if (tableLink?.uuid == null) throw new Error(`Table link not found for the following component: “${componentName}”`);
-			properties = {
-				component: "table",
-				linkUuid: tableLink.uuid
-			};
-			break;
-		}
-		case "search-bar": {
-			let queryVariant = null;
-			queryVariant = getPropertyValueByLabel(componentProperty.properties, "query-variant");
-			queryVariant ??= "submit";
-			const boundElementUuid = getPropertyByLabel(componentProperty.properties, "bound-element")?.values[0]?.uuid ?? null;
-			const linkToProperty = getPropertyByLabel(componentProperty.properties, "link-to");
-			const href = linkToProperty?.values[0]?.href ?? linkToProperty?.values[0]?.slug ?? null;
-			if (!boundElementUuid && !href) throw new Error(`Bound element or href not found for the following component: “${componentName}”`);
-			let placeholder = getPropertyValueByLabel(componentProperty.properties, "placeholder-text");
-			placeholder ??= null;
-			let baseFilterQueries = getPropertyValueByLabel(componentProperty.properties, "base-filter-queries");
-			baseFilterQueries ??= null;
-			properties = {
-				component: "search-bar",
-				queryVariant,
-				placeholder,
-				baseFilterQueries: baseFilterQueries?.replaceAll(String.raw`\{`, "{").replaceAll(String.raw`\}`, "}") ?? null,
-				boundElementUuid,
-				href
-			};
-			break;
-		}
-		case "text": {
-			const content = elementResource.document && "content" in elementResource.document ? parseDocument(elementResource.document.content) : null;
-			if (!content) throw new Error(`Content not found for the following component: “${componentName}”`);
-			let variantName = "block";
-			let variant;
-			const variantProperty = getPropertyByLabel(componentProperty.properties, "variant");
-			if (variantProperty !== null) {
-				variantName = variantProperty.values[0].content;
-				if (variantName === "paragraph" || variantName === "label" || variantName === "heading" || variantName === "display") {
-					let size = getPropertyValueByLabel(variantProperty.properties, "size");
-					size ??= "md";
-					variant = {
-						name: variantName,
-						size
-					};
-				} else variant = { name: variantName };
-			} else variant = { name: variantName };
-			let headingLevel = getPropertyValueByLabel(componentProperty.properties, "heading-level");
-			headingLevel ??= null;
-			properties = {
-				component: "text",
-				variant,
-				headingLevel,
-				content
-			};
-			break;
-		}
-		case "timeline": {
-			const timelineLink = links.find((link) => link.category === "tree");
-			if (timelineLink?.uuid == null) throw new Error(`Timeline link not found for the following component: “${componentName}”`);
-			properties = {
-				component: "timeline",
-				linkUuid: timelineLink.uuid
-			};
-			break;
-		}
-		case "video": {
-			const videoLink = links.find((link) => link.type === "video");
-			if (videoLink?.uuid == null) throw new Error(`Video link not found for the following component: “${componentName}”`);
-			let isChaptersDisplayed = getPropertyValueByLabel(componentProperty.properties, "chapters-displayed");
-			isChaptersDisplayed ??= true;
-			properties = {
-				component: "video",
-				linkUuid: videoLink.uuid,
-				isChaptersDisplayed
-			};
-			break;
-		}
-		default:
-			console.warn(`Invalid or non-implemented component name “${unparsedComponentName?.toString() ?? "(unknown)"}” for the following element: “${parseStringContent(elementResource.identification.label)}”`);
-			break;
-	}
-	if (properties === null) throw new Error(`Properties not found for the following component: “${componentName}”`);
-	return properties;
-}
-function parseWebTitle(properties, identification, overrides) {
-	const title = {
-		label: identification.label,
-		variant: "default",
-		properties: {
-			isNameDisplayed: overrides?.isNameDisplayed ?? false,
-			isDescriptionDisplayed: overrides?.isDescriptionDisplayed ?? false,
-			isDateDisplayed: overrides?.isDateDisplayed ?? false,
-			isCreatorsDisplayed: overrides?.isCreatorsDisplayed ?? false,
-			isCountDisplayed: overrides?.isCountDisplayed ?? false
-		}
-	};
-	const titleProperties = getPropertyByLabelAndValue(properties, "presentation", "title")?.properties ?? [];
-	if (titleProperties.length > 0) {
-		title.variant = getPropertyValueByLabel(titleProperties, "variant") ?? "default";
-		title.properties.isNameDisplayed = getPropertyValueByLabel(titleProperties, "name-displayed") ?? false;
-		title.properties.isDescriptionDisplayed = getPropertyValueByLabel(titleProperties, "description-displayed") ?? false;
-		title.properties.isDateDisplayed = getPropertyValueByLabel(titleProperties, "date-displayed") ?? false;
-		title.properties.isCreatorsDisplayed = getPropertyValueByLabel(titleProperties, "creators-displayed") ?? false;
-		title.properties.isCountDisplayed = getPropertyValueByLabel(titleProperties, "count-displayed") ?? false;
-	}
-	return title;
-}
-/**
-* Parses raw web element data into a standardized WebElement structure
-*
-* @param elementResource - Raw element resource data in OCHRE format
-* @returns Parsed WebElement object
-*/
-function parseWebElement(elementResource) {
-	const identification = parseIdentification(elementResource.identification);
-	const elementProperties = elementResource.properties?.property ? parseProperties(Array.isArray(elementResource.properties.property) ? elementResource.properties.property : [elementResource.properties.property]) : [];
-	const presentationProperty = getPropertyByLabel(elementProperties, "presentation");
-	if (presentationProperty === null) throw new Error(`Presentation property not found for element “${identification.label}”`);
-	const componentProperty = getPropertyByLabel(presentationProperty.properties, "component");
-	if (componentProperty === null) throw new Error(`Component for element “${identification.label}” not found`);
-	const properties = parseWebElementProperties(componentProperty, elementResource);
-	const cssStyles = parseResponsiveCssStyles(elementProperties);
-	const title = parseWebTitle(elementProperties, identification, {
-		isNameDisplayed: properties.component === "annotated-image" || properties.component === "annotated-document" || properties.component === "collection",
-		isCountDisplayed: properties.component === "collection" && properties.variant === "full"
-	});
-	return {
-		uuid: elementResource.uuid,
-		type: "element",
-		title,
-		cssStyles,
-		...properties
-	};
-}
-/**
-* Parses raw webpage data into a standardized Webpage structure
-*
-* @param webpageResource - Raw webpage resource data in OCHRE format
-* @returns Parsed Webpage object
-*/
-function parseWebpage(webpageResource, slugPrefix) {
-	const webpageProperties = webpageResource.properties ? parseProperties(ensureArray(webpageResource.properties.property)) : [];
-	if (webpageProperties.length === 0 || getPropertyValueByLabel(webpageProperties, "presentation") !== "page") return null;
-	const identification = parseIdentification(webpageResource.identification);
-	const slug = webpageResource.slug?.replace(/^\$[^-]*-/, "") ?? null;
-	if (slug == null) throw new Error(`Slug not found for page “${identification.label}”`);
-	const returnWebpage = {
-		uuid: webpageResource.uuid,
-		type: "page",
-		title: identification.label,
-		slug: slugPrefix != null ? `${slugPrefix}/${slug}`.replace(/\/$/, "") : slug,
-		publicationDateTime: parseOptionalDate(webpageResource.publicationDateTime),
-		items: [],
-		properties: {
-			width: "default",
-			variant: "default",
-			isBreadcrumbsDisplayed: false,
-			isSidebarDisplayed: true,
-			isDisplayedInNavbar: true,
-			isNavbarSearchBarDisplayed: true,
-			backgroundImage: null,
-			cssStyles: {
-				default: [],
-				tablet: [],
-				mobile: []
-			}
-		},
-		webpages: []
-	};
-	const imageLink = (webpageResource.links != null ? parseLinks(ensureArray(webpageResource.links)) : []).find((link) => link.type === "image" || link.type === "IIIF");
-	const webpageResources = webpageResource.resource != null ? ensureArray(webpageResource.resource) : [];
-	const items = [];
-	for (const resource of webpageResources) {
-		const resourceType = getPropertyValueByLabel(resource.properties != null ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
-		if (resourceType === null) continue;
-		switch (resourceType) {
-			case "segment": {
-				const segment = parseWebSegment(resource);
-				if (segment) items.push(segment);
-				break;
-			}
-			case "element": {
-				const element = parseWebElement(resource);
-				items.push(element);
-				break;
-			}
-			case "block": {
-				const block = parseWebBlock(resource);
-				if (block) items.push(block);
-				break;
-			}
+			if (queries.length === 0) throw new Error(`No queries found for the following component: “${componentName}”`);
+			const displayedProperties = getPropertyByLabel(componentProperty.properties, "use-property");
+			let itemVariant = getPropertyValueByLabel(componentProperty.properties, "item-variant");
+			itemVariant ??= "detailed";
+			let paginationVariant = getPropertyValueByLabel(componentProperty.properties, "pagination-variant");
+			paginationVariant ??= "default";
+			let layout = getPropertyValueByLabel(componentProperty.properties, "layout");
+			layout ??= "image-start";
+			properties = {
+				component: "query",
+				itemCategory,
+				queries,
+				displayedProperties: displayedProperties?.values.filter((value) => value.uuid !== null).map((value) => ({
+					uuid: value.uuid,
+					label: value.content?.toString() ?? ""
+				})) ?? null,
+				itemVariant,
+				paginationVariant,
+				layout
+			};
+			break;
 		}
-	}
-	returnWebpage.webpages = webpageResource.resource != null ? parseWebpageResources(ensureArray(webpageResource.resource), "page") : [];
-	const webpageSubProperties = getPropertyByLabelAndValue(webpageProperties, "presentation", "page")?.properties ?? [];
-	if (webpageSubProperties.length > 0) {
-		returnWebpage.properties.isDisplayedInNavbar = getPropertyValueByLabel(webpageSubProperties, "displayed-in-navbar") ?? true;
-		returnWebpage.properties.width = getPropertyValueByLabel(webpageSubProperties, "width") ?? "default";
-		returnWebpage.properties.variant = getPropertyValueByLabel(webpageSubProperties, "variant") ?? "default";
-		returnWebpage.properties.isSidebarDisplayed = getPropertyValueByLabel(webpageSubProperties, "sidebar-displayed") ?? true;
-		returnWebpage.properties.isBreadcrumbsDisplayed = getPropertyValueByLabel(webpageSubProperties, "breadcrumbs-displayed") ?? false;
-		returnWebpage.properties.isNavbarSearchBarDisplayed = getPropertyValueByLabel(webpageSubProperties, "navbar-search-bar-displayed") ?? true;
-	}
-	if (imageLink?.uuid != null) returnWebpage.properties.backgroundImage = {
-		uuid: imageLink.uuid,
-		label: imageLink.identification?.label ?? null,
-		description: imageLink.description ?? null,
-		width: imageLink.image?.width ?? 0,
-		height: imageLink.image?.height ?? 0,
-		quality: "high"
-	};
-	returnWebpage.properties.cssStyles = parseResponsiveCssStyles(webpageProperties);
-	return returnWebpage;
-}
-/**
-* Parses raw webpage resources into an array of Webpage objects
-*
-* @param webpageResources - Array of raw webpage resources in OCHRE format
-* @returns Array of parsed Webpage objects
-*/
-function parseWebpages(webpageResources, slugPrefix) {
-	const returnPages = [];
-	for (const webpageResource of webpageResources) {
-		const webpage = parseWebpage(webpageResource, slugPrefix);
-		if (webpage !== null) returnPages.push(webpage);
-	}
-	return returnPages;
-}
-/**
-* Parses raw segment resource into a standardized WebSegment object
-*
-* @param segmentResource - Raw segment resource in OCHRE format
-* @returns Parsed WebSegment object
-*/
-function parseWebSegment(segmentResource, slugPrefix) {
-	const webpageProperties = segmentResource.properties ? parseProperties(ensureArray(segmentResource.properties.property)) : [];
-	if (webpageProperties.length === 0 || getPropertyValueByLabel(webpageProperties, "presentation") !== "segment") return null;
-	const identification = parseIdentification(segmentResource.identification);
-	const slug = segmentResource.identification.abbreviation != null ? parseFakeStringOrContent(segmentResource.identification.abbreviation) : null;
-	if (slug == null) throw new Error(`Slug not found for segment “${identification.label}”`);
-	const returnSegment = {
-		uuid: segmentResource.uuid,
-		type: "segment",
-		title: identification.label,
-		slug,
-		publicationDateTime: parseOptionalDate(segmentResource.publicationDateTime),
-		items: []
-	};
-	returnSegment.items = parseWebSegmentItems(segmentResource.resource ? ensureArray(segmentResource.resource) : [], slugPrefix != null ? `${slugPrefix}/${slug}`.replace(/\/$/, "") : slug);
-	return returnSegment;
-}
-/**
-* Parses raw segment resources into an array of WebSegment objects
-*
-* @param segmentResources - Array of raw segment resources in OCHRE format
-* @returns Array of parsed WebSegment objects
-*/
-function parseSegments(segmentResources, slugPrefix) {
-	const returnSegments = [];
-	for (const segmentResource of segmentResources) {
-		const segment = parseWebSegment(segmentResource, slugPrefix);
-		if (segment !== null) returnSegments.push(segment);
-	}
-	return returnSegments;
-}
-/**
-* Parses raw segment item into a standardized WebSegmentItem object
-*
-* @param segmentItemResource - Raw segment item resource in OCHRE format
-* @returns Parsed WebSegmentItem object
-*/
-function parseWebSegmentItem(segmentItemResource, slugPrefix) {
-	const webpageProperties = segmentItemResource.properties ? parseProperties(ensureArray(segmentItemResource.properties.property)) : [];
-	if (webpageProperties.length === 0 || getPropertyValueByLabel(webpageProperties, "presentation") !== "segment-item") return null;
-	const identification = parseIdentification(segmentItemResource.identification);
-	const slug = segmentItemResource.identification.abbreviation != null ? parseFakeStringOrContent(segmentItemResource.identification.abbreviation) : null;
-	if (slug == null) throw new Error(`Slug not found for segment item “${identification.label}”`);
-	const returnSegmentItem = {
-		uuid: segmentItemResource.uuid,
-		type: "segment-item",
-		title: identification.label,
-		slug,
-		publicationDateTime: parseOptionalDate(segmentItemResource.publicationDateTime),
-		items: []
-	};
-	const resources = segmentItemResource.resource ? ensureArray(segmentItemResource.resource) : [];
-	returnSegmentItem.items.push(...parseWebpages(resources, slugPrefix != null ? `${slugPrefix}/${slug}`.replace(/\/$/, "") : slug), ...parseSegments(resources, slugPrefix != null ? `${slugPrefix}/${slug}`.replace(/\/$/, "") : slug));
-	return returnSegmentItem;
-}
-/**
-* Parses raw segment items into an array of WebSegmentItem objects
-*
-* @param segmentItems - Array of raw segment items in OCHRE format
-* @returns Array of parsed WebSegmentItem objects
-*/
-function parseWebSegmentItems(segmentItems, slugPrefix) {
-	const returnItems = [];
-	for (const segmentItem of segmentItems) {
-		const segmentItemParsed = parseWebSegmentItem(segmentItem, slugPrefix);
-		if (segmentItemParsed !== null) returnItems.push(segmentItemParsed);
-	}
-	return returnItems;
-}
-/**
-* Parses raw sidebar data into a standardized Sidebar structure
-*
-* @param resources - Array of raw sidebar resources in OCHRE format
-* @returns Parsed Sidebar object
-*/
-function parseSidebar(resources) {
-	let returnSidebar = null;
-	const items = [];
-	const title = {
-		label: "",
-		variant: "default",
-		properties: {
-			isNameDisplayed: false,
-			isDescriptionDisplayed: false,
-			isDateDisplayed: false,
-			isCreatorsDisplayed: false,
-			isCountDisplayed: false
+		case "table": {
+			const tableLink = links.find((link) => link.category === "set");
+			if (tableLink?.uuid == null) throw new Error(`Table link not found for the following component: “${componentName}”`);
+			properties = {
+				component: "table",
+				linkUuid: tableLink.uuid
+			};
+			break;
 		}
-	};
-	let layout = "start";
-	let mobileLayout = "default";
-	const cssStyles = {
-		default: [],
-		tablet: [],
-		mobile: []
-	};
-	const sidebarResource = resources.find((resource) => {
-		const resourceProperties = resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [];
-		return getPropertyValueByLabel(resourceProperties, "presentation") === "element" && getPropertyValueByLabel(resourceProperties[0]?.properties ?? [], "component") === "sidebar";
-	});
-	if (sidebarResource != null) {
-		title.label = parseFakeStringOrContent(sidebarResource.identification.label);
-		const sidebarBaseProperties = sidebarResource.properties ? parseProperties(ensureArray(sidebarResource.properties.property)) : [];
-		const sidebarProperties = sidebarBaseProperties.find((property) => property.label === "presentation" && property.values[0]?.content === "element")?.properties.find((property) => property.label === "component" && property.values[0]?.content === "sidebar")?.properties ?? [];
-		const sidebarLayoutProperty = sidebarProperties.find((property) => property.label === "layout");
-		if (sidebarLayoutProperty) layout = sidebarLayoutProperty.values[0].content;
-		const sidebarMobileLayoutProperty = sidebarProperties.find((property) => property.label === "layout-mobile");
-		if (sidebarMobileLayoutProperty) mobileLayout = sidebarMobileLayoutProperty.values[0].content;
-		const parsedCssStyles = parseResponsiveCssStyles(sidebarBaseProperties);
-		cssStyles.default = parsedCssStyles.default;
-		cssStyles.tablet = parsedCssStyles.tablet;
-		cssStyles.mobile = parsedCssStyles.mobile;
-		const titleProperties = sidebarBaseProperties.find((property) => property.label === "presentation" && property.values[0].content === "title")?.properties;
-		if (titleProperties) {
-			const titleVariant = getPropertyValueByLabel(titleProperties, "variant");
-			if (titleVariant) title.variant = titleVariant;
-			title.properties.isNameDisplayed = getPropertyValueByLabel(titleProperties, "name-displayed") === true;
-			title.properties.isDescriptionDisplayed = getPropertyValueByLabel(titleProperties, "description-displayed") === true;
-			title.properties.isDateDisplayed = getPropertyValueByLabel(titleProperties, "date-displayed") === true;
-			title.properties.isCreatorsDisplayed = getPropertyValueByLabel(titleProperties, "creators-displayed") === true;
-			title.properties.isCountDisplayed = getPropertyValueByLabel(titleProperties, "count-displayed") === true;
+		case "search-bar": {
+			let queryVariant = null;
+			queryVariant = getPropertyValueByLabel(componentProperty.properties, "query-variant");
+			queryVariant ??= "submit";
+			const boundElementUuid = getPropertyByLabel(componentProperty.properties, "bound-element")?.values[0]?.uuid ?? null;
+			const linkToProperty = getPropertyByLabel(componentProperty.properties, "link-to");
+			const href = linkToProperty?.values[0]?.href ?? linkToProperty?.values[0]?.slug ?? null;
+			if (!boundElementUuid && !href) throw new Error(`Bound element or href not found for the following component: “${componentName}”`);
+			let placeholder = getPropertyValueByLabel(componentProperty.properties, "placeholder-text");
+			placeholder ??= null;
+			let baseFilterQueries = getPropertyValueByLabel(componentProperty.properties, "base-filter-queries");
+			baseFilterQueries ??= null;
+			properties = {
+				component: "search-bar",
+				queryVariant,
+				placeholder,
+				baseFilterQueries: baseFilterQueries?.replaceAll(String.raw`\{`, "{").replaceAll(String.raw`\}`, "}") ?? null,
+				boundElementUuid,
+				href
+			};
+			break;
+		}
+		case "text": {
+			const content = elementResource.document && "content" in elementResource.document ? parseDocument(elementResource.document.content) : null;
+			if (!content) throw new Error(`Content not found for the following component: “${componentName}”`);
+			let variantName = "block";
+			let variant;
+			const variantProperty = getPropertyByLabel(componentProperty.properties, "variant");
+			if (variantProperty !== null) {
+				variantName = variantProperty.values[0].content;
+				if (variantName === "paragraph" || variantName === "label" || variantName === "heading" || variantName === "display") {
+					let size = getPropertyValueByLabel(variantProperty.properties, "size");
+					size ??= "md";
+					variant = {
+						name: variantName,
+						size
+					};
+				} else variant = { name: variantName };
+			} else variant = { name: variantName };
+			let headingLevel = getPropertyValueByLabel(componentProperty.properties, "heading-level");
+			headingLevel ??= null;
+			properties = {
+				component: "text",
+				variant,
+				headingLevel,
+				content
+			};
+			break;
+		}
+		case "timeline": {
+			const timelineLink = links.find((link) => link.category === "tree");
+			if (timelineLink?.uuid == null) throw new Error(`Timeline link not found for the following component: “${componentName}”`);
+			properties = {
+				component: "timeline",
+				linkUuid: timelineLink.uuid
+			};
+			break;
+		}
+		case "video": {
+			const videoLink = links.find((link) => link.type === "video");
+			if (videoLink?.uuid == null) throw new Error(`Video link not found for the following component: “${componentName}”`);
+			let isChaptersDisplayed = getPropertyValueByLabel(componentProperty.properties, "chapters-displayed");
+			isChaptersDisplayed ??= true;
+			properties = {
+				component: "video",
+				linkUuid: videoLink.uuid,
+				isChaptersDisplayed
+			};
+			break;
 		}
-		const sidebarResources = sidebarResource.resource ? ensureArray(sidebarResource.resource) : [];
-		for (const resource of sidebarResources) {
-			const resourceType = getPropertyValueByLabel(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
-			if (resourceType === null) continue;
-			switch (resourceType) {
-				case "element": {
-					const element = parseWebElement(resource);
-					items.push(element);
-					break;
-				}
-				case "block": {
-					const block = parseWebBlock(resource);
-					if (block) items.push(block);
-					break;
-				}
-			}
+		default:
+			console.warn(`Invalid or non-implemented component name “${unparsedComponentName?.toString() ?? "(unknown)"}” for the following element: “${parseStringContent(elementResource.identification.label)}”`);
+			break;
+	}
+	if (properties === null) throw new Error(`Properties not found for the following component: “${componentName}”`);
+	return properties;
+}
+function parseWebTitle(properties, identification, overrides) {
+	const title = {
+		label: identification.label,
+		variant: "default",
+		properties: {
+			isNameDisplayed: overrides?.isNameDisplayed ?? false,
+			isDescriptionDisplayed: overrides?.isDescriptionDisplayed ?? false,
+			isDateDisplayed: overrides?.isDateDisplayed ?? false,
+			isCreatorsDisplayed: overrides?.isCreatorsDisplayed ?? false,
+			isCountDisplayed: overrides?.isCountDisplayed ?? false
 		}
+	};
+	const titleProperties = getPropertyByLabelAndValue(properties, "presentation", "title")?.properties ?? [];
+	if (titleProperties.length > 0) {
+		title.variant = getPropertyValueByLabel(titleProperties, "variant") ?? "default";
+		title.properties.isNameDisplayed = getPropertyValueByLabel(titleProperties, "name-displayed") ?? false;
+		title.properties.isDescriptionDisplayed = getPropertyValueByLabel(titleProperties, "description-displayed") ?? false;
+		title.properties.isDateDisplayed = getPropertyValueByLabel(titleProperties, "date-displayed") ?? false;
+		title.properties.isCreatorsDisplayed = getPropertyValueByLabel(titleProperties, "creators-displayed") ?? false;
+		title.properties.isCountDisplayed = getPropertyValueByLabel(titleProperties, "count-displayed") ?? false;
 	}
-	if (items.length > 0) returnSidebar = {
-		isDisplayed: true,
-		items,
+	return title;
+}
+/**
+* Parses raw web element data into a standardized WebElement structure
+*
+* @param elementResource - Raw element resource data in OCHRE format
+* @returns Parsed WebElement object
+*/
+function parseWebElement(elementResource) {
+	const identification = parseIdentification(elementResource.identification);
+	const elementProperties = elementResource.properties?.property ? parseProperties(Array.isArray(elementResource.properties.property) ? elementResource.properties.property : [elementResource.properties.property]) : [];
+	const presentationProperty = getPropertyByLabel(elementProperties, "presentation");
+	if (presentationProperty === null) throw new Error(`Presentation property not found for element “${identification.label}”`);
+	const componentProperty = getPropertyByLabel(presentationProperty.properties, "component");
+	if (componentProperty === null) throw new Error(`Component for element “${identification.label}” not found`);
+	const properties = parseWebElementProperties(componentProperty, elementResource);
+	const cssStyles = parseResponsiveCssStyles(elementProperties);
+	const title = parseWebTitle(elementProperties, identification, {
+		isNameDisplayed: properties.component === "annotated-image" || properties.component === "annotated-document" || properties.component === "collection",
+		isCountDisplayed: properties.component === "collection" && properties.variant === "full"
+	});
+	return {
+		uuid: elementResource.uuid,
+		type: "element",
 		title,
-		layout,
-		mobileLayout,
-		cssStyles
+		cssStyles,
+		...properties
 	};
-	return returnSidebar;
 }
 /**
-* Parses raw text element data for accordion layout with items support
+* Parses raw webpage resources into standardized WebElement or Webpage objects
 *
-* @param elementResource - Raw element resource data in OCHRE format
-* @returns Parsed text WebElement with items array
+* @param webpageResources - Array of raw webpage resources in OCHRE format
+* @param type - Type of resource to parse ("element" or "page")
+* @returns Array of parsed WebElement or Webpage objects
 */
-function parseWebElementForAccordion(elementResource) {
-	const textElement = parseWebElement(elementResource);
-	const childResources = elementResource.resource ? ensureArray(elementResource.resource) : [];
-	const items = [];
-	for (const resource of childResources) {
-		const resourceType = getPropertyValueByLabel(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
-		if (resourceType === null) continue;
-		switch (resourceType) {
+const parseWebpageResources = (webpageResources, type) => {
+	const returnElements = [];
+	for (const resource of webpageResources) {
+		if (getPropertyByLabelAndValue(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation", type) === null) continue;
+		switch (type) {
 			case "element": {
 				const element = parseWebElement(resource);
-				items.push(element);
+				returnElements.push(element);
+				break;
+			}
+			case "page": {
+				const webpage = parseWebpage(resource);
+				if (webpage) returnElements.push(webpage);
 				break;
 			}
 			case "block": {
 				const block = parseWebBlock(resource);
-				if (block) items.push(block);
+				if (block) returnElements.push(block);
 				break;
 			}
 		}
 	}
-	return {
-		...textElement,
-		items
-	};
-}
+	return returnElements;
+};
 /**
-* Parses raw block data into a standardized WebBlock structure
+* Parses raw webpage data into a standardized Webpage structure
 *
-* @param blockResource - Raw block resource data in OCHRE format
-* @returns Parsed WebBlock object
+* @param webpageResource - Raw webpage resource data in OCHRE format
+* @returns Parsed Webpage object
 */
-function parseWebBlock(blockResource) {
-	const blockProperties = blockResource.properties ? parseProperties(ensureArray(blockResource.properties.property)) : [];
-	const returnBlock = {
-		uuid: blockResource.uuid,
-		type: "block",
-		title: parseWebTitle(blockProperties, parseIdentification(blockResource.identification)),
+function parseWebpage(webpageResource, slugPrefix) {
+	const webpageProperties = webpageResource.properties ? parseProperties(ensureArray(webpageResource.properties.property)) : [];
+	if (webpageProperties.length === 0 || getPropertyValueByLabel(webpageProperties, "presentation") !== "page") return null;
+	const identification = parseIdentification(webpageResource.identification);
+	const slug = webpageResource.slug?.replace(/^\$[^-]*-/, "") ?? null;
+	if (slug == null) throw new Error(`Slug not found for page “${identification.label}”`);
+	const returnWebpage = {
+		uuid: webpageResource.uuid,
+		type: "page",
+		title: identification.label,
+		slug: slugPrefix != null ? `${slugPrefix}/${slug}`.replace(/\/$/, "") : slug,
+		publicationDateTime: parseOptionalDate(webpageResource.publicationDateTime),
 		items: [],
 		properties: {
-			default: {
-				layout: "vertical",
-				spacing: null,
-				gap: null
-			},
-			mobile: null,
-			tablet: null
+			width: "default",
+			variant: "default",
+			isBreadcrumbsDisplayed: false,
+			isSidebarDisplayed: true,
+			isDisplayedInNavbar: true,
+			isNavbarSearchBarDisplayed: true,
+			backgroundImage: null,
+			cssStyles: {
+				default: [],
+				tablet: [],
+				mobile: []
+			}
 		},
-		cssStyles: {
-			default: [],
-			tablet: [],
-			mobile: []
-		}
+		webpages: []
 	};
-	const blockMainProperties = getPropertyByLabelAndValue(blockProperties, "presentation", "block")?.properties ?? [];
-	if (blockMainProperties.length > 0) {
-		returnBlock.properties.default.layout = getPropertyValueByLabel(blockMainProperties, "layout") ?? "vertical";
-		if (returnBlock.properties.default.layout === "accordion") {
-			returnBlock.properties.default.isAccordionEnabled = getPropertyValueByLabel(blockMainProperties, "accordion-enabled") ?? true;
-			returnBlock.properties.default.isAccordionExpandedByDefault = getPropertyValueByLabel(blockMainProperties, "accordion-expanded") ?? true;
-			returnBlock.properties.default.isAccordionSidebarDisplayed = getPropertyValueByLabel(blockMainProperties, "accordion-sidebar-displayed") ?? false;
-		}
-		returnBlock.properties.default.spacing = getPropertyValueByLabel(blockMainProperties, "spacing") ?? null;
-		returnBlock.properties.default.gap = getPropertyValueByLabel(blockMainProperties, "gap") ?? null;
-		const tabletOverwriteProperty = getPropertyByLabel(blockMainProperties, "overwrite-tablet");
-		if (tabletOverwriteProperty !== null) {
-			const tabletOverwriteProperties = tabletOverwriteProperty.properties;
-			const propertiesTablet = {
-				layout: getPropertyValueByLabel(tabletOverwriteProperties, "layout") ?? void 0,
-				spacing: getPropertyValueByLabel(tabletOverwriteProperties, "spacing") ?? void 0,
-				gap: getPropertyValueByLabel(tabletOverwriteProperties, "gap") ?? void 0,
-				isAccordionEnabled: void 0,
-				isAccordionExpandedByDefault: void 0,
-				isAccordionSidebarDisplayed: void 0
-			};
-			if (propertiesTablet.layout === "accordion" || returnBlock.properties.default.layout === "accordion") {
-				propertiesTablet.isAccordionEnabled = getPropertyValueByLabel(tabletOverwriteProperties, "accordion-enabled") ?? void 0;
-				propertiesTablet.isAccordionExpandedByDefault = getPropertyValueByLabel(tabletOverwriteProperties, "accordion-expanded") ?? void 0;
-				propertiesTablet.isAccordionSidebarDisplayed = getPropertyValueByLabel(tabletOverwriteProperties, "accordion-sidebar-displayed") ?? void 0;
+	const imageLink = (webpageResource.links != null ? parseLinks(ensureArray(webpageResource.links)) : []).find((link) => link.type === "image" || link.type === "IIIF");
+	const webpageResources = webpageResource.resource != null ? ensureArray(webpageResource.resource) : [];
+	const items = [];
+	for (const resource of webpageResources) {
+		const resourceType = getPropertyValueByLabel(resource.properties != null ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
+		if (resourceType === null) continue;
+		switch (resourceType) {
+			case "segment": {
+				const segment = parseWebSegment(resource);
+				if (segment) items.push(segment);
+				break;
 			}
-			if (Object.values(propertiesTablet).every((value) => value != null)) returnBlock.properties.tablet = propertiesTablet;
-		}
-		const mobileOverwriteProperty = getPropertyByLabel(blockMainProperties, "overwrite-tablet");
-		if (mobileOverwriteProperty !== null) {
-			const mobileOverwriteProperties = mobileOverwriteProperty.properties;
-			const propertiesMobile = {
-				layout: getPropertyValueByLabel(mobileOverwriteProperties, "layout") ?? void 0,
-				spacing: getPropertyValueByLabel(mobileOverwriteProperties, "spacing") ?? void 0,
-				gap: getPropertyValueByLabel(mobileOverwriteProperties, "gap") ?? void 0,
-				isAccordionEnabled: void 0,
-				isAccordionExpandedByDefault: void 0,
-				isAccordionSidebarDisplayed: void 0
-			};
-			if (propertiesMobile.layout === "accordion" || returnBlock.properties.default.layout === "accordion") {
-				propertiesMobile.isAccordionEnabled = getPropertyValueByLabel(mobileOverwriteProperties, "accordion-enabled") ?? void 0;
-				propertiesMobile.isAccordionExpandedByDefault = getPropertyValueByLabel(mobileOverwriteProperties, "accordion-expanded") ?? void 0;
-				propertiesMobile.isAccordionSidebarDisplayed = getPropertyValueByLabel(mobileOverwriteProperties, "accordion-sidebar-displayed") ?? void 0;
+			case "element": {
+				const element = parseWebElement(resource);
+				items.push(element);
+				break;
 			}
-			if (Object.values(propertiesMobile).every((value) => value != null)) returnBlock.properties.mobile = propertiesMobile;
-		}
-	}
-	const blockResources = blockResource.resource ? ensureArray(blockResource.resource) : [];
-	if (returnBlock.properties.default.layout === "accordion") {
-		const accordionItems = [];
-		for (const resource of blockResources) {
-			const resourceProperties = resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [];
-			const resourceType = getPropertyValueByLabel(resourceProperties, "presentation");
-			if (resourceType !== "element") throw new Error(`Accordion only accepts elements, but got “${resourceType}” for the following resource: “${parseStringContent(resource.identification.label)}”`);
-			const componentType = getPropertyValueByLabel(getPropertyByLabel(resourceProperties, "presentation")?.properties ?? [], "component");
-			if (componentType !== "text") throw new Error(`Accordion only accepts text components, but got “${componentType}” for the following resource: “${parseStringContent(resource.identification.label)}”`);
-			const element = parseWebElementForAccordion(resource);
-			accordionItems.push(element);
-		}
-		returnBlock.items = accordionItems;
-	} else {
-		const blockItems = [];
-		for (const resource of blockResources) {
-			const resourceType = getPropertyValueByLabel(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
-			if (resourceType === null) continue;
-			switch (resourceType) {
-				case "element": {
-					const element = parseWebElement(resource);
-					blockItems.push(element);
-					break;
-				}
-				case "block": {
-					const block = parseWebBlock(resource);
-					if (block) blockItems.push(block);
-					break;
-				}
+			case "block": {
+				const block = parseWebBlock(resource);
+				if (block) items.push(block);
+				break;
 			}
 		}
-		returnBlock.items = blockItems;
 	}
-	returnBlock.cssStyles = parseResponsiveCssStyles(blockProperties);
-	return returnBlock;
+	returnWebpage.webpages = webpageResource.resource != null ? parseWebpageResources(ensureArray(webpageResource.resource), "page") : [];
+	const webpageSubProperties = getPropertyByLabelAndValue(webpageProperties, "presentation", "page")?.properties ?? [];
+	if (webpageSubProperties.length > 0) {
+		returnWebpage.properties.isDisplayedInNavbar = getPropertyValueByLabel(webpageSubProperties, "displayed-in-navbar") ?? true;
+		returnWebpage.properties.width = getPropertyValueByLabel(webpageSubProperties, "width") ?? "default";
+		returnWebpage.properties.variant = getPropertyValueByLabel(webpageSubProperties, "variant") ?? "default";
+		returnWebpage.properties.isSidebarDisplayed = getPropertyValueByLabel(webpageSubProperties, "sidebar-displayed") ?? true;
+		returnWebpage.properties.isBreadcrumbsDisplayed = getPropertyValueByLabel(webpageSubProperties, "breadcrumbs-displayed") ?? false;
+		returnWebpage.properties.isNavbarSearchBarDisplayed = getPropertyValueByLabel(webpageSubProperties, "navbar-search-bar-displayed") ?? true;
+	}
+	if (imageLink?.uuid != null) returnWebpage.properties.backgroundImage = {
+		uuid: imageLink.uuid,
+		label: imageLink.identification?.label ?? null,
+		description: imageLink.description ?? null,
+		width: imageLink.image?.width ?? 0,
+		height: imageLink.image?.height ?? 0,
+		quality: "high"
+	};
+	returnWebpage.properties.cssStyles = parseResponsiveCssStyles(webpageProperties);
+	return returnWebpage;
 }
 /**
-* Parses raw website properties into a standardized Website properties structure
+* Parses raw webpage resources into an array of Webpage objects
 *
-* @param properties - Array of raw website properties in OCHRE format
-* @returns Parsed WebsiteProperties object
+* @param webpageResources - Array of raw webpage resources in OCHRE format
+* @returns Array of parsed Webpage objects
 */
-function parseWebsiteProperties(properties, websiteTree, sidebar) {
-	const websiteProperties = getPropertyByLabel(parseProperties(properties), "presentation")?.properties ?? [];
-	let type = getPropertyValueByLabel(websiteProperties, "webUI");
-	type ??= "traditional";
-	let status = getPropertyValueByLabel(websiteProperties, "status");
-	status ??= "development";
-	let privacy = getPropertyValueByLabel(websiteProperties, "privacy");
-	privacy ??= "public";
-	const returnProperties = {
-		type,
-		status,
-		privacy,
-		contact: null,
-		theme: {
-			isThemeToggleDisplayed: true,
-			defaultTheme: "system"
-		},
-		icon: {
-			logoUuid: null,
-			faviconUuid: null,
-			appleTouchIconUuid: null
-		},
-		navbar: {
-			isDisplayed: true,
-			variant: "default",
-			alignment: "start",
-			isProjectDisplayed: true,
-			searchBarBoundElementUuid: null,
-			items: null
-		},
-		footer: {
-			isDisplayed: true,
-			items: null
-		},
-		sidebar,
-		itemPage: {
-			isMainContentDisplayed: true,
-			isDescriptionDisplayed: true,
-			isDocumentDisplayed: true,
-			isNotesDisplayed: true,
-			isEventsDisplayed: true,
-			isPeriodsDisplayed: true,
-			isPropertiesDisplayed: true,
-			isBibliographyDisplayed: true,
-			isPropertyValuesGrouped: true,
-			iiifViewer: "universal-viewer"
-		},
-		options: {
-			contexts: null,
-			scopes: null,
-			labels: { title: null }
-		}
-	};
-	const contactProperty = getPropertyByLabel(websiteProperties, "contact");
-	if (contactProperty !== null) {
-		const contactContent = contactProperty.values[0]?.content?.toString().split(";");
-		if (contactContent?.length === 2) returnProperties.contact = {
-			name: contactContent[0],
-			email: contactContent[1] ?? null
-		};
-		else throw new Error(`Contact property must be in the format “name;email”, but got “${contactProperty.values[0]?.content}”`);
-	}
-	returnProperties.theme.isThemeToggleDisplayed = getPropertyValueByLabel(websiteProperties, "supports-theme-toggle") ?? true;
-	returnProperties.theme.defaultTheme = getPropertyValueByLabel(websiteProperties, "default-theme") ?? "system";
-	returnProperties.icon.logoUuid = getPropertyByLabel(websiteProperties, "logo")?.values[0]?.uuid ?? null;
-	returnProperties.navbar.isDisplayed = getPropertyValueByLabel(websiteProperties, "navbar-displayed") ?? true;
-	returnProperties.navbar.variant = getPropertyValueByLabel(websiteProperties, "navbar-variant") ?? "default";
-	returnProperties.navbar.alignment = getPropertyValueByLabel(websiteProperties, "navbar-alignment") ?? "start";
-	returnProperties.navbar.isProjectDisplayed = getPropertyValueByLabel(websiteProperties, "navbar-project-displayed") ?? true;
-	returnProperties.navbar.searchBarBoundElementUuid = getPropertyByLabel(websiteProperties, "bound-element-navbar-search-bar")?.values[0]?.uuid ?? null;
-	returnProperties.footer.isDisplayed = getPropertyValueByLabel(websiteProperties, "footer-displayed") ?? true;
-	const itemPageTypeProperty = getPropertyByLabelAndValue(websiteProperties, "page-type", "item-page");
-	if (itemPageTypeProperty !== null) {
-		returnProperties.itemPage.isMainContentDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-main-content-displayed") ?? true;
-		returnProperties.itemPage.isDescriptionDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-description-displayed") ?? true;
-		returnProperties.itemPage.isDocumentDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-document-displayed") ?? true;
-		returnProperties.itemPage.isNotesDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-notes-displayed") ?? true;
-		returnProperties.itemPage.isEventsDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-events-displayed") ?? true;
-		returnProperties.itemPage.isPeriodsDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-periods-displayed") ?? true;
-		returnProperties.itemPage.isPropertiesDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-properties-displayed") ?? true;
-		returnProperties.itemPage.isBibliographyDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-bibliography-displayed") ?? true;
-		returnProperties.itemPage.isPropertyValuesGrouped = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-property-values-grouped") ?? true;
-		returnProperties.itemPage.iiifViewer = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-iiif-viewer") ?? "universal-viewer";
-	}
-	if ("options" in websiteTree && websiteTree.options) {
-		returnProperties.options.scopes = websiteTree.options.scopes != null ? ensureArray(websiteTree.options.scopes.scope).map((scope) => ({
-			uuid: scope.uuid.content,
-			type: scope.uuid.type,
-			identification: parseIdentification(scope.identification)
-		})) : null;
-		returnProperties.options.contexts = parseAllOptionContexts(websiteTree.options);
-		if ("notes" in websiteTree.options && websiteTree.options.notes != null) {
-			const labelNotes = parseNotes(ensureArray(websiteTree.options.notes.note));
-			returnProperties.options.labels.title = labelNotes.find((note) => note.title === "Title label")?.content ?? null;
-		}
-	}
-	return returnProperties;
-}
-function parseContexts(contexts) {
-	const contextsParsed = [];
-	for (const mainContext of contexts) for (const contextItemToParse of ensureArray(mainContext.context)) {
-		const levelsToParse = ensureArray(contextItemToParse.levels.level);
-		let type = "";
-		const levels = levelsToParse.map((level) => {
-			let variableUuid = "";
-			let valueUuid = null;
-			if (typeof level === "string") {
-				const splitLevel = level.split(", ");
-				variableUuid = splitLevel[0];
-				valueUuid = splitLevel[1] === "null" ? null : splitLevel[1];
-			} else {
-				const splitLevel = level.content.split(", ");
-				type = level.dataType;
-				variableUuid = splitLevel[0];
-				valueUuid = splitLevel[1] === "null" ? null : splitLevel[1];
-			}
-			return {
-				variableUuid,
-				valueUuid
-			};
-		});
-		contextsParsed.push({
-			context: levels,
-			type,
-			identification: parseIdentification(contextItemToParse.identification)
-		});
+function parseWebpages(webpageResources, slugPrefix) {
+	const returnPages = [];
+	for (const webpageResource of webpageResources) {
+		const webpage = parseWebpage(webpageResource, slugPrefix);
+		if (webpage !== null) returnPages.push(webpage);
 	}
-	return contextsParsed;
+	return returnPages;
 }
-function parseWebsite(websiteTree, metadata, belongsTo, { version = DEFAULT_API_VERSION } = {}) {
-	if (!websiteTree.properties) throw new Error("Website properties not found");
-	if (typeof websiteTree.items === "string" || !("resource" in websiteTree.items)) throw new Error("Website pages not found");
-	const resources = ensureArray(websiteTree.items.resource);
-	const items = [...parseWebpages(resources), ...parseSegments(resources)];
-	const sidebar = parseSidebar(resources);
-	const properties = parseWebsiteProperties(ensureArray(websiteTree.properties.property), websiteTree, sidebar);
-	return {
-		uuid: websiteTree.uuid,
-		version,
-		belongsTo: belongsTo ?? null,
-		metadata: parseMetadata(metadata),
-		publicationDateTime: parseOptionalDate(websiteTree.publicationDateTime),
-		identification: parseIdentification(websiteTree.identification),
-		creators: websiteTree.creators ? parsePersons(ensureArray(websiteTree.creators.creator)) : [],
-		license: parseLicense(websiteTree.availability),
-		items,
-		properties
+/**
+* Parses raw segment resource into a standardized WebSegment object
+*
+* @param segmentResource - Raw segment resource in OCHRE format
+* @returns Parsed WebSegment object
+*/
+function parseWebSegment(segmentResource, slugPrefix) {
+	const webpageProperties = segmentResource.properties ? parseProperties(ensureArray(segmentResource.properties.property)) : [];
+	if (webpageProperties.length === 0 || getPropertyValueByLabel(webpageProperties, "presentation") !== "segment") return null;
+	const identification = parseIdentification(segmentResource.identification);
+	const slug = segmentResource.identification.abbreviation != null ? parseFakeStringOrContent(segmentResource.identification.abbreviation) : null;
+	if (slug == null) throw new Error(`Slug not found for segment “${identification.label}”`);
+	const returnSegment = {
+		uuid: segmentResource.uuid,
+		type: "segment",
+		title: identification.label,
+		slug,
+		publicationDateTime: parseOptionalDate(segmentResource.publicationDateTime),
+		items: []
 	};
+	returnSegment.items = parseWebSegmentItems(segmentResource.resource ? ensureArray(segmentResource.resource) : [], slugPrefix != null ? `${slugPrefix}/${slug}`.replace(/\/$/, "") : slug);
+	return returnSegment;
 }
-
-//#endregion
-//#region src/utils/fetchers/gallery.ts
 /**
-* Fetches and parses a gallery from the OCHRE API
+* Parses raw segment resources into an array of WebSegment objects
 *
-* @param uuid - The UUID of the gallery
-* @param filter - The filter to apply to the gallery
-* @param page - The page number to fetch
-* @param pageSize - The number of items per page
-* @param options - The options for the fetch
-* @param options.fetch - The fetch function to use
-* @param options.version - The version of the OCHRE API to use
-* @returns The parsed gallery or an error message if the fetch/parse fails
+* @param segmentResources - Array of raw segment resources in OCHRE format
+* @returns Array of parsed WebSegment objects
 */
-async function fetchGallery(uuid, filter, page, pageSize, options) {
-	try {
-		const { uuid: parsedUuid, filter: parsedFilter, page: parsedPage, pageSize: parsedPageSize } = gallerySchema.parse({
-			uuid,
-			filter,
-			page,
-			pageSize
-		});
-		const response = await (options?.fetch ?? fetch)(`https://ochre.lib.uchicago.edu/ochre?xquery=${encodeURIComponent(`
-        for $q in input()/ochre[@uuid='${parsedUuid}']
-        let $filtered := $q//items/resource[contains(lower-case(identification/label), lower-case('${parsedFilter}'))]
-        let $maxLength := count($filtered)
-        return <gallery maxLength='{$maxLength}'>
-          {$q/metadata/project}
-          {$q/metadata/item}
-          {$filtered[position() >= ${((parsedPage - 1) * parsedPageSize + 1).toString()} and position() < ${(parsedPage * parsedPageSize + 1).toString()}]}
-        </gallery>
-      `)}&format=json`);
-		if (!response.ok) throw new Error("Error fetching gallery items, please try again later.");
-		const data = await response.json();
-		if (!("gallery" in data.result)) throw new Error("Failed to fetch gallery");
-		return {
-			item: {
-				identification: parseIdentification(data.result.gallery.item.identification),
-				projectIdentification: parseIdentification(data.result.gallery.project.identification),
-				resources: parseResources(data.result.gallery.resource ? Array.isArray(data.result.gallery.resource) ? data.result.gallery.resource : [data.result.gallery.resource] : []),
-				maxLength: data.result.gallery.maxLength
-			},
-			error: null
-		};
-	} catch (error) {
-		console.error(error);
-		return {
-			item: null,
-			error: error instanceof Error ? error.message : "Failed to fetch gallery"
-		};
+function parseSegments(segmentResources, slugPrefix) {
+	const returnSegments = [];
+	for (const segmentResource of segmentResources) {
+		const segment = parseWebSegment(segmentResource, slugPrefix);
+		if (segment !== null) returnSegments.push(segment);
 	}
+	return returnSegments;
 }
-
-//#endregion
-//#region src/utils/fetchers/uuid.ts
 /**
-* Fetches raw OCHRE data by UUID from the OCHRE API
+* Parses raw segment item into a standardized WebSegmentItem object
 *
-* @param uuid - The UUID of the OCHRE item to fetch
-* @returns A tuple containing either [null, OchreData] on success or [error message, null] on failure
-* @internal
+* @param segmentItemResource - Raw segment item resource in OCHRE format
+* @returns Parsed WebSegmentItem object
 */
-async function fetchByUuid(uuid, options) {
-	try {
-		const version = options?.version ?? DEFAULT_API_VERSION;
-		const parsedUuid = uuidSchema.parse(uuid);
-		const response = await (options?.fetch ?? fetch)(version === 2 ? `https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?uuid=${parsedUuid}&format=json&lang="*"` : `https://ochre.lib.uchicago.edu/ochre?uuid=${parsedUuid}&format=json&lang="*"`);
-		if (!response.ok) throw new Error("Failed to fetch OCHRE data");
-		const dataRaw = await response.json();
-		if (version === 2 && (!("result" in dataRaw) || !("ochre" in dataRaw.result)) || version !== 2 && !("ochre" in dataRaw)) throw new Error("Invalid OCHRE data: API response missing 'ochre' key");
-		return [null, "result" in dataRaw && !Array.isArray(dataRaw.result) && "ochre" in dataRaw.result ? dataRaw.result : "ochre" in dataRaw ? dataRaw : null];
-	} catch (error) {
-		return [error instanceof Error ? error.message : "Unknown error", null];
-	}
+function parseWebSegmentItem(segmentItemResource, slugPrefix) {
+	const webpageProperties = segmentItemResource.properties ? parseProperties(ensureArray(segmentItemResource.properties.property)) : [];
+	if (webpageProperties.length === 0 || getPropertyValueByLabel(webpageProperties, "presentation") !== "segment-item") return null;
+	const identification = parseIdentification(segmentItemResource.identification);
+	const slug = segmentItemResource.identification.abbreviation != null ? parseFakeStringOrContent(segmentItemResource.identification.abbreviation) : null;
+	if (slug == null) throw new Error(`Slug not found for segment item “${identification.label}”`);
+	const returnSegmentItem = {
+		uuid: segmentItemResource.uuid,
+		type: "segment-item",
+		title: identification.label,
+		slug,
+		publicationDateTime: parseOptionalDate(segmentItemResource.publicationDateTime),
+		items: []
+	};
+	const resources = segmentItemResource.resource ? ensureArray(segmentItemResource.resource) : [];
+	returnSegmentItem.items.push(...parseWebpages(resources, slugPrefix != null ? `${slugPrefix}/${slug}`.replace(/\/$/, "") : slug), ...parseSegments(resources, slugPrefix != null ? `${slugPrefix}/${slug}`.replace(/\/$/, "") : slug));
+	return returnSegmentItem;
 }
-
-//#endregion
-//#region src/utils/fetchers/item.ts
 /**
-* Fetches and parses an OCHRE item from the OCHRE API
+* Parses raw segment items into an array of WebSegmentItem objects
 *
-* @param uuid - The UUID of the OCHRE item to fetch
-* @returns Object containing the parsed OCHRE item, or an error message if the fetch/parse fails
+* @param segmentItems - Array of raw segment items in OCHRE format
+* @returns Array of parsed WebSegmentItem objects
 */
-async function fetchItem(uuid, category, itemCategories, options) {
-	try {
-		const version = options?.version ?? DEFAULT_API_VERSION;
-		const [error, data] = await fetchByUuid(uuid, {
-			fetch,
-			version
-		});
-		if (error !== null) throw new Error(error);
-		const categoryKey = category ?? getItemCategory(Object.keys(data.ochre));
-		const belongsTo = {
-			uuid: data.ochre.uuidBelongsTo,
-			abbreviation: parseFakeString(data.ochre.belongsTo)
-		};
-		const metadata = parseMetadata(data.ochre.metadata);
-		let item;
-		switch (categoryKey) {
-			case "resource":
-				if (!("resource" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'resource' key");
-				item = parseResource(data.ochre.resource, metadata, data.ochre.persistentUrl, belongsTo);
-				break;
-			case "spatialUnit":
-				if (!("spatialUnit" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'spatialUnit' key");
-				item = parseSpatialUnit(data.ochre.spatialUnit, metadata, data.ochre.persistentUrl, belongsTo);
-				break;
-			case "concept":
-				if (!("concept" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'concept' key");
-				item = parseConcept(data.ochre.concept, metadata, data.ochre.persistentUrl, belongsTo);
-				break;
-			case "period":
-				if (!("period" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'period' key");
-				item = parsePeriod(data.ochre.period, metadata, data.ochre.persistentUrl, {
-					uuid: data.ochre.uuidBelongsTo,
-					abbreviation: parseFakeString(data.ochre.belongsTo)
-				});
-				break;
-			case "bibliography":
-				if (!("bibliography" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'bibliography' key");
-				item = parseBibliography(data.ochre.bibliography, metadata, data.ochre.persistentUrl, belongsTo);
-				break;
-			case "person":
-				if (!("person" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'person' key");
-				item = parsePerson(data.ochre.person, metadata, data.ochre.persistentUrl, belongsTo);
-				break;
-			case "propertyVariable":
-				if (!("propertyVariable" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'propertyVariable' key");
-				item = parsePropertyVariable(data.ochre.propertyVariable, metadata, data.ochre.persistentUrl, belongsTo);
-				break;
-			case "propertyValue":
-				if (!("propertyValue" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'propertyValue' key");
-				item = parsePropertyValue(data.ochre.propertyValue, metadata, data.ochre.persistentUrl, belongsTo);
-				break;
-			case "text":
-				if (!("text" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'text' key");
-				item = parseText(data.ochre.text, metadata, data.ochre.persistentUrl, belongsTo);
-				break;
-			case "set":
-				if (!("set" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'set' key");
-				item = parseSet(data.ochre.set, itemCategories, metadata, data.ochre.persistentUrl, belongsTo);
-				break;
-			case "tree":
-				if (!("tree" in data.ochre)) throw new Error("Invalid OCHRE data: API response missing 'tree' key");
-				item = parseTree(data.ochre.tree, itemCategories, metadata, data.ochre.persistentUrl, belongsTo);
-				break;
-			default: throw new Error("Invalid category");
-		}
-		return {
-			error: null,
-			item
-		};
-	} catch (error) {
-		return {
-			error: error instanceof Error ? error.message : "Unknown error",
-			item: void 0
-		};
+function parseWebSegmentItems(segmentItems, slugPrefix) {
+	const returnItems = [];
+	for (const segmentItem of segmentItems) {
+		const segmentItemParsed = parseWebSegmentItem(segmentItem, slugPrefix);
+		if (segmentItemParsed !== null) returnItems.push(segmentItemParsed);
 	}
+	return returnItems;
 }
-
-//#endregion
-//#region src/utils/fetchers/items-by-property-values.ts
 /**
-* Build an XQuery string to fetch items by property values from the OCHRE API
-* @param params - The parameters for the fetch
-* @param params.projectScopeUuid - The UUID of the project scope
-* @param params.belongsToCollectionScopeUuids - An array of collection scope UUIDs to filter by
-* @param params.propertyVariableUuids - An array of property variable UUIDs to fetch
-* @param params.propertyValues - An array of property values to fetch
-* @param params.itemCategory - The category of the items to fetch
-* @param params.page - The page number (1-indexed)
-* @param params.pageSize - The number of items per page
-* @param params.includeChildItems - Whether to include child items of the same category
-* @param options - Options for the fetch
-* @param options.version - The version of the OCHRE API to use
-* @returns An XQuery string
+* Parses raw sidebar data into a standardized Sidebar structure
+*
+* @param resources - Array of raw sidebar resources in OCHRE format
+* @returns Parsed Sidebar object
 */
-function buildXQuery$1(params, options) {
-	const version = options?.version ?? DEFAULT_API_VERSION;
-	const { propertyVariableUuids, propertyValues, projectScopeUuid, belongsToCollectionScopeUuids, itemCategory, page, pageSize, includeChildItems = false } = params;
-	const startPos = (page - 1) * pageSize + 1;
-	const endPos = page * pageSize;
-	let belongsToCollectionScopeFilter = "";
-	if (belongsToCollectionScopeUuids.length > 0) belongsToCollectionScopeFilter = `[.//properties[property[label/@uuid="${BELONGS_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]]`;
-	const propertyVariables = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
-	const propertyValuesFilters = propertyValues.map(({ dataType, value }) => {
-		if (dataType === "IDREF") return `value[@uuid="${value}"]`;
-		if (dataType === "date" || dataType === "dateTime" || dataType === "time" || dataType === "integer" || dataType === "decimal" || dataType === "boolean") return `value[@rawValue="${value}"]`;
-		return `value[.="${value}"]`;
-	}).join(" or ");
-	return `<ochre>{${`let $match-uuids := distinct-values(
-    ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
-        ${belongsToCollectionScopeFilter}
-          //property[label[${propertyVariables}]][${propertyValuesFilters}]]
-        /@uuid
-  )
-
-  let $items := ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
-      /${itemCategory ?? "*"}[@uuid = $match-uuids
-             or bibliographies/bibliography/@uuid = $match-uuids]
-
-  let $unique-uuids := distinct-values($items/@uuid)
-  let $totalCount := count($unique-uuids)
-
-  return <items totalCount="{$totalCount}" page="${page}" pageSize="${pageSize}">{
-    for $uuid in $unique-uuids[position() ge ${startPos} and position() le ${endPos}]
-      let $item := ($items[@uuid = $uuid])[1]
-      let $category := local-name($item)
-      return element { node-name($item) } {
-        $item/@*, ${includeChildItems ? "$item/node()" : "$item/node()[not(local-name(.) = $category)]"}
-      }
-  }</items>`}}</ochre>`;
+function parseSidebar(resources) {
+	let returnSidebar = null;
+	const items = [];
+	const title = {
+		label: "",
+		variant: "default",
+		properties: {
+			isNameDisplayed: false,
+			isDescriptionDisplayed: false,
+			isDateDisplayed: false,
+			isCreatorsDisplayed: false,
+			isCountDisplayed: false
+		}
+	};
+	let layout = "start";
+	let mobileLayout = "default";
+	const cssStyles = {
+		default: [],
+		tablet: [],
+		mobile: []
+	};
+	const sidebarResource = resources.find((resource) => {
+		const resourceProperties = resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [];
+		return getPropertyValueByLabel(resourceProperties, "presentation") === "element" && getPropertyValueByLabel(resourceProperties[0]?.properties ?? [], "component") === "sidebar";
+	});
+	if (sidebarResource != null) {
+		title.label = parseFakeStringOrContent(sidebarResource.identification.label);
+		const sidebarBaseProperties = sidebarResource.properties ? parseProperties(ensureArray(sidebarResource.properties.property)) : [];
+		const sidebarProperties = sidebarBaseProperties.find((property) => property.label === "presentation" && property.values[0]?.content === "element")?.properties.find((property) => property.label === "component" && property.values[0]?.content === "sidebar")?.properties ?? [];
+		const sidebarLayoutProperty = sidebarProperties.find((property) => property.label === "layout");
+		if (sidebarLayoutProperty) layout = sidebarLayoutProperty.values[0].content;
+		const sidebarMobileLayoutProperty = sidebarProperties.find((property) => property.label === "layout-mobile");
+		if (sidebarMobileLayoutProperty) mobileLayout = sidebarMobileLayoutProperty.values[0].content;
+		const parsedCssStyles = parseResponsiveCssStyles(sidebarBaseProperties);
+		cssStyles.default = parsedCssStyles.default;
+		cssStyles.tablet = parsedCssStyles.tablet;
+		cssStyles.mobile = parsedCssStyles.mobile;
+		const titleProperties = sidebarBaseProperties.find((property) => property.label === "presentation" && property.values[0].content === "title")?.properties;
+		if (titleProperties) {
+			const titleVariant = getPropertyValueByLabel(titleProperties, "variant");
+			if (titleVariant) title.variant = titleVariant;
+			title.properties.isNameDisplayed = getPropertyValueByLabel(titleProperties, "name-displayed") === true;
+			title.properties.isDescriptionDisplayed = getPropertyValueByLabel(titleProperties, "description-displayed") === true;
+			title.properties.isDateDisplayed = getPropertyValueByLabel(titleProperties, "date-displayed") === true;
+			title.properties.isCreatorsDisplayed = getPropertyValueByLabel(titleProperties, "creators-displayed") === true;
+			title.properties.isCountDisplayed = getPropertyValueByLabel(titleProperties, "count-displayed") === true;
+		}
+		const sidebarResources = sidebarResource.resource ? ensureArray(sidebarResource.resource) : [];
+		for (const resource of sidebarResources) {
+			const resourceType = getPropertyValueByLabel(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
+			if (resourceType === null) continue;
+			switch (resourceType) {
+				case "element": {
+					const element = parseWebElement(resource);
+					items.push(element);
+					break;
+				}
+				case "block": {
+					const block = parseWebBlock(resource);
+					if (block) items.push(block);
+					break;
+				}
+			}
+		}
+	}
+	if (items.length > 0) returnSidebar = {
+		isDisplayed: true,
+		items,
+		title,
+		layout,
+		mobileLayout,
+		cssStyles
+	};
+	return returnSidebar;
 }
 /**
-* Fetches and parses items by property values from the OCHRE API
+* Parses raw text element data for accordion layout with items support
 *
-* @param params - The parameters for the fetch
-* @param params.projectScopeUuid - The UUID of the project scope
-* @param params.belongsToCollectionScopeUuids - The collection scope UUIDs to filter by
-* @param params.propertyVariableUuids - The property variable UUIDs to query by
-* @param params.propertyValues - The property values to query by
-* @param params.page - The page number (1-indexed)
-* @param params.pageSize - The number of items per page
-* @param params.itemCategory - The category of the items to fetch
-* @param params.includeChildItems - Whether to include child items of the same category
-* @param categoryParams - The category parameters for the fetch
-* @param categoryParams.category - The category of the items to fetch
-* @param categoryParams.itemCategories - The categories of the items to fetch
-* @param options - Options for the fetch
-* @param options.fetch - The fetch function to use
-* @param options.version - The version of the OCHRE API to use
-* @returns The parsed items by property values or null if the fetch/parse fails
+* @param elementResource - Raw element resource data in OCHRE format
+* @returns Parsed text WebElement with items array
 */
-async function fetchItemsByPropertyValues(params, categoryParams, options) {
-	try {
-		const version = options?.version ?? DEFAULT_API_VERSION;
-		const { propertyVariableUuids, propertyValues, projectScopeUuid, belongsToCollectionScopeUuids, page, pageSize = DEFAULT_PAGE_SIZE, itemCategory, includeChildItems } = params;
-		const { category, itemCategories } = categoryParams ?? {};
-		const xquery = buildXQuery$1({
-			projectScopeUuid,
-			belongsToCollectionScopeUuids,
-			propertyVariableUuids,
-			propertyValues,
-			itemCategory,
-			includeChildItems,
-			page,
-			pageSize
-		}, { version });
-		const response = await (options?.fetch ?? fetch)(version === 2 ? `https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?xquery=${encodeURIComponent(xquery)}&format=json&lang="*"` : `https://ochre.lib.uchicago.edu/ochre?xquery=${encodeURIComponent(xquery)}&format=json&lang="*"`);
-		if (!response.ok) throw new Error(`OCHRE API responded with status: ${response.status}`);
-		const data = await response.json();
-		if (Array.isArray(data.result) || Object.keys(data.result.ochre).length === 0) throw new Error("No items found");
-		if (category != null && data.result.ochre.items[category] == null) throw new Error(`No items found for category: ${category}`);
-		if ((category === "set" || category === "tree") && itemCategories != null && "items" in data.result.ochre.items[category] && Array.isArray(data.result.ochre.items[category].items) && data.result.ochre.items[category].items.every((item) => item.category !== itemCategories)) throw new Error(`No items found for category: ${category} and item categories: ${itemCategories}`);
-		const items = [];
-		if ("resource" in data.result.ochre.items && data.result.ochre.items.resource != null) {
-			const resources = parseResources(Array.isArray(data.result.ochre.items.resource) ? data.result.ochre.items.resource : [data.result.ochre.items.resource]);
-			items.push(...resources);
-		}
-		if ("spatialUnit" in data.result.ochre.items && data.result.ochre.items.spatialUnit != null) {
-			const spatialUnits = parseSpatialUnits(Array.isArray(data.result.ochre.items.spatialUnit) ? data.result.ochre.items.spatialUnit : [data.result.ochre.items.spatialUnit]);
-			items.push(...spatialUnits);
-		}
-		if ("concept" in data.result.ochre.items && data.result.ochre.items.concept != null) {
-			const concepts = parseConcepts(Array.isArray(data.result.ochre.items.concept) ? data.result.ochre.items.concept : [data.result.ochre.items.concept]);
-			items.push(...concepts);
-		}
-		if ("period" in data.result.ochre.items && data.result.ochre.items.period != null) {
-			const periods = parsePeriods(Array.isArray(data.result.ochre.items.period) ? data.result.ochre.items.period : [data.result.ochre.items.period]);
-			items.push(...periods);
-		}
-		if ("bibliography" in data.result.ochre.items && data.result.ochre.items.bibliography != null) {
-			const bibliographies = parseBibliographies(Array.isArray(data.result.ochre.items.bibliography) ? data.result.ochre.items.bibliography : [data.result.ochre.items.bibliography]);
-			items.push(...bibliographies);
-		}
-		if ("person" in data.result.ochre.items && data.result.ochre.items.person != null) {
-			const persons = parsePersons(Array.isArray(data.result.ochre.items.person) ? data.result.ochre.items.person : [data.result.ochre.items.person]);
-			items.push(...persons);
-		}
-		if ("propertyVariable" in data.result.ochre.items && data.result.ochre.items.propertyVariable != null) {
-			const propertyVariables = parsePropertyVariables(Array.isArray(data.result.ochre.items.propertyVariable) ? data.result.ochre.items.propertyVariable : [data.result.ochre.items.propertyVariable]);
-			items.push(...propertyVariables);
-		}
-		if ("propertyValue" in data.result.ochre.items && data.result.ochre.items.propertyValue != null) {
-			const propertyValues = parsePropertyValues(Array.isArray(data.result.ochre.items.propertyValue) ? data.result.ochre.items.propertyValue : [data.result.ochre.items.propertyValue]);
-			items.push(...propertyValues);
-		}
-		if ("text" in data.result.ochre.items && data.result.ochre.items.text != null) {
-			const texts = parseTexts(Array.isArray(data.result.ochre.items.text) ? data.result.ochre.items.text : [data.result.ochre.items.text]);
-			items.push(...texts);
-		}
-		if ("set" in data.result.ochre.items && data.result.ochre.items.set != null) {
-			const sets = parseSets(Array.isArray(data.result.ochre.items.set) ? data.result.ochre.items.set : [data.result.ochre.items.set]);
-			items.push(...sets);
-		}
-		if ("tree" in data.result.ochre.items && data.result.ochre.items.tree != null) {
-			const trees = parseTrees(Array.isArray(data.result.ochre.items.tree) ? data.result.ochre.items.tree : [data.result.ochre.items.tree]);
-			items.push(...trees);
+function parseWebElementForAccordion(elementResource) {
+	const textElement = parseWebElement(elementResource);
+	const childResources = elementResource.resource ? ensureArray(elementResource.resource) : [];
+	const items = [];
+	for (const resource of childResources) {
+		const resourceType = getPropertyValueByLabel(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
+		if (resourceType === null) continue;
+		switch (resourceType) {
+			case "element": {
+				const element = parseWebElement(resource);
+				items.push(element);
+				break;
+			}
+			case "block": {
+				const block = parseWebBlock(resource);
+				if (block) items.push(block);
+				break;
+			}
 		}
-		return {
-			totalCount: data.result.ochre.items.totalCount,
-			page: data.result.ochre.items.page,
-			pageSize: data.result.ochre.items.pageSize,
-			items,
-			error: null
-		};
-	} catch (error) {
-		console.error(error);
-		return {
-			totalCount: null,
-			page: null,
-			pageSize: null,
-			items: null,
-			error: error instanceof Error ? error.message : "Failed to fetch items by property values"
-		};
 	}
+	return {
+		...textElement,
+		items
+	};
 }
-
-//#endregion
-//#region src/utils/fetchers/property-values-by-property-variables.ts
 /**
-* Schema for a single property value query item in the OCHRE API response
+* Parses raw block data into a standardized WebBlock structure
+*
+* @param blockResource - Raw block resource data in OCHRE format
+* @returns Parsed WebBlock object
 */
-const propertyValueQueryItemSchema = z.object({
-	uuid: z.string(),
-	itemUuid: z.string().optional(),
-	dataType: z.string(),
-	rawValue: z.union([
-		z.string(),
-		z.number(),
-		z.boolean()
-	]).optional(),
-	content: z.union([
-		z.string(),
-		z.number(),
-		z.boolean(),
-		richTextStringSchema,
-		z.array(richTextStringSchema)
-	]).optional()
-}).transform((val) => {
-	const returnValue = {
-		itemUuid: val.itemUuid != null && val.itemUuid !== "" ? val.itemUuid : null,
-		dataType: val.dataType,
-		content: null,
-		label: null
+function parseWebBlock(blockResource) {
+	const blockProperties = blockResource.properties ? parseProperties(ensureArray(blockResource.properties.property)) : [];
+	const returnBlock = {
+		uuid: blockResource.uuid,
+		type: "block",
+		title: parseWebTitle(blockProperties, parseIdentification(blockResource.identification)),
+		items: [],
+		properties: {
+			default: {
+				layout: "vertical",
+				spacing: null,
+				gap: null
+			},
+			mobile: null,
+			tablet: null
+		},
+		cssStyles: {
+			default: [],
+			tablet: [],
+			mobile: []
+		}
 	};
-	switch (val.dataType) {
-		case "IDREF":
-			returnValue.content = val.uuid !== "" ? val.uuid : null;
-			returnValue.label = val.content != null && val.content !== "" ? typeof val.content === "object" ? parseStringContent({ content: val.content }) : parseFakeString(val.content) : null;
-			break;
-		case "integer":
-		case "decimal":
-		case "time":
-			returnValue.content = val.rawValue != null && val.rawValue !== "" ? Number(val.rawValue) : null;
-			returnValue.label = val.content != null && val.content !== "" ? val.content.toString() : null;
-			break;
-		case "boolean":
-			returnValue.content = val.rawValue != null && val.rawValue !== "" ? Boolean(val.rawValue) : null;
-			returnValue.label = val.content != null && val.content !== "" ? val.content.toString() : null;
-			break;
-		default:
-			returnValue.content = val.rawValue != null && val.rawValue !== "" ? val.rawValue.toString() : null;
-			returnValue.label = val.content != null && val.content !== "" ? val.content.toString() : null;
-			break;
+	const blockMainProperties = getPropertyByLabelAndValue(blockProperties, "presentation", "block")?.properties ?? [];
+	if (blockMainProperties.length > 0) {
+		returnBlock.properties.default.layout = getPropertyValueByLabel(blockMainProperties, "layout") ?? "vertical";
+		if (returnBlock.properties.default.layout === "accordion") {
+			returnBlock.properties.default.isAccordionEnabled = getPropertyValueByLabel(blockMainProperties, "accordion-enabled") ?? true;
+			returnBlock.properties.default.isAccordionExpandedByDefault = getPropertyValueByLabel(blockMainProperties, "accordion-expanded") ?? true;
+			returnBlock.properties.default.isAccordionSidebarDisplayed = getPropertyValueByLabel(blockMainProperties, "accordion-sidebar-displayed") ?? false;
+		}
+		returnBlock.properties.default.spacing = getPropertyValueByLabel(blockMainProperties, "spacing") ?? null;
+		returnBlock.properties.default.gap = getPropertyValueByLabel(blockMainProperties, "gap") ?? null;
+		const tabletOverwriteProperty = getPropertyByLabel(blockMainProperties, "overwrite-tablet");
+		if (tabletOverwriteProperty !== null) {
+			const tabletOverwriteProperties = tabletOverwriteProperty.properties;
+			const propertiesTablet = {
+				layout: getPropertyValueByLabel(tabletOverwriteProperties, "layout") ?? void 0,
+				spacing: getPropertyValueByLabel(tabletOverwriteProperties, "spacing") ?? void 0,
+				gap: getPropertyValueByLabel(tabletOverwriteProperties, "gap") ?? void 0,
+				isAccordionEnabled: void 0,
+				isAccordionExpandedByDefault: void 0,
+				isAccordionSidebarDisplayed: void 0
+			};
+			if (propertiesTablet.layout === "accordion" || returnBlock.properties.default.layout === "accordion") {
+				propertiesTablet.isAccordionEnabled = getPropertyValueByLabel(tabletOverwriteProperties, "accordion-enabled") ?? void 0;
+				propertiesTablet.isAccordionExpandedByDefault = getPropertyValueByLabel(tabletOverwriteProperties, "accordion-expanded") ?? void 0;
+				propertiesTablet.isAccordionSidebarDisplayed = getPropertyValueByLabel(tabletOverwriteProperties, "accordion-sidebar-displayed") ?? void 0;
+			}
+			if (Object.values(propertiesTablet).every((value) => value != null)) returnBlock.properties.tablet = propertiesTablet;
+		}
+		const mobileOverwriteProperty = getPropertyByLabel(blockMainProperties, "overwrite-tablet");
+		if (mobileOverwriteProperty !== null) {
+			const mobileOverwriteProperties = mobileOverwriteProperty.properties;
+			const propertiesMobile = {
+				layout: getPropertyValueByLabel(mobileOverwriteProperties, "layout") ?? void 0,
+				spacing: getPropertyValueByLabel(mobileOverwriteProperties, "spacing") ?? void 0,
+				gap: getPropertyValueByLabel(mobileOverwriteProperties, "gap") ?? void 0,
+				isAccordionEnabled: void 0,
+				isAccordionExpandedByDefault: void 0,
+				isAccordionSidebarDisplayed: void 0
+			};
+			if (propertiesMobile.layout === "accordion" || returnBlock.properties.default.layout === "accordion") {
+				propertiesMobile.isAccordionEnabled = getPropertyValueByLabel(mobileOverwriteProperties, "accordion-enabled") ?? void 0;
+				propertiesMobile.isAccordionExpandedByDefault = getPropertyValueByLabel(mobileOverwriteProperties, "accordion-expanded") ?? void 0;
+				propertiesMobile.isAccordionSidebarDisplayed = getPropertyValueByLabel(mobileOverwriteProperties, "accordion-sidebar-displayed") ?? void 0;
+			}
+			if (Object.values(propertiesMobile).every((value) => value != null)) returnBlock.properties.mobile = propertiesMobile;
+		}
+	}
+	const blockResources = blockResource.resource ? ensureArray(blockResource.resource) : [];
+	if (returnBlock.properties.default.layout === "accordion") {
+		const accordionItems = [];
+		for (const resource of blockResources) {
+			const resourceProperties = resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [];
+			const resourceType = getPropertyValueByLabel(resourceProperties, "presentation");
+			if (resourceType !== "element") throw new Error(`Accordion only accepts elements, but got “${resourceType}” for the following resource: “${parseStringContent(resource.identification.label)}”`);
+			const componentType = getPropertyValueByLabel(getPropertyByLabel(resourceProperties, "presentation")?.properties ?? [], "component");
+			if (componentType !== "text") throw new Error(`Accordion only accepts text components, but got “${componentType}” for the following resource: “${parseStringContent(resource.identification.label)}”`);
+			const element = parseWebElementForAccordion(resource);
+			accordionItems.push(element);
+		}
+		returnBlock.items = accordionItems;
+	} else {
+		const blockItems = [];
+		for (const resource of blockResources) {
+			const resourceType = getPropertyValueByLabel(resource.properties ? parseProperties(ensureArray(resource.properties.property)) : [], "presentation");
+			if (resourceType === null) continue;
+			switch (resourceType) {
+				case "element": {
+					const element = parseWebElement(resource);
+					blockItems.push(element);
+					break;
+				}
+				case "block": {
+					const block = parseWebBlock(resource);
+					if (block) blockItems.push(block);
+					break;
+				}
+			}
+		}
+		returnBlock.items = blockItems;
 	}
-	return returnValue;
-});
-/**
-* Schema for the property values by property variables OCHRE API response
-*/
-const responseSchema = z.object({ result: z.union([z.object({ ochre: z.object({ propertyValue: z.union([propertyValueQueryItemSchema, z.array(propertyValueQueryItemSchema)]) }) }), z.array(z.unknown()).length(0)]) });
-/**
-* Build an XQuery string to fetch property values by property variables from the OCHRE API
-* @param params - The parameters for the fetch
-* @param params.projectScopeUuid - The UUID of the project scope
-* @param params.belongsToCollectionScopeUuids - An array of collection scope UUIDs to filter by
-* @param params.propertyVariableUuids - An array of property variable UUIDs to fetch
-* @param options - Options for the fetch
-* @param options.version - The version of the OCHRE API to use
-* @returns An XQuery string
-*/
-function buildXQuery(params, options) {
-	const version = options?.version ?? DEFAULT_API_VERSION;
-	const { projectScopeUuid, belongsToCollectionScopeUuids, propertyVariableUuids } = params;
-	let collectionScopeFilter = "";
-	if (belongsToCollectionScopeUuids.length > 0) collectionScopeFilter = `//properties[property[label/@uuid="${BELONGS_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]]`;
-	const propertyVariableFilters = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
-	return `<ochre>{${`let $matching-props := ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
-      ${collectionScopeFilter}
-      /*[not(self::set)]
-      //property[label/(${propertyVariableFilters})]
-
-  for $v in $matching-props/value
-    let $item-uuid := $v/ancestor::*[parent::ochre]/@uuid
-    return <propertyValue uuid="{$v/@uuid}" rawValue="{$v/@rawValue}" dataType="{$v/@dataType}" itemUuid="{$item-uuid}">{
-      if ($v/content) then $v/content else $v/text()
-    }</propertyValue>`}}</ochre>`;
+	returnBlock.cssStyles = parseResponsiveCssStyles(blockProperties);
+	return returnBlock;
 }
 /**
-* Fetches and parses property values by property variables from the OCHRE API
+* Parses raw website properties into a standardized Website properties structure
 *
-* @param params - The parameters for the fetch
-* @param params.projectScopeUuid - The UUID of the project scope
-* @param params.belongsToCollectionScopeUuids - The collection scope UUIDs to filter by
-* @param params.propertyVariableUuids - The property variable UUIDs to query by
-* @param options - Options for the fetch
-* @param options.fetch - The fetch function to use
-* @param options.version - The version of the OCHRE API to use
-* @returns The parsed property values by property variables or null if the fetch/parse fails
+* @param properties - Array of raw website properties in OCHRE format
+* @returns Parsed WebsiteProperties object
 */
-async function fetchPropertyValuesByPropertyVariables(params, options) {
-	try {
-		const version = options?.version ?? DEFAULT_API_VERSION;
-		const { belongsToCollectionScopeUuids, propertyVariableUuids, projectScopeUuid } = params;
-		const xquery = buildXQuery({
-			projectScopeUuid,
-			belongsToCollectionScopeUuids,
-			propertyVariableUuids
-		}, { version });
-		const response = await (options?.fetch ?? fetch)(version === 2 ? `https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?xquery=${encodeURIComponent(xquery)}&format=json&lang="*"` : `https://ochre.lib.uchicago.edu/ochre?xquery=${encodeURIComponent(xquery)}&format=json&lang="*"`);
-		if (!response.ok) throw new Error(`OCHRE API responded with status: ${response.status}`);
-		const data = await response.json();
-		const parsedResultRaw = responseSchema.parse(data);
-		if (Array.isArray(parsedResultRaw.result)) throw new TypeError("No items found");
-		const parsedItems = Array.isArray(parsedResultRaw.result.ochre.propertyValue) ? parsedResultRaw.result.ochre.propertyValue : [parsedResultRaw.result.ochre.propertyValue];
-		const groupedItemsMap = /* @__PURE__ */ new Map();
-		for (const item of parsedItems) {
-			const existing = groupedItemsMap.get(item.content);
-			if (existing == null) groupedItemsMap.set(item.content, {
-				dataType: item.dataType,
-				content: item.content,
-				label: item.label,
-				itemUuids: new Set([item.itemUuid])
-			});
-			else existing.itemUuids.add(item.itemUuid);
+function parseWebsiteProperties(properties, websiteTree, sidebar) {
+	const websiteProperties = getPropertyByLabel(parseProperties(properties), "presentation")?.properties ?? [];
+	let type = getPropertyValueByLabel(websiteProperties, "webUI");
+	type ??= "traditional";
+	let status = getPropertyValueByLabel(websiteProperties, "status");
+	status ??= "development";
+	let privacy = getPropertyValueByLabel(websiteProperties, "privacy");
+	privacy ??= "public";
+	const returnProperties = {
+		type,
+		status,
+		privacy,
+		contact: null,
+		theme: {
+			isThemeToggleDisplayed: true,
+			defaultTheme: "system"
+		},
+		icon: {
+			logoUuid: null,
+			faviconUuid: null,
+			appleTouchIconUuid: null
+		},
+		navbar: {
+			isDisplayed: true,
+			variant: "default",
+			alignment: "start",
+			isProjectDisplayed: true,
+			searchBarBoundElementUuid: null,
+			items: null
+		},
+		footer: {
+			isDisplayed: true,
+			items: null
+		},
+		sidebar,
+		itemPage: {
+			isMainContentDisplayed: true,
+			isDescriptionDisplayed: true,
+			isDocumentDisplayed: true,
+			isNotesDisplayed: true,
+			isEventsDisplayed: true,
+			isPeriodsDisplayed: true,
+			isPropertiesDisplayed: true,
+			isBibliographyDisplayed: true,
+			isPropertyValuesGrouped: true,
+			iiifViewer: "universal-viewer"
+		},
+		options: {
+			contexts: null,
+			scopes: null,
+			labels: { title: null }
 		}
-		const groupedItems = [];
-		for (const group of groupedItemsMap.values()) groupedItems.push({
-			count: group.itemUuids.size,
-			dataType: group.dataType,
-			content: group.content,
-			label: group.label
-		});
-		return {
-			items: groupedItems.toSorted((a, b) => {
-				if (a.count !== b.count) return b.count - a.count;
-				if (a.label !== b.label) return a.label?.localeCompare(b.label ?? "") ?? 0;
-				return a.content?.toString().localeCompare(b.content?.toString() ?? "") ?? 0;
-			}),
-			error: null
-		};
-	} catch (error) {
-		console.error(error);
-		return {
-			items: null,
-			error: error instanceof Error ? error.message : "Failed to fetch property values by property variables"
+	};
+	const contactProperty = getPropertyByLabel(websiteProperties, "contact");
+	if (contactProperty !== null) {
+		const contactContent = contactProperty.values[0]?.content?.toString().split(";");
+		if (contactContent?.length === 2) returnProperties.contact = {
+			name: contactContent[0],
+			email: contactContent[1] ?? null
 		};
+		else throw new Error(`Contact property must be in the format “name;email”, but got “${contactProperty.values[0]?.content}”`);
+	}
+	returnProperties.theme.isThemeToggleDisplayed = getPropertyValueByLabel(websiteProperties, "supports-theme-toggle") ?? true;
+	returnProperties.theme.defaultTheme = getPropertyValueByLabel(websiteProperties, "default-theme") ?? "system";
+	returnProperties.icon.logoUuid = getPropertyByLabel(websiteProperties, "logo")?.values[0]?.uuid ?? null;
+	returnProperties.navbar.isDisplayed = getPropertyValueByLabel(websiteProperties, "navbar-displayed") ?? true;
+	returnProperties.navbar.variant = getPropertyValueByLabel(websiteProperties, "navbar-variant") ?? "default";
+	returnProperties.navbar.alignment = getPropertyValueByLabel(websiteProperties, "navbar-alignment") ?? "start";
+	returnProperties.navbar.isProjectDisplayed = getPropertyValueByLabel(websiteProperties, "navbar-project-displayed") ?? true;
+	returnProperties.navbar.searchBarBoundElementUuid = getPropertyByLabel(websiteProperties, "bound-element-navbar-search-bar")?.values[0]?.uuid ?? null;
+	returnProperties.footer.isDisplayed = getPropertyValueByLabel(websiteProperties, "footer-displayed") ?? true;
+	const itemPageTypeProperty = getPropertyByLabelAndValue(websiteProperties, "page-type", "item-page");
+	if (itemPageTypeProperty !== null) {
+		returnProperties.itemPage.isMainContentDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-main-content-displayed") ?? true;
+		returnProperties.itemPage.isDescriptionDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-description-displayed") ?? true;
+		returnProperties.itemPage.isDocumentDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-document-displayed") ?? true;
+		returnProperties.itemPage.isNotesDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-notes-displayed") ?? true;
+		returnProperties.itemPage.isEventsDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-events-displayed") ?? true;
+		returnProperties.itemPage.isPeriodsDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-periods-displayed") ?? true;
+		returnProperties.itemPage.isPropertiesDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-properties-displayed") ?? true;
+		returnProperties.itemPage.isBibliographyDisplayed = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-bibliography-displayed") ?? true;
+		returnProperties.itemPage.isPropertyValuesGrouped = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-property-values-grouped") ?? true;
+		returnProperties.itemPage.iiifViewer = getPropertyValueByLabel(itemPageTypeProperty.properties, "item-page-iiif-viewer") ?? "universal-viewer";
 	}
+	if ("options" in websiteTree && websiteTree.options) {
+		returnProperties.options.scopes = websiteTree.options.scopes != null ? ensureArray(websiteTree.options.scopes.scope).map((scope) => ({
+			uuid: scope.uuid.content,
+			type: scope.uuid.type,
+			identification: parseIdentification(scope.identification)
+		})) : null;
+		returnProperties.options.contexts = parseAllOptionContexts(websiteTree.options);
+		if ("notes" in websiteTree.options && websiteTree.options.notes != null) {
+			const labelNotes = parseNotes(ensureArray(websiteTree.options.notes.note));
+			returnProperties.options.labels.title = labelNotes.find((note) => note.title === "Title label")?.content ?? null;
+		}
+	}
+	return returnProperties;
+}
+function parseContexts(contexts) {
+	const contextsParsed = [];
+	for (const mainContext of contexts) for (const contextItemToParse of ensureArray(mainContext.context)) {
+		const levelsToParse = ensureArray(contextItemToParse.levels.level);
+		let type = "";
+		const levels = levelsToParse.map((level) => {
+			let variableUuid = "";
+			let valueUuid = null;
+			if (typeof level === "string") {
+				const splitLevel = level.split(", ");
+				variableUuid = splitLevel[0];
+				valueUuid = splitLevel[1] === "null" ? null : splitLevel[1];
+			} else {
+				const splitLevel = level.content.split(", ");
+				type = level.dataType;
+				variableUuid = splitLevel[0];
+				valueUuid = splitLevel[1] === "null" ? null : splitLevel[1];
+			}
+			return {
+				variableUuid,
+				valueUuid
+			};
+		});
+		contextsParsed.push({
+			context: levels,
+			type,
+			identification: parseIdentification(contextItemToParse.identification)
+		});
+	}
+	return contextsParsed;
+}
+function parseWebsite(websiteTree, metadata, belongsTo, { version = DEFAULT_API_VERSION } = {}) {
+	if (!websiteTree.properties) throw new Error("Website properties not found");
+	if (typeof websiteTree.items === "string" || !("resource" in websiteTree.items)) throw new Error("Website pages not found");
+	const resources = ensureArray(websiteTree.items.resource);
+	const items = [...parseWebpages(resources), ...parseSegments(resources)];
+	const sidebar = parseSidebar(resources);
+	const properties = parseWebsiteProperties(ensureArray(websiteTree.properties.property), websiteTree, sidebar);
+	return {
+		uuid: websiteTree.uuid,
+		version,
+		belongsTo: belongsTo ?? null,
+		metadata: parseMetadata(metadata),
+		publicationDateTime: parseOptionalDate(websiteTree.publicationDateTime),
+		identification: parseIdentification(websiteTree.identification),
+		creators: websiteTree.creators ? parsePersons(ensureArray(websiteTree.creators.creator)) : [],
+		license: parseLicense(websiteTree.availability),
+		items,
+		properties
+	};
 }
 
 //#endregion