ochre-sdk 1.0.0-beta.12 → 1.0.0-beta.14

package/dist/index.d.mts

@@ -188,38 +188,48 @@ declare class MultilingualString<T extends ReadonlyArray<string> = ReadonlyArray
 //#endregion
 //#region src/types/index.d.ts
 type Prettify<T> = { [K in keyof T]: T[K] } & {};
+/**
+ * Language-code tuple or array used by OCHRE multilingual fields.
+ *
+ * Use the default when the consumer does not need to narrow a value to a
+ * specific language tuple.
+ */
+type LanguageCodes = ReadonlyArray<string>;
 /**
  * The category of an item in OCHRE
  */
-type DataCategory = "tree" | "bibliography" | "concept" | "spatialUnit" | "period" | "person" | "propertyVariable" | "propertyValue" | "resource" | "text" | "set";
-type HierarchyDataCategory = Extract<DataCategory, "tree" | "set">;
+type ItemCategory = "tree" | "bibliography" | "concept" | "spatialUnit" | "period" | "person" | "propertyVariable" | "propertyValue" | "resource" | "text" | "set";
+/**
+ * OCHRE item categories that can contain other items in API payloads.
+ */
+type ItemContainerCategory = Extract<ItemCategory, "tree" | "set">;
 /**
  * The category of items in a Tree
  */
-type ItemsDataCategory = Exclude<DataCategory, "tree">;
+type TreeItemCategory = Exclude<ItemCategory, "tree">;
 /**
  * The category of items in a Set
  */
-type SetItemDataCategory = DataCategory;
-type HierarchyItemDataCategory<U extends DataCategory> = U extends "tree" ? ItemsDataCategory : U extends "set" ? SetItemDataCategory : never;
-type HierarchyItemCategoryOption<U extends DataCategory> = U extends "tree" ? ItemsDataCategory : U extends "set" ? SetItemDataCategory | ReadonlyArray<SetItemDataCategory> : never;
-type HierarchyItemCategoryFromOption<U extends DataCategory, V extends HierarchyItemCategoryOption<U> | undefined> = V extends ReadonlyArray<infer W> ? Extract<W, HierarchyItemDataCategory<U>> : V extends HierarchyItemDataCategory<U> ? V : HierarchyItemDataCategory<U>;
+type SetItemCategory = ItemCategory;
+type ContainedItemCategory<U extends ItemCategory = ItemCategory> = U extends "tree" ? TreeItemCategory : U extends "set" ? SetItemCategory : never;
+type ContainedItemCategoryOption<U extends ItemCategory = ItemCategory> = U extends "tree" ? TreeItemCategory : U extends "set" ? SetItemCategory | ReadonlyArray<SetItemCategory> : never;
+type ContainedItemCategoryFromOption<U extends ItemCategory = ItemCategory, V extends ContainedItemCategoryOption<U> | undefined = undefined> = V extends ReadonlyArray<infer W> ? Extract<W, ContainedItemCategory<U>> : V extends ContainedItemCategory<U> ? V : ContainedItemCategory<U>;
 /**
  * The category of items in a heading
  */
-type HeadingDataCategory = Exclude<DataCategory, "tree" | "bibliography" | "spatialUnit" | "concept" | "period">;
+type HeadingItemCategory = Exclude<ItemCategory, "tree" | "bibliography" | "spatialUnit" | "concept" | "period">;
 /**
- * The category of items that are in hierarchies (tree or set)
+ * The category of items that expose recursive subitem structures.
  */
-type RecursiveDataCategory = Exclude<DataCategory, "tree" | "person" | "propertyVariable" | "propertyValue" | "set">;
+type RecursiveItemCategory = Exclude<ItemCategory, "tree" | "person" | "propertyVariable" | "propertyValue" | "set">;
 /**
  *  The category names that can appear in OCHRE context paths
  */
-type ContextDataCategory = Exclude<DataCategory, "tree" | "person" | "set">;
+type ContextItemCategory = Exclude<ItemCategory, "tree" | "person" | "set">;
 /**
  *  Basic identification information
  */
