ochre-sdk 0.20.20 → 0.20.22

package/dist/index.d.mts

@@ -1223,7 +1223,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.belongsToCollectionScopeUuids - The collection scope UUIDs to filter by
  * @param params.propertyVariableUuids - The property variable UUIDs to filter by
  * @param params.queries - Ordered queries to combine with AND/OR and optional NOT via negation
  * @param params.sort - Optional sorting configuration applied before pagination.
@@ -1238,7 +1237,6 @@ declare function fetchItem<T extends DataCategory = DataCategory, U extends Data
  */
 declare function fetchSetItems<U extends Array<DataCategory> = Array<DataCategory>>(params: {
   setScopeUuids: Array<string>;
-  belongsToCollectionScopeUuids: Array<string>;
   propertyVariableUuids: Array<string>;
   queries: Array<Query>;
   sort?: SetItemsSort;
@@ -1267,7 +1265,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.belongsToCollectionScopeUuids - The collection 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
@@ -1282,7 +1279,6 @@ declare function fetchSetItems<U extends Array<DataCategory> = Array<DataCategor
  */
 declare function fetchSetPropertyValuesByPropertyVariables(params: {
   setScopeUuids: Array<string>;
-  belongsToCollectionScopeUuids: Array<string>;
   propertyVariableUuids: Array<string>;
   queries?: Array<Query>;
   attributes?: {

package/dist/index.mjs

@@ -16,6 +16,9 @@ const TEXT_ANNOTATION_TEXT_STYLING_HEADING_LEVEL_UUID = "d4266f0b-3f8d-4b32-8c15
 
 //#endregion
 //#region src/utils/string.ts
+const EMAIL_BRACKET_CLEANUP_REGEX = /(?<=\s|^)[([{]+|[)\]}]+(?=\s|$)/g;
+const EMAIL_PUNCTUATION_CLEANUP_REGEX = /[!),:;?\]]/g;
+const EMAIL_TRAILING_PERIOD_REGEX = /\.$/;
 /**
 * Finds a string item in an array by language code
 *
@@ -46,7 +49,7 @@ function parseEmail(string) {
 	const splitString = string.split(" ");
 	const returnSplitString = [];
 	for (const string of splitString) {
-		const cleanString = transformPermanentIdentificationUrl(string).replaceAll(/(?<=\s|^)[([{]+|[)\]}]+(?=\s|$)/g, "").replaceAll(/[!),:;?\]]/g, "").replace(/\.$/, "");
+		const cleanString = transformPermanentIdentificationUrl(string).replaceAll(EMAIL_BRACKET_CLEANUP_REGEX, "").replaceAll(EMAIL_PUNCTUATION_CLEANUP_REGEX, "").replace(EMAIL_TRAILING_PERIOD_REGEX, "");
 		const index = string.indexOf(cleanString);
 		const before = string.slice(0, index);
 		const after = string.slice(index + cleanString.length);
@@ -442,6 +445,7 @@ function parseStringContent(content, language = "eng") {
 
 //#endregion
 //#region src/utils/internal.ts
+const PSEUDO_UUID_REGEX = /^[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12}$/i;
 /**
 * Get the category of an item from the OCHRE API response
 * @param keys - The keys of the OCHRE API response
@@ -481,7 +485,7 @@ function getItemCategories(keys) {
 * @internal
 */
 function isPseudoUuid(value) {
-	return /^[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12}$/i.test(value);
+	return PSEUDO_UUID_REGEX.test(value);
 }
 /**
 * Flatten a properties array
@@ -900,6 +904,7 @@ const setItemsParamsSchema = z.object({
 
 //#endregion
 //#region src/utils/parse/index.ts
+const TRAILING_ELLIPSIS_REGEX = /\s*\.{3}$/;
 /**
 * Parses raw identification data into the standardized Identification type
 *
@@ -1406,7 +1411,7 @@ function parseProperty(property, language = "eng") {
 	});
 	return {
 		uuid: property.label.uuid,
-		label: parseStringContent(property.label, language).replace(/\s*\.{3}$/, "").trim(),
+		label: parseStringContent(property.label, language).replace(TRAILING_ELLIPSIS_REGEX, "").trim(),
 		values,
 		comment: property.comment != null ? parseStringContent(property.comment) : null,
 		properties: property.property ? parseProperties(ensureArray(property.property)) : []
@@ -2142,10 +2147,18 @@ async function fetchItem(uuid, category, itemCategories, options) {
 
 //#endregion
 //#region src/utils/fetchers/set/query-helpers.ts
-/**
-* Build a string match predicate for an XQuery string
-*/
-function buildStringMatchPredicate(params) {
+const CTS_INCLUDES_STOP_WORDS = [
+	"of",
+	"the",
+	"and",
+	"in",
+	"it"
+];
+const CTS_INCLUDES_STOP_WORDS_VAR = "$ctsIncludesStopWords";
+/**
+* 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 comparedValueLiteral = stringLiteral(isCaseSensitive ? value : value.toLowerCase());
@@ -2153,6 +2166,77 @@ function buildStringMatchPredicate(params) {
 	return `${comparedPath} = ${comparedValueLiteral}`;
 }
 /**
+* 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"
+	].map((option) => stringLiteral(option)).join(", ")})`;
+}
+/**
+* Build a CTS-backed includes predicate for an XQuery string.
+*/
+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
+	});
+	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"}`,
+			`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"))
+  else ()`
+		],
+		predicate: `(if (exists(${ctsQueryVar})) then cts:contains(${path}, ${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,
+		value,
+		isCaseSensitive,
+		queryIndex
+	});
+	return {
+		declarations: [],
+		predicate: buildRawStringMatchPredicate({
+			path,
+			value,
+			matchMode,
+			isCaseSensitive
+		})
+	};
+}
+/**
 * Build a date/dateTime range predicate for an XQuery string.
 */
 function buildDateRangePredicate(params) {
@@ -2163,76 +2247,136 @@ function buildDateRangePredicate(params) {
 	return conditions.join(" and ");
 }
 /**
-* Build a property value predicate for an XQuery string
+* Build a property value predicate for an XQuery string.
 */
-function buildPropertyValuePredicate(query) {
-	if (query.dataType === "IDREF") return `.//properties//property[value[@uuid=${stringLiteral(query.value)}]]`;
-	if (query.dataType === "date" || query.dataType === "dateTime") return `.//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 `.//properties//property[value[@rawValue=${stringLiteral(query.value)}]]`;
-	return `.//properties//property[${buildStringMatchPredicate({
+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)}]]`
+	};
+	const compiledStringPredicate = buildStringMatchPredicate({
 		path: `string-join(value/content[@xml:lang="${query.language}"]/string, "")`,
 		value: query.value,
 		matchMode: query.matchMode,
-		isCaseSensitive: query.isCaseSensitive
-	})}]`;
+		isCaseSensitive: query.isCaseSensitive,
+		version,
+		queryIndex
+	});
+	return {
+		declarations: compiledStringPredicate.declarations,
+		predicate: `.//properties//property[${compiledStringPredicate.predicate}]`
+	};
 }
 /**
-* Build a query predicate for an XQuery string
+* Build a query predicate for an XQuery string.
 */
