ochre-sdk 0.20.4 → 0.20.6

package/dist/index.d.mts

@@ -1254,9 +1254,11 @@ declare function fetchSetPropertyValuesByPropertyVariables(params: {
   version?: ApiVersion;
 }): Promise<{
   propertyValues: Array<PropertyValueQueryItem> | null;
+  propertyValuesByPropertyVariableUuid: Record<string, Array<PropertyValueQueryItem>> | null;
   error: null;
 } | {
   propertyValues: null;
+  propertyValuesByPropertyVariableUuid: null;
   error: string;
 }>;
 //#endregion

package/dist/index.mjs

@@ -2343,11 +2343,59 @@ async function fetchSetItems(params, itemCategories, options) {
 
 //#endregion
 //#region src/utils/fetchers/set/property-values-by-property-variables.ts
+function parsePropertyValueLabel(content) {
+	if (content == null || content === "") return null;
+	if (typeof content === "object") return parseStringContent({ content });
+	return parseFakeString(content);
+}
+function parsePropertyValueBooleanContent(rawValue) {
+	if (rawValue == null || rawValue === "") return null;
+	if (typeof rawValue === "boolean") return rawValue;
+	return rawValue.toString().toLocaleLowerCase("en-US") === "true";
+}
+function getPropertyValueGroupKey(value) {
+	const contentKey = value.content == null ? "null" : `${typeof value.content}:${value.content.toLocaleString("en-US")}`;
+	return `${value.dataType}|${contentKey}`;
+}
+function aggregatePropertyValues(values) {
+	const groupedPropertyValuesMap = /* @__PURE__ */ new Map();
+	for (const value of values) {
+		const key = getPropertyValueGroupKey(value);
+		const existing = groupedPropertyValuesMap.get(key);
+		if (existing == null) {
+			groupedPropertyValuesMap.set(key, {
+				dataType: value.dataType,
+				content: value.content,
+				label: value.label,
+				itemUuids: new Set([value.itemUuid])
+			});
+			continue;
+		}
+		existing.itemUuids.add(value.itemUuid);
+		if (existing.label == null && value.label != null) existing.label = value.label;
+	}
+	const groupedPropertyValues = [];
+	for (const group of groupedPropertyValuesMap.values()) {
+		if (group.content == null) continue;
+		groupedPropertyValues.push({
+			count: group.itemUuids.size,
+			dataType: group.dataType,
+			content: group.content,
+			label: group.label
+		});
+	}
+	return groupedPropertyValues.toSorted((a, b) => {
+		if (a.count !== b.count) return b.count - a.count;
+		if (a.label !== b.label) return a.label?.localeCompare(b.label ?? "") ?? 0;
+		return a.content?.toString().localeCompare(b.content?.toString() ?? "") ?? 0;
+	});
+}
 /**
 * Schema for a single property value query item in the OCHRE API response
 */
 const propertyValueQueryItemSchema = z.object({
 	uuid: z.string(),
+	variableUuid: z.string().optional(),
 	itemUuid: z.string().optional(),
 	dataType: z.string(),
 	rawValue: fakeStringSchema.optional(),
@@ -2358,6 +2406,7 @@ const propertyValueQueryItemSchema = z.object({
 	]).optional()
 }).transform((val) => {
 	const returnValue = {
+		variableUuid: val.variableUuid != null && val.variableUuid !== "" ? val.variableUuid : null,
 		itemUuid: val.itemUuid != null && val.itemUuid !== "" ? val.itemUuid : null,
 		dataType: val.dataType,
 		content: null,
@@ -2366,21 +2415,24 @@ const propertyValueQueryItemSchema = z.object({
 	switch (val.dataType) {
 		case "IDREF":
 			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;
+			returnValue.label = parsePropertyValueLabel(val.content);
 			break;
 		case "integer":
 		case "decimal":
 		case "time":
-			returnValue.content = val.rawValue != null && val.rawValue !== "" ? Number(val.rawValue) : null;
-			returnValue.label = val.content != null && val.content !== "" ? val.content.toString() : null;
+			if (val.rawValue != null && val.rawValue !== "") {
+				const numericContent = Number(val.rawValue);
+				returnValue.content = Number.isNaN(numericContent) ? null : numericContent;
+			}
+			returnValue.label = parsePropertyValueLabel(val.content);
 			break;
 		case "boolean":
-			returnValue.content = val.rawValue != null && val.rawValue !== "" ? Boolean(val.rawValue) : null;
-			returnValue.label = val.content != null && val.content !== "" ? val.content.toString() : null;
+			returnValue.content = parsePropertyValueBooleanContent(val.rawValue);
+			returnValue.label = parsePropertyValueLabel(val.content);
 			break;
 		default:
 			returnValue.content = val.rawValue != null && val.rawValue !== "" ? val.rawValue.toString() : null;
-			returnValue.label = val.content != null && val.content !== "" ? val.content.toString() : null;
+			returnValue.label = parsePropertyValueLabel(val.content);
 			break;
 	}
 	return returnValue;
@@ -2413,10 +2465,12 @@ function buildXQuery(params, options) {
       ${collectionScopeFilter}
       //property[label/(${propertyVariableFilters})]
 
-  for $v in $matching-props/value${isLimitedToLeafPropertyValues ? "[not(@i)]" : ""}
+  for $p in $matching-props
+  for $v in $p/value${isLimitedToLeafPropertyValues ? "[not(@i)]" : ""}
     let $item-uuid := $v/ancestor::*[parent::items]/@uuid
-    return <propertyValue uuid="{$v/@uuid}" rawValue="{$v/@rawValue}" dataType="{$v/@dataType}" itemUuid="{$item-uuid}">{
-      if ($v/content) then $v/content else $v/text()
+    let $variable-uuid := $p/label/@uuid
+    return <propertyValue uuid="{$v/@uuid}" rawValue="{$v/@rawValue}" dataType="{$v/@dataType}" itemUuid="{$item-uuid}" variableUuid="{$variable-uuid}">{
+      if ($v/content) then string-join($v/content[@xml:lang="eng"]/string, "") else $v/text()
     }</propertyValue>`}}</ochre>`;
 }
 /**
@@ -2448,36 +2502,34 @@ async function fetchSetPropertyValuesByPropertyVariables(params, options) {
 		const parsedResultRaw = responseSchema.parse(data);
 		if (Array.isArray(parsedResultRaw.result)) throw new TypeError("No property values found");
 		const parsedPropertyValues = Array.isArray(parsedResultRaw.result.ochre.propertyValue) ? parsedResultRaw.result.ochre.propertyValue : [parsedResultRaw.result.ochre.propertyValue];
-		const groupedPropertyValuesMap = /* @__PURE__ */ new Map();
+		const propertyValuesByPropertyVariableUuidRaw = {};
+		const flattenedPropertyValues = [];
 		for (const propertyValue of parsedPropertyValues) {
-			const existing = groupedPropertyValuesMap.get(propertyValue.content);
-			if (existing == null) groupedPropertyValuesMap.set(propertyValue.content, {
+			const aggregatePropertyValueItem = {
+				itemUuid: propertyValue.itemUuid,
 				dataType: propertyValue.dataType,
 				content: propertyValue.content,
-				label: propertyValue.label,
-				itemUuids: new Set([propertyValue.itemUuid])
-			});
-			else existing.itemUuids.add(propertyValue.itemUuid);
+				label: propertyValue.label
+			};
+			flattenedPropertyValues.push(aggregatePropertyValueItem);
+			if (propertyValue.variableUuid == null) continue;
+			(propertyValuesByPropertyVariableUuidRaw[propertyValue.variableUuid] ??= []).push(aggregatePropertyValueItem);
+		}
+		const propertyValuesByPropertyVariableUuid = {};
+		for (const [propertyVariableUuid, values] of Object.entries(propertyValuesByPropertyVariableUuidRaw)) {
+			const aggregatedValues = aggregatePropertyValues(values);
+			if (aggregatedValues.length > 0) propertyValuesByPropertyVariableUuid[propertyVariableUuid] = aggregatedValues;
 		}
-		const groupedPropertyValues = [];
-		for (const group of groupedPropertyValuesMap.values()) groupedPropertyValues.push({
-			count: group.itemUuids.size,
-			dataType: group.dataType,
-			content: group.content,
-			label: group.label
-		});
 		return {
-			propertyValues: groupedPropertyValues.filter((propertyValue) => propertyValue.content !== null).toSorted((a, b) => {
-				if (a.count !== b.count) return b.count - a.count;
-				if (a.label !== b.label) return a.label?.localeCompare(b.label ?? "") ?? 0;
-				return a.content?.toString().localeCompare(b.content?.toString() ?? "") ?? 0;
-			}),
+			propertyValues: aggregatePropertyValues(flattenedPropertyValues),
+			propertyValuesByPropertyVariableUuid,
 			error: null
 		};
 	} catch (error) {
 		console.error(error);
 		return {
 			propertyValues: null,
+			propertyValuesByPropertyVariableUuid: null,
 			error: error instanceof Error ? error.message : "Failed to fetch property values by property variables"
 		};
 	}

package/package.json

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