ochre-sdk 0.22.18 → 0.22.20

package/dist/index.d.mts

@@ -300,6 +300,7 @@ type Event = {
 type Interpretation = {
   date: string | null;
   number: number;
+  notes: Array<Note>;
   links: Array<Link>;
   properties: Array<Property>;
   bibliographies: Array<Bibliography>;

package/dist/index.mjs

@@ -1292,7 +1292,7 @@ function parseObservation(observation) {
 * @returns Array of parsed Observation objects
 */
 function parseObservations(observations) {
-	return observations.map((obs) => parseObservation(obs));
+	return observations.map((observation) => parseObservation(observation));
 }
 /**
 * Parses an array of raw events into standardized Event objects
@@ -1435,12 +1435,13 @@ function parseProperties(properties, language = "eng") {
 * @returns Array of parsed Interpretation objects
 */
 function parseInterpretations(interpretations) {
-	return interpretations.map((interp) => ({
-		date: interp.date ?? null,
-		number: interp.interpretationNo,
-		links: interp.links ? parseLinks(ensureArray(interp.links)) : [],
-		properties: interp.properties ? parseProperties(ensureArray(interp.properties.property)) : [],
-		bibliographies: interp.bibliographies ? parseBibliographies(ensureArray(interp.bibliographies.bibliography)) : []
+	return interpretations.map((interpretation) => ({
+		date: interpretation.date ?? null,
+		number: interpretation.interpretationNo,
+		notes: interpretation.notes ? parseNotes(ensureArray(interpretation.notes.note)) : [],
+		links: interpretation.links ? parseLinks(ensureArray(interpretation.links)) : [],
+		properties: interpretation.properties ? parseProperties(ensureArray(interpretation.properties.property)) : [],
+		bibliographies: interpretation.bibliographies ? parseBibliographies(ensureArray(interpretation.bibliographies.bibliography)) : []
 	}));
 }
 /**
@@ -2275,13 +2276,8 @@ function buildRichTextPhraseQueryExpression(params) {
 	const { value, isCaseSensitive } = params;
 	return `cts:word-query(${stringLiteral(value)}, ${buildRichTextPhraseOptionsExpression({ isCaseSensitive })})`;
 }
-function buildCtsNearQueryExpression(params) {
-	const { queryExpressions, distance, isOrdered = false } = params;
-	const options = isOrdered ? `, (${stringLiteral("ordered")})` : "";
-	return `cts:near-query((${queryExpressions.join(", ")}), ${distance}${options})`;
-}
 function buildRichTextExactQueryExpression(params) {
-	const { value, isCaseSensitive, language } = params;
+	const { value, isCaseSensitive } = params;
 	const phraseQuery = buildRichTextPhraseQueryExpression({
 		value,
 		isCaseSensitive
@@ -2291,17 +2287,10 @@ function buildRichTextExactQueryExpression(params) {
 		isCaseSensitive
 	});
 	if (terms.length <= 1) return phraseQuery;
-	return buildOrCtsQueryExpressionInternal([phraseQuery, buildCtsNearQueryExpression({
-		queryExpressions: terms.map((term) => buildCtsWordQueryExpression({
-			value: term,
-			matchMode: "exact",
-			isCaseSensitive,
-			queryFamily: "text",
-			language
-		})),
-		distance: 2,
-		isOrdered: true
-	})]);
+	return buildOrCtsQueryExpressionInternal([phraseQuery, buildAndCtsQueryExpressionInternal(terms.map((term) => buildRichTextPhraseQueryExpression({
+		value: term,
+		isCaseSensitive
+	})))]);
 }
 function buildCtsElementWordQueryExpression(params) {
 	const { elementName, value, matchMode, isCaseSensitive, queryFamily, language } = params;
@@ -2522,6 +2511,16 @@ function buildPropertyStringQueryExpression(params) {
 			value,
 			matchMode,
 			isCaseSensitive
+		}),
+		rawValueQueryExpression: buildValueRawValueInnerQuery({
+			value,
+			matchMode,
+			isCaseSensitive
+		}),
+		bareValueQueryExpression: buildValueDirectTextInnerQuery({
+			value,
+			matchMode,
+			isCaseSensitive
 		})
 	});
 }
@@ -3041,6 +3040,47 @@ function buildOrderedItemsClause(sort) {
 	})}
       return $item`;
 }
+function isExactStringPropertyQuery(query) {
+	return "target" in query && query.target === "property" && query.dataType === "string" && query.value != null && query.matchMode === "exact" && query.isNegated !== true;
+}
+function getCtsQueriesWithoutExactStringPropertyQueries(queries) {
+	if (queries == null) return null;
+	if ("target" in queries) return isExactStringPropertyQuery(queries) ? null : queries;
+	if ("or" in queries) return queries;
+	const filteredChildren = [];
+	for (const childQuery of queries.and) {
+		const filteredChildQuery = getCtsQueriesWithoutExactStringPropertyQueries(childQuery);
+		if (filteredChildQuery != null) filteredChildren.push(filteredChildQuery);
+	}
+	if (filteredChildren.length === 0) return null;
+	return filteredChildren.length === 1 ? filteredChildren[0] ?? null : { and: filteredChildren };
+}
+function buildExactStringPropertyPredicate(query) {
+	const propertyPredicates = [];
+	const value = stringLiteral(query.value);
+	if (query.propertyVariable != null) propertyPredicates.push(`label/@uuid = ${stringLiteral(query.propertyVariable)}`);
+	propertyPredicates.push(`value[
+    not(@inherited = "true")
+    and (
+      content[@xml:lang = ${stringLiteral(query.language)}]/string = ${value}
+      or @rawValue = ${value}
+      or (not(content) and text() = ${value})
+    )
+  ]`);
+	return `.//properties/property[${propertyPredicates.join(" and ")}]`;
+}
+function buildExactStringPropertyXPathFilterExpression(queries) {
+	if (queries == null) return null;
+	if ("target" in queries) return isExactStringPropertyQuery(queries) ? buildExactStringPropertyPredicate(queries) : null;
+	if ("or" in queries) return null;
+	const childExpressions = [];
+	for (const childQuery of queries.and) {
+		const childExpression = buildExactStringPropertyXPathFilterExpression(childQuery);
+		if (childExpression != null) childExpressions.push(childExpression);
+	}
+	if (childExpressions.length === 0) return null;
+	return childExpressions.join(" and ");
+}
 /**
 * Build an XQuery string to fetch Set items from the OCHRE API
 * @param params - The parameters for the fetch
@@ -3058,7 +3098,9 @@ function buildXQuery$1(params) {
 	const startPosition = (page - 1) * pageSize + 1;
 	const setScopeDeclaration = `declare variable $setScopeUuids := (${setScopeUuids.map((uuid) => stringLiteral(uuid)).join(", ")});`;
 	const baseItemsExpression = "doc()/ochre/set[@uuid = $setScopeUuids]/items/*";
-	const compiledQueryPlan = buildQueryPlan({ queries });
+	const ctsQueries = getCtsQueriesWithoutExactStringPropertyQueries(queries);
+	const exactStringPropertyXPathFilterExpression = buildExactStringPropertyXPathFilterExpression(queries);
+	const compiledQueryPlan = buildQueryPlan({ queries: ctsQueries });
 	const itemsQueryExpressions = [];
 	const belongsToCollectionQueryExpression = buildBelongsToCollectionQueryExpression(belongsToCollectionScopeUuids, BELONGS_TO_COLLECTION_UUID);
 	if (compiledQueryPlan.queryExpression != null) itemsQueryExpressions.push(compiledQueryPlan.queryExpression);
@@ -3067,8 +3109,11 @@ function buildXQuery$1(params) {
 	const orderedItemsClause = buildOrderedItemsClause(sort);
 	const xqueryDeclarations = ["xquery version \"1.0-ml\";", setScopeDeclaration];
 	if (compiledQueryPlan.prolog !== "") xqueryDeclarations.push(compiledQueryPlan.prolog);
-	const itemsClause = itemsQueryExpression == null ? `let $items := ${baseItemsExpression}` : `let $query := ${itemsQueryExpression}
-  let $items := cts:search(${baseItemsExpression}, $query)`;
+	const searchedItemsClause = itemsQueryExpression == null ? `let $searchedItems := ${baseItemsExpression}` : `let $query := ${itemsQueryExpression}
+  let $searchedItems := cts:search(${baseItemsExpression}, $query)`;
+	const itemsClause = exactStringPropertyXPathFilterExpression == null ? `${searchedItemsClause}
+  let $items := $searchedItems` : `${searchedItemsClause}
+  let $items := $searchedItems[${exactStringPropertyXPathFilterExpression}]`;
 	return `${xqueryDeclarations.join("\n\n")}
 
 <ochre>{
@@ -3201,67 +3246,27 @@ function parsePropertyValueBooleanContent(rawValue) {
 	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) => {
+function sortPropertyValues(values) {
+	return values.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;
 	});
 }
-function aggregateAttributeValues(values) {
-	const groupedAttributeValuesMap = /* @__PURE__ */ new Map();
-	for (const value of values) {
-		if (value.content == null || value.content === "") continue;
-		const existing = groupedAttributeValuesMap.get(value.content);
-		if (existing == null) {
-			groupedAttributeValuesMap.set(value.content, {
-				content: value.content,
-				itemUuids: new Set([value.itemUuid])
-			});
-			continue;
-		}
-		existing.itemUuids.add(value.itemUuid);
-	}
-	const groupedAttributeValues = [];
-	for (const group of groupedAttributeValuesMap.values()) groupedAttributeValues.push({
-		count: group.itemUuids.size,
-		content: group.content
-	});
-	return groupedAttributeValues.toSorted((a, b) => {
+function getPropertyValueKey(value) {
+	return `${value.dataType}|${typeof value.content}:${value.content.toLocaleString("en-US")}`;
+}
+function sortAttributeValues(values) {
+	return values.toSorted((a, b) => {
 		if (a.count !== b.count) return b.count - a.count;
 		return a.content.localeCompare(b.content);
 	});
 }
+const countSchema = z.union([z.number(), z.string()]).optional().transform((val) => {
+	if (val == null || val === "") return 1;
+	const count = Number(val);
+	return Number.isFinite(count) ? count : 1;
+});
 function getPropertyVariableUuidsFromQueries(queries) {
 	const propertyVariableUuids = /* @__PURE__ */ new Set();
 	if (queries == null) return [];
@@ -3298,8 +3303,10 @@ function getItemFilterQueriesFromPropertyValueQueries(queries) {
 */
 const propertyValueQueryItemSchema = z.object({
 	uuid: z.string(),
+	scope: z.enum(["global", "variable"]).default("global"),
 	variableUuid: z.string().optional(),
-	itemUuid: z.string().optional(),
+	count: countSchema,
+	globalCount: countSchema.nullish(),
 	dataType: z.string(),
 	rawValue: fakeStringSchema.optional(),
 	content: z.union([
@@ -3309,8 +3316,10 @@ const propertyValueQueryItemSchema = z.object({
 	]).optional()
 }).transform((val) => {
 	const returnValue = {
+		scope: val.scope,
 		variableUuid: val.variableUuid != null && val.variableUuid !== "" ? val.variableUuid : null,
-		itemUuid: val.itemUuid != null && val.itemUuid !== "" ? val.itemUuid : null,
+		count: val.count,
+		globalCount: val.globalCount ?? null,
 		dataType: val.dataType,
 		content: null,
 		label: null
@@ -3342,11 +3351,11 @@ const propertyValueQueryItemSchema = z.object({
 });
 const attributeValueQueryItemSchema = z.object({
 	attributeType: z.enum(["bibliographies", "periods"]),
-	itemUuid: z.string().optional(),
+	count: countSchema,
 	content: z.string().optional()
 }).transform((val) => ({
 	attributeType: val.attributeType,
-	itemUuid: val.itemUuid != null && val.itemUuid !== "" ? val.itemUuid : null,
+	count: val.count,
 	content: val.content != null && val.content !== "" ? val.content : null
 }));
 /**
@@ -3371,9 +3380,8 @@ const responseSchema = z.object({ result: z.union([z.object({ ochre: z.object({
 */
 function buildXQuery(params) {
 	const { setScopeUuids, belongsToCollectionScopeUuids, queries, propertyVariableUuids, attributes, isLimitedToLeafPropertyValues } = params;
-	const setScopeValues = setScopeUuids.map((uuid) => stringLiteral(uuid));
-	const setScopeDeclaration = setScopeValues.length > 0 ? `declare variable $setScopeUuids := (${setScopeValues.join(", ")});` : "";
-	const baseItemsExpression = setScopeValues.length > 0 ? "doc()/ochre/set[@uuid = $setScopeUuids]/items/*" : "doc()/ochre/set/items/*";
+	const setScopeDeclaration = `declare variable $setScopeUuids := (${setScopeUuids.map((uuid) => stringLiteral(uuid)).join(", ")});`;
+	const baseItemsExpression = "doc()/ochre/set[@uuid = $setScopeUuids]/items/*";
 	const compiledQueryPlan = buildQueryPlan({ queries: getItemFilterQueriesFromPropertyValueQueries(queries) });
 	const itemsQueryExpressions = [];
 	const belongsToCollectionQueryExpression = buildBelongsToCollectionQueryExpression(belongsToCollectionScopeUuids, BELONGS_TO_COLLECTION_UUID);
@@ -3383,39 +3391,186 @@ function buildXQuery(params) {
 	const valueFilter = isLimitedToLeafPropertyValues ? "[not(@i)]" : "";
 	const queryBlocks = [];
 	const returnedSequences = [];
-	const xqueryDeclarations = ["xquery version \"1.0-ml\";"];
-	if (setScopeDeclaration !== "") xqueryDeclarations.push(setScopeDeclaration);
+	const xqueryDeclarations = [
+		"xquery version \"1.0-ml\";",
+		"declare namespace map = \"http://marklogic.com/xdmp/map\";",
+		setScopeDeclaration,
+		`declare function local:increment-count($counts, $key) {
+  let $current := map:get($counts, $key)
+  return map:put(
+    $counts,
+    $key,
+    if (empty($current)) then 1 else xs:integer($current) + 1
+  )
+};
+
+declare function local:value-display($v) {
+  if ($v/content)
+  then string-join($v/content[@xml:lang="eng"]//text(), "")
+  else string($v)
+};
+
+declare function local:value-content($data-type, $raw-value, $value-uuid, $display) {
+  if ($data-type = "IDREF") then $value-uuid
+  else if ($data-type = ("integer", "decimal", "time")) then
+    if ($raw-value castable as xs:double)
+    then string(xs:double($raw-value))
+    else ""
+  else if ($data-type = "boolean") then
+    if ($raw-value = "") then ""
+    else if (lower-case($raw-value) = "true") then "true"
+    else "false"
+  else if ($raw-value != "") then $raw-value
+  else if ($display != "" and $display != "<unassigned>") then $display
+  else ""
+};
+
+declare function local:value-kind($data-type) {
+  if ($data-type = ("integer", "decimal", "time")) then "number"
+  else if ($data-type = "boolean") then "boolean"
+  else "string"
+};
+
+declare function local:property-output-raw-value($data-type, $raw-value, $content) {
+  if ($data-type = ("integer", "decimal", "time", "boolean")) then $content
+  else $raw-value
+};
+
+declare function local:put-property-detail(
+  $details,
+  $key,
+  $scope,
+  $variable-uuid,
+  $value-uuid,
+  $raw-value,
+  $data-type,
+  $display
+) {
+  let $existing := map:get($details, $key)
+  return
+    if (
+      empty($existing)
+      or (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}">{$display}</propertyValue>
+      )
+    else ()
+};
+
+declare function local:add-property-facet(
+  $counts,
+  $details,
+  $seen,
+  $key,
+  $scope,
+  $variable-uuid,
+  $value-uuid,
+  $raw-value,
+  $data-type,
+  $display
+) {
+  if (exists(map:get($seen, $key))) then ()
+  else (
+    map:put($seen, $key, true()),
+    local:increment-count($counts, $key),
+    local:put-property-detail($details, $key, $scope, $variable-uuid, $value-uuid, $raw-value, $data-type, $display)
+  )
+};
+
+declare function local:add-attribute-facet($counts, $seen, $key) {
+  if (exists(map:get($seen, $key))) then ()
+  else (
+    map:put($seen, $key, true()),
+    local:increment-count($counts, $key)
+  )
+};`
+	];
 	if (compiledQueryPlan.prolog !== "") xqueryDeclarations.push(compiledQueryPlan.prolog);
 	if (propertyVariableUuids.length > 0) {
-		const propertyVariableFilters = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
-		queryBlocks.push(`let $matching-props := $items//property[label[${propertyVariableFilters}]]
+		const propertyVariableValues = propertyVariableUuids.map((uuid) => stringLiteral(uuid));
+		xqueryDeclarations.push(`declare variable $facetLabelUuids := (${propertyVariableValues.join(", ")});`);
+		queryBlocks.push(`let $global-property-counts := map:map()
+let $variable-property-counts := map:map()
+let $variable-property-details := map:map()
+let $variable-property-global-keys := map:map()
+let $_property-aggregation := xdmp:eager(
+  for $item in $items
+  let $global-seen := map:map()
+  let $variable-seen := map:map()
+  return
+    for $p in $item/properties/property[label/@uuid = $facetLabelUuids]
+    let $variable-uuid := string($p/label/@uuid)
+    for $v in $p/value${valueFilter}
+    let $value-uuid := string($v/@uuid)
+    let $raw-value := string($v/@rawValue)
+    let $data-type := string($v/@dataType)
+    let $display := local:value-display($v)
+    let $content := local:value-content($data-type, $raw-value, $value-uuid, $display)
+    let $value-kind := local:value-kind($data-type)
+    let $output-raw-value := local:property-output-raw-value($data-type, $raw-value, $content)
+    let $global-key := string-join(($data-type, $value-kind, $content), "||")
+    let $variable-key := string-join(($variable-uuid, $data-type, $value-kind, $content), "||")
+    where $content != ""
+    return (
+      local:add-attribute-facet($global-property-counts, $global-seen, $global-key),
+      local:add-property-facet($variable-property-counts, $variable-property-details, $variable-seen, $variable-key, "variable", $variable-uuid, $value-uuid, $output-raw-value, $data-type, $display),
+      map:put($variable-property-global-keys, $variable-key, $global-key)
+    )
+)
 
 let $property-values :=
-  for $p in $matching-props
-  for $v in $p/value${valueFilter}
-    let $item-uuid := $v/ancestor::*[parent::items]/@uuid
-    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"]//text(), "") else $v/text()
-    }</propertyValue>`);
+  (
+    $_property-aggregation,
+    for $key in map:keys($variable-property-counts)
+    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)
+    }</propertyValue>
+  )`);
 		returnedSequences.push("$property-values");
 	}
 	if (attributes.bibliographies) {
-		queryBlocks.push(`let $bibliography-values :=
+		queryBlocks.push(`let $bibliography-counts := map:map()
+let $_bibliography-aggregation := xdmp:eager(
   for $item in $items
-  for $bibliography in $item/bibliographies/bibliography
+  let $seen := map:map()
+  return
+    for $bibliography in $item/bibliographies/bibliography
     let $label := string-join($bibliography/identification/label/content[@xml:lang="eng"]//text(), "")
     where string-length($label) gt 0
-    return <attributeValue attributeType="bibliographies" itemUuid="{$item/@uuid}" content="{$label}" />`);
+    return local:add-attribute-facet($bibliography-counts, $seen, $label)
+)
+
+let $bibliography-values :=
+  (
+    $_bibliography-aggregation,
+    for $label in map:keys($bibliography-counts)
+    return <attributeValue attributeType="bibliographies" count="{map:get($bibliography-counts, $label)}" content="{$label}" />
+  )`);
 		returnedSequences.push("$bibliography-values");
 	}
 	if (attributes.periods) {
-		queryBlocks.push(`let $period-values :=
+		queryBlocks.push(`let $period-counts := map:map()
+let $_period-aggregation := xdmp:eager(
   for $item in $items
-  for $period in $item/periods/period
+  let $seen := map:map()
+  return
+    for $period in $item/periods/period
     let $label := string-join($period/identification/label/content[@xml:lang="eng"]//text(), "")
     where string-length($label) gt 0
-    return <attributeValue attributeType="periods" itemUuid="{$item/@uuid}" content="{$label}" />`);
+    return local:add-attribute-facet($period-counts, $seen, $label)
+)
+
+let $period-values :=
+  (
+    $_period-aggregation,
+    for $label in map:keys($period-counts)
+    return <attributeValue attributeType="periods" count="{map:get($period-counts, $label)}" content="{$label}" />
+  )`);
 		returnedSequences.push("$period-values");
 	}
 	const itemsClause = itemsQueryExpression == null ? `let $items := ${baseItemsExpression}` : `let $query := ${itemsQueryExpression}
@@ -3481,35 +3636,50 @@ async function fetchSetPropertyValues(params, options) {
 			if (parsedResultRaw.result.ochre.propertyValue != null) parsedPropertyValues.push(...Array.isArray(parsedResultRaw.result.ochre.propertyValue) ? parsedResultRaw.result.ochre.propertyValue : [parsedResultRaw.result.ochre.propertyValue]);
 			if (parsedResultRaw.result.ochre.attributeValue != null) parsedAttributeValues.push(...Array.isArray(parsedResultRaw.result.ochre.attributeValue) ? parsedResultRaw.result.ochre.attributeValue : [parsedResultRaw.result.ochre.attributeValue]);
 		}
-		const propertyValuesByPropertyVariableUuidRaw = {};
-		const flattenedPropertyValues = [];
+		const propertyValuesByPropertyVariableUuid = {};
+		const flattenedPropertyValuesByKey = /* @__PURE__ */ new Map();
 		for (const propertyValue of parsedPropertyValues) {
-			const aggregatePropertyValueItem = {
-				itemUuid: propertyValue.itemUuid,
+			if (propertyValue.content == null) continue;
+			const propertyValueItem = {
+				count: propertyValue.count,
 				dataType: propertyValue.dataType,
 				content: propertyValue.content,
 				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 globalPropertyValueItem = {
+				count: propertyValue.globalCount ?? propertyValue.count,
+				dataType: propertyValue.dataType,
+				content: propertyValue.content,
+				label: propertyValue.label
+			};
+			const globalPropertyValueKey = getPropertyValueKey({
+				dataType: globalPropertyValueItem.dataType,
+				content: propertyValue.content
+			});
+			const existingGlobalPropertyValue = flattenedPropertyValuesByKey.get(globalPropertyValueKey);
+			if (existingGlobalPropertyValue == null) flattenedPropertyValuesByKey.set(globalPropertyValueKey, globalPropertyValueItem);
+			else if (existingGlobalPropertyValue.label == null && globalPropertyValueItem.label != null) existingGlobalPropertyValue.label = globalPropertyValueItem.label;
+			if (propertyValue.scope === "global") continue;
+			if (propertyValue.variableUuid != null) (propertyValuesByPropertyVariableUuid[propertyValue.variableUuid] ??= []).push(propertyValueItem);
 		}
-		const attributeValuesByTypeRaw = {
+		for (const [propertyVariableUuid, values] of Object.entries(propertyValuesByPropertyVariableUuid)) propertyValuesByPropertyVariableUuid[propertyVariableUuid] = sortPropertyValues(values);
+		const attributeValuesByType = {
 			bibliographies: [],
 			periods: []
 		};
-		for (const attributeValue of parsedAttributeValues) attributeValuesByTypeRaw[attributeValue.attributeType].push(attributeValue);
+		for (const attributeValue of parsedAttributeValues) {
+			if (attributeValue.content == null || attributeValue.content === "") continue;
+			attributeValuesByType[attributeValue.attributeType].push({
+				count: attributeValue.count,
+				content: attributeValue.content
+			});
+		}
 		return {
-			propertyValues: aggregatePropertyValues(flattenedPropertyValues),
+			propertyValues: sortPropertyValues([...flattenedPropertyValuesByKey.values()]),
 			propertyValuesByPropertyVariableUuid,
 			attributeValues: {
-				bibliographies: attributes.bibliographies ? aggregateAttributeValues(attributeValuesByTypeRaw.bibliographies) : null,
-				periods: attributes.periods ? aggregateAttributeValues(attributeValuesByTypeRaw.periods) : null
+				bibliographies: attributes.bibliographies ? sortAttributeValues(attributeValuesByType.bibliographies) : null,
+				periods: attributes.periods ? sortAttributeValues(attributeValuesByType.periods) : null
 			},
 			error: null
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "0.22.18",
+  "version": "0.22.20",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -46,7 +46,7 @@
     "@date-fns/utc": "^2.1.1",
     "date-fns": "^4.1.0",
     "fast-equals": "^6.0.0",
-    "zod": "^4.3.6"
+    "zod": "^4.4.1"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^8.2.0",
@@ -54,9 +54,9 @@
     "bumpp": "^11.0.1",
     "eslint": "^10.2.1",
     "prettier": "^3.8.3",
-    "tsdown": "^0.21.9",
+    "tsdown": "^0.21.10",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.4"
+    "vitest": "^4.1.5"
   },
   "scripts": {
     "dev": "tsdown src/index.ts --watch",