ochre-sdk 0.20.27 → 0.20.29

package/dist/index.mjs

@@ -2507,12 +2507,12 @@ function buildPropertyStringIncludesGroupMember(query) {
 	const propertyValue = query.propertyValues[0] ?? "";
 	if (propertyVariables.length > 0) predicateParts.push(buildPropertyLabelPredicate(propertyVariables));
 	return {
-		rawPredicate: `.//properties//property[${buildAndPredicate([...predicateParts, buildRawStringMatchPredicate({
+		rawPredicate: buildPropertyPredicateExpression([...predicateParts, buildRawStringMatchPredicate({
 			valueExpression,
 			value: propertyValue,
 			matchMode: "includes",
 			isCaseSensitive: query.isCaseSensitive
-		})])}]`,
+		})]),
 		buildCandidateTermQuery: (termExpression) => buildPropertyStringCandidateBranch({
 			termExpression,
 			isCaseSensitive: query.isCaseSensitive,
@@ -2658,6 +2658,11 @@ function buildPropertyValueAttributePredicate(params) {
 	for (const propertyValue of propertyValues) valuePredicates.push(`value[@${attributeName}=${stringLiteral(propertyValue)}]`);
 	return buildOrPredicate(valuePredicates);
 }
+function buildPropertyPredicateExpression(propertyPredicates) {
+	let propertyExpression = ".//properties//property";
+	for (const propertyPredicate of propertyPredicates) propertyExpression += `[${propertyPredicate}]`;
+	return propertyExpression;
+}
 function buildPropertyStringValueClause(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}"]`;
@@ -2743,7 +2748,7 @@ function buildPropertyClause(params) {
 	}
 	return {
 		declarations,
-		predicate: `.//properties//property[${buildAndPredicate(predicateParts)}]`,
+		predicate: buildPropertyPredicateExpression(predicateParts),
 		candidateQueryVar
 	};
 }
@@ -3014,15 +3019,7 @@ function buildXQuery$1(params, options) {
 	if (compiledQueryPlan.predicate.length > 0) filterPredicates.push(`(${compiledQueryPlan.predicate})`);
 	const itemFilters = filterPredicates.length > 0 ? `[${filterPredicates.join(" and ")}]` : "";
 	const orderedItemsClause = buildOrderedItemsClause(sort);
-	return `<ochre>{${`${queryFilterDeclarations}let $rawItems := ${compiledQueryPlan.itemsExpression}${itemFilters}
-  let $items :=
-    for $item at $position in $rawItems
-      let $itemUuid := string($item/@uuid)
-      where not(
-        some $previous in subsequence($rawItems, 1, $position - 1)
-          satisfies string($previous/@uuid) = $itemUuid
-      )
-      return $item
+	return `<ochre>{${`${queryFilterDeclarations}let $items := ${compiledQueryPlan.itemsExpression}${itemFilters}
 
   let $totalCount := count($items)
   ${orderedItemsClause}
@@ -3123,10 +3120,7 @@ async function fetchSetItems(params, itemCategories, options) {
 			items.push(...trees);
 		}
 		const itemsByUuid = /* @__PURE__ */ new Map();
-		for (const item of items) {
-			if (itemsByUuid.has(item.uuid)) throw new Error(`Duplicate item UUID: ${item.uuid}`);
-			itemsByUuid.set(item.uuid, item);
-		}
+		for (const item of items) if (!itemsByUuid.has(item.uuid)) itemsByUuid.set(item.uuid, item);
 		const uniqueItems = [...itemsByUuid.values()];
 		return {
 			totalCount: data.result.ochre.items.totalCount,

package/package.json

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