ochre-sdk 1.3.12 → 1.3.14

package/dist/parsers/website/bounds.d.mts

@@ -1,4 +1,3 @@
-//#region src/parsers/website/bounds.d.ts
 /**
  * Parses raw bounds data into a standardized bounds structure
  *
@@ -6,5 +5,4 @@
  * @returns Parsed bounds object
  * @internal
  */
-export declare function parseBounds(bounds: string): [[number, number], [number, number]];
-//#endregion
+export declare function parseBounds(bounds: string): [[number, number], [number, number]];

package/dist/parsers/website/bounds.mjs

@@ -1,4 +1,4 @@
-//#region src/parsers/website/bounds.ts
+// src/parsers/website/bounds.ts
 /**
 * Parses raw bounds data into a standardized bounds structure
 *
@@ -24,5 +24,4 @@ function parseJsonBounds(bounds) {
 function isNumberPairArray(value) {
 	return Array.isArray(value) && value.every((pair) => Array.isArray(pair) && pair.every((coordinate) => typeof coordinate === "number"));
 }
-//#endregion
 export { parseBounds };

package/dist/parsers/website/components.d.mts

@@ -4,7 +4,6 @@ import { XMLWebsiteResource } from "../../xml/types.mjs";
 import { ParserOptions } from "../helpers.mjs";
 import { WebsitePresentationReader } from "./reader.mjs";
 import { WebsitePageSlugs } from "./slug.mjs";
-//#region src/parsers/website/components.d.ts
 /**
  * What every component parser is handed
  *
@@ -88,5 +87,4 @@ export declare function parseWebTitle<T extends ReadonlyArray<string>>(propertie
  * @returns Parsed WebElement object
  */
 export declare function parseWebElement<T extends ReadonlyArray<string>>(elementResource: XMLWebsiteResource, options: ParserOptions<T>, pageSlugs: WebsitePageSlugs | undefined): WebElement<T>;
-//#endregion
 export {};

package/dist/parsers/website/components.mjs

@@ -11,7 +11,7 @@ import { websitePresentationReader } from "./reader.mjs";
 import { parseResponsiveCssStyles } from "./styles.mjs";
 import { normalizeWebsiteResources } from "./walk.mjs";
 import * as v from "valibot";
