ochre-sdk 0.20.28 → 0.20.30

package/dist/index.mjs

@@ -2409,6 +2409,52 @@ function buildOrCtsQueryExpression(queries) {
 	if (queries.length === 1) return queries[0] ?? "cts:false-query()";
 	return `cts:or-query((${queries.join(", ")}))`;
 }
+function buildPredicateGroups(predicateParts) {
+	const groups = [];
+	let currentGroup = [];
+	for (const predicatePart of predicateParts) {
+		if (predicatePart.operator == null || predicatePart.operator === "AND") {
+			currentGroup.push(predicatePart.predicate);
+			continue;
+		}
+		if (currentGroup.length > 0) groups.push(currentGroup);
+		currentGroup = [predicatePart.predicate];
+	}
+	if (currentGroup.length > 0) groups.push(currentGroup);
+	return groups;
+}
+function buildGroupedPredicateExpression(predicateGroups) {
+	if (predicateGroups.length === 0) return "";
+	const groupExpressions = [];
+	for (let index = 0; index < predicateGroups.length;) {
+		const predicateGroup = predicateGroups[index];
+		const firstPredicate = predicateGroup?.[0];
+		if (predicateGroup == null || predicateGroup.length < 2 || firstPredicate == null) {
+			groupExpressions.push(buildAndPredicate(predicateGroup ?? []));
+			index += 1;
+			continue;
+		}
+		let sharedGroupEnd = index + 1;
+		while (sharedGroupEnd < predicateGroups.length) {
+			const sharedGroup = predicateGroups[sharedGroupEnd];
+			if (sharedGroup == null || sharedGroup.length < 2 || sharedGroup[0] !== firstPredicate) break;
+			sharedGroupEnd += 1;
+		}
+		if (sharedGroupEnd === index + 1) {
+			groupExpressions.push(buildAndPredicate(predicateGroup));
+			index += 1;
+			continue;
+		}
+		const suffixGroupExpressions = [];
+		for (const sharedGroup of predicateGroups.slice(index, sharedGroupEnd)) {
+			const suffixPredicates = sharedGroup.slice(1);
+			suffixGroupExpressions.push(buildAndPredicate(suffixPredicates));
+		}
+		groupExpressions.push(buildAndPredicate([firstPredicate, buildOrPredicate(suffixGroupExpressions)]));
+		index = sharedGroupEnd;
+	}
+	return buildOrPredicate(groupExpressions);
+}
 function buildContentTargetCandidateBranch(params) {
 	const { containerElementName, termExpression, isCaseSensitive, language } = params;
 	return `cts:element-query(xs:QName("${containerElementName}"),
@@ -2507,12 +2553,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 +2704,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 +2794,7 @@ function buildPropertyClause(params) {
 	}
 	return {
 		declarations,
-		predicate: `.//properties//property[${buildAndPredicate(predicateParts)}]`,
+		predicate: buildPropertyPredicateExpression(predicateParts),
 		candidateQueryVar
 	};
 }
@@ -2880,11 +2931,17 @@ function buildQueryPlan(params) {
 		}
 		if (compiledClause.candidateQueryVar != null) candidateQueryVars.push(compiledClause.candidateQueryVar);
 		if (index === 0) {
-			predicateParts.push(compiledClause.predicate);
+			predicateParts.push({
+				operator: null,
+				predicate: compiledClause.predicate
+			});
 			index += groupedQueries?.length ?? 1;
 			continue;
 		}
-		predicateParts.push(`${query.operator === "AND" ? "and" : "or"} ${compiledClause.predicate}`);
+		predicateParts.push({
+			operator: query.operator ?? "OR",
+			predicate: compiledClause.predicate
+		});
 		index += groupedQueries?.length ?? 1;
 	}
 	if (hasCtsIncludesClauses) declarations.unshift(`let ${CTS_INCLUDES_STOP_WORDS_VAR} := (${CTS_INCLUDES_STOP_WORDS.map((stopWord) => stringLiteral(stopWord)).join(", ")})`);
@@ -2905,7 +2962,7 @@ function buildQueryPlan(params) {
 	return {
 		declarations,
 		itemsExpression,
-		predicate: predicateParts.join(" ")
+		predicate: buildGroupedPredicateExpression(buildPredicateGroups(predicateParts))
 	};
 }
 //#endregion

package/package.json

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