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

package/dist/index.d.mts

@@ -198,31 +198,34 @@ 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 = DataCategory> = U extends "tree" ? ItemsDataCategory : U extends "set" ? SetItemDataCategory : never;
-type HierarchyItemCategoryOption<U extends DataCategory = DataCategory> = U extends "tree" ? ItemsDataCategory : U extends "set" ? SetItemDataCategory | ReadonlyArray<SetItemDataCategory> : never;
-type HierarchyItemCategoryFromOption<U extends DataCategory = DataCategory, V extends HierarchyItemCategoryOption<U> | undefined = 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
  */
@@ -271,8 +274,8 @@ type BelongsTo = {
   uuid: string;
   abbreviation: string;
 };
-type ItemLocation = "topLevel" | "nested";
-type ItemOrigin<T extends LanguageCodes, 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;
@@ -300,7 +303,7 @@ type ContextItem = {
 /**
  *  Context node in OCHRE
  */
-type ContextNode<U extends ContextDataCategory = ContextDataCategory> = {
+type ContextNode<U extends ContextItemCategory = ContextItemCategory> = {
   tree: ContextItem;
   project: ContextItem;
   heading: Array<ContextItem>;
@@ -308,7 +311,7 @@ type ContextNode<U extends ContextDataCategory = ContextDataCategory> = {
 /**
  *  Context in OCHRE
  */
-type Context<U extends ContextDataCategory = ContextDataCategory> = {
+type Context<U extends ContextItemCategory = ContextItemCategory> = {
   nodes: Array<ContextNode<U>>;
   displayPath: string;
 };
@@ -431,7 +434,7 @@ 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
@@ -493,37 +496,37 @@ type SimplifiedProperty<T extends LanguageCodes = LanguageCodes> = {
 /**
  *  Property in a Set item. OCHRE exposes Set item properties as a flat list.
  */
-type SingleHierarchyProperty<T extends LanguageCodes = LanguageCodes> = Omit<Property<T>, "properties">;
-type SingleHierarchySimplifiedProperty<T extends LanguageCodes = LanguageCodes> = Omit<SimplifiedProperty<T>, "properties">;
-type PropertyLike<T extends LanguageCodes = LanguageCodes> = Property<T> | SingleHierarchyProperty<T> | SimplifiedProperty<T> | SingleHierarchySimplifiedProperty<T>;
-type ItemProperty<T extends LanguageCodes = LanguageCodes> = Property<T> | SingleHierarchyProperty<T>;
+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 WithSingleHierarchyProperties<U extends {
+type WithSetItemProperties<U extends {
   properties: Array<Property<T>>;
 }, 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 LanguageCodes = LanguageCodes, 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.
  */
@@ -531,7 +534,7 @@ type BaseItemLink<U extends ItemLinkCategory = ItemLinkCategory, T extends Langu
   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;
@@ -552,11 +555,11 @@ type BibliographyEntryInfo = {
 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 LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"set", T> & {
   type: string | null;
-  itemsCategory: Array<SetItemDataCategory> | null;
+  containedItemCategories: Array<SetItemCategory> | null;
 }>;
 type BibliographyItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<BaseItemLink<"bibliography", T> & {
   type: string | null;
@@ -572,7 +575,7 @@ type BibliographyItemLink<T extends LanguageCodes = LanguageCodes> = Prettify<Ba
     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>>;
@@ -627,35 +630,35 @@ type ItemLink<U extends ItemLinkCategory = ItemLinkCategory, T extends LanguageC
 /**
  * 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 LanguageCodes = LanguageCodes, 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 TopLevelItem<U extends DataCategory = DataCategory, V extends HierarchyItemDataCategory<U> = HierarchyItemDataCategory<U>, T extends LanguageCodes = LanguageCodes> = Item<U, V, T, "topLevel">;
-type NestedItem<U extends DataCategory = DataCategory, V extends HierarchyItemDataCategory<U> = HierarchyItemDataCategory<U>, T extends LanguageCodes = LanguageCodes> = Item<U, V, T, "nested">;
-type LocatedItem<U extends DataCategory = DataCategory, V extends HierarchyItemDataCategory<U> = HierarchyItemDataCategory<U>, T extends LanguageCodes = LanguageCodes> = Item<U, V, T, ItemLocation>;
+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 = HeadingDataCategory, T extends LanguageCodes = LanguageCodes> = {
+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 = ItemsDataCategory, T extends LanguageCodes = LanguageCodes, 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 = SetItemDataCategory, T extends LanguageCodes = LanguageCodes, 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>;
@@ -663,25 +666,25 @@ type Set<U extends SetItemDataCategory = SetItemDataCategory, T extends Language
   properties: Array<Property<T>>;
   items: Array<SetItem<U, T>>;
 }>;
-type SetBibliography<T extends LanguageCodes = LanguageCodes> = 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 LanguageCodes = LanguageCodes> = 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 LanguageCodes = LanguageCodes> = 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 LanguageCodes = LanguageCodes> = Prettify<Omit<WithSingleHierarchyProperties<Period<T, "nested">, T>, "items">>;
-type SetResource<T extends LanguageCodes = LanguageCodes> = Prettify<Omit<WithSingleHierarchyProperties<Resource<T, "nested">, T>, "items">>;
-type SetTree<T extends LanguageCodes = LanguageCodes> = Prettify<Omit<WithSingleHierarchyProperties<Tree<ItemsDataCategory, T, "nested">, T>, "items">>;
-type SetItem<U extends SetItemDataCategory = SetItemDataCategory, 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" ? 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 LanguageCodes = LanguageCodes, 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: {
@@ -692,7 +695,7 @@ type Person<T extends LanguageCodes = LanguageCodes, U extends ItemLocation = "t
   } | 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>>;
@@ -700,19 +703,19 @@ type Person<T extends LanguageCodes = LanguageCodes, U extends ItemLocation = "t
 /**
  *  Period in OCHRE
  */
-type Period<T extends LanguageCodes = LanguageCodes, 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 LanguageCodes = LanguageCodes, 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;
@@ -720,18 +723,18 @@ type Bibliography<T extends LanguageCodes = LanguageCodes, U extends ItemLocatio
   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;
@@ -742,11 +745,11 @@ type Bibliography<T extends LanguageCodes = LanguageCodes, U extends ItemLocatio
 /**
  *  Concept in OCHRE
  */
-type Concept<T extends LanguageCodes = LanguageCodes, 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
@@ -754,17 +757,17 @@ type Concept<T extends LanguageCodes = LanguageCodes, U extends ItemLocation = "
 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 LanguageCodes = LanguageCodes, 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: {
@@ -774,8 +777,8 @@ type SpatialUnit<T extends LanguageCodes = LanguageCodes, U extends ItemLocation
     };
   } | 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
@@ -783,37 +786,37 @@ type SpatialUnit<T extends LanguageCodes = LanguageCodes, U extends ItemLocation
 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 LanguageCodes = LanguageCodes, 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 LanguageCodes = LanguageCodes, 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 LanguageCodes = LanguageCodes, 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;
@@ -825,18 +828,18 @@ type Resource<T extends LanguageCodes = LanguageCodes, U extends ItemLocation =
   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 LanguageCodes = LanguageCodes, 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;
@@ -846,9 +849,9 @@ type Text<T extends LanguageCodes = LanguageCodes, U extends ItemLocation = "top
   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
@@ -861,35 +864,35 @@ type Section<T extends LanguageCodes = LanguageCodes> = {
     identification: Identification<T>;
   } | null;
 };
-type NestedTree<U extends ItemsDataCategory = ItemsDataCategory, T extends LanguageCodes = LanguageCodes> = Tree<U, T, "nested">;
-type LocatedTree<U extends ItemsDataCategory = ItemsDataCategory, T extends LanguageCodes = LanguageCodes> = Tree<U, T, ItemLocation>;
-type NestedSet<U extends SetItemDataCategory = SetItemDataCategory, T extends LanguageCodes = LanguageCodes> = Set<U, T, "nested">;
-type LocatedSet<U extends SetItemDataCategory = SetItemDataCategory, T extends LanguageCodes = LanguageCodes> = Set<U, T, ItemLocation>;
-type NestedBibliography<T extends LanguageCodes = LanguageCodes> = Bibliography<T, "nested">;
-type LocatedBibliography<T extends LanguageCodes = LanguageCodes> = Bibliography<T, ItemLocation>;
-type NestedConcept<T extends LanguageCodes = LanguageCodes> = Concept<T, "nested">;
-type LocatedConcept<T extends LanguageCodes = LanguageCodes> = Concept<T, ItemLocation>;
-type NestedSpatialUnit<T extends LanguageCodes = LanguageCodes> = SpatialUnit<T, "nested">;
-type LocatedSpatialUnit<T extends LanguageCodes = LanguageCodes> = SpatialUnit<T, ItemLocation>;
-type NestedPeriod<T extends LanguageCodes = LanguageCodes> = Period<T, "nested">;
-type LocatedPeriod<T extends LanguageCodes = LanguageCodes> = Period<T, ItemLocation>;
-type NestedPerson<T extends LanguageCodes = LanguageCodes> = Person<T, "nested">;
-type LocatedPerson<T extends LanguageCodes = LanguageCodes> = Person<T, ItemLocation>;
-type NestedPropertyVariable<T extends LanguageCodes = LanguageCodes> = PropertyVariable<T, "nested">;
-type LocatedPropertyVariable<T extends LanguageCodes = LanguageCodes> = PropertyVariable<T, ItemLocation>;
-type NestedPropertyValue<T extends LanguageCodes = LanguageCodes> = PropertyValue<T, "nested">;
-type LocatedPropertyValue<T extends LanguageCodes = LanguageCodes> = PropertyValue<T, ItemLocation>;
-type NestedResource<T extends LanguageCodes = LanguageCodes> = Resource<T, "nested">;
-type LocatedResource<T extends LanguageCodes = LanguageCodes> = Resource<T, ItemLocation>;
-type NestedText<T extends LanguageCodes = LanguageCodes> = Text<T, "nested">;
-type LocatedText<T extends LanguageCodes = LanguageCodes> = Text<T, ItemLocation>;
+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 LanguageCodes = LanguageCodes> = {
   identification: Identification<T>;
   projectIdentification: Identification<T>;
-  resources: Array<Resource<T, "nested">>;
+  resources: Array<Resource<T, "embedded">>;
   maxLength: number;
 };
 /**
@@ -1057,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;
@@ -1100,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;
@@ -1143,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
  *
@@ -1154,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;
@@ -1273,7 +1276,7 @@ type Scope<T extends LanguageCodes = LanguageCodes> = {
 /**
  * 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";
@@ -1323,12 +1326,13 @@ type Website<T extends LanguageCodes = LanguageCodes> = {
   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;
@@ -1502,7 +1506,7 @@ type WebElementComponent<T extends LanguageCodes = LanguageCodes> = {
 } | {
   component: "bibliography";
   linkUuids: Array<string>;
-  bibliographies: Array<Bibliography<T, "nested">>;
+  bibliographies: Array<Bibliography<T, "embedded">>;
   layout: "long" | "short";
   isSourceDocumentDisplayed: boolean;
 } | {
@@ -1770,9 +1774,9 @@ type SearchableProperty<T extends LanguageCodes> = PropertyLike<T>;
  * @returns The matching Property object, or null if not found
  */
 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<SingleHierarchyProperty<T>>, variableUuid: string, options?: PropertyOptions): SingleHierarchyProperty<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<SingleHierarchySimplifiedProperty<T>>, variableUuid: string, options?: PropertyOptions): SingleHierarchySimplifiedProperty<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.
  *
@@ -1818,9 +1822,9 @@ declare function getPropertyValueContentByVariableUuid<T extends LanguageCodes =
  * @returns The matching Property object, or null if not found
  */
 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<SingleHierarchyProperty<T>>, variableLabel: string, options?: PropertyOptions): SingleHierarchyProperty<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<SingleHierarchySimplifiedProperty<T>>, variableLabel: string, options?: PropertyOptions): SingleHierarchySimplifiedProperty<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.
  *
@@ -1831,9 +1835,9 @@ declare function getPropertyByVariableLabel<T extends LanguageCodes = LanguageCo
  * @returns The matching Property object, or null if not found or all values do not match
  */
 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<SingleHierarchyProperty<T>>, variableLabel: string, values: ReadonlyArray<PropertyValueContent<T>>, options?: PropertyOptions): SingleHierarchyProperty<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<SingleHierarchySimplifiedProperty<T>>, variableLabel: string, values: ReadonlyArray<PropertyValueContent<T>>, options?: PropertyOptions): SingleHierarchySimplifiedProperty<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.
  *
@@ -1844,9 +1848,9 @@ declare function getPropertyByVariableLabelAndValues<T extends LanguageCodes = L
  * @returns The matching Property object, or null if not found or all value contents do not match
  */
 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<SingleHierarchyProperty<T>>, variableLabel: string, valueContents: ReadonlyArray<PropertyContent<T>>, options?: PropertyOptions): SingleHierarchyProperty<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<SingleHierarchySimplifiedProperty<T>>, variableLabel: string, valueContents: ReadonlyArray<PropertyContent<T>>, options?: PropertyOptions): SingleHierarchySimplifiedProperty<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.
  *
