ochre-sdk 0.19.14 → 0.20.0

package/dist/index.d.mts

@@ -643,6 +643,17 @@ type PropertyValueQueryItem = {
   content: string | number | boolean | null;
   label: string | null;
 };
+/**
+ * Represents a query for Set items
+ */
+type Query = {
+  target: "title" | "description" | "image" | "periods" | "bibliography" | "propertyValue";
+  value: string;
+  matchMode: "includes" | "exact";
+  isCaseSensitive: boolean;
+  language: string;
+  operator?: "AND" | "OR";
+};
 //#endregion
 //#region src/types/website.d.ts
 /**
@@ -1144,48 +1155,38 @@ declare function fetchItem<T extends DataCategory = DataCategory, U extends Data
   item: never;
 }>;
 //#endregion
-//#region src/utils/fetchers/set/items-by-property-values.d.ts
+//#region src/utils/fetchers/set/items.d.ts
 /**
- * Fetches and parses items by property values from the OCHRE API
+ * Fetches and parses Set items from the OCHRE API
  *
  * @param params - The parameters for the fetch
  * @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 query by
- * @param params.propertyValues - The property values to query by
+ * @param params.propertyVariableUuids - The property variable UUIDs to filter by
+ * @param params.queries - Ordered queries to combine with AND/OR
  * @param params.page - The page number (1-indexed)
  * @param params.pageSize - The number of items per page
- * @param params.includeChildItems - Whether to include child items of the same category
- * @param categoryParams - The category parameters for the fetch
- * @param categoryParams.category - The category of the items to fetch
- * @param categoryParams.itemCategories - The categories of the items to fetch
+ * @param itemCategories - The categories of the items to fetch
  * @param options - Options for the fetch
  * @param options.fetch - The fetch function to use
  * @param options.version - The version of the OCHRE API to use
- * @returns The parsed items by property values or null if the fetch/parse fails
+ * @returns The parsed Set items or null if the fetch/parse fails
  */
