ochre-sdk 1.0.76 → 1.0.78

package/dist/constants.d.mts

@@ -1,16 +1,15 @@
 import { X2jOptions } from "fast-xml-parser";
 //#region src/constants.d.ts
-declare const XML_ARRAY_TAGS: ReadonlyArray<string>;
-declare const XML_PARSER_OPTIONS: X2jOptions;
-declare const DEFAULT_LANGUAGES: readonly ["eng"];
-declare const BELONGS_TO_COLLECTION_UUID = "30054cb2-909a-4f34-8db9-8fe7369d691d";
-declare const PRESENTATION_ITEM_UUID = "f1c131b6-1498-48a4-95bf-a9edae9fd518";
-declare const TEXT_ANNOTATION_UUID = "b9ca2732-78f4-416e-b77f-dae7647e68a9";
-declare const TEXT_ANNOTATION_HOVER_CARD_UUID = "c7f6a08a-f07b-49b6-bcb1-af485da3c58f";
-declare const TEXT_ANNOTATION_ITEM_PAGE_VARIANT_UUID = "bf4476ab-6bc8-40d0-a001-1446213c72ce";
-declare const TEXT_ANNOTATION_ENTRY_PAGE_VARIANT_UUID = "9d52db95-a9cf-45f7-a0bf-fc9ba9f0aae0";
-declare const TEXT_ANNOTATION_TEXT_STYLING_UUID = "3e6f86ab-df81-45ae-8257-e2867357df56";
-declare const TEXT_ANNOTATION_TEXT_STYLING_VARIANT_UUID = "e1647bef-d801-4100-bdde-d081c422f763";
-declare const TEXT_ANNOTATION_TEXT_STYLING_HEADING_LEVEL_UUID = "d4266f0b-3f8d-4b32-8c15-4b229c8bb11e";
-//#endregion
-export { BELONGS_TO_COLLECTION_UUID, DEFAULT_LANGUAGES, PRESENTATION_ITEM_UUID, TEXT_ANNOTATION_ENTRY_PAGE_VARIANT_UUID, TEXT_ANNOTATION_HOVER_CARD_UUID, TEXT_ANNOTATION_ITEM_PAGE_VARIANT_UUID, TEXT_ANNOTATION_TEXT_STYLING_HEADING_LEVEL_UUID, TEXT_ANNOTATION_TEXT_STYLING_UUID, TEXT_ANNOTATION_TEXT_STYLING_VARIANT_UUID, TEXT_ANNOTATION_UUID, XML_ARRAY_TAGS, XML_PARSER_OPTIONS };
+export declare const XML_ARRAY_TAGS: ReadonlyArray<string>;
+export declare const XML_PARSER_OPTIONS: X2jOptions;
+export declare const DEFAULT_LANGUAGES: readonly ["eng"];
+export declare const BELONGS_TO_COLLECTION_UUID = "30054cb2-909a-4f34-8db9-8fe7369d691d";
+export declare const PRESENTATION_ITEM_UUID = "f1c131b6-1498-48a4-95bf-a9edae9fd518";
+export declare const TEXT_ANNOTATION_UUID = "b9ca2732-78f4-416e-b77f-dae7647e68a9";
+export declare const TEXT_ANNOTATION_HOVER_CARD_UUID = "c7f6a08a-f07b-49b6-bcb1-af485da3c58f";
+export declare const TEXT_ANNOTATION_ITEM_PAGE_VARIANT_UUID = "bf4476ab-6bc8-40d0-a001-1446213c72ce";
+export declare const TEXT_ANNOTATION_ENTRY_PAGE_VARIANT_UUID = "9d52db95-a9cf-45f7-a0bf-fc9ba9f0aae0";
+export declare const TEXT_ANNOTATION_TEXT_STYLING_UUID = "3e6f86ab-df81-45ae-8257-e2867357df56";
+export declare const TEXT_ANNOTATION_TEXT_STYLING_VARIANT_UUID = "e1647bef-d801-4100-bdde-d081c422f763";
+export declare const TEXT_ANNOTATION_TEXT_STYLING_HEADING_LEVEL_UUID = "d4266f0b-3f8d-4b32-8c15-4b229c8bb11e";
+//#endregion

