@digitalculture/ochre-sdk 0.18.16 → 0.18.17

package/dist/index.d.mts

@@ -36,6 +36,7 @@ type Metadata = {
     identification: Identification & {
       website: string | null;
     };
+    dateFormat: string | null;
   } | null;
   collection: {
     identification: Identification;
@@ -260,8 +261,7 @@ type Observation = {
  * Represents an event with date, label and optional agent
  */
 type Event = {
-  dateTime: Date | null;
-  date: string | null;
+  dateTime: string | null;
   label: string;
   agent: {
     uuid: string;

package/dist/index.mjs

@@ -548,7 +548,7 @@ function filterProperties(property, filter, options = DEFAULT_OPTIONS) {
 
 //#endregion
 //#region src/constants.ts
-const BELONG_TO_COLLECTION_UUID = "30054cb2-909a-4f34-8db9-8fe7369d691d";
+const BELONGS_TO_COLLECTION_UUID = "30054cb2-909a-4f34-8db9-8fe7369d691d";
 const PRESENTATION_ITEM_UUID = "f1c131b6-1498-48a4-95bf-a9edae9fd518";
 const TEXT_ANNOTATION_UUID = "b9ca2732-78f4-416e-b77f-dae7647e68a9";
 const TEXT_ANNOTATION_HOVER_CARD_UUID = "c7f6a08a-f07b-49b6-bcb1-af485da3c58f";
@@ -1106,7 +1106,10 @@ function parseMetadata(metadata) {
 	let collectionIdentification = null;
 	if (metadata.collection) collectionIdentification = parseIdentification(metadata.collection.identification);
 	return {
-		project: projectIdentification ? { identification: projectIdentification } : null,
+		project: projectIdentification ? {
+			identification: projectIdentification,
+			dateFormat: metadata.project?.dateFormat ?? null
+		} : null,
 		collection: collectionIdentification ? { identification: collectionIdentification } : null,
 		item: metadata.item ? {
 			identification,
@@ -1438,8 +1441,7 @@ function parseObservations(observations) {
 function parseEvents(events) {
 	const returnEvents = [];
 	for (const event of events) returnEvents.push({
-		dateTime: event.dateTime != null ? parseISO(event.dateTime) : null,
-		date: event.partialDates?.year != null ? `${event.partialDates.year}-01-01/${event.partialDates.endYear ?? event.partialDates.year}-12-31` : null,
+		dateTime: event.endDateTime != null ? `${event.dateTime}/${event.endDateTime}` : event.dateTime ?? null,
 		label: parseStringContent(event.label),
 		location: event.location ? {
 			uuid: event.location.uuid,
@@ -1577,7 +1579,7 @@ function parseProperties(properties, language = "eng") {
 function parseInterpretations(interpretations) {
 	const returnInterpretations = [];
 	for (const interpretation of interpretations) returnInterpretations.push({
-		date: interpretation.date,
+		date: interpretation.date ?? null,
 		number: interpretation.interpretationNo,
 		links: interpretation.links ? parseLinks(Array.isArray(interpretation.links) ? interpretation.links : [interpretation.links]) : [],
 		properties: interpretation.properties ? parseProperties(Array.isArray(interpretation.properties.property) ? interpretation.properties.property : [interpretation.properties.property]) : [],
@@ -3584,7 +3586,7 @@ function buildXQuery$2(params, options) {
 	const startPos = (page - 1) * pageSize + 1;
 	const endPos = page * pageSize;
 	let belongsToCollectionScopeFilter = "";
-	if (belongsToCollectionScopeUuids.length > 0) belongsToCollectionScopeFilter = `[.//properties[property[label/@uuid="${BELONG_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]]`;
+	if (belongsToCollectionScopeUuids.length > 0) belongsToCollectionScopeFilter = `[.//properties[property[label/@uuid="${BELONGS_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]]`;
 	const propertyVariables = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
 	const propertyValuesFilters = propertyValues.map(({ dataType, value }) => {
 		if (dataType === "IDREF") return `value[@uuid="${value}"]`;
@@ -3733,7 +3735,7 @@ function buildXQuery$1(params, options) {
 	const version = options?.version ?? DEFAULT_API_VERSION;
 	const { projectScopeUuid, belongsToCollectionScopeUuids, itemCategory, itemUuids, linkUuids } = params;
 	let belongsToCollectionScopeFilter = "";
-	if (belongsToCollectionScopeUuids.length > 0) belongsToCollectionScopeFilter = `properties/property[label/@uuid="${BELONG_TO_COLLECTION_UUID}"][value[${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")}]]`;
+	if (belongsToCollectionScopeUuids.length > 0) belongsToCollectionScopeFilter = `properties/property[label/@uuid="${BELONGS_TO_COLLECTION_UUID}"][value[${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")}]]`;
 	let itemCategoryFilter = "";
 	const filterParts = [];
 	if (itemUuids.length > 0) filterParts.push(itemUuids.map((uuid) => `@uuid="${uuid}"`).join(" or "));
@@ -3848,6 +3850,7 @@ async function fetchItemsByUuidsAndLinks(params, categoryParams, options) {
 */
 const propertyValueQueryItemSchema = z.object({
 	uuid: z.string(),
+	itemUuid: z.string().optional(),
 	dataType: z.string(),
 	rawValue: z.union([
 		z.string(),
@@ -3863,6 +3866,7 @@ const propertyValueQueryItemSchema = z.object({
 	]).optional()
 }).transform((val) => {
 	const returnValue = {
+		itemUuid: val.itemUuid != null && val.itemUuid !== "" ? val.itemUuid : null,
 		dataType: val.dataType,
 		content: null,
 		label: null
@@ -3907,16 +3911,17 @@ function buildXQuery(params, options) {
 	const version = options?.version ?? DEFAULT_API_VERSION;
 	const { projectScopeUuid, belongsToCollectionScopeUuids, propertyVariableUuids } = params;
 	let collectionScopeFilter = "";
-	if (belongsToCollectionScopeUuids.length > 0) collectionScopeFilter = `//properties[property[label/@uuid="${BELONG_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]]`;
+	if (belongsToCollectionScopeUuids.length > 0) collectionScopeFilter = `//properties[property[label/@uuid="${BELONGS_TO_COLLECTION_UUID}" and value/(${belongsToCollectionScopeUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ")})]]`;
 	const propertyVariableFilters = propertyVariableUuids.map((uuid) => `@uuid="${uuid}"`).join(" or ");
 	return `<ochre>{${`let $matching-props := ${version === 2 ? "doc()" : "input()"}/ochre[@uuidBelongsTo="${projectScopeUuid}"]
       ${collectionScopeFilter}
       //property[label/(${propertyVariableFilters})]
 
   for $v in $matching-props/value
-  return <propertyValue uuid="{$v/@uuid}" rawValue="{$v/@rawValue}" dataType="{$v/@dataType}">{
-    if ($v/content) then $v/content else $v/text()
-  }</propertyValue>`}}</ochre>`;
+    let $item-uuid := $v/ancestor::*[parent::ochre]/@uuid
+    return <propertyValue uuid="{$v/@uuid}" rawValue="{$v/@rawValue}" dataType="{$v/@dataType}" itemUuid="{$item-uuid}">{
+      if ($v/content) then $v/content else $v/text()
+    }</propertyValue>`}}</ochre>`;
 }
 /**
 * Fetches and parses property values by property variables from the OCHRE API
@@ -3945,15 +3950,24 @@ async function fetchPropertyValuesByPropertyVariables(params, options) {
 		const parsedResultRaw = responseSchema.parse(data);
 		if (Array.isArray(parsedResultRaw.result)) throw new TypeError("No items found");
 		const parsedItems = Array.isArray(parsedResultRaw.result.ochre.propertyValue) ? parsedResultRaw.result.ochre.propertyValue : [parsedResultRaw.result.ochre.propertyValue];
-		const groupedItems = [];
+		const groupedItemsMap = /* @__PURE__ */ new Map();
 		for (const item of parsedItems) {
-			const existingItem = groupedItems.find((i) => i.content === item.content);
-			if (existingItem == null) groupedItems.push({
-				count: 1,
-				...item
+			const existing = groupedItemsMap.get(item.content);
+			if (existing == null) groupedItemsMap.set(item.content, {
+				dataType: item.dataType,
+				content: item.content,
+				label: item.label,
+				itemUuids: new Set([item.itemUuid])
 			});
-			else existingItem.count++;
+			else existing.itemUuids.add(item.itemUuid);
 		}
+		const groupedItems = [];
+		for (const group of groupedItemsMap.values()) groupedItems.push({
+			count: group.itemUuids.size,
+			dataType: group.dataType,
+			content: group.content,
+			label: group.label
+		});
 		return {
 			items: groupedItems.toSorted((a, b) => {
 				if (a.count !== b.count) return b.count - a.count;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalculture/ochre-sdk",
-  "version": "0.18.16",
+  "version": "0.18.17",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -46,11 +46,11 @@
   },
   "devDependencies": {
     "@antfu/eslint-config": "^7.2.0",
-    "@types/node": "^24.10.10",
-    "bumpp": "^10.4.0",
+    "@types/node": "^24.10.11",
+    "bumpp": "^10.4.1",
     "eslint": "^9.39.2",
     "prettier": "^3.8.1",
-    "tsdown": "^0.20.1",
+    "tsdown": "^0.20.3",
     "typescript": "^5.9.3",
     "vitest": "^4.0.18"
   },