ochre-sdk 1.0.22 → 1.0.24

package/dist/parsers/string.mjs

@@ -12,6 +12,9 @@ const ITEM_PAGE_TOKEN = "item-page";
 const ENTRY_PAGE_TOKEN = "entry-page";
 const VARIANT_TOKEN = "variant";
 const HEADING_LEVEL_TOKEN = "heading-level";
+const RAW_MDX_BLOCK_DELIMITER = "```***```";
+const RAW_MDX_BLOCK_PLACEHOLDER_PREFIX = "\0raw-mdx-block:";
+const RAW_MDX_BLOCK_PLACEHOLDER_SUFFIX = "\0";
 const MDX_QUOTED_ATTRIBUTE_ESCAPE_REGEX = /[\n\r"]/;
 const MDX_RENDER_ELEMENTS = {
 	bold: "strong",
@@ -252,7 +255,37 @@ function parseXMLStringItem(item, contentItem, options) {
 }
 function parseNestedStringItems(items, contentItem, options) {
 	let result = "";
-	for (const item of items) result += parseXMLStringItem(item, contentItem, options);
+	let rawMDXBlockStartIndex = null;
+	for (const [index, item] of items.entries()) {
+		if (item.payload === RAW_MDX_BLOCK_DELIMITER && item.rend == null && item.links == null && item.properties == null && item.annotation == null && item.string == null) {
+			if (rawMDXBlockStartIndex == null) {
+				rawMDXBlockStartIndex = index;
+				continue;
+			}
+			let rawMDXBlock = "";
+			for (let rawIndex = rawMDXBlockStartIndex + 1; rawIndex < index; rawIndex += 1) {
+				const rawItem = items[rawIndex];
+				if (rawItem != null) rawMDXBlock += parseXMLStringItem(rawItem, contentItem, {
+					languages: options.languages,
+					rendering: "plain"
+				});
+			}
+			if (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);
+				result += placeholder;
+			} else result += rawMDXBlock;
+			rawMDXBlockStartIndex = null;
+			continue;
+		}
+		if (rawMDXBlockStartIndex != null) continue;
+		result += parseXMLStringItem(item, contentItem, options);
+	}
+	if (rawMDXBlockStartIndex != null) for (let index = rawMDXBlockStartIndex; index < items.length; index += 1) {
+		const item = items[index];
+		if (item != null) result += parseXMLStringItem(item, contentItem, options);
+	}
 	return result;
 }
 function isTextAnnotationMarkerLink(link) {
@@ -419,16 +452,19 @@ function parseXMLContent(item, options) {
 	return MultilingualString.empty(languages, { aliases });
 }
 function parseXMLContentItem(contentItem, options) {
-	const richText = parseNestedStringItems(contentItem.string, contentItem, {
+	const rawMDXBlocks = [];
+	let serializedRichText = serializeMDXContent(parseNestedStringItems(contentItem.string, contentItem, {
 		...options,
-		rendering: "rich"
-	});
+		rendering: "rich",
+		rawMDXBlocks
+	}));
+	for (const [index, rawMDXBlock] of rawMDXBlocks.entries()) serializedRichText = serializedRichText.replaceAll(`${RAW_MDX_BLOCK_PLACEHOLDER_PREFIX}${index}${RAW_MDX_BLOCK_PLACEHOLDER_SUFFIX}`, rawMDXBlock);
 	return {
 		text: parseNestedStringItems(contentItem.string, contentItem, {
 			...options,
 			rendering: "plain"
 		}),
-		richText: serializeMDXContent(richText)
+		richText: serializedRichText
 	};
 }
 /**

package/dist/xml/schemas.mjs

@@ -201,7 +201,7 @@ const XMLImage = v.object({
 	fileSize: XMLOptionalNumber,
 	payload: v.optional(v.string("XMLImage: payload is string and optional"))
 }, "XMLImage: Shape error");
-const XMLImageMapArea = v.pipe(v.object({
+const XMLImageMapArea = v.object({
 	uuid: v.pipe(v.string("XMLImageMapArea: uuid is string and required"), v.check(isPseudoUuid, "XMLImageMapArea: uuid is not a valid pseudo-UUID")),
 	publicationDateTime: v.optional(customDateTime("XMLImageMapArea: publicationDateTime is not a valid datetime")),
 	type: v.string("XMLImageMapArea: type is string and required"),
@@ -213,7 +213,7 @@ const XMLImageMapArea = v.pipe(v.object({
 		"poly"
 	], "XMLImageMapArea: shape is rect, circle, or poly"),
 	coords: v.string("XMLImageMapArea: coords is string and required")
-}, "XMLImageMapArea: Shape error"), v.check((area) => area.type === "person" || area.publicationDateTime != null, "XMLImageMapArea: publicationDateTime is required unless type is person"));
+}, "XMLImageMapArea: Shape error");
 const XMLImageMap = v.object({
 	area: v.array(XMLImageMapArea, "XMLImageMap: area is array of XMLImageMapArea"),
 	width: XMLNumber,

package/package.json

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