package/dist/fetchers/gallery.d.mts

@@ -14,7 +14,7 @@ import { FetchBaseOptions, FetchLanguages } from "../parsers/helpers.mjs";
  * @param options.fetch - The fetch function to use
  * @returns The parsed gallery or an error message if the fetch/parse fails
  */
-declare function fetchGallery<const TLanguages extends ReadonlyArray<string> | undefined = undefined>(parameters: {
+export declare function fetchGallery<const TLanguages extends ReadonlyArray<string> | undefined = undefined>(parameters: {
   uuid: string;
   filter?: string;
   page: number;
@@ -28,5 +28,4 @@ declare function fetchGallery<const TLanguages extends ReadonlyArray<string> | u
   error: string;
   detailedError: string;
 }>;
-//#endregion
-export { fetchGallery };
+//#endregion

package/dist/fetchers/gallery.mjs

@@ -8,7 +8,8 @@ import * as v from "valibot";
 import { XMLParser } from "fast-xml-parser";
 //#region src/fetchers/gallery.ts
 function parseLanguages(languages) {
-	return Array.from(languages, (language) => v.parse(iso639_3Schema, language));
+	for (const language of languages) v.parse(iso639_3Schema, language);
+	return languages;
 }
 function isRecord(value) {
 	return typeof value === "object" && value !== null;

package/dist/fetchers/item-children.d.mts

@@ -24,13 +24,12 @@ type ItemChildrenPayloadKind<U extends ItemCategory> = U extends "tree" | "set"
  * @param options.fetch - Custom fetch function to use instead of the default fetch
  * @returns An object containing parsed child items
  */
-declare function fetchItemChildren<const TContainedItemCategory extends ContainedItemCategoryOption<ItemContainerCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options?: FetchBaseOptions<TLanguages> & {
+export declare function fetchItemChildren<const TContainedItemCategory extends ContainedItemCategoryOption<ItemContainerCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options?: FetchBaseOptions<TLanguages> & {
   category?: undefined;
   containedItemCategory?: TContainedItemCategory;
 }): FetchItemChildrenResult<Array<Item<ItemCategory, ContainedItemCategoryFromOption<ItemCategory, TContainedItemCategory>, FetchLanguages<TLanguages>, "embedded" | "standaloneChild">>>;
-declare function fetchItemChildren<const TCategory extends ItemCategoryOption, const TChildCategory extends ItemCategory = ItemChildCategory<ItemCategoryFromOption<TCategory>>, const TContainedItemCategory extends ContainedItemCategoryOption<TChildCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchBaseOptions<TLanguages> & {
+export declare function fetchItemChildren<const TCategory extends ItemCategoryOption, const TChildCategory extends ItemCategory = ItemChildCategory<ItemCategoryFromOption<TCategory>>, const TContainedItemCategory extends ContainedItemCategoryOption<TChildCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchBaseOptions<TLanguages> & {
   category: TCategory;
   containedItemCategory?: TContainedItemCategory;
 }): FetchItemChildrenResult<Array<Item<TChildCategory, ContainedItemCategoryFromOption<TChildCategory, TContainedItemCategory>, FetchLanguages<TLanguages>, ItemChildrenPayloadKind<ItemCategoryFromOption<TCategory>>>>>;
-//#endregion
-export { fetchItemChildren };
+//#endregion

package/dist/fetchers/item-children.mjs

@@ -21,7 +21,8 @@ const ITEM_COLLECTION_CATEGORIES = [
 	"set"
 ];
 function parseLanguages(languages) {
-	return Array.from(languages, (language) => v.parse(iso639_3Schema, language));
+	for (const language of languages) v.parse(iso639_3Schema, language);
+	return languages;
 }
 function isRecord(value) {
 	return typeof value === "object" && value !== null;

package/dist/fetchers/item-links.d.mts

@@ -11,7 +11,7 @@ import { FetchBaseOptions, FetchLanguages } from "../parsers/helpers.mjs";
  * @param options.fetch - Custom fetch function to use instead of the default fetch
  * @returns An object containing parsed linked items
  */
-declare function fetchItemLinks<const TContainedItemCategory extends ContainedItemCategoryOption<ItemContainerCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options?: FetchBaseOptions<TLanguages> & {
+export declare function fetchItemLinks<const TContainedItemCategory extends ContainedItemCategoryOption<ItemContainerCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options?: FetchBaseOptions<TLanguages> & {
   containedItemCategory?: TContainedItemCategory;
 }): Promise<{
   items: Array<Item<ItemCategory, ContainedItemCategoryFromOption<ItemCategory, TContainedItemCategory>, FetchLanguages<TLanguages>, "embedded">>;
@@ -22,5 +22,4 @@ declare function fetchItemLinks<const TContainedItemCategory extends ContainedIt
   error: string;
   detailedError: string;
 }>;
-//#endregion
-export { fetchItemLinks };
+//#endregion

package/dist/fetchers/item-links.mjs

@@ -8,7 +8,8 @@ import * as v from "valibot";
 import { XMLParser } from "fast-xml-parser";
 //#region src/fetchers/item-links.ts
 function parseLanguages(languages) {
-	return Array.from(languages, (language) => v.parse(iso639_3Schema, language));
+	for (const language of languages) v.parse(iso639_3Schema, language);
+	return languages;
 }
 function isRecord(value) {
 	return typeof value === "object" && value !== null;

package/dist/fetchers/item-ocr-data.d.mts

@@ -23,7 +23,7 @@ import { OcrString } from "../types/index.mjs";
  * @returns The matching OCR strings, an empty array when the item has no OCR
  * layer or nothing matches, and a null output on fetch/parse errors
  */
-declare function fetchItemOcrData(uuid: string, value: string, options?: {
+export declare function fetchItemOcrData(uuid: string, value: string, options?: {
   matchMode?: "includes" | "exact";
   isCaseSensitive?: boolean;
   fetch?: (input: string | URL | globalThis.Request, init?: RequestInit) => Promise<Response>;
@@ -36,5 +36,4 @@ declare function fetchItemOcrData(uuid: string, value: string, options?: {
   error: string;
   detailedError: string;
 }>;
-//#endregion
-export { fetchItemOcrData };
+//#endregion

package/dist/fetchers/item.d.mts

@@ -19,12 +19,12 @@ type FetchItemResult<TItem> = Promise<{
  * Use this helper when the language set is stored separately:
  * `const languages = defineLanguages("eng", "spa")`.
  */
-declare function defineLanguages<const TLanguages extends ReadonlyArray<string>>(...languages: TLanguages): TLanguages;
+export declare function defineLanguages<const TLanguages extends ReadonlyArray<string>>(...languages: TLanguages): TLanguages;
 /**
  * @deprecated Pass inline language arrays directly to fetchItem, or use
  * defineLanguages("eng", "spa") for reusable language tuples.
  */
-declare function withLanguages<const TLanguages extends ReadonlyArray<string>>(languages: TLanguages): TLanguages;
+export declare function withLanguages<const TLanguages extends ReadonlyArray<string>>(languages: TLanguages): TLanguages;
 /**
  * Fetches an OCHRE item by UUID from the OCHRE API
  *
@@ -39,25 +39,24 @@ declare function withLanguages<const TLanguages extends ReadonlyArray<string>>(l
  * @param options.fetch - Custom fetch function to use instead of the default fetch
  * @returns An object containing the parsed item
  */
-declare function fetchItem<const TContainedItemCategory extends ContainedItemCategoryOption<ItemContainerCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options?: FetchBaseOptions<TLanguages> & {
+export declare function fetchItem<const TContainedItemCategory extends ContainedItemCategoryOption<ItemContainerCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options?: FetchBaseOptions<TLanguages> & {
   category?: undefined;
   containedItemCategory?: TContainedItemCategory;
   shouldOmitEmbeddedItems?: false;
 }): FetchItemResult<Item<ItemCategory, ContainedItemCategoryFromOption<ItemCategory, TContainedItemCategory>, FetchLanguages<TLanguages>>>;
-declare function fetchItem<const TContainedItemCategory extends ContainedItemCategoryOption<ItemContainerCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchBaseOptions<TLanguages> & {
+export declare function fetchItem<const TContainedItemCategory extends ContainedItemCategoryOption<ItemContainerCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchBaseOptions<TLanguages> & {
   category?: undefined;
   containedItemCategory?: TContainedItemCategory;
   shouldOmitEmbeddedItems?: true;
 }): FetchItemResult<ItemWithoutEmbeddedItems<ItemCategoryWithEmbeddedItems, ContainedItemCategoryFromOption<ItemContainerCategory, TContainedItemCategory>, FetchLanguages<TLanguages>> | Item<Exclude<ItemCategory, ItemCategoryWithEmbeddedItems>, never, FetchLanguages<TLanguages>>>;
-declare function fetchItem<const TCategory extends ItemCategoryOption, const TContainedItemCategory extends ContainedItemCategoryOption<ItemCategoryFromOption<TCategory>> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchBaseOptions<TLanguages> & {
+export declare function fetchItem<const TCategory extends ItemCategoryOption, const TContainedItemCategory extends ContainedItemCategoryOption<ItemCategoryFromOption<TCategory>> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchBaseOptions<TLanguages> & {
   category: TCategory;
   containedItemCategory?: TContainedItemCategory;
   shouldOmitEmbeddedItems?: false;
 }): FetchItemResult<Item<ItemCategoryFromOption<TCategory>, ContainedItemCategoryFromOption<ItemCategoryFromOption<TCategory>, TContainedItemCategory>, FetchLanguages<TLanguages>>>;
-declare function fetchItem<const TCategory extends ItemCategoryOption, const TContainedItemCategory extends ContainedItemCategoryOption<Extract<ItemCategoryFromOption<TCategory>, ItemCategoryWithEmbeddedItems>> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchBaseOptions<TLanguages> & {
+export declare function fetchItem<const TCategory extends ItemCategoryOption, const TContainedItemCategory extends ContainedItemCategoryOption<Extract<ItemCategoryFromOption<TCategory>, ItemCategoryWithEmbeddedItems>> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchBaseOptions<TLanguages> & {
   category: TCategory;
   containedItemCategory?: TContainedItemCategory;
   shouldOmitEmbeddedItems: true;
 }): FetchItemResult<ItemWithoutEmbeddedItems<Extract<ItemCategoryFromOption<TCategory>, ItemCategoryWithEmbeddedItems>, ContainedItemCategoryFromOption<Extract<ItemCategoryFromOption<TCategory>, ItemCategoryWithEmbeddedItems>, TContainedItemCategory>, FetchLanguages<TLanguages>> | Item<Exclude<ItemCategoryFromOption<TCategory>, ItemCategoryWithEmbeddedItems>, never, FetchLanguages<TLanguages>>>;
-//#endregion
-export { defineLanguages, fetchItem, withLanguages };
+//#endregion

package/dist/fetchers/item.mjs

@@ -85,7 +85,8 @@ function omitEmbeddedItems(item) {
 * Validate language codes while preserving literal tuple inference.
 */
 function parseLanguages(languages) {
-	return Array.from(languages, (language) => v.parse(iso639_3Schema, language));
+	for (const language of languages) v.parse(iso639_3Schema, language);
+	return languages;
 }
 /**
 * Defines a reusable languages tuple with validation and literal type inference.

package/dist/fetchers/set/items.d.mts

@@ -17,7 +17,7 @@ type FetchSetItemsCategory<TContainedItemCategories extends ReadonlyArray<SetIte
  * @param options.fetch - The fetch function to use
  * @returns The parsed Set items or null if the fetch/parse fails
  */
-declare function fetchSetItems<const TContainedItemCategories extends ReadonlyArray<SetItemCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(parameters: {
+export declare function fetchSetItems<const TContainedItemCategories extends ReadonlyArray<SetItemCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(parameters: {
   setScopeUuids: Array<string>;
   queries?: Query | null;
   sort?: SetItemsSort;
@@ -38,5 +38,4 @@ declare function fetchSetItems<const TContainedItemCategories extends ReadonlyAr
   error: string;
   detailedError: string;
 }>;
-//#endregion
-export { fetchSetItems };
+//#endregion

package/dist/fetchers/set/items.mjs

@@ -9,7 +9,8 @@ import * as v from "valibot";
 import { XMLParser } from "fast-xml-parser";
 //#region src/fetchers/set/items.ts
 function parseLanguages(languages) {
-	return Array.from(languages, (language) => v.parse(iso639_3Schema, language));
+	for (const language of languages) v.parse(iso639_3Schema, language);
+	return languages;
 }
 function isRecord(value) {
 	return typeof value === "object" && value !== null;

package/dist/fetchers/set/property-values.d.mts

@@ -15,7 +15,7 @@ import { PropertyValueQueryItem, Query, SetAttributeValueQueryItem } from "../..
  * @returns Parsed Set property values and requested attribute values.
  * Returns empty arrays/objects when no matches are found, and null outputs on fetch/parse errors.
  */
-declare function fetchSetPropertyValues(parameters: {
+export declare function fetchSetPropertyValues(parameters: {
   setScopeUuids: Array<string>;
   queries?: Query | null;
   attributes?: {
@@ -41,5 +41,4 @@ declare function fetchSetPropertyValues(parameters: {
   error: string;
   detailedError: string;
 }>;
-//#endregion
-export { fetchSetPropertyValues };
+//#endregion

package/dist/fetchers/set/property-values.mjs

@@ -93,8 +93,7 @@ function getPropertyFacetSelectorsFromQueries(queries) {
 function getItemFilterQueriesFromPropertyValueQueries(queries) {
 	if (queries == null) return null;
 	if ("target" in queries) {
-		if (queries.target !== "property") return queries;
-		if (queries.dataType === "date" || queries.dataType === "dateTime") return queries;
+		if (queries.target !== "property" || queries.dataType === "date" || queries.dataType === "dateTime") return queries;
 		return "value" in queries && queries.value != null ? queries : null;
 	}
 	const filteredChildren = [];
@@ -103,8 +102,7 @@ function getItemFilterQueriesFromPropertyValueQueries(queries) {
 		const filteredChildQuery = getItemFilterQueriesFromPropertyValueQueries(childQuery);
 		if (filteredChildQuery != null) filteredChildren.push(filteredChildQuery);
 	}
-	if (filteredChildren.length === 0) return null;
-	if (filteredChildren.length === 1) return filteredChildren[0] ?? null;
+	if (filteredChildren.length <= 1) return filteredChildren[0] ?? null;
 	return "and" in queries ? { and: filteredChildren } : { or: filteredChildren };
 }
 /**
@@ -411,6 +409,55 @@ ${queryBlocks.join("\n\n")}
 return (${returnedSequences.join(", ")})
 }</ochre>`;
 }
+function collectPropertyValues(parsedPropertyValues) {
+	const propertyValuesByPropertyVariableUuid = {};
+	const flattenedPropertyValuesByKey = /* @__PURE__ */ new Map();
+	for (const propertyValue of parsedPropertyValues) {
+		if (propertyValue.content == null) continue;
+		const propertyValueItem = {
+			uuid: propertyValue.uuid,
+			count: propertyValue.count,
+			dataType: propertyValue.dataType,
+			content: propertyValue.content,
+			label: propertyValue.label
+		};
+		const globalPropertyValueItem = {
+			uuid: propertyValue.uuid,
+			count: propertyValue.globalCount ?? propertyValue.count,
+			dataType: propertyValue.dataType,
+			content: propertyValue.content,
+			label: propertyValue.label
+		};
+		const globalPropertyValueKey = getPropertyValueKey({
+			dataType: globalPropertyValueItem.dataType,
+			content: propertyValue.content
+		});
+		const existingGlobalPropertyValue = flattenedPropertyValuesByKey.get(globalPropertyValueKey);
+		if (existingGlobalPropertyValue == null) flattenedPropertyValuesByKey.set(globalPropertyValueKey, globalPropertyValueItem);
+		else if (existingGlobalPropertyValue.label == null && globalPropertyValueItem.label != null) existingGlobalPropertyValue.label = globalPropertyValueItem.label;
+		if (propertyValue.scope === "global") continue;
+		if (propertyValue.variableUuid != null) (propertyValuesByPropertyVariableUuid[propertyValue.variableUuid] ??= []).push(propertyValueItem);
+	}
+	for (const [propertyVariableUuid, values] of Object.entries(propertyValuesByPropertyVariableUuid)) propertyValuesByPropertyVariableUuid[propertyVariableUuid] = sortPropertyValues(values);
+	return {
+		propertyValuesByPropertyVariableUuid,
+		flattenedPropertyValues: sortPropertyValues(flattenedPropertyValuesByKey.values().toArray())
+	};
+}
+function collectAttributeValues(parsedAttributeValues) {
+	const attributeValuesByType = {
+		bibliographies: [],
+		periods: []
+	};
+	for (const attributeValue of parsedAttributeValues) {
+		if (attributeValue.content == null || attributeValue.content === "") continue;
+		attributeValuesByType[attributeValue.attributeType].push({
+			count: attributeValue.count,
+			content: attributeValue.content
+		});
+	}
+	return attributeValuesByType;
+}
 /**
 * Fetches and parses Set property values from the OCHRE API
 *
@@ -458,52 +505,12 @@ async function fetchSetPropertyValues(parameters, options) {
 		const data = new XMLParser(XML_PARSER_OPTIONS).parse(dataRaw);
 		const { success, issues, output } = v.safeParse(responseSchema, data);
 		if (!success) throw createSchemaValidationError("Failed to parse OCHRE Set property values", issues);
-		const parsedPropertyValues = [];
-		const parsedAttributeValues = [];
-		if (output.result.ochre.propertyValue != null) parsedPropertyValues.push(...Array.isArray(output.result.ochre.propertyValue) ? output.result.ochre.propertyValue : [output.result.ochre.propertyValue]);
-		if (output.result.ochre.attributeValue != null) parsedAttributeValues.push(...Array.isArray(output.result.ochre.attributeValue) ? output.result.ochre.attributeValue : [output.result.ochre.attributeValue]);
-		const propertyValuesByPropertyVariableUuid = {};
-		const flattenedPropertyValuesByKey = /* @__PURE__ */ new Map();
-		for (const propertyValue of parsedPropertyValues) {
-			if (propertyValue.content == null) continue;
-			const propertyValueItem = {
-				uuid: propertyValue.uuid,
-				count: propertyValue.count,
-				dataType: propertyValue.dataType,
-				content: propertyValue.content,
-				label: propertyValue.label
-			};
-			const globalPropertyValueItem = {
-				uuid: propertyValue.uuid,
-				count: propertyValue.globalCount ?? propertyValue.count,
-				dataType: propertyValue.dataType,
-				content: propertyValue.content,
-				label: propertyValue.label
-			};
-			const globalPropertyValueKey = getPropertyValueKey({
-				dataType: globalPropertyValueItem.dataType,
-				content: propertyValue.content
-			});
-			const existingGlobalPropertyValue = flattenedPropertyValuesByKey.get(globalPropertyValueKey);
-			if (existingGlobalPropertyValue == null) flattenedPropertyValuesByKey.set(globalPropertyValueKey, globalPropertyValueItem);
-			else if (existingGlobalPropertyValue.label == null && globalPropertyValueItem.label != null) existingGlobalPropertyValue.label = globalPropertyValueItem.label;
-			if (propertyValue.scope === "global") continue;
-			if (propertyValue.variableUuid != null) (propertyValuesByPropertyVariableUuid[propertyValue.variableUuid] ??= []).push(propertyValueItem);
-		}
-		for (const [propertyVariableUuid, values] of Object.entries(propertyValuesByPropertyVariableUuid)) propertyValuesByPropertyVariableUuid[propertyVariableUuid] = sortPropertyValues(values);
-		const attributeValuesByType = {
-			bibliographies: [],
-			periods: []
-		};
-		for (const attributeValue of parsedAttributeValues) {
-			if (attributeValue.content == null || attributeValue.content === "") continue;
-			attributeValuesByType[attributeValue.attributeType].push({
-				count: attributeValue.count,
-				content: attributeValue.content
-			});
-		}
+		const parsedPropertyValues = [output.result.ochre.propertyValue ?? []].flat();
+		const parsedAttributeValues = [output.result.ochre.attributeValue ?? []].flat();
+		const { propertyValuesByPropertyVariableUuid, flattenedPropertyValues } = collectPropertyValues(parsedPropertyValues);
+		const attributeValuesByType = collectAttributeValues(parsedAttributeValues);
 		return {
-			propertyValues: sortPropertyValues(flattenedPropertyValuesByKey.values().toArray()),
+			propertyValues: flattenedPropertyValues,
 			propertyValuesByPropertyVariableUuid,
 			attributeValues: {
 				bibliographies: attributes.bibliographies ? sortAttributeValues(attributeValuesByType.bibliographies) : null,

package/dist/fetchers/website-metadata.d.mts

@@ -5,7 +5,7 @@ import { FetchBaseOptions, FetchLanguages } from "../parsers/helpers.mjs";
  * Fetches and parses a page-scoped website metadata projection from the OCHRE
  * API.
  */
-declare function fetchWebsiteMetadata<const TLanguages extends ReadonlyArray<string> | undefined = undefined>(abbreviation: string, options: FetchBaseOptions<TLanguages> & {
+export declare function fetchWebsiteMetadata<const TLanguages extends ReadonlyArray<string> | undefined = undefined>(abbreviation: string, options: FetchBaseOptions<TLanguages> & {
   slug: string;
 }): Promise<{
   websiteMetadata: WebsiteMetadata<FetchLanguages<TLanguages>>;
@@ -16,5 +16,4 @@ declare function fetchWebsiteMetadata<const TLanguages extends ReadonlyArray<str
   error: string;
   detailedError: string;
 }>;
-//#endregion
-export { fetchWebsiteMetadata };
+//#endregion

package/dist/fetchers/website.d.mts

@@ -11,7 +11,7 @@ import { FetchFunction } from "../parsers/helpers.mjs";
  * `username` and `password` for OCHRE accounts) to authenticate and receive the full
  * website data.
  */
-declare function fetchWebsite<const T extends LanguageCodes = LanguageCodes>(abbreviation: string, options?: {
+export declare function fetchWebsite<const T extends LanguageCodes = LanguageCodes>(abbreviation: string, options?: {
   fetch?: FetchFunction;
   languages?: T;
   credentials?: string | {
@@ -34,5 +34,4 @@ declare function fetchWebsite<const T extends LanguageCodes = LanguageCodes>(abb
   error: string;
   detailedError: string;
 }>;
-//#endregion
-export { fetchWebsite };
+//#endregion