ochre-sdk 0.22.3 → 0.22.4

package/dist/index.mjs

@@ -2379,6 +2379,12 @@ function buildPropertyQueryExpression(params) {
 	if (propertyVariable != null) propertyQueryExpressions.unshift(buildPropertyLabelQuery(propertyVariable));
 	return buildNestedElementQuery(["properties", "property"], buildAndCtsQueryExpressionInternal(propertyQueryExpressions));
 }
+function buildPropertyPresenceQueryExpression(params) {
+	return buildPropertyQueryExpression({
+		propertyVariable: params.propertyVariable,
+		queryExpression: "cts:true-query()"
+	});
+}
 function buildPropertyStringQueryExpression(params) {
 	const { propertyVariable, value, matchMode, isCaseSensitive, language } = params;
 	return buildPropertyQueryExpression({
@@ -2408,7 +2414,7 @@ function buildPropertyScalarQueryExpression(params) {
 }
 function buildPropertyAllQueryExpression(params) {
 	const { query, value, matchMode } = params;
-	if (matchMode === "exact") return buildPropertyQueryExpression({
+	return buildPropertyQueryExpression({
 		propertyVariable: query.propertyVariable,
 		queryExpression: buildNestedElementQuery(["value"], buildAndCtsQueryExpressionInternal([buildValueNotIdRefQuery(), buildCtsWordQueryExpression({
 			value,
@@ -2416,27 +2422,6 @@ function buildPropertyAllQueryExpression(params) {
 			isCaseSensitive: query.isCaseSensitive
 		})]))
 	});
-	return buildPropertyQueryExpression({
-		propertyVariable: query.propertyVariable,
-		queryExpression: buildNestedElementQuery(["value"], buildAndCtsQueryExpressionInternal([buildValueNotIdRefQuery(), buildOrCtsQueryExpressionInternal([
-			buildValueRawValueInnerQuery({
-				value,
-				matchMode,
-				isCaseSensitive: query.isCaseSensitive
-			}),
-			buildValueDirectTextInnerQuery({
-				value,
-				matchMode,
-				isCaseSensitive: query.isCaseSensitive
-			}),
-			buildValueContentInnerQuery({
-				language: query.language,
-				value,
-				matchMode,
-				isCaseSensitive: query.isCaseSensitive
-			})
-		])]))
-	});
 }
 function buildPropertyIdRefQueryExpression(params) {
 	const { propertyVariable, value } = params;
@@ -2451,8 +2436,8 @@ function buildPropertyIdRefQueryExpression(params) {
 }
 function buildPropertyDateRangeQueryExpression(query) {
 	const rangeQueryExpressions = [];
-	if (query.from != null) rangeQueryExpressions.push(`cts:element-attribute-range-query(xs:QName("value"), xs:QName("rawValue"), ">=", xs:${query.dataType}(${stringLiteral(query.from)}))`);
-	if (query.to != null) rangeQueryExpressions.push(`cts:element-attribute-range-query(xs:QName("value"), xs:QName("rawValue"), "<=", xs:${query.dataType}(${stringLiteral(query.to)}))`);
+	if (query.from != null) rangeQueryExpressions.push(`cts:element-attribute-range-query(xs:QName("value"), xs:QName("rawValue"), ">=", ${stringLiteral(query.from)})`);
+	if (query.to != null) rangeQueryExpressions.push(`cts:element-attribute-range-query(xs:QName("value"), xs:QName("rawValue"), "<=", ${stringLiteral(query.to)})`);
 	return buildPropertyQueryExpression({
 		propertyVariable: query.propertyVariable,
 		queryExpression: buildNestedElementQuery(["value"], buildAndCtsQueryExpressionInternal(rangeQueryExpressions))
@@ -2543,6 +2528,7 @@ function buildLeafValueQueryExpression(params) {
 	}
 }
 function buildLeafQueryExpression(query) {
+	if (query.target === "property" && query.dataType !== "date" && query.dataType !== "dateTime" && !("value" in query) && query.propertyVariable != null) return buildPropertyPresenceQueryExpression({ propertyVariable: query.propertyVariable });
 	if (query.target === "property" && (query.dataType === "date" || query.dataType === "dateTime") && query.value == null) return buildPropertyDateRangeQueryExpression(query);
 	const searchValue = getLeafSearchValue(query);
 	if (searchValue == null) throw new Error("Missing searchable value for query leaf");
@@ -2959,6 +2945,23 @@ function getPropertyVariableUuidsFromQueries(queries) {
 	}
 	return [...propertyVariableUuids];
 }
+function getItemFilterQueriesFromPropertyValueQueries(queries) {
+	if (queries == null) return null;
+	if ("target" in queries) {
+		if (queries.target !== "property") return queries;
+		if (queries.dataType === "date" || queries.dataType === "dateTime") return queries;
+		return "value" in queries && queries.value != null ? queries : null;
+	}
+	const filteredChildren = [];
+	const childQueries = "and" in queries ? queries.and : queries.or;
+	for (const childQuery of childQueries) {
+		const filteredChildQuery = getItemFilterQueriesFromPropertyValueQueries(childQuery);
+		if (filteredChildQuery != null) filteredChildren.push(filteredChildQuery);
+	}
+	if (filteredChildren.length === 0) return null;
+	if (filteredChildren.length === 1) return filteredChildren[0] ?? null;
+	return "and" in queries ? { and: filteredChildren } : { or: filteredChildren };
+}
 /**
 * Schema for a single property value query item in the OCHRE API response
 */
@@ -3040,7 +3043,7 @@ function buildXQuery(params) {
 	if (setScopeUuids.length > 0) setScopeFilter = `/set[(${setScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]/items/*`;
 	const propertyVariableFilters = getPropertyVariableUuidsFromQueries(queries).map((uuid) => `@uuid="${uuid}"`).join(" or ");
 	const baseItemsExpression = `doc()/ochre${setScopeFilter}`;
-	const compiledQueryPlan = buildQueryPlan({ queries });
+	const compiledQueryPlan = buildQueryPlan({ queries: getItemFilterQueriesFromPropertyValueQueries(queries) });
 	const itemsQueryExpressions = [];
 	const belongsToCollectionQueryExpression = buildBelongsToCollectionQueryExpression(belongsToCollectionScopeUuids, BELONGS_TO_COLLECTION_UUID);
 	if (compiledQueryPlan.queryExpression != null) itemsQueryExpressions.push(compiledQueryPlan.queryExpression);

package/package.json

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