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

package/src/collab/remote-to-local.ts

@@ -0,0 +1,151 @@
+import { Map as YMap, YArrayEvent, YEvent, YMapEvent, Text as YText, YTextEvent, Array as YArray } from 'yjs'
+import { ComponentInstance, ComponentLiteral, Registry, Slot, Translator } from '@textbus/core'
+
+type YPath = [number, string][]
+
+export class RemoteToLocal {
+  constructor(private translator: Translator,
+              private registry: Registry) {
+  }
+
+  transform(events: YEvent[], slot: Slot) {
+    events.forEach(ev => {
+      const path: YPath = []
+
+      for (let i = 0; i < ev.path.length; i += 2) {
+        path.push(ev.path.slice(i, i + 2) as [number, string])
+      }
+
+      if (path.length) {
+        const componentIndex = path.shift()![0] as number
+        const component = slot.getContentAtIndex(componentIndex) as ComponentInstance
+        this.applySharedComponentToComponent(ev, path, component)
+        return
+      }
+
+      this.applySharedSlotToSlot(ev, path, slot)
+    })
+  }
+
+  private applySharedComponentToComponent(ev: YEvent, path: YPath, component: ComponentInstance) {
+    if (path.length) {
+      const childPath = path.shift()!
+      const slot = component.slots.get(childPath[0])!
+      this.applySharedSlotToSlot(ev, path, slot)
+      return
+    }
+    if (ev instanceof YMapEvent) {
+      ev.keysChanged.forEach(key => {
+        if (key === 'state') {
+          const state = (ev.target as YMap<any>).get('state')
+          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 as Array<any>).forEach(item => {
+            slots.insert(this.translator.createSlot(item.toJSON())!)
+          })
+        } else if (action.delete) {
+          slots.retain(slots.index)
+          slots.delete(action.delete)
+        }
+      })
+    }
+  }
+
+  private applySharedSlotToSlot(ev: YEvent, path: YPath, slot: Slot) {
+    if (path.length) {
+      path.shift()
+      const delta = (ev.target.parent as YText).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) as ComponentInstance
+      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 component = this.createComponentBySharedComponent(action.insert as YMap<any>)
+            slot.insert(component)
+          }
+        } 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')
+    }
+  }
+
+  private createComponentBySharedComponent(yMap: YMap<any>): ComponentInstance {
+    const slots = yMap.get('slots') as YArray<YMap<any>>
+    const componentLiteral: ComponentLiteral = {
+      state: yMap.get('state'),
+      name: yMap.get('name'),
+      slots: slots.map(sharedSlot => {
+        return this.createSlotBySharedSlot(sharedSlot).toJSON()
+      })
+    }
+    return this.translator.createComponent(componentLiteral)!
+  }
+
+  private createSlotBySharedSlot(sharedSlot: YMap<any>): Slot {
+    const content = sharedSlot.get('content') as YText
+    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 {
+        throw new Error('xxx')
+      }
+    }
+    return slot
+  }
+}

package/src/collaborate.ts

@@ -1,54 +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,
-  FormatterList
+  Registry,
+  Selection,
+  SelectionPaths,
+  History, Renderer
 } from '@textbus/core'
-import { Doc as YDoc } from 'yjs'
-import { localToRemote } from './local-to-remote'
-import { remoteToLocal } from './remote-to-local'
-
-// 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 formatterList: FormatterList,
+              private renderer: Renderer,
+              private registry: Registry,
+              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() {
     this.subscriptions.push(
       this.starter.onReady.subscribe(() => {
-        this.listen()
+        this.listen2()
+      }),
+      this.selection.onChange.subscribe(() => {
+        const paths = this.selection.getPaths()
+        this.selectionChangeEvent.next(paths)
       })
     )
   }
 
+  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.manager = new UndoManager(root)
     root.observeDeep((events, transaction) => {
       if (transaction.origin === this.yDoc) {
         return
       }
       this.updateFromSelf = false
 
-      remoteToLocal(events, slot, this.translator, this.formatterList)
-
+      this.remoteToLocal.transform(events, slot)
+      this.renderer.render()
+      this.selection.restore()
       this.updateFromSelf = true
     })
     const operations: Operation[] = []
@@ -64,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/src/public-api.ts

@@ -1 +1,2 @@
+export * from './collab/_api'
 export * from './collaborate'

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/local-to-remote.d.ts

