@digitalculture/ochre-sdk 0.18.7 → 0.18.8

package/dist/index.mjs

@@ -3851,18 +3851,19 @@ async function fetchItemsByUuidsAndLinks(params, categoryParams, options) {
 * Schema for a single property value query item in the OCHRE API response
 */
 const propertyValueQueryItemSchema = z.object({
-	uuid: z.string().optional(),
+	uuid: z.string(),
 	dataType: z.string(),
-	identification: identificationSchema.optional(),
 	rawValue: z.union([
 		z.string(),
 		z.number(),
 		z.boolean()
 	]).optional(),
-	value: z.union([
+	content: z.union([
 		z.string(),
 		z.number(),
-		z.boolean()
+		z.boolean(),
+		richTextStringSchema,
+		z.array(richTextStringSchema)
 	]).optional()
 }).transform((val) => {
 	const returnValue = {
@@ -3872,28 +3873,22 @@ const propertyValueQueryItemSchema = z.object({
 	};
 	switch (val.dataType) {
 		case "IDREF":
-			returnValue.content = val.uuid != null ? val.uuid || null : null;
-			returnValue.label = val.identification != null ? parseStringContent({ content: val.identification.label.content }) : null;
-			break;
-		case "string":
-		case "date":
-		case "dateTime":
-			returnValue.content = val.rawValue?.toString() ?? null;
-			returnValue.label = val.value?.toString() ?? null;
+			returnValue.content = val.uuid !== "" ? val.uuid : null;
+			returnValue.label = val.content != null && val.content !== "" ? typeof val.content === "object" ? parseStringContent({ content: val.content }) : parseFakeString(val.content) : null;
 			break;
 		case "integer":
 		case "decimal":
 		case "time":
-			returnValue.content = val.rawValue != null ? Number(val.rawValue) : null;
-			returnValue.label = val.value?.toString() ?? null;
+			returnValue.content = val.rawValue != null && val.rawValue !== "" ? Number(val.rawValue) : null;
+			returnValue.label = val.content != null && val.content !== "" ? val.content.toString() : null;
 			break;
 		case "boolean":
-			returnValue.content = val.rawValue != null ? Boolean(val.rawValue) : null;
-			returnValue.label = val.value?.toString() ?? null;
+			returnValue.content = val.rawValue != null && val.rawValue !== "" ? Boolean(val.rawValue) : null;
+			returnValue.label = val.content != null && val.content !== "" ? val.content.toString() : null;
 			break;
 		default:
-			returnValue.content = val.rawValue?.toString() ?? null;
-			returnValue.label = val.value?.toString() ?? null;
+			returnValue.content = val.rawValue != null && val.rawValue !== "" ? val.rawValue.toString() : null;
+			returnValue.label = val.content != null && val.content !== "" ? val.content.toString() : null;
 			break;
 	}
 	return returnValue;
@@ -3901,7 +3896,7 @@ const propertyValueQueryItemSchema = z.object({
 /**
 * Schema for the property values by property variables OCHRE API response
 */
-const responseSchema = z.object({ result: z.union([z.object({ ochre: z.object({ item: z.union([propertyValueQueryItemSchema, z.array(propertyValueQueryItemSchema)]) }) }), z.array(z.unknown()).length(0)]) });
+const responseSchema = z.object({ result: z.union([z.object({ ochre: z.object({ propertyValue: z.union([propertyValueQueryItemSchema, z.array(propertyValueQueryItemSchema)]) }) }), z.array(z.unknown()).length(0)]) });
 /**
 * Build an XQuery string to fetch property values by property variables from the OCHRE API
 * @param params - The parameters for the fetch
@@ -3924,9 +3919,9 @@ function buildXQuery(params, options) {
       /value
 
   for $v in $values
-  return <item uuid="{$v/@uuid}" rawValue="{$v/@rawValue}" dataType="{$v/@dataType}" value="{string($v)}">{
-    if (string($v/@uuid) != "") then $v/ancestor::*[parent::ochre]/identification else ()
-  }</item>`}}</ochre>`;
+  return <propertyValue uuid="{$v/@uuid}" rawValue="{$v/@rawValue}" dataType="{$v/@dataType}">{
+    if ($v/content) then $v/content else $v/text()
+  }</propertyValue>`}}</ochre>`;
 }
 /**
 * Fetches and parses property values by property variables from the OCHRE API
@@ -3954,7 +3949,7 @@ async function fetchPropertyValuesByPropertyVariables(params, options) {
 		const data = await response.json();
 		const parsedResultRaw = responseSchema.parse(data);
 		if (Array.isArray(parsedResultRaw.result)) throw new TypeError("No items found");
-		const parsedItems = Array.isArray(parsedResultRaw.result.ochre.item) ? parsedResultRaw.result.ochre.item : [parsedResultRaw.result.ochre.item];
+		const parsedItems = Array.isArray(parsedResultRaw.result.ochre.propertyValue) ? parsedResultRaw.result.ochre.propertyValue : [parsedResultRaw.result.ochre.propertyValue];
 		const groupedItems = [];
 		for (const item of parsedItems) {
 			const existingItem = groupedItems.find((i) => i.content === item.content);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalculture/ochre-sdk",
-  "version": "0.18.7",
+  "version": "0.18.8",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@antfu/eslint-config": "^7.2.0",
-    "@types/node": "^24.10.9",
+    "@types/node": "^24.10.10",
     "bumpp": "^10.4.0",
     "eslint": "^9.39.2",
     "prettier": "^3.8.1",