-//#region src/parsers/website/components.ts
+// src/parsers/website/components.ts
 /**
 * Default values for a collection's display properties, shared between the
 * "collection" component and the "query" component's collection overrides.
@@ -436,8 +436,9 @@ const MAP_COMPONENT_DEFAULTS = {
 };
 function parseMapComponent(parameters) {
 	const { componentProperty, componentReader, elementResource, websiteLinks } = parameters;
-	const mapLink = findWebsiteLinkByCategories(websiteLinks, ["set", "tree"]);
-	if (mapLink == null) throw new Error(formatComponentError("Map link not found", "map", elementResource), { cause: componentProperty });
+	const linkUuids = [];
+	for (const link of websiteLinks) if (link.category === "set" || link.category === "tree") linkUuids.push(link.uuid);
+	if (linkUuids.length === 0) throw new Error(formatComponentError("Map link not found", "map", elementResource), { cause: componentProperty });
 	const properties = { ...MAP_COMPONENT_DEFAULTS };
 	componentReader.readAll(properties, {
 		isInteractive: "is-interactive",
@@ -456,7 +457,7 @@ function parseMapComponent(parameters) {
 	if (maximumBoundsProperty !== null) maximumBounds = parseBounds(String(maximumBoundsProperty));
 	return {
 		component: "map",
-		linkUuid: mapLink.uuid,
+		linkUuids,
 		boundElementUuid: componentReader.uuid("bound-element"),
 		customBasemap,
 		initialBounds,
@@ -716,5 +717,4 @@ function parseWebElement(elementResource, options, pageSlugs) {
 		...properties
 	};
 }
-//#endregion
 export { WEB_ELEMENT_COMPONENT_PARSERS, parseWebElement, parseWebTitle };

package/dist/parsers/website/index.d.mts

@@ -1,11 +1,9 @@
 import { Webpage, Website } from "../../types/website.mjs";
 import { XMLWebsiteData, XMLWebsiteResource } from "../../xml/types.mjs";
 import { ParserOptions } from "../helpers.mjs";
-//#region src/parsers/website/index.d.ts
 export declare function parseWebpageView<T extends ReadonlyArray<string>>(view: {
   resource?: Array<XMLWebsiteResource>;
 } | undefined, options: ParserOptions<T>, context: Pick<Website<T>, "belongsTo" | "metadata">): Webpage<T> | null;
 export declare function parseWebsite<const T extends ReadonlyArray<string> = ReadonlyArray<string>>(data: XMLWebsiteData, options?: {
   languages?: T;
-}): Website<T>;
-//#endregion
+}): Website<T>;

package/dist/parsers/website/index.mjs

@@ -1,4 +1,4 @@
-import { cleanObject, parseLicense } from "../helpers.mjs";
+import { cleanObject, parseLicense, parseRequiredContentLike } from "../helpers.mjs";
 import { parseMetadataLanguages, resolveDefaultLanguage, resolveLanguages } from "../languages.mjs";
 import { parseIdentification, parseLinks, parseMetadata, parsePersonList, parseSimplifiedProperties } from "../index.mjs";
 import { findWebsiteLink, parseWebsiteLinkTarget, webImageFromLink } from "./links.mjs";
@@ -7,7 +7,7 @@ import { emptyResponsiveStyles, parseResponsiveCssStyles } from "./styles.mjs";
 import { collectWebsitePageSlugs, normalizeWebsiteResources, readWebsitePages } from "./walk.mjs";
 import { parseWebElement, parseWebTitle } from "./components.mjs";
 import { parseWebsiteProperties } from "./properties.mjs";
-//#region src/parsers/website/index.ts
+// src/parsers/website/index.ts
 function isSidebarResource(resource, options) {
 	const resourceProperties = parseSimplifiedProperties(resource.properties, options);
 	const resourceReader = websitePresentationReader(resourceProperties);
@@ -306,13 +306,15 @@ function parseWebsite(data, options) {
 	};
 	const websiteTree = rawOchre.tree[0];
 	if (websiteTree == null) throw new Error("Website tree not found", { cause: data });
-	return parseWebsiteTree(websiteTree, parserOptions, {
+	const website = parseWebsiteTree(websiteTree, parserOptions, {
 		belongsTo: {
 			uuid: rawOchre.uuidBelongsTo,
 			abbreviation: rawOchre.belongsTo
 		},
 		metadata: parseMetadata(rawOchre, parserOptions, defaultLanguage)
 	}, "website");
+	const styleLabels = new Map((rawOchre.styleLabels?.styleLabel ?? []).map((styleLabel) => [styleLabel.valueUuid, parseRequiredContentLike(styleLabel, parserOptions)]));
+	for (const stylesheet of website.properties.options.stylesheets.properties) if (stylesheet.category === "propertyValue") stylesheet.label = styleLabels.get(stylesheet.uuid) ?? null;
+	return website;
 }
-//#endregion
 export { parseWebpageView, parseWebsite };

package/dist/parsers/website/links.d.mts

@@ -1,7 +1,6 @@
 import { WebImage } from "../../types/website.mjs";
 import { ItemLink, ItemLinkCategory, ItemLinks, PropertyValueContent } from "../../types/index.mjs";
 import { WebsitePageSlugs } from "./slug.mjs";
-//#region src/parsers/website/links.d.ts
 /**
  * The link categories a website can point at
  */
@@ -32,5 +31,4 @@ export declare function parseWebsiteLinkTarget<T extends ReadonlyArray<string>>(
  * @returns The image
  * @internal
  */
-export declare function webImageFromLink<T extends ReadonlyArray<string>>(link: ItemLinks<T>[number], quality: WebImage<T>["quality"]): WebImage<T>;
-//#endregion
+export declare function webImageFromLink<T extends ReadonlyArray<string>>(link: ItemLinks<T>[number], quality: WebImage<T>["quality"]): WebImage<T>;

package/dist/parsers/website/links.mjs

@@ -1,5 +1,5 @@
 import { transformPermanentIdentificationUrlToItemLink } from "../string.mjs";
-//#region src/parsers/website/links.ts
+// src/parsers/website/links.ts
 function isWebsiteLink(link, category) {
 	return link.category === category;
 }
@@ -54,5 +54,4 @@ function webImageFromLink(link, quality) {
 		quality
 	};
 }
