@annotorious/core 3.0.0-rc.9 → 3.0.0

package/dist/lifecycle/Lifecycle.d.ts

@@ -1,10 +1,10 @@
-import type { Annotation, AnnotatorState, FormatAdapter } from '../model';
-import { type UndoStack } from '../state';
-import type { LifecycleEvents } from './LifecycleEvents';
-export type Lifecycle<I extends Annotation, E extends unknown> = ReturnType<typeof createLifecyleObserver<I, E>>;
-export declare const createLifecyleObserver: <I extends Annotation, E extends unknown>(state: AnnotatorState<I>, undoStack: UndoStack<I>, adapter?: FormatAdapter<I, E>, autoSave?: boolean) => {
-    on: <T extends keyof LifecycleEvents<Annotation>>(event: T, callback: LifecycleEvents<E>[T]) => void;
-    off: <T_1 extends keyof LifecycleEvents<E>>(event: T_1, callback: LifecycleEvents<E>[T_1]) => void;
-    emit: (event: keyof LifecycleEvents<E>, arg0: I | I[], arg1?: PointerEvent | I) => void;
+import { Annotation, AnnotatorState, FormatAdapter } from '../model';
+import { UndoStack } from '../state';
+import { LifecycleEvents } from './LifecycleEvents';
+export type Lifecycle<I extends Annotation, E extends unknown> = ReturnType<typeof createLifecycleObserver<I, E>>;
+export declare const createLifecycleObserver: <I extends Annotation, E extends unknown>(state: AnnotatorState<I>, undoStack: UndoStack<I>, adapter?: FormatAdapter<I, E>, autoSave?: boolean) => {
+    on: <T extends keyof LifecycleEvents>(event: T, callback: LifecycleEvents<E>[T]) => void;
+    off: <T extends keyof LifecycleEvents<E>>(event: T, callback: LifecycleEvents<E>[T]) => void;
+    emit: (event: keyof LifecycleEvents<E>, arg0: I | I[], arg1?: I | PointerEvent) => void;
 };
 //# sourceMappingURL=Lifecycle.d.ts.map

package/dist/lifecycle/Lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Lifecycle.d.ts","sourceRoot":"","sources":["../../src/lifecycle/Lifecycle.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAElE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,IAC3D,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAElD,eAAO,MAAM,sBAAsB,yIAItB,OAAO;;;;CAqMnB,CAAA"}
+{"version":3,"file":"Lifecycle.d.ts","sourceRoot":"","sources":["../../src/lifecycle/Lifecycle.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,IAC3D,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAEnD,eAAO,MAAM,uBAAuB,GAAI,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,SACtE,cAAc,CAAC,CAAC,CAAC,aACb,SAAS,CAAC,CAAC,CAAC,YACb,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,aAClB,OAAO;SAaN,CAAC,SAAS,MAAM,eAAe,SAAS,CAAC,YAAY,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;UAQzE,CAAC,SAAS,MAAM,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;kBASrE,MAAM,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,GAAG,YAAY;CAwKtF,CAAA"}

package/dist/lifecycle/LifecycleEvents.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation } from '../model';
+import { Annotation } from '../model';
 export interface LifecycleEvents<T extends unknown = Annotation> {
     clickAnnotation: (annotation: T, originalEvent: PointerEvent) => void;
     createAnnotation: (annotation: T) => void;

package/dist/model/Annotation.d.ts

@@ -1,4 +1,4 @@
-import type { User } from './User';
+import { User } from './User';
 export interface Annotation {
     id: string;
     target: AnnotationTarget;
@@ -21,12 +21,13 @@ export interface AnnotationBody {
     id: string;
     annotation: string;
     type?: string;
-    purpose?: Purpose | string;
+    purpose?: typeof PurposeValues[number] | string & {};
     value?: string;
     creator?: User;
     created?: Date;
     updatedBy?: User;
     updated?: Date;
 }
-export type Purpose = 'assessing' | 'bookmarking' | 'classifying' | 'commenting' | 'describing' | 'editing' | 'highlighting' | 'identifying' | 'linking' | 'moderating' | 'questioning' | 'replying' | 'tagging';
+declare const PurposeValues: readonly ["assessing", "bookmarking", "classifying", "commenting", "describing", "editing", "highlighting", "identifying", "linking", "moderating", "questioning", "replying", "tagging"];
+export {};
 //# sourceMappingURL=Annotation.d.ts.map

package/dist/model/Annotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Annotation.d.ts","sourceRoot":"","sources":["../../src/model/Annotation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEnC,MAAM,WAAW,UAAU;IAEzB,EAAE,EAAE,MAAM,CAAC;IAEX,MAAM,EAAE,gBAAgB,CAAC;IAEzB,MAAM,EAAE,cAAc,EAAE,CAAC;IAEzB,UAAU,CAAC,EAAE;QAEX,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KAEpB,CAAA;CAEF;AAED,MAAM,WAAW,gBAAgB;IAE/B,UAAU,EAAE,MAAM,CAAC;IAEnB,QAAQ,EAAE,gBAAgB,CAAC;IAE3B,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf,SAAS,CAAC,EAAE,IAAI,CAAC;IAEjB,OAAO,CAAC,EAAE,IAAI,CAAC;CAEhB;AAED,MAAM,WAAW,gBAAgB;CAAI;AAErC,MAAM,WAAW,cAAc;IAE7B,EAAE,EAAE,MAAM,CAAC;IAEX,UAAU,EAAE,MAAM,CAAC;IAEnB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE3B,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf,SAAS,CAAC,EAAE,IAAI,CAAC;IAEjB,OAAO,CAAC,EAAE,IAAI,CAAC;CAEhB;AAGD,MAAM,MAAM,OAAO,GACjB,WAAW,GACX,aAAa,GACb,aAAa,GACb,YAAY,GACZ,YAAY,GACZ,SAAS,GACT,cAAc,GACd,aAAa,GACb,SAAS,GACT,YAAY,GACZ,aAAa,GACb,UAAU,GACV,SAAS,CAAC"}
+{"version":3,"file":"Annotation.d.ts","sourceRoot":"","sources":["../../src/model/Annotation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEnC,MAAM,WAAW,UAAU;IAEzB,EAAE,EAAE,MAAM,CAAC;IAEX,MAAM,EAAE,gBAAgB,CAAC;IAEzB,MAAM,EAAE,cAAc,EAAE,CAAC;IAEzB,UAAU,CAAC,EAAE;QAEX,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KAEpB,CAAA;CAEF;AAED,MAAM,WAAW,gBAAgB;IAE/B,UAAU,EAAE,MAAM,CAAC;IAEnB,QAAQ,EAAE,gBAAgB,CAAC;IAE3B,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf,SAAS,CAAC,EAAE,IAAI,CAAC;IAEjB,OAAO,CAAC,EAAE,IAAI,CAAC;CAEhB;AAED,MAAM,WAAW,gBAAgB;CAAI;AAErC,MAAM,WAAW,cAAc;IAE7B,EAAE,EAAE,MAAM,CAAC;IAEX,UAAU,EAAE,MAAM,CAAC;IAEnB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,OAAO,CAAC,EAAE,OAAO,aAAa,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,EAAE,CAAC;IAErD,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf,SAAS,CAAC,EAAE,IAAI,CAAC;IAEjB,OAAO,CAAC,EAAE,IAAI,CAAC;CAEhB;AAGD,QAAA,MAAM,aAAa,2LAcT,CAAC"}

package/dist/model/AnnotationState.d.ts

@@ -0,0 +1,8 @@
+export interface AnnotationState {
+    selected?: boolean;
+    hovered?: boolean;
+    custom?: {
+        [key: string]: any;
+    };
+}
+//# sourceMappingURL=AnnotationState.d.ts.map

package/dist/model/AnnotationState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AnnotationState.d.ts","sourceRoot":"","sources":["../../src/model/AnnotationState.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAE9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,MAAM,CAAC,EAAE;QAEP,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAEnB,CAAA;CAEF"}

package/dist/model/Annotator.d.ts

@@ -1,18 +1,18 @@
-import type { Annotation } from './Annotation';
-import type { User } from './User';
-import type { PresenceProvider } from '../presence/PresenceProvider';
-import { type HoverState, type SelectionState, type Store, type UndoStack, type ViewportState } from '../state';
-import type { LifecycleEvents } from '../lifecycle/LifecycleEvents';
-import { type FormatAdapter } from './FormatAdapter';
-import type { DrawingStyle } from './DrawingStyle';
-import type { Filter } from './Filter';
+import { Annotation } from './Annotation';
+import { User } from './User';
+import { PresenceProvider } from '../presence';
+import { HoverState, SelectionState, Store, UndoStack, UserSelectActionExpression, ViewportState } from '../state';
+import { LifecycleEvents } from '../lifecycle';
+import { FormatAdapter } from './FormatAdapter';
+import { DrawingStyleExpression } from './DrawingStyle';
+import { Filter } from './Filter';
 /**
- * Base annotator interface.
- * I ... internal core data model
- * E ... external adapted representation
+ * Base annotator interface
+ * @template I - internal core data model
+ * @template E - external adapted representation
  */
 export interface Annotator<I extends Annotation = Annotation, E extends unknown = Annotation> {
-    addAnnotation(annotation: E): void;
+    addAnnotation(annotation: Partial<E>): void;
     cancelSelected(): void;
     canRedo(): boolean;
     canUndo(): boolean;
@@ -22,17 +22,19 @@ export interface Annotator<I extends Annotation = Annotation, E extends unknown
     getAnnotations(): E[];
     getSelected(): E[];
     getUser(): User;
-    loadAnnotations(url: string): Promise<E[]>;
+    loadAnnotations(url: string, replace?: boolean): Promise<E[]>;
     redo(): void;
-    removeAnnotation(arg: E | string): E;
-    setAnnotations(annotations: E[]): void;
-    setFilter(filter: Filter): void;
+    removeAnnotation(arg: Partial<E> | string): E | undefined;
+    setAnnotations(annotations: Partial<E>[], replace?: boolean): void;
+    setFilter(filter: Filter | undefined): void;
     setPresenceProvider?(provider: PresenceProvider): void;
-    setSelected(arg?: string | string[]): void;
-    setStyle(arg: DrawingStyle | ((annotation: I) => DrawingStyle) | undefined): void;
+    setSelected(arg?: string | string[], editable?: boolean): void;
+    setStyle(style: DrawingStyleExpression<I> | undefined): void;
     setUser(user: User): void;
+    setUserSelectAction(action: UserSelectActionExpression<I>): void;
+    setVisible(visible: boolean): void;
     undo(): void;
-    updateAnnotation(annotation: E): E;
+    updateAnnotation(annotation: Partial<E>): E;
     on<T extends keyof LifecycleEvents<E>>(event: T, callback: LifecycleEvents<E>[T]): void;
     off<T extends keyof LifecycleEvents<E>>(event: T, callback: LifecycleEvents<E>[T]): void;
     state: AnnotatorState<I>;
@@ -49,14 +51,15 @@ export declare const createBaseAnnotator: <I extends Annotation, E extends unkno
     canRedo: () => boolean;
     canUndo: () => boolean;
     clearAnnotations: () => void;
-    getAnnotationById: (id: string) => E;
+    getAnnotationById: (id: string) => E | undefined;
     getAnnotations: () => E[];
     getSelected: () => E[];
-    loadAnnotations: (url: string) => Promise<any>;
+    loadAnnotations: (url: string, replace?: boolean) => Promise<any>;
     redo: () => void;
-    removeAnnotation: (arg: string | E) => E;
-    setAnnotations: (annotations: E[]) => void;
-    setSelected: (arg?: string | string[]) => void;
+    removeAnnotation: (arg: E | string) => E | undefined;
+    setAnnotations: (annotations: E[], replace?: boolean) => void;
+    setSelected: (arg?: string | string[], editable?: boolean) => void;
+    setUserSelectAction: (action: UserSelectActionExpression<I>) => void;
     undo: () => void;
     updateAnnotation: (updated: E) => E;
 };

package/dist/model/Annotator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Annotator.d.ts","sourceRoot":"","sources":["../../src/model/Annotator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Annotator.d.ts","sourceRoot":"","sources":["../../src/model/Annotator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACd,KAAK,EACL,SAAS,EACT,0BAA0B,EAC1B,aAAa,EACd,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAY,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC;;;;GAIG;AACH,MAAM,WAAW,SAAS,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,CAAC,SAAS,OAAO,GAAG,UAAU;IAE1F,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAE5C,cAAc,IAAI,IAAI,CAAC;IAEvB,OAAO,IAAI,OAAO,CAAC;IAEnB,OAAO,IAAI,OAAO,CAAC;IAEnB,gBAAgB,IAAI,IAAI,CAAC;IAEzB,OAAO,IAAI,IAAI,CAAC;IAEhB,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;IAE7C,cAAc,IAAI,CAAC,EAAE,CAAC;IAEtB,WAAW,IAAI,CAAC,EAAE,CAAC;IAEnB,OAAO,IAAI,IAAI,CAAC;IAEhB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IAE9D,IAAI,IAAI,IAAI,CAAC;IAEb,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;IAE1D,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAEnE,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IAE5C,mBAAmB,CAAC,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAEvD,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAE/D,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;IAE7D,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAE1B,mBAAmB,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAEjE,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAEnC,IAAI,IAAI,IAAI,CAAC;IAEb,gBAAgB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAE5C,EAAE,CAAC,CAAC,SAAS,MAAM,eAAe,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAExF,GAAG,CAAC,CAAC,SAAS,MAAM,eAAe,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAEzF,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;CAE1B;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,UAAU;IAElD,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAEhB,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;IAE7B,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAErB,QAAQ,EAAE,aAAa,CAAC;CAEzB;AAED,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,SAClE,cAAc,CAAC,CAAC,CAAC,aACb,SAAS,CAAC,CAAC,CAAC,YACb,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC;gCAKM,CAAC;;;;;4BAiBL,MAAM,KAAG,CAAC,GAAG,SAAS;0BAOa,CAAC,EAAE;;2BAYvC,MAAM;;4BAQL,CAAC,GAAG,MAAM,KAAG,CAAC,GAAG,SAAS;kCAiBpB,CAAC,EAAE;wBAab,MAAM,GAAG,MAAM,EAAE,aAAa,OAAO;kCAQ3B,0BAA0B,CAAC,CAAC,CAAC;;gCAK/B,CAAC,KAAG,CAAC;CAmCzC,CAAA"}

package/dist/model/DrawingStyle.d.ts

@@ -1,3 +1,5 @@
+import { Annotation } from './Annotation';
+import { AnnotationState } from './AnnotationState';
 type RGB = `rgb(${number}, ${number}, ${number})`;
 type RGBA = `rgba(${number}, ${number}, ${number}, ${number})`;
 type HEX = `#${string}`;
@@ -7,6 +9,8 @@ export interface DrawingStyle {
     fillOpacity?: number;
     stroke?: Color;
     strokeOpacity?: number;
+    strokeWidth?: number;
 }
+export type DrawingStyleExpression<T extends Annotation = Annotation> = DrawingStyle | ((annotation: T, state?: AnnotationState) => DrawingStyle | undefined);
 export {};
 //# sourceMappingURL=DrawingStyle.d.ts.map

package/dist/model/DrawingStyle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DrawingStyle.d.ts","sourceRoot":"","sources":["../../src/model/DrawingStyle.ts"],"names":[],"mappings":"AAAA,KAAK,GAAG,GAAG,OAAO,MAAM,KAAK,MAAM,KAAK,MAAM,GAAG,CAAC;AAElD,KAAK,IAAI,GAAG,QAAQ,MAAM,KAAK,MAAM,KAAK,MAAM,KAAK,MAAM,GAAG,CAAC;AAE/D,KAAK,GAAG,GAAG,IAAI,MAAM,EAAE,CAAC;AAExB,MAAM,MAAM,KAAK,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC;AAErC,MAAM,WAAW,YAAY;IAE3B,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,MAAM,CAAC,EAAE,KAAK,CAAC;IAEf,aAAa,CAAC,EAAE,MAAM,CAAC;CAExB"}
+{"version":3,"file":"DrawingStyle.d.ts","sourceRoot":"","sources":["../../src/model/DrawingStyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,KAAK,GAAG,GAAG,OAAO,MAAM,KAAK,MAAM,KAAK,MAAM,GAAG,CAAC;AAElD,KAAK,IAAI,GAAG,QAAQ,MAAM,KAAK,MAAM,KAAK,MAAM,KAAK,MAAM,GAAG,CAAC;AAE/D,KAAK,GAAG,GAAG,IAAI,MAAM,EAAE,CAAC;AAExB,MAAM,MAAM,KAAK,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC;AAErC,MAAM,WAAW,YAAY;IAE3B,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,MAAM,CAAC,EAAE,KAAK,CAAC;IAEf,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,WAAW,CAAC,EAAE,MAAM,CAAC;CAEtB;AAED,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAClE,YAAY,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,eAAe,KAAK,YAAY,GAAG,SAAS,CAAC,CAAC"}

package/dist/model/Filter.d.ts

@@ -1,3 +1,3 @@
-import type { Annotation } from './Annotation';
+import { Annotation } from './Annotation';
 export type Filter<T extends Annotation = Annotation> = (annotation: T) => boolean;
 //# sourceMappingURL=Filter.d.ts.map

package/dist/model/FormatAdapter.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation } from './Annotation';
+import { Annotation } from './Annotation';
 export interface FormatAdapter<A extends Annotation, T extends unknown> {
     parse(serialized: T): ParseResult<A>;
     serialize(core: A): T;
@@ -9,7 +9,7 @@ export interface ParseResult<A extends Annotation> {
 }
 export declare const serializeAll: <A extends Annotation, T extends unknown>(adapter: FormatAdapter<A, T>) => (annotations: A[]) => T[];
 export declare const parseAll: <A extends Annotation, T extends unknown>(adapter: FormatAdapter<A, T>) => (serialized: T[]) => {
-    parsed: any[];
-    failed: any[];
+    parsed: A[];
+    failed: T[];
 };
 //# sourceMappingURL=FormatAdapter.d.ts.map

package/dist/model/FormatAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FormatAdapter.d.ts","sourceRoot":"","sources":["../../src/model/FormatAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO;IAEpE,KAAK,CAAC,UAAU,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAErC,SAAS,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;CAEvB;AAED,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,UAAU;IAE/C,MAAM,CAAC,EAAE,CAAC,CAAC;IAEX,KAAK,CAAC,EAAE,KAAK,CAAC;CAEf;AAED,eAAO,MAAM,YAAY,sGAE2C,CAAC;AAErE,eAAO,MAAM,QAAQ;;;CAYa,CAAC"}
+{"version":3,"file":"FormatAdapter.d.ts","sourceRoot":"","sources":["../../src/model/FormatAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO;IAEpE,KAAK,CAAC,UAAU,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAErC,SAAS,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;CAEvB;AAED,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,UAAU;IAE/C,MAAM,CAAC,EAAE,CAAC,CAAC;IAEX,KAAK,CAAC,EAAE,KAAK,CAAC;CAEf;AAED,eAAO,MAAM,YAAY,GACtB,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,WAAW,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,mBACtD,CAAC,EAAE,QAA+C,CAAC;AAErE,eAAO,MAAM,QAAQ,GAClB,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,OAAO,WAAW,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,kBACvD,CAAC,EAAE;YAYG,CAAC,EAAE;YAAgB,CAAC,EAAE;CAAE,CAAC"}

package/dist/model/W3CAnnotation.d.ts

@@ -1,34 +1,38 @@
-import type { AnnotationBody } from './Annotation';
+import { AnnotationBody } from './Annotation';
 export interface W3CAnnotation {
     '@context': 'http://www.w3.org/ns/anno.jsonld';
     type: 'Annotation';
     id: string;
+    creator?: W3CUser;
+    created?: string;
+    modified?: string;
     body: W3CAnnotationBody | W3CAnnotationBody[];
     target: W3CAnnotationTarget | W3CAnnotationTarget[];
     [key: string]: any;
 }
+export interface W3CUser {
+    type?: string;
+    id: string;
+    name?: string;
+}
 export interface W3CAnnotationBody {
-    id?: string;
     type?: string;
+    id?: string;
     purpose?: string;
     value?: string;
     source?: string;
-    created?: Date;
-    creator?: {
-        type?: string;
-        id: string;
-        name?: string;
-    };
+    creator?: W3CUser;
+    created?: string;
+    modified?: string;
 }
 export interface W3CAnnotationTarget {
+    id?: string;
     source: string;
-    selector?: W3CSelector | W3CSelector[];
+    selector?: AbstractW3CSelector;
 }
-export interface W3CSelector {
-    type: string;
-    conformsTo?: string;
-    value: string;
+export interface AbstractW3CSelector {
 }
+export declare const parseW3CUser: (user?: any) => any;
 /**
  * Helper to crosswalk the W3C annotation body to a list of core AnnotationBody objects.
  */

package/dist/model/W3CAnnotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"W3CAnnotation.d.ts","sourceRoot":"","sources":["../../src/model/W3CAnnotation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,WAAW,aAAa;IAE5B,UAAU,EAAE,kCAAkC,CAAC;IAE/C,IAAI,EAAE,YAAY,CAAC;IAEnB,EAAE,EAAE,MAAM,CAAC;IAEX,IAAI,EAAE,iBAAiB,GAAG,iBAAiB,EAAE,CAAA;IAE7C,MAAM,EAAE,mBAAmB,GAAG,mBAAmB,EAAE,CAAC;IAEpD,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CAEpB;AAED,MAAM,WAAW,iBAAiB;IAEhC,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,OAAO,CAAC,EAAE,IAAI,CAAC;IAEf,OAAO,CAAC,EAAE;QAER,IAAI,CAAC,EAAE,MAAM,CAAC;QAEd,EAAE,EAAE,MAAM,CAAC;QAEX,IAAI,CAAC,EAAE,MAAM,CAAC;KAEf,CAAC;CAEH;AAED,MAAM,WAAW,mBAAmB;IAElC,MAAM,EAAE,MAAM,CAAC;IAEf,QAAQ,CAAC,EAAE,WAAW,GAAG,WAAW,EAAE,CAAC;CAExC;AAED,MAAM,WAAW,WAAW;IAE1B,IAAI,EAAE,MAAM,CAAC;IAEb,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,KAAK,EAAE,MAAM,CAAC;CACf;AAiBD;;GAEG;AACH,eAAO,MAAM,cAAc,SACnB,iBAAiB,GAAG,iBAAiB,EAAE,gBAC/B,MAAM,KACnB,cAAc,EAuBf,CAAC;AAEH,oFAAoF;AACpF,eAAO,MAAM,kBAAkB,WAAY,cAAc,EAAE,KAAG,iBAAiB,EAS3E,CAAC"}
+{"version":3,"file":"W3CAnnotation.d.ts","sourceRoot":"","sources":["../../src/model/W3CAnnotation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,WAAW,aAAa;IAE5B,UAAU,EAAE,kCAAkC,CAAC;IAE/C,IAAI,EAAE,YAAY,CAAC;IAEnB,EAAE,EAAE,MAAM,CAAC;IAEX,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,IAAI,EAAE,iBAAiB,GAAG,iBAAiB,EAAE,CAAC;IAE9C,MAAM,EAAE,mBAAmB,GAAG,mBAAmB,EAAE,CAAC;IAEpD,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CAEpB;AAED,MAAM,WAAW,OAAO;IAEtB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,EAAE,EAAE,MAAM,CAAC;IAEX,IAAI,CAAC,EAAE,MAAM,CAAC;CAEf;AAED,MAAM,WAAW,iBAAiB;IAEhC,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAEnB;AAED,MAAM,WAAW,mBAAmB;IAElC,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IAEf,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CAEhC;AAED,MAAM,WAAW,mBAAmB;CAAI;AAiBxC,eAAO,MAAM,YAAY,UAAW,GAAG,QACsB,CAAC;AAE9D;;GAEG;AACH,eAAO,MAAM,cAAc,SACnB,iBAAiB,GAAG,iBAAiB,EAAE,gBAC/B,MAAM,KAClB,cAAc,EAsBhB,CAAC;AAEH,oFAAoF;AACpF,eAAO,MAAM,kBAAkB,WAAY,cAAc,EAAE,KAAG,iBAAiB,EAc3E,CAAC"}

package/dist/model/index.d.ts

@@ -1,4 +1,5 @@
 export * from './Annotation';
+export * from './AnnotationState';
 export * from './Annotator';
 export * from './DrawingStyle';
 export * from './Filter';

package/dist/model/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,QAAQ,CAAC;AACvB,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,QAAQ,CAAC;AACvB,cAAc,iBAAiB,CAAC"}

package/dist/presence/AppearanceProvider.d.ts

@@ -1,6 +1,6 @@
-import type { User } from '../model/User';
-import type { Appearance } from './Appearance';
-import type { PresentUser } from './PresentUser';
+import { User } from '../model/User';
+import { Appearance } from './Appearance';
+import { PresentUser } from './PresentUser';
 export interface AppearanceProvider {
     addUser(presenceKey: string, user: User): Appearance;
     removeUser(user: PresentUser): void;
@@ -9,7 +9,7 @@ export declare const defaultColorProvider: () => {
     assignRandomColor: () => string;
     releaseColor: (color: string) => number;
 };
-export declare const createDefaultAppearenceProvider: () => {
+export declare const createDefaultAppearanceProvider: () => {
     addUser: (presenceKey: string, user: User) => Appearance;
     removeUser: (user: PresentUser) => number;
 };

package/dist/presence/PresenceEvents.d.ts

@@ -1,4 +1,4 @@
-import type { PresentUser } from './PresentUser';
+import { PresentUser } from './PresentUser';
 export interface PresenceEvents {
     presence: (users: PresentUser[]) => void;
     selectionChange: (from: PresentUser, selection: string[] | null) => void;

package/dist/presence/PresenceProvider.d.ts

@@ -1,4 +1,4 @@
-import type { PresenceEvents } from './PresenceEvents';
+import { PresenceEvents } from './PresenceEvents';
 export interface PresenceProvider {
     on<E extends keyof PresenceEvents>(event: E, callback: PresenceEvents[E]): void;
 }

package/dist/presence/PresenceState.d.ts

@@ -1,8 +1,8 @@
-import { type Unsubscribe } from 'nanoevents';
-import type { User } from '../model/User';
-import type { PresentUser } from './PresentUser';
-import type { PresenceEvents } from './PresenceEvents';
-import type { AppearanceProvider } from './AppearanceProvider';
+import { Unsubscribe } from 'nanoevents';
+import { User } from '../model/User';
+import { PresentUser } from './PresentUser';
+import { PresenceEvents } from './PresenceEvents';
+import { AppearanceProvider } from './AppearanceProvider';
 export interface PresenceState {
     getPresentUsers(): PresentUser[];
     notifyActivity(presenceKey: string, annotationIds: string[]): void;

package/dist/presence/PresentUser.d.ts

@@ -1,5 +1,5 @@
-import type { User } from '../model/User';
-import type { Appearance } from './Appearance';
+import { User } from '../model/User';
+import { Appearance } from './Appearance';
 export interface PresentUser extends User {
     presenceKey: string;
     appearance: Appearance;

package/dist/state/Hover.d.ts

@@ -1,34 +1,9 @@
-import type { Annotation } from '../model';
-import type { Store } from './Store';
+import { Annotation } from '../model';
+import { Store } from './Store';
 export type HoverState<T extends Annotation> = ReturnType<typeof createHoverState<T>>;
-export declare const createHoverState: <T extends Annotation>(store: {
-    addAnnotation: (annotation: T, origin?: import("./StoreObserver").Origin) => void;
-    addBody: (body: import("../model").AnnotationBody, origin?: import("./StoreObserver").Origin) => void;
-    all: () => T[];
-    bulkAddAnnotation: (annotations: T[], replace?: boolean, origin?: import("./StoreObserver").Origin) => void;
-    bulkDeleteAnnotation: (annotationsOrIds: (string | T)[], origin?: import("./StoreObserver").Origin) => void;
-    bulkUpdateAnnotation: (annotations: T[], origin?: import("./StoreObserver").Origin) => void;
-    bulkUpdateBodies: (bodies: import("../model").AnnotationBody[], origin?: import("./StoreObserver").Origin) => void;
-    bulkUpdateTargets: (targets: import("../model").AnnotationTarget[], origin?: import("./StoreObserver").Origin) => void;
-    clear: (origin?: import("./StoreObserver").Origin) => void;
-    deleteAnnotation: (annotationOrId: string | T, origin?: import("./StoreObserver").Origin) => void;
-    deleteBody: (body: {
-        id: string;
-        annotation: string;
-    }, origin?: import("./StoreObserver").Origin) => void;
-    getAnnotation: (id: string) => T;
-    getBody: (id: string) => import("../model").AnnotationBody;
-    observe: (onChange: (event: import("./StoreObserver").StoreChangeEvent<T>) => void, options?: import("./StoreObserver").StoreObserveOptions) => number;
-    unobserve: (onChange: (event: import("./StoreObserver").StoreChangeEvent<T>) => void) => void;
-    updateAnnotation: (arg1: string | T, arg2?: import("./StoreObserver").Origin | T, arg3?: import("./StoreObserver").Origin) => void;
-    updateBody: (oldBodyId: {
-        id: string;
-        annotation: string;
-    }, newBody: import("../model").AnnotationBody, origin?: import("./StoreObserver").Origin) => void;
-    updateTarget: (target: import("../model").AnnotationTarget, origin?: import("./StoreObserver").Origin) => void;
-}) => {
-    readonly current: string;
-    subscribe: (this: void, run: import("svelte/store").Subscriber<string>, invalidate?: (value?: string) => void) => import("svelte/store").Unsubscriber;
-    set: (this: void, value: string) => void;
+export declare const createHoverState: <T extends Annotation>(store: Store<T>) => {
+    readonly current: string | undefined;
+    subscribe: (this: void, run: import('svelte/store').Subscriber<string | undefined>, invalidate?: import('svelte/store').Invalidator<string | undefined> | undefined) => import('svelte/store').Unsubscriber;
+    set: (this: void, value: string | undefined) => void;
 };
 //# sourceMappingURL=Hover.d.ts.map

package/dist/state/Hover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Hover.d.ts","sourceRoot":"","sources":["../../src/state/Hover.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,UAAU,IAAI,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtF,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2B5B,CAAA"}
+{"version":3,"file":"Hover.d.ts","sourceRoot":"","sources":["../../src/state/Hover.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,UAAU,IAAI,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtF,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,UAAU,SAAS,KAAK,CAAC,CAAC,CAAC;;;;CA2BrE,CAAA"}

package/dist/state/Selection.d.ts

@@ -1,55 +1,34 @@
-import type { Annotation } from '../model';
-import type { Store } from './Store';
-export type Selection = {
+import { Annotation } from '../model';
+import { Store } from './Store';
+export interface Selection {
     selected: {
         id: string;
         editable?: boolean;
     }[];
-    pointerEvent?: PointerEvent;
-};
+    event?: PointerEvent | KeyboardEvent;
+    [key: string]: any;
+}
 export type SelectionState<T extends Annotation> = ReturnType<typeof createSelectionState<T>>;
-export declare enum PointerSelectAction {
-    EDIT = "EDIT",
-    SELECT = "SELECT",
+export declare enum UserSelectAction {
+    EDIT = "EDIT",// Make annotation target(s) editable on pointer select
+    SELECT = "SELECT",// Just select, but don't make editable
     NONE = "NONE"
 }
-export declare const createSelectionState: <T extends Annotation>(store: {
-    addAnnotation: (annotation: T, origin?: import("./StoreObserver").Origin) => void;
-    addBody: (body: import("../model").AnnotationBody, origin?: import("./StoreObserver").Origin) => void;
-    all: () => T[];
-    bulkAddAnnotation: (annotations: T[], replace?: boolean, origin?: import("./StoreObserver").Origin) => void;
-    bulkDeleteAnnotation: (annotationsOrIds: (string | T)[], origin?: import("./StoreObserver").Origin) => void;
-    bulkUpdateAnnotation: (annotations: T[], origin?: import("./StoreObserver").Origin) => void;
-    bulkUpdateBodies: (bodies: import("../model").AnnotationBody[], origin?: import("./StoreObserver").Origin) => void;
-    bulkUpdateTargets: (targets: import("../model").AnnotationTarget[], origin?: import("./StoreObserver").Origin) => void;
-    clear: (origin?: import("./StoreObserver").Origin) => void;
-    deleteAnnotation: (annotationOrId: string | T, origin?: import("./StoreObserver").Origin) => void;
-    deleteBody: (body: {
-        id: string;
-        annotation: string;
-    }, origin?: import("./StoreObserver").Origin) => void;
-    getAnnotation: (id: string) => T;
-    getBody: (id: string) => import("../model").AnnotationBody;
-    observe: (onChange: (event: import("./StoreObserver").StoreChangeEvent<T>) => void, options?: import("./StoreObserver").StoreObserveOptions) => number;
-    unobserve: (onChange: (event: import("./StoreObserver").StoreChangeEvent<T>) => void) => void;
-    updateAnnotation: (arg1: string | T, arg2?: import("./StoreObserver").Origin | T, arg3?: import("./StoreObserver").Origin) => void;
-    updateBody: (oldBodyId: {
-        id: string;
-        annotation: string;
-    }, newBody: import("../model").AnnotationBody, origin?: import("./StoreObserver").Origin) => void;
-    updateTarget: (target: import("../model").AnnotationTarget, origin?: import("./StoreObserver").Origin) => void;
-}, selectAction?: PointerSelectAction | ((a: Annotation) => PointerSelectAction)) => {
-    clear: () => void;
-    clickSelect: (id: string, pointerEvent: PointerEvent) => void;
+export type UserSelectActionExpression<T extends Annotation> = UserSelectAction | ((a: T) => UserSelectAction);
+export declare const createSelectionState: <T extends Annotation>(store: Store<T>) => {
+    readonly event: PointerEvent | KeyboardEvent | null | undefined;
     readonly selected: {
         id: string;
         editable?: boolean;
-    }[];
-    readonly pointerEvent: PointerEvent;
+    }[] | null;
+    readonly userSelectAction: UserSelectActionExpression<T> | undefined;
+    clear: () => void;
     isEmpty: () => boolean;
-    isSelected: (annotationOrId: string | T) => boolean;
+    isSelected: (annotationOrId: T | string) => boolean;
     setSelected: (idOrIds: string | string[], editable?: boolean) => void;
-    subscribe: (this: void, run: import("svelte/store").Subscriber<Selection>, invalidate?: (value?: Selection) => void) => import("svelte/store").Unsubscriber;
+    setUserSelectAction: (action: UserSelectActionExpression<T> | undefined) => UserSelectActionExpression<T> | undefined;
+    subscribe: (this: void, run: import('svelte/store').Subscriber<Selection>, invalidate?: import('svelte/store').Invalidator<Selection> | undefined) => import('svelte/store').Unsubscriber;
+    userSelect: (id: string, event?: Selection["event"]) => void;
 };
-export declare const onPointerSelect: (annotation: Annotation, action?: PointerSelectAction | ((a: Annotation) => PointerSelectAction)) => PointerSelectAction;
+export declare const onUserSelect: <T extends Annotation>(annotation: T, action?: UserSelectActionExpression<T>) => UserSelectAction;
 //# sourceMappingURL=Selection.d.ts.map

package/dist/state/Selection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Selection.d.ts","sourceRoot":"","sources":["../../src/state/Selection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAG,UAAU,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,MAAM,SAAS,GAAG;IAEtB,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,CAAC;IAE/C,YAAY,CAAC,EAAE,YAAY,CAAC;CAE7B,CAAA;AAED,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,UAAU,IAAI,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9F,oBAAY,mBAAmB;IAE7B,IAAI,SAAS;IAEb,MAAM,WAAW;IAEjB,IAAI,SAAS;CAEd;AAID,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;6CAEU,UAAU,KAAK,mBAAmB;;sBAqBlD,MAAM,gBAAgB,YAAY;;YA3C3C,MAAM;mBAAa,OAAO;;;;;2BA0DZ,MAAM,GAAG,MAAM,EAAE,aAAY,OAAO;;CAyCnE,CAAA;AAED,eAAO,MAAM,eAAe,eACd,UAAU,sCACc,UAAU,KAAK,mBAAmB,MACrE,mBAEqC,CAAC"}
+{"version":3,"file":"Selection.d.ts","sourceRoot":"","sources":["../../src/state/Selection.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,WAAW,SAAS;IAExB,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,CAAC;IAE/C,KAAK,CAAC,EAAE,YAAY,GAAG,aAAa,CAAC;IAErC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CAEpB;AAED,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,UAAU,IAAI,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9F,oBAAY,gBAAgB;IAE1B,IAAI,SAAS,CAAE,uDAAuD;IAEtE,MAAM,WAAW,CAAG,uCAAuC;IAE3D,IAAI,SAAS;CAEd;AAED,MAAM,MAAM,0BAA0B,CAAC,CAAC,SAAS,UAAU,IAAI,gBAAgB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,gBAAgB,CAAC,CAAC;AAI/G,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,UAAU,SAAS,KAAK,CAAC,CAAC,CAAC;;;YAxBxD,MAAM;mBAAa,OAAO;;;;;iCAyCN,CAAC,GAAG,MAAM;2BA6BhB,MAAM,GAAG,MAAM,EAAE,aAAa,OAAO;kCAmC9B,0BAA0B,CAAC,CAAC,CAAC,GAAG,SAAS;;qBAvDtD,MAAM,UAAU,SAAS,CAAC,OAAO,CAAC;CAkF3D,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,UAAU,cACnC,CAAC,WACJ,0BAA0B,CAAC,CAAC,CAAC,KACrC,gBAA2G,CAAC"}

package/dist/state/Store.d.ts

@@ -1,30 +1,34 @@
-import type { Annotation, AnnotationBody, AnnotationTarget } from '../model';
-import { Origin } from './StoreObserver';
-import type { StoreChangeEvent, StoreObserveOptions } from './StoreObserver';
+import { Annotation } from '../model';
+import { Origin, StoreChangeEvent, StoreObserveOptions } from './StoreObserver';
 type AnnotationBodyIdentifier = {
     id: string;
     annotation: string;
 };
 export type Store<T extends Annotation> = ReturnType<typeof createStore<T>>;
 export declare const createStore: <T extends Annotation>() => {
-    addAnnotation: (annotation: T, origin?: Origin) => void;
-    addBody: (body: AnnotationBody, origin?: Origin) => void;
+    addAnnotation: (annotation: Partial<T>, origin?: Origin) => void;
+    addBody: (body: T["bodies"][number], origin?: Origin) => void;
     all: () => T[];
-    bulkAddAnnotation: (annotations: T[], replace?: boolean, origin?: Origin) => void;
-    bulkDeleteAnnotation: (annotationsOrIds: (string | T)[], origin?: Origin) => void;
+    bulkAddAnnotation: (annotations: Partial<T>[], replace?: boolean, origin?: Origin) => void;
+    bulkDeleteAnnotation: (annotationsOrIds: (T | string)[], origin?: Origin) => void;
+    bulkDeleteBodies: (bodies: AnnotationBodyIdentifier[], origin?: Origin) => void;
     bulkUpdateAnnotation: (annotations: T[], origin?: Origin) => void;
-    bulkUpdateBodies: (bodies: AnnotationBody[], origin?: Origin) => void;
-    bulkUpdateTargets: (targets: AnnotationTarget[], origin?: Origin) => void;
+    bulkUpdateBodies: (bodies: Array<T["bodies"][number]>, origin?: Origin) => void;
+    bulkUpdateTargets: (targets: Array<T["target"]>, origin?: Origin) => void;
     clear: (origin?: Origin) => void;
-    deleteAnnotation: (annotationOrId: string | T, origin?: Origin) => void;
+    deleteAnnotation: (annotationOrId: T | string, origin?: Origin) => void;
     deleteBody: (body: AnnotationBodyIdentifier, origin?: Origin) => void;
-    getAnnotation: (id: string) => T;
-    getBody: (id: string) => AnnotationBody | undefined;
-    observe: (onChange: (event: StoreChangeEvent<T>) => void, options?: StoreObserveOptions) => number;
-    unobserve: (onChange: (event: StoreChangeEvent<T>) => void) => void;
-    updateAnnotation: (arg1: string | T, arg2?: Origin | T, arg3?: Origin) => void;
-    updateBody: (oldBodyId: AnnotationBodyIdentifier, newBody: AnnotationBody, origin?: Origin) => void;
-    updateTarget: (target: AnnotationTarget, origin?: Origin) => void;
+    getAnnotation: (id: string) => T | undefined;
+    getBody: (id: string) => T["bodies"][number] | undefined;
+    observe: (onChange: {
+        (event: StoreChangeEvent<T>): void;
+    }, options?: StoreObserveOptions) => number;
+    unobserve: (onChange: {
+        (event: StoreChangeEvent<T>): void;
+    }) => void;
+    updateAnnotation: (arg1: string | T, arg2?: T | Origin, arg3?: Origin) => void;
+    updateBody: (oldBodyId: AnnotationBodyIdentifier, newBody: T["bodies"][number], origin?: Origin) => void;
+    updateTarget: (target: T["target"], origin?: Origin) => void;
 };
 export {};
 //# sourceMappingURL=Store.d.ts.map

package/dist/state/Store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Store.d.ts","sourceRoot":"","sources":["../../src/state/Store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE7E,OAAO,EAAE,MAAM,EAA6C,MAAM,iBAAiB,CAAC;AACpF,OAAO,KAAK,EAAiB,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAG5F,KAAK,wBAAwB,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnE,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,UAAU,IAAI,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AAI5E,eAAO,MAAM,WAAW;;oBA0FC,cAAc;;;;;+BAkLH,cAAc,EAAE;iCAoCd,gBAAgB,EAAE;;;uBAxH5B,wBAAwB;wBA6BvB,MAAM;kBAKZ,MAAM,KAAG,cAAc,GAAG,SAAS;wDAlNG,IAAI,YAAa,mBAAmB;0DAGlC,IAAI;;4BA4PlC,wBAAwB,WAAW,cAAc;2BAmClD,gBAAgB;CAiC/C,CAAA"}
+{"version":3,"file":"Store.d.ts","sourceRoot":"","sources":["../../src/state/Store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAE,MAAM,EAA6C,MAAM,iBAAiB,CAAC;AACpF,OAAO,KAAK,EAAiB,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAG5F,KAAK,wBAAwB,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC;AAmBnE,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,UAAU,IAAI,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AAI5E,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,UAAU;gCAkCX,OAAO,CAAC,CAAC,CAAC;oBAyDtB,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;;qCAiCF,OAAO,CAAC,CAAC,CAAC,EAAE;6CAqDJ,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE;+BA6C5B,wBAAwB,EAAE;wCA7IjB,CAAC,EAAE;+BA8MZ,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;iCAuCxB,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;;uCA3JZ,CAAC,GAAG,MAAM;uBA6C1B,wBAAwB;wBAevB,MAAM,KAAG,CAAC,GAAG,SAAS;kBAK5B,MAAM,KAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS;wBApOlC;QAAE,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;KAAE,YAAW,mBAAmB;0BAGlE;QAAE,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;KAAE;6BA8DnC,MAAM,GAAG,CAAC,SAAQ,CAAC,GAAG,MAAM;4BAgN7B,wBAAwB,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;2BAuCvD,CAAC,CAAC,QAAQ,CAAC;CAmC1C,CAAA"}

package/dist/state/StoreObserver.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation, AnnotationBody, AnnotationTarget } from '../model/Annotation';
+import { Annotation, AnnotationBody, AnnotationTarget } from '../model/Annotation';
 /** Interface for listening to changes in the annotation store **/
 export interface StoreObserver<T extends Annotation> {
     onChange: {

package/dist/state/StoreObserver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StoreObserver.d.ts","sourceRoot":"","sources":["../../src/state/StoreObserver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGxF,kEAAkE;AAClE,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,UAAU;IAEjD,QAAQ,EAAE;QAAE,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;KAAE,CAAC;IAEjD,OAAO,EAAE,mBAAmB,CAAC;CAE9B;AAED,yDAAyD;AACzD,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,UAAU;IAEpD,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IAEtB,KAAK,EAAE,CAAC,EAAE,CAAC;CAEZ;AAED,MAAM,WAAW,SAAS,CAAC,CAAC,SAAS,UAAU;IAE7C,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;IAEd,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;IAEd,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;CAEvB;AAED,MAAM,WAAW,MAAM,CAAC,CAAC,SAAS,UAAU;IAE1C,QAAQ,EAAE,CAAC,CAAC;IAEZ,QAAQ,EAAE,CAAC,CAAC;IAEZ,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;IAEjC,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;IAEjC,aAAa,CAAC,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE,CAAC,CAAC;IAE5E,aAAa,CAAC,EAAE;QAAE,SAAS,EAAE,gBAAgB,CAAC;QAAC,SAAS,EAAE,gBAAgB,CAAA;KAAC,CAAC;CAE7E;AAED,gFAAgF;AAChF,MAAM,WAAW,mBAAmB;IAGlC,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAGhC,MAAM,CAAC,EAAE,MAAM,CAAA;CAEhB;AAED,yDAAyD;AACzD,oBAAY,MAAM;IAGhB,SAAS,cAAc;IAGvB,WAAW,gBAAgB;CAE5B;AAED,qGAAqG;AACrG,oBAAY,MAAM;IAEhB,KAAK,UAAU;IAEf,MAAM,WAAW;CAElB;AAED,kEAAkE;AAClE,eAAO,MAAM,YAAY,2FAiDxB,CAAA;AAED,eAAO,MAAM,YAAY;;;;CA0DxB,CAAA"}
+{"version":3,"file":"StoreObserver.d.ts","sourceRoot":"","sources":["../../src/state/StoreObserver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGxF,kEAAkE;AAClE,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,UAAU;IAEjD,QAAQ,EAAE;QAAE,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;KAAE,CAAC;IAEjD,OAAO,EAAE,mBAAmB,CAAC;CAE9B;AAED,yDAAyD;AACzD,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,UAAU;IAEpD,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IAEtB,KAAK,EAAE,CAAC,EAAE,CAAC;CAEZ;AAED,MAAM,WAAW,SAAS,CAAC,CAAC,SAAS,UAAU;IAE7C,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;IAEd,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;IAEd,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;CAEvB;AAED,MAAM,WAAW,MAAM,CAAC,CAAC,SAAS,UAAU;IAE1C,QAAQ,EAAE,CAAC,CAAC;IAEZ,QAAQ,EAAE,CAAC,CAAC;IAEZ,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;IAEjC,aAAa,CAAC,EAAE,cAAc,EAAE,CAAC;IAEjC,aAAa,CAAC,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,cAAc,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE,CAAC,CAAC;IAE5E,aAAa,CAAC,EAAE;QAAE,SAAS,EAAE,gBAAgB,CAAC;QAAC,SAAS,EAAE,gBAAgB,CAAA;KAAC,CAAC;CAE7E;AAED,gFAAgF;AAChF,MAAM,WAAW,mBAAmB;IAGlC,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAGhC,MAAM,CAAC,EAAE,MAAM,CAAA;CAEhB;AAED,yDAAyD;AACzD,oBAAY,MAAM;IAGhB,SAAS,cAAc;IAGvB,WAAW,gBAAgB;CAE5B;AAED,qGAAqG;AACrG,oBAAY,MAAM;IAEhB,KAAK,UAAU;IAEf,MAAM,WAAW;CAElB;AAED,kEAAkE;AAClE,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,UAAU,YAAY,aAAa,CAAC,CAAC,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,YAiDxG,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,UAAU,WAAW,SAAS,CAAC,CAAC,CAAC,WAAW,SAAS,CAAC,CAAC,CAAC;;;;CAyD9F,CAAA"}