ochre-sdk 1.0.0-beta.10 → 1.0.0-beta.12

package/dist/index.mjs

@@ -805,6 +805,7 @@ const ITEM_PAGE_TOKEN = "item-page";
 const ENTRY_PAGE_TOKEN = "entry-page";
 const VARIANT_TOKEN = "variant";
 const HEADING_LEVEL_TOKEN = "heading-level";
+const MDX_QUOTED_ATTRIBUTE_ESCAPE_REGEX = /[\n\r"]/;
 function isXMLRichTextLink(value) {
 	return typeof value === "object" && value != null;
 }
@@ -951,23 +952,27 @@ function createMDXComponent(variant, properties) {
 	let returnString = "";
 	switch (variant) {
 		case "inlineImage":
-			returnString = `<InlineImage uuid="${uuid}" ${content != null && content !== "" ? `content="${content}"` : ""} height={${height ?? "null"}} width={${width ?? "null"}} />`;
+			returnString = `<InlineImage uuid="${uuid}"${createMDXStringAttribute("content", content)} height={${height ?? "null"}} width={${width ?? "null"}} />`;
 			break;
 		case "internalLink":
-			returnString = `<InternalLink uuid="${uuid}"${content != null && content !== "" ? ` content="${content}"` : ""}>${text}</InternalLink>`;
+			returnString = `<InternalLink uuid="${uuid}"${createMDXStringAttribute("content", content)}>${text}</InternalLink>`;
 			break;
 		case "externalLink":
-			returnString = `<ExternalLink href="${href == null ? "#" : transformPermanentIdentificationUrl(href)}"${content != null && content !== "" ? ` content="${content}"` : ""}>${text}</ExternalLink>`;
+			returnString = `<ExternalLink href="${href == null ? "#" : transformPermanentIdentificationUrl(href)}"${createMDXStringAttribute("content", content)}>${text}</ExternalLink>`;
 			break;
 		case "documentLink":
-			returnString = String.raw`<ExternalLink href="https:\/\/ochre.lib.uchicago.edu/ochre/v2/ochre.php?uuid=${uuid}&load"${content != null && content !== "" ? ` content="${content}"` : ""}>${text}</ExternalLink>`;
+			returnString = String.raw`<ExternalLink href="https:\/\/ochre.lib.uchicago.edu/ochre/v2/ochre.php?uuid=${uuid}&load"${createMDXStringAttribute("content", content)}>${text}</ExternalLink>`;
 			break;
 		case "tooltipSpan":
-			returnString = `<TooltipSpan${content != null && content !== "" ? ` content="${content}"` : ""}>${text}</TooltipSpan>`;
+			returnString = `<TooltipSpan${createMDXStringAttribute("content", content)}>${text}</TooltipSpan>`;
 			break;
 	}
 	return returnString;
 }
+function createMDXStringAttribute(name, value) {
+	if (value == null || value === "") return "";
+	return ` ${name}=${MDX_QUOTED_ATTRIBUTE_ESCAPE_REGEX.test(value) ? `{${JSON.stringify(value)}}` : `"${value}"`}`;
+}
 function applyWhitespaceToResult(result, whitespace, rendering) {
 	return whitespace == null ? result : parseWhitespace(result, whitespace, rendering);
 }
@@ -1110,7 +1115,7 @@ 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}"` : ""}` : ""}${properties.content != null && properties.content !== "" ? ` 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", properties.content)}>${innerContent}</InternalLink>`;
 	}
 }
 function getXMLRichTextLinks(item) {
@@ -5006,12 +5011,19 @@ declare function local:put-property-detail(
   return
     if (
       empty($existing)
-      or (string-length(string($existing)) = 0 and string-length($display) gt 0)
+      or (not($existing/content) and exists($label-content))
+      or (
+        not($existing/content)
+        and string-length(string($existing)) = 0
+        and string-length($display) gt 0
+      )
     ) then
       map:put(
         $details,
         $key,
-        <propertyValue scope="{$scope}" variableUuid="{$variable-uuid}" uuid="{$value-uuid}" rawValue="{$raw-value}" dataType="{$data-type}">{$label-content}{$display}</propertyValue>
+        <propertyValue scope="{$scope}" variableUuid="{$variable-uuid}" uuid="{$value-uuid}" rawValue="{$raw-value}" dataType="{$data-type}">{
+          if (exists($label-content)) then $label-content else $display
+        }</propertyValue>
       )
     else ()
 };
@@ -5086,7 +5098,7 @@ let $property-values :=
     let $detail := map:get($variable-property-details, $key)
     let $global-key := map:get($variable-property-global-keys, $key)
     return <propertyValue scope="variable" variableUuid="{string($detail/@variableUuid)}" uuid="{string($detail/@uuid)}" rawValue="{string($detail/@rawValue)}" dataType="{string($detail/@dataType)}" count="{map:get($variable-property-counts, $key)}" globalCount="{map:get($global-property-counts, $global-key)}">{
-      string($detail)
+      $detail/node()
     }</propertyValue>
   )`);
 		returnedSequences.push("$property-values");

package/package.json

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