@digitalculture/ochre-sdk 0.4.1 → 0.4.3

package/dist/index.cjs

@@ -198,11 +198,13 @@ function parseWhitespace(contentString, whitespace) {
     console.warn(`Invalid whitespace string provided: \u201C${whitespace}\u201D`);
     return contentString;
   }
-  for (const option of result.data) {
+  for (const [index, option] of result.data.entries()) {
     switch (option) {
       case "newline": {
-        returnString = `${returnString}
-<br />`;
+        if (index !== 0) {
+          returnString = `<br />
+${returnString}`;
+        }
         break;
       }
       case "trailing": {
@@ -589,6 +591,7 @@ var componentSchema = import_zod3.z.enum(
     "blog",
     "button",
     "collection",
+    "empty-space",
     "iiif-viewer",
     "image",
     "image-gallery",
@@ -1510,6 +1513,19 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       properties.collectionId = collectionLink.uuid;
       break;
     }
+    case "empty-space": {
+      const height = getPropertyValueByLabel(
+        componentProperty.properties,
+        "height"
+      );
+      const width = getPropertyValueByLabel(
+        componentProperty.properties,
+        "width"
+      );
+      properties.height = height;
+      properties.width = width;
+      break;
+    }
     case "iiif-viewer": {
       const manifestLink = links.find((link) => link.type === "IIIF");
       if (!manifestLink) {
@@ -1890,7 +1906,7 @@ async function parseWebpage(webpageResource) {
     return null;
   }
   const identification = parseIdentification(webpageResource.identification);
-  const slug = webpageResource.slug === "/" ? "" : webpageResource.slug;
+  const slug = webpageResource.slug;
   if (slug === void 0) {
     throw new Error(`Slug not found for page \u201C${identification.label}\u201D`);
   }
@@ -1900,16 +1916,55 @@ async function parseWebpage(webpageResource) {
   const imageLink = links.find(
     (link) => link.type === "image" || link.type === "IIIF"
   );
-  const blocks = webpageResource.resource ? await parseWebpageResources(
-    Array.isArray(webpageResource.resource) ? webpageResource.resource : [webpageResource.resource],
-    "block"
-  ) : [];
-  if (blocks.length === 0) {
-    const defaultBlock = {
+  const webpageResources = webpageResource.resource ? Array.isArray(webpageResource.resource) ? webpageResource.resource : [webpageResource.resource] : [];
+  const blocks = [];
+  let elementsToHandle = [];
+  for (const resource of webpageResources) {
+    const resourceProperties = resource.properties ? parseProperties(
+      Array.isArray(resource.properties.property) ? resource.properties.property : [resource.properties.property]
+    ) : [];
+    const resourceType = getPropertyValueByLabel(
+      resourceProperties,
+      "presentation"
+    );
+    if (!resourceType) {
+      continue;
+    }
+    if (resourceType !== "block") {
+      elementsToHandle.push(resource);
+    } else {
+      if (elementsToHandle.length > 0) {
+        const elements = await parseWebpageResources(
+          elementsToHandle,
+          "element"
+        );
+        const block = {
+          uuid: resource.uuid,
+          layout: "vertical",
+          blocks: [],
+          elements,
+          properties: {
+            spacing: "auto",
+            gap: "none",
+            alignItems: "stretch",
+            justifyContent: "stretch"
+          },
+          cssStyles: []
+        };
+        blocks.push(block);
+        elementsToHandle = [];
+      }
+      const parsedBlocks = await parseWebpageResources([resource], "block");
+      blocks.push(...parsedBlocks);
+    }
+  }
+  if (elementsToHandle.length > 0) {
+    const elements = await parseWebpageResources(elementsToHandle, "element");
+    const block = {
       uuid: webpageResource.uuid,
       layout: "vertical",
       blocks: [],
-      elements: [],
+      elements,
       properties: {
         spacing: "auto",
         gap: "none",
@@ -1918,14 +1973,7 @@ async function parseWebpage(webpageResource) {
       },
       cssStyles: []
     };
-    blocks.push(defaultBlock);
-    const elements = webpageResource.resource ? await parseWebpageResources(
-      Array.isArray(webpageResource.resource) ? webpageResource.resource : [webpageResource.resource],
-      "element"
-    ) : [];
-    if (elements.length > 0) {
-      defaultBlock.elements = elements;
-    }
+    blocks.push(block);
   }
   const webpages = webpageResource.resource ? await parseWebpageResources(
     Array.isArray(webpageResource.resource) ? webpageResource.resource : [webpageResource.resource],

package/dist/index.d.cts

@@ -499,6 +499,10 @@ type WebElementComponent = {
     variant: "full" | "highlights";
     layout: "image-top" | "image-bottom" | "image-start" | "image-end";
     isSearchable: boolean;
+} | {
+    component: "empty-space";
+    height: string | null;
+    width: string | null;
 } | {
     component: "iiif-viewer";
     IIIFId: string;

package/dist/index.d.ts

@@ -499,6 +499,10 @@ type WebElementComponent = {
     variant: "full" | "highlights";
     layout: "image-top" | "image-bottom" | "image-start" | "image-end";
     isSearchable: boolean;
+} | {
+    component: "empty-space";
+    height: string | null;
+    width: string | null;
 } | {
     component: "iiif-viewer";
     IIIFId: string;

package/dist/index.js

@@ -120,11 +120,13 @@ function parseWhitespace(contentString, whitespace) {
     console.warn(`Invalid whitespace string provided: \u201C${whitespace}\u201D`);
     return contentString;
   }
-  for (const option of result.data) {
+  for (const [index, option] of result.data.entries()) {
     switch (option) {
       case "newline": {
-        returnString = `${returnString}
-<br />`;
+        if (index !== 0) {
+          returnString = `<br />
+${returnString}`;
+        }
         break;
       }
       case "trailing": {
@@ -511,6 +513,7 @@ var componentSchema = z3.enum(
     "blog",
     "button",
     "collection",
+    "empty-space",
     "iiif-viewer",
     "image",
     "image-gallery",
@@ -1432,6 +1435,19 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       properties.collectionId = collectionLink.uuid;
       break;
     }
+    case "empty-space": {
+      const height = getPropertyValueByLabel(
+        componentProperty.properties,
+        "height"
+      );
+      const width = getPropertyValueByLabel(
+        componentProperty.properties,
+        "width"
+      );
+      properties.height = height;
+      properties.width = width;
+      break;
+    }
     case "iiif-viewer": {
       const manifestLink = links.find((link) => link.type === "IIIF");
       if (!manifestLink) {
@@ -1812,7 +1828,7 @@ async function parseWebpage(webpageResource) {
     return null;
   }
   const identification = parseIdentification(webpageResource.identification);
-  const slug = webpageResource.slug === "/" ? "" : webpageResource.slug;
+  const slug = webpageResource.slug;
   if (slug === void 0) {
     throw new Error(`Slug not found for page \u201C${identification.label}\u201D`);
   }
@@ -1822,16 +1838,55 @@ async function parseWebpage(webpageResource) {
   const imageLink = links.find(
     (link) => link.type === "image" || link.type === "IIIF"
   );
-  const blocks = webpageResource.resource ? await parseWebpageResources(
-    Array.isArray(webpageResource.resource) ? webpageResource.resource : [webpageResource.resource],
-    "block"
-  ) : [];
-  if (blocks.length === 0) {
-    const defaultBlock = {
+  const webpageResources = webpageResource.resource ? Array.isArray(webpageResource.resource) ? webpageResource.resource : [webpageResource.resource] : [];
+  const blocks = [];
+  let elementsToHandle = [];
+  for (const resource of webpageResources) {
+    const resourceProperties = resource.properties ? parseProperties(
+      Array.isArray(resource.properties.property) ? resource.properties.property : [resource.properties.property]
+    ) : [];
+    const resourceType = getPropertyValueByLabel(
+      resourceProperties,
+      "presentation"
+    );
+    if (!resourceType) {
+      continue;
+    }
+    if (resourceType !== "block") {
+      elementsToHandle.push(resource);
+    } else {
+      if (elementsToHandle.length > 0) {
+        const elements = await parseWebpageResources(
+          elementsToHandle,
+          "element"
+        );
+        const block = {
+          uuid: resource.uuid,
+          layout: "vertical",
+          blocks: [],
+          elements,
+          properties: {
+            spacing: "auto",
+            gap: "none",
+            alignItems: "stretch",
+            justifyContent: "stretch"
+          },
+          cssStyles: []
+        };
+        blocks.push(block);
+        elementsToHandle = [];
+      }
+      const parsedBlocks = await parseWebpageResources([resource], "block");
+      blocks.push(...parsedBlocks);
+    }
+  }
+  if (elementsToHandle.length > 0) {
+    const elements = await parseWebpageResources(elementsToHandle, "element");
+    const block = {
       uuid: webpageResource.uuid,
       layout: "vertical",
       blocks: [],
-      elements: [],
+      elements,
       properties: {
         spacing: "auto",
         gap: "none",
@@ -1840,14 +1895,7 @@ async function parseWebpage(webpageResource) {
       },
       cssStyles: []
     };
-    blocks.push(defaultBlock);
-    const elements = webpageResource.resource ? await parseWebpageResources(
-      Array.isArray(webpageResource.resource) ? webpageResource.resource : [webpageResource.resource],
-      "element"
-    ) : [];
-    if (elements.length > 0) {
-      defaultBlock.elements = elements;
-    }
+    blocks.push(block);
   }
   const webpages = webpageResource.resource ? await parseWebpageResources(
     Array.isArray(webpageResource.resource) ? webpageResource.resource : [webpageResource.resource],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalculture/ochre-sdk",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -52,9 +52,9 @@
     "eslint": "^9.21.0",
     "eslint-plugin-unused-imports": "^4.1.4",
     "prettier": "^3.5.2",
-    "tsup": "^8.3.6",
+    "tsup": "^8.4.0",
     "typescript": "^5.7.3",
-    "vitest": "^3.0.6"
+    "vitest": "^3.0.7"
   },
   "scripts": {
     "dev": "tsup src/index.ts --watch",