-type Identification<T extends ReadonlyArray<string>> = {
+type Identification<T extends LanguageCodes = LanguageCodes> = {
   label: MultilingualString<T>;
   abbreviation: MultilingualString<T> | null;
   code: string | null;
@@ -229,7 +239,7 @@ type Identification<T extends ReadonlyArray<string>> = {
 /**
  *  Metadata in OCHRE
  */
-type Metadata<T extends ReadonlyArray<string>> = {
+type Metadata<T extends LanguageCodes = LanguageCodes> = {
   dataset: string;
   description: string;
   publisher: string;
@@ -264,8 +274,8 @@ type BelongsTo = {
   uuid: string;
   abbreviation: string;
 };
-type ItemLocation = "topLevel" | "nested";
-type ItemOrigin<T extends ReadonlyArray<string>, U extends ItemLocation> = U extends "topLevel" ? {
+type ItemPayloadKind = "topLevel" | "embedded";
+type ItemEnvelopeFields<T extends LanguageCodes, U extends ItemPayloadKind> = U extends "topLevel" ? {
   belongsTo: BelongsTo;
   metadata: Metadata<T>;
   persistentUrl: string | null;
@@ -293,7 +303,7 @@ type ContextItem = {
 /**
  *  Context node in OCHRE
  */
-type ContextNode<U extends ContextDataCategory> = {
+type ContextNode<U extends ContextItemCategory = ContextItemCategory> = {
   tree: ContextItem;
   project: ContextItem;
   heading: Array<ContextItem>;
@@ -301,14 +311,14 @@ type ContextNode<U extends ContextDataCategory> = {
 /**
  *  Context in OCHRE
  */
-type Context<U extends ContextDataCategory> = {
+type Context<U extends ContextItemCategory = ContextItemCategory> = {
   nodes: Array<ContextNode<U>>;
   displayPath: string;
 };
 /**
  *  Event in OCHRE
  */
-type Event<T extends ReadonlyArray<string>> = {
+type Event<T extends LanguageCodes = LanguageCodes> = {
   date: Date | {
     start: Date;
     end: Date;
@@ -334,7 +344,7 @@ type Event<T extends ReadonlyArray<string>> = {
 /**
  *  Source of coordinates in OCHRE
  */
-type CoordinatesSource<T extends ReadonlyArray<string>> = {
+type CoordinatesSource<T extends LanguageCodes = LanguageCodes> = {
   context: "self";
   uuid: string;
   label: MultilingualString<T>;
@@ -355,7 +365,7 @@ type CoordinatesSource<T extends ReadonlyArray<string>> = {
 /**
  *  Coordinates in OCHRE
  */
-type Coordinates<T extends ReadonlyArray<string>> = {
+type Coordinates<T extends LanguageCodes = LanguageCodes> = {
   type: "point";
   latitude: number;
   longitude: number;
@@ -376,7 +386,7 @@ type Coordinates<T extends ReadonlyArray<string>> = {
 /**
  *  Image in OCHRE
  */
-type Image<T extends ReadonlyArray<string>> = {
+type Image<T extends LanguageCodes = LanguageCodes> = {
   publicationDateTime: Date | null;
   identification: Identification<T> | null;
   href: string | null;
@@ -420,16 +430,16 @@ type ImageMap = {
 /**
  *  Note in OCHRE
  */
-type Note<T extends ReadonlyArray<string>> = {
+type Note<T extends LanguageCodes = LanguageCodes> = {
   number: number;
   title: MultilingualString<T> | null;
   content: MultilingualString<T>;
-  authors: Array<Person<T, "nested">>;
+  authors: Array<Person<T, "embedded">>;
 };
 /**
  *  Property value content in OCHRE
  */
-type PropertyValueContent<T extends ReadonlyArray<string>> = Prettify<{
+type PropertyValueContent<T extends LanguageCodes = LanguageCodes> = Prettify<{
   hierarchy: {
     isLeaf: boolean;
     level: number | null;
@@ -459,7 +469,7 @@ type PropertyValueContent<T extends ReadonlyArray<string>> = Prettify<{
 /**
  *  Property in OCHRE
  */
-type Property<T extends ReadonlyArray<string>> = {
+type Property<T extends LanguageCodes = LanguageCodes> = {
   variable: {
     uuid: string;
     label: MultilingualString<T>;
@@ -473,7 +483,7 @@ type Property<T extends ReadonlyArray<string>> = {
  * Simplified property in OCHRE website payloads. Simplified property variables
  * expose scalar labels rather than multilingual labels.
  */
-type SimplifiedProperty<T extends ReadonlyArray<string>> = {
+type SimplifiedProperty<T extends LanguageCodes = LanguageCodes> = {
   variable: {
     uuid: string;
     label: string;
@@ -486,41 +496,45 @@ type SimplifiedProperty<T extends ReadonlyArray<string>> = {
 /**
  *  Property in a Set item. OCHRE exposes Set item properties as a flat list.
  */
-type SingleHierarchyProperty<T extends ReadonlyArray<string>> = Omit<Property<T>, "properties">;
-type SingleHierarchySimplifiedProperty<T extends ReadonlyArray<string>> = Omit<SimplifiedProperty<T>, "properties">;
-type WithSingleHierarchyProperties<U extends {
+type SetItemProperty<T extends LanguageCodes = LanguageCodes> = Omit<Property<T>, "properties">;
+type SetItemSimplifiedProperty<T extends LanguageCodes = LanguageCodes> = Omit<SimplifiedProperty<T>, "properties">;
+type PropertyLike<T extends LanguageCodes = LanguageCodes> = Property<T> | SetItemProperty<T> | SimplifiedProperty<T> | SetItemSimplifiedProperty<T>;
+type ItemProperty<T extends LanguageCodes = LanguageCodes> = Property<T> | SetItemProperty<T>;
+type PropertyValueDataType = PropertyValueContent["dataType"];
+type QueryablePropertyValueDataType = Exclude<PropertyValueDataType, "coordinate">;
+type WithSetItemProperties<U extends {
   properties: Array<Property<T>>;
-}, T extends ReadonlyArray<string>> = U extends {
+}, T extends LanguageCodes> = U extends {
   properties: Array<Property<T>>;
 } ? Prettify<Omit<U, "properties"> & {
-  properties: Array<SingleHierarchyProperty<T>>;
+  properties: Array<SetItemProperty<T>>;
 }> : never;
 /**
  *  Base item in OCHRE
  */
-type BaseItem<U extends DataCategory = DataCategory, T extends ReadonlyArray<string> = ReadonlyArray<string>, V extends ItemLocation = "topLevel"> = ItemOrigin<T, V> & {
+type BaseItem<U extends ItemCategory = ItemCategory, T extends LanguageCodes = LanguageCodes, V extends ItemPayloadKind = "topLevel"> = ItemEnvelopeFields<T, V> & {
   uuid: string;
   category: U;
   publicationDateTime: Date | null;
-  context: Context<ContextDataCategory> | null;
+  context: Context<ContextItemCategory> | null;
   date: Date | null;
   license: License | null;
   copyright: MultilingualString<T> | null;
   watermark: MultilingualString<T> | null;
   identification: Identification<T>;
-  creators: Array<Person<T, "nested">>;
+  creators: Array<Person<T, "embedded">>;
   description: MultilingualString<T> | null;
   events: Array<Event<T>>;
 };
-type ItemLinkCategory = DataCategory | "dictionaryUnit";
+type ItemLinkCategory = ItemCategory | "dictionaryUnit";
 /**
  *  Base item data exposed by OCHRE link and reverse-link payloads.
  */
-type BaseItemLink<U extends ItemLinkCategory = ItemLinkCategory, T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type BaseItemLink<U extends ItemLinkCategory = ItemLinkCategory, T extends LanguageCodes = LanguageCodes> = {
   uuid: string;
   category: U;
   publicationDateTime: Date | null;
-  context: Context<ContextDataCategory> | null;
+  context: Context<ContextItemCategory> | null;
   date: Date | null;
   identification: Identification<T>;
   description: MultilingualString<T> | null;
@@ -538,16 +552,16 @@ type BibliographyEntryInfo = {
   startPage: string;
   endPage: string;
 };
-type ItemLinks<T extends ReadonlyArray<string> = ReadonlyArray<string>> = Array<ItemLink<ItemLinkCategory, T>>;
-type TreeItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"tree", T> & {
+type ItemLinks<T extends LanguageCodes = LanguageCodes> = Array<ItemLink<ItemLinkCategory, T>>;
+type TreeItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"tree", T> & {
   type: string | null;
-  itemsCategory: ItemsDataCategory | null;
+  containedItemCategory: TreeItemCategory | null;
 }>;
-type SetItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"set", T> & {
+type SetItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"set", T> & {
   type: string | null;
-  itemsCategory: Array<SetItemDataCategory> | null;
+  containedItemCategories: Array<SetItemCategory> | null;
 }>;
-type BibliographyItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"bibliography", T> & {
+type BibliographyItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"bibliography", T> & {
   type: string | null;
   zoteroId: string | null;
   citationDetails: string | null;
@@ -561,35 +575,35 @@ type BibliographyItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLi
     startDate: Date | null;
   } | null;
   entryInfo: BibliographyEntryInfo | null;
-  source: ItemLink<ItemsDataCategory, T> | null;
+  source: ItemLink<TreeItemCategory, T> | null;
   authors: Array<ItemLink<"person", T>>;
   periods: Array<ItemLink<"period", T>>;
   properties: Array<Property<T>>;
 }>;
-type ConceptItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"concept", T> & {
+type ConceptItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"concept", T> & {
   image: Image<T> | null;
   coordinates: Array<Coordinates<T>>;
 }>;
-type SpatialUnitItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"spatialUnit", T> & {
+type SpatialUnitItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"spatialUnit", T> & {
   image: Image<T> | null;
   coordinates: Array<Coordinates<T>>;
 }>;
-type PeriodItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"period", T> & {
+type PeriodItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"period", T> & {
   type: string | null;
   coordinates: Array<Coordinates<T>>;
 }>;
-type PersonItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"person", T> & {
+type PersonItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"person", T> & {
   type: string | null;
   coordinates: Array<Coordinates<T>>;
 }>;
-type PropertyVariableItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"propertyVariable", T> & {
+type PropertyVariableItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"propertyVariable", T> & {
   type: string | null;
   coordinates: Array<Coordinates<T>>;
 }>;
-type PropertyValueItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"propertyValue", T> & {
+type PropertyValueItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"propertyValue", T> & {
   coordinates: Array<Coordinates<T>>;
 }>;
-type ResourceItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"resource", T> & {
+type ResourceItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"resource", T> & {
   type: string | null;
   href: string | null;
   fileFormat: string | null;
@@ -601,47 +615,50 @@ type ResourceItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"
   image: Image<T> | null;
   coordinates: Array<Coordinates<T>>;
 }>;
-type TextItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"text", T> & {
+type TextItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"text", T> & {
   type: string | null;
   text: string | null;
   language: string | null;
   image: Image<T> | null;
   coordinates: Array<Coordinates<T>>;
 }>;
-type DictionaryUnitItemLink<T extends ReadonlyArray<string>> = Prettify<BaseItemLink<"dictionaryUnit", T>>;
+type DictionaryUnitItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"dictionaryUnit", T>>;
 /**
  * An abridged item reference exposed inside OCHRE links and reverse links.
  */
-type ItemLink<U extends ItemLinkCategory = ItemLinkCategory, T extends ReadonlyArray<string> = ReadonlyArray<string>> = U extends ItemLinkCategory ? U extends "tree" ? TreeItemLink<T> : U extends "set" ? SetItemLink<T> : U extends "bibliography" ? BibliographyItemLink<T> : U extends "concept" ? ConceptItemLink<T> : U extends "spatialUnit" ? SpatialUnitItemLink<T> : U extends "period" ? PeriodItemLink<T> : U extends "person" ? PersonItemLink<T> : U extends "propertyVariable" ? PropertyVariableItemLink<T> : U extends "propertyValue" ? PropertyValueItemLink<T> : U extends "resource" ? ResourceItemLink<T> : U extends "text" ? TextItemLink<T> : U extends "dictionaryUnit" ? DictionaryUnitItemLink<T> : never : never;
+type ItemLink<U extends ItemLinkCategory = ItemLinkCategory, T extends LanguageCodes = LanguageCodes> = U extends ItemLinkCategory ? U extends "tree" ? TreeItemLink<T> : U extends "set" ? SetItemLink<T> : U extends "bibliography" ? BibliographyItemLink<T> : U extends "concept" ? ConceptItemLink<T> : U extends "spatialUnit" ? SpatialUnitItemLink<T> : U extends "period" ? PeriodItemLink<T> : U extends "person" ? PersonItemLink<T> : U extends "propertyVariable" ? PropertyVariableItemLink<T> : U extends "propertyValue" ? PropertyValueItemLink<T> : U extends "resource" ? ResourceItemLink<T> : U extends "text" ? TextItemLink<T> : U extends "dictionaryUnit" ? DictionaryUnitItemLink<T> : never : never;
 /**
  * An Item in OCHRE (can be a tree, set, bibliography, concept, spatial unit, period, person, property value, property variable, or resource)
  */
-type Item<U extends DataCategory = DataCategory, V extends HierarchyItemDataCategory<U> = HierarchyItemDataCategory<U>, T extends ReadonlyArray<string> = ReadonlyArray<string>, W extends ItemLocation = "topLevel"> = U extends DataCategory ? U extends "tree" ? Tree<Extract<V, ItemsDataCategory>, T, W> : U extends "set" ? Set<Extract<V, SetItemDataCategory>, T, W> : U extends "bibliography" ? Bibliography<T, W> : U extends "concept" ? Concept<T, W> : U extends "spatialUnit" ? SpatialUnit<T, W> : U extends "period" ? Period<T, W> : U extends "person" ? Person<T, W> : U extends "propertyVariable" ? PropertyVariable<T, W> : U extends "propertyValue" ? PropertyValue<T, W> : U extends "resource" ? Resource<T, W> : U extends "text" ? Text<T, W> : never : never;
+type Item<U extends ItemCategory = ItemCategory, V extends ContainedItemCategory<U> = ContainedItemCategory<U>, T extends LanguageCodes = LanguageCodes, W extends ItemPayloadKind = "topLevel"> = U extends ItemCategory ? U extends "tree" ? Tree<Extract<V, TreeItemCategory>, T, W> : U extends "set" ? Set<Extract<V, SetItemCategory>, T, W> : U extends "bibliography" ? Bibliography<T, W> : U extends "concept" ? Concept<T, W> : U extends "spatialUnit" ? SpatialUnit<T, W> : U extends "period" ? Period<T, W> : U extends "person" ? Person<T, W> : U extends "propertyVariable" ? PropertyVariable<T, W> : U extends "propertyValue" ? PropertyValue<T, W> : U extends "resource" ? Resource<T, W> : U extends "text" ? Text<T, W> : never : never;
+type TopLevelItem<U extends ItemCategory = ItemCategory, V extends ContainedItemCategory<U> = ContainedItemCategory<U>, T extends LanguageCodes = LanguageCodes> = Item<U, V, T, "topLevel">;
+type EmbeddedItem<U extends ItemCategory = ItemCategory, V extends ContainedItemCategory<U> = ContainedItemCategory<U>, T extends LanguageCodes = LanguageCodes> = Item<U, V, T, "embedded">;
+type AnyItem<U extends ItemCategory = ItemCategory, V extends ContainedItemCategory<U> = ContainedItemCategory<U>, T extends LanguageCodes = LanguageCodes> = Item<U, V, T, ItemPayloadKind>;
 /**
  *  Heading in OCHRE
  */
-type Heading<U extends HeadingDataCategory, T extends ReadonlyArray<string>> = {
+type Heading<U extends HeadingItemCategory = HeadingItemCategory, T extends LanguageCodes = LanguageCodes> = {
   name: string;
   headings: Array<Heading<U, T>>;
-  items: Array<Item<U, never, T, "nested">>;
+  items: Array<Item<U, never, T, "embedded">>;
 };
 /**
  *  Tree in OCHRE
  */
-type Tree<U extends ItemsDataCategory, T extends ReadonlyArray<string>, V extends ItemLocation = "topLevel"> = Prettify<BaseItem<"tree", T, V> & {
+type Tree<U extends TreeItemCategory = TreeItemCategory, T extends LanguageCodes = LanguageCodes, V extends ItemPayloadKind = "topLevel"> = Prettify<BaseItem<"tree", T, V> & {
   type: string | null;
-  itemsCategory: U | null;
+  containedItemCategory: U | null;
   links: ItemLinks<T>;
   notes: Array<Note<T>>;
   properties: Array<Property<T>>;
-  bibliographies: Array<Bibliography<T, "nested">>;
-  items: U extends HeadingDataCategory ? Array<Heading<U, T> | Item<U, never, T, "nested">> : Array<Item<U, never, T, "nested">>;
+  bibliographies: Array<Bibliography<T, "embedded">>;
+  items: U extends HeadingItemCategory ? Array<Heading<U, T> | Item<U, never, T, "embedded">> : Array<Item<U, never, T, "embedded">>;
 }>;
 /**
  *  Set in OCHRE
  */
-type Set<U extends SetItemDataCategory, T extends ReadonlyArray<string>, V extends ItemLocation = "topLevel"> = Prettify<BaseItem<"set", T, V> & {
-  itemsCategory: Array<U>;
+type Set<U extends SetItemCategory = SetItemCategory, T extends LanguageCodes = LanguageCodes, V extends ItemPayloadKind = "topLevel"> = Prettify<BaseItem<"set", T, V> & {
+  containedItemCategories: Array<U>;
   isTabularStructure: boolean;
   isSuppressingBlanks: boolean;
   links: ItemLinks<T>;
@@ -649,25 +666,25 @@ type Set<U extends SetItemDataCategory, T extends ReadonlyArray<string>, V exten
   properties: Array<Property<T>>;
   items: Array<SetItem<U, T>>;
 }>;
-type SetBibliography<T extends ReadonlyArray<string>> = Bibliography<T, "nested"> extends infer U ? U extends {
+type SetBibliography<T extends LanguageCodes = LanguageCodes> = Bibliography<T, "embedded"> extends infer U ? U extends {
   properties: Array<Property<T>>;
 } ? Prettify<Omit<U, "properties" | "items"> & {
-  properties: Array<SingleHierarchyProperty<T>>;
+  properties: Array<SetItemProperty<T>>;
 }> : never : never;
-type SetConcept<T extends ReadonlyArray<string>> = Prettify<Omit<Concept<T, "nested">, "interpretations" | "items"> & {
-  properties: Array<SingleHierarchyProperty<T>>;
+type SetConcept<T extends LanguageCodes = LanguageCodes> = Prettify<Omit<Concept<T, "embedded">, "interpretations" | "items"> & {
+  properties: Array<SetItemProperty<T>>;
 }>;
-type SetSpatialUnit<T extends ReadonlyArray<string>> = Prettify<Omit<SpatialUnit<T, "nested">, "observations" | "items"> & {
-  properties: Array<SingleHierarchyProperty<T>>;
+type SetSpatialUnit<T extends LanguageCodes = LanguageCodes> = Prettify<Omit<SpatialUnit<T, "embedded">, "observations" | "items"> & {
+  properties: Array<SetItemProperty<T>>;
 }>;
-type SetPeriod<T extends ReadonlyArray<string>> = Prettify<Omit<WithSingleHierarchyProperties<Period<T, "nested">, T>, "items">>;
-type SetResource<T extends ReadonlyArray<string>> = Prettify<Omit<WithSingleHierarchyProperties<Resource<T, "nested">, T>, "items">>;
-type SetTree<T extends ReadonlyArray<string>> = Prettify<Omit<WithSingleHierarchyProperties<Tree<ItemsDataCategory, T, "nested">, T>, "items">>;
-type SetItem<U extends SetItemDataCategory, T extends ReadonlyArray<string>> = U extends "tree" ? SetTree<T> : U extends "bibliography" ? SetBibliography<T> : U extends "concept" ? SetConcept<T> : U extends "spatialUnit" ? SetSpatialUnit<T> : U extends "period" ? SetPeriod<T> : U extends "person" ? WithSingleHierarchyProperties<Person<T, "nested">, T> : U extends "propertyVariable" ? PropertyVariable<T, "nested"> : U extends "propertyValue" ? WithSingleHierarchyProperties<PropertyValue<T, "nested">, T> : U extends "resource" ? SetResource<T> : U extends "text" ? Text<T, "nested"> : U extends "set" ? Omit<WithSingleHierarchyProperties<Set<SetItemDataCategory, T, "nested">, T>, "items"> : never;
+type SetPeriod<T extends LanguageCodes = LanguageCodes> = Prettify<Omit<WithSetItemProperties<Period<T, "embedded">, T>, "items">>;
+type SetResource<T extends LanguageCodes = LanguageCodes> = Prettify<Omit<WithSetItemProperties<Resource<T, "embedded">, T>, "items">>;
+type SetTree<T extends LanguageCodes = LanguageCodes> = Prettify<Omit<WithSetItemProperties<Tree<TreeItemCategory, T, "embedded">, T>, "items">>;
+type SetItem<U extends SetItemCategory = SetItemCategory, T extends LanguageCodes = LanguageCodes> = U extends "tree" ? SetTree<T> : U extends "bibliography" ? SetBibliography<T> : U extends "concept" ? SetConcept<T> : U extends "spatialUnit" ? SetSpatialUnit<T> : U extends "period" ? SetPeriod<T> : U extends "person" ? WithSetItemProperties<Person<T, "embedded">, T> : U extends "propertyVariable" ? PropertyVariable<T, "embedded"> : U extends "propertyValue" ? WithSetItemProperties<PropertyValue<T, "embedded">, T> : U extends "resource" ? SetResource<T> : U extends "text" ? Text<T, "embedded"> : U extends "set" ? Omit<WithSetItemProperties<Set<SetItemCategory, T, "embedded">, T>, "items"> : never;
 /**
  *  Person in OCHRE
  */
-type Person<T extends ReadonlyArray<string>, U extends ItemLocation = "topLevel"> = Prettify<BaseItem<"person", T, U> & {
+type Person<T extends LanguageCodes = LanguageCodes, U extends ItemPayloadKind = "topLevel"> = Prettify<BaseItem<"person", T, U> & {
   type: string;
   image: Image<T> | null;
   address: {
@@ -678,7 +695,7 @@ type Person<T extends ReadonlyArray<string>, U extends ItemLocation = "topLevel"
   } | null;
   coordinates: Array<Coordinates<T>>;
   content: MultilingualString<T> | null;
-  periods: Array<Period<T, "nested">>;
+  periods: Array<Period<T, "embedded">>;
   links: ItemLinks<T>;
   notes: Array<Note<T>>;
   properties: Array<Property<T>>;
@@ -686,19 +703,19 @@ type Person<T extends ReadonlyArray<string>, U extends ItemLocation = "topLevel"
 /**
  *  Period in OCHRE
  */
-type Period<T extends ReadonlyArray<string>, U extends ItemLocation = "topLevel"> = Prettify<BaseItem<"period", T, U> & {
+type Period<T extends LanguageCodes = LanguageCodes, U extends ItemPayloadKind = "topLevel"> = Prettify<BaseItem<"period", T, U> & {
   type: string | null;
   coordinates: Array<Coordinates<T>>;
   links: ItemLinks<T>;
   notes: Array<Note<T>>;
   properties: Array<Property<T>>;
-  bibliographies: Array<Bibliography<T, "nested">>;
-  items: Array<Period<T, "nested">>;
+  bibliographies: Array<Bibliography<T, "embedded">>;
+  items: Array<Period<T, "embedded">>;
 }>;
 /**
  *  Bibliography in OCHRE
  */
-type Bibliography<T extends ReadonlyArray<string>, U extends ItemLocation = "topLevel"> = Prettify<BaseItem<"bibliography", T, U> & {
+type Bibliography<T extends LanguageCodes = LanguageCodes, U extends ItemPayloadKind = "topLevel"> = Prettify<BaseItem<"bibliography", T, U> & {
   citationDetails: string | null;
   citationFormat: MultilingualString<T> | null;
   citationFormatSpan: string | null;
@@ -706,18 +723,18 @@ type Bibliography<T extends ReadonlyArray<string>, U extends ItemLocation = "top
   image: Image<T> | null;
   sourceDocument: BibliographySourceDocument | null;
   publicationInfo: {
-    publishers: Array<Person<T, "nested">>;
+    publishers: Array<Person<T, "embedded">>;
     startDate: Date | null;
   } | null;
   entryInfo: BibliographyEntryInfo | null;
-  source: ItemLink<ItemsDataCategory, T> | null;
-  authors: Array<Person<T, "nested">>;
-  periods: Array<Period<T, "nested">>;
+  source: ItemLink<TreeItemCategory, T> | null;
+  authors: Array<Person<T, "embedded">>;
+  periods: Array<Period<T, "embedded">>;
   links: ItemLinks<T>;
   notes: Array<Note<T>>;
   properties: Array<Property<T>>;
-  bibliographies: Array<Bibliography<T, "nested">>;
-  items: Array<Bibliography<T, "nested">>;
+  bibliographies: Array<Bibliography<T, "embedded">>;
+  items: Array<Bibliography<T, "embedded">>;
 } & ({
   type: "zotero";
   zoteroId: string;
@@ -728,29 +745,29 @@ type Bibliography<T extends ReadonlyArray<string>, U extends ItemLocation = "top
 /**
  *  Concept in OCHRE
  */
-type Concept<T extends ReadonlyArray<string>, U extends ItemLocation = "topLevel"> = Prettify<BaseItem<"concept", T, U> & {
+type Concept<T extends LanguageCodes = LanguageCodes, U extends ItemPayloadKind = "topLevel"> = Prettify<BaseItem<"concept", T, U> & {
   image: Image<T> | null;
   interpretations: Array<Interpretation<T>>;
   coordinates: Array<Coordinates<T>>;
-  items: Array<Concept<T, "nested">>;
+  items: Array<Concept<T, "embedded">>;
 }>;
 /**
  *  Interpretation in OCHRE
  */
-type Interpretation<T extends ReadonlyArray<string>> = {
+type Interpretation<T extends LanguageCodes = LanguageCodes> = {
   number: number;
   date: Date | null;
-  observers: Array<Person<T, "nested">>;
-  periods: Array<Period<T, "nested">>;
+  observers: Array<Person<T, "embedded">>;
+  periods: Array<Period<T, "embedded">>;
   links: ItemLinks<T>;
   notes: Array<Note<T>>;
   properties: Array<Property<T>>;
-  bibliographies: Array<Bibliography<T, "nested">>;
+  bibliographies: Array<Bibliography<T, "embedded">>;
 };
 /**
  *  Spatial unit in OCHRE
  */
-type SpatialUnit<T extends ReadonlyArray<string>, U extends ItemLocation = "topLevel"> = Prettify<BaseItem<"spatialUnit", T, U> & {
+type SpatialUnit<T extends LanguageCodes = LanguageCodes, U extends ItemPayloadKind = "topLevel"> = Prettify<BaseItem<"spatialUnit", T, U> & {
   image: Image<T> | null;
   coordinates: Array<Coordinates<T>>;
   mapData: {
@@ -760,46 +777,46 @@ type SpatialUnit<T extends ReadonlyArray<string>, U extends ItemLocation = "topL
     };
   } | null;
   observations: Array<Observation<T>>;
-  bibliographies: Array<Bibliography<T, "nested">>;
-  items: Array<SpatialUnit<T, "nested">>;
+  bibliographies: Array<Bibliography<T, "embedded">>;
+  items: Array<SpatialUnit<T, "embedded">>;
 }>;
 /**
  *  Observation in OCHRE
  */
-type Observation<T extends ReadonlyArray<string>> = {
+type Observation<T extends LanguageCodes = LanguageCodes> = {
   number: number;
   date: Date | null;
-  observers: Array<string> | Array<Person<T, "nested">>;
-  periods: Array<Period<T, "nested">>;
+  observers: Array<string> | Array<Person<T, "embedded">>;
+  periods: Array<Period<T, "embedded">>;
   links: ItemLinks<T>;
   notes: Array<Note<T>>;
   properties: Array<Property<T>>;
-  bibliographies: Array<Bibliography<T, "nested">>;
+  bibliographies: Array<Bibliography<T, "embedded">>;
 };
 /**
  *  Property variable in OCHRE
  */
-type PropertyVariable<T extends ReadonlyArray<string>, U extends ItemLocation = "topLevel"> = Prettify<BaseItem<"propertyVariable", T, U> & {
+type PropertyVariable<T extends LanguageCodes = LanguageCodes, U extends ItemPayloadKind = "topLevel"> = Prettify<BaseItem<"propertyVariable", T, U> & {
   type: string | null;
   coordinates: Array<Coordinates<T>>;
   links: ItemLinks<T>;
   notes: Array<Note<T>>;
-  bibliographies: Array<Bibliography<T, "nested">>;
+  bibliographies: Array<Bibliography<T, "embedded">>;
 }>;
 /**
  *  Property value in OCHRE
  */
-type PropertyValue<T extends ReadonlyArray<string>, U extends ItemLocation = "topLevel"> = Prettify<BaseItem<"propertyValue", T, U> & {
+type PropertyValue<T extends LanguageCodes = LanguageCodes, U extends ItemPayloadKind = "topLevel"> = Prettify<BaseItem<"propertyValue", T, U> & {
   coordinates: Array<Coordinates<T>>;
   links: ItemLinks<T>;
   notes: Array<Note<T>>;
   properties: Array<Property<T>>;
-  bibliographies: Array<Bibliography<T, "nested">>;
+  bibliographies: Array<Bibliography<T, "embedded">>;
 }>;
 /**
  *  Resource in OCHRE
  */
-type Resource<T extends ReadonlyArray<string>, U extends ItemLocation = "topLevel"> = Prettify<BaseItem<"resource", T, U> & {
+type Resource<T extends LanguageCodes = LanguageCodes, U extends ItemPayloadKind = "topLevel"> = Prettify<BaseItem<"resource", T, U> & {
   type: string;
   href: string | null;
   fileFormat: string | null;
@@ -811,18 +828,18 @@ type Resource<T extends ReadonlyArray<string>, U extends ItemLocation = "topLeve
   document: MultilingualString<T> | null;
   imageMap: ImageMap | null;
   coordinates: Array<Coordinates<T>>;
-  periods: Array<Period<T, "nested">>;
+  periods: Array<Period<T, "embedded">>;
   links: ItemLinks<T>;
   reverseLinks: ItemLinks<T>;
   notes: Array<Note<T>>;
   properties: Array<Property<T>>;
-  bibliographies: Array<Bibliography<T, "nested">>;
-  items: Array<Resource<T, "nested">>;
+  bibliographies: Array<Bibliography<T, "embedded">>;
+  items: Array<Resource<T, "embedded">>;
 }>;
 /**
  *  Text in OCHRE
  */
-type Text<T extends ReadonlyArray<string>, U extends ItemLocation = "topLevel"> = Prettify<BaseItem<"text", T, U> & {
+type Text<T extends LanguageCodes = LanguageCodes, U extends ItemPayloadKind = "topLevel"> = Prettify<BaseItem<"text", T, U> & {
   type: string;
   text: string | null;
   language: string | null;
@@ -832,14 +849,14 @@ type Text<T extends ReadonlyArray<string>, U extends ItemLocation = "topLevel">
   reverseLinks: ItemLinks<T>;
   notes: Array<Note<T>>;
   sections: Array<Section<T>>;
-  periods: Array<Period<T, "nested">>;
-  creators: Array<Person<T, "nested">>;
-  editions: Array<Person<T, "nested">>;
+  periods: Array<Period<T, "embedded">>;
+  creators: Array<Person<T, "embedded">>;
+  editions: Array<Person<T, "embedded">>;
 }>;
 /**
  *  Section in OCHRE
  */
-type Section<T extends ReadonlyArray<string>> = {
+type Section<T extends LanguageCodes = LanguageCodes> = {
   uuid: string;
   publicationDateTime: Date | null;
   identification: Identification<T>;
@@ -847,13 +864,35 @@ type Section<T extends ReadonlyArray<string>> = {
     identification: Identification<T>;
   } | null;
 };
+type EmbeddedTree<U extends TreeItemCategory = TreeItemCategory, T extends LanguageCodes = LanguageCodes> = Tree<U, T, "embedded">;
+type AnyTree<U extends TreeItemCategory = TreeItemCategory, T extends LanguageCodes = LanguageCodes> = Tree<U, T, ItemPayloadKind>;
+type EmbeddedSet<U extends SetItemCategory = SetItemCategory, T extends LanguageCodes = LanguageCodes> = Set<U, T, "embedded">;
+type AnySet<U extends SetItemCategory = SetItemCategory, T extends LanguageCodes = LanguageCodes> = Set<U, T, ItemPayloadKind>;
+type EmbeddedBibliography<T extends LanguageCodes = LanguageCodes> = Bibliography<T, "embedded">;
+type AnyBibliography<T extends LanguageCodes = LanguageCodes> = Bibliography<T, ItemPayloadKind>;
+type EmbeddedConcept<T extends LanguageCodes = LanguageCodes> = Concept<T, "embedded">;
+type AnyConcept<T extends LanguageCodes = LanguageCodes> = Concept<T, ItemPayloadKind>;
+type EmbeddedSpatialUnit<T extends LanguageCodes = LanguageCodes> = SpatialUnit<T, "embedded">;
+type AnySpatialUnit<T extends LanguageCodes = LanguageCodes> = SpatialUnit<T, ItemPayloadKind>;
+type EmbeddedPeriod<T extends LanguageCodes = LanguageCodes> = Period<T, "embedded">;
+type AnyPeriod<T extends LanguageCodes = LanguageCodes> = Period<T, ItemPayloadKind>;
+type EmbeddedPerson<T extends LanguageCodes = LanguageCodes> = Person<T, "embedded">;
+type AnyPerson<T extends LanguageCodes = LanguageCodes> = Person<T, ItemPayloadKind>;
+type EmbeddedPropertyVariable<T extends LanguageCodes = LanguageCodes> = PropertyVariable<T, "embedded">;
+type AnyPropertyVariable<T extends LanguageCodes = LanguageCodes> = PropertyVariable<T, ItemPayloadKind>;
+type EmbeddedPropertyValue<T extends LanguageCodes = LanguageCodes> = PropertyValue<T, "embedded">;
+type AnyPropertyValue<T extends LanguageCodes = LanguageCodes> = PropertyValue<T, ItemPayloadKind>;
+type EmbeddedResource<T extends LanguageCodes = LanguageCodes> = Resource<T, "embedded">;
+type AnyResource<T extends LanguageCodes = LanguageCodes> = Resource<T, ItemPayloadKind>;
+type EmbeddedText<T extends LanguageCodes = LanguageCodes> = Text<T, "embedded">;
+type AnyText<T extends LanguageCodes = LanguageCodes> = Text<T, ItemPayloadKind>;
 /**
  * Represents a gallery with its identification, project identification, resources and max length
  */
-type Gallery<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type Gallery<T extends LanguageCodes = LanguageCodes> = {
   identification: Identification<T>;
   projectIdentification: Identification<T>;
-  resources: Array<Resource<T, "nested">>;
+  resources: Array<Resource<T, "embedded">>;
   maxLength: number;
 };
 /**
@@ -861,7 +900,7 @@ type Gallery<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
  */
 type PropertyValueQueryItem = {
   count: number;
-  dataType: Exclude<PropertyValueContent<ReadonlyArray<string>>["dataType"], "coordinate">;
+  dataType: QueryablePropertyValueDataType;
   content: string | number | boolean | null;
   label: MultilingualString | null;
 };
@@ -888,7 +927,7 @@ type SetItemsSort = {
 } | {
   target: "propertyValue";
   propertyVariableUuid: string;
-  dataType: Exclude<PropertyValueContent<ReadonlyArray<string>>["dataType"], "coordinate">;
+  dataType: QueryablePropertyValueDataType;
   direction?: SetItemsSortDirection;
   language?: string;
 };
@@ -898,7 +937,7 @@ type SetItemsSort = {
 type QueryLeaf = {
   target: "property";
   propertyVariable?: string;
-  dataType: Exclude<PropertyValueContent<ReadonlyArray<string>>["dataType"], "coordinate" | "date" | "dateTime">;
+  dataType: Exclude<QueryablePropertyValueDataType, "date" | "dateTime">;
   value?: string;
   from?: never;
   to?: never;
@@ -1021,15 +1060,15 @@ type FetchItemLinksLanguages<TLanguages extends ReadonlyArray<string> | undefine
  *
  * @param uuid - The UUID of the OCHRE item whose linked items should be fetched
  * @param options - Fetch and parser options
- * @param options.itemCategory - The category of items inside linked Trees/Sets to parse. Tree accepts one category; Set accepts one category or an array.
+ * @param options.containedItemCategory - The category of items inside linked Trees/Sets to parse. Tree accepts one category; Set accepts one category or an array.
  * @param options.languages - Language codes to parse. Inline arrays preserve literal types automatically.
  * @param options.fetch - Custom fetch function to use instead of the default fetch
  * @returns An object containing parsed linked items
  */
-declare function fetchItemLinks<const TItemCategory extends HierarchyItemCategoryOption<HierarchyDataCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options?: FetchItemLinksBaseOptions<TLanguages> & {
-  itemCategory?: TItemCategory;
+declare function fetchItemLinks<const TContainedItemCategory extends ContainedItemCategoryOption<ItemContainerCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options?: FetchItemLinksBaseOptions<TLanguages> & {
+  containedItemCategory?: TContainedItemCategory;
 }): Promise<{
-  items: Array<Item<DataCategory, HierarchyItemCategoryFromOption<DataCategory, TItemCategory>, FetchItemLinksLanguages<TLanguages>, "nested">>;
+  items: Array<Item<ItemCategory, ContainedItemCategoryFromOption<ItemCategory, TContainedItemCategory>, FetchItemLinksLanguages<TLanguages>, "embedded">>;
   error: null;
 } | {
   items: null;
@@ -1064,36 +1103,36 @@ declare function withLanguages<const TLanguages extends ReadonlyArray<string>>(l
  * @param uuid - The UUID of the OCHRE item to fetch
  * @param options - Required options object
  * @param options.category - The category of the OCHRE item to fetch
- * @param options.itemCategory - The category of items inside the OCHRE item to fetch. Only valid for Trees and Sets. Tree accepts one category; Set accepts one category or an array.
+ * @param options.containedItemCategory - The category of items inside the OCHRE item to fetch. Only valid for Trees and Sets. Tree accepts one category; Set accepts one category or an array.
  * @param options.languages - Language codes to parse. Inline arrays preserve literal types automatically.
  * @param options.fetch - Custom fetch function to use instead of the default fetch
  * @returns An object containing the parsed item
  */
-declare function fetchItem<const TItemCategory extends HierarchyItemCategoryOption<HierarchyDataCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options?: FetchItemBaseOptions<TLanguages> & {
+declare function fetchItem<const TContainedItemCategory extends ContainedItemCategoryOption<ItemContainerCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options?: FetchItemBaseOptions<TLanguages> & {
   category?: undefined;
-  itemCategory?: TItemCategory;
+  containedItemCategory?: TContainedItemCategory;
 }): Promise<{
-  item: Item<DataCategory, HierarchyItemCategoryFromOption<DataCategory, TItemCategory>, FetchItemLanguages<TLanguages>>;
+  item: Item<ItemCategory, ContainedItemCategoryFromOption<ItemCategory, TContainedItemCategory>, FetchItemLanguages<TLanguages>>;
   error: null;
 } | {
   item: null;
   error: string;
 }>;
-declare function fetchItem<const TCategory extends HierarchyDataCategory, const TItemCategory extends HierarchyItemCategoryOption<TCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchItemBaseOptions<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> & {
   category: TCategory;
-  itemCategory?: TItemCategory;
+  containedItemCategory?: TContainedItemCategory;
 }): Promise<{
-  item: Item<TCategory, HierarchyItemCategoryFromOption<TCategory, TItemCategory>, FetchItemLanguages<TLanguages>>;
+  item: Item<TCategory, ContainedItemCategoryFromOption<TCategory, TContainedItemCategory>, FetchItemLanguages<TLanguages>>;
   error: null;
 } | {
   item: null;
   error: string;
 }>;
-declare function fetchItem<const TCategory extends DataCategory, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchItemBaseOptions<TLanguages> & {
+declare function fetchItem<const TCategory extends ItemCategory, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(uuid: string, options: FetchItemBaseOptions<TLanguages> & {
   category: TCategory;
-  itemCategory?: never;
+  containedItemCategory?: never;
 }): Promise<{
-  item: Item<TCategory, HierarchyItemDataCategory<TCategory>, FetchItemLanguages<TLanguages>>;
+  item: Item<TCategory, ContainedItemCategory<TCategory>, FetchItemLanguages<TLanguages>>;
   error: null;
 } | {
   item: null;
@@ -1107,7 +1146,7 @@ type FetchSetItemsBaseOptions<TLanguages extends ReadonlyArray<string> | undefin
   fetch?: FetchFunction$1;
 };
 type FetchSetItemsLanguages<TLanguages extends ReadonlyArray<string> | undefined> = TLanguages extends readonly [] ? ReadonlyArray<string> : TLanguages extends ReadonlyArray<string> ? TLanguages : ReadonlyArray<string>;
-type FetchSetItemsCategory<TItemCategories extends ReadonlyArray<SetItemDataCategory> | undefined> = TItemCategories extends ReadonlyArray<infer U> ? Extract<U, SetItemDataCategory> : SetItemDataCategory;
+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
  *
@@ -1118,22 +1157,22 @@ type FetchSetItemsCategory<TItemCategories extends ReadonlyArray<SetItemDataCate
  * For propertyValue sorting, dataType is required and the sort key uses the first valid leaf value (value[not(@i)]).
  * @param params.page - The page number (1-indexed)
  * @param params.pageSize - The number of items per page
- * @param itemCategories - The categories of the items to fetch
+ * @param containedItemCategories - The categories of the items to fetch
  * @param options - Options for the fetch
  * @param options.fetch - The fetch function to use
  * @returns The parsed Set items or null if the fetch/parse fails
  */
-declare function fetchSetItems<const TItemCategories extends ReadonlyArray<SetItemDataCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(params: {
+declare function fetchSetItems<const TContainedItemCategories extends ReadonlyArray<SetItemCategory> | undefined = undefined, const TLanguages extends ReadonlyArray<string> | undefined = undefined>(params: {
   setScopeUuids: Array<string>;
   queries?: Query | null;
   sort?: SetItemsSort;
   page: number;
   pageSize?: number;
-}, itemCategories?: TItemCategories, options?: FetchSetItemsBaseOptions<TLanguages>): Promise<{
+}, containedItemCategories?: TContainedItemCategories, options?: FetchSetItemsBaseOptions<TLanguages>): Promise<{
   totalCount: number;
   page: number;
   pageSize: number;
-  items: Array<SetItem<FetchSetItemsCategory<TItemCategories>, FetchSetItemsLanguages<TLanguages>>>;
+  items: Array<SetItem<FetchSetItemsCategory<TContainedItemCategories>, FetchSetItemsLanguages<TLanguages>>>;
   error: null;
 } | {
   totalCount: null;
@@ -1185,7 +1224,7 @@ declare function fetchSetPropertyValues(params: {
 }>;
 //#endregion
 //#region src/types/website.d.ts
-type WebsitePropertyValueDataType = Exclude<PropertyValueContent<ReadonlyArray<string>>["dataType"], "coordinate">;
+type WebsitePropertyValueDataType = QueryablePropertyValueDataType;
 /**
  * Represents a context tree level item with a variable and value
  */
@@ -1196,7 +1235,7 @@ type ContextTreeLevelItem = {
 /**
  * Represents a context tree level with a context item
  */
-type ContextTreeLevel<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type ContextTreeLevel<T extends LanguageCodes = LanguageCodes> = {
   context: Array<ContextTreeLevelItem>;
   identification: Identification<T>;
   type: string;
@@ -1204,7 +1243,7 @@ type ContextTreeLevel<T extends ReadonlyArray<string> = ReadonlyArray<string>> =
 /**
  * Represents a filter context tree level with a context item
  */
-type ContextTreeFilterLevel<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type ContextTreeFilterLevel<T extends LanguageCodes = LanguageCodes> = {
   context: Array<ContextTreeLevelItem>;
   identification: Identification<T>;
   type: string;
@@ -1216,7 +1255,7 @@ type ContextTreeFilterLevel<T extends ReadonlyArray<string> = ReadonlyArray<stri
 /**
  * Represents a context tree with levels grouped by behavior
  */
-type ContextTree<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type ContextTree<T extends LanguageCodes = LanguageCodes> = {
   flatten: Array<ContextTreeLevel<T>>;
   suppress: Array<ContextTreeLevel<T>>;
   filter: Array<ContextTreeFilterLevel<T>>;
@@ -1229,7 +1268,7 @@ type ContextTree<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
 /**
  * Represents a scope with its UUID, type and identification
  */
-type Scope<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type Scope<T extends LanguageCodes = LanguageCodes> = {
   uuid: string;
   type: string;
   identification: Identification<T>;
@@ -1237,7 +1276,7 @@ type Scope<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
 /**
  * Represents a stylesheet item with its UUID and category
  */
-type StylesheetCategory = Extract<DataCategory, "propertyVariable" | "propertyValue">;
+type StylesheetCategory = Extract<ItemCategory, "propertyVariable" | "propertyValue">;
 type StylesheetItem = {
   uuid: string;
   category: "propertyVariable";
@@ -1258,7 +1297,7 @@ type StylesheetItem = {
     mobile: Array<Style>;
   };
 };
-type WebsitePropertyQueryNode<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type WebsitePropertyQueryNode<T extends LanguageCodes = LanguageCodes> = {
   target: "property";
   propertyVariable: string;
   dataType: WebsitePropertyValueDataType;
@@ -1266,7 +1305,7 @@ type WebsitePropertyQueryNode<T extends ReadonlyArray<string> = ReadonlyArray<st
   isCaseSensitive: boolean;
   language: T[number];
 };
-type WebsitePropertyQuery<T extends ReadonlyArray<string> = ReadonlyArray<string>> = WebsitePropertyQueryNode<T> | {
+type WebsitePropertyQuery<T extends LanguageCodes = LanguageCodes> = WebsitePropertyQueryNode<T> | {
   and: Array<WebsitePropertyQuery<T>>;
 } | {
   or: Array<WebsitePropertyQuery<T>>;
@@ -1278,7 +1317,7 @@ type WebsiteType = "traditional" | "digital-collection" | "plum" | "cedar" | "el
 /**
  * Represents a website with its properties and elements
  */
-type Website<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type Website<T extends LanguageCodes = LanguageCodes> = {
   uuid: string;
   belongsTo: {
     uuid: string;
@@ -1287,12 +1326,13 @@ type Website<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
   metadata: Metadata<T>;
   publicationDateTime: Date | null;
   identification: Identification<T>;
-  creators: Array<Person<T, "nested">>;
+  creators: Array<Person<T, "embedded">>;
   license: License | null;
   items: Array<Webpage<T> | WebSegment<T>>;
   properties: {
     type: WebsiteType;
     status: "development" | "preview" | "production";
+    versionLabel: "experimental" | "alpha" | "beta" | "test" | "staging" | "pre-release" | "release";
     privacy: "public" | "password" | "private";
     contact: {
       name: string;
@@ -1362,7 +1402,7 @@ type Website<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
 /**
  * Represents a webpage with its title, slug, properties, items and subpages
  */
-type Webpage<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type Webpage<T extends LanguageCodes = LanguageCodes> = {
   uuid: string;
   type: "page";
   title: MultilingualString<T>;
@@ -1388,7 +1428,7 @@ type Webpage<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
 /**
  * Represents a web segment
  */
-type WebSegment<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type WebSegment<T extends LanguageCodes = LanguageCodes> = {
   uuid: string;
   type: "segment";
   title: MultilingualString<T>;
@@ -1399,7 +1439,7 @@ type WebSegment<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
 /**
  * Represents a web segment item
  */
-type WebSegmentItem<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type WebSegmentItem<T extends LanguageCodes = LanguageCodes> = {
   uuid: string;
   type: "segment-item";
   title: MultilingualString<T>;
@@ -1410,7 +1450,7 @@ type WebSegmentItem<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
 /**
  * Represents a title with its label and variant
  */
-type WebTitle<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type WebTitle<T extends LanguageCodes = LanguageCodes> = {
   label: MultilingualString<T>;
   variant: "default" | "simple";
   properties: {
@@ -1424,7 +1464,7 @@ type WebTitle<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
 /**
  * Base properties for web elements
  */
-type WebElement<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type WebElement<T extends LanguageCodes = LanguageCodes> = {
   uuid: string;
   type: "element";
   title: WebTitle<T>;
@@ -1437,7 +1477,7 @@ type WebElement<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
 /**
  * Union type of all possible web element components
  */
-type WebElementComponent<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type WebElementComponent<T extends LanguageCodes = LanguageCodes> = {
   component: "3d-viewer";
   linkUuid: string;
   fileSize: number | null;
@@ -1466,7 +1506,7 @@ type WebElementComponent<T extends ReadonlyArray<string> = ReadonlyArray<string>
 } | {
   component: "bibliography";
   linkUuids: Array<string>;
-  bibliographies: Array<Bibliography<T, "nested">>;
+  bibliographies: Array<Bibliography<T, "embedded">>;
   layout: "long" | "short";
   isSourceDocumentDisplayed: boolean;
 } | {
@@ -1630,10 +1670,17 @@ type WebElementComponent<T extends ReadonlyArray<string> = ReadonlyArray<string>
   linkUuid: string;
   isChaptersDisplayed: boolean;
 };
+type WebElementComponentName = WebElementComponent["component"];
+type WebElementComponentOf<U extends WebElementComponentName, T extends LanguageCodes = LanguageCodes> = Extract<WebElementComponent<T>, {
+  component: U;
+}>;
+type WebElementOf<U extends WebElementComponentName, T extends LanguageCodes = LanguageCodes> = Extract<WebElement<T>, {
+  component: U;
+}>;
 /**
  * Represents an image used in web elements
  */
-type WebImage<T extends ReadonlyArray<string> = ReadonlyArray<string>> = {
+type WebImage<T extends LanguageCodes = LanguageCodes> = {
   uuid: string | null;
   label: MultilingualString<T> | null;
   description: MultilingualString<T> | null;
@@ -1652,7 +1699,7 @@ type WebBlockLayout = "vertical" | "horizontal" | "grid" | "vertical-flex" | "ho
 /**
  * Represents a block of vertical or horizontal content alignment
  */
-type WebBlock<T extends ReadonlyArray<string> = ReadonlyArray<string>, U extends WebBlockLayout = WebBlockLayout> = {
+type WebBlock<T extends LanguageCodes = LanguageCodes, U extends WebBlockLayout = WebBlockLayout> = {
   uuid: string;
   type: "block";
   title: WebTitle<T>;
@@ -1686,6 +1733,8 @@ type WebBlock<T extends ReadonlyArray<string> = ReadonlyArray<string>, U extends
     mobile: Array<Style>;
   };
 };
+type WebBlockByLayout<U extends WebBlockLayout = WebBlockLayout, T extends LanguageCodes = LanguageCodes> = WebBlock<T, U>;
+type AccordionWebBlock<T extends LanguageCodes = LanguageCodes> = WebBlock<T, "accordion">;
 //#endregion
 //#region src/fetchers/website.d.ts
 type FetchFunction = (input: string | URL | globalThis.Request, init?: RequestInit) => Promise<Response>;
@@ -1695,7 +1744,7 @@ type FetchFunction = (input: string | URL | globalThis.Request, init?: RequestIn
  * @param abbreviation - The abbreviation identifier for the website
  * @returns The parsed website configuration or null if the fetch/parse fails
  */
-declare function fetchWebsite<const T extends ReadonlyArray<string> = ReadonlyArray<string>>(abbreviation: string, options?: {
+declare function fetchWebsite<const T extends LanguageCodes = LanguageCodes>(abbreviation: string, options?: {
   fetch?: FetchFunction;
   languages?: T;
 }): Promise<{
@@ -1714,8 +1763,8 @@ type PropertyOptions = {
   /** Whether to recursively search through nested properties. */includeNestedProperties?: boolean; /** Whether to limit property values to leaf values. */
   limitToLeafPropertyValues?: boolean;
 };
-type PropertyContent<T extends ReadonlyArray<string>> = PropertyValueContent<T>["content"];
-type SearchableProperty<T extends ReadonlyArray<string>> = Property<T> | SingleHierarchyProperty<T> | SimplifiedProperty<T> | SingleHierarchySimplifiedProperty<T>;
+type PropertyContent<T extends LanguageCodes> = PropertyValueContent<T>["content"];
+type SearchableProperty<T extends LanguageCodes> = PropertyLike<T>;
 /**
  * Finds a property by its variable UUID in an array of properties.
  *
@@ -1724,10 +1773,10 @@ type SearchableProperty<T extends ReadonlyArray<string>> = Property<T> | SingleH
  * @param options - Search options, including whether to include nested properties
  * @returns The matching Property object, or null if not found
  */
-declare function getPropertyByVariableUuid<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<Property<T>>, variableUuid: string, options?: PropertyOptions): Property<T> | null;
-declare function getPropertyByVariableUuid<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchyProperty<T>>, variableUuid: string, options?: PropertyOptions): SingleHierarchyProperty<T> | null;
-declare function getPropertyByVariableUuid<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SimplifiedProperty<T>>, variableUuid: string, options?: PropertyOptions): SimplifiedProperty<T> | null;
-declare function getPropertyByVariableUuid<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchySimplifiedProperty<T>>, variableUuid: string, options?: PropertyOptions): SingleHierarchySimplifiedProperty<T> | null;
+declare function getPropertyByVariableUuid<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<Property<T>>, variableUuid: string, options?: PropertyOptions): Property<T> | null;
+declare function getPropertyByVariableUuid<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemProperty<T>>, variableUuid: string, options?: PropertyOptions): SetItemProperty<T> | null;
+declare function getPropertyByVariableUuid<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SimplifiedProperty<T>>, variableUuid: string, options?: PropertyOptions): SimplifiedProperty<T> | null;
+declare function getPropertyByVariableUuid<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemSimplifiedProperty<T>>, variableUuid: string, options?: PropertyOptions): SetItemSimplifiedProperty<T> | null;
 /**
  * Retrieves all values for a property with the given variable UUID.
  *
@@ -1736,7 +1785,7 @@ declare function getPropertyByVariableUuid<T extends ReadonlyArray<string> = Rea
  * @param options - Search options, including whether to include nested properties
  * @returns Array of property values, or null if property not found
  */
-declare function getPropertyValuesByVariableUuid<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SearchableProperty<T>>, variableUuid: string, options?: PropertyOptions): Array<PropertyValueContent<T>> | null;
+declare function getPropertyValuesByVariableUuid<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SearchableProperty<T>>, variableUuid: string, options?: PropertyOptions): Array<PropertyValueContent<T>> | null;
 /**
  * Retrieves all value contents for a property with the given variable UUID.
  *
@@ -1745,7 +1794,7 @@ declare function getPropertyValuesByVariableUuid<T extends ReadonlyArray<string>
  * @param options - Search options, including whether to include nested properties
  * @returns Array of property value contents, or null if property not found
  */
-declare function getPropertyValueContentsByVariableUuid<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SearchableProperty<T>>, variableUuid: string, options?: PropertyOptions): Array<PropertyContent<T>> | null;
+declare function getPropertyValueContentsByVariableUuid<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SearchableProperty<T>>, variableUuid: string, options?: PropertyOptions): Array<PropertyContent<T>> | null;
 /**
  * Gets the first value of a property with the given variable UUID.
  *
@@ -1754,7 +1803,7 @@ declare function getPropertyValueContentsByVariableUuid<T extends ReadonlyArray<
  * @param options - Search options, including whether to include nested properties
  * @returns The first property value, or null if property not found
  */
-declare function getPropertyValueByVariableUuid<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SearchableProperty<T>>, variableUuid: string, options?: PropertyOptions): PropertyValueContent<T> | null;
+declare function getPropertyValueByVariableUuid<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SearchableProperty<T>>, variableUuid: string, options?: PropertyOptions): PropertyValueContent<T> | null;
 /**
  * Gets the first value content of a property with the given variable UUID.
  *
@@ -1763,7 +1812,7 @@ declare function getPropertyValueByVariableUuid<T extends ReadonlyArray<string>
  * @param options - Search options, including whether to include nested properties
  * @returns The first property value content, or null if property not found
  */
-declare function getPropertyValueContentByVariableUuid<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SearchableProperty<T>>, variableUuid: string, options?: PropertyOptions): PropertyContent<T> | null;
+declare function getPropertyValueContentByVariableUuid<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SearchableProperty<T>>, variableUuid: string, options?: PropertyOptions): PropertyContent<T> | null;
 /**
  * Finds a property by its variable label in an array of properties.
  *
@@ -1772,10 +1821,10 @@ declare function getPropertyValueContentByVariableUuid<T extends ReadonlyArray<s
  * @param options - Search options, including whether to include nested properties
  * @returns The matching Property object, or null if not found
  */
-declare function getPropertyByVariableLabel<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<Property<T>>, variableLabel: string, options?: PropertyOptions): Property<T> | null;
-declare function getPropertyByVariableLabel<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchyProperty<T>>, variableLabel: string, options?: PropertyOptions): SingleHierarchyProperty<T> | null;
-declare function getPropertyByVariableLabel<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SimplifiedProperty<T>>, variableLabel: string, options?: PropertyOptions): SimplifiedProperty<T> | null;
-declare function getPropertyByVariableLabel<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchySimplifiedProperty<T>>, variableLabel: string, options?: PropertyOptions): SingleHierarchySimplifiedProperty<T> | null;
+declare function getPropertyByVariableLabel<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<Property<T>>, variableLabel: string, options?: PropertyOptions): Property<T> | null;
+declare function getPropertyByVariableLabel<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemProperty<T>>, variableLabel: string, options?: PropertyOptions): SetItemProperty<T> | null;
+declare function getPropertyByVariableLabel<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SimplifiedProperty<T>>, variableLabel: string, options?: PropertyOptions): SimplifiedProperty<T> | null;
+declare function getPropertyByVariableLabel<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemSimplifiedProperty<T>>, variableLabel: string, options?: PropertyOptions): SetItemSimplifiedProperty<T> | null;
 /**
  * Finds a property by its variable label and all values.
  *
@@ -1785,10 +1834,10 @@ declare function getPropertyByVariableLabel<T extends ReadonlyArray<string> = Re
  * @param options - Search options, including whether to include nested properties
  * @returns The matching Property object, or null if not found or all values do not match
  */
-declare function getPropertyByVariableLabelAndValues<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<Property<T>>, variableLabel: string, values: ReadonlyArray<PropertyValueContent<T>>, options?: PropertyOptions): Property<T> | null;
-declare function getPropertyByVariableLabelAndValues<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchyProperty<T>>, variableLabel: string, values: ReadonlyArray<PropertyValueContent<T>>, options?: PropertyOptions): SingleHierarchyProperty<T> | null;
-declare function getPropertyByVariableLabelAndValues<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SimplifiedProperty<T>>, variableLabel: string, values: ReadonlyArray<PropertyValueContent<T>>, options?: PropertyOptions): SimplifiedProperty<T> | null;
-declare function getPropertyByVariableLabelAndValues<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchySimplifiedProperty<T>>, variableLabel: string, values: ReadonlyArray<PropertyValueContent<T>>, options?: PropertyOptions): SingleHierarchySimplifiedProperty<T> | null;
+declare function getPropertyByVariableLabelAndValues<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<Property<T>>, variableLabel: string, values: ReadonlyArray<PropertyValueContent<T>>, options?: PropertyOptions): Property<T> | null;
+declare function getPropertyByVariableLabelAndValues<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemProperty<T>>, variableLabel: string, values: ReadonlyArray<PropertyValueContent<T>>, options?: PropertyOptions): SetItemProperty<T> | null;
+declare function getPropertyByVariableLabelAndValues<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SimplifiedProperty<T>>, variableLabel: string, values: ReadonlyArray<PropertyValueContent<T>>, options?: PropertyOptions): SimplifiedProperty<T> | null;
+declare function getPropertyByVariableLabelAndValues<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemSimplifiedProperty<T>>, variableLabel: string, values: ReadonlyArray<PropertyValueContent<T>>, options?: PropertyOptions): SetItemSimplifiedProperty<T> | null;
 /**
  * Finds a property by its variable label and all value contents.
  *
@@ -1798,10 +1847,10 @@ declare function getPropertyByVariableLabelAndValues<T extends ReadonlyArray<str
  * @param options - Search options, including whether to include nested properties
  * @returns The matching Property object, or null if not found or all value contents do not match
  */
-declare function getPropertyByVariableLabelAndValueContents<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<Property<T>>, variableLabel: string, valueContents: ReadonlyArray<PropertyContent<T>>, options?: PropertyOptions): Property<T> | null;
-declare function getPropertyByVariableLabelAndValueContents<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchyProperty<T>>, variableLabel: string, valueContents: ReadonlyArray<PropertyContent<T>>, options?: PropertyOptions): SingleHierarchyProperty<T> | null;
-declare function getPropertyByVariableLabelAndValueContents<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SimplifiedProperty<T>>, variableLabel: string, valueContents: ReadonlyArray<PropertyContent<T>>, options?: PropertyOptions): SimplifiedProperty<T> | null;
-declare function getPropertyByVariableLabelAndValueContents<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchySimplifiedProperty<T>>, variableLabel: string, valueContents: ReadonlyArray<PropertyContent<T>>, options?: PropertyOptions): SingleHierarchySimplifiedProperty<T> | null;
+declare function getPropertyByVariableLabelAndValueContents<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<Property<T>>, variableLabel: string, valueContents: ReadonlyArray<PropertyContent<T>>, options?: PropertyOptions): Property<T> | null;
+declare function getPropertyByVariableLabelAndValueContents<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemProperty<T>>, variableLabel: string, valueContents: ReadonlyArray<PropertyContent<T>>, options?: PropertyOptions): SetItemProperty<T> | null;
+declare function getPropertyByVariableLabelAndValueContents<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SimplifiedProperty<T>>, variableLabel: string, valueContents: ReadonlyArray<PropertyContent<T>>, options?: PropertyOptions): SimplifiedProperty<T> | null;
+declare function getPropertyByVariableLabelAndValueContents<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemSimplifiedProperty<T>>, variableLabel: string, valueContents: ReadonlyArray<PropertyContent<T>>, options?: PropertyOptions): SetItemSimplifiedProperty<T> | null;
 /**
  * Finds a property by its variable label and one value.
  *
@@ -1811,10 +1860,10 @@ declare function getPropertyByVariableLabelAndValueContents<T extends ReadonlyAr
  * @param options - Search options, including whether to include nested properties
  * @returns The matching Property object, or null if not found or value does not match
  */
-declare function getPropertyByVariableLabelAndValue<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<Property<T>>, variableLabel: string, value: PropertyValueContent<T>, options?: PropertyOptions): Property<T> | null;
-declare function getPropertyByVariableLabelAndValue<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchyProperty<T>>, variableLabel: string, value: PropertyValueContent<T>, options?: PropertyOptions): SingleHierarchyProperty<T> | null;
-declare function getPropertyByVariableLabelAndValue<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SimplifiedProperty<T>>, variableLabel: string, value: PropertyValueContent<T>, options?: PropertyOptions): SimplifiedProperty<T> | null;
-declare function getPropertyByVariableLabelAndValue<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchySimplifiedProperty<T>>, variableLabel: string, value: PropertyValueContent<T>, options?: PropertyOptions): SingleHierarchySimplifiedProperty<T> | null;
+declare function getPropertyByVariableLabelAndValue<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<Property<T>>, variableLabel: string, value: PropertyValueContent<T>, options?: PropertyOptions): Property<T> | null;
+declare function getPropertyByVariableLabelAndValue<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemProperty<T>>, variableLabel: string, value: PropertyValueContent<T>, options?: PropertyOptions): SetItemProperty<T> | null;
+declare function getPropertyByVariableLabelAndValue<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SimplifiedProperty<T>>, variableLabel: string, value: PropertyValueContent<T>, options?: PropertyOptions): SimplifiedProperty<T> | null;
+declare function getPropertyByVariableLabelAndValue<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemSimplifiedProperty<T>>, variableLabel: string, value: PropertyValueContent<T>, options?: PropertyOptions): SetItemSimplifiedProperty<T> | null;
 /**
  * Finds a property by its variable label and one value content.
  *
@@ -1824,10 +1873,10 @@ declare function getPropertyByVariableLabelAndValue<T extends ReadonlyArray<stri
  * @param options - Search options, including whether to include nested properties
  * @returns The matching Property object, or null if not found or value content does not match
  */
-declare function getPropertyByVariableLabelAndValueContent<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<Property<T>>, variableLabel: string, valueContent: PropertyContent<T>, options?: PropertyOptions): Property<T> | null;
-declare function getPropertyByVariableLabelAndValueContent<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchyProperty<T>>, variableLabel: string, valueContent: PropertyContent<T>, options?: PropertyOptions): SingleHierarchyProperty<T> | null;
-declare function getPropertyByVariableLabelAndValueContent<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SimplifiedProperty<T>>, variableLabel: string, valueContent: PropertyContent<T>, options?: PropertyOptions): SimplifiedProperty<T> | null;
-declare function getPropertyByVariableLabelAndValueContent<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchySimplifiedProperty<T>>, variableLabel: string, valueContent: PropertyContent<T>, options?: PropertyOptions): SingleHierarchySimplifiedProperty<T> | null;
+declare function getPropertyByVariableLabelAndValueContent<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<Property<T>>, variableLabel: string, valueContent: PropertyContent<T>, options?: PropertyOptions): Property<T> | null;
+declare function getPropertyByVariableLabelAndValueContent<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemProperty<T>>, variableLabel: string, valueContent: PropertyContent<T>, options?: PropertyOptions): SetItemProperty<T> | null;
+declare function getPropertyByVariableLabelAndValueContent<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SimplifiedProperty<T>>, variableLabel: string, valueContent: PropertyContent<T>, options?: PropertyOptions): SimplifiedProperty<T> | null;
+declare function getPropertyByVariableLabelAndValueContent<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemSimplifiedProperty<T>>, variableLabel: string, valueContent: PropertyContent<T>, options?: PropertyOptions): SetItemSimplifiedProperty<T> | null;
 /**
  * Retrieves all values for a property with the given variable label.
  *
@@ -1836,7 +1885,7 @@ declare function getPropertyByVariableLabelAndValueContent<T extends ReadonlyArr
  * @param options - Search options, including whether to include nested properties
  * @returns Array of property values, or null if property not found
  */
-declare function getPropertyValuesByVariableLabel<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SearchableProperty<T>>, variableLabel: string, options?: PropertyOptions): Array<PropertyValueContent<T>> | null;
+declare function getPropertyValuesByVariableLabel<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SearchableProperty<T>>, variableLabel: string, options?: PropertyOptions): Array<PropertyValueContent<T>> | null;
 /**
  * Gets the first value of a property with the given variable label.
  *
@@ -1845,7 +1894,7 @@ declare function getPropertyValuesByVariableLabel<T extends ReadonlyArray<string
  * @param options - Search options, including whether to include nested properties
  * @returns The first property value, or null if property not found
  */
-declare function getPropertyValueByVariableLabel<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SearchableProperty<T>>, variableLabel: string, options?: PropertyOptions): PropertyValueContent<T> | null;
+declare function getPropertyValueByVariableLabel<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SearchableProperty<T>>, variableLabel: string, options?: PropertyOptions): PropertyValueContent<T> | null;
 /**
  * Gets the first value content of a property with the given variable label.
  *
@@ -1854,7 +1903,7 @@ declare function getPropertyValueByVariableLabel<T extends ReadonlyArray<string>
  * @param options - Search options, including whether to include nested properties
  * @returns The first property value content, or null if property not found
  */
-declare function getPropertyValueContentByVariableLabel<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SearchableProperty<T>>, variableLabel: string, options?: PropertyOptions): PropertyContent<T> | null;
+declare function getPropertyValueContentByVariableLabel<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SearchableProperty<T>>, variableLabel: string, options?: PropertyOptions): PropertyContent<T> | null;
 /**
  * Gets all unique properties from an array of properties.
  *
@@ -1862,10 +1911,10 @@ declare function getPropertyValueContentByVariableLabel<T extends ReadonlyArray<
  * @param options - Search options, including whether to include nested properties
  * @returns Array of unique properties
  */
-declare function getUniqueProperties<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<Property<T>>, options?: PropertyOptions): Array<Property<T>>;
-declare function getUniqueProperties<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchyProperty<T>>, options?: PropertyOptions): Array<SingleHierarchyProperty<T>>;
-declare function getUniqueProperties<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SimplifiedProperty<T>>, options?: PropertyOptions): Array<SimplifiedProperty<T>>;
-declare function getUniqueProperties<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SingleHierarchySimplifiedProperty<T>>, options?: PropertyOptions): Array<SingleHierarchySimplifiedProperty<T>>;
+declare function getUniqueProperties<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<Property<T>>, options?: PropertyOptions): Array<Property<T>>;
+declare function getUniqueProperties<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemProperty<T>>, options?: PropertyOptions): Array<SetItemProperty<T>>;
+declare function getUniqueProperties<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SimplifiedProperty<T>>, options?: PropertyOptions): Array<SimplifiedProperty<T>>;
+declare function getUniqueProperties<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SetItemSimplifiedProperty<T>>, options?: PropertyOptions): Array<SetItemSimplifiedProperty<T>>;
 /**
  * Gets all unique property variable labels from an array of properties.
  *
@@ -1873,14 +1922,14 @@ declare function getUniqueProperties<T extends ReadonlyArray<string> = ReadonlyA
  * @param options - Search options, including whether to include nested properties
  * @returns Array of unique property variable labels
  */
-declare function getUniquePropertyVariableLabels<T extends ReadonlyArray<string> = ReadonlyArray<string>>(properties: ReadonlyArray<SearchableProperty<T>>, options?: PropertyOptions): Array<string>;
+declare function getUniquePropertyVariableLabels<T extends LanguageCodes = LanguageCodes>(properties: ReadonlyArray<SearchableProperty<T>>, options?: PropertyOptions): Array<string>;
 /**
  * Get the leaf property values from an array of property values.
  *
  * @param propertyValues - The array of property values to get the leaf property values from
  * @returns The array of leaf property values
  */
-declare function getLeafPropertyValues<T extends ReadonlyArray<string> = ReadonlyArray<string>>(propertyValues: ReadonlyArray<PropertyValueContent<T>>): Array<PropertyValueContent<T>>;
+declare function getLeafPropertyValues<T extends LanguageCodes = LanguageCodes>(propertyValues: ReadonlyArray<PropertyValueContent<T>>): Array<PropertyValueContent<T>>;
 /**
  * Filters a property based on a variable label and value content criterion.
  *
@@ -1891,14 +1940,14 @@ declare function getLeafPropertyValues<T extends ReadonlyArray<string> = Readonl
  * @param options - Search options, including whether to include nested properties
  * @returns True if the property matches the filter criteria, false otherwise
  */
-declare function filterProperties<T extends ReadonlyArray<string> = ReadonlyArray<string>>(property: SearchableProperty<T>, filter: {
+declare function filterProperties<T extends LanguageCodes = LanguageCodes>(property: SearchableProperty<T>, filter: {
   variableLabel: string;
   value: PropertyValueContent<T>;
 }, options?: PropertyOptions): boolean;
 //#endregion
 //#region src/helpers.d.ts
-type FlattenedItem<U, T extends ReadonlyArray<string>> = Omit<U, "properties"> & {
-  properties: Array<SingleHierarchyProperty<T>>;
+type FlattenedItem<U, T extends LanguageCodes> = Omit<U, "properties"> & {
+  properties: Array<SetItemProperty<T>>;
 };
 /**
  * The default page size to use for fetching paginated items
@@ -1909,6 +1958,6 @@ declare const DEFAULT_PAGE_SIZE = 48;
  * @param item - The item whose properties to flatten
  * @returns The item with the properties flattened
  */
-declare function flattenItemProperties<U extends DataCategory = DataCategory, V extends HierarchyItemDataCategory<U> = HierarchyItemDataCategory<U>, T extends ReadonlyArray<string> = ReadonlyArray<string>, W extends ItemLocation = "topLevel">(item: Item<U, V, T, W>): FlattenedItem<Item<U, V, T, W>, T>;
+declare function flattenItemProperties<U extends ItemCategory = ItemCategory, V extends ContainedItemCategory<U> = ContainedItemCategory<U>, T extends LanguageCodes = LanguageCodes, W extends ItemPayloadKind = "topLevel">(item: Item<U, V, T, W>): FlattenedItem<Item<U, V, T, W>, T>;
 //#endregion
-export { BaseItem, BaseItemLink, BelongsTo, Bibliography, BibliographyEntryInfo, BibliographyItemLink, BibliographySourceDocument, Concept, ConceptItemLink, Context, ContextDataCategory, ContextItem, ContextNode, ContextTree, ContextTreeFilterLevel, ContextTreeLevel, ContextTreeLevelItem, Coordinates, CoordinatesSource, DEFAULT_PAGE_SIZE, DataCategory, DictionaryUnitItemLink, Event, Gallery, Heading, HeadingDataCategory, HierarchyDataCategory, HierarchyItemCategoryFromOption, HierarchyItemCategoryOption, HierarchyItemDataCategory, Identification, Image, ImageMap, ImageMapArea, Interpretation, Item, ItemLink, ItemLinkCategory, ItemLinks, ItemLocation, ItemsDataCategory, License, Metadata, type MultilingualOptions, MultilingualString, type MultilingualStringEntries, type MultilingualStringEntry, type MultilingualStringInput, type MultilingualStringJSON, type MultilingualStringObject, type MultilingualStringText, Note, Observation, Period, PeriodItemLink, Person, PersonItemLink, Property, PropertyOptions, PropertyValue, PropertyValueContent, PropertyValueItemLink, PropertyValueQueryItem, PropertyVariable, PropertyVariableItemLink, Query, QueryGroup, QueryLeaf, RecursiveDataCategory, Resource, ResourceItemLink, Scope, Section, Set, SetAttributeValueQueryItem, SetBibliography, SetConcept, SetItem, SetItemDataCategory, SetItemLink, SetItemsSort, SetItemsSortDirection, SetPeriod, SetResource, SetSpatialUnit, SetTree, SimplifiedProperty, SingleHierarchyProperty, SingleHierarchySimplifiedProperty, SpatialUnit, SpatialUnitItemLink, Style, StylesheetCategory, StylesheetItem, Text, TextItemLink, Tree, TreeItemLink, WebBlock, WebBlockLayout, WebElement, WebElementComponent, WebImage, WebSegment, WebSegmentItem, WebTitle, Webpage, Website, WebsitePropertyQuery, WebsitePropertyQueryNode, 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 { AccordionWebBlock, 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, ContextTree, ContextTreeFilterLevel, ContextTreeLevel, ContextTreeLevelItem, Coordinates, CoordinatesSource, DEFAULT_PAGE_SIZE, 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, LanguageCodes, License, Metadata, type MultilingualOptions, MultilingualString, type MultilingualStringEntries, type MultilingualStringEntry, type MultilingualStringInput, type MultilingualStringJSON, type MultilingualStringObject, type MultilingualStringText, Note, Observation, Period, PeriodItemLink, Person, PersonItemLink, Property, PropertyLike, PropertyOptions, PropertyValue, PropertyValueContent, PropertyValueDataType, PropertyValueItemLink, PropertyValueQueryItem, PropertyVariable, PropertyVariableItemLink, Query, QueryGroup, QueryLeaf, QueryablePropertyValueDataType, RecursiveItemCategory, Resource, ResourceItemLink, Scope, Section, Set, SetAttributeValueQueryItem, SetBibliography, SetConcept, SetItem, SetItemCategory, SetItemLink, SetItemProperty, SetItemSimplifiedProperty, SetItemsSort, SetItemsSortDirection, SetPeriod, SetResource, SetSpatialUnit, SetTree, SimplifiedProperty, SpatialUnit, SpatialUnitItemLink, Style, StylesheetCategory, StylesheetItem, Text, TextItemLink, TopLevelItem, Tree, TreeItemCategory, TreeItemLink, WebBlock, WebBlockByLayout, WebBlockLayout, WebElement, WebElementComponent, WebElementComponentName, WebElementComponentOf, WebElementOf, WebImage, WebSegment, WebSegmentItem, WebTitle, Webpage, Website, WebsitePropertyQuery, WebsitePropertyQueryNode, 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 };