@digitalculture/ochre-sdk 0.17.9 → 0.17.11

package/dist/index.mjs

@@ -69,6 +69,29 @@ function flattenProperties(properties) {
 * @internal
 */
 const uuidSchema = z.string().refine(isPseudoUuid, { error: "Invalid pseudo-UUID" });
+const richTextStringContentSchema = z.object({
+	content: z.union([
+		z.string(),
+		z.number(),
+		z.boolean()
+	]),
+	rend: z.string().optional(),
+	whitespace: z.string().optional()
+});
+/**
+* Schema for validating rich text string content
+* @internal
+*/
+const richTextStringSchema = z.object({
+	string: z.union([
+		z.string(),
+		z.number(),
+		z.boolean(),
+		richTextStringContentSchema,
+		z.array(richTextStringContentSchema)
+	]),
+	lang: z.string().optional()
+});
 /**
 * Schema for validating filters
 * @internal
@@ -3620,8 +3643,18 @@ const responseItemSchema = z.object({
 		type: z.string().optional(),
 		dataType: z.string().optional(),
 		publicationDateTime: z.string().optional(),
-		content: z.string().optional(),
-		rawValue: z.string().optional()
+		content: z.union([
+			z.string(),
+			z.number(),
+			z.boolean(),
+			richTextStringSchema,
+			z.array(richTextStringSchema)
+		]).optional(),
+		rawValue: z.union([
+			z.string(),
+			z.number(),
+			z.boolean()
+		]).optional()
 	})
 });
 /**
@@ -3682,7 +3715,7 @@ async function fetchPropertyValuesByPropertyVariables(params, options) {
 		for (const item of parsedItems) {
 			const categoryUuid = item.category.uuid;
 			const valueUuid = item.value.uuid;
-			const valueContent = item.value.rawValue ?? item.value.content ?? "";
+			const valueContent = item.value.rawValue?.toString() ?? (typeof item.value.content === "string" || typeof item.value.content === "number" || typeof item.value.content === "boolean" ? parseFakeString(item.value.content) : item.value.content != null ? parseStringContent({ content: item.value.content }) : "");
 			if (valueContent in items) items[valueContent].resultUuids.push(categoryUuid);
 			else items[valueContent] = {
 				value: {
@@ -3691,8 +3724,8 @@ async function fetchPropertyValuesByPropertyVariables(params, options) {
 					type: item.value.type ?? null,
 					dataType: item.value.dataType ?? null,
 					publicationDateTime: item.value.publicationDateTime ?? null,
-					content: item.value.rawValue ?? item.value.content ?? "",
-					label: item.value.rawValue != null && item.value.content != null ? item.value.content : null
+					content: valueContent,
+					label: item.value.rawValue != null && item.value.content != null ? typeof item.value.content === "string" || typeof item.value.content === "number" || typeof item.value.content === "boolean" ? item.value.content.toString() : Array.isArray(item.value.content) ? item.value.content.find((content) => content.lang === "eng")?.string.toString() ?? "" : item.value.content.string.toString() : null
 				},
 				resultUuids: [categoryUuid]
 			};
@@ -3702,7 +3735,7 @@ async function fetchPropertyValuesByPropertyVariables(params, options) {
 				const aValue = a.value.label ?? a.value.content;
 				const bValue = b.value.label ?? b.value.content;
 				return aValue.localeCompare(bValue, "en-US");
-			}),
+			}).filter((item) => item.value.content !== ""),
 			error: null
 		};
 	} catch (error) {

package/package.json

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