ochre-sdk 0.20.2 → 0.20.3

package/dist/index.d.mts

@@ -656,6 +656,7 @@ type Query = {
   isCaseSensitive: boolean;
   language: string;
   operator?: "AND" | "OR";
+  isNegated?: boolean;
 } | {
   target: "propertyValue";
   dataType: "date" | "dateTime";
@@ -666,6 +667,7 @@ type Query = {
   isCaseSensitive: boolean;
   language: string;
   operator?: "AND" | "OR";
+  isNegated?: boolean;
 } | {
   target: "propertyValue";
   dataType: "date" | "dateTime";
@@ -676,6 +678,7 @@ type Query = {
   isCaseSensitive: boolean;
   language: string;
   operator?: "AND" | "OR";
+  isNegated?: boolean;
 } | {
   target: "title" | "description" | "image" | "periods" | "bibliography";
   value: string;
@@ -683,6 +686,7 @@ type Query = {
   isCaseSensitive: boolean;
   language: string;
   operator?: "AND" | "OR";
+  isNegated?: boolean;
 };
 //#endregion
 //#region src/types/website.d.ts
@@ -1193,7 +1197,7 @@ declare function fetchItem<T extends DataCategory = DataCategory, U extends Data
  * @param params.setScopeUuids - The Set scope UUIDs to filter by
  * @param params.belongsToCollectionScopeUuids - The collection scope UUIDs to filter by
  * @param params.propertyVariableUuids - The property variable UUIDs to filter by
- * @param params.queries - Ordered queries to combine with AND/OR
+ * @param params.queries - Ordered queries to combine with AND/OR and optional NOT via negation
  * @param params.page - The page number (1-indexed)
  * @param params.pageSize - The number of items per page
  * @param itemCategories - The categories of the items to fetch

package/dist/index.mjs

@@ -787,7 +787,8 @@ const setItemsParamsSchema = z.object({
 			matchMode: z.enum(["includes", "exact"]),
 			isCaseSensitive: z.boolean(),
 			language: z.string().default("eng"),
-			operator: z.enum(["AND", "OR"]).optional()
+			operator: z.enum(["AND", "OR"]).optional(),
+			isNegated: z.boolean().optional().default(false)
 		}).strict(),
 		z.object({
 			target: z.literal("propertyValue"),
@@ -798,7 +799,8 @@ const setItemsParamsSchema = z.object({
 			matchMode: z.enum(["includes", "exact"]),
 			isCaseSensitive: z.boolean(),
 			language: z.string().default("eng"),
-			operator: z.enum(["AND", "OR"]).optional()
+			operator: z.enum(["AND", "OR"]).optional(),
+			isNegated: z.boolean().optional().default(false)
 		}).strict(),
 		z.object({
 			target: z.literal("propertyValue"),
@@ -809,7 +811,8 @@ const setItemsParamsSchema = z.object({
 			matchMode: z.enum(["includes", "exact"]),
 			isCaseSensitive: z.boolean(),
 			language: z.string().default("eng"),
-			operator: z.enum(["AND", "OR"]).optional()
+			operator: z.enum(["AND", "OR"]).optional(),
+			isNegated: z.boolean().optional().default(false)
 		}).strict(),
 		z.object({
 			target: z.enum([
@@ -823,7 +826,8 @@ const setItemsParamsSchema = z.object({
 			matchMode: z.enum(["includes", "exact"]),
 			isCaseSensitive: z.boolean(),
 			language: z.string().default("eng"),
-			operator: z.enum(["AND", "OR"]).optional()
+			operator: z.enum(["AND", "OR"]).optional(),
+			isNegated: z.boolean().optional().default(false)
 		}).strict()
 	])).default([]),
 	page: z.number().min(1, "Page must be positive").default(1),
@@ -2181,12 +2185,19 @@ function buildQueryPredicate(query) {
 	}
 }
 /**
+* Build a boolean query clause for an XQuery string.
+*/
+function buildBooleanQueryClause(query) {
+	const baseClause = `(${buildQueryPredicate(query)})`;
+	return query.isNegated ? `not(${baseClause})` : baseClause;
+}
+/**
 * Build an XQuery string to fetch Set items from the OCHRE API
 * @param params - The parameters for the fetch
 * @param params.setScopeUuids - An array of Set scope UUIDs to filter by
 * @param params.belongsToCollectionScopeUuids - An array of collection scope UUIDs to filter by
 * @param params.propertyVariableUuids - An array of property variable UUIDs to filter by
-* @param params.queries - Ordered queries to combine with AND/OR
+* @param params.queries - Ordered queries to combine with AND/OR and optional NOT via negation
 * @param params.page - The page number (1-indexed)
 * @param params.pageSize - The number of items per page
 * @param options - Options for the fetch
@@ -2200,9 +2211,9 @@ function buildXQuery$1(params, options) {
 	const endPosition = page * pageSize;
 	const setScopeFilter = `/set[(${setScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]/items/*`;
 	const queryFilters = queries.map((query, index) => {
-		const predicate = `(${buildQueryPredicate(query)})`;
-		if (index === 0) return predicate;
-		return `${query.operator === "OR" ? "or" : "and"} ${predicate}`;
+		const clause = buildBooleanQueryClause(query);
+		if (index === 0) return clause;
+		return `${query.operator === "OR" ? "or" : "and"} ${clause}`;
 	}).join(" ");
 	const filterPredicates = [];
 	if (belongsToCollectionScopeUuids.length > 0) {
@@ -2235,7 +2246,7 @@ function buildXQuery$1(params, options) {
 * @param params.setScopeUuids - The Set scope UUIDs to filter by
 * @param params.belongsToCollectionScopeUuids - The collection scope UUIDs to filter by
 * @param params.propertyVariableUuids - The property variable UUIDs to filter by
-* @param params.queries - Ordered queries to combine with AND/OR
+* @param params.queries - Ordered queries to combine with AND/OR and optional NOT via negation
 * @param params.page - The page number (1-indexed)
 * @param params.pageSize - The number of items per page
 * @param itemCategories - The categories of the items to fetch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "0.20.2",
+  "version": "0.20.3",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -52,8 +52,7 @@
     "eslint": "^10.0.2",
     "prettier": "^3.8.1",
     "tsdown": "^0.20.3",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.18"
+    "typescript": "^5.9.3"
   },
   "scripts": {
     "dev": "tsdown src/index.ts --watch",
@@ -65,7 +64,6 @@
     "format": "prettier --cache --check .",
     "format:fix": "prettier --cache --write --list-different .",
     "check-types": "tsc --noEmit",
-    "test": "vitest run",
     "release": "bumpp"
   }
 }