@textbus/collaborate 5.3.2 → 5.3.3

package/dist/base/collaborate.d.ts

@@ -72,9 +72,13 @@ export declare class Collaborate {
     private sharedModelForArraySlot;
     /**
      * 在可观察数组中插入稀疏空洞（与 YArray 中 XmlElement 占位对齐）。
-     * 仅在远端同步路径调用；直接操作 raw，避免走插入 undefined 的可观察路径。
+     * 仅在远端同步路径调用；先改 raw，再用与 {@link ArrayProxyHandler} `length` 增长一致的原子命令
+     * `retain` + `insert`（`undefined` 槽）记录，`unApply` 为 `retain` + `delete`。
+     * `runLocalUpdate` 在 `updateFromRemote` 为 true 时会跳过，不会把洞再写回 Y。
      */
     private insertSparseHole;
+    /** 与 Y 洞位对齐的稀疏洞写入，仅操作 raw */
+    private applySparseHoleToRaw;
     /**
      * 双向同步数组
      * @param sharedArray

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 import { Injectable, Inject, Optional } from '@viewfly/core';
-import { makeError, Slot, ChangeOrigin, observe, toRaw, AsyncSlot, AsyncComponent, Component, Scheduler, Registry, Selection, HISTORY_STACK_SIZE, RootComponentRef, History } from '@textbus/core';
+import { makeError, Slot, ChangeOrigin, observe, AsyncSlot, AsyncComponent, Component, toRaw, getObserver, attachModel, valueToJSON, 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';
@@ -731,11 +731,10 @@ var Collaborate = /*#__PURE__*/ function() {
             key: "createSharedArrayByLocalArray",
             value: function createSharedArrayByLocalArray(localArray) {
                 var sharedArray = new Array$1();
-                var raw = toRaw(localArray);
-                for(var i = 0; i < raw.length; i++){
-                    if (i in raw) {
+                for(var i = 0; i < localArray.length; i++){
+                    if (i in localArray) {
                         sharedArray.push([
-                            this.sharedModelForArraySlot(raw[i])
+                            this.sharedModelForArraySlot(localArray[i])
                         ]);
                     } else {
                         sharedArray.push([
@@ -1070,9 +1069,60 @@ var Collaborate = /*#__PURE__*/ function() {
             key: "insertSparseHole",
             value: /**
    * 在可观察数组中插入稀疏空洞（与 YArray 中 XmlElement 占位对齐）。
-   * 仅在远端同步路径调用；直接操作 raw，避免走插入 undefined 的可观察路径。
+   * 仅在远端同步路径调用；先改 raw，再用与 {@link ArrayProxyHandler} `length` 增长一致的原子命令
+   * `retain` + `insert`（`undefined` 槽）记录，`unApply` 为 `retain` + `delete`。
+   * `runLocalUpdate` 在 `updateFromRemote` 为 true 时会跳过，不会把洞再写回 Y。
    */ function insertSparseHole(localArray, atIndex) {
                 var raw = toRaw(localArray);
+                var oldLen = raw.length;
+                this.applySparseHoleToRaw(raw, atIndex);
+                var holeCount = atIndex >= oldLen ? atIndex + 1 - oldLen : 1;
+                var newTail = [];
+                if (atIndex >= oldLen) {
+                    for(var i = oldLen; i < oldLen + holeCount; i++){
+                        newTail.push(raw[i]);
+                    }
+                } else {
+                    newTail.push(undefined);
+                }
+                var changeMarker = localArray.__changeMarker__;
+                changeMarker.beforeChange();
+                var parentModel = getObserver(raw);
+                var subModels = newTail.map(function(item) {
+                    var m = observe(item);
+                    attachModel(parentModel, m);
+                    return m;
+                });
+                var retainOffset = atIndex >= oldLen ? oldLen : atIndex;
+                changeMarker.markAsDirtied({
+                    paths: [],
+                    apply: [
+                        {
+                            type: 'retain',
+                            offset: retainOffset
+                        },
+                        {
+                            type: 'insert',
+                            data: valueToJSON(newTail),
+                            ref: subModels
+                        }
+                    ],
+                    unApply: [
+                        {
+                            type: 'retain',
+                            offset: retainOffset
+                        },
+                        {
+                            type: 'delete',
+                            count: holeCount
+                        }
+                    ]
+                });
+            }
+        },
+        {
+            key: "applySparseHoleToRaw",
+            value: /** 与 Y 洞位对齐的稀疏洞写入，仅操作 raw */ function applySparseHoleToRaw(raw, atIndex) {
                 var len = raw.length;
                 if (atIndex >= len) {
                     raw.length = atIndex + 1;