@metadev/daga 1.4.1 → 1.4.3

package/index.d.ts

@@ -2,22 +2,24 @@ export { CollapseButtonComponent } from './lib/collapse-button/collapse-button.c
 export { DagaModule } from './lib/daga.module';
 export { DiagramButtonsComponent } from './lib/diagram-buttons/diagram-buttons.component';
 export { DiagramEditorComponent } from './lib/diagram-editor/diagram-editor.component';
+export { CollabClient } from './lib/diagram-editor/diagram/collab/collab-client';
+export { CollabTimestamp, CollabTimestampSet } from './lib/diagram-editor/diagram/collab/primitives';
 export { DagaExporter } from './lib/diagram-editor/diagram/converters/daga-exporter';
 export { DagaImporter } from './lib/diagram-editor/diagram/converters/daga-importer';
 export { DagaModel } from './lib/diagram-editor/diagram/converters/daga-model';
 export { DiagramModelExporter } from './lib/diagram-editor/diagram/converters/diagram-model-exporter';
 export { DiagramModelImporter } from './lib/diagram-editor/diagram/converters/diagram-model-importer';
-export { ActionQueue, AddConnectionAction, AddNodeAction, DiagramAction, DiagramActions, EditFieldAction, MoveNodeAction, RemoveAction, StretchNodeAction, UpdateValuesAction } from './lib/diagram-editor/diagram/diagram-action';
+export { ActionQueue, AddConnectionAction, AddNodeAction, DiagramAction, DiagramActions, EditFieldAction, RemoveAction, SetGeometryAction, UpdateValuesAction } from './lib/diagram-editor/diagram/diagram-action';
 export { ACTION_QUEUE_SIZE, DiagramCanvas } from './lib/diagram-editor/diagram/diagram-canvas';
 export { ButtonsComponentConfig, ComponentsConfig, ConnectionMarkerLook, ConnectionTemplateConfig, ConnectionTypeConfig, DiagramConfig, ErrorsComponentConfig, FieldConfig, NodeImageLook, NodeShapedLook, NodeStretchableImageLook, NodeTemplateConfig, NodeTypeConfig, PaletteComponentConfig, PaletteSectionConfig, PortConfig, PropertyEditorComponentConfig, SectionConfig, SectionGridConfig, UserActionConfig } from './lib/diagram-editor/diagram/diagram-config';
 export { DiagramConnection, DiagramConnectionSet, DiagramConnectionType } from './lib/diagram-editor/diagram/diagram-connection';
 export { DiagramElement, DiagramEntity, DiagramEntitySet } from './lib/diagram-editor/diagram/diagram-element';
 export { DiagramField, DiagramFieldSet } from './lib/diagram-editor/diagram/diagram-field';
 export { DiagramModel } from './lib/diagram-editor/diagram/diagram-model';
-export { DiagramNode, DiagramNodeSet, DiagramNodeType } from './lib/diagram-editor/diagram/diagram-node';
+export { DiagramNode, DiagramNodeSet, DiagramNodeType, DiagramNodeGeometry } from './lib/diagram-editor/diagram/diagram-node';
 export { DiagramPort, DiagramPortSet } from './lib/diagram-editor/diagram/diagram-port';
 export { Property, PropertySet, Type, ValueSet } from './lib/diagram-editor/diagram/diagram-property';
-export { DiagramSection, DiagramSectionSet } from './lib/diagram-editor/diagram/diagram-section';
+export { DiagramSection, DiagramSectionSet, DiagramSectionGeometry } from './lib/diagram-editor/diagram/diagram-section';
 export { AdjacencyLayout } from './lib/diagram-editor/diagram/layout/adjacency-layout';
 export { BreadthAdjacencyLayout } from './lib/diagram-editor/diagram/layout/breadth-adjacency-layout';
 export { BreadthLayout } from './lib/diagram-editor/diagram/layout/breadth-layout';
@@ -35,13 +37,13 @@ export { DiagramButtons } from './lib/interfaces/diagram-buttons';
 export { DiagramEditor } from './lib/interfaces/diagram-editor';
 export { Palette } from './lib/interfaces/palette';
 export { PropertyEditor } from './lib/interfaces/property-editor';
-export { ObjectEditorComponent } from './lib/object-editor/object-editor.component';
 export { PaletteComponent } from './lib/palette/palette.component';
