ochre-sdk 1.0.47 → 1.0.49

package/dist/fetchers/set/items.mjs

@@ -124,48 +124,6 @@ function buildOrderedItemsClause(sort) {
 	})}
       return $item`;
 }
-function isExactStringPropertyQuery(query) {
-	return "target" in query && query.target === "property" && query.dataType === "string" && query.value != null && query.matchMode === "exact" && query.isNegated !== true;
-}
-function getCtsQueriesWithoutExactStringPropertyQueries(queries) {
-	if (queries == null) return null;
-	if ("target" in queries) return isExactStringPropertyQuery(queries) ? null : queries;
-	if ("or" in queries) return queries;
-	const filteredChildren = [];
-	for (const childQuery of queries.and) {
-		const filteredChildQuery = getCtsQueriesWithoutExactStringPropertyQueries(childQuery);
-		if (filteredChildQuery != null) filteredChildren.push(filteredChildQuery);
-	}
-	if (filteredChildren.length === 0) return null;
-	return filteredChildren.length === 1 ? filteredChildren[0] ?? null : { and: filteredChildren };
-}
-function buildExactStringPropertyPredicate(query) {
-	const propertyPredicates = [];
-	const value = stringLiteral(query.value);
-	if (query.propertyVariable != null) propertyPredicates.push(`label/@uuid = ${stringLiteral(query.propertyVariable)}`);
-	if (query.propertyRelation != null) propertyPredicates.push(`label/@relation = ${stringLiteral(query.propertyRelation)}`);
-	propertyPredicates.push(`value[
-    not(@inherited = "true")
-    and (
-      content[@xml:lang = ${stringLiteral(query.language)}]/string = ${value}
-      or @rawValue = ${value}
-      or (not(content) and text() = ${value})
-    )
-  ]`);
-	return `.//properties/property[${propertyPredicates.join(" and ")}]`;
-}
-function buildExactStringPropertyXPathFilterExpression(queries) {
-	if (queries == null) return null;
-	if ("target" in queries) return isExactStringPropertyQuery(queries) ? buildExactStringPropertyPredicate(queries) : null;
-	if ("or" in queries) return null;
-	const childExpressions = [];
-	for (const childQuery of queries.and) {
-		const childExpression = buildExactStringPropertyXPathFilterExpression(childQuery);
-		if (childExpression != null) childExpressions.push(childExpression);
-	}
-	if (childExpressions.length === 0) return null;
-	return childExpressions.join(" and ");
-}
 /**
 * Build an XQuery string to fetch Set items from the OCHRE API
 * @param params - The parameters for the fetch
@@ -183,9 +141,7 @@ function buildXQuery(params) {
 	const startPosition = (page - 1) * pageSize + 1;
 	const setScopeDeclaration = `declare variable $setScopeUuids := (${setScopeUuids.map((uuid) => stringLiteral(uuid)).join(", ")});`;
 	const baseItemsExpression = "doc()/ochre/set[@uuid = $setScopeUuids]/items/*";
-	const ctsQueries = getCtsQueriesWithoutExactStringPropertyQueries(queries);
-	const exactStringPropertyXPathFilterExpression = buildExactStringPropertyXPathFilterExpression(queries);
-	const compiledQueryPlan = buildQueryPlan({ queries: ctsQueries });
+	const compiledQueryPlan = buildQueryPlan({ queries });
 	const itemsQueryExpressions = [];
 	const belongsToCollectionQueryExpression = buildBelongsToCollectionQueryExpression(belongsToCollectionScopeUuids, BELONGS_TO_COLLECTION_UUID);
 	if (compiledQueryPlan.queryExpression != null) itemsQueryExpressions.push(compiledQueryPlan.queryExpression);
@@ -194,11 +150,8 @@ function buildXQuery(params) {
 	const orderedItemsClause = buildOrderedItemsClause(sort);
 	const xqueryDeclarations = ["xquery version \"1.0-ml\";", setScopeDeclaration];
 	if (compiledQueryPlan.prolog !== "") xqueryDeclarations.push(compiledQueryPlan.prolog);
-	const searchedItemsClause = itemsQueryExpression == null ? `let $searchedItems := ${baseItemsExpression}` : `let $query := ${itemsQueryExpression}
-  let $searchedItems := cts:search(${baseItemsExpression}, $query)`;
-	const itemsClause = exactStringPropertyXPathFilterExpression == null ? `${searchedItemsClause}
-  let $items := $searchedItems` : `${searchedItemsClause}
-  let $items := $searchedItems[${exactStringPropertyXPathFilterExpression}]`;
+	const itemsClause = itemsQueryExpression == null ? `let $items := ${baseItemsExpression}` : `let $query := ${itemsQueryExpression}
+  let $items := cts:search(${baseItemsExpression}, $query)`;
 	return `${xqueryDeclarations.join("\n\n")}
 
 <ochre>{

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { MultilingualOptions, MultilingualString, MultilingualStringEntries, MultilingualStringEntry, MultilingualStringInput, MultilingualStringJSON, MultilingualStringObject, MultilingualStringText } from "./parsers/multilingual.mjs";
 import { AccordionWebBlock, ContextTree, ContextTreeFilterLevel, ContextTreeLevel, ContextTreeLevelItem, Scope, Style, StylesheetCategory, StylesheetItem, WebAccordionItem, WebBlock, WebBlockByLayout, WebBlockItem, WebBlockLayout, WebElement, WebElementComponent, WebElementComponentName, WebElementComponentOf, WebElementOf, WebImage, WebSidebar, WebTitle, Webpage, Website, WebsiteMetadata, WebsitePropertyQuery, WebsitePropertyQueryNode, WebsiteSegment, WebsiteType } from "./types/website.mjs";
-import { AnyBibliography, AnyConcept, AnyItem, AnyPeriod, AnyPerson, AnyPropertyValue, AnyPropertyVariable, AnyResource, AnySet, AnySpatialUnit, AnyText, AnyTree, BaseItem, BaseItemLink, BelongsTo, Bibliography, BibliographyEntryInfo, BibliographyItemLink, BibliographySourceDocument, Concept, ConceptItemLink, ContainedItemCategory, ContainedItemCategoryFromOption, ContainedItemCategoryOption, Context, ContextItem, ContextItemCategory, ContextNode, Coordinates, CoordinatesSource, DictionaryUnitItemLink, EmbeddedBibliography, EmbeddedConcept, EmbeddedItem, EmbeddedPeriod, EmbeddedPerson, EmbeddedPropertyValue, EmbeddedPropertyVariable, EmbeddedResource, EmbeddedSet, EmbeddedSpatialUnit, EmbeddedText, EmbeddedTree, Event, Gallery, Heading, HeadingItemCategory, Identification, Image, ImageMap, ImageMapArea, Interpretation, Item, ItemCategory, ItemCategoryFromOption, ItemCategoryOption, ItemCategoryWithEmbeddedItems, ItemContainerCategory, ItemLink, ItemLinkCategory, ItemLinks, ItemPayloadKind, ItemProperty, ItemWithoutEmbeddedItems, LanguageCodes, License, Metadata, Note, Observation, Period, PeriodItemLink, Person, PersonItemLink, Property, PropertyLike, PropertyRelation, PropertyValue, PropertyValueContent, PropertyValueDataType, PropertyValueItemLink, PropertyValueQueryItem, PropertyVariable, PropertyVariableItemLink, Query, QueryGroup, QueryLeaf, QueryablePropertyValueDataType, RecursiveItemCategory, Resource, ResourceItemLink, Section, Set, SetAttributeValueQueryItem, SetBibliography, SetConcept, SetItem, SetItemCategory, SetItemLink, SetItemProperty, SetItemSimplifiedProperty, SetItemsSort, SetItemsSortDirection, SetPeriod, SetResource, SetSpatialUnit, SetTree, SimplifiedProperty, SpatialUnit, SpatialUnitItemLink, Text, TextItemLink, TopLevelItem, Tree, TreeItemCategory, TreeItemLink } from "./types/index.mjs";
+import { AnyBibliography, AnyConcept, AnyItem, AnyPeriod, AnyPerson, AnyPropertyValue, AnyPropertyVariable, AnyResource, AnySet, AnySpatialUnit, AnyText, AnyTree, BaseItem, BaseItemLink, BelongsTo, Bibliography, BibliographyEntryInfo, BibliographyItemLink, BibliographySourceDocument, Concept, ConceptItemLink, ContainedItemCategory, ContainedItemCategoryFromOption, ContainedItemCategoryOption, Context, ContextItem, ContextItemCategory, ContextNode, Coordinates, CoordinatesSource, DictionaryUnitItemLink, EmbeddedBibliography, EmbeddedConcept, EmbeddedItem, EmbeddedPeriod, EmbeddedPerson, EmbeddedPropertyValue, EmbeddedPropertyVariable, EmbeddedResource, EmbeddedSet, EmbeddedSpatialUnit, EmbeddedText, EmbeddedTree, Event, Gallery, Heading, HeadingItemCategory, Identification, Image, ImageMap, ImageMapArea, Interpretation, Item, ItemCategory, ItemCategoryFromOption, ItemCategoryOption, ItemCategoryWithEmbeddedItems, ItemContainerCategory, ItemLink, ItemLinkCategory, ItemLinks, ItemPayloadKind, ItemProperty, ItemWithoutEmbeddedItems, LanguageCodes, License, Metadata, Note, Observation, Period, PeriodItemLink, Person, PersonItemLink, Prettify, Property, PropertyLike, PropertyRelation, PropertyValue, PropertyValueContent, PropertyValueDataType, PropertyValueItemLink, PropertyValueQueryItem, PropertyVariable, PropertyVariableItemLink, Query, QueryGroup, QueryLeaf, QueryablePropertyValueDataType, RecursiveItemCategory, Resource, ResourceItemLink, Section, Set, SetAttributeValueQueryItem, SetBibliography, SetConcept, SetItem, SetItemCategory, SetItemLink, SetItemProperty, SetItemSimplifiedProperty, SetItemsSort, SetItemsSortDirection, SetPeriod, SetResource, SetSpatialUnit, SetTree, SimplifiedProperty, SpatialUnit, SpatialUnitItemLink, Text, TextItemLink, TopLevelItem, Tree, TreeItemCategory, TreeItemLink } from "./types/index.mjs";
 import { fetchGallery } from "./fetchers/gallery.mjs";
 import { fetchItemChildren } from "./fetchers/item-children.mjs";
 import { fetchItemLinks } from "./fetchers/item-links.mjs";
@@ -11,4 +11,4 @@ import { fetchWebsiteMetadata } from "./fetchers/website-metadata.mjs";
 import { fetchWebsite } from "./fetchers/website.mjs";
 import { PropertyOptions, filterProperties, getLeafPropertyValues, getPropertyByVariableLabel, getPropertyByVariableLabelAndValue, getPropertyByVariableLabelAndValueContent, getPropertyByVariableLabelAndValueContents, getPropertyByVariableLabelAndValues, getPropertyByVariableUuid, getPropertyValueByVariableLabel, getPropertyValueByVariableUuid, getPropertyValueContentByVariableLabel, getPropertyValueContentByVariableUuid, getPropertyValueContentsByVariableUuid, getPropertyValuesByVariableLabel, getPropertyValuesByVariableUuid, getUniqueProperties, getUniquePropertyVariableLabels } from "./getters.mjs";
 import { DEFAULT_PAGE_SIZE, flattenItemProperties } from "./helpers.mjs";
-export { type AccordionWebBlock, type AnyBibliography, type AnyConcept, type AnyItem, type AnyPeriod, type AnyPerson, type AnyPropertyValue, type AnyPropertyVariable, type AnyResource, type AnySet, type AnySpatialUnit, type AnyText, type AnyTree, type BaseItem, type BaseItemLink, type BelongsTo, type Bibliography, type BibliographyEntryInfo, type BibliographyItemLink, type BibliographySourceDocument, type Concept, type ConceptItemLink, type ContainedItemCategory, type ContainedItemCategoryFromOption, type ContainedItemCategoryOption, type Context, type ContextItem, type ContextItemCategory, type ContextNode, type ContextTree, type ContextTreeFilterLevel, type ContextTreeLevel, type ContextTreeLevelItem, type Coordinates, type CoordinatesSource, DEFAULT_PAGE_SIZE, type DictionaryUnitItemLink, type EmbeddedBibliography, type EmbeddedConcept, type EmbeddedItem, type EmbeddedPeriod, type EmbeddedPerson, type EmbeddedPropertyValue, type EmbeddedPropertyVariable, type EmbeddedResource, type EmbeddedSet, type EmbeddedSpatialUnit, type EmbeddedText, type EmbeddedTree, type Event, type Gallery, type Heading, type HeadingItemCategory, type Identification, type Image, type ImageMap, type ImageMapArea, type Interpretation, type Item, type ItemCategory, type ItemCategoryFromOption, type ItemCategoryOption, type ItemCategoryWithEmbeddedItems, type ItemContainerCategory, type ItemLink, type ItemLinkCategory, type ItemLinks, type ItemPayloadKind, type ItemProperty, type ItemWithoutEmbeddedItems, type LanguageCodes, type License, type Metadata, type MultilingualOptions, MultilingualString, type MultilingualStringEntries, type MultilingualStringEntry, type MultilingualStringInput, type MultilingualStringJSON, type MultilingualStringObject, type MultilingualStringText, type Note, type Observation, type Period, type PeriodItemLink, type Person, type PersonItemLink, type Property, type PropertyLike, PropertyOptions, type PropertyRelation, type PropertyValue, type PropertyValueContent, type PropertyValueDataType, type PropertyValueItemLink, type PropertyValueQueryItem, type PropertyVariable, type PropertyVariableItemLink, type Query, type QueryGroup, type QueryLeaf, type QueryablePropertyValueDataType, type RecursiveItemCategory, type Resource, type ResourceItemLink, type Scope, type Section, type Set, type SetAttributeValueQueryItem, type SetBibliography, type SetConcept, type SetItem, type SetItemCategory, type SetItemLink, type SetItemProperty, type SetItemSimplifiedProperty, type SetItemsSort, type SetItemsSortDirection, type SetPeriod, type SetResource, type SetSpatialUnit, type SetTree, type SimplifiedProperty, type SpatialUnit, type SpatialUnitItemLink, type Style, type StylesheetCategory, type StylesheetItem, type Text, type TextItemLink, type TopLevelItem, type Tree, type TreeItemCategory, type TreeItemLink, type WebAccordionItem, type WebBlock, type WebBlockByLayout, type WebBlockItem, type WebBlockLayout, type WebElement, type WebElementComponent, type WebElementComponentName, type WebElementComponentOf, type WebElementOf, type WebImage, type WebSidebar, type WebTitle, type Webpage, type Website, type WebsiteMetadata, type WebsitePropertyQuery, type WebsitePropertyQueryNode, type WebsiteSegment, type WebsiteType, defineLanguages, fetchGallery, fetchItem, fetchItemChildren, fetchItemLinks, fetchSetItems, fetchSetPropertyValues, fetchWebsite, fetchWebsiteMetadata, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByVariableLabel, getPropertyByVariableLabelAndValue, getPropertyByVariableLabelAndValueContent, getPropertyByVariableLabelAndValueContents, getPropertyByVariableLabelAndValues, getPropertyByVariableUuid, getPropertyValueByVariableLabel, getPropertyValueByVariableUuid, getPropertyValueContentByVariableLabel, getPropertyValueContentByVariableUuid, getPropertyValueContentsByVariableUuid, getPropertyValuesByVariableLabel, getPropertyValuesByVariableUuid, getUniqueProperties, getUniquePropertyVariableLabels, withLanguages };
+export { type AccordionWebBlock, type AnyBibliography, type AnyConcept, type AnyItem, type AnyPeriod, type AnyPerson, type AnyPropertyValue, type AnyPropertyVariable, type AnyResource, type AnySet, type AnySpatialUnit, type AnyText, type AnyTree, type BaseItem, type BaseItemLink, type BelongsTo, type Bibliography, type BibliographyEntryInfo, type BibliographyItemLink, type BibliographySourceDocument, type Concept, type ConceptItemLink, type ContainedItemCategory, type ContainedItemCategoryFromOption, type ContainedItemCategoryOption, type Context, type ContextItem, type ContextItemCategory, type ContextNode, type ContextTree, type ContextTreeFilterLevel, type ContextTreeLevel, type ContextTreeLevelItem, type Coordinates, type CoordinatesSource, DEFAULT_PAGE_SIZE, type DictionaryUnitItemLink, type EmbeddedBibliography, type EmbeddedConcept, type EmbeddedItem, type EmbeddedPeriod, type EmbeddedPerson, type EmbeddedPropertyValue, type EmbeddedPropertyVariable, type EmbeddedResource, type EmbeddedSet, type EmbeddedSpatialUnit, type EmbeddedText, type EmbeddedTree, type Event, type Gallery, type Heading, type HeadingItemCategory, type Identification, type Image, type ImageMap, type ImageMapArea, type Interpretation, type Item, type ItemCategory, type ItemCategoryFromOption, type ItemCategoryOption, type ItemCategoryWithEmbeddedItems, type ItemContainerCategory, type ItemLink, type ItemLinkCategory, type ItemLinks, type ItemPayloadKind, type ItemProperty, type ItemWithoutEmbeddedItems, type LanguageCodes, type License, type Metadata, type MultilingualOptions, MultilingualString, type MultilingualStringEntries, type MultilingualStringEntry, type MultilingualStringInput, type MultilingualStringJSON, type MultilingualStringObject, type MultilingualStringText, type Note, type Observation, type Period, type PeriodItemLink, type Person, type PersonItemLink, type Prettify, type Property, type PropertyLike, PropertyOptions, type PropertyRelation, type PropertyValue, type PropertyValueContent, type PropertyValueDataType, type PropertyValueItemLink, type PropertyValueQueryItem, type PropertyVariable, type PropertyVariableItemLink, type Query, type QueryGroup, type QueryLeaf, type QueryablePropertyValueDataType, type RecursiveItemCategory, type Resource, type ResourceItemLink, type Scope, type Section, type Set, type SetAttributeValueQueryItem, type SetBibliography, type SetConcept, type SetItem, type SetItemCategory, type SetItemLink, type SetItemProperty, type SetItemSimplifiedProperty, type SetItemsSort, type SetItemsSortDirection, type SetPeriod, type SetResource, type SetSpatialUnit, type SetTree, type SimplifiedProperty, type SpatialUnit, type SpatialUnitItemLink, type Style, type StylesheetCategory, type StylesheetItem, type Text, type TextItemLink, type TopLevelItem, type Tree, type TreeItemCategory, type TreeItemLink, type WebAccordionItem, type WebBlock, type WebBlockByLayout, type WebBlockItem, type WebBlockLayout, type WebElement, type WebElementComponent, type WebElementComponentName, type WebElementComponentOf, type WebElementOf, type WebImage, type WebSidebar, type WebTitle, type Webpage, type Website, type WebsiteMetadata, type WebsitePropertyQuery, type WebsitePropertyQueryNode, type WebsiteSegment, type WebsiteType, defineLanguages, fetchGallery, fetchItem, fetchItemChildren, fetchItemLinks, fetchSetItems, fetchSetPropertyValues, fetchWebsite, fetchWebsiteMetadata, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByVariableLabel, getPropertyByVariableLabelAndValue, getPropertyByVariableLabelAndValueContent, getPropertyByVariableLabelAndValueContents, getPropertyByVariableLabelAndValues, getPropertyByVariableUuid, getPropertyValueByVariableLabel, getPropertyValueByVariableUuid, getPropertyValueContentByVariableLabel, getPropertyValueContentByVariableUuid, getPropertyValueContentsByVariableUuid, getPropertyValuesByVariableLabel, getPropertyValuesByVariableUuid, getUniqueProperties, getUniquePropertyVariableLabels, withLanguages };

package/dist/parsers/website/index.mjs

@@ -384,6 +384,7 @@ function parseWebElementProperties(componentProperty, elementResource, options,
 			const filterSidebarSort = componentReader.valueOr("filter-sidebar-sort", "default");
 			const imageLayout = componentReader.valueOr("image-layout", "start");
 			const isImagePlaceholderDisplayed = componentReader.valueOr("image-placeholder-displayed", true);
+			const isInteractive = componentReader.valueOr("is-interactive", false);
 			const componentOptions = parseWebsiteOptions(elementResource.options, options);
 			properties = {
 				component: "collection",
@@ -398,8 +399,9 @@ function parseWebElementProperties(componentProperty, elementResource, options,
 				imageLayout,
 				isImagePlaceholderDisplayed,
 				expectedItemCount,
-				isUsingQueryParams,
 				isSortDisplayed,
+				isUsingQueryParams,
+				isInteractive,
 				filter: {
 					isSidebarDisplayed: isFilterSidebarDisplayed,
 					isResultsBarDisplayed: isFilterResultsBarDisplayed,
@@ -600,26 +602,37 @@ function parseWebElementProperties(componentProperty, elementResource, options,
 			}
 			if (items.length === 0) throw new Error(formatComponentError("No queries found", componentName, elementResource), { cause: componentProperty });
 			const componentOptions = parseWebsiteOptions(elementResource.options, options);
+			const collectionProperties = {};
 			const displayedProperties = componentReader.property("use-property");
-			const variant = componentReader.valueOr("variant", "slide");
-			const paginationVariant = componentReader.valueOr("pagination-variant", "default");
-			const loadingVariant = componentReader.valueOr("loading-variant", "skeleton");
-			const imageLayout = componentReader.valueOr("image-layout", "start");
+			if (displayedProperties != null) collectionProperties.displayedProperties = displayedProperties.values.filter((value) => value.uuid !== null).map((value) => ({
+				uuid: value.uuid,
+				label: value.label
+			}));
+			const overrideReader = componentReader.nestedByValue("sub-component-override", "collection");
+			const variant = overrideReader.value("variant");
+			if (variant != null) collectionProperties.variant = variant;
+			const paginationVariant = overrideReader.value("pagination-variant");
+			if (paginationVariant != null) collectionProperties.paginationVariant = paginationVariant;
+			const loadingVariant = overrideReader.value("loading-variant");
+			if (loadingVariant != null) collectionProperties.loadingVariant = loadingVariant;
+			const imageLayout = overrideReader.value("image-layout");
+			if (imageLayout != null) collectionProperties.imageLayout = imageLayout;
+			const isImagePlaceholderDisplayed = overrideReader.value("image-placeholder-displayed");
+			if (isImagePlaceholderDisplayed != null) collectionProperties.isImagePlaceholderDisplayed = isImagePlaceholderDisplayed;
+			const expectedItemCount = overrideReader.value("item-count");
+			if (expectedItemCount != null) collectionProperties.expectedItemCount = expectedItemCount;
+			const isSortDisplayed = overrideReader.value("sort-displayed");
+			if (isSortDisplayed != null) collectionProperties.isSortDisplayed = isSortDisplayed;
+			const isUsingQueryParams = overrideReader.value("is-using-query-params");
+			if (isUsingQueryParams != null) collectionProperties.isUsingQueryParams = isUsingQueryParams;
+			const isInteractive = overrideReader.value("is-interactive");
+			if (isInteractive != null) collectionProperties.isInteractive = isInteractive;
 			properties = {
 				component: "query",
 				linkUuids: setLinks.map((link) => link.uuid),
 				items,
 				options: componentOptions,
-				collectionProperties: {
-					displayedProperties: displayedProperties?.values.filter((value) => value.uuid !== null).map((value) => ({
-						uuid: value.uuid,
-						label: value.label
-					})) ?? null,
-					variant,
-					paginationVariant,
-					loadingVariant,
-					imageLayout
-				}
+				collectionProperties
 			};
 			break;
 		}

package/dist/query.mjs

@@ -227,13 +227,6 @@ function buildPropertyLabelQuery(propertyVariable) {
 		value: propertyVariable
 	});
 }
-function buildValueNotInheritedQuery() {
-	return buildNotCtsQueryExpression(buildPlainElementAttributeValueQueryExpression({
-		elementName: "value",
-		attributeName: "inherited",
-		value: "true"
-	}));
-}
 function buildValueNotIdRefQuery() {
 	return buildNotCtsQueryExpression(buildPlainElementAttributeValueQueryExpression({
 		elementName: "value",
@@ -264,6 +257,14 @@ function buildValueContentInnerQuery(params) {
 		isCaseSensitive
 	}));
 }
+function buildValueContentExactInnerQuery(params) {
+	const { language, value, isCaseSensitive } = params;
+	return buildNestedElementQuery(["content"], buildAndCtsQueryExpressionInternal([buildContentLanguageQuery(language), buildCtsElementValueQueryExpression({
+		elementName: "string",
+		value,
+		isCaseSensitive
+	})]));
+}
 function buildValueDirectTextInnerQuery(params) {
 	const { value, matchMode, isCaseSensitive } = params;
 	const directTextQuery = matchMode === "exact" ? buildCtsElementValueQueryExpression({
@@ -372,8 +373,11 @@ function buildPropertyStringQueryExpression(params) {
 	return buildPropertyTextMatchQueryExpression({
 		propertyVariable,
 		propertyRelation,
-		valueFilters: [buildValueNotInheritedQuery()],
-		contentQueryExpression: buildValueContentInnerQuery({
+		contentQueryExpression: matchMode === "exact" ? buildValueContentExactInnerQuery({
+			language,
+			value,
+			isCaseSensitive
+		}) : buildValueContentInnerQuery({
 			language,
 			value,
 			matchMode,

package/dist/types/index.d.mts

@@ -868,4 +868,4 @@ type QueryGroup = {
  */
 type Query = QueryLeaf | QueryGroup;
 //#endregion
