@univerjs/drawing 0.5.2 → 0.5.3-experimental.20250106-e3b7a39

package/lib/es/index.js

@@ -1,11 +1,11 @@
 var $t = Object.defineProperty;
 var Nt = (a, e, n) => e in a ? $t(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n;
 var F = (a, e, n) => Nt(a, typeof e != "symbol" ? e + "" : e, n);
-import { sortRules as Rt, sortRulesByDesc as xt, createIdentifier as Bt, ImageSourceType as at, ImageUploadStatusType as et, Tools as Wt, Inject as Gt, Injector as Lt, Plugin as qt, merge as Kt, mergeOverrideWithDependencies as Ft, IConfigService as Vt, IImageIoService as Ht } from "@univerjs/core";
+import { sortRules as Rt, sortRulesByDesc as xt, createIdentifier as Bt, ImageSourceType as at, ImageUploadStatusType as Qe, Tools as Wt, Inject as Gt, Injector as Lt, Plugin as qt, merge as Kt, mergeOverrideWithDependencies as Ft, IConfigService as Vt, IImageIoService as Ht } from "@univerjs/core";
 import { IImageIoService as bn, ImageSourceType as Cn, ImageUploadStatusType as In } from "@univerjs/core";
 import { Subject as be } from "rxjs";
 const gn = 500, yn = 500, _n = 10, zt = 5 * 1024 * 1024, Xt = ["image/png", "image/jpeg", "image/jpg", "image/gif", "image/bmp"];
-var Ve = {}, Ze = {}, tt = {}, _t;
+var Ye = {}, et = {}, tt = {}, _t;
 function Jt() {
   if (_t) return tt;
   _t = 1, Object.defineProperty(tt, "__esModule", { value: !0 });
@@ -289,9 +289,9 @@ function Ut() {
     }(a.ConflictType || (a.ConflictType = {}));
   }(ut)), ut;
 }