+export { ObjectEditorComponent } from './lib/property-editor/object-editor/object-editor.component';
 export { PropertyEditorComponent } from './lib/property-editor/property-editor.component';
+export { TextListEditorComponent } from './lib/property-editor/text-list-editor/text-list-editor.component';
+export { TextMapEditorComponent } from './lib/property-editor/text-map-editor/text-map-editor.component';
 export { CanvasProviderService } from './lib/services/canvas-provider.service';
 export { DagaConfigurationService } from './lib/services/daga-configuration.service';
-export { TextListEditorComponent } from './lib/text-list-editor/text-list-editor.component';
-export { TextMapEditorComponent } from './lib/text-map-editor/text-map-editor.component';
 export { Line, Point, Rectangle } from './lib/util/canvas-util';
 export { LineShape, LineStyle } from './lib/util/line';
 export { ClosedShape } from './lib/util/shape';

package/lib/daga.module.d.ts

@@ -4,16 +4,15 @@ import * as i2 from "./diagram-buttons/diagram-buttons.component";
 import * as i3 from "./diagram/diagram.component";
 import * as i4 from "./diagram-editor/diagram-editor.component";
 import * as i5 from "./errors/errors.component";
-import * as i6 from "./object-editor/object-editor.component";
+import * as i6 from "./property-editor/object-editor/object-editor.component";
 import * as i7 from "./palette/palette.component";
-import * as i8 from "./text-list-editor/text-list-editor.component";
-import * as i9 from "./text-map-editor/text-map-editor.component";
+import * as i8 from "./property-editor/text-list-editor/text-list-editor.component";
+import * as i9 from "./property-editor/text-map-editor/text-map-editor.component";
 import * as i10 from "./property-editor/property-editor.component";
 import * as i11 from "@angular/common";
 import * as i12 from "@angular/forms";
