@digitalculture/ochre-sdk 0.4.14 → 0.5.0

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

@@ -42,7 +42,7 @@ __export(index_exports, {
   parseContext: () => parseContext,
   parseCoordinates: () => parseCoordinates,
   parseDocument: () => parseDocument,
-  parseEmailAndUrl: () => parseEmailAndUrl,
+  parseEmail: () => parseEmail,
   parseEvents: () => parseEvents,
   parseFakeString: () => parseFakeString,
   parseIdentification: () => parseIdentification,
@@ -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
@@ -125,21 +124,11 @@ var whitespaceSchema = import_zod2.z.string().transform((str) => str.split(" "))
   )
 );
 var emailSchema = import_zod2.z.string().email({ message: "Invalid email" });
-var urlSchema = import_zod2.z.string().refine((v) => v ? isUrlValid(v) : false, {
-  message: "Invalid URL"
-});
-function isUrlValid(url) {
-  const pattern = (
-    // eslint-disable-next-line regexp/no-useless-quantifier, regexp/no-unused-capturing-group
-    /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\w$&+,:;=-]+@)?[\d.A-Za-z-]+(:\d+)?|(?:www.|[\w$&+,:;=-]+@)[\d.A-Za-z-]+)((?:\/[\w%+./~-]*)?\??[\w%&+.;=@-]*#?\w*)?)/
-  );
-  return !!pattern.test(url);
-}
 function getStringItemByLanguage(content, language) {
   const stringItemToFind = content.find((item) => item.lang === language);
   return stringItemToFind ?? null;
 }
