ochre-sdk 1.0.0-beta.5 → 1.0.0-beta.6

package/dist/index.mjs

@@ -879,9 +879,13 @@ function parseWhitespace(contentString, whitespace, rendering) {
 * @internal
 */
 function parseXMLStringVariant(string, options) {
-	let returnString = (string.payload ?? "").replaceAll("<", options.rendering === "rich" ? String.raw`\<` : "<").replaceAll("{", String.raw`\{`).replaceAll("}", String.raw`\}`);
+	let returnString = parseXMLStringPayload(string, options);
 	if (string.whitespace != null) returnString = parseWhitespace(returnString, string.whitespace, options.rendering);
 	if (string.rend != null) returnString = parseRenderOptions(returnString, string.rend, options.rendering);
+	return returnString;
+}
+function parseXMLStringPayload(string, options) {
+	const returnString = (string.payload ?? "").replaceAll("<", options.rendering === "rich" ? String.raw`\<` : "<").replaceAll("{", String.raw`\{`).replaceAll("}", String.raw`\}`);
 	return options.parseEmail ? parseEmail(returnString) : returnString;
 }
 function parseXMLString(string, options) {
@@ -1035,14 +1039,13 @@ function hasRichTextEnvelope(item) {
 	return item.properties?.property[0] != null || getXMLRichTextLinks(item).length > 0;
 }
 function parseXMLStringItem(item, contentItem, options) {
-	if (item.payload != null) return parseXMLStringVariant(item, {
-		rendering: options.rendering,
-		parseEmail: options.parseEmail
-	});
-	if (item.string == null && item.whitespace != null) return parseWhitespace("", item.whitespace, options.rendering);
-	if (item.string == null) return "";
+	if (item.payload == null && item.string == null && item.whitespace != null) return parseWhitespace("", item.whitespace, options.rendering);
+	if (item.payload == null && item.string == null) return "";
 	if (hasRichTextEnvelope(item)) {
-		let linkString = parseNestedStringItems(item.string, contentItem, {
+		let linkString = item.payload != null ? parseXMLStringPayload(item, {
+			rendering: options.rendering,
+			parseEmail: false
+		}) : parseNestedStringItems(item.string ?? [], contentItem, {
 			...options,
 			parseEmail: false
 		});
@@ -1050,7 +1053,11 @@ function parseXMLStringItem(item, contentItem, options) {
 		if (options.rendering === "plain") return applyWhitespaceToResult(linkString, item.whitespace, options.rendering);
 		return renderRichTextItem(item, linkString, contentItem, options);
 	}
-	let result = parseNestedStringItems(item.string, contentItem, options);
+	if (item.payload != null) return parseXMLStringVariant(item, {
+		rendering: options.rendering,
+		parseEmail: options.parseEmail
+	});
+	let result = parseNestedStringItems(item.string ?? [], contentItem, options);
 	if (item.rend != null) result = parseRenderOptions(result, item.rend, options.rendering);
 	return applyWhitespaceToResult(result, item.whitespace, options.rendering);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",