ochre-sdk 0.20.23 → 0.20.25

package/dist/index.d.mts

@@ -674,9 +674,10 @@ type SetItemsSort = {
  * Represents a query for Set items
  */
 type Query = {
-  target: "propertyValue";
+  target: "property";
+  propertyVariables: Array<string>;
   dataType: Exclude<Exclude<PropertyValueContentType, "coordinate">, "date" | "dateTime">;
-  value: string;
+  propertyValues?: Array<string>;
   from?: never;
   to?: never;
   matchMode: "includes" | "exact";
@@ -685,9 +686,10 @@ type Query = {
   operator?: "AND" | "OR";
   isNegated?: boolean;
 } | {
-  target: "propertyValue";
+  target: "property";
+  propertyVariables: Array<string>;
   dataType: "date" | "dateTime";
-  value: string;
+  propertyValues?: never;
   from: string;
   to?: string;
   matchMode: "includes" | "exact";
@@ -696,9 +698,10 @@ type Query = {
   operator?: "AND" | "OR";
   isNegated?: boolean;
 } | {
-  target: "propertyValue";
+  target: "property";
+  propertyVariables: Array<string>;
   dataType: "date" | "dateTime";
-  value: string;
+  propertyValues?: never;
   from?: string;
   to: string;
   matchMode: "includes" | "exact";
@@ -1231,7 +1234,6 @@ declare function fetchItem<T extends DataCategory = DataCategory, U extends Data
  *
  * @param params - The parameters for the fetch
  * @param params.setScopeUuids - The Set scope UUIDs to filter by
- * @param params.propertyVariableUuids - The property variable UUIDs to filter by
  * @param params.queries - Ordered queries to combine with AND/OR and optional NOT via negation
  * @param params.sort - Optional sorting configuration applied before pagination.
  * For propertyValue sorting, dataType is required and the sort key uses the first valid leaf value (value[not(@i)]).
@@ -1245,7 +1247,6 @@ declare function fetchItem<T extends DataCategory = DataCategory, U extends Data
  */
 declare function fetchSetItems<U extends Array<DataCategory> = Array<DataCategory>>(params: {
   setScopeUuids: Array<string>;
-  propertyVariableUuids: Array<string>;
   queries: Array<Query>;
   sort?: SetItemsSort;
   page: number;
@@ -1267,13 +1268,12 @@ declare function fetchSetItems<U extends Array<DataCategory> = Array<DataCategor
   error: string;
 }>;
 //#endregion
-//#region src/utils/fetchers/set/property-values-by-property-variables.d.ts
+//#region src/utils/fetchers/set/property-values.d.ts
 /**
- * Fetches and parses Set property values by property variables from the OCHRE API
+ * Fetches and parses Set property values from the OCHRE API
  *
  * @param params - The parameters for the fetch
  * @param params.setScopeUuids - An array of set scope UUIDs to filter by
- * @param params.propertyVariableUuids - The property variable UUIDs to query by
  * @param params.queries - Ordered queries to combine with AND/OR and optional NOT via negation
  * @param params.attributes - Whether to return values for bibliographies and periods
  * @param params.attributes.bibliographies - Whether to return values for bibliographies
@@ -1285,9 +1285,8 @@ declare function fetchSetItems<U extends Array<DataCategory> = Array<DataCategor
  * @returns Parsed Set property values and requested attribute values.
  * Returns empty arrays/objects when no matches are found, and null outputs on fetch/parse errors.
  */
-declare function fetchSetPropertyValuesByPropertyVariables(params: {
+declare function fetchSetPropertyValues(params: {
   setScopeUuids: Array<string>;
-  propertyVariableUuids: Array<string>;
   queries?: Array<Query>;
   attributes?: {
     bibliographies: boolean;
@@ -1471,4 +1470,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, Query, Resource, Scope, Section, Set, SetAttributeValueQueryItem, SetItemsSort, SetItemsSortDirection, SpatialUnit, Style, Text, Tree, WebBlock, WebBlockLayout, WebElement, WebElementComponent, WebImage, WebSegment, WebSegmentItem, WebTitle, Webpage, Website, WebsiteType, fetchGallery, fetchItem, fetchSetItems, fetchSetPropertyValuesByPropertyVariables, 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, Query, Resource, Scope, Section, Set, SetAttributeValueQueryItem, SetItemsSort, SetItemsSortDirection, SpatialUnit, Style, Text, Tree, WebBlock, WebBlockLayout, WebElement, WebElementComponent, WebImage, WebSegment, WebSegmentItem, WebTitle, Webpage, Website, WebsiteType, fetchGallery, fetchItem, fetchSetItems, fetchSetPropertyValues, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByLabelAndValue, getPropertyByLabelAndValues, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };

package/dist/index.mjs

@@ -758,7 +758,8 @@ const boundsSchema = z.string().transform((str, ctx) => {
 */
 const setQuerySchema = z.union([
 	z.object({
-		target: z.literal("propertyValue"),
+		target: z.literal("property"),
+		propertyVariables: z.array(uuidSchema).min(1, "At least one property variable UUID is required"),
 		dataType: z.enum([
 			"string",
 			"integer",
@@ -767,7 +768,7 @@ const setQuerySchema = z.union([
 			"time",
 			"IDREF"
 		]),
-		value: z.string(),
+		propertyValues: z.array(z.string()).min(1, "At least one property value is required").optional(),
 		matchMode: z.enum(["includes", "exact"]),
 		isCaseSensitive: z.boolean(),
 		language: z.string().default("eng"),
@@ -775,9 +776,9 @@ const setQuerySchema = z.union([
 		isNegated: z.boolean().optional().default(false)
 	}).strict(),
 	z.object({
-		target: z.literal("propertyValue"),
+		target: z.literal("property"),
+		propertyVariables: z.array(uuidSchema).min(1, "At least one property variable UUID is required"),
 		dataType: z.enum(["date", "dateTime"]),
-		value: z.string(),
 		from: z.string(),
 		to: z.string().optional(),
 		matchMode: z.enum(["includes", "exact"]),
@@ -787,9 +788,9 @@ const setQuerySchema = z.union([
 		isNegated: z.boolean().optional().default(false)
 	}).strict(),
 	z.object({
-		target: z.literal("propertyValue"),
+		target: z.literal("property"),
+		propertyVariables: z.array(uuidSchema).min(1, "At least one property variable UUID is required"),
 		dataType: z.enum(["date", "dateTime"]),
-		value: z.string(),
 		from: z.string().optional(),
 		to: z.string(),
 		matchMode: z.enum(["includes", "exact"]),
@@ -860,13 +861,12 @@ function validateSetQueriesOperators(queries, ctx) {
 	});
 }
 /**
-* Schema for validating the parameters for the Set property values by property variables fetching function
+* Schema for validating the parameters for the Set property values fetching function
 * @internal
 */
-const setPropertyValuesByPropertyVariablesParamsSchema = z.object({
+const setPropertyValuesParamsSchema = 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"),
 	queries: setQueriesSchema,
 	attributes: z.object({
 		bibliographies: z.boolean().default(false),
@@ -878,11 +878,15 @@ const setPropertyValuesByPropertyVariablesParamsSchema = z.object({
 	isLimitedToLeafPropertyValues: z.boolean().default(false)
 }).superRefine((value, ctx) => {
 	validateSetQueriesOperators(value.queries, ctx);
+	if (!value.queries.some((query) => query.target === "property")) ctx.addIssue({
+		code: "custom",
+		path: ["queries"],
+		message: "At least one property query is required"
+	});
 });
 const setItemsParamsSchema = 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).default([]),
 	queries: setQueriesSchema,
 	sort: setItemsSortSchema,
 	page: z.number().min(1, "Page must be positive").default(1),
@@ -2141,24 +2145,31 @@ const CTS_INCLUDES_STOP_WORDS = [
 	"to"
 ];
 const CTS_INCLUDES_STOP_WORDS_VAR = "$ctsIncludesStopWords";
+function buildFlattenedContentValuesExpression(contentNodesExpression) {
+	return `for $content in ${contentNodesExpression}
+    return string-join($content//text(), "")`;
+}
 /**
 * Build a string match predicate for an XQuery string.
 */
 function buildRawStringMatchPredicate(params) {
-	const { path, value, matchMode, isCaseSensitive } = params;
-	const comparedPath = isCaseSensitive ? path : `lower-case(${path})`;
+	const { valueExpression, value, matchMode, isCaseSensitive } = params;
 	const comparedValueLiteral = stringLiteral(isCaseSensitive ? value : value.toLowerCase());
-	if (matchMode === "includes") return `contains(${comparedPath}, ${comparedValueLiteral})`;
-	return `${comparedPath} = ${comparedValueLiteral}`;
+	const candidateVar = "$candidate";
+	const comparedCandidate = isCaseSensitive ? candidateVar : `lower-case(${candidateVar})`;
+	if (matchMode === "includes") return `some ${candidateVar} in (${valueExpression})
+  satisfies contains(${comparedCandidate}, ${comparedValueLiteral})`;
+	return `some ${candidateVar} in (${valueExpression})
+  satisfies ${comparedCandidate} = ${comparedValueLiteral}`;
 }
 /**
 * Build a combined raw string match predicate for multiple paths.
 */
 function buildCombinedRawStringMatchPredicate(params) {
-	const { paths, value, matchMode, isCaseSensitive } = params;
+	const { valueExpressions, value, matchMode, isCaseSensitive } = params;
 	const predicates = [];
-	for (const path of paths) predicates.push(buildRawStringMatchPredicate({
-		path,
+	for (const valueExpression of valueExpressions) predicates.push(buildRawStringMatchPredicate({
+		valueExpression,
 		value,
 		matchMode,
 		isCaseSensitive
@@ -2187,10 +2198,10 @@ function buildCtsWordQueryExpression(params) {
 * Build tokenized search declarations for CTS-backed queries.
 */
 function buildTokenizedSearchDeclarations(params) {
-	const { value, isCaseSensitive, queryIndex } = params;
-	const searchStringVar = `$query${queryIndex}SearchString`;
-	const rawTermsVar = `$query${queryIndex}RawTerms`;
-	const termsVar = `$query${queryIndex}Terms`;
+	const { value, isCaseSensitive, queryKey } = params;
+	const searchStringVar = `$query${queryKey}SearchString`;
+	const rawTermsVar = `$query${queryKey}RawTerms`;
+	const termsVar = `$query${queryKey}Terms`;
 	const tokenSourceExpression = isCaseSensitive ? searchStringVar : `fn:lower-case(${searchStringVar})`;
 	return {
 		declarations: [
@@ -2209,15 +2220,16 @@ function buildTokenizedSearchDeclarations(params) {
 * Build a CTS-backed field includes predicate for an XQuery string.
 */
 function buildCtsFieldIncludesPredicate(params) {
-	const { path, value, isCaseSensitive, queryIndex } = params;
+	const { contentNodesExpression, valueExpression, value, isCaseSensitive, queryKey } = params;
 	const tokenizedSearchDeclarations = buildTokenizedSearchDeclarations({
 		value,
 		isCaseSensitive,
-		queryIndex
+		queryKey
 	});
-	const ctsQueryVar = `$query${queryIndex}CtsQuery`;
+	const ctsQueryVar = `$query${queryKey}CtsQuery`;
+	const contentNodeVar = `$query${queryKey}ContentNode`;
 	const fallbackPredicate = buildRawStringMatchPredicate({
-		path,
+		valueExpression,
 		value,
 		matchMode: "includes",
 		isCaseSensitive
@@ -2238,14 +2250,17 @@ function buildCtsFieldIncludesPredicate(params) {
 		})}
   ))
   else ()`],
-		predicate: `(if (exists(${ctsQueryVar})) then cts:contains(${path}, ${ctsQueryVar}) else ${fallbackPredicate})`
+		predicate: `(if (exists(${ctsQueryVar}))
+  then some ${contentNodeVar} in (${contentNodesExpression})
+    satisfies cts:contains(${contentNodeVar}, ${ctsQueryVar})
+  else ${fallbackPredicate})`
 	};
 }
 /**
 * Build the raw search paths for item-level string search.
 */
 function buildItemStringSearchPaths(language) {
-	return [`string-join(identification/label/content[@xml:lang="${language}"]/string, "")`, `string-join(properties//property/value[not(@inherited="true")]/content[@xml:lang="${language}"]/string, "")`];
+	return [buildFlattenedContentValuesExpression(`identification/label/content[@xml:lang="${language}"]`), buildFlattenedContentValuesExpression(`properties//property/value[not(@inherited="true")]/content[@xml:lang="${language}"]`)];
 }
 /**
 * Build the identification branch for an item-level CTS string search.
@@ -2290,9 +2305,9 @@ function buildItemStringPropertyValueBranch(params) {
 * Build an item-level CTS string search predicate.
 */
 function buildItemStringSearchPredicate(params) {
-	const { query, version, queryIndex } = params;
+	const { query, version, queryKey } = params;
 	const fallbackPredicate = buildCombinedRawStringMatchPredicate({
-		paths: buildItemStringSearchPaths(query.language),
+		valueExpressions: buildItemStringSearchPaths(query.language),
 		value: query.value,
 		matchMode: query.matchMode,
 		isCaseSensitive: query.isCaseSensitive
@@ -2304,10 +2319,10 @@ function buildItemStringSearchPredicate(params) {
 	const tokenizedSearchDeclarations = buildTokenizedSearchDeclarations({
 		value: query.value,
 		isCaseSensitive: query.isCaseSensitive,
-		queryIndex
+		queryKey
 	});
-	const termQueriesVar = `$query${queryIndex}TermQueries`;
-	const ctsQueryVar = `$query${queryIndex}CtsQuery`;
+	const termQueriesVar = `$query${queryKey}TermQueries`;
+	const ctsQueryVar = `$query${queryKey}CtsQuery`;
 	return {
 		declarations: [
 			...tokenizedSearchDeclarations.declarations,
@@ -2340,23 +2355,33 @@ function buildItemStringSearchPredicate(params) {
 * Build a string match predicate for an XQuery string.
 */
 function buildStringMatchPredicate(params) {
-	const { path, value, matchMode, isCaseSensitive, version, queryIndex } = params;
+	const { contentNodesExpression, value, matchMode, isCaseSensitive, version, queryKey } = params;
+	const valueExpression = buildFlattenedContentValuesExpression(contentNodesExpression);
 	if (matchMode === "includes" && version === 2) return buildCtsFieldIncludesPredicate({
-		path,
+		contentNodesExpression,
+		valueExpression,
 		value,
 		isCaseSensitive,
-		queryIndex
+		queryKey
 	});
 	return {
 		declarations: [],
 		predicate: buildRawStringMatchPredicate({
-			path,
+			valueExpression,
 			value,
 			matchMode,
 			isCaseSensitive
 		})
 	};
 }
+function buildOrPredicate(predicates) {
+	if (predicates.length === 1) return predicates[0] ?? "false()";
+	return `(${predicates.join(" or ")})`;
+}
+function buildAndPredicate(predicates) {
+	if (predicates.length === 1) return predicates[0] ?? "false()";
+	return `(${predicates.join(" and ")})`;
+}
 /**
 * Build a date/dateTime range predicate for an XQuery string.
 */
@@ -2368,93 +2393,139 @@ function buildDateRangePredicate(params) {
 	return conditions.join(" and ");
 }
 /**
-* Build a property value predicate for an XQuery string.
+* Build a property label predicate for an XQuery string.
 */
-function buildPropertyValuePredicate(params) {
-	const { query, version, queryIndex } = params;
-	if (query.dataType === "IDREF") return {
-		declarations: [],
-		predicate: `.//properties//property[value[@uuid=${stringLiteral(query.value)}]]`
-	};
-	if (query.dataType === "date" || query.dataType === "dateTime") return {
-		declarations: [],
-		predicate: `.//properties//property[(label/@uuid=${stringLiteral(query.value)}) and ${buildDateRangePredicate({
-			from: query.from,
-			to: query.to
-		})}]`
-	};
-	if (query.dataType === "time" || query.dataType === "integer" || query.dataType === "decimal" || query.dataType === "boolean") return {
-		declarations: [],
-		predicate: `.//properties//property[value[@rawValue=${stringLiteral(query.value)}]]`
+function buildPropertyLabelPredicate(propertyVariables) {
+	const labelPredicates = [];
+	for (const propertyVariable of propertyVariables) labelPredicates.push(`@uuid=${stringLiteral(propertyVariable)}`);
+	return `label[${buildOrPredicate(labelPredicates)}]`;
+}
+function buildPropertyValueAttributePredicate(params) {
+	const { propertyValues, attributeName } = params;
+	const valuePredicates = [];
+	for (const propertyValue of propertyValues) valuePredicates.push(`value[@${attributeName}=${stringLiteral(propertyValue)}]`);
+	return buildOrPredicate(valuePredicates);
+}
+function buildPropertyStringValuePredicate(params) {
+	const { query, version, queryKey } = params;
+	const propertyContentNodesExpression = query.matchMode === "includes" && version === 2 ? `value[not(@inherited="true")]/content[@xml:lang="${query.language}"]` : `value/content[@xml:lang="${query.language}"]`;
+	const declarations = [];
+	const valuePredicates = [];
+	for (const [propertyValueIndex, propertyValue] of query.propertyValues.entries()) {
+		const compiledStringPredicate = buildStringMatchPredicate({
+			contentNodesExpression: propertyContentNodesExpression,
+			value: propertyValue,
+			matchMode: query.matchMode,
+			isCaseSensitive: query.isCaseSensitive,
+			version,
+			queryKey: `${queryKey}_${propertyValueIndex + 1}`
+		});
+		declarations.push(...compiledStringPredicate.declarations);
+		valuePredicates.push(compiledStringPredicate.predicate);
+	}
+	return {
+		declarations,
+		predicate: buildOrPredicate(valuePredicates)
 	};
-	const compiledStringPredicate = buildStringMatchPredicate({
-		path: query.matchMode === "includes" && version === 2 ? `string-join(value[not(@inherited="true")]/content[@xml:lang="${query.language}"]/string, "")` : `string-join(value/content[@xml:lang="${query.language}"]/string, "")`,
-		value: query.value,
-		matchMode: query.matchMode,
-		isCaseSensitive: query.isCaseSensitive,
-		version,
-		queryIndex
-	});
+}
+/**
+* Build a property predicate for an XQuery string.
+*/
+function buildPropertyPredicate(params) {
+	const { query, version, queryKey } = params;
+	const predicateParts = [buildPropertyLabelPredicate(query.propertyVariables)];
+	const declarations = [];
+	if (query.dataType === "date" || query.dataType === "dateTime") predicateParts.push(buildDateRangePredicate({
+		from: query.from,
+		to: query.to
+	}));
+	else if (query.propertyValues != null) switch (query.dataType) {
+		case "IDREF":
+			predicateParts.push(buildPropertyValueAttributePredicate({
+				propertyValues: query.propertyValues,
+				attributeName: "uuid"
+			}));
+			break;
+		case "integer":
+		case "decimal":
+		case "time":
+		case "boolean":
+			predicateParts.push(buildPropertyValueAttributePredicate({
+				propertyValues: query.propertyValues,
+				attributeName: "rawValue"
+			}));
+			break;
+		case "string": {
+			const compiledStringPredicate = buildPropertyStringValuePredicate({
+				query,
+				version,
+				queryKey
+			});
+			declarations.push(...compiledStringPredicate.declarations);
+			predicateParts.push(compiledStringPredicate.predicate);
+			break;
+		}
+	}
 	return {
-		declarations: compiledStringPredicate.declarations,
-		predicate: `.//properties//property[${compiledStringPredicate.predicate}]`
+		declarations,
+		predicate: `.//properties//property[${buildAndPredicate(predicateParts)}]`
 	};
 }
 /**
 * Build a query predicate for an XQuery string.
 */
 function buildQueryPredicate(params) {
-	const { query, version, queryIndex } = params;
+	const { query, version, queryKey } = params;
 	switch (query.target) {
 		case "string": return buildItemStringSearchPredicate({
 			query,
 			version,
-			queryIndex
+			queryKey
 		});
 		case "title": return buildStringMatchPredicate({
-			path: `string-join(identification/label/content[@xml:lang="${query.language}"]/string, "")`,
+			contentNodesExpression: `identification/label/content[@xml:lang="${query.language}"]`,
 			value: query.value,
 			matchMode: query.matchMode,
 			isCaseSensitive: query.isCaseSensitive,
 			version,
-			queryIndex
+			queryKey
 		});
 		case "description": return buildStringMatchPredicate({
-			path: `string-join(description/content[@xml:lang="${query.language}"]/string, "")`,
+			contentNodesExpression: `description/content[@xml:lang="${query.language}"]`,
 			value: query.value,
 			matchMode: query.matchMode,
 			isCaseSensitive: query.isCaseSensitive,
 			version,
-			queryIndex
+			queryKey
 		});
 		case "periods": return buildStringMatchPredicate({
-			path: `string-join(periods/period/identification/label/content[@xml:lang="${query.language}"]/string, "")`,
+			contentNodesExpression: `periods/period/identification/label/content[@xml:lang="${query.language}"]`,
 			value: query.value,
 			matchMode: query.matchMode,
 			isCaseSensitive: query.isCaseSensitive,
 			version,
-			queryIndex
+			queryKey
 		});
 		case "bibliography": return buildStringMatchPredicate({
-			path: `string-join(bibliographies/bibliography/identification/label/content[@xml:lang="${query.language}"]/string, "")`,
+			contentNodesExpression: `bibliographies/bibliography/identification/label/content[@xml:lang="${query.language}"]`,
 			value: query.value,
 			matchMode: query.matchMode,
 			isCaseSensitive: query.isCaseSensitive,
 			version,
-			queryIndex
+			queryKey
 		});
 		case "image": return buildStringMatchPredicate({
-			path: `string-join(image/identification/label/content[@xml:lang="${query.language}"]/string, "")`,
+			contentNodesExpression: `image/identification/label/content[@xml:lang="${query.language}"]`,
 			value: query.value,
 			matchMode: query.matchMode,
 			isCaseSensitive: query.isCaseSensitive,
 			version,
-			queryIndex
+			queryKey
 		});
-		case "propertyValue": return buildPropertyValuePredicate({
+		case "property": return buildPropertyPredicate({
 			query,
 			version,
-			queryIndex
+			queryKey
 		});
 	}
 }
@@ -2462,11 +2533,11 @@ function buildQueryPredicate(params) {
 * Build a boolean query clause for an XQuery string.
 */
 function buildBooleanQueryClause(params) {
-	const { query, version, queryIndex } = params;
+	const { query, version, queryKey } = params;
 	const compiledQueryPredicate = buildQueryPredicate({
 		query,
 		version,
-		queryIndex
+		queryKey
 	});
 	const baseClause = `(${compiledQueryPredicate.predicate})`;
 	return {
@@ -2486,7 +2557,7 @@ function buildQueryFilters(params) {
 		const compiledClause = buildBooleanQueryClause({
 			query,
 			version,
-			queryIndex: index + 1
+			queryKey: `${index + 1}`
 		});
 		if (compiledClause.declarations.length > 0) {
 			hasCtsIncludesClauses = true;
@@ -2581,7 +2652,6 @@ function buildOrderedItemsClause(sort) {
 * @param params - The parameters for the fetch
 * @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 filter by
 * @param params.queries - Ordered queries to combine with AND/OR and optional NOT via negation
 * @param params.sort - Optional sorting configuration applied before pagination.
 * For propertyValue sorting, dataType is required and the sort key uses the first valid leaf value (value[not(@i)]).
@@ -2593,7 +2663,7 @@ function buildOrderedItemsClause(sort) {
 */
 function buildXQuery$1(params, options) {
 	const version = options?.version ?? 2;
-	const { propertyVariableUuids, queries, sort, setScopeUuids, belongsToCollectionScopeUuids, page, pageSize } = params;
+	const { queries, sort, setScopeUuids, belongsToCollectionScopeUuids, page, pageSize } = params;
 	const startPosition = (page - 1) * pageSize + 1;
 	const endPosition = page * pageSize;
 	const setScopeFilter = `/set[(${setScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]/items/*`;
@@ -2607,10 +2677,6 @@ function buildXQuery$1(params, options) {
 		const belongsToCollectionScopeValues = belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
 		filterPredicates.push(`.//properties[property[label/@uuid="${BELONGS_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeValues})]]`);
 	}
-	if (propertyVariableUuids.length > 0) {
-		const propertyVariables = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
-		filterPredicates.push(`.//properties//property[label[${propertyVariables}]]`);
-	}
 	if (compiledQueryFilters.predicate.length > 0) filterPredicates.push(`(${compiledQueryFilters.predicate})`);
 	const itemFilters = filterPredicates.length > 0 ? `[${filterPredicates.join(" and ")}]` : "";
 	const orderedItemsClause = buildOrderedItemsClause(sort);
@@ -2633,7 +2699,6 @@ function buildXQuery$1(params, options) {
 *
 * @param params - The parameters for the fetch
 * @param params.setScopeUuids - The Set scope UUIDs to filter by
-* @param params.propertyVariableUuids - The property variable UUIDs to filter by
 * @param params.queries - Ordered queries to combine with AND/OR and optional NOT via negation
 * @param params.sort - Optional sorting configuration applied before pagination.
 * For propertyValue sorting, dataType is required and the sort key uses the first valid leaf value (value[not(@i)]).
@@ -2648,11 +2713,10 @@ function buildXQuery$1(params, options) {
 async function fetchSetItems(params, itemCategories, options) {
 	try {
 		const version = options?.version ?? 2;
-		const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids, queries, sort, page, pageSize } = setItemsParamsSchema.parse(params);
+		const { setScopeUuids, belongsToCollectionScopeUuids, queries, sort, page, pageSize } = setItemsParamsSchema.parse(params);
 		const xquery = buildXQuery$1({
 			setScopeUuids,
 			belongsToCollectionScopeUuids,
-			propertyVariableUuids,
 			queries,
 			sort,
 			page,
@@ -2743,7 +2807,7 @@ async function fetchSetItems(params, itemCategories, options) {
 	}
 }
 //#endregion
-//#region src/utils/fetchers/set/property-values-by-property-variables.ts
+//#region src/utils/fetchers/set/property-values.ts
 function parsePropertyValueLabel(content) {
 	if (content == null || content === "") return null;
 	if (typeof content === "object") return parseStringContent({ content });
@@ -2815,6 +2879,14 @@ function aggregateAttributeValues(values) {
 		return a.content.localeCompare(b.content);
 	});
 }
+function getPropertyVariableUuidsFromQueries(queries) {
+	const propertyVariableUuids = /* @__PURE__ */ new Set();
+	for (const query of queries) {
+		if (query.target !== "property") continue;
+		for (const propertyVariableUuid of query.propertyVariables) propertyVariableUuids.add(propertyVariableUuid);
+	}
+	return [...propertyVariableUuids];
+}
 /**
 * Schema for a single property value query item in the OCHRE API response
 */
@@ -2872,18 +2944,17 @@ const attributeValueQueryItemSchema = z.object({
 	content: val.content != null && val.content !== "" ? val.content : null
 }));
 /**
-* Schema for the property values by property variables OCHRE API response
+* Schema for the property values OCHRE API response
 */
 const responseSchema = z.object({ result: z.union([z.object({ ochre: z.object({
 	propertyValue: z.union([propertyValueQueryItemSchema, z.array(propertyValueQueryItemSchema)]).optional(),
 	attributeValue: z.union([attributeValueQueryItemSchema, z.array(attributeValueQueryItemSchema)]).optional()
 }) }), z.array(z.unknown()).length(0)]) });
 /**
-* Build an XQuery string to fetch property values by property variables from the OCHRE API
+* Build an XQuery string to fetch property values from the OCHRE API
 * @param params - The parameters for the fetch
 * @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.queries - Ordered queries to combine with AND/OR and optional NOT via negation
 * @param params.attributes - Whether to return values for bibliographies and periods
 * @param params.attributes.bibliographies - Whether to return values for bibliographies
@@ -2895,10 +2966,10 @@ const responseSchema = z.object({ result: z.union([z.object({ ochre: z.object({
 */
 function buildXQuery(params, options) {
 	const version = options?.version ?? 2;
-	const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids, queries, attributes, isLimitedToLeafPropertyValues } = params;
+	const { setScopeUuids, belongsToCollectionScopeUuids, queries, attributes, isLimitedToLeafPropertyValues } = params;
 	let setScopeFilter = "/set/items/*";
 	if (setScopeUuids.length > 0) setScopeFilter = `/set[(${setScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]/items/*`;
-	const propertyVariableFilters = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
+	const propertyVariableFilters = getPropertyVariableUuidsFromQueries(queries).map((uuid) => `@uuid="${uuid}"`).join(" or ");
 	const compiledQueryFilters = buildQueryFilters({
 		queries,
 		version
@@ -2919,14 +2990,14 @@ let $property-values :=
     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"]/string, "") else $v/text()
+      if ($v/content) then string-join($v/content[@xml:lang="eng"]//text(), "") else $v/text()
     }</propertyValue>`];
 	const returnedSequences = ["$property-values"];
 	if (attributes.bibliographies) {
 		queryBlocks.push(`let $bibliography-values :=
   for $item in $items
   for $bibliography in $item/bibliographies/bibliography
-    let $label := string-join($bibliography/identification/label/content[@xml:lang="eng"]/string, "")
+    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}" />`);
 		returnedSequences.push("$bibliography-values");
@@ -2935,7 +3006,7 @@ let $property-values :=
 		queryBlocks.push(`let $period-values :=
   for $item in $items
   for $period in $item/periods/period
-    let $label := string-join($period/identification/label/content[@xml:lang="eng"]/string, "")
+    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}" />`);
 		returnedSequences.push("$period-values");
@@ -2949,11 +3020,10 @@ ${queryBlocks.join("\n\n")}
 return (${returnedSequences.join(", ")})`}}</ochre>`;
 }
 /**
-* Fetches and parses Set property values by property variables from the OCHRE API
+* Fetches and parses Set property values from the OCHRE API
 *
 * @param params - The parameters for the fetch
 * @param params.setScopeUuids - An array of set scope UUIDs to filter by
-* @param params.propertyVariableUuids - The property variable UUIDs to query by
 * @param params.queries - Ordered queries to combine with AND/OR and optional NOT via negation
 * @param params.attributes - Whether to return values for bibliographies and periods
 * @param params.attributes.bibliographies - Whether to return values for bibliographies
@@ -2965,14 +3035,13 @@ return (${returnedSequences.join(", ")})`}}</ochre>`;
 * @returns Parsed Set property values and requested attribute values.
 * Returns empty arrays/objects when no matches are found, and null outputs on fetch/parse errors.
 */
-async function fetchSetPropertyValuesByPropertyVariables(params, options) {
+async function fetchSetPropertyValues(params, options) {
 	try {
 		const version = options?.version ?? 2;
-		const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids, queries, attributes, isLimitedToLeafPropertyValues } = setPropertyValuesByPropertyVariablesParamsSchema.parse(params);
+		const { setScopeUuids, belongsToCollectionScopeUuids, queries, attributes, isLimitedToLeafPropertyValues } = setPropertyValuesParamsSchema.parse(params);
 		const xquery = buildXQuery({
 			setScopeUuids,
 			belongsToCollectionScopeUuids,
-			propertyVariableUuids,
 			queries,
 			attributes,
 			isLimitedToLeafPropertyValues
@@ -3031,7 +3100,7 @@ async function fetchSetPropertyValuesByPropertyVariables(params, options) {
 			propertyValues: null,
 			propertyValuesByPropertyVariableUuid: null,
 			attributeValues: null,
-			error: error instanceof Error ? error.message : "Failed to fetch property values by property variables"
+			error: error instanceof Error ? error.message : "Failed to fetch property values"
 		};
 	}
 }
@@ -4631,4 +4700,4 @@ async function fetchWebsite(abbreviation, options) {
 	}
 }
 //#endregion
-export { DEFAULT_API_VERSION, DEFAULT_PAGE_SIZE, fetchGallery, fetchItem, fetchSetItems, fetchSetPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByLabelAndValue, getPropertyByLabelAndValues, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };
+export { DEFAULT_API_VERSION, DEFAULT_PAGE_SIZE, fetchGallery, fetchItem, fetchSetItems, fetchSetPropertyValues, 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.20.23",
+  "version": "0.20.25",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -49,7 +49,7 @@
     "@antfu/eslint-config": "^7.7.3",
     "@types/node": "^24.12.0",
     "bumpp": "^11.0.1",
-    "eslint": "^10.0.3",
+    "eslint": "^10.1.0",
     "prettier": "^3.8.1",
     "tsdown": "^0.21.4",
     "typescript": "^5.9.3"