-var Se = {}, He = {}, wt;
+var Fe = {}, Ve = {}, wt;
 function ht() {
-  return wt || (wt = 1, Object.defineProperty(He, "__esModule", { value: !0 }), He.uniToStrPos = He.strPosToUni = void 0, He.strPosToUni = (a, e = a.length) => {
+  return wt || (wt = 1, Object.defineProperty(Ve, "__esModule", { value: !0 }), Ve.uniToStrPos = Ve.strPosToUni = void 0, Ve.strPosToUni = (a, e = a.length) => {
     let n = 0, t = 0;
     for (; t < e; t++) {
       const r = a.charCodeAt(t);
@@ -300,14 +300,14 @@ function ht() {
     if (t !== e)
       throw Error("Invalid offset - splits unicode bytes");
     return t - n;
-  }, He.uniToStrPos = (a, e) => {
+  }, Ve.uniToStrPos = (a, e) => {
     let n = 0;
     for (; e > 0; e--) {
       const t = a.charCodeAt(n);
       n += t >= 55296 && t <= 57343 ? 2 : 1;
     }
     return n;
-  }), He;
+  }), Ve;
 }
 var ct = {}, bt;
 function ft() {
@@ -634,22 +634,22 @@ function Zt() {
 var It;
 function Qt() {
   return It || (It = 1, function(a) {
-    var e = Se && Se.__createBinding || (Object.create ? function(c, h, S, Y) {
+    var e = Fe.__createBinding || (Object.create ? function(c, h, S, Y) {
       Y === void 0 && (Y = S), Object.defineProperty(c, Y, { enumerable: !0, get: function() {
         return h[S];
       } });
     } : function(c, h, S, Y) {
       Y === void 0 && (Y = S), c[Y] = h[S];
-    }), n = Se && Se.__setModuleDefault || (Object.create ? function(c, h) {
+    }), n = Fe.__setModuleDefault || (Object.create ? function(c, h) {
       Object.defineProperty(c, "default", { enumerable: !0, value: h });
     } : function(c, h) {
       c.default = h;
-    }), t = Se && Se.__importStar || function(c) {
+    }), t = Fe.__importStar || function(c) {
       if (c && c.__esModule) return c;
       var h = {};
       if (c != null) for (var S in c) Object.hasOwnProperty.call(c, S) && e(h, c, S);
       return n(h, c), h;
-    }, r = Se && Se.__importDefault || function(c) {
+    }, r = Fe.__importDefault || function(c) {
       return c && c.__esModule ? c : { default: c };
     };
     Object.defineProperty(a, "__esModule", { value: !0 }), a.type = a.remove = a.insert = void 0;
@@ -689,12 +689,12 @@ function Qt() {
     Object.defineProperty(a, "makeType", { enumerable: !0, get: function() {
       return s.default;
     } });
-  }(Se)), Se;
+  }(Fe)), Fe;
 }
 var Et;
 function en() {
   return Et || (Et = 1, function(a) {
-    var e = Ze && Ze.__importDefault || function(i) {
+    var e = et.__importDefault || function(i) {
       return i && i.__esModule ? i : {
         default: i
       };
@@ -927,9 +927,9 @@ function en() {
         g.d != null && (v[g.d] = O.clone());
       });
       const B = r.writeCursor();
-      return function g(U, re, te, K, se, Ne, Oe, ye) {
+      return function g(U, re, te, K, se, $e, Oe, ye) {
         o(re || te);
-        const oe = l(re), Pe = l(te), Ae = !!Pe && Pe.r !== void 0, Le = !!oe && oe.i !== void 0, Te = oe ? oe.d : null, Ie = Pe ? Pe.p : null, Re = (Ne || Ae) && Ie == null;
+        const oe = l(re), Pe = l(te), Ae = !!Pe && Pe.r !== void 0, Le = !!oe && oe.i !== void 0, Te = oe ? oe.d : null, Ie = Pe ? Pe.p : null, Ne = ($e || Ae) && Ie == null;
         if (Ie != null) K = v[Ie], Oe = $[Ie] = new r.WriteCursor();
         else if (Pe && Pe.r !== void 0) K = null;
         else {
@@ -937,7 +937,7 @@ function en() {
           T && T.d != null && (K = null);
         }
         const Q = l(K);
-        if (Te != null) if (U = p[Te], ye = R[Te] = new r.WriteCursor(), Re) Ne && !Ae && ye.write("r", !0);
+        if (Te != null) if (U = p[Te], ye = R[Te] = new r.WriteCursor(), Ne) $e && !Ae && ye.write("r", !0);
         else {
           const T = w[Te] = m++;
           Oe.write("d", T);
@@ -949,42 +949,42 @@ function en() {
         }
         let A;
         Le ? (o(se === void 0), A = oe.i) : A = se;
-        const W = (Ie == null ? !Le || Ne || Ae : A === void 0) ? null : Oe.getComponent();
+        const W = (Ie == null ? !Le || $e || Ae : A === void 0) ? null : Oe.getComponent();
         if (Ie != null) {
           if (!(se !== void 0 || Le)) {
             const T = Te != null ? w[Te] : m++;
             C[Ie] = T, ye.write("p", T);
           }
         } else Ae && (Le || se !== void 0 || (Pe.r, ye.write("r", Pe.r)));
-        const M = Re ? null : ve(oe), P = ve(Q);
+        const M = Ne ? null : ve(oe), P = ve(Q);
         if ((M || P) && (M && M.name, P && P.name), M && P) {
           o(M === P);
           const T = f(oe), G = f(Q), he = M.compose(T, G);
           y(Oe, M, he), N.add(Q);
         } else M ? y(Oe, M, f(oe)) : P && (y(Oe, P, f(Q)), N.add(Q));
         const k = typeof A == "object" && A != null;
-        let X = !1, J = 0, ee = 0, fe = 0, de = 0, ae = 0;
+        let J = !1, X = 0, ee = 0, fe = 0, de = 0, ae = 0;
         const me = r.advancer(K, (T, G) => s(G) ? de - T - 1 : T - de, (T, G) => {
           s(G) && de++;
-        }), H = r.advancer(U, (T, G) => _(G) ? J - T - 1 : T - J, (T, G) => {
-          _(G) && J++;
+        }), H = r.advancer(U, (T, G) => _(G) ? X - T - 1 : T - X, (T, G) => {
+          _(G) && X++;
         });
         if (r.eachChildOf(re, te, (T, G, he) => {
-          let we, xe, qe = T, Me = T, Ye = T;
+          let we, Re, qe = T, Me = T, Je = T;
           if (typeof T == "number") {
             let _e = T + fe;
-            xe = me(_e), Me = _e + de;
+            Re = me(_e), Me = _e + de;
             let ue = T + ee;
-            we = H(ue), s(l(xe)) && (we = null), qe = ue + J, Ye = T + ae, o(qe >= 0, "p1PickKey is negative"), o(Me >= 0, "p2DropKey is negative");
-            const Ue = s(l(G)), Be = _(l(he));
-            (Ue || Be && !Re) && ae--, Ue && ee--, Be && fe--;
-          } else we = H(T), xe = me(T);
+            we = H(ue), s(l(Re)) && (we = null), qe = ue + X, Je = T + ae, o(qe >= 0, "p1PickKey is negative"), o(Me >= 0, "p2DropKey is negative");
+            const Ue = s(l(G)), xe = _(l(he));
+            (Ue || xe && !Ne) && ae--, Ue && ee--, xe && fe--;
+          } else we = H(T), Re = me(T);
           ye.descend(qe), Oe.descend(Me);
-          const Xe = k && !s(l(G)) ? A[Ye] : void 0, je = g(we, G, he, xe, Xe, Re, Oe, ye);
-          var $e, j, ie;
-          k && !Re ? Xe !== je && (X || (A = Array.isArray(A) ? A.slice() : Object.assign({}, A), X = !0), $e = A, ie = je, typeof (j = Ye) == "number" ? (o(Array.isArray($e)), o(j < $e.length)) : (o(!Array.isArray($e)), o($e[j] !== void 0)), ie === void 0 ? typeof j == "number" ? $e.splice(j, 1) : delete $e[j] : $e[j] = ie) : o(je === void 0), Oe.ascend(), ye.ascend();
+          const ze = k && !s(l(G)) ? A[Je] : void 0, Se = g(we, G, he, Re, ze, Ne, Oe, ye);
+          var je, j, ie;
+          k && !Ne ? ze !== Se && (J || (A = Array.isArray(A) ? A.slice() : Object.assign({}, A), J = !0), je = A, ie = Se, typeof (j = Je) == "number" ? (o(Array.isArray(je)), o(j < je.length)) : (o(!Array.isArray(je)), o(je[j] !== void 0)), ie === void 0 ? typeof j == "number" ? je.splice(j, 1) : delete je[j] : je[j] = ie) : o(Se === void 0), Oe.ascend(), ye.ascend();
         }), H.end(), me.end(), W != null) W.i = A;
-        else if (!Ne && !Ae && Ie == null) return A;
+        else if (!$e && !Ae && Ie == null) return A;
       }(D, D.clone(), O, O.clone(), void 0, !1, I, B), I.reset(), I.mergeTree(B.get()), I.reset(), I.get(), R.map((g) => g.get()), $.map((g) => g.get()), D.traverse(I, (g, U) => {
         const re = g.p;
         if (re != null) {
@@ -1100,8 +1100,8 @@ function en() {
           _(se) && U++;
         });
         for (const K of w) if (typeof K == "number") {
-          const se = K - re, Ne = te(se), Oe = se + U, ye = Y(N, B ? se : Oe);
-          C.descend(K), p(Ne, w, C, ye, B), s(w.getComponent()) && re++, C.ascend();
+          const se = K - re, $e = te(se), Oe = se + U, ye = Y(N, B ? se : Oe);
+          C.descend(K), p($e, w, C, ye, B), s(w.getComponent()) && re++, C.ascend();
         } else {
           const se = Y(N, K);
           C.descend(K), p(te(K), w, C, se, B), C.ascend();
@@ -1131,36 +1131,36 @@ function en() {
       z(i), z(d);
       let O = null;
       const I = [], R = [], $ = [], p = [], v = [], w = [], C = [], N = [], B = [], g = [], U = [], re = [], te = [], K = [], se = [];
-      let Ne = 0;
+      let $e = 0;
       const Oe = r.readCursor(i), ye = r.readCursor(d), oe = r.writeCursor();
       if (function Q(A, W = null, M) {
         const P = l(W);
         P && (P.r !== void 0 ? M = W.clone() : P.p != null && (M = null, w[P.p] = A.clone()));
         const k = A.getComponent();
-        let X;
-        k && (X = k.p) != null && (v[X] = W ? W.clone() : null, $[X] = A.clone(), M && (g[X] = !0, B[X] = M), P && P.p != null && (K[X] = P.p));
-        const J = r.advancer(W);
-        for (const ee of A) Q(A, J(ee), M);
-        J.end();
+        let J;
+        k && (J = k.p) != null && (v[J] = W ? W.clone() : null, $[J] = A.clone(), M && (g[J] = !0, B[J] = M), P && P.p != null && (K[J] = P.p));
+        const X = r.advancer(W);
+        for (const ee of A) Q(A, X(ee), M);
+        X.end();
       }(ye, Oe, null), function Q(A, W, M, P, k) {
-        const X = M.getComponent();
-        let J, ee = !1;
-        X && ((J = X.d) != null ? (p[J] = M.clone(), P != null && (se[P] == null && (se[P] = []), se[P].push(J)), A = v[J] || null, W = $[J] || null, g[J] ? (k && (U[J] = !0), k = B[J] || null) : !k || D !== 1 && K[J] != null || O == null && (O = {
+        const J = M.getComponent();
+        let X, ee = !1;
+        J && ((X = J.d) != null ? (p[X] = M.clone(), P != null && (se[P] == null && (se[P] = []), se[P].push(X)), g[X], A = v[X] || null, W = $[X] || null, g[X] ? (k && (U[X] = !0), k = B[X] || null) : !k || D !== 1 && K[X] != null || O == null && (O = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
           op1: a.removeOp(k.getPath()),
           op2: a.moveOp(W.getPath(), M.getPath())
-        }), ee = !0) : X.i !== void 0 && (A = W = null, ee = !0, k && O == null && (O = {
+        }), ee = !0) : J.i !== void 0 && (A = W = null, ee = !0, k && O == null && (O = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
           op1: a.removeOp(k.getPath()),
-          op2: a.insertOp(M.getPath(), X.i)
+          op2: a.insertOp(M.getPath(), J.i)
         })));
         const fe = l(A);
         fe && (fe.r !== void 0 ? k = A.clone() : fe.p != null && (fe.p, P = fe.p, k = null));
-        const de = ve(X);
+        const de = ve(J);
         de && k && O == null && (O = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
           op1: a.removeOp(k.getPath()),
-          op2: a.editOp(M.getPath(), de, f(X), !0)
+          op2: a.editOp(M.getPath(), de, f(J), !0)
         });
         let ae = 0, me = 0;
         const H = r.advancer(W, (G, he) => _(he) ? ae - G - 1 : G - ae, (G, he) => {
@@ -1182,16 +1182,16 @@ function en() {
       const Pe = [];
       let Ae = null;
       (function Q(A, W, M, P, k) {
-        let X = !1;
-        const J = l(W);
-        if (_(J)) {
-          const H = J.p;
-          H != null ? (M = p[H], P = re[H] = r.writeCursor(), X = !0, k = null) : (M = null, k = W.clone());
+        let J = !1;
+        const X = l(W);
+        if (_(X)) {
+          const H = X.p;
+          H != null ? (M = p[H], P = re[H] = r.writeCursor(), J = !0, k = null) : (M = null, k = W.clone());
         } else s(l(M)) && (M = null);
         const ee = A.getComponent();
         if (ee) {
           const H = ee.p;
-          H != null ? (k && (N[H] = k), Pe[H] = k || D === 1 && X ? null : P.getComponent(), I[H] = A.clone(), M && (C[H] = M.clone())) : ee.r !== void 0 && (k || P.write("r", !0), (k || X) && (Ae == null && (Ae = /* @__PURE__ */ new Set()), Ae.add(ee)));
+          H != null ? (k && (N[H] = k), Pe[H] = k || D === 1 && J ? null : P.getComponent(), I[H] = A.clone(), M && (C[H] = M.clone())) : ee.r !== void 0 && (k || P.write("r", !0), (k || J) && (Ae == null && (Ae = /* @__PURE__ */ new Set()), Ae.add(ee)));
         }
         let fe = 0, de = 0;
         const ae = r.advancer(W, void 0, (H, T) => {
@@ -1209,46 +1209,46 @@ function en() {
         ae.end(), me.end();
       })(Oe, ye, ye.clone(), oe, null), oe.reset();
       let Le = [];
-      if (function Q(A, W, M, P, k, X) {
+      if (function Q(A, W, M, P, k, J) {
         o(W);
-        const J = W.getComponent();
+        const X = W.getComponent();
         let ee = l(P), fe = !1;
         const de = (j, ie, _e) => j ? a.moveOp(j.getPath(), ie.getPath()) : a.insertOp(ie.getPath(), _e.i);
-        if (s(J)) {
-          const j = J.d;
+        if (s(X)) {
+          const j = X.d;
           j != null && (R[j] = W.clone());
           const ie = j != null ? Pe[j] : null;
           let _e = !1;
-          if (J.i !== void 0 || j != null && ie) {
+          if (X.i !== void 0 || j != null && ie) {
             let ue;
-            ee && (ee.i !== void 0 || (ue = ee.d) != null && !g[ue]) && (_e = ue != null ? j != null && j === K[ue] : n.default(ee.i, J.i), _e || ue != null && D !== 1 && K[ue] != null || O == null && (O = {
+            ee && (ee.i !== void 0 || (ue = ee.d) != null && !g[ue]) && (_e = ue != null ? j != null && j === K[ue] : n.default(ee.i, X.i), _e || ue != null && D !== 1 && K[ue] != null || O == null && (O = {
               type: u.ConflictType.DROP_COLLISION,
-              op1: de(j != null ? I[j] : null, W, J),
+              op1: de(j != null ? I[j] : null, W, X),
               op2: de(ue != null ? $[ue] : null, P, ee)
-            })), _e || (X ? O == null && (O = {
+            })), _e || (J ? O == null && (O = {
               type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-              op1: de(j != null ? I[j] : null, W, J),
-              op2: a.removeOp(X.getPath())
-            }) : (j != null ? (Le[Ne] = j, k.write("d", ie.p = Ne++)) : k.write("i", t.default(J.i)), fe = !0));
+              op1: de(j != null ? I[j] : null, W, X),
+              op2: a.removeOp(J.getPath())
+            }) : (j != null ? (Le[$e] = j, k.write("d", ie.p = $e++)) : k.write("i", t.default(X.i)), fe = !0));
           } else if (j != null && !ie) {
             const ue = N[j];
-            ue && (X = ue.clone());
+            ue && (J = ue.clone());
           }
-          j != null ? (A = I[j], M = w[j], P = C[j]) : J.i !== void 0 && (A = M = null, _e || (P = null));
+          j != null ? (A = I[j], M = w[j], P = C[j]) : X.i !== void 0 && (A = M = null, _e || (P = null));
         } else _(l(A)) && (A = M = P = null);
         const ae = l(A), me = l(M);
         if (_(me)) {
           const j = me.p;
-          me.r !== void 0 && (!ae || ae.r === void 0) || g[j] ? (P = null, X = M.clone()) : j != null && (P = p[j], D !== 1 && K[j] != null || ((k = te[j]) || (k = te[j] = r.writeCursor()), k.reset(), X = null));
-        } else !s(J) && s(ee) && (P = null);
+          me.r !== void 0 && (!ae || ae.r === void 0) || g[j] ? (P = null, J = M.clone()) : j != null && (P = p[j], D !== 1 && K[j] != null || ((k = te[j]) || (k = te[j] = r.writeCursor()), k.reset(), J = null));
+        } else !s(X) && s(ee) && (P = null);
         ee = P != null ? P.getComponent() : null;
-        const H = ve(J);
+        const H = ve(X);
         if (H) {
-          const j = f(J);
-          if (X) O == null && (O = {
+          const j = f(X);
+          if (J) O == null && (O = {
             type: u.ConflictType.RM_UNEXPECTED_CONTENT,
             op1: a.editOp(W.getPath(), H, j, !0),
-            op2: a.removeOp(X.getPath())
+            op2: a.removeOp(J.getPath())
           });
           else {
             const ie = ve(ee);
@@ -1261,72 +1261,72 @@ function en() {
             y(k, H, _e);
           }
         }
-        let T = 0, G = 0, he = 0, we = 0, xe = 0, qe = 0, Me = A != null && A.descendFirst(), Ye = Me;
-        const Xe = r.advancer(M, void 0, (j, ie) => {
+        let T = 0, G = 0, he = 0, we = 0, Re = 0, qe = 0, Me = A != null && A.descendFirst(), Je = Me;
+        const ze = r.advancer(M, void 0, (j, ie) => {
           _(ie) && he++;
         });
-        let je = P != null && P.descendFirst(), $e = je;
+        let Se = P != null && P.descendFirst(), je = Se;
         for (const j of W) if (typeof j == "number") {
           let ie;
           const _e = s(W.getComponent()), ue = j - G;
           {
-            let We;
-            for (; Me && typeof (We = A.getKey()) == "number"; ) {
-              We += T;
-              const ke = A.getComponent(), Je = _(ke);
-              if (We > ue || We === ue && (!Je || D === 0 && _e)) break;
-              if (Je) {
+            let Be;
+            for (; Me && typeof (Be = A.getKey()) == "number"; ) {
+              Be += T;
+              const ke = A.getComponent(), Xe = _(ke);
+              if (Be > ue || Be === ue && (!Xe || D === 0 && _e)) break;
+              if (Xe) {
                 T--;
                 const Ke = ke.p;
-                K.includes(Ke), ke.d, l(te[ke.d]), _(l(te[ke.d])), (ke.r === void 0 || Ae && Ae.has(ke)) && (Ke == null || !Pe[Ke] || D !== 1 && K.includes(Ke)) || xe--;
+                K.includes(Ke), ke.d, l(te[ke.d]), _(l(te[ke.d])), (ke.r === void 0 || Ae && Ae.has(ke)) && (Ke == null || !Pe[Ke] || D !== 1 && K.includes(Ke)) || Re--;
               }
               Me = A.nextSibling();
             }
-            ie = Me && We === ue ? A : null;
+            ie = Me && Be === ue ? A : null;
           }
           const Ue = ue - T;
-          let Be = Xe(Ue);
+          let xe = ze(Ue);
           const ot = Ue - he;
-          let Qe = null;
+          let Ze = null;
           {
-            let We, ke;
-            for (; je && typeof (We = P.getKey()) == "number"; ) {
-              ke = We - we;
-              const Je = P.getComponent(), Ke = s(Je);
+            let Be, ke;
+            for (; Se && typeof (Be = P.getKey()) == "number"; ) {
+              ke = Be - we;
+              const Xe = P.getComponent(), Ke = s(Xe);
               if (ke > ot) break;
               if (ke === ot) {
                 if (!Ke) {
-                  Qe = P;
+                  Ze = P;
                   break;
                 }
                 {
                   if (D === 0 && _e) {
-                    Qe = P;
+                    Ze = P;
                     break;
                   }
-                  const Fe = Be && _(Be.getComponent());
-                  if (D === 0 && Fe) break;
+                  const We = xe && _(xe.getComponent());
+                  if (D === 0 && We) break;
                 }
               }
               if (Ke) {
-                const Fe = Je.d;
-                K[Fe], Je.i === void 0 && (g[Fe] || K[Fe] != null && D !== 1) ? (g[Fe] || K[Fe] != null && D === 0) && (we++, qe--) : we++;
+                const We = Xe.d;
+                g[We], K[We], Xe.i === void 0 && (g[We] || K[We] != null && D !== 1) ? (g[We] || K[We] != null && D === 0) && (we++, qe--) : we++;
               }
-              je = P.nextSibling();
+              Se = P.nextSibling();
             }
           }
-          const yt = ot + we + xe + qe;
-          o(yt >= 0, "trying to descend to a negative index"), k.descend(yt), _e && (ie = Be = Qe = null, G++), Q(ie, W, Be, Qe, k, X) && qe++, k.ascend();
+          const yt = ot + we + Re + qe;
+          o(yt >= 0, "trying to descend to a negative index"), k.descend(yt), _e && (ie = xe = Ze = null, G++), Q(ie, W, xe, Ze, k, J) && qe++, k.ascend();
         } else {
           let ie;
           for (; Me && (ie = A.getKey(), typeof ie != "string" || !(ie > j || ie === j)); ) Me = A.nextSibling();
-          const _e = Me && ie === j ? A : null, ue = Xe(j);
+          const _e = Me && ie === j ? A : null, ue = ze(j);
           let Ue;
-          for (; je && (Ue = P.getKey(), typeof Ue != "string" || !(Ue > j || Ue === j)); ) je = P.nextSibling();
-          const Be = je && Ue === j ? P : null;
-          k.descend(j), Q(_e, W, ue, Be, k, X), k.ascend();
+          for (; Se && (Ue = P.getKey(), typeof Ue != "string" || !(Ue > j || Ue === j)); ) Se = P.nextSibling();
+          const xe = Se && Ue === j ? P : null;
+          k.descend(j), Q(_e, W, ue, xe, k, J), k.ascend();
         }
-        return Xe.end(), Ye && A.ascend(), $e && P.ascend(), fe;
+        return ze.end(), Je && A.ascend(), je && P.ascend(), fe;
       }(Oe, Oe.clone(), ye, ye.clone(), oe, null), O) return {
         ok: !1,
         conflict: O
@@ -1338,7 +1338,7 @@ function en() {
       (g.length || re.length) && (Te(ye, oe, (Q, A, W) => {
         g[Q] && !U[Q] && W.write("r", !0), re[Q] && W.mergeTree(re[Q].get());
       }), oe.reset());
-      const Ie = [], Re = [];
+      const Ie = [], Ne = [];
       if ((te.length || g.length) && !O) {
         const Q = r.readCursor(it(oe.get()));
         if (Te(Q, null, (A, W) => {
@@ -1347,11 +1347,11 @@ function en() {
           A && Te(r.readCursor(A.get()), null, (W, M) => {
             Ie[W] = M.clone();
           });
-        }), function A(W, M, P, k, X, J) {
+        }), function A(W, M, P, k, J, X) {
           const ee = l(M);
           if (ee && _(ee)) if (ee.p != null) {
             const T = ee.p;
-            Ie[T].getPath(), P = Ie[T], k = Re[T] = r.writeCursor();
+            Ie[T].getPath(), P = Ie[T], k = Ne[T] = r.writeCursor();
           } else ee.r !== void 0 && (P = null);
           else s(l(P)) && (P = null);
           const fe = W.getComponent();
@@ -1369,29 +1369,29 @@ function en() {
             s(G) && ae++;
           });
           for (const T of W) if (typeof T == "number") {
-            const G = me(T), he = T + de, we = H(he), xe = he + ae;
-            k.descend(xe), A(W, G, we, k), k.ascend();
+            const G = me(T), he = T + de, we = H(he), Re = he + ae;
+            k.descend(Re), A(W, G, we, k), k.ascend();
           } else k.descend(T), A(W, me(T), H(T), k), k.ascend();
           me.end(), H.end();
         }(ye, Q, Q.clone(), oe), oe.reset(), O) return {
           ok: !1,
           conflict: O
         };
-        if (oe.get(), Re.length) {
-          const A = Re.map((M) => M ? M.get() : null), W = r.readCursor(it(oe.get()));
+        if (oe.get(), Ne.length) {
+          const A = Ne.map((M) => M ? M.get() : null), W = r.readCursor(it(oe.get()));
           if (Te(W, oe, (M, P, k) => {
-            const X = A[M];
-            X && (k.mergeTree(X), A[M] = null);
+            const J = A[M];
+            J && (k.mergeTree(J), A[M] = null);
           }), A.find((M) => M)) {
             const M = r.writeCursor(), P = r.writeCursor();
-            let k = 0, X = 0;
-            A.forEach((J) => {
-              J != null && Te(r.readCursor(J), null, (ee) => {
+            let k = 0, J = 0;
+            A.forEach((X) => {
+              X != null && Te(r.readCursor(X), null, (ee) => {
                 const fe = Le[ee];
                 M.writeMove(I[fe].getPath(), R[fe].getPath(), k++);
                 const de = se[fe];
                 de && de.forEach((ae) => {
-                  g[ae] || D !== 1 && K[ae] != null || P.writeMove($[ae].getPath(), p[ae].getPath(), X++);
+                  g[ae] || D !== 1 && K[ae] != null || P.writeMove($[ae].getPath(), p[ae].getPath(), J++);
                 });
               });
             }), O = {
@@ -1419,7 +1419,7 @@ function en() {
       if (D.ok) return D.result;
       pt(D.conflict);
     }
-    const ze = (i) => {
+    const He = (i) => {
       const d = r.writeCursor();
       return r.readCursor(i).traverse(d, (m, D) => {
         (s(m) || ve(m)) && D.write("r", !0);
@@ -1428,14 +1428,14 @@ function en() {
       const { type: m, op1: D, op2: O } = i;
       switch (m) {
         case u.ConflictType.DROP_COLLISION:
-          return d === "left" ? [null, ze(O)] : [ze(D), null];
+          return d === "left" ? [null, He(O)] : [He(D), null];
         case u.ConflictType.RM_UNEXPECTED_CONTENT:
           let I = !1;
           return r.readCursor(D).traverse(null, (R) => {
             R.r !== void 0 && (I = !0);
-          }), I ? [null, ze(O)] : [ze(D), null];
+          }), I ? [null, He(O)] : [He(D), null];
         case u.ConflictType.BLACKHOLE:
-          return [ze(D), ze(O)];
+          return [He(D), He(O)];
         default:
           throw Error("Unrecognised conflict: " + m);
       }
@@ -1453,18 +1453,18 @@ function en() {
         }
       }
     }
-  }(Ze)), Ze;
+  }(et)), et;
 }
 var Dt;
 function tn() {
   return Dt || (Dt = 1, function(a) {
-    var e = Ve && Ve.__createBinding || (Object.create ? function(u, o, l, E) {
+    var e = Ye.__createBinding || (Object.create ? function(u, o, l, E) {
       E === void 0 && (E = l), Object.defineProperty(u, E, { enumerable: !0, get: function() {
         return o[l];
       } });
     } : function(u, o, l, E) {
       E === void 0 && (E = l), u[E] = o[l];
-    }), n = Ve && Ve.__exportStar || function(u, o) {
+    }), n = Ye.__exportStar || function(u, o) {
       for (var l in u) l !== "default" && !o.hasOwnProperty(l) && e(o, u, l);
     };
     Object.defineProperty(a, "__esModule", { value: !0 }), n(en(), a);
@@ -1478,7 +1478,7 @@ function tn() {
     Object.defineProperty(a, "ConflictType", { enumerable: !0, get: function() {
       return r.ConflictType;
     } });
-  }(Ve)), Ve;
+  }(Ye)), Ye;
 }
 var V = tn();
 class nn {
@@ -1933,11 +1933,11 @@ class an {
   async saveImage(e) {
     return new Promise((n, t) => {
       if (!Xt.includes(e.type)) {
-        t(new Error(et.ERROR_IMAGE_TYPE)), this._decreaseWaiting();
+        t(new Error(Qe.ERROR_IMAGE_TYPE)), this._decreaseWaiting();
         return;
       }
       if (e.size > zt) {
-        t(new Error(et.ERROR_EXCEED_SIZE)), this._decreaseWaiting();
+        t(new Error(Qe.ERROR_EXCEED_SIZE)), this._decreaseWaiting();
         return;
       }
       const r = new FileReader();
@@ -1945,7 +1945,7 @@ class an {
         var E;
         const o = (E = u.target) == null ? void 0 : E.result;
         if (o == null) {
-          t(new Error(et.ERROR_IMAGE)), this._decreaseWaiting();
+          t(new Error(Qe.ERROR_IMAGE)), this._decreaseWaiting();
           return;
         }
         const l = Wt.generateRandomId(6);
@@ -1954,7 +1954,7 @@ class an {
           imageSourceType: at.BASE64,
           source: o,
           base64Cache: o,
-          status: et.SUCCUSS
+          status: Qe.SUCCUSS
         }), this._decreaseWaiting();
       };
     });