-import * as i13 from "@metadev/lux";
 export declare class DagaModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<DagaModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<DagaModule, never, [typeof i1.CollapseButtonComponent, typeof i2.DiagramButtonsComponent, typeof i3.DiagramComponent, typeof i4.DiagramEditorComponent, typeof i5.ErrorsComponent, typeof i6.ObjectEditorComponent, typeof i7.PaletteComponent, typeof i8.TextListEditorComponent, typeof i9.TextMapEditorComponent, typeof i10.PropertyEditorComponent, typeof i11.CommonModule, typeof i12.FormsModule, typeof i13.LuxModule], [typeof i3.DiagramComponent, typeof i4.DiagramEditorComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<DagaModule, never, [typeof i1.CollapseButtonComponent, typeof i2.DiagramButtonsComponent, typeof i3.DiagramComponent, typeof i4.DiagramEditorComponent, typeof i5.ErrorsComponent, typeof i6.ObjectEditorComponent, typeof i7.PaletteComponent, typeof i8.TextListEditorComponent, typeof i9.TextMapEditorComponent, typeof i10.PropertyEditorComponent, typeof i11.CommonModule, typeof i12.FormsModule], [typeof i3.DiagramComponent, typeof i4.DiagramEditorComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<DagaModule>;
 }

package/lib/diagram-editor/diagram/collab/collab-action.d.ts

@@ -0,0 +1,212 @@
+import { Canvas } from '../../../interfaces/canvas';
+import { Point } from '../../../util/canvas-util';
+import { CollabTimestamp } from './primitives';
+import { DiagramNodeGeometry } from '../diagram-node';
+import { ValueSet } from '../diagram-property';
+/**
+ * An action taken by a local or remote user.
+ *
+ * The action can performed on its creator's device, serialized
+ * and deserialized to reach remote users' devices, and performed
+ * on remote users' devices.
+ * @private
+ */
+export interface CollabAction {
+    /**
+     * Performs this action on the diagram.
+     *
+     * Note: Local Actions should call `canvas.collabEngine.doCollaboratively(collabAction)`, **not** this method directly.
+     *
+     * CollabAction `do()` methods must follow the rules of operation-based CRDT messages:
+     * If two users concurrently create CollabActions (possibly of different types) on the same diagram, then performing the actions on a future diagram state _in either order_ must result in the same diagram state.
+     */
+    do(): void;
+    /**
+     * Serializes this action, converting it to a JSON form.
+     *
+     * To deserialize, use the *static* deserialize method on the same class.
+     */
+    serialize(): CollabActionSerialized;
+}
+/**
+ * @private
+ */
+export type CollabActionSerialized = AddNodeSerialized | SetGeometrySerialized | AddConnectionSerialized | EditFieldSerialized | UpdateValuesSerialized | SetSelfRemovedSerialized;
+/**
+ * @private
+ */
+export type AddNodeSerialized = {
+    type: 'addNode';
+    id: string;
+    typeId: string;
+    coords: Point;
+    label?: string;
+    values?: {
+        [key: string]: unknown;
+    };
+};
+/**
+ * Collaborative action which consists of adding a node.
+ * @see AddNodeAction
+ * @private
+ */
+export declare class AddNodeCollabAction implements CollabAction {
+    readonly canvas: Canvas;
+    readonly id: string;
+    readonly typeId: string;
+    readonly coords: Point;
+    readonly label?: string | undefined;
+    readonly values?: {
+        [key: string]: unknown;
+    } | undefined;
+    constructor(canvas: Canvas, id: string, typeId: string, coords: Point, label?: string | undefined, values?: {
+        [key: string]: unknown;
+    } | undefined);
+    do(): void;
+    serialize(): AddNodeSerialized;
+    static deserialize(canvas: Canvas, serialized: AddNodeSerialized): AddNodeCollabAction;
+}
+/**
+ * @private
+ */
+export type SetGeometrySerialized = {
+    type: 'setGeometry';
+    nodeId: string;
+    to: DiagramNodeGeometry;
+    timestamp: CollabTimestamp;
+};
+/**
+ * Collaborative action which consists of changing a node's geometry: moving, stretching, or stretching sections.
+ * @see SetGeometryAction
+ * @private
+ */
+export declare class SetGeometryCollabAction implements CollabAction {
+    readonly canvas: Canvas;
+    readonly nodeId: string;
+    readonly to: DiagramNodeGeometry;
+    readonly timestamp: CollabTimestamp;
+    constructor(canvas: Canvas, nodeId: string, to: DiagramNodeGeometry, timestamp: CollabTimestamp);
+    do(): void;
+    serialize(): SetGeometrySerialized;
+    static deserialize(canvas: Canvas, serialized: SetGeometrySerialized): SetGeometryCollabAction;
+}
+/**
+ * @private
+ */
+export type AddConnectionSerialized = {
+    type: 'addConnection';
+    id: string;
+    typeId: string;
+    startId: string;
+    endId: string;
+};
+/**
+ * Collaborative action which consists of adding a connection.
+ * @see AddConnectionAction
+ * @private
+ */
+export declare class AddConnectionCollabAction implements CollabAction {
+    readonly canvas: Canvas;
+    readonly id: string;
+    readonly typeId: string;
+    readonly startId: string;
+    readonly endId: string;
+    constructor(canvas: Canvas, id: string, typeId: string, startId: string, endId: string);
+    do(): void;
+    serialize(): AddConnectionSerialized;
+    static deserialize(canvas: Canvas, serialized: AddConnectionSerialized): AddConnectionCollabAction;
+}
+/**
+ * @private
+ */
+export type EditFieldSerialized = {
+    type: 'editField';
+    fieldId: string;
+    to: string;
+    timestamp: CollabTimestamp;
+};
+/**
+ * Collaborative action which consists of editing the text of a field.
+ * @see EditFieldAction
+ * @private
+ */
+export declare class EditFieldCollabAction implements CollabAction {
+    readonly canvas: Canvas;
+    readonly fieldId: string;
+    readonly to: string;
+    readonly timestamp: CollabTimestamp;
+    constructor(canvas: Canvas, fieldId: string, to: string, timestamp: CollabTimestamp);
+    do(): void;
+    serialize(): EditFieldSerialized;
+    static deserialize(canvas: Canvas, serialized: EditFieldSerialized): EditFieldCollabAction;
+}
+/**
+ * @private
+ */
+export type UpdateValuesSerialized = {
+    type: 'updateValues';
+    id: string | undefined;
+    to: {
+        [key: string]: unknown;
+    };
+    timestamp: CollabTimestamp;
+};
+/**
+ * Collaborative action which consists of editing the values of a value set.
+ * @see UpdateValuesAction
+ * @private
+ */
+export declare class UpdateValuesCollabAction implements CollabAction {
+    readonly canvas: Canvas;
+    readonly id: string | undefined;
+    readonly to: {
+        [key: string]: unknown;
+    };
+    readonly timestamp: CollabTimestamp;
+    constructor(canvas: Canvas, id: string | undefined, to: {
+        [key: string]: unknown;
+    }, timestamp: CollabTimestamp);
+    getValueSet(): ValueSet | undefined;
+    do(): void;
+    serialize(): UpdateValuesSerialized;
+    static deserialize(canvas: Canvas, serialized: UpdateValuesSerialized): UpdateValuesCollabAction;
+}
+/**
+ * @private
+ */
+export type SetSelfRemovedSerialized = {
+    type: 'setSelfRemoved';
+    nodeIds: string[];
+    sectionIds: string[];
+    portIds: string[];
+    connectionIds: string[];
+    fieldIds: string[];
+    removed: boolean;
+    timestamp: CollabTimestamp;
+};
+/**
+ * Collaborative action which consists of removing or un-removing elements.
+ *
+ * Specifically, the action sets the `selfRemoved` field for elements that are
+ * explicitly removed/unremoved. This causes the `removed` fields for those elements
+ * and their transitive dependents to update automatically.
+ * For example, self-removing a node also removes all of its sections/connections/etc.
+ *
+ * @see RemoveAction
+ * @private
+ */
+export declare class SetSelfRemovedCollabAction implements CollabAction {
+    readonly canvas: Canvas;
+    readonly nodeIds: string[];
+    readonly sectionIds: string[];
+    readonly portIds: string[];
+    readonly connectionIds: string[];
+    readonly fieldIds: string[];
+    readonly selfRemoved: boolean;
+    readonly timestamp: CollabTimestamp;
+    constructor(canvas: Canvas, nodeIds: string[], sectionIds: string[], portIds: string[], connectionIds: string[], fieldIds: string[], selfRemoved: boolean, timestamp: CollabTimestamp);
+    private doOne;
+    do(): void;
+    serialize(): CollabActionSerialized;
+    static deserialize(canvas: Canvas, serialized: SetSelfRemovedSerialized): SetSelfRemovedCollabAction;
+}

package/lib/diagram-editor/diagram/collab/collab-client.d.ts

@@ -0,0 +1,57 @@
+import { Canvas } from '../../../interfaces/canvas';
+/**
+ * The client that communicates with the daga-server over WebSockets.
+ *
+ * Use this to create and join rooms.
+ * @public
+ */
+export declare class CollabClient {
+    /**
+     * The WebSocket URL of the daga-server.
+     */
+    readonly dagaServer: string;
+    readonly userId: string;
+    readonly clientId: string;
+    private readonly ws;
+    private sendQueue;
+    /**
+     * Joined sessions by locator.
+     */
+    private sessions;
+    /**
+     * Created but unacked sessions by refId.
+     */
+    private pendingSessions;
+    constructor(dagaServer: string, userId: string);
+    private onOpen;
+    private onMessage;
+    private onClose;
+    private onError;
+    /**
+     * Internal send method. Use instead of calling ws.send directly.
+     */
+    private send;
+    /**
+     * Internal receive method. Use instead of handling ws receive events directly.
+     */
+    private receive;
+    /**
+     * Creates and joins a room. The given canvas becomes collaborative, starting
+     * with its current model.
+     *
+     * Returns a Promise that resolves with the new room's locator once joined.
+     * @public
+     */
+    createAndJoinRoom(canvas: Canvas): Promise<string>;
+    /**
+     * Joins the room with the given locator. The given canvas becomes collaborative,
+     * **replacing** its current model with the room's model.
+     *
+     * Returns a Promise that resolves once the room has been joined and loaded into
+     * the canvas. You should hide or lock the canvas until it resolves, since any
+     * user inputs before then will be overwritten.
+     * @public
+     */
+    joinRoom(canvas: Canvas, locator: string): Promise<void>;
+    private startSyncing;
+}

package/lib/diagram-editor/diagram/collab/collab-engine.d.ts

@@ -0,0 +1,46 @@
+import type { Canvas } from '../../../interfaces/canvas';
+import { CollabAction, CollabActionSerialized } from './collab-action';
+import { CollabTimestamp } from './primitives';
+/**
+ * A collaboration engine, which manages collaboration for a diagram.
+ * @private
+ */
+export declare class CollabEngine {
+    /**
+     * Canvas that this collaboration engine belongs to.
+     * @private
+     */
+    readonly canvas: Canvas;
+    /**
+     * The local replica ID.
+     */
+    readonly replicaId: string;
+    /**
+     * Event handler for when we request to send a message to the server.
+     */
+    onSend?: (message: CollabActionSerialized) => void;
+    /**
+     * Whether we have joined (or are joining) a room on the server.
+     */
+    isInRoom: boolean;
+    constructor(canvas: Canvas);
+    /**
+     * Returns a fresh timestamp, suitable for use by new CollabActions.
+     */
+    freshTimestamp(): CollabTimestamp;
+    /**
+     * Returns a fresh unique ID, suitable for use by new CollabActions.
+     */
+    freshId(): string;
+    /**
+     * Performs the action - immediately locally, and eventually for remote collaborators.
+     */
+    doCollaboratively(action: CollabAction): void;
+    /**
+     * Processes a message received from the server.
+     *
+     * The message is assumed to be non-redundant (in particular, not one of
+     * our own messages) and delivered after all prior messages on the server.
+     */
+    receive(message: CollabActionSerialized): void;
+}

package/lib/diagram-editor/diagram/collab/message-types.d.ts

@@ -0,0 +1,97 @@
+/**
+ * Message types for communicating with the daga server.
+ *
+ * Duplicated between https://github.com/metadevpro/daga-server/blob/dev/types.ts and
+ * https://github.com/metadevpro/daga/blob/dev/libs/daga/src/lib/diagram-editor/diagram/collab/message-types.ts
+ */
+/**
+ * Stand-in for the DagaModel type on the server.
+ */
+export interface DagaModelStub {
+}
+export interface RoomInfo {
+    locator: string;
+    ownerId: string;
+    initialModel: DagaModelStub;
+    messages: AddMessage[];
+}
+export interface UserInfo {
+    id: string;
+    username: string;
+}
+export interface ClientInfo {
+    key: string;
+    connection: unknown;
+    user: UserInfo;
+    ts: string;
+}
+export interface IMessage {
+    ts: string;
+}
+export type Message = HeloMessage | ByeMessage | CreateMessage | CreateAckMessage | EnrollMessage | EnrollAckMessage | DeleteMessage | AddMessage | ErrorMessage | OkMessage;
+export interface HeloMessage extends IMessage {
+    type: 'HELO';
+    clientId: string;
+    userId: string;
+    token?: string;
+    /** version of the protocol */
+    version: string;
+}
+export interface ByeMessage extends IMessage {
+    type: 'BYE';
+    clientId: string;
+    userId: string;
+}
+export interface CreateMessage extends IMessage {
+    type: 'CREA';
+    clientId: string;
+    userId: string;
+    /** Correlation id for the client */
+    refId: string;
+    initialModel: DagaModelStub;
+}
+export interface CreateAckMessage extends IMessage {
+    type: 'CACK';
+    clientId: string;
+    userId: string;
+    /** Correlation id for the client */
+    refId: string;
+    locator: string;
+}
+export interface EnrollMessage extends IMessage {
+    type: 'ENRO';
+    clientId: string;
+    userId: string;
+    locator: string;
+}
+export interface EnrollAckMessage extends IMessage {
+    type: 'EACK';
+    locator: string;
+    initialModel: DagaModelStub;
+}
+export interface DeleteMessage extends IMessage {
+    type: 'DLTE';
+    clientId: string;
+    userId: string;
+    locator: string;
+}
+export interface AddMessage extends IMessage {
+    type: 'ADD';
+    clientId: string;
+    userId: string;
+    locator: string;
+    payload: unknown;
+}
+export interface ErrorMessage extends IMessage {
+    type: 'ERR';
+    clientId: string;
+    userId: string;
+    locator: string;
+    status: number;
+    description: string;
+}
+export interface OkMessage extends IMessage {
+    type: 'OK';
+    clientId: string;
+    userId: string;
+}

package/lib/diagram-editor/diagram/collab/primitives.d.ts

@@ -0,0 +1,22 @@
+/**
+ * A timestamp used to break ties during collaborative editing.
+ * If multiple users edit a property at the same time, the edit with the last timestamp "wins".
+ *
+ * Specifically, `CollabTimestamp` is a [Lamport timestamp](https://en.wikipedia.org/wiki/Lamport_timestamp),
+ * consisting of a logical clock and a tiebreaker (`replicaId`, a UUID that is created fresh for each diagram).
+ */
+export type CollabTimestamp = [clock: number, replicaId: string];
+/**
+ * Returns whether the incoming timestamp wins over the existing timestamp.
+ *
+ * In the DiagramModel, timestamps that have never been set are left null;
+ * `timestampWins` treats that as an "initial timestamp" that loses to all LogicalTimestamps.
+ */
+export declare function timestampWins(incoming: CollabTimestamp, existing: CollabTimestamp | null | undefined): boolean;
+/**
+ * A nested collection of CollabTimestamps associated to a ValueSet.
+ * @see ValueSet
+ */
+export type CollabTimestampSet = {
+    [key: string]: CollabTimestamp | CollabTimestampSet;
+};

package/lib/diagram-editor/diagram/converters/daga-exporter.d.ts

@@ -6,5 +6,5 @@ import { DiagramModelExporter } from './diagram-model-exporter';
  * @public
  */
 export declare class DagaExporter implements DiagramModelExporter<DagaModel> {
-    export(model: DiagramModel): DagaModel;
+    export(model: DiagramModel, includeCollabMeta?: boolean): DagaModel;
 }

package/lib/diagram-editor/diagram/converters/daga-model.d.ts

@@ -1,5 +1,6 @@
 import { Point } from '../../../util/canvas-util';
 import { Side } from '../../../util/svg-util';
+import { CollabTimestamp, CollabTimestampSet } from '../collab/primitives';
 export declare const DAGA_FILE_VERSION = 1;
 /**
  * Representation of a diagram model in a serialized format.
@@ -28,6 +29,17 @@ export interface DagaModel {
                 coords: Point;
                 direction: Side;
                 label: string;
+                collabMeta?: {
+                    removed: boolean;
+                    selfRemoved: boolean;
+                    selfRemovedTimestamp: CollabTimestamp | null;
+                    label?: {
+                        removed: boolean;
+                        selfRemoved: boolean;
+                        selfRemovedTimestamp: CollabTimestamp | null;
+                        textTimestamp: CollabTimestamp | null;
+                    };
+                };
             }[];
             label: string;
             indexXInNode: number;
@@ -35,12 +47,34 @@ export interface DagaModel {
             coords: Point;
             width: number;
             height: number;
+            collabMeta?: {
+                removed: boolean;
+                selfRemoved: boolean;
+                selfRemovedTimestamp: CollabTimestamp | null;
+                label?: {
+                    removed: boolean;
+                    selfRemoved: boolean;
+                    selfRemovedTimestamp: CollabTimestamp | null;
+                    textTimestamp: CollabTimestamp | null;
+                };
+            };
         }[];
         ports?: {
             id: string;
             coords: Point;
             direction: Side;
             label: string;
+            collabMeta?: {
+                removed: boolean;
+                selfRemoved: boolean;
+                selfRemovedTimestamp: CollabTimestamp | null;
+                label?: {
+                    removed: boolean;
+                    selfRemoved: boolean;
+                    selfRemovedTimestamp: CollabTimestamp | null;
+                    textTimestamp: CollabTimestamp | null;
+                };
+            };
         }[];
         label: string;
         coords: Point;
@@ -49,6 +83,19 @@ export interface DagaModel {
         data: {
             [key: string]: unknown;
         };
+        collabMeta?: {
+            removed: boolean;
+            selfRemoved: boolean;
+            selfRemovedTimestamp: CollabTimestamp | null;
+            geometryTimestamp: CollabTimestamp | null;
+            dataTimestamps: CollabTimestampSet;
+            label?: {
+                removed: boolean;
+                selfRemoved: boolean;
+                selfRemovedTimestamp: CollabTimestamp | null;
+                textTimestamp: CollabTimestamp | null;
+            };
+        };
     }[];
     connections: {
         id: string;
@@ -62,8 +109,18 @@ export interface DagaModel {
         data: {
             [key: string]: unknown;
         };
+        collabMeta?: {
+            removed: boolean;
+            selfRemoved: boolean;
+            selfRemovedTimestamp: CollabTimestamp | null;
+            dataTimestamps: CollabTimestampSet;
+        };
     }[];
     data: {
         [key: string]: unknown;
     };
+    collabMeta?: {
+        logicalClock: number;
+        dataTimestamps: CollabTimestampSet;
+    };
 }