ochre-sdk 1.0.16 → 1.0.18

package/dist/fetchers/gallery.d.mts

@@ -1,12 +1,7 @@
 import { Gallery } from "../types/index.mjs";
+import { FetchBaseOptions, FetchLanguages } from "../parsers/helpers.mjs";
 
 //#region src/fetchers/gallery.d.ts
-type FetchFunction = (input: string | URL | globalThis.Request, init?: RequestInit) => Promise<Response>;
-type FetchGalleryBaseOptions<TLanguages extends ReadonlyArray<string> | undefined = undefined> = {
-  languages?: TLanguages;
-  fetch?: FetchFunction;
-};
-type FetchGalleryLanguages<TLanguages extends ReadonlyArray<string> | undefined> = TLanguages extends readonly [] ? ReadonlyArray<string> : TLanguages extends ReadonlyArray<string> ? TLanguages : ReadonlyArray<string>;
 /**
  * Fetches and parses a gallery from the OCHRE API
  *
@@ -25,8 +20,8 @@ declare function fetchGallery<const TLanguages extends ReadonlyArray<string> | u
   filter?: string;
   page: number;
   perPage: number;
-}, options?: FetchGalleryBaseOptions<TLanguages>): Promise<{
-  gallery: Gallery<FetchGalleryLanguages<TLanguages>>;
+}, options?: FetchBaseOptions<TLanguages>): Promise<{
+  gallery: Gallery<FetchLanguages<TLanguages>>;
   error: null;
   detailedError: null;
 } | {

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

@@ -1,12 +1,7 @@
 import { ContainedItemCategoryFromOption, ContainedItemCategoryOption, Item, ItemCategory, ItemContainerCategory } from "../types/index.mjs";
+import { FetchBaseOptions, FetchLanguages } from "../parsers/helpers.mjs";
 
 //#region src/fetchers/item-links.d.ts
-type FetchFunction = (input: string | URL | globalThis.Request, init?: RequestInit) => Promise<Response>;
-type FetchItemLinksBaseOptions<TLanguages extends ReadonlyArray<string> | undefined = undefined> = {
-  languages?: TLanguages;
-  fetch?: FetchFunction;
-};
-type FetchItemLinksLanguages<TLanguages extends ReadonlyArray<string> | undefined> = TLanguages extends readonly [] ? ReadonlyArray<string> : TLanguages extends ReadonlyArray<string> ? TLanguages : ReadonlyArray<string>;
 /**
  * Fetches linked OCHRE items by source-item UUID.
  *
@@ -17,10 +12,10 @@ type FetchItemLinksLanguages<TLanguages extends ReadonlyArray<string> | undefine
  * @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?: FetchItemLinksBaseOptions<TLanguages> & {
+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>, FetchItemLinksLanguages<TLanguages>, "embedded">>;
+  items: Array<Item<ItemCategory, ContainedItemCategoryFromOption<ItemCategory, TContainedItemCategory>, FetchLanguages<TLanguages>, "embedded">>;
   error: null;
   detailedError: null;
 } | {

package/dist/fetchers/item.d.mts

@@ -1,26 +1,16 @@
 import { ContainedItemCategory, ContainedItemCategoryFromOption, ContainedItemCategoryOption, Item, ItemCategory, ItemContainerCategory, ItemWithoutEmbeddedItems } from "../types/index.mjs";
+import { FetchBaseOptions, FetchLanguages } from "../parsers/helpers.mjs";
 
 //#region src/fetchers/item.d.ts
-type FetchFunction = (input: string | URL | globalThis.Request, init?: RequestInit) => Promise<Response>;
-type FetchItemBaseOptions<TLanguages extends ReadonlyArray<string> | undefined = undefined> = {
-  languages?: TLanguages;
-  fetch?: FetchFunction;
-};
-type FetchItemNoOmitEmbeddedItemsOption = {
-  shouldOmitEmbeddedItems?: false;
-};
-type FetchItemLanguages<TLanguages extends ReadonlyArray<string> | undefined> = TLanguages extends readonly [] ? ReadonlyArray<string> : TLanguages extends ReadonlyArray<string> ? TLanguages : ReadonlyArray<string>;
-type FetchItemSuccess<TItem> = {
+type FetchItemResult<TItem> = Promise<{
   item: TItem;
   error: null;
   detailedError: null;
-};
-type FetchItemError = {
+} | {
   item: null;
   error: string;
   detailedError: string;
-};
-type FetchItemResult<TItem> = Promise<FetchItemSuccess<TItem> | FetchItemError>;
+}>;
 /**
  * Defines a reusable languages tuple with validation and literal type inference.
  *
@@ -48,27 +38,30 @@ 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?: FetchItemBaseOptions<TLanguages> & FetchItemNoOmitEmbeddedItemsOption & {
+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;
-}): FetchItemResult<Item<ItemCategory, ContainedItemCategoryFromOption<ItemCategory, TContainedItemCategory>, FetchItemLanguages<TLanguages>>>;
-declare function fetchItem<const TContainedItemCategory extends ContainedItemCategoryOption<ItemContainerCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchItemBaseOptions<TLanguages> & {
+  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> & {
   category?: undefined;
   containedItemCategory?: TContainedItemCategory;
-  shouldOmitEmbeddedItems: true;
-}): FetchItemResult<ItemWithoutEmbeddedItems<ItemContainerCategory, ContainedItemCategoryFromOption<ItemContainerCategory, TContainedItemCategory>, FetchItemLanguages<TLanguages>>>;
-declare function fetchItem<const TCategory extends ItemContainerCategory, const TContainedItemCategory extends ContainedItemCategoryOption<TCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchItemBaseOptions<TLanguages> & FetchItemNoOmitEmbeddedItemsOption & {
+  shouldOmitEmbeddedItems?: true;
+}): FetchItemResult<ItemWithoutEmbeddedItems<ItemContainerCategory, ContainedItemCategoryFromOption<ItemContainerCategory, TContainedItemCategory>, FetchLanguages<TLanguages>>>;
+declare function fetchItem<const TCategory extends ItemContainerCategory, const TContainedItemCategory extends ContainedItemCategoryOption<TCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchBaseOptions<TLanguages> & {
   category: TCategory;
   containedItemCategory?: TContainedItemCategory;
-}): FetchItemResult<Item<TCategory, ContainedItemCategoryFromOption<TCategory, TContainedItemCategory>, FetchItemLanguages<TLanguages>>>;
-declare function fetchItem<const TCategory extends ItemContainerCategory, const TContainedItemCategory extends ContainedItemCategoryOption<TCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchItemBaseOptions<TLanguages> & {
+  shouldOmitEmbeddedItems?: false;
+}): FetchItemResult<Item<TCategory, ContainedItemCategoryFromOption<TCategory, TContainedItemCategory>, FetchLanguages<TLanguages>>>;
+declare function fetchItem<const TCategory extends ItemContainerCategory, const TContainedItemCategory extends ContainedItemCategoryOption<TCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchBaseOptions<TLanguages> & {
   category: TCategory;
   containedItemCategory?: TContainedItemCategory;
   shouldOmitEmbeddedItems: true;
-}): FetchItemResult<ItemWithoutEmbeddedItems<TCategory, ContainedItemCategoryFromOption<TCategory, TContainedItemCategory>, FetchItemLanguages<TLanguages>>>;
-declare function fetchItem<const TCategory extends ItemCategory, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchItemBaseOptions<TLanguages> & FetchItemNoOmitEmbeddedItemsOption & {
+}): FetchItemResult<ItemWithoutEmbeddedItems<TCategory, ContainedItemCategoryFromOption<TCategory, TContainedItemCategory>, FetchLanguages<TLanguages>>>;
+declare function fetchItem<const TCategory extends ItemCategory, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchBaseOptions<TLanguages> & {
   category: TCategory;
   containedItemCategory?: never;
-}): FetchItemResult<Item<TCategory, ContainedItemCategory<TCategory>, FetchItemLanguages<TLanguages>>>;
+  shouldOmitEmbeddedItems?: false;
+}): FetchItemResult<Item<TCategory, ContainedItemCategory<TCategory>, FetchLanguages<TLanguages>>>;
 //#endregion
 export { defineLanguages, fetchItem, withLanguages };

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

@@ -1,12 +1,7 @@
 import { Query, SetItem, SetItemCategory, SetItemsSort } from "../../types/index.mjs";
+import { FetchBaseOptions, FetchLanguages } from "../../parsers/helpers.mjs";
 
 //#region src/fetchers/set/items.d.ts
-type FetchFunction = (input: string | URL | globalThis.Request, init?: RequestInit) => Promise<Response>;
-type FetchSetItemsBaseOptions<TLanguages extends ReadonlyArray<string> | undefined = undefined> = {
-  languages?: TLanguages;
-  fetch?: FetchFunction;
-};
-type FetchSetItemsLanguages<TLanguages extends ReadonlyArray<string> | undefined> = TLanguages extends readonly [] ? ReadonlyArray<string> : TLanguages extends ReadonlyArray<string> ? TLanguages : ReadonlyArray<string>;
 type FetchSetItemsCategory<TContainedItemCategories extends ReadonlyArray<SetItemCategory> | undefined> = TContainedItemCategories extends ReadonlyArray<infer U> ? Extract<U, SetItemCategory> : SetItemCategory;
 /**
  * Fetches and parses Set items from the OCHRE API
@@ -29,11 +24,11 @@ declare function fetchSetItems<const TContainedItemCategories extends ReadonlyAr
   sort?: SetItemsSort;
   page: number;
   pageSize?: number;
-}, containedItemCategories?: TContainedItemCategories, options?: FetchSetItemsBaseOptions<TLanguages>): Promise<{
+}, containedItemCategories?: TContainedItemCategories, options?: FetchBaseOptions<TLanguages>): Promise<{
   totalCount: number;
   page: number;
   pageSize: number;
-  items: Array<SetItem<FetchSetItemsCategory<TContainedItemCategories>, FetchSetItemsLanguages<TLanguages>>>;
+  items: Array<SetItem<FetchSetItemsCategory<TContainedItemCategories>, FetchLanguages<TLanguages>>>;
   error: null;
   detailedError: null;
 } | {

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

@@ -0,0 +1,21 @@
+import { WebsiteMetadata } from "../types/website.mjs";
+import { FetchBaseOptions, FetchLanguages } from "../parsers/helpers.mjs";
+
+//#region src/fetchers/website-metadata.d.ts
+/**
+ * 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> & {
+  slug: string;
+}): Promise<{
+  websiteMetadata: WebsiteMetadata<FetchLanguages<TLanguages>>;
+  error: null;
+  detailedError: null;
+} | {
+  websiteMetadata: null;
+  error: string;
+  detailedError: string;
+}>;
+//#endregion
+export { fetchWebsiteMetadata };

package/dist/fetchers/website-metadata.mjs

@@ -0,0 +1,168 @@
+import { XML_PARSER_OPTIONS } from "../constants.mjs";
+import { createSchemaValidationError, getErrorOutput, stringLiteral } from "../utils.mjs";
+import { iso639_3Schema } from "../schemas.mjs";
+import { restoreXMLMetadata } from "../xml/metadata.mjs";
+import { parseStringLike } from "../parsers/helpers.mjs";
+import { parseIdentification, parseMetadataLanguages, parseSimplifiedProperties, resolveLanguages } from "../parsers/index.mjs";
+import { XMLWebsiteData } from "../xml/schemas.mjs";
+import { websitePresentationReader } from "../parsers/website/reader.mjs";
+import * as v from "valibot";
+import { XMLParser } from "fast-xml-parser";
+//#region src/fetchers/website-metadata.ts
+function parseWebsiteMetadata(data, options) {
+	const rawOchre = data.result.ochre;
+	const websiteTree = rawOchre.tree[0];
+	if (websiteTree == null) throw new Error("Website tree not found", { cause: data });
+	const identification = parseIdentification(websiteTree.identification, options);
+	const websiteName = identification.label.getText().trim();
+	const metadataDescription = (parseStringLike(rawOchre.metadata.description) ?? "").trim();
+	const reader = websitePresentationReader(parseSimplifiedProperties(websiteTree.properties, options));
+	const webpage = websiteTree.items?.resource?.[0] ?? null;
+	const webpageTitle = webpage != null && "identification" in webpage ? parseIdentification(webpage.identification, options).label : null;
+	return {
+		uuid: websiteTree.uuid,
+		belongsTo: {
+			uuid: rawOchre.uuidBelongsTo,
+			abbreviation: rawOchre.belongsTo
+		},
+		identification,
+		description: websiteName === "" ? metadataDescription : metadataDescription !== "" && metadataDescription !== websiteName ? `${websiteName} - ${metadataDescription}` : websiteName,
+		webpageTitle,
+		properties: { icon: {
+			faviconUuid: reader.uuid("favicon-ico"),
+			appleTouchIconUuid: reader.uuid("favicon-img")
+		} }
+	};
+}
+function buildXQuery(params) {
+	return String.raw`xquery version "1.0-ml";
+
+declare function local:resource-items($resources) {
+  for $resource in $resources
+  return
+    if ($resource/segments) then $resource
+    else if ($resource/identification) then $resource
+    else local:resource-items($resource/resource)
+};
+
+declare function local:presentation($resource) {
+  string(($resource/properties/property[label/string() = "presentation"]/value)[1])
+};
+
+declare function local:clean-slug($slug) {
+  replace(string($slug), "^\$[^-]*-", "")
+};
+
+declare function local:page-slug($resource, $slug-prefix) {
+  let $slug := local:clean-slug($resource/@slug)
+  return
+    if ($slug-prefix = "") then $slug
+    else if ($slug = "") then $slug-prefix
+    else concat($slug-prefix, "/", $slug)
+};
+
+declare function local:matches-page-slug($resource, $target-slug, $slug-prefix) {
+  local:page-slug($resource, $slug-prefix) = $target-slug
+};
+
+declare function local:page-child-slug-prefix($resource, $slug-prefix) {
+  if ($slug-prefix = "") then ""
+  else local:page-slug($resource, $slug-prefix)
+};
+
+declare function local:metadata-page($resource) {
+  element resource {
+    attribute uuid { string($resource/@uuid) },
+    $resource/identification
+  }
+};
+
+declare function local:matching-pages($resources, $target-slug, $slug-prefix) {
+  for $resource in $resources
+  let $children := local:resource-items($resource/resource)
+  let $page-slug := local:page-slug($resource, $slug-prefix)
+  let $child-slug-prefix := local:page-child-slug-prefix($resource, $slug-prefix)
+  return (
+    if (local:matches-page-slug($resource, $target-slug, $slug-prefix)) then
+      local:metadata-page($resource)
+    else (),
+    local:matching-pages(
+      $children[local:presentation(.) = "page"],
+      $target-slug,
+      $child-slug-prefix
+    ),
+    for $segment in $children[segments]/segments/tree
+    return local:matching-pages(
+      local:resource-items($segment/items/resource),
+      $target-slug,
+      $page-slug
+    )
+  )
+};
+
+declare function local:metadata-tree($tree, $target-slug, $slug-prefix) {
+  let $resources := local:resource-items($tree/items/resource)
+  let $icon-properties := $tree/properties/property[label/string() = "presentation"][value/string() = "website"]/property[label/string() = ("favicon-ico", "favicon-img")]
+  return
+    element tree {
+      attribute uuid { string($tree/@uuid) },
+      $tree/identification,
+      if (empty($icon-properties)) then () else element properties { $icon-properties },
+      element items {
+        local:matching-pages(
+          $resources[local:presentation(.) = "page"],
+          $target-slug,
+          $slug-prefix
+        )
+      }
+    }
+};
+
+let $website := collection("ochre/tree")/ochre[tree/identification/abbreviation/content/string = ${stringLiteral(params.abbreviation)}][1]
+let $target-slug := ${stringLiteral(params.slug)}
+return
+  <ochre>{
+    $website/@uuid,
+    $website/@uuidBelongsTo,
+    $website/@belongsTo,
+    $website/@publicationDateTime,
+    $website/@languages,
+    $website/metadata,
+    local:metadata-tree($website/tree[1], $target-slug, "")
+  }</ochre>`;
+}
+async function fetchWebsiteMetadata(abbreviation, options) {
+	try {
+		const cleanAbbreviation = abbreviation.trim().toLocaleLowerCase("en-US");
+		if (options?.slug == null) throw new Error("Website metadata slug is required");
+		const slug = options.slug.trim().replaceAll(/^\/+|\/+$/g, "");
+		const requestedLanguages = [];
+		for (const language of options.languages ?? []) requestedLanguages.push(v.parse(iso639_3Schema, language));
+		const response = await (options.fetch ?? fetch)("https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?xquery&xsl=none&lang=\"*\"", {
+			method: "POST",
+			body: buildXQuery({
+				abbreviation: cleanAbbreviation,
+				slug
+			}),
+			headers: { "Content-Type": "application/xquery" }
+		});
+		if (!response.ok) throw new Error("Failed to fetch website metadata", { cause: response.statusText });
+		const dataRaw = await response.text();
+		const data = new XMLParser(XML_PARSER_OPTIONS).parse(dataRaw);
+		const { success, issues, output } = v.safeParse(XMLWebsiteData, data);
+		if (!success) throw createSchemaValidationError("Failed to parse website metadata XML", issues);
+		restoreXMLMetadata(output, data);
+		return {
+			websiteMetadata: parseWebsiteMetadata(output, { languages: resolveLanguages(requestedLanguages, parseMetadataLanguages(output.result.ochre)) }),
+			error: null,
+			detailedError: null
+		};
+	} catch (error) {
+		return {
+			websiteMetadata: null,
+			...getErrorOutput(error, "Unknown error")
+		};
+	}
+}
+//#endregion
+export { fetchWebsiteMetadata };

package/dist/fetchers/website.d.mts

@@ -1,8 +1,8 @@
 import { Website } from "../types/website.mjs";
 import { LanguageCodes } from "../types/index.mjs";
+import { FetchFunction } from "../parsers/helpers.mjs";
 
 //#region src/fetchers/website.d.ts
-type FetchFunction = (input: string | URL | globalThis.Request, init?: RequestInit) => Promise<Response>;
 /**
  * Fetches and parses a website configuration from the OCHRE API
  *

package/dist/index.d.mts

@@ -1,12 +1,13 @@
 import { MultilingualOptions, MultilingualString, MultilingualStringEntries, MultilingualStringEntry, MultilingualStringInput, MultilingualStringJSON, MultilingualStringObject, MultilingualStringText } from "./parsers/multilingual.mjs";
-import { AccordionWebBlock, ContextTree, ContextTreeFilterLevel, ContextTreeLevel, ContextTreeLevelItem, Scope, Style, StylesheetCategory, StylesheetItem, WebBlock, WebBlockByLayout, WebBlockLayout, WebElement, WebElementComponent, WebElementComponentName, WebElementComponentOf, WebElementOf, WebImage, WebTitle, Webpage, Website, WebsitePropertyQuery, WebsitePropertyQueryNode, WebsiteSegment, WebsiteType } from "./types/website.mjs";
+import { AccordionWebBlock, ContextTree, ContextTreeFilterLevel, ContextTreeLevel, ContextTreeLevelItem, Scope, Style, StylesheetCategory, StylesheetItem, WebBlock, WebBlockByLayout, WebBlockLayout, WebElement, WebElementComponent, WebElementComponentName, WebElementComponentOf, WebElementOf, WebImage, 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, ItemContainerCategory, ItemLink, ItemLinkCategory, ItemLinks, ItemPayloadKind, ItemProperty, ItemWithoutEmbeddedItems, LanguageCodes, License, Metadata, Note, Observation, Period, PeriodItemLink, Person, PersonItemLink, Property, PropertyLike, 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 { fetchItemLinks } from "./fetchers/item-links.mjs";
 import { defineLanguages, fetchItem, withLanguages } from "./fetchers/item.mjs";
 import { fetchSetItems } from "./fetchers/set/items.mjs";
 import { fetchSetPropertyValues } from "./fetchers/set/property-values.mjs";
+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 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 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 WebBlock, type WebBlockByLayout, type WebBlockLayout, type WebElement, type WebElementComponent, type WebElementComponentName, type WebElementComponentOf, type WebElementOf, type WebImage, type WebTitle, type Webpage, type Website, type WebsitePropertyQuery, type WebsitePropertyQueryNode, type WebsiteSegment, type WebsiteType, defineLanguages, fetchGallery, fetchItem, fetchItemLinks, fetchSetItems, fetchSetPropertyValues, fetchWebsite, 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 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 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 WebBlock, type WebBlockByLayout, type WebBlockLayout, type WebElement, type WebElementComponent, type WebElementComponentName, type WebElementComponentOf, type WebElementOf, type WebImage, type WebTitle, type Webpage, type Website, type WebsiteMetadata, type WebsitePropertyQuery, type WebsitePropertyQueryNode, type WebsiteSegment, type WebsiteType, defineLanguages, fetchGallery, fetchItem, 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/index.mjs

@@ -6,5 +6,6 @@ import { fetchItemLinks } from "./fetchers/item-links.mjs";
 import { defineLanguages, fetchItem, withLanguages } from "./fetchers/item.mjs";
 import { fetchSetItems } from "./fetchers/set/items.mjs";
 import { fetchSetPropertyValues } from "./fetchers/set/property-values.mjs";
+import { fetchWebsiteMetadata } from "./fetchers/website-metadata.mjs";
 import { fetchWebsite } from "./fetchers/website.mjs";
-export { DEFAULT_PAGE_SIZE, MultilingualString, defineLanguages, fetchGallery, fetchItem, fetchItemLinks, fetchSetItems, fetchSetPropertyValues, fetchWebsite, filterProperties, flattenItemProperties, getLeafPropertyValues, getPropertyByVariableLabel, getPropertyByVariableLabelAndValue, getPropertyByVariableLabelAndValueContent, getPropertyByVariableLabelAndValueContents, getPropertyByVariableLabelAndValues, getPropertyByVariableUuid, getPropertyValueByVariableLabel, getPropertyValueByVariableUuid, getPropertyValueContentByVariableLabel, getPropertyValueContentByVariableUuid, getPropertyValueContentsByVariableUuid, getPropertyValuesByVariableLabel, getPropertyValuesByVariableUuid, getUniqueProperties, getUniquePropertyVariableLabels, withLanguages };
+export { DEFAULT_PAGE_SIZE, MultilingualString, defineLanguages, fetchGallery, fetchItem, 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/helpers.d.mts

@@ -3,6 +3,13 @@ import { License } from "../types/index.mjs";
 import { XMLContent, XMLString } from "../xml/types.mjs";
 
 //#region src/parsers/helpers.d.ts
+type FetchFunction = (input: string | URL | globalThis.Request, init?: RequestInit) => Promise<Response>;
+type FetchBaseOptions<TLanguages extends ReadonlyArray<string> | undefined = undefined> = {
+  languages?: TLanguages;
+  fetch?: FetchFunction;
+};
+type FetchRuntimeOptions = FetchBaseOptions<ReadonlyArray<string>>;
+type FetchLanguages<TLanguages extends ReadonlyArray<string> | undefined> = TLanguages extends readonly [] ? ReadonlyArray<string> : TLanguages extends ReadonlyArray<string> ? TLanguages : ReadonlyArray<string>;
 type ParserOptions<T extends ReadonlyArray<string>> = {
   languages: T;
 };
@@ -24,4 +31,4 @@ declare function parseRequiredContentLike<T extends ReadonlyArray<string>>(value
 declare function parseContentLikeText<T extends ReadonlyArray<string>>(value: XMLContent | XMLString | undefined, options: ParserOptions<T>): string;
 declare function parseStringContent(value: XMLContent | XMLString | string | undefined, options?: ParserOptions<ReadonlyArray<string>>): string;
 //#endregion
-export { ParserOptions, cleanObject, getParserOptions, isXMLContent, multilingualFromText, parseContentLike, parseContentLikeText, parseLicense, parseRequiredContentLike, parseStringContent, parseStringLike };
+export { FetchBaseOptions, FetchFunction, FetchLanguages, FetchRuntimeOptions, ParserOptions, cleanObject, getParserOptions, isXMLContent, multilingualFromText, parseContentLike, parseContentLikeText, parseLicense, parseRequiredContentLike, parseStringContent, parseStringLike };

package/dist/parsers/mdx.d.mts

@@ -1,4 +1,5 @@
 //#region src/parsers/mdx.d.ts
 declare function serializeMDXText(value: string): string;
+declare function serializeMDXContent(value: string): string;
 //#endregion
-export { serializeMDXText };
+export { serializeMDXContent, serializeMDXText };

package/dist/parsers/mdx.mjs

@@ -1,9 +1,22 @@
 //#region src/parsers/mdx.ts
 const MDX_LITERAL_EXPRESSION_REGEX = /[!#*<>[\]_`{|}~]/;
 const MDX_LITERAL_BLOCK_REGEX = /(?:^|\n)[\t ]*(?:import|export|[+>-]|\d+[).])(?:[\t ]|$)/;
+const MDX_MULTIPLE_SPACES_REGEX = / {2,}/g;
+const MDX_INLINE_BOUNDARY_PATTERN = "(?:Annotation|ExternalLink|InlineImage|InternalLink|TooltipSpan|em|strong|u)";
+const MDX_INLINE_BOUNDARY_SPACES_REGEX = new RegExp(String.raw`(\}|<\/${MDX_INLINE_BOUNDARY_PATTERN}>|\/>)([\t ]+)(?=\{|<\/?${MDX_INLINE_BOUNDARY_PATTERN}\b)`, "g");
+const MDX_INLINE_BOUNDARY_REGEX = new RegExp(String.raw`(?:\}[\t ]*|<\/${MDX_INLINE_BOUNDARY_PATTERN}>|\/>)(?=\{|<\/?${MDX_INLINE_BOUNDARY_PATTERN}\b)`);
+function preserveMultipleSpaces(value) {
+	return value.replaceAll(MDX_MULTIPLE_SPACES_REGEX, (spaces) => `${spaces.slice(0, 1)}${"\xA0".repeat(spaces.length - 1)}`);
+}
 function serializeMDXText(value) {
-	if (value === "" || !MDX_LITERAL_EXPRESSION_REGEX.test(value) && !MDX_LITERAL_BLOCK_REGEX.test(value)) return value;
-	return `{${JSON.stringify(value)}}`;
+	const displaySafeValue = preserveMultipleSpaces(value);
+	if (displaySafeValue === "" || !(displaySafeValue !== value) && !MDX_LITERAL_EXPRESSION_REGEX.test(displaySafeValue) && !MDX_LITERAL_BLOCK_REGEX.test(displaySafeValue)) return displaySafeValue;
+	return `{${JSON.stringify(displaySafeValue)}}`;
+}
+function serializeMDXContent(value) {
+	const content = value.replaceAll(MDX_INLINE_BOUNDARY_SPACES_REGEX, (_, previousBoundary, spaces) => `${previousBoundary}{${JSON.stringify(preserveMultipleSpaces(spaces))}}`);
+	if (!MDX_INLINE_BOUNDARY_REGEX.test(content)) return content;
+	return content.endsWith("\n") ? `<>\n${content}</>` : `<>\n${content}\n</>`;
 }
 //#endregion
-export { serializeMDXText };
+export { serializeMDXContent, serializeMDXText };

package/dist/parsers/string.mjs

@@ -1,5 +1,5 @@
 import { TEXT_ANNOTATION_UUID } from "../constants.mjs";
-import { serializeMDXText } from "./mdx.mjs";
+import { serializeMDXContent, serializeMDXText } from "./mdx.mjs";
 import { MultilingualString } from "./multilingual.mjs";
 import { renderOptionsSchema } from "../schemas.mjs";
 import { getXMLSourceIndex } from "../xml/metadata.mjs";
@@ -419,15 +419,16 @@ function parseXMLContent(item, options) {
 	return MultilingualString.empty(languages, { aliases });
 }
 function parseXMLContentItem(contentItem, options) {
+	const richText = parseNestedStringItems(contentItem.string, contentItem, {
+		...options,
+		rendering: "rich"
+	});
 	return {
 		text: parseNestedStringItems(contentItem.string, contentItem, {
 			...options,
 			rendering: "plain"
 		}),
-		richText: parseNestedStringItems(contentItem.string, contentItem, {
-			...options,
-			rendering: "rich"
-		})
+		richText: serializeMDXContent(richText)
 	};
 }
 /**

package/dist/schemas.d.mts

@@ -11,7 +11,7 @@ declare const uuidSchema: v.SchemaWithPipe<readonly [v.StringSchema<undefined>,
  * Schema for validating language codes
  * @internal
  */