-declare function fetchSetItemsByPropertyValues<T extends DataCategory = DataCategory, U extends DataCategory | Array<DataCategory> = (T extends "tree" ? Exclude<DataCategory, "tree"> : T extends "set" ? Array<DataCategory> : never)>(params: {
+declare function fetchSetItems<U extends Array<DataCategory> = Array<DataCategory>>(params: {
   setScopeUuids: Array<string>;
   belongsToCollectionScopeUuids: Array<string>;
   propertyVariableUuids: Array<string>;
-  propertyValues: Array<{
-    dataType: Exclude<PropertyValueContentType, "coordinate">;
-    value: string;
-  }>;
+  queries: Array<Query>;
   page: number;
   pageSize?: number;
-  includeChildItems?: boolean;
-}, categoryParams?: {
-  category?: T;
-  itemCategories?: U;
-}, options?: {
+}, itemCategories?: U, options?: {
   fetch?: (input: string | URL | globalThis.Request, init?: RequestInit) => Promise<Response>;
   version?: ApiVersion;
 }): Promise<{
   totalCount: number;
   page: number;
   pageSize: number;
-  items: Array<Item<T, U>>;
+  items: Array<Item<"set", U>>;
   error: null;
 } | {
   totalCount: null;
@@ -1382,4 +1383,4 @@ declare const DEFAULT_PAGE_SIZE = 48;
  */
 declare function flattenItemProperties<T extends DataCategory = DataCategory, U extends DataCategory | Array<DataCategory> = (T extends "tree" ? Exclude<DataCategory, "tree"> : T extends "set" ? Array<DataCategory> : never)>(item: Item<T, U>): Item<T, U>;
 //#endregion
-export { ApiVersion, Bibliography, Concept, Context, ContextItem, ContextNode, Coordinate, DEFAULT_API_VERSION, DEFAULT_PAGE_SIZE, Data, DataCategory, Event, FileFormat, Gallery, Identification, Image, ImageMap, ImageMapArea, Interpretation, Item, LevelContext, LevelContextItem, License, Link, Metadata, Note, Observation, Period, Person, Property, PropertyContexts, PropertyValue, PropertyValueContent, PropertyValueContentType, PropertyValueQueryItem, PropertyVariable, Resource, Scope, Section, Set, SpatialUnit, Style, Text, Tree, WebBlock, WebBlockLayout, WebElement, WebElementComponent, WebImage, WebSegment, WebSegmentItem, WebTitle, Webpage, Website, WebsiteType, fetchGallery, fetchItem, fetchSetItemsByPropertyValues, fetchSetPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByLabelAndValue, getPropertyByLabelAndValues, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };
+export { ApiVersion, Bibliography, Concept, Context, ContextItem, ContextNode, Coordinate, DEFAULT_API_VERSION, DEFAULT_PAGE_SIZE, Data, DataCategory, Event, FileFormat, Gallery, Identification, Image, ImageMap, ImageMapArea, Interpretation, Item, LevelContext, LevelContextItem, License, Link, Metadata, Note, Observation, Period, Person, Property, PropertyContexts, PropertyValue, PropertyValueContent, PropertyValueContentType, PropertyValueQueryItem, PropertyVariable, Query, Resource, Scope, Section, Set, SpatialUnit, Style, Text, Tree, WebBlock, WebBlockLayout, WebElement, WebElementComponent, WebImage, WebSegment, WebSegmentItem, WebTitle, Webpage, Website, WebsiteType, fetchGallery, fetchItem, fetchSetItems, fetchSetPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByLabelAndValue, getPropertyByLabelAndValues, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };

package/dist/index.mjs

@@ -551,6 +551,14 @@ function parseOptionalDate(dateTime) {
 function cleanObject(object) {
 	return Object.fromEntries(Object.entries(object).filter(([_, value]) => value != null));
 }
+/**
+* Build a string literal for an XQuery string
+* @param value - The string value to escape
+* @returns The escaped string literal
+*/
+function stringLiteral(value) {
+	return `"${value.replaceAll("\"", "\"\"")}"`;
+}
 
 //#endregion
 //#region src/utils/helpers.ts
@@ -593,24 +601,23 @@ function flattenItemProperties(item) {
 * @internal
 */
 const uuidSchema = z.string().refine(isPseudoUuid, { error: "Invalid pseudo-UUID" });
-const richTextStringContentSchema = z.object({
-	content: z.union([
-		z.string(),
-		z.number(),
-		z.boolean()
-	]).optional(),
+const fakeStringSchema = z.union([
+	z.string(),
+	z.number(),
+	z.boolean()
+]);
+const richTextStringContentSchema = z.union([fakeStringSchema, z.object({
+	content: fakeStringSchema.optional(),
 	rend: z.string().optional(),
 	whitespace: z.string().optional()
-});
+})]);
 /**
 * Schema for validating rich text string content
 * @internal
 */
 const richTextStringSchema = z.object({
 	string: z.union([
-		z.string(),
-		z.number(),
-		z.boolean(),
+		fakeStringSchema,
 		richTextStringContentSchema,
 		z.array(richTextStringContentSchema)
 	]),
@@ -761,30 +768,48 @@ const setPropertyValuesByPropertyVariablesParamsSchema = z.object({
 	belongsToCollectionScopeUuids: z.array(uuidSchema).default([]),
 	propertyVariableUuids: z.array(uuidSchema).min(1, "At least one property variable UUID is required")
 });
-const setItemsByPropertyValuesParamsSchema = z.object({
-	...setPropertyValuesByPropertyVariablesParamsSchema.shape,
-	propertyValues: z.array(z.object({
-		dataType: z.enum([
-			"string",
-			"integer",
-			"decimal",
-			"boolean",
-			"date",
-			"dateTime",
-			"time",
-			"IDREF"
+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({
+		target: z.enum([
+			"title",
+			"description",
+			"image",
+			"periods",
+			"bibliography",
+			"propertyValue"
 		]),
-		value: z.string()
-	})).min(1, "At least one property value is required"),
-	page: z.number().min(1, "Page must be at least 1").default(1),
-	pageSize: z.number().min(1, "Page size must be at least 1").default(DEFAULT_PAGE_SIZE),
-	itemCategory: z.enum([
-		"resource",
-		"spatialUnit",
-		"concept",
-		"text"
-	]).optional(),
-	includeChildItems: z.boolean().optional().default(false)
+		value: z.string(),
+		matchMode: z.enum(["includes", "exact"]),
+		isCaseSensitive: z.boolean(),
+		language: z.string().default("eng"),
+		operator: z.enum(["AND", "OR"]).optional()
+	})).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) => {
+	for (const [index, query] of value.queries.entries()) {
+		if (index === 0 && query.operator != null) ctx.addIssue({
+			code: "custom",
+			path: [
+				"queries",
+				index,
+				"operator"
+			],
+			message: "The first query rule must not include an operator"
+		});
+		if (index > 0 && query.operator == null) ctx.addIssue({
+			code: "custom",
+			path: [
+				"queries",
+				index,
+				"operator"
+			],
+			message: "Query rules after the first must include an operator"
+		});
+	}
 });
 
 //#endregion
@@ -859,12 +884,12 @@ function parseMetadata(metadata) {
 			page: metadata.project?.page ?? null
 		} : null,
 		collection: metadata.collection ? {
-			uuid: metadata.collection?.uuid ?? "",
+			uuid: metadata.collection.uuid,
 			identification: parseIdentification(metadata.collection.identification),
 			page: metadata.collection.page
 		} : null,
 		publication: metadata.publication ? {
-			uuid: metadata.publication?.uuid ?? "",
+			uuid: metadata.publication.uuid,
 			identification: parseIdentification(metadata.publication.identification),
 			page: metadata.publication.page
 		} : null,
@@ -2030,132 +2055,189 @@ async function fetchItem(uuid, category, itemCategories, options) {
 }
 
 //#endregion
-//#region src/utils/fetchers/set/items-by-property-values.ts
+//#region src/utils/fetchers/set/items.ts
+/**
+* Build a string match predicate for an XQuery string
+* @param params - The parameters for the predicate
+* @param params.path - The path to the string
+* @param params.value - The value to match
+* @param params.matchMode - The match mode (includes or exact)
+* @param params.isCaseSensitive - Whether to match case-sensitively
+* @returns The string match predicate
+*/
+function buildStringMatchPredicate(params) {
+	const { path, value, matchMode, isCaseSensitive } = params;
+	const comparedPath = isCaseSensitive ? path : `lower-case(${path})`;
+	const comparedValueLiteral = stringLiteral(isCaseSensitive ? value : value.toLowerCase());
+	if (matchMode === "includes") return `contains(${comparedPath}, ${comparedValueLiteral})`;
+	return `${comparedPath} = ${comparedValueLiteral}`;
+}
+/**
+* Build a query predicate for an XQuery string
+* @param query - The query to build the predicate for
+* @returns The query predicate
+*/
+function buildQueryPredicate(query) {
+	const stringMatchParams = {
+		value: query.value,
+		matchMode: query.matchMode,
+		isCaseSensitive: query.isCaseSensitive,
+		language: query.language
+	};
+	switch (query.target) {
+		case "title": return buildStringMatchPredicate({
+			path: `string-join(identification/label/content[@xml:lang="${query.language}"]/string, "")`,
+			...stringMatchParams
+		});
+		case "description": return buildStringMatchPredicate({
+			path: `string-join(description/content[@xml:lang="${query.language}"]/string, "")`,
+			...stringMatchParams
+		});
+		case "periods": return buildStringMatchPredicate({
+			path: `string-join(periods/period/identification/label/content[@xml:lang="${query.language}"]/string, "")`,
+			...stringMatchParams
+		});
+		case "bibliography": return buildStringMatchPredicate({
+			path: `string-join(bibliographies/bibliography/identification/label/content[@xml:lang="${query.language}"]/string, "")`,
+			...stringMatchParams
+		});
+		case "image": return buildStringMatchPredicate({
+			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
+		})}]`;
+	}
+}
 /**
-* Build an XQuery string to fetch items by property values from the OCHRE API
+* 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 fetch
-* @param params.propertyValues - An array of property values to fetch
+* @param params.propertyVariableUuids - An array of property variable UUIDs to filter by
+* @param params.queries - Ordered queries to combine with AND/OR
 * @param params.page - The page number (1-indexed)
 * @param params.pageSize - The number of items per page
-* @param params.includeChildItems - Whether to include child items of the same category
 * @param options - Options for the fetch
 * @param options.version - The version of the OCHRE API to use
 * @returns An XQuery string
 */
 function buildXQuery$1(params, options) {
 	const version = options?.version ?? DEFAULT_API_VERSION;
-	const { propertyVariableUuids, propertyValues, setScopeUuids, belongsToCollectionScopeUuids, page, pageSize, includeChildItems = false } = params;
+	const { propertyVariableUuids, queries, setScopeUuids, belongsToCollectionScopeUuids, page, pageSize } = params;
 	const startPosition = (page - 1) * pageSize + 1;
 	const endPosition = page * pageSize;
-	let setScopeFilter = "";
-	if (setScopeUuids.length > 0) setScopeFilter = `/set[(${setScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]/items/*`;
-	let belongsToCollectionScopeFilter = "";
-	if (belongsToCollectionScopeUuids.length > 0) belongsToCollectionScopeFilter = `[.//properties[property[label/@uuid="${BELONGS_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]]`;
-	const propertyVariables = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
-	const propertyValuesFilters = propertyValues.map(({ dataType, value }) => {
-		if (dataType === "IDREF") return `value[@uuid="${value}"]`;
-		if (dataType === "date" || dataType === "dateTime" || dataType === "time" || dataType === "integer" || dataType === "decimal" || dataType === "boolean") return `value[@rawValue="${value}"]`;
-		return `value[.="${value}"]`;
-	}).join(" or ");
+	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}`;
+	}).join(" ");
+	const filterPredicates = [];
+	if (belongsToCollectionScopeUuids.length > 0) {
+		const belongsToCollectionScopeValues = belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
+		filterPredicates.push(`.//properties[property[label/@uuid="${BELONGS_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeValues})]]`);
+	}
+	if (propertyVariableUuids.length > 0) {
+		const propertyVariables = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
+		filterPredicates.push(`.//properties//property[label[${propertyVariables}]]`);
+	}
+	if (queryFilters.length > 0) filterPredicates.push(`(${queryFilters})`);
+	const itemFilters = filterPredicates.length > 0 ? `[${filterPredicates.join(" and ")}]` : "";
 	return `<ochre>{${`let $items := ${version === 2 ? "doc()" : "input()"}/ochre
         ${setScopeFilter}
-        ${belongsToCollectionScopeFilter}
-          //property[label[${propertyVariables}]][${propertyValuesFilters}]]
+        ${itemFilters}
 
   let $totalCount := count($items)
 
   return <items totalCount="{$totalCount}" page="${page}" pageSize="${pageSize}">{
     for $item in $items[position() ge ${startPosition} and position() le ${endPosition}]
-      let $category := local-name($item)
       return element { node-name($item) } {
-        $item/@*, ${includeChildItems ? "$item/node()" : "$item/node()[not(local-name(.) = $category)]"}
+        $item/@*, $item/node()
       }
   }</items>`}}</ochre>`;
 }
 /**
-* Fetches and parses items by property values from the OCHRE API
+* Fetches and parses Set items from the OCHRE API
 *
 * @param params - The parameters for the fetch
 * @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 query by
-* @param params.propertyValues - The property values to query by
+* @param params.propertyVariableUuids - The property variable UUIDs to filter by
+* @param params.queries - Ordered queries to combine with AND/OR
 * @param params.page - The page number (1-indexed)
 * @param params.pageSize - The number of items per page
-* @param params.includeChildItems - Whether to include child items of the same category
-* @param categoryParams - The category parameters for the fetch
-* @param categoryParams.category - The category of the items to fetch
-* @param categoryParams.itemCategories - The categories of the items to fetch
+* @param itemCategories - The categories of the items to fetch
 * @param options - Options for the fetch
 * @param options.fetch - The fetch function to use
 * @param options.version - The version of the OCHRE API to use
-* @returns The parsed items by property values or null if the fetch/parse fails
+* @returns The parsed Set items or null if the fetch/parse fails
 */
-async function fetchSetItemsByPropertyValues(params, categoryParams, options) {
+async function fetchSetItems(params, itemCategories, options) {
 	try {
 		const version = options?.version ?? DEFAULT_API_VERSION;
-		const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids, propertyValues, page, pageSize, includeChildItems } = setItemsByPropertyValuesParamsSchema.parse(params);
-		const { category, itemCategories } = categoryParams ?? {};
+		const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids, queries, page, pageSize } = setItemsParamsSchema.parse(params);
 		const xquery = buildXQuery$1({
 			setScopeUuids,
 			belongsToCollectionScopeUuids,
 			propertyVariableUuids,
-			propertyValues,
-			includeChildItems,
+			queries,
 			page,
 			pageSize
 		}, { version });
 		const response = await (options?.fetch ?? fetch)(version === 2 ? `https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?xquery=${encodeURIComponent(xquery)}&format=json&lang="*"` : `https://ochre.lib.uchicago.edu/ochre?xquery=${encodeURIComponent(xquery)}&format=json&lang="*"`);
 		if (!response.ok) throw new Error(`OCHRE API responded with status: ${response.status}`);
 		const data = await response.json();
-		if (Array.isArray(data.result) || Object.keys(data.result.ochre).length === 0) throw new Error("No items found");
-		if (category != null && data.result.ochre.items[category] == null) throw new Error(`No items found for category: ${category}`);
-		if ((category === "set" || category === "tree") && itemCategories != null && "items" in data.result.ochre.items[category] && Array.isArray(data.result.ochre.items[category].items) && data.result.ochre.items[category].items.every((item) => item.category !== itemCategories)) throw new Error(`No items found for category: ${category} and item categories: ${itemCategories}`);
+		if (Array.isArray(data.result) || Object.keys(data.result).length === 0) throw new Error("No items found");
+		if (itemCategories != null) {
+			const itemCategoriesSet = new Set(Object.keys(data.result.ochre.items));
+			const missingCategories = itemCategories.filter((category) => !itemCategoriesSet.has(category));
+			if (missingCategories.length > 0) throw new Error(`No Set items found for item categories: ${missingCategories.join(", ")}`);
+		}
 		const items = [];
-		if ("resource" in data.result.ochre.items && data.result.ochre.items.resource != null) {
+		if ((itemCategories == null || itemCategories.includes("resource")) && "resource" in data.result.ochre.items && data.result.ochre.items.resource != null) {
 			const resources = parseResources(Array.isArray(data.result.ochre.items.resource) ? data.result.ochre.items.resource : [data.result.ochre.items.resource]);
 			items.push(...resources);
 		}
-		if ("spatialUnit" in data.result.ochre.items && data.result.ochre.items.spatialUnit != null) {
+		if ((itemCategories == null || itemCategories.includes("spatialUnit")) && "spatialUnit" in data.result.ochre.items && data.result.ochre.items.spatialUnit != null) {
 			const spatialUnits = parseSpatialUnits(Array.isArray(data.result.ochre.items.spatialUnit) ? data.result.ochre.items.spatialUnit : [data.result.ochre.items.spatialUnit]);
 			items.push(...spatialUnits);
 		}
-		if ("concept" in data.result.ochre.items && data.result.ochre.items.concept != null) {
+		if ((itemCategories == null || itemCategories.includes("concept")) && "concept" in data.result.ochre.items && data.result.ochre.items.concept != null) {
 			const concepts = parseConcepts(Array.isArray(data.result.ochre.items.concept) ? data.result.ochre.items.concept : [data.result.ochre.items.concept]);
 			items.push(...concepts);
 		}
-		if ("period" in data.result.ochre.items && data.result.ochre.items.period != null) {
+		if ((itemCategories == null || itemCategories.includes("period")) && "period" in data.result.ochre.items && data.result.ochre.items.period != null) {
 			const periods = parsePeriods(Array.isArray(data.result.ochre.items.period) ? data.result.ochre.items.period : [data.result.ochre.items.period]);
 			items.push(...periods);
 		}
-		if ("bibliography" in data.result.ochre.items && data.result.ochre.items.bibliography != null) {
+		if ((itemCategories == null || itemCategories.includes("bibliography")) && "bibliography" in data.result.ochre.items && data.result.ochre.items.bibliography != null) {
 			const bibliographies = parseBibliographies(Array.isArray(data.result.ochre.items.bibliography) ? data.result.ochre.items.bibliography : [data.result.ochre.items.bibliography]);
 			items.push(...bibliographies);
 		}
-		if ("person" in data.result.ochre.items && data.result.ochre.items.person != null) {
+		if ((itemCategories == null || itemCategories.includes("person")) && "person" in data.result.ochre.items && data.result.ochre.items.person != null) {
 			const persons = parsePersons(Array.isArray(data.result.ochre.items.person) ? data.result.ochre.items.person : [data.result.ochre.items.person]);
 			items.push(...persons);
 		}
-		if ("propertyVariable" in data.result.ochre.items && data.result.ochre.items.propertyVariable != null) {
+		if ((itemCategories == null || itemCategories.includes("propertyVariable")) && "propertyVariable" in data.result.ochre.items && data.result.ochre.items.propertyVariable != null) {
 			const propertyVariables = parsePropertyVariables(Array.isArray(data.result.ochre.items.propertyVariable) ? data.result.ochre.items.propertyVariable : [data.result.ochre.items.propertyVariable]);
 			items.push(...propertyVariables);
 		}
-		if ("propertyValue" in data.result.ochre.items && data.result.ochre.items.propertyValue != null) {
+		if ((itemCategories == null || itemCategories.includes("propertyValue")) && "propertyValue" in data.result.ochre.items && data.result.ochre.items.propertyValue != null) {
 			const propertyValues = parsePropertyValues(Array.isArray(data.result.ochre.items.propertyValue) ? data.result.ochre.items.propertyValue : [data.result.ochre.items.propertyValue]);
 			items.push(...propertyValues);
 		}
-		if ("text" in data.result.ochre.items && data.result.ochre.items.text != null) {
+		if ((itemCategories == null || itemCategories.includes("text")) && "text" in data.result.ochre.items && data.result.ochre.items.text != null) {
 			const texts = parseTexts(Array.isArray(data.result.ochre.items.text) ? data.result.ochre.items.text : [data.result.ochre.items.text]);
 			items.push(...texts);
 		}
-		if ("set" in data.result.ochre.items && data.result.ochre.items.set != null) {
+		if ((itemCategories == null || itemCategories.includes("set")) && "set" in data.result.ochre.items && data.result.ochre.items.set != null) {
 			const sets = parseSets(Array.isArray(data.result.ochre.items.set) ? data.result.ochre.items.set : [data.result.ochre.items.set]);
 			items.push(...sets);
 		}
-		if ("tree" in data.result.ochre.items && data.result.ochre.items.tree != null) {
+		if ((itemCategories == null || itemCategories.includes("tree")) && "tree" in data.result.ochre.items && data.result.ochre.items.tree != null) {
 			const trees = parseTrees(Array.isArray(data.result.ochre.items.tree) ? data.result.ochre.items.tree : [data.result.ochre.items.tree]);
 			items.push(...trees);
 		}
@@ -2173,7 +2255,7 @@ async function fetchSetItemsByPropertyValues(params, categoryParams, options) {
 			page: null,
 			pageSize: null,
 			items: null,
-			error: error instanceof Error ? error.message : "Failed to fetch items by property values"
+			error: error instanceof Error ? error.message : "Failed to fetch Set items"
 		};
 	}
 }
@@ -2187,15 +2269,9 @@ const propertyValueQueryItemSchema = z.object({
 	uuid: z.string(),
 	itemUuid: z.string().optional(),
 	dataType: z.string(),
-	rawValue: z.union([
-		z.string(),
-		z.number(),
-		z.boolean()
-	]).optional(),
+	rawValue: fakeStringSchema.optional(),
 	content: z.union([
-		z.string(),
-		z.number(),
-		z.boolean(),
+		fakeStringSchema,
 		richTextStringSchema,
 		z.array(richTextStringSchema)
 	]).optional()
@@ -3915,4 +3991,4 @@ async function fetchWebsite(abbreviation, options) {
 }
 
 //#endregion
-export { DEFAULT_API_VERSION, DEFAULT_PAGE_SIZE, fetchGallery, fetchItem, fetchSetItemsByPropertyValues, fetchSetPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByLabelAndValue, getPropertyByLabelAndValues, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };
+export { DEFAULT_API_VERSION, DEFAULT_PAGE_SIZE, fetchGallery, fetchItem, fetchSetItems, fetchSetPropertyValuesByPropertyVariables, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByLabel, getPropertyByLabelAndValue, getPropertyByLabelAndValues, getPropertyByUuid, getPropertyValueByLabel, getPropertyValueByUuid, getPropertyValuesByLabel, getPropertyValuesByUuid, getUniqueProperties, getUniquePropertyLabels };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "0.19.14",
+  "version": "0.20.0",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -46,10 +46,10 @@
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^7.4.3",
+    "@antfu/eslint-config": "^7.6.1",
     "@types/node": "^24.10.13",
     "bumpp": "^10.4.1",
-    "eslint": "^10.0.0",
+    "eslint": "^10.0.2",
     "prettier": "^3.8.1",
     "tsdown": "^0.20.3",
     "typescript": "^5.9.3",