ochre-sdk 1.0.43 → 1.0.45

package/dist/parsers/string.mjs

@@ -69,10 +69,6 @@ function applyMDXRenderElements(contentString, options) {
 function applyNewlineWhitespace(contentString, whitespace, rendering) {
 	if (whitespace == null) return contentString;
 	if (!whitespace.split(" ").includes("newline")) return contentString;
-	if (contentString === "") {
-		if (rendering === "rich") return "<br />\n<br />\n";
-		return "\n\n";
-	}
 	if (rendering === "rich") return contentString.trim() === "***" ? `${contentString}\n` : `<br />\n${contentString}`;
 	return `\n${contentString}`;
 }
@@ -245,7 +241,14 @@ function hasRichTextEnvelope(item) {
 	return item.properties?.property[0] != null || getXMLRichTextLinks(item).length > 0;
 }
 function parseXMLStringItem(item, contentItem, options) {
-	if (!(item.payload != null || item.string != null) && getXMLRichTextLinks(item).length === 0) return applyNewlineWhitespace("", item.whitespace, options.rendering);
+	if (!(item.payload != null && item.payload !== "" || item.string != null) && getXMLRichTextLinks(item).length === 0) {
+		const hasNewlineWhitespace = item.whitespace?.split(" ").includes("newline") === true;
+		const nextHasNewlineWhitespace = options.nextItem?.whitespace?.split(" ").includes("newline") === true;
+		if (hasNewlineWhitespace && options.rendering === "plain") return nextHasNewlineWhitespace ? "\n" : "\n\n";
+		if (hasNewlineWhitespace && options.rendering === "rawMDX") return nextHasNewlineWhitespace ? "\n<br />" : "\n<br />\n";
+		if (hasNewlineWhitespace && options.rendering === "rich") return nextHasNewlineWhitespace ? "<br />\n" : "<br />\n<br />\n";
+		return applyNewlineWhitespace("", item.whitespace, options.rendering);
+	}
 	if (hasRichTextEnvelope(item)) {
 		let linkString = item.payload != null ? parseXMLStringPayload(item, { rendering: options.rendering }) : parseNestedStringItems(item.string ?? [], contentItem, { ...options });
 		if (item.rend != null) linkString = parseRenderOptions(linkString, item.rend, options.rendering);
@@ -273,10 +276,10 @@ function parseNestedStringItems(items, contentItem, options) {
 				if (rawItem != null) rawMDXBlock += parseXMLStringItem(rawItem, contentItem, {
 					languages: options.languages,
 					rendering: rawMDXBlockRendering,
-					rawMDXBlocks: options.rawMDXBlocks
+					rawMDXBlocks: options.rawMDXBlocks,
+					nextItem: rawIndex + 1 < index ? items[rawIndex + 1] : void 0
 				});
 			}
-			if (rawMDXBlock !== "" && !rawMDXBlock.endsWith("\n") && item.whitespace?.split(" ").includes("newline") === true) rawMDXBlock += "\n";
 			if (options.rendering === "rich" && options.rawMDXBlocks != null) {
 				const placeholder = `${RAW_MDX_BLOCK_PLACEHOLDER_PREFIX}${options.rawMDXBlocks.length}${RAW_MDX_BLOCK_PLACEHOLDER_SUFFIX}`;
 				options.rawMDXBlocks.push(rawMDXBlock);
@@ -286,7 +289,10 @@ function parseNestedStringItems(items, contentItem, options) {
 			continue;
 		}
 		if (rawMDXBlockStartIndex != null) continue;
-		result += parseXMLStringItem(item, contentItem, options);
+		result += parseXMLStringItem(item, contentItem, {
+			...options,
+			nextItem: items[index + 1]
+		});
 	}
 	if (rawMDXBlockStartIndex != null) for (let index = rawMDXBlockStartIndex; index < items.length; index += 1) {
 		const item = items[index];

package/dist/parsers/website/index.mjs

@@ -806,10 +806,12 @@ function parseWebpage(webpageResource, options, context, slugPrefix) {
 	const webpageResources = webpageResource.resource != null ? normalizeWebsiteResources(webpageResource.resource) : [];
 	const items = [];
 	for (const resource of webpageResources) {
-		const resourceType = websitePresentationReader(resource.properties != null ? parseSimplifiedProperties(resource.properties, options) : []).value("presentation");
+		const resourceProperties = resource.properties != null ? parseSimplifiedProperties(resource.properties, options) : [];
+		const resourceType = websitePresentationReader(resourceProperties).value("presentation");
 		if (resourceType === null) continue;
 		switch (resourceType) {
 			case "element": {
+				if (websitePresentationReader(resourceProperties).nestedByValue("presentation", "element").value("component") === "sidebar") continue;
 				const element = parseWebElement(resource, options, context);
 				items.push(element);
 				break;
@@ -969,6 +971,7 @@ function parseWebBlock(blockResource, options, context) {
 	const blockProperties = blockResource.properties ? parseSimplifiedProperties(blockResource.properties, options) : [];
 	const returnBlock = {
 		uuid: blockResource.uuid,
+		language: blockResource.lang ?? null,
 		type: "block",
 		title: parseWebTitle(blockProperties, parseIdentification(blockResource.identification, options)),
 		items: [],

package/dist/types/website.d.mts

@@ -477,6 +477,7 @@ type WebAccordionItem<T extends LanguageCodes = LanguageCodes> = {
  */
 type WebBlock<T extends LanguageCodes = LanguageCodes, U extends WebBlockLayout = WebBlockLayout> = {
   uuid: string;
+  language: string | null;
   type: "block";
   title: WebTitle<T>;
   items: U extends "accordion" ? Array<WebAccordionItem<T> | WebBlockItem<T>> : Array<WebBlockItem<T>>;

package/package.json

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