@univerjs/drawing 0.1.15 → 0.1.16

package/lib/es/index.js

@@ -1,6 +1,6 @@
 var Dt = Object.defineProperty;
 var Ut = (t, e, n) => e in t ? Dt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
-var q = (t, e, n) => (Ut(t, typeof e != "symbol" ? e + "" : e, n), n);
+var V = (t, e, n) => Ut(t, typeof e != "symbol" ? e + "" : e, n);
 import { Subject as we } from "rxjs";
 import { sortRules as Mt, sortRulesByDesc as Nt, Tools as kt, Plugin as Rt, mergeOverrideWithDependencies as St } from "@univerjs/core";
 import { createIdentifier as It, Inject as jt, Injector as Tt } from "@wendellhu/redi";
@@ -279,9 +279,9 @@ var ht = {};
     e[e.RM_UNEXPECTED_CONTENT = 1] = "RM_UNEXPECTED_CONTENT", e[e.DROP_COLLISION = 2] = "DROP_COLLISION", e[e.BLACKHOLE = 3] = "BLACKHOLE";
   }(t.ConflictType || (t.ConflictType = {}));
 })(ht);
-var it = {}, Ve = {}, vt;
+var it = {}, Fe = {}, vt;
 function pt() {
-  return vt || (vt = 1, Object.defineProperty(Ve, "__esModule", { value: !0 }), Ve.uniToStrPos = Ve.strPosToUni = void 0, Ve.strPosToUni = (t, e = t.length) => {
+  return vt || (vt = 1, Object.defineProperty(Fe, "__esModule", { value: !0 }), Fe.uniToStrPos = Fe.strPosToUni = void 0, Fe.strPosToUni = (t, e = t.length) => {
     let n = 0, s = 0;
     for (; s < e; s++) {
       const i = t.charCodeAt(s);
@@ -290,14 +290,14 @@ function pt() {
     if (s !== e)
       throw Error("Invalid offset - splits unicode bytes");
     return s - n;
-  }, Ve.uniToStrPos = (t, e) => {
+  }, Fe.uniToStrPos = (t, e) => {
     let n = 0;
     for (; e > 0; e--) {
       const s = t.charCodeAt(n);
       n += s >= 55296 && s <= 57343 ? 2 : 1;
     }
     return n;
-  }), Ve;
+  }), Fe;
 }
 var st = {}, yt;
 function at() {
@@ -359,17 +359,16 @@ function at() {
     const d = (f) => f, l = (f) => i(f, d);
     t.dlen = (f) => typeof f == "number" ? f : e.strPosToUni(f);
     const a = (f) => (_) => {
-      if (!(!_ || _.d === 0 || _.d === ""))
-        if (f.length === 0)
-          f.push(_);
-        else if (typeof _ == typeof f[f.length - 1])
-          if (typeof _ == "object") {
-            const w = f[f.length - 1];
-            w.d = typeof w.d == "string" && typeof _.d == "string" ? w.d + _.d : t.dlen(w.d) + t.dlen(_.d);
-          } else
-            f[f.length - 1] += _;
-        else
-          f.push(_);
+      if (!(!_ || _.d === 0 || _.d === "")) if (f.length === 0)
+        f.push(_);
+      else if (typeof _ == typeof f[f.length - 1])
+        if (typeof _ == "object") {
+          const w = f[f.length - 1];
+          w.d = typeof w.d == "string" && typeof _.d == "string" ? w.d + _.d : t.dlen(w.d) + t.dlen(_.d);
+        } else
+          f[f.length - 1] += _;
+      else
+        f.push(_);
     }, E = (f) => typeof f == "number" ? f : typeof f == "string" ? e.strPosToUni(f) : typeof f.d == "number" ? f.d : e.strPosToUni(f.d);
     t.uniSlice = (f, _, w) => {
       const L = e.uniToStrPos(f, _), X = w == null ? 1 / 0 : e.uniToStrPos(f, w);
@@ -576,11 +575,10 @@ function at() {
     t.default = ve;
   }(st)), st;
 }
-var Qe = {}, mt;
+var Qe = {}, bt;
 function xt() {
-  if (mt)
-    return Qe;
-  mt = 1, Object.defineProperty(Qe, "__esModule", { value: !0 });
+  if (bt) return Qe;
+  bt = 1, Object.defineProperty(Qe, "__esModule", { value: !0 });
   const t = at(), e = pt();
   function n(s, i) {
     return {
@@ -621,9 +619,9 @@ function xt() {
   }
   return Qe.default = n, n.provides = { text: !0 }, Qe;
 }
-var bt;
+var mt;
 function Lt() {
-  return bt || (bt = 1, function(t) {
+  return mt || (mt = 1, function(t) {
     var e = Ce && Ce.__createBinding || (Object.create ? function(c, h, R, Z) {
       Z === void 0 && (Z = R), Object.defineProperty(c, Z, { enumerable: !0, get: function() {
         return h[R];
@@ -635,12 +633,9 @@ function Lt() {
     } : function(c, h) {
       c.default = h;
     }), s = Ce && Ce.__importStar || function(c) {
-      if (c && c.__esModule)
-        return c;
+      if (c && c.__esModule) return c;
       var h = {};
-      if (c != null)
-        for (var R in c)
-          Object.hasOwnProperty.call(c, R) && e(h, c, R);
+      if (c != null) for (var R in c) Object.hasOwnProperty.call(c, R) && e(h, c, R);
       return n(h, c), h;
     }, i = Ce && Ce.__importDefault || function(c) {
       return c && c.__esModule ? c : { default: c };
@@ -695,8 +690,7 @@ function Lt() {
   }), t.editOp = t.replaceOp = t.insertOp = t.moveOp = t.removeOp = t.type = void 0;
   const n = e(ct), s = e(dt), i = ft, d = ht;
   function l(r, u) {
-    if (!r)
-      throw new Error(u);
+    if (!r) throw new Error(u);
   }
   t.type = {
     name: "json1",
@@ -739,7 +733,7 @@ function Lt() {
   }
   t.removeOp = (r, u = !0) => i.writeCursor().writeAtPath(r, "r", u).get(), t.moveOp = (r, u) => i.writeCursor().writeMove(r, u).get(), t.insertOp = (r, u) => i.writeCursor().writeAtPath(r, "i", u).get(), t.replaceOp = (r, u, y) => i.writeCursor().at(r, (A) => {
     A.write("r", u), A.write("i", y);
-  }).get(), t.editOp = (r, u, y, A = !1) => i.writeCursor().at(r, (m) => _(m, u, y, A)).get();
+  }).get(), t.editOp = (r, u, y, A = !1) => i.writeCursor().at(r, (b) => _(b, u, y, A)).get();
   const R = (r, u) => r != null && (typeof u == "number" ? Array.isArray(r) : typeof r == "object"), Z = (r, u) => R(r, u) ? r[u] : void 0, pe = {};
   function J(r) {
     let u = r.type ? r.type : r;
@@ -747,8 +741,7 @@ function Lt() {
   }
   const Ie = (r) => {
     const u = pe[r];
-    if (u)
-      return u;
+    if (u) return u;
     throw Error("Missing type: " + r);
   };
   J(Lt());
@@ -761,8 +754,8 @@ function Lt() {
     transform: (r) => r
   });
   const ve = (r) => r == null ? null : r.et ? Ie(r.et) : r.es ? pe["text-unicode"] : r.ena != null ? pe.number : null, f = (r) => r.es ? r.es : r.ena != null ? r.ena : r.e, _ = (r, u, y, A = !1) => {
-    const [m, C] = typeof u == "string" ? [Ie(u), u] : [u, u.name];
-    !A && m.isNoop && m.isNoop(y) || (C === "number" ? r.write("ena", y) : C === "text-unicode" ? r.write("es", y) : (r.write("et", C), r.write("e", y)));
+    const [b, C] = typeof u == "string" ? [Ie(u), u] : [u, u.name];
+    !A && b.isNoop && b.isNoop(y) || (C === "number" ? r.write("ena", y) : C === "text-unicode" ? r.write("es", y) : (r.write("et", C), r.write("e", y)));
   };
   function w(r) {
     l(typeof r == "number"), l(r >= 0), l(r === (0 | r));
@@ -771,148 +764,130 @@ function Lt() {
     typeof r == "number" ? w(r) : l(typeof r == "string");
   }
   function X(r) {
-    if (r === null)
-      return;
+    if (r === null) return;
     const u = /* @__PURE__ */ new Set(), y = /* @__PURE__ */ new Set(), A = (C) => {
       let $ = !0, j = !1;
       for (let p in C) {
         const v = C[p];
-        if ($ = !1, l(p === "p" || p === "r" || p === "d" || p === "i" || p === "e" || p === "es" || p === "ena" || p === "et", "Invalid component item '" + p + "'"), p === "p")
-          w(v), l(!u.has(v)), u.add(v), l(C.r === void 0);
-        else if (p === "d")
-          w(v), l(!y.has(v)), y.add(v), l(C.i === void 0);
+        if ($ = !1, l(p === "p" || p === "r" || p === "d" || p === "i" || p === "e" || p === "es" || p === "ena" || p === "et", "Invalid component item '" + p + "'"), p === "p") w(v), l(!u.has(v)), u.add(v), l(C.r === void 0);
+        else if (p === "d") w(v), l(!y.has(v)), y.add(v), l(C.i === void 0);
         else if (p === "e" || p === "es" || p === "ena") {
           l(!j), j = !0;
-          const b = ve(C);
-          l(b, "Missing type in edit"), b.checkValidOp && b.checkValidOp(f(C));
+          const m = ve(C);
+          l(m, "Missing type in edit"), m.checkValidOp && m.checkValidOp(f(C));
         }
       }
       l(!$);
-    }, m = (C, $, j) => {
-      if (!Array.isArray(C))
-        throw Error("Op must be null or a list");
-      if (C.length === 0)
-        throw Error("Empty descent");
+    }, b = (C, $, j) => {
+      if (!Array.isArray(C)) throw Error("Op must be null or a list");
+      if (C.length === 0) throw Error("Empty descent");
       $ || L(C[0]);
-      let p = 1, v = 0, b = 0;
+      let p = 1, v = 0, m = 0;
       for (let I = 0; I < C.length; I++) {
         const T = C[I];
         if (l(T != null), Array.isArray(T)) {
-          const G = m(T, !1);
+          const G = b(T, !1);
           if (v) {
-            const g = typeof b, N = typeof G;
-            g === N ? l(b < G, "descent keys are not in order") : l(g === "number" && N === "string");
+            const g = typeof m, N = typeof G;
+            g === N ? l(m < G, "descent keys are not in order") : l(g === "number" && N === "string");
           }
-          b = G, v++, p = 3;
-        } else
-          typeof T == "object" ? (l(p === 1, `Prev not scalar - instead ${p}`), A(T), p = 2) : (l(p !== 3), L(T), l(i.isValidPathItem(T), "Invalid path key"), p = 1);
+          m = G, v++, p = 3;
+        } else typeof T == "object" ? (l(p === 1, `Prev not scalar - instead ${p}`), A(T), p = 2) : (l(p !== 3), L(T), l(i.isValidPathItem(T), "Invalid path key"), p = 1);
       }
       return l(v !== 1, "Operation makes multiple descents. Remove some []"), l(p === 2 || p === 3), C[0];
     };
-    m(r, !0), l(u.size === y.size, "Mismatched picks and drops in op");
-    for (let C = 0; C < u.size; C++)
-      l(u.has(C)), l(y.has(C));
+    b(r, !0), l(u.size === y.size, "Mismatched picks and drops in op");
+    for (let C = 0; C < u.size; C++) l(u.has(C)), l(y.has(C));
   }
   function H(r) {
     let u = 0, y = [];
     const A = i.writeCursor();
-    return A.mergeTree(r, (m, C) => {
-      const $ = ve(m);
+    return A.mergeTree(r, (b, C) => {
+      const $ = ve(b);
       if ($) {
-        const p = f(m);
+        const p = f(b);
         _(C, $, $.normalize ? $.normalize(p) : p);
       }
-      for (const p of ["r", "p", "i", "d"])
-        if (m[p] !== void 0) {
-          const v = p === "p" || p === "d" ? (j = m[p], y[j] == null && (y[j] = u++), y[j]) : m[p];
-          C.write(p, v);
-        }
+      for (const p of ["r", "p", "i", "d"]) if (b[p] !== void 0) {
+        const v = p === "p" || p === "d" ? (j = b[p], y[j] == null && (y[j] = u++), y[j]) : b[p];
+        C.write(p, v);
+      }
       var j;
     }), A.get();
   }
   function Ae(r, u) {
-    if (X(u), u === null)
-      return r;
+    if (X(u), u === null) return r;
     const y = [];
-    return function A(m, C) {
-      let $ = m, j = 0, p = {
-        root: m
-      }, v = 0, b = p, I = "root";
+    return function A(b, C) {
+      let $ = b, j = 0, p = {
+        root: b
+      }, v = 0, m = p, I = "root";
       function T() {
         for (; v < j; v++) {
           let G = C[v];
-          typeof G != "object" && (l(R(b, I)), b = b[I] = W(b[I]), I = G);
+          typeof G != "object" && (l(R(m, I)), m = m[I] = W(m[I]), I = G);
         }
       }
       for (; j < C.length; j++) {
         const G = C[j];
         if (Array.isArray(G)) {
           const g = A($, G);
-          g !== $ && g !== void 0 && (T(), $ = b[I] = g);
+          g !== $ && g !== void 0 && (T(), $ = m[I] = g);
         } else if (typeof G == "object") {
-          G.d != null ? (T(), $ = h(b, I, y[G.d])) : G.i !== void 0 && (T(), $ = h(b, I, G.i));
+          G.d != null ? (T(), $ = h(m, I, y[G.d])) : G.i !== void 0 && (T(), $ = h(m, I, G.i));
           const g = ve(G);
-          if (g)
-            T(), $ = b[I] = g.apply($, f(G));
-          else if (G.e !== void 0)
-            throw Error("Subtype " + G.et + " undefined");
-        } else
-          $ = Z($, G);
+          if (g) T(), $ = m[I] = g.apply($, f(G));
+          else if (G.e !== void 0) throw Error("Subtype " + G.et + " undefined");
+        } else $ = Z($, G);
       }
       return p.root;
-    }(r = function A(m, C) {
+    }(r = function A(b, C) {
       const $ = [];
       let j = 0;
       for (; j < C.length; j++) {
         const I = C[j];
-        if (Array.isArray(I))
-          break;
-        typeof I != "object" && ($.push(m), m = Z(m, I));
+        if (Array.isArray(I)) break;
+        typeof I != "object" && ($.push(b), b = Z(b, I));
       }
-      for (let I = C.length - 1; I >= j; I--)
-        m = A(m, C[I]);
+      for (let I = C.length - 1; I >= j; I--) b = A(b, C[I]);
       for (--j; j >= 0; j--) {
         const I = C[j];
         if (typeof I != "object") {
           const T = $.pop();
-          m = m === Z(T, I) ? T : m === void 0 ? c(T, I) : (v = I, b = m, (p = W(p = T))[v] = b, p);
-        } else
-          O(I) && (l(m !== void 0, "Cannot pick up or remove undefined"), I.p != null && (y[I.p] = m), m = void 0);
+          b = b === Z(T, I) ? T : b === void 0 ? c(T, I) : (v = I, m = b, (p = W(p = T))[v] = m, p);
+        } else O(I) && (l(b !== void 0, "Cannot pick up or remove undefined"), I.p != null && (y[I.p] = b), b = void 0);
       }
-      var p, v, b;
-      return m;
+      var p, v, m;
+      return b;
     }(r, u), u);
   }
   function ue(r, u) {
     r = r.slice(), X(u);
     const y = i.readCursor(u);
-    let A, m, C = !1;
+    let A, b, C = !1;
     const $ = [];
     for (let p = 0; ; p++) {
-      const v = r[p], b = y.getComponent();
-      if (b && (b.r !== void 0 ? C = !0 : b.p != null && (C = !1, A = b.p, m = p)), p >= r.length)
-        break;
+      const v = r[p], m = y.getComponent();
+      if (m && (m.r !== void 0 ? C = !0 : m.p != null && (C = !1, A = m.p, b = p)), p >= r.length) break;
       let I = 0;
       const T = i.advancer(y, void 0, (g, N) => {
         O(N) && I++;
       });
       $.unshift(T);
       const G = T(v);
-      if (typeof v == "number" && (r[p] -= I), !G)
-        break;
+      if (typeof v == "number" && (r[p] -= I), !G) break;
     }
-    if ($.forEach((p) => p.end()), C)
-      return null;
+    if ($.forEach((p) => p.end()), C) return null;
     const j = () => {
       let p = 0;
       if (A != null) {
         const v = y.getPath();
-        p = v.length, r = v.concat(r.slice(m));
+        p = v.length, r = v.concat(r.slice(b));
       }
       for (; p < r.length; p++) {
-        const v = r[p], b = a(y), I = ve(b);
+        const v = r[p], m = a(y), I = ve(m);
         if (I) {
-          const g = f(b);
+          const g = f(m);
           I.transformPosition && (r[p] = I.transformPosition(r[p], g));
           break;
         }
@@ -920,8 +895,7 @@ function Lt() {
         const G = i.advancer(y, (g, N) => o(N) ? ~(g - T) : g - T, (g, N) => {
           o(N) && T++;
         })(v);
-        if (typeof v == "number" && (r[p] += T), !G)
-          break;
+        if (typeof v == "number" && (r[p] += T), !G) break;
       }
     };
     return A != null ? y.eachDrop(null, (p) => {
@@ -929,121 +903,106 @@ function Lt() {
     }) : j(), r;
   }
   function ne(r, u) {
-    if (X(r), X(u), r == null)
-      return u;
-    if (u == null)
-      return r;
+    if (X(r), X(u), r == null) return u;
+    if (u == null) return r;
     let y = 0;
-    const A = i.readCursor(r), m = i.readCursor(u), C = i.writeCursor(), $ = [], j = [], p = [], v = [], b = [], I = [], T = /* @__PURE__ */ new Set();
+    const A = i.readCursor(r), b = i.readCursor(u), C = i.writeCursor(), $ = [], j = [], p = [], v = [], m = [], I = [], T = /* @__PURE__ */ new Set();
     A.traverse(null, (g) => {
       g.p != null && (p[g.p] = A.clone());
-    }), m.traverse(null, (g) => {
-      g.d != null && (v[g.d] = m.clone());
+    }), b.traverse(null, (g) => {
+      g.d != null && (v[g.d] = b.clone());
     });
     const G = i.writeCursor();
-    return function g(N, re, te, K, se, Te, me, _e) {
+    return function g(N, re, te, K, se, Te, be, _e) {
       l(re || te);
       const oe = a(re), De = a(te), Me = !!De && De.r !== void 0, Le = !!oe && oe.i !== void 0, Ue = oe ? oe.d : null, Ee = De ? De.p : null, $e = (Te || Me) && Ee == null;
-      if (Ee != null)
-        K = v[Ee], me = j[Ee] = new i.WriteCursor();
-      else if (De && De.r !== void 0)
-        K = null;
+      if (Ee != null) K = v[Ee], be = j[Ee] = new i.WriteCursor();
+      else if (De && De.r !== void 0) K = null;
       else {
         const D = a(K);
         D && D.d != null && (K = null);
       }
       const Q = a(K);
-      if (Ue != null)
-        if (N = p[Ue], _e = $[Ue] = new i.WriteCursor(), $e)
-          Te && !Me && _e.write("r", !0);
-        else {
-          const D = b[Ue] = y++;
-          me.write("d", D);
-        }
-      else if (oe && oe.i !== void 0)
-        N = null;
+      if (Ue != null) if (N = p[Ue], _e = $[Ue] = new i.WriteCursor(), $e) Te && !Me && _e.write("r", !0);
+      else {
+        const D = m[Ue] = y++;
+        be.write("d", D);
+      }
+      else if (oe && oe.i !== void 0) N = null;
       else {
         const D = a(N);
         D && D.p != null && (N = null);
       }
       let U;
       Le ? (l(se === void 0), U = oe.i) : U = se;
-      const B = (Ee == null ? !Le || Te || Me : U === void 0) ? null : me.getComponent();
+      const B = (Ee == null ? !Le || Te || Me : U === void 0) ? null : be.getComponent();
       if (Ee != null) {
         if (!(se !== void 0 || Le)) {
-          const D = Ue != null ? b[Ue] : y++;
+          const D = Ue != null ? m[Ue] : y++;
           I[Ee] = D, _e.write("p", D);
         }
-      } else
-        Me && (Le || se !== void 0 || (De.r, _e.write("r", De.r)));
+      } else Me && (Le || se !== void 0 || (De.r, _e.write("r", De.r)));
       const M = $e ? null : ve(oe), P = ve(Q);
       if ((M || P) && (M && M.name, P && P.name), M && P) {
         l(M === P);
         const D = f(oe), x = f(Q), he = M.compose(D, x);
-        _(me, M, he), T.add(Q);
-      } else
-        M ? _(me, M, f(oe)) : P && (_(me, P, f(Q)), T.add(Q));
+        _(be, M, he), T.add(Q);
+      } else M ? _(be, M, f(oe)) : P && (_(be, P, f(Q)), T.add(Q));
       const k = typeof U == "object" && U != null;
       let z = !1, Y = 0, ee = 0, fe = 0, de = 0, le = 0;
       const ye = i.advancer(K, (D, x) => o(x) ? de - D - 1 : D - de, (D, x) => {
         o(x) && de++;
-      }), V = i.advancer(N, (D, x) => O(x) ? Y - D - 1 : D - Y, (D, x) => {
+      }), q = i.advancer(N, (D, x) => O(x) ? Y - D - 1 : D - Y, (D, x) => {
         O(x) && Y++;
       });
       if (i.eachChildOf(re, te, (D, x, he) => {
-        let be, We, He = D, Ne = D, Ye = D;
+        let me, We, He = D, Ne = D, Ye = D;
         if (typeof D == "number") {
           let Oe = D + fe;
           We = ye(Oe), Ne = Oe + de;
           let ce = D + ee;
-          be = V(ce), o(a(We)) && (be = null), He = ce + Y, Ye = D + le, l(He >= 0, "p1PickKey is negative"), l(Ne >= 0, "p2DropKey is negative");
+          me = q(ce), o(a(We)) && (me = null), He = ce + Y, Ye = D + le, l(He >= 0, "p1PickKey is negative"), l(Ne >= 0, "p2DropKey is negative");
           const ke = o(a(x)), Ge = O(a(he));
           (ke || Ge && !$e) && le--, ke && ee--, Ge && fe--;
-        } else
-          be = V(D), We = ye(D);
-        _e.descend(He), me.descend(Ne);
-        const Xe = k && !o(a(x)) ? U[Ye] : void 0, Se = g(be, x, he, We, Xe, $e, me, _e);
+        } else me = q(D), We = ye(D);
+        _e.descend(He), be.descend(Ne);
+        const Xe = k && !o(a(x)) ? U[Ye] : void 0, Se = g(me, x, he, We, Xe, $e, be, _e);
         var je, S, ie;
-        k && !$e ? Xe !== Se && (z || (U = Array.isArray(U) ? U.slice() : Object.assign({}, U), z = !0), je = U, ie = Se, typeof (S = Ye) == "number" ? (l(Array.isArray(je)), l(S < je.length)) : (l(!Array.isArray(je)), l(je[S] !== void 0)), ie === void 0 ? typeof S == "number" ? je.splice(S, 1) : delete je[S] : je[S] = ie) : l(Se === void 0), me.ascend(), _e.ascend();
-      }), V.end(), ye.end(), B != null)
-        B.i = U;
-      else if (!Te && !Me && Ee == null)
-        return U;
-    }(A, A.clone(), m, m.clone(), void 0, !1, C, G), C.reset(), C.mergeTree(G.get()), C.reset(), C.get(), $.map((g) => g.get()), j.map((g) => g.get()), A.traverse(C, (g, N) => {
+        k && !$e ? Xe !== Se && (z || (U = Array.isArray(U) ? U.slice() : Object.assign({}, U), z = !0), je = U, ie = Se, typeof (S = Ye) == "number" ? (l(Array.isArray(je)), l(S < je.length)) : (l(!Array.isArray(je)), l(je[S] !== void 0)), ie === void 0 ? typeof S == "number" ? je.splice(S, 1) : delete je[S] : je[S] = ie) : l(Se === void 0), be.ascend(), _e.ascend();
+      }), q.end(), ye.end(), B != null) B.i = U;
+      else if (!Te && !Me && Ee == null) return U;
+    }(A, A.clone(), b, b.clone(), void 0, !1, C, G), C.reset(), C.mergeTree(G.get()), C.reset(), C.get(), $.map((g) => g.get()), j.map((g) => g.get()), A.traverse(C, (g, N) => {
       const re = g.p;
       if (re != null) {
-        const te = b[re];
+        const te = m[re];
         te != null && N.write("p", te);
         const K = $[re];
         K && K.get(), K && N.mergeTree(K.get());
-      } else
-        g.r !== void 0 && N.write("r", g.r);
-    }), C.reset(), C.get(), m.traverse(C, (g, N) => {
+      } else g.r !== void 0 && N.write("r", g.r);
+    }), C.reset(), C.get(), b.traverse(C, (g, N) => {
       const re = g.d;
       if (re != null) {
         const K = I[re];
         K != null && N.write("d", K);
         const se = j[re];
         se && N.mergeTree(se.get());
-      } else
-        g.i !== void 0 && N.write("i", g.i);
+      } else g.i !== void 0 && N.write("i", g.i);
       const te = ve(g);
       te && !T.has(g) && _(N, te, f(g));
     }), C.get();
   }
   function ae(r) {
-    if (r == null)
-      return null;
+    if (r == null) return null;
     const u = new i.ReadCursor(r), y = new i.WriteCursor();
     let A;
-    const m = [], C = [];
+    const b = [], C = [];
     return function $(j, p, v) {
-      const b = j.getComponent();
+      const m = j.getComponent();
       let I, T = !1;
-      if (b) {
-        b.p != null && (p.write("d", b.p), m[b.p] = j.clone()), b.r !== void 0 && p.write("i", b.r), b.d != null && (p.write("p", b.d), v = void 0), b.i !== void 0 && (v = I = b.i);
-        const g = ve(b);
-        g && (v === void 0 ? (A || (A = /* @__PURE__ */ new Set()), A.add(b)) : (f(b), v = g.apply(v, f(b)), T = !0));
+      if (m) {
+        m.p != null && (p.write("d", m.p), b[m.p] = j.clone()), m.r !== void 0 && p.write("i", m.r), m.d != null && (p.write("p", m.d), v = void 0), m.i !== void 0 && (v = I = m.i);
+        const g = ve(m);
+        g && (v === void 0 ? (A || (A = /* @__PURE__ */ new Set()), A.add(m)) : (f(m), v = g.apply(v, f(m)), T = !0));
       }
       let G = 0;
       for (const g of j) {
@@ -1052,36 +1011,31 @@ function Lt() {
         o(j.getComponent()) && G++;
         const te = $(j, p, re);
         if (v !== void 0 && te !== void 0) {
-          if (T || (T = !0, v = W(v)), !R(v, N))
-            throw Error("Cannot modify child - invalid operation");
+          if (T || (T = !0, v = W(v)), !R(v, N)) throw Error("Cannot modify child - invalid operation");
           v[N] = te;
         }
         p.ascend();
       }
-      if (I === void 0)
-        return T ? v : void 0;
+      if (I === void 0) return T ? v : void 0;
       p.write("r", v);
     }(u, y, void 0), A && (y.reset(), function $(j, p, v) {
-      const b = p.getComponent();
-      if (b) {
-        const g = b.d;
-        if (g != null && (j = m[g], v = C[g] = i.writeCursor()), A.has(b)) {
-          const N = ve(b);
-          if (!N.invert)
-            throw Error(`Cannot invert subtype ${N.name}`);
-          _(v, N, N.invert(f(b)));
+      const m = p.getComponent();
+      if (m) {
+        const g = m.d;
+        if (g != null && (j = b[g], v = C[g] = i.writeCursor()), A.has(m)) {
+          const N = ve(m);
+          if (!N.invert) throw Error(`Cannot invert subtype ${N.name}`);
+          _(v, N, N.invert(f(m)));
         }
       }
       let I = 0, T = 0;
       const G = i.advancer(j, (g, N) => O(N) ? I - g - 1 : g - I, (g, N) => {
         O(N) && I++;
       });
-      for (const g of p)
-        if (typeof g == "number") {
-          const N = g - T, re = G(N), te = N + I;
-          v.descend(te), $(re, p, v), o(p.getComponent()) && T++, v.ascend();
-        } else
-          v.descend(g), $(G(g), p, v), v.ascend();
+      for (const g of p) if (typeof g == "number") {
+        const N = g - T, re = G(N), te = N + I;
+        v.descend(te), $(re, p, v), o(p.getComponent()) && T++, v.ascend();
+      } else v.descend(g), $(G(g), p, v), v.ascend();
       G.end();
     }(u.clone(), u, y), C.length && (y.reset(), u.traverse(y, ($, j) => {
       const p = $.p;
@@ -1096,31 +1050,29 @@ function Lt() {
     if (r == null || !ge(r, (p) => {
       var v;
       return p.r !== void 0 || ((v = ve(p)) === null || v === void 0 ? void 0 : v.makeInvertible) != null;
-    }))
-      return r;
+    })) return r;
     const y = new i.ReadCursor(r), A = new i.WriteCursor();
-    let m = !1;
-    const C = [], $ = [], j = (p, v, b) => {
+    let b = !1;
+    const C = [], $ = [], j = (p, v, m) => {
       const I = p.getComponent();
       let T = !1;
       if (I) {
         I.d != null && v.write("d", I.d), I.i !== void 0 && v.write("i", I.i);
         const g = I.p;
-        if (g != null && (C[g] = p.clone(), l(b !== void 0, "Operation picks up at an invalid key"), $[g] = b, v.write("p", I.p)), I.r !== void 0 && b === void 0)
-          throw Error("Invalid doc / op in makeInvertible: removed item missing from doc");
+        if (g != null && (C[g] = p.clone(), l(m !== void 0, "Operation picks up at an invalid key"), $[g] = m, v.write("p", I.p)), I.r !== void 0 && m === void 0) throw Error("Invalid doc / op in makeInvertible: removed item missing from doc");
         const N = ve(I);
-        N && (N.makeInvertible ? m = !0 : _(v, N, f(I), !0));
+        N && (N.makeInvertible ? b = !0 : _(v, N, f(I), !0));
       }
       let G = 0;
       for (const g of p) {
         v.descend(g);
-        const N = typeof g == "number" ? g - G : g, re = Z(b, N), te = j(p, v, re);
-        re !== te && (T || (T = !0, b = W(b)), te === void 0 ? (b = c(b, N), typeof g == "number" && G++) : b[N] = te), v.ascend();
+        const N = typeof g == "number" ? g - G : g, re = Z(m, N), te = j(p, v, re);
+        re !== te && (T || (T = !0, m = W(m)), te === void 0 ? (m = c(m, N), typeof g == "number" && G++) : m[N] = te), v.ascend();
       }
-      return I && (I.r !== void 0 ? (v.write("r", s.default(b)), b = void 0) : I.p != null && (b = void 0)), b;
+      return I && (I.r !== void 0 ? (v.write("r", s.default(m)), m = void 0) : I.p != null && (m = void 0)), m;
     };
-    return j(y, A, u), A.get(), m && (A.reset(), function p(v, b, I, T, G) {
-      const g = b.getComponent();
+    return j(y, A, u), A.get(), b && (A.reset(), function p(v, m, I, T, G) {
+      const g = m.getComponent();
       if (g) {
         g.i !== void 0 ? (T = g.i, G = !0) : g.d != null && (T = $[g.d], v = C[g.d], G = !1, g.d);
         let K = ve(g);
@@ -1133,14 +1085,13 @@ function Lt() {
       const te = i.advancer(v, (K, se) => O(se) ? N - K - 1 : K - N, (K, se) => {
         O(se) && N++;
       });
-      for (const K of b)
-        if (typeof K == "number") {
-          const se = K - re, Te = te(se), me = se + N, _e = Z(T, G ? se : me);
-          I.descend(K), p(Te, b, I, _e, G), o(b.getComponent()) && re++, I.ascend();
-        } else {
-          const se = Z(T, K);
-          I.descend(K), p(te(K), b, I, se, G), I.ascend();
-        }
+      for (const K of m) if (typeof K == "number") {
+        const se = K - re, Te = te(se), be = se + N, _e = Z(T, G ? se : be);
+        I.descend(K), p(Te, m, I, _e, G), o(m.getComponent()) && re++, I.ascend();
+      } else {
+        const se = Z(T, K);
+        I.descend(K), p(te(K), m, I, se, G), I.ascend();
+      }
       te.end();
     }(y.clone(), y, A, u, !1)), A.get();
   }
@@ -1148,8 +1099,7 @@ function Lt() {
     return ae(Pe(r, u));
   }
   const tt = (r) => {
-    if (r == null)
-      return null;
+    if (r == null) return null;
     const u = r.slice();
     for (let y = 0; y < r.length; y++) {
       const A = u[y];
@@ -1160,34 +1110,32 @@ function Lt() {
   function nt(r, u, y) {
     l(y === "left" || y === "right", "Direction must be left or right");
     const A = y === "left" ? 0 : 1;
-    if (u == null)
-      return {
-        ok: !0,
-        result: r
-      };
+    if (u == null) return {
+      ok: !0,
+      result: r
+    };
     X(r), X(u);
-    let m = null;
-    const C = [], $ = [], j = [], p = [], v = [], b = [], I = [], T = [], G = [], g = [], N = [], re = [], te = [], K = [], se = [];
+    let b = null;
+    const C = [], $ = [], j = [], p = [], v = [], m = [], I = [], T = [], G = [], g = [], N = [], re = [], te = [], K = [], se = [];
     let Te = 0;
-    const me = i.readCursor(r), _e = i.readCursor(u), oe = i.writeCursor();
+    const be = i.readCursor(r), _e = i.readCursor(u), oe = i.writeCursor();
     if (function Q(U, B = null, M) {
       const P = a(B);
-      P && (P.r !== void 0 ? M = B.clone() : P.p != null && (M = null, b[P.p] = U.clone()));
+      P && (P.r !== void 0 ? M = B.clone() : P.p != null && (M = null, m[P.p] = U.clone()));
       const k = U.getComponent();
       let z;
       k && (z = k.p) != null && (v[z] = B ? B.clone() : null, j[z] = U.clone(), M && (g[z] = !0, G[z] = M), P && P.p != null && (K[z] = P.p));
       const Y = i.advancer(B);
-      for (const ee of U)
-        Q(U, Y(ee), M);
+      for (const ee of U) Q(U, Y(ee), M);
       Y.end();
-    }(_e, me, null), function Q(U, B, M, P, k) {
+    }(_e, be, null), function Q(U, B, M, P, k) {
       const z = M.getComponent();
       let Y, ee = !1;
-      z && ((Y = z.d) != null ? (p[Y] = M.clone(), P != null && (se[P] == null && (se[P] = []), se[P].push(Y)), U = v[Y] || null, B = j[Y] || null, g[Y] ? (k && (N[Y] = !0), k = G[Y] || null) : !k || A !== 1 && K[Y] != null || m == null && (m = {
+      z && ((Y = z.d) != null ? (p[Y] = M.clone(), P != null && (se[P] == null && (se[P] = []), se[P].push(Y)), U = v[Y] || null, B = j[Y] || null, g[Y] ? (k && (N[Y] = !0), k = G[Y] || null) : !k || A !== 1 && K[Y] != null || b == null && (b = {
         type: d.ConflictType.RM_UNEXPECTED_CONTENT,
         op1: t.removeOp(k.getPath()),
         op2: t.moveOp(B.getPath(), M.getPath())
-      }), ee = !0) : z.i !== void 0 && (U = B = null, ee = !0, k && m == null && (m = {
+      }), ee = !0) : z.i !== void 0 && (U = B = null, ee = !0, k && b == null && (b = {
         type: d.ConflictType.RM_UNEXPECTED_CONTENT,
         op1: t.removeOp(k.getPath()),
         op2: t.insertOp(M.getPath(), z.i)
@@ -1195,29 +1143,27 @@ function Lt() {
       const fe = a(U);
       fe && (fe.r !== void 0 ? k = U.clone() : fe.p != null && (fe.p, P = fe.p, k = null));
       const de = ve(z);
-      de && k && m == null && (m = {
+      de && k && b == null && (b = {
         type: d.ConflictType.RM_UNEXPECTED_CONTENT,
         op1: t.removeOp(k.getPath()),
         op2: t.editOp(M.getPath(), de, f(z), !0)
       });
       let le = 0, ye = 0;
-      const V = i.advancer(B, (x, he) => O(he) ? le - x - 1 : x - le, (x, he) => {
+      const q = i.advancer(B, (x, he) => O(he) ? le - x - 1 : x - le, (x, he) => {
         O(he) && le++;
       }), D = i.advancer(U);
-      for (const x of M)
-        if (typeof x == "number") {
-          const he = x - ye, be = V(he);
-          ye += +Q(D(he + le), be, M, P, k);
-        } else {
-          const he = V(x);
-          Q(D(x), he, M, P, k);
-        }
-      return V.end(), D.end(), ee;
-    }(me, _e, _e.clone(), null, null), p.map((Q) => Q && Q.get()), m)
-      return {
-        ok: !1,
-        conflict: m
-      };
+      for (const x of M) if (typeof x == "number") {
+        const he = x - ye, me = q(he);
+        ye += +Q(D(he + le), me, M, P, k);
+      } else {
+        const he = q(x);
+        Q(D(x), he, M, P, k);
+      }
+      return q.end(), D.end(), ee;
+    }(be, _e, _e.clone(), null, null), p.map((Q) => Q && Q.get()), b) return {
+      ok: !1,
+      conflict: b
+    };
     N.map((Q) => !!Q);
     const De = [];
     let Me = null;
@@ -1225,32 +1171,29 @@ function Lt() {
       let z = !1;
       const Y = a(B);
       if (O(Y)) {
-        const V = Y.p;
-        V != null ? (M = p[V], P = re[V] = i.writeCursor(), z = !0, k = null) : (M = null, k = B.clone());
-      } else
-        o(a(M)) && (M = null);
+        const q = Y.p;
+        q != null ? (M = p[q], P = re[q] = i.writeCursor(), z = !0, k = null) : (M = null, k = B.clone());
+      } else o(a(M)) && (M = null);
       const ee = U.getComponent();
       if (ee) {
-        const V = ee.p;
-        V != null ? (k && (T[V] = k), De[V] = k || A === 1 && z ? null : P.getComponent(), C[V] = U.clone(), M && (I[V] = M.clone())) : ee.r !== void 0 && (k || P.write("r", !0), (k || z) && (Me == null && (Me = /* @__PURE__ */ new Set()), Me.add(ee)));
+        const q = ee.p;
+        q != null ? (k && (T[q] = k), De[q] = k || A === 1 && z ? null : P.getComponent(), C[q] = U.clone(), M && (I[q] = M.clone())) : ee.r !== void 0 && (k || P.write("r", !0), (k || z) && (Me == null && (Me = /* @__PURE__ */ new Set()), Me.add(ee)));
       }
       let fe = 0, de = 0;
-      const le = i.advancer(B, void 0, (V, D) => {
+      const le = i.advancer(B, void 0, (q, D) => {
         O(D) && fe++;
-      }), ye = i.advancer(M, (V, D) => o(D) ? ~(V - de) : V - de, (V, D) => {
+      }), ye = i.advancer(M, (q, D) => o(D) ? ~(q - de) : q - de, (q, D) => {
         o(D) && de++;
       });
-      if (U)
-        for (const V of U)
-          if (typeof V == "string") {
-            const D = le(V), x = ye(V);
-            P.descend(V), Q(U, D, x, P, k), P.ascend();
-          } else {
-            const D = le(V), x = V - fe, he = O(a(D)) ? null : ye(x), be = x + de;
-            l(be >= 0), P.descend(be), Q(U, D, he, P, k), P.ascend();
-          }
+      if (U) for (const q of U) if (typeof q == "string") {
+        const D = le(q), x = ye(q);
+        P.descend(q), Q(U, D, x, P, k), P.ascend();
+      } else {
+        const D = le(q), x = q - fe, he = O(a(D)) ? null : ye(x), me = x + de;
+        l(me >= 0), P.descend(me), Q(U, D, he, P, k), P.ascend();
+      }
       le.end(), ye.end();
-    })(me, _e, _e.clone(), oe, null), oe.reset();
+    })(be, _e, _e.clone(), oe, null), oe.reset();
     let Le = [];
     if (function Q(U, B, M, P, k, z) {
       l(B);
@@ -1264,11 +1207,11 @@ function Lt() {
         let Oe = !1;
         if (Y.i !== void 0 || S != null && ie) {
           let ce;
-          ee && (ee.i !== void 0 || (ce = ee.d) != null && !g[ce]) && (Oe = ce != null ? S != null && S === K[ce] : n.default(ee.i, Y.i), Oe || ce != null && A !== 1 && K[ce] != null || m == null && (m = {
+          ee && (ee.i !== void 0 || (ce = ee.d) != null && !g[ce]) && (Oe = ce != null ? S != null && S === K[ce] : n.default(ee.i, Y.i), Oe || ce != null && A !== 1 && K[ce] != null || b == null && (b = {
             type: d.ConflictType.DROP_COLLISION,
             op1: de(S != null ? C[S] : null, B, Y),
             op2: de(ce != null ? j[ce] : null, P, ee)
-          })), Oe || (z ? m == null && (m = {
+          })), Oe || (z ? b == null && (b = {
             type: d.ConflictType.RM_UNEXPECTED_CONTENT,
             op1: de(S != null ? C[S] : null, B, Y),
             op2: t.removeOp(z.getPath())
@@ -1277,115 +1220,103 @@ function Lt() {
           const ce = T[S];
           ce && (z = ce.clone());
         }
-        S != null ? (U = C[S], M = b[S], P = I[S]) : Y.i !== void 0 && (U = M = null, Oe || (P = null));
-      } else
-        O(a(U)) && (U = M = P = null);
+        S != null ? (U = C[S], M = m[S], P = I[S]) : Y.i !== void 0 && (U = M = null, Oe || (P = null));
+      } else O(a(U)) && (U = M = P = null);
       const le = a(U), ye = a(M);
       if (O(ye)) {
         const S = ye.p;
         ye.r !== void 0 && (!le || le.r === void 0) || g[S] ? (P = null, z = M.clone()) : S != null && (P = p[S], A !== 1 && K[S] != null || ((k = te[S]) || (k = te[S] = i.writeCursor()), k.reset(), z = null));
-      } else
-        !o(Y) && o(ee) && (P = null);
+      } else !o(Y) && o(ee) && (P = null);
       ee = P != null ? P.getComponent() : null;
-      const V = ve(Y);
-      if (V) {
+      const q = ve(Y);
+      if (q) {
         const S = f(Y);
-        if (z)
-          m == null && (m = {
-            type: d.ConflictType.RM_UNEXPECTED_CONTENT,
-            op1: t.editOp(B.getPath(), V, S, !0),
-            op2: t.removeOp(z.getPath())
-          });
+        if (z) b == null && (b = {
+          type: d.ConflictType.RM_UNEXPECTED_CONTENT,
+          op1: t.editOp(B.getPath(), q, S, !0),
+          op2: t.removeOp(z.getPath())
+        });
         else {
           const ie = ve(ee);
           let Oe;
           if (ie) {
-            if (V !== ie)
-              throw Error("Transforming incompatible types");
+            if (q !== ie) throw Error("Transforming incompatible types");
             const ce = f(ee);
-            Oe = V.transform(S, ce, y);
-          } else
-            Oe = s.default(S);
-          _(k, V, Oe);
+            Oe = q.transform(S, ce, y);
+          } else Oe = s.default(S);
+          _(k, q, Oe);
         }
       }
-      let D = 0, x = 0, he = 0, be = 0, We = 0, He = 0, Ne = U != null && U.descendFirst(), Ye = Ne;
+      let D = 0, x = 0, he = 0, me = 0, We = 0, He = 0, Ne = U != null && U.descendFirst(), Ye = Ne;
       const Xe = i.advancer(M, void 0, (S, ie) => {
         O(ie) && he++;
       });
       let Se = P != null && P.descendFirst(), je = Se;
-      for (const S of B)
-        if (typeof S == "number") {
-          let ie;
-          const Oe = o(B.getComponent()), ce = S - x;
-          {
-            let Be;
-            for (; Ne && typeof (Be = U.getKey()) == "number"; ) {
-              Be += D;
-              const Re = U.getComponent(), ze = O(Re);
-              if (Be > ce || Be === ce && (!ze || A === 0 && Oe))
-                break;
-              if (ze) {
-                D--;
-                const Ke = Re.p;
-                K.includes(Ke), Re.d, a(te[Re.d]), O(a(te[Re.d])), (Re.r === void 0 || Me && Me.has(Re)) && (Ke == null || !De[Ke] || A !== 1 && K.includes(Ke)) || We--;
-              }
-              Ne = U.nextSibling();
+      for (const S of B) if (typeof S == "number") {
+        let ie;
+        const Oe = o(B.getComponent()), ce = S - x;
+        {
+          let Be;
+          for (; Ne && typeof (Be = U.getKey()) == "number"; ) {
+            Be += D;
+            const Re = U.getComponent(), ze = O(Re);
+            if (Be > ce || Be === ce && (!ze || A === 0 && Oe)) break;
+            if (ze) {
+              D--;
+              const Ke = Re.p;
+              K.includes(Ke), Re.d, a(te[Re.d]), O(a(te[Re.d])), (Re.r === void 0 || Me && Me.has(Re)) && (Ke == null || !De[Ke] || A !== 1 && K.includes(Ke)) || We--;
             }
-            ie = Ne && Be === ce ? U : null;
+            Ne = U.nextSibling();
           }
-          const ke = ce - D;
-          let Ge = Xe(ke);
-          const rt = ke - he;
-          let Je = null;
-          {
-            let Be, Re;
-            for (; Se && typeof (Be = P.getKey()) == "number"; ) {
-              Re = Be - be;
-              const ze = P.getComponent(), Ke = o(ze);
-              if (Re > rt)
+          ie = Ne && Be === ce ? U : null;
+        }
+        const ke = ce - D;
+        let Ge = Xe(ke);
+        const rt = ke - he;
+        let Je = null;
+        {
+          let Be, Re;
+          for (; Se && typeof (Be = P.getKey()) == "number"; ) {
+            Re = Be - me;
+            const ze = P.getComponent(), Ke = o(ze);
+            if (Re > rt) break;
+            if (Re === rt) {
+              if (!Ke) {
+                Je = P;
                 break;
-              if (Re === rt) {
-                if (!Ke) {
+              }
+              {
+                if (A === 0 && Oe) {
                   Je = P;
                   break;
                 }
-                {
-                  if (A === 0 && Oe) {
-                    Je = P;
-                    break;
-                  }
-                  const Fe = Ge && O(Ge.getComponent());
-                  if (A === 0 && Fe)
-                    break;
-                }
+                const Ve = Ge && O(Ge.getComponent());
+                if (A === 0 && Ve) break;
               }
-              if (Ke) {
-                const Fe = ze.d;
-                K[Fe], ze.i === void 0 && (g[Fe] || K[Fe] != null && A !== 1) ? (g[Fe] || K[Fe] != null && A === 0) && (be++, He--) : be++;
-              }
-              Se = P.nextSibling();
             }
-          }
-          const Ot = rt + be + We + He;
-          l(Ot >= 0, "trying to descend to a negative index"), k.descend(Ot), Oe && (ie = Ge = Je = null, x++), Q(ie, B, Ge, Je, k, z) && He++, k.ascend();
-        } else {
-          let ie;
-          for (; Ne && (ie = U.getKey(), typeof ie != "string" || !(ie > S || ie === S)); )
-            Ne = U.nextSibling();
-          const Oe = Ne && ie === S ? U : null, ce = Xe(S);
-          let ke;
-          for (; Se && (ke = P.getKey(), typeof ke != "string" || !(ke > S || ke === S)); )
+            if (Ke) {
+              const Ve = ze.d;
+              K[Ve], ze.i === void 0 && (g[Ve] || K[Ve] != null && A !== 1) ? (g[Ve] || K[Ve] != null && A === 0) && (me++, He--) : me++;
+            }
             Se = P.nextSibling();
-          const Ge = Se && ke === S ? P : null;
-          k.descend(S), Q(Oe, B, ce, Ge, k, z), k.ascend();
+          }
         }
+        const Ot = rt + me + We + He;
+        l(Ot >= 0, "trying to descend to a negative index"), k.descend(Ot), Oe && (ie = Ge = Je = null, x++), Q(ie, B, Ge, Je, k, z) && He++, k.ascend();
+      } else {
+        let ie;
+        for (; Ne && (ie = U.getKey(), typeof ie != "string" || !(ie > S || ie === S)); ) Ne = U.nextSibling();
+        const Oe = Ne && ie === S ? U : null, ce = Xe(S);
+        let ke;
+        for (; Se && (ke = P.getKey(), typeof ke != "string" || !(ke > S || ke === S)); ) Se = P.nextSibling();
+        const Ge = Se && ke === S ? P : null;
+        k.descend(S), Q(Oe, B, ce, Ge, k, z), k.ascend();
+      }
       return Xe.end(), Ye && U.ascend(), je && P.ascend(), fe;
-    }(me, me.clone(), _e, _e.clone(), oe, null), m)
-      return {
-        ok: !1,
-        conflict: m
-      };
+    }(be, be.clone(), _e, _e.clone(), oe, null), b) return {
+      ok: !1,
+      conflict: b
+    };
     oe.reset();
     const Ue = (Q, U, B) => Q.traverse(U, (M, P) => {
       M.d != null && B(M.d, Q, P);
@@ -1394,7 +1325,7 @@ function Lt() {
       g[Q] && !N[Q] && B.write("r", !0), re[Q] && B.mergeTree(re[Q].get());
     }), oe.reset());
     const Ee = [], $e = [];
-    if ((te.length || g.length) && !m) {
+    if ((te.length || g.length) && !b) {
       const Q = i.readCursor(tt(oe.get()));
       if (Ue(Q, null, (U, B) => {
         Ee[U] = B.clone();
@@ -1404,14 +1335,11 @@ function Lt() {
         });
       }), function U(B, M, P, k, z, Y) {
         const ee = a(M);
-        if (ee && O(ee))
-          if (ee.p != null) {
-            const D = ee.p;
-            Ee[D].getPath(), P = Ee[D], k = $e[D] = i.writeCursor();
-          } else
-            ee.r !== void 0 && (P = null);
-        else
-          o(a(P)) && (P = null);
+        if (ee && O(ee)) if (ee.p != null) {
+          const D = ee.p;
+          Ee[D].getPath(), P = Ee[D], k = $e[D] = i.writeCursor();
+        } else ee.r !== void 0 && (P = null);
+        else o(a(P)) && (P = null);
         const fe = B.getComponent();
         if (fe) {
           let D;
@@ -1423,21 +1351,18 @@ function Lt() {
         let de = 0, le = 0;
         const ye = i.advancer(M, void 0, (D, x) => {
           O(x) && de--;
-        }), V = i.advancer(P, (D, x) => o(x) ? -(D - le) - 1 : D - le, (D, x) => {
+        }), q = i.advancer(P, (D, x) => o(x) ? -(D - le) - 1 : D - le, (D, x) => {
           o(x) && le++;
         });
-        for (const D of B)
-          if (typeof D == "number") {
-            const x = ye(D), he = D + de, be = V(he), We = he + le;
-            k.descend(We), U(B, x, be, k), k.ascend();
-          } else
-            k.descend(D), U(B, ye(D), V(D), k), k.ascend();
-        ye.end(), V.end();
-      }(_e, Q, Q.clone(), oe), oe.reset(), m)
-        return {
-          ok: !1,
-          conflict: m
-        };
+        for (const D of B) if (typeof D == "number") {
+          const x = ye(D), he = D + de, me = q(he), We = he + le;
+          k.descend(We), U(B, x, me, k), k.ascend();
+        } else k.descend(D), U(B, ye(D), q(D), k), k.ascend();
+        ye.end(), q.end();
+      }(_e, Q, Q.clone(), oe), oe.reset(), b) return {
+        ok: !1,
+        conflict: b
+      };
       if (oe.get(), $e.length) {
         const U = $e.map((M) => M ? M.get() : null), B = i.readCursor(tt(oe.get()));
         if (Ue(B, oe, (M, P, k) => {
@@ -1455,7 +1380,7 @@ function Lt() {
                 g[le] || A !== 1 && K[le] != null || P.writeMove(j[le].getPath(), p[le].getPath(), z++);
               });
             });
-          }), m = {
+          }), b = {
             type: d.ConflictType.BLACKHOLE,
             op1: M.get(),
             op2: P.get()
@@ -1463,9 +1388,9 @@ function Lt() {
         }
       }
     }
-    return m ? {
+    return b ? {
       ok: !1,
-      conflict: m
+      conflict: b
     } : {
       ok: !0,
       result: oe.get()
@@ -1477,8 +1402,7 @@ function Lt() {
   };
   function At(r, u, y) {
     const A = nt(r, u, y);
-    if (A.ok)
-      return A.result;
+    if (A.ok) return A.result;
     gt(A.conflict);
   }
   const qe = (r) => {
@@ -1487,32 +1411,31 @@ function Lt() {
       (o(y) || ve(y)) && A.write("r", !0);
     }), u.get();
   }, Pt = (r, u) => {
-    const { type: y, op1: A, op2: m } = r;
+    const { type: y, op1: A, op2: b } = r;
     switch (y) {
       case d.ConflictType.DROP_COLLISION:
-        return u === "left" ? [null, qe(m)] : [qe(A), null];
+        return u === "left" ? [null, qe(b)] : [qe(A), null];
       case d.ConflictType.RM_UNEXPECTED_CONTENT:
         let C = !1;
         return i.readCursor(A).traverse(null, ($) => {
           $.r !== void 0 && (C = !0);
-        }), C ? [null, qe(m)] : [qe(A), null];
+        }), C ? [null, qe(b)] : [qe(A), null];
       case d.ConflictType.BLACKHOLE:
-        return [qe(A), qe(m)];
+        return [qe(A), qe(b)];
       default:
         throw Error("Unrecognised conflict: " + y);
     }
   };
   function _t(r, u, y, A) {
-    let m = null;
+    let b = null;
     for (; ; ) {
       const C = nt(u, y, A);
-      if (C.ok)
-        return ne(m, C.result);
+      if (C.ok) return ne(b, C.result);
       {
         const { conflict: $ } = C;
         r($) || gt($);
         const [j, p] = Pt($, A);
-        u = ne(H(u), j), y = ne(H(y), p), m = ne(m, p);
+        u = ne(H(u), j), y = ne(H(y), p), b = ne(b, p);
       }
     }
   }
@@ -1525,8 +1448,7 @@ function Lt() {
   } : function(d, l, a, E) {
     E === void 0 && (E = a), d[E] = l[a];
   }), n = Ce && Ce.__exportStar || function(d, l) {
-    for (var a in d)
-      a !== "default" && !l.hasOwnProperty(a) && e(l, d, a);
+    for (var a in d) a !== "default" && !l.hasOwnProperty(a) && e(l, d, a);
   };
   Object.defineProperty(t, "__esModule", { value: !0 }), n(Ct, t);
   var s = ft;
@@ -1542,41 +1464,43 @@ function Lt() {
 })(F);
 class Ht {
   constructor() {
-    q(this, "drawingManagerData", {});
-    q(this, "_oldDrawingManagerData", {});
-    q(this, "_focusDrawings", []);
-    q(this, "_remove$", new we());
-    q(this, "remove$", this._remove$.asObservable());
-    q(this, "_add$", new we());
-    q(this, "add$", this._add$.asObservable());
-    q(this, "_update$", new we());
-    q(this, "update$", this._update$.asObservable());
-    q(this, "_order$", new we());
-    q(this, "order$", this._order$.asObservable());
-    q(this, "_group$", new we());
-    q(this, "group$", this._group$.asObservable());
-    q(this, "_ungroup$", new we());
-    q(this, "ungroup$", this._ungroup$.asObservable());
-    q(this, "_refreshTransform$", new we());
-    q(this, "refreshTransform$", this._refreshTransform$.asObservable());
-    q(this, "_visible$", new we());
-    q(this, "visible$", this._visible$.asObservable());
+    V(this, "drawingManagerData", {});
+    V(this, "_oldDrawingManagerData", {});
+    V(this, "_focusDrawings", []);
+    V(this, "_remove$", new we());
+    V(this, "remove$", this._remove$.asObservable());
+    V(this, "_add$", new we());
+    V(this, "add$", this._add$.asObservable());
+    V(this, "_update$", new we());
+    V(this, "update$", this._update$.asObservable());
+    V(this, "_order$", new we());
+    V(this, "order$", this._order$.asObservable());
+    V(this, "_group$", new we());
+    V(this, "group$", this._group$.asObservable());
+    V(this, "_ungroup$", new we());
+    V(this, "ungroup$", this._ungroup$.asObservable());
+    V(this, "_refreshTransform$", new we());
+    V(this, "refreshTransform$", this._refreshTransform$.asObservable());
+    V(this, "_visible$", new we());
+    V(this, "visible$", this._visible$.asObservable());
     // private readonly _externalUpdate$ = new Subject<T[]>();
     // readonly externalUpdate$ = this._externalUpdate$.asObservable();
-    q(this, "_focus$", new we());
-    q(this, "focus$", this._focus$.asObservable());
-    q(this, "_featurePluginUpdate$", new we());
-    q(this, "featurePluginUpdate$", this._featurePluginUpdate$.asObservable());
-    q(this, "_featurePluginAdd$", new we());
-    q(this, "featurePluginAdd$", this._featurePluginAdd$.asObservable());
-    q(this, "_featurePluginRemove$", new we());
-    q(this, "featurePluginRemove$", this._featurePluginRemove$.asObservable());
-    q(this, "_featurePluginOrderUpdate$", new we());
-    q(this, "featurePluginOrderUpdate$", this._featurePluginOrderUpdate$.asObservable());
-    q(this, "_featurePluginGroupUpdate$", new we());
-    q(this, "featurePluginGroupUpdate$", this._featurePluginGroupUpdate$.asObservable());
-    q(this, "_featurePluginUngroupUpdate$", new we());
-    q(this, "featurePluginUngroupUpdate$", this._featurePluginUngroupUpdate$.asObservable());
+    V(this, "_focus$", new we());
+    V(this, "focus$", this._focus$.asObservable());
+    V(this, "_featurePluginUpdate$", new we());
+    V(this, "featurePluginUpdate$", this._featurePluginUpdate$.asObservable());
+    V(this, "_featurePluginAdd$", new we());
+    V(this, "featurePluginAdd$", this._featurePluginAdd$.asObservable());
+    V(this, "_featurePluginRemove$", new we());
+    V(this, "featurePluginRemove$", this._featurePluginRemove$.asObservable());
+    V(this, "_featurePluginOrderUpdate$", new we());
+    V(this, "featurePluginOrderUpdate$", this._featurePluginOrderUpdate$.asObservable());
+    V(this, "_featurePluginGroupUpdate$", new we());
+    V(this, "featurePluginGroupUpdate$", this._featurePluginGroupUpdate$.asObservable());
+    V(this, "_featurePluginUngroupUpdate$", new we());
+    V(this, "featurePluginUngroupUpdate$", this._featurePluginUngroupUpdate$.asObservable());
+    V(this, "_visible", !0);
+    V(this, "_editable", !0);
   }
   dispose() {
     this._remove$.complete(), this._add$.complete(), this._update$.complete(), this._order$.complete(), this._focus$.complete(), this._featurePluginUpdate$.complete(), this._featurePluginAdd$.complete(), this._featurePluginRemove$.complete(), this._featurePluginOrderUpdate$.complete(), this.drawingManagerData = {}, this._oldDrawingManagerData = {};
@@ -1926,6 +1850,18 @@ class Ht {
     var s, i;
     return ((i = (s = this.drawingManagerData[e]) == null ? void 0 : s[n]) == null ? void 0 : i.order) || [];
   }
+  getDrawingVisible() {
+    return this._visible;
+  }
+  getDrawingEditable() {
+    return this._editable;
+  }
+  setDrawingVisible(e) {
+    this._visible = e;
+  }
+  setDrawingEditable(e) {
+    this._editable = e;
+  }
 }
 class Kt extends Ht {
 }
@@ -1946,13 +1882,13 @@ const un = async (t) => new Promise((e, n) => {
   };
 });
 var et = /* @__PURE__ */ ((t) => (t.URL = "URL", t.UUID = "UUID", t.BASE64 = "BASE64", t))(et || {}), Ze = /* @__PURE__ */ ((t) => (t.SUCCUSS = "0", t.ERROR_EXCEED_SIZE = "1", t.ERROR_IMAGE_TYPE = "2", t.ERROR_UPLOAD_COUNT_LIMIT = "3", t.ERROR_IMAGE = "4", t))(Ze || {});
-const Ft = It("core.image-io.service");
-class Vt {
+const Vt = It("core.image-io.service");
+class Ft {
   constructor() {
-    q(this, "_waitCount", 0);
-    q(this, "_change$", new we());
-    q(this, "change$", this._change$);
-    q(this, "_imageSourceCache", /* @__PURE__ */ new Map());
+    V(this, "_waitCount", 0);
+    V(this, "_change$", new we());
+    V(this, "change$", this._change$);
+    V(this, "_imageSourceCache", /* @__PURE__ */ new Map());
   }
   setWaitCount(e) {
     this._waitCount = e, this._change$.next(e);
@@ -2023,11 +1959,11 @@ let wt = (ot = class extends Rt {
   _initDependencies(t) {
     var s;
     St([
-      [Ft, { useClass: Vt }],
+      [Vt, { useClass: Ft }],
       [zt, { useClass: Kt }]
     ], (s = this._config) == null ? void 0 : s.override).forEach((i) => t.add(i));
   }
-}, q(ot, "pluginName", en), ot);
+}, V(ot, "pluginName", en), ot);
 wt = Jt([
   Qt(1, jt(Tt))
 ], wt);
@@ -2042,8 +1978,8 @@ export {
   Kt as DrawingManagerService,
   Xt as DrawingTypeEnum,
   zt as IDrawingManagerService,
-  Ft as IImageIoService,
-  Vt as ImageIoService,
+  Vt as IImageIoService,
+  Ft as ImageIoService,
   et as ImageSourceType,
   Ze as ImageUploadStatusType,
   Ht as UnitDrawingService,