@textbus/collaborate 5.4.1 → 5.4.2

package/dist/base/collaborate.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from '@tanbo/stream';
-import { Component, Registry, Scheduler, Selection, Slot, AbstractSelection } from '@textbus/core';
+import { Component, Formats, FormatValue, Registry, Scheduler, Selection, Slot, AbstractSelection } from '@textbus/core';
 import { AbstractType, Doc as YDoc, Map as YMap, RelativePosition, Text as YText } from 'yjs';
 import { SubModelLoader } from './sub-model-loader';
 export interface RelativePositionRecord {
@@ -96,4 +96,11 @@ export declare class Collaborate {
     private runLocalUpdate;
     private runRemoteUpdate;
 }
+export declare function localFormatsToYjsAttributes(registry: Registry, slot: Slot, start: number, end: number, localFormats: Record<string, FormatValue>): Record<string, FormatValue | FormatValue[] | null>;
+export declare function localFormatsRecordToRemote(registry: Registry, formats: Record<string, FormatValue> | undefined): Record<string, FormatValue | FormatValue[] | null> | undefined;
+export declare function formatsArrayToRemoteRecord(registry: Registry, formats: Formats): Record<string, FormatValue | FormatValue[]> | undefined;
+/** 远程插入内容的格式 → 本地 Formats（新内容无旧状态，可堆叠仅展开远程数组） */
+export declare function remoteInsertFormatsToLocal(registry: Registry, attrs?: Record<string, FormatValue | FormatValue[] | null> | null): Formats;
+/** 远程 retain 格式 → 本地 Formats（可堆叠与区间内本地快照做差量对齐） */
+export declare function remoteRetainFormatsToLocal(registry: Registry, slot: Slot, start: number, end: number, attrs?: Record<string, FormatValue | FormatValue[] | null> | null): Formats;
 export {};

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 import { Injectable, Inject, Optional } from '@viewfly/core';
-import { makeError, Slot, ChangeOrigin, toRaw, observe, AsyncSlot, AsyncComponent, Component, getObserver, attachModel, valueToJSON, Scheduler, Registry, Selection, HISTORY_STACK_SIZE, RootComponentRef, History } from '@textbus/core';
+import { makeError, valueToJSON, Format, PendingErasure, Slot, ChangeOrigin, toRaw, observe, AsyncSlot, AsyncComponent, Component, getObserver, attachModel, StackableFormatter, Scheduler, Registry, Selection, HISTORY_STACK_SIZE, RootComponentRef, History } from '@textbus/core';
 import { Subject, map, filter, Subscription } from '@tanbo/stream';
 import { Doc, createAbsolutePositionFromRelativePosition, createRelativePositionFromTypeIndex, Map, Array as Array$1, Text, XmlElement, UndoManager } from 'yjs';
 import { HocuspocusProvider } from '@hocuspocus/provider';
@@ -543,7 +543,9 @@ var Collaborate = /*#__PURE__*/ function() {
                         ev.delta.forEach(function(action) {
                             if (Reflect.has(action, 'retain')) {
                                 if (action.attributes) {
-                                    var formats = remoteFormatsToLocal(_this.registry, action.attributes);
+                                    var start = localSlot.index;
+                                    var end = start + action.retain;
+                                    var formats = remoteRetainFormatsToLocal(_this.registry, localSlot, start, end, action.attributes);
                                     if (formats.length) {
                                         localSlot.retain(action.retain, formats);
                                     }
@@ -554,7 +556,7 @@ var Collaborate = /*#__PURE__*/ function() {
                                 var length = 1;
                                 if (typeof action.insert === 'string') {
                                     length = action.insert.length;
-                                    localSlot.insert(action.insert, remoteFormatsToLocal(_this.registry, action.attributes));
+                                    localSlot.insert(action.insert, remoteInsertFormatsToLocal(_this.registry, action.attributes));
                                 } else {
                                     var sharedComponent = action.insert;
                                     var component = _this.createLocalComponentBySharedComponent(sharedComponent);
@@ -590,22 +592,14 @@ var Collaborate = /*#__PURE__*/ function() {
                         var length = 0;
                         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                         try {
-                            var _loop = function() {
+                            for(var _iterator = actions[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                                 var action = _step.value;
                                 if (action.type === 'retain') {
                                     var formats = action.formats;
                                     if (formats) {
-                                        var keys = Object.keys(formats);
-                                        var length1 = keys.length;
-                                        keys.forEach(function(key) {
-                                            var formatter = _this.registry.getFormatter(key);
-                                            if (!formatter) {
-                                                length1--;
-                                                Reflect.deleteProperty(formats, key);
-                                            }
-                                        });
-                                        if (length1) {
-                                            sharedSlot.format(offset, action.offset, formats);
+                                        var attrs = localFormatsToYjsAttributes(_this.registry, localSlot, offset, offset + action.offset, formats);
+                                        if (Object.keys(attrs).length) {
+                                            sharedSlot.format(offset, action.offset, attrs);
                                         }
                                     } else {
                                         offset = action.offset;
@@ -615,11 +609,11 @@ var Collaborate = /*#__PURE__*/ function() {
                                     var isEmpty = delta.length === 1 && delta[0].insert === Slot.emptyPlaceholder;
                                     if (typeof action.content === 'string') {
                                         length = action.content.length;
-                                        sharedSlot.insert(offset, action.content, action.formats || {});
+                                        sharedSlot.insert(offset, action.content, localFormatsRecordToRemote(_this.registry, action.formats) || {});
                                     } else {
                                         length = 1;
                                         var sharedComponent = _this.createSharedComponentByLocalComponent(action.ref);
-                                        sharedSlot.insertEmbed(offset, sharedComponent, action.formats || {});
+                                        sharedSlot.insertEmbed(offset, sharedComponent, localFormatsRecordToRemote(_this.registry, action.formats) || {});
                                     }
                                     if (isEmpty && offset === 0) {
                                         sharedSlot.delete(sharedSlot.length - 1, 1);
@@ -639,8 +633,7 @@ var Collaborate = /*#__PURE__*/ function() {
                                 } else if (action.type === 'attrDelete') {
                                     sharedSlot.removeAttribute(action.name);
                                 }
-                            };
-                            for(var _iterator = actions[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
+                            }
                         } catch (err) {
                             _didIteratorError = true;
                             _iteratorError = err;
@@ -795,14 +788,7 @@ var Collaborate = /*#__PURE__*/ function() {
                 var _this = this;
                 var offset = 0;
                 localSlot.toDelta().forEach(function(i) {
-                    var formats = {};
-                    if (i.formats) {
-                        i.formats.forEach(function(item) {
-                            formats[item[0].name] = item[1];
-                        });
-                    } else {
-                        formats = null;
-                    }
+                    var formats = i.formats ? formatsArrayToRemoteRecord(_this.registry, i.formats) : undefined;
                     if (typeof i.insert === 'string') {
                         sharedContent.insert(offset, i.insert, formats);
                     } else {
@@ -893,12 +879,12 @@ var Collaborate = /*#__PURE__*/ function() {
                         var action = _step.value;
                         if (action.insert) {
                             if (typeof action.insert === 'string') {
-                                var formats = remoteFormatsToLocal(this.registry, action.attributes);
+                                var formats = remoteInsertFormatsToLocal(this.registry, action.attributes);
                                 localSlot.insert(action.insert, formats);
                             } else {
                                 var sharedComponent = action.insert;
                                 var component = this.createLocalComponentBySharedComponent(sharedComponent);
-                                localSlot.insert(component, remoteFormatsToLocal(this.registry, action.attributes));
+                                localSlot.insert(component, remoteInsertFormatsToLocal(this.registry, action.attributes));
                             }
                         } else {
                             throw collaborateErrorFn('unexpected delta action.');
@@ -1377,19 +1363,180 @@ Collaborate = _ts_decorate$2([
         typeof SubModelLoader === "undefined" ? Object : SubModelLoader
     ])
 ], Collaborate);
-function remoteFormatsToLocal(registry, attrs) {
+function collectStackableValuesInRange(slot, formatter, start, end) {
+    var values = [];
+    slot.getFormatRangesByFormatter(formatter, start, end).forEach(function(range) {
+        var v = range.value;
+        if (!values.some(function(existing) {
+            return Format.equal(existing, v);
+        })) {
+            values.push(v);
+        }
+    });
+    return values;
+}
+function serializeFormatForYjs(value) {
+    return valueToJSON(value);
+}
+function localFormatsToYjsAttributes(registry, slot, start, end, localFormats) {
+    var attrs = {};
+    Object.keys(localFormats).forEach(function(key) {
+        var formatter = registry.getFormatter(key);
+        if (!formatter) {
+            return;
+        }
+        if (_instanceof$1(formatter, StackableFormatter)) {
+            var values = collectStackableValuesInRange(slot, formatter, start, end);
+            attrs[key] = values.length ? values.map(serializeFormatForYjs) : null;
+        } else {
+            attrs[key] = localFormats[key];
+        }
+    });
+    return attrs;
+}
+function localFormatsRecordToRemote(registry, formats) {
+    if (!formats) {
+        return undefined;
+    }
+    var record = {};
+    Object.keys(formats).forEach(function(key) {
+        var formatter = registry.getFormatter(key);
+        if (!formatter) {
+            return;
+        }
+        var incoming = formats[key];
+        if (_instanceof$1(formatter, StackableFormatter)) {
+            if (incoming === null || incoming === undefined) {
+                record[key] = null;
+            } else {
+                record[key] = [
+                    serializeFormatForYjs(incoming)
+                ];
+            }
+        } else {
+            record[key] = incoming;
+        }
+    });
+    return Object.keys(record).length ? record : undefined;
+}
+function formatsArrayToRemoteRecord(registry, formats) {
+    var record = {};
+    formats.forEach(function(param) {
+        var _param = _sliced_to_array(param, 2), formatter = _param[0], value = _param[1];
+        if (!registry.getFormatter(formatter.name)) {
+            return;
+        }
+        if (_instanceof$1(formatter, StackableFormatter)) {
+            var serialized = serializeFormatForYjs(value);
+            var current = record[formatter.name];
+            if (Array.isArray(current)) {
+                current.push(serialized);
+            } else {
+                record[formatter.name] = [
+                    serialized
+                ];
+            }
+        } else {
+            record[formatter.name] = value;
+        }
+    });
+    return Object.keys(record).length ? record : undefined;
+}
+function stackableRemoteRetainToLocal(slot, formatter, start, end, raw) {
     var formats = [];
-    if (attrs) {
-        Object.keys(attrs).forEach(function(key) {
-            var formatter = registry.getFormatter(key);
-            if (formatter) {
-                formats.push([
-                    formatter,
-                    attrs[key]
-                ]);
-            }
-        });
+    var localValues = collectStackableValuesInRange(slot, formatter, start, end);
+    if (raw === null || raw === undefined || Array.isArray(raw) && raw.length === 0) {
+        if (localValues.length > 0) {
+            formats.push([
+                formatter,
+                new PendingErasure(true)
+            ]);
+        }
+        return formats;
+    }
+    var remoteValues = Array.isArray(raw) ? raw : [
+        raw
+    ];
+    localValues.forEach(function(localValue) {
+        if (!remoteValues.some(function(remoteValue) {
+            return Format.equal(localValue, remoteValue);
+        })) {
+            formats.push([
+                formatter,
+                new PendingErasure(false, localValue)
+            ]);
+        }
+    });
+    remoteValues.forEach(function(remoteValue) {
+        if (!localValues.some(function(localValue) {
+            return Format.equal(localValue, remoteValue);
+        })) {
+            formats.push([
+                formatter,
+                remoteValue
+            ]);
+        }
+    });
+    return formats;
+}
+function stackableRemoteInsertToLocal(formatter, raw) {
+    if (raw === null || raw === undefined || Array.isArray(raw) && raw.length === 0) {
+        return [];
+    }
+    var remoteValues = Array.isArray(raw) ? raw : [
+        raw
+    ];
+    return remoteValues.map(function(value) {
+        return [
+            formatter,
+            value
+        ];
+    });
+}
+/** 远程插入内容的格式 → 本地 Formats（新内容无旧状态，可堆叠仅展开远程数组） */ function remoteInsertFormatsToLocal(registry, attrs) {
+    var formats = [];
+    if (!attrs) {
+        return formats;
+    }
+    Object.keys(attrs).forEach(function(key) {
+        var formatter = registry.getFormatter(key);
+        if (!formatter) {
+            return;
+        }
+        var raw = attrs[key];
+        if (_instanceof$1(formatter, StackableFormatter)) {
+            var _formats;
+            (_formats = formats).push.apply(_formats, _to_consumable_array(stackableRemoteInsertToLocal(formatter, raw)));
+            return;
+        }
+        formats.push([
+            formatter,
+            raw
+        ]);
+    });
+    return formats;
+}
+/** 远程 retain 格式 → 本地 Formats（可堆叠与区间内本地快照做差量对齐） */ function remoteRetainFormatsToLocal(registry, slot, start, end, attrs) {
+    var formats = [];
+    if (!attrs) {
+        return formats;
     }
+    Object.keys(attrs).forEach(function(key) {
+        var formatter = registry.getFormatter(key);
+        if (!formatter) {
+            return;
+        }
+        var raw = attrs[key];
+        if (_instanceof$1(formatter, StackableFormatter)) {
+            var _formats;
+            (_formats = formats).push.apply(_formats, _to_consumable_array(stackableRemoteRetainToLocal(slot, formatter, start, end, raw)));
+            return;
+        }
+        formats.push([
+            formatter,
+            raw
+        ]);
+    });
     return formats;
 }
 
@@ -2721,5 +2868,5 @@ var MultipleDocumentCollaborateModule = /*#__PURE__*/ function() {
     return MultipleDocumentCollaborateModule;
 }();
 
-export { CollabHistory, Collaborate, CollaborateModule, CustomUndoManagerConfig, HocuspocusConnector, LocalConnector, MessageBus, MultipleDocCollabHistory, MultipleDocumentCollaborateModule, NonSubModelLoader, SubModelLoader, SyncConnector, YWebsocketConnector };
+export { CollabHistory, Collaborate, CollaborateModule, CustomUndoManagerConfig, HocuspocusConnector, LocalConnector, MessageBus, MultipleDocCollabHistory, MultipleDocumentCollaborateModule, NonSubModelLoader, SubModelLoader, SyncConnector, YWebsocketConnector, formatsArrayToRemoteRecord, localFormatsRecordToRemote, localFormatsToYjsAttributes, remoteInsertFormatsToLocal, remoteRetainFormatsToLocal };
 //# sourceMappingURL=index.esm.js.map