@digitalculture/ochre-sdk 0.18.12 → 0.18.13

package/dist/index.mjs

@@ -3596,7 +3596,7 @@ function buildXQuery$2(params, options) {
 	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 ")}]]]`;
+	if (belongsToCollectionScopeUuids.length > 0) belongsToCollectionScopeFilter = `[.//properties[property[label/@uuid="${BELONG_TO_COLLECTION_UUID}" and 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}"]`;
@@ -3605,8 +3605,8 @@ function buildXQuery$2(params, options) {
 	}).join(" or ");
 	return `<ochre>{${`let $match-uuids := distinct-values(
     ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
-        /*${belongsToCollectionScopeFilter}
-          [properties//property[label[${propertyVariables}]][${propertyValuesFilters}]]
+        ${belongsToCollectionScopeFilter}
+          //property[label[${propertyVariables}]][${propertyValuesFilters}]]
         /@uuid
   )
 
@@ -3619,11 +3619,11 @@ function buildXQuery$2(params, options) {
 
   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)]"}
-    }
+      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>`;
 }
 /**

package/package.json

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