@textbus/collaborate 2.0.0-alpha.38 → 2.0.0-alpha.39

package/bundles/collab/remote-to-local.js

@@ -1,143 +1,158 @@
-import { YArrayEvent, YMapEvent } from 'yjs';
-import { FormatType } from '@textbus/core';
-export function remoteToLocal(events, slot, translator, registry) {
-    events.forEach(ev => {
-        const path = [];
-        for (let i = 0; i < ev.path.length; i += 2) {
-            path.push(ev.path.slice(i, i + 2));
-        }
-        if (path.length) {
-            const componentIndex = path.shift()[0];
-            const component = slot.getContentAtIndex(componentIndex);
-            applySharedComponentToComponent(ev, path, component, translator, registry);
-            return;
-        }
-        apply(ev, slot, translator);
-    });
-}
-function applySharedComponentToComponent(ev, path, component, translator, registry) {
-    if (path.length) {
-        const childPath = path.shift();
-        const slot = component.slots.get(childPath[0]);
-        applySharedSlotToSlot(ev, path, slot, translator, registry, childPath[1] === 'formats');
-        return;
-    }
-    if (ev instanceof YMapEvent) {
-        ev.keysChanged.forEach(key => {
-            if (key === 'state') {
-                const state = ev.target.get('state');
-                component.updateState(draft => {
-                    Object.assign(draft, state);
-                });
-            }
+import { YArrayEvent, YMapEvent, YTextEvent } from 'yjs';
+export class RemoteToLocal {
+    constructor(translator, registry) {
+        Object.defineProperty(this, "translator", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: translator
         });
-    }
-    else if (ev instanceof YArrayEvent) {
-        const slots = component.slots;
-        ev.delta.forEach(action => {
-            if (Reflect.has(action, 'retain')) {
-                slots.retain(action.retain);
-            }
-            else if (action.insert) {
-                action.insert.forEach(item => {
-                    slots.insert(translator.createSlot(item.toJSON()));
-                });
-            }
-            else if (action.delete) {
-                slots.retain(slots.index);
-                slots.delete(action.delete);
-            }
+        Object.defineProperty(this, "registry", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: registry
         });
     }
-}
-function applySharedSlotToSlot(ev, path, slot, translator, registry, isUpdateFormats) {
-    if (path.length) {
-        const componentIndex = path.shift()[0];
-        const component = slot.getContentAtIndex(componentIndex);
-        applySharedComponentToComponent(ev, path, component, translator, registry);
-        return;
-    }
-    if (ev instanceof YArrayEvent) {
-        ev.delta.forEach(action => {
-            if (Reflect.has(action, 'retain')) {
-                slot.retain(action.retain);
-            }
-            else if (action.insert) {
-                action.insert.forEach(item => {
-                    if (typeof item === 'string') {
-                        slot.insert(item);
-                    }
-                    else {
-                        slot.insert(translator.createComponent(item.toJSON()));
-                    }
-                });
+    transform(events, slot) {
+        events.forEach(ev => {
+            const path = [];
+            for (let i = 0; i < ev.path.length; i += 2) {
+                path.push(ev.path.slice(i, i + 2));
             }
-            else if (action.delete) {
-                slot.retain(slot.index);
-                slot.delete(action.delete);
+            if (path.length) {
+                const componentIndex = path.shift()[0];
+                const component = slot.getContentAtIndex(componentIndex);
+                this.applySharedComponentToComponent(ev, path, component);
+                return;
             }
+            this.applySharedSlotToSlot(ev, path, slot);
         });
     }
-    else if (ev instanceof YMapEvent) {
-        if (isUpdateFormats) {
-            const json = ev.target.toJSON();
-            ev.keysChanged.forEach(key => {
-                const formats = json[key];
-                const formatter = registry.getFormatter(key);
-                if (formatter.type !== FormatType.Block) {
-                    slot.applyFormat(formatter, {
-                        startIndex: 0,
-                        endIndex: slot.length,
-                        value: null
-                    });
-                }
-                formats.forEach(item => {
-                    if (formatter.type === FormatType.Block) {
-                        slot.applyFormat(formatter, item.value);
-                    }
-                    else {
-                        slot.applyFormat(formatter, item);
-                    }
-                });
-            });
+    applySharedComponentToComponent(ev, path, component) {
+        if (path.length) {
+            const childPath = path.shift();
+            const slot = component.slots.get(childPath[0]);
+            this.applySharedSlotToSlot(ev, path, slot);
+            return;
         }
-        else {
+        if (ev instanceof YMapEvent) {
             ev.keysChanged.forEach(key => {
                 if (key === 'state') {
                     const state = ev.target.get('state');
-                    slot.updateState(draft => {
+                    component.updateState(draft => {
                         Object.assign(draft, state);
                     });
                 }
             });
         }
+        else if (ev instanceof YArrayEvent) {
+            const slots = component.slots;
+            ev.delta.forEach(action => {
+                if (Reflect.has(action, 'retain')) {
+                    slots.retain(action.retain);
+                }
+                else if (action.insert) {
+                    action.insert.forEach(item => {
+                        slots.insert(this.translator.createSlot(item.toJSON()));
+                    });
+                }
+                else if (action.delete) {
+                    slots.retain(slots.index);
+                    slots.delete(action.delete);
+                }
+            });
+        }
     }
-}
-function apply(ev, slot, translator) {
-    if (ev instanceof YArrayEvent) {
-        slot.retain(0);
-        const delta = ev.delta;
-        delta.forEach(action => {
-            if (action.insert) {
-                action.insert.forEach(item => {
-                    if (typeof item === 'string') {
-                        slot.insert(item);
+    applySharedSlotToSlot(ev, path, slot) {
+        if (path.length) {
+            path.shift();
+            const delta = ev.target.parent.toDelta();
+            let componentIndex = 0;
+            for (let i = 0; i < delta.length; i++) {
+                const action = delta[i];
+                if (action.insert === ev.target) {
+                    break;
+                }
+                componentIndex += typeof action.insert === 'string' ? action.insert.length : 1;
+            }
+            const component = slot.getContentAtIndex(componentIndex);
+            this.applySharedComponentToComponent(ev, path, component);
+            return;
+        }
+        if (ev instanceof YTextEvent) {
+            slot.retain(0);
+            ev.delta.forEach(action => {
+                if (Reflect.has(action, 'retain')) {
+                    if (action.attributes) {
+                        slot.retain(action.retain, Object.keys(action.attributes).map(key => {
+                            return [this.registry.getFormatter(key), action.attributes[key]];
+                        }));
+                    }
+                    slot.retain(action.retain);
+                }
+                else if (action.insert) {
+                    if (typeof action.insert === 'string') {
+                        slot.insert(action.insert, action.attributes ? Object.keys(action.attributes).map(key => {
+                            return [this.registry.getFormatter(key), action.attributes[key]];
+                        }) : []);
                     }
                     else {
-                        const json = item.toJSON();
-                        const component = translator.createComponent(json);
+                        const component = this.createComponentBySharedComponent(action.insert);
                         slot.insert(component);
                     }
-                });
-            }
-            else if (Reflect.has(action, 'retain')) {
-                slot.retain(action.retain);
+                }
+                else if (action.delete) {
+                    slot.retain(slot.index);
+                    slot.delete(action.delete);
+                }
+                else if (action.attributes) {
+                    slot.updateState(draft => {
+                        Object.assign(draft, action.attributes);
+                    });
+                }
+            });
+        }
+        else {
+            throw new Error('xxx');
+        }
+    }
+    createComponentBySharedComponent(yMap) {
+        const slots = yMap.get('slots');
+        const componentLiteral = {
+            state: yMap.get('state'),
+            name: yMap.get('name'),
+            slots: slots.map(sharedSlot => {
+                return this.createSlotBySharedSlot(sharedSlot).toJSON();
+            })
+        };
+        return this.translator.createComponent(componentLiteral);
+    }
+    createSlotBySharedSlot(sharedSlot) {
+        const content = sharedSlot.get('content');
+        const delta = content.toDelta();
+        const slot = this.translator.createSlot({
+            schema: sharedSlot.get('schema'),
+            state: sharedSlot.get('state'),
+            formats: {},
+            content: []
+        });
+        for (const action of delta) {
+            if (action.insert) {
+                if (typeof action.insert === 'string') {
+                    slot.insert(action.insert, action.attributes ? Object.keys(action.attributes).map(key => {
+                        return [this.registry.getFormatter(key), action.attributes[key]];
+                    }) : []);
+                }
+                else {
+                    slot.insert(this.createComponentBySharedComponent(action.insert));
+                }
             }
-            else if (action.delete) {
-                slot.retain(slot.index);
-                slot.delete(action.delete);
+            else {
+                throw new Error('xxx');
             }
-        });
+        }
+        return slot;
     }
 }
 //# sourceMappingURL=remote-to-local.js.map

package/bundles/collab/remote-to-local.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-to-local.js","sourceRoot":"","sources":["../../src/collab/remote-to-local.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remote-to-local.js","sourceRoot":"","sources":["../../src/collab/remote-to-local.ts"],"names":[],"mappings":"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","sourcesContent":["import { Map as YMap, YArrayEvent, YEvent, YMapEvent, Text as YText, YTextEvent, Array as YArray } from 'yjs'\nimport { ComponentInstance, ComponentLiteral, Registry, Slot, Translator } from '@textbus/core'\n\ntype YPath = [number, string][]\n\nexport class RemoteToLocal {\n  constructor(private translator: Translator,\n              private registry: Registry) {\n  }\n\n  transform(events: YEvent[], slot: Slot) {\n    events.forEach(ev => {\n      const path: YPath = []\n\n      for (let i = 0; i < ev.path.length; i += 2) {\n        path.push(ev.path.slice(i, i + 2) as [number, string])\n      }\n\n      if (path.length) {\n        const componentIndex = path.shift()![0] as number\n        const component = slot.getContentAtIndex(componentIndex) as ComponentInstance\n        this.applySharedComponentToComponent(ev, path, component)\n        return\n      }\n\n      this.applySharedSlotToSlot(ev, path, slot)\n    })\n  }\n\n  private applySharedComponentToComponent(ev: YEvent, path: YPath, component: ComponentInstance) {\n    if (path.length) {\n      const childPath = path.shift()!\n      const slot = component.slots.get(childPath[0])!\n      this.applySharedSlotToSlot(ev, path, slot)\n      return\n    }\n    if (ev instanceof YMapEvent) {\n      ev.keysChanged.forEach(key => {\n        if (key === 'state') {\n          const state = (ev.target as YMap<any>).get('state')\n          component.updateState(draft => {\n            Object.assign(draft, state)\n          })\n        }\n      })\n    } else if (ev instanceof YArrayEvent) {\n      const slots = component.slots\n      ev.delta.forEach(action => {\n        if (Reflect.has(action, 'retain')) {\n          slots.retain(action.retain!)\n        } else if (action.insert) {\n          (action.insert as Array<any>).forEach(item => {\n            slots.insert(this.translator.createSlot(item.toJSON())!)\n          })\n        } else if (action.delete) {\n          slots.retain(slots.index)\n          slots.delete(action.delete)\n        }\n      })\n    }\n  }\n\n  private applySharedSlotToSlot(ev: YEvent, path: YPath, slot: Slot) {\n    if (path.length) {\n      path.shift()\n      const delta = (ev.target.parent as YText).toDelta()\n      let componentIndex = 0\n      for (let i = 0; i < delta.length; i++) {\n        const action = delta[i]\n        if (action.insert === ev.target) {\n          break\n        }\n        componentIndex += typeof action.insert === 'string' ? action.insert.length : 1\n      }\n      const component = slot.getContentAtIndex(componentIndex) as ComponentInstance\n      this.applySharedComponentToComponent(ev, path, component)\n      return\n    }\n\n    if (ev instanceof YTextEvent) {\n      slot.retain(0)\n      ev.delta.forEach(action => {\n        if (Reflect.has(action, 'retain')) {\n          if (action.attributes) {\n            slot.retain(action.retain!, Object.keys(action.attributes).map(key => {\n              return [this.registry.getFormatter(key)!, action.attributes![key]]\n            }))\n          }\n          slot.retain(action.retain!)\n        } else if (action.insert) {\n          if (typeof action.insert === 'string') {\n            slot.insert(action.insert, action.attributes ? Object.keys(action.attributes).map(key => {\n              return [this.registry.getFormatter(key)!, action.attributes![key]]\n            }) : [])\n          } else {\n            const component = this.createComponentBySharedComponent(action.insert as YMap<any>)\n            slot.insert(component)\n          }\n        } else if (action.delete) {\n          slot.retain(slot.index)\n          slot.delete(action.delete)\n        } else if (action.attributes) {\n          slot.updateState(draft => {\n            Object.assign(draft, action.attributes)\n          })\n        }\n      })\n    } else {\n      throw new Error('xxx')\n    }\n  }\n\n  private createComponentBySharedComponent(yMap: YMap<any>): ComponentInstance {\n    const slots = yMap.get('slots') as YArray<YMap<any>>\n    const componentLiteral: ComponentLiteral = {\n      state: yMap.get('state'),\n      name: yMap.get('name'),\n      slots: slots.map(sharedSlot => {\n        return this.createSlotBySharedSlot(sharedSlot).toJSON()\n      })\n    }\n    return this.translator.createComponent(componentLiteral)!\n  }\n\n  private createSlotBySharedSlot(sharedSlot: YMap<any>): Slot {\n    const content = sharedSlot.get('content') as YText\n    const delta = content.toDelta()\n\n    const slot = this.translator.createSlot({\n      schema: sharedSlot.get('schema'),\n      state: sharedSlot.get('state'),\n      formats: {},\n      content: []\n    })\n\n    for (const action of delta) {\n      if (action.insert) {\n        if (typeof action.insert === 'string') {\n          slot.insert(action.insert, action.attributes ? Object.keys(action.attributes).map(key => {\n            return [this.registry.getFormatter(key)!, action.attributes![key]]\n          }) : [])\n        } else {\n          slot.insert(this.createComponentBySharedComponent(action.insert))\n        }\n      } else {\n        throw new Error('xxx')\n      }\n    }\n    return slot\n  }\n}\n"]}

package/bundles/collaborate.d.ts

@@ -1,23 +1,39 @@
 import { Observable } from '@tanbo/stream';
-import { RootComponentRef, Starter, Translator, Registry, Selection, SelectionPaths } from '@textbus/core';
+import { RootComponentRef, Starter, Translator, Registry, Selection, SelectionPaths, History, Renderer } from '@textbus/core';
 import { Doc as YDoc } from 'yjs';
-import { CollaborateHistory, CollaborateCursor, RemoteSelection } from './collab/_api';
-export declare class Collaborate {
+import { CollaborateCursor, RemoteSelection } from './collab/_api';
+export declare class Collaborate implements History {
     private rootComponentRef;
     private collaborateCursor;
     private translator;
+    private renderer;
     private registry;
     private selection;
-    private collaborateHistory;
     private starter;
     onSelectionChange: Observable<SelectionPaths>;
     yDoc: YDoc;
+    onBack: Observable<void>;
+    onForward: Observable<void>;
+    onChange: Observable<any>;
+    onPush: Observable<void>;
+    get canBack(): boolean;
+    get canForward(): boolean;
+    private localToRemote;
+    private remoteToLocal;
+    private backEvent;
+    private forwardEvent;
+    private changeEvent;
+    private pushEvent;
+    private manager;
     private subscriptions;
     private updateFromSelf;
     private selectionChangeEvent;
-    constructor(rootComponentRef: RootComponentRef, collaborateCursor: CollaborateCursor, translator: Translator, registry: Registry, selection: Selection, collaborateHistory: CollaborateHistory, starter: Starter);
+    constructor(rootComponentRef: RootComponentRef, collaborateCursor: CollaborateCursor, translator: Translator, renderer: Renderer, registry: Registry, selection: Selection, starter: Starter);
     setup(): void;
     updateRemoteSelection(paths: RemoteSelection[]): void;
+    listen(): void;
+    back(): void;
+    forward(): void;
     destroy(): void;
-    private listen;
+    private listen2;
 }

package/bundles/collaborate.js

@@ -9,29 +9,168 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { Injectable } from '@tanbo/di';
 import { debounceTime, filter, Subject, tap } from '@tanbo/stream';
-import { RootComponentRef, Starter, Translator, Registry, Selection } from '@textbus/core';
-import { Doc as YDoc } from 'yjs';
-import { localToRemote } from './collab/local-to-remote';
-import { remoteToLocal } from './collab/remote-to-local';
-import { CollaborateHistory, CollaborateCursor } from './collab/_api';
+import { RootComponentRef, Starter, Translator, Registry, Selection, Renderer } from '@textbus/core';
+import { Doc as YDoc, UndoManager } from 'yjs';
+import { LocalToRemote } from './collab/local-to-remote';
+import { RemoteToLocal } from './collab/remote-to-local';
+import { CollaborateCursor } from './collab/_api';
 let Collaborate = class Collaborate {
-    constructor(rootComponentRef, collaborateCursor, translator, registry, selection, collaborateHistory, starter) {
-        this.rootComponentRef = rootComponentRef;
-        this.collaborateCursor = collaborateCursor;
-        this.translator = translator;
-        this.registry = registry;
-        this.selection = selection;
-        this.collaborateHistory = collaborateHistory;
-        this.starter = starter;
-        this.yDoc = new YDoc();
-        this.subscriptions = [];
-        this.updateFromSelf = true;
-        this.selectionChangeEvent = new Subject();
+    constructor(rootComponentRef, collaborateCursor, translator, renderer, registry, selection, starter) {
+        Object.defineProperty(this, "rootComponentRef", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: rootComponentRef
+        });
+        Object.defineProperty(this, "collaborateCursor", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: collaborateCursor
+        });
+        Object.defineProperty(this, "translator", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: translator
+        });
+        Object.defineProperty(this, "renderer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: renderer
+        });
+        Object.defineProperty(this, "registry", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: registry
+        });
+        Object.defineProperty(this, "selection", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: selection
+        });
+        Object.defineProperty(this, "starter", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: starter
+        });
+        Object.defineProperty(this, "onSelectionChange", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "yDoc", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new YDoc()
+        });
+        Object.defineProperty(this, "onBack", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "onForward", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "onChange", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "onPush", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "localToRemote", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new LocalToRemote()
+        });
+        Object.defineProperty(this, "remoteToLocal", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new RemoteToLocal(this.translator, this.registry)
+        });
+        Object.defineProperty(this, "backEvent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Subject()
+        });
+        Object.defineProperty(this, "forwardEvent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Subject()
+        });
+        Object.defineProperty(this, "changeEvent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Subject()
+        });
+        Object.defineProperty(this, "pushEvent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Subject()
+        });
+        Object.defineProperty(this, "manager", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "subscriptions", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "updateFromSelf", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: true
+        });
+        Object.defineProperty(this, "selectionChangeEvent", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Subject()
+        });
         this.onSelectionChange = this.selectionChangeEvent.asObservable();
+        this.onBack = this.backEvent.asObservable();
+        this.onForward = this.forwardEvent.asObservable();
+        this.onChange = this.changeEvent.asObservable();
+        this.onPush = this.pushEvent.asObservable();
+    }
+    get canBack() {
+        var _a;
+        return (_a = this.manager) === null || _a === void 0 ? void 0 : _a.canUndo();
+    }
+    get canForward() {
+        var _a;
+        return (_a = this.manager) === null || _a === void 0 ? void 0 : _a.canRedo();
     }
     setup() {
         this.subscriptions.push(this.starter.onReady.subscribe(() => {
-            this.listen();
+            this.listen2();
         }), this.selection.onChange.subscribe(() => {
             const paths = this.selection.getPaths();
             this.selectionChangeEvent.next(paths);
@@ -40,19 +179,34 @@ let Collaborate = class Collaborate {
     updateRemoteSelection(paths) {
         this.collaborateCursor.draw(paths);
     }
+    listen() {
+        //
+    }
+    back() {
+        if (this.canBack) {
+            this.manager.undo();
+        }
+    }
+    forward() {
+        if (this.canForward) {
+            this.manager.redo();
+        }
+    }
     destroy() {
         this.subscriptions.forEach(i => i.unsubscribe());
     }
-    listen() {
-        const root = this.yDoc.getArray('content');
+    listen2() {
+        const root = this.yDoc.getText('content');
         const slot = this.rootComponentRef.component.slots.get(0);
-        this.collaborateHistory.init(root);
+        this.manager = new UndoManager(root);
         root.observeDeep((events, transaction) => {
             if (transaction.origin === this.yDoc) {
                 return;
             }
             this.updateFromSelf = false;
-            remoteToLocal(events, slot, this.translator, this.registry);
+            this.remoteToLocal.transform(events, slot);
+            this.renderer.render();
+            this.selection.restore();
             this.updateFromSelf = true;
         });
         const operations = [];
@@ -63,10 +217,12 @@ let Collaborate = class Collaborate {
         }), debounceTime(1)).subscribe(() => {
             this.yDoc.transact(() => {
                 operations.forEach(operation => {
-                    localToRemote(operation, root);
+                    this.localToRemote.transform(operation, root);
                 });
                 operations.length = 0;
             }, this.yDoc);
+            this.renderer.render();
+            this.selection.restore();
         }));
     }
 };
@@ -75,9 +231,9 @@ Collaborate = __decorate([
     __metadata("design:paramtypes", [RootComponentRef,
         CollaborateCursor,
         Translator,
+        Renderer,
         Registry,
         Selection,
-        CollaborateHistory,
         Starter])
 ], Collaborate);
 export { Collaborate };

package/bundles/collaborate.js.map

@@ -1 +1 @@
-{"version":3,"file":"collaborate.js","sourceRoot":"","sources":["../src/collaborate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collaborate.js","sourceRoot":"","sources":["../src/collaborate.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@tanbo/di'\nimport { debounceTime, filter, Observable, Subject, Subscription, tap } from '@tanbo/stream'\nimport {\n  RootComponentRef,\n  Starter,\n  Operation,\n  Translator,\n  Registry,\n  Selection,\n  SelectionPaths,\n  History, Renderer\n} from '@textbus/core'\nimport { Doc as YDoc, UndoManager } from 'yjs'\nimport { LocalToRemote } from './collab/local-to-remote'\nimport { RemoteToLocal } from './collab/remote-to-local'\nimport { CollaborateCursor, RemoteSelection } from './collab/_api'\n\n@Injectable()\nexport class Collaborate implements History {\n  onSelectionChange: Observable<SelectionPaths>\n  yDoc = new YDoc()\n  onBack: Observable<void>\n  onForward: Observable<void>\n  onChange: Observable<any>\n  onPush: Observable<void>\n\n  get canBack() {\n    return this.manager?.canUndo()\n  }\n\n  get canForward() {\n    return this.manager?.canRedo()\n  }\n\n  private localToRemote = new LocalToRemote()\n  private remoteToLocal = new RemoteToLocal(this.translator, this.registry)\n\n  private backEvent = new Subject<void>()\n  private forwardEvent = new Subject<void>()\n  private changeEvent = new Subject<void>()\n  private pushEvent = new Subject<void>()\n\n  private manager!: UndoManager\n\n  private subscriptions: Subscription[] = []\n  private updateFromSelf = true\n\n  private selectionChangeEvent = new Subject<SelectionPaths>()\n\n  constructor(private rootComponentRef: RootComponentRef,\n              private collaborateCursor: CollaborateCursor,\n              private translator: Translator,\n              private renderer: Renderer,\n              private registry: Registry,\n              private selection: Selection,\n              private starter: Starter) {\n    this.onSelectionChange = this.selectionChangeEvent.asObservable()\n    this.onBack = this.backEvent.asObservable()\n    this.onForward = this.forwardEvent.asObservable()\n    this.onChange = this.changeEvent.asObservable()\n    this.onPush = this.pushEvent.asObservable()\n  }\n\n  setup() {\n    this.subscriptions.push(\n      this.starter.onReady.subscribe(() => {\n        this.listen2()\n      }),\n      this.selection.onChange.subscribe(() => {\n        const paths = this.selection.getPaths()\n        this.selectionChangeEvent.next(paths)\n      })\n    )\n  }\n\n  updateRemoteSelection(paths: RemoteSelection[]) {\n    this.collaborateCursor.draw(paths)\n  }\n\n  listen() {\n    //\n  }\n\n  back() {\n    if (this.canBack) {\n      this.manager.undo()\n    }\n  }\n\n  forward() {\n    if (this.canForward) {\n      this.manager.redo()\n    }\n  }\n\n  destroy() {\n    this.subscriptions.forEach(i => i.unsubscribe())\n  }\n\n  private listen2() {\n    const root = this.yDoc.getText('content')\n    const slot = this.rootComponentRef.component.slots.get(0)!\n    this.manager = new UndoManager(root)\n    root.observeDeep((events, transaction) => {\n      if (transaction.origin === this.yDoc) {\n        return\n      }\n      this.updateFromSelf = false\n\n      this.remoteToLocal.transform(events, slot)\n      this.renderer.render()\n      this.selection.restore()\n      this.updateFromSelf = true\n    })\n    const operations: Operation[] = []\n    this.subscriptions.push(\n      this.rootComponentRef.component.changeMarker.onChange.pipe(\n        filter(() => {\n          return this.updateFromSelf\n        }),\n        tap(op => {\n          operations.push(op)\n        }),\n        debounceTime(1)\n      ).subscribe(() => {\n        this.yDoc.transact(() => {\n          operations.forEach(operation => {\n            this.localToRemote.transform(operation, root)\n          })\n          operations.length = 0\n        }, this.yDoc)\n        this.renderer.render()\n        this.selection.restore()\n      })\n    )\n  }\n}\n"]}

package/bundles/public-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"public-api.js","sourceRoot":"","sources":["../src/public-api.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,eAAe,CAAA"}
+{"version":3,"file":"public-api.js","sourceRoot":"","sources":["../src/public-api.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,eAAe,CAAA","sourcesContent":["export * from './collab/_api'\nexport * from './collaborate'\n"]}