@univerjs/drawing 0.15.0 → 0.15.1

package/lib/es/index.js

@@ -1,47 +1,47 @@
 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";
+var xt = (a, e, t) => e in a ? Rt(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
+var F = (a, e, t) => xt(a, typeof e != "symbol" ? e + "" : e, t);
+import { createIdentifier as Bt, CommandType as Wt, sortRules as Lt, sortRulesByDesc as Gt, ImageSourceType as at, ImageUploadStatusType as et, generateRandomId as qt, Disposable as $t, toDisposable as Kt, Inject as Ft, Injector as Vt, IConfigService as Ht, ICommandService as zt, Plugin as Xt, merge as Jt, mergeOverrideWithDependencies as Yt, IImageIoService as Zt, IURLImageService as Qt } from "@univerjs/core";
+import { IImageIoService as Tn, ImageSourceType as Sn, ImageUploadStatusType as kn } 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 = Bt("univer.drawing-manager.service"), Qt = {
+const wn = 500, bn = 500, In = 10, en = 5 * 1024 * 1024, tn = ["image/png", "image/jpeg", "image/jpg", "image/gif", "image/bmp"], kt = Bt("univer.drawing-manager.service"), nn = {
   id: "drawing.operation.set-drawing-selected",
   type: Wt.OPERATION,
   handler: (a, e) => {
-    const n = a.get(Mt);
-    return e == null ? !1 : (n.focusDrawing(e), !0);
-  }
-}, en = "drawing.config", vt = {};
-var Ve = {}, Ze = {}, tt = {}, mt;
-function tn() {
-  if (mt) return tt;
-  mt = 1, Object.defineProperty(tt, "__esModule", { value: !0 });
-  function a(t, r) {
+    const t = a.get(kt);
+    return e == null ? !1 : (t.focusDrawing(e), !0);
+  }
+}, rn = "drawing.config", mt = {};
+var Ve = {}, Ze = {}, tt = {}, vt;
+function sn() {
+  if (vt) return tt;
+  vt = 1, Object.defineProperty(tt, "__esModule", { value: !0 });
+  function a(n, r) {
     if (Array.isArray(r))
       return !1;
-    for (let u in t)
-      if (!n(t[u], r[u]))
+    for (let u in n)
+      if (!t(n[u], r[u]))
         return !1;
     for (let u in r)
-      if (t[u] === void 0)
+      if (n[u] === void 0)
         return !1;
     return !0;
   }
-  function e(t, r) {
-    if (!Array.isArray(r) || t.length !== r.length)
+  function e(n, r) {
+    if (!Array.isArray(r) || n.length !== r.length)
       return !1;
-    for (let u = 0; u < t.length; u++)
-      if (!n(t[u], r[u]))
+    for (let u = 0; u < n.length; u++)
+      if (!t(n[u], r[u]))
         return !1;
     return !0;
   }
-  function n(t, r) {
-    return t === r ? !0 : t === null || r === null || typeof t != "object" || typeof r != "object" ? !1 : Array.isArray(t) ? e(t, r) : a(t, r);
+  function t(n, r) {
+    return n === r ? !0 : n === null || r === null || typeof n != "object" || typeof r != "object" ? !1 : Array.isArray(n) ? e(n, r) : a(n, r);
   }
-  return tt.default = n, tt;
+  return tt.default = t, tt;
 }
 var nt = {}, Ot;
-function nn() {
+function on() {
   if (Ot) return nt;
   Ot = 1, Object.defineProperty(nt, "__esModule", { value: !0 });
   function a(e) {
@@ -50,24 +50,24 @@ function nn() {
     if (Array.isArray(e))
       return e.map(a);
     if (typeof e == "object") {
-      const n = {};
-      for (let t in e)
-        n[t] = a(e[t]);
-      return n;
+      const t = {};
+      for (let n in e)
+        t[n] = a(e[n]);
+      return t;
     } else
       return e;
   }
   return nt.default = a, nt;
 }
 var lt = {}, wt;
-function St() {
+function Ut() {
   return wt || (wt = 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 (!_)
         throw new Error(s);
     }
-    const n = (_) => _ != null && typeof _ == "object" && !Array.isArray(_), t = (_, s) => (
+    const t = (_) => _ != null && typeof _ == "object" && !Array.isArray(_), n = (_, s) => (
       // All the numbers, then all the letters. Just as the gods of ascii intended.
       typeof _ == typeof s ? _ > s : typeof _ == "string" && typeof s == "number"
     );
@@ -83,13 +83,13 @@ function St() {
         this.parents = [], this.indexes = [], this.lcIdx = -1, this.idx = -1, this.container = s;
       }
       ascend() {
-        e(this.parents.length === this.indexes.length / 2), this.idx === 0 ? this.parents.length ? (this.lcIdx = this.indexes.pop(), this.container = this.parents.pop(), this.idx = this.indexes.pop()) : (this.lcIdx = 0, this.idx = -1) : (e(this.idx > 0), this.idx--, n(this.container[this.idx]) && this.idx--);
+        e(this.parents.length === this.indexes.length / 2), this.idx === 0 ? this.parents.length ? (this.lcIdx = this.indexes.pop(), this.container = this.parents.pop(), this.idx = this.indexes.pop()) : (this.lcIdx = 0, this.idx = -1) : (e(this.idx > 0), this.idx--, t(this.container[this.idx]) && this.idx--);
       }
       getPath() {
         const s = [];
-        let c = this.container, h = this.parents.length - 1, U = this.idx;
-        for (; U >= 0; )
-          s.unshift(c[U]), U === 0 ? (U = this.indexes[h * 2], c = this.parents[h--]) : U -= n(c[U - 1]) ? 2 : 1;
+        let c = this.container, h = this.parents.length - 1, M = this.idx;
+        for (; M >= 0; )
+          s.unshift(c[M]), M === 0 ? (M = this.indexes[h * 2], c = this.parents[h--]) : M -= t(c[M - 1]) ? 2 : 1;
         return s;
       }
     }
@@ -103,13 +103,13 @@ function St() {
       }
       getComponent() {
         let s;
-        return this.container && this.container.length > this.idx + 1 && n(s = this.container[this.idx + 1]) ? s : null;
+        return this.container && this.container.length > this.idx + 1 && t(s = this.container[this.idx + 1]) ? s : null;
       }
       descendFirst() {
         let s = this.idx + 1;
-        if (!this.container || s >= this.container.length || n(this.container[s]) && s + 1 >= this.container.length)
+        if (!this.container || s >= this.container.length || t(this.container[s]) && s + 1 >= this.container.length)
           return !1;
-        n(this.container[s]) && s++;
+        t(this.container[s]) && s++;
         const c = this.container[s];
         return Array.isArray(c) ? (this.indexes.push(this.idx), this.parents.push(this.container), this.indexes.push(s), this.idx = 0, this.container = c) : this.idx = s, !0;
       }
@@ -119,8 +119,8 @@ function St() {
         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, U) {
-        this.container = s, this.idx = c, this.parents = h.slice(), this.indexes = U.slice();
+      _init(s, c, h, M) {
+        this.container = s, this.idx = c, this.parents = h.slice(), this.indexes = M.slice();
       }
       clone() {
         const s = new o();
@@ -140,17 +140,17 @@ function St() {
       traverse(s, c) {
         const h = this.getComponent();
         h && c(h, s);
-        for (const U of this)
-          s && s.descend(U), this.traverse(s, c), s && s.ascend();
+        for (const M of this)
+          s && s.descend(M), this.traverse(s, c), s && s.ascend();
       }
       eachPick(s, c) {
-        this.traverse(s, (h, U) => {
-          h.p != null && c(h.p, U);
+        this.traverse(s, (h, M) => {
+          h.p != null && c(h.p, M);
         });
       }
       eachDrop(s, c) {
-        this.traverse(s, (h, U) => {
-          h.d != null && c(h.d, U);
+        this.traverse(s, (h, M) => {
+          h.d != null && c(h.d, M);
         });
       }
     }
@@ -164,22 +164,22 @@ function St() {
         for (let s = 0; s < this.pendingDescent.length; s++) {
           const c = this.pendingDescent[s];
           let h = this.idx + 1;
-          if (h < this.container.length && n(this.container[h]) && h++, e(h === this.container.length || !n(this.container[h])), h === this.container.length)
+          if (h < this.container.length && t(this.container[h]) && h++, e(h === this.container.length || !t(this.container[h])), h === this.container.length)
             this.container.push(c), this.idx = h;
           else if (this.container[h] === c)
             this.idx = h;
           else {
             if (!Array.isArray(this.container[h])) {
-              const U = this.container.splice(h, this.container.length - h);
-              this.container.push(U), this.lcIdx > -1 && (this.lcIdx = h);
+              const M = this.container.splice(h, this.container.length - h);
+              this.container.push(M), 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]); )
+            for (this.indexes.push(this.idx), this.parents.push(this.container), this.lcIdx !== -1 && (e(n(c, this.container[this.lcIdx][0])), h = this.lcIdx + 1, this.lcIdx = -1); h < this.container.length && n(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 U = [c];
-              this.container.splice(h, 0, U), this.container = U;
+              const M = [c];
+              this.container.splice(h, 0, M), this.container = M;
             }
           }
         }
@@ -194,7 +194,7 @@ function St() {
       getComponent() {
         this.flushDescent();
         const s = this.idx + 1;
-        if (s < this.container.length && n(this.container[s]))
+        if (s < this.container.length && t(this.container[s]))
           return this.container[s];
         {
           const c = {};
@@ -224,7 +224,7 @@ function St() {
           return;
         if (e(Array.isArray(s)), s === this._op)
           throw Error("Cannot merge into my own tree");
-        const h = this.lcIdx, U = this.parents.length;
+        const h = this.lcIdx, M = this.parents.length;
         let Y = 0;
         for (let pe = 0; pe < s.length; pe++) {
           const Z = s[pe];
@@ -232,7 +232,7 @@ function St() {
         }
         for (; Y--; )
           this.ascend();
-        this.lcIdx = this.parents.length === U ? h : -1;
+        this.lcIdx = this.parents.length === M ? h : -1;
       }
       at(s, c) {
         this.descendPath(s), c(this);
@@ -255,20 +255,20 @@ function St() {
     }
     a.WriteCursor = l, a.writeCursor = () => new l(), a.readCursor = (_) => new o(_);
     function E(_, s, c) {
-      let h, U;
-      U = h = _ ? _.descendFirst() : !1;
+      let h, M;
+      M = h = _ ? _.descendFirst() : !1;
       function Y(pe) {
         let Z;
-        for (; U; ) {
-          const Ce = Z = _.getKey();
+        for (; M; ) {
+          const Ie = Z = _.getKey();
           if (pe != null) {
             let qe = !1;
-            if (s && typeof Ce == "number" && (Z = s(Ce, _.getComponent()), Z < 0 && (Z = ~Z, qe = !0)), t(Z, pe))
+            if (s && typeof Ie == "number" && (Z = s(Ie, _.getComponent()), Z < 0 && (Z = ~Z, qe = !0)), n(Z, pe))
               return null;
             if (Z === pe && !qe)
               return _;
           }
-          c && typeof Z == "number" && c(Z, _.getComponent()), U = _.nextSibling();
+          c && typeof Z == "number" && c(Z, _.getComponent()), M = _.nextSibling();
         }
         return null;
       }
@@ -278,49 +278,49 @@ function St() {
     }
     a.advancer = E;
     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;
-        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());
+      let h, M, Y, pe;
+      for (h = M = _ && _.descendFirst(), Y = pe = s && s.descendFirst(); h || Y; ) {
+        let Z = h ? _.getKey() : null, Ie = Y ? s.getKey() : null;
+        Z !== null && Ie !== null && (n(Ie, Z) ? Ie = null : Z !== Ie && (Z = null)), c(Z == null ? Ie : Z, Z != null ? _ : null, Ie != null ? s : null), Z != null && h && (h = _.nextSibling()), Ie != null && Y && (Y = s.nextSibling());
       }
-      U && _.ascend(), pe && s.ascend();
+      M && _.ascend(), pe && s.ascend();
     }
     a.eachChildOf = B;
   })(lt)), lt;
 }
 var ut = {}, bt;
-function kt() {
+function At() {
   return bt || (bt = 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 Ue = {}, He = {}, Ct;
+var Me = {}, He = {}, It;
 function pt() {
-  return Ct || (Ct = 1, Object.defineProperty(He, "__esModule", { value: !0 }), He.uniToStrPos = He.strPosToUni = void 0, He.strPosToUni = (a, e = a.length) => {
-    let n = 0, t = 0;
-    for (; t < e; t++) {
-      const r = a.charCodeAt(t);
-      r >= 55296 && r <= 57343 && (n++, t++);
+  return It || (It = 1, Object.defineProperty(He, "__esModule", { value: !0 }), He.uniToStrPos = He.strPosToUni = void 0, He.strPosToUni = (a, e = a.length) => {
+    let t = 0, n = 0;
+    for (; n < e; n++) {
+      const r = a.charCodeAt(n);
+      r >= 55296 && r <= 57343 && (t++, n++);
     }
-    if (t !== e)
+    if (n !== e)
       throw Error("Invalid offset - splits unicode bytes");
-    return t - n;
+    return n - t;
   }, He.uniToStrPos = (a, e) => {
-    let n = 0;
+    let t = 0;
     for (; e > 0; e--) {
-      const t = a.charCodeAt(n);
-      n += t >= 55296 && t <= 57343 ? 2 : 1;
+      const n = a.charCodeAt(t);
+      t += n >= 55296 && n <= 57343 ? 2 : 1;
     }
-    return n;
+    return t;
   }), He;
 }
-var ct = {}, It;
+var ct = {}, Ct;
 function ht() {
-  return It || (It = 1, (function(a) {
+  return Ct || (Ct = 1, (function(a) {
     Object.defineProperty(a, "__esModule", { value: !0 }), a.uniSlice = a.dlen = a.eachOp = void 0;
-    const e = pt(), n = (f) => {
+    const e = pt(), t = (f) => {
       if (!Array.isArray(f))
         throw Error("Op must be an array of components");
       let y = null;
@@ -349,28 +349,28 @@ function ht() {
       if (typeof y == "number")
         throw Error("Op has a trailing skip");
     };
-    function t(f, y) {
+    function n(f, y) {
       let b = 0, q = 0;
       for (let z = 0; z < f.length; z++) {
-        const K = f[z];
-        switch (y(K, b, q), typeof K) {
+        const $ = f[z];
+        switch (y($, b, q), typeof $) {
           case "object":
-            b += a.dlen(K.d);
+            b += a.dlen($.d);
             break;
           case "string":
-            q += e.strPosToUni(K);
+            q += e.strPosToUni($);
             break;
           case "number":
-            b += K, q += K;
+            b += $, q += $;
             break;
         }
       }
     }
-    a.eachOp = t;
+    a.eachOp = n;
     function r(f, y) {
       const b = [], q = l(b);
-      return t(f, (z, K, Ee) => {
-        q(y(z, K, Ee));
+      return n(f, (z, $, Ee) => {
+        q(y(z, $, Ee));
       }), s(b);
     }
     const u = (f) => f, o = (f) => r(f, u);
@@ -393,26 +393,26 @@ function ht() {
     };
     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: (K, Ee) => {
+      return { take: ($, Ee) => {
         if (y === f.length)
-          return K === -1 ? null : K;
+          return $ === -1 ? null : $;
         const ce = f[y];
         let ne;
         if (typeof ce == "number")
-          return K === -1 || ce - b <= K ? (ne = ce - b, ++y, b = 0, ne) : (b += K, K);
+          return $ === -1 || ce - b <= $ ? (ne = ce - b, ++y, b = 0, ne) : (b += $, $);
         if (typeof ce == "string") {
-          if (K === -1 || Ee === "i" || e.strPosToUni(ce.slice(b)) <= K)
+          if ($ === -1 || Ee === "i" || e.strPosToUni(ce.slice(b)) <= $)
             return ne = ce.slice(b), ++y, b = 0, ne;
           {
-            const le = b + e.uniToStrPos(ce.slice(b), K);
+            const le = b + e.uniToStrPos(ce.slice(b), $);
             return ne = ce.slice(b, le), b = le, ne;
           }
         } else {
-          if (K === -1 || Ee === "d" || a.dlen(ce.d) - b <= K)
+          if ($ === -1 || Ee === "d" || a.dlen(ce.d) - b <= $)
             return ne = { d: B(ce.d, b) }, ++y, b = 0, ne;
           {
-            let le = B(ce.d, b, b + K);
-            return b += K, { d: le };
+            let le = B(ce.d, b, b + $);
+            return b += $, { d: le };
           }
         }
       }, peek: () => f[y] };
@@ -420,22 +420,22 @@ function ht() {
     function c(f, y, b) {
       if (b !== "left" && b !== "right")
         throw Error("side (" + b + ") must be 'left' or 'right'");
-      n(f), n(y);
-      const q = [], z = l(q), { take: K, peek: Ee } = _(f);
+      t(f), t(y);
+      const q = [], z = l(q), { take: $, 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 = K(ge, "i"), z(De), typeof De != "string" && (ge -= E(De));
+              De = $(ge, "i"), z(De), typeof De != "string" && (ge -= E(De));
             break;
           case "string":
-            b === "left" && typeof Ee() == "string" && z(K(-1)), z(e.strPosToUni(le));
+            b === "left" && typeof Ee() == "string" && z($(-1)), z(e.strPosToUni(le));
             break;
           case "object":
             for (ge = a.dlen(le.d); ge > 0; )
-              switch (De = K(ge, "i"), typeof De) {
+              switch (De = $(ge, "i"), typeof De) {
                 case "number":
                   ge -= De;
                   break;
@@ -449,12 +449,12 @@ function ht() {
         }
       }
       let ce;
-      for (; ce = K(-1); )
+      for (; ce = $(-1); )
         z(ce);
       return s(q);
     }
     function h(f, y) {
-      n(f), n(y);
+      t(f), t(y);
       const b = [], q = l(b), { take: z } = _(f);
       for (let Ee = 0; Ee < y.length; Ee++) {
         const ce = y[Ee];
@@ -484,12 +484,12 @@ function ht() {
             break;
         }
       }
-      let K;
-      for (; K = z(-1); )
-        q(K);
+      let $;
+      for (; $ = z(-1); )
+        q($);
       return s(b);
     }
-    const U = (f, y) => {
+    const M = (f, y) => {
       let b = 0;
       for (let q = 0; q < y.length && f > b; q++) {
         const z = y[q];
@@ -499,8 +499,8 @@ function ht() {
             break;
           }
           case "string":
-            const K = e.strPosToUni(z);
-            b += K, f += K;
+            const $ = e.strPosToUni(z);
+            b += $, f += $;
             break;
           case "object":
             f -= Math.min(a.dlen(z.d), f - b);
@@ -508,7 +508,7 @@ function ht() {
         }
       }
       return f;
-    }, Y = (f, y) => typeof f == "number" ? U(f, y) : f.map((b) => U(b, y));
+    }, Y = (f, y) => typeof f == "number" ? M(f, y) : f.map((b) => M(b, y));
     function pe(f, y, b) {
       return r(f, (q, z) => typeof q == "object" && typeof q.d == "number" ? { d: b.slice(y, z, z + q.d) } : q);
     }
@@ -528,22 +528,22 @@ function ht() {
         }
       });
     }
-    function Ce(f) {
+    function Ie(f) {
       return r(f, (y) => typeof y == "object" && typeof y.d == "string" ? { d: e.strPosToUni(y.d) } : y);
     }
     function qe(f) {
       let y = !0;
-      return t(f, (b) => {
+      return n(f, (b) => {
         typeof b == "object" && typeof b.d == "number" && (y = !1);
       }), y;
     }
-    function ve(f) {
+    function me(f) {
       return {
         name: "text-unicode",
         uri: "http://sharejs.org/types/text-unicode",
         trim: s,
         normalize: o,
-        checkOp: n,
+        checkOp: t,
         /** Create a new text snapshot.
          *
          * @param {string} initial - initial snapshot data. Optional. Defaults to ''.
@@ -557,19 +557,19 @@ function ht() {
         /** Apply an operation to a document snapshot
          */
         apply(y, b) {
-          n(b);
+          t(b);
           const q = f.builder(y);
           for (let z = 0; z < b.length; z++) {
-            const K = b[z];
-            switch (typeof K) {
+            const $ = b[z];
+            switch (typeof $) {
               case "number":
-                q.skip(K);
+                q.skip($);
                 break;
               case "string":
-                q.append(K);
+                q.append($);
                 break;
               case "object":
-                q.del(a.dlen(K.d));
+                q.del(a.dlen($.d));
                 break;
             }
           }
@@ -577,13 +577,13 @@ function ht() {
         },
         transform: c,
         compose: h,
-        transformPosition: U,
+        transformPosition: M,
         transformSelection: Y,
         isInvertible: qe,
         makeInvertible(y, b) {
           return pe(y, b, f);
         },
-        stripInvertible: Ce,
+        stripInvertible: Ie,
         invert: Z,
         invertWithDoc(y, b) {
           return Z(pe(y, b, f));
@@ -591,29 +591,29 @@ function ht() {
         isNoop: (y) => y.length === 0
       };
     }
-    a.default = ve;
+    a.default = me;
   })(ct)), ct;
 }
 var rt = {}, Et;
-function rn() {
+function an() {
   if (Et) return rt;
   Et = 1, Object.defineProperty(rt, "__esModule", { value: !0 });
   const a = ht(), e = pt();
-  function n(t, r) {
+  function t(n, r) {
     return {
       // Returns the text content of the document
-      get: t,
+      get: n,
       // Returns the number of characters in the string
       getLength() {
-        return t().length;
+        return n().length;
       },
       // Insert the specified text at the given position in the document
       insert(u, o, l) {
-        const E = e.strPosToUni(t(), u);
+        const E = e.strPosToUni(n(), u);
         return r([E, o], l);
       },
       remove(u, o, l) {
-        const E = e.strPosToUni(t(), u);
+        const E = e.strPosToUni(n(), u);
         return r([E, { d: o }], l);
       },
       // When you use this API, you should implement these two methods
@@ -636,31 +636,31 @@ function rn() {
       onRemove: null
     };
   }
-  return rt.default = n, n.provides = { text: !0 }, rt;
+  return rt.default = t, t.provides = { text: !0 }, rt;
 }
 var Dt;
-function sn() {
+function ln() {
   return Dt || (Dt = 1, (function(a) {
-    var e = Ue && Ue.__createBinding || (Object.create ? (function(c, h, U, Y) {
-      Y === void 0 && (Y = U), Object.defineProperty(c, Y, { enumerable: !0, get: function() {
-        return h[U];
+    var e = Me && Me.__createBinding || (Object.create ? (function(c, h, M, Y) {
+      Y === void 0 && (Y = M), Object.defineProperty(c, Y, { enumerable: !0, get: function() {
+        return h[M];
       } });
-    }) : (function(c, h, U, Y) {
-      Y === void 0 && (Y = U), c[Y] = h[U];
-    })), n = Ue && Ue.__setModuleDefault || (Object.create ? (function(c, h) {
+    }) : (function(c, h, M, Y) {
+      Y === void 0 && (Y = M), c[Y] = h[M];
+    })), t = Me && Me.__setModuleDefault || (Object.create ? (function(c, h) {
       Object.defineProperty(c, "default", { enumerable: !0, value: h });
     }) : function(c, h) {
       c.default = h;
-    }), t = Ue && Ue.__importStar || function(c) {
+    }), n = Me && Me.__importStar || function(c) {
       if (c && c.__esModule) return c;
       var h = {};
-      if (c != null) for (var U in c) Object.hasOwnProperty.call(c, U) && e(h, c, U);
-      return n(h, c), h;
-    }, r = Ue && Ue.__importDefault || function(c) {
+      if (c != null) for (var M in c) Object.hasOwnProperty.call(c, M) && e(h, c, M);
+      return t(h, c), h;
+    }, r = Me && Me.__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 = pt(), o = t(ht()), l = r(rn()), E = {
+    const u = pt(), o = n(ht()), l = r(an()), E = {
       create(c) {
         return c;
       },
@@ -672,17 +672,17 @@ function sn() {
           throw Error("Invalid document snapshot: " + c);
         const h = [];
         return {
-          skip(U) {
-            let Y = u.uniToStrPos(c, U);
+          skip(M) {
+            let Y = u.uniToStrPos(c, M);
             if (Y > c.length)
               throw Error("The op is too long for this document");
             h.push(c.slice(0, Y)), c = c.slice(Y);
           },
-          append(U) {
-            h.push(U);
+          append(M) {
+            h.push(M);
           },
-          del(U) {
-            c = c.slice(u.uniToStrPos(c, U));
+          del(M) {
+            c = c.slice(u.uniToStrPos(c, M));
           },
           build() {
             return h.join("") + c;
@@ -696,10 +696,10 @@ function sn() {
     Object.defineProperty(a, "makeType", { enumerable: !0, get: function() {
       return s.default;
     } });
-  })(Ue)), Ue;
+  })(Me)), Me;
 }
 var Pt;
-function on() {
+function un() {
   return Pt || (Pt = 1, (function(a) {
     var e = Ze && Ze.__importDefault || function(i) {
       return i && i.__esModule ? i : {
@@ -709,7 +709,7 @@ function on() {
     Object.defineProperty(a, "__esModule", {
       value: !0
     }), a.editOp = a.replaceOp = a.insertOp = a.moveOp = a.removeOp = a.type = void 0;
-    const n = e(tn()), t = e(nn()), r = St(), u = kt();
+    const t = e(sn()), n = e(on()), r = Ut(), u = At();
     function o(i, d) {
       if (!i) throw new Error(d);
     }
@@ -724,7 +724,7 @@ function on() {
       },
       registerSubtype: Z,
       checkValidOp: z,
-      normalize: K,
+      normalize: $,
       apply: Ee,
       transformPosition: ce,
       compose: ne,
@@ -732,13 +732,13 @@ function on() {
       transform: jt,
       makeInvertible: De,
       invert: le,
-      invertWithDoc: Ut,
+      invertWithDoc: Mt,
       RM_UNEXPECTED_CONTENT: u.ConflictType.RM_UNEXPECTED_CONTENT,
       DROP_COLLISION: u.ConflictType.DROP_COLLISION,
       BLACKHOLE: u.ConflictType.BLACKHOLE,
-      transformNoConflict: (i, d, m) => yt(() => !0, i, d, m),
+      transformNoConflict: (i, d, v) => yt(() => !0, i, d, v),
       typeAllowingConflictsPred: (i) => Object.assign(Object.assign({}, a.type), {
-        transform: (d, m, D) => yt(i, d, m, D)
+        transform: (d, v, D) => yt(i, d, v, D)
       })
     };
     const l = (i) => i ? i.getComponent() : null;
@@ -749,23 +749,23 @@ function on() {
     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, 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;
+    function h(i, d, v) {
+      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, v)) : (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] = v), v;
     }
-    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 U = (i, d) => i != null && (typeof d == "number" ? Array.isArray(i) : typeof i == "object"), Y = (i, d) => U(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, v) => r.writeCursor().at(i, (D) => {
+      D.write("r", d), D.write("i", v);
+    }).get(), a.editOp = (i, d, v, D = !1) => r.writeCursor().at(i, (O) => y(O, d, v, D)).get();
+    const M = (i, d) => i != null && (typeof d == "number" ? Array.isArray(i) : typeof i == "object"), Y = (i, d) => M(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);
     }
-    const Ce = (i) => {
+    const Ie = (i) => {
       const d = pe[i];
       if (d) return d;
       throw Error("Missing type: " + i);
     };
-    Z(sn());
+    Z(ln());
     const qe = (i, d) => i + d;
     Z({
       name: "number",
@@ -774,9 +774,9 @@ function on() {
       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, 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)));
+    const me = (i) => i == null ? null : i.et ? Ie(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, v, D = !1) => {
+      const [O, C] = typeof d == "string" ? [Ie(d), d] : [d, d.name];
+      !D && O.isNoop && O.isNoop(v) || (C === "number" ? i.write("ena", v) : C === "text-unicode" ? i.write("es", v) : (i.write("et", C), i.write("e", v)));
     };
     function b(i) {
       o(typeof i == "number"), o(i >= 0), o(i === (0 | i));
@@ -786,522 +786,522 @@ function on() {
     }
     function z(i) {
       if (i === null) return;
-      const d = /* @__PURE__ */ new Set(), m = /* @__PURE__ */ new Set(), D = (I) => {
+      const d = /* @__PURE__ */ new Set(), v = /* @__PURE__ */ new Set(), D = (C) => {
         let x = !0, N = !1;
-        for (let p in I) {
-          const v = I[p];
-          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);
+        for (let p in C) {
+          const m = C[p];
+          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(m), o(!d.has(m)), d.add(m), o(C.r === void 0);
+          else if (p === "d") b(m), o(!v.has(m)), v.add(m), o(C.i === void 0);
           else if (p === "e" || p === "es" || p === "ena") {
             o(!N), N = !0;
-            const w = ve(I);
-            o(w, "Missing type in edit"), w.checkValidOp && w.checkValidOp(f(I));
+            const w = me(C);
+            o(w, "Missing type in edit"), w.checkValidOp && w.checkValidOp(f(C));
           }
         }
         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");
-        x || q(I[0]);
-        let p = 1, v = 0, w = 0;
-        for (let C = 0; C < I.length; C++) {
-          const R = I[C];
+      }, O = (C, x, N) => {
+        if (!Array.isArray(C)) throw Error("Op must be null or a list");
+        if (C.length === 0) throw Error("Empty descent");
+        x || q(C[0]);
+        let p = 1, m = 0, w = 0;
+        for (let I = 0; I < C.length; I++) {
+          const R = C[I];
           if (o(R != null), Array.isArray(R)) {
             const W = O(R, !1);
-            if (v) {
-              const g = typeof w, S = typeof W;
-              g === S ? o(w < W, "descent keys are not in order") : o(g === "number" && S === "string");
+            if (m) {
+              const g = typeof w, U = typeof W;
+              g === U ? o(w < W, "descent keys are not in order") : o(g === "number" && U === "string");
             }
-            w = W, v++, p = 3;
+            w = W, m++, 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];
+        return o(m !== 1, "Operation makes multiple descents. Remove some []"), o(p === 2 || p === 3), C[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));
+      O(i, !0), o(d.size === v.size, "Mismatched picks and drops in op");
+      for (let C = 0; C < d.size; C++) o(d.has(C)), o(v.has(C));
     }
-    function K(i) {
-      let d = 0, m = [];
+    function $(i) {
+      let d = 0, v = [];
       const D = r.writeCursor();
-      return D.mergeTree(i, (O, I) => {
-        const x = ve(O);
+      return D.mergeTree(i, (O, C) => {
+        const x = me(O);
         if (x) {
           const p = f(O);
-          y(I, x, x.normalize ? x.normalize(p) : p);
+          y(C, 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" ? (N = O[p], m[N] == null && (m[N] = d++), m[N]) : O[p];
-          I.write(p, v);
+          const m = p === "p" || p === "d" ? (N = O[p], v[N] == null && (v[N] = d++), v[N]) : O[p];
+          C.write(p, m);
         }
         var N;
       }), D.get();
     }
     function Ee(i, d) {
       if (z(d), d === null) return i;
-      const m = [];
-      return (function D(O, I) {
+      const v = [];
+      return (function D(O, C) {
         let x = O, N = 0, p = {
           root: O
-        }, v = 0, w = p, C = "root";
+        }, m = 0, w = p, I = "root";
         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 (; m < N; m++) {
+            let W = C[m];
+            typeof W != "object" && (o(M(w, I)), w = w[I] = B(w[I]), I = W);
           }
         }
-        for (; N < I.length; N++) {
-          const W = I[N];
+        for (; N < C.length; N++) {
+          const W = C[N];
           if (Array.isArray(W)) {
             const g = D(x, W);
-            g !== x && g !== void 0 && (R(), x = w[C] = g);
+            g !== x && g !== void 0 && (R(), x = w[I] = 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));
+            W.d != null ? (R(), x = h(w, I, v[W.d])) : W.i !== void 0 && (R(), x = h(w, I, W.i));
+            const g = me(W);
+            if (g) R(), x = w[I] = 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) {
+      })(i = (function D(O, C) {
         const x = [];
         let N = 0;
-        for (; N < I.length; N++) {
-          const C = I[N];
-          if (Array.isArray(C)) break;
-          typeof C != "object" && (x.push(O), O = Y(O, C));
+        for (; N < C.length; N++) {
+          const I = C[N];
+          if (Array.isArray(I)) break;
+          typeof I != "object" && (x.push(O), O = Y(O, I));
         }
-        for (let C = I.length - 1; C >= N; C--) O = D(O, I[C]);
+        for (let I = C.length - 1; I >= N; I--) O = D(O, C[I]);
         for (--N; N >= 0; N--) {
-          const C = I[N];
-          if (typeof C != "object") {
+          const I = C[N];
+          if (typeof I != "object") {
             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);
+            O = O === Y(R, I) ? R : O === void 0 ? c(R, I) : (m = I, w = O, (p = B(p = R))[m] = w, p);
+          } else _(I) && (o(O !== void 0, "Cannot pick up or remove undefined"), I.p != null && (v[I.p] = O), O = void 0);
         }
-        var p, v, w;
+        var p, m, w;
         return O;
       })(i, d), d);
     }
     function ce(i, d) {
       i = i.slice(), z(d);
-      const m = r.readCursor(d);
-      let D, O, I = !1;
+      const v = r.readCursor(d);
+      let D, O, C = !1;
       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 R = r.advancer(m, void 0, (g, S) => {
-          _(S) && C++;
+        const m = i[p], w = v.getComponent();
+        if (w && (w.r !== void 0 ? C = !0 : w.p != null && (C = !1, D = w.p, O = p)), p >= i.length) break;
+        let I = 0;
+        const R = r.advancer(v, void 0, (g, U) => {
+          _(U) && I++;
         });
         x.unshift(R);
-        const W = R(v);
-        if (typeof v == "number" && (i[p] -= C), !W) break;
+        const W = R(m);
+        if (typeof m == "number" && (i[p] -= I), !W) break;
       }
-      if (x.forEach((p) => p.end()), I) return null;
+      if (x.forEach((p) => p.end()), C) return null;
       const N = () => {
         let p = 0;
         if (D != null) {
-          const v = m.getPath();
-          p = v.length, i = v.concat(i.slice(O));
+          const m = v.getPath();
+          p = m.length, i = m.concat(i.slice(O));
         }
         for (; p < i.length; p++) {
-          const v = i[p], w = l(m), C = ve(w);
-          if (C) {
+          const m = i[p], w = l(v), I = me(w);
+          if (I) {
             const g = f(w);
-            C.transformPosition && (i[p] = C.transformPosition(i[p], g));
+            I.transformPosition && (i[p] = I.transformPosition(i[p], g));
             break;
           }
           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] += R), !W) break;
+          const W = r.advancer(v, (g, U) => s(U) ? ~(g - R) : g - R, (g, U) => {
+            s(U) && R++;
+          })(m);
+          if (typeof m == "number" && (i[p] += R), !W) break;
         }
       };
-      return D != null ? m.eachDrop(null, (p) => {
+      return D != null ? v.eachDrop(null, (p) => {
         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(), x = [], N = [], p = [], v = [], w = [], C = [], R = /* @__PURE__ */ new Set();
+      let v = 0;
+      const D = r.readCursor(i), O = r.readCursor(d), C = r.writeCursor(), x = [], N = [], p = [], m = [], w = [], I = [], 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());
+        g.d != null && (m[g.d] = O.clone());
       });
       const W = r.writeCursor();
-      return (function g(S, re, te, $, se, Re, Oe, ye) {
+      return (function g(U, re, te, K, se, Re, Oe, ye) {
         o(re || te);
-        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;
+        const oe = l(re), Pe = l(te), Se = !!Pe && Pe.r !== void 0, $e = !!oe && oe.i !== void 0, Te = oe ? oe.d : null, Ce = Pe ? Pe.p : null, xe = (Re || Se) && Ce == null;
+        if (Ce != null) K = m[Ce], Oe = N[Ce] = new r.WriteCursor();
+        else if (Pe && Pe.r !== void 0) K = null;
         else {
-          const T = l($);
-          T && T.d != null && ($ = null);
+          const T = l(K);
+          T && T.d != null && (K = null);
         }
-        const Q = l($);
-        if (Te != null) if (S = p[Te], ye = x[Te] = new r.WriteCursor(), xe) Re && !Ae && ye.write("r", !0);
+        const Q = l(K);
+        if (Te != null) if (U = p[Te], ye = x[Te] = new r.WriteCursor(), xe) Re && !Se && ye.write("r", !0);
         else {
-          const T = w[Te] = m++;
+          const T = w[Te] = v++;
           Oe.write("d", T);
         }
-        else if (oe && oe.i !== void 0) S = null;
+        else if (oe && oe.i !== void 0) U = null;
         else {
-          const T = l(S);
-          T && T.p != null && (S = null);
+          const T = l(U);
+          T && T.p != null && (U = null);
         }
-        let A;
-        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 || Ke)) {
-            const T = Te != null ? w[Te] : m++;
-            C[Ie] = T, ye.write("p", T);
+        let S;
+        $e ? (o(se === void 0), S = oe.i) : S = se;
+        const L = (Ce == null ? !$e || Re || Se : S === void 0) ? null : Oe.getComponent();
+        if (Ce != null) {
+          if (!(se !== void 0 || $e)) {
+            const T = Te != null ? w[Te] : v++;
+            I[Ce] = T, ye.write("p", T);
           }
-        } 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), 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;
+        } else Se && ($e || se !== void 0 || (Pe.r, ye.write("r", Pe.r)));
+        const k = xe ? null : me(oe), P = me(Q);
+        if ((k || P) && (k && k.name, P && P.name), k && P) {
+          o(k === P);
+          const T = f(oe), G = f(Q), he = k.compose(T, G);
+          y(Oe, k, he), R.add(Q);
+        } else k ? y(Oe, k, f(oe)) : P && (y(Oe, P, f(Q)), R.add(Q));
+        const A = typeof S == "object" && S != null;
         let J = !1, X = 0, ee = 0, fe = 0, de = 0, ae = 0;
-        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++;
+        const ve = r.advancer(K, (T, G) => s(G) ? de - T - 1 : T - de, (T, G) => {
+          s(G) && de++;
+        }), H = r.advancer(U, (T, G) => _(G) ? X - T - 1 : T - X, (T, G) => {
+          _(G) && X++;
         });
-        if (r.eachChildOf(re, te, (T, L, he) => {
-          let we, Be, $e = T, Me = T, Ye = T;
+        if (r.eachChildOf(re, te, (T, G, he) => {
+          let we, Be, Ke = T, ke = T, Ye = T;
           if (typeof T == "number") {
             let _e = T + fe;
-            Be = me(_e), Me = _e + de;
+            Be = ve(_e), ke = _e + de;
             let ue = T + ee;
-            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);
+            we = H(ue), s(l(Be)) && (we = null), Ke = ue + X, Ye = T + ae, o(Ke >= 0, "p1PickKey is negative"), o(ke >= 0, "p2DropKey is negative");
+            const Ue = s(l(G)), We = _(l(he));
+            (Ue || We && !xe) && ae--, Ue && ee--, We && fe--;
+          } else we = H(T), Be = ve(T);
+          ye.descend(Ke), Oe.descend(ke);
+          const Xe = A && !s(l(G)) ? S[Ye] : void 0, je = g(we, G, 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) => {
+          A && !xe ? Xe !== je && (J || (S = Array.isArray(S) ? S.slice() : Object.assign({}, S), J = !0), Ne = S, 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(), ve.end(), L != null) L.i = S;
+        else if (!Re && !Se && Ce == null) return S;
+      })(D, D.clone(), O, O.clone(), void 0, !1, C, W), C.reset(), C.mergeTree(W.get()), C.reset(), C.get(), x.map((g) => g.get()), N.map((g) => g.get()), D.traverse(C, (g, U) => {
         const re = g.p;
         if (re != null) {
           const te = w[re];
-          te != null && S.write("p", te);
-          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) => {
+          te != null && U.write("p", te);
+          const K = x[re];
+          K && K.get(), K && U.mergeTree(K.get());
+        } else g.r !== void 0 && U.write("r", g.r);
+      }), C.reset(), C.get(), O.traverse(C, (g, U) => {
         const re = g.d;
         if (re != null) {
-          const $ = C[re];
-          $ != null && S.write("d", $);
+          const K = I[re];
+          K != null && U.write("d", K);
           const se = N[re];
-          se && S.mergeTree(se.get());
-        } else g.i !== void 0 && S.write("i", g.i);
-        const te = ve(g);
-        te && !R.has(g) && y(S, te, f(g));
-      }), I.get();
+          se && U.mergeTree(se.get());
+        } else g.i !== void 0 && U.write("i", g.i);
+        const te = me(g);
+        te && !R.has(g) && y(U, te, f(g));
+      }), C.get();
     }
     function le(i) {
       if (i == null) return null;
-      const d = new r.ReadCursor(i), m = new r.WriteCursor();
+      const d = new r.ReadCursor(i), v = new r.WriteCursor();
       let D;
-      const O = [], I = [];
-      return (function x(N, p, v) {
+      const O = [], C = [];
+      return (function x(N, p, m) {
         const w = N.getComponent();
-        let C, R = !1;
+        let I, R = !1;
         if (w) {
-          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)), R = !0));
+          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), m = void 0), w.i !== void 0 && (m = I = w.i);
+          const g = me(w);
+          g && (m === void 0 ? (D || (D = /* @__PURE__ */ new Set()), D.add(w)) : (f(w), m = g.apply(m, f(w)), R = !0));
         }
         let W = 0;
         for (const g of N) {
           p.descend(g);
-          const S = typeof g == "number" ? g - W : g, re = Y(v, S);
+          const U = typeof g == "number" ? g - W : g, re = Y(m, U);
           s(N.getComponent()) && W++;
           const te = x(N, p, re);
-          if (v !== void 0 && te !== void 0) {
-            if (R || (R = !0, v = B(v)), !U(v, S)) throw Error("Cannot modify child - invalid operation");
-            v[S] = te;
+          if (m !== void 0 && te !== void 0) {
+            if (R || (R = !0, m = B(m)), !M(m, U)) throw Error("Cannot modify child - invalid operation");
+            m[U] = te;
           }
           p.ascend();
         }
-        if (C === void 0) return R ? v : void 0;
-        p.write("r", v);
-      })(d, m, void 0), D && (m.reset(), (function x(N, p, v) {
+        if (I === void 0) return R ? m : void 0;
+        p.write("r", m);
+      })(d, v, void 0), D && (v.reset(), (function x(N, p, m) {
         const w = p.getComponent();
         if (w) {
           const g = w.d;
-          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)));
+          if (g != null && (N = O[g], m = C[g] = r.writeCursor()), D.has(w)) {
+            const U = me(w);
+            if (!U.invert) throw Error(`Cannot invert subtype ${U.name}`);
+            y(m, U, U.invert(f(w)));
           }
         }
-        let C = 0, R = 0;
-        const W = r.advancer(N, (g, S) => _(S) ? C - g - 1 : g - C, (g, S) => {
-          _(S) && C++;
+        let I = 0, R = 0;
+        const W = r.advancer(N, (g, U) => _(U) ? I - g - 1 : g - I, (g, U) => {
+          _(U) && I++;
         });
         for (const g of p) if (typeof g == "number") {
-          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();
+          const U = g - R, re = W(U), te = U + I;
+          m.descend(te), x(re, p, m), s(p.getComponent()) && R++, m.ascend();
+        } else m.descend(g), x(W(g), p, m), m.ascend();
         W.end();
-      })(d.clone(), d, m), I.length && (m.reset(), d.traverse(m, (x, N) => {
+      })(d.clone(), d, v), C.length && (v.reset(), d.traverse(v, (x, N) => {
         const p = x.p;
         if (p != null) {
-          const v = I[p];
-          v && v.get(), v && N.mergeTree(v.get());
+          const m = C[p];
+          m && m.get(), m && N.mergeTree(m.get());
         }
-      }))), m.get();
+      }))), v.get();
     }
-    const ge = (i, d) => i.some((m) => typeof m == "object" && (Array.isArray(m) ? ge(m, d) : d(m)));
+    const ge = (i, d) => i.some((v) => typeof v == "object" && (Array.isArray(v) ? ge(v, d) : d(v)));
     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;
+        var m;
+        return p.r !== void 0 || ((m = me(p)) === null || m === void 0 ? void 0 : m.makeInvertible) != null;
       })) return i;
-      const m = new r.ReadCursor(i), D = new r.WriteCursor();
+      const v = new r.ReadCursor(i), D = new r.WriteCursor();
       let O = !1;
-      const I = [], x = [], N = (p, v, w) => {
-        const C = p.getComponent();
+      const C = [], x = [], N = (p, m, w) => {
+        const I = p.getComponent();
         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"), 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));
+        if (I) {
+          I.d != null && m.write("d", I.d), I.i !== void 0 && m.write("i", I.i);
+          const g = I.p;
+          if (g != null && (C[g] = p.clone(), o(w !== void 0, "Operation picks up at an invalid key"), x[g] = w, m.write("p", I.p)), I.r !== void 0 && w === void 0) throw Error("Invalid doc / op in makeInvertible: removed item missing from doc");
+          const U = me(I);
+          U && (U.makeInvertible ? O = !0 : y(m, U, f(I), !0));
         }
         let W = 0;
         for (const g of p) {
-          v.descend(g);
-          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();
+          m.descend(g);
+          const U = typeof g == "number" ? g - W : g, re = Y(w, U), te = N(p, m, re);
+          re !== te && (R || (R = !0, w = B(w)), te === void 0 ? (w = c(w, U), typeof g == "number" && W++) : w[U] = te), m.ascend();
         }
-        return C && (C.r !== void 0 ? (v.write("r", t.default(w)), w = void 0) : C.p != null && (w = void 0)), w;
+        return I && (I.r !== void 0 ? (m.write("r", n.default(w)), w = void 0) : I.p != null && (w = void 0)), w;
       };
-      return N(m, D, d), D.get(), O && (D.reset(), (function p(v, w, C, R, W) {
+      return N(v, D, d), D.get(), O && (D.reset(), (function p(m, w, I, R, W) {
         const g = w.getComponent();
         if (g) {
-          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) {
+          g.i !== void 0 ? (R = g.i, W = !0) : g.d != null && (R = x[g.d], m = C[g.d], W = !1, g.d);
+          let K = me(g);
+          if (K && K.makeInvertible) {
             const se = f(g);
-            y(C, $, $.makeInvertible(se, R), !0);
+            y(I, K, K.makeInvertible(se, R), !0);
           }
         }
-        let S = 0, re = 0;
-        const te = r.advancer(v, ($, se) => _(se) ? S - $ - 1 : $ - S, ($, se) => {
-          _(se) && S++;
+        let U = 0, re = 0;
+        const te = r.advancer(m, (K, se) => _(se) ? U - K - 1 : K - U, (K, se) => {
+          _(se) && U++;
         });
-        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();
+        for (const K of w) if (typeof K == "number") {
+          const se = K - re, Re = te(se), Oe = se + U, ye = Y(R, W ? se : Oe);
+          I.descend(K), p(Re, w, I, ye, W), s(w.getComponent()) && re++, I.ascend();
         } else {
-          const se = Y(R, $);
-          C.descend($), p(te($), w, C, se, W), C.ascend();
+          const se = Y(R, K);
+          I.descend(K), p(te(K), w, I, se, W), I.ascend();
         }
         te.end();
-      })(m.clone(), m, D, d, !1)), D.get();
+      })(v.clone(), v, D, d, !1)), D.get();
     }
-    function Ut(i, d) {
+    function Mt(i, d) {
       return le(De(i, d));
     }
     const it = (i) => {
       if (i == null) return null;
       const d = i.slice();
-      for (let m = 0; m < i.length; m++) {
-        const D = d[m];
-        Array.isArray(D) && (d[m] = it(D));
+      for (let v = 0; v < i.length; v++) {
+        const D = d[v];
+        Array.isArray(D) && (d[v] = it(D));
       }
       return d;
     };
-    function st(i, d, m) {
-      o(m === "left" || m === "right", "Direction must be left or right");
-      const D = m === "left" ? 0 : 1;
+    function st(i, d, v) {
+      o(v === "left" || v === "right", "Direction must be left or right");
+      const D = v === "left" ? 0 : 1;
       if (d == null) return {
         ok: !0,
         result: i
       };
       z(i), z(d);
       let O = null;
-      const I = [], x = [], N = [], p = [], v = [], w = [], C = [], R = [], W = [], g = [], S = [], re = [], te = [], $ = [], se = [];
+      const C = [], x = [], N = [], p = [], m = [], w = [], I = [], R = [], W = [], g = [], U = [], re = [], te = [], K = [], se = [];
       let Re = 0;
       const Oe = r.readCursor(i), ye = r.readCursor(d), oe = r.writeCursor();
-      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();
+      if ((function Q(S, L = null, k) {
+        const P = l(L);
+        P && (P.r !== void 0 ? k = L.clone() : P.p != null && (k = null, w[P.p] = S.clone()));
+        const A = S.getComponent();
         let J;
-        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);
+        A && (J = A.p) != null && (m[J] = L ? L.clone() : null, N[J] = S.clone(), k && (g[J] = !0, W[J] = k), P && P.p != null && (K[J] = P.p));
+        const X = r.advancer(L);
+        for (const ee of S) Q(S, X(ee), k);
         X.end();
-      })(ye, Oe, null), (function Q(A, G, M, P, k) {
-        const J = M.getComponent();
+      })(ye, Oe, null), (function Q(S, L, k, P, A) {
+        const J = k.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, G = N[X] || null, g[X] ? (k && (S[X] = !0), k = W[X] || null) : !k || D !== 1 && $[X] != null || O == null && (O = {
+        J && ((X = J.d) != null ? (p[X] = k.clone(), P != null && (se[P] == null && (se[P] = []), se[P].push(X)), g[X], S = m[X] || null, L = N[X] || null, g[X] ? (A && (U[X] = !0), A = W[X] || null) : !A || D !== 1 && K[X] != null || O == null && (O = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-          op1: a.removeOp(k.getPath()),
-          op2: a.moveOp(G.getPath(), M.getPath())
-        }), ee = !0) : J.i !== void 0 && (A = G = null, ee = !0, k && O == null && (O = {
+          op1: a.removeOp(A.getPath()),
+          op2: a.moveOp(L.getPath(), k.getPath())
+        }), ee = !0) : J.i !== void 0 && (S = L = null, ee = !0, A && O == null && (O = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-          op1: a.removeOp(k.getPath()),
-          op2: a.insertOp(M.getPath(), J.i)
+          op1: a.removeOp(A.getPath()),
+          op2: a.insertOp(k.getPath(), J.i)
         })));
-        const fe = l(A);
-        fe && (fe.r !== void 0 ? k = A.clone() : fe.p != null && (fe.p, P = fe.p, k = null));
-        const de = ve(J);
-        de && k && O == null && (O = {
+        const fe = l(S);
+        fe && (fe.r !== void 0 ? A = S.clone() : fe.p != null && (fe.p, P = fe.p, A = null));
+        const de = me(J);
+        de && A && O == null && (O = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-          op1: a.removeOp(k.getPath()),
-          op2: a.editOp(M.getPath(), de, f(J), !0)
+          op1: a.removeOp(A.getPath()),
+          op2: a.editOp(k.getPath(), de, f(J), !0)
         });
-        let ae = 0, me = 0;
-        const H = r.advancer(G, (L, he) => _(he) ? ae - L - 1 : L - ae, (L, he) => {
+        let ae = 0, ve = 0;
+        const H = r.advancer(L, (G, he) => _(he) ? ae - G - 1 : G - ae, (G, he) => {
           _(he) && ae++;
-        }), T = r.advancer(A);
-        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);
+        }), T = r.advancer(S);
+        for (const G of k) if (typeof G == "number") {
+          const he = G - ve, we = H(he);
+          ve += +Q(T(he + ae), we, k, P, A);
         } else {
-          const he = H(L);
-          Q(T(L), he, M, P, k);
+          const he = H(G);
+          Q(T(G), he, k, P, A);
         }
         return H.end(), T.end(), ee;
       })(Oe, ye, ye.clone(), null, null), p.map((Q) => Q && Q.get()), O) return {
         ok: !1,
         conflict: O
       };
-      S.map((Q) => !!Q);
+      U.map((Q) => !!Q);
       const Pe = [];
-      let Ae = null;
-      (function Q(A, G, M, P, k) {
+      let Se = null;
+      (function Q(S, L, k, P, A) {
         let J = !1;
-        const X = l(G);
+        const X = l(L);
         if (_(X)) {
           const H = X.p;
-          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();
+          H != null ? (k = p[H], P = re[H] = r.writeCursor(), J = !0, A = null) : (k = null, A = L.clone());
+        } else s(l(k)) && (k = null);
+        const ee = S.getComponent();
         if (ee) {
           const H = ee.p;
-          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)));
+          H != null ? (A && (R[H] = A), Pe[H] = A || D === 1 && J ? null : P.getComponent(), C[H] = S.clone(), k && (I[H] = k.clone())) : ee.r !== void 0 && (A || P.write("r", !0), (A || J) && (Se == null && (Se = /* @__PURE__ */ new Set()), Se.add(ee)));
         }
         let fe = 0, de = 0;
-        const ae = r.advancer(G, void 0, (H, T) => {
+        const ae = r.advancer(L, void 0, (H, T) => {
           _(T) && fe++;
-        }), me = r.advancer(M, (H, T) => s(T) ? ~(H - de) : H - de, (H, T) => {
+        }), ve = r.advancer(k, (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), L = me(H);
-          P.descend(H), Q(A, T, L, P, k), P.ascend();
+        if (S) for (const H of S) if (typeof H == "string") {
+          const T = ae(H), G = ve(H);
+          P.descend(H), Q(S, T, G, P, A), P.ascend();
         } else {
-          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();
+          const T = ae(H), G = H - fe, he = _(l(T)) ? null : ve(G), we = G + de;
+          o(we >= 0), P.descend(we), Q(S, T, he, P, A), P.ascend();
         }
-        ae.end(), me.end();
+        ae.end(), ve.end();
       })(Oe, ye, ye.clone(), oe, null), oe.reset();
-      let Ke = [];
-      if ((function Q(A, G, M, P, k, J) {
-        o(G);
-        const X = G.getComponent();
+      let $e = [];
+      if ((function Q(S, L, k, P, A, J) {
+        o(L);
+        const X = L.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 && (x[j] = G.clone());
+          j != null && (x[j] = L.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 === $[ue] : n.default(ee.i, X.i), _e || ue != null && D !== 1 && $[ue] != null || O == null && (O = {
+            ee && (ee.i !== void 0 || (ue = ee.d) != null && !g[ue]) && (_e = ue != null ? j != null && j === K[ue] : t.default(ee.i, X.i), _e || ue != null && D !== 1 && K[ue] != null || O == null && (O = {
               type: u.ConflictType.DROP_COLLISION,
-              op1: de(j != null ? I[j] : null, G, X),
+              op1: de(j != null ? C[j] : null, L, 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, G, X),
+              op1: de(j != null ? C[j] : null, L, X),
               op2: a.removeOp(J.getPath())
-            }) : (j != null ? (Ke[Re] = j, k.write("d", ie.p = Re++)) : k.write("i", t.default(X.i)), fe = !0));
+            }) : (j != null ? ($e[Re] = j, A.write("d", ie.p = Re++)) : A.write("i", n.default(X.i)), fe = !0));
           } else if (j != null && !ie) {
             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));
-        } 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, J = M.clone()) : j != null && (P = p[j], D !== 1 && $[j] != null || ((k = te[j]) || (k = te[j] = r.writeCursor()), k.reset(), J = null));
+          j != null ? (S = C[j], k = w[j], P = I[j]) : X.i !== void 0 && (S = k = null, _e || (P = null));
+        } else _(l(S)) && (S = k = P = null);
+        const ae = l(S), ve = l(k);
+        if (_(ve)) {
+          const j = ve.p;
+          ve.r !== void 0 && (!ae || ae.r === void 0) || g[j] ? (P = null, J = k.clone()) : j != null && (P = p[j], D !== 1 && K[j] != null || ((A = te[j]) || (A = te[j] = r.writeCursor()), A.reset(), J = null));
         } else !s(X) && s(ee) && (P = null);
         ee = P != null ? P.getComponent() : null;
-        const H = ve(X);
+        const H = me(X);
         if (H) {
           const j = f(X);
           if (J) O == null && (O = {
             type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-            op1: a.editOp(G.getPath(), H, j, !0),
+            op1: a.editOp(L.getPath(), H, j, !0),
             op2: a.removeOp(J.getPath())
           });
           else {
-            const ie = ve(ee);
+            const ie = me(ee);
             let _e;
             if (ie) {
               if (H !== ie) throw Error("Transforming incompatible types");
               const ue = f(ee);
-              _e = H.transform(j, ue, m);
-            } else _e = t.default(j);
-            y(k, H, _e);
+              _e = H.transform(j, ue, v);
+            } else _e = n.default(j);
+            y(A, H, _e);
           }
         }
-        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) => {
+        let T = 0, G = 0, he = 0, we = 0, Be = 0, Ke = 0, ke = S != null && S.descendFirst(), Ye = ke;
+        const Xe = r.advancer(k, void 0, (j, ie) => {
           _(ie) && he++;
         });
         let je = P != null && P.descendFirst(), Ne = je;
-        for (const j of G) if (typeof j == "number") {
+        for (const j of L) if (typeof j == "number") {
           let ie;
-          const _e = s(G.getComponent()), ue = j - L;
+          const _e = s(L.getComponent()), ue = j - G;
           {
-            let Ge;
-            for (; Me && typeof (Ge = A.getKey()) == "number"; ) {
-              Ge += T;
-              const ke = A.getComponent(), Je = _(ke);
-              if (Ge > ue || Ge === ue && (!Je || D === 0 && _e)) break;
+            let Le;
+            for (; ke && typeof (Le = S.getKey()) == "number"; ) {
+              Le += T;
+              const Ae = S.getComponent(), Je = _(Ae);
+              if (Le > ue || Le === ue && (!Je || D === 0 && _e)) break;
               if (Je) {
                 T--;
-                const Fe = ke.p;
-                $.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--;
+                const Fe = Ae.p;
+                K.includes(Fe), Ae.d, l(te[Ae.d]), _(l(te[Ae.d])), (Ae.r === void 0 || Se && Se.has(Ae)) && (Fe == null || !Pe[Fe] || D !== 1 && K.includes(Fe)) || Be--;
               }
-              Me = A.nextSibling();
+              ke = S.nextSibling();
             }
-            ie = Me && Ge === ue ? A : null;
+            ie = ke && Le === ue ? S : null;
           }
-          const Se = ue - T;
-          let We = Xe(Se);
-          const ot = Se - he;
+          const Ue = ue - T;
+          let We = Xe(Ue);
+          const ot = Ue - he;
           let Qe = null;
           {
-            let Ge, ke;
-            for (; je && typeof (Ge = P.getKey()) == "number"; ) {
-              ke = Ge - we;
+            let Le, Ae;
+            for (; je && typeof (Le = P.getKey()) == "number"; ) {
+              Ae = Le - we;
               const Je = P.getComponent(), Fe = s(Je);
-              if (ke > ot) break;
-              if (ke === ot) {
+              if (Ae > ot) break;
+              if (Ae === ot) {
                 if (!Fe) {
                   Qe = P;
                   break;
@@ -1311,99 +1311,99 @@ function on() {
                     Qe = P;
                     break;
                   }
-                  const Le = We && _(We.getComponent());
-                  if (D === 0 && Le) break;
+                  const Ge = We && _(We.getComponent());
+                  if (D === 0 && Ge) break;
                 }
               }
               if (Fe) {
-                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++;
+                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++;
               }
               je = P.nextSibling();
             }
           }
-          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();
+          const _t = ot + we + Be + Ke;
+          o(_t >= 0, "trying to descend to a negative index"), A.descend(_t), _e && (ie = We = Qe = null, G++), Q(ie, L, We, Qe, A, J) && Ke++, A.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 We = je && Se === j ? P : null;
-          k.descend(j), Q(_e, G, ue, We, k, J), k.ascend();
+          for (; ke && (ie = S.getKey(), typeof ie != "string" || !(ie > j || ie === j)); ) ke = S.nextSibling();
+          const _e = ke && ie === j ? S : null, ue = Xe(j);
+          let Ue;
+          for (; je && (Ue = P.getKey(), typeof Ue != "string" || !(Ue > j || Ue === j)); ) je = P.nextSibling();
+          const We = je && Ue === j ? P : null;
+          A.descend(j), Q(_e, L, ue, We, A, J), A.ascend();
         }
-        return Xe.end(), Ye && A.ascend(), Ne && P.ascend(), fe;
+        return Xe.end(), Ye && S.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, G) => Q.traverse(A, (M, P) => {
-        M.d != null && G(M.d, Q, P);
+      const Te = (Q, S, L) => Q.traverse(S, (k, P) => {
+        k.d != null && L(k.d, Q, P);
       });
-      (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());
+      (g.length || re.length) && (Te(ye, oe, (Q, S, L) => {
+        g[Q] && !U[Q] && L.write("r", !0), re[Q] && L.mergeTree(re[Q].get());
       }), oe.reset());
-      const Ie = [], xe = [];
+      const Ce = [], xe = [];
       if ((te.length || g.length) && !O) {
         const Q = r.readCursor(it(oe.get()));
-        if (Te(Q, null, (A, G) => {
-          Ie[A] = G.clone();
-        }), te.forEach((A) => {
-          A && Te(r.readCursor(A.get()), null, (G, M) => {
-            Ie[G] = M.clone();
+        if (Te(Q, null, (S, L) => {
+          Ce[S] = L.clone();
+        }), te.forEach((S) => {
+          S && Te(r.readCursor(S.get()), null, (L, k) => {
+            Ce[L] = k.clone();
           });
-        }), (function A(G, M, P, k, J, X) {
-          const ee = l(M);
+        }), (function S(L, k, P, A, J, X) {
+          const ee = l(k);
           if (ee && _(ee)) if (ee.p != null) {
             const T = ee.p;
-            Ie[T].getPath(), P = Ie[T], k = xe[T] = r.writeCursor();
+            Ce[T].getPath(), P = Ce[T], A = xe[T] = r.writeCursor();
           } else ee.r !== void 0 && (P = null);
           else s(l(P)) && (P = null);
-          const fe = G.getComponent();
+          const fe = L.getComponent();
           if (fe) {
             let T;
             if ((T = fe.d) != null) {
-              const L = te[T];
-              L && (L.get(), k.mergeTree(L.get()), P = r.readCursor(L.get()));
+              const G = te[T];
+              G && (G.get(), A.mergeTree(G.get()), P = r.readCursor(G.get()));
             }
           }
           let de = 0, ae = 0;
-          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++;
+          const ve = r.advancer(k, 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 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();
+          for (const T of L) if (typeof T == "number") {
+            const G = ve(T), he = T + de, we = H(he), Be = he + ae;
+            A.descend(Be), S(L, G, we, A), A.ascend();
+          } else A.descend(T), S(L, ve(T), H(T), A), A.ascend();
+          ve.end(), H.end();
         })(ye, Q, Q.clone(), oe), oe.reset(), O) return {
           ok: !1,
           conflict: O
         };
         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)) {
-            const M = r.writeCursor(), P = r.writeCursor();
-            let k = 0, J = 0;
-            A.forEach((X) => {
+          const S = xe.map((k) => k ? k.get() : null), L = r.readCursor(it(oe.get()));
+          if (Te(L, oe, (k, P, A) => {
+            const J = S[k];
+            J && (A.mergeTree(J), S[k] = null);
+          }), S.find((k) => k)) {
+            const k = r.writeCursor(), P = r.writeCursor();
+            let A = 0, J = 0;
+            S.forEach((X) => {
               X != null && Te(r.readCursor(X), null, (ee) => {
-                const fe = Ke[ee];
-                M.writeMove(I[fe].getPath(), x[fe].getPath(), k++);
+                const fe = $e[ee];
+                k.writeMove(C[fe].getPath(), x[fe].getPath(), A++);
                 const de = se[fe];
                 de && de.forEach((ae) => {
-                  g[ae] || D !== 1 && $[ae] != null || P.writeMove(N[ae].getPath(), p[ae].getPath(), J++);
+                  g[ae] || D !== 1 && K[ae] != null || P.writeMove(N[ae].getPath(), p[ae].getPath(), J++);
                 });
               });
             }), O = {
               type: u.ConflictType.BLACKHOLE,
-              op1: M.get(),
+              op1: k.get(),
               op2: P.get()
             };
           }
@@ -1421,49 +1421,49 @@ function on() {
       const d = new Error("Transform detected write conflict");
       throw d.conflict = i, d.type = d.name = "writeConflict", d;
     };
-    function jt(i, d, m) {
-      const D = st(i, d, m);
+    function jt(i, d, v) {
+      const D = st(i, d, v);
       if (D.ok) return D.result;
       gt(D.conflict);
     }
     const ze = (i) => {
       const d = r.writeCursor();
-      return r.readCursor(i).traverse(d, (m, D) => {
-        (s(m) || ve(m)) && D.write("r", !0);
+      return r.readCursor(i).traverse(d, (v, D) => {
+        (s(v) || me(v)) && D.write("r", !0);
       }), d.get();
     }, Nt = (i, d) => {
-      const { type: m, op1: D, op2: O } = i;
-      switch (m) {
+      const { type: v, op1: D, op2: O } = i;
+      switch (v) {
         case u.ConflictType.DROP_COLLISION:
           return d === "left" ? [null, ze(O)] : [ze(D), null];
         case u.ConflictType.RM_UNEXPECTED_CONTENT:
-          let I = !1;
+          let C = !1;
           return r.readCursor(D).traverse(null, (x) => {
-            x.r !== void 0 && (I = !0);
-          }), I ? [null, ze(O)] : [ze(D), null];
+            x.r !== void 0 && (C = !0);
+          }), C ? [null, ze(O)] : [ze(D), null];
         case u.ConflictType.BLACKHOLE:
           return [ze(D), ze(O)];
         default:
-          throw Error("Unrecognised conflict: " + m);
+          throw Error("Unrecognised conflict: " + v);
       }
     };
-    function yt(i, d, m, D) {
+    function yt(i, d, v, D) {
       let O = null;
       for (; ; ) {
-        const I = st(d, m, D);
-        if (I.ok) return ne(O, I.result);
+        const C = st(d, v, D);
+        if (C.ok) return ne(O, C.result);
         {
-          const { conflict: x } = I;
+          const { conflict: x } = C;
           i(x) || gt(x);
           const [N, p] = Nt(x, D);
-          d = ne(K(d), N), m = ne(K(m), p), O = ne(O, p);
+          d = ne($(d), N), v = ne($(v), p), O = ne(O, p);
         }
       }
     }
   })(Ze)), Ze;
 }
 var Tt;
-function an() {
+function cn() {
   return Tt || (Tt = 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() {
@@ -1471,24 +1471,24 @@ function an() {
       } });
     }) : (function(u, o, l, E) {
       E === void 0 && (E = l), u[E] = o[l];
-    })), n = Ve && Ve.__exportStar || function(u, o) {
+    })), t = 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(on(), a);
-    var t = St();
+    Object.defineProperty(a, "__esModule", { value: !0 }), t(un(), a);
+    var n = Ut();
     Object.defineProperty(a, "ReadCursor", { enumerable: !0, get: function() {
-      return t.ReadCursor;
+      return n.ReadCursor;
     } }), Object.defineProperty(a, "WriteCursor", { enumerable: !0, get: function() {
-      return t.WriteCursor;
+      return n.WriteCursor;
     } });
-    var r = kt();
+    var r = At();
     Object.defineProperty(a, "ConflictType", { enumerable: !0, get: function() {
       return r.ConflictType;
     } });
   })(Ve)), Ve;
 }
-var V = an();
-class ln {
+var V = cn();
+class dn {
   constructor() {
     F(this, "drawingManagerData", {});
     F(this, "_oldDrawingManagerData", {});
@@ -1535,74 +1535,74 @@ class ln {
     this._visible$.next(e);
   }
   refreshTransform(e) {
-    e.forEach((n) => {
-      const t = this._getCurrentBySearch(n);
-      t != null && (t.transform = n.transform, t.transforms = n.transforms, t.isMultiTransform = n.isMultiTransform);
+    e.forEach((t) => {
+      const n = this._getCurrentBySearch(t);
+      n != null && (n.transform = t.transform, n.transforms = t.transforms, n.isMultiTransform = t.isMultiTransform);
     }), this.refreshTransformNotification(e);
   }
   getDrawingDataForUnit(e) {
     return this.drawingManagerData[e] || {};
   }
   removeDrawingDataForUnit(e) {
-    const n = this.drawingManagerData[e];
-    if (n == null)
+    const t = this.drawingManagerData[e];
+    if (t == null)
       return;
     delete this.drawingManagerData[e];
-    const t = [];
-    Object.keys(n).forEach((r) => {
-      const u = n[r];
+    const n = [];
+    Object.keys(t).forEach((r) => {
+      const u = t[r];
       (u == null ? void 0 : u.data) != null && Object.keys(u.data).forEach((o) => {
-        t.push({ unitId: e, subUnitId: r, drawingId: o });
+        n.push({ unitId: e, subUnitId: r, drawingId: o });
       });
-    }), t.length > 0 && this.removeNotification(t);
+    }), n.length > 0 && this.removeNotification(n);
   }
-  registerDrawingData(e, n) {
-    this.drawingManagerData[e] = n;
+  registerDrawingData(e, t) {
+    this.drawingManagerData[e] = t;
   }
   initializeNotification(e) {
-    const n = [], t = this.drawingManagerData[e];
-    t != null && (Object.keys(t).forEach((r) => {
+    const t = [], n = this.drawingManagerData[e];
+    n != null && (Object.keys(n).forEach((r) => {
       this._establishDrawingMap(e, r);
-      const u = t[r];
+      const u = n[r];
       Object.keys(u.data).forEach((o) => {
         const l = u.data[o];
-        l.unitId = e, l.subUnitId = r, n.push(l);
+        l.unitId = e, l.subUnitId = r, t.push(l);
       });
-    }), n.length > 0 && this.addNotification(n));
+    }), t.length > 0 && this.addNotification(t));
   }
-  getDrawingData(e, n) {
-    return this._getDrawingData(e, n);
+  getDrawingData(e, t) {
+    return this._getDrawingData(e, t);
   }
   // Use in doc only.
-  setDrawingData(e, n, t) {
-    this.drawingManagerData[e][n].data = t;
+  setDrawingData(e, t, n) {
+    this.drawingManagerData[e][t].data = n;
   }
   getBatchAddOp(e) {
-    const n = [], t = [], r = [];
+    const t = [], n = [], r = [];
     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);
+      t.push({ unitId: B.unitId, subUnitId: B.subUnitId, drawingId: B.drawingId }), n.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 };
+    const u = n.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: t };
   }
   getBatchRemoveOp(e) {
-    const n = [], t = [];
+    const t = [], n = [];
     e.forEach((E) => {
       const { op: B, invertOp: _ } = this._removeByParam(E);
-      n.unshift(B), t.push(_);
+      t.unshift(B), n.push(_);
     });
-    const r = n.reduce(V.type.compose, null), u = t.reduce(V.type.compose, null), { unitId: o, subUnitId: l } = e[0];
+    const r = t.reduce(V.type.compose, null), u = n.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 = [];
+    const t = [], n = [], r = [];
     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);
+      t.push({ unitId: B.unitId, subUnitId: B.subUnitId, drawingId: B.drawingId }), n.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 };
+    const u = n.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: t };
   }
   removeNotification(e) {
     this._remove$.next(e);
@@ -1626,38 +1626,38 @@ class ln {
     this._refreshTransform$.next(e);
   }
   getGroupDrawingOp(e) {
-    const n = [], { unitId: t, subUnitId: r } = e[0].parent;
+    const t = [], { unitId: n, subUnitId: r } = e[0].parent;
     e.forEach((l) => {
-      n.push(this._getGroupDrawingOp(l));
+      t.push(this._getGroupDrawingOp(l));
     });
-    const u = n.reduce(V.type.compose, null);
-    return { undo: V.type.invertWithDoc(u, this.drawingManagerData), redo: u, unitId: t, subUnitId: r, objects: e };
+    const u = t.reduce(V.type.compose, null);
+    return { undo: V.type.invertWithDoc(u, this.drawingManagerData), redo: u, unitId: n, subUnitId: r, objects: e };
   }
   getUngroupDrawingOp(e) {
-    const n = [], { unitId: t, subUnitId: r } = e[0].parent;
+    const t = [], { unitId: n, subUnitId: r } = e[0].parent;
     e.forEach((l) => {
-      n.push(this._getUngroupDrawingOp(l));
+      t.push(this._getUngroupDrawingOp(l));
     });
-    const u = n.reduce(V.type.compose, null);
-    return { undo: V.type.invertWithDoc(u, this.drawingManagerData), redo: u, unitId: t, subUnitId: r, objects: e };
+    const u = t.reduce(V.type.compose, null);
+    return { undo: V.type.invertWithDoc(u, this.drawingManagerData), redo: u, unitId: n, subUnitId: r, objects: e };
   }
   getDrawingsByGroup(e) {
-    const { unitId: n, subUnitId: t, drawingId: r } = e;
-    if (this.getDrawingByParam({ unitId: n, subUnitId: t, drawingId: r }) == null)
+    const { unitId: t, subUnitId: n, drawingId: r } = e;
+    if (this.getDrawingByParam({ unitId: t, subUnitId: n, drawingId: r }) == null)
       return [];
-    const o = this._getDrawingData(n, t), l = [];
+    const o = this._getDrawingData(t, n), l = [];
     return Object.keys(o).forEach((E) => {
       const B = o[E];
       B.groupId === r && l.push(B);
     }), l;
   }
   _getGroupDrawingOp(e) {
-    const { parent: n, children: t } = e, { unitId: r, subUnitId: u, drawingId: o } = n, l = [];
+    const { parent: t, children: n } = e, { unitId: r, subUnitId: u, drawingId: o } = t, l = [];
     l.push(
-      V.insertOp([r, u, "data", o], n)
+      V.insertOp([r, u, "data", o], t)
     );
     let E = Number.NEGATIVE_INFINITY;
-    return t.forEach((B) => {
+    return n.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(B, this.getDrawingByParam({ unitId: _, subUnitId: s, drawingId: c }))
@@ -1667,8 +1667,8 @@ class ln {
     ), l.reduce(V.type.compose, null);
   }
   _getUngroupDrawingOp(e) {
-    const { parent: n, children: t } = e, { unitId: r, subUnitId: u, drawingId: o } = n, l = [];
-    return t.forEach((E) => {
+    const { parent: t, children: n } = e, { unitId: r, subUnitId: u, drawingId: o } = t, l = [];
+    return n.forEach((E) => {
       const { unitId: B, subUnitId: _, drawingId: s } = E;
       l.push(
         ...this._getUpdateParamCompareOp(E, this.getDrawingByParam({ unitId: B, subUnitId: _, drawingId: s }))
@@ -1679,8 +1679,8 @@ class ln {
       V.removeOp([r, u, "order", this._getDrawingOrder(r, u).indexOf(o)], !0)
     ), l.reduce(V.type.compose, null);
   }
-  applyJson1(e, n, t) {
-    this._establishDrawingMap(e, n), this._oldDrawingManagerData = { ...this.drawingManagerData }, this.drawingManagerData = V.type.apply(this.drawingManagerData, t);
+  applyJson1(e, t, n) {
+    this._establishDrawingMap(e, t), this._oldDrawingManagerData = { ...this.drawingManagerData }, this.drawingManagerData = V.type.apply(this.drawingManagerData, n);
   }
   // private _fillMissingFields(jsonOp: JSONOp) {
   //     if (jsonOp == null) {
@@ -1727,134 +1727,134 @@ class ln {
     return this._getOldBySearch(e);
   }
   getDrawingOKey(e) {
-    const [n, t, r] = e.split("#-#");
-    return this._getCurrentBySearch({ unitId: n, subUnitId: t, drawingId: r });
+    const [t, n, r] = e.split("#-#");
+    return this._getCurrentBySearch({ unitId: t, subUnitId: n, drawingId: r });
   }
   focusDrawing(e) {
     if (e == null || e.length === 0) {
       this._focusDrawings = [], this._focus$.next([]);
       return;
     }
-    const n = [];
-    e.forEach((t) => {
+    const t = [];
+    e.forEach((n) => {
       var E;
-      const { unitId: r, subUnitId: u, drawingId: o } = t, l = (E = this._getDrawingData(r, u)) == null ? void 0 : E[o];
-      l != null && n.push(l);
-    }), n.length > 0 && (this._focusDrawings = n, this._focus$.next(n));
+      const { unitId: r, subUnitId: u, drawingId: o } = n, l = (E = this._getDrawingData(r, u)) == null ? void 0 : E[o];
+      l != null && t.push(l);
+    }), t.length > 0 && (this._focusDrawings = t, this._focus$.next(t));
   }
   getFocusDrawings() {
     const e = [];
-    return this._focusDrawings.forEach((n) => {
+    return this._focusDrawings.forEach((t) => {
       var l;
-      const { unitId: t, subUnitId: r, drawingId: u } = n, o = (l = this._getDrawingData(t, r)) == null ? void 0 : l[u];
+      const { unitId: n, subUnitId: r, drawingId: u } = t, o = (l = this._getDrawingData(n, r)) == null ? void 0 : l[u];
       o != null && e.push(o);
     }), e;
   }
-  getDrawingOrder(e, n) {
-    return this._getDrawingOrder(e, n);
+  getDrawingOrder(e, t) {
+    return this._getDrawingOrder(e, t);
   }
   // Use in doc only.
-  setDrawingOrder(e, n, t) {
-    this.drawingManagerData[e][n].order = t;
+  setDrawingOrder(e, t, n) {
+    this.drawingManagerData[e][t].order = n;
   }
   orderUpdateNotification(e) {
     this._order$.next(e);
   }
   getForwardDrawingsOp(e) {
-    const { unitId: n, subUnitId: t, drawingIds: r } = e, u = [], o = this.getDrawingOrder(n, t), l = [...r];
+    const { unitId: t, subUnitId: n, drawingIds: r } = e, u = [], o = this.getDrawingOrder(t, n), l = [...r];
     r.forEach((_) => {
-      const s = this._hasDrawingOrder({ unitId: n, subUnitId: t, drawingId: _ });
+      const s = this._hasDrawingOrder({ unitId: t, subUnitId: n, drawingId: _ });
       if (s === -1 || s === o.length - 1)
         return;
-      const c = V.moveOp([n, t, "order", s], [n, t, "order", s + 1]);
+      const c = V.moveOp([t, n, "order", s], [t, n, "order", s + 1]);
       u.push(c), l.includes(o[s + 1]) || l.push(o[s + 1]);
     });
     const E = u.reduce(V.type.compose, null);
-    return { undo: V.type.invertWithDoc(E, this.drawingManagerData), redo: E, unitId: n, subUnitId: t, objects: { ...e, drawingIds: l } };
+    return { undo: V.type.invertWithDoc(E, this.drawingManagerData), redo: E, unitId: t, subUnitId: n, objects: { ...e, drawingIds: l } };
   }
   getBackwardDrawingOp(e) {
-    const { unitId: n, subUnitId: t, drawingIds: r } = e, u = [], o = this.getDrawingOrder(n, t), l = [...r];
+    const { unitId: t, subUnitId: n, drawingIds: r } = e, u = [], o = this.getDrawingOrder(t, n), l = [...r];
     r.forEach((_) => {
-      const s = this._hasDrawingOrder({ unitId: n, subUnitId: t, drawingId: _ });
+      const s = this._hasDrawingOrder({ unitId: t, subUnitId: n, drawingId: _ });
       if (s === -1 || s === 0)
         return;
-      const c = V.moveOp([n, t, "order", s], [n, t, "order", s - 1]);
+      const c = V.moveOp([t, n, "order", s], [t, n, "order", s - 1]);
       u.push(c), l.includes(o[s - 1]) || l.push(o[s - 1]);
     });
     const E = u.reduce(V.type.compose, null);
-    return { undo: V.type.invertWithDoc(E, this.drawingManagerData), redo: E, unitId: n, subUnitId: t, objects: { ...e, drawingIds: l } };
+    return { undo: V.type.invertWithDoc(E, this.drawingManagerData), redo: E, unitId: t, subUnitId: n, objects: { ...e, drawingIds: l } };
   }
   getFrontDrawingsOp(e) {
-    const { unitId: n, subUnitId: t, drawingIds: r } = e, u = this._getOrderFromSearchParams(n, t, r), o = [...r], l = this.getDrawingOrder(n, t), E = [];
+    const { unitId: t, subUnitId: n, drawingIds: r } = e, u = this._getOrderFromSearchParams(t, n, r), o = [...r], l = this.getDrawingOrder(t, n), E = [];
     u.forEach((s) => {
-      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 { drawingId: c } = s, h = this._getDrawingCount(t, n) - 1, M = V.moveOp([t, n, "order", this._getDrawingOrder(t, n).indexOf(c)], [t, n, "order", h]);
+      E.push(M), o.includes(l[h]) || o.push(l[h]);
     });
     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 } };
+    return { undo: V.type.invertWithDoc(B, this.drawingManagerData), redo: B, unitId: t, subUnitId: n, 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 = [];
+    const { unitId: t, subUnitId: n, drawingIds: r } = e, u = this._getOrderFromSearchParams(t, n, r, !0), o = [...r], l = this.getDrawingOrder(t, n), E = [];
     u.forEach((s) => {
-      const { drawingId: c } = s, h = V.moveOp([n, t, "order", this._getDrawingOrder(n, t).indexOf(c)], [n, t, "order", 0]);
+      const { drawingId: c } = s, h = V.moveOp([t, n, "order", this._getDrawingOrder(t, n).indexOf(c)], [t, n, "order", 0]);
       E.push(h), o.includes(l[0]) || o.push(l[0]);
     });
     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 } };
+    return { undo: V.type.invertWithDoc(B, this.drawingManagerData), redo: B, unitId: t, subUnitId: n, objects: { ...e, drawingIds: o } };
   }
-  _getDrawingCount(e, n) {
-    return this.getDrawingOrder(e, n).length || 0;
+  _getDrawingCount(e, t) {
+    return this.getDrawingOrder(e, t).length || 0;
   }
-  _getOrderFromSearchParams(e, n, t, r = !1) {
-    return t.map((u) => {
-      const o = this._hasDrawingOrder({ unitId: e, subUnitId: n, drawingId: u });
+  _getOrderFromSearchParams(e, t, n, r = !1) {
+    return n.map((u) => {
+      const o = this._hasDrawingOrder({ unitId: e, subUnitId: t, drawingId: u });
       return { drawingId: u, zIndex: o };
-    }).sort(r === !1 ? Gt : Lt);
+    }).sort(r === !1 ? Lt : Gt);
   }
   _hasDrawingOrder(e) {
     if (e == null)
       return -1;
-    const { unitId: n, subUnitId: t, drawingId: r } = e;
-    return this._establishDrawingMap(n, t), this._getDrawingOrder(n, t).indexOf(r);
+    const { unitId: t, subUnitId: n, drawingId: r } = e;
+    return this._establishDrawingMap(t, n), this._getDrawingOrder(t, n).indexOf(r);
   }
   _getCurrentBySearch(e) {
     var u, o, l;
     if (e == null)
       return;
-    const { unitId: n, subUnitId: t, drawingId: r } = e;
-    return (l = (o = (u = this.drawingManagerData[n]) == null ? void 0 : u[t]) == null ? void 0 : o.data) == null ? void 0 : l[r];
+    const { unitId: t, subUnitId: n, drawingId: r } = e;
+    return (l = (o = (u = this.drawingManagerData[t]) == null ? void 0 : u[n]) == null ? void 0 : o.data) == null ? void 0 : l[r];
   }
   _getOldBySearch(e) {
     var u, o, l;
     if (e == null)
       return;
-    const { unitId: n, subUnitId: t, drawingId: r } = e;
-    return (l = (o = (u = this._oldDrawingManagerData[n]) == null ? void 0 : u[t]) == null ? void 0 : o.data) == null ? void 0 : l[r];
+    const { unitId: t, subUnitId: n, drawingId: r } = e;
+    return (l = (o = (u = this._oldDrawingManagerData[t]) == null ? void 0 : u[n]) == null ? void 0 : o.data) == null ? void 0 : l[r];
   }
-  _establishDrawingMap(e, n, t) {
+  _establishDrawingMap(e, t, n) {
     var r;
-    return this.drawingManagerData[e] || (this.drawingManagerData[e] = {}), this.drawingManagerData[e][n] || (this.drawingManagerData[e][n] = {
+    return this.drawingManagerData[e] || (this.drawingManagerData[e] = {}), this.drawingManagerData[e][t] || (this.drawingManagerData[e][t] = {
       data: {},
       order: []
-    }), t == null ? null : (r = this.drawingManagerData[e][n].data) == null ? void 0 : r[t];
+    }), n == null ? null : (r = this.drawingManagerData[e][t].data) == null ? void 0 : r[n];
   }
   _addByParam(e) {
-    const { unitId: n, subUnitId: t, drawingId: r } = e;
-    this._establishDrawingMap(n, t, r);
-    const u = V.insertOp([n, t, "data", r], e), o = V.insertOp([n, t, "order", this._getDrawingOrder(n, t).length], r), l = [u, o].reduce(V.type.compose, null), E = V.type.invertWithDoc(l, this.drawingManagerData);
+    const { unitId: t, subUnitId: n, drawingId: r } = e;
+    this._establishDrawingMap(t, n, r);
+    const u = V.insertOp([t, n, "data", r], e), o = V.insertOp([t, n, "order", this._getDrawingOrder(t, n).length], r), l = [u, o].reduce(V.type.compose, null), E = V.type.invertWithDoc(l, this.drawingManagerData);
     return { op: l, invertOp: E };
   }
   _removeByParam(e) {
     if (e == null)
       return { op: [], invertOp: [] };
-    const { unitId: n, subUnitId: t, drawingId: r } = e;
-    if (this._establishDrawingMap(n, t, r) == null)
+    const { unitId: t, subUnitId: n, drawingId: r } = e;
+    if (this._establishDrawingMap(t, n, 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), B = V.type.invertWithDoc(E, this.drawingManagerData);
+    const o = V.removeOp([t, n, "data", r], !0), l = V.removeOp([t, n, "order", this._getDrawingOrder(t, n).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);
+    const { unitId: t, subUnitId: n, drawingId: r } = e, u = this._establishDrawingMap(t, n, r);
     if (u == null)
       return { op: [], invertOp: [] };
     const l = this._getUpdateParamCompareOp(e, u).reduce(V.type.compose, null), E = V.type.invertWithDoc(l, this.drawingManagerData);
@@ -1867,22 +1867,22 @@ class ln {
   //         }
   //     });
   // }
-  _getUpdateParamCompareOp(e, n) {
-    const { unitId: t, subUnitId: r, drawingId: u } = e, o = [];
+  _getUpdateParamCompareOp(e, t) {
+    const { unitId: n, subUnitId: r, drawingId: u } = e, o = [];
     return Object.keys(e).forEach((l) => {
-      const E = e[l], B = n[l];
+      const E = e[l], B = t[l];
       B !== E && o.push(
-        V.replaceOp([t, r, "data", u, l], B, E)
+        V.replaceOp([n, r, "data", u, l], B, E)
       );
     }), o;
   }
-  _getDrawingData(e, n) {
-    var t, r;
-    return ((r = (t = this.drawingManagerData[e]) == null ? void 0 : t[n]) == null ? void 0 : r.data) || {};
+  _getDrawingData(e, t) {
+    var n, r;
+    return ((r = (n = this.drawingManagerData[e]) == null ? void 0 : n[t]) == null ? void 0 : r.data) || {};
   }
-  _getDrawingOrder(e, n) {
-    var t, r;
-    return ((r = (t = this.drawingManagerData[e]) == null ? void 0 : t[n]) == null ? void 0 : r.order) || [];
+  _getDrawingOrder(e, t) {
+    var n, r;
+    return ((r = (n = this.drawingManagerData[e]) == null ? void 0 : n[t]) == null ? void 0 : r.order) || [];
   }
   getDrawingVisible() {
     return this._visible;
@@ -1897,9 +1897,9 @@ class ln {
     this._editable = e;
   }
 }
-class un extends ln {
+class fn extends dn {
 }
-class cn {
+class hn {
   constructor() {
     F(this, "_waitCount", 0);
     F(this, "_change$", new be());
@@ -1909,27 +1909,27 @@ class cn {
   setWaitCount(e) {
     this._waitCount = e, this._change$.next(e);
   }
-  getImageSourceCache(e, n) {
-    if (n === at.BASE64) {
-      const t = new Image();
-      return t.src = e, t;
+  getImageSourceCache(e, t) {
+    if (t === at.BASE64) {
+      const n = new Image();
+      return n.src = e, n;
     }
     return this._imageSourceCache.get(e);
   }
-  addImageSourceCache(e, n, t) {
-    n === at.BASE64 || t == null || this._imageSourceCache.set(e, t);
+  addImageSourceCache(e, t, n) {
+    t === at.BASE64 || n == null || this._imageSourceCache.set(e, n);
   }
   async getImage(e) {
     return Promise.resolve(e);
   }
   async saveImage(e) {
-    return new Promise((n, t) => {
-      if (!Zt.includes(e.type)) {
-        t(new Error(et.ERROR_IMAGE_TYPE)), this._decreaseWaiting();
+    return new Promise((t, n) => {
+      if (!tn.includes(e.type)) {
+        n(new Error(et.ERROR_IMAGE_TYPE)), this._decreaseWaiting();
         return;
       }
-      if (e.size > Yt) {
-        t(new Error(et.ERROR_EXCEED_SIZE)), this._decreaseWaiting();
+      if (e.size > en) {
+        n(new Error(et.ERROR_EXCEED_SIZE)), this._decreaseWaiting();
         return;
       }
       const r = new FileReader();
@@ -1937,11 +1937,11 @@ class cn {
         var E;
         const o = (E = u.target) == null ? void 0 : E.result;
         if (o == null) {
-          t(new Error(et.ERROR_IMAGE)), this._decreaseWaiting();
+          n(new Error(et.ERROR_IMAGE)), this._decreaseWaiting();
           return;
         }
         const l = qt(6);
-        n({
+        t({
           imageId: l,
           imageSourceType: at.BASE64,
           source: o,
@@ -1955,74 +1955,106 @@ class cn {
     this._waitCount -= 1, this._change$.next(this._waitCount);
   }
 }
-var dn = Object.getOwnPropertyDescriptor, fn = (a, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? dn(e, n) : e, u = a.length - 1, o; u >= 0; u--)
+class pn extends $t {
+  constructor() {
+    super(...arguments);
+    F(this, "_urlImageDownloader", null);
+  }
+  registerURLImageDownloader(t) {
+    return this._urlImageDownloader = t, Kt(() => {
+      this._urlImageDownloader = null;
+    });
+  }
+  async getImage(t) {
+    if (this._urlImageDownloader)
+      try {
+        return await this._urlImageDownloader(t);
+      } catch (n) {
+        console.error(`Custom downloader failed for ${t}, falling back to default behavior:`, n);
+      }
+    return t;
+  }
+  async downloadImage(t) {
+    if (this._urlImageDownloader)
+      try {
+        const r = await this._urlImageDownloader(t);
+        return await (await fetch(r)).blob();
+      } catch (r) {
+        console.error(`Custom downloader failed for ${t}, falling back to default fetch:`, r);
+      }
+    return await (await fetch(t)).blob();
+  }
+}
+var gn = Object.getOwnPropertyDescriptor, yn = (a, e, t, n) => {
+  for (var r = n > 1 ? void 0 : n ? gn(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (r = o(r) || r);
   return r;
-}, dt = (a, e) => (n, t) => e(n, t, a);
-const hn = "UNIVER_DRAWING_PLUGIN";
+}, dt = (a, e) => (t, n) => e(t, n, a);
+const _n = "UNIVER_DRAWING_PLUGIN";
 var ft;
-let At = (ft = class extends Ht {
-  constructor(a = vt, e, n, t) {
-    super(), this._config = a, this._injector = e, this._configService = n, this._commandService = t;
-    const { ...r } = zt(
+let St = (ft = class extends Xt {
+  constructor(a = mt, e, t, n) {
+    super(), this._config = a, this._injector = e, this._configService = t, this._commandService = n;
+    const { ...r } = Jt(
       {},
-      vt,
+      mt,
       this._config
     );
-    this._configService.setConfig(en, r);
+    this._configService.setConfig(rn, r);
   }
   onStarting() {
     this._initCommands(), this._initDependencies();
   }
   _initDependencies() {
-    var n;
-    Xt([
-      [Jt, { useClass: cn }],
-      [Mt, { useClass: un }]
-    ], (n = this._config) == null ? void 0 : n.override).forEach((t) => this._injector.add(t));
+    var t;
+    Yt([
+      [Zt, { useClass: hn }],
+      [Qt, { useClass: pn }],
+      [kt, { useClass: fn }]
+    ], (t = this._config) == null ? void 0 : t.override).forEach((n) => this._injector.add(n));
   }
   _initCommands() {
     [
-      Qt
+      nn
     ].forEach((a) => this.disposeWithMe(this._commandService.registerCommand(a)));
   }
-}, F(ft, "pluginName", hn), ft);
-At = fn([
-  dt(1, Kt($t)),
-  dt(2, Ft),
-  dt(3, Vt)
-], At);
-function On({ unitId: a, subUnitId: e, drawingId: n }, t) {
-  return typeof t == "number" ? `${a}#-#${e}#-#${n}#-#${t}` : `${a}#-#${e}#-#${n}`;
+}, F(ft, "pluginName", _n), ft);
+St = yn([
+  dt(1, Ft(Vt)),
+  dt(2, Ht),
+  dt(3, zt)
+], St);
+function Cn({ unitId: a, subUnitId: e, drawingId: t }, n) {
+  return typeof n == "number" ? `${a}#-#${e}#-#${t}#-#${n}` : `${a}#-#${e}#-#${t}`;
 }
-const wn = async (a) => new Promise((e, n) => {
-  const t = new Image();
-  t.src = a, t.onload = () => {
+const En = async (a) => new Promise((e, t) => {
+  const n = new Image();
+  n.src = a, n.onload = () => {
     e({
-      width: t.width,
-      height: t.height,
-      image: t
+      width: n.width,
+      height: n.height,
+      image: n
     });
-  }, t.onerror = (r) => {
-    n(r);
+  }, n.onerror = (r) => {
+    t(r);
   };
 });
 export {
-  Zt as DRAWING_IMAGE_ALLOW_IMAGE_LIST,
-  Yt as DRAWING_IMAGE_ALLOW_SIZE,
-  mn as DRAWING_IMAGE_COUNT_LIMIT,
-  vn as DRAWING_IMAGE_HEIGHT_LIMIT,
-  _n as DRAWING_IMAGE_WIDTH_LIMIT,
-  un as DrawingManagerService,
-  Mt as IDrawingManagerService,
-  In as IImageIoService,
-  cn as ImageIoService,
-  En as ImageSourceType,
-  Dn as ImageUploadStatusType,
-  Qt as SetDrawingSelectedOperation,
-  ln as UnitDrawingService,
-  At as UniverDrawingPlugin,
-  On as getDrawingShapeKeyByDrawingSearch,
-  wn as getImageSize
+  tn as DRAWING_IMAGE_ALLOW_IMAGE_LIST,
+  en as DRAWING_IMAGE_ALLOW_SIZE,
+  In as DRAWING_IMAGE_COUNT_LIMIT,
+  bn as DRAWING_IMAGE_HEIGHT_LIMIT,
+  wn as DRAWING_IMAGE_WIDTH_LIMIT,
+  fn as DrawingManagerService,
+  kt as IDrawingManagerService,
+  Tn as IImageIoService,
+  hn as ImageIoService,
+  Sn as ImageSourceType,
+  kn as ImageUploadStatusType,
+  nn as SetDrawingSelectedOperation,
+  pn as URLImageService,
+  dn as UnitDrawingService,
+  St as UniverDrawingPlugin,
+  Cn as getDrawingShapeKeyByDrawingSearch,
+  En as getImageSize
 };