ochre-sdk 0.19.9 → 0.19.10

package/dist/index.d.mts

@@ -891,7 +891,7 @@ type WebElementComponent = {
     label: string;
   }> | null;
   variant: "full" | "highlights";
-  itemVariant: "detailed" | "card" | "tile";
+  itemVariant: "detailed" | "card" | "tile" | "showcase";
   paginationVariant: "default" | "numeric";
   layout: "image-top" | "image-bottom" | "image-start" | "image-end";
   imageQuality: "high" | "low";
@@ -968,7 +968,7 @@ type WebElementComponent = {
   isFullHeight: boolean;
 } | {
   component: "query";
-  itemCategory: "resource" | "spatialUnit" | "concept" | "text" | null;
+  linkUuids: Array<string>;
   queries: Array<{
     label: string;
     propertyVariableUuids: Array<string>;
@@ -979,9 +979,15 @@ type WebElementComponent = {
     uuid: string;
     label: string;
   }> | null;
-  itemVariant: "detailed" | "card" | "tile";
-  paginationVariant: "default" | "numeric";
-  layout: "image-top" | "image-bottom" | "image-start" | "image-end";
+  itemVariant: Extract<WebElementComponent, {
+    component: "collection";
+  }>["itemVariant"];
+  paginationVariant: Extract<WebElementComponent, {
+    component: "collection";
+  }>["paginationVariant"];
+  layout: Extract<WebElementComponent, {
+    component: "collection";
+  }>["layout"];
 } | {
   component: "search-bar";
   queryVariant: "submit" | "change";
@@ -1123,18 +1129,17 @@ declare function fetchItem<T extends DataCategory = DataCategory, U extends Data
   item: never;
 }>;
 //#endregion
-//#region src/utils/fetchers/items-by-property-values.d.ts
+//#region src/utils/fetchers/set/items-by-property-values.d.ts
 /**
  * Fetches and parses items by property values from the OCHRE API
  *
  * @param params - The parameters for the fetch
- * @param params.projectScopeUuid - The UUID of the project scope
+ * @param params.setScopeUuids - The Set scope UUIDs to filter by
  * @param params.belongsToCollectionScopeUuids - The collection scope UUIDs to filter by
  * @param params.propertyVariableUuids - The property variable UUIDs to query by
  * @param params.propertyValues - The property values to query by
  * @param params.page - The page number (1-indexed)
  * @param params.pageSize - The number of items per page
- * @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
@@ -1144,8 +1149,8 @@ declare function fetchItem<T extends DataCategory = DataCategory, U extends Data
  * @param options.version - The version of the OCHRE API to use
  * @returns The parsed items by property values or null if the fetch/parse fails
  */
-declare function fetchItemsByPropertyValues<T extends DataCategory = DataCategory, U extends DataCategory | Array<DataCategory> = (T extends "tree" ? Exclude<DataCategory, "tree"> : T extends "set" ? Array<DataCategory> : never)>(params: {
-  projectScopeUuid: string;
+declare function fetchSetItemsByPropertyValues<T extends DataCategory = DataCategory, U extends DataCategory | Array<DataCategory> = (T extends "tree" ? Exclude<DataCategory, "tree"> : T extends "set" ? Array<DataCategory> : never)>(params: {
+  setScopeUuids: Array<string>;
   belongsToCollectionScopeUuids: Array<string>;
   propertyVariableUuids: Array<string>;
   propertyValues: Array<{
@@ -1154,7 +1159,6 @@ declare function fetchItemsByPropertyValues<T extends DataCategory = DataCategor
   }>;
   page: number;
   pageSize?: number;
-  itemCategory?: "resource" | "spatialUnit" | "concept" | "text";
   includeChildItems?: boolean;
 }, categoryParams?: {
   category?: T;
@@ -1176,31 +1180,31 @@ declare function fetchItemsByPropertyValues<T extends DataCategory = DataCategor
   error: string;
 }>;
 //#endregion
-//#region src/utils/fetchers/property-values-by-property-variables.d.ts
+//#region src/utils/fetchers/set/property-values-by-property-variables.d.ts
 /**
- * Fetches and parses property values by property variables from the OCHRE API
+ * Fetches and parses Set property values by property variables from the OCHRE API
  *
  * @param params - The parameters for the fetch
- * @param params.projectScopeUuid - The UUID of the project scope
+ * @param params.setScopeUuids - An array of set scope UUIDs to filter by
  * @param params.belongsToCollectionScopeUuids - The collection scope UUIDs to filter by
  * @param params.propertyVariableUuids - The property variable UUIDs to query by
  * @param options - Options for the fetch
  * @param options.fetch - The fetch function to use
  * @param options.version - The version of the OCHRE API to use
- * @returns The parsed property values by property variables or null if the fetch/parse fails
+ * @returns The parsed Set property values by property variables or null if the fetch/parse fails
  */
-declare function fetchPropertyValuesByPropertyVariables(params: {
-  projectScopeUuid: string;
+declare function fetchSetPropertyValuesByPropertyVariables(params: {
+  setScopeUuids: Array<string>;
   belongsToCollectionScopeUuids: Array<string>;
   propertyVariableUuids: Array<string>;
 }, options?: {
   fetch?: (input: string | URL | globalThis.Request, init?: RequestInit) => Promise<Response>;
   version?: ApiVersion;
 }): Promise<{
-  items: Array<PropertyValueQueryItem> | null;
+  propertyValues: Array<PropertyValueQueryItem> | null;
   error: null;
 } | {
-  items: null;
+  propertyValues: null;
   error: string;
 }>;
 //#endregion
@@ -1363,4 +1367,4 @@ declare const DEFAULT_PAGE_SIZE = 48;
  */
 declare function flattenItemProperties<T extends DataCategory = DataCategory, U extends DataCategory | Array<DataCategory> = (T extends "tree" ? Exclude<DataCategory, "tree"> : T extends "set" ? Array<DataCategory> : never)>(item: Item<T, U>): Item<T, U>;
 //#endregion
-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, PropertyVariable, Resource, Scope, Section, Set, SpatialUnit, Style, Text, Tree, WebBlock, WebBlockLayout, WebElement, WebElementComponent, WebImage, WebSegment, WebSegmentItem, WebTitle, Webpage, Website, WebsiteType, fetchGallery, fetchItem, fetchItemsByPropertyValues, fetchPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByLabelAndValue, getPropertyByLabelAndValues, 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, PropertyVariable, Resource, Scope, Section, Set, SpatialUnit, Style, Text, Tree, WebBlock, WebBlockLayout, WebElement, WebElementComponent, WebImage, WebSegment, WebSegmentItem, WebTitle, Webpage, Website, WebsiteType, fetchGallery, fetchItem, fetchSetItemsByPropertyValues, fetchSetPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByLabelAndValue, getPropertyByLabelAndValues, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };

package/dist/index.mjs

@@ -552,6 +552,40 @@ function cleanObject(object) {
 	return Object.fromEntries(Object.entries(object).filter(([_, value]) => value != null));
 }
 
+//#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
+*/
+function flattenItemProperties(item) {
+	const allProperties = [];
+	if ("properties" in item) allProperties.push(...item.properties);
+	if ("observations" in item) for (const observation of item.observations) allProperties.push(...observation.properties);
+	if ("interpretations" in item) for (const interpretation of item.interpretations) allProperties.push(...interpretation.properties);
+	if ("bibliographies" in item) for (const bibliography of item.bibliographies) allProperties.push(...bibliography.properties);
+	return {
+		...item,
+		properties: flattenProperties(allProperties)
+	};
+}
+
 //#endregion
 //#region src/schemas.ts
 /**
@@ -718,40 +752,40 @@ const boundsSchema = z.string().transform((str, ctx) => {
 		return z.NEVER;
 	}
 }).pipe(z.tuple([z.tuple([z.number(), z.number()]), z.tuple([z.number(), z.number()])], { message: "Must contain exactly 2 coordinate pairs" }));
-
-//#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
+* Schema for validating the parameters for the Set property values by property variables fetching function
+* @internal
 */
-function flattenItemProperties(item) {
-	const allProperties = [];
-	if ("properties" in item) allProperties.push(...item.properties);
-	if ("observations" in item) for (const observation of item.observations) allProperties.push(...observation.properties);
-	if ("interpretations" in item) for (const interpretation of item.interpretations) allProperties.push(...interpretation.properties);
-	if ("bibliographies" in item) for (const bibliography of item.bibliographies) allProperties.push(...bibliography.properties);
-	return {
-		...item,
-		properties: flattenProperties(allProperties)
-	};
-}
+const setPropertyValuesByPropertyVariablesParamsSchema = z.object({
+	setScopeUuids: z.array(uuidSchema).min(1, "At least one set scope UUID is required"),
+	belongsToCollectionScopeUuids: z.array(uuidSchema).default([]),
+	propertyVariableUuids: z.array(uuidSchema).min(1, "At least one property variable UUID is required")
+});
+const setItemsByPropertyValuesParamsSchema = z.object({
+	...setPropertyValuesByPropertyVariablesParamsSchema.shape,
+	propertyValues: z.array(z.object({
+		dataType: z.enum([
+			"string",
+			"integer",
+			"decimal",
+			"boolean",
+			"date",
+			"dateTime",
+			"time",
+			"IDREF"
+		]),
+		value: z.string()
+	})).min(1, "At least one property value is required"),
+	page: z.number().min(1, "Page must be at least 1").default(1),
+	pageSize: z.number().min(1, "Page size must be at least 1").default(DEFAULT_PAGE_SIZE),
+	itemCategory: z.enum([
+		"resource",
+		"spatialUnit",
+		"concept",
+		"text"
+	]).optional(),
+	includeChildItems: z.boolean().optional().default(false)
+});
 
 //#endregion
 //#region src/utils/parse/index.ts
@@ -1992,15 +2026,14 @@ async function fetchItem(uuid, category, itemCategories, options) {
 }
 
 //#endregion
-//#region src/utils/fetchers/items-by-property-values.ts
+//#region src/utils/fetchers/set/items-by-property-values.ts
 /**
 * Build an XQuery string to fetch items by property values from the OCHRE API
 * @param params - The parameters for the fetch
-* @param params.projectScopeUuid - The UUID of the project scope
+* @param params.setScopeUuids - An array of Set scope UUIDs to filter by
 * @param params.belongsToCollectionScopeUuids - An array of collection scope UUIDs to filter by
 * @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
@@ -2010,9 +2043,11 @@ async function fetchItem(uuid, category, itemCategories, options) {
 */
 function buildXQuery$1(params, options) {
 	const version = options?.version ?? DEFAULT_API_VERSION;
-	const { propertyVariableUuids, propertyValues, projectScopeUuid, belongsToCollectionScopeUuids, itemCategory, page, pageSize, includeChildItems = false } = params;
-	const startPos = (page - 1) * pageSize + 1;
-	const endPos = page * pageSize;
+	const { propertyVariableUuids, propertyValues, setScopeUuids, belongsToCollectionScopeUuids, page, pageSize, includeChildItems = false } = params;
+	const startPosition = (page - 1) * pageSize + 1;
+	const endPosition = page * pageSize;
+	let setScopeFilter = "";
+	if (setScopeUuids.length > 0) setScopeFilter = `/set[(${setScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]/items/*`;
 	let belongsToCollectionScopeFilter = "";
 	if (belongsToCollectionScopeUuids.length > 0) belongsToCollectionScopeFilter = `[.//properties[property[label/@uuid="${BELONGS_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]]`;
 	const propertyVariables = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
@@ -2021,23 +2056,15 @@ function buildXQuery$1(params, options) {
 		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}"]
+	return `<ochre>{${`let $items := ${version === 2 ? "doc()" : "input()"}/ochre
+        ${setScopeFilter}
         ${belongsToCollectionScopeFilter}
           //property[label[${propertyVariables}]][${propertyValuesFilters}]]
-        /@uuid
-  )
 
-  let $items := ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
-      /${itemCategory ?? "*"}[@uuid = $match-uuids
-             or bibliographies/bibliography/@uuid = $match-uuids]
-
-  let $unique-uuids := distinct-values($items/@uuid)
-  let $totalCount := count($unique-uuids)
+  let $totalCount := count($items)
 
   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]
+    for $item in $items[position() ge ${startPosition} and position() le ${endPosition}]
       let $category := local-name($item)
       return element { node-name($item) } {
         $item/@*, ${includeChildItems ? "$item/node()" : "$item/node()[not(local-name(.) = $category)]"}
@@ -2048,13 +2075,12 @@ function buildXQuery$1(params, options) {
 * Fetches and parses items by property values from the OCHRE API
 *
 * @param params - The parameters for the fetch
-* @param params.projectScopeUuid - The UUID of the project scope
+* @param params.setScopeUuids - The Set scope UUIDs to filter by
 * @param params.belongsToCollectionScopeUuids - The collection scope UUIDs to filter by
 * @param params.propertyVariableUuids - The property variable UUIDs to query by
 * @param params.propertyValues - The property values to query by
 * @param params.page - The page number (1-indexed)
 * @param params.pageSize - The number of items per page
-* @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
@@ -2064,17 +2090,16 @@ function buildXQuery$1(params, options) {
 * @param options.version - The version of the OCHRE API to use
 * @returns The parsed items by property values or null if the fetch/parse fails
 */
-async function fetchItemsByPropertyValues(params, categoryParams, options) {
+async function fetchSetItemsByPropertyValues(params, categoryParams, options) {
 	try {
 		const version = options?.version ?? DEFAULT_API_VERSION;
-		const { propertyVariableUuids, propertyValues, projectScopeUuid, belongsToCollectionScopeUuids, page, pageSize = DEFAULT_PAGE_SIZE, itemCategory, includeChildItems } = params;
+		const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids, propertyValues, page, pageSize, includeChildItems } = setItemsByPropertyValuesParamsSchema.parse(params);
 		const { category, itemCategories } = categoryParams ?? {};
 		const xquery = buildXQuery$1({
-			projectScopeUuid,
+			setScopeUuids,
 			belongsToCollectionScopeUuids,
 			propertyVariableUuids,
 			propertyValues,
-			itemCategory,
 			includeChildItems,
 			page,
 			pageSize
@@ -2150,7 +2175,7 @@ async function fetchItemsByPropertyValues(params, categoryParams, options) {
 }
 
 //#endregion
-//#region src/utils/fetchers/property-values-by-property-variables.ts
+//#region src/utils/fetchers/set/property-values-by-property-variables.ts
 /**
 * Schema for a single property value query item in the OCHRE API response
 */
@@ -2206,7 +2231,7 @@ const responseSchema = z.object({ result: z.union([z.object({ ochre: z.object({
 /**
 * Build an XQuery string to fetch property values by property variables from the OCHRE API
 * @param params - The parameters for the fetch
-* @param params.projectScopeUuid - The UUID of the project scope
+* @param params.setScopeUuids - An array of set scope UUIDs to filter by
 * @param params.belongsToCollectionScopeUuids - An array of collection scope UUIDs to filter by
 * @param params.propertyVariableUuids - An array of property variable UUIDs to fetch
 * @param options - Options for the fetch
@@ -2215,39 +2240,41 @@ const responseSchema = z.object({ result: z.union([z.object({ ochre: z.object({
 */
 function buildXQuery(params, options) {
 	const version = options?.version ?? DEFAULT_API_VERSION;
-	const { projectScopeUuid, belongsToCollectionScopeUuids, propertyVariableUuids } = params;
+	const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids } = params;
+	let setScopeFilter = "";
+	if (setScopeUuids.length > 0) setScopeFilter = `/set[(${setScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]/items`;
 	let collectionScopeFilter = "";
 	if (belongsToCollectionScopeUuids.length > 0) collectionScopeFilter = `//properties[property[label/@uuid="${BELONGS_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]]`;
 	const propertyVariableFilters = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
-	return `<ochre>{${`let $matching-props := ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
+	return `<ochre>{${`let $matching-props := ${version === 2 ? "doc()" : "input()"}/ochre
+      ${setScopeFilter}
       ${collectionScopeFilter}
-      /*[not(self::set)]
       //property[label/(${propertyVariableFilters})]
 
   for $v in $matching-props/value
-    let $item-uuid := $v/ancestor::*[parent::ochre]/@uuid
+    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()
     }</propertyValue>`}}</ochre>`;
 }
 /**
-* Fetches and parses property values by property variables from the OCHRE API
+* Fetches and parses Set property values by property variables from the OCHRE API
 *
 * @param params - The parameters for the fetch
-* @param params.projectScopeUuid - The UUID of the project scope
+* @param params.setScopeUuids - An array of set scope UUIDs to filter by
 * @param params.belongsToCollectionScopeUuids - The collection scope UUIDs to filter by
 * @param params.propertyVariableUuids - The property variable UUIDs to query by
 * @param options - Options for the fetch
 * @param options.fetch - The fetch function to use
 * @param options.version - The version of the OCHRE API to use
-* @returns The parsed property values by property variables or null if the fetch/parse fails
+* @returns The parsed Set property values by property variables or null if the fetch/parse fails
 */
-async function fetchPropertyValuesByPropertyVariables(params, options) {
+async function fetchSetPropertyValuesByPropertyVariables(params, options) {
 	try {
 		const version = options?.version ?? DEFAULT_API_VERSION;
-		const { belongsToCollectionScopeUuids, propertyVariableUuids, projectScopeUuid } = params;
+		const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids } = setPropertyValuesByPropertyVariablesParamsSchema.parse(params);
 		const xquery = buildXQuery({
-			projectScopeUuid,
+			setScopeUuids,
 			belongsToCollectionScopeUuids,
 			propertyVariableUuids
 		}, { version });
@@ -2255,28 +2282,28 @@ async function fetchPropertyValuesByPropertyVariables(params, options) {
 		if (!response.ok) throw new Error(`OCHRE API responded with status: ${response.status}`);
 		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.propertyValue) ? parsedResultRaw.result.ochre.propertyValue : [parsedResultRaw.result.ochre.propertyValue];
-		const groupedItemsMap = /* @__PURE__ */ new Map();
-		for (const item of parsedItems) {
-			const existing = groupedItemsMap.get(item.content);
-			if (existing == null) groupedItemsMap.set(item.content, {
-				dataType: item.dataType,
-				content: item.content,
-				label: item.label,
-				itemUuids: new Set([item.itemUuid])
+		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();
+		for (const propertyValue of parsedPropertyValues) {
+			const existing = groupedPropertyValuesMap.get(propertyValue.content);
+			if (existing == null) groupedPropertyValuesMap.set(propertyValue.content, {
+				dataType: propertyValue.dataType,
+				content: propertyValue.content,
+				label: propertyValue.label,
+				itemUuids: new Set([propertyValue.itemUuid])
 			});
-			else existing.itemUuids.add(item.itemUuid);
+			else existing.itemUuids.add(propertyValue.itemUuid);
 		}
-		const groupedItems = [];
-		for (const group of groupedItemsMap.values()) groupedItems.push({
+		const groupedPropertyValues = [];
+		for (const group of groupedPropertyValuesMap.values()) groupedPropertyValues.push({
 			count: group.itemUuids.size,
 			dataType: group.dataType,
 			content: group.content,
 			label: group.label
 		});
 		return {
-			items: groupedItems.toSorted((a, b) => {
+			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;
@@ -2286,7 +2313,7 @@ async function fetchPropertyValuesByPropertyVariables(params, options) {
 	} catch (error) {
 		console.error(error);
 		return {
-			items: null,
+			propertyValues: null,
 			error: error instanceof Error ? error.message : "Failed to fetch property values by property variables"
 		};
 	}
@@ -2765,8 +2792,8 @@ function parseWebElementProperties(componentProperty, elementResource) {
 			break;
 		}
 		case "collection": {
-			const collectionLinks = links.filter((link) => link.category === "set");
-			if (collectionLinks.every((link) => link.uuid === null)) throw new Error(`Collection links not found for the following component: “${componentName}”`);
+			const setLinks = links.filter((link) => link.category === "set");
+			if (setLinks.every((link) => link.uuid === null)) throw new Error(`Set links not found for the following component: “${componentName}”`);
 			const displayedProperties = getPropertyByLabel(componentProperty.properties, "use-property");
 			let variant = getPropertyValueByLabel(componentProperty.properties, "variant");
 			variant ??= "full";
@@ -2818,7 +2845,7 @@ function parseWebElementProperties(componentProperty, elementResource) {
 			}
 			properties = {
 				component: "collection",
-				linkUuids: collectionLinks.map((link) => link.uuid).filter((uuid) => uuid !== null),
+				linkUuids: setLinks.map((link) => link.uuid).filter((uuid) => uuid !== null),
 				displayedProperties: displayedProperties?.values.filter(({ uuid }) => uuid !== null).map((value) => ({
 					uuid: value.uuid,
 					label: value.content?.toString() ?? ""
@@ -3028,9 +3055,9 @@ function parseWebElementProperties(componentProperty, elementResource) {
 			break;
 		}
 		case "query": {
+			const setLinks = links.filter((link) => link.category === "set");
+			if (setLinks.every((link) => link.uuid === null)) throw new Error(`Set links not found for the following component: “${componentName}”`);
 			const queries = [];
-			let itemCategory = getPropertyValueByLabel(componentProperty.properties, "item-category");
-			itemCategory ??= null;
 			if (componentProperty.properties.length === 0) throw new Error(`Query properties not found for the following component: “${componentName}”`);
 			for (const query of componentProperty.properties) {
 				const querySubProperties = query.properties;
@@ -3058,7 +3085,7 @@ function parseWebElementProperties(componentProperty, elementResource) {
 			layout ??= "image-start";
 			properties = {
 				component: "query",
-				itemCategory,
+				linkUuids: setLinks.map((link) => link.uuid).filter((uuid) => uuid !== null),
 				queries,
 				displayedProperties: displayedProperties?.values.filter((value) => value.uuid !== null).map((value) => ({
 					uuid: value.uuid,
@@ -3863,4 +3890,4 @@ async function fetchWebsite(abbreviation, options) {
 }
 
 //#endregion
-export { DEFAULT_API_VERSION, DEFAULT_PAGE_SIZE, fetchGallery, fetchItem, fetchItemsByPropertyValues, fetchPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByLabelAndValue, getPropertyByLabelAndValues, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };
+export { DEFAULT_API_VERSION, DEFAULT_PAGE_SIZE, fetchGallery, fetchItem, fetchSetItemsByPropertyValues, fetchSetPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByLabelAndValue, getPropertyByLabelAndValues, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };

package/package.json

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