-//#endregion
 export { findWebsiteLink, findWebsiteLinkByCategories, getWebsiteLinks, parseWebsiteLinkTarget, webImageFromLink };

package/dist/parsers/website/messages.d.mts

@@ -1,6 +1,5 @@
 import { WebElementComponent } from "../../types/website.mjs";
 import { XMLWebsiteResource } from "../../xml/types.mjs";
-//#region src/parsers/website/messages.d.ts
 /**
  * Name a resource well enough to find it in OCHRE from an error message
  *
@@ -20,5 +19,4 @@ export declare function formatXMLWebsiteResourceMetadata(resource: XMLWebsiteRes
  * @returns The error message
  * @internal
  */
-export declare function formatComponentError(message: string, componentName: WebElementComponent["component"] | undefined, elementResource: XMLWebsiteResource): string;
-//#endregion
+export declare function formatComponentError(message: string, componentName: WebElementComponent["component"] | undefined, elementResource: XMLWebsiteResource): string;

package/dist/parsers/website/messages.mjs

@@ -1,5 +1,5 @@
 import { parseStringContent } from "../helpers.mjs";
-//#region src/parsers/website/messages.ts
+// src/parsers/website/messages.ts
 /**
 * Name a resource well enough to find it in OCHRE from an error message
 *
@@ -27,5 +27,4 @@ function formatXMLWebsiteResourceMetadata(resource) {
 function formatComponentError(message, componentName, elementResource) {
 	return `${message} for component “${componentName ?? "(unknown)"}” (${formatXMLWebsiteResourceMetadata(elementResource)})`;
 }
-//#endregion
 export { formatComponentError, formatXMLWebsiteResourceMetadata };

package/dist/parsers/website/options.d.mts

@@ -1,6 +1,4 @@
 import { WebOptions } from "../../types/website.mjs";
 import { XMLWebsiteOptions } from "../../xml/types.mjs";
 import { ParserOptions } from "../helpers.mjs";
-//#region src/parsers/website/options.d.ts
-export declare function parseWebsiteOptions<T extends ReadonlyArray<string>>(rawOptions: XMLWebsiteOptions | undefined, options: ParserOptions<T>): WebOptions<T>;
-//#endregion
+export declare function parseWebsiteOptions<T extends ReadonlyArray<string>>(rawOptions: XMLWebsiteOptions | undefined, options: ParserOptions<T>): WebOptions<T>;

package/dist/parsers/website/options.mjs

@@ -1,6 +1,6 @@
 import { parseContentLike } from "../helpers.mjs";
 import { parseIdentification, parseNotes } from "../index.mjs";
-//#region src/parsers/website/options.ts
+// src/parsers/website/options.ts
 function parseContextTreeLevel(contextItemToParse, options) {
 	let type = "";
 	const levels = [];
@@ -110,5 +110,4 @@ function parseWebsiteOptions(rawOptions, options) {
 	}
 	return parsedOptions;
 }
-//#endregion
 export { parseWebsiteOptions };

package/dist/parsers/website/properties.d.mts

@@ -1,12 +1,10 @@
 import { WebSidebar, Website } from "../../types/website.mjs";
 import { XMLWebsiteProperties, XMLWebsiteTree } from "../../xml/types.mjs";
 import { ParserOptions } from "../helpers.mjs";
-//#region src/parsers/website/properties.d.ts
 /**
  * Parses raw website properties into a standardized Website properties structure
  *
  * @param properties - Array of raw website properties in OCHRE format
  * @returns Parsed WebsiteProperties object
  */