-export { AnyBibliography, AnyConcept, AnyItem, AnyPeriod, AnyPerson, AnyPropertyValue, AnyPropertyVariable, AnyResource, AnySet, AnySpatialUnit, AnyText, AnyTree, BaseItem, BaseItemLink, BelongsTo, Bibliography, BibliographyEntryInfo, BibliographyItemLink, BibliographySourceDocument, Concept, ConceptItemLink, ContainedItemCategory, ContainedItemCategoryFromOption, ContainedItemCategoryOption, Context, ContextItem, ContextItemCategory, ContextNode, Coordinates, CoordinatesSource, DictionaryUnitItemLink, EmbeddedBibliography, EmbeddedConcept, EmbeddedItem, EmbeddedPeriod, EmbeddedPerson, EmbeddedPropertyValue, EmbeddedPropertyVariable, EmbeddedResource, EmbeddedSet, EmbeddedSpatialUnit, EmbeddedText, EmbeddedTree, Event, Gallery, Heading, HeadingItemCategory, Identification, Image, ImageMap, ImageMapArea, Interpretation, Item, ItemCategory, ItemCategoryFromOption, ItemCategoryOption, ItemCategoryWithEmbeddedItems, ItemContainerCategory, ItemLink, ItemLinkCategory, ItemLinks, ItemPayloadKind, ItemProperty, ItemWithoutEmbeddedItems, LanguageCodes, License, Metadata, Note, Observation, Period, PeriodItemLink, Person, PersonItemLink, Property, PropertyLike, PropertyRelation, PropertyValue, PropertyValueContent, PropertyValueDataType, PropertyValueItemLink, PropertyValueQueryItem, PropertyVariable, PropertyVariableItemLink, Query, QueryGroup, QueryLeaf, QueryablePropertyValueDataType, RecursiveItemCategory, Resource, ResourceItemLink, Section, Set, SetAttributeValueQueryItem, SetBibliography, SetConcept, SetItem, SetItemCategory, SetItemLink, SetItemProperty, SetItemSimplifiedProperty, SetItemsSort, SetItemsSortDirection, SetPeriod, SetResource, SetSpatialUnit, SetTree, SimplifiedProperty, SpatialUnit, SpatialUnitItemLink, Text, TextItemLink, TopLevelItem, Tree, TreeItemCategory, TreeItemLink };
+export { AnyBibliography, AnyConcept, AnyItem, AnyPeriod, AnyPerson, AnyPropertyValue, AnyPropertyVariable, AnyResource, AnySet, AnySpatialUnit, AnyText, AnyTree, BaseItem, BaseItemLink, BelongsTo, Bibliography, BibliographyEntryInfo, BibliographyItemLink, BibliographySourceDocument, Concept, ConceptItemLink, ContainedItemCategory, ContainedItemCategoryFromOption, ContainedItemCategoryOption, Context, ContextItem, ContextItemCategory, ContextNode, Coordinates, CoordinatesSource, DictionaryUnitItemLink, EmbeddedBibliography, EmbeddedConcept, EmbeddedItem, EmbeddedPeriod, EmbeddedPerson, EmbeddedPropertyValue, EmbeddedPropertyVariable, EmbeddedResource, EmbeddedSet, EmbeddedSpatialUnit, EmbeddedText, EmbeddedTree, Event, Gallery, Heading, HeadingItemCategory, Identification, Image, ImageMap, ImageMapArea, Interpretation, Item, ItemCategory, ItemCategoryFromOption, ItemCategoryOption, ItemCategoryWithEmbeddedItems, ItemContainerCategory, ItemLink, ItemLinkCategory, ItemLinks, ItemPayloadKind, ItemProperty, ItemWithoutEmbeddedItems, LanguageCodes, License, Metadata, Note, Observation, Period, PeriodItemLink, Person, PersonItemLink, Prettify, Property, PropertyLike, PropertyRelation, PropertyValue, PropertyValueContent, PropertyValueDataType, PropertyValueItemLink, PropertyValueQueryItem, PropertyVariable, PropertyVariableItemLink, Query, QueryGroup, QueryLeaf, QueryablePropertyValueDataType, RecursiveItemCategory, Resource, ResourceItemLink, Section, Set, SetAttributeValueQueryItem, SetBibliography, SetConcept, SetItem, SetItemCategory, SetItemLink, SetItemProperty, SetItemSimplifiedProperty, SetItemsSort, SetItemsSortDirection, SetPeriod, SetResource, SetSpatialUnit, SetTree, SimplifiedProperty, SpatialUnit, SpatialUnitItemLink, Text, TextItemLink, TopLevelItem, Tree, TreeItemCategory, TreeItemLink };

