ochre-sdk 0.20.22 → 0.20.23

package/dist/index.d.mts

@@ -706,6 +706,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;

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)
@@ -818,6 +798,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",
@@ -897,11 +886,10 @@ const setItemsParamsSchema = z.object({
 	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 +1965,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 +1991,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 +2023,6 @@ async function fetchGallery(params, options) {
 		};
 	}
 }
-
 //#endregion
 //#region src/utils/fetchers/uuid.ts
 /**
@@ -2048,7 +2034,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 +2045,6 @@ async function fetchByUuid(uuid, options) {
 		return [error instanceof Error ? error.message : "Unknown error", null];
 	}
 }
-
 //#endregion
 //#region src/utils/fetchers/item.ts
 /**
@@ -2070,7 +2055,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,15 +2129,16 @@ 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";
 /**
@@ -2166,53 +2152,188 @@ function buildRawStringMatchPredicate(params) {
 	return `${comparedPath} = ${comparedValueLiteral}`;
 }
 /**
+* Build a combined raw string match predicate for multiple paths.
+*/
+function buildCombinedRawStringMatchPredicate(params) {
+	const { paths, value, matchMode, isCaseSensitive } = params;
+	const predicates = [];
+	for (const path of paths) predicates.push(buildRawStringMatchPredicate({
+		path,
+		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.
 */
 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;
+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, queryIndex } = params;
 	const searchStringVar = `$query${queryIndex}SearchString`;
 	const rawTermsVar = `$query${queryIndex}RawTerms`;
 	const termsVar = `$query${queryIndex}Terms`;
+	const tokenSourceExpression = isCaseSensitive ? searchStringVar : `fn:lower-case(${searchStringVar})`;
+	return {
+		declarations: [
+			`let ${searchStringVar} := ${stringLiteral(value)}`,
+			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 $term`
+		],
+		termsVar
+	};
+}
+/**
+* Build a CTS-backed field includes predicate for an XQuery string.
+*/
+function buildCtsFieldIncludesPredicate(params) {
+	const { path, value, isCaseSensitive, queryIndex } = params;
+	const tokenizedSearchDeclarations = buildTokenizedSearchDeclarations({
+		value,
+		isCaseSensitive,
+		queryIndex
+	});
 	const ctsQueryVar = `$query${queryIndex}CtsQuery`;
-	const ctsOptionsExpression = buildCtsQueryOptionsExpression(isCaseSensitive);
 	const fallbackPredicate = buildRawStringMatchPredicate({
 		path,
 		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 cts:contains(${path}, ${ctsQueryVar}) else ${fallbackPredicate})`
+	};
+}
+/**
+* Build the raw search paths for item-level string search.
+*/
+function buildItemStringSearchPaths(language) {
+	return [`string-join(identification/label/content[@xml:lang="${language}"]/string, "")`, `string-join(properties//property/value[not(@inherited="true")]/content[@xml:lang="${language}"]/string, "")`];
+}
+/**
+* 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, queryIndex } = params;
+	const fallbackPredicate = buildCombinedRawStringMatchPredicate({
+		paths: 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,
+		queryIndex
+	});
+	const termQueriesVar = `$query${queryIndex}TermQueries`;
+	const ctsQueryVar = `$query${queryIndex}CtsQuery`;
 	return {
 		declarations: [
-			`let ${searchStringVar} := ${stringLiteral(value)}`,
-			String.raw`let ${rawTermsVar} := fn:tokenize(${searchStringVar}, "\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"}`,
+			...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})`
 	};
 }
 /**
@@ -2220,7 +2341,7 @@ function buildCtsIncludesPredicate(params) {
 */
 function buildStringMatchPredicate(params) {
 	const { path, value, matchMode, isCaseSensitive, version, queryIndex } = params;
-	if (matchMode === "includes" && version === 2) return buildCtsIncludesPredicate({
+	if (matchMode === "includes" && version === 2) return buildCtsFieldIncludesPredicate({
 		path,
 		value,
 		isCaseSensitive,
@@ -2267,7 +2388,7 @@ function buildPropertyValuePredicate(params) {
 		predicate: `.//properties//property[value[@rawValue=${stringLiteral(query.value)}]]`
 	};
 	const compiledStringPredicate = buildStringMatchPredicate({
-		path: `string-join(value/content[@xml:lang="${query.language}"]/string, "")`,
+		path: query.matchMode === "includes" && version === 2 ? `string-join(value[not(@inherited="true")]/content[@xml:lang="${query.language}"]/string, "")` : `string-join(value/content[@xml:lang="${query.language}"]/string, "")`,
 		value: query.value,
 		matchMode: query.matchMode,
 		isCaseSensitive: query.isCaseSensitive,
@@ -2285,6 +2406,11 @@ function buildPropertyValuePredicate(params) {
 function buildQueryPredicate(params) {
 	const { query, version, queryIndex } = params;
 	switch (query.target) {
+		case "string": return buildItemStringSearchPredicate({
+			query,
+			version,
+			queryIndex
+		});
 		case "title": return buildStringMatchPredicate({
 			path: `string-join(identification/label/content[@xml:lang="${query.language}"]/string, "")`,
 			value: query.value,
@@ -2378,7 +2504,6 @@ function buildQueryFilters(params) {
 		predicate: predicateParts.join(" ")
 	};
 }
-
 //#endregion
 //#region src/utils/fetchers/set/items.ts
 function mapSortDirectionToXQuery(direction) {
@@ -2467,7 +2592,7 @@ function buildOrderedItemsClause(sort) {
 * @returns An XQuery string
 */
 function buildXQuery$1(params, options) {
-	const version = options?.version ?? DEFAULT_API_VERSION;
+	const version = options?.version ?? 2;
 	const { propertyVariableUuids, queries, sort, setScopeUuids, belongsToCollectionScopeUuids, page, pageSize } = params;
 	const startPosition = (page - 1) * pageSize + 1;
 	const endPosition = page * pageSize;
@@ -2522,7 +2647,7 @@ function buildXQuery$1(params, options) {
 */
 async function fetchSetItems(params, itemCategories, options) {
 	try {
-		const version = options?.version ?? DEFAULT_API_VERSION;
+		const version = options?.version ?? 2;
 		const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids, queries, sort, page, pageSize } = setItemsParamsSchema.parse(params);
 		const xquery = buildXQuery$1({
 			setScopeUuids,
@@ -2617,7 +2742,6 @@ async function fetchSetItems(params, itemCategories, options) {
 		};
 	}
 }
-
 //#endregion
 //#region src/utils/fetchers/set/property-values-by-property-variables.ts
 function parsePropertyValueLabel(content) {
@@ -2770,7 +2894,7 @@ 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 version = options?.version ?? 2;
 	const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids, queries, attributes, isLimitedToLeafPropertyValues } = params;
 	let setScopeFilter = "/set/items/*";
 	if (setScopeUuids.length > 0) setScopeFilter = `/set[(${setScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]/items/*`;
@@ -2843,7 +2967,7 @@ return (${returnedSequences.join(", ")})`}}</ochre>`;
 */
 async function fetchSetPropertyValuesByPropertyVariables(params, options) {
 	try {
-		const version = options?.version ?? DEFAULT_API_VERSION;
+		const version = options?.version ?? 2;
 		const { setScopeUuids, belongsToCollectionScopeUuids, propertyVariableUuids, queries, attributes, isLimitedToLeafPropertyValues } = setPropertyValuesByPropertyVariablesParamsSchema.parse(params);
 		const xquery = buildXQuery({
 			setScopeUuids,
@@ -2911,7 +3035,6 @@ async function fetchSetPropertyValuesByPropertyVariables(params, options) {
 		};
 	}
 }
-
 //#endregion
 //#region src/utils/getters.ts
 const DEFAULT_OPTIONS = { includeNestedProperties: false };
@@ -3165,7 +3288,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 +4538,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 +4558,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 +4570,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 +4630,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.23",
   "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.0.3",
     "prettier": "^3.8.1",
-    "tsdown": "^0.20.3",
+    "tsdown": "^0.21.4",
     "typescript": "^5.9.3"
   },
   "scripts": {