-export declare function parseWebsiteProperties<T extends ReadonlyArray<string>>(properties: XMLWebsiteProperties["property"], websiteTree: XMLWebsiteTree, sidebar: WebSidebar<T> | null, options: ParserOptions<T>, parent: Website<T>["properties"] | null): Website<T>["properties"];
-//#endregion
+export declare function parseWebsiteProperties<T extends ReadonlyArray<string>>(properties: XMLWebsiteProperties["property"], websiteTree: XMLWebsiteTree, sidebar: WebSidebar<T> | null, options: ParserOptions<T>, parent: Website<T>["properties"] | null): Website<T>["properties"];

package/dist/parsers/website/properties.mjs

@@ -2,7 +2,7 @@ import { parseSimplifiedProperties } from "../index.mjs";
 import { parseWebsiteOptions } from "./options.mjs";
 import { websitePresentationReader } from "./reader.mjs";
 import { parseStylesheets } from "./styles.mjs";
-//#region src/parsers/website/properties.ts
+// src/parsers/website/properties.ts
 /**
 * Parses raw website properties into a standardized Website properties structure
 *
@@ -156,5 +156,4 @@ function parseWebsiteProperties(properties, websiteTree, sidebar, options, paren
 	}
 	return returnProperties;
 }
-//#endregion
 export { parseWebsiteProperties };

package/dist/parsers/website/reader.d.mts

@@ -1,7 +1,6 @@
 import { MultilingualString } from "../multilingual.mjs";
 import { LanguageCodes, PropertyValueContent, SimplifiedProperty } from "../../types/index.mjs";
 import { ParserOptions } from "../helpers.mjs";
-//#region src/parsers/website/reader.d.ts
 type WebsitePropertyContent<T extends LanguageCodes> = PropertyValueContent<T>["content"];
 /**
  * The fields of an object that hold a UUID, which are the only ones
@@ -74,5 +73,4 @@ export declare class WebsitePresentationReader<T extends LanguageCodes> {
   get size(): number;
 }
 export declare function websitePresentationReader<T extends LanguageCodes>(properties: ReadonlyArray<SimplifiedProperty<T>>): WebsitePresentationReader<T>;
-//#endregion
 export {};

package/dist/parsers/website/reader.mjs

@@ -1,6 +1,6 @@
 import { getProperty, getPropertyValue } from "../../getters.mjs";
 import { multilingualFromText } from "../helpers.mjs";
-//#region src/parsers/website/reader.ts
+// src/parsers/website/reader.ts
 /**
 * Reads a website's presentation properties
 *
@@ -118,5 +118,4 @@ var WebsitePresentationReader = class WebsitePresentationReader {
 function websitePresentationReader(properties) {
 	return new WebsitePresentationReader(properties);
 }
-//#endregion
 export { WebsitePresentationReader, websitePresentationReader };

package/dist/parsers/website/slug.d.mts

@@ -1,4 +1,3 @@
-//#region src/parsers/website/slug.d.ts
 /**
  * How a website page slug is built
  *
@@ -63,5 +62,4 @@ export declare function childSlugPrefix(pageSlug: string, slugPrefix: string | u
  * attribute.
  * @internal
  */
-export declare const WEBSITE_PAGE_SLUG_DECLARATIONS: string;
-//#endregion
+export declare const WEBSITE_PAGE_SLUG_DECLARATIONS: string;

package/dist/parsers/website/slug.mjs

@@ -1,5 +1,5 @@
 import { stringLiteral } from "../../xquery.mjs";
-//#region src/parsers/website/slug.ts
+// src/parsers/website/slug.ts
 /**
 * How a website page slug is built
 *
@@ -85,5 +85,4 @@ declare function local:page-child-slug-prefix($resource, $slug-prefix) {
   else local:page-slug($resource, $slug-prefix)
 };
 `;
-//#endregion
 export { SEGMENT_UNIQUE_SLUG_PREFIX_PATTERN, WEBSITE_PAGE_SLUG_DECLARATIONS, WEBSITE_PAGE_SLUG_SEPARATOR, childSlugPrefix, cleanWebsitePageSlug, prefixSlug };

package/dist/parsers/website/styles.d.mts

@@ -1,7 +1,6 @@
 import { ResponsiveStyles, StylesheetItem } from "../../types/website.mjs";
-import { SimplifiedProperty } from "../../types/index.mjs";
+import { LanguageCodes, SimplifiedProperty } from "../../types/index.mjs";
 import { XMLWebsiteStyle } from "../../xml/types.mjs";
-//#region src/parsers/website/styles.d.ts
 /**
  * The CSS declarations for every viewport a resource defines
  * @param properties - Array of properties to parse
@@ -24,5 +23,4 @@ export declare function emptyResponsiveStyles(): ResponsiveStyles;
  * @returns The parsed stylesheet items
  * @internal
  */