package/dist/types/website.d.mts

@@ -1,5 +1,5 @@
 import { MultilingualString } from "../parsers/multilingual.mjs";
-import { Bibliography, Identification, ItemCategory, LanguageCodes, License, Metadata, Person, QueryablePropertyValueDataType } from "./index.mjs";
+import { Bibliography, Identification, ItemCategory, LanguageCodes, License, Metadata, Person, Prettify, QueryablePropertyValueDataType } from "./index.mjs";
 
 //#region src/types/website.d.ts
 /**
@@ -305,6 +305,7 @@ type WebElementComponent<T extends LanguageCodes = LanguageCodes> = {
   expectedItemCount: number | null;
   isSortDisplayed: boolean;
   isUsingQueryParams: boolean;
+  isInteractive: boolean;
   filter: {
     isSidebarDisplayed: boolean;
     isResultsBarDisplayed: boolean;
@@ -385,23 +386,9 @@ type WebElementComponent<T extends LanguageCodes = LanguageCodes> = {
       title: MultilingualString<T> | null;
     };
   };
-  collectionProperties: {
-    displayedProperties: Extract<WebElementComponent<T>, {
-      component: "collection";
-    }>["displayedProperties"];
-    variant: Extract<WebElementComponent<T>, {
-      component: "collection";
-    }>["variant"];
-    paginationVariant: Extract<WebElementComponent<T>, {
-      component: "collection";
-    }>["paginationVariant"];
-    loadingVariant: Extract<WebElementComponent<T>, {
-      component: "collection";
-    }>["loadingVariant"];
-    imageLayout: Extract<WebElementComponent<T>, {
-      component: "collection";
-    }>["imageLayout"];
-  };
+  collectionProperties: Prettify<Partial<Omit<Extract<WebElementComponent<T>, {
+    component: "collection";
+  }>, "component" | "linkUuids" | "options">>>;
 } | {
   component: "search-bar";
   queryVariant: "submit" | "change";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "1.0.47",
+  "version": "1.0.49",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -44,28 +44,6 @@
   "files": [
     "dist"
   ],
-  "changelogithub": {
-    "types": {
-      "feat": {
-        "title": "🚀 Features"
-      },
-      "fix": {
-        "title": "🐞 Bug Fixes"
-      },
-      "refactor": {
-        "title": "🔧 Refactors"
-      },
-      "test": {
-        "title": "🧪 Tests"
-      },
-      "docs": {
-        "title": "📝 Documentation"
-      },
-      "chore": {
-        "title": "🧹 Chores"
-      }
-    }
-  },
   "dependencies": {
     "date-fns": "^4.4.0",
     "fast-equals": "^6.0.0",
@@ -74,7 +52,7 @@
   },
   "devDependencies": {
     "@antfu/eslint-config": "^9.0.0",
-    "@types/node": "^24.13.1",
+    "@types/node": "^24.13.2",
     "bumpp": "^11.1.0",
     "eslint": "^10.4.1",
     "knip": "^6.16.1",
@@ -86,8 +64,8 @@
   "scripts": {
     "dev": "tsdown src/index.ts --watch",
     "build": "tsdown",
-    "lint": "knip; eslint .",
-    "lint:fix": "knip --fix; eslint . --fix",
+    "lint": "knip; eslint --concurrency auto .",
+    "lint:fix": "knip --fix; eslint --concurrency auto --fix .",
     "format": "oxfmt --check",
     "format:fix": "oxfmt",
     "check-types": "tsc --noEmit",