@textbus/collaborate 4.0.0-alpha.26 → 4.0.0-alpha.28

package/bundles/index.esm.js

@@ -1,7 +1,7 @@
 import { Injectable, Inject, Optional } from '@viewfly/core';
 import { Subject, map, filter } from '@tanbo/stream';
-import { makeError, HISTORY_STACK_SIZE, ChangeOrigin, MapModel, ArrayModel, Slot, RootComponentRef, Scheduler, Registry, Selection, History } from '@textbus/core';
-import { Doc, UndoManager, Map, Array, Text, createAbsolutePositionFromRelativePosition, createRelativePositionFromTypeIndex } from 'yjs';
+import { makeError, HISTORY_STACK_SIZE, ChangeOrigin, createObjectProxy, createArrayProxy, Slot, RootComponentRef, Scheduler, Registry, Selection, History } from '@textbus/core';
+import { Doc, UndoManager, Map, Array as Array$1, Text, createAbsolutePositionFromRelativePosition, createRelativePositionFromTypeIndex } from 'yjs';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -269,25 +269,23 @@ let Collaborate = class Collaborate {
     }
     syncSharedMapToLocalMap(sharedMap, localMap, parent) {
         sharedMap.forEach((value, key) => {
-            localMap.set(key, this.createLocalModelBySharedByModel(value, parent));
+            localMap[key] = this.createLocalModelBySharedByModel(value, parent);
         });
         this.syncObject(sharedMap, localMap, parent);
     }
     createLocalMapBySharedMap(sharedMap, parent) {
-        const localMap = new MapModel(parent);
+        const localMap = createObjectProxy({}, parent);
         this.syncSharedMapToLocalMap(sharedMap, localMap, parent);
         return localMap;
     }
     createLocalArrayBySharedArray(sharedArray, parent) {
-        const localArray = new ArrayModel(parent);
-        sharedArray.forEach(item => {
-            localArray.insert(this.createLocalModelBySharedByModel(item, parent));
-        });
+        const localArray = createArrayProxy([], parent);
+        localArray.push(...sharedArray.map(item => this.createLocalModelBySharedByModel(item, parent)));
         this.syncArray(sharedArray, localArray, parent);
         return localArray;
     }
     syncLocalMapToSharedMap(localMap, sharedMap, parent) {
-        localMap.forEach((value, key) => {
+        Object.entries(localMap).forEach(([key, value]) => {
             sharedMap.set(key, this.createSharedModelByLocalModel(value, parent));
         });
         this.syncObject(sharedMap, localMap, parent);
@@ -298,7 +296,7 @@ let Collaborate = class Collaborate {
         return sharedMap;
     }
     createSharedArrayByLocalArray(localArray, parent) {
-        const sharedArray = new Array();
+        const sharedArray = new Array$1();
         localArray.forEach(value => {
             sharedArray.push([this.createSharedModelByLocalModel(value, parent)]);
         });
@@ -363,37 +361,29 @@ let Collaborate = class Collaborate {
         this.syncSlot(sharedSlot, localSlot);
         return localSlot;
     }
-    // private createSharedModelByLocalModel(sharedModel: YMap<any>, parent: Component<any>): MapModel<any>
-    // private createSharedModelByLocalModel(sharedModel: YArray<any>, parent: Component<any>): ArrayModel<any>
-    // private createSharedModelByLocalModel(sharedModel: YText, parent: Component<any>): Slot
-    // private createSharedModelByLocalModel(sharedModel: any, parent: Component<any>): any
-    createSharedModelByLocalModel(sharedModel, parent) {
-        if (sharedModel instanceof MapModel) {
-            return this.createSharedMapByLocalMap(sharedModel, parent);
+    createSharedModelByLocalModel(localModel, parent) {
+        if (localModel instanceof Slot) {
+            return this.createSharedSlotByLocalSlot(localModel);
         }
-        if (sharedModel instanceof ArrayModel) {
-            return this.createSharedArrayByLocalArray(sharedModel, parent);
+        if (Array.isArray(localModel)) {
+            return this.createSharedArrayByLocalArray(localModel, parent);
         }
-        if (sharedModel instanceof Slot) {
-            return this.createSharedSlotByLocalSlot(sharedModel);
+        if (typeof localModel === 'object' && localModel !== null) {
+            return this.createSharedMapByLocalMap(localModel, parent);
         }
-        return sharedModel;
+        return localModel;
     }
-    // private createLocalModelBySharedByModel(localModel: MapModel<any>, parent: Component<any>): MapModel<any>
-    // private createLocalModelBySharedByModel(localModel: ArrayModel<any>, parent: Component<any>): YArray<any>
-    // private createLocalModelBySharedByModel(localModel: Slot, parent: Component<any>): YText
-    // private createLocalModelBySharedByModel(localModel: any, parent: Component<any>): any
-    createLocalModelBySharedByModel(localModel, parent) {
-        if (localModel instanceof Map) {
-            return this.createLocalMapBySharedMap(localModel, parent);
+    createLocalModelBySharedByModel(sharedModel, parent) {
+        if (sharedModel instanceof Map) {
+            return this.createLocalMapBySharedMap(sharedModel, parent);
         }
-        if (localModel instanceof Array) {
-            return this.createLocalArrayBySharedArray(localModel, parent);
+        if (sharedModel instanceof Array$1) {
+            return this.createLocalArrayBySharedArray(sharedModel, parent);
         }
-        if (localModel instanceof Text) {
-            return this.createLocalSlotBySharedSlot(localModel);
+        if (sharedModel instanceof Text) {
+            return this.createLocalSlotBySharedSlot(sharedModel);
         }
-        return localModel;
+        return sharedModel;
     }
     getAbstractSelection(position) {
         const anchorPosition = createAbsolutePositionFromRelativePosition(position.anchor, this.yDoc);
@@ -567,7 +557,7 @@ let Collaborate = class Collaborate {
             });
         });
         this.slotMap.set(localSlot, sharedSlot);
-        localSlot.destroyCallbacks.push(() => {
+        localSlot.changeMarker.destroyCallbacks.push(() => {
             this.slotMap.delete(localSlot);
             sharedSlot.unobserve(syncRemote);
             sub.unsubscribe();
@@ -599,23 +589,29 @@ let Collaborate = class Collaborate {
      * @private
      */
     syncArray(sharedArray, localArray, parent) {
-        const sub = localArray.changeMarker.onChange.subscribe((op) => {
+        const sub = localArray.__changeMarker__.onSelfChange.subscribe((actions) => {
             this.runLocalUpdate(() => {
                 let index = 0;
-                for (const action of op.apply) {
+                for (const action of actions) {
                     switch (action.type) {
                         case 'retain':
                             index = action.offset;
                             break;
                         case 'insert':
                             {
-                                const data = this.createSharedModelByLocalModel(action.ref, parent);
+                                const data = action.ref.map(item => {
+                                    return this.createSharedModelByLocalModel(item, parent);
+                                });
                                 sharedArray.insert(index, [data]);
                             }
                             break;
                         case 'delete':
                             sharedArray.delete(index, 1);
                             break;
+                        case 'setIndex':
+                            sharedArray.delete(action.index, 1);
+                            sharedArray.insert(action.index, this.createSharedModelByLocalModel(action.ref, parent));
+                            break;
                     }
                 }
             });
@@ -623,28 +619,25 @@ let Collaborate = class Collaborate {
         const syncRemote = (ev, tr) => {
             this.runRemoteUpdate(tr, () => {
                 let index = 0;
-                localArray.retain(index);
                 ev.delta.forEach((action) => {
                     if (Reflect.has(action, 'retain')) {
                         index += action.retain;
-                        localArray.retain(index);
                     }
                     else if (action.insert) {
-                        action.insert.forEach((item) => {
-                            const value = this.createLocalModelBySharedByModel(item, parent);
-                            localArray.insert(value);
-                            index++;
+                        const data = action.insert.map((item) => {
+                            return this.createLocalModelBySharedByModel(item, parent);
                         });
+                        localArray.splice(index, 0, ...data);
+                        index += data.length;
                     }
                     else if (action.delete) {
-                        localArray.retain(index);
-                        localArray.delete(action.delete);
+                        localArray.splice(index, action.delete);
                     }
                 });
             });
         };
         sharedArray.observe(syncRemote);
-        localArray.destroyCallbacks.push(() => {
+        localArray.__changeMarker__.destroyCallbacks.push(() => {
             sub.unsubscribe();
             sharedArray.unobserve(syncRemote);
         });
@@ -662,18 +655,18 @@ let Collaborate = class Collaborate {
                 ev.changes.keys.forEach((item, key) => {
                     if (item.action === 'add' || item.action === 'update') {
                         const value = sharedObject.get(key);
-                        localObject.set(key, this.createLocalModelBySharedByModel(value, parent));
+                        localObject[key] = this.createLocalModelBySharedByModel(value, parent);
                     }
                     else {
-                        localObject.remove(key);
+                        Reflect.deleteProperty(localObject, key);
                     }
                 });
             });
         };
         sharedObject.observe(syncRemote);
-        const sub = localObject.changeMarker.onChange.subscribe((op) => {
+        const sub = localObject.__changeMarker__.onSelfChange.subscribe((actions) => {
             this.runLocalUpdate(() => {
-                for (const action of op.apply) {
+                for (const action of actions) {
                     switch (action.type) {
                         case 'propSet':
                             sharedObject.set(action.key, this.createSharedModelByLocalModel(action.value, parent));

package/bundles/index.js

@@ -271,25 +271,23 @@ exports.Collaborate = class Collaborate {
     }
     syncSharedMapToLocalMap(sharedMap, localMap, parent) {
         sharedMap.forEach((value, key) => {
-            localMap.set(key, this.createLocalModelBySharedByModel(value, parent));
+            localMap[key] = this.createLocalModelBySharedByModel(value, parent);
         });
         this.syncObject(sharedMap, localMap, parent);
     }
     createLocalMapBySharedMap(sharedMap, parent) {
-        const localMap = new core.MapModel(parent);
+        const localMap = core.createObjectProxy({}, parent);
         this.syncSharedMapToLocalMap(sharedMap, localMap, parent);
         return localMap;
     }
     createLocalArrayBySharedArray(sharedArray, parent) {
-        const localArray = new core.ArrayModel(parent);
-        sharedArray.forEach(item => {
-            localArray.insert(this.createLocalModelBySharedByModel(item, parent));
-        });
+        const localArray = core.createArrayProxy([], parent);
+        localArray.push(...sharedArray.map(item => this.createLocalModelBySharedByModel(item, parent)));
         this.syncArray(sharedArray, localArray, parent);
         return localArray;
     }
     syncLocalMapToSharedMap(localMap, sharedMap, parent) {
-        localMap.forEach((value, key) => {
+        Object.entries(localMap).forEach(([key, value]) => {
             sharedMap.set(key, this.createSharedModelByLocalModel(value, parent));
         });
         this.syncObject(sharedMap, localMap, parent);
@@ -365,37 +363,29 @@ exports.Collaborate = class Collaborate {
         this.syncSlot(sharedSlot, localSlot);
         return localSlot;
     }
-    // private createSharedModelByLocalModel(sharedModel: YMap<any>, parent: Component<any>): MapModel<any>
-    // private createSharedModelByLocalModel(sharedModel: YArray<any>, parent: Component<any>): ArrayModel<any>
-    // private createSharedModelByLocalModel(sharedModel: YText, parent: Component<any>): Slot
-    // private createSharedModelByLocalModel(sharedModel: any, parent: Component<any>): any
-    createSharedModelByLocalModel(sharedModel, parent) {
-        if (sharedModel instanceof core.MapModel) {
-            return this.createSharedMapByLocalMap(sharedModel, parent);
+    createSharedModelByLocalModel(localModel, parent) {
+        if (localModel instanceof core.Slot) {
+            return this.createSharedSlotByLocalSlot(localModel);
         }
-        if (sharedModel instanceof core.ArrayModel) {
-            return this.createSharedArrayByLocalArray(sharedModel, parent);
+        if (Array.isArray(localModel)) {
+            return this.createSharedArrayByLocalArray(localModel, parent);
         }
-        if (sharedModel instanceof core.Slot) {
-            return this.createSharedSlotByLocalSlot(sharedModel);
+        if (typeof localModel === 'object' && localModel !== null) {
+            return this.createSharedMapByLocalMap(localModel, parent);
         }
-        return sharedModel;
+        return localModel;
     }
-    // private createLocalModelBySharedByModel(localModel: MapModel<any>, parent: Component<any>): MapModel<any>
-    // private createLocalModelBySharedByModel(localModel: ArrayModel<any>, parent: Component<any>): YArray<any>
-    // private createLocalModelBySharedByModel(localModel: Slot, parent: Component<any>): YText
-    // private createLocalModelBySharedByModel(localModel: any, parent: Component<any>): any
-    createLocalModelBySharedByModel(localModel, parent) {
-        if (localModel instanceof yjs.Map) {
-            return this.createLocalMapBySharedMap(localModel, parent);
+    createLocalModelBySharedByModel(sharedModel, parent) {
+        if (sharedModel instanceof yjs.Map) {
+            return this.createLocalMapBySharedMap(sharedModel, parent);
         }
-        if (localModel instanceof yjs.Array) {
-            return this.createLocalArrayBySharedArray(localModel, parent);
+        if (sharedModel instanceof yjs.Array) {
+            return this.createLocalArrayBySharedArray(sharedModel, parent);
         }
-        if (localModel instanceof yjs.Text) {
-            return this.createLocalSlotBySharedSlot(localModel);
+        if (sharedModel instanceof yjs.Text) {
+            return this.createLocalSlotBySharedSlot(sharedModel);
         }
-        return localModel;
+        return sharedModel;
     }
     getAbstractSelection(position) {
         const anchorPosition = yjs.createAbsolutePositionFromRelativePosition(position.anchor, this.yDoc);
@@ -569,7 +559,7 @@ exports.Collaborate = class Collaborate {
             });
         });
         this.slotMap.set(localSlot, sharedSlot);
-        localSlot.destroyCallbacks.push(() => {
+        localSlot.changeMarker.destroyCallbacks.push(() => {
             this.slotMap.delete(localSlot);
             sharedSlot.unobserve(syncRemote);
             sub.unsubscribe();
@@ -601,23 +591,29 @@ exports.Collaborate = class Collaborate {
      * @private
      */
     syncArray(sharedArray, localArray, parent) {
-        const sub = localArray.changeMarker.onChange.subscribe((op) => {
+        const sub = localArray.__changeMarker__.onSelfChange.subscribe((actions) => {
             this.runLocalUpdate(() => {
                 let index = 0;
-                for (const action of op.apply) {
+                for (const action of actions) {
                     switch (action.type) {
                         case 'retain':
                             index = action.offset;
                             break;
                         case 'insert':
                             {
-                                const data = this.createSharedModelByLocalModel(action.ref, parent);
+                                const data = action.ref.map(item => {
+                                    return this.createSharedModelByLocalModel(item, parent);
+                                });
                                 sharedArray.insert(index, [data]);
                             }
                             break;
                         case 'delete':
                             sharedArray.delete(index, 1);
                             break;
+                        case 'setIndex':
+                            sharedArray.delete(action.index, 1);
+                            sharedArray.insert(action.index, this.createSharedModelByLocalModel(action.ref, parent));
+                            break;
                     }
                 }
             });
@@ -625,28 +621,25 @@ exports.Collaborate = class Collaborate {
         const syncRemote = (ev, tr) => {
             this.runRemoteUpdate(tr, () => {
                 let index = 0;
-                localArray.retain(index);
                 ev.delta.forEach((action) => {
                     if (Reflect.has(action, 'retain')) {
                         index += action.retain;
-                        localArray.retain(index);
                     }
                     else if (action.insert) {
-                        action.insert.forEach((item) => {
-                            const value = this.createLocalModelBySharedByModel(item, parent);
-                            localArray.insert(value);
-                            index++;
+                        const data = action.insert.map((item) => {
+                            return this.createLocalModelBySharedByModel(item, parent);
                         });
+                        localArray.splice(index, 0, ...data);
+                        index += data.length;
                     }
                     else if (action.delete) {
-                        localArray.retain(index);
-                        localArray.delete(action.delete);
+                        localArray.splice(index, action.delete);
                     }
                 });
             });
         };
         sharedArray.observe(syncRemote);
-        localArray.destroyCallbacks.push(() => {
+        localArray.__changeMarker__.destroyCallbacks.push(() => {
             sub.unsubscribe();
             sharedArray.unobserve(syncRemote);
         });
@@ -664,18 +657,18 @@ exports.Collaborate = class Collaborate {
                 ev.changes.keys.forEach((item, key) => {
                     if (item.action === 'add' || item.action === 'update') {
                         const value = sharedObject.get(key);
-                        localObject.set(key, this.createLocalModelBySharedByModel(value, parent));
+                        localObject[key] = this.createLocalModelBySharedByModel(value, parent);
                     }
                     else {
-                        localObject.remove(key);
+                        Reflect.deleteProperty(localObject, key);
                     }
                 });
             });
         };
         sharedObject.observe(syncRemote);
-        const sub = localObject.changeMarker.onChange.subscribe((op) => {
+        const sub = localObject.__changeMarker__.onSelfChange.subscribe((actions) => {
             this.runLocalUpdate(() => {
-                for (const action of op.apply) {
+                for (const action of actions) {
                     switch (action.type) {
                         case 'propSet':
                             sharedObject.set(action.key, this.createSharedModelByLocalModel(action.value, parent));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/collaborate",
-  "version": "4.0.0-alpha.26",
+  "version": "4.0.0-alpha.28",
   "description": "Textbus is a rich text editor and framework that is highly customizable and extensible to achieve rich wysiwyg effects.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -26,7 +26,7 @@
   ],
   "dependencies": {
     "@tanbo/stream": "^1.2.3",
-    "@textbus/core": "^4.0.0-alpha.26",
+    "@textbus/core": "^4.0.0-alpha.28",
     "@viewfly/core": "^0.6.0",
     "reflect-metadata": "^0.1.13",
     "y-protocols": "^1.0.5",
@@ -50,5 +50,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "36aff3db9897ccd73ba4533972991d537778bd6e"
+  "gitHead": "afb457beb39742c7e00f78b71cd24e13443bae56"
 }