@digitalculture/ochre-sdk 0.2.1 → 0.2.3

package/dist/index.cjs

@@ -622,6 +622,9 @@ function parseIdentification(identification) {
   }
 }
 function parseLanguages(language) {
+  if (language == null) {
+    return ["eng"];
+  }
   if (Array.isArray(language)) {
     return language.map((lang) => parseStringContent(lang));
   } else {
@@ -1327,7 +1330,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
   const links = elementResource.links ? parseLinks(
     Array.isArray(elementResource.links) ? elementResource.links : [elementResource.links]
   ) : [];
-  const imageLink = links.find((link) => link.type === "image");
+  const imageLinks = links.filter((link) => link.type === "image");
   let document = elementResource.document ? parseDocument(elementResource.document.content) : null;
   if (document === null) {
     const documentLink = links.find((link) => link.type === "internalDocument");
@@ -1350,7 +1353,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       break;
     }
     case "annotated-image": {
-      if (!imageLink) {
+      if (imageLinks.length === 0) {
         throw new Error(
           `Image link not found for the following component: \u201C${componentName}\u201D`
         );
@@ -1359,7 +1362,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "is-searchable"
       ) === "Yes";
-      properties.imageUuid = imageLink.uuid;
+      properties.imageUuid = imageLinks[0].uuid;
       properties.isSearchable = isSearchable;
       break;
     }
@@ -1458,7 +1461,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       break;
     }
     case "image": {
-      if (!imageLink) {
+      if (imageLinks.length === 0) {
         throw new Error(
           `Image link not found for the following component: \u201C${componentName}\u201D`
         );
@@ -1491,12 +1494,16 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       if (altTextSource === null) {
         altTextSource = "name";
       }
-      properties.image = {
-        url: `https://ochre.lib.uchicago.edu/ochre?uuid=${imageLink.uuid}&load`,
-        label: imageLink.identification?.label ?? null,
-        width: imageLink.image?.width ?? 0,
-        height: imageLink.image?.height ?? 0
-      };
+      const images = [];
+      for (const imageLink of imageLinks) {
+        images.push({
+          url: `https://ochre.lib.uchicago.edu/ochre?uuid=${imageLink.uuid}&load`,
+          label: imageLink.identification?.label ?? null,
+          width: imageLink.image?.width ?? 0,
+          height: imageLink.image?.height ?? 0
+        });
+      }
+      properties.images = images;
       properties.imageQuality = imageQuality;
       properties.captionLayout = captionLayout;
       properties.captionSource = captionSource;
@@ -1606,10 +1613,10 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       if (captionLayout === null) {
         captionLayout = "bottom";
       }
-      const imageLink2 = links.find(
+      const imageLink = links.find(
         (link) => link.type === "image" || link.type === "IIIF"
       );
-      if (!imageLink2) {
+      if (!imageLink) {
         throw new Error(
           `Image link not found for the following component: \u201C${componentName}\u201D: ${JSON.stringify(
             links
@@ -1639,10 +1646,10 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       }
       properties.variant = variant;
       properties.image = {
-        url: `https://ochre.lib.uchicago.edu/ochre?uuid=${imageLink2.uuid}&preview`,
-        label: imageLink2.identification?.label ?? null,
-        width: imageLink2.image?.width ?? 0,
-        height: imageLink2.image?.height ?? 0
+        url: `https://ochre.lib.uchicago.edu/ochre?uuid=${imageLink.uuid}&preview`,
+        label: imageLink.identification?.label ?? null,
+        width: imageLink.image?.width ?? 0,
+        height: imageLink.image?.height ?? 0
       };
       properties.imageQuality = imageQuality;
       properties.layout = layout;

package/dist/index.d.cts

@@ -752,7 +752,7 @@ type OchreMetadata = {
   publisher: OchreStringContent;
   dataset: OchreStringContent;
   project?: { identification: OchreIdentification };
-  language: OchreLanguage | Array<OchreLanguage>;
+  language?: OchreLanguage | Array<OchreLanguage>;
   description: OchreStringContent;
 };
 
@@ -1506,7 +1506,7 @@ declare function parseIdentification(identification: OchreIdentification): Ident
  * @param language - Raw language data, either single or array
  * @returns Array of language codes as strings
  */
-declare function parseLanguages(language: OchreLanguage | Array<OchreLanguage>): Array<string>;
+declare function parseLanguages(language: OchreLanguage | Array<OchreLanguage> | undefined): Array<string>;
 /**
  * Parses raw metadata into the standardized Metadata type
  *

package/dist/index.d.ts

@@ -752,7 +752,7 @@ type OchreMetadata = {
   publisher: OchreStringContent;
   dataset: OchreStringContent;
   project?: { identification: OchreIdentification };
-  language: OchreLanguage | Array<OchreLanguage>;
+  language?: OchreLanguage | Array<OchreLanguage>;
   description: OchreStringContent;
 };
 
@@ -1506,7 +1506,7 @@ declare function parseIdentification(identification: OchreIdentification): Ident
  * @param language - Raw language data, either single or array
  * @returns Array of language codes as strings
  */
-declare function parseLanguages(language: OchreLanguage | Array<OchreLanguage>): Array<string>;
+declare function parseLanguages(language: OchreLanguage | Array<OchreLanguage> | undefined): Array<string>;
 /**
  * Parses raw metadata into the standardized Metadata type
  *

package/dist/index.js

@@ -545,6 +545,9 @@ function parseIdentification(identification) {
   }
 }
 function parseLanguages(language) {
+  if (language == null) {
+    return ["eng"];
+  }
   if (Array.isArray(language)) {
     return language.map((lang) => parseStringContent(lang));
   } else {
@@ -1250,7 +1253,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
   const links = elementResource.links ? parseLinks(
     Array.isArray(elementResource.links) ? elementResource.links : [elementResource.links]
   ) : [];
-  const imageLink = links.find((link) => link.type === "image");
+  const imageLinks = links.filter((link) => link.type === "image");
   let document = elementResource.document ? parseDocument(elementResource.document.content) : null;
   if (document === null) {
     const documentLink = links.find((link) => link.type === "internalDocument");
@@ -1273,7 +1276,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       break;
     }
     case "annotated-image": {
-      if (!imageLink) {
+      if (imageLinks.length === 0) {
         throw new Error(
           `Image link not found for the following component: \u201C${componentName}\u201D`
         );
@@ -1282,7 +1285,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         componentProperty.properties,
         "is-searchable"
       ) === "Yes";
-      properties.imageUuid = imageLink.uuid;
+      properties.imageUuid = imageLinks[0].uuid;
       properties.isSearchable = isSearchable;
       break;
     }
@@ -1381,7 +1384,7 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       break;
     }
     case "image": {
-      if (!imageLink) {
+      if (imageLinks.length === 0) {
         throw new Error(
           `Image link not found for the following component: \u201C${componentName}\u201D`
         );
@@ -1414,12 +1417,16 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       if (altTextSource === null) {
         altTextSource = "name";
       }
-      properties.image = {
-        url: `https://ochre.lib.uchicago.edu/ochre?uuid=${imageLink.uuid}&load`,
-        label: imageLink.identification?.label ?? null,
-        width: imageLink.image?.width ?? 0,
-        height: imageLink.image?.height ?? 0
-      };
+      const images = [];
+      for (const imageLink of imageLinks) {
+        images.push({
+          url: `https://ochre.lib.uchicago.edu/ochre?uuid=${imageLink.uuid}&load`,
+          label: imageLink.identification?.label ?? null,
+          width: imageLink.image?.width ?? 0,
+          height: imageLink.image?.height ?? 0
+        });
+      }
+      properties.images = images;
       properties.imageQuality = imageQuality;
       properties.captionLayout = captionLayout;
       properties.captionSource = captionSource;
@@ -1529,10 +1536,10 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       if (captionLayout === null) {
         captionLayout = "bottom";
       }
-      const imageLink2 = links.find(
+      const imageLink = links.find(
         (link) => link.type === "image" || link.type === "IIIF"
       );
-      if (!imageLink2) {
+      if (!imageLink) {
         throw new Error(
           `Image link not found for the following component: \u201C${componentName}\u201D: ${JSON.stringify(
             links
@@ -1562,10 +1569,10 @@ async function parseWebElementProperties(componentProperty, elementResource) {
       }
       properties.variant = variant;
       properties.image = {
-        url: `https://ochre.lib.uchicago.edu/ochre?uuid=${imageLink2.uuid}&preview`,
-        label: imageLink2.identification?.label ?? null,
-        width: imageLink2.image?.width ?? 0,
-        height: imageLink2.image?.height ?? 0
+        url: `https://ochre.lib.uchicago.edu/ochre?uuid=${imageLink.uuid}&preview`,
+        label: imageLink.identification?.label ?? null,
+        width: imageLink.image?.width ?? 0,
+        height: imageLink.image?.height ?? 0
       };
       properties.imageQuality = imageQuality;
       properties.layout = layout;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalculture/ochre-sdk",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -44,16 +44,16 @@
     "zod": "^3.24.1"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^4.1.0",
+    "@antfu/eslint-config": "^4.1.1",
     "@arethetypeswrong/cli": "^0.17.3",
     "@changesets/cli": "^2.27.12",
     "@total-typescript/ts-reset": "^0.6.1",
-    "@types/node": "^22.10.10",
+    "@types/node": "^22.13.1",
     "eslint-plugin-unused-imports": "^4.1.4",
     "prettier": "^3.4.2",
     "tsup": "^8.3.6",
     "typescript": "^5.7.3",
-    "vitest": "^3.0.4"
+    "vitest": "^3.0.5"
   },
   "scripts": {
     "dev": "tsup src/index.ts --watch",