ochre-sdk 1.0.33 → 1.0.35

package/dist/fetchers/set/property-values.mjs

@@ -122,6 +122,7 @@ const propertyValueQueryItemSchema = v.pipe(v.object({
 	const dataType = normalizePropertyValueDataType(val.dataType);
 	const label = parsePropertyValueLabel(val.content, val.payload);
 	const returnValue = {
+		uuid: val.uuid !== "" ? val.uuid : null,
 		scope: val.scope,
 		variableUuid: val.variableUuid != null && val.variableUuid !== "" ? val.variableUuid : null,
 		count: val.count,
@@ -468,12 +469,14 @@ async function fetchSetPropertyValues(params, options) {
 		for (const propertyValue of parsedPropertyValues) {
 			if (propertyValue.content == null) continue;
 			const propertyValueItem = {
+				uuid: propertyValue.uuid,
 				count: propertyValue.count,
 				dataType: propertyValue.dataType,
 				content: propertyValue.content,
 				label: propertyValue.label
 			};
 			const globalPropertyValueItem = {
+				uuid: propertyValue.uuid,
 				count: propertyValue.globalCount ?? propertyValue.count,
 				dataType: propertyValue.dataType,
 				content: propertyValue.content,

package/dist/parsers/string.mjs

@@ -47,7 +47,7 @@ function transformPermanentIdentificationUrl(url) {
 function parseRenderOptions(contentString, renderString, rendering) {
 	const { success, output } = v.safeParse(renderOptionsSchema, renderString);
 	if (!success) return contentString;
-	if (rendering !== "rich") return contentString.replaceAll("'", "'");
+	if (rendering === "plain") return contentString.replaceAll("'", "'");
 	return applyRichRenderOptions(contentString, output).replaceAll("'", "'");
 }
 function applyRichRenderOptions(contentString, options) {
@@ -263,11 +263,13 @@ function parseNestedStringItems(items, contentItem, options) {
 				continue;
 			}
 			let rawMDXBlock = "";
+			const rawMDXBlockRendering = options.rendering === "plain" ? "plain" : "rawMDX";
 			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"
+					rendering: rawMDXBlockRendering,
+					rawMDXBlocks: options.rawMDXBlocks
 				});
 			}
 			if (item.whitespace?.split(" ").includes("newline") === true) rawMDXBlock += "\n";
@@ -335,7 +337,7 @@ function renderRichTextItem(item, linkString, contentItem, options) {
 	let result = "";
 	for (const link of links) {
 		const linkContent = link.identification != null ? "content" in link.identification.label ? parseXMLContent(link.identification.label, { languages }) : MultilingualString.create(contentItem.lang, parseXMLString(link.identification.label), languages) : MultilingualString.create(contentItem.lang, "", languages);
-		const contentText = (rendering === "rich" ? linkContent.getExactRichText(contentItem.lang) : linkContent.getExactText(contentItem.lang)) ?? "";
+		const contentText = (rendering === "plain" ? linkContent.getExactText(contentItem.lang) : linkContent.getExactRichText(contentItem.lang)) ?? "";
 		if ("type" in link && link.type != null) switch (link.type) {
 			case "IIIF":
 			case "image":

package/dist/types/index.d.mts

@@ -739,6 +739,7 @@ type Gallery<T extends LanguageCodes = LanguageCodes> = {
  * Represents a property query item with its UUID, raw value, count, and content
  */
 type PropertyValueQueryItem = {
+  uuid: string | null;
   count: number;
   dataType: QueryablePropertyValueDataType;
   content: string | number | boolean | null;

package/dist/types/website.d.mts

@@ -2,7 +2,6 @@ import { MultilingualString } from "../parsers/multilingual.mjs";
 import { Bibliography, Identification, ItemCategory, LanguageCodes, License, Metadata, Person, QueryablePropertyValueDataType } from "./index.mjs";
 
 //#region src/types/website.d.ts
-type WebsitePropertyValueDataType = QueryablePropertyValueDataType;
 /**
  * Represents a context tree level item with a variable and value
  */
@@ -78,7 +77,7 @@ type StylesheetItem = {
 type WebsitePropertyQueryNode<T extends LanguageCodes = LanguageCodes> = {
   target: "property";
   propertyVariable: string;
-  dataType: WebsitePropertyValueDataType;
+  dataType: QueryablePropertyValueDataType;
   matchMode: "includes" | "exact";
   isCaseSensitive: boolean;
   language: T[number];

package/package.json

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