@@ -1,3 +0,0 @@
-import { Operation } from '@textbus/core';
-import { Array as YArray } from 'yjs';
-export declare function localToRemote(operation: Operation, root: YArray<any>): void;

package/bundles/local-to-remote.js

@@ -1,173 +0,0 @@
-import { Format } from '@textbus/core';
-import { Array as YArray, Map as YMap } from 'yjs';
-export function localToRemote(operation, root) {
-    const path = [...operation.path];
-    path.shift();
-    if (path.length) {
-        const componentIndex = path.shift();
-        applyComponentOperationToSharedComponent(path, operation.apply, root.get(componentIndex));
-        return;
-    }
-    insertContent(root, operation.apply);
-}
-function applyComponentOperationToSharedComponent(path, actions, componentYMap) {
-    const sharedSlots = componentYMap.get('slots');
-    if (path.length) {
-        const slotIndex = path.shift();
-        const sharedSlot = sharedSlots.get(slotIndex);
-        applySlotOperationToSharedSlot(path, actions, sharedSlot);
-        return;
-    }
-    let index;
-    actions.forEach(action => {
-        switch (action.type) {
-            case 'retain':
-                index = action.index;
-                break;
-            case 'insertSlot':
-                sharedSlots.insert(index, [makeSharedSlotBySlotLiteral(action.slot)]);
-                break;
-            case 'apply':
-                componentYMap.set('state', action.value);
-                break;
-            case 'delete':
-                sharedSlots.delete(index, action.count);
-                break;
-        }
-    });
-}
-function applySlotOperationToSharedSlot(path, actions, slotYMap) {
-    if (path.length) {
-        const componentIndex = path.shift();
-        const sharedContent = slotYMap.get('content');
-        const sharedComponent = sharedContent.get(componentIndex);
-        applyComponentOperationToSharedComponent(path, actions, sharedComponent);
-        return;
-    }
-    const content = slotYMap.get('content');
-    let index;
-    let len;
-    actions.forEach(action => {
-        switch (action.type) {
-            case 'retain':
-                if (action.formats) {
-                    mergeSharedFormats(index, action.index, action.formats, slotYMap);
-                }
-                index = action.index;
-                break;
-            case 'insert':
-                if (typeof action.content === 'string') {
-                    len = action.content.length;
-                    content.insert(index, action.content.split(''));
-                }
-                else {
-                    len = 1;
-                    content.insert(index, [makeSharedComponentByComponentLiteral(action.content)]);
-                }
-                if (action.formats) {
-                    insertSharedFormats(index, len, action.formats, slotYMap);
-                }
-                break;
-            case 'delete':
-                if (content.length === 0) {
-                    // 当内容为空时，slot 实例内容为 ['\n']，触发删除会导致长度溢出
-                    return;
-                }
-                content.delete(index, action.count);
-                break;
-            case 'apply':
-                slotYMap.set('state', action.value);
-                break;
-        }
-    });
-}
-function insertSharedFormats(index, distance, formats, sharedSlots) {
-    const sharedFormats = sharedSlots.get('formats');
-    const keys = Array.from(sharedFormats.keys());
-    const expandedValues = Array.from({ length: distance });
-    keys.forEach(key => {
-        const formatRanges = sharedFormats.get(key);
-        const values = Format.tileRanges(formatRanges);
-        values.splice(index, 0, ...expandedValues);
-        const newRanges = Format.toRanges(values);
-        sharedFormats.set(key, newRanges);
-    });
-    mergeSharedFormats(index, index + distance, formats, sharedSlots);
-}
-function mergeSharedFormats(startIndex, endIndex, formats, sharedSlots) {
-    const sharedFormats = sharedSlots.get('formats');
-    Object.keys(formats).forEach(key => {
-        if (!sharedFormats.has(key)) {
-            sharedFormats.set(key, [{
-                    startIndex,
-                    endIndex,
-                    value: formats[key]
-                }]);
-        }
-        const oldFormatRanges = sharedFormats.get(key);
-        const formatRanges = Format.normalizeFormatRange(oldFormatRanges, {
-            startIndex,
-            endIndex,
-            value: formats[key]
-        });
-        sharedFormats.set(key, formatRanges);
-    });
-}
-function insertContent(content, actions) {
-    let index;
-    actions.forEach(action => {
-        switch (action.type) {
-            case 'retain':
-                index = action.index;
-                break;
-            case 'insert':
-                content.insert(index, [
-                    typeof action.content === 'string' ?
-                        action.content :
-                        makeSharedComponentByComponentLiteral(action.content)
-                ]);
-                if (action.formats) {
-                    // TODO 根节点样式
-                }
-                break;
-            case 'delete':
-                content.delete(index, action.count);
-                break;
-        }
-    });
-}
-function makeSharedSlotBySlotLiteral(slotLiteral) {
-    const content = new YArray();
-    let index = 0;
-    slotLiteral.content.forEach(i => {
-        let size;
-        if (typeof i === 'string') {
-            size = i.length;
-            content.insert(index, [i]);
-        }
-        else {
-            size = 1;
-            content.insert(index, [makeSharedComponentByComponentLiteral(i)]);
-        }
-        index += size;
-    });
-    const formats = new YMap();
-    const sharedSlot = new YMap();
-    sharedSlot.set('state', slotLiteral.state);
-    sharedSlot.set('content', content);
-    sharedSlot.set('schema', slotLiteral.schema);
-    sharedSlot.set('formats', formats);
-    return sharedSlot;
-}
-function makeSharedComponentByComponentLiteral(componentLiteral) {
-    const slots = new YArray();
-    componentLiteral.slots.forEach(item => {
-        slots.push([makeSharedSlotBySlotLiteral(item)]);
-    });
-    const sharedComponent = new YMap();
-    sharedComponent.set('name', componentLiteral.name);
-    sharedComponent.set('slots', slots);
-    sharedComponent.set('state', componentLiteral.state);
-    return sharedComponent;
-}
-//# sourceMappingURL=local-to-remote.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"local-to-remote.js","sourceRoot":"","sources":["../src/local-to-remote.ts"],"names":[],"mappings":"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"}

