@digitalculture/ochre-sdk 0.4.15 → 0.5.1

package/README.md

@@ -25,7 +25,7 @@ bun add @digitalculture/ochre-sdk
 From the root directory of the project, run the following command:
 
 ```bash
-pnpm run dev:ochre-sdk
+pnpm run dev
 ```
 
 ## Build production server

package/dist/index.cjs

@@ -76,7 +76,6 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/utils/parse.ts
-var import_uuid = require("uuid");
 var import_zod3 = require("zod");
 
 // src/utils/fetchers/generic.ts
@@ -568,6 +567,7 @@ var componentSchema = import_zod3.z.enum(
     "button",
     "collection",
     "empty-space",
+    "iframe",
     "iiif-viewer",
     "image",
     "image-gallery",
@@ -726,6 +726,7 @@ function parseLink(linkRaw) {
     const returnLink = {
       category: "resource" in linkRaw ? "resource" : "concept" in linkRaw ? "concept" : "set" in linkRaw ? "set" : "person" in linkRaw ? "person" : "tree" in linkRaw ? "tree" : "bibliography" in linkRaw ? "bibliography" : "epigraphicUnit" in linkRaw ? "epigraphicUnit" : null,
       content: "content" in link ? link.content != null ? parseFakeString(link.content) : null : null,
+      href: "href" in link && link.href != null ? link.href : null,
       uuid: link.uuid,
       type: link.type ?? null,
       identification: link.identification ? parseIdentification(link.identification) : null,
@@ -1307,10 +1308,7 @@ var parseWebpageResources = async (webpageResources, type) => {
     if (!resourceProperty) continue;
     switch (type) {
       case "element": {
-        const element = await parseWebElement(
-          resource,
-          resourceProperty.properties
-        );
+        const element = await parseWebElement(resource);
         returnElements.push(
           element
         );
@@ -1412,9 +1410,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "layout"
       );
-      if (layout === null) {
-        layout = "long";
-      }
+      layout ??= "long";
       properties.bibliographies = bibliographyLink.bibliographies;
       properties.layout = layout;
       break;
@@ -1434,9 +1430,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "variant"
       );
-      if (variant === null) {
-        variant = "default";
-      }
+      variant ??= "default";
       let isExternal = false;
       let href = getPropertyValueByLabel(
         componentProperty.properties,
@@ -1467,16 +1461,12 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "variant"
       );
-      if (variant === null) {
-        variant = "full";
-      }
+      variant ??= "full";
       let layout = getPropertyValueByLabel(
         componentProperty.properties,
         "layout"
       );
-      if (layout === null) {
-        layout = "image-start";
-      }
+      layout ??= "image-start";
       const collectionLink = links.find((link) => link.category === "set");
       if (!collectionLink) {
         throw new Error(
@@ -1501,6 +1491,16 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       properties.width = width;
       break;
     }
+    case "iframe": {
+      const url = links.find((link) => link.type === "webpage")?.href;
+      if (!url) {
+        throw new Error(
+          `URL not found for the following component: \u201C${componentName}\u201D`
+        );
+      }
+      properties.url = url;
+      break;
+    }
     case "iiif-viewer": {
       const manifestLink = links.find((link) => link.type === "IIIF");
       if (!manifestLink) {
@@ -1530,16 +1530,12 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "variant"
       );
-      if (variant === null) {
-        variant = "default";
-      }
+      variant ??= "default";
       let captionLayout = getPropertyValueByLabel(
         componentProperty.properties,
         "layout-caption"
       );
-      if (captionLayout === null) {
-        captionLayout = "bottom";
-      }
+      captionLayout ??= "bottom";
       let width = null;
       const widthProperty = getPropertyValueByLabel(
         componentProperty.properties,
@@ -1576,23 +1572,17 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "image-quality"
       );
-      if (imageQuality === null) {
-        imageQuality = "high";
-      }
+      imageQuality ??= "high";
       let captionSource = getPropertyValueByLabel(
         componentProperty.properties,
         "caption-source"
       );
-      if (captionSource === null) {
-        captionSource = "name";
-      }
+      captionSource ??= "name";
       let altTextSource = getPropertyValueByLabel(
         componentProperty.properties,
         "alt-text-source"
       );
-      if (altTextSource === null) {
-        altTextSource = "name";
-      }
+      altTextSource ??= "name";
       let isTransparentBackground = false;
       const isTransparentBackgroundProperty = getPropertyValueByLabel(
         componentProperty.properties,
@@ -1713,9 +1703,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "variant"
       );
-      if (variant === null) {
-        variant = "block";
-      }
+      variant ??= "block";
       const heading = getPropertyValueByLabel(
         componentProperty.properties,
         "heading"
@@ -1735,23 +1723,17 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "variant"
       );
-      if (variant === null) {
-        variant = "block";
-      }
+      variant ??= "block";
       let layout = getPropertyValueByLabel(
         componentProperty.properties,
         "layout"
       );
-      if (layout === null) {
-        layout = "image-start";
-      }
+      layout ??= "image-start";
       let captionLayout = getPropertyValueByLabel(
         componentProperty.properties,
         "layout-caption"
       );
-      if (captionLayout === null) {
-        captionLayout = "bottom";
-      }
+      captionLayout ??= "bottom";
       const imageLink = links.find(
         (link) => link.type === "image" || link.type === "IIIF"
       );
@@ -1766,23 +1748,17 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "image-quality"
       );
-      if (imageQuality === null) {
-        imageQuality = "high";
-      }
+      imageQuality ??= "high";
       let captionSource = getPropertyValueByLabel(
         componentProperty.properties,
         "caption-source"
       );
-      if (captionSource === null) {
-        captionSource = "name";
-      }
+      captionSource ??= "name";
       let altTextSource = getPropertyValueByLabel(
         componentProperty.properties,
         "alt-text-source"
       );
-      if (altTextSource === null) {
-        altTextSource = "name";
-      }
+      altTextSource ??= "name";
       properties.variant = variant;
       properties.image = {
         url: `https://ochre.lib.uchicago.edu/ochre?uuid=${imageLink.uuid}&preview`,
@@ -1819,9 +1795,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "chapters-displayed"
       );
-      if (isChaptersDislayed == null) {
-        isChaptersDislayed = "Yes";
-      }
+      isChaptersDislayed ??= "Yes";
       properties.videoId = videoLink.uuid;
       properties.isChaptersDislayed = isChaptersDislayed === "Yes";
       break;
@@ -1837,9 +1811,20 @@ async function parseWebElementProperties(componentProperty, elementResource) {
   }
   return properties;
 }
-async function parseWebElement(elementResource, elementProperties) {
+async function parseWebElement(elementResource) {
   const identification = parseIdentification(elementResource.identification);
-  const componentProperty = elementProperties.find(
+  const elementProperties = elementResource.properties?.property ? parseProperties(
+    Array.isArray(elementResource.properties.property) ? elementResource.properties.property : [elementResource.properties.property]
+  ) : [];
+  const presentationProperty = elementProperties.find(
+    (property) => property.label === "presentation"
+  );
+  if (!presentationProperty) {
+    throw new Error(
+      `Presentation property not found for element \u201C${identification.label}\u201D`
+    );
+  }
+  const componentProperty = presentationProperty.properties.find(
     (property) => property.label === "component"
   );
   if (!componentProperty) {
@@ -1903,6 +1888,7 @@ async function parseWebElement(elementResource, elementProperties) {
   }
   return {
     uuid: elementResource.uuid,
+    type: "element",
     title: {
       label: identification.label,
       variant,
@@ -1937,8 +1923,7 @@ async function parseWebpage(webpageResource) {
     (link) => link.type === "image" || link.type === "IIIF"
   );
   const webpageResources = webpageResource.resource ? Array.isArray(webpageResource.resource) ? webpageResource.resource : [webpageResource.resource] : [];
-  const blocks = [];
-  let elementsToHandle = [];
+  const items = [];
   for (const resource of webpageResources) {
     const resourceProperties = resource.properties ? parseProperties(
       Array.isArray(resource.properties.property) ? resource.properties.property : [resource.properties.property]
@@ -1950,55 +1935,21 @@ async function parseWebpage(webpageResource) {
     if (!resourceType) {
       continue;
     }
-    if (resourceType === "element") {
-      elementsToHandle.push(resource);
-    } else if (resourceType === "block") {
-      if (elementsToHandle.length > 0) {
-        const elements = await parseWebpageResources(
-          elementsToHandle,
-          "element"
-        );
-        const block = {
-          uuid: (0, import_uuid.v4)(),
-          layout: "vertical",
-          blocks: [],
-          elements,
-          properties: {
-            spacing: void 0,
-            gap: void 0,
-            alignItems: "start",
-            justifyContent: "stretch"
-          },
-          propertiesMobile: null,
-          cssStyles: [],
-          cssStylesMobile: []
-        };
-        blocks.push(block);
-        elementsToHandle = [];
+    switch (resourceType) {
+      case "element": {
+        const element = await parseWebElement(resource);
+        items.push(element);
+        break;
+      }
+      case "block": {
+        const block = await parseBlock(resource);
+        if (block) {
+          items.push(block);
+        }
+        break;
       }
-      const parsedBlocks = await parseWebpageResources([resource], "block");
-      blocks.push(...parsedBlocks);
     }
   }
-  if (elementsToHandle.length > 0) {
-    const elements = await parseWebpageResources(elementsToHandle, "element");
-    const block = {
-      uuid: (0, import_uuid.v4)(),
-      layout: "vertical",
-      blocks: [],
-      elements,
-      properties: {
-        spacing: void 0,
-        gap: void 0,
-        alignItems: "start",
-        justifyContent: "stretch"
-      },
-      propertiesMobile: null,
-      cssStyles: [],
-      cssStylesMobile: []
-    };
-    blocks.push(block);
-  }
   const webpages = webpageResource.resource ? await parseWebpageResources(
     Array.isArray(webpageResource.resource) ? webpageResource.resource : [webpageResource.resource],
     "page"
@@ -2063,7 +2014,7 @@ async function parseWebpage(webpageResource) {
   return {
     title: identification.label,
     slug,
-    blocks,
+    items,
     properties: {
       displayedInHeader,
       width,
@@ -2090,9 +2041,9 @@ async function parseWebpages(webpageResources) {
 async function parseBlock(blockResource) {
   const returnBlock = {
     uuid: blockResource.uuid,
+    type: "block",
     layout: "vertical",
-    blocks: [],
-    elements: [],
+    items: [],
     properties: {
       spacing: void 0,
       gap: void 0,
@@ -2152,20 +2103,35 @@ async function parseBlock(blockResource) {
       returnBlock.propertiesMobile = propertiesMobile;
     }
   }
-  const blockBlocks = blockResource.resource ? await parseWebpageResources(
-    Array.isArray(blockResource.resource) ? blockResource.resource : [blockResource.resource],
-    "block"
-  ) : [];
-  for (const block of blockBlocks) {
-    returnBlock.blocks.push(block);
-  }
-  const blockElements = blockResource.resource ? await parseWebpageResources(
-    Array.isArray(blockResource.resource) ? blockResource.resource : [blockResource.resource],
-    "element"
-  ) : [];
-  for (const element of blockElements) {
-    returnBlock.elements.push(element);
+  const blockResources = blockResource.resource ? Array.isArray(blockResource.resource) ? blockResource.resource : [blockResource.resource] : [];
+  const blockItems = [];
+  for (const resource of blockResources) {
+    const resourceProperties = resource.properties ? parseProperties(
+      Array.isArray(resource.properties.property) ? resource.properties.property : [resource.properties.property]
+    ) : [];
+    const resourceType = getPropertyValueByLabel(
+      resourceProperties,
+      "presentation"
+    );
+    if (!resourceType) {
+      continue;
+    }
+    switch (resourceType) {
+      case "element": {
+        const element = await parseWebElement(resource);
+        blockItems.push(element);
+        break;
+      }
+      case "block": {
+        const block = await parseBlock(resource);
+        if (block) {
+          blockItems.push(block);
+        }
+        break;
+      }
+    }
   }
+  returnBlock.items = blockItems;
   const blockCssStyles = blockProperties.find(
     (property) => property.label === "presentation" && property.values[0]?.content === "css"
   )?.properties;
@@ -2211,9 +2177,7 @@ function parseWebsiteProperties(properties) {
   let privacy = websiteProperties.find(
     (property) => property.label === "privacy"
   )?.values[0]?.content;
-  if (privacy == null) {
-    privacy = "public";
-  }
+  privacy ??= "public";
   const result = websiteSchema.safeParse({
     type,
     status,
@@ -2399,15 +2363,7 @@ async function parseWebsite(websiteTree, projectName, website) {
     }
     const sidebarResources = sidebarResource.resource ? Array.isArray(sidebarResource.resource) ? sidebarResource.resource : [sidebarResource.resource] : [];
     for (const resource of sidebarResources) {
-      const sidebarResourceProperties = resource.properties ? parseProperties(
-        Array.isArray(resource.properties.property) ? resource.properties.property : [resource.properties.property]
-      ) : [];
-      const element = await parseWebElement(
-        resource,
-        sidebarResourceProperties.find(
-          (property) => property.label === "presentation" && property.values[0]?.content === "element"
-        )?.properties ?? []
-      );
+      const element = await parseWebElement(resource);
       sidebarElements.push(element);
     }
   }

package/dist/index.d.cts

@@ -115,6 +115,7 @@ type Link = {
     category: "resource" | "concept" | "set" | "tree" | "person" | "bibliography" | "epigraphicUnit" | null;
     identification: Identification | null;
     content: string | null;
+    href: string | null;
     image: {
         isInline: boolean;
         heightPreview: number;
@@ -440,7 +441,7 @@ type Webpage = {
     title: string;
     slug: string;
     properties: WebpageProperties;
-    blocks: Array<WebBlock>;
+    items: Array<WebElement | WebBlock>;
     webpages: Array<Webpage>;
 };
 /**
@@ -460,6 +461,7 @@ type WebpageProperties = {
  */
 type WebElement = {
     uuid: string;
+    type: "element";
     title: {
         label: string;
         variant: "default" | "simple";
@@ -506,6 +508,9 @@ type WebElementComponent = {
     component: "empty-space";
     height: string | null;
     width: string | null;
+} | {
+    component: "iframe";
+    url: string;
 } | {
     component: "iiif-viewer";
     IIIFId: string;
@@ -588,9 +593,9 @@ type Style = {
  */
 type WebBlock = {
     uuid: string;
+    type: "block";
     layout: "vertical" | "horizontal" | "grid";
-    blocks: Array<WebBlock>;
-    elements: Array<WebElement>;
+    items: Array<WebElement | WebBlock>;
     properties: {
         /**
          * valid `gridTemplateColumns` or `gridTemplateRows` CSS property value

package/dist/index.d.ts

@@ -115,6 +115,7 @@ type Link = {
     category: "resource" | "concept" | "set" | "tree" | "person" | "bibliography" | "epigraphicUnit" | null;
     identification: Identification | null;
     content: string | null;
+    href: string | null;
     image: {
         isInline: boolean;
         heightPreview: number;
@@ -440,7 +441,7 @@ type Webpage = {
     title: string;
     slug: string;
     properties: WebpageProperties;
-    blocks: Array<WebBlock>;
+    items: Array<WebElement | WebBlock>;
     webpages: Array<Webpage>;
 };
 /**
@@ -460,6 +461,7 @@ type WebpageProperties = {
  */
 type WebElement = {
     uuid: string;
+    type: "element";
     title: {
         label: string;
         variant: "default" | "simple";
@@ -506,6 +508,9 @@ type WebElementComponent = {
     component: "empty-space";
     height: string | null;
     width: string | null;
+} | {
+    component: "iframe";
+    url: string;
 } | {
     component: "iiif-viewer";
     IIIFId: string;
@@ -588,9 +593,9 @@ type Style = {
  */
 type WebBlock = {
     uuid: string;
+    type: "block";
     layout: "vertical" | "horizontal" | "grid";
-    blocks: Array<WebBlock>;
-    elements: Array<WebElement>;
+    items: Array<WebElement | WebBlock>;
     properties: {
         /**
          * valid `gridTemplateColumns` or `gridTemplateRows` CSS property value

package/dist/index.js

@@ -1,5 +1,4 @@
 // src/utils/parse.ts
-import { v4 as uuidv4 } from "uuid";
 import { z as z3 } from "zod";
 
 // src/utils/fetchers/generic.ts
@@ -491,6 +490,7 @@ var componentSchema = z3.enum(
     "button",
     "collection",
     "empty-space",
+    "iframe",
     "iiif-viewer",
     "image",
     "image-gallery",
@@ -649,6 +649,7 @@ function parseLink(linkRaw) {
     const returnLink = {
       category: "resource" in linkRaw ? "resource" : "concept" in linkRaw ? "concept" : "set" in linkRaw ? "set" : "person" in linkRaw ? "person" : "tree" in linkRaw ? "tree" : "bibliography" in linkRaw ? "bibliography" : "epigraphicUnit" in linkRaw ? "epigraphicUnit" : null,
       content: "content" in link ? link.content != null ? parseFakeString(link.content) : null : null,
+      href: "href" in link && link.href != null ? link.href : null,
       uuid: link.uuid,
       type: link.type ?? null,
       identification: link.identification ? parseIdentification(link.identification) : null,
@@ -1230,10 +1231,7 @@ var parseWebpageResources = async (webpageResources, type) => {
     if (!resourceProperty) continue;
     switch (type) {
       case "element": {
-        const element = await parseWebElement(
-          resource,
-          resourceProperty.properties
-        );
+        const element = await parseWebElement(resource);
         returnElements.push(
           element
         );
@@ -1335,9 +1333,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "layout"
       );
-      if (layout === null) {
-        layout = "long";
-      }
+      layout ??= "long";
       properties.bibliographies = bibliographyLink.bibliographies;
       properties.layout = layout;
       break;
@@ -1357,9 +1353,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "variant"
       );
-      if (variant === null) {
-        variant = "default";
-      }
+      variant ??= "default";
       let isExternal = false;
       let href = getPropertyValueByLabel(
         componentProperty.properties,
@@ -1390,16 +1384,12 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "variant"
       );
-      if (variant === null) {
-        variant = "full";
-      }
+      variant ??= "full";
       let layout = getPropertyValueByLabel(
         componentProperty.properties,
         "layout"
       );
-      if (layout === null) {
-        layout = "image-start";
-      }
+      layout ??= "image-start";
       const collectionLink = links.find((link) => link.category === "set");
       if (!collectionLink) {
         throw new Error(
@@ -1424,6 +1414,16 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       properties.width = width;
       break;
     }
+    case "iframe": {
+      const url = links.find((link) => link.type === "webpage")?.href;
+      if (!url) {
+        throw new Error(
+          `URL not found for the following component: \u201C${componentName}\u201D`
+        );
+      }
+      properties.url = url;
+      break;
+    }
     case "iiif-viewer": {
       const manifestLink = links.find((link) => link.type === "IIIF");
       if (!manifestLink) {
@@ -1453,16 +1453,12 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "variant"
       );
-      if (variant === null) {
-        variant = "default";
-      }
+      variant ??= "default";
       let captionLayout = getPropertyValueByLabel(
         componentProperty.properties,
         "layout-caption"
       );
-      if (captionLayout === null) {
-        captionLayout = "bottom";
-      }
+      captionLayout ??= "bottom";
       let width = null;
       const widthProperty = getPropertyValueByLabel(
         componentProperty.properties,
@@ -1499,23 +1495,17 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "image-quality"
       );
-      if (imageQuality === null) {
-        imageQuality = "high";
-      }
+      imageQuality ??= "high";
       let captionSource = getPropertyValueByLabel(
         componentProperty.properties,
         "caption-source"
       );
-      if (captionSource === null) {
-        captionSource = "name";
-      }
+      captionSource ??= "name";
       let altTextSource = getPropertyValueByLabel(
         componentProperty.properties,
         "alt-text-source"
       );
-      if (altTextSource === null) {
-        altTextSource = "name";
-      }
+      altTextSource ??= "name";
       let isTransparentBackground = false;
       const isTransparentBackgroundProperty = getPropertyValueByLabel(
         componentProperty.properties,
@@ -1636,9 +1626,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "variant"
       );
-      if (variant === null) {
-        variant = "block";
-      }
+      variant ??= "block";
       const heading = getPropertyValueByLabel(
         componentProperty.properties,
         "heading"
@@ -1658,23 +1646,17 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "variant"
       );
-      if (variant === null) {
-        variant = "block";
-      }
+      variant ??= "block";
       let layout = getPropertyValueByLabel(
         componentProperty.properties,
         "layout"
       );
-      if (layout === null) {
-        layout = "image-start";
-      }
+      layout ??= "image-start";
       let captionLayout = getPropertyValueByLabel(
         componentProperty.properties,
         "layout-caption"
       );
-      if (captionLayout === null) {
-        captionLayout = "bottom";
-      }
+      captionLayout ??= "bottom";
       const imageLink = links.find(
         (link) => link.type === "image" || link.type === "IIIF"
       );
@@ -1689,23 +1671,17 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "image-quality"
       );
-      if (imageQuality === null) {
-        imageQuality = "high";
-      }
+      imageQuality ??= "high";
       let captionSource = getPropertyValueByLabel(
         componentProperty.properties,
         "caption-source"
       );
-      if (captionSource === null) {
-        captionSource = "name";
-      }
+      captionSource ??= "name";
       let altTextSource = getPropertyValueByLabel(
         componentProperty.properties,
         "alt-text-source"
       );
-      if (altTextSource === null) {
-        altTextSource = "name";
-      }
+      altTextSource ??= "name";
       properties.variant = variant;
       properties.image = {
         url: `https://ochre.lib.uchicago.edu/ochre?uuid=${imageLink.uuid}&preview`,
@@ -1742,9 +1718,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "chapters-displayed"
       );
-      if (isChaptersDislayed == null) {
-        isChaptersDislayed = "Yes";
-      }
+      isChaptersDislayed ??= "Yes";
       properties.videoId = videoLink.uuid;
       properties.isChaptersDislayed = isChaptersDislayed === "Yes";
       break;
@@ -1760,9 +1734,20 @@ async function parseWebElementProperties(componentProperty, elementResource) {
   }
   return properties;
 }
-async function parseWebElement(elementResource, elementProperties) {
+async function parseWebElement(elementResource) {
   const identification = parseIdentification(elementResource.identification);
-  const componentProperty = elementProperties.find(
+  const elementProperties = elementResource.properties?.property ? parseProperties(
+    Array.isArray(elementResource.properties.property) ? elementResource.properties.property : [elementResource.properties.property]
+  ) : [];
+  const presentationProperty = elementProperties.find(
+    (property) => property.label === "presentation"
+  );
+  if (!presentationProperty) {
+    throw new Error(
+      `Presentation property not found for element \u201C${identification.label}\u201D`
+    );
+  }
+  const componentProperty = presentationProperty.properties.find(
     (property) => property.label === "component"
   );
   if (!componentProperty) {
@@ -1826,6 +1811,7 @@ async function parseWebElement(elementResource, elementProperties) {
   }
   return {
     uuid: elementResource.uuid,
+    type: "element",
     title: {
       label: identification.label,
       variant,
@@ -1860,8 +1846,7 @@ async function parseWebpage(webpageResource) {
     (link) => link.type === "image" || link.type === "IIIF"
   );
   const webpageResources = webpageResource.resource ? Array.isArray(webpageResource.resource) ? webpageResource.resource : [webpageResource.resource] : [];
-  const blocks = [];
-  let elementsToHandle = [];
+  const items = [];
   for (const resource of webpageResources) {
     const resourceProperties = resource.properties ? parseProperties(
       Array.isArray(resource.properties.property) ? resource.properties.property : [resource.properties.property]
@@ -1873,55 +1858,21 @@ async function parseWebpage(webpageResource) {
     if (!resourceType) {
       continue;
     }
-    if (resourceType === "element") {
-      elementsToHandle.push(resource);
-    } else if (resourceType === "block") {
-      if (elementsToHandle.length > 0) {
-        const elements = await parseWebpageResources(
-          elementsToHandle,
-          "element"
-        );
-        const block = {
-          uuid: uuidv4(),
-          layout: "vertical",
-          blocks: [],
-          elements,
-          properties: {
-            spacing: void 0,
-            gap: void 0,
-            alignItems: "start",
-            justifyContent: "stretch"
-          },
-          propertiesMobile: null,
-          cssStyles: [],
-          cssStylesMobile: []
-        };
-        blocks.push(block);
-        elementsToHandle = [];
+    switch (resourceType) {
+      case "element": {
+        const element = await parseWebElement(resource);
+        items.push(element);
+        break;
+      }
+      case "block": {
+        const block = await parseBlock(resource);
+        if (block) {
+          items.push(block);
+        }
+        break;
       }
-      const parsedBlocks = await parseWebpageResources([resource], "block");
-      blocks.push(...parsedBlocks);
     }
   }
-  if (elementsToHandle.length > 0) {
-    const elements = await parseWebpageResources(elementsToHandle, "element");
-    const block = {
-      uuid: uuidv4(),
-      layout: "vertical",
-      blocks: [],
-      elements,
-      properties: {
-        spacing: void 0,
-        gap: void 0,
-        alignItems: "start",
-        justifyContent: "stretch"
-      },
-      propertiesMobile: null,
-      cssStyles: [],
-      cssStylesMobile: []
-    };
-    blocks.push(block);
-  }
   const webpages = webpageResource.resource ? await parseWebpageResources(
     Array.isArray(webpageResource.resource) ? webpageResource.resource : [webpageResource.resource],
     "page"
@@ -1986,7 +1937,7 @@ async function parseWebpage(webpageResource) {
   return {
     title: identification.label,
     slug,
-    blocks,
+    items,
     properties: {
       displayedInHeader,
       width,
@@ -2013,9 +1964,9 @@ async function parseWebpages(webpageResources) {
 async function parseBlock(blockResource) {
   const returnBlock = {
     uuid: blockResource.uuid,
+    type: "block",
     layout: "vertical",
-    blocks: [],
-    elements: [],
+    items: [],
     properties: {
       spacing: void 0,
       gap: void 0,
@@ -2075,20 +2026,35 @@ async function parseBlock(blockResource) {
       returnBlock.propertiesMobile = propertiesMobile;
     }
   }
-  const blockBlocks = blockResource.resource ? await parseWebpageResources(
-    Array.isArray(blockResource.resource) ? blockResource.resource : [blockResource.resource],
-    "block"
-  ) : [];
-  for (const block of blockBlocks) {
-    returnBlock.blocks.push(block);
-  }
-  const blockElements = blockResource.resource ? await parseWebpageResources(
-    Array.isArray(blockResource.resource) ? blockResource.resource : [blockResource.resource],
-    "element"
-  ) : [];
-  for (const element of blockElements) {
-    returnBlock.elements.push(element);
+  const blockResources = blockResource.resource ? Array.isArray(blockResource.resource) ? blockResource.resource : [blockResource.resource] : [];
+  const blockItems = [];
+  for (const resource of blockResources) {
+    const resourceProperties = resource.properties ? parseProperties(
+      Array.isArray(resource.properties.property) ? resource.properties.property : [resource.properties.property]
+    ) : [];
+    const resourceType = getPropertyValueByLabel(
+      resourceProperties,
+      "presentation"
+    );
+    if (!resourceType) {
+      continue;
+    }
+    switch (resourceType) {
+      case "element": {
+        const element = await parseWebElement(resource);
+        blockItems.push(element);
+        break;
+      }
+      case "block": {
+        const block = await parseBlock(resource);
+        if (block) {
+          blockItems.push(block);
+        }
+        break;
+      }
+    }
   }
+  returnBlock.items = blockItems;
   const blockCssStyles = blockProperties.find(
     (property) => property.label === "presentation" && property.values[0]?.content === "css"
   )?.properties;
@@ -2134,9 +2100,7 @@ function parseWebsiteProperties(properties) {
   let privacy = websiteProperties.find(
     (property) => property.label === "privacy"
   )?.values[0]?.content;
-  if (privacy == null) {
-    privacy = "public";
-  }
+  privacy ??= "public";
   const result = websiteSchema.safeParse({
     type,
     status,
@@ -2322,15 +2286,7 @@ async function parseWebsite(websiteTree, projectName, website) {
     }
     const sidebarResources = sidebarResource.resource ? Array.isArray(sidebarResource.resource) ? sidebarResource.resource : [sidebarResource.resource] : [];
     for (const resource of sidebarResources) {
-      const sidebarResourceProperties = resource.properties ? parseProperties(
-        Array.isArray(resource.properties.property) ? resource.properties.property : [resource.properties.property]
-      ) : [];
-      const element = await parseWebElement(
-        resource,
-        sidebarResourceProperties.find(
-          (property) => property.label === "presentation" && property.values[0]?.content === "element"
-        )?.properties ?? []
-      );
+      const element = await parseWebElement(resource);
       sidebarElements.push(element);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalculture/ochre-sdk",
-  "version": "0.4.15",
+  "version": "0.5.1",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -41,21 +41,20 @@
   ],
   "dependencies": {
     "iso-639-3": "^3.0.1",
-    "uuid": "^11.1.0",
     "zod": "^3.24.2"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^4.3.0",
+    "@antfu/eslint-config": "^4.11.0",
     "@arethetypeswrong/cli": "^0.17.4",
     "@changesets/cli": "^2.28.1",
     "@total-typescript/ts-reset": "^0.6.1",
-    "@types/node": "^22.13.5",
-    "eslint": "^9.21.0",
+    "@types/node": "^22.13.14",
+    "eslint": "^9.23.0",
     "eslint-plugin-unused-imports": "^4.1.4",
-    "prettier": "^3.5.2",
+    "prettier": "^3.5.3",
     "tsup": "^8.4.0",
-    "typescript": "^5.7.3",
-    "vitest": "^3.0.7"
+    "typescript": "^5.8.2",
+    "vitest": "^3.0.9"
   },
   "scripts": {
     "dev": "tsup src/index.ts --watch",