Merge pull request #16 from IIIF-Commons/feature/import-raw-json

Added raw json helper

src/annotation-page-builder.ts

@@ -11,27 +11,11 @@ export class AnnotationPageInstanceBuilder extends BaseEntityBuilder<AnnotationP
 
   createAnnotation(annotation: Annotation) {
     // Extract annotation body + target as reference
-
     if (this.defaultAnnotationTarget && !annotation.target) {
       annotation.target = this.defaultAnnotationTarget;
     }
 
-    const body = Array.isArray(annotation.body) ? annotation.body : [annotation.body];
-
-    annotation.body = body.map((singleBody) => {
-      if (singleBody && (singleBody as ChoiceBody).type === 'Choice') {
-        const choiceBody = singleBody as ChoiceBody;
-        choiceBody.items = choiceBody.items.map((choiceItem) => {
-          return this.addEmbeddedInstance(choiceItem, 'ContentResource');
-        });
-        return this.addEmbeddedInstance(choiceBody, 'ContentResource');
-      }
-
-      return this.addEmbeddedInstance(singleBody, 'ContentResource');
-    });
-
-    const annotationRef = this.addEmbeddedInstance(annotation, 'Annotation');
-
+    const [annotationRef] = this.importRawJson<'Annotation'>(annotation);
     this.modified.add('items');
     this.entity.items = [...this.entity.items, annotationRef];
   }

src/base-entity-builder.ts

@@ -10,9 +10,11 @@ import {
   CollectionItemSchemas,
   AnnotationPageNormalized,
   AnnotationPage,
+  Annotation,
 } from '@iiif/presentation-3';
 import { ServiceNormalized } from '@iiif/presentation-3/resources/service';
 import { IIIFBuilder } from './iiif-builder';
+import { normalize } from '@iiif/parser';
 
 export class BaseEntityBuilder<
   T extends ManifestNormalized | CollectionNormalized | CanvasNormalized | AnnotationPageNormalized
@@ -36,6 +38,21 @@ export class BaseEntityBuilder<
     this.newInstances = [];
   }
 
+  importRawJson<Type, Resource = any>(obj: any): [Reference<Type>, Resource] {
+    const { entities, resource } = normalize(obj);
+
+    const types = Object.keys(entities);
+    for (const type of types) {
+      const objects = (entities as any)[type];
+      const ids = Object.keys(objects);
+      for (const id of ids) {
+        this.embeddedInstances.push(objects[id]);
+      }
+    }
+
+    return [{ id: resource.id, type: resource.type }, resource] as any;
+  }
+
   dispose() {
     // Method used only to prevent implementations from holding on to references and
     // keeping these classes in memory.