-export declare function parseStylesheets(styles: Array<XMLWebsiteStyle>): Array<StylesheetItem>;
-//#endregion
+export declare function parseStylesheets<T extends LanguageCodes>(styles: Array<XMLWebsiteStyle>): Array<StylesheetItem<T>>;

package/dist/parsers/website/styles.mjs

@@ -1,5 +1,5 @@
 import { getProperty } from "../../getters.mjs";
-//#region src/parsers/website/styles.ts
+// src/parsers/website/styles.ts
 const STYLESHEET_NON_STYLE_KEYS = /* @__PURE__ */ new Set([
 	"variableUuid",
 	"valueUuid",
@@ -85,6 +85,7 @@ function parseStylesheets(styles) {
 				uuid: style.valueUuid,
 				category: "propertyValue",
 				variableUuid: style.variableUuid,
+				label: null,
 				icon: style.lucideIcon ?? null,
 				styles: stylesByViewport
 			});
@@ -99,5 +100,4 @@ function parseStylesheets(styles) {
 	}
 	return parsedStyles;
 }
-//#endregion
 export { emptyResponsiveStyles, parseResponsiveCssStyles, parseStylesheets };

package/dist/parsers/website/walk.d.mts

@@ -1,7 +1,6 @@
 import { XMLWebsiteResource, XMLWebsiteResourceItem, XMLWebsiteTree } from "../../xml/types.mjs";
 import { ParserOptions } from "../helpers.mjs";
 import { WebsitePageSlugs } from "./slug.mjs";
-//#region src/parsers/website/walk.d.ts
 /**
  * A page in a website, with its slug already resolved
  *
@@ -64,5 +63,4 @@ export declare function collectWebsitePageSlugs<T extends ReadonlyArray<string>>
  * presentation and reads segments off the same sequence.
  * @internal
  */
-export declare const WEBSITE_WALK_DECLARATIONS: string;
-//#endregion
+export declare const WEBSITE_WALK_DECLARATIONS: string;

package/dist/parsers/website/walk.mjs

@@ -4,7 +4,7 @@ import { stringLiteral } from "../../xquery.mjs";
 import { formatXMLWebsiteResourceMetadata } from "./messages.mjs";
 import { websitePresentationReader } from "./reader.mjs";
 import { WEBSITE_PAGE_SLUG_DECLARATIONS, childSlugPrefix, cleanWebsitePageSlug, prefixSlug } from "./slug.mjs";