package/bundles/remote-to-local.d.ts

@@ -1,3 +0,0 @@
-import { YEvent } from 'yjs';
-import { FormatterList, Slot, Translator } from '@textbus/core';
-export declare function remoteToLocal(events: YEvent[], slot: Slot, translator: Translator, formatterList: FormatterList): void;

package/bundles/remote-to-local.js

@@ -1,143 +0,0 @@
-import { YArrayEvent, YMapEvent } from 'yjs';
-import { FormatType } from '@textbus/core';
-export function remoteToLocal(events, slot, translator, formatterList) {
-    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, formatterList);
-            return;
-        }
-        apply(ev, slot, translator);
-    });
-}
-function applySharedComponentToComponent(ev, path, component, translator, formatterList) {
-    if (path.length) {
-        const childPath = path.shift();
-        const slot = component.slots.get(childPath[0]);
-        applySharedSlotToSlot(ev, path, slot, translator, formatterList, 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);
-                });
-            }
-        });
-    }
-    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);
-            }
-        });
-    }
-}
-function applySharedSlotToSlot(ev, path, slot, translator, formatterList, isUpdateFormats) {
-    if (path.length) {
-        const componentIndex = path.shift()[0];
-        const component = slot.getContentAtIndex(componentIndex);
-        applySharedComponentToComponent(ev, path, component, translator, formatterList);
-        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()));
-                    }
-                });
-            }
-            else if (action.delete) {
-                slot.retain(slot.index);
-                slot.delete(action.delete);
-            }
-        });
-    }
-    else if (ev instanceof YMapEvent) {
-        if (isUpdateFormats) {
-            const json = ev.target.toJSON();
-            ev.keysChanged.forEach(key => {
-                const formats = json[key];
-                const formatter = formatterList.get(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);
-                    }
-                });
-            });
-        }
-        else {
-            ev.keysChanged.forEach(key => {
-                if (key === 'state') {
-                    const state = ev.target.get('state');
-                    slot.updateState(draft => {
-                        Object.assign(draft, state);
-                    });
-                }
-            });
-        }
-    }
-}
-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);
-                    }
-                    else {
-                        const json = item.toJSON();
-                        const component = translator.createComponent(json);
-                        slot.insert(component);
-                    }
-                });
-            }
-            else if (action.retain) {
-                slot.retain(action.retain);
-            }
-            else if (action.delete) {
-                slot.retain(slot.index);
-                slot.delete(action.delete);
-            }
-        });
-    }
-}
-//# sourceMappingURL=remote-to-local.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"remote-to-local.js","sourceRoot":"","sources":["../src/remote-to-local.ts"],"names":[],"mappings":"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"}