@univerjs/drawing 0.5.0-nightly.202411291606 → 0.5.1

package/lib/es/index.js

@@ -1,11 +1,12 @@
-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 Tt, Tools as Bt, Inject as Wt, Injector as Lt, Plugin as Gt, mergeOverrideWithDependencies as qt, IConfigService as Kt } from "@univerjs/core";
+var jt = Object.defineProperty;
+var $t = (a, e, n) => e in a ? jt(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n;
+var F = (a, e, n) => $t(a, typeof e != "symbol" ? e + "" : e, n);
+import { sortRules as Nt, sortRulesByDesc as Rt, createIdentifier as xt, ImageSourceType as at, ImageUploadStatusType as et, Tools as Bt, Inject as Wt, Injector as Gt, Plugin as Lt, mergeOverrideWithDependencies as qt, IConfigService as Kt, IImageIoService as Ft } from "@univerjs/core";
+import { IImageIoService as wn, ImageSourceType as bn, ImageUploadStatusType as Cn } from "@univerjs/core";
 import { Subject as be } from "rxjs";
-const pn = 500, gn = 500, yn = 10, Ft = 5 * 1024 * 1024, Vt = ["image/png", "image/jpeg", "image/jpg", "image/gif", "image/bmp"];
+const pn = 500, gn = 500, yn = 10, Vt = 5 * 1024 * 1024, Ht = ["image/png", "image/jpeg", "image/jpg", "image/gif", "image/bmp"];
 var Ve = {}, Ze = {}, tt = {}, _t;
-function Ht() {
+function zt() {
   if (_t) return tt;
   _t = 1, Object.defineProperty(tt, "__esModule", { value: !0 });
   function a(t, r) {
@@ -33,7 +34,7 @@ function Ht() {
   return tt.default = n, tt;
 }
 var nt = {}, vt;
-function zt() {
+function Xt() {
   if (vt) return nt;
   vt = 1, Object.defineProperty(nt, "__esModule", { value: !0 });
   function a(e) {
@@ -51,9 +52,9 @@ function zt() {
   }
   return nt.default = a, nt;
 }
-var lt = {}, Ot;
-function Ut() {
-  return Ot || (Ot = 1, function(a) {
+var lt = {}, mt;
+function At() {
+  return mt || (mt = 1, function(a) {
     Object.defineProperty(a, "__esModule", { value: !0 }), a.eachChildOf = a.advancer = a.readCursor = a.writeCursor = a.WriteCursor = a.ReadCursor = a.isValidPathItem = void 0;
     function e(_, s) {
       if (!_)
@@ -79,9 +80,9 @@ function Ut() {
       }
       getPath() {
         const s = [];
-        let c = this.container, h = this.parents.length - 1, j = this.idx;
-        for (; j >= 0; )
-          s.unshift(c[j]), j === 0 ? (j = this.indexes[h * 2], c = this.parents[h--]) : j -= n(c[j - 1]) ? 2 : 1;
+        let c = this.container, h = this.parents.length - 1, S = this.idx;
+        for (; S >= 0; )
+          s.unshift(c[S]), S === 0 ? (S = this.indexes[h * 2], c = this.parents[h--]) : S -= n(c[S - 1]) ? 2 : 1;
         return s;
       }
     }
@@ -111,8 +112,8 @@ function Ut() {
         const s = this.indexes[this.indexes.length - 1] + 1, c = this.parents[this.parents.length - 1];
         return s >= c.length ? !1 : (e(!isNaN(s)), this.indexes[this.indexes.length - 1] = s, this.container = c[s], !0);
       }
-      _init(s, c, h, j) {
-        this.container = s, this.idx = c, this.parents = h.slice(), this.indexes = j.slice();
+      _init(s, c, h, S) {
+        this.container = s, this.idx = c, this.parents = h.slice(), this.indexes = S.slice();
       }
       clone() {
         const s = new o();
@@ -132,17 +133,17 @@ function Ut() {
       traverse(s, c) {
         const h = this.getComponent();
         h && c(h, s);
-        for (const j of this)
-          s && s.descend(j), this.traverse(s, c), s && s.ascend();
+        for (const S of this)
+          s && s.descend(S), this.traverse(s, c), s && s.ascend();
       }
       eachPick(s, c) {
-        this.traverse(s, (h, j) => {
-          h.p != null && c(h.p, j);
+        this.traverse(s, (h, S) => {
+          h.p != null && c(h.p, S);
         });
       }
       eachDrop(s, c) {
-        this.traverse(s, (h, j) => {
-          h.d != null && c(h.d, j);
+        this.traverse(s, (h, S) => {
+          h.d != null && c(h.d, S);
         });
       }
     }
@@ -162,16 +163,16 @@ function Ut() {
             this.idx = h;
           else {
             if (!Array.isArray(this.container[h])) {
-              const j = this.container.splice(h, this.container.length - h);
-              this.container.push(j), this.lcIdx > -1 && (this.lcIdx = h);
+              const S = this.container.splice(h, this.container.length - h);
+              this.container.push(S), this.lcIdx > -1 && (this.lcIdx = h);
             }
             for (this.indexes.push(this.idx), this.parents.push(this.container), this.lcIdx !== -1 && (e(t(c, this.container[this.lcIdx][0])), h = this.lcIdx + 1, this.lcIdx = -1); h < this.container.length && t(c, this.container[h][0]); )
               h++;
             if (this.indexes.push(h), this.idx = 0, h < this.container.length && this.container[h][0] === c)
               this.container = this.container[h];
             else {
-              const j = [c];
-              this.container.splice(h, 0, j), this.container = j;
+              const S = [c];
+              this.container.splice(h, 0, S), this.container = S;
             }
           }
         }
@@ -216,15 +217,15 @@ function Ut() {
           return;
         if (e(Array.isArray(s)), s === this._op)
           throw Error("Cannot merge into my own tree");
-        const h = this.lcIdx, j = this.parents.length;
-        let J = 0;
+        const h = this.lcIdx, S = this.parents.length;
+        let Y = 0;
         for (let pe = 0; pe < s.length; pe++) {
           const Z = s[pe];
-          typeof Z == "string" || typeof Z == "number" ? (J++, this.descend(Z)) : Array.isArray(Z) ? this.mergeTree(Z, c) : typeof Z == "object" && c(Z, this);
+          typeof Z == "string" || typeof Z == "number" ? (Y++, this.descend(Z)) : Array.isArray(Z) ? this.mergeTree(Z, c) : typeof Z == "object" && c(Z, this);
         }
-        for (; J--; )
+        for (; Y--; )
           this.ascend();
-        this.lcIdx = this.parents.length === j ? h : -1;
+        this.lcIdx = this.parents.length === S ? h : -1;
       }
       at(s, c) {
         this.descendPath(s), c(this);
@@ -247,48 +248,48 @@ function Ut() {
     }
     a.WriteCursor = l, a.writeCursor = () => new l(), a.readCursor = (_) => new o(_);
     function E(_, s, c) {
-      let h, j;
-      j = h = _ ? _.descendFirst() : !1;
-      function J(pe) {
+      let h, S;
+      S = h = _ ? _.descendFirst() : !1;
+      function Y(pe) {
         let Z;
-        for (; j; ) {
+        for (; S; ) {
           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 Ge = !1;
+            if (s && typeof Ce == "number" && (Z = s(Ce, _.getComponent()), Z < 0 && (Z = ~Z, Ge = !0)), t(Z, pe))
               return null;
-            if (Z === pe && !Le)
+            if (Z === pe && !Ge)
               return _;
           }
-          c && typeof Z == "number" && c(Z, _.getComponent()), j = _.nextSibling();
+          c && typeof Z == "number" && c(Z, _.getComponent()), S = _.nextSibling();
         }
         return null;
       }
-      return J.end = () => {
+      return Y.end = () => {
         h && _.ascend();
-      }, J;
+      }, Y;
     }
     a.advancer = E;
     function x(_, s, c) {
-      let h, j, J, pe;
-      for (h = j = _ && _.descendFirst(), J = pe = s && s.descendFirst(); h || J; ) {
-        let Z = h ? _.getKey() : null, Ce = J ? s.getKey() : null;
-        Z !== null && Ce !== null && (t(Ce, Z) ? Ce = null : Z !== Ce && (Z = null)), c(Z == null ? Ce : Z, Z != null ? _ : null, Ce != null ? s : null), Z != null && h && (h = _.nextSibling()), Ce != null && J && (J = s.nextSibling());
+      let h, S, Y, pe;
+      for (h = S = _ && _.descendFirst(), Y = pe = s && s.descendFirst(); h || Y; ) {
+        let Z = h ? _.getKey() : null, Ce = Y ? s.getKey() : null;
+        Z !== null && Ce !== null && (t(Ce, Z) ? Ce = null : Z !== Ce && (Z = null)), c(Z == null ? Ce : Z, Z != null ? _ : null, Ce != null ? s : null), Z != null && h && (h = _.nextSibling()), Ce != null && Y && (Y = s.nextSibling());
       }
-      j && _.ascend(), pe && s.ascend();
+      S && _.ascend(), pe && s.ascend();
     }
     a.eachChildOf = x;
   }(lt)), lt;
 }
-var ut = {}, mt;
+var ut = {}, Ot;
 function Mt() {
-  return mt || (mt = 1, function(a) {
+  return Ot || (Ot = 1, function(a) {
     Object.defineProperty(a, "__esModule", { value: !0 }), a.ConflictType = void 0, function(e) {
       e[e.RM_UNEXPECTED_CONTENT = 1] = "RM_UNEXPECTED_CONTENT", e[e.DROP_COLLISION = 2] = "DROP_COLLISION", e[e.BLACKHOLE = 3] = "BLACKHOLE";
     }(a.ConflictType || (a.ConflictType = {}));
   }(ut)), ut;
 }
-var je = {}, He = {}, wt;
+var Se = {}, He = {}, 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) => {
     let n = 0, t = 0;
@@ -317,52 +318,52 @@ function ft() {
         throw Error("Op must be an array of components");
       let y = null;
       for (let b = 0; b < f.length; b++) {
-        const G = f[b];
-        switch (typeof G) {
+        const L = f[b];
+        switch (typeof L) {
           case "object":
-            if (typeof G.d != "number" && typeof G.d != "string")
+            if (typeof L.d != "number" && typeof L.d != "string")
               throw Error("Delete must be number or string");
-            if (a.dlen(G.d) <= 0)
+            if (a.dlen(L.d) <= 0)
               throw Error("Deletes must not be empty");
             break;
           case "string":
-            if (!(G.length > 0))
+            if (!(L.length > 0))
               throw Error("Inserts cannot be empty");
             break;
           case "number":
-            if (!(G > 0))
+            if (!(L > 0))
               throw Error("Skip components must be >0");
             if (typeof y == "number")
               throw Error("Adjacent skip components should be combined");
             break;
         }
-        y = G;
+        y = L;
       }
       if (typeof y == "number")
         throw Error("Op has a trailing skip");
     };
     function t(f, y) {
-      let b = 0, G = 0;
+      let b = 0, L = 0;
       for (let z = 0; z < f.length; z++) {
         const q = f[z];
-        switch (y(q, b, G), typeof q) {
+        switch (y(q, b, L), typeof q) {
           case "object":
             b += a.dlen(q.d);
             break;
           case "string":
-            G += e.strPosToUni(q);
+            L += e.strPosToUni(q);
             break;
           case "number":
-            b += q, G += q;
+            b += q, L += q;
             break;
         }
       }
     }
     a.eachOp = t;
     function r(f, y) {
-      const b = [], G = l(b);
+      const b = [], L = l(b);
       return t(f, (z, q, Ee) => {
-        G(y(z, q, Ee));
+        L(y(z, q, Ee));
       }), s(b);
     }
     const u = (f) => f, o = (f) => r(f, u);
@@ -380,8 +381,8 @@ function ft() {
         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 G = e.uniToStrPos(f, y), z = b == null ? 1 / 0 : e.uniToStrPos(f, b);
-      return f.slice(G, z);
+      const L = e.uniToStrPos(f, y), z = b == null ? 1 / 0 : e.uniToStrPos(f, b);
+      return f.slice(L, z);
     };
     const x = (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;
@@ -413,7 +414,7 @@ function ft() {
       if (b !== "left" && b !== "right")
         throw Error("side (" + b + ") must be 'left' or 'right'");
       n(f), n(y);
-      const G = [], z = l(G), { take: q, peek: Ee } = _(f);
+      const L = [], z = l(L), { take: q, peek: Ee } = _(f);
       for (let ne = 0; ne < y.length; ne++) {
         const le = y[ne];
         let ge, De;
@@ -443,21 +444,21 @@ function ft() {
       let ce;
       for (; ce = q(-1); )
         z(ce);
-      return s(G);
+      return s(L);
     }
     function h(f, y) {
       n(f), n(y);
-      const b = [], G = l(b), { take: z } = _(f);
+      const b = [], L = 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"), G(le), typeof le != "object" && (ne -= E(le));
+              le = z(ne, "d"), L(le), typeof le != "object" && (ne -= E(le));
             break;
           case "string":
-            G(ce);
+            L(ce);
             break;
           case "object":
             ne = a.dlen(ce.d);
@@ -465,26 +466,26 @@ function ft() {
             for (; ge < ne; )
               switch (le = z(ne - ge, "d"), typeof le) {
                 case "number":
-                  G({ d: x(ce.d, ge, ge + le) }), ge += le;
+                  L({ d: x(ce.d, ge, ge + le) }), ge += le;
                   break;
                 case "string":
                   ge += e.strPosToUni(le);
                   break;
                 case "object":
-                  G(le);
+                  L(le);
               }
             break;
         }
       }
       let q;
       for (; q = z(-1); )
-        G(q);
+        L(q);
       return s(b);
     }
-    const j = (f, y) => {
+    const S = (f, y) => {
       let b = 0;
-      for (let G = 0; G < y.length && f > b; G++) {
-        const z = y[G];
+      for (let L = 0; L < y.length && f > b; L++) {
+        const z = y[L];
         switch (typeof z) {
           case "number": {
             b += z;
@@ -500,9 +501,9 @@ function ft() {
         }
       }
       return f;
-    }, J = (f, y) => typeof f == "number" ? j(f, y) : f.map((b) => j(b, y));
+    }, Y = (f, y) => typeof f == "number" ? S(f, y) : f.map((b) => S(b, y));
     function pe(f, y, b) {
-      return r(f, (G, z) => typeof G == "object" && typeof G.d == "number" ? { d: b.slice(y, z, z + G.d) } : G);
+      return r(f, (L, z) => typeof L == "object" && typeof L.d == "number" ? { d: b.slice(y, z, z + L.d) } : L);
     }
     function Z(f) {
       return r(f, (y) => {
@@ -523,7 +524,7 @@ function ft() {
     function Ce(f) {
       return r(f, (y) => typeof y == "object" && typeof y.d == "string" ? { d: e.strPosToUni(y.d) } : y);
     }
-    function Le(f) {
+    function Ge(f) {
       let y = !0;
       return t(f, (b) => {
         typeof b == "object" && typeof b.d == "number" && (y = !1);
@@ -550,28 +551,28 @@ function ft() {
          */
         apply(y, b) {
           n(b);
-          const G = f.builder(y);
+          const L = f.builder(y);
           for (let z = 0; z < b.length; z++) {
             const q = b[z];
             switch (typeof q) {
               case "number":
-                G.skip(q);
+                L.skip(q);
                 break;
               case "string":
-                G.append(q);
+                L.append(q);
                 break;
               case "object":
-                G.del(a.dlen(q.d));
+                L.del(a.dlen(q.d));
                 break;
             }
           }
-          return G.build();
+          return L.build();
         },
         transform: c,
         compose: h,
-        transformPosition: j,
-        transformSelection: J,
-        isInvertible: Le,
+        transformPosition: S,
+        transformSelection: Y,
+        isInvertible: Ge,
         makeInvertible(y, b) {
           return pe(y, b, f);
         },
@@ -587,7 +588,7 @@ function ft() {
   }(ct)), ct;
 }
 var rt = {}, Ct;
-function Xt() {
+function Jt() {
   if (Ct) return rt;
   Ct = 1, Object.defineProperty(rt, "__esModule", { value: !0 });
   const a = ft(), e = ht();
@@ -633,26 +634,26 @@ function Xt() {
 var It;
 function Yt() {
   return It || (It = 1, function(a) {
-    var e = je && je.__createBinding || (Object.create ? function(c, h, j, J) {
-      J === void 0 && (J = j), Object.defineProperty(c, J, { enumerable: !0, get: function() {
-        return h[j];
+    var e = Se && Se.__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, j, J) {
-      J === void 0 && (J = j), c[J] = h[j];
-    }), n = je && je.__setModuleDefault || (Object.create ? function(c, h) {
+    } : function(c, h, S, Y) {
+      Y === void 0 && (Y = S), c[Y] = h[S];
+    }), n = Se && Se.__setModuleDefault || (Object.create ? function(c, h) {
       Object.defineProperty(c, "default", { enumerable: !0, value: h });
     } : function(c, h) {
       c.default = h;
-    }), t = je && je.__importStar || function(c) {
+    }), t = Se && Se.__importStar || function(c) {
       if (c && c.__esModule) return c;
       var h = {};
-      if (c != null) for (var j in c) Object.hasOwnProperty.call(c, j) && e(h, c, j);
+      if (c != null) for (var S in c) Object.hasOwnProperty.call(c, S) && e(h, c, S);
       return n(h, c), h;
-    }, r = je && je.__importDefault || function(c) {
+    }, r = Se && Se.__importDefault || function(c) {
       return c && c.__esModule ? c : { default: c };
     };
     Object.defineProperty(a, "__esModule", { value: !0 }), a.type = a.remove = a.insert = void 0;
-    const u = ht(), o = t(ft()), l = r(Xt()), E = {
+    const u = ht(), o = t(ft()), l = r(Jt()), E = {
       create(c) {
         return c;
       },
@@ -664,17 +665,17 @@ function Yt() {
           throw Error("Invalid document snapshot: " + c);
         const h = [];
         return {
-          skip(j) {
-            let J = u.uniToStrPos(c, j);
-            if (J > c.length)
+          skip(S) {
+            let Y = u.uniToStrPos(c, S);
+            if (Y > c.length)
               throw Error("The op is too long for this document");
-            h.push(c.slice(0, J)), c = c.slice(J);
+            h.push(c.slice(0, Y)), c = c.slice(Y);
           },
-          append(j) {
-            h.push(j);
+          append(S) {
+            h.push(S);
           },
-          del(j) {
-            c = c.slice(u.uniToStrPos(c, j));
+          del(S) {
+            c = c.slice(u.uniToStrPos(c, S));
           },
           build() {
             return h.join("") + c;
@@ -688,10 +689,10 @@ function Yt() {
     Object.defineProperty(a, "makeType", { enumerable: !0, get: function() {
       return s.default;
     } });
-  }(je)), je;
+  }(Se)), Se;
 }
 var Et;
-function Jt() {
+function Zt() {
   return Et || (Et = 1, function(a) {
     var e = Ze && Ze.__importDefault || function(i) {
       return i && i.__esModule ? i : {
@@ -701,7 +702,7 @@ function Jt() {
     Object.defineProperty(a, "__esModule", {
       value: !0
     }), a.editOp = a.replaceOp = a.insertOp = a.moveOp = a.removeOp = a.type = void 0;
-    const n = e(Ht()), t = e(zt()), r = Ut(), u = Mt();
+    const n = e(zt()), t = e(Xt()), r = At(), u = Mt();
     function o(i, d) {
       if (!i) throw new Error(d);
     }
@@ -720,17 +721,17 @@ function Jt() {
       apply: Ee,
       transformPosition: ce,
       compose: ne,
-      tryTransform: ot,
-      transform: jt,
+      tryTransform: st,
+      transform: kt,
       makeInvertible: De,
       invert: le,
-      invertWithDoc: kt,
+      invertWithDoc: Ut,
       RM_UNEXPECTED_CONTENT: u.ConflictType.RM_UNEXPECTED_CONTENT,
       DROP_COLLISION: u.ConflictType.DROP_COLLISION,
       BLACKHOLE: u.ConflictType.BLACKHOLE,
-      transformNoConflict: (i, d, O) => gt(() => !0, i, d, O),
+      transformNoConflict: (i, d, m) => gt(() => !0, i, d, m),
       typeAllowingConflictsPred: (i) => Object.assign(Object.assign({}, a.type), {
-        transform: (d, O, D) => gt(i, d, O, D)
+        transform: (d, m, D) => gt(i, d, m, D)
       })
     };
     const l = (i) => i ? i.getComponent() : null;
@@ -741,13 +742,13 @@ function Jt() {
     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;
     }
-    function h(i, d, O) {
-      return typeof d == "number" ? (o(i != null, "Container is missing for key"), o(Array.isArray(i), "Cannot use numerical key for object container"), o(i.length >= d, "Cannot insert into out of bounds index"), i.splice(d, 0, O)) : (o(E(i), "Cannot insert into missing item"), o(i[d] === void 0, "Trying to overwrite value at key. Your op needs to remove it first"), i[d] = O), O;
+    function h(i, d, m) {
+      return typeof d == "number" ? (o(i != null, "Container is missing for key"), o(Array.isArray(i), "Cannot use numerical key for object container"), o(i.length >= d, "Cannot insert into out of bounds index"), i.splice(d, 0, m)) : (o(E(i), "Cannot insert into missing item"), o(i[d] === void 0, "Trying to overwrite value at key. Your op needs to remove it first"), i[d] = m), m;
     }
-    a.removeOp = (i, d = !0) => r.writeCursor().writeAtPath(i, "r", d).get(), a.moveOp = (i, d) => r.writeCursor().writeMove(i, d).get(), a.insertOp = (i, d) => r.writeCursor().writeAtPath(i, "i", d).get(), a.replaceOp = (i, d, O) => r.writeCursor().at(i, (D) => {
-      D.write("r", d), D.write("i", O);
-    }).get(), a.editOp = (i, d, O, D = !1) => r.writeCursor().at(i, (m) => y(m, d, O, D)).get();
-    const j = (i, d) => i != null && (typeof d == "number" ? Array.isArray(i) : typeof i == "object"), J = (i, d) => j(i, d) ? i[d] : void 0, pe = {};
+    a.removeOp = (i, d = !0) => r.writeCursor().writeAtPath(i, "r", d).get(), a.moveOp = (i, d) => r.writeCursor().writeMove(i, d).get(), a.insertOp = (i, d) => r.writeCursor().writeAtPath(i, "i", d).get(), a.replaceOp = (i, d, m) => r.writeCursor().at(i, (D) => {
+      D.write("r", d), D.write("i", m);
+    }).get(), a.editOp = (i, d, m, D = !1) => r.writeCursor().at(i, (O) => y(O, d, m, D)).get();
+    const S = (i, d) => i != null && (typeof d == "number" ? Array.isArray(i) : typeof i == "object"), Y = (i, d) => S(i, d) ? i[d] : void 0, pe = {};
     function Z(i) {
       let d = i.type ? i.type : i;
       d.name && (pe[d.name] = d), d.uri && (pe[d.uri] = d);
@@ -758,32 +759,32 @@ function Jt() {
       throw Error("Missing type: " + i);
     };
     Z(Yt());
-    const Le = (i, d) => i + d;
+    const Ge = (i, d) => i + d;
     Z({
       name: "number",
-      apply: Le,
-      compose: Le,
+      apply: Ge,
+      compose: Ge,
       invert: (i) => -i,
       transform: (i) => i
     });
-    const ve = (i) => i == null ? null : i.et ? Ce(i.et) : i.es ? pe["text-unicode"] : i.ena != null ? pe.number : null, f = (i) => i.es ? i.es : i.ena != null ? i.ena : i.e, y = (i, d, O, D = !1) => {
-      const [m, I] = typeof d == "string" ? [Ce(d), d] : [d, d.name];
-      !D && m.isNoop && m.isNoop(O) || (I === "number" ? i.write("ena", O) : I === "text-unicode" ? i.write("es", O) : (i.write("et", I), i.write("e", O)));
+    const ve = (i) => i == null ? null : i.et ? Ce(i.et) : i.es ? pe["text-unicode"] : i.ena != null ? pe.number : null, f = (i) => i.es ? i.es : i.ena != null ? i.ena : i.e, y = (i, d, m, D = !1) => {
+      const [O, I] = typeof d == "string" ? [Ce(d), d] : [d, d.name];
+      !D && O.isNoop && O.isNoop(m) || (I === "number" ? i.write("ena", m) : I === "text-unicode" ? i.write("es", m) : (i.write("et", I), i.write("e", m)));
     };
     function b(i) {
       o(typeof i == "number"), o(i >= 0), o(i === (0 | i));
     }
-    function G(i) {
+    function L(i) {
       typeof i == "number" ? b(i) : o(typeof i == "string");
     }
     function z(i) {
       if (i === null) return;
-      const d = /* @__PURE__ */ new Set(), O = /* @__PURE__ */ new Set(), D = (I) => {
+      const d = /* @__PURE__ */ new Set(), m = /* @__PURE__ */ new Set(), D = (I) => {
         let R = !0, $ = !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);
-          else if (p === "d") b(v), o(!O.has(v)), O.add(v), o(I.i === 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;
             const w = ve(I);
@@ -791,38 +792,38 @@ function Jt() {
           }
         }
         o(!R);
-      }, m = (I, R, $) => {
+      }, O = (I, R, $) => {
         if (!Array.isArray(I)) throw Error("Op must be null or a list");
         if (I.length === 0) throw Error("Empty descent");
-        R || G(I[0]);
+        R || L(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 = m(N, !1);
+            const B = O(N, !1);
             if (v) {
-              const g = typeof w, M = typeof B;
-              g === M ? o(w < B, "descent keys are not in order") : o(g === "number" && M === "string");
+              const g = typeof w, U = typeof B;
+              g === U ? o(w < B, "descent keys are not in order") : o(g === "number" && U === "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), G(N), o(r.isValidPathItem(N), "Invalid path key"), p = 1);
+          } 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);
         }
         return o(v !== 1, "Operation makes multiple descents. Remove some []"), o(p === 2 || p === 3), I[0];
       };
-      m(i, !0), o(d.size === O.size, "Mismatched picks and drops in op");
-      for (let I = 0; I < d.size; I++) o(d.has(I)), o(O.has(I));
+      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) {
-      let d = 0, O = [];
+      let d = 0, m = [];
       const D = r.writeCursor();
-      return D.mergeTree(i, (m, I) => {
-        const R = ve(m);
+      return D.mergeTree(i, (O, I) => {
+        const R = ve(O);
         if (R) {
-          const p = f(m);
+          const p = f(O);
           y(I, R, R.normalize ? R.normalize(p) : p);
         }
-        for (const p of ["r", "p", "i", "d"]) if (m[p] !== void 0) {
-          const v = p === "p" || p === "d" ? ($ = m[p], O[$] == null && (O[$] = d++), O[$]) : m[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];
           I.write(p, v);
         }
         var $;
@@ -830,15 +831,15 @@ function Jt() {
     }
     function Ee(i, d) {
       if (z(d), d === null) return i;
-      const O = [];
-      return function D(m, I) {
-        let R = m, $ = 0, p = {
-          root: m
+      const m = [];
+      return function D(O, I) {
+        let R = O, $ = 0, p = {
+          root: O
         }, v = 0, w = p, C = "root";
         function N() {
           for (; v < $; v++) {
             let B = I[v];
-            typeof B != "object" && (o(j(w, C)), w = w[C] = x(w[C]), C = B);
+            typeof B != "object" && (o(S(w, C)), w = w[C] = x(w[C]), C = B);
           }
         }
         for (; $ < I.length; $++) {
@@ -847,44 +848,44 @@ function Jt() {
             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, O[B.d])) : B.i !== void 0 && (N(), R = h(w, C, B.i));
+            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 = J(R, B);
+          } else R = Y(R, B);
         }
         return p.root;
-      }(i = function D(m, I) {
+      }(i = function D(O, I) {
         const R = [];
         let $ = 0;
         for (; $ < I.length; $++) {
           const C = I[$];
           if (Array.isArray(C)) break;
-          typeof C != "object" && (R.push(m), m = J(m, C));
+          typeof C != "object" && (R.push(O), O = Y(O, C));
         }
-        for (let C = I.length - 1; C >= $; C--) m = D(m, I[C]);
+        for (let C = I.length - 1; C >= $; C--) O = D(O, I[C]);
         for (--$; $ >= 0; $--) {
           const C = I[$];
           if (typeof C != "object") {
             const N = R.pop();
-            m = m === J(N, C) ? N : m === void 0 ? c(N, C) : (v = C, w = m, (p = x(p = N))[v] = w, p);
-          } else _(C) && (o(m !== void 0, "Cannot pick up or remove undefined"), C.p != null && (O[C.p] = m), m = void 0);
+            O = O === Y(N, C) ? N : O === void 0 ? c(N, C) : (v = C, w = O, (p = x(p = N))[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;
-        return m;
+        return O;
       }(i, d), d);
     }
     function ce(i, d) {
       i = i.slice(), z(d);
-      const O = r.readCursor(d);
-      let D, m, I = !1;
+      const m = r.readCursor(d);
+      let D, O, I = !1;
       const R = [];
       for (let p = 0; ; p++) {
-        const v = i[p], w = O.getComponent();
-        if (w && (w.r !== void 0 ? I = !0 : w.p != null && (I = !1, D = w.p, m = p)), p >= i.length) break;
+        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(O, void 0, (g, M) => {
-          _(M) && C++;
+        const N = r.advancer(m, void 0, (g, U) => {
+          _(U) && C++;
         });
         R.unshift(N);
         const B = N(v);
@@ -894,178 +895,178 @@ function Jt() {
       const $ = () => {
         let p = 0;
         if (D != null) {
-          const v = O.getPath();
-          p = v.length, i = v.concat(i.slice(m));
+          const v = m.getPath();
+          p = v.length, i = v.concat(i.slice(O));
         }
         for (; p < i.length; p++) {
-          const v = i[p], w = l(O), C = ve(w);
+          const v = i[p], w = l(m), C = ve(w);
           if (C) {
             const g = f(w);
             C.transformPosition && (i[p] = C.transformPosition(i[p], g));
             break;
           }
           let N = 0;
-          const B = r.advancer(O, (g, M) => s(M) ? ~(g - N) : g - N, (g, M) => {
-            s(M) && N++;
+          const B = r.advancer(m, (g, U) => s(U) ? ~(g - N) : g - N, (g, U) => {
+            s(U) && N++;
           })(v);
           if (typeof v == "number" && (i[p] += N), !B) break;
         }
       };
-      return D != null ? O.eachDrop(null, (p) => {
+      return D != null ? m.eachDrop(null, (p) => {
         p === D && $();
       }) : $(), i;
     }
     function ne(i, d) {
       if (z(i), z(d), i == null) return d;
       if (d == null) return i;
-      let O = 0;
-      const D = r.readCursor(i), m = r.readCursor(d), I = r.writeCursor(), R = [], $ = [], p = [], v = [], w = [], C = [], N = /* @__PURE__ */ new Set();
+      let m = 0;
+      const D = r.readCursor(i), O = r.readCursor(d), I = r.writeCursor(), R = [], $ = [], p = [], v = [], w = [], C = [], N = /* @__PURE__ */ new Set();
       D.traverse(null, (g) => {
         g.p != null && (p[g.p] = D.clone());
-      }), m.traverse(null, (g) => {
-        g.d != null && (v[g.d] = m.clone());
+      }), O.traverse(null, (g) => {
+        g.d != null && (v[g.d] = O.clone());
       });
       const B = r.writeCursor();
-      return function g(M, re, te, K, se, Ne, me, ye) {
+      return function g(U, re, te, K, se, Ne, Oe, ye) {
         o(re || te);
-        const oe = l(re), Pe = l(te), Te = !!Pe && Pe.r !== void 0, Ge = !!oe && oe.i !== void 0, Ae = oe ? oe.d : null, Ie = Pe ? Pe.p : null, Re = (Ne || Te) && Ie == null;
-        if (Ie != null) K = v[Ie], me = $[Ie] = new r.WriteCursor();
+        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;
+        if (Ie != null) K = v[Ie], Oe = $[Ie] = new r.WriteCursor();
         else if (Pe && Pe.r !== void 0) K = null;
         else {
-          const A = l(K);
-          A && A.d != null && (K = null);
+          const T = l(K);
+          T && T.d != null && (K = null);
         }
         const Q = l(K);
-        if (Ae != null) if (M = p[Ae], ye = R[Ae] = new r.WriteCursor(), Re) Ne && !Te && ye.write("r", !0);
+        if (Te != null) if (U = p[Te], ye = R[Te] = new r.WriteCursor(), Re) Ne && !Ae && ye.write("r", !0);
         else {
-          const A = w[Ae] = O++;
-          me.write("d", A);
+          const T = w[Te] = m++;
+          Oe.write("d", T);
         }
-        else if (oe && oe.i !== void 0) M = null;
+        else if (oe && oe.i !== void 0) U = null;
         else {
-          const A = l(M);
-          A && A.p != null && (M = null);
+          const T = l(U);
+          T && T.p != null && (U = null);
         }
-        let T;
-        Ge ? (o(se === void 0), T = oe.i) : T = se;
-        const W = (Ie == null ? !Ge || Ne || Te : T === void 0) ? null : me.getComponent();
+        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();
         if (Ie != null) {
-          if (!(se !== void 0 || Ge)) {
-            const A = Ae != null ? w[Ae] : O++;
-            C[Ie] = A, ye.write("p", A);
+          if (!(se !== void 0 || Le)) {
+            const T = Te != null ? w[Te] : m++;
+            C[Ie] = T, ye.write("p", T);
           }
-        } else Te && (Ge || se !== void 0 || (Pe.r, ye.write("r", Pe.r)));
-        const U = Re ? null : ve(oe), P = ve(Q);
-        if ((U || P) && (U && U.name, P && P.name), U && P) {
-          o(U === P);
-          const A = f(oe), L = f(Q), he = U.compose(A, L);
-          y(me, U, he), N.add(Q);
-        } else U ? y(me, U, f(oe)) : P && (y(me, P, f(Q)), N.add(Q));
-        const k = typeof T == "object" && T != null;
-        let X = !1, Y = 0, ee = 0, fe = 0, de = 0, ae = 0;
-        const Oe = r.advancer(K, (A, L) => s(L) ? de - A - 1 : A - de, (A, L) => {
-          s(L) && de++;
-        }), H = r.advancer(M, (A, L) => _(L) ? Y - A - 1 : A - Y, (A, L) => {
-          _(L) && Y++;
+        } else Ae && (Le || se !== void 0 || (Pe.r, ye.write("r", Pe.r)));
+        const M = Re ? 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;
+        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++;
         });
-        if (r.eachChildOf(re, te, (A, L, he) => {
-          let we, xe, qe = A, Ue = A, Je = A;
-          if (typeof A == "number") {
-            let _e = A + fe;
-            xe = Oe(_e), Ue = _e + de;
-            let ue = A + ee;
-            we = H(ue), s(l(xe)) && (we = null), qe = ue + Y, Je = A + ae, o(qe >= 0, "p1PickKey is negative"), o(Ue >= 0, "p2DropKey is negative");
-            const Me = s(l(L)), Be = _(l(he));
-            (Me || Be && !Re) && ae--, Me && ee--, Be && fe--;
-          } else we = H(A), xe = Oe(A);
-          ye.descend(qe), me.descend(Ue);
-          const Xe = k && !s(l(L)) ? T[Je] : void 0, Se = g(we, L, he, xe, Xe, Re, me, ye);
-          var $e, S, ie;
-          k && !Re ? Xe !== Se && (X || (T = Array.isArray(T) ? T.slice() : Object.assign({}, T), X = !0), $e = T, ie = Se, typeof (S = Je) == "number" ? (o(Array.isArray($e)), o(S < $e.length)) : (o(!Array.isArray($e)), o($e[S] !== void 0)), ie === void 0 ? typeof S == "number" ? $e.splice(S, 1) : delete $e[S] : $e[S] = ie) : o(Se === void 0), me.ascend(), ye.ascend();
-        }), H.end(), Oe.end(), W != null) W.i = T;
-        else if (!Ne && !Te && Ie == null) return T;
-      }(D, D.clone(), m, m.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, M) => {
+        if (r.eachChildOf(re, te, (T, G, he) => {
+          let we, xe, qe = T, Me = T, Ye = T;
+          if (typeof T == "number") {
+            let _e = T + fe;
+            xe = 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);
+          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();
+        }), 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, U) => {
         const re = g.p;
         if (re != null) {
           const te = w[re];
-          te != null && M.write("p", te);
+          te != null && U.write("p", te);
           const K = R[re];
-          K && K.get(), K && M.mergeTree(K.get());
-        } else g.r !== void 0 && M.write("r", g.r);
-      }), I.reset(), I.get(), m.traverse(I, (g, M) => {
+          K && K.get(), K && U.mergeTree(K.get());
+        } else g.r !== void 0 && U.write("r", g.r);
+      }), I.reset(), I.get(), O.traverse(I, (g, U) => {
         const re = g.d;
         if (re != null) {
           const K = C[re];
-          K != null && M.write("d", K);
+          K != null && U.write("d", K);
           const se = $[re];
-          se && M.mergeTree(se.get());
-        } else g.i !== void 0 && M.write("i", g.i);
+          se && U.mergeTree(se.get());
+        } else g.i !== void 0 && U.write("i", g.i);
         const te = ve(g);
-        te && !N.has(g) && y(M, te, f(g));
+        te && !N.has(g) && y(U, te, f(g));
       }), I.get();
     }
     function le(i) {
       if (i == null) return null;
-      const d = new r.ReadCursor(i), O = new r.WriteCursor();
+      const d = new r.ReadCursor(i), m = new r.WriteCursor();
       let D;
-      const m = [], I = [];
+      const O = [], I = [];
       return function R($, p, v) {
         const w = $.getComponent();
         let C, N = !1;
         if (w) {
-          w.p != null && (p.write("d", w.p), m[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] = $.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));
         }
         let B = 0;
         for (const g of $) {
           p.descend(g);
-          const M = typeof g == "number" ? g - B : g, re = J(v, M);
+          const U = typeof g == "number" ? g - B : g, re = Y(v, U);
           s($.getComponent()) && B++;
           const te = R($, p, re);
           if (v !== void 0 && te !== void 0) {
-            if (N || (N = !0, v = x(v)), !j(v, M)) throw Error("Cannot modify child - invalid operation");
-            v[M] = te;
+            if (N || (N = !0, v = x(v)), !S(v, U)) throw Error("Cannot modify child - invalid operation");
+            v[U] = te;
           }
           p.ascend();
         }
         if (C === void 0) return N ? v : void 0;
         p.write("r", v);
-      }(d, O, void 0), D && (O.reset(), function R($, p, v) {
+      }(d, m, void 0), D && (m.reset(), function R($, p, v) {
         const w = p.getComponent();
         if (w) {
           const g = w.d;
-          if (g != null && ($ = m[g], v = I[g] = r.writeCursor()), D.has(w)) {
-            const M = ve(w);
-            if (!M.invert) throw Error(`Cannot invert subtype ${M.name}`);
-            y(v, M, M.invert(f(w)));
+          if (g != null && ($ = O[g], v = I[g] = r.writeCursor()), D.has(w)) {
+            const U = ve(w);
+            if (!U.invert) throw Error(`Cannot invert subtype ${U.name}`);
+            y(v, U, U.invert(f(w)));
           }
         }
         let C = 0, N = 0;
-        const B = r.advancer($, (g, M) => _(M) ? C - g - 1 : g - C, (g, M) => {
-          _(M) && C++;
+        const B = r.advancer($, (g, U) => _(U) ? C - g - 1 : g - C, (g, U) => {
+          _(U) && C++;
         });
         for (const g of p) if (typeof g == "number") {
-          const M = g - N, re = B(M), te = M + C;
+          const U = g - N, re = B(U), te = U + 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, O), I.length && (O.reset(), d.traverse(O, (R, $) => {
+      }(d.clone(), d, m), I.length && (m.reset(), d.traverse(m, (R, $) => {
         const p = R.p;
         if (p != null) {
           const v = I[p];
           v && v.get(), v && $.mergeTree(v.get());
         }
-      }))), O.get();
+      }))), m.get();
     }
-    const ge = (i, d) => i.some((O) => typeof O == "object" && (Array.isArray(O) ? ge(O, d) : d(O)));
+    const ge = (i, d) => i.some((m) => typeof m == "object" && (Array.isArray(m) ? ge(m, d) : d(m)));
     function De(i, d) {
       if (i == null || !ge(i, (p) => {
         var v;
         return p.r !== void 0 || ((v = ve(p)) === null || v === void 0 ? void 0 : v.makeInvertible) != null;
       })) return i;
-      const O = new r.ReadCursor(i), D = new r.WriteCursor();
-      let m = !1;
+      const m = new r.ReadCursor(i), D = new r.WriteCursor();
+      let O = !1;
       const I = [], R = [], $ = (p, v, w) => {
         const C = p.getComponent();
         let N = !1;
@@ -1073,18 +1074,18 @@ function Jt() {
           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");
-          const M = ve(C);
-          M && (M.makeInvertible ? m = !0 : y(v, M, f(C), !0));
+          const U = ve(C);
+          U && (U.makeInvertible ? O = !0 : y(v, U, f(C), !0));
         }
         let B = 0;
         for (const g of p) {
           v.descend(g);
-          const M = typeof g == "number" ? g - B : g, re = J(w, M), te = $(p, v, re);
-          re !== te && (N || (N = !0, w = x(w)), te === void 0 ? (w = c(w, M), typeof g == "number" && B++) : w[M] = te), v.ascend();
+          const U = typeof g == "number" ? g - B : g, re = Y(w, U), te = $(p, v, re);
+          re !== te && (N || (N = !0, w = x(w)), te === void 0 ? (w = c(w, U), typeof g == "number" && B++) : w[U] = 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 $(O, D, d), D.get(), m && (D.reset(), function p(v, w, C, N, B) {
+      return $(m, D, d), D.get(), O && (D.reset(), function p(v, w, C, N, B) {
         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);
@@ -1094,159 +1095,159 @@ function Jt() {
             y(C, K, K.makeInvertible(se, N), !0);
           }
         }
-        let M = 0, re = 0;
-        const te = r.advancer(v, (K, se) => _(se) ? M - K - 1 : K - M, (K, se) => {
-          _(se) && M++;
+        let U = 0, re = 0;
+        const te = r.advancer(v, (K, se) => _(se) ? U - K - 1 : K - U, (K, se) => {
+          _(se) && U++;
         });
         for (const K of w) if (typeof K == "number") {
-          const se = K - re, Ne = te(se), me = se + M, ye = J(N, B ? se : me);
+          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();
         } else {
-          const se = J(N, K);
+          const se = Y(N, K);
           C.descend(K), p(te(K), w, C, se, B), C.ascend();
         }
         te.end();
-      }(O.clone(), O, D, d, !1)), D.get();
+      }(m.clone(), m, D, d, !1)), D.get();
     }
-    function kt(i, d) {
+    function Ut(i, d) {
       return le(De(i, d));
     }
-    const st = (i) => {
+    const it = (i) => {
       if (i == null) return null;
       const d = i.slice();
-      for (let O = 0; O < i.length; O++) {
-        const D = d[O];
-        Array.isArray(D) && (d[O] = st(D));
+      for (let m = 0; m < i.length; m++) {
+        const D = d[m];
+        Array.isArray(D) && (d[m] = it(D));
       }
       return d;
     };
-    function ot(i, d, O) {
-      o(O === "left" || O === "right", "Direction must be left or right");
-      const D = O === "left" ? 0 : 1;
+    function st(i, d, m) {
+      o(m === "left" || m === "right", "Direction must be left or right");
+      const D = m === "left" ? 0 : 1;
       if (d == null) return {
         ok: !0,
         result: i
       };
       z(i), z(d);
-      let m = null;
-      const I = [], R = [], $ = [], p = [], v = [], w = [], C = [], N = [], B = [], g = [], M = [], re = [], te = [], K = [], se = [];
+      let O = null;
+      const I = [], R = [], $ = [], p = [], v = [], w = [], C = [], N = [], B = [], g = [], U = [], re = [], te = [], K = [], se = [];
       let Ne = 0;
-      const me = r.readCursor(i), ye = r.readCursor(d), oe = r.writeCursor();
-      if (function Q(T, W = null, U) {
+      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 ? U = W.clone() : P.p != null && (U = null, w[P.p] = T.clone()));
-        const k = T.getComponent();
+        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] = T.clone(), U && (g[X] = !0, B[X] = U), P && P.p != null && (K[X] = P.p));
-        const Y = r.advancer(W);
-        for (const ee of T) Q(T, Y(ee), U);
-        Y.end();
-      }(ye, me, null), function Q(T, W, U, P, k) {
-        const X = U.getComponent();
-        let Y, ee = !1;
-        X && ((Y = X.d) != null ? (p[Y] = U.clone(), P != null && (se[P] == null && (se[P] = []), se[P].push(Y)), T = v[Y] || null, W = $[Y] || null, g[Y] ? (k && (M[Y] = !0), k = B[Y] || null) : !k || D !== 1 && K[Y] != null || m == null && (m = {
+        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();
+      }(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 = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
           op1: a.removeOp(k.getPath()),
-          op2: a.moveOp(W.getPath(), U.getPath())
-        }), ee = !0) : X.i !== void 0 && (T = W = null, ee = !0, k && m == null && (m = {
+          op2: a.moveOp(W.getPath(), M.getPath())
+        }), ee = !0) : X.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(U.getPath(), X.i)
+          op2: a.insertOp(M.getPath(), X.i)
         })));
-        const fe = l(T);
-        fe && (fe.r !== void 0 ? k = T.clone() : fe.p != null && (fe.p, P = fe.p, k = null));
+        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);
-        de && k && m == null && (m = {
+        de && k && O == null && (O = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
           op1: a.removeOp(k.getPath()),
-          op2: a.editOp(U.getPath(), de, f(X), !0)
+          op2: a.editOp(M.getPath(), de, f(X), !0)
         });
-        let ae = 0, Oe = 0;
-        const H = r.advancer(W, (L, he) => _(he) ? ae - L - 1 : L - ae, (L, he) => {
+        let ae = 0, me = 0;
+        const H = r.advancer(W, (G, he) => _(he) ? ae - G - 1 : G - ae, (G, he) => {
           _(he) && ae++;
-        }), A = r.advancer(T);
-        for (const L of U) if (typeof L == "number") {
-          const he = L - Oe, we = H(he);
-          Oe += +Q(A(he + ae), we, U, P, k);
+        }), T = r.advancer(A);
+        for (const G of M) if (typeof G == "number") {
+          const he = G - me, we = H(he);
+          me += +Q(T(he + ae), we, M, P, k);
         } else {
-          const he = H(L);
-          Q(A(L), he, U, P, k);
+          const he = H(G);
+          Q(T(G), he, M, P, k);
         }
-        return H.end(), A.end(), ee;
-      }(me, ye, ye.clone(), null, null), p.map((Q) => Q && Q.get()), m) return {
+        return H.end(), T.end(), ee;
+      }(Oe, ye, ye.clone(), null, null), p.map((Q) => Q && Q.get()), O) return {
         ok: !1,
-        conflict: m
+        conflict: O
       };
-      M.map((Q) => !!Q);
+      U.map((Q) => !!Q);
       const Pe = [];
-      let Te = null;
-      (function Q(T, W, U, P, k) {
+      let Ae = null;
+      (function Q(A, W, M, P, k) {
         let X = !1;
-        const Y = l(W);
-        if (_(Y)) {
-          const H = Y.p;
-          H != null ? (U = p[H], P = re[H] = r.writeCursor(), X = !0, k = null) : (U = null, k = W.clone());
-        } else s(l(U)) && (U = null);
-        const ee = T.getComponent();
+        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());
+        } 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] = T.clone(), U && (C[H] = U.clone())) : ee.r !== void 0 && (k || P.write("r", !0), (k || X) && (Te == null && (Te = /* @__PURE__ */ new Set()), Te.add(ee)));
+          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)));
         }
         let fe = 0, de = 0;
-        const ae = r.advancer(W, void 0, (H, A) => {
-          _(A) && fe++;
-        }), Oe = r.advancer(U, (H, A) => s(A) ? ~(H - de) : H - de, (H, A) => {
-          s(A) && de++;
+        const ae = r.advancer(W, void 0, (H, T) => {
+          _(T) && fe++;
+        }), me = r.advancer(M, (H, T) => s(T) ? ~(H - de) : H - de, (H, T) => {
+          s(T) && de++;
         });
-        if (T) for (const H of T) if (typeof H == "string") {
-          const A = ae(H), L = Oe(H);
-          P.descend(H), Q(T, A, L, P, k), P.ascend();
+        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();
         } else {
-          const A = ae(H), L = H - fe, he = _(l(A)) ? null : Oe(L), we = L + de;
-          o(we >= 0), P.descend(we), Q(T, A, he, P, k), P.ascend();
+          const T = ae(H), G = H - fe, he = _(l(T)) ? null : me(G), we = G + de;
+          o(we >= 0), P.descend(we), Q(A, T, he, P, k), P.ascend();
         }
-        ae.end(), Oe.end();
-      })(me, ye, ye.clone(), oe, null), oe.reset();
-      let Ge = [];
-      if (function Q(T, W, U, P, k, X) {
+        ae.end(), me.end();
+      })(Oe, ye, ye.clone(), oe, null), oe.reset();
+      let Le = [];
+      if (function Q(A, W, M, P, k, X) {
         o(W);
-        const Y = W.getComponent();
+        const J = W.getComponent();
         let ee = l(P), fe = !1;
-        const de = (S, ie, _e) => S ? a.moveOp(S.getPath(), ie.getPath()) : a.insertOp(ie.getPath(), _e.i);
-        if (s(Y)) {
-          const S = Y.d;
-          S != null && (R[S] = W.clone());
-          const ie = S != null ? Pe[S] : null;
+        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;
+          j != null && (R[j] = W.clone());
+          const ie = j != null ? Pe[j] : null;
           let _e = !1;
-          if (Y.i !== void 0 || S != null && ie) {
+          if (J.i !== void 0 || j != null && ie) {
             let ue;
-            ee && (ee.i !== void 0 || (ue = ee.d) != null && !g[ue]) && (_e = ue != null ? S != null && S === K[ue] : n.default(ee.i, Y.i), _e || ue != null && D !== 1 && K[ue] != null || m == null && (m = {
+            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 = {
               type: u.ConflictType.DROP_COLLISION,
-              op1: de(S != null ? I[S] : null, W, Y),
+              op1: de(j != null ? I[j] : null, W, J),
               op2: de(ue != null ? $[ue] : null, P, ee)
-            })), _e || (X ? m == null && (m = {
+            })), _e || (X ? O == null && (O = {
               type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-              op1: de(S != null ? I[S] : null, W, Y),
+              op1: de(j != null ? I[j] : null, W, J),
               op2: a.removeOp(X.getPath())
-            }) : (S != null ? (Ge[Ne] = S, k.write("d", ie.p = Ne++)) : k.write("i", t.default(Y.i)), fe = !0));
-          } else if (S != null && !ie) {
-            const ue = N[S];
+            }) : (j != null ? (Le[Ne] = j, k.write("d", ie.p = Ne++)) : k.write("i", t.default(J.i)), fe = !0));
+          } else if (j != null && !ie) {
+            const ue = N[j];
             ue && (X = ue.clone());
           }
-          S != null ? (T = I[S], U = w[S], P = C[S]) : Y.i !== void 0 && (T = U = null, _e || (P = null));
-        } else _(l(T)) && (T = U = P = null);
-        const ae = l(T), Oe = l(U);
-        if (_(Oe)) {
-          const S = Oe.p;
-          Oe.r !== void 0 && (!ae || ae.r === void 0) || g[S] ? (P = null, X = U.clone()) : S != null && (P = p[S], D !== 1 && K[S] != null || ((k = te[S]) || (k = te[S] = r.writeCursor()), k.reset(), X = null));
-        } else !s(Y) && s(ee) && (P = null);
+          j != null ? (A = I[j], M = w[j], P = C[j]) : J.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);
         ee = P != null ? P.getComponent() : null;
-        const H = ve(Y);
+        const H = ve(J);
         if (H) {
-          const S = f(Y);
-          if (X) m == null && (m = {
+          const j = f(J);
+          if (X) O == null && (O = {
             type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-            op1: a.editOp(W.getPath(), H, S, !0),
+            op1: a.editOp(W.getPath(), H, j, !0),
             op2: a.removeOp(X.getPath())
           });
           else {
@@ -1255,52 +1256,52 @@ function Jt() {
             if (ie) {
               if (H !== ie) throw Error("Transforming incompatible types");
               const ue = f(ee);
-              _e = H.transform(S, ue, O);
-            } else _e = t.default(S);
+              _e = H.transform(j, ue, m);
+            } else _e = t.default(j);
             y(k, H, _e);
           }
         }
-        let A = 0, L = 0, he = 0, we = 0, xe = 0, qe = 0, Ue = T != null && T.descendFirst(), Je = Ue;
-        const Xe = r.advancer(U, void 0, (S, ie) => {
+        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) => {
           _(ie) && he++;
         });
-        let Se = P != null && P.descendFirst(), $e = Se;
-        for (const S of W) if (typeof S == "number") {
+        let je = P != null && P.descendFirst(), $e = je;
+        for (const j of W) if (typeof j == "number") {
           let ie;
-          const _e = s(W.getComponent()), ue = S - L;
+          const _e = s(W.getComponent()), ue = j - G;
           {
             let We;
-            for (; Ue && typeof (We = T.getKey()) == "number"; ) {
-              We += A;
-              const ke = T.getComponent(), Ye = _(ke);
-              if (We > ue || We === ue && (!Ye || D === 0 && _e)) break;
-              if (Ye) {
-                A--;
+            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) {
+                T--;
                 const Ke = ke.p;
-                K.includes(Ke), ke.d, l(te[ke.d]), _(l(te[ke.d])), (ke.r === void 0 || Te && Te.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)) || xe--;
               }
-              Ue = T.nextSibling();
+              Me = A.nextSibling();
             }
-            ie = Ue && We === ue ? T : null;
+            ie = Me && We === ue ? A : null;
           }
-          const Me = ue - A;
-          let Be = Xe(Me);
-          const at = Me - he;
-          let et = null;
+          const Ue = ue - T;
+          let Be = Xe(Ue);
+          const ot = Ue - he;
+          let Qe = null;
           {
             let We, ke;
-            for (; Se && typeof (We = P.getKey()) == "number"; ) {
+            for (; je && typeof (We = P.getKey()) == "number"; ) {
               ke = We - we;
-              const Ye = P.getComponent(), Ke = s(Ye);
-              if (ke > at) break;
-              if (ke === at) {
+              const Je = P.getComponent(), Ke = s(Je);
+              if (ke > ot) break;
+              if (ke === ot) {
                 if (!Ke) {
-                  et = P;
+                  Qe = P;
                   break;
                 }
                 {
                   if (D === 0 && _e) {
-                    et = P;
+                    Qe = P;
                     break;
                   }
                   const Fe = Be && _(Be.getComponent());
@@ -1308,102 +1309,102 @@ function Jt() {
                 }
               }
               if (Ke) {
-                const Fe = Ye.d;
-                K[Fe], Ye.i === void 0 && (g[Fe] || K[Fe] != null && D !== 1) ? (g[Fe] || K[Fe] != null && D === 0) && (we++, qe--) : we++;
+                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++;
               }
-              Se = P.nextSibling();
+              je = P.nextSibling();
             }
           }
-          const yt = at + we + xe + qe;
-          o(yt >= 0, "trying to descend to a negative index"), k.descend(yt), _e && (ie = Be = et = null, L++), Q(ie, W, Be, et, k, X) && qe++, k.ascend();
+          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();
         } else {
           let ie;
-          for (; Ue && (ie = T.getKey(), typeof ie != "string" || !(ie > S || ie === S)); ) Ue = T.nextSibling();
-          const _e = Ue && ie === S ? T : null, ue = Xe(S);
-          let Me;
-          for (; Se && (Me = P.getKey(), typeof Me != "string" || !(Me > S || Me === S)); ) Se = P.nextSibling();
-          const Be = Se && Me === S ? P : null;
-          k.descend(S), Q(_e, W, ue, Be, k, X), k.ascend();
+          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 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();
         }
-        return Xe.end(), Je && T.ascend(), $e && P.ascend(), fe;
-      }(me, me.clone(), ye, ye.clone(), oe, null), m) return {
+        return Xe.end(), Ye && A.ascend(), $e && P.ascend(), fe;
+      }(Oe, Oe.clone(), ye, ye.clone(), oe, null), O) return {
         ok: !1,
-        conflict: m
+        conflict: O
       };
       oe.reset();
-      const Ae = (Q, T, W) => Q.traverse(T, (U, P) => {
-        U.d != null && W(U.d, Q, P);
+      const Te = (Q, A, W) => Q.traverse(A, (M, P) => {
+        M.d != null && W(M.d, Q, P);
       });
-      (g.length || re.length) && (Ae(ye, oe, (Q, T, W) => {
-        g[Q] && !M[Q] && W.write("r", !0), re[Q] && W.mergeTree(re[Q].get());
+      (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 = [];
-      if ((te.length || g.length) && !m) {
-        const Q = r.readCursor(st(oe.get()));
-        if (Ae(Q, null, (T, W) => {
-          Ie[T] = W.clone();
-        }), te.forEach((T) => {
-          T && Ae(r.readCursor(T.get()), null, (W, U) => {
-            Ie[W] = U.clone();
+      if ((te.length || g.length) && !O) {
+        const Q = r.readCursor(it(oe.get()));
+        if (Te(Q, null, (A, W) => {
+          Ie[A] = W.clone();
+        }), te.forEach((A) => {
+          A && Te(r.readCursor(A.get()), null, (W, M) => {
+            Ie[W] = M.clone();
           });
-        }), function T(W, U, P, k, X, Y) {
-          const ee = l(U);
+        }), function A(W, M, P, k, X, J) {
+          const ee = l(M);
           if (ee && _(ee)) if (ee.p != null) {
-            const A = ee.p;
-            Ie[A].getPath(), P = Ie[A], k = Re[A] = r.writeCursor();
+            const T = ee.p;
+            Ie[T].getPath(), P = Ie[T], k = Re[T] = r.writeCursor();
           } else ee.r !== void 0 && (P = null);
           else s(l(P)) && (P = null);
           const fe = W.getComponent();
           if (fe) {
-            let A;
-            if ((A = fe.d) != null) {
-              const L = te[A];
-              L && (L.get(), k.mergeTree(L.get()), P = r.readCursor(L.get()));
+            let T;
+            if ((T = fe.d) != null) {
+              const G = te[T];
+              G && (G.get(), k.mergeTree(G.get()), P = r.readCursor(G.get()));
             }
           }
           let de = 0, ae = 0;
-          const Oe = r.advancer(U, void 0, (A, L) => {
-            _(L) && de--;
-          }), H = r.advancer(P, (A, L) => s(L) ? -(A - ae) - 1 : A - ae, (A, L) => {
-            s(L) && ae++;
+          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++;
           });
-          for (const A of W) if (typeof A == "number") {
-            const L = Oe(A), he = A + de, we = H(he), xe = he + ae;
-            k.descend(xe), T(W, L, we, k), k.ascend();
-          } else k.descend(A), T(W, Oe(A), H(A), k), k.ascend();
-          Oe.end(), H.end();
-        }(ye, Q, Q.clone(), oe), oe.reset(), m) return {
+          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();
+          me.end(), H.end();
+        }(ye, Q, Q.clone(), oe), oe.reset(), O) return {
           ok: !1,
-          conflict: m
+          conflict: O
         };
         if (oe.get(), Re.length) {
-          const T = Re.map((U) => U ? U.get() : null), W = r.readCursor(st(oe.get()));
-          if (Ae(W, oe, (U, P, k) => {
-            const X = T[U];
-            X && (k.mergeTree(X), T[U] = null);
-          }), T.find((U) => U)) {
-            const U = r.writeCursor(), P = r.writeCursor();
+          const A = Re.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);
+          }), A.find((M) => M)) {
+            const M = r.writeCursor(), P = r.writeCursor();
             let k = 0, X = 0;
-            T.forEach((Y) => {
-              Y != null && Ae(r.readCursor(Y), null, (ee) => {
-                const fe = Ge[ee];
-                U.writeMove(I[fe].getPath(), R[fe].getPath(), k++);
+            A.forEach((J) => {
+              J != null && Te(r.readCursor(J), 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++);
                 });
               });
-            }), m = {
+            }), O = {
               type: u.ConflictType.BLACKHOLE,
-              op1: U.get(),
+              op1: M.get(),
               op2: P.get()
             };
           }
         }
       }
-      return m ? {
+      return O ? {
         ok: !1,
-        conflict: m
+        conflict: O
       } : {
         ok: !0,
         result: oe.get()
@@ -1413,49 +1414,49 @@ function Jt() {
       const d = new Error("Transform detected write conflict");
       throw d.conflict = i, d.type = d.name = "writeConflict", d;
     };
-    function jt(i, d, O) {
-      const D = ot(i, d, O);
+    function kt(i, d, m) {
+      const D = st(i, d, m);
       if (D.ok) return D.result;
       pt(D.conflict);
     }
     const ze = (i) => {
       const d = r.writeCursor();
-      return r.readCursor(i).traverse(d, (O, D) => {
-        (s(O) || ve(O)) && D.write("r", !0);
+      return r.readCursor(i).traverse(d, (m, D) => {
+        (s(m) || ve(m)) && D.write("r", !0);
       }), d.get();
     }, St = (i, d) => {
-      const { type: O, op1: D, op2: m } = i;
-      switch (O) {
+      const { type: m, op1: D, op2: O } = i;
+      switch (m) {
         case u.ConflictType.DROP_COLLISION:
-          return d === "left" ? [null, ze(m)] : [ze(D), null];
+          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);
-          }), I ? [null, ze(m)] : [ze(D), null];
+          }), I ? [null, ze(O)] : [ze(D), null];
         case u.ConflictType.BLACKHOLE:
-          return [ze(D), ze(m)];
+          return [ze(D), ze(O)];
         default:
-          throw Error("Unrecognised conflict: " + O);
+          throw Error("Unrecognised conflict: " + m);
       }
     };
-    function gt(i, d, O, D) {
-      let m = null;
+    function gt(i, d, m, D) {
+      let O = null;
       for (; ; ) {
-        const I = ot(d, O, D);
-        if (I.ok) return ne(m, I.result);
+        const I = st(d, m, D);
+        if (I.ok) return ne(O, I.result);
         {
           const { conflict: R } = I;
           i(R) || pt(R);
           const [$, p] = St(R, D);
-          d = ne(q(d), $), O = ne(q(O), p), m = ne(m, p);
+          d = ne(q(d), $), m = ne(q(m), p), O = ne(O, p);
         }
       }
     }
   }(Ze)), Ze;
 }
 var Dt;
-function Zt() {
+function Qt() {
   return Dt || (Dt = 1, function(a) {
     var e = Ve && Ve.__createBinding || (Object.create ? function(u, o, l, E) {
       E === void 0 && (E = l), Object.defineProperty(u, E, { enumerable: !0, get: function() {
@@ -1466,8 +1467,8 @@ function Zt() {
     }), n = Ve && Ve.__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(Jt(), a);
-    var t = Ut();
+    Object.defineProperty(a, "__esModule", { value: !0 }), n(Zt(), a);
+    var t = At();
     Object.defineProperty(a, "ReadCursor", { enumerable: !0, get: function() {
       return t.ReadCursor;
     } }), Object.defineProperty(a, "WriteCursor", { enumerable: !0, get: function() {
@@ -1479,8 +1480,8 @@ function Zt() {
     } });
   }(Ve)), Ve;
 }
-var V = Zt();
-class Qt {
+var V = Qt();
+class en {
   constructor() {
     F(this, "drawingManagerData", {});
     F(this, "_oldDrawingManagerData", {});
@@ -1779,8 +1780,8 @@ class Qt {
   getFrontDrawingsOp(e) {
     const { unitId: n, subUnitId: t, drawingIds: r } = e, u = this._getOrderFromSearchParams(n, t, r), o = [...r], l = this.getDrawingOrder(n, t), E = [];
     u.forEach((s) => {
-      const { drawingId: c } = s, h = this._getDrawingCount(n, t) - 1, j = V.moveOp([n, t, "order", this._getDrawingOrder(n, t).indexOf(c)], [n, t, "order", h]);
-      E.push(j), o.includes(l[h]) || o.push(l[h]);
+      const { drawingId: c } = s, h = this._getDrawingCount(n, t) - 1, S = V.moveOp([n, t, "order", this._getDrawingOrder(n, t).indexOf(c)], [n, t, "order", h]);
+      E.push(S), 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 } };
@@ -1801,7 +1802,7 @@ class Qt {
     return t.map((u) => {
       const o = this._hasDrawingOrder({ unitId: e, subUnitId: n, drawingId: u });
       return { drawingId: u, zIndex: o };
-    }).sort(r === !1 ? Rt : xt);
+    }).sort(r === !1 ? Nt : Rt);
   }
   _hasDrawingOrder(e) {
     if (e == null)
@@ -1889,7 +1890,7 @@ class Qt {
     this._editable = e;
   }
 }
-class en extends Qt {
+class tn extends en {
 }
 function _n({ unitId: a, subUnitId: e, drawingId: n }, t) {
   return typeof t == "number" ? `${a}#-#${e}#-#${n}#-#${t}` : `${a}#-#${e}#-#${n}`;
@@ -1905,9 +1906,7 @@ const vn = async (a) => new Promise((e, n) => {
   }, t.onerror = (r) => {
     n(r);
   };
-}), tn = "drawing.config", nn = {}, rn = Tt("univer.drawing-manager.service");
-var it = /* @__PURE__ */ ((a) => (a.URL = "URL", a.UUID = "UUID", a.BASE64 = "BASE64", a))(it || {}), Qe = /* @__PURE__ */ ((a) => (a.SUCCUSS = "0", a.ERROR_EXCEED_SIZE = "1", a.ERROR_IMAGE_TYPE = "2", a.ERROR_UPLOAD_COUNT_LIMIT = "3", a.ERROR_IMAGE = "4", a))(Qe || {});
-const sn = Tt("core.image-io.service");
+}), nn = "drawing.config", rn = {}, sn = xt("univer.drawing-manager.service");
 class on {
   constructor() {
     F(this, "_waitCount", 0);
@@ -1919,26 +1918,26 @@ class on {
     this._waitCount = e, this._change$.next(e);
   }
   getImageSourceCache(e, n) {
-    if (n === it.BASE64) {
+    if (n === at.BASE64) {
       const t = new Image();
       return t.src = e, t;
     }
     return this._imageSourceCache.get(e);
   }
   addImageSourceCache(e, n, t) {
-    n === it.BASE64 || t == null || this._imageSourceCache.set(e, t);
+    n === at.BASE64 || t == null || this._imageSourceCache.set(e, t);
   }
   async getImage(e) {
     return Promise.resolve(e);
   }
   async saveImage(e) {
     return new Promise((n, t) => {
-      if (!Vt.includes(e.type)) {
-        t(new Error(Qe.ERROR_IMAGE_TYPE)), this._decreaseWaiting();
+      if (!Ht.includes(e.type)) {
+        t(new Error(et.ERROR_IMAGE_TYPE)), this._decreaseWaiting();
         return;
       }
-      if (e.size > Ft) {
-        t(new Error(Qe.ERROR_EXCEED_SIZE)), this._decreaseWaiting();
+      if (e.size > Vt) {
+        t(new Error(et.ERROR_EXCEED_SIZE)), this._decreaseWaiting();
         return;
       }
       const r = new FileReader();
@@ -1946,16 +1945,16 @@ class on {
         var E;
         const o = (E = u.target) == null ? void 0 : E.result;
         if (o == null) {
-          t(new Error(Qe.ERROR_IMAGE)), this._decreaseWaiting();
+          t(new Error(et.ERROR_IMAGE)), this._decreaseWaiting();
           return;
         }
         const l = Bt.generateRandomId(6);
         n({
           imageId: l,
-          imageSourceType: it.BASE64,
+          imageSourceType: at.BASE64,
           source: o,
           base64Cache: o,
-          status: Qe.SUCCUSS
+          status: et.SUCCUSS
         }), this._decreaseWaiting();
       };
     });
@@ -1971,11 +1970,11 @@ var an = Object.defineProperty, ln = Object.getOwnPropertyDescriptor, un = (a, e
 }, Pt = (a, e) => (n, t) => e(n, t, a);
 const cn = "UNIVER_DRAWING_PLUGIN";
 var dt;
-let At = (dt = class extends Gt {
-  constructor(a = nn, e, n) {
+let Tt = (dt = class extends Lt {
+  constructor(a = rn, e, n) {
     super(), this._config = a, this._injector = e, this._configService = n;
     const { ...t } = this._config;
-    this._configService.setConfig(tn, t);
+    this._configService.setConfig(nn, t);
   }
   onStarting() {
     this._initDependencies();
@@ -1983,29 +1982,29 @@ let At = (dt = class extends Gt {
   _initDependencies() {
     var n;
     qt([
-      [sn, { useClass: on }],
-      [rn, { useClass: en }]
+      [Ft, { useClass: on }],
+      [sn, { useClass: tn }]
     ], (n = this._config) == null ? void 0 : n.override).forEach((t) => this._injector.add(t));
   }
 }, F(dt, "pluginName", cn), dt);
-At = un([
-  Pt(1, Wt(Lt)),
+Tt = un([
+  Pt(1, Wt(Gt)),
   Pt(2, Kt)
-], At);
+], Tt);
 export {
-  Vt as DRAWING_IMAGE_ALLOW_IMAGE_LIST,
-  Ft as DRAWING_IMAGE_ALLOW_SIZE,
+  Ht as DRAWING_IMAGE_ALLOW_IMAGE_LIST,
+  Vt as DRAWING_IMAGE_ALLOW_SIZE,
   yn as DRAWING_IMAGE_COUNT_LIMIT,
   gn as DRAWING_IMAGE_HEIGHT_LIMIT,
   pn as DRAWING_IMAGE_WIDTH_LIMIT,
-  en as DrawingManagerService,
-  rn as IDrawingManagerService,
-  sn as IImageIoService,
+  tn as DrawingManagerService,
+  sn as IDrawingManagerService,
+  wn as IImageIoService,
   on as ImageIoService,
-  it as ImageSourceType,
-  Qe as ImageUploadStatusType,
-  Qt as UnitDrawingService,
-  At as UniverDrawingPlugin,
+  bn as ImageSourceType,
+  Cn as ImageUploadStatusType,
+  en as UnitDrawingService,
+  Tt as UniverDrawingPlugin,
   _n as getDrawingShapeKeyByDrawingSearch,
   vn as getImageSize
 };