@@ -1857,9 +1861,9 @@ declare function getPropertyByVariableLabelAndValueContents<T extends LanguageCo
  * @returns The matching Property object, or null if not found or value does not match
  */
 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<SingleHierarchyProperty<T>>, variableLabel: string, value: PropertyValueContent<T>, options?: PropertyOptions): SingleHierarchyProperty<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<SingleHierarchySimplifiedProperty<T>>, variableLabel: string, value: PropertyValueContent<T>, options?: PropertyOptions): SingleHierarchySimplifiedProperty<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.
  *
@@ -1870,9 +1874,9 @@ declare function getPropertyByVariableLabelAndValue<T extends LanguageCodes = La
  * @returns The matching Property object, or null if not found or value content does not match
  */
 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<SingleHierarchyProperty<T>>, variableLabel: string, valueContent: PropertyContent<T>, options?: PropertyOptions): SingleHierarchyProperty<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<SingleHierarchySimplifiedProperty<T>>, variableLabel: string, valueContent: PropertyContent<T>, options?: PropertyOptions): SingleHierarchySimplifiedProperty<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.
  *
@@ -1908,9 +1912,9 @@ declare function getPropertyValueContentByVariableLabel<T extends LanguageCodes
  * @returns Array of unique properties
  */
 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<SingleHierarchyProperty<T>>, options?: PropertyOptions): Array<SingleHierarchyProperty<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<SingleHierarchySimplifiedProperty<T>>, options?: PropertyOptions): Array<SingleHierarchySimplifiedProperty<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.
  *
