ochre-sdk 0.20.22 → 0.20.24

package/dist/index.d.mts

@@ -674,9 +674,10 @@ type SetItemsSort = {
  * Represents a query for Set items
  */
 type Query = {
-  target: "propertyValue";
+  target: "property";
+  propertyVariables: Array<string>;
   dataType: Exclude<Exclude<PropertyValueContentType, "coordinate">, "date" | "dateTime">;
-  value: string;
+  propertyValues?: Array<string>;
   from?: never;
   to?: never;
   matchMode: "includes" | "exact";
@@ -685,9 +686,10 @@ type Query = {
   operator?: "AND" | "OR";
   isNegated?: boolean;
 } | {
-  target: "propertyValue";
+  target: "property";
+  propertyVariables: Array<string>;
   dataType: "date" | "dateTime";
-  value: string;
+  propertyValues?: never;
   from: string;
   to?: string;
   matchMode: "includes" | "exact";
@@ -696,9 +698,10 @@ type Query = {
   operator?: "AND" | "OR";
   isNegated?: boolean;
 } | {
-  target: "propertyValue";
+  target: "property";
+  propertyVariables: Array<string>;
   dataType: "date" | "dateTime";
-  value: string;
+  propertyValues?: never;
   from?: string;
   to: string;
   matchMode: "includes" | "exact";
@@ -706,6 +709,14 @@ type Query = {
   language: string;
   operator?: "AND" | "OR";
   isNegated?: boolean;
+} | {
+  target: "string";
+  value: string;
+  matchMode: "includes" | "exact";
+  isCaseSensitive: boolean;
+  language: string;
+  operator?: "AND" | "OR";
+  isNegated?: boolean;
 } | {
   target: "title" | "description" | "image" | "periods" | "bibliography";
   value: string;
@@ -1223,7 +1234,6 @@ declare function fetchItem<T extends DataCategory = DataCategory, U extends Data
  *
  * @param params - The parameters for the fetch
  * @param params.setScopeUuids - The Set 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 and optional NOT via negation
  * @param params.sort - Optional sorting configuration applied before pagination.
  * For propertyValue sorting, dataType is required and the sort key uses the first valid leaf value (value[not(@i)]).
@@ -1237,7 +1247,6 @@ declare function fetchItem<T extends DataCategory = DataCategory, U extends Data
  */
 declare function fetchSetItems<U extends Array<DataCategory> = Array<DataCategory>>(params: {
   setScopeUuids: Array<string>;
-  propertyVariableUuids: Array<string>;
   queries: Array<Query>;
   sort?: SetItemsSort;
   page: number;
@@ -1265,7 +1274,6 @@ declare function fetchSetItems<U extends Array<DataCategory> = Array<DataCategor
  *
  * @param params - The parameters for the fetch
  * @param params.setScopeUuids - An array of set scope UUIDs to filter by
- * @param params.propertyVariableUuids - The property variable UUIDs to query by
  * @param params.queries - Ordered queries to combine with AND/OR and optional NOT via negation
  * @param params.attributes - Whether to return values for bibliographies and periods
  * @param params.attributes.bibliographies - Whether to return values for bibliographies
@@ -1279,7 +1287,6 @@ declare function fetchSetItems<U extends Array<DataCategory> = Array<DataCategor
  */
 declare function fetchSetPropertyValuesByPropertyVariables(params: {
   setScopeUuids: Array<string>;
-  propertyVariableUuids: Array<string>;
   queries?: Array<Query>;
   attributes?: {
     bibliographies: boolean;

package/dist/index.mjs

@@ -2,18 +2,13 @@ import * as z from "zod";
 import { parseISO, set } from "date-fns";
 import { UTCDate } from "@date-fns/utc";
 import { deepEqual } from "fast-equals";
-
 //#region src/constants.ts
 const BELONGS_TO_COLLECTION_UUID = "30054cb2-909a-4f34-8db9-8fe7369d691d";
-const PRESENTATION_ITEM_UUID = "f1c131b6-1498-48a4-95bf-a9edae9fd518";
-const TEXT_ANNOTATION_UUID = "b9ca2732-78f4-416e-b77f-dae7647e68a9";
 const TEXT_ANNOTATION_HOVER_CARD_UUID = "c7f6a08a-f07b-49b6-bcb1-af485da3c58f";
 const TEXT_ANNOTATION_ITEM_PAGE_VARIANT_UUID = "bf4476ab-6bc8-40d0-a001-1446213c72ce";
 const TEXT_ANNOTATION_ENTRY_PAGE_VARIANT_UUID = "9d52db95-a9cf-45f7-a0bf-fc9ba9f0aae0";
-const TEXT_ANNOTATION_TEXT_STYLING_UUID = "3e6f86ab-df81-45ae-8257-e2867357df56";
 const TEXT_ANNOTATION_TEXT_STYLING_VARIANT_UUID = "e1647bef-d801-4100-bdde-d081c422f763";
 const TEXT_ANNOTATION_TEXT_STYLING_HEADING_LEVEL_UUID = "d4266f0b-3f8d-4b32-8c15-4b229c8bb11e";
-
 //#endregion
 //#region src/utils/string.ts
 const EMAIL_BRACKET_CLEANUP_REGEX = /(?<=\s|^)[([{]+|[)\]}]+(?=\s|$)/g;
@@ -180,7 +175,7 @@ function extractAnnotationMetadata(item) {
 	if (itemProperty == null) return result;
 	const itemPropertyLabelUuid = itemProperty.label.uuid;
 	const itemPropertyValueUuid = typeof itemProperty.value === "object" && "uuid" in itemProperty.value && itemProperty.value.uuid != null ? itemProperty.value.uuid : null;
-	if (itemPropertyLabelUuid !== PRESENTATION_ITEM_UUID || itemPropertyValueUuid !== TEXT_ANNOTATION_UUID) return result;
+	if (itemPropertyLabelUuid !== "f1c131b6-1498-48a4-95bf-a9edae9fd518" || itemPropertyValueUuid !== "b9ca2732-78f4-416e-b77f-dae7647e68a9") return result;
 	const textAnnotationProperties = itemProperty.property != null ? Array.isArray(itemProperty.property) ? itemProperty.property : [itemProperty.property] : [];
 	for (const textAnnotationProperty of textAnnotationProperties) {
 		const textAnnotationPropertyValueUuid = typeof textAnnotationProperty.value === "object" && "uuid" in textAnnotationProperty.value && textAnnotationProperty.value.uuid != null ? textAnnotationProperty.value.uuid : null;
@@ -194,7 +189,7 @@ function extractAnnotationMetadata(item) {
 			case TEXT_ANNOTATION_ENTRY_PAGE_VARIANT_UUID:
 				result.linkVariant = "entry-page";
 				break;
-			default: if (textAnnotationPropertyValueUuid === TEXT_ANNOTATION_TEXT_STYLING_UUID && textAnnotationProperty.property != null) {
+			default: if (textAnnotationPropertyValueUuid === "3e6f86ab-df81-45ae-8257-e2867357df56" && textAnnotationProperty.property != null) {
 				let textStylingVariant = "block";
 				let textStylingSize = "md";
 				let textStylingHeadingLevel = null;
@@ -211,7 +206,7 @@ function extractAnnotationMetadata(item) {
 				}
 				const textStylingHeadingLevelProperty = textStylingProperties.find((property) => property.label.uuid === TEXT_ANNOTATION_TEXT_STYLING_HEADING_LEVEL_UUID);
 				if (textStylingHeadingLevelProperty != null) textStylingHeadingLevel = parseFakeString(textStylingHeadingLevelProperty.value.content);
-				const textStylingCssProperties = textStylingProperties.filter((property) => property.label.uuid !== TEXT_ANNOTATION_TEXT_STYLING_VARIANT_UUID && property.label.uuid !== TEXT_ANNOTATION_TEXT_STYLING_HEADING_LEVEL_UUID);
+				const textStylingCssProperties = textStylingProperties.filter((property) => property.label.uuid !== "e1647bef-d801-4100-bdde-d081c422f763" && property.label.uuid !== "d4266f0b-3f8d-4b32-8c15-4b229c8bb11e");
 				if (textStylingCssProperties.length > 0) textStylingCss = textStylingCssProperties.map((property) => ({
 					label: parseFakeString(property.label.content),
 					value: parseFakeString(property.value.content)
@@ -371,10 +366,10 @@ function parseStringDocumentItem(item) {
 		if (itemProperty != null) {
 			const itemPropertyLabelUuid = itemProperty.label.uuid;
 			const itemPropertyValueUuid = typeof itemProperty.value === "object" && "uuid" in itemProperty.value && itemProperty.value.uuid != null ? itemProperty.value.uuid : null;
-			if (itemPropertyLabelUuid === PRESENTATION_ITEM_UUID && itemPropertyValueUuid === TEXT_ANNOTATION_UUID) {
+			if (itemPropertyLabelUuid === "f1c131b6-1498-48a4-95bf-a9edae9fd518" && itemPropertyValueUuid === "b9ca2732-78f4-416e-b77f-dae7647e68a9") {
 				const textAnnotationProperty = itemProperty.property != null ? Array.isArray(itemProperty.property) ? itemProperty.property[0] : itemProperty.property : null;
 				if (textAnnotationProperty != null) {
-					if ((typeof textAnnotationProperty.value === "object" && "uuid" in textAnnotationProperty.value && textAnnotationProperty.value.uuid != null ? textAnnotationProperty.value.uuid : null) === TEXT_ANNOTATION_TEXT_STYLING_UUID && textAnnotationProperty.property != null) {
+					if ((typeof textAnnotationProperty.value === "object" && "uuid" in textAnnotationProperty.value && textAnnotationProperty.value.uuid != null ? textAnnotationProperty.value.uuid : null) === "3e6f86ab-df81-45ae-8257-e2867357df56" && textAnnotationProperty.property != null) {
 						const textStylingType = "text-styling";
 						let textStylingVariant = "block";
 						let textStylingSize = "md";
@@ -391,7 +386,7 @@ function parseStringDocumentItem(item) {
 							}
 							const textStylingHeadingLevelProperty = textStylingProperties.find((property) => property.label.uuid === TEXT_ANNOTATION_TEXT_STYLING_HEADING_LEVEL_UUID);
 							if (textStylingHeadingLevelProperty != null) textStylingHeadingLevel = parseFakeString(textStylingHeadingLevelProperty.value.content);
-							const textStylingCssProperties = textStylingProperties.filter((property) => property.label.uuid !== TEXT_ANNOTATION_TEXT_STYLING_VARIANT_UUID && property.label.uuid !== TEXT_ANNOTATION_TEXT_STYLING_HEADING_LEVEL_UUID);
+							const textStylingCssProperties = textStylingProperties.filter((property) => property.label.uuid !== "e1647bef-d801-4100-bdde-d081c422f763" && property.label.uuid !== "d4266f0b-3f8d-4b32-8c15-4b229c8bb11e");
 							if (textStylingCssProperties.length > 0) textStylingCss = textStylingCssProperties.map((property) => ({
 								label: parseFakeString(property.label.content),
 								value: parseFakeString(property.value.content)
@@ -442,7 +437,6 @@ function parseStringContent(content, language = "eng") {
 		default: return String(content.content);
 	}
 }
-
 //#endregion
 //#region src/utils/internal.ts
 const PSEUDO_UUID_REGEX = /^[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12}$/i;
@@ -572,7 +566,6 @@ function cleanObject(object) {
 function stringLiteral(value) {
 	return `"${value.replaceAll("\"", "\"\"")}"`;
 }
-
 //#endregion
 //#region src/utils/helpers.ts
 /**
@@ -606,7 +599,6 @@ function flattenItemProperties(item) {
 		properties: flattenProperties(allProperties)
 	};
 }
-
 //#endregion
 //#region src/schemas.ts
 /**
@@ -636,25 +628,13 @@ const richTextStringSchema = z.object({
 	]),
 	lang: z.string().optional()
 });
-/**
-* Schema for validating identification
-* @internal
-*/
-const identificationSchema = z.object({
+z.object({
 	label: z.object({ content: z.union([richTextStringSchema, z.array(richTextStringSchema)]) }),
 	abbreviation: z.object({ content: z.union([richTextStringSchema, z.array(richTextStringSchema)]).optional() }),
 	code: z.string().optional()
 });
-/**
-* Schema for validating filters
-* @internal
-*/
-const filterSchema = z.string().optional();
-/**
-* Schema for validating data options
-* @internal
-*/
-const dataOptionsSchema = z.object({
+z.string().optional();
+z.object({
 	filter: z.string().optional().default(""),
 	start: z.number().positive({ error: "Start must be positive" }).optional().default(1),
 	limit: z.number().positive({ error: "Limit must be positive" }).optional().default(40)
@@ -778,7 +758,8 @@ const boundsSchema = z.string().transform((str, ctx) => {
 */
 const setQuerySchema = z.union([
 	z.object({
-		target: z.literal("propertyValue"),
+		target: z.literal("property"),
+		propertyVariables: z.array(uuidSchema).min(1, "At least one property variable UUID is required"),
 		dataType: z.enum([
 			"string",
 			"integer",
@@ -787,7 +768,7 @@ const setQuerySchema = z.union([
 			"time",
 			"IDREF"
 		]),
-		value: z.string(),
+		propertyValues: z.array(z.string()).min(1, "At least one property value is required").optional(),
 		matchMode: z.enum(["includes", "exact"]),
 		isCaseSensitive: z.boolean(),
 		language: z.string().default("eng"),
@@ -795,9 +776,9 @@ const setQuerySchema = z.union([
 		isNegated: z.boolean().optional().default(false)
 	}).strict(),
 	z.object({
-		target: z.literal("propertyValue"),
+		target: z.literal("property"),
+		propertyVariables: z.array(uuidSchema).min(1, "At least one property variable UUID is required"),
 		dataType: z.enum(["date", "dateTime"]),
-		value: z.string(),
 		from: z.string(),
 		to: z.string().optional(),
 		matchMode: z.enum(["includes", "exact"]),
@@ -807,9 +788,9 @@ const setQuerySchema = z.union([
 		isNegated: z.boolean().optional().default(false)
 	}).strict(),
 	z.object({
-		target: z.literal("propertyValue"),
+		target: z.literal("property"),
+		propertyVariables: z.array(uuidSchema).min(1, "At least one property variable UUID is required"),
 		dataType: z.enum(["date", "dateTime"]),
-		value: z.string(),
 		from: z.string().optional(),
 		to: z.string(),
 		matchMode: z.enum(["includes", "exact"]),
@@ -818,6 +799,15 @@ const setQuerySchema = z.union([
 		operator: z.enum(["AND", "OR"]).optional(),
 		isNegated: z.boolean().optional().default(false)
 	}).strict(),
+	z.object({
+		target: z.literal("string"),
+		value: z.string(),
+		matchMode: z.enum(["includes", "exact"]),
+		isCaseSensitive: z.boolean(),
+		language: z.string().default("eng"),
+		operator: z.enum(["AND", "OR"]).optional(),
+		isNegated: z.boolean().optional().default(false)
+	}).strict(),
 	z.object({
 		target: z.enum([
 			"title",
@@ -877,7 +867,6 @@ function validateSetQueriesOperators(queries, ctx) {
 const setPropertyValuesByPropertyVariablesParamsSchema = 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).min(1, "At least one property variable UUID is required"),
 	queries: setQueriesSchema,
 	attributes: z.object({
 		bibliographies: z.boolean().default(false),
@@ -889,19 +878,22 @@ const setPropertyValuesByPropertyVariablesParamsSchema = z.object({
 	isLimitedToLeafPropertyValues: z.boolean().default(false)
 }).superRefine((value, ctx) => {
 	validateSetQueriesOperators(value.queries, ctx);
+	if (!value.queries.some((query) => query.target === "property")) ctx.addIssue({
+		code: "custom",
+		path: ["queries"],
+		message: "At least one property query is required"
+	});
 });
 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: setQueriesSchema,
 	sort: setItemsSortSchema,
 	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)
+	pageSize: z.number().min(1, "Page size must be positive").default(48)
 }).superRefine((value, ctx) => {
 	validateSetQueriesOperators(value.queries, ctx);
 });
-
 //#endregion
 //#region src/utils/parse/index.ts
 const TRAILING_ELLIPSIS_REGEX = /\s*\.{3}$/;
@@ -1977,7 +1969,6 @@ function parseConcept(concept, metadata, persistentUrl, belongsTo) {
 function parseConcepts(concepts) {
 	return concepts.map((concept) => parseConcept(concept));
 }
-
 //#endregion
 //#region src/utils/fetchers/gallery.ts
 /**
@@ -2004,7 +1995,7 @@ const galleryParamsSchema = z.object({
 */
 async function fetchGallery(params, options) {
 	try {
-		const version = options?.version ?? DEFAULT_API_VERSION;
+		const version = options?.version ?? 2;
 		const { uuid, filter, page, pageSize } = galleryParamsSchema.parse(params);
 		const response = await (options?.fetch ?? fetch)(`${version === 2 ? "https://ochre.lib.uchicago.edu/ochre/v2/ochre.php" : "https://ochre.lib.uchicago.edu/ochre"}?xquery=${encodeURIComponent(`<ochre>{
         for $q in ${version === 2 ? "doc()" : "input()"}/ochre[@uuid='${uuid}']
@@ -2036,7 +2027,6 @@ async function fetchGallery(params, options) {
 		};
 	}
 }
-
 //#endregion
 //#region src/utils/fetchers/uuid.ts
 /**
@@ -2048,7 +2038,7 @@ async function fetchGallery(params, options) {
 */
 async function fetchByUuid(uuid, options) {
 	try {
-		const version = options?.version ?? DEFAULT_API_VERSION;
+		const version = options?.version ?? 2;
 		const parsedUuid = uuidSchema.parse(uuid);
 		const response = await (options?.fetch ?? fetch)(version === 2 ? `https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?uuid=${parsedUuid}&format=json&lang="*"` : `https://ochre.lib.uchicago.edu/ochre?uuid=${parsedUuid}&format=json&lang="*"`);
 		if (!response.ok) throw new Error("Failed to fetch OCHRE data");
@@ -2059,7 +2049,6 @@ async function fetchByUuid(uuid, options) {
 		return [error instanceof Error ? error.message : "Unknown error", null];
 	}
 }
-
 //#endregion
 //#region src/utils/fetchers/item.ts
 /**
@@ -2070,7 +2059,7 @@ async function fetchByUuid(uuid, options) {
 */
 async function fetchItem(uuid, category, itemCategories, options) {
 	try {
-		const version = options?.version ?? DEFAULT_API_VERSION;
+		const version = options?.version ?? 2;
 		const [error, data] = await fetchByUuid(uuid, {
 			fetch,
 			version
@@ -2144,26 +2133,49 @@ async function fetchItem(uuid, category, itemCategories, options) {
 		};
 	}
 }
-
 //#endregion
 //#region src/utils/fetchers/set/query-helpers.ts
 const CTS_INCLUDES_STOP_WORDS = [
-	"of",
-	"the",
 	"and",
+	"at",
 	"in",
-	"it"
+	"it",
+	"of",
+	"the",
+	"to"
 ];
 const CTS_INCLUDES_STOP_WORDS_VAR = "$ctsIncludesStopWords";
+function buildFlattenedContentValuesExpression(contentNodesExpression) {
+	return `for $content in ${contentNodesExpression}
+    return string-join($content//text(), "")`;
+}
 /**
 * Build a string match predicate for an XQuery string.
 */
 function buildRawStringMatchPredicate(params) {
-	const { path, value, matchMode, isCaseSensitive } = params;
-	const comparedPath = isCaseSensitive ? path : `lower-case(${path})`;
+	const { valueExpression, value, matchMode, isCaseSensitive } = params;
 	const comparedValueLiteral = stringLiteral(isCaseSensitive ? value : value.toLowerCase());
-	if (matchMode === "includes") return `contains(${comparedPath}, ${comparedValueLiteral})`;
-	return `${comparedPath} = ${comparedValueLiteral}`;
+	const candidateVar = "$candidate";
+	const comparedCandidate = isCaseSensitive ? candidateVar : `lower-case(${candidateVar})`;
+	if (matchMode === "includes") return `some ${candidateVar} in (${valueExpression})
+  satisfies contains(${comparedCandidate}, ${comparedValueLiteral})`;
+	return `some ${candidateVar} in (${valueExpression})
+  satisfies ${comparedCandidate} = ${comparedValueLiteral}`;
+}
+/**
+* Build a combined raw string match predicate for multiple paths.
+*/
+function buildCombinedRawStringMatchPredicate(params) {
+	const { valueExpressions, value, matchMode, isCaseSensitive } = params;
+	const predicates = [];
+	for (const valueExpression of valueExpressions) predicates.push(buildRawStringMatchPredicate({
+		valueExpression,
+		value,
+		matchMode,
+		isCaseSensitive
+	}));
+	if (predicates.length === 1) return predicates[0] ?? "false()";
+	return `(${predicates.join(" or ")})`;
 }
 /**
 * Build CTS word-query options for API v2 includes search.
@@ -2172,70 +2184,204 @@ function buildCtsQueryOptionsExpression(isCaseSensitive) {
 	return `(${[
 		isCaseSensitive ? "case-sensitive" : "case-insensitive",
 		"diacritic-insensitive",
-		"punctuation-insensitive",
-		"whitespace-insensitive",
-		"stemmed"
+		"punctuation-insensitive"
 	].map((option) => stringLiteral(option)).join(", ")})`;
 }
 /**
-* Build a CTS-backed includes predicate for an XQuery string.
+* Build a CTS word-query expression for an XQuery term.
 */
-function buildCtsIncludesPredicate(params) {
-	const { path, value, isCaseSensitive, queryIndex } = params;
-	const searchStringVar = `$query${queryIndex}SearchString`;
-	const rawTermsVar = `$query${queryIndex}RawTerms`;
-	const termsVar = `$query${queryIndex}Terms`;
-	const ctsQueryVar = `$query${queryIndex}CtsQuery`;
-	const ctsOptionsExpression = buildCtsQueryOptionsExpression(isCaseSensitive);
-	const fallbackPredicate = buildRawStringMatchPredicate({
-		path,
-		value,
-		matchMode: "includes",
-		isCaseSensitive
-	});
+function buildCtsWordQueryExpression(params) {
+	const { termExpression, isCaseSensitive } = params;
+	return `cts:word-query(${termExpression}, ${buildCtsQueryOptionsExpression(isCaseSensitive)})`;
+}
+/**
+* Build tokenized search declarations for CTS-backed queries.
+*/
+function buildTokenizedSearchDeclarations(params) {
+	const { value, isCaseSensitive, queryKey } = params;
+	const searchStringVar = `$query${queryKey}SearchString`;
+	const rawTermsVar = `$query${queryKey}RawTerms`;
+	const termsVar = `$query${queryKey}Terms`;
+	const tokenSourceExpression = isCaseSensitive ? searchStringVar : `fn:lower-case(${searchStringVar})`;
 	return {
 		declarations: [
 			`let ${searchStringVar} := ${stringLiteral(value)}`,
-			String.raw`let ${rawTermsVar} := fn:tokenize(${searchStringVar}, "\W+")`,
+			String.raw`let ${rawTermsVar} := fn:tokenize(${tokenSourceExpression}, "\W+")`,
 			`let ${termsVar} :=
   for $term in ${rawTermsVar}
     let $normalizedTerm := fn:lower-case($term)
     where $normalizedTerm ne "" and not($normalizedTerm = ${CTS_INCLUDES_STOP_WORDS_VAR})
-    return ${isCaseSensitive ? "$term" : "$normalizedTerm"}`,
+    return $term`
+		],
+		termsVar
+	};
+}
+/**
+* Build a CTS-backed field includes predicate for an XQuery string.
+*/
+function buildCtsFieldIncludesPredicate(params) {
+	const { contentNodesExpression, valueExpression, value, isCaseSensitive, queryKey } = params;
+	const tokenizedSearchDeclarations = buildTokenizedSearchDeclarations({
+		value,
+		isCaseSensitive,
+		queryKey
+	});
+	const ctsQueryVar = `$query${queryKey}CtsQuery`;
+	const contentNodeVar = `$query${queryKey}ContentNode`;
+	const fallbackPredicate = buildRawStringMatchPredicate({
+		valueExpression,
+		value,
+		matchMode: "includes",
+		isCaseSensitive
+	});
+	return {
+		declarations: [...tokenizedSearchDeclarations.declarations, `let ${ctsQueryVar} :=
+  if (count(${tokenizedSearchDeclarations.termsVar}) = 1)
+  then ${buildCtsWordQueryExpression({
+			termExpression: `${tokenizedSearchDeclarations.termsVar}[1]`,
+			isCaseSensitive
+		})}
+  else if (count(${tokenizedSearchDeclarations.termsVar}) gt 1)
+  then cts:and-query((
+    for $term in ${tokenizedSearchDeclarations.termsVar}
+      return ${buildCtsWordQueryExpression({
+			termExpression: "$term",
+			isCaseSensitive
+		})}
+  ))
+  else ()`],
+		predicate: `(if (exists(${ctsQueryVar}))
+  then some ${contentNodeVar} in (${contentNodesExpression})
+    satisfies cts:contains(${contentNodeVar}, ${ctsQueryVar})
+  else ${fallbackPredicate})`
+	};
+}
+/**
+* Build the raw search paths for item-level string search.
+*/
+function buildItemStringSearchPaths(language) {
+	return [buildFlattenedContentValuesExpression(`identification/label/content[@xml:lang="${language}"]`), buildFlattenedContentValuesExpression(`properties//property/value[not(@inherited="true")]/content[@xml:lang="${language}"]`)];
+}
+/**
+* Build the identification branch for an item-level CTS string search.
+*/
+function buildItemStringIdentificationBranch(params) {
+	const { termExpression, isCaseSensitive, language } = params;
+	return `cts:element-query(xs:QName("identification"),
+        cts:and-query((
+          cts:element-attribute-value-query(xs:QName("content"), xs:QName("xml:lang"), ${stringLiteral(language)}),
+          ${buildCtsWordQueryExpression({
+		termExpression,
+		isCaseSensitive
+	})}
+        ))
+      )`;
+}
+/**
+* Build the property value branch for an item-level CTS string search.
+*/
+function buildItemStringPropertyValueBranch(params) {
+	const { termExpression, isCaseSensitive, language } = params;
+	return `cts:element-query(xs:QName("properties"),
+        cts:element-query(xs:QName("property"),
+          cts:element-query(xs:QName("value"),
+            cts:and-query((
+              cts:not-query(cts:element-attribute-value-query(xs:QName("value"), xs:QName("inherited"), "true")),
+              cts:element-query(xs:QName("content"),
+                cts:and-query((
+                  cts:element-attribute-value-query(xs:QName("content"), xs:QName("xml:lang"), ${stringLiteral(language)}),
+                  ${buildCtsWordQueryExpression({
+		termExpression,
+		isCaseSensitive
+	})}
+                ))
+              )
+            ))
+          )
+        )
+      )`;
+}
+/**
+* Build an item-level CTS string search predicate.
+*/
+function buildItemStringSearchPredicate(params) {
+	const { query, version, queryKey } = params;
+	const fallbackPredicate = buildCombinedRawStringMatchPredicate({
+		valueExpressions: buildItemStringSearchPaths(query.language),
+		value: query.value,
+		matchMode: query.matchMode,
+		isCaseSensitive: query.isCaseSensitive
+	});
+	if (query.matchMode !== "includes" || version !== 2) return {
+		declarations: [],
+		predicate: fallbackPredicate
+	};
+	const tokenizedSearchDeclarations = buildTokenizedSearchDeclarations({
+		value: query.value,
+		isCaseSensitive: query.isCaseSensitive,
+		queryKey
+	});
+	const termQueriesVar = `$query${queryKey}TermQueries`;
+	const ctsQueryVar = `$query${queryKey}CtsQuery`;
+	return {
+		declarations: [
+			...tokenizedSearchDeclarations.declarations,
+			`let ${termQueriesVar} :=
+  for $term in ${tokenizedSearchDeclarations.termsVar}
+    return
+      cts:or-query((
+        ${buildItemStringIdentificationBranch({
+				termExpression: "$term",
+				isCaseSensitive: query.isCaseSensitive,
+				language: query.language
+			})},
+        ${buildItemStringPropertyValueBranch({
+				termExpression: "$term",
+				isCaseSensitive: query.isCaseSensitive,
+				language: query.language
+			})}
+      ))`,
 			`let ${ctsQueryVar} :=
-  if (count(${termsVar}) = 1)
-  then cts:word-query(${termsVar}[1], ${ctsOptionsExpression})
-  else if (count(${termsVar}) gt 1)
-  then cts:near-query((
-    for $term in ${termsVar}
-      return cts:word-query($term, ${ctsOptionsExpression})
-  ), 5, ("unordered"))
+  if (count(${tokenizedSearchDeclarations.termsVar}) = 1)
+  then ${termQueriesVar}[1]
+  else if (count(${tokenizedSearchDeclarations.termsVar}) gt 1)
+  then cts:and-query(${termQueriesVar})
   else ()`
 		],
-		predicate: `(if (exists(${ctsQueryVar})) then cts:contains(${path}, ${ctsQueryVar}) else ${fallbackPredicate})`
+		predicate: `(if (exists(${ctsQueryVar})) then cts:contains(., ${ctsQueryVar}) else ${fallbackPredicate})`
 	};
 }
 /**
 * Build a string match predicate for an XQuery string.
 */
 function buildStringMatchPredicate(params) {
-	const { path, value, matchMode, isCaseSensitive, version, queryIndex } = params;
-	if (matchMode === "includes" && version === 2) return buildCtsIncludesPredicate({
-		path,
+	const { contentNodesExpression, value, matchMode, isCaseSensitive, version, queryKey } = params;
+	const valueExpression = buildFlattenedContentValuesExpression(contentNodesExpression);
+	if (matchMode === "includes" && version === 2) return buildCtsFieldIncludesPredicate({
+		contentNodesExpression,
+		valueExpression,
 		value,
 		isCaseSensitive,
-		queryIndex
+		queryKey
 	});
 	return {
 		declarations: [],
 		predicate: buildRawStringMatchPredicate({
-			path,
+			valueExpression,
 			value,
 			matchMode,
 			isCaseSensitive
 		})
 	};
 }
+function buildOrPredicate(predicates) {
+	if (predicates.length === 1) return predicates[0] ?? "false()";
+	return `(${predicates.join(" or ")})`;
+}
+function buildAndPredicate(predicates) {
+	if (predicates.length === 1) return predicates[0] ?? "false()";
+	return `(${predicates.join(" and ")})`;
+}
 /**
 * Build a date/dateTime range predicate for an XQuery string.
 */
@@ -2247,88 +2393,139 @@ function buildDateRangePredicate(params) {
 	return conditions.join(" and ");
 }
 /**
-* Build a property value predicate for an XQuery string.
+* Build a property label predicate for an XQuery string.
 */
-function buildPropertyValuePredicate(params) {
-	const { query, version, queryIndex } = params;
-	if (query.dataType === "IDREF") return {
-		declarations: [],
-		predicate: `.//properties//property[value[@uuid=${stringLiteral(query.value)}]]`
-	};
-	if (query.dataType === "date" || query.dataType === "dateTime") return {
-		declarations: [],
-		predicate: `.//properties//property[(label/@uuid=${stringLiteral(query.value)}) and ${buildDateRangePredicate({
-			from: query.from,
-			to: query.to
-		})}]`
-	};
-	if (query.dataType === "time" || query.dataType === "integer" || query.dataType === "decimal" || query.dataType === "boolean") return {
-		declarations: [],
-		predicate: `.//properties//property[value[@rawValue=${stringLiteral(query.value)}]]`
+function buildPropertyLabelPredicate(propertyVariables) {
+	const labelPredicates = [];
+	for (const propertyVariable of propertyVariables) labelPredicates.push(`@uuid=${stringLiteral(propertyVariable)}`);
+	return `label[${buildOrPredicate(labelPredicates)}]`;
+}
+function buildPropertyValueAttributePredicate(params) {
+	const { propertyValues, attributeName } = params;
+	const valuePredicates = [];
+	for (const propertyValue of propertyValues) valuePredicates.push(`value[@${attributeName}=${stringLiteral(propertyValue)}]`);
+	return buildOrPredicate(valuePredicates);
+}
+function buildPropertyStringValuePredicate(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}"]`;
+	const declarations = [];
+	const valuePredicates = [];
+	for (const [propertyValueIndex, propertyValue] of query.propertyValues.entries()) {
+		const compiledStringPredicate = buildStringMatchPredicate({
+			contentNodesExpression: propertyContentNodesExpression,
+			value: propertyValue,
+			matchMode: query.matchMode,
+			isCaseSensitive: query.isCaseSensitive,
+			version,
+			queryKey: `${queryKey}_${propertyValueIndex + 1}`
+		});
+		declarations.push(...compiledStringPredicate.declarations);
+		valuePredicates.push(compiledStringPredicate.predicate);
+	}
+	return {
+		declarations,
+		predicate: buildOrPredicate(valuePredicates)
 	};
-	const compiledStringPredicate = buildStringMatchPredicate({
-		path: `string-join(value/content[@xml:lang="${query.language}"]/string, "")`,
-		value: query.value,
-		matchMode: query.matchMode,
-		isCaseSensitive: query.isCaseSensitive,
-		version,
-		queryIndex
-	});
+}
+/**
+* Build a property predicate for an XQuery string.
+*/
+function buildPropertyPredicate(params) {
+	const { query, version, queryKey } = params;
+	const predicateParts = [buildPropertyLabelPredicate(query.propertyVariables)];
+	const declarations = [];
+	if (query.dataType === "date" || query.dataType === "dateTime") predicateParts.push(buildDateRangePredicate({
+		from: query.from,
+		to: query.to
+	}));
+	else if (query.propertyValues != null) switch (query.dataType) {
+		case "IDREF":
+			predicateParts.push(buildPropertyValueAttributePredicate({
+				propertyValues: query.propertyValues,
+				attributeName: "uuid"
+			}));
+			break;
+		case "integer":
+		case "decimal":
+		case "time":
+		case "boolean":
+			predicateParts.push(buildPropertyValueAttributePredicate({
+				propertyValues: query.propertyValues,
+				attributeName: "rawValue"
+			}));
+			break;
+		case "string": {
+			const compiledStringPredicate = buildPropertyStringValuePredicate({
+				query,
+				version,
+				queryKey
+			});
+			declarations.push(...compiledStringPredicate.declarations);
+			predicateParts.push(compiledStringPredicate.predicate);
+			break;
+		}
+	}
 	return {
-		declarations: compiledStringPredicate.declarations,
-		predicate: `.//properties//property[${compiledStringPredicate.predicate}]`
+		declarations,
+		predicate: `.//properties//property[${buildAndPredicate(predicateParts)}]`
 	};
 }
 /**
 * Build a query predicate for an XQuery string.
 */
 function buildQueryPredicate(params) {
-	const { query, version, queryIndex } = params;
+	const { query, version, queryKey } = params;
 	switch (query.target) {
+		case "string": return buildItemStringSearchPredicate({
+			query,
+			version,
+			queryKey
+		});
 		case "title": return buildStringMatchPredicate({
-			path: `string-join(identification/label/content[@xml:lang="${query.language}"]/string, "")`,
+			contentNodesExpression: `identification/label/content[@xml:lang="${query.language}"]`,
 			value: query.value,
 			matchMode: query.matchMode,
 			isCaseSensitive: query.isCaseSensitive,
 			version,
-			queryIndex
+			queryKey
 		});
 		case "description": return buildStringMatchPredicate({
-			path: `string-join(description/content[@xml:lang="${query.language}"]/string, "")`,
+			contentNodesExpression: `description/content[@xml:lang="${query.language}"]`,
 			value: query.value,
 			matchMode: query.matchMode,
 			isCaseSensitive: query.isCaseSensitive,
 			version,
-			queryIndex
+			queryKey
 		});
 		case "periods": return buildStringMatchPredicate({
-			path: `string-join(periods/period/identification/label/content[@xml:lang="${query.language}"]/string, "")`,
+			contentNodesExpression: `periods/period/identification/label/content[@xml:lang="${query.language}"]`,
 			value: query.value,
 			matchMode: query.matchMode,
 			isCaseSensitive: query.isCaseSensitive,
 			version,
-			queryIndex
+			queryKey
 		});
 		case "bibliography": return buildStringMatchPredicate({
-			path: `string-join(bibliographies/bibliography/identification/label/content[@xml:lang="${query.language}"]/string, "")`,
+			contentNodesExpression: `bibliographies/bibliography/identification/label/content[@xml:lang="${query.language}"]`,
 			value: query.value,
 			matchMode: query.matchMode,
 			isCaseSensitive: query.isCaseSensitive,
 			version,
-			queryIndex
+			queryKey
 		});
 		case "image": return buildStringMatchPredicate({
-			path: `string-join(image/identification/label/content[@xml:lang="${query.language}"]/string, "")`,
+			contentNodesExpression: `image/identification/label/content[@xml:lang="${query.language}"]`,
 			value: query.value,
 			matchMode: query.matchMode,
 			isCaseSensitive: query.isCaseSensitive,
 			version,
-			queryIndex
+			queryKey
 		});
-		case "propertyValue": return buildPropertyValuePredicate({
+		case "property": return buildPropertyPredicate({
 			query,
 			version,
-			queryIndex
+			queryKey
 		});
 	}
 }
@@ -2336,11 +2533,11 @@ function buildQueryPredicate(params) {
 * Build a boolean query clause for an XQuery string.
 */
 function buildBooleanQueryClause(params) {
-	const { query, version, queryIndex } = params;
+	const { query, version, queryKey } = params;
 	const compiledQueryPredicate = buildQueryPredicate({
 		query,
 		version,
-		queryIndex
+		queryKey
 	});
 	const baseClause = `(${compiledQueryPredicate.predicate})`;
 	return {
@@ -2360,7 +2557,7 @@ function buildQueryFilters(params) {
 		const compiledClause = buildBooleanQueryClause({
 			query,
 			version,
-			queryIndex: index + 1
+			queryKey: `${index + 1}`
 		});
 		if (compiledClause.declarations.length > 0) {
 			hasCtsIncludesClauses = true;
@@ -2378,7 +2575,6 @@ function buildQueryFilters(params) {
 		predicate: predicateParts.join(" ")
 	};
 }
-
 //#endregion
 //#region src/utils/fetchers/set/items.ts
 function mapSortDirectionToXQuery(direction) {
@@ -2456,7 +2652,6 @@ function buildOrderedItemsClause(sort) {
 * @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 and optional NOT via negation
 * @param params.sort - Optional sorting configuration applied before pagination.
 * For propertyValue sorting, dataType is required and the sort key uses the first valid leaf value (value[not(@i)]).
@@ -2467,8 +2662,8 @@ function buildOrderedItemsClause(sort) {
 * @returns An XQuery string
 */
 function buildXQuery$1(params, options) {
-	const version = options?.version ?? DEFAULT_API_VERSION;
-	const { propertyVariableUuids, queries, sort, setScopeUuids, belongsToCollectionScopeUuids, page, pageSize } = params;
+	const version = options?.version ?? 2;
+	const { queries, sort, setScopeUuids, belongsToCollectionScopeUuids, page, pageSize } = params;
 	const startPosition = (page - 1) * pageSize + 1;
 	const endPosition = page * pageSize;
 	const setScopeFilter = `/set[(${setScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]/items/*`;
@@ -2482,10 +2677,6 @@ function buildXQuery$1(params, options) {
 		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 (compiledQueryFilters.predicate.length > 0) filterPredicates.push(`(${compiledQueryFilters.predicate})`);
 	const itemFilters = filterPredicates.length > 0 ? `[${filterPredicates.join(" and ")}]` : "";
 	const orderedItemsClause = buildOrderedItemsClause(sort);
@@ -2508,7 +2699,6 @@ function buildXQuery$1(params, options) {
 *
 * @param params - The parameters for the fetch
 * @param params.setScopeUuids - The Set 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 and optional NOT via negation
 * @param params.sort - Optional sorting configuration applied before pagination.
 * For propertyValue sorting, dataType is required and the sort key uses the first valid leaf value (value[not(@i)]).
@@ -2522,12 +2712,11 @@ function buildXQuery$1(params, options) {
 */
 async function fetchSetItems(params, itemCategories, options) {
 	try {
-		const version = options?.version ?? DEFAULT_API_VERSION;
-		const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids, queries, sort, page, pageSize } = setItemsParamsSchema.parse(params);
+		const version = options?.version ?? 2;
+		const { setScopeUuids, belongsToCollectionScopeUuids, queries, sort, page, pageSize } = setItemsParamsSchema.parse(params);
 		const xquery = buildXQuery$1({
 			setScopeUuids,
 			belongsToCollectionScopeUuids,
-			propertyVariableUuids,
 			queries,
 			sort,
 			page,
@@ -2617,7 +2806,6 @@ async function fetchSetItems(params, itemCategories, options) {
 		};
 	}
 }
-
 //#endregion
 //#region src/utils/fetchers/set/property-values-by-property-variables.ts
 function parsePropertyValueLabel(content) {
@@ -2691,6 +2879,14 @@ function aggregateAttributeValues(values) {
 		return a.content.localeCompare(b.content);
 	});
 }
+function getPropertyVariableUuidsFromQueries(queries) {
+	const propertyVariableUuids = /* @__PURE__ */ new Set();
+	for (const query of queries) {
+		if (query.target !== "property") continue;
+		for (const propertyVariableUuid of query.propertyVariables) propertyVariableUuids.add(propertyVariableUuid);
+	}
+	return [...propertyVariableUuids];
+}
 /**
 * Schema for a single property value query item in the OCHRE API response
 */
@@ -2759,7 +2955,6 @@ const responseSchema = z.object({ result: z.union([z.object({ ochre: z.object({
 * @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.queries - Ordered queries to combine with AND/OR and optional NOT via negation
 * @param params.attributes - Whether to return values for bibliographies and periods
 * @param params.attributes.bibliographies - Whether to return values for bibliographies
@@ -2770,11 +2965,11 @@ const responseSchema = z.object({ result: z.union([z.object({ ochre: z.object({
 * @returns An XQuery string
 */
 function buildXQuery(params, options) {
-	const version = options?.version ?? DEFAULT_API_VERSION;
-	const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids, queries, attributes, isLimitedToLeafPropertyValues } = params;
+	const version = options?.version ?? 2;
+	const { setScopeUuids, belongsToCollectionScopeUuids, queries, attributes, isLimitedToLeafPropertyValues } = params;
 	let setScopeFilter = "/set/items/*";
 	if (setScopeUuids.length > 0) setScopeFilter = `/set[(${setScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]/items/*`;
-	const propertyVariableFilters = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
+	const propertyVariableFilters = getPropertyVariableUuidsFromQueries(queries).map((uuid) => `@uuid="${uuid}"`).join(" or ");
 	const compiledQueryFilters = buildQueryFilters({
 		queries,
 		version
@@ -2795,14 +2990,14 @@ let $property-values :=
     let $item-uuid := $v/ancestor::*[parent::items]/@uuid
     let $variable-uuid := $p/label/@uuid
     return <propertyValue uuid="{$v/@uuid}" rawValue="{$v/@rawValue}" dataType="{$v/@dataType}" itemUuid="{$item-uuid}" variableUuid="{$variable-uuid}">{
-      if ($v/content) then string-join($v/content[@xml:lang="eng"]/string, "") else $v/text()
+      if ($v/content) then string-join($v/content[@xml:lang="eng"]//text(), "") else $v/text()
     }</propertyValue>`];
 	const returnedSequences = ["$property-values"];
 	if (attributes.bibliographies) {
 		queryBlocks.push(`let $bibliography-values :=
   for $item in $items
   for $bibliography in $item/bibliographies/bibliography
-    let $label := string-join($bibliography/identification/label/content[@xml:lang="eng"]/string, "")
+    let $label := string-join($bibliography/identification/label/content[@xml:lang="eng"]//text(), "")
     where string-length($label) gt 0
     return <attributeValue attributeType="bibliographies" itemUuid="{$item/@uuid}" content="{$label}" />`);
 		returnedSequences.push("$bibliography-values");
@@ -2811,7 +3006,7 @@ let $property-values :=
 		queryBlocks.push(`let $period-values :=
   for $item in $items
   for $period in $item/periods/period
-    let $label := string-join($period/identification/label/content[@xml:lang="eng"]/string, "")
+    let $label := string-join($period/identification/label/content[@xml:lang="eng"]//text(), "")
     where string-length($label) gt 0
     return <attributeValue attributeType="periods" itemUuid="{$item/@uuid}" content="{$label}" />`);
 		returnedSequences.push("$period-values");
@@ -2829,7 +3024,6 @@ return (${returnedSequences.join(", ")})`}}</ochre>`;
 *
 * @param params - The parameters for the fetch
 * @param params.setScopeUuids - An array of set scope UUIDs to filter by
-* @param params.propertyVariableUuids - The property variable UUIDs to query by
 * @param params.queries - Ordered queries to combine with AND/OR and optional NOT via negation
 * @param params.attributes - Whether to return values for bibliographies and periods
 * @param params.attributes.bibliographies - Whether to return values for bibliographies
@@ -2843,12 +3037,11 @@ return (${returnedSequences.join(", ")})`}}</ochre>`;
 */
 async function fetchSetPropertyValuesByPropertyVariables(params, options) {
 	try {
-		const version = options?.version ?? DEFAULT_API_VERSION;
-		const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids, queries, attributes, isLimitedToLeafPropertyValues } = setPropertyValuesByPropertyVariablesParamsSchema.parse(params);
+		const version = options?.version ?? 2;
+		const { setScopeUuids, belongsToCollectionScopeUuids, queries, attributes, isLimitedToLeafPropertyValues } = setPropertyValuesByPropertyVariablesParamsSchema.parse(params);
 		const xquery = buildXQuery({
 			setScopeUuids,
 			belongsToCollectionScopeUuids,
-			propertyVariableUuids,
 			queries,
 			attributes,
 			isLimitedToLeafPropertyValues
@@ -2911,7 +3104,6 @@ async function fetchSetPropertyValuesByPropertyVariables(params, options) {
 		};
 	}
 }
-
 //#endregion
 //#region src/utils/getters.ts
 const DEFAULT_OPTIONS = { includeNestedProperties: false };
@@ -3165,7 +3357,6 @@ function filterProperties(property, filter, options = DEFAULT_OPTIONS) {
 	}
 	return false;
 }
-
 //#endregion
 //#region src/utils/parse/website.ts
 const SEGMENT_UNIQUE_SLUG_PREFIX_REGEX = /^\$[^-]*-/;
@@ -4416,7 +4607,7 @@ function parseContexts(contexts) {
 	}
 	return contextsParsed;
 }
-function parseWebsite(websiteTree, metadata, belongsTo, { version = DEFAULT_API_VERSION } = {}) {
+function parseWebsite(websiteTree, metadata, belongsTo, { version = 2 } = {}) {
 	if (!websiteTree.properties) throw new Error("Website properties not found");
 	if (typeof websiteTree.items === "string" || !("resource" in websiteTree.items)) throw new Error("Website pages not found");
 	const resources = ensureArray(websiteTree.items.resource);
@@ -4436,7 +4627,6 @@ function parseWebsite(websiteTree, metadata, belongsTo, { version = DEFAULT_API_
 		properties
 	};
 }
-
 //#endregion
 //#region src/utils/fetchers/website.ts
 const API_VERSION_SUFFIX_REGEX = /-v\d+$/;
@@ -4449,7 +4639,7 @@ const API_VERSION_SUFFIX_REGEX = /-v\d+$/;
 function parseApiVersionSuffix(abbreviation) {
 	if (!API_VERSION_SUFFIX_REGEX.test(abbreviation)) return {
 		abbreviation,
-		version: DEFAULT_API_VERSION
+		version: 2
 	};
 	const result = apiVersionSuffixSchema.safeParse(abbreviation.slice(-3));
 	if (!result.success) throw new Error("Invalid API version suffix");
@@ -4509,6 +4699,5 @@ async function fetchWebsite(abbreviation, options) {
 		};
 	}
 }
-
 //#endregion
-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 };
+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.20.22",
+  "version": "0.20.24",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -46,12 +46,12 @@
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^7.7.0",
+    "@antfu/eslint-config": "^7.7.3",
     "@types/node": "^24.12.0",
-    "bumpp": "^10.4.1",
-    "eslint": "^10.0.2",
+    "bumpp": "^11.0.1",
+    "eslint": "^10.1.0",
     "prettier": "^3.8.1",
-    "tsdown": "^0.20.3",
+    "tsdown": "^0.21.4",
     "typescript": "^5.9.3"
   },
   "scripts": {