@annotorious/core 3.0.0-pre-alpha-50 → 3.0.0-pre-alpha-52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@annotorious/core",
-  "version": "3.0.0-pre-alpha-50",
+  "version": "3.0.0-pre-alpha-52",
   "description": "Annotorious core types and functions",
   "author": "Rainer Simon",
   "license": "BSD-3-Clause",

package/src/model/Annotation.ts

@@ -44,7 +44,7 @@ export interface AnnotationBody {
 
   purpose?: string;
 
-  value: string;
+  value?: string;
 
   creator?: User;
 

package/src/model/W3CAnnotation.ts

@@ -26,6 +26,8 @@ export interface W3CAnnotationBody {
 
   value?: string;
 
+  source?: string;
+
   created?: Date;
 
   creator?: {
@@ -78,23 +80,30 @@ const hashCode = (obj: Object): string => {
 export const parseW3CBodies = (
   body: W3CAnnotationBody | W3CAnnotationBody[], 
   annotationId: string
-): AnnotationBody[] => (Array.isArray(body) ? body : [body]).map(b => ({
+): AnnotationBody[] => (Array.isArray(body) ? body : [body]).map(body => {
+
+  // Exctract properties that conform to the internal model, but keep custom props
+  const { id, type, purpose, value, created, creator, ...rest} = body;
+
   // The internal model strictly requires IDs. (Because multi-user scenarios
   // will have problems without them.) In the W3C model, bodys *may* have IDs.
   // We'll create ad-hoc IDs for bodies without IDs, but want to make sure that
   // generating the ID is idempotent: the same body should always get the same ID.
   // This will avoid unexpected results when checking for equality.  
-  id: b.id || hashCode(b),
-  annotation: annotationId,
-  type: b.type,
-  purpose: b.purpose,
-  value: b.value,
-  created: b.created,
-  creator: b.creator ? 
-    typeof b.creator === 'object' ? { ...b.creator }: b.creator :
-    undefined
-}));
+  return {
+    id: id || hashCode(body),
+    annotation: annotationId,
+    type,
+    purpose,
+    value,
+    created,
+    creator: creator ? 
+      typeof creator === 'object' ? { ...creator }: creator :
+      undefined,
+    ...rest
+  }
 
+});
 
 export const serializeW3CBodies = (bodies: AnnotationBody[]): W3CAnnotationBody[] => 
   bodies.map(b => {

package/src/state/Store.ts

@@ -108,9 +108,13 @@ export const createStore = <T extends Annotation>() => {
 
   const all = () => [...annotationIndex.values()];
 
-  const clear = () => { 
+  const clear = (origin = Origin.LOCAL) => { 
+    const all = [...annotationIndex.values()];
+
     annotationIndex.clear();
     bodyIndex.clear();
+
+    emit(origin, { deleted: all });
   }
 
   const bulkAddAnnotation = (annotations: T[], replace = true, origin = Origin.LOCAL) => {

package/src/utils/annotationUtils.ts

@@ -21,7 +21,7 @@ export const getContributors = (annotation: Annotation): User[] => {
 
 export const createBody = (
   annotation: Annotation, 
-  payload: { value: string, [key: string]: any },
+  payload: { [key: string]: any },
   created?: Date,
   creator?: User
 ): AnnotationBody => ({