@textbus/collaborate 2.0.0-alpha.37 → 2.0.0-alpha.40

package/src/collaborate.ts

@@ -1,67 +1,115 @@
 import { Injectable } from '@tanbo/di'
-import { debounceTime, filter, Subscription, tap } from '@tanbo/stream'
+import { debounceTime, filter, Observable, Subject, Subscription, tap } from '@tanbo/stream'
 import {
   RootComponentRef,
   Starter,
   Operation,
   Translator,
-  Registry
+  Registry,
+  Selection,
+  SelectionPaths,
+  History, Renderer
 } from '@textbus/core'
-import { Doc as YDoc } from 'yjs'
-import { Awareness } from 'y-protocols/awareness'
-import { localToRemote } from './collab/local-to-remote'
-import { remoteToLocal } from './collab/remote-to-local'
-import { CollaborateHistory } from './collab/_api'
-
-// const collaborateErrorFn = makeError('Collaborate')
+import { Doc as YDoc, UndoManager } from 'yjs'
+import { LocalToRemote } from './collab/local-to-remote'
+import { RemoteToLocal } from './collab/remote-to-local'
+import { CollaborateCursor, RemoteSelection } from './collab/_api'
 
 @Injectable()
-export class Collaborate {
+export class Collaborate implements History {
+  onSelectionChange: Observable<SelectionPaths>
   yDoc = new YDoc()
+  onBack: Observable<void>
+  onForward: Observable<void>
+  onChange: Observable<any>
+  onPush: Observable<void>
+
+  get canBack() {
+    return this.manager?.canUndo()
+  }
+
+  get canForward() {
+    return this.manager?.canRedo()
+  }
+
+  private localToRemote = new LocalToRemote()
+  private remoteToLocal = new RemoteToLocal(this.translator, this.registry)
+
+  private backEvent = new Subject<void>()
+  private forwardEvent = new Subject<void>()
+  private changeEvent = new Subject<void>()
+  private pushEvent = new Subject<void>()
+
+  private manager!: UndoManager
 
   private subscriptions: Subscription[] = []
   private updateFromSelf = true
 
+  private selectionChangeEvent = new Subject<SelectionPaths>()
+
   constructor(private rootComponentRef: RootComponentRef,
+              private collaborateCursor: CollaborateCursor,
               private translator: Translator,
+              private renderer: Renderer,
               private registry: Registry,
-              private collaborateHistory: CollaborateHistory,
+              private selection: Selection,
               private starter: Starter) {
+    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()
   }
 
-  setup(awareness: Awareness) {
+  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)
       })
     )
-    awareness.on('update', () => {
-      const users: any[] = []
-      awareness.getStates().forEach(state => {
-        if (state.user) {
-          users.push(state.user)
-        }
-      })
-      console.log(users)
-    })
+  }
+
+  updateRemoteSelection(paths: RemoteSelection[]) {
+    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())
   }
 
-  private listen() {
-    const root = this.yDoc.getArray('content')
+  private 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: Operation[] = []
@@ -77,10 +125,12 @@ export class Collaborate {
       ).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()
       })
     )
   }

package/tsconfig-build.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "declaration": true,
+    "useDefineForClassFields": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
@@ -10,6 +11,7 @@
     "module": "es2020",
     "moduleResolution": "node",
     "sourceMap": true,
+    "inlineSources": true,
     "noImplicitAny": false,
     "suppressImplicitAnyIndexErrors": true,
     "outDir": "bundles/",

package/bundles/collab/collaborate-history.d.ts

@@ -1,22 +0,0 @@
-import { History } from '@textbus/core';
-import { Observable } from '@tanbo/stream';
-import { Array as YArray } from 'yjs';
-export declare class CollaborateHistory implements History {
-    onBack: Observable<void>;
-    onForward: Observable<void>;
-    onChange: Observable<any>;
-    onPush: Observable<void>;
-    get canBack(): boolean;
-    get canForward(): boolean;
-    private backEvent;
-    private forwardEvent;
-    private changeEvent;
-    private pushEvent;
-    private manager;
-    constructor();
-    init(yArray: YArray<any>): void;
-    listen(): void;
-    back(): void;
-    forward(): void;
-    destroy(): void;
-}