-//#region src/parsers/website/walk.ts
+// src/parsers/website/walk.ts
 /**
 * Flatten the wrapper elements OCHRE nests resources in
 *
@@ -112,5 +112,4 @@ declare function local:presentation($resource) {
 };
 
 ${WEBSITE_PAGE_SLUG_DECLARATIONS}`;
-//#endregion
 export { WEBSITE_WALK_DECLARATIONS, collectWebsitePageSlugs, normalizeWebsiteResources, readWebsitePages };

package/dist/query.d.mts

@@ -1,6 +1,5 @@
 import { PropertyRelation, Query } from "./types/index.mjs";
 import { OchreContentLanguage, OchreQueryContext } from "./xquery.mjs";
-//#region src/query.d.ts
 export declare function buildBelongsToCollectionQueryExpression(belongsToCollectionScopeUuids: ReadonlyArray<string>, belongsToCollectionPropertyVariableUuid: string): string | null;
 /**
  * The scope variable and searchable path of each item container
@@ -111,5 +110,4 @@ export declare function getPropertyFacetSelectors(queries: Query | null): Array<
   uuid: string;
   relation: PropertyRelation | null;
 }>;
-//#endregion
 export {};

package/dist/query.mjs

@@ -1,7 +1,7 @@
 import { BELONGS_TO_COLLECTION_UUID } from "./constants.mjs";
 import { OCHRE_RESPONSE_PADDING, compileOchreQuery, stringLiteral } from "./xquery.mjs";
 import { OCR_WORD_CONTENT_ATTRIBUTE, OCR_WORD_QNAMES, buildOcrWordPath } from "./ocr.mjs";
-//#region src/query.ts
+// src/query.ts
 const CTS_INCLUDES_STOP_WORDS = /* @__PURE__ */ new Set([
 	"and",
 	"at",
@@ -1340,5 +1340,4 @@ function getPropertyFacetSelectors(queries) {
 	}
 	return selectors.values().toArray();
 }
-//#endregion
 export { buildBelongsToCollectionQueryExpression, buildQueryPlan, compileContainerItemsQuery, getItemFilterQueries, getPropertyFacetSelectors };

package/dist/reflection.d.mts

@@ -1,4 +1,3 @@
-//#region src/reflection.d.ts
 /**
  * Reading values whose shape is not known at compile time
  *
@@ -60,5 +59,4 @@ export declare function readArrayProperty(value: unknown, key: PropertyKey): Rea
  * @returns The string, or null when the property is absent or not one
  * @internal
  */
-export declare function readStringProperty(value: unknown, key: PropertyKey): string | null;
-//#endregion
+export declare function readStringProperty(value: unknown, key: PropertyKey): string | null;

package/dist/reflection.mjs

@@ -1,4 +1,4 @@
-//#region src/reflection.ts
+// src/reflection.ts
 /**
 * Reading values whose shape is not known at compile time
 *
@@ -75,5 +75,4 @@ function readStringProperty(value, key) {
 	const property = readProperty(value, key);
 	return typeof property === "string" ? property : null;
 }
-//#endregion
 export { isObject, readArrayProperty, readEntries, readProperty, readStringProperty };

package/dist/schemas.d.mts

@@ -1,6 +1,5 @@
 import { Query } from "./types/index.mjs";
 import * as v from "valibot";
-//#region src/schemas.d.ts
 /**
  * Validates a pseudo-UUID string
  * @param value - The string to validate
@@ -100,15 +99,24 @@ export declare const setItemsParametersSchema: v.ObjectSchema<{
   readonly setScopeUuids: v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>, undefined>, v.MinLengthAction<string[], 1, "At least one set scope UUID is required">]>;
 }, undefined>;
 /**
- * Schema for validating the parameters of the Set item locations fetching function
+ * Schema for validating the parameters of the item locations fetching function
  * @internal
  */
-export declare const setItemLocationsParametersSchema: v.ObjectSchema<{
-  readonly setScopeUuids: v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>, undefined>, v.MinLengthAction<string[], 1, "At least one set scope UUID is required">]>;
+export declare const itemLocationsParametersSchema: v.SchemaWithPipe<readonly [v.ObjectSchema<{
+  readonly setScopeUuids: v.OptionalSchema<v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>, undefined>, readonly []>;
+  readonly treeScopeUuids: v.OptionalSchema<v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>, undefined>, readonly []>;
   readonly belongsToCollectionScopeUuids: v.OptionalSchema<v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>, undefined>, readonly []>;
   readonly queries: v.OptionalSchema<v.NullableSchema<v.GenericSchema<unknown, Query>, undefined>, null>;
   readonly propertyVariableUuids: v.OptionalSchema<v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>, undefined>, readonly []>;
-}, undefined>;
+  readonly isMapDataIncluded: v.OptionalSchema<v.BooleanSchema<undefined>, false>;
+}, undefined>, v.CheckAction<{
+  setScopeUuids: string[];
+  treeScopeUuids: string[];
+  belongsToCollectionScopeUuids: string[];
+  queries: Query | null;
+  propertyVariableUuids: string[];
+  isMapDataIncluded: boolean;
+}, "At least one Set or Tree scope UUID is required">]>;
 export declare const treeItemsParametersSchema: v.ObjectSchema<{
   readonly belongsToCollectionScopeUuids: v.OptionalSchema<v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>, undefined>, readonly []>;
   readonly queries: v.OptionalSchema<v.NullableSchema<v.GenericSchema<unknown, Query>, undefined>, null>;
@@ -138,5 +146,4 @@ export declare const treeItemsParametersSchema: v.ObjectSchema<{
   readonly page: v.OptionalSchema<v.GenericSchema<unknown, number>, 1>;
   readonly pageSize: v.OptionalSchema<v.GenericSchema<unknown, number>, 48>;
   readonly treeScopeUuids: v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>, undefined>, v.MinLengthAction<string[], 1, "At least one tree scope UUID is required">]>;
-}, undefined>;
-//#endregion
+}, undefined>;

