ochre-sdk 1.0.0 → 1.0.2

package/dist/index.mjs

@@ -54,6 +54,7 @@ const XML_ARRAY_TAGS = [
 ];
 const XML_PARSER_OPTIONS = {
 	alwaysCreateTextNode: true,
+	captureMetaData: true,
 	ignoreAttributes: false,
 	removeNSPrefix: true,
 	ignorePiTags: true,
@@ -814,6 +815,34 @@ const setItemsParamsSchema = v.object({
 	pageSize: v.optional(positiveNumber("Page size must be positive"), 48)
 });
 //#endregion
+//#region src/xml/metadata.ts
+const XML_METADATA_SYMBOL = XMLParser.getMetaDataSymbol();
+function isRecord$4(value) {
+	return typeof value === "object" && value != null;
+}
+function getXMLMetadata(value) {
+	if (!isRecord$4(value)) return null;
+	return value[XML_METADATA_SYMBOL] ?? null;
+}
+function getXMLSourceIndex(value) {
+	const startIndex = getXMLMetadata(value)?.startIndex;
+	return typeof startIndex === "number" ? startIndex : null;
+}
+function restoreXMLMetadata(output, input) {
+	if (!isRecord$4(output) || !isRecord$4(input)) return;
+	const metadata = getXMLMetadata(input);
+	if (metadata != null) Object.defineProperty(output, XML_METADATA_SYMBOL, {
+		value: metadata,
+		enumerable: false,
+		configurable: true
+	});
+	if (Array.isArray(output) && Array.isArray(input)) {
+		for (const [index, outputValue] of output.entries()) restoreXMLMetadata(outputValue, input[index]);
+		return;
+	}
+	for (const [key, outputValue] of Object.entries(output)) restoreXMLMetadata(outputValue, input[key]);
+}
+//#endregion
 //#region src/parsers/string.ts
 const TEXT_ANNOTATION_TOKEN = "text-annotation";
 const TEXT_STYLING_TOKEN = "text-styling";
@@ -979,19 +1008,20 @@ function parseXMLString(string, options) {
 */
 function createMDXComponent(variant, properties) {
 	const { uuid, href, height, width, content, text } = properties;
+	const tooltipContent = getDistinctTooltipContent(content, text);
 	let returnString = "";
 	switch (variant) {
 		case "inlineImage":
 			returnString = `<InlineImage uuid="${uuid}"${createMDXStringAttribute("content", content)} height={${height ?? "null"}} width={${width ?? "null"}} />`;
 			break;
 		case "internalLink":
-			returnString = `<InternalLink uuid="${uuid}"${createMDXStringAttribute("content", content)}>${text}</InternalLink>`;
+			returnString = `<InternalLink uuid="${uuid}"${createMDXStringAttribute("content", tooltipContent)}>${text}</InternalLink>`;
 			break;
 		case "externalLink":
-			returnString = `<ExternalLink href="${href == null ? "#" : transformPermanentIdentificationUrl(href)}"${createMDXStringAttribute("content", content)}>${text}</ExternalLink>`;
+			returnString = `<ExternalLink href="${href == null ? "#" : transformPermanentIdentificationUrl(href)}"${createMDXStringAttribute("content", tooltipContent)}>${text}</ExternalLink>`;
 			break;
 		case "documentLink":
-			returnString = String.raw`<ExternalLink href="https:\/\/ochre.lib.uchicago.edu/ochre/v2/ochre.php?uuid=${uuid}&load"${createMDXStringAttribute("content", content)}>${text}</ExternalLink>`;
+			returnString = String.raw`<ExternalLink href="https:\/\/ochre.lib.uchicago.edu/ochre/v2/ochre.php?uuid=${uuid}&load"${createMDXStringAttribute("content", tooltipContent)}>${text}</ExternalLink>`;
 			break;
 		case "tooltipSpan":
 			returnString = `<TooltipSpan${createMDXStringAttribute("content", content)}>${text}</TooltipSpan>`;
@@ -999,6 +1029,9 @@ function createMDXComponent(variant, properties) {
 	}
 	return returnString;
 }
+function getDistinctTooltipContent(content, textContent) {
+	return content === textContent ? void 0 : content;
+}
 function createMDXStringAttribute(name, value) {
 	if (value == null || value === "") return "";
 	return ` ${name}=${MDX_QUOTED_ATTRIBUTE_ESCAPE_REGEX.test(value) ? `{${JSON.stringify(value)}}` : `"${value}"`}`;
@@ -1144,16 +1177,31 @@ function createInternalLinkComponent(properties) {
 		case "hover-card": return `<Annotation type="hover-card" uuid="${properties.uuid}">${innerContent}</Annotation>`;
 		case "item-page": return `<InternalLink type="item" uuid="${properties.uuid}">${innerContent}</InternalLink>`;
 		case "entry-page": return `<InternalLink type="entry" uuid="${properties.uuid}">${innerContent}</InternalLink>`;
-		default: return `<InternalLink uuid="${properties.uuid}"${properties.propertyMetadata != null ? ` properties="${properties.propertyMetadata.labelUuid}"${properties.propertyMetadata.valueUuid != null ? ` value="${properties.propertyMetadata.valueUuid}"` : ""}` : ""}${createMDXStringAttribute("content", properties.content)}>${innerContent}</InternalLink>`;
+		default: return `<InternalLink uuid="${properties.uuid}"${properties.propertyMetadata != null ? ` properties="${properties.propertyMetadata.labelUuid}"${properties.propertyMetadata.valueUuid != null ? ` value="${properties.propertyMetadata.valueUuid}"` : ""}` : ""}${createMDXStringAttribute("content", getDistinctTooltipContent(properties.content, properties.text))}>${innerContent}</InternalLink>`;
 	}
 }
 function getXMLRichTextLinks(item) {
 	const links = [];
+	let fallbackIndex = 0;
 	for (const rawLinks of Object.values(item.links ?? {})) {
 		if (!Array.isArray(rawLinks)) continue;
-		for (const rawLink of rawLinks) if (isXMLRichTextLink(rawLink) && !isTextAnnotationMarkerLink(rawLink)) links.push(rawLink);
+		for (const rawLink of rawLinks) if (isXMLRichTextLink(rawLink) && !isTextAnnotationMarkerLink(rawLink)) {
+			links.push({
+				link: rawLink,
+				fallbackIndex
+			});
+			fallbackIndex += 1;
+		}
 	}
-	return links;
+	links.sort((left, right) => {
+		const leftIndex = getXMLSourceIndex(left.link);
+		const rightIndex = getXMLSourceIndex(right.link);
+		if (leftIndex != null && rightIndex != null && leftIndex !== rightIndex) return leftIndex - rightIndex;
+		return left.fallbackIndex - right.fallbackIndex;
+	});
+	const sortedLinks = [];
+	for (const { link } of links) sortedLinks.push(link);
+	return sortedLinks;
 }
 function renderRichTextItem(item, linkString, contentItem, options) {
 	const { languages, rendering } = options;
@@ -1556,29 +1604,83 @@ function normalizeCategory(category) {
 function isHeadingItemCategory(category) {
 	return HEADING_ITEM_CATEGORIES.includes(category);
 }
-function pushCategoryIfPresent(categories, category, items) {
-	if ((items?.length ?? 0) === 0) return;
-	pushCategory(categories, category);
-}
 function pushCategory(categories, category) {
 	if (!categories.includes(category)) categories.push(category);
 }
+function getHierarchyEntryCategory(key) {
+	switch (key) {
+		case "heading":
+		case "tree":
+		case "bibliography":
+		case "concept":
+		case "spatialUnit":
+		case "period":
+		case "person":
+		case "resource":
+		case "text":
+		case "set":
+		case "dictionaryUnit": return key;
+		case "propertyVariable":
+		case "variable": return "propertyVariable";
+		case "propertyValue":
+		case "value": return "propertyValue";
+		default: return null;
+	}
+}
+function isRecord$3(value) {
+	return typeof value === "object" && value != null;
+}
+function isResourceWrapper(value) {
+	return isRecord$3(value) && !("uuid" in value) && Array.isArray(value.resource);
+}
+function sourceOrderSort(left, right) {
+	const leftIndex = getXMLSourceIndex(left.item);
+	const rightIndex = getXMLSourceIndex(right.item);
+	if (leftIndex != null && rightIndex != null && leftIndex !== rightIndex) return leftIndex - rightIndex;
+	return left.fallbackIndex - right.fallbackIndex;
+}
+function collectHierarchyEntries(hierarchy, categories) {
+	const entries = [];
+	if (hierarchy == null) return entries;
+	let fallbackIndex = 0;
+	for (const key of Object.keys(hierarchy)) {
+		const category = getHierarchyEntryCategory(key);
+		if (category == null || !(categories == null || categories.includes(category))) continue;
+		const values = hierarchy[key];
+		if (!Array.isArray(values)) continue;
+		for (const value of values) {
+			if (category === "resource" && isResourceWrapper(value)) {
+				for (const resource of value.resource) {
+					entries.push({
+						category,
+						item: resource,
+						fallbackIndex
+					});
+					fallbackIndex += 1;
+				}
+				continue;
+			}
+			entries.push({
+				category,
+				item: value,
+				fallbackIndex
+			});
+			fallbackIndex += 1;
+		}
+	}
+	entries.sort(sourceOrderSort);
+	return entries;
+}
 function inferItemCategories(hierarchy) {
 	const categories = [];
 	if (hierarchy == null) return categories;
-	for (const heading of hierarchy.heading ?? []) for (const category of inferItemCategories(heading)) pushCategory(categories, category);
-	for (const category of SET_ITEM_CATEGORIES) {
-		if (category === "propertyVariable") {
-			pushCategoryIfPresent(categories, category, hierarchy.propertyVariable);
-			pushCategoryIfPresent(categories, category, hierarchy.variable);
-			continue;
-		}
-		if (category === "propertyValue") {
-			pushCategoryIfPresent(categories, category, hierarchy.propertyValue);
-			pushCategoryIfPresent(categories, category, hierarchy.value);
+	for (const entry of collectHierarchyEntries(hierarchy)) {
+		if (entry.category === "heading") {
+			for (const category of inferItemCategories(entry.item)) pushCategory(categories, category);
 			continue;
 		}
-		pushCategoryIfPresent(categories, category, hierarchy[category]);
+		if (entry.category === "dictionaryUnit") continue;
+		pushCategory(categories, entry.category);
 	}
 	return categories;
 }
@@ -1864,62 +1966,79 @@ function withoutItems(item) {
 	const { items: _items, ...itemWithoutItems } = item;
 	return itemWithoutItems;
 }
+function parseEmbeddedItemEntry(entry, options) {
+	switch (entry.category) {
+		case "tree": return parseTree(entry.item, {
+			...options,
+			containedItemCategory: normalizeTreeItemCategory(options.containedItemCategory)
+		});
+		case "bibliography": return parseBibliography(entry.item, options);
+		case "concept": return parseConcept(entry.item, options);
+		case "spatialUnit": return parseSpatialUnit(entry.item, options);
+		case "period": return parsePeriod(entry.item, options);
+		case "person": return parsePerson(entry.item, options);
+		case "propertyVariable": return parsePropertyVariable(entry.item, options);
+		case "propertyValue": return parsePropertyValue(entry.item, options);
+		case "resource": return parseResource(entry.item, options);
+		case "text": return parseText(entry.item, options);
+		case "set": return parseSet(entry.item, options);
+		case "dictionaryUnit":
+		case "heading": return null;
+	}
+}
 function parseItemHierarchy(hierarchy, options, categories) {
 	const items = [];
 	if (hierarchy == null) return items;
-	const shouldParse = (category) => categories == null || categories.includes(category);
-	if (shouldParse("tree")) for (const tree of hierarchy.tree ?? []) items.push(parseTree(tree, options));
-	if (shouldParse("bibliography")) for (const bibliography of hierarchy.bibliography ?? []) items.push(parseBibliography(bibliography, options));
-	if (shouldParse("concept")) for (const concept of hierarchy.concept ?? []) items.push(parseConcept(concept, options));
-	if (shouldParse("spatialUnit")) for (const spatialUnit of hierarchy.spatialUnit ?? []) items.push(parseSpatialUnit(spatialUnit, options));
-	if (shouldParse("period")) for (const period of hierarchy.period ?? []) items.push(parsePeriod(period, options));
-	if (shouldParse("person")) for (const person of hierarchy.person ?? []) items.push(parsePerson(person, options));
-	if (shouldParse("propertyVariable")) {
-		for (const propertyVariable of hierarchy.propertyVariable ?? []) items.push(parsePropertyVariable(propertyVariable, options));
-		for (const propertyVariable of hierarchy.variable ?? []) items.push(parsePropertyVariable(propertyVariable, options));
-	}
-	if (shouldParse("propertyValue")) {
-		for (const propertyValue of hierarchy.propertyValue ?? []) items.push(parsePropertyValue(propertyValue, options));
-		for (const propertyValue of hierarchy.value ?? []) items.push(parsePropertyValue(propertyValue, options));
-	}
-	if (shouldParse("resource")) for (const resource of hierarchy.resource ?? []) {
-		if (!("uuid" in resource)) {
-			for (const embeddedResource of resource.resource) items.push(parseResource(embeddedResource, options));
-			continue;
-		}
-		items.push(parseResource(resource, options));
+	for (const entry of collectHierarchyEntries(hierarchy, categories)) {
+		const item = parseEmbeddedItemEntry(entry, options);
+		if (item != null) items.push(item);
 	}
-	if (shouldParse("text")) for (const text of hierarchy.text ?? []) items.push(parseText(text, options));
-	if (shouldParse("set")) for (const set of hierarchy.set ?? []) items.push(parseSet(set, options));
 	return items;
 }
 function parseSetItemHierarchy(hierarchy, options, categories) {
 	const items = [];
 	if (hierarchy == null) return items;
-	const shouldParse = (category) => categories == null || categories.includes(category);
-	if (shouldParse("tree")) for (const tree of hierarchy.tree ?? []) items.push(parseSetTree(tree, options));
-	if (shouldParse("bibliography")) for (const bibliography of hierarchy.bibliography ?? []) items.push(parseSetBibliography(bibliography, options));
-	if (shouldParse("concept")) for (const concept of hierarchy.concept ?? []) items.push(parseSetConcept(concept, options));
-	if (shouldParse("spatialUnit")) for (const spatialUnit of hierarchy.spatialUnit ?? []) items.push(parseSetSpatialUnit(spatialUnit, options));
-	if (shouldParse("period")) for (const period of hierarchy.period ?? []) items.push(parseSetPeriod(period, options));
-	if (shouldParse("person")) for (const person of hierarchy.person ?? []) items.push(withSetItemProperties(parsePerson(person, options), person.properties, options));
-	if (shouldParse("propertyVariable")) {
-		for (const propertyVariable of hierarchy.propertyVariable ?? []) items.push(parsePropertyVariable(propertyVariable, options));
-		for (const propertyVariable of hierarchy.variable ?? []) items.push(parsePropertyVariable(propertyVariable, options));
-	}
-	if (shouldParse("propertyValue")) {
-		for (const propertyValue of hierarchy.propertyValue ?? []) items.push(withSetItemProperties(parsePropertyValue(propertyValue, options), propertyValue.properties, options));
-		for (const propertyValue of hierarchy.value ?? []) items.push(withSetItemProperties(parsePropertyValue(propertyValue, options), propertyValue.properties, options));
-	}
-	if (shouldParse("resource")) for (const resource of hierarchy.resource ?? []) {
-		if (!("uuid" in resource)) {
-			for (const embeddedResource of resource.resource) items.push(parseSetResource(embeddedResource, options));
-			continue;
+	for (const entry of collectHierarchyEntries(hierarchy, categories)) switch (entry.category) {
+		case "tree":
+			items.push(parseSetTree(entry.item, options));
+			break;
+		case "bibliography":
+			items.push(parseSetBibliography(entry.item, options));
+			break;
+		case "concept":
+			items.push(parseSetConcept(entry.item, options));
+			break;
+		case "spatialUnit":
+			items.push(parseSetSpatialUnit(entry.item, options));
+			break;
+		case "period":
+			items.push(parseSetPeriod(entry.item, options));
+			break;
+		case "person": {
+			const person = entry.item;
+			items.push(withSetItemProperties(parsePerson(person, options), person.properties, options));
+			break;
+		}
+		case "propertyVariable":
+			items.push(parsePropertyVariable(entry.item, options));
+			break;
+		case "propertyValue": {
+			const propertyValue = entry.item;
+			items.push(withSetItemProperties(parsePropertyValue(propertyValue, options), propertyValue.properties, options));
+			break;
 		}
-		items.push(parseSetResource(resource, options));
+		case "resource":
+			items.push(parseSetResource(entry.item, options));
+			break;
+		case "text":
+			items.push(parseText(entry.item, options));
+			break;
+		case "set":
+			items.push(parseSetSet(entry.item, options));
+			break;
+		case "dictionaryUnit":
+		case "heading": break;
 	}
-	if (shouldParse("text")) for (const text of hierarchy.text ?? []) items.push(parseText(text, options));
-	if (shouldParse("set")) for (const set of hierarchy.set ?? []) items.push(parseSetSet(set, options));
 	return items;
 }
 function normalizeTreeLinkItemsCategory(type) {
@@ -2088,26 +2207,45 @@ function parseLinks(rawLinks, options) {
 	const links = [];
 	if (rawLinks == null) return links;
 	const hierarchy = rawLinks;
-	for (const tree of hierarchy.tree ?? []) links.push(parseTreeItemLink(tree, options));
-	for (const bibliography of hierarchy.bibliography ?? []) links.push(parseBibliographyItemLink(bibliography, options));
-	for (const concept of hierarchy.concept ?? []) links.push(parseConceptItemLink(concept, options));
-	for (const spatialUnit of hierarchy.spatialUnit ?? []) links.push(parseSpatialUnitItemLink(spatialUnit, options));
-	for (const period of hierarchy.period ?? []) links.push(parsePeriodItemLink(period, options));
-	for (const person of hierarchy.person ?? []) links.push(parsePersonItemLink(person, options));
-	for (const propertyVariable of hierarchy.propertyVariable ?? []) links.push(parsePropertyVariableItemLink(propertyVariable, options));
-	for (const propertyVariable of hierarchy.variable ?? []) links.push(parsePropertyVariableItemLink(propertyVariable, options));
-	for (const propertyValue of hierarchy.propertyValue ?? []) links.push(parsePropertyValueItemLink(propertyValue, options));
-	for (const propertyValue of hierarchy.value ?? []) links.push(parsePropertyValueItemLink(propertyValue, options));
-	for (const resource of hierarchy.resource ?? []) {
-		if (!("uuid" in resource)) {
-			for (const embeddedResource of resource.resource) links.push(parseResourceItemLink(embeddedResource, options));
-			continue;
-		}
-		links.push(parseResourceItemLink(resource, options));
+	for (const entry of collectHierarchyEntries(hierarchy)) switch (entry.category) {
+		case "tree":
+			links.push(parseTreeItemLink(entry.item, options));
+			break;
+		case "bibliography":
+			links.push(parseBibliographyItemLink(entry.item, options));
+			break;
+		case "concept":
+			links.push(parseConceptItemLink(entry.item, options));
+			break;
+		case "spatialUnit":
+			links.push(parseSpatialUnitItemLink(entry.item, options));
+			break;
+		case "period":
+			links.push(parsePeriodItemLink(entry.item, options));
+			break;
+		case "person":
+			links.push(parsePersonItemLink(entry.item, options));
+			break;
+		case "propertyVariable":
+			links.push(parsePropertyVariableItemLink(entry.item, options));
+			break;
+		case "propertyValue":
+			links.push(parsePropertyValueItemLink(entry.item, options));
+			break;
+		case "resource":
+			links.push(parseResourceItemLink(entry.item, options));
+			break;
+		case "text":
+			links.push(parseTextItemLink(entry.item, options));
+			break;
+		case "set":
+			links.push(parseSetItemLink(entry.item, options));
+			break;
+		case "dictionaryUnit":
+			links.push(parseDictionaryUnitItemLink(entry.item, options));
+			break;
+		case "heading": break;
 	}
-	for (const text of hierarchy.text ?? []) links.push(parseTextItemLink(text, options));
-	for (const set of hierarchy.set ?? []) links.push(parseSetItemLink(set, options));
-	for (const dictionaryUnit of hierarchy.dictionaryUnit ?? []) links.push(parseDictionaryUnitItemLink(dictionaryUnit, options));
 	return links;
 }
 function parseReverseLinks(rawLinks, options) {
@@ -2183,8 +2321,19 @@ function parseTree(rawTree, options) {
 	const childOptions = getParserOptions(options);
 	const containedItemCategory = resolveTreeItemCategory(rawTree, normalizeTreeItemCategory(options.containedItemCategory));
 	const items = [];
-	if (containedItemCategory != null && isHeadingItemCategory(containedItemCategory)) for (const heading of rawTree.items?.heading ?? []) items.push(parseHeading(heading, containedItemCategory, childOptions));
-	if (containedItemCategory != null) items.push(...parseItemHierarchy(rawTree.items, childOptions, [containedItemCategory]));
+	if (containedItemCategory != null) {
+		const itemCategories = [containedItemCategory];
+		if (isHeadingItemCategory(containedItemCategory)) itemCategories.push("heading");
+		for (const entry of collectHierarchyEntries(rawTree.items, itemCategories)) {
+			if (entry.category === "heading") {
+				if (!isHeadingItemCategory(containedItemCategory)) continue;
+				items.push(parseHeading(entry.item, containedItemCategory, childOptions));
+				continue;
+			}
+			const item = parseEmbeddedItemEntry(entry, childOptions);
+			if (item != null) items.push(item);
+		}
+	}
 	return {
 		...parseBaseItem("tree", rawTree, childOptions),
 		type: rawTree.type ?? null,
@@ -2516,22 +2665,10 @@ function parseLinkedItems(rawItems, options) {
 		containedItemCategory: options.containedItemCategory
 	};
 	const items = [];
-	for (const tree of rawItems?.tree ?? []) items.push(parseTree(tree, {
-		...parserOptions,
-		containedItemCategory: normalizeTreeItemCategory(options.containedItemCategory)
-	}));
-	for (const bibliography of rawItems?.bibliography ?? []) items.push(parseBibliography(bibliography, parserOptions));
-	for (const concept of rawItems?.concept ?? []) items.push(parseConcept(concept, parserOptions));
-	for (const spatialUnit of rawItems?.spatialUnit ?? []) items.push(parseSpatialUnit(spatialUnit, parserOptions));
-	for (const period of rawItems?.period ?? []) items.push(parsePeriod(period, parserOptions));
-	for (const person of rawItems?.person ?? []) items.push(parsePerson(person, parserOptions));
-	for (const propertyVariable of rawItems?.propertyVariable ?? []) items.push(parsePropertyVariable(propertyVariable, parserOptions));
-	for (const propertyVariable of rawItems?.variable ?? []) items.push(parsePropertyVariable(propertyVariable, parserOptions));
-	for (const propertyValue of rawItems?.propertyValue ?? []) items.push(parsePropertyValue(propertyValue, parserOptions));
-	for (const propertyValue of rawItems?.value ?? []) items.push(parsePropertyValue(propertyValue, parserOptions));
-	for (const resource of rawItems?.resource ?? []) items.push(parseResource(resource, parserOptions));
-	for (const text of rawItems?.text ?? []) items.push(parseText(text, parserOptions));
-	for (const set of rawItems?.set ?? []) items.push(parseSet(set, parserOptions));
+	for (const entry of collectHierarchyEntries(rawItems)) {
+		const item = parseEmbeddedItemEntry(entry, parserOptions);
+		if (item != null) items.push(item);
+	}
 	return items;
 }
 function parseSetItems(rawItems, options) {
@@ -3481,6 +3618,7 @@ async function fetchGallery(params, options) {
 			logIssues(issues);
 			throw new Error("Failed to parse gallery XML");
 		}
+		restoreXMLMetadata(output, data);
 		return {
 			gallery: parseGallery(output, { languages: resolveGalleryLanguages(output, requestedLanguages) }),
 			error: null
@@ -3532,39 +3670,46 @@ function resolveItemLinksLanguages(data, requestedLanguages) {
 function buildXQuery$2(uuid) {
 	return `<ochre>{${`let $item-uuid := "${uuid}"
 
-let $uuids :=
-  distinct-values((
-
-    (: Direct links on most item categories :)
-    fn:collection("ochre/resource")/ochre[@uuid = $item-uuid]/resource/links/*/@uuid/string(),
-    fn:collection("ochre/bibliography")/ochre[@uuid = $item-uuid]/bibliography/links/*/@uuid/string(),
-    fn:collection("ochre/period")/ochre[@uuid = $item-uuid]/period/links/*/@uuid/string(),
-    fn:collection("ochre/person")/ochre[@uuid = $item-uuid]/person/links/*/@uuid/string(),
-    fn:collection("ochre/propertyVariable")/ochre[@uuid = $item-uuid]/propertyVariable/links/*/@uuid/string(),
-    fn:collection("ochre/propertyValue")/ochre[@uuid = $item-uuid]/propertyValue/links/*/@uuid/string(),
-    fn:collection("ochre/text")/ochre[@uuid = $item-uuid]/text/links/*/@uuid/string(),
-    fn:collection("ochre/tree")/ochre[@uuid = $item-uuid]/tree/links/*/@uuid/string(),
-    fn:collection("ochre/set")/ochre[@uuid = $item-uuid]/set/links/*/@uuid/string(),
+let $source-items := (
+  fn:collection("ochre/resource")/ochre[@uuid = $item-uuid]/resource,
+  fn:collection("ochre/bibliography")/ochre[@uuid = $item-uuid]/bibliography,
+  fn:collection("ochre/period")/ochre[@uuid = $item-uuid]/period,
+  fn:collection("ochre/person")/ochre[@uuid = $item-uuid]/person,
+  fn:collection("ochre/propertyVariable")/ochre[@uuid = $item-uuid]/propertyVariable,
+  fn:collection("ochre/propertyValue")/ochre[@uuid = $item-uuid]/propertyValue,
+  fn:collection("ochre/text")/ochre[@uuid = $item-uuid]/text,
+  fn:collection("ochre/tree")/ochre[@uuid = $item-uuid]/tree,
+  fn:collection("ochre/set")/ochre[@uuid = $item-uuid]/set,
+  fn:collection("ochre/spatialUnit")/ochre[@uuid = $item-uuid]/spatialUnit,
+  fn:collection("ochre/concept")/ochre[@uuid = $item-uuid]/concept
+)
 
-    (: Special category structures :)
-    fn:collection("ochre/spatialUnit")/ochre[@uuid = $item-uuid]/spatialUnit/observations/observation/links/*/@uuid/string(),
-    fn:collection("ochre/concept")/ochre[@uuid = $item-uuid]/concept/interpretations/interpretation/links/*/@uuid/string()
-  ))
+let $link-nodes := (
+  $source-items/links/*,
+  $source-items/observations/observation/links/*,
+  $source-items/interpretations/interpretation/links/*
+)
 
 return
-    <items>{(
-      fn:collection("ochre/resource")/ochre/resource[@uuid = $uuids],
-      fn:collection("ochre/bibliography")/ochre/bibliography[@uuid = $uuids],
-      fn:collection("ochre/period")/ochre/period[@uuid = $uuids],
-      fn:collection("ochre/person")/ochre/person[@uuid = $uuids],
-      fn:collection("ochre/propertyVariable")/ochre/propertyVariable[@uuid = $uuids],
-      fn:collection("ochre/propertyValue")/ochre/propertyValue[@uuid = $uuids],
-      fn:collection("ochre/text")/ochre/text[@uuid = $uuids],
-      fn:collection("ochre/tree")/ochre/tree[@uuid = $uuids],
-      fn:collection("ochre/set")/ochre/set[@uuid = $uuids],
-      fn:collection("ochre/spatialUnit")/ochre/spatialUnit[@uuid = $uuids],
-      fn:collection("ochre/concept")/ochre/concept[@uuid = $uuids]
-    )}</items>`}}</ochre>`;
+    <items>{
+      for $link at $position in $link-nodes
+      let $uuid := $link/@uuid/string()
+      let $category := name($link)
+      where $uuid ne "" and not($uuid = $link-nodes[position() lt $position]/@uuid/string())
+      return
+        if ($category = "resource") then fn:collection("ochre/resource")/ochre/resource[@uuid = $uuid]
+        else if ($category = "bibliography") then fn:collection("ochre/bibliography")/ochre/bibliography[@uuid = $uuid]
+        else if ($category = "period") then fn:collection("ochre/period")/ochre/period[@uuid = $uuid]
+        else if ($category = "person") then fn:collection("ochre/person")/ochre/person[@uuid = $uuid]
+        else if ($category = "propertyVariable" or $category = "variable") then fn:collection("ochre/propertyVariable")/ochre/propertyVariable[@uuid = $uuid]
+        else if ($category = "propertyValue" or $category = "value") then fn:collection("ochre/propertyValue")/ochre/propertyValue[@uuid = $uuid]
+        else if ($category = "text") then fn:collection("ochre/text")/ochre/text[@uuid = $uuid]
+        else if ($category = "tree") then fn:collection("ochre/tree")/ochre/tree[@uuid = $uuid]
+        else if ($category = "set") then fn:collection("ochre/set")/ochre/set[@uuid = $uuid]
+        else if ($category = "spatialUnit") then fn:collection("ochre/spatialUnit")/ochre/spatialUnit[@uuid = $uuid]
+        else if ($category = "concept") then fn:collection("ochre/concept")/ochre/concept[@uuid = $uuid]
+        else ()
+    }</items>`}}</ochre>`;
 }
 async function fetchItemLinks(uuid, options) {
 	try {
@@ -3583,6 +3728,7 @@ async function fetchItemLinks(uuid, options) {
 			logIssues(issues);
 			throw new Error("Failed to parse OCHRE item links");
 		}
+		restoreXMLMetadata(output, data);
 		const languages = resolveItemLinksLanguages(output, requestedLanguages);
 		return {
 			items: parseLinkedItems(output.result.ochre.items, {
@@ -3683,6 +3829,7 @@ async function fetchItem(uuid, options) {
 			logIssues(issues);
 			throw new Error("Failed to parse OCHRE data");
 		}
+		restoreXMLMetadata(output, data);
 		const category = options?.category ?? inferFetchItemCategory(output.result.ochre);
 		assertItemCategoryAllowed(category, options?.containedItemCategory);
 		return {
@@ -4756,6 +4903,7 @@ async function fetchSetItems(params, containedItemCategories, options) {
 			logIssues(issues);
 			throw new Error("Failed to parse OCHRE Set items");
 		}
+		restoreXMLMetadata(output, data);
 		if (containedItemCategories != null) {
 			const missingCategories = containedItemCategories.filter((category) => !hasSetItemsCategory(output.result.ochre.items, category));
 			if (missingCategories.length > 0) throw new Error(`No Set items found for item categories: ${missingCategories.join(", ")}`);
@@ -6096,15 +6244,14 @@ function parseWebElementProperties(componentProperty, elementResource, options)
 			break;
 		}
 		case "image": {
-			const imageLinks = getWebsiteLinks(websiteLinks, "resource").filter((link) => link.type === "image" || link.type === "IIIF");
-			if (imageLinks.length === 0) throw new Error(formatComponentError("No links found", componentName, elementResource));
+			if (websiteLinks.length === 0) throw new Error(formatComponentError("No links found", componentName, elementResource));
 			const imageQuality = componentReader.valueOr("image-quality", "high");
 			const images = [];
-			for (const link of imageLinks) images.push({
+			for (const link of websiteLinks) images.push({
 				uuid: link.uuid,
 				label: link.identification.label,
-				width: link.image?.width ?? 0,
-				height: link.image?.height ?? 0,
+				width: "image" in link ? link.image?.width ?? 0 : 0,
+				height: "image" in link ? link.image?.height ?? 0 : 0,
 				description: link.description,
 				quality: imageQuality
 			});
@@ -7033,6 +7180,7 @@ async function fetchWebsite(abbreviation, options) {
 			logIssues(issues);
 			throw new Error("Failed to parse website XML");
 		}
+		restoreXMLMetadata(output, data);
 		return {
 			website: parseWebsite(output, { languages: options?.languages }),
 			error: null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -45,7 +45,7 @@
   "dependencies": {
     "date-fns": "^4.1.0",
     "fast-equals": "^6.0.0",
-    "fast-xml-parser": "^5.7.3",
+    "fast-xml-parser": "^5.8.0",
     "valibot": "^1.4.0"
   },
   "devDependencies": {