package/bundles/collab/collaborate-history.js

@@ -1,53 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { Injectable } from '@tanbo/di';
-import { Subject } from '@tanbo/stream';
-import { UndoManager } from 'yjs';
-let CollaborateHistory = class CollaborateHistory {
-    constructor() {
-        this.backEvent = new Subject();
-        this.forwardEvent = new Subject();
-        this.changeEvent = new Subject();
-        this.pushEvent = new Subject();
-        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();
-    }
-    init(yArray) {
-        this.manager = new UndoManager(yArray);
-    }
-    listen() {
-        //
-    }
-    back() {
-        //
-    }
-    forward() {
-        //
-    }
-    destroy() {
-        //
-    }
-};
-CollaborateHistory = __decorate([
-    Injectable(),
-    __metadata("design:paramtypes", [])
-], CollaborateHistory);
-export { CollaborateHistory };
-//# sourceMappingURL=collaborate-history.js.map

package/bundles/collab/collaborate-history.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"collaborate-history.js","sourceRoot":"","sources":["../../src/collab/collaborate-history.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,OAAO,EAAc,OAAO,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,WAAW,EAAmB,MAAM,KAAK,CAAA;AAGlD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAsB7B;QAPQ,cAAS,GAAG,IAAI,OAAO,EAAQ,CAAA;QAC/B,iBAAY,GAAG,IAAI,OAAO,EAAQ,CAAA;QAClC,gBAAW,GAAG,IAAI,OAAO,EAAQ,CAAA;QACjC,cAAS,GAAG,IAAI,OAAO,EAAQ,CAAA;QAKrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAA;QAC3C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAA;QACjD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAA;QAC/C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAA;IAC7C,CAAC;IArBD,IAAI,OAAO;;QACT,OAAO,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,EAAE,CAAA;IAChC,CAAC;IAED,IAAI,UAAU;;QACZ,OAAO,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,EAAE,CAAA;IAChC,CAAC;IAiBD,IAAI,CAAC,MAAmB;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;IAED,MAAM;QACJ,EAAE;IACJ,CAAC;IAED,IAAI;QACF,EAAE;IACJ,CAAC;IAED,OAAO;QACL,EAAE;IACJ,CAAC;IAED,OAAO;QACL,EAAE;IACJ,CAAC;CACF,CAAA;AAhDY,kBAAkB;IAD9B,UAAU,EAAE;;GACA,kBAAkB,CAgD9B;SAhDY,kBAAkB"}

package/src/collab/collaborate-history.ts

@@ -1,55 +0,0 @@
-import { Injectable } from '@tanbo/di'
-import { History } from '@textbus/core'
-import { Observable, Subject } from '@tanbo/stream'
-import { UndoManager, Array as YArray } from 'yjs'
-
-@Injectable()
-export class CollaborateHistory implements History {
-  onBack: Observable<void>
-  onForward: Observable<void>
-  onChange: Observable<any>
-  onPush: Observable<void>
-
-  get canBack() {
-    return this.manager?.canUndo()
-  }
-
-  get canForward() {
-    return this.manager?.canRedo()
-  }
-
-
-  private backEvent = new Subject<void>()
-  private forwardEvent = new Subject<void>()
-  private changeEvent = new Subject<void>()
-  private pushEvent = new Subject<void>()
-
-  private manager!: UndoManager
-
-  constructor() {
-    this.onBack = this.backEvent.asObservable()
-    this.onForward = this.forwardEvent.asObservable()
-    this.onChange = this.changeEvent.asObservable()
-    this.onPush = this.pushEvent.asObservable()
-  }
-
-  init(yArray: YArray<any>) {
-    this.manager = new UndoManager(yArray)
-  }
-
-  listen() {
-    //
-  }
-
-  back() {
-    //
-  }
-
-  forward() {
-    //
-  }
-
-  destroy() {
-    //
-  }
-}