ochre-sdk 1.0.47 → 1.0.48

package/dist/fetchers/set/items.mjs

@@ -124,48 +124,6 @@ function buildOrderedItemsClause(sort) {
 	})}
       return $item`;
 }
-function isExactStringPropertyQuery(query) {
-	return "target" in query && query.target === "property" && query.dataType === "string" && query.value != null && query.matchMode === "exact" && query.isNegated !== true;
-}
-function getCtsQueriesWithoutExactStringPropertyQueries(queries) {
-	if (queries == null) return null;
-	if ("target" in queries) return isExactStringPropertyQuery(queries) ? null : queries;
-	if ("or" in queries) return queries;
-	const filteredChildren = [];
-	for (const childQuery of queries.and) {
-		const filteredChildQuery = getCtsQueriesWithoutExactStringPropertyQueries(childQuery);
-		if (filteredChildQuery != null) filteredChildren.push(filteredChildQuery);
-	}
-	if (filteredChildren.length === 0) return null;
-	return filteredChildren.length === 1 ? filteredChildren[0] ?? null : { and: filteredChildren };
-}
-function buildExactStringPropertyPredicate(query) {
-	const propertyPredicates = [];
-	const value = stringLiteral(query.value);
-	if (query.propertyVariable != null) propertyPredicates.push(`label/@uuid = ${stringLiteral(query.propertyVariable)}`);
-	if (query.propertyRelation != null) propertyPredicates.push(`label/@relation = ${stringLiteral(query.propertyRelation)}`);
-	propertyPredicates.push(`value[
-    not(@inherited = "true")
-    and (
-      content[@xml:lang = ${stringLiteral(query.language)}]/string = ${value}
-      or @rawValue = ${value}
-      or (not(content) and text() = ${value})
-    )
-  ]`);
-	return `.//properties/property[${propertyPredicates.join(" and ")}]`;
-}
-function buildExactStringPropertyXPathFilterExpression(queries) {
-	if (queries == null) return null;
-	if ("target" in queries) return isExactStringPropertyQuery(queries) ? buildExactStringPropertyPredicate(queries) : null;
-	if ("or" in queries) return null;
-	const childExpressions = [];
-	for (const childQuery of queries.and) {
-		const childExpression = buildExactStringPropertyXPathFilterExpression(childQuery);
-		if (childExpression != null) childExpressions.push(childExpression);
-	}
-	if (childExpressions.length === 0) return null;
-	return childExpressions.join(" and ");
-}
 /**
 * Build an XQuery string to fetch Set items from the OCHRE API
 * @param params - The parameters for the fetch
@@ -183,9 +141,7 @@ function buildXQuery(params) {
 	const startPosition = (page - 1) * pageSize + 1;
 	const setScopeDeclaration = `declare variable $setScopeUuids := (${setScopeUuids.map((uuid) => stringLiteral(uuid)).join(", ")});`;
 	const baseItemsExpression = "doc()/ochre/set[@uuid = $setScopeUuids]/items/*";
-	const ctsQueries = getCtsQueriesWithoutExactStringPropertyQueries(queries);
-	const exactStringPropertyXPathFilterExpression = buildExactStringPropertyXPathFilterExpression(queries);
-	const compiledQueryPlan = buildQueryPlan({ queries: ctsQueries });
+	const compiledQueryPlan = buildQueryPlan({ queries });
 	const itemsQueryExpressions = [];
 	const belongsToCollectionQueryExpression = buildBelongsToCollectionQueryExpression(belongsToCollectionScopeUuids, BELONGS_TO_COLLECTION_UUID);
 	if (compiledQueryPlan.queryExpression != null) itemsQueryExpressions.push(compiledQueryPlan.queryExpression);
@@ -194,11 +150,8 @@ function buildXQuery(params) {
 	const orderedItemsClause = buildOrderedItemsClause(sort);
 	const xqueryDeclarations = ["xquery version \"1.0-ml\";", setScopeDeclaration];
 	if (compiledQueryPlan.prolog !== "") xqueryDeclarations.push(compiledQueryPlan.prolog);
-	const searchedItemsClause = itemsQueryExpression == null ? `let $searchedItems := ${baseItemsExpression}` : `let $query := ${itemsQueryExpression}
-  let $searchedItems := cts:search(${baseItemsExpression}, $query)`;
-	const itemsClause = exactStringPropertyXPathFilterExpression == null ? `${searchedItemsClause}
-  let $items := $searchedItems` : `${searchedItemsClause}
-  let $items := $searchedItems[${exactStringPropertyXPathFilterExpression}]`;
+	const itemsClause = itemsQueryExpression == null ? `let $items := ${baseItemsExpression}` : `let $query := ${itemsQueryExpression}
+  let $items := cts:search(${baseItemsExpression}, $query)`;
 	return `${xqueryDeclarations.join("\n\n")}
 
 <ochre>{

package/dist/query.mjs

@@ -227,13 +227,6 @@ function buildPropertyLabelQuery(propertyVariable) {
 		value: propertyVariable
 	});
 }
-function buildValueNotInheritedQuery() {
-	return buildNotCtsQueryExpression(buildPlainElementAttributeValueQueryExpression({
-		elementName: "value",
-		attributeName: "inherited",
-		value: "true"
-	}));
-}
 function buildValueNotIdRefQuery() {
 	return buildNotCtsQueryExpression(buildPlainElementAttributeValueQueryExpression({
 		elementName: "value",
@@ -264,6 +257,14 @@ function buildValueContentInnerQuery(params) {
 		isCaseSensitive
 	}));
 }
+function buildValueContentExactInnerQuery(params) {
+	const { language, value, isCaseSensitive } = params;
+	return buildNestedElementQuery(["content"], buildAndCtsQueryExpressionInternal([buildContentLanguageQuery(language), buildCtsElementValueQueryExpression({
+		elementName: "string",
+		value,
+		isCaseSensitive
+	})]));
+}
 function buildValueDirectTextInnerQuery(params) {
 	const { value, matchMode, isCaseSensitive } = params;
 	const directTextQuery = matchMode === "exact" ? buildCtsElementValueQueryExpression({
@@ -372,8 +373,11 @@ function buildPropertyStringQueryExpression(params) {
 	return buildPropertyTextMatchQueryExpression({
 		propertyVariable,
 		propertyRelation,
-		valueFilters: [buildValueNotInheritedQuery()],
-		contentQueryExpression: buildValueContentInnerQuery({
+		contentQueryExpression: matchMode === "exact" ? buildValueContentExactInnerQuery({
+			language,
+			value,
+			isCaseSensitive
+		}) : buildValueContentInnerQuery({
 			language,
 			value,
 			matchMode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "1.0.47",
+  "version": "1.0.48",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -44,28 +44,6 @@
   "files": [
     "dist"
   ],
-  "changelogithub": {
-    "types": {
-      "feat": {
-        "title": "🚀 Features"
-      },
-      "fix": {
-        "title": "🐞 Bug Fixes"
-      },
-      "refactor": {
-        "title": "🔧 Refactors"
-      },
-      "test": {
-        "title": "🧪 Tests"
-      },
-      "docs": {
-        "title": "📝 Documentation"
-      },
-      "chore": {
-        "title": "🧹 Chores"
-      }
-    }
-  },
   "dependencies": {
     "date-fns": "^4.4.0",
     "fast-equals": "^6.0.0",
@@ -74,7 +52,7 @@
   },
   "devDependencies": {
     "@antfu/eslint-config": "^9.0.0",
-    "@types/node": "^24.13.1",
+    "@types/node": "^24.13.2",
     "bumpp": "^11.1.0",
     "eslint": "^10.4.1",
     "knip": "^6.16.1",
@@ -86,8 +64,8 @@
   "scripts": {
     "dev": "tsdown src/index.ts --watch",
     "build": "tsdown",
-    "lint": "knip; eslint .",
-    "lint:fix": "knip --fix; eslint . --fix",
+    "lint": "knip; eslint --concurrency auto .",
+    "lint:fix": "knip --fix; eslint --concurrency auto --fix .",
     "format": "oxfmt --check",
     "format:fix": "oxfmt",
     "check-types": "tsc --noEmit",