@canopy-iiif/app 1.6.11 → 1.6.13

package/lib/build/iiif.js

@@ -498,7 +498,7 @@ function collectTextualBody(body, out) {
   if (body.text !== undefined) collectTextualBody(body.text, out);
 }
 
-function extractAnnotationText(manifest, options = {}) {
+async function extractAnnotationText(manifest, options = {}) {
   if (!manifest || typeof manifest !== "object") return "";
   if (!options.enabled) return "";
   const motivations =
@@ -524,7 +524,7 @@ function extractAnnotationText(manifest, options = {}) {
     }
   }
 
-  function handleAnnotation(annotation) {
+  async function handleAnnotation(annotation) {
     if (!annotation || typeof annotation !== "object") return;
     if (!matchesMotivation(annotation.motivation)) return;
     const body = annotation.body;
@@ -538,10 +538,10 @@ function extractAnnotationText(manifest, options = {}) {
     }
   }
 
-  function walk(value) {
+  async function walk(value) {
     if (!value) return;
     if (Array.isArray(value)) {
-      for (const entry of value) walk(entry);
+      for (const entry of value) await walk(entry);
       return;
     }
     if (typeof value !== "object") return;
@@ -549,22 +549,29 @@ function extractAnnotationText(manifest, options = {}) {
     seenNodes.add(value);
     if (Array.isArray(value.annotations)) {
       for (const page of value.annotations) {
-        if (page && Array.isArray(page.items)) {
+        if (page && typeof page.id === 'string' && !page.items){
+          const fetchedPage = await readJsonFromUri(page.id, { log: true });
+          if (fetchedPage && Array.isArray(fetchedPage.items)) {
+            for (const item of fetchedPage.items){
+              handleAnnotation(item)
+            }
+          }
+        } else if (page && Array.isArray(page.items)) {
           for (const item of page.items) handleAnnotation(item);
         }
-        walk(page);
+        await walk(page);
       }
     }
     if (Array.isArray(value.items)) {
-      for (const item of value.items) walk(item);
+      for (const item of value.items) await walk(item);
     }
     for (const key of Object.keys(value)) {
       if (key === "annotations" || key === "items") continue;
-      walk(value[key]);
+      await walk(value[key]);
     }
   }
 
-  walk(manifest);
+  await walk(manifest);
   if (!results.length) return "";
   return results.join(" ");
 }
@@ -2342,7 +2349,7 @@ async function buildIiifCollectionPages(CONFIG) {
           }
           if (annotationsOptions && annotationsOptions.enabled) {
             try {
-              annotationValue = extractAnnotationText(
+              annotationValue = await extractAnnotationText(
                 manifest,
                 annotationsOptions,
               );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopy-iiif/app",
-  "version": "1.6.11",
+  "version": "1.6.13",
   "private": false,
   "license": "MIT",
   "author": "Mat Jordan <mat@northwestern.edu>",