@digitalculture/ochre-sdk 0.18.4 → 0.18.5

package/dist/index.d.mts

@@ -604,6 +604,7 @@ type Gallery = {
 type PropertyValueQueryItem = {
   uuid: string | null;
   count: number;
+  dataType: Exclude<PropertyValueContentType, "coordinate">;
   label: string | null;
   content: string | number | boolean | null;
 };

package/dist/index.mjs

@@ -3708,14 +3708,15 @@ const propertyValueQueryItemSchema = z.object({
 		z.boolean()
 	]).optional().transform((val) => val ?? null)
 }).transform((val) => {
-	let value = val;
+	const { identification, ...rest } = val;
+	let value = { ...rest };
 	switch (val.dataType) {
 		case "IDREF":
 		case "string":
 		case "date":
 		case "dateTime":
 			value = {
-				...val,
+				...value,
 				content: val.content?.toString() ?? null
 			};
 			break;
@@ -3723,27 +3724,22 @@ const propertyValueQueryItemSchema = z.object({
 		case "decimal":
 		case "time":
 			value = {
-				...val,
+				...value,
 				content: val.content !== null ? Number(val.content) : null
 			};
 			break;
 		case "boolean":
 			value = {
-				...val,
+				...value,
 				content: val.content !== null ? Boolean(val.content) : null
 			};
 			break;
-		default:
-			value = val;
-			break;
-	}
-	if ("identification" in value && value.identification != null) {
-		const { identification, ...rest } = value;
-		value = {
-			...rest,
-			content: parseStringContent({ content: identification.label.content })
-		};
+		default: break;
 	}
+	if ("identification" in value && value.identification != null) value = {
+		...value,
+		content: identification?.label.content != null ? parseStringContent({ content: identification.label.content }) : null
+	};
 	return value;
 });
 /**
@@ -3780,7 +3776,7 @@ function buildXQuery(params, options) {
     let $matching-prop := ($props[value/@uuid = $val])[1]
     let $count := count($uuid-values[@uuid = $val])
     let $identification := $matching-prop/ancestor::*[parent::ochre]/identification
-    let $label := $identification/label/content/string/text())
+    let $label := string($identification/label/content/string/text())
     order by $count descending, $label ascending
     return <item count="{$count}" uuid="{$val}" dataType="{$uuid-dataType}">{$identification}</item>
 
@@ -3833,7 +3829,7 @@ async function fetchPropertyValuesByPropertyVariables(params, options) {
 		const parsedResultRaw = responseSchema.parse(data);
 		if (Array.isArray(parsedResultRaw.result)) throw new TypeError("No items found");
 		return {
-			items: (Array.isArray(parsedResultRaw.result.ochre.item) ? parsedResultRaw.result.ochre.item : [parsedResultRaw.result.ochre.item]).filter((item) => String(item.content).trim() !== ""),
+			items: (Array.isArray(parsedResultRaw.result.ochre.item) ? parsedResultRaw.result.ochre.item : [parsedResultRaw.result.ochre.item]).filter((item) => item.content?.toString().trim() !== ""),
 			error: null
 		};
 	} catch (error) {

package/package.json

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