@textbus/collaborate 4.0.0-alpha.33 → 4.0.0-alpha.35

package/bundles/collaborate.d.ts

@@ -60,7 +60,6 @@ export declare class Collaborate implements History {
      * 双向同步数组
      * @param sharedArray
      * @param localArray
-     * @param parent
      * @private
      */
     private syncArray;
@@ -68,7 +67,6 @@ export declare class Collaborate implements History {
      * 双向同步对象
      * @param sharedObject
      * @param localObject
-     * @param parent
      * @private
      */
     private syncObject;

package/bundles/index.esm.js

@@ -258,7 +258,7 @@ let Collaborate = class Collaborate {
         let state = root.get('state');
         if (!state) {
             state = new Map();
-            this.syncLocalMapToSharedMap(rootComponent.state, state, rootComponent);
+            this.syncLocalMapToSharedMap(rootComponent.state, state);
             this.yDoc.transact(() => {
                 root.set('state', state);
             });
@@ -267,43 +267,43 @@ let Collaborate = class Collaborate {
             Object.keys(rootComponent.state).forEach(key => {
                 Reflect.deleteProperty(rootComponent.state, key);
             });
-            this.syncSharedMapToLocalMap(state, rootComponent.state, rootComponent);
+            this.syncSharedMapToLocalMap(state, rootComponent.state);
         }
     }
-    syncSharedMapToLocalMap(sharedMap, localMap, parent) {
+    syncSharedMapToLocalMap(sharedMap, localMap) {
         sharedMap.forEach((value, key) => {
-            localMap[key] = this.createLocalModelBySharedByModel(value, parent);
+            localMap[key] = this.createLocalModelBySharedByModel(value);
         });
-        this.syncObject(sharedMap, localMap, parent);
+        this.syncObject(sharedMap, localMap);
     }
-    createLocalMapBySharedMap(sharedMap, parent) {
-        const localMap = createObjectProxy({}, parent);
-        this.syncSharedMapToLocalMap(sharedMap, localMap, parent);
+    createLocalMapBySharedMap(sharedMap) {
+        const localMap = createObjectProxy({});
+        this.syncSharedMapToLocalMap(sharedMap, localMap);
         return localMap;
     }
-    createLocalArrayBySharedArray(sharedArray, parent) {
-        const localArray = createArrayProxy([], parent);
-        localArray.push(...sharedArray.map(item => this.createLocalModelBySharedByModel(item, parent)));
-        this.syncArray(sharedArray, localArray, parent);
+    createLocalArrayBySharedArray(sharedArray) {
+        const localArray = createArrayProxy([]);
+        localArray.push(...sharedArray.map(item => this.createLocalModelBySharedByModel(item)));
+        this.syncArray(sharedArray, localArray);
         return localArray;
     }
-    syncLocalMapToSharedMap(localMap, sharedMap, parent) {
+    syncLocalMapToSharedMap(localMap, sharedMap) {
         Object.entries(localMap).forEach(([key, value]) => {
-            sharedMap.set(key, this.createSharedModelByLocalModel(value, parent));
+            sharedMap.set(key, this.createSharedModelByLocalModel(value));
         });
-        this.syncObject(sharedMap, localMap, parent);
+        this.syncObject(sharedMap, localMap);
     }
-    createSharedMapByLocalMap(localMap, parent) {
+    createSharedMapByLocalMap(localMap) {
         const sharedMap = new Map();
-        this.syncLocalMapToSharedMap(localMap, sharedMap, parent);
+        this.syncLocalMapToSharedMap(localMap, sharedMap);
         return sharedMap;
     }
-    createSharedArrayByLocalArray(localArray, parent) {
+    createSharedArrayByLocalArray(localArray) {
         const sharedArray = new Array$1();
         localArray.forEach(value => {
-            sharedArray.push([this.createSharedModelByLocalModel(value, parent)]);
+            sharedArray.push([this.createSharedModelByLocalModel(value)]);
         });
-        this.syncArray(sharedArray, localArray, parent);
+        this.syncArray(sharedArray, localArray);
         return sharedArray;
     }
     createSharedSlotByLocalSlot(localSlot) {
@@ -364,24 +364,24 @@ let Collaborate = class Collaborate {
         this.syncSlot(sharedSlot, localSlot);
         return localSlot;
     }
-    createSharedModelByLocalModel(localModel, parent) {
+    createSharedModelByLocalModel(localModel) {
         if (localModel instanceof Slot) {
             return this.createSharedSlotByLocalSlot(localModel);
         }
         if (Array.isArray(localModel)) {
-            return this.createSharedArrayByLocalArray(localModel, parent);
+            return this.createSharedArrayByLocalArray(localModel);
         }
         if (typeof localModel === 'object' && localModel !== null) {
-            return this.createSharedMapByLocalMap(localModel, parent);
+            return this.createSharedMapByLocalMap(localModel);
         }
         return localModel;
     }
-    createLocalModelBySharedByModel(sharedModel, parent) {
+    createLocalModelBySharedByModel(sharedModel) {
         if (sharedModel instanceof Map) {
-            return this.createLocalMapBySharedMap(sharedModel, parent);
+            return this.createLocalMapBySharedMap(sharedModel);
         }
         if (sharedModel instanceof Array$1) {
-            return this.createLocalArrayBySharedArray(sharedModel, parent);
+            return this.createLocalArrayBySharedArray(sharedModel);
         }
         if (sharedModel instanceof Text) {
             return this.createLocalSlotBySharedSlot(sharedModel);
@@ -560,7 +560,7 @@ let Collaborate = class Collaborate {
             });
         });
         this.slotMap.set(localSlot, sharedSlot);
-        localSlot.changeMarker.destroyCallbacks.push(() => {
+        localSlot.__changeMarker__.destroyCallbacks.push(() => {
             this.slotMap.delete(localSlot);
             sharedSlot.unobserve(syncRemote);
             sub.unsubscribe();
@@ -568,7 +568,7 @@ let Collaborate = class Collaborate {
     }
     createSharedComponentByLocalComponent(component) {
         const sharedComponent = new Map();
-        const sharedState = this.createSharedMapByLocalMap(component.state, component);
+        const sharedState = this.createSharedMapByLocalMap(component.state);
         sharedComponent.set('name', component.name);
         sharedComponent.set('state', sharedState);
         return sharedComponent;
@@ -576,9 +576,8 @@ let Collaborate = class Collaborate {
     createLocalComponentBySharedComponent(yMap) {
         const componentName = yMap.get('name');
         const sharedState = yMap.get('state');
-        const instance = this.registry.createComponentByData(componentName, (component) => {
-            return this.createLocalMapBySharedMap(sharedState, component);
-        });
+        const state = this.createLocalMapBySharedMap(sharedState);
+        const instance = this.registry.createComponentByData(componentName, state);
         if (instance) {
             return instance;
         }
@@ -588,10 +587,9 @@ let Collaborate = class Collaborate {
      * 双向同步数组
      * @param sharedArray
      * @param localArray
-     * @param parent
      * @private
      */
-    syncArray(sharedArray, localArray, parent) {
+    syncArray(sharedArray, localArray) {
         const sub = localArray.__changeMarker__.onSelfChange.subscribe((actions) => {
             this.runLocalUpdate(() => {
                 let index = 0;
@@ -603,9 +601,9 @@ let Collaborate = class Collaborate {
                         case 'insert':
                             {
                                 const data = action.ref.map(item => {
-                                    return this.createSharedModelByLocalModel(item, parent);
+                                    return this.createSharedModelByLocalModel(item);
                                 });
-                                sharedArray.insert(index, [data]);
+                                sharedArray.insert(index, data);
                             }
                             break;
                         case 'delete':
@@ -613,7 +611,7 @@ let Collaborate = class Collaborate {
                             break;
                         case 'setIndex':
                             sharedArray.delete(action.index, 1);
-                            sharedArray.insert(action.index, this.createSharedModelByLocalModel(action.ref, parent));
+                            sharedArray.insert(action.index, [this.createSharedModelByLocalModel(action.ref)]);
                             break;
                     }
                 }
@@ -628,7 +626,7 @@ let Collaborate = class Collaborate {
                     }
                     else if (action.insert) {
                         const data = action.insert.map((item) => {
-                            return this.createLocalModelBySharedByModel(item, parent);
+                            return this.createLocalModelBySharedByModel(item);
                         });
                         localArray.splice(index, 0, ...data);
                         index += data.length;
@@ -649,16 +647,15 @@ let Collaborate = class Collaborate {
      * 双向同步对象
      * @param sharedObject
      * @param localObject
-     * @param parent
      * @private
      */
-    syncObject(sharedObject, localObject, parent) {
+    syncObject(sharedObject, localObject) {
         const syncRemote = (ev, tr) => {
             this.runRemoteUpdate(tr, () => {
                 ev.changes.keys.forEach((item, key) => {
                     if (item.action === 'add' || item.action === 'update') {
                         const value = sharedObject.get(key);
-                        localObject[key] = this.createLocalModelBySharedByModel(value, parent);
+                        localObject[key] = this.createLocalModelBySharedByModel(value);
                     }
                     else {
                         Reflect.deleteProperty(localObject, key);
@@ -672,7 +669,7 @@ let Collaborate = class Collaborate {
                 for (const action of actions) {
                     switch (action.type) {
                         case 'propSet':
-                            sharedObject.set(action.key, this.createSharedModelByLocalModel(action.value, parent));
+                            sharedObject.set(action.key, this.createSharedModelByLocalModel(action.value));
                             break;
                         case 'propDelete':
                             sharedObject.delete(action.key);

package/bundles/index.js

@@ -260,7 +260,7 @@ exports.Collaborate = class Collaborate {
         let state = root.get('state');
         if (!state) {
             state = new yjs.Map();
-            this.syncLocalMapToSharedMap(rootComponent.state, state, rootComponent);
+            this.syncLocalMapToSharedMap(rootComponent.state, state);
             this.yDoc.transact(() => {
                 root.set('state', state);
             });
@@ -269,43 +269,43 @@ exports.Collaborate = class Collaborate {
             Object.keys(rootComponent.state).forEach(key => {
                 Reflect.deleteProperty(rootComponent.state, key);
             });
-            this.syncSharedMapToLocalMap(state, rootComponent.state, rootComponent);
+            this.syncSharedMapToLocalMap(state, rootComponent.state);
         }
     }
-    syncSharedMapToLocalMap(sharedMap, localMap, parent) {
+    syncSharedMapToLocalMap(sharedMap, localMap) {
         sharedMap.forEach((value, key) => {
-            localMap[key] = this.createLocalModelBySharedByModel(value, parent);
+            localMap[key] = this.createLocalModelBySharedByModel(value);
         });
-        this.syncObject(sharedMap, localMap, parent);
+        this.syncObject(sharedMap, localMap);
     }
-    createLocalMapBySharedMap(sharedMap, parent) {
-        const localMap = core.createObjectProxy({}, parent);
-        this.syncSharedMapToLocalMap(sharedMap, localMap, parent);
+    createLocalMapBySharedMap(sharedMap) {
+        const localMap = core.createObjectProxy({});
+        this.syncSharedMapToLocalMap(sharedMap, localMap);
         return localMap;
     }
-    createLocalArrayBySharedArray(sharedArray, parent) {
-        const localArray = core.createArrayProxy([], parent);
-        localArray.push(...sharedArray.map(item => this.createLocalModelBySharedByModel(item, parent)));
-        this.syncArray(sharedArray, localArray, parent);
+    createLocalArrayBySharedArray(sharedArray) {
+        const localArray = core.createArrayProxy([]);
+        localArray.push(...sharedArray.map(item => this.createLocalModelBySharedByModel(item)));
+        this.syncArray(sharedArray, localArray);
         return localArray;
     }
-    syncLocalMapToSharedMap(localMap, sharedMap, parent) {
+    syncLocalMapToSharedMap(localMap, sharedMap) {
         Object.entries(localMap).forEach(([key, value]) => {
-            sharedMap.set(key, this.createSharedModelByLocalModel(value, parent));
+            sharedMap.set(key, this.createSharedModelByLocalModel(value));
         });
-        this.syncObject(sharedMap, localMap, parent);
+        this.syncObject(sharedMap, localMap);
     }
-    createSharedMapByLocalMap(localMap, parent) {
+    createSharedMapByLocalMap(localMap) {
         const sharedMap = new yjs.Map();
-        this.syncLocalMapToSharedMap(localMap, sharedMap, parent);
+        this.syncLocalMapToSharedMap(localMap, sharedMap);
         return sharedMap;
     }
-    createSharedArrayByLocalArray(localArray, parent) {
+    createSharedArrayByLocalArray(localArray) {
         const sharedArray = new yjs.Array();
         localArray.forEach(value => {
-            sharedArray.push([this.createSharedModelByLocalModel(value, parent)]);
+            sharedArray.push([this.createSharedModelByLocalModel(value)]);
         });
-        this.syncArray(sharedArray, localArray, parent);
+        this.syncArray(sharedArray, localArray);
         return sharedArray;
     }
     createSharedSlotByLocalSlot(localSlot) {
@@ -366,24 +366,24 @@ exports.Collaborate = class Collaborate {
         this.syncSlot(sharedSlot, localSlot);
         return localSlot;
     }
-    createSharedModelByLocalModel(localModel, parent) {
+    createSharedModelByLocalModel(localModel) {
         if (localModel instanceof core.Slot) {
             return this.createSharedSlotByLocalSlot(localModel);
         }
         if (Array.isArray(localModel)) {
-            return this.createSharedArrayByLocalArray(localModel, parent);
+            return this.createSharedArrayByLocalArray(localModel);
         }
         if (typeof localModel === 'object' && localModel !== null) {
-            return this.createSharedMapByLocalMap(localModel, parent);
+            return this.createSharedMapByLocalMap(localModel);
         }
         return localModel;
     }
-    createLocalModelBySharedByModel(sharedModel, parent) {
+    createLocalModelBySharedByModel(sharedModel) {
         if (sharedModel instanceof yjs.Map) {
-            return this.createLocalMapBySharedMap(sharedModel, parent);
+            return this.createLocalMapBySharedMap(sharedModel);
         }
         if (sharedModel instanceof yjs.Array) {
-            return this.createLocalArrayBySharedArray(sharedModel, parent);
+            return this.createLocalArrayBySharedArray(sharedModel);
         }
         if (sharedModel instanceof yjs.Text) {
             return this.createLocalSlotBySharedSlot(sharedModel);
@@ -562,7 +562,7 @@ exports.Collaborate = class Collaborate {
             });
         });
         this.slotMap.set(localSlot, sharedSlot);
-        localSlot.changeMarker.destroyCallbacks.push(() => {
+        localSlot.__changeMarker__.destroyCallbacks.push(() => {
             this.slotMap.delete(localSlot);
             sharedSlot.unobserve(syncRemote);
             sub.unsubscribe();
@@ -570,7 +570,7 @@ exports.Collaborate = class Collaborate {
     }
     createSharedComponentByLocalComponent(component) {
         const sharedComponent = new yjs.Map();
-        const sharedState = this.createSharedMapByLocalMap(component.state, component);
+        const sharedState = this.createSharedMapByLocalMap(component.state);
         sharedComponent.set('name', component.name);
         sharedComponent.set('state', sharedState);
         return sharedComponent;
@@ -578,9 +578,8 @@ exports.Collaborate = class Collaborate {
     createLocalComponentBySharedComponent(yMap) {
         const componentName = yMap.get('name');
         const sharedState = yMap.get('state');
-        const instance = this.registry.createComponentByData(componentName, (component) => {
-            return this.createLocalMapBySharedMap(sharedState, component);
-        });
+        const state = this.createLocalMapBySharedMap(sharedState);
+        const instance = this.registry.createComponentByData(componentName, state);
         if (instance) {
             return instance;
         }
@@ -590,10 +589,9 @@ exports.Collaborate = class Collaborate {
      * 双向同步数组
      * @param sharedArray
      * @param localArray
-     * @param parent
      * @private
      */
-    syncArray(sharedArray, localArray, parent) {
+    syncArray(sharedArray, localArray) {
         const sub = localArray.__changeMarker__.onSelfChange.subscribe((actions) => {
             this.runLocalUpdate(() => {
                 let index = 0;
@@ -605,9 +603,9 @@ exports.Collaborate = class Collaborate {
                         case 'insert':
                             {
                                 const data = action.ref.map(item => {
-                                    return this.createSharedModelByLocalModel(item, parent);
+                                    return this.createSharedModelByLocalModel(item);
                                 });
-                                sharedArray.insert(index, [data]);
+                                sharedArray.insert(index, data);
                             }
                             break;
                         case 'delete':
@@ -615,7 +613,7 @@ exports.Collaborate = class Collaborate {
                             break;
                         case 'setIndex':
                             sharedArray.delete(action.index, 1);
-                            sharedArray.insert(action.index, this.createSharedModelByLocalModel(action.ref, parent));
+                            sharedArray.insert(action.index, [this.createSharedModelByLocalModel(action.ref)]);
                             break;
                     }
                 }
@@ -630,7 +628,7 @@ exports.Collaborate = class Collaborate {
                     }
                     else if (action.insert) {
                         const data = action.insert.map((item) => {
-                            return this.createLocalModelBySharedByModel(item, parent);
+                            return this.createLocalModelBySharedByModel(item);
                         });
                         localArray.splice(index, 0, ...data);
                         index += data.length;
@@ -651,16 +649,15 @@ exports.Collaborate = class Collaborate {
      * 双向同步对象
      * @param sharedObject
      * @param localObject
-     * @param parent
      * @private
      */
-    syncObject(sharedObject, localObject, parent) {
+    syncObject(sharedObject, localObject) {
         const syncRemote = (ev, tr) => {
             this.runRemoteUpdate(tr, () => {
                 ev.changes.keys.forEach((item, key) => {
                     if (item.action === 'add' || item.action === 'update') {
                         const value = sharedObject.get(key);
-                        localObject[key] = this.createLocalModelBySharedByModel(value, parent);
+                        localObject[key] = this.createLocalModelBySharedByModel(value);
                     }
                     else {
                         Reflect.deleteProperty(localObject, key);
@@ -674,7 +671,7 @@ exports.Collaborate = class Collaborate {
                 for (const action of actions) {
                     switch (action.type) {
                         case 'propSet':
-                            sharedObject.set(action.key, this.createSharedModelByLocalModel(action.value, parent));
+                            sharedObject.set(action.key, this.createSharedModelByLocalModel(action.value));
                             break;
                         case 'propDelete':
                             sharedObject.delete(action.key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/collaborate",
-  "version": "4.0.0-alpha.33",
+  "version": "4.0.0-alpha.35",
   "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.33",
+    "@textbus/core": "^4.0.0-alpha.35",
     "@viewfly/core": "^0.6.3",
     "reflect-metadata": "^0.1.13",
     "y-websocket": "^1.4.3",
@@ -50,5 +50,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "5eb73f9a388d331946a8579aa6eaa23cc44bffe0"
+  "gitHead": "a50ac82617ef249feadbe926bae178912ed9a310"
 }