-function parseEmailAndUrl(string) {
+function parseEmail(string) {
   const splitString = string.split(" ");
   const returnSplitString = [];
   for (const string2 of splitString) {
@@ -155,13 +144,6 @@ function parseEmailAndUrl(string) {
       );
       continue;
     }
-    const isUrl = urlSchema.safeParse(cleanString).success;
-    if (isUrl) {
-      returnSplitString.push(
-        `${before}<ExternalLink href="${cleanString}">${cleanString}</ExternalLink>${after}`
-      );
-      continue;
-    }
     returnSplitString.push(string2);
   }
   return returnSplitString.join(" ");
@@ -265,7 +247,7 @@ function parseStringItem(item) {
 }
 function parseStringDocumentItem(item, footnotes) {
   if (typeof item === "string" || typeof item === "number" || typeof item === "boolean") {
-    return parseEmailAndUrl(parseFakeString(item));
+    return parseEmail(parseFakeString(item));
   }
   if ("whitespace" in item && !("content" in item) && !("string" in item)) {
     if (item.whitespace === "newline") {
@@ -371,25 +353,16 @@ function parseStringDocumentItem(item, footnotes) {
       returnString += parseStringDocumentItem(stringItem, footnotes);
     }
     if ("whitespace" in item && item.whitespace != null) {
-      returnString = parseWhitespace(
-        parseEmailAndUrl(returnString),
-        item.whitespace
-      );
+      returnString = parseWhitespace(parseEmail(returnString), item.whitespace);
     }
     return returnString.replaceAll("&#39;", "'").replaceAll(/^(\d+)\./gm, String.raw`$1\.`);
   } else {
     returnString = parseFakeString(item.content);
     if (item.rend != null) {
-      returnString = parseRenderOptions(
-        parseEmailAndUrl(returnString),
-        item.rend
-      );
+      returnString = parseRenderOptions(parseEmail(returnString), item.rend);
     }
     if (item.whitespace != null) {
-      returnString = parseWhitespace(
-        parseEmailAndUrl(returnString),
-        item.whitespace
-      );
+      returnString = parseWhitespace(parseEmail(returnString), item.whitespace);
     }
   }
   return returnString.replaceAll(/^(\d+)\./gm, String.raw`$1\.`);
@@ -786,9 +759,7 @@ function parseDocument(document, language = "eng") {
   const footnotes = [];
   const documentWithLanguage = Array.isArray(document) ? document.find((doc) => doc.lang === language) : document;
   if (typeof documentWithLanguage.string === "string" || typeof documentWithLanguage.string === "number" || typeof documentWithLanguage.string === "boolean") {
-    returnString += parseEmailAndUrl(
-      parseFakeString(documentWithLanguage.string)
-    );
+    returnString += parseEmail(parseFakeString(documentWithLanguage.string));
   } else {
     const documentItems = Array.isArray(documentWithLanguage.string) ? documentWithLanguage.string : [documentWithLanguage.string];
     for (const item of documentItems) {
@@ -840,9 +811,9 @@ function parseNotes(notes, language = "eng") {
       }
     }
     if (typeof noteWithLanguage.string === "string" || typeof noteWithLanguage.string === "number" || typeof noteWithLanguage.string === "boolean") {
-      content = parseEmailAndUrl(parseFakeString(noteWithLanguage.string));
+      content = parseEmail(parseFakeString(noteWithLanguage.string));
     } else {
-      content = parseEmailAndUrl(parseDocument(noteWithLanguage).content);
+      content = parseEmail(parseDocument(noteWithLanguage).content);
     }
     returnNotes.push({
       number: note.noteNo,
@@ -1335,10 +1306,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
         );
@@ -1865,9 +1833,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) {
@@ -1931,6 +1910,7 @@ async function parseWebElement(elementResource, elementProperties) {
   }
   return {
     uuid: elementResource.uuid,
+    type: "element",
     title: {
       label: identification.label,
       variant,
@@ -1965,8 +1945,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]
@@ -1978,55 +1957,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"
@@ -2091,7 +2036,7 @@ async function parseWebpage(webpageResource) {
   return {
     title: identification.label,
     slug,
-    blocks,
+    items,
     properties: {
       displayedInHeader,
       width,
@@ -2118,9 +2063,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,
@@ -2180,20 +2125,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;
@@ -2427,15 +2387,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);
     }
   }
@@ -2743,7 +2695,7 @@ async function fetchWebsite(abbreviation) {
   parseContext,
   parseCoordinates,
   parseDocument,
-  parseEmailAndUrl,
+  parseEmail,
   parseEvents,
   parseFakeString,
   parseIdentification,

package/dist/index.d.cts

@@ -440,7 +440,7 @@ type Webpage = {
     title: string;
     slug: string;
     properties: WebpageProperties;
-    blocks: Array<WebBlock>;
+    items: Array<WebElement | WebBlock>;
     webpages: Array<Webpage>;
 };
 /**
@@ -460,6 +460,7 @@ type WebpageProperties = {
  */
 type WebElement = {
     uuid: string;
+    type: "element";
     title: {
         label: string;
         variant: "default" | "simple";
@@ -588,9 +589,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
@@ -1796,19 +1797,18 @@ declare function parseConcepts(concepts: Array<OchreConcept> | Array<OchreNested
 declare function parseWebsite(websiteTree: OchreTree, projectName: FakeString, website: FakeString | null): Promise<Website>;
 
 /**
- * Parses email addresses and URLs in a string into HTML links
+ * Parses email addresses in a string into HTML links
  *
  * @param string - Input string to parse
- * @returns String with emails and URLs converted to HTML links
+ * @returns String with emails converted to HTML links
  *
  * @example
  * ```ts
- * const parsed = parseEmailAndUrl("Contact us at info@example.com or visit www.example.com");
- * // Returns: "Contact us at <ExternalLink href="mailto:info@example.com">info@example.com</ExternalLink>
- * //          or visit <ExternalLink href="www.example.com">www.example.com</ExternalLink>"
+ * const parsed = parseEmail("Contact us at info@example.com");
+ * // Returns: "Contact us at <ExternalLink href="mailto:info@example.com">info@example.com</ExternalLink>"
  * ```
  */
-declare function parseEmailAndUrl(string: string): string;
+declare function parseEmail(string: string): string;
 /**
  * Converts a FakeString (string|number|boolean) to a proper string
  *
@@ -1847,4 +1847,4 @@ declare function parseStringDocumentItem(item: OchreStringRichTextItem, footnote
  */
 declare function parseStringContent(content: OchreStringContent, language?: string): string;
 
-export { type Bibliography, type Concept, type Context, type ContextItem, type ContextNode, type Coordinates, type Data, type Document, type Event, type Footnote, type Gallery, type Identification, type Image, type ImageMap, type ImageMapArea, type Interpretation, type License, type Link, type Metadata, type NestedConcept, type NestedResource, type NestedSpatialUnit, type Note, type Observation, type Period, type Person, type Property, type PropertyValue, type PropertyValueType, type Resource, type Set, type SpatialUnit, type Style, type Tree, type WebBlock, type WebElement, type WebElementComponent, type WebImage, type Webpage, type WebpageProperties, type Website, type WebsiteProperties, fetchBibliography, fetchByUuid, fetchConcept, fetchGallery, fetchPeriod, fetchResource, fetchSet, fetchSpatialUnit, fetchTree, fetchWebsite, filterProperties, getAllPropertyLabels, getPropertyByLabel, getPropertyValueByLabel, getPropertyValuesByLabel, parseBibliographies, parseBibliography, parseConcept, parseConcepts, parseContext, parseCoordinates, parseDocument, parseEmailAndUrl, parseEvents, parseFakeString, parseIdentification, parseImage, parseImageMap, parseInterpretations, parseLanguages, parseLicense, parseLink, parseLinks, parseMetadata, parseNotes, parseObservation, parseObservations, parsePeriod, parsePeriods, parsePerson, parsePersons, parseProperties, parseResource, parseResources, parseSet, parseSpatialUnit, parseSpatialUnits, parseStringContent, parseStringDocumentItem, parseStringItem, parseTree, parseWebsite };
+export { type Bibliography, type Concept, type Context, type ContextItem, type ContextNode, type Coordinates, type Data, type Document, type Event, type Footnote, type Gallery, type Identification, type Image, type ImageMap, type ImageMapArea, type Interpretation, type License, type Link, type Metadata, type NestedConcept, type NestedResource, type NestedSpatialUnit, type Note, type Observation, type Period, type Person, type Property, type PropertyValue, type PropertyValueType, type Resource, type Set, type SpatialUnit, type Style, type Tree, type WebBlock, type WebElement, type WebElementComponent, type WebImage, type Webpage, type WebpageProperties, type Website, type WebsiteProperties, fetchBibliography, fetchByUuid, fetchConcept, fetchGallery, fetchPeriod, fetchResource, fetchSet, fetchSpatialUnit, fetchTree, fetchWebsite, filterProperties, getAllPropertyLabels, getPropertyByLabel, getPropertyValueByLabel, getPropertyValuesByLabel, parseBibliographies, parseBibliography, parseConcept, parseConcepts, parseContext, parseCoordinates, parseDocument, parseEmail, parseEvents, parseFakeString, parseIdentification, parseImage, parseImageMap, parseInterpretations, parseLanguages, parseLicense, parseLink, parseLinks, parseMetadata, parseNotes, parseObservation, parseObservations, parsePeriod, parsePeriods, parsePerson, parsePersons, parseProperties, parseResource, parseResources, parseSet, parseSpatialUnit, parseSpatialUnits, parseStringContent, parseStringDocumentItem, parseStringItem, parseTree, parseWebsite };

package/dist/index.d.ts

@@ -440,7 +440,7 @@ type Webpage = {
     title: string;
     slug: string;
     properties: WebpageProperties;
-    blocks: Array<WebBlock>;
+    items: Array<WebElement | WebBlock>;
     webpages: Array<Webpage>;
 };
 /**
@@ -460,6 +460,7 @@ type WebpageProperties = {
  */
 type WebElement = {
     uuid: string;
+    type: "element";
     title: {
         label: string;
         variant: "default" | "simple";
@@ -588,9 +589,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
@@ -1796,19 +1797,18 @@ declare function parseConcepts(concepts: Array<OchreConcept> | Array<OchreNested
 declare function parseWebsite(websiteTree: OchreTree, projectName: FakeString, website: FakeString | null): Promise<Website>;
 
 /**
- * Parses email addresses and URLs in a string into HTML links
+ * Parses email addresses in a string into HTML links
  *
  * @param string - Input string to parse
- * @returns String with emails and URLs converted to HTML links
+ * @returns String with emails converted to HTML links
  *
  * @example
  * ```ts
- * const parsed = parseEmailAndUrl("Contact us at info@example.com or visit www.example.com");
- * // Returns: "Contact us at <ExternalLink href="mailto:info@example.com">info@example.com</ExternalLink>
- * //          or visit <ExternalLink href="www.example.com">www.example.com</ExternalLink>"
+ * const parsed = parseEmail("Contact us at info@example.com");
+ * // Returns: "Contact us at <ExternalLink href="mailto:info@example.com">info@example.com</ExternalLink>"
  * ```
  */
-declare function parseEmailAndUrl(string: string): string;
+declare function parseEmail(string: string): string;
 /**
  * Converts a FakeString (string|number|boolean) to a proper string
  *
@@ -1847,4 +1847,4 @@ declare function parseStringDocumentItem(item: OchreStringRichTextItem, footnote
  */
 declare function parseStringContent(content: OchreStringContent, language?: string): string;
 
-export { type Bibliography, type Concept, type Context, type ContextItem, type ContextNode, type Coordinates, type Data, type Document, type Event, type Footnote, type Gallery, type Identification, type Image, type ImageMap, type ImageMapArea, type Interpretation, type License, type Link, type Metadata, type NestedConcept, type NestedResource, type NestedSpatialUnit, type Note, type Observation, type Period, type Person, type Property, type PropertyValue, type PropertyValueType, type Resource, type Set, type SpatialUnit, type Style, type Tree, type WebBlock, type WebElement, type WebElementComponent, type WebImage, type Webpage, type WebpageProperties, type Website, type WebsiteProperties, fetchBibliography, fetchByUuid, fetchConcept, fetchGallery, fetchPeriod, fetchResource, fetchSet, fetchSpatialUnit, fetchTree, fetchWebsite, filterProperties, getAllPropertyLabels, getPropertyByLabel, getPropertyValueByLabel, getPropertyValuesByLabel, parseBibliographies, parseBibliography, parseConcept, parseConcepts, parseContext, parseCoordinates, parseDocument, parseEmailAndUrl, parseEvents, parseFakeString, parseIdentification, parseImage, parseImageMap, parseInterpretations, parseLanguages, parseLicense, parseLink, parseLinks, parseMetadata, parseNotes, parseObservation, parseObservations, parsePeriod, parsePeriods, parsePerson, parsePersons, parseProperties, parseResource, parseResources, parseSet, parseSpatialUnit, parseSpatialUnits, parseStringContent, parseStringDocumentItem, parseStringItem, parseTree, parseWebsite };
+export { type Bibliography, type Concept, type Context, type ContextItem, type ContextNode, type Coordinates, type Data, type Document, type Event, type Footnote, type Gallery, type Identification, type Image, type ImageMap, type ImageMapArea, type Interpretation, type License, type Link, type Metadata, type NestedConcept, type NestedResource, type NestedSpatialUnit, type Note, type Observation, type Period, type Person, type Property, type PropertyValue, type PropertyValueType, type Resource, type Set, type SpatialUnit, type Style, type Tree, type WebBlock, type WebElement, type WebElementComponent, type WebImage, type Webpage, type WebpageProperties, type Website, type WebsiteProperties, fetchBibliography, fetchByUuid, fetchConcept, fetchGallery, fetchPeriod, fetchResource, fetchSet, fetchSpatialUnit, fetchTree, fetchWebsite, filterProperties, getAllPropertyLabels, getPropertyByLabel, getPropertyValueByLabel, getPropertyValuesByLabel, parseBibliographies, parseBibliography, parseConcept, parseConcepts, parseContext, parseCoordinates, parseDocument, parseEmail, parseEvents, parseFakeString, parseIdentification, parseImage, parseImageMap, parseInterpretations, parseLanguages, parseLicense, parseLink, parseLinks, parseMetadata, parseNotes, parseObservation, parseObservations, parsePeriod, parsePeriods, parsePerson, parsePersons, parseProperties, parseResource, parseResources, parseSet, parseSpatialUnit, parseSpatialUnits, parseStringContent, parseStringDocumentItem, parseStringItem, parseTree, parseWebsite };

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
@@ -48,21 +47,11 @@ var whitespaceSchema = z2.string().transform((str) => str.split(" ")).pipe(
   )
 );
 var emailSchema = z2.string().email({ message: "Invalid email" });
-var urlSchema = z2.string().refine((v) => v ? isUrlValid(v) : false, {
-  message: "Invalid URL"
-});
-function isUrlValid(url) {
-  const pattern = (
-    // eslint-disable-next-line regexp/no-useless-quantifier, regexp/no-unused-capturing-group
-    /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\w$&+,:;=-]+@)?[\d.A-Za-z-]+(:\d+)?|(?:www.|[\w$&+,:;=-]+@)[\d.A-Za-z-]+)((?:\/[\w%+./~-]*)?\??[\w%&+.;=@-]*#?\w*)?)/
-  );
-  return !!pattern.test(url);
-}
 function getStringItemByLanguage(content, language) {
   const stringItemToFind = content.find((item) => item.lang === language);
   return stringItemToFind ?? null;
 }
-function parseEmailAndUrl(string) {
+function parseEmail(string) {
   const splitString = string.split(" ");
   const returnSplitString = [];
   for (const string2 of splitString) {
@@ -78,13 +67,6 @@ function parseEmailAndUrl(string) {
       );
       continue;
     }
-    const isUrl = urlSchema.safeParse(cleanString).success;
-    if (isUrl) {
-      returnSplitString.push(
-        `${before}<ExternalLink href="${cleanString}">${cleanString}</ExternalLink>${after}`
-      );
-      continue;
-    }
     returnSplitString.push(string2);
   }
   return returnSplitString.join(" ");
@@ -188,7 +170,7 @@ function parseStringItem(item) {
 }
 function parseStringDocumentItem(item, footnotes) {
   if (typeof item === "string" || typeof item === "number" || typeof item === "boolean") {
-    return parseEmailAndUrl(parseFakeString(item));
+    return parseEmail(parseFakeString(item));
   }
   if ("whitespace" in item && !("content" in item) && !("string" in item)) {
     if (item.whitespace === "newline") {
@@ -294,25 +276,16 @@ function parseStringDocumentItem(item, footnotes) {
       returnString += parseStringDocumentItem(stringItem, footnotes);
     }
     if ("whitespace" in item && item.whitespace != null) {
-      returnString = parseWhitespace(
-        parseEmailAndUrl(returnString),
-        item.whitespace
-      );
+      returnString = parseWhitespace(parseEmail(returnString), item.whitespace);
     }
     return returnString.replaceAll("&#39;", "'").replaceAll(/^(\d+)\./gm, String.raw`$1\.`);
   } else {
     returnString = parseFakeString(item.content);
     if (item.rend != null) {
-      returnString = parseRenderOptions(
-        parseEmailAndUrl(returnString),
-        item.rend
-      );
+      returnString = parseRenderOptions(parseEmail(returnString), item.rend);
     }
     if (item.whitespace != null) {
-      returnString = parseWhitespace(
-        parseEmailAndUrl(returnString),
-        item.whitespace
-      );
+      returnString = parseWhitespace(parseEmail(returnString), item.whitespace);
     }
   }
   return returnString.replaceAll(/^(\d+)\./gm, String.raw`$1\.`);
@@ -709,9 +682,7 @@ function parseDocument(document, language = "eng") {
   const footnotes = [];
   const documentWithLanguage = Array.isArray(document) ? document.find((doc) => doc.lang === language) : document;
   if (typeof documentWithLanguage.string === "string" || typeof documentWithLanguage.string === "number" || typeof documentWithLanguage.string === "boolean") {
-    returnString += parseEmailAndUrl(
-      parseFakeString(documentWithLanguage.string)
-    );
+    returnString += parseEmail(parseFakeString(documentWithLanguage.string));
   } else {
     const documentItems = Array.isArray(documentWithLanguage.string) ? documentWithLanguage.string : [documentWithLanguage.string];
     for (const item of documentItems) {
@@ -763,9 +734,9 @@ function parseNotes(notes, language = "eng") {
       }
     }
     if (typeof noteWithLanguage.string === "string" || typeof noteWithLanguage.string === "number" || typeof noteWithLanguage.string === "boolean") {
-      content = parseEmailAndUrl(parseFakeString(noteWithLanguage.string));
+      content = parseEmail(parseFakeString(noteWithLanguage.string));
     } else {
-      content = parseEmailAndUrl(parseDocument(noteWithLanguage).content);
+      content = parseEmail(parseDocument(noteWithLanguage).content);
     }
     returnNotes.push({
       number: note.noteNo,
@@ -1258,10 +1229,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
         );
@@ -1788,9 +1756,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) {
@@ -1854,6 +1833,7 @@ async function parseWebElement(elementResource, elementProperties) {
   }
   return {
     uuid: elementResource.uuid,
+    type: "element",
     title: {
       label: identification.label,
       variant,
@@ -1888,8 +1868,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]
@@ -1901,55 +1880,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"
@@ -2014,7 +1959,7 @@ async function parseWebpage(webpageResource) {
   return {
     title: identification.label,
     slug,
-    blocks,
+    items,
     properties: {
       displayedInHeader,
       width,
@@ -2041,9 +1986,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,
@@ -2103,20 +2048,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;
@@ -2350,15 +2310,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);
     }
   }
@@ -2665,7 +2617,7 @@ export {
   parseContext,
   parseCoordinates,
   parseDocument,
-  parseEmailAndUrl,
+  parseEmail,
   parseEvents,
   parseFakeString,
   parseIdentification,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalculture/ochre-sdk",
-  "version": "0.4.14",
+  "version": "0.5.0",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -45,17 +45,17 @@
     "zod": "^3.24.2"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^4.3.0",
+    "@antfu/eslint-config": "^4.10.1",
     "@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.10",
+    "eslint": "^9.22.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",