@univerjs/drawing 0.12.1-nightly.202511221011 → 0.12.2

package/lib/index.js

@@ -1,12 +1,12 @@
-var Nt = Object.defineProperty;
-var Rt = (a, e, n) => e in a ? Nt(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n;
-var F = (a, e, n) => Rt(a, typeof e != "symbol" ? e + "" : e, n);
-import { createIdentifier as xt, CommandType as Bt, sortRules as Wt, sortRulesByDesc as Gt, ImageSourceType as at, ImageUploadStatusType as et, generateRandomId as Lt, Inject as qt, Injector as Kt, IConfigService as Ft, ICommandService as Vt, Plugin as Ht, merge as zt, mergeOverrideWithDependencies as Xt, IImageIoService as Jt } from "@univerjs/core";
+var Rt = Object.defineProperty;
+var xt = (a, e, n) => e in a ? Rt(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n;
+var F = (a, e, n) => xt(a, typeof e != "symbol" ? e + "" : e, n);
+import { createIdentifier as Bt, CommandType as Wt, sortRules as Gt, sortRulesByDesc as Lt, ImageSourceType as at, ImageUploadStatusType as et, generateRandomId as qt, Inject as Kt, Injector as $t, IConfigService as Ft, ICommandService as Vt, Plugin as Ht, merge as zt, mergeOverrideWithDependencies as Xt, IImageIoService as Jt } from "@univerjs/core";
 import { IImageIoService as In, ImageSourceType as En, ImageUploadStatusType as Dn } from "@univerjs/core";
 import { Subject as be } from "rxjs";
-const _n = 500, vn = 500, mn = 10, Yt = 5 * 1024 * 1024, Zt = ["image/png", "image/jpeg", "image/jpg", "image/gif", "image/bmp"], Mt = xt("univer.drawing-manager.service"), Qt = {
+const _n = 500, vn = 500, mn = 10, Yt = 5 * 1024 * 1024, Zt = ["image/png", "image/jpeg", "image/jpg", "image/gif", "image/bmp"], Mt = Bt("univer.drawing-manager.service"), Qt = {
   id: "drawing.operation.set-drawing-selected",
-  type: Bt.OPERATION,
+  type: Wt.OPERATION,
   handler: (a, e) => {
     const n = a.get(Mt);
     return e == null ? !1 : (n.focusDrawing(e), !0);
@@ -262,10 +262,10 @@ function St() {
         for (; U; ) {
           const Ce = Z = _.getKey();
           if (pe != null) {
-            let Le = !1;
-            if (s && typeof Ce == "number" && (Z = s(Ce, _.getComponent()), Z < 0 && (Z = ~Z, Le = !0)), t(Z, pe))
+            let qe = !1;
+            if (s && typeof Ce == "number" && (Z = s(Ce, _.getComponent()), Z < 0 && (Z = ~Z, qe = !0)), t(Z, pe))
               return null;
-            if (Z === pe && !Le)
+            if (Z === pe && !qe)
               return _;
           }
           c && typeof Z == "number" && c(Z, _.getComponent()), U = _.nextSibling();
@@ -277,7 +277,7 @@ function St() {
       }, Y;
     }
     a.advancer = E;
-    function x(_, s, c) {
+    function B(_, s, c) {
       let h, U, Y, pe;
       for (h = U = _ && _.descendFirst(), Y = pe = s && s.descendFirst(); h || Y; ) {
         let Z = h ? _.getKey() : null, Ce = Y ? s.getKey() : null;
@@ -285,7 +285,7 @@ function St() {
       }
       U && _.ascend(), pe && s.ascend();
     }
-    a.eachChildOf = x;
+    a.eachChildOf = B;
   })(lt)), lt;
 }
 var ut = {}, bt;
@@ -325,52 +325,52 @@ function ht() {
         throw Error("Op must be an array of components");
       let y = null;
       for (let b = 0; b < f.length; b++) {
-        const L = f[b];
-        switch (typeof L) {
+        const q = f[b];
+        switch (typeof q) {
           case "object":
-            if (typeof L.d != "number" && typeof L.d != "string")
+            if (typeof q.d != "number" && typeof q.d != "string")
               throw Error("Delete must be number or string");
-            if (a.dlen(L.d) <= 0)
+            if (a.dlen(q.d) <= 0)
               throw Error("Deletes must not be empty");
             break;
           case "string":
-            if (!(L.length > 0))
+            if (!(q.length > 0))
               throw Error("Inserts cannot be empty");
             break;
           case "number":
-            if (!(L > 0))
+            if (!(q > 0))
               throw Error("Skip components must be >0");
             if (typeof y == "number")
               throw Error("Adjacent skip components should be combined");
             break;
         }
-        y = L;
+        y = q;
       }
       if (typeof y == "number")
         throw Error("Op has a trailing skip");
     };
     function t(f, y) {
-      let b = 0, L = 0;
+      let b = 0, q = 0;
       for (let z = 0; z < f.length; z++) {
-        const q = f[z];
-        switch (y(q, b, L), typeof q) {
+        const K = f[z];
+        switch (y(K, b, q), typeof K) {
           case "object":
-            b += a.dlen(q.d);
+            b += a.dlen(K.d);
             break;
           case "string":
-            L += e.strPosToUni(q);
+            q += e.strPosToUni(K);
             break;
           case "number":
-            b += q, L += q;
+            b += K, q += K;
             break;
         }
       }
     }
     a.eachOp = t;
     function r(f, y) {
-      const b = [], L = l(b);
-      return t(f, (z, q, Ee) => {
-        L(y(z, q, Ee));
+      const b = [], q = l(b);
+      return t(f, (z, K, Ee) => {
+        q(y(z, K, Ee));
       }), s(b);
     }
     const u = (f) => f, o = (f) => r(f, u);
@@ -388,31 +388,31 @@ function ht() {
         f.push(y);
     }, E = (f) => typeof f == "number" ? f : typeof f == "string" ? e.strPosToUni(f) : typeof f.d == "number" ? f.d : e.strPosToUni(f.d);
     a.uniSlice = (f, y, b) => {
-      const L = e.uniToStrPos(f, y), z = b == null ? 1 / 0 : e.uniToStrPos(f, b);
-      return f.slice(L, z);
+      const q = e.uniToStrPos(f, y), z = b == null ? 1 / 0 : e.uniToStrPos(f, b);
+      return f.slice(q, z);
     };
-    const x = (f, y, b) => typeof f == "number" ? b == null ? f - y : Math.min(f, b) - y : a.uniSlice(f, y, b), _ = (f) => {
+    const B = (f, y, b) => typeof f == "number" ? b == null ? f - y : Math.min(f, b) - y : a.uniSlice(f, y, b), _ = (f) => {
       let y = 0, b = 0;
-      return { take: (q, Ee) => {
+      return { take: (K, Ee) => {
         if (y === f.length)
-          return q === -1 ? null : q;
+          return K === -1 ? null : K;
         const ce = f[y];
         let ne;
         if (typeof ce == "number")
-          return q === -1 || ce - b <= q ? (ne = ce - b, ++y, b = 0, ne) : (b += q, q);
+          return K === -1 || ce - b <= K ? (ne = ce - b, ++y, b = 0, ne) : (b += K, K);
         if (typeof ce == "string") {
-          if (q === -1 || Ee === "i" || e.strPosToUni(ce.slice(b)) <= q)
+          if (K === -1 || Ee === "i" || e.strPosToUni(ce.slice(b)) <= K)
             return ne = ce.slice(b), ++y, b = 0, ne;
           {
-            const le = b + e.uniToStrPos(ce.slice(b), q);
+            const le = b + e.uniToStrPos(ce.slice(b), K);
             return ne = ce.slice(b, le), b = le, ne;
           }
         } else {
-          if (q === -1 || Ee === "d" || a.dlen(ce.d) - b <= q)
-            return ne = { d: x(ce.d, b) }, ++y, b = 0, ne;
+          if (K === -1 || Ee === "d" || a.dlen(ce.d) - b <= K)
+            return ne = { d: B(ce.d, b) }, ++y, b = 0, ne;
           {
-            let le = x(ce.d, b, b + q);
-            return b += q, { d: le };
+            let le = B(ce.d, b, b + K);
+            return b += K, { d: le };
           }
         }
       }, peek: () => f[y] };
@@ -421,21 +421,21 @@ function ht() {
       if (b !== "left" && b !== "right")
         throw Error("side (" + b + ") must be 'left' or 'right'");
       n(f), n(y);
-      const L = [], z = l(L), { take: q, peek: Ee } = _(f);
+      const q = [], z = l(q), { take: K, peek: Ee } = _(f);
       for (let ne = 0; ne < y.length; ne++) {
         const le = y[ne];
         let ge, De;
         switch (typeof le) {
           case "number":
             for (ge = le; ge > 0; )
-              De = q(ge, "i"), z(De), typeof De != "string" && (ge -= E(De));
+              De = K(ge, "i"), z(De), typeof De != "string" && (ge -= E(De));
             break;
           case "string":
-            b === "left" && typeof Ee() == "string" && z(q(-1)), z(e.strPosToUni(le));
+            b === "left" && typeof Ee() == "string" && z(K(-1)), z(e.strPosToUni(le));
             break;
           case "object":
             for (ge = a.dlen(le.d); ge > 0; )
-              switch (De = q(ge, "i"), typeof De) {
+              switch (De = K(ge, "i"), typeof De) {
                 case "number":
                   ge -= De;
                   break;
@@ -449,23 +449,23 @@ function ht() {
         }
       }
       let ce;
-      for (; ce = q(-1); )
+      for (; ce = K(-1); )
         z(ce);
-      return s(L);
+      return s(q);
     }
     function h(f, y) {
       n(f), n(y);
-      const b = [], L = l(b), { take: z } = _(f);
+      const b = [], q = l(b), { take: z } = _(f);
       for (let Ee = 0; Ee < y.length; Ee++) {
         const ce = y[Ee];
         let ne, le;
         switch (typeof ce) {
           case "number":
             for (ne = ce; ne > 0; )
-              le = z(ne, "d"), L(le), typeof le != "object" && (ne -= E(le));
+              le = z(ne, "d"), q(le), typeof le != "object" && (ne -= E(le));
             break;
           case "string":
-            L(ce);
+            q(ce);
             break;
           case "object":
             ne = a.dlen(ce.d);
@@ -473,34 +473,34 @@ function ht() {
             for (; ge < ne; )
               switch (le = z(ne - ge, "d"), typeof le) {
                 case "number":
-                  L({ d: x(ce.d, ge, ge + le) }), ge += le;
+                  q({ d: B(ce.d, ge, ge + le) }), ge += le;
                   break;
                 case "string":
                   ge += e.strPosToUni(le);
                   break;
                 case "object":
-                  L(le);
+                  q(le);
               }
             break;
         }
       }
-      let q;
-      for (; q = z(-1); )
-        L(q);
+      let K;
+      for (; K = z(-1); )
+        q(K);
       return s(b);
     }
     const U = (f, y) => {
       let b = 0;
-      for (let L = 0; L < y.length && f > b; L++) {
-        const z = y[L];
+      for (let q = 0; q < y.length && f > b; q++) {
+        const z = y[q];
         switch (typeof z) {
           case "number": {
             b += z;
             break;
           }
           case "string":
-            const q = e.strPosToUni(z);
-            b += q, f += q;
+            const K = e.strPosToUni(z);
+            b += K, f += K;
             break;
           case "object":
             f -= Math.min(a.dlen(z.d), f - b);
@@ -510,7 +510,7 @@ function ht() {
       return f;
     }, Y = (f, y) => typeof f == "number" ? U(f, y) : f.map((b) => U(b, y));
     function pe(f, y, b) {
-      return r(f, (L, z) => typeof L == "object" && typeof L.d == "number" ? { d: b.slice(y, z, z + L.d) } : L);
+      return r(f, (q, z) => typeof q == "object" && typeof q.d == "number" ? { d: b.slice(y, z, z + q.d) } : q);
     }
     function Z(f) {
       return r(f, (y) => {
@@ -531,7 +531,7 @@ function ht() {
     function Ce(f) {
       return r(f, (y) => typeof y == "object" && typeof y.d == "string" ? { d: e.strPosToUni(y.d) } : y);
     }
-    function Le(f) {
+    function qe(f) {
       let y = !0;
       return t(f, (b) => {
         typeof b == "object" && typeof b.d == "number" && (y = !1);
@@ -558,28 +558,28 @@ function ht() {
          */
         apply(y, b) {
           n(b);
-          const L = f.builder(y);
+          const q = f.builder(y);
           for (let z = 0; z < b.length; z++) {
-            const q = b[z];
-            switch (typeof q) {
+            const K = b[z];
+            switch (typeof K) {
               case "number":
-                L.skip(q);
+                q.skip(K);
                 break;
               case "string":
-                L.append(q);
+                q.append(K);
                 break;
               case "object":
-                L.del(a.dlen(q.d));
+                q.del(a.dlen(K.d));
                 break;
             }
           }
-          return L.build();
+          return q.build();
         },
         transform: c,
         compose: h,
         transformPosition: U,
         transformSelection: Y,
-        isInvertible: Le,
+        isInvertible: qe,
         makeInvertible(y, b) {
           return pe(y, b, f);
         },
@@ -627,8 +627,8 @@ function rn() {
               this.onInsert && this.onInsert(E, o);
               break;
             case "object":
-              const x = a.dlen(o.d);
-              this.onRemove && this.onRemove(E, x);
+              const B = a.dlen(o.d);
+              this.onRemove && this.onRemove(E, B);
           }
         });
       },
@@ -690,7 +690,7 @@ function sn() {
         };
       },
       slice: o.uniSlice
-    }, x = o.default(E), _ = Object.assign(Object.assign({}, x), { api: l.default });
+    }, B = o.default(E), _ = Object.assign(Object.assign({}, B), { api: l.default });
     a.type = _, a.insert = (c, h) => h.length === 0 ? [] : c === 0 ? [h] : [c, h], a.remove = (c, h) => o.dlen(h) === 0 ? [] : c === 0 ? [{ d: h }] : [c, { d: h }];
     var s = ht();
     Object.defineProperty(a, "makeType", { enumerable: !0, get: function() {
@@ -724,7 +724,7 @@ function on() {
       },
       registerSubtype: Z,
       checkValidOp: z,
-      normalize: q,
+      normalize: K,
       apply: Ee,
       transformPosition: ce,
       compose: ne,
@@ -745,7 +745,7 @@ function on() {
     function E(i) {
       return i && typeof i == "object" && !Array.isArray(i);
     }
-    const x = (i) => Array.isArray(i) ? i.slice() : i !== null && typeof i == "object" ? Object.assign({}, i) : i, _ = (i) => i && (i.p != null || i.r !== void 0), s = (i) => i && (i.d != null || i.i !== void 0);
+    const B = (i) => Array.isArray(i) ? i.slice() : i !== null && typeof i == "object" ? Object.assign({}, i) : i, _ = (i) => i && (i.p != null || i.r !== void 0), s = (i) => i && (i.d != null || i.i !== void 0);
     function c(i, d) {
       return o(i != null), typeof d == "number" ? (o(Array.isArray(i), "Invalid key - child is not an array"), (i = i.slice()).splice(d, 1)) : (o(E(i), "Invalid key - child is not an object"), delete (i = Object.assign({}, i))[d]), i;
     }
@@ -766,11 +766,11 @@ function on() {
       throw Error("Missing type: " + i);
     };
     Z(sn());
-    const Le = (i, d) => i + d;
+    const qe = (i, d) => i + d;
     Z({
       name: "number",
-      apply: Le,
-      compose: Le,
+      apply: qe,
+      compose: qe,
       invert: (i) => -i,
       transform: (i) => i
     });
@@ -781,101 +781,101 @@ function on() {
     function b(i) {
       o(typeof i == "number"), o(i >= 0), o(i === (0 | i));
     }
-    function L(i) {
+    function q(i) {
       typeof i == "number" ? b(i) : o(typeof i == "string");
     }
     function z(i) {
       if (i === null) return;
       const d = /* @__PURE__ */ new Set(), m = /* @__PURE__ */ new Set(), D = (I) => {
-        let R = !0, $ = !1;
+        let x = !0, N = !1;
         for (let p in I) {
           const v = I[p];
-          if (R = !1, o(p === "p" || p === "r" || p === "d" || p === "i" || p === "e" || p === "es" || p === "ena" || p === "et", "Invalid component item '" + p + "'"), p === "p") b(v), o(!d.has(v)), d.add(v), o(I.r === void 0);
+          if (x = !1, o(p === "p" || p === "r" || p === "d" || p === "i" || p === "e" || p === "es" || p === "ena" || p === "et", "Invalid component item '" + p + "'"), p === "p") b(v), o(!d.has(v)), d.add(v), o(I.r === void 0);
           else if (p === "d") b(v), o(!m.has(v)), m.add(v), o(I.i === void 0);
           else if (p === "e" || p === "es" || p === "ena") {
-            o(!$), $ = !0;
+            o(!N), N = !0;
             const w = ve(I);
             o(w, "Missing type in edit"), w.checkValidOp && w.checkValidOp(f(I));
           }
         }
-        o(!R);
-      }, O = (I, R, $) => {
+        o(!x);
+      }, O = (I, x, N) => {
         if (!Array.isArray(I)) throw Error("Op must be null or a list");
         if (I.length === 0) throw Error("Empty descent");
-        R || L(I[0]);
+        x || q(I[0]);
         let p = 1, v = 0, w = 0;
         for (let C = 0; C < I.length; C++) {
-          const N = I[C];
-          if (o(N != null), Array.isArray(N)) {
-            const B = O(N, !1);
+          const R = I[C];
+          if (o(R != null), Array.isArray(R)) {
+            const W = O(R, !1);
             if (v) {
-              const g = typeof w, S = typeof B;
-              g === S ? o(w < B, "descent keys are not in order") : o(g === "number" && S === "string");
+              const g = typeof w, S = typeof W;
+              g === S ? o(w < W, "descent keys are not in order") : o(g === "number" && S === "string");
             }
-            w = B, v++, p = 3;
-          } else typeof N == "object" ? (o(p === 1, `Prev not scalar - instead ${p}`), D(N), p = 2) : (o(p !== 3), L(N), o(r.isValidPathItem(N), "Invalid path key"), p = 1);
+            w = W, v++, p = 3;
+          } else typeof R == "object" ? (o(p === 1, `Prev not scalar - instead ${p}`), D(R), p = 2) : (o(p !== 3), q(R), o(r.isValidPathItem(R), "Invalid path key"), p = 1);
         }
         return o(v !== 1, "Operation makes multiple descents. Remove some []"), o(p === 2 || p === 3), I[0];
       };
       O(i, !0), o(d.size === m.size, "Mismatched picks and drops in op");
       for (let I = 0; I < d.size; I++) o(d.has(I)), o(m.has(I));
     }
-    function q(i) {
+    function K(i) {
       let d = 0, m = [];
       const D = r.writeCursor();
       return D.mergeTree(i, (O, I) => {
-        const R = ve(O);
-        if (R) {
+        const x = ve(O);
+        if (x) {
           const p = f(O);
-          y(I, R, R.normalize ? R.normalize(p) : p);
+          y(I, x, x.normalize ? x.normalize(p) : p);
         }
         for (const p of ["r", "p", "i", "d"]) if (O[p] !== void 0) {
-          const v = p === "p" || p === "d" ? ($ = O[p], m[$] == null && (m[$] = d++), m[$]) : O[p];
+          const v = p === "p" || p === "d" ? (N = O[p], m[N] == null && (m[N] = d++), m[N]) : O[p];
           I.write(p, v);
         }
-        var $;
+        var N;
       }), D.get();
     }
     function Ee(i, d) {
       if (z(d), d === null) return i;
       const m = [];
       return (function D(O, I) {
-        let R = O, $ = 0, p = {
+        let x = O, N = 0, p = {
           root: O
         }, v = 0, w = p, C = "root";
-        function N() {
-          for (; v < $; v++) {
-            let B = I[v];
-            typeof B != "object" && (o(U(w, C)), w = w[C] = x(w[C]), C = B);
+        function R() {
+          for (; v < N; v++) {
+            let W = I[v];
+            typeof W != "object" && (o(U(w, C)), w = w[C] = B(w[C]), C = W);
           }
         }
-        for (; $ < I.length; $++) {
-          const B = I[$];
-          if (Array.isArray(B)) {
-            const g = D(R, B);
-            g !== R && g !== void 0 && (N(), R = w[C] = g);
-          } else if (typeof B == "object") {
-            B.d != null ? (N(), R = h(w, C, m[B.d])) : B.i !== void 0 && (N(), R = h(w, C, B.i));
-            const g = ve(B);
-            if (g) N(), R = w[C] = g.apply(R, f(B));
-            else if (B.e !== void 0) throw Error("Subtype " + B.et + " undefined");
-          } else R = Y(R, B);
+        for (; N < I.length; N++) {
+          const W = I[N];
+          if (Array.isArray(W)) {
+            const g = D(x, W);
+            g !== x && g !== void 0 && (R(), x = w[C] = g);
+          } else if (typeof W == "object") {
+            W.d != null ? (R(), x = h(w, C, m[W.d])) : W.i !== void 0 && (R(), x = h(w, C, W.i));
+            const g = ve(W);
+            if (g) R(), x = w[C] = g.apply(x, f(W));
+            else if (W.e !== void 0) throw Error("Subtype " + W.et + " undefined");
+          } else x = Y(x, W);
         }
         return p.root;
       })(i = (function D(O, I) {
-        const R = [];
-        let $ = 0;
-        for (; $ < I.length; $++) {
-          const C = I[$];
+        const x = [];
+        let N = 0;
+        for (; N < I.length; N++) {
+          const C = I[N];
           if (Array.isArray(C)) break;
-          typeof C != "object" && (R.push(O), O = Y(O, C));
+          typeof C != "object" && (x.push(O), O = Y(O, C));
         }
-        for (let C = I.length - 1; C >= $; C--) O = D(O, I[C]);
-        for (--$; $ >= 0; $--) {
-          const C = I[$];
+        for (let C = I.length - 1; C >= N; C--) O = D(O, I[C]);
+        for (--N; N >= 0; N--) {
+          const C = I[N];
           if (typeof C != "object") {
-            const N = R.pop();
-            O = O === Y(N, C) ? N : O === void 0 ? c(N, C) : (v = C, w = O, (p = x(p = N))[v] = w, p);
+            const R = x.pop();
+            O = O === Y(R, C) ? R : O === void 0 ? c(R, C) : (v = C, w = O, (p = B(p = R))[v] = w, p);
           } else _(C) && (o(O !== void 0, "Cannot pick up or remove undefined"), C.p != null && (m[C.p] = O), O = void 0);
         }
         var p, v, w;
@@ -886,20 +886,20 @@ function on() {
       i = i.slice(), z(d);
       const m = r.readCursor(d);
       let D, O, I = !1;
-      const R = [];
+      const x = [];
       for (let p = 0; ; p++) {
         const v = i[p], w = m.getComponent();
         if (w && (w.r !== void 0 ? I = !0 : w.p != null && (I = !1, D = w.p, O = p)), p >= i.length) break;
         let C = 0;
-        const N = r.advancer(m, void 0, (g, S) => {
+        const R = r.advancer(m, void 0, (g, S) => {
           _(S) && C++;
         });
-        R.unshift(N);
-        const B = N(v);
-        if (typeof v == "number" && (i[p] -= C), !B) break;
+        x.unshift(R);
+        const W = R(v);
+        if (typeof v == "number" && (i[p] -= C), !W) break;
       }
-      if (R.forEach((p) => p.end()), I) return null;
-      const $ = () => {
+      if (x.forEach((p) => p.end()), I) return null;
+      const N = () => {
         let p = 0;
         if (D != null) {
           const v = m.getPath();
@@ -912,39 +912,39 @@ function on() {
             C.transformPosition && (i[p] = C.transformPosition(i[p], g));
             break;
           }
-          let N = 0;
-          const B = r.advancer(m, (g, S) => s(S) ? ~(g - N) : g - N, (g, S) => {
-            s(S) && N++;
+          let R = 0;
+          const W = r.advancer(m, (g, S) => s(S) ? ~(g - R) : g - R, (g, S) => {
+            s(S) && R++;
           })(v);
-          if (typeof v == "number" && (i[p] += N), !B) break;
+          if (typeof v == "number" && (i[p] += R), !W) break;
         }
       };
       return D != null ? m.eachDrop(null, (p) => {
-        p === D && $();
-      }) : $(), i;
+        p === D && N();
+      }) : N(), i;
     }
     function ne(i, d) {
       if (z(i), z(d), i == null) return d;
       if (d == null) return i;
       let m = 0;
-      const D = r.readCursor(i), O = r.readCursor(d), I = r.writeCursor(), R = [], $ = [], p = [], v = [], w = [], C = [], N = /* @__PURE__ */ new Set();
+      const D = r.readCursor(i), O = r.readCursor(d), I = r.writeCursor(), x = [], N = [], p = [], v = [], w = [], C = [], R = /* @__PURE__ */ new Set();
       D.traverse(null, (g) => {
         g.p != null && (p[g.p] = D.clone());
       }), O.traverse(null, (g) => {
         g.d != null && (v[g.d] = O.clone());
       });
-      const B = r.writeCursor();
-      return (function g(S, re, te, K, se, Ne, Oe, ye) {
+      const W = r.writeCursor();
+      return (function g(S, re, te, $, se, Re, Oe, ye) {
         o(re || te);
-        const oe = l(re), Pe = l(te), Ae = !!Pe && Pe.r !== void 0, qe = !!oe && oe.i !== void 0, Te = oe ? oe.d : null, Ie = Pe ? Pe.p : null, Re = (Ne || Ae) && Ie == null;
-        if (Ie != null) K = v[Ie], Oe = $[Ie] = new r.WriteCursor();
-        else if (Pe && Pe.r !== void 0) K = null;
+        const oe = l(re), Pe = l(te), Ae = !!Pe && Pe.r !== void 0, Ke = !!oe && oe.i !== void 0, Te = oe ? oe.d : null, Ie = Pe ? Pe.p : null, xe = (Re || Ae) && Ie == null;
+        if (Ie != null) $ = v[Ie], Oe = N[Ie] = new r.WriteCursor();
+        else if (Pe && Pe.r !== void 0) $ = null;
         else {
-          const T = l(K);
-          T && T.d != null && (K = null);
+          const T = l($);
+          T && T.d != null && ($ = null);
         }
-        const Q = l(K);
-        if (Te != null) if (S = p[Te], ye = R[Te] = new r.WriteCursor(), Re) Ne && !Ae && ye.write("r", !0);
+        const Q = l($);
+        if (Te != null) if (S = p[Te], ye = x[Te] = new r.WriteCursor(), xe) Re && !Ae && ye.write("r", !0);
         else {
           const T = w[Te] = m++;
           Oe.write("d", T);
@@ -955,61 +955,61 @@ function on() {
           T && T.p != null && (S = null);
         }
         let A;
-        qe ? (o(se === void 0), A = oe.i) : A = se;
-        const W = (Ie == null ? !qe || Ne || Ae : A === void 0) ? null : Oe.getComponent();
+        Ke ? (o(se === void 0), A = oe.i) : A = se;
+        const G = (Ie == null ? !Ke || Re || Ae : A === void 0) ? null : Oe.getComponent();
         if (Ie != null) {
-          if (!(se !== void 0 || qe)) {
+          if (!(se !== void 0 || Ke)) {
             const T = Te != null ? w[Te] : m++;
             C[Ie] = T, ye.write("p", T);
           }
-        } else Ae && (qe || se !== void 0 || (Pe.r, ye.write("r", Pe.r)));
-        const M = Re ? null : ve(oe), P = ve(Q);
+        } else Ae && (Ke || se !== void 0 || (Pe.r, ye.write("r", Pe.r)));
+        const M = xe ? 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 T = f(oe), L = f(Q), he = M.compose(T, L);
+          y(Oe, M, he), R.add(Q);
+        } else M ? y(Oe, M, f(oe)) : P && (y(Oe, P, f(Q)), R.add(Q));
         const k = typeof A == "object" && A != null;
         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(S, (T, G) => _(G) ? X - T - 1 : T - X, (T, G) => {
-          _(G) && X++;
+        const me = r.advancer($, (T, L) => s(L) ? de - T - 1 : T - de, (T, L) => {
+          s(L) && de++;
+        }), H = r.advancer(S, (T, L) => _(L) ? X - T - 1 : T - X, (T, L) => {
+          _(L) && X++;
         });
-        if (r.eachChildOf(re, te, (T, G, he) => {
-          let we, xe, Ke = T, Me = T, Ye = T;
+        if (r.eachChildOf(re, te, (T, L, he) => {
+          let we, Be, $e = T, Me = T, Ye = T;
           if (typeof T == "number") {
             let _e = T + fe;
-            xe = me(_e), Me = _e + de;
+            Be = me(_e), Me = _e + de;
             let ue = T + ee;
-            we = H(ue), s(l(xe)) && (we = null), Ke = ue + X, Ye = T + ae, o(Ke >= 0, "p1PickKey is negative"), o(Me >= 0, "p2DropKey is negative");
-            const Se = s(l(G)), Be = _(l(he));
-            (Se || Be && !Re) && ae--, Se && ee--, Be && fe--;
-          } else we = H(T), xe = me(T);
-          ye.descend(Ke), 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 && (J || (A = Array.isArray(A) ? A.slice() : Object.assign({}, A), J = !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();
-        }), H.end(), me.end(), W != null) W.i = A;
-        else if (!Ne && !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, S) => {
+            we = H(ue), s(l(Be)) && (we = null), $e = ue + X, Ye = T + ae, o($e >= 0, "p1PickKey is negative"), o(Me >= 0, "p2DropKey is negative");
+            const Se = s(l(L)), We = _(l(he));
+            (Se || We && !xe) && ae--, Se && ee--, We && fe--;
+          } else we = H(T), Be = me(T);
+          ye.descend($e), Oe.descend(Me);
+          const Xe = k && !s(l(L)) ? A[Ye] : void 0, je = g(we, L, he, Be, Xe, xe, Oe, ye);
+          var Ne, j, ie;
+          k && !xe ? Xe !== je && (J || (A = Array.isArray(A) ? A.slice() : Object.assign({}, A), J = !0), Ne = A, ie = je, typeof (j = Ye) == "number" ? (o(Array.isArray(Ne)), o(j < Ne.length)) : (o(!Array.isArray(Ne)), o(Ne[j] !== void 0)), ie === void 0 ? typeof j == "number" ? Ne.splice(j, 1) : delete Ne[j] : Ne[j] = ie) : o(je === void 0), Oe.ascend(), ye.ascend();
+        }), H.end(), me.end(), G != null) G.i = A;
+        else if (!Re && !Ae && Ie == null) return A;
+      })(D, D.clone(), O, O.clone(), void 0, !1, I, W), I.reset(), I.mergeTree(W.get()), I.reset(), I.get(), x.map((g) => g.get()), N.map((g) => g.get()), D.traverse(I, (g, S) => {
         const re = g.p;
         if (re != null) {
           const te = w[re];
           te != null && S.write("p", te);
-          const K = R[re];
-          K && K.get(), K && S.mergeTree(K.get());
+          const $ = x[re];
+          $ && $.get(), $ && S.mergeTree($.get());
         } else g.r !== void 0 && S.write("r", g.r);
       }), I.reset(), I.get(), O.traverse(I, (g, S) => {
         const re = g.d;
         if (re != null) {
-          const K = C[re];
-          K != null && S.write("d", K);
-          const se = $[re];
+          const $ = C[re];
+          $ != null && S.write("d", $);
+          const se = N[re];
           se && S.mergeTree(se.get());
         } else g.i !== void 0 && S.write("i", g.i);
         const te = ve(g);
-        te && !N.has(g) && y(S, te, f(g));
+        te && !R.has(g) && y(S, te, f(g));
       }), I.get();
     }
     function le(i) {
@@ -1017,52 +1017,52 @@ function on() {
       const d = new r.ReadCursor(i), m = new r.WriteCursor();
       let D;
       const O = [], I = [];
-      return (function R($, p, v) {
-        const w = $.getComponent();
-        let C, N = !1;
+      return (function x(N, p, v) {
+        const w = N.getComponent();
+        let C, R = !1;
         if (w) {
-          w.p != null && (p.write("d", w.p), O[w.p] = $.clone()), w.r !== void 0 && p.write("i", w.r), w.d != null && (p.write("p", w.d), v = void 0), w.i !== void 0 && (v = C = w.i);
+          w.p != null && (p.write("d", w.p), O[w.p] = N.clone()), w.r !== void 0 && p.write("i", w.r), w.d != null && (p.write("p", w.d), v = void 0), w.i !== void 0 && (v = C = w.i);
           const g = ve(w);
-          g && (v === void 0 ? (D || (D = /* @__PURE__ */ new Set()), D.add(w)) : (f(w), v = g.apply(v, f(w)), N = !0));
+          g && (v === void 0 ? (D || (D = /* @__PURE__ */ new Set()), D.add(w)) : (f(w), v = g.apply(v, f(w)), R = !0));
         }
-        let B = 0;
-        for (const g of $) {
+        let W = 0;
+        for (const g of N) {
           p.descend(g);
-          const S = typeof g == "number" ? g - B : g, re = Y(v, S);
-          s($.getComponent()) && B++;
-          const te = R($, p, re);
+          const S = typeof g == "number" ? g - W : g, re = Y(v, S);
+          s(N.getComponent()) && W++;
+          const te = x(N, p, re);
           if (v !== void 0 && te !== void 0) {
-            if (N || (N = !0, v = x(v)), !U(v, S)) throw Error("Cannot modify child - invalid operation");
+            if (R || (R = !0, v = B(v)), !U(v, S)) throw Error("Cannot modify child - invalid operation");
             v[S] = te;
           }
           p.ascend();
         }
-        if (C === void 0) return N ? v : void 0;
+        if (C === void 0) return R ? v : void 0;
         p.write("r", v);
-      })(d, m, void 0), D && (m.reset(), (function R($, p, v) {
+      })(d, m, void 0), D && (m.reset(), (function x(N, p, v) {
         const w = p.getComponent();
         if (w) {
           const g = w.d;
-          if (g != null && ($ = O[g], v = I[g] = r.writeCursor()), D.has(w)) {
+          if (g != null && (N = O[g], v = I[g] = r.writeCursor()), D.has(w)) {
             const S = ve(w);
             if (!S.invert) throw Error(`Cannot invert subtype ${S.name}`);
             y(v, S, S.invert(f(w)));
           }
         }
-        let C = 0, N = 0;
-        const B = r.advancer($, (g, S) => _(S) ? C - g - 1 : g - C, (g, S) => {
+        let C = 0, R = 0;
+        const W = r.advancer(N, (g, S) => _(S) ? C - g - 1 : g - C, (g, S) => {
           _(S) && C++;
         });
         for (const g of p) if (typeof g == "number") {
-          const S = g - N, re = B(S), te = S + C;
-          v.descend(te), R(re, p, v), s(p.getComponent()) && N++, v.ascend();
-        } else v.descend(g), R(B(g), p, v), v.ascend();
-        B.end();
-      })(d.clone(), d, m), I.length && (m.reset(), d.traverse(m, (R, $) => {
-        const p = R.p;
+          const S = g - R, re = W(S), te = S + C;
+          v.descend(te), x(re, p, v), s(p.getComponent()) && R++, v.ascend();
+        } else v.descend(g), x(W(g), p, v), v.ascend();
+        W.end();
+      })(d.clone(), d, m), I.length && (m.reset(), d.traverse(m, (x, N) => {
+        const p = x.p;
         if (p != null) {
           const v = I[p];
-          v && v.get(), v && $.mergeTree(v.get());
+          v && v.get(), v && N.mergeTree(v.get());
         }
       }))), m.get();
     }
@@ -1074,44 +1074,44 @@ function on() {
       })) return i;
       const m = new r.ReadCursor(i), D = new r.WriteCursor();
       let O = !1;
-      const I = [], R = [], $ = (p, v, w) => {
+      const I = [], x = [], N = (p, v, w) => {
         const C = p.getComponent();
-        let N = !1;
+        let R = !1;
         if (C) {
           C.d != null && v.write("d", C.d), C.i !== void 0 && v.write("i", C.i);
           const g = C.p;
-          if (g != null && (I[g] = p.clone(), o(w !== void 0, "Operation picks up at an invalid key"), R[g] = w, v.write("p", C.p)), C.r !== void 0 && w === void 0) throw Error("Invalid doc / op in makeInvertible: removed item missing from doc");
+          if (g != null && (I[g] = p.clone(), o(w !== void 0, "Operation picks up at an invalid key"), x[g] = w, v.write("p", C.p)), C.r !== void 0 && w === void 0) throw Error("Invalid doc / op in makeInvertible: removed item missing from doc");
           const S = ve(C);
           S && (S.makeInvertible ? O = !0 : y(v, S, f(C), !0));
         }
-        let B = 0;
+        let W = 0;
         for (const g of p) {
           v.descend(g);
-          const S = typeof g == "number" ? g - B : g, re = Y(w, S), te = $(p, v, re);
-          re !== te && (N || (N = !0, w = x(w)), te === void 0 ? (w = c(w, S), typeof g == "number" && B++) : w[S] = te), v.ascend();
+          const S = typeof g == "number" ? g - W : g, re = Y(w, S), te = N(p, v, re);
+          re !== te && (R || (R = !0, w = B(w)), te === void 0 ? (w = c(w, S), typeof g == "number" && W++) : w[S] = te), v.ascend();
         }
         return C && (C.r !== void 0 ? (v.write("r", t.default(w)), w = void 0) : C.p != null && (w = void 0)), w;
       };
-      return $(m, D, d), D.get(), O && (D.reset(), (function p(v, w, C, N, B) {
+      return N(m, D, d), D.get(), O && (D.reset(), (function p(v, w, C, R, W) {
         const g = w.getComponent();
         if (g) {
-          g.i !== void 0 ? (N = g.i, B = !0) : g.d != null && (N = R[g.d], v = I[g.d], B = !1, g.d);
-          let K = ve(g);
-          if (K && K.makeInvertible) {
+          g.i !== void 0 ? (R = g.i, W = !0) : g.d != null && (R = x[g.d], v = I[g.d], W = !1, g.d);
+          let $ = ve(g);
+          if ($ && $.makeInvertible) {
             const se = f(g);
-            y(C, K, K.makeInvertible(se, N), !0);
+            y(C, $, $.makeInvertible(se, R), !0);
           }
         }
         let S = 0, re = 0;
-        const te = r.advancer(v, (K, se) => _(se) ? S - K - 1 : K - S, (K, se) => {
+        const te = r.advancer(v, ($, se) => _(se) ? S - $ - 1 : $ - S, ($, se) => {
           _(se) && S++;
         });
-        for (const K of w) if (typeof K == "number") {
-          const se = K - re, Ne = te(se), Oe = se + S, ye = Y(N, B ? se : Oe);
-          C.descend(K), p(Ne, w, C, ye, B), s(w.getComponent()) && re++, C.ascend();
+        for (const $ of w) if (typeof $ == "number") {
+          const se = $ - re, Re = te(se), Oe = se + S, ye = Y(R, W ? se : Oe);
+          C.descend($), p(Re, w, C, ye, W), s(w.getComponent()) && re++, C.ascend();
         } else {
-          const se = Y(N, K);
-          C.descend(K), p(te(K), w, C, se, B), C.ascend();
+          const se = Y(R, $);
+          C.descend($), p(te($), w, C, se, W), C.ascend();
         }
         te.end();
       })(m.clone(), m, D, d, !1)), D.get();
@@ -1137,26 +1137,26 @@ function on() {
       };
       z(i), z(d);
       let O = null;
-      const I = [], R = [], $ = [], p = [], v = [], w = [], C = [], N = [], B = [], g = [], S = [], re = [], te = [], K = [], se = [];
-      let Ne = 0;
+      const I = [], x = [], N = [], p = [], v = [], w = [], C = [], R = [], W = [], g = [], S = [], re = [], te = [], $ = [], se = [];
+      let Re = 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()));
+      if ((function Q(A, G = null, M) {
+        const P = l(G);
+        P && (P.r !== void 0 ? M = G.clone() : P.p != null && (M = null, w[P.p] = A.clone()));
         const k = A.getComponent();
         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);
+        k && (J = k.p) != null && (v[J] = G ? G.clone() : null, N[J] = A.clone(), M && (g[J] = !0, W[J] = M), P && P.p != null && ($[J] = P.p));
+        const X = r.advancer(G);
         for (const ee of A) Q(A, X(ee), M);
         X.end();
-      })(ye, Oe, null), (function Q(A, W, M, P, k) {
+      })(ye, Oe, null), (function Q(A, G, M, P, k) {
         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 && (S[X] = !0), k = B[X] || null) : !k || D !== 1 && K[X] != null || O == null && (O = {
+        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, G = N[X] || null, g[X] ? (k && (S[X] = !0), k = W[X] || null) : !k || D !== 1 && $[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) : J.i !== void 0 && (A = W = null, ee = !0, k && O == null && (O = {
+          op2: a.moveOp(G.getPath(), M.getPath())
+        }), ee = !0) : J.i !== void 0 && (A = G = null, ee = !0, k && O == null && (O = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
           op1: a.removeOp(k.getPath()),
           op2: a.insertOp(M.getPath(), J.i)
@@ -1170,15 +1170,15 @@ function on() {
           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) => {
+        const H = r.advancer(G, (L, he) => _(he) ? ae - L - 1 : L - ae, (L, he) => {
           _(he) && ae++;
         }), T = r.advancer(A);
-        for (const G of M) if (typeof G == "number") {
-          const he = G - me, we = H(he);
+        for (const L of M) if (typeof L == "number") {
+          const he = L - me, we = H(he);
           me += +Q(T(he + ae), we, M, P, k);
         } else {
-          const he = H(G);
-          Q(T(G), he, M, P, k);
+          const he = H(L);
+          Q(T(L), he, M, P, k);
         }
         return H.end(), T.end(), ee;
       })(Oe, ye, ye.clone(), null, null), p.map((Q) => Q && Q.get()), O) return {
@@ -1188,57 +1188,57 @@ function on() {
       S.map((Q) => !!Q);
       const Pe = [];
       let Ae = null;
-      (function Q(A, W, M, P, k) {
+      (function Q(A, G, M, P, k) {
         let J = !1;
-        const X = l(W);
+        const X = l(G);
         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());
+          H != null ? (M = p[H], P = re[H] = r.writeCursor(), J = !0, k = null) : (M = null, k = G.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 && 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)));
+          H != null ? (k && (R[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) => {
+        const ae = r.advancer(G, void 0, (H, T) => {
           _(T) && fe++;
         }), me = r.advancer(M, (H, T) => s(T) ? ~(H - de) : H - de, (H, T) => {
           s(T) && de++;
         });
         if (A) for (const H of A) if (typeof H == "string") {
-          const T = ae(H), G = me(H);
-          P.descend(H), Q(A, T, G, P, k), P.ascend();
+          const T = ae(H), L = me(H);
+          P.descend(H), Q(A, T, L, P, k), P.ascend();
         } else {
-          const T = ae(H), G = H - fe, he = _(l(T)) ? null : me(G), we = G + de;
+          const T = ae(H), L = H - fe, he = _(l(T)) ? null : me(L), we = L + de;
           o(we >= 0), P.descend(we), Q(A, T, he, P, k), P.ascend();
         }
         ae.end(), me.end();
       })(Oe, ye, ye.clone(), oe, null), oe.reset();
-      let qe = [];
-      if ((function Q(A, W, M, P, k, J) {
-        o(W);
-        const X = W.getComponent();
+      let Ke = [];
+      if ((function Q(A, G, M, P, k, J) {
+        o(G);
+        const X = G.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(X)) {
           const j = X.d;
-          j != null && (R[j] = W.clone());
+          j != null && (x[j] = G.clone());
           const ie = j != null ? Pe[j] : null;
           let _e = !1;
           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, X.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 === $[ue] : n.default(ee.i, X.i), _e || ue != null && D !== 1 && $[ue] != null || O == null && (O = {
               type: u.ConflictType.DROP_COLLISION,
-              op1: de(j != null ? I[j] : null, W, X),
-              op2: de(ue != null ? $[ue] : null, P, ee)
+              op1: de(j != null ? I[j] : null, G, X),
+              op2: de(ue != null ? N[ue] : null, P, ee)
             })), _e || (J ? O == null && (O = {
               type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-              op1: de(j != null ? I[j] : null, W, X),
+              op1: de(j != null ? I[j] : null, G, X),
               op2: a.removeOp(J.getPath())
-            }) : (j != null ? (qe[Ne] = j, k.write("d", ie.p = Ne++)) : k.write("i", t.default(X.i)), fe = !0));
+            }) : (j != null ? (Ke[Re] = j, k.write("d", ie.p = Re++)) : k.write("i", t.default(X.i)), fe = !0));
           } else if (j != null && !ie) {
-            const ue = N[j];
+            const ue = R[j];
             ue && (J = ue.clone());
           }
           j != null ? (A = I[j], M = w[j], P = C[j]) : X.i !== void 0 && (A = M = null, _e || (P = null));
@@ -1246,7 +1246,7 @@ function on() {
         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, 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));
+          me.r !== void 0 && (!ae || ae.r === void 0) || g[j] ? (P = null, J = M.clone()) : j != null && (P = p[j], D !== 1 && $[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(X);
@@ -1254,7 +1254,7 @@ function on() {
           const j = f(X);
           if (J) O == null && (O = {
             type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-            op1: a.editOp(W.getPath(), H, j, !0),
+            op1: a.editOp(G.getPath(), H, j, !0),
             op2: a.removeOp(J.getPath())
           });
           else {
@@ -1268,37 +1268,37 @@ function on() {
             y(k, H, _e);
           }
         }
-        let T = 0, G = 0, he = 0, we = 0, xe = 0, Ke = 0, Me = A != null && A.descendFirst(), Ye = Me;
+        let T = 0, L = 0, he = 0, we = 0, Be = 0, $e = 0, Me = A != null && A.descendFirst(), Ye = Me;
         const Xe = r.advancer(M, void 0, (j, ie) => {
           _(ie) && he++;
         });
-        let je = P != null && P.descendFirst(), $e = je;
-        for (const j of W) if (typeof j == "number") {
+        let je = P != null && P.descendFirst(), Ne = je;
+        for (const j of G) if (typeof j == "number") {
           let ie;
-          const _e = s(W.getComponent()), ue = j - G;
+          const _e = s(G.getComponent()), ue = j - L;
           {
-            let We;
-            for (; Me && typeof (We = A.getKey()) == "number"; ) {
-              We += T;
+            let Ge;
+            for (; Me && typeof (Ge = A.getKey()) == "number"; ) {
+              Ge += T;
               const ke = A.getComponent(), Je = _(ke);
-              if (We > ue || We === ue && (!Je || D === 0 && _e)) break;
+              if (Ge > ue || Ge === ue && (!Je || D === 0 && _e)) break;
               if (Je) {
                 T--;
                 const Fe = ke.p;
-                K.includes(Fe), ke.d, l(te[ke.d]), _(l(te[ke.d])), (ke.r === void 0 || Ae && Ae.has(ke)) && (Fe == null || !Pe[Fe] || D !== 1 && K.includes(Fe)) || xe--;
+                $.includes(Fe), ke.d, l(te[ke.d]), _(l(te[ke.d])), (ke.r === void 0 || Ae && Ae.has(ke)) && (Fe == null || !Pe[Fe] || D !== 1 && $.includes(Fe)) || Be--;
               }
               Me = A.nextSibling();
             }
-            ie = Me && We === ue ? A : null;
+            ie = Me && Ge === ue ? A : null;
           }
           const Se = ue - T;
-          let Be = Xe(Se);
+          let We = Xe(Se);
           const ot = Se - he;
           let Qe = null;
           {
-            let We, ke;
-            for (; je && typeof (We = P.getKey()) == "number"; ) {
-              ke = We - we;
+            let Ge, ke;
+            for (; je && typeof (Ge = P.getKey()) == "number"; ) {
+              ke = Ge - we;
               const Je = P.getComponent(), Fe = s(Je);
               if (ke > ot) break;
               if (ke === ot) {
@@ -1311,82 +1311,82 @@ function on() {
                     Qe = P;
                     break;
                   }
-                  const Ge = Be && _(Be.getComponent());
-                  if (D === 0 && Ge) break;
+                  const Le = We && _(We.getComponent());
+                  if (D === 0 && Le) break;
                 }
               }
               if (Fe) {
-                const Ge = Je.d;
-                g[Ge], K[Ge], Je.i === void 0 && (g[Ge] || K[Ge] != null && D !== 1) ? (g[Ge] || K[Ge] != null && D === 0) && (we++, Ke--) : we++;
+                const Le = Je.d;
+                g[Le], $[Le], Je.i === void 0 && (g[Le] || $[Le] != null && D !== 1) ? (g[Le] || $[Le] != null && D === 0) && (we++, $e--) : we++;
               }
               je = P.nextSibling();
             }
           }
-          const _t = ot + we + xe + Ke;
-          o(_t >= 0, "trying to descend to a negative index"), k.descend(_t), _e && (ie = Be = Qe = null, G++), Q(ie, W, Be, Qe, k, J) && Ke++, k.ascend();
+          const _t = ot + we + Be + $e;
+          o(_t >= 0, "trying to descend to a negative index"), k.descend(_t), _e && (ie = We = Qe = null, L++), Q(ie, G, We, Qe, k, J) && $e++, 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);
           let Se;
           for (; je && (Se = P.getKey(), typeof Se != "string" || !(Se > j || Se === j)); ) je = P.nextSibling();
-          const Be = je && Se === j ? P : null;
-          k.descend(j), Q(_e, W, ue, Be, k, J), k.ascend();
+          const We = je && Se === j ? P : null;
+          k.descend(j), Q(_e, G, ue, We, k, J), k.ascend();
         }
-        return Xe.end(), Ye && A.ascend(), $e && P.ascend(), fe;
+        return Xe.end(), Ye && A.ascend(), Ne && P.ascend(), fe;
       })(Oe, Oe.clone(), ye, ye.clone(), oe, null), O) return {
         ok: !1,
         conflict: O
       };
       oe.reset();
-      const Te = (Q, A, W) => Q.traverse(A, (M, P) => {
-        M.d != null && W(M.d, Q, P);
+      const Te = (Q, A, G) => Q.traverse(A, (M, P) => {
+        M.d != null && G(M.d, Q, P);
       });
-      (g.length || re.length) && (Te(ye, oe, (Q, A, W) => {
-        g[Q] && !S[Q] && W.write("r", !0), re[Q] && W.mergeTree(re[Q].get());
+      (g.length || re.length) && (Te(ye, oe, (Q, A, G) => {
+        g[Q] && !S[Q] && G.write("r", !0), re[Q] && G.mergeTree(re[Q].get());
       }), oe.reset());
-      const Ie = [], Re = [];
+      const Ie = [], xe = [];
       if ((te.length || g.length) && !O) {
         const Q = r.readCursor(it(oe.get()));
-        if (Te(Q, null, (A, W) => {
-          Ie[A] = W.clone();
+        if (Te(Q, null, (A, G) => {
+          Ie[A] = G.clone();
         }), te.forEach((A) => {
-          A && Te(r.readCursor(A.get()), null, (W, M) => {
-            Ie[W] = M.clone();
+          A && Te(r.readCursor(A.get()), null, (G, M) => {
+            Ie[G] = M.clone();
           });
-        }), (function A(W, M, P, k, J, X) {
+        }), (function A(G, 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 = xe[T] = r.writeCursor();
           } else ee.r !== void 0 && (P = null);
           else s(l(P)) && (P = null);
-          const fe = W.getComponent();
+          const fe = G.getComponent();
           if (fe) {
             let T;
             if ((T = fe.d) != null) {
-              const G = te[T];
-              G && (G.get(), k.mergeTree(G.get()), P = r.readCursor(G.get()));
+              const L = te[T];
+              L && (L.get(), k.mergeTree(L.get()), P = r.readCursor(L.get()));
             }
           }
           let de = 0, ae = 0;
-          const me = r.advancer(M, void 0, (T, G) => {
-            _(G) && de--;
-          }), H = r.advancer(P, (T, G) => s(G) ? -(T - ae) - 1 : T - ae, (T, G) => {
-            s(G) && ae++;
+          const me = r.advancer(M, void 0, (T, L) => {
+            _(L) && de--;
+          }), H = r.advancer(P, (T, L) => s(L) ? -(T - ae) - 1 : T - ae, (T, L) => {
+            s(L) && 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();
-          } else k.descend(T), A(W, me(T), H(T), k), k.ascend();
+          for (const T of G) if (typeof T == "number") {
+            const L = me(T), he = T + de, we = H(he), Be = he + ae;
+            k.descend(Be), A(G, L, we, k), k.ascend();
+          } else k.descend(T), A(G, 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 (Te(W, oe, (M, P, k) => {
+        if (oe.get(), xe.length) {
+          const A = xe.map((M) => M ? M.get() : null), G = r.readCursor(it(oe.get()));
+          if (Te(G, oe, (M, P, k) => {
             const J = A[M];
             J && (k.mergeTree(J), A[M] = null);
           }), A.find((M) => M)) {
@@ -1394,11 +1394,11 @@ function on() {
             let k = 0, J = 0;
             A.forEach((X) => {
               X != null && Te(r.readCursor(X), null, (ee) => {
-                const fe = qe[ee];
-                M.writeMove(I[fe].getPath(), R[fe].getPath(), k++);
+                const fe = Ke[ee];
+                M.writeMove(I[fe].getPath(), x[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(), J++);
+                  g[ae] || D !== 1 && $[ae] != null || P.writeMove(N[ae].getPath(), p[ae].getPath(), J++);
                 });
               });
             }), O = {
@@ -1431,15 +1431,15 @@ function on() {
       return r.readCursor(i).traverse(d, (m, D) => {
         (s(m) || ve(m)) && D.write("r", !0);
       }), d.get();
-    }, $t = (i, d) => {
+    }, Nt = (i, d) => {
       const { type: m, op1: D, op2: O } = i;
       switch (m) {
         case u.ConflictType.DROP_COLLISION:
           return d === "left" ? [null, ze(O)] : [ze(D), null];
         case u.ConflictType.RM_UNEXPECTED_CONTENT:
           let I = !1;
-          return r.readCursor(D).traverse(null, (R) => {
-            R.r !== void 0 && (I = !0);
+          return r.readCursor(D).traverse(null, (x) => {
+            x.r !== void 0 && (I = !0);
           }), I ? [null, ze(O)] : [ze(D), null];
         case u.ConflictType.BLACKHOLE:
           return [ze(D), ze(O)];
@@ -1453,10 +1453,10 @@ function on() {
         const I = st(d, m, D);
         if (I.ok) return ne(O, I.result);
         {
-          const { conflict: R } = I;
-          i(R) || gt(R);
-          const [$, p] = $t(R, D);
-          d = ne(q(d), $), m = ne(q(m), p), O = ne(O, p);
+          const { conflict: x } = I;
+          i(x) || gt(x);
+          const [N, p] = Nt(x, D);
+          d = ne(K(d), N), m = ne(K(m), p), O = ne(O, p);
         }
       }
     }
@@ -1579,9 +1579,9 @@ class ln {
   }
   getBatchAddOp(e) {
     const n = [], t = [], r = [];
-    e.forEach((x) => {
-      const { op: _, invertOp: s } = this._addByParam(x);
-      n.push({ unitId: x.unitId, subUnitId: x.subUnitId, drawingId: x.drawingId }), t.push(_), r.push(s);
+    e.forEach((B) => {
+      const { op: _, invertOp: s } = this._addByParam(B);
+      n.push({ unitId: B.unitId, subUnitId: B.subUnitId, drawingId: B.drawingId }), t.push(_), r.push(s);
     });
     const u = t.reduce(V.type.compose, null), o = r.reduce(V.type.compose, null), { unitId: l, subUnitId: E } = e[0];
     return { undo: o, redo: u, unitId: l, subUnitId: E, objects: n };
@@ -1589,17 +1589,17 @@ class ln {
   getBatchRemoveOp(e) {
     const n = [], t = [];
     e.forEach((E) => {
-      const { op: x, invertOp: _ } = this._removeByParam(E);
-      n.unshift(x), t.push(_);
+      const { op: B, invertOp: _ } = this._removeByParam(E);
+      n.unshift(B), t.push(_);
     });
     const r = n.reduce(V.type.compose, null), u = t.reduce(V.type.compose, null), { unitId: o, subUnitId: l } = e[0];
     return { undo: u, redo: r, unitId: o, subUnitId: l, objects: e };
   }
   getBatchUpdateOp(e) {
     const n = [], t = [], r = [];
-    e.forEach((x) => {
-      const { op: _, invertOp: s } = this._updateByParam(x);
-      n.push({ unitId: x.unitId, subUnitId: x.subUnitId, drawingId: x.drawingId }), t.push(_), r.push(s);
+    e.forEach((B) => {
+      const { op: _, invertOp: s } = this._updateByParam(B);
+      n.push({ unitId: B.unitId, subUnitId: B.subUnitId, drawingId: B.drawingId }), t.push(_), r.push(s);
     });
     const u = t.reduce(V.type.compose, null), o = r.reduce(V.type.compose, null), { unitId: l, subUnitId: E } = e[0];
     return { undo: o, redo: u, unitId: l, subUnitId: E, objects: n };
@@ -1647,8 +1647,8 @@ class ln {
       return [];
     const o = this._getDrawingData(n, t), l = [];
     return Object.keys(o).forEach((E) => {
-      const x = o[E];
-      x.groupId === r && l.push(x);
+      const B = o[E];
+      B.groupId === r && l.push(B);
     }), l;
   }
   _getGroupDrawingOp(e) {
@@ -1657,10 +1657,10 @@ class ln {
       V.insertOp([r, u, "data", o], n)
     );
     let E = Number.NEGATIVE_INFINITY;
-    return t.forEach((x) => {
-      const { unitId: _, subUnitId: s, drawingId: c } = x, h = this._hasDrawingOrder({ unitId: _, subUnitId: s, drawingId: c });
+    return t.forEach((B) => {
+      const { unitId: _, subUnitId: s, drawingId: c } = B, h = this._hasDrawingOrder({ unitId: _, subUnitId: s, drawingId: c });
       E = Math.max(E, h), l.push(
-        ...this._getUpdateParamCompareOp(x, this.getDrawingByParam({ unitId: _, subUnitId: s, drawingId: c }))
+        ...this._getUpdateParamCompareOp(B, this.getDrawingByParam({ unitId: _, subUnitId: s, drawingId: c }))
       );
     }), E === Number.NEGATIVE_INFINITY && (E = this._getDrawingOrder(r, u).length), l.push(
       V.insertOp([r, u, "order", E], o)
@@ -1669,9 +1669,9 @@ class ln {
   _getUngroupDrawingOp(e) {
     const { parent: n, children: t } = e, { unitId: r, subUnitId: u, drawingId: o } = n, l = [];
     return t.forEach((E) => {
-      const { unitId: x, subUnitId: _, drawingId: s } = E;
+      const { unitId: B, subUnitId: _, drawingId: s } = E;
       l.push(
-        ...this._getUpdateParamCompareOp(E, this.getDrawingByParam({ unitId: x, subUnitId: _, drawingId: s }))
+        ...this._getUpdateParamCompareOp(E, this.getDrawingByParam({ unitId: B, subUnitId: _, drawingId: s }))
       );
     }), l.push(
       V.removeOp([r, u, "data", o], !0)
@@ -1790,8 +1790,8 @@ class ln {
       const { drawingId: c } = s, h = this._getDrawingCount(n, t) - 1, U = V.moveOp([n, t, "order", this._getDrawingOrder(n, t).indexOf(c)], [n, t, "order", h]);
       E.push(U), o.includes(l[h]) || o.push(l[h]);
     });
-    const x = E.reduce(V.type.compose, null);
-    return { undo: V.type.invertWithDoc(x, this.drawingManagerData), redo: x, unitId: n, subUnitId: t, objects: { ...e, drawingIds: o } };
+    const B = E.reduce(V.type.compose, null);
+    return { undo: V.type.invertWithDoc(B, this.drawingManagerData), redo: B, unitId: n, subUnitId: t, objects: { ...e, drawingIds: o } };
   }
   getBackDrawingsOp(e) {
     const { unitId: n, subUnitId: t, drawingIds: r } = e, u = this._getOrderFromSearchParams(n, t, r, !0), o = [...r], l = this.getDrawingOrder(n, t), E = [];
@@ -1799,8 +1799,8 @@ class ln {
       const { drawingId: c } = s, h = V.moveOp([n, t, "order", this._getDrawingOrder(n, t).indexOf(c)], [n, t, "order", 0]);
       E.push(h), o.includes(l[0]) || o.push(l[0]);
     });
-    const x = E.reduce(V.type.compose, null);
-    return { undo: V.type.invertWithDoc(x, this.drawingManagerData), redo: x, unitId: n, subUnitId: t, objects: { ...e, drawingIds: o } };
+    const B = E.reduce(V.type.compose, null);
+    return { undo: V.type.invertWithDoc(B, this.drawingManagerData), redo: B, unitId: n, subUnitId: t, objects: { ...e, drawingIds: o } };
   }
   _getDrawingCount(e, n) {
     return this.getDrawingOrder(e, n).length || 0;
@@ -1809,7 +1809,7 @@ class ln {
     return t.map((u) => {
       const o = this._hasDrawingOrder({ unitId: e, subUnitId: n, drawingId: u });
       return { drawingId: u, zIndex: o };
-    }).sort(r === !1 ? Wt : Gt);
+    }).sort(r === !1 ? Gt : Lt);
   }
   _hasDrawingOrder(e) {
     if (e == null)
@@ -1850,8 +1850,8 @@ class ln {
     const { unitId: n, subUnitId: t, drawingId: r } = e;
     if (this._establishDrawingMap(n, t, r) == null)
       return { op: [], invertOp: [] };
-    const o = V.removeOp([n, t, "data", r], !0), l = V.removeOp([n, t, "order", this._getDrawingOrder(n, t).indexOf(r)], !0), E = [o, l].reduce(V.type.compose, null), x = V.type.invertWithDoc(E, this.drawingManagerData);
-    return { op: E, invertOp: x };
+    const o = V.removeOp([n, t, "data", r], !0), l = V.removeOp([n, t, "order", this._getDrawingOrder(n, t).indexOf(r)], !0), E = [o, l].reduce(V.type.compose, null), B = V.type.invertWithDoc(E, this.drawingManagerData);
+    return { op: E, invertOp: B };
   }
   _updateByParam(e) {
     const { unitId: n, subUnitId: t, drawingId: r } = e, u = this._establishDrawingMap(n, t, r);
@@ -1870,9 +1870,9 @@ class ln {
   _getUpdateParamCompareOp(e, n) {
     const { unitId: t, subUnitId: r, drawingId: u } = e, o = [];
     return Object.keys(e).forEach((l) => {
-      const E = e[l], x = n[l];
-      x !== E && o.push(
-        V.replaceOp([t, r, "data", u, l], x, E)
+      const E = e[l], B = n[l];
+      B !== E && o.push(
+        V.replaceOp([t, r, "data", u, l], B, E)
       );
     }), o;
   }
@@ -1940,7 +1940,7 @@ class cn {
           t(new Error(et.ERROR_IMAGE)), this._decreaseWaiting();
           return;
         }
-        const l = Lt(6);
+        const l = qt(6);
         n({
           imageId: l,
           imageSourceType: at.BASE64,
@@ -1989,7 +1989,7 @@ let At = (ft = class extends Ht {
   }
 }, F(ft, "pluginName", hn), ft);
 At = fn([
-  dt(1, qt(Kt)),
+  dt(1, Kt($t)),
   dt(2, Ft),
   dt(3, Vt)
 ], At);