ochre-sdk 1.0.66 → 1.0.68

package/dist/parsers/website/index.mjs

@@ -262,8 +262,8 @@ const COLLECTION_PROPERTY_DEFAULTS = {
 */
 const COLLECTION_IMAGE_DEFAULTS = {
 	layout: "start",
-	fit: "fill",
-	alignment: "center",
+	fit: "fit",
+	alignment: null,
 	isPlaceholderDisplayed: true
 };
 /**
@@ -1197,20 +1197,40 @@ function parseWebsiteProperties(properties, websiteTree, sidebar, options, paren
 		},
 		sidebar: sidebar ?? parent?.sidebar ?? null,
 		itemPage: {
-			isMainContentDisplayed: parent?.itemPage.isMainContentDisplayed ?? true,
-			isDescriptionDisplayed: parent?.itemPage.isDescriptionDisplayed ?? true,
-			isDocumentDisplayed: parent?.itemPage.isDocumentDisplayed ?? true,
+			mainContent: {
+				isDisplayed: parent?.itemPage.mainContent.isDisplayed ?? true,
+				isHeaderDisplayed: parent?.itemPage.mainContent.isHeaderDisplayed ?? true
+			},
+			description: {
+				isDisplayed: parent?.itemPage.description.isDisplayed ?? true,
+				isHeaderDisplayed: parent?.itemPage.description.isHeaderDisplayed ?? true
+			},
+			document: {
+				isDisplayed: parent?.itemPage.document.isDisplayed ?? true,
+				isHeaderDisplayed: parent?.itemPage.document.isHeaderDisplayed ?? true
+			},
 			notes: {
 				isDisplayed: parent?.itemPage.notes.isDisplayed ?? true,
+				isHeaderDisplayed: parent?.itemPage.notes.isHeaderDisplayed ?? true,
 				variant: parent?.itemPage.notes.variant ?? "discrete"
 			},
 			events: {
 				isDisplayed: parent?.itemPage.events.isDisplayed ?? true,
+				isHeaderDisplayed: parent?.itemPage.events.isHeaderDisplayed ?? true,
 				variant: parent?.itemPage.events.variant ?? "tabular"
 			},
-			isPeriodsDisplayed: parent?.itemPage.isPeriodsDisplayed ?? true,
-			isPropertiesDisplayed: parent?.itemPage.isPropertiesDisplayed ?? true,
-			isBibliographyDisplayed: parent?.itemPage.isBibliographyDisplayed ?? true,
+			periods: {
+				isDisplayed: parent?.itemPage.periods.isDisplayed ?? true,
+				isHeaderDisplayed: parent?.itemPage.periods.isHeaderDisplayed ?? true
+			},
+			properties: {
+				isDisplayed: parent?.itemPage.properties.isDisplayed ?? true,
+				isHeaderDisplayed: parent?.itemPage.properties.isHeaderDisplayed ?? true
+			},
+			bibliography: {
+				isDisplayed: parent?.itemPage.bibliography.isDisplayed ?? true,
+				isHeaderDisplayed: parent?.itemPage.bibliography.isHeaderDisplayed ?? true
+			},
 			isPropertyValuesGrouped: parent?.itemPage.isPropertyValuesGrouped ?? true,
 			isPublicationDateTimeDisplayed: parent?.itemPage.isPublicationDateTimeDisplayed ?? true,
 			isPersistentIdentifierDisplayed: parent?.itemPage.isPersistentIdentifierDisplayed ?? true,
@@ -1247,16 +1267,22 @@ function parseWebsiteProperties(properties, websiteTree, sidebar, options, paren
 	returnProperties.footer.logoUuid = websiteReader.uuid("footer-logo") ?? parent?.footer.logoUuid ?? null;
 	const itemPageReader = websiteReader.nestedByValue("page-type", "item-page");
 	if (itemPageReader.size > 0) {
-		returnProperties.itemPage.isMainContentDisplayed = itemPageReader.valueOr("item-page-main-content-displayed", returnProperties.itemPage.isMainContentDisplayed);
-		returnProperties.itemPage.isDescriptionDisplayed = itemPageReader.valueOr("item-page-description-displayed", returnProperties.itemPage.isDescriptionDisplayed);
-		returnProperties.itemPage.isDocumentDisplayed = itemPageReader.valueOr("item-page-document-displayed", returnProperties.itemPage.isDocumentDisplayed);
-		returnProperties.itemPage.notes.isDisplayed = itemPageReader.valueOr("item-page-notes-displayed", returnProperties.itemPage.notes.isDisplayed);
+		for (const [key, slug] of [
+			["mainContent", "main-content"],
+			["description", "description"],
+			["document", "document"],
+			["notes", "notes"],
+			["events", "events"],
+			["periods", "periods"],
+			["properties", "properties"],
+			["bibliography", "bibliography"]
+		]) {
+			const section = returnProperties.itemPage[key];
+			section.isDisplayed = itemPageReader.valueOr(`item-page-${slug}-displayed`, section.isDisplayed);
+			section.isHeaderDisplayed = itemPageReader.valueOr(`item-page-${slug}-header-displayed`, section.isHeaderDisplayed);
+		}
 		returnProperties.itemPage.notes.variant = itemPageReader.valueOr("item-page-notes-display-variant", returnProperties.itemPage.notes.variant);
-		returnProperties.itemPage.events.isDisplayed = itemPageReader.valueOr("item-page-events-displayed", returnProperties.itemPage.events.isDisplayed);
 		returnProperties.itemPage.events.variant = itemPageReader.valueOr("item-page-events-display-variant", returnProperties.itemPage.events.variant);
-		returnProperties.itemPage.isPeriodsDisplayed = itemPageReader.valueOr("item-page-periods-displayed", returnProperties.itemPage.isPeriodsDisplayed);
-		returnProperties.itemPage.isPropertiesDisplayed = itemPageReader.valueOr("item-page-properties-displayed", returnProperties.itemPage.isPropertiesDisplayed);
-		returnProperties.itemPage.isBibliographyDisplayed = itemPageReader.valueOr("item-page-bibliography-displayed", returnProperties.itemPage.isBibliographyDisplayed);
 		returnProperties.itemPage.isPropertyValuesGrouped = itemPageReader.valueOr("item-page-property-values-grouped", returnProperties.itemPage.isPropertyValuesGrouped);
 		returnProperties.itemPage.isPublicationDateTimeDisplayed = itemPageReader.valueOr("item-page-publication-date-time-displayed", returnProperties.itemPage.isPublicationDateTimeDisplayed);
 		returnProperties.itemPage.isPersistentIdentifierDisplayed = itemPageReader.valueOr("item-page-persistent-identifier-displayed", returnProperties.itemPage.isPersistentIdentifierDisplayed);

package/dist/types/website.d.mts

@@ -155,20 +155,40 @@ type Website<T extends LanguageCodes = LanguageCodes> = {
     };
     sidebar: WebSidebar<T> | null;
     itemPage: {
-      isMainContentDisplayed: boolean;
-      isDescriptionDisplayed: boolean;
-      isDocumentDisplayed: boolean;
+      mainContent: {
+        isDisplayed: boolean;
+        isHeaderDisplayed: boolean;
+      };
+      description: {
+        isDisplayed: boolean;
+        isHeaderDisplayed: boolean;
+      };
+      document: {
+        isDisplayed: boolean;
+        isHeaderDisplayed: boolean;
+      };
       notes: {
         isDisplayed: boolean;
+        isHeaderDisplayed: boolean;
         variant: "discrete" | "tabs-horizontal" | "tabs-vertical" | "tabular";
       };
       events: {
         isDisplayed: boolean;
+        isHeaderDisplayed: boolean;
         variant: "discrete" | "tabs-horizontal" | "tabs-vertical" | "tabular";
       };
-      isPeriodsDisplayed: boolean;
-      isPropertiesDisplayed: boolean;
-      isBibliographyDisplayed: boolean;
+      periods: {
+        isDisplayed: boolean;
+        isHeaderDisplayed: boolean;
+      };
+      properties: {
+        isDisplayed: boolean;
+        isHeaderDisplayed: boolean;
+      };
+      bibliography: {
+        isDisplayed: boolean;
+        isHeaderDisplayed: boolean;
+      };
       isPropertyValuesGrouped: boolean;
       isPublicationDateTimeDisplayed: boolean;
       isPersistentIdentifierDisplayed: boolean;
@@ -322,7 +342,7 @@ type WebElementComponent<T extends LanguageCodes = LanguageCodes> = {
   image: {
     layout: "top" | "bottom" | "start" | "end" | null;
     fit: "fill" | "fit";
-    alignment: "top" | "center" | "bottom";
+    alignment: "top" | "center" | "bottom" | null;
     isPlaceholderDisplayed: boolean;
   };
   minimumColumnCount: number | null;

package/package.json

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