-declare const iso639_3Schema: v.SchemaWithPipe<readonly [v.StringSchema<"Language code must be a string">, v.LengthAction<string, 3, "Language code must be exactly 3 characters">, v.RegexAction<string, "Language code must be exactly 3 lowercase letters">]>;
+declare const iso639_3Schema: v.SchemaWithPipe<readonly [v.StringSchema<"Language code must be a string">, v.RegexAction<string, "Language code must be exactly 3 lowercase letters">]>;
 /**
  * Valid component types for web elements
  * @internal

package/dist/schemas.mjs

@@ -15,7 +15,7 @@ const uuidSchema = v.pipe(v.string(), v.check(isPseudoUuid, "Invalid pseudo-UUID
 * Schema for validating language codes
 * @internal
 */
-const iso639_3Schema = v.pipe(v.string("Language code must be a string"), v.length(3, "Language code must be exactly 3 characters"), v.regex(/^[a-z]{3}$/, "Language code must be exactly 3 lowercase letters"));
+const iso639_3Schema = v.pipe(v.string("Language code must be a string"), v.regex(/^[a-z]{3}$/, "Language code must be exactly 3 lowercase letters"));
 /**
 * Valid component types for web elements
 * @internal

package/dist/types/website.d.mts

@@ -497,5 +497,21 @@ type WebBlock<T extends LanguageCodes = LanguageCodes, U extends WebBlockLayout
 };
 type WebBlockByLayout<U extends WebBlockLayout = WebBlockLayout, T extends LanguageCodes = LanguageCodes> = WebBlock<T, U>;
 type AccordionWebBlock<T extends LanguageCodes = LanguageCodes> = WebBlock<T, "accordion">;
+type WebsiteMetadata<T extends LanguageCodes = LanguageCodes> = {
+  uuid: string;
+  belongsTo: {
+    uuid: string;
+    abbreviation: string;
+  } | null;
+  identification: Identification<T>;
+  description: string;
+  webpageTitle: MultilingualString<T> | null;
+  properties: {
+    icon: {
+      faviconUuid: string | null;
+      appleTouchIconUuid: string | null;
+    };
+  };
+};
 //#endregion
-export { AccordionWebBlock, ContextTree, ContextTreeFilterLevel, ContextTreeLevel, ContextTreeLevelItem, Scope, Style, StylesheetCategory, StylesheetItem, WebBlock, WebBlockByLayout, WebBlockLayout, WebElement, WebElementComponent, WebElementComponentName, WebElementComponentOf, WebElementOf, WebImage, WebTitle, Webpage, Website, WebsitePropertyQuery, WebsitePropertyQueryNode, WebsiteSegment, WebsiteType };
+export { AccordionWebBlock, ContextTree, ContextTreeFilterLevel, ContextTreeLevel, ContextTreeLevelItem, Scope, Style, StylesheetCategory, StylesheetItem, WebBlock, WebBlockByLayout, WebBlockLayout, WebElement, WebElementComponent, WebElementComponentName, WebElementComponentOf, WebElementOf, WebImage, WebTitle, Webpage, Website, WebsiteMetadata, WebsitePropertyQuery, WebsitePropertyQueryNode, WebsiteSegment, WebsiteType };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",