-function buildQueryPredicate(query) {
+function buildQueryPredicate(params) {
+	const { query, version, queryIndex } = params;
 	switch (query.target) {
 		case "title": return buildStringMatchPredicate({
 			path: `string-join(identification/label/content[@xml:lang="${query.language}"]/string, "")`,
 			value: query.value,
 			matchMode: query.matchMode,
-			isCaseSensitive: query.isCaseSensitive
+			isCaseSensitive: query.isCaseSensitive,
+			version,
+			queryIndex
 		});
 		case "description": return buildStringMatchPredicate({
 			path: `string-join(description/content[@xml:lang="${query.language}"]/string, "")`,
 			value: query.value,
 			matchMode: query.matchMode,
-			isCaseSensitive: query.isCaseSensitive
+			isCaseSensitive: query.isCaseSensitive,
+			version,
+			queryIndex
 		});
 		case "periods": return buildStringMatchPredicate({
 			path: `string-join(periods/period/identification/label/content[@xml:lang="${query.language}"]/string, "")`,
 			value: query.value,
 			matchMode: query.matchMode,
-			isCaseSensitive: query.isCaseSensitive
+			isCaseSensitive: query.isCaseSensitive,
+			version,
+			queryIndex
 		});
 		case "bibliography": return buildStringMatchPredicate({
 			path: `string-join(bibliographies/bibliography/identification/label/content[@xml:lang="${query.language}"]/string, "")`,
 			value: query.value,
 			matchMode: query.matchMode,
-			isCaseSensitive: query.isCaseSensitive
+			isCaseSensitive: query.isCaseSensitive,
+			version,
+			queryIndex
 		});
 		case "image": return buildStringMatchPredicate({
 			path: `string-join(image/identification/label/content[@xml:lang="${query.language}"]/string, "")`,
 			value: query.value,
 			matchMode: query.matchMode,
-			isCaseSensitive: query.isCaseSensitive
+			isCaseSensitive: query.isCaseSensitive,
+			version,
+			queryIndex
+		});
+		case "propertyValue": return buildPropertyValuePredicate({
+			query,
+			version,
+			queryIndex
 		});
-		case "propertyValue": return buildPropertyValuePredicate(query);
 	}
 }
 /**
 * Build a boolean query clause for an XQuery string.
 */
-function buildBooleanQueryClause(query) {
-	const baseClause = `(${buildQueryPredicate(query)})`;
-	return query.isNegated ? `not(${baseClause})` : baseClause;
+function buildBooleanQueryClause(params) {
+	const { query, version, queryIndex } = params;
+	const compiledQueryPredicate = buildQueryPredicate({
+		query,
+		version,
+		queryIndex
+	});
+	const baseClause = `(${compiledQueryPredicate.predicate})`;
+	return {
+		declarations: compiledQueryPredicate.declarations,
+		predicate: query.isNegated ? `not(${baseClause})` : baseClause
+	};
 }
 /**
 * Build query filters for an XQuery string.
 */
-function buildQueryFilters(queries) {
-	return queries.map((query, index) => {
-		const clause = buildBooleanQueryClause(query);
-		if (index === 0) return clause;
-		return `${query.operator === "AND" ? "and" : "or"} ${clause}`;
-	}).join(" ");
+function buildQueryFilters(params) {
+	const { queries, version } = params;
+	const declarations = [];
+	const predicateParts = [];
+	let hasCtsIncludesClauses = false;
+	for (const [index, query] of queries.entries()) {
+		const compiledClause = buildBooleanQueryClause({
+			query,
+			version,
+			queryIndex: index + 1
+		});
+		if (compiledClause.declarations.length > 0) {
+			hasCtsIncludesClauses = true;
+			declarations.push(...compiledClause.declarations);
+		}
+		if (index === 0) {
+			predicateParts.push(compiledClause.predicate);
+			continue;
+		}
+		predicateParts.push(`${query.operator === "AND" ? "and" : "or"} ${compiledClause.predicate}`);
+	}
+	if (hasCtsIncludesClauses) declarations.unshift(`let ${CTS_INCLUDES_STOP_WORDS_VAR} := (${CTS_INCLUDES_STOP_WORDS.map((stopWord) => stringLiteral(stopWord)).join(", ")})`);
+	return {
+		declarations,
+		predicate: predicateParts.join(" ")
+	};
 }
 
 //#endregion
@@ -2328,7 +2472,11 @@ function buildXQuery$1(params, options) {
 	const startPosition = (page - 1) * pageSize + 1;
 	const endPosition = page * pageSize;
 	const setScopeFilter = `/set[(${setScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]/items/*`;
-	const queryFilters = buildQueryFilters(queries);
+	const compiledQueryFilters = buildQueryFilters({
+		queries,
+		version
+	});
+	const queryFilterDeclarations = compiledQueryFilters.declarations.length > 0 ? `${compiledQueryFilters.declarations.join("\n")}\n\n` : "";
 	const filterPredicates = [];
 	if (belongsToCollectionScopeUuids.length > 0) {
 		const belongsToCollectionScopeValues = belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
@@ -2338,10 +2486,10 @@ function buildXQuery$1(params, options) {
 		const propertyVariables = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
 		filterPredicates.push(`.//properties//property[label[${propertyVariables}]]`);
 	}
-	if (queryFilters.length > 0) filterPredicates.push(`(${queryFilters})`);
+	if (compiledQueryFilters.predicate.length > 0) filterPredicates.push(`(${compiledQueryFilters.predicate})`);
 	const itemFilters = filterPredicates.length > 0 ? `[${filterPredicates.join(" and ")}]` : "";
 	const orderedItemsClause = buildOrderedItemsClause(sort);
-	return `<ochre>{${`let $items := ${version === 2 ? "doc()" : "input()"}/ochre
+	return `<ochre>{${`${queryFilterDeclarations}let $items := ${version === 2 ? "doc()" : "input()"}/ochre
         ${setScopeFilter}
         ${itemFilters}
 
@@ -2360,7 +2508,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.belongsToCollectionScopeUuids - The collection scope UUIDs to filter by
 * @param params.propertyVariableUuids - The property variable UUIDs to filter by
 * @param params.queries - Ordered queries to combine with AND/OR and optional NOT via negation
 * @param params.sort - Optional sorting configuration applied before pagination.
@@ -2386,7 +2533,13 @@ async function fetchSetItems(params, itemCategories, options) {
 			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="*"`);
+		let response;
+		if (version === 2) response = await (options?.fetch ?? fetch)("https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?xquery&format=json", {
+			method: "POST",
+			body: xquery,
+			headers: { "Content-Type": "application/xquery" }
+		});
+		else response = await (options?.fetch ?? fetch)(`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).length === 0) throw new Error("No items found");
@@ -2622,13 +2775,17 @@ function buildXQuery(params, options) {
 	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 queryFilters = buildQueryFilters(queries);
+	const compiledQueryFilters = buildQueryFilters({
+		queries,
+		version
+	});
+	const queryFilterDeclarations = compiledQueryFilters.declarations.length > 0 ? `${compiledQueryFilters.declarations.join("\n")}\n\n` : "";
 	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 (queryFilters.length > 0) filterPredicates.push(`(${queryFilters})`);
+	if (compiledQueryFilters.predicate.length > 0) filterPredicates.push(`(${compiledQueryFilters.predicate})`);
 	const itemFilters = filterPredicates.length > 0 ? `[${filterPredicates.join(" and ")}]` : "";
 	const queryBlocks = [`let $matching-props := $items//property[label[${propertyVariableFilters}]]
 
@@ -2659,7 +2816,7 @@ let $property-values :=
     return <attributeValue attributeType="periods" itemUuid="{$item/@uuid}" content="{$label}" />`);
 		returnedSequences.push("$period-values");
 	}
-	return `<ochre>{${`let $items := ${version === 2 ? "doc()" : "input()"}/ochre
+	return `<ochre>{${`${queryFilterDeclarations}let $items := ${version === 2 ? "doc()" : "input()"}/ochre
       ${setScopeFilter}
       ${itemFilters}
 
@@ -2672,7 +2829,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.belongsToCollectionScopeUuids - The collection 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
@@ -2697,7 +2853,13 @@ async function fetchSetPropertyValuesByPropertyVariables(params, options) {
 			attributes,
 			isLimitedToLeafPropertyValues
 		}, { 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="*"`);
+		let response;
+		if (version === 2) response = await (options?.fetch ?? fetch)("https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?xquery&format=json", {
+			method: "POST",
+			body: xquery,
+			headers: { "Content-Type": "application/xquery" }
+		});
+		else response = await (options?.fetch ?? fetch)(`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();
 		const parsedResultRaw = responseSchema.parse(data);
@@ -3006,6 +3168,8 @@ function filterProperties(property, filter, options = DEFAULT_OPTIONS) {
 
 //#endregion
 //#region src/utils/parse/website.ts
+const SEGMENT_UNIQUE_SLUG_PREFIX_REGEX = /^\$[^-]*-/;
+const TRAILING_SLASH_REGEX = /\/$/;
 /**
 * Extracts CSS style properties for a given presentation variant.
 *
@@ -3726,13 +3890,13 @@ function parseWebpage(webpageResource, slugPrefix) {
 	const webpageProperties = webpageResource.properties ? parseProperties(ensureArray(webpageResource.properties.property)) : [];
 	if (webpageProperties.length === 0 || getPropertyValueByLabel(webpageProperties, "presentation") !== "page") return null;
 	const identification = parseIdentification(webpageResource.identification);
-	const slug = webpageResource.slug?.replace(/^\$[^-]*-/, "") ?? null;
+	const slug = webpageResource.slug?.replace(SEGMENT_UNIQUE_SLUG_PREFIX_REGEX, "") ?? null;
 	if (slug == null) throw new Error(`Slug not found for page “${identification.label}”`);
 	const returnWebpage = {
 		uuid: webpageResource.uuid,
 		type: "page",
 		title: identification.label,
-		slug: slugPrefix != null ? `${slugPrefix}/${slug}`.replace(/\/$/, "") : slug,
+		slug: slugPrefix != null ? `${slugPrefix}/${slug}`.replace(TRAILING_SLASH_REGEX, "") : slug,
 		publicationDateTime: parseOptionalDate(webpageResource.publicationDateTime),
 		items: [],
 		properties: {
@@ -3831,7 +3995,7 @@ function parseWebSegment(segmentResource, slugPrefix) {
 		publicationDateTime: parseOptionalDate(segmentResource.publicationDateTime),
 		items: []
 	};
-	returnSegment.items = parseWebSegmentItems(segmentResource.resource ? ensureArray(segmentResource.resource) : [], slugPrefix != null ? `${slugPrefix}/${slug}`.replace(/\/$/, "") : slug);
+	returnSegment.items = parseWebSegmentItems(segmentResource.resource ? ensureArray(segmentResource.resource) : [], slugPrefix != null ? `${slugPrefix}/${slug}`.replace(TRAILING_SLASH_REGEX, "") : slug);
 	return returnSegment;
 }
 /**
@@ -3869,7 +4033,7 @@ function parseWebSegmentItem(segmentItemResource, slugPrefix) {
 		items: []
 	};
 	const resources = segmentItemResource.resource ? ensureArray(segmentItemResource.resource) : [];
-	returnSegmentItem.items.push(...parseWebpages(resources, slugPrefix != null ? `${slugPrefix}/${slug}`.replace(/\/$/, "") : slug), ...parseSegments(resources, slugPrefix != null ? `${slugPrefix}/${slug}`.replace(/\/$/, "") : slug));
+	returnSegmentItem.items.push(...parseWebpages(resources, slugPrefix != null ? `${slugPrefix}/${slug}`.replace(TRAILING_SLASH_REGEX, "") : slug), ...parseSegments(resources, slugPrefix != null ? `${slugPrefix}/${slug}`.replace(TRAILING_SLASH_REGEX, "") : slug));
 	return returnSegmentItem;
 }
 /**
@@ -4275,6 +4439,7 @@ function parseWebsite(websiteTree, metadata, belongsTo, { version = DEFAULT_API_
 
 //#endregion
 //#region src/utils/fetchers/website.ts
+const API_VERSION_SUFFIX_REGEX = /-v\d+$/;
 /**
 * Parses the version suffix from an API abbreviation
 *
@@ -4282,7 +4447,7 @@ function parseWebsite(websiteTree, metadata, belongsTo, { version = DEFAULT_API_
 * @returns The parsed abbreviation and API version
 */
 function parseApiVersionSuffix(abbreviation) {
-	if (!/-v\d+$/.test(abbreviation)) return {
+	if (!API_VERSION_SUFFIX_REGEX.test(abbreviation)) return {
 		abbreviation,
 		version: DEFAULT_API_VERSION
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "0.20.20",
+  "version": "0.20.22",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -46,8 +46,8 @@
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^7.6.1",
-    "@types/node": "^24.11.0",
+    "@antfu/eslint-config": "^7.7.0",
+    "@types/node": "^24.12.0",
     "bumpp": "^10.4.1",
     "eslint": "^10.0.2",
     "prettier": "^3.8.1",