@@ -1943,7 +1947,7 @@ declare function filterProperties<T extends LanguageCodes = LanguageCodes>(prope
 //#endregion
 //#region src/helpers.d.ts
 type FlattenedItem<U, T extends LanguageCodes> = Omit<U, "properties"> & {
-  properties: Array<SingleHierarchyProperty<T>>;
+  properties: Array<SetItemProperty<T>>;
 };
 /**
  * The default page size to use for fetching paginated items
@@ -1954,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 LanguageCodes = LanguageCodes, 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 { AccordionWebBlock, 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, ItemProperty, ItemsDataCategory, LanguageCodes, License, LocatedBibliography, LocatedConcept, LocatedItem, LocatedPeriod, LocatedPerson, LocatedPropertyValue, LocatedPropertyVariable, LocatedResource, LocatedSet, LocatedSpatialUnit, LocatedText, LocatedTree, Metadata, type MultilingualOptions, MultilingualString, type MultilingualStringEntries, type MultilingualStringEntry, type MultilingualStringInput, type MultilingualStringJSON, type MultilingualStringObject, type MultilingualStringText, NestedBibliography, NestedConcept, NestedItem, NestedPeriod, NestedPerson, NestedPropertyValue, NestedPropertyVariable, NestedResource, NestedSet, NestedSpatialUnit, NestedText, NestedTree, Note, Observation, Period, PeriodItemLink, Person, PersonItemLink, Property, PropertyLike, PropertyOptions, PropertyValue, PropertyValueContent, PropertyValueDataType, PropertyValueItemLink, PropertyValueQueryItem, PropertyVariable, PropertyVariableItemLink, Query, QueryGroup, QueryLeaf, QueryablePropertyValueDataType, 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, TopLevelItem, Tree, 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 };
+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 };