package/dist/schemas.mjs

@@ -1,7 +1,7 @@
 import "./constants.mjs";
 import { getOchreLanguageCode, isOchreLanguageCode } from "./languages.mjs";
 import * as v from "valibot";
-//#region src/schemas.ts
+// src/schemas.ts
 const PSEUDO_UUID_REGEX = /^[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12}$/i;
 /**
 * Validates a pseudo-UUID string
@@ -275,18 +275,19 @@ const setItemsParametersSchema = v.object({
 	...containerItemsParametersEntries
 });
 /**
-* Schema for validating the parameters of the Set item locations fetching function
+* Schema for validating the parameters of the item locations fetching function
 * @internal
 */
-const setItemLocationsParametersSchema = v.object({
-	setScopeUuids: v.pipe(v.array(uuidSchema), v.minLength(1, "At least one set scope UUID is required")),
+const itemLocationsParametersSchema = v.pipe(v.object({
+	setScopeUuids: v.optional(v.array(uuidSchema), []),
+	treeScopeUuids: v.optional(v.array(uuidSchema), []),
 	belongsToCollectionScopeUuids: v.optional(v.array(uuidSchema), []),
 	queries: setQueriesSchema,
-	propertyVariableUuids: v.optional(v.array(uuidSchema), [])
-});
+	propertyVariableUuids: v.optional(v.array(uuidSchema), []),
+	isMapDataIncluded: v.optional(v.boolean(), false)
+}), v.check(({ setScopeUuids, treeScopeUuids }) => setScopeUuids.length > 0 || treeScopeUuids.length > 0, "At least one Set or Tree scope UUID is required"));
 const treeItemsParametersSchema = v.object({
 	treeScopeUuids: v.pipe(v.array(uuidSchema), v.minLength(1, "At least one tree scope UUID is required")),
 	...containerItemsParametersEntries
 });
-//#endregion
-export { componentSchema, gallerySchema, isPseudoUuid, itemOcrDataParametersSchema, ochreLanguageCodeSchema, renderOptionsSchema, setItemLocationsParametersSchema, setItemsParametersSchema, setPropertyValuesParametersSchema, treeItemsParametersSchema, uuidSchema };
+export { componentSchema, gallerySchema, isPseudoUuid, itemLocationsParametersSchema, itemOcrDataParametersSchema, ochreLanguageCodeSchema, renderOptionsSchema, setItemsParametersSchema, setPropertyValuesParametersSchema, treeItemsParametersSchema, uuidSchema };

package/dist/types/index.d.mts

@@ -1,7 +1,6 @@
 import { MultilingualString } from "../parsers/multilingual.mjs";
 import { Prettify } from "./utilities.mjs";
 import { Style, Webpage } from "./website.mjs";
-//#region src/types/index.d.ts
 /**
  * Language-code tuple or array used by OCHRE multilingual fields.
  *
@@ -194,6 +193,12 @@ export type Coordinates<T extends LanguageCodes = LanguageCodes> = {
   latitude: number;
   longitude: number;
   altitude: number | null;
+  crs: {
+    wkid: number;
+    x: number;
+    y: number;
+    z: number | null;
+  } | null;
   source: CoordinatesSource<T> | null;
 } | {
   type: "plane";
@@ -220,6 +225,14 @@ export type Image<T extends LanguageCodes = LanguageCodes> = {
   fileSize: number | null;
   base64: string | null;
 };
+/**
+ *  Download option of an item in OCHRE
+ */
+export type DownloadOption = {
+  type: "highQualityImage" | "iiifManifest" | "document" | "ocr";
+  href: string;
+  fileFormat: string;
+};
 /**
  *  Area of an image map in OCHRE
  */
