@digitalculture/ochre-sdk 0.18.4 → 0.18.6

package/dist/index.d.mts

@@ -602,10 +602,10 @@ type Gallery = {
  * Represents a property query item with its UUID, raw value, count, and content
  */
 type PropertyValueQueryItem = {
-  uuid: string | null;
   count: number;
-  label: string | null;
+  dataType: Exclude<PropertyValueContentType, "coordinate">;
   content: string | number | boolean | null;
+  label: string | null;
 };
 /**
  * Represents a metadata object given a UUID
@@ -1105,6 +1105,7 @@ declare function fetchItem<T extends DataCategory = DataCategory, U extends Data
  * @param params.propertyVariableUuids - The property variable UUIDs to query by
  * @param params.propertyValues - The property values to query by
  * @param params.itemCategory - The category of the items to fetch
+ * @param params.includeChildItems - Whether to include child items of the same category
  * @param categoryParams - The category parameters for the fetch
  * @param categoryParams.category - The category of the items to fetch
  * @param categoryParams.itemCategories - The categories of the items to fetch
@@ -1122,6 +1123,7 @@ declare function fetchItemsByPropertyValues<T extends DataCategory = DataCategor
     value: string;
   }>;
   itemCategory?: "resource" | "spatialUnit" | "concept" | "text";
+  includeChildItems?: boolean;
 }, categoryParams?: {
   category?: T;
   itemCategories?: U;
@@ -1129,9 +1131,15 @@ declare function fetchItemsByPropertyValues<T extends DataCategory = DataCategor
   customFetch?: (input: string | URL | globalThis.Request, init?: RequestInit) => Promise<Response>;
   version: ApiVersion;
 }): Promise<{
+  totalCount: number;
+  page: number;
+  pageSize: number;
   items: Array<Item<T, U>>;
   error: null;
 } | {
+  totalCount: null;
+  page: null;
+  pageSize: null;
   items: null;
   error: string;
 }>;
@@ -1389,7 +1397,21 @@ declare function filterProperties(property: Property, filter: {
 }, options?: PropertyOptions): boolean;
 //#endregion
 //#region src/utils/helpers.d.ts
+/**
+ * The default API version to use
+ *
+ * @remarks
+ * Version 1 of the OCHRE API is deprecated and will be removed in the future.
+ * It points to the old Tamino server.
+ *
+ * Version 2 of the OCHRE API is the current version and is the default.
+ * It points to the new MarkLogic server.
+ */
 declare const DEFAULT_API_VERSION = 2;
+/**
+ * The default page size to use for fetching paginated items
+ */
+declare const DEFAULT_PAGE_SIZE = 48;
 /**
  * Flatten the properties of an item
  * @param item - The item whose properties to flatten
@@ -1403,4 +1425,4 @@ declare function flattenItemProperties<T extends DataCategory = DataCategory, U
  */
 declare function getLeafPropertyValues<T extends PropertyValueContentType = PropertyValueContentType>(propertyValues: Array<PropertyValueContent<T>>): Array<PropertyValueContent<T>>;
 //#endregion
-export { ApiVersion, Bibliography, Concept, Context, ContextItem, ContextNode, Coordinate, DEFAULT_API_VERSION, Data, DataCategory, Event, FileFormat, Gallery, Identification, Image, ImageMap, ImageMapArea, Interpretation, Item, LevelContext, LevelContextItem, License, Link, Metadata, Note, Observation, Period, Person, Property, PropertyContexts, PropertyValue, PropertyValueContent, PropertyValueContentType, PropertyValueQueryItem, Resource, Scope, Section, Set, SpatialUnit, Style, Text, Tree, UuidMetadata, WebBlock, WebBlockLayout, WebElement, WebElementComponent, WebImage, WebTitle, Webpage, Website, fetchByUuidMetadata, fetchGallery, fetchItem, fetchItemsByPropertyValues, fetchPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };
+export { ApiVersion, Bibliography, Concept, Context, ContextItem, ContextNode, Coordinate, DEFAULT_API_VERSION, DEFAULT_PAGE_SIZE, Data, DataCategory, Event, FileFormat, Gallery, Identification, Image, ImageMap, ImageMapArea, Interpretation, Item, LevelContext, LevelContextItem, License, Link, Metadata, Note, Observation, Period, Person, Property, PropertyContexts, PropertyValue, PropertyValueContent, PropertyValueContentType, PropertyValueQueryItem, Resource, Scope, Section, Set, SpatialUnit, Style, Text, Tree, UuidMetadata, WebBlock, WebBlockLayout, WebElement, WebElementComponent, WebImage, WebTitle, Webpage, Website, fetchByUuidMetadata, fetchGallery, fetchItem, fetchItemsByPropertyValues, fetchPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };

package/dist/index.mjs

@@ -99,8 +99,8 @@ const richTextStringSchema = z.object({
 * @internal
 */
 const identificationSchema = z.object({
-	label: z.object({ content: richTextStringSchema }),
-	abbreviation: z.object({ content: richTextStringSchema }).optional(),
+	label: z.object({ content: z.union([richTextStringSchema, z.array(richTextStringSchema)]) }),
+	abbreviation: z.object({ content: z.union([richTextStringSchema, z.array(richTextStringSchema)]).optional() }),
 	code: z.string().optional()
 });
 /**
@@ -990,8 +990,22 @@ function parseStringContent(content, language = "eng") {
 
 //#endregion
 //#region src/utils/helpers.ts
+/**
+* The default API version to use
+*
+* @remarks
+* Version 1 of the OCHRE API is deprecated and will be removed in the future.
+* It points to the old Tamino server.
+*
+* Version 2 of the OCHRE API is the current version and is the default.
+* It points to the new MarkLogic server.
+*/
 const DEFAULT_API_VERSION = 2;
 /**
+* The default page size to use for fetching paginated items
+*/
+const DEFAULT_PAGE_SIZE = 48;
+/**
 * Flatten the properties of an item
 * @param item - The item whose properties to flatten
 * @returns The item with the properties flattened
@@ -3559,26 +3573,30 @@ async function fetchItem(uuid, category, itemCategories, options) {
 * @param params.propertyVariableUuids - An array of property variable UUIDs to fetch
 * @param params.propertyValues - An array of property values to fetch
 * @param params.itemCategory - The category of the items to fetch
+* @param params.page - The page number (1-indexed)
+* @param params.pageSize - The number of items per page
+* @param params.includeChildItems - Whether to include child items of the same category
 * @param options - Options for the fetch
 * @param options.version - The version of the OCHRE API to use
 * @returns An XQuery string
 */
 function buildXQuery$1(params, options) {
 	const version = options?.version ?? DEFAULT_API_VERSION;
-	const { propertyVariableUuids, propertyValues, projectScopeUuid, belongsToCollectionScopeUuids, itemCategory } = params;
+	const { propertyVariableUuids, propertyValues, projectScopeUuid, belongsToCollectionScopeUuids, itemCategory, page = 1, pageSize = DEFAULT_PAGE_SIZE, includeChildItems = false } = params;
+	const startPos = (page - 1) * pageSize + 1;
+	const endPos = page * pageSize;
 	let belongsToCollectionScopeFilter = "";
 	if (belongsToCollectionScopeUuids.length > 0) belongsToCollectionScopeFilter = `[properties/property[label/@uuid="${BELONG_TO_COLLECTION_UUID}"][value[${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")}]]]`;
 	const propertyVariables = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
 	const propertyValuesFilters = propertyValues.map(({ dataType, value }) => {
-		if (dataType === "IDREF") return `value/@uuid="${value}"`;
-		if (dataType === "date" || dataType === "dateTime" || dataType === "time" || dataType === "integer" || dataType === "decimal" || dataType === "boolean") return `value/@rawValue="${value}"`;
-		return `value="${value}"`;
+		if (dataType === "IDREF") return `value[@uuid="${value}"]`;
+		if (dataType === "date" || dataType === "dateTime" || dataType === "time" || dataType === "integer" || dataType === "decimal" || dataType === "boolean") return `value[@rawValue="${value}"]`;
+		return `value[.="${value}"]`;
 	}).join(" or ");
 	return `<ochre>{${`let $match-uuids := distinct-values(
     ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
         /*${belongsToCollectionScopeFilter}
-          [properties//property/label[${propertyVariables}]
-                               [${propertyValuesFilters}]]
+          [properties//property[label[${propertyVariables}]][${propertyValuesFilters}]]
         /@uuid
   )
 
@@ -3587,15 +3605,16 @@ function buildXQuery$1(params, options) {
              or bibliographies/bibliography/@uuid = $match-uuids]
 
   let $unique-uuids := distinct-values($items/@uuid)
+  let $totalCount := count($unique-uuids)
 
-  for $uuid in $unique-uuids
-  let $item := $items[@uuid = $uuid][1]
-  let $category := local-name($item)
-
-  return element { node-name($item) } {
-    $item/@*,
-    $item/node()[not(local-name(.) = $category)]
-  }`}}</ochre>`;
+  return <items totalCount="{$totalCount}" page="${page}" pageSize="${pageSize}">{
+    for $uuid in $unique-uuids[position() ge ${startPos} and position() le ${endPos}]
+    let $item := ($items[@uuid = $uuid])[1]
+    let $category := local-name($item)
+    return element { node-name($item) } {
+      $item/@*, ${includeChildItems ? "$item/node()" : "$item/node()[not(local-name(.) = $category)]"}
+    }
+  }</items>`}}</ochre>`;
 }
 /**
 * Fetches and parses items by property values from the OCHRE API
@@ -3606,6 +3625,7 @@ function buildXQuery$1(params, options) {
 * @param params.propertyVariableUuids - The property variable UUIDs to query by
 * @param params.propertyValues - The property values to query by
 * @param params.itemCategory - The category of the items to fetch
+* @param params.includeChildItems - Whether to include child items of the same category
 * @param categoryParams - The category parameters for the fetch
 * @param categoryParams.category - The category of the items to fetch
 * @param categoryParams.itemCategories - The categories of the items to fetch
@@ -3618,69 +3638,76 @@ async function fetchItemsByPropertyValues(params, categoryParams, options) {
 	try {
 		const customFetch = options?.customFetch;
 		const version = options?.version ?? DEFAULT_API_VERSION;
-		const { propertyVariableUuids, propertyValues, projectScopeUuid, belongsToCollectionScopeUuids, itemCategory } = params;
+		const { propertyVariableUuids, propertyValues, projectScopeUuid, belongsToCollectionScopeUuids, itemCategory, includeChildItems } = params;
 		const { category, itemCategories } = categoryParams ?? {};
 		const xquery = buildXQuery$1({
 			projectScopeUuid,
 			belongsToCollectionScopeUuids,
 			propertyVariableUuids,
 			propertyValues,
-			itemCategory
+			itemCategory,
+			includeChildItems
 		}, { version });
 		const response = await (customFetch ?? fetch)(version === 2 ? `https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?xquery=${encodeURIComponent(xquery)}&format=json&lang="*"` : `https://ochre.lib.uchicago.edu/ochre?xquery=${encodeURIComponent(xquery)}&format=json&lang="*"`);
 		if (!response.ok) throw new Error(`OCHRE API responded with status: ${response.status}`);
 		const data = await response.json();
 		if (Array.isArray(data.result) || Object.keys(data.result.ochre).length === 0) throw new Error("No items found");
-		if (category != null && data.result.ochre[category] == null) throw new Error(`No items found for category: ${category}`);
-		if ((category === "set" || category === "tree") && itemCategories != null && "items" in data.result.ochre[category] && Array.isArray(data.result.ochre[category].items) && data.result.ochre[category].items.every((item) => item.category !== itemCategories)) throw new Error(`No items found for category: ${category} and item categories: ${itemCategories}`);
+		if (category != null && data.result.ochre.items[category] == null) throw new Error(`No items found for category: ${category}`);
+		if ((category === "set" || category === "tree") && itemCategories != null && "items" in data.result.ochre.items[category] && Array.isArray(data.result.ochre.items[category].items) && data.result.ochre.items[category].items.every((item) => item.category !== itemCategories)) throw new Error(`No items found for category: ${category} and item categories: ${itemCategories}`);
 		const items = [];
-		if ("resource" in data.result.ochre && data.result.ochre.resource != null) {
-			const resources = parseResources(Array.isArray(data.result.ochre.resource) ? data.result.ochre.resource : [data.result.ochre.resource]);
+		if ("resource" in data.result.ochre.items && data.result.ochre.items.resource != null) {
+			const resources = parseResources(Array.isArray(data.result.ochre.items.resource) ? data.result.ochre.items.resource : [data.result.ochre.items.resource]);
 			items.push(...resources);
 		}
-		if ("spatialUnit" in data.result.ochre && data.result.ochre.spatialUnit != null) {
-			const spatialUnits = parseSpatialUnits(Array.isArray(data.result.ochre.spatialUnit) ? data.result.ochre.spatialUnit : [data.result.ochre.spatialUnit]);
+		if ("spatialUnit" in data.result.ochre.items && data.result.ochre.items.spatialUnit != null) {
+			const spatialUnits = parseSpatialUnits(Array.isArray(data.result.ochre.items.spatialUnit) ? data.result.ochre.items.spatialUnit : [data.result.ochre.items.spatialUnit]);
 			items.push(...spatialUnits);
 		}
-		if ("concept" in data.result.ochre && data.result.ochre.concept != null) {
-			const concepts = parseConcepts(Array.isArray(data.result.ochre.concept) ? data.result.ochre.concept : [data.result.ochre.concept]);
+		if ("concept" in data.result.ochre.items && data.result.ochre.items.concept != null) {
+			const concepts = parseConcepts(Array.isArray(data.result.ochre.items.concept) ? data.result.ochre.items.concept : [data.result.ochre.items.concept]);
 			items.push(...concepts);
 		}
-		if ("period" in data.result.ochre && data.result.ochre.period != null) {
-			const periods = parsePeriods(Array.isArray(data.result.ochre.period) ? data.result.ochre.period : [data.result.ochre.period]);
+		if ("period" in data.result.ochre.items && data.result.ochre.items.period != null) {
+			const periods = parsePeriods(Array.isArray(data.result.ochre.items.period) ? data.result.ochre.items.period : [data.result.ochre.items.period]);
 			items.push(...periods);
 		}
-		if ("bibliography" in data.result.ochre && data.result.ochre.bibliography != null) {
-			const bibliographies = parseBibliographies(Array.isArray(data.result.ochre.bibliography) ? data.result.ochre.bibliography : [data.result.ochre.bibliography]);
+		if ("bibliography" in data.result.ochre.items && data.result.ochre.items.bibliography != null) {
+			const bibliographies = parseBibliographies(Array.isArray(data.result.ochre.items.bibliography) ? data.result.ochre.items.bibliography : [data.result.ochre.items.bibliography]);
 			items.push(...bibliographies);
 		}
-		if ("person" in data.result.ochre && data.result.ochre.person != null) {
-			const persons = parsePersons(Array.isArray(data.result.ochre.person) ? data.result.ochre.person : [data.result.ochre.person]);
+		if ("person" in data.result.ochre.items && data.result.ochre.items.person != null) {
+			const persons = parsePersons(Array.isArray(data.result.ochre.items.person) ? data.result.ochre.items.person : [data.result.ochre.items.person]);
 			items.push(...persons);
 		}
-		if ("propertyValue" in data.result.ochre && data.result.ochre.propertyValue != null) {
-			const propertyValues = parsePropertyValues(Array.isArray(data.result.ochre.propertyValue) ? data.result.ochre.propertyValue : [data.result.ochre.propertyValue]);
+		if ("propertyValue" in data.result.ochre.items && data.result.ochre.items.propertyValue != null) {
+			const propertyValues = parsePropertyValues(Array.isArray(data.result.ochre.items.propertyValue) ? data.result.ochre.items.propertyValue : [data.result.ochre.items.propertyValue]);
 			items.push(...propertyValues);
 		}
-		if ("text" in data.result.ochre && data.result.ochre.text != null) {
-			const texts = parseTexts(Array.isArray(data.result.ochre.text) ? data.result.ochre.text : [data.result.ochre.text]);
+		if ("text" in data.result.ochre.items && data.result.ochre.items.text != null) {
+			const texts = parseTexts(Array.isArray(data.result.ochre.items.text) ? data.result.ochre.items.text : [data.result.ochre.items.text]);
 			items.push(...texts);
 		}
-		if ("set" in data.result.ochre && data.result.ochre.set != null) {
-			const sets = parseSets(Array.isArray(data.result.ochre.set) ? data.result.ochre.set : [data.result.ochre.set]);
+		if ("set" in data.result.ochre.items && data.result.ochre.items.set != null) {
+			const sets = parseSets(Array.isArray(data.result.ochre.items.set) ? data.result.ochre.items.set : [data.result.ochre.items.set]);
 			items.push(...sets);
 		}
-		if ("tree" in data.result.ochre && data.result.ochre.tree != null) {
-			const trees = parseTrees(Array.isArray(data.result.ochre.tree) ? data.result.ochre.tree : [data.result.ochre.tree]);
+		if ("tree" in data.result.ochre.items && data.result.ochre.items.tree != null) {
+			const trees = parseTrees(Array.isArray(data.result.ochre.items.tree) ? data.result.ochre.items.tree : [data.result.ochre.items.tree]);
 			items.push(...trees);
 		}
 		return {
+			totalCount: data.result.ochre.totalCount,
+			page: data.result.ochre.page,
+			pageSize: data.result.ochre.pageSize,
 			items,
 			error: null
 		};
 	} catch (error) {
 		console.error(error);
 		return {
+			totalCount: null,
+			page: null,
+			pageSize: null,
 			items: null,
 			error: error instanceof Error ? error.message : "Failed to fetch items by property values"
 		};
@@ -3693,58 +3720,52 @@ async function fetchItemsByPropertyValues(params, categoryParams, options) {
 * Schema for a single property value query item in the OCHRE API response
 */
 const propertyValueQueryItemSchema = z.object({
-	uuid: uuidSchema.optional().transform((val) => val ?? null),
-	count: z.number(),
+	uuid: z.string().optional(),
 	dataType: z.string(),
 	identification: identificationSchema.optional(),
-	label: z.union([
+	rawValue: z.union([
 		z.string(),
 		z.number(),
 		z.boolean()
-	]).optional().transform((val) => val?.toString() ?? null),
-	content: z.union([
+	]).optional(),
+	value: z.union([
 		z.string(),
 		z.number(),
 		z.boolean()
-	]).optional().transform((val) => val ?? null)
+	]).optional()
 }).transform((val) => {
-	let value = val;
+	const returnValue = {
+		dataType: val.dataType,
+		content: null,
+		label: null
+	};
 	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":
-			value = {
-				...val,
-				content: val.content?.toString() ?? null
-			};
+			returnValue.content = val.rawValue?.toString() ?? null;
+			returnValue.label = val.value?.toString() ?? null;
 			break;
 		case "integer":
 		case "decimal":
 		case "time":
-			value = {
-				...val,
-				content: val.content !== null ? Number(val.content) : null
-			};
+			returnValue.content = val.rawValue != null ? Number(val.rawValue) : null;
+			returnValue.label = val.value?.toString() ?? null;
 			break;
 		case "boolean":
-			value = {
-				...val,
-				content: val.content !== null ? Boolean(val.content) : null
-			};
+			returnValue.content = val.rawValue != null ? Boolean(val.rawValue) : null;
+			returnValue.label = val.value?.toString() ?? null;
 			break;
 		default:
-			value = val;
+			returnValue.content = val.rawValue?.toString() ?? null;
+			returnValue.label = val.value?.toString() ?? null;
 			break;
 	}
-	if ("identification" in value && value.identification != null) {
-		const { identification, ...rest } = value;
-		value = {
-			...rest,
-			content: parseStringContent({ content: identification.label.content })
-		};
-	}
-	return value;
+	return returnValue;
 });
 /**
 * Schema for the property values by property variables OCHRE API response
@@ -3766,44 +3787,15 @@ function buildXQuery(params, options) {
 	let collectionScopeFilter = "";
 	if (belongsToCollectionScopeUuids.length > 0) collectionScopeFilter = `[properties/property[label/@uuid="${BELONG_TO_COLLECTION_UUID}"][value[${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")}]]]`;
 	const propertyVariableFilters = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
-	return `<ochre>{${`let $props := ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
+	return `<ochre>{${`let $values := ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
       /*${collectionScopeFilter}
       /properties//property[label[${propertyVariableFilters}]]
+      /value
 
-  let $values := $props/value
-
-  let $uuid-values := $values[@uuid]
-  let $uuid-vals := distinct-values($uuid-values/@uuid)
-  let $uuid-dataType := string($uuid-values[1]/@dataType)
-  let $uuid-items :=
-    for $val in $uuid-vals
-    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())
-    order by $count descending, $label ascending
-    return <item count="{$count}" uuid="{$val}" dataType="{$uuid-dataType}">{$identification}</item>
-
-  let $raw-values := $values[@rawValue]
-  let $raw-vals := distinct-values($raw-values/@rawValue)
-  let $raw-dataType := string($raw-values[1]/@dataType)
-  let $raw-items :=
-    for $val in $raw-vals
-    let $count := count($raw-values[@rawValue = $val])
-    let $label := string($raw-values[@rawValue = $val][1])
-    order by $count descending, $label ascending
-    return <item count="{$count}" rawValue="{$val}" dataType="{$raw-dataType}" label="{$label}">{$val}</item>
-
-  let $text-values := $values[not(@uuid) and not(@rawValue)]
-  let $text-vals := distinct-values(for $v in $text-values return string($v))
-  let $text-dataType := string($text-values[1]/@dataType)
-  let $text-items :=
-    for $val in $text-vals
-    let $count := count($text-values[string(.) = $val])
-    order by $count descending, $val ascending
-    return <item count="{$count}" dataType="{$text-dataType}">{$val}</item>
-
-  return ($uuid-items, $raw-items, $text-items)`}}</ochre>`;
+  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>`;
 }
 /**
 * Fetches and parses property values by property variables from the OCHRE API
@@ -3832,8 +3824,22 @@ 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 groupedItems = [];
+		for (const item of parsedItems) {
+			const existingItem = groupedItems.find((i) => i.content === item.content);
+			if (existingItem == null) groupedItems.push({
+				count: 1,
+				...item
+			});
+			else existingItem.count++;
+		}
 		return {
-			items: (Array.isArray(parsedResultRaw.result.ochre.item) ? parsedResultRaw.result.ochre.item : [parsedResultRaw.result.ochre.item]).filter((item) => String(item.content).trim() !== ""),
+			items: groupedItems.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;
+			}),
 			error: null
 		};
 	} catch (error) {
@@ -3986,4 +3992,4 @@ async function fetchWebsite(abbreviation, options) {
 }
 
 //#endregion
-export { DEFAULT_API_VERSION, fetchByUuidMetadata, fetchGallery, fetchItem, fetchItemsByPropertyValues, fetchPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };
+export { DEFAULT_API_VERSION, DEFAULT_PAGE_SIZE, fetchByUuidMetadata, fetchGallery, fetchItem, fetchItemsByPropertyValues, fetchPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };

package/package.json

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