ochre-sdk 0.20.0 → 0.20.1

package/dist/index.d.mts

@@ -647,7 +647,15 @@ type PropertyValueQueryItem = {
  * Represents a query for Set items
  */
 type Query = {
-  target: "title" | "description" | "image" | "periods" | "bibliography" | "propertyValue";
+  target: "propertyValue";
+  dataType: Exclude<PropertyValueContentType, "coordinate">;
+  value: string;
+  matchMode: "includes" | "exact";
+  isCaseSensitive: boolean;
+  language: string;
+  operator?: "AND" | "OR";
+} | {
+  target: "title" | "description" | "image" | "periods" | "bibliography";
   value: string;
   matchMode: "includes" | "exact";
   isCaseSensitive: boolean;

package/dist/index.mjs

@@ -772,21 +772,37 @@ const setItemsParamsSchema = z.object({
 	setScopeUuids: z.array(uuidSchema).min(1, "At least one set scope UUID is required"),
 	belongsToCollectionScopeUuids: z.array(uuidSchema).default([]),
 	propertyVariableUuids: z.array(uuidSchema).default([]),
-	queries: z.array(z.object({
+	queries: z.array(z.discriminatedUnion("target", [z.object({
+		target: z.literal("propertyValue"),
+		dataType: z.enum([
+			"string",
+			"integer",
+			"decimal",
+			"boolean",
+			"date",
+			"dateTime",
+			"time",
+			"IDREF"
+		]),
+		value: z.string(),
+		matchMode: z.enum(["includes", "exact"]),
+		isCaseSensitive: z.boolean(),
+		language: z.string().default("eng"),
+		operator: z.enum(["AND", "OR"]).optional()
+	}), z.object({
 		target: z.enum([
 			"title",
 			"description",
 			"image",
 			"periods",
-			"bibliography",
-			"propertyValue"
+			"bibliography"
 		]),
 		value: z.string(),
 		matchMode: z.enum(["includes", "exact"]),
 		isCaseSensitive: z.boolean(),
 		language: z.string().default("eng"),
 		operator: z.enum(["AND", "OR"]).optional()
-	})).default([]),
+	})])).default([]),
 	page: z.number().min(1, "Page must be positive").default(1),
 	pageSize: z.number().min(1, "Page size must be positive").default(DEFAULT_PAGE_SIZE)
 }).superRefine((value, ctx) => {
@@ -2073,6 +2089,21 @@ function buildStringMatchPredicate(params) {
 	return `${comparedPath} = ${comparedValueLiteral}`;
 }
 /**
+* Build a property value predicate for an XQuery string
+* @param query - The propertyValue query
+* @returns The property value predicate
+*/
+function buildPropertyValuePredicate(query) {
+	if (query.dataType === "IDREF") return `.//properties//property[value[@uuid=${stringLiteral(query.value)}]]`;
+	if (query.dataType === "date" || query.dataType === "dateTime" || query.dataType === "time" || query.dataType === "integer" || query.dataType === "decimal" || query.dataType === "boolean") return `.//properties//property[value[@rawValue=${stringLiteral(query.value)}]]`;
+	return `.//properties//property[${buildStringMatchPredicate({
+		path: `string-join(value/content[@xml:lang="${query.language}"]/string, "")`,
+		value: query.value,
+		matchMode: query.matchMode,
+		isCaseSensitive: query.isCaseSensitive
+	})}]`;
+}
+/**
 * Build a query predicate for an XQuery string
 * @param query - The query to build the predicate for
 * @returns The query predicate
@@ -2105,10 +2136,7 @@ function buildQueryPredicate(query) {
 			path: `string-join(image/identification/label/content[@xml:lang="${query.language}"]/string, "")`,
 			...stringMatchParams
 		});
-		case "propertyValue": return `.//properties//property[${buildStringMatchPredicate({
-			path: `string-join(value/content[@xml:lang="${query.language}"]/string, "")`,
-			...stringMatchParams
-		})}]`;
+		case "propertyValue": return buildPropertyValuePredicate(query);
 	}
 }
 /**

package/package.json

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