@@ -568,18 +581,41 @@ export type SetItem<U extends SetItemCategory = SetItemCategory, T extends Langu
  * The location of a Set item, without its properties, for drawing and ordering
  * every match of a query at once
  */
-export type SetItemLocation<T extends LanguageCodes = LanguageCodes> = {
+export type ItemLocation<T extends LanguageCodes = LanguageCodes> = {
   uuid: string;
   category: SetItemCategory;
+  scopeUuids: Array<string>;
   publicationDateTime: Date | null;
   identification: Identification<T>;
   coordinates: Array<Coordinates<T>>;
+  mapData: SpatialUnit<T>["mapData"];
   propertyValues: Array<{
     variableUuid: string;
     valueUuid: string;
     label: MultilingualString<T>;
   }>;
 };
+/**
+ * A layer a map draws, from a Set or Tree of OCHRE items or from a geospatial
+ * web service linked as a webpage Resource
+ */
+export type MapLayer<T extends LanguageCodes = LanguageCodes> = {
+  type: "ochre-set" | "ochre-tree";
+  uuid: string;
+  label: MultilingualString<T>;
+  wkid: number | null;
+} | {
+  type: "arcgis-feature" | "arcgis-map" | "arcgis-image" | "wmts" | "wms" | "web-tile";
+  uuid: string;
+  label: MultilingualString<T>;
+  url: string;
+} | {
+  type: "arcgis-item";
+  uuid: string;
+  label: MultilingualString<T>;
+  itemId: string;
+  portalUrl: string;
+};
 /**
  *  Person in OCHRE
  */
@@ -623,6 +659,7 @@ export type Bibliography<T extends LanguageCodes = LanguageCodes, U extends Item
   citationFormatSpan: string | null;
   referenceFormatDiv: string | null;
   image: Image<T> | null;
+  downloadOptions: Array<DownloadOption>;
   sourceDocument: BibliographySourceDocument | null;
   publicationInfo: {
     publishers: Array<Person<T, "embedded">>;
@@ -694,6 +731,7 @@ export type Observation<T extends LanguageCodes = LanguageCodes> = {
   periods: Array<Period<T, "embedded">>;
   links: ItemLinks<T>;
   reverseLinks: ItemLinks<T>;
+  downloadOptions: Array<DownloadOption>;
   notes: Array<Note<T>>;
   properties: Array<Property<T>>;
   bibliographies: Array<Bibliography<T, "embedded">>;
@@ -735,6 +773,7 @@ export type Resource<T extends LanguageCodes = LanguageCodes, U extends ItemPayl
   image: Image<T> | null;
   document: MultilingualString<T> | null;
   imageMap: ImageMap | null;
+  downloadOptions: Array<DownloadOption>;
   coordinates: Array<Coordinates<T>>;
   periods: Array<Period<T, "embedded">>;
   links: ItemLinks<T>;
@@ -986,5 +1025,4 @@ export type ItemProperty<T extends LanguageCodes = LanguageCodes> = Property<T>
  */
 export type RecursiveItemCategory = Exclude<ItemCategory, "tree" | "person" | "propertyVariable" | "propertyValue" | "set">;
 export type TopLevelItem<U extends ItemCategory = ItemCategory, V extends ContainedItemCategory<U> = ContainedItemCategory<U>, T extends LanguageCodes = LanguageCodes> = Item<U, V, T, "topLevel">;
-//#endregion
 export {};

package/dist/types/utilities.d.mts

@@ -1,9 +1,7 @@
-//#region src/types/utilities.d.ts
 /**
  * Flatten an intersection so editors show one object instead of `A & B`
  *
  * Deliberately not re-exported from the package root: it is a TypeScript
  * presentation detail, not part of the OCHRE model.
  */
-export type Prettify<T> = { [K in keyof T]: T[K]; } & {};
-//#endregion
+export type Prettify<T> = { [K in keyof T]: T[K]; } & {};