@univerjs/drawing 0.16.1 → 0.17.0

package/lib/es/index.js

@@ -1,21 +1,24 @@
-var Rt = Object.defineProperty;
-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";
+var xt = Object.defineProperty;
+var Bt = (a, e, t) => e in a ? xt(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
+var G = (a, e, t) => Bt(a, typeof e != "symbol" ? e + "" : e, t);
+import { createIdentifier as Wt, CommandType as Lt, sortRules as Gt, sortRulesByDesc as qt, ImageSourceType as lt, ImageUploadStatusType as tt, generateRandomId as $t, Disposable as Kt, toDisposable as Ft, Inject as Vt, Injector as Ht, IConfigService as zt, ICommandService as Xt, Plugin as Jt, merge as Yt, mergeOverrideWithDependencies as Zt, IImageIoService as Qt, IURLImageService as en } from "@univerjs/core";
+import { IImageIoService as Sn, ImageSourceType as Un, ImageUploadStatusType as An } from "@univerjs/core";
 import { Subject as be } from "rxjs";
-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 = {
+const In = 500, Cn = 500, En = 10, tn = 5 * 1024 * 1024, nn = ["image/png", "image/jpeg", "image/jpg", "image/gif", "image/bmp"], Ut = Wt("univer.drawing-manager.service"), rn = {
   id: "drawing.operation.set-drawing-selected",
-  type: Wt.OPERATION,
+  type: Lt.OPERATION,
   handler: (a, e) => {
-    const t = a.get(kt);
+    const t = a.get(Ut);
     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 });
+}, sn = "@univerjs/drawing", on = "0.17.0", _t = {
+  name: sn,
+  version: on
+}, an = "drawing.config", vt = {};
+var Ve = {}, Ze = {}, nt = {}, Ot;
+function ln() {
+  if (Ot) return nt;
+  Ot = 1, Object.defineProperty(nt, "__esModule", { value: !0 });
   function a(n, r) {
     if (Array.isArray(r))
       return !1;
@@ -38,12 +41,12 @@ function sn() {
   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 = t, tt;
+  return nt.default = t, nt;
 }
-var nt = {}, Ot;
-function on() {
-  if (Ot) return nt;
-  Ot = 1, Object.defineProperty(nt, "__esModule", { value: !0 });
+var rt = {}, wt;
+function un() {
+  if (wt) return rt;
+  wt = 1, Object.defineProperty(rt, "__esModule", { value: !0 });
   function a(e) {
     if (e === null)
       return null;
@@ -57,27 +60,27 @@ function on() {
     } else
       return e;
   }
-  return nt.default = a, nt;
+  return rt.default = a, rt;
 }
-var lt = {}, wt;
-function Ut() {
-  return wt || (wt = 1, (function(a) {
+var ut = {}, bt;
+function At() {
+  return bt || (bt = 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 (!_)
+    function e(m, s) {
+      if (!m)
         throw new Error(s);
     }
-    const t = (_) => _ != null && typeof _ == "object" && !Array.isArray(_), n = (_, s) => (
+    const t = (m) => m != null && typeof m == "object" && !Array.isArray(m), n = (m, s) => (
       // All the numbers, then all the letters. Just as the gods of ascii intended.
-      typeof _ == typeof s ? _ > s : typeof _ == "string" && typeof s == "number"
+      typeof m == typeof s ? m > s : typeof m == "string" && typeof s == "number"
     );
-    function r(_, s) {
-      for (let c in _) {
+    function r(m, s) {
+      for (let c in m) {
         const h = c;
-        s.write(h, _[h]);
+        s.write(h, m[h]);
       }
     }
-    a.isValidPathItem = (_) => typeof _ == "number" || typeof _ == "string" && _ !== "__proto__";
+    a.isValidPathItem = (m) => typeof m == "number" || typeof m == "string" && m !== "__proto__";
     class u {
       constructor(s = null) {
         this.parents = [], this.indexes = [], this.lcIdx = -1, this.idx = -1, this.container = s;
@@ -253,52 +256,52 @@ function Ut() {
         return s.push(...this.pendingDescent), s;
       }
     }
-    a.WriteCursor = l, a.writeCursor = () => new l(), a.readCursor = (_) => new o(_);
-    function E(_, s, c) {
+    a.WriteCursor = l, a.writeCursor = () => new l(), a.readCursor = (m) => new o(m);
+    function E(m, s, c) {
       let h, M;
-      M = h = _ ? _.descendFirst() : !1;
+      M = h = m ? m.descendFirst() : !1;
       function Y(pe) {
         let Z;
         for (; M; ) {
-          const Ie = Z = _.getKey();
+          const Ie = Z = m.getKey();
           if (pe != null) {
             let qe = !1;
-            if (s && typeof Ie == "number" && (Z = s(Ie, _.getComponent()), Z < 0 && (Z = ~Z, qe = !0)), n(Z, pe))
+            if (s && typeof Ie == "number" && (Z = s(Ie, m.getComponent()), Z < 0 && (Z = ~Z, qe = !0)), n(Z, pe))
               return null;
             if (Z === pe && !qe)
-              return _;
+              return m;
           }
-          c && typeof Z == "number" && c(Z, _.getComponent()), M = _.nextSibling();
+          c && typeof Z == "number" && c(Z, m.getComponent()), M = m.nextSibling();
         }
         return null;
       }
       return Y.end = () => {
-        h && _.ascend();
+        h && m.ascend();
       }, Y;
     }
     a.advancer = E;
-    function B(_, s, c) {
+    function B(m, s, c) {
       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());
+      for (h = M = m && m.descendFirst(), Y = pe = s && s.descendFirst(); h || Y; ) {
+        let Z = h ? m.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 ? m : null, Ie != null ? s : null), Z != null && h && (h = m.nextSibling()), Ie != null && Y && (Y = s.nextSibling());
       }
-      M && _.ascend(), pe && s.ascend();
+      M && m.ascend(), pe && s.ascend();
     }
     a.eachChildOf = B;
-  })(lt)), lt;
+  })(ut)), ut;
 }
-var ut = {}, bt;
-function At() {
-  return bt || (bt = 1, (function(a) {
+var ct = {}, It;
+function Mt() {
+  return It || (It = 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;
+  })(ct)), ct;
 }
-var Me = {}, He = {}, It;
+var Me = {}, He = {}, Ct;
 function pt() {
-  return It || (It = 1, Object.defineProperty(He, "__esModule", { value: !0 }), He.uniToStrPos = He.strPosToUni = void 0, He.strPosToUni = (a, e = a.length) => {
+  return Ct || (Ct = 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);
@@ -316,61 +319,61 @@ function pt() {
     return t;
   }), He;
 }
-var ct = {}, Ct;
+var dt = {}, Et;
 function ht() {
-  return Ct || (Ct = 1, (function(a) {
+  return Et || (Et = 1, (function(a) {
     Object.defineProperty(a, "__esModule", { value: !0 }), a.uniSlice = a.dlen = a.eachOp = void 0;
     const e = pt(), t = (f) => {
       if (!Array.isArray(f))
         throw Error("Op must be an array of components");
       let y = null;
       for (let b = 0; b < f.length; b++) {
-        const q = f[b];
-        switch (typeof q) {
+        const $ = f[b];
+        switch (typeof $) {
           case "object":
-            if (typeof q.d != "number" && typeof q.d != "string")
+            if (typeof $.d != "number" && typeof $.d != "string")
               throw Error("Delete must be number or string");
-            if (a.dlen(q.d) <= 0)
+            if (a.dlen($.d) <= 0)
               throw Error("Deletes must not be empty");
             break;
           case "string":
-            if (!(q.length > 0))
+            if (!($.length > 0))
               throw Error("Inserts cannot be empty");
             break;
           case "number":
-            if (!(q > 0))
+            if (!($ > 0))
               throw Error("Skip components must be >0");
             if (typeof y == "number")
               throw Error("Adjacent skip components should be combined");
             break;
         }
-        y = q;
+        y = $;
       }
       if (typeof y == "number")
         throw Error("Op has a trailing skip");
     };
     function n(f, y) {
-      let b = 0, q = 0;
+      let b = 0, $ = 0;
       for (let z = 0; z < f.length; z++) {
-        const $ = f[z];
-        switch (y($, b, q), typeof $) {
+        const K = f[z];
+        switch (y(K, b, $), typeof K) {
           case "object":
-            b += a.dlen($.d);
+            b += a.dlen(K.d);
             break;
           case "string":
-            q += e.strPosToUni($);
+            $ += e.strPosToUni(K);
             break;
           case "number":
-            b += $, q += $;
+            b += K, $ += K;
             break;
         }
       }
     }
     a.eachOp = n;
     function r(f, y) {
-      const b = [], q = l(b);
-      return n(f, (z, $, Ee) => {
-        q(y(z, $, Ee));
+      const b = [], $ = l(b);
+      return n(f, (z, K, Ee) => {
+        $(y(z, K, Ee));
       }), s(b);
     }
     const u = (f) => f, o = (f) => r(f, u);
@@ -388,31 +391,31 @@ function ht() {
         f.push(y);
     }, E = (f) => typeof f == "number" ? f : typeof f == "string" ? e.strPosToUni(f) : typeof f.d == "number" ? f.d : e.strPosToUni(f.d);
     a.uniSlice = (f, y, b) => {
-      const q = e.uniToStrPos(f, y), z = b == null ? 1 / 0 : e.uniToStrPos(f, b);
-      return f.slice(q, z);
+      const $ = e.uniToStrPos(f, y), z = b == null ? 1 / 0 : e.uniToStrPos(f, b);
+      return f.slice($, z);
     };
-    const B = (f, y, b) => typeof f == "number" ? b == null ? f - y : Math.min(f, b) - y : a.uniSlice(f, y, b), _ = (f) => {
+    const B = (f, y, b) => typeof f == "number" ? b == null ? f - y : Math.min(f, b) - y : a.uniSlice(f, y, b), m = (f) => {
       let y = 0, b = 0;
-      return { take: ($, Ee) => {
+      return { take: (K, Ee) => {
         if (y === f.length)
-          return $ === -1 ? null : $;
+          return K === -1 ? null : K;
         const ce = f[y];
         let ne;
         if (typeof ce == "number")
-          return $ === -1 || ce - b <= $ ? (ne = ce - b, ++y, b = 0, ne) : (b += $, $);
+          return K === -1 || ce - b <= K ? (ne = ce - b, ++y, b = 0, ne) : (b += K, K);
         if (typeof ce == "string") {
-          if ($ === -1 || Ee === "i" || e.strPosToUni(ce.slice(b)) <= $)
+          if (K === -1 || Ee === "i" || e.strPosToUni(ce.slice(b)) <= K)
             return ne = ce.slice(b), ++y, b = 0, ne;
           {
-            const le = b + e.uniToStrPos(ce.slice(b), $);
+            const le = b + e.uniToStrPos(ce.slice(b), K);
             return ne = ce.slice(b, le), b = le, ne;
           }
         } else {
-          if ($ === -1 || Ee === "d" || a.dlen(ce.d) - b <= $)
+          if (K === -1 || Ee === "d" || a.dlen(ce.d) - b <= K)
             return ne = { d: B(ce.d, b) }, ++y, b = 0, ne;
           {
-            let le = B(ce.d, b, b + $);
-            return b += $, { d: le };
+            let le = B(ce.d, b, b + K);
+            return b += K, { d: le };
           }
         }
       }, peek: () => f[y] };
@@ -421,21 +424,21 @@ function ht() {
       if (b !== "left" && b !== "right")
         throw Error("side (" + b + ") must be 'left' or 'right'");
       t(f), t(y);
-      const q = [], z = l(q), { take: $, peek: Ee } = _(f);
+      const $ = [], z = l($), { take: K, peek: Ee } = m(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 = $(ge, "i"), z(De), typeof De != "string" && (ge -= E(De));
+              De = K(ge, "i"), z(De), typeof De != "string" && (ge -= E(De));
             break;
           case "string":
-            b === "left" && typeof Ee() == "string" && z($(-1)), z(e.strPosToUni(le));
+            b === "left" && typeof Ee() == "string" && z(K(-1)), z(e.strPosToUni(le));
             break;
           case "object":
             for (ge = a.dlen(le.d); ge > 0; )
-              switch (De = $(ge, "i"), typeof De) {
+              switch (De = K(ge, "i"), typeof De) {
                 case "number":
                   ge -= De;
                   break;
@@ -449,23 +452,23 @@ function ht() {
         }
       }
       let ce;
-      for (; ce = $(-1); )
+      for (; ce = K(-1); )
         z(ce);
-      return s(q);
+      return s($);
     }
     function h(f, y) {
       t(f), t(y);
-      const b = [], q = l(b), { take: z } = _(f);
+      const b = [], $ = l(b), { take: z } = m(f);
       for (let Ee = 0; Ee < y.length; Ee++) {
         const ce = y[Ee];
         let ne, le;
         switch (typeof ce) {
           case "number":
             for (ne = ce; ne > 0; )
-              le = z(ne, "d"), q(le), typeof le != "object" && (ne -= E(le));
+              le = z(ne, "d"), $(le), typeof le != "object" && (ne -= E(le));
             break;
           case "string":
-            q(ce);
+            $(ce);
             break;
           case "object":
             ne = a.dlen(ce.d);
@@ -473,34 +476,34 @@ function ht() {
             for (; ge < ne; )
               switch (le = z(ne - ge, "d"), typeof le) {
                 case "number":
-                  q({ d: B(ce.d, ge, ge + le) }), ge += le;
+                  $({ d: B(ce.d, ge, ge + le) }), ge += le;
                   break;
                 case "string":
                   ge += e.strPosToUni(le);
                   break;
                 case "object":
-                  q(le);
+                  $(le);
               }
             break;
         }
       }
-      let $;
-      for (; $ = z(-1); )
-        q($);
+      let K;
+      for (; K = z(-1); )
+        $(K);
       return s(b);
     }
     const M = (f, y) => {
       let b = 0;
-      for (let q = 0; q < y.length && f > b; q++) {
-        const z = y[q];
+      for (let $ = 0; $ < y.length && f > b; $++) {
+        const z = y[$];
         switch (typeof z) {
           case "number": {
             b += z;
             break;
           }
           case "string":
-            const $ = e.strPosToUni(z);
-            b += $, f += $;
+            const K = e.strPosToUni(z);
+            b += K, f += K;
             break;
           case "object":
             f -= Math.min(a.dlen(z.d), f - b);
@@ -510,7 +513,7 @@ function ht() {
       return f;
     }, 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);
+      return r(f, ($, z) => typeof $ == "object" && typeof $.d == "number" ? { d: b.slice(y, z, z + $.d) } : $);
     }
     function Z(f) {
       return r(f, (y) => {
@@ -537,7 +540,7 @@ function ht() {
         typeof b == "object" && typeof b.d == "number" && (y = !1);
       }), y;
     }
-    function me(f) {
+    function _e(f) {
       return {
         name: "text-unicode",
         uri: "http://sharejs.org/types/text-unicode",
@@ -558,22 +561,22 @@ function ht() {
          */
         apply(y, b) {
           t(b);
-          const q = f.builder(y);
+          const $ = f.builder(y);
           for (let z = 0; z < b.length; z++) {
-            const $ = b[z];
-            switch (typeof $) {
+            const K = b[z];
+            switch (typeof K) {
               case "number":
-                q.skip($);
+                $.skip(K);
                 break;
               case "string":
-                q.append($);
+                $.append(K);
                 break;
               case "object":
-                q.del(a.dlen($.d));
+                $.del(a.dlen(K.d));
                 break;
             }
           }
-          return q.build();
+          return $.build();
         },
         transform: c,
         compose: h,
@@ -591,13 +594,13 @@ function ht() {
         isNoop: (y) => y.length === 0
       };
     }
-    a.default = me;
-  })(ct)), ct;
+    a.default = _e;
+  })(dt)), dt;
 }
-var rt = {}, Et;
-function an() {
-  if (Et) return rt;
-  Et = 1, Object.defineProperty(rt, "__esModule", { value: !0 });
+var it = {}, Dt;
+function cn() {
+  if (Dt) return it;
+  Dt = 1, Object.defineProperty(it, "__esModule", { value: !0 });
   const a = ht(), e = pt();
   function t(n, r) {
     return {
@@ -636,11 +639,11 @@ function an() {
       onRemove: null
     };
   }
-  return rt.default = t, t.provides = { text: !0 }, rt;
+  return it.default = t, t.provides = { text: !0 }, it;
 }
-var Dt;
-function ln() {
-  return Dt || (Dt = 1, (function(a) {
+var Pt;
+function dn() {
+  return Pt || (Pt = 1, (function(a) {
     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];
@@ -660,7 +663,7 @@ function ln() {
       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 = n(ht()), l = r(an()), E = {
+    const u = pt(), o = n(ht()), l = r(cn()), E = {
       create(c) {
         return c;
       },
@@ -690,17 +693,17 @@ function ln() {
         };
       },
       slice: o.uniSlice
-    }, B = o.default(E), _ = Object.assign(Object.assign({}, B), { api: l.default });
-    a.type = _, a.insert = (c, h) => h.length === 0 ? [] : c === 0 ? [h] : [c, h], a.remove = (c, h) => o.dlen(h) === 0 ? [] : c === 0 ? [{ d: h }] : [c, { d: h }];
+    }, B = o.default(E), m = Object.assign(Object.assign({}, B), { api: l.default });
+    a.type = m, a.insert = (c, h) => h.length === 0 ? [] : c === 0 ? [h] : [c, h], a.remove = (c, h) => o.dlen(h) === 0 ? [] : c === 0 ? [{ d: h }] : [c, { d: h }];
     var s = ht();
     Object.defineProperty(a, "makeType", { enumerable: !0, get: function() {
       return s.default;
     } });
   })(Me)), Me;
 }
-var Pt;
-function un() {
-  return Pt || (Pt = 1, (function(a) {
+var Tt;
+function fn() {
+  return Tt || (Tt = 1, (function(a) {
     var e = Ze && Ze.__importDefault || function(i) {
       return i && i.__esModule ? i : {
         default: i
@@ -709,7 +712,7 @@ function un() {
     Object.defineProperty(a, "__esModule", {
       value: !0
     }), a.editOp = a.replaceOp = a.insertOp = a.moveOp = a.removeOp = a.type = void 0;
-    const t = e(sn()), n = e(on()), r = Ut(), u = At();
+    const t = e(ln()), n = e(un()), r = At(), u = Mt();
     function o(i, d) {
       if (!i) throw new Error(d);
     }
@@ -724,15 +727,15 @@ function un() {
       },
       registerSubtype: Z,
       checkValidOp: z,
-      normalize: $,
+      normalize: K,
       apply: Ee,
       transformPosition: ce,
       compose: ne,
-      tryTransform: st,
-      transform: jt,
+      tryTransform: ot,
+      transform: Nt,
       makeInvertible: De,
       invert: le,
-      invertWithDoc: Mt,
+      invertWithDoc: jt,
       RM_UNEXPECTED_CONTENT: u.ConflictType.RM_UNEXPECTED_CONTENT,
       DROP_COLLISION: u.ConflictType.DROP_COLLISION,
       BLACKHOLE: u.ConflictType.BLACKHOLE,
@@ -745,7 +748,7 @@ function un() {
     function E(i) {
       return i && typeof i == "object" && !Array.isArray(i);
     }
-    const B = (i) => Array.isArray(i) ? i.slice() : i !== null && typeof i == "object" ? Object.assign({}, i) : i, _ = (i) => i && (i.p != null || i.r !== void 0), s = (i) => i && (i.d != null || i.i !== void 0);
+    const B = (i) => Array.isArray(i) ? i.slice() : i !== null && typeof i == "object" ? Object.assign({}, i) : i, m = (i) => i && (i.p != null || i.r !== void 0), s = (i) => i && (i.d != null || i.i !== void 0);
     function c(i, d) {
       return o(i != null), typeof d == "number" ? (o(Array.isArray(i), "Invalid key - child is not an array"), (i = i.slice()).splice(d, 1)) : (o(E(i), "Invalid key - child is not an object"), delete (i = Object.assign({}, i))[d]), i;
     }
@@ -765,7 +768,7 @@ function un() {
       if (d) return d;
       throw Error("Missing type: " + i);
     };
-    Z(ln());
+    Z(dn());
     const qe = (i, d) => i + d;
     Z({
       name: "number",
@@ -774,14 +777,14 @@ function un() {
       invert: (i) => -i,
       transform: (i) => i
     });
-    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 _e = (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));
     }
-    function q(i) {
+    function $(i) {
       typeof i == "number" ? b(i) : o(typeof i == "string");
     }
     function z(i) {
@@ -789,12 +792,12 @@ function un() {
       const d = /* @__PURE__ */ new Set(), v = /* @__PURE__ */ new Set(), D = (C) => {
         let x = !0, N = !1;
         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);
+          const _ = 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(_), o(!d.has(_)), d.add(_), o(C.r === void 0);
+          else if (p === "d") b(_), o(!v.has(_)), v.add(_), o(C.i === void 0);
           else if (p === "e" || p === "es" || p === "ena") {
             o(!N), N = !0;
-            const w = me(C);
+            const w = _e(C);
             o(w, "Missing type in edit"), w.checkValidOp && w.checkValidOp(f(C));
           }
         }
@@ -802,36 +805,36 @@ function un() {
       }, 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;
+        x || $(C[0]);
+        let p = 1, _ = 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 (m) {
+            if (_) {
               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, 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);
+            w = W, _++, p = 3;
+          } else typeof R == "object" ? (o(p === 1, `Prev not scalar - instead ${p}`), D(R), p = 2) : (o(p !== 3), $(R), o(r.isValidPathItem(R), "Invalid path key"), p = 1);
         }
-        return o(m !== 1, "Operation makes multiple descents. Remove some []"), o(p === 2 || p === 3), C[0];
+        return o(_ !== 1, "Operation makes multiple descents. Remove some []"), o(p === 2 || p === 3), C[0];
       };
       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 $(i) {
+    function K(i) {
       let d = 0, v = [];
       const D = r.writeCursor();
       return D.mergeTree(i, (O, C) => {
-        const x = me(O);
+        const x = _e(O);
         if (x) {
           const p = f(O);
           y(C, x, x.normalize ? x.normalize(p) : p);
         }
         for (const p of ["r", "p", "i", "d"]) if (O[p] !== void 0) {
-          const m = p === "p" || p === "d" ? (N = O[p], v[N] == null && (v[N] = d++), v[N]) : O[p];
-          C.write(p, m);
+          const _ = p === "p" || p === "d" ? (N = O[p], v[N] == null && (v[N] = d++), v[N]) : O[p];
+          C.write(p, _);
         }
         var N;
       }), D.get();
@@ -842,10 +845,10 @@ function un() {
       return (function D(O, C) {
         let x = O, N = 0, p = {
           root: O
-        }, m = 0, w = p, I = "root";
+        }, _ = 0, w = p, I = "root";
         function R() {
-          for (; m < N; m++) {
-            let W = C[m];
+          for (; _ < N; _++) {
+            let W = C[_];
             typeof W != "object" && (o(M(w, I)), w = w[I] = B(w[I]), I = W);
           }
         }
@@ -856,7 +859,7 @@ function un() {
             g !== x && g !== void 0 && (R(), x = w[I] = g);
           } else if (typeof W == "object") {
             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);
+            const g = _e(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);
@@ -875,10 +878,10 @@ function un() {
           const I = C[N];
           if (typeof I != "object") {
             const R = x.pop();
-            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);
+            O = O === Y(R, I) ? R : O === void 0 ? c(R, I) : (_ = I, w = O, (p = B(p = R))[_] = w, p);
+          } else m(I) && (o(O !== void 0, "Cannot pick up or remove undefined"), I.p != null && (v[I.p] = O), O = void 0);
         }
-        var p, m, w;
+        var p, _, w;
         return O;
       })(i, d), d);
     }
@@ -888,25 +891,25 @@ function un() {
       let D, O, C = !1;
       const x = [];
       for (let p = 0; ; p++) {
-        const m = i[p], w = v.getComponent();
+        const _ = 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++;
+          m(U) && I++;
         });
         x.unshift(R);
-        const W = R(m);
-        if (typeof m == "number" && (i[p] -= I), !W) break;
+        const W = R(_);
+        if (typeof _ == "number" && (i[p] -= I), !W) break;
       }
       if (x.forEach((p) => p.end()), C) return null;
       const N = () => {
         let p = 0;
         if (D != null) {
-          const m = v.getPath();
-          p = m.length, i = m.concat(i.slice(O));
+          const _ = v.getPath();
+          p = _.length, i = _.concat(i.slice(O));
         }
         for (; p < i.length; p++) {
-          const m = i[p], w = l(v), I = me(w);
+          const _ = i[p], w = l(v), I = _e(w);
           if (I) {
             const g = f(w);
             I.transformPosition && (i[p] = I.transformPosition(i[p], g));
@@ -915,8 +918,8 @@ function un() {
           let R = 0;
           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;
+          })(_);
+          if (typeof _ == "number" && (i[p] += R), !W) break;
         }
       };
       return D != null ? v.eachDrop(null, (p) => {
@@ -927,24 +930,24 @@ function un() {
       if (z(i), z(d), i == null) return d;
       if (d == null) return i;
       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();
+      const D = r.readCursor(i), O = r.readCursor(d), C = r.writeCursor(), x = [], N = [], p = [], _ = [], 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 && (m[g.d] = O.clone());
+        g.d != null && (_[g.d] = O.clone());
       });
       const W = r.writeCursor();
-      return (function g(U, re, te, K, se, Re, Oe, ye) {
+      return (function g(U, re, te, F, se, Re, Oe, ye) {
         o(re || te);
-        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;
+        const oe = l(re), Pe = l(te), ke = !!Pe && Pe.r !== void 0, $e = !!oe && oe.i !== void 0, Te = oe ? oe.d : null, Ce = Pe ? Pe.p : null, xe = (Re || ke) && Ce == null;
+        if (Ce != null) F = _[Ce], Oe = N[Ce] = new r.WriteCursor();
+        else if (Pe && Pe.r !== void 0) F = null;
         else {
-          const T = l(K);
-          T && T.d != null && (K = null);
+          const T = l(F);
+          T && T.d != null && (F = null);
         }
-        const Q = l(K);
-        if (Te != null) if (U = p[Te], ye = x[Te] = new r.WriteCursor(), xe) Re && !Se && ye.write("r", !0);
+        const Q = l(F);
+        if (Te != null) if (U = p[Te], ye = x[Te] = new r.WriteCursor(), xe) Re && !ke && ye.write("r", !0);
         else {
           const T = w[Te] = v++;
           Oe.write("d", T);
@@ -954,61 +957,61 @@ function un() {
           const T = l(U);
           T && T.p != null && (U = null);
         }
-        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();
+        let k;
+        $e ? (o(se === void 0), k = oe.i) : k = se;
+        const L = (Ce == null ? !$e || Re || ke : k === 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 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;
+        } else ke && ($e || se !== void 0 || (Pe.r, ye.write("r", Pe.r)));
+        const S = xe ? null : _e(oe), P = _e(Q);
+        if ((S || P) && (S && S.name, P && P.name), S && P) {
+          o(S === P);
+          const T = f(oe), q = f(Q), he = S.compose(T, q);
+          y(Oe, S, he), R.add(Q);
+        } else S ? y(Oe, S, f(oe)) : P && (y(Oe, P, f(Q)), R.add(Q));
+        const A = typeof k == "object" && k != null;
         let J = !1, X = 0, ee = 0, fe = 0, de = 0, ae = 0;
-        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++;
+        const ve = r.advancer(F, (T, q) => s(q) ? de - T - 1 : T - de, (T, q) => {
+          s(q) && de++;
+        }), H = r.advancer(U, (T, q) => m(q) ? X - T - 1 : T - X, (T, q) => {
+          m(q) && X++;
         });
-        if (r.eachChildOf(re, te, (T, G, he) => {
-          let we, Be, Ke = T, ke = T, Ye = T;
+        if (r.eachChildOf(re, te, (T, q, he) => {
+          let we, Be, Ke = T, Se = T, Ye = T;
           if (typeof T == "number") {
-            let _e = T + fe;
-            Be = ve(_e), ke = _e + de;
+            let me = T + fe;
+            Be = ve(me), Se = me + de;
             let ue = T + ee;
-            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));
+            we = H(ue), s(l(Be)) && (we = null), Ke = ue + X, Ye = T + ae, o(Ke >= 0, "p1PickKey is negative"), o(Se >= 0, "p2DropKey is negative");
+            const Ue = s(l(q)), We = m(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);
+          ye.descend(Ke), Oe.descend(Se);
+          const Xe = A && !s(l(q)) ? k[Ye] : void 0, je = g(we, q, he, Be, Xe, xe, Oe, ye);
           var Ne, j, ie;
-          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;
+          A && !xe ? Xe !== je && (J || (k = Array.isArray(k) ? k.slice() : Object.assign({}, k), J = !0), Ne = k, 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 = k;
+        else if (!Re && !ke && Ce == null) return k;
       })(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 && U.write("p", te);
-          const K = x[re];
-          K && K.get(), K && U.mergeTree(K.get());
+          const F = x[re];
+          F && F.get(), F && U.mergeTree(F.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 K = I[re];
-          K != null && U.write("d", K);
+          const F = I[re];
+          F != null && U.write("d", F);
           const se = N[re];
           se && U.mergeTree(se.get());
         } else g.i !== void 0 && U.write("i", g.i);
-        const te = me(g);
+        const te = _e(g);
         te && !R.has(g) && y(U, te, f(g));
       }), C.get();
     }
@@ -1017,118 +1020,118 @@ function un() {
       const d = new r.ReadCursor(i), v = new r.WriteCursor();
       let D;
       const O = [], C = [];
-      return (function x(N, p, m) {
+      return (function x(N, p, _) {
         const w = N.getComponent();
         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), 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));
+          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), _ = void 0), w.i !== void 0 && (_ = I = w.i);
+          const g = _e(w);
+          g && (_ === void 0 ? (D || (D = /* @__PURE__ */ new Set()), D.add(w)) : (f(w), _ = g.apply(_, f(w)), R = !0));
         }
         let W = 0;
         for (const g of N) {
           p.descend(g);
-          const U = typeof g == "number" ? g - W : g, re = Y(m, U);
+          const U = typeof g == "number" ? g - W : g, re = Y(_, U);
           s(N.getComponent()) && W++;
           const te = x(N, p, re);
-          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;
+          if (_ !== void 0 && te !== void 0) {
+            if (R || (R = !0, _ = B(_)), !M(_, U)) throw Error("Cannot modify child - invalid operation");
+            _[U] = te;
           }
           p.ascend();
         }
-        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) {
+        if (I === void 0) return R ? _ : void 0;
+        p.write("r", _);
+      })(d, v, void 0), D && (v.reset(), (function x(N, p, _) {
         const w = p.getComponent();
         if (w) {
           const g = w.d;
-          if (g != null && (N = O[g], m = C[g] = r.writeCursor()), D.has(w)) {
-            const U = me(w);
+          if (g != null && (N = O[g], _ = C[g] = r.writeCursor()), D.has(w)) {
+            const U = _e(w);
             if (!U.invert) throw Error(`Cannot invert subtype ${U.name}`);
-            y(m, U, U.invert(f(w)));
+            y(_, U, U.invert(f(w)));
           }
         }
         let I = 0, R = 0;
-        const W = r.advancer(N, (g, U) => _(U) ? I - g - 1 : g - I, (g, U) => {
-          _(U) && I++;
+        const W = r.advancer(N, (g, U) => m(U) ? I - g - 1 : g - I, (g, U) => {
+          m(U) && I++;
         });
         for (const g of p) if (typeof g == "number") {
           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();
+          _.descend(te), x(re, p, _), s(p.getComponent()) && R++, _.ascend();
+        } else _.descend(g), x(W(g), p, _), _.ascend();
         W.end();
       })(d.clone(), d, v), C.length && (v.reset(), d.traverse(v, (x, N) => {
         const p = x.p;
         if (p != null) {
-          const m = C[p];
-          m && m.get(), m && N.mergeTree(m.get());
+          const _ = C[p];
+          _ && _.get(), _ && N.mergeTree(_.get());
         }
       }))), v.get();
     }
     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 m;
-        return p.r !== void 0 || ((m = me(p)) === null || m === void 0 ? void 0 : m.makeInvertible) != null;
+        var _;
+        return p.r !== void 0 || ((_ = _e(p)) === null || _ === void 0 ? void 0 : _.makeInvertible) != null;
       })) return i;
       const v = new r.ReadCursor(i), D = new r.WriteCursor();
       let O = !1;
-      const C = [], x = [], N = (p, m, w) => {
+      const C = [], x = [], N = (p, _, w) => {
         const I = p.getComponent();
         let R = !1;
         if (I) {
-          I.d != null && m.write("d", I.d), I.i !== void 0 && m.write("i", I.i);
+          I.d != null && _.write("d", I.d), I.i !== void 0 && _.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));
+          if (g != null && (C[g] = p.clone(), o(w !== void 0, "Operation picks up at an invalid key"), x[g] = w, _.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 = _e(I);
+          U && (U.makeInvertible ? O = !0 : y(_, U, f(I), !0));
         }
         let W = 0;
         for (const g of p) {
-          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();
+          _.descend(g);
+          const U = typeof g == "number" ? g - W : g, re = Y(w, U), te = N(p, _, re);
+          re !== te && (R || (R = !0, w = B(w)), te === void 0 ? (w = c(w, U), typeof g == "number" && W++) : w[U] = te), _.ascend();
         }
-        return I && (I.r !== void 0 ? (m.write("r", n.default(w)), w = void 0) : I.p != null && (w = void 0)), w;
+        return I && (I.r !== void 0 ? (_.write("r", n.default(w)), w = void 0) : I.p != null && (w = void 0)), w;
       };
-      return N(v, D, d), D.get(), O && (D.reset(), (function p(m, w, I, R, W) {
+      return N(v, D, d), D.get(), O && (D.reset(), (function p(_, 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], m = C[g.d], W = !1, g.d);
-          let K = me(g);
-          if (K && K.makeInvertible) {
+          g.i !== void 0 ? (R = g.i, W = !0) : g.d != null && (R = x[g.d], _ = C[g.d], W = !1, g.d);
+          let F = _e(g);
+          if (F && F.makeInvertible) {
             const se = f(g);
-            y(I, K, K.makeInvertible(se, R), !0);
+            y(I, F, F.makeInvertible(se, R), !0);
           }
         }
         let U = 0, re = 0;
-        const te = r.advancer(m, (K, se) => _(se) ? U - K - 1 : K - U, (K, se) => {
-          _(se) && U++;
+        const te = r.advancer(_, (F, se) => m(se) ? U - F - 1 : F - U, (F, se) => {
+          m(se) && U++;
         });
-        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();
+        for (const F of w) if (typeof F == "number") {
+          const se = F - re, Re = te(se), Oe = se + U, ye = Y(R, W ? se : Oe);
+          I.descend(F), p(Re, w, I, ye, W), s(w.getComponent()) && re++, I.ascend();
         } else {
-          const se = Y(R, K);
-          I.descend(K), p(te(K), w, I, se, W), I.ascend();
+          const se = Y(R, F);
+          I.descend(F), p(te(F), w, I, se, W), I.ascend();
         }
         te.end();
       })(v.clone(), v, D, d, !1)), D.get();
     }
-    function Mt(i, d) {
+    function jt(i, d) {
       return le(De(i, d));
     }
-    const it = (i) => {
+    const st = (i) => {
       if (i == null) return null;
       const d = i.slice();
       for (let v = 0; v < i.length; v++) {
         const D = d[v];
-        Array.isArray(D) && (d[v] = it(D));
+        Array.isArray(D) && (d[v] = st(D));
       }
       return d;
     };
-    function st(i, d, v) {
+    function ot(i, d, v) {
       o(v === "left" || v === "right", "Direction must be left or right");
       const D = v === "left" ? 0 : 1;
       if (d == null) return {
@@ -1137,48 +1140,48 @@ function un() {
       };
       z(i), z(d);
       let O = null;
-      const C = [], x = [], N = [], p = [], m = [], w = [], I = [], R = [], W = [], g = [], U = [], re = [], te = [], K = [], se = [];
+      const C = [], x = [], N = [], p = [], _ = [], w = [], I = [], R = [], W = [], g = [], U = [], re = [], te = [], F = [], se = [];
       let Re = 0;
       const Oe = r.readCursor(i), ye = r.readCursor(d), oe = r.writeCursor();
-      if ((function Q(S, L = null, k) {
+      if ((function Q(k, L = null, S) {
         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();
+        P && (P.r !== void 0 ? S = L.clone() : P.p != null && (S = null, w[P.p] = k.clone()));
+        const A = k.getComponent();
         let J;
-        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));
+        A && (J = A.p) != null && (_[J] = L ? L.clone() : null, N[J] = k.clone(), S && (g[J] = !0, W[J] = S), P && P.p != null && (F[J] = P.p));
         const X = r.advancer(L);
-        for (const ee of S) Q(S, X(ee), k);
+        for (const ee of k) Q(k, X(ee), S);
         X.end();
-      })(ye, Oe, null), (function Q(S, L, k, P, A) {
-        const J = k.getComponent();
+      })(ye, Oe, null), (function Q(k, L, S, P, A) {
+        const J = S.getComponent();
         let X, ee = !1;
-        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 = {
+        J && ((X = J.d) != null ? (p[X] = S.clone(), P != null && (se[P] == null && (se[P] = []), se[P].push(X)), g[X], k = _[X] || null, L = N[X] || null, g[X] ? (A && (U[X] = !0), A = W[X] || null) : !A || D !== 1 && F[X] != null || O == null && (O = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
           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 = {
+          op2: a.moveOp(L.getPath(), S.getPath())
+        }), ee = !0) : J.i !== void 0 && (k = L = null, ee = !0, A && O == null && (O = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
           op1: a.removeOp(A.getPath()),
-          op2: a.insertOp(k.getPath(), J.i)
+          op2: a.insertOp(S.getPath(), J.i)
         })));
-        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);
+        const fe = l(k);
+        fe && (fe.r !== void 0 ? A = k.clone() : fe.p != null && (fe.p, P = fe.p, A = null));
+        const de = _e(J);
         de && A && O == null && (O = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
           op1: a.removeOp(A.getPath()),
-          op2: a.editOp(k.getPath(), de, f(J), !0)
+          op2: a.editOp(S.getPath(), de, f(J), !0)
         });
         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(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);
+        const H = r.advancer(L, (q, he) => m(he) ? ae - q - 1 : q - ae, (q, he) => {
+          m(he) && ae++;
+        }), T = r.advancer(k);
+        for (const q of S) if (typeof q == "number") {
+          const he = q - ve, we = H(he);
+          ve += +Q(T(he + ae), we, S, P, A);
         } else {
-          const he = H(G);
-          Q(T(G), he, k, P, A);
+          const he = H(q);
+          Q(T(q), he, S, P, A);
         }
         return H.end(), T.end(), ee;
       })(Oe, ye, ye.clone(), null, null), p.map((Q) => Q && Q.get()), O) return {
@@ -1187,52 +1190,52 @@ function un() {
       };
       U.map((Q) => !!Q);
       const Pe = [];
-      let Se = null;
-      (function Q(S, L, k, P, A) {
+      let ke = null;
+      (function Q(k, L, S, P, A) {
         let J = !1;
         const X = l(L);
-        if (_(X)) {
+        if (m(X)) {
           const H = X.p;
-          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();
+          H != null ? (S = p[H], P = re[H] = r.writeCursor(), J = !0, A = null) : (S = null, A = L.clone());
+        } else s(l(S)) && (S = null);
+        const ee = k.getComponent();
         if (ee) {
           const H = ee.p;
-          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)));
+          H != null ? (A && (R[H] = A), Pe[H] = A || D === 1 && J ? null : P.getComponent(), C[H] = k.clone(), S && (I[H] = S.clone())) : ee.r !== void 0 && (A || P.write("r", !0), (A || J) && (ke == null && (ke = /* @__PURE__ */ new Set()), ke.add(ee)));
         }
         let fe = 0, de = 0;
         const ae = r.advancer(L, void 0, (H, T) => {
-          _(T) && fe++;
-        }), ve = r.advancer(k, (H, T) => s(T) ? ~(H - de) : H - de, (H, T) => {
+          m(T) && fe++;
+        }), ve = r.advancer(S, (H, T) => s(T) ? ~(H - de) : H - de, (H, T) => {
           s(T) && de++;
         });
-        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();
+        if (k) for (const H of k) if (typeof H == "string") {
+          const T = ae(H), q = ve(H);
+          P.descend(H), Q(k, T, q, P, A), P.ascend();
         } else {
-          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();
+          const T = ae(H), q = H - fe, he = m(l(T)) ? null : ve(q), we = q + de;
+          o(we >= 0), P.descend(we), Q(k, T, he, P, A), P.ascend();
         }
         ae.end(), ve.end();
       })(Oe, ye, ye.clone(), oe, null), oe.reset();
       let $e = [];
-      if ((function Q(S, L, k, P, A, J) {
+      if ((function Q(k, L, S, 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);
+        const de = (j, ie, me) => j ? a.moveOp(j.getPath(), ie.getPath()) : a.insertOp(ie.getPath(), me.i);
         if (s(X)) {
           const j = X.d;
           j != null && (x[j] = L.clone());
           const ie = j != null ? Pe[j] : null;
-          let _e = !1;
+          let me = !1;
           if (X.i !== void 0 || j != null && ie) {
             let ue;
-            ee && (ee.i !== void 0 || (ue = ee.d) != null && !g[ue]) && (_e = ue != null ? j != null && j === K[ue] : t.default(ee.i, X.i), _e || ue != null && D !== 1 && K[ue] != null || O == null && (O = {
+            ee && (ee.i !== void 0 || (ue = ee.d) != null && !g[ue]) && (me = ue != null ? j != null && j === F[ue] : t.default(ee.i, X.i), me || ue != null && D !== 1 && F[ue] != null || O == null && (O = {
               type: u.ConflictType.DROP_COLLISION,
               op1: de(j != null ? C[j] : null, L, X),
               op2: de(ue != null ? N[ue] : null, P, ee)
-            })), _e || (J ? O == null && (O = {
+            })), me || (J ? O == null && (O = {
               type: u.ConflictType.RM_UNEXPECTED_CONTENT,
               op1: de(j != null ? C[j] : null, L, X),
               op2: a.removeOp(J.getPath())
@@ -1241,15 +1244,15 @@ function un() {
             const ue = R[j];
             ue && (J = ue.clone());
           }
-          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)) {
+          j != null ? (k = C[j], S = w[j], P = I[j]) : X.i !== void 0 && (k = S = null, me || (P = null));
+        } else m(l(k)) && (k = S = P = null);
+        const ae = l(k), ve = l(S);
+        if (m(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));
+          ve.r !== void 0 && (!ae || ae.r === void 0) || g[j] ? (P = null, J = S.clone()) : j != null && (P = p[j], D !== 1 && F[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 = me(X);
+        const H = _e(X);
         if (H) {
           const j = f(X);
           if (J) O == null && (O = {
@@ -1258,105 +1261,105 @@ function un() {
             op2: a.removeOp(J.getPath())
           });
           else {
-            const ie = me(ee);
-            let _e;
+            const ie = _e(ee);
+            let me;
             if (ie) {
               if (H !== ie) throw Error("Transforming incompatible types");
               const ue = f(ee);
-              _e = H.transform(j, ue, v);
-            } else _e = n.default(j);
-            y(A, H, _e);
+              me = H.transform(j, ue, v);
+            } else me = n.default(j);
+            y(A, H, me);
           }
         }
-        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 T = 0, q = 0, he = 0, we = 0, Be = 0, Ke = 0, Se = k != null && k.descendFirst(), Ye = Se;
+        const Xe = r.advancer(S, void 0, (j, ie) => {
+          m(ie) && he++;
         });
         let je = P != null && P.descendFirst(), Ne = je;
         for (const j of L) if (typeof j == "number") {
           let ie;
-          const _e = s(L.getComponent()), ue = j - G;
+          const me = s(L.getComponent()), ue = j - q;
           {
             let Le;
-            for (; ke && typeof (Le = S.getKey()) == "number"; ) {
+            for (; Se && typeof (Le = k.getKey()) == "number"; ) {
               Le += T;
-              const Ae = S.getComponent(), Je = _(Ae);
-              if (Le > ue || Le === ue && (!Je || D === 0 && _e)) break;
+              const Ae = k.getComponent(), Je = m(Ae);
+              if (Le > ue || Le === ue && (!Je || D === 0 && me)) break;
               if (Je) {
                 T--;
                 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--;
+                F.includes(Fe), Ae.d, l(te[Ae.d]), m(l(te[Ae.d])), (Ae.r === void 0 || ke && ke.has(Ae)) && (Fe == null || !Pe[Fe] || D !== 1 && F.includes(Fe)) || Be--;
               }
-              ke = S.nextSibling();
+              Se = k.nextSibling();
             }
-            ie = ke && Le === ue ? S : null;
+            ie = Se && Le === ue ? k : null;
           }
           const Ue = ue - T;
           let We = Xe(Ue);
-          const ot = Ue - he;
-          let Qe = null;
+          const at = Ue - he;
+          let et = null;
           {
             let Le, Ae;
             for (; je && typeof (Le = P.getKey()) == "number"; ) {
               Ae = Le - we;
               const Je = P.getComponent(), Fe = s(Je);
-              if (Ae > ot) break;
-              if (Ae === ot) {
+              if (Ae > at) break;
+              if (Ae === at) {
                 if (!Fe) {
-                  Qe = P;
+                  et = P;
                   break;
                 }
                 {
-                  if (D === 0 && _e) {
-                    Qe = P;
+                  if (D === 0 && me) {
+                    et = P;
                     break;
                   }
-                  const Ge = We && _(We.getComponent());
+                  const Ge = We && m(We.getComponent());
                   if (D === 0 && Ge) break;
                 }
               }
               if (Fe) {
                 const Ge = Je.d;
-                g[Ge], K[Ge], Je.i === void 0 && (g[Ge] || K[Ge] != null && D !== 1) ? (g[Ge] || K[Ge] != null && D === 0) && (we++, Ke--) : we++;
+                g[Ge], F[Ge], Je.i === void 0 && (g[Ge] || F[Ge] != null && D !== 1) ? (g[Ge] || F[Ge] != null && D === 0) && (we++, Ke--) : we++;
               }
               je = P.nextSibling();
             }
           }
-          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();
+          const mt = at + we + Be + Ke;
+          o(mt >= 0, "trying to descend to a negative index"), A.descend(mt), me && (ie = We = et = null, q++), Q(ie, L, We, et, A, J) && Ke++, A.ascend();
         } else {
           let ie;
-          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);
+          for (; Se && (ie = k.getKey(), typeof ie != "string" || !(ie > j || ie === j)); ) Se = k.nextSibling();
+          const me = Se && ie === j ? k : 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();
+          A.descend(j), Q(me, L, ue, We, A, J), A.ascend();
         }
-        return Xe.end(), Ye && S.ascend(), Ne && P.ascend(), fe;
+        return Xe.end(), Ye && k.ascend(), Ne && P.ascend(), fe;
       })(Oe, Oe.clone(), ye, ye.clone(), oe, null), O) return {
         ok: !1,
         conflict: O
       };
       oe.reset();
-      const Te = (Q, S, L) => Q.traverse(S, (k, P) => {
-        k.d != null && L(k.d, Q, P);
+      const Te = (Q, k, L) => Q.traverse(k, (S, P) => {
+        S.d != null && L(S.d, Q, P);
       });
-      (g.length || re.length) && (Te(ye, oe, (Q, S, L) => {
+      (g.length || re.length) && (Te(ye, oe, (Q, k, L) => {
         g[Q] && !U[Q] && L.write("r", !0), re[Q] && L.mergeTree(re[Q].get());
       }), oe.reset());
       const Ce = [], xe = [];
       if ((te.length || g.length) && !O) {
-        const Q = r.readCursor(it(oe.get()));
-        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();
+        const Q = r.readCursor(st(oe.get()));
+        if (Te(Q, null, (k, L) => {
+          Ce[k] = L.clone();
+        }), te.forEach((k) => {
+          k && Te(r.readCursor(k.get()), null, (L, S) => {
+            Ce[L] = S.clone();
           });
-        }), (function S(L, k, P, A, J, X) {
-          const ee = l(k);
-          if (ee && _(ee)) if (ee.p != null) {
+        }), (function k(L, S, P, A, J, X) {
+          const ee = l(S);
+          if (ee && m(ee)) if (ee.p != null) {
             const T = ee.p;
             Ce[T].getPath(), P = Ce[T], A = xe[T] = r.writeCursor();
           } else ee.r !== void 0 && (P = null);
@@ -1365,45 +1368,45 @@ function un() {
           if (fe) {
             let T;
             if ((T = fe.d) != null) {
-              const G = te[T];
-              G && (G.get(), A.mergeTree(G.get()), P = r.readCursor(G.get()));
+              const q = te[T];
+              q && (q.get(), A.mergeTree(q.get()), P = r.readCursor(q.get()));
             }
           }
           let de = 0, ae = 0;
-          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++;
+          const ve = r.advancer(S, void 0, (T, q) => {
+            m(q) && de--;
+          }), H = r.advancer(P, (T, q) => s(q) ? -(T - ae) - 1 : T - ae, (T, q) => {
+            s(q) && ae++;
           });
           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();
+            const q = ve(T), he = T + de, we = H(he), Be = he + ae;
+            A.descend(Be), k(L, q, we, A), A.ascend();
+          } else A.descend(T), k(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 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();
+          const k = xe.map((S) => S ? S.get() : null), L = r.readCursor(st(oe.get()));
+          if (Te(L, oe, (S, P, A) => {
+            const J = k[S];
+            J && (A.mergeTree(J), k[S] = null);
+          }), k.find((S) => S)) {
+            const S = r.writeCursor(), P = r.writeCursor();
             let A = 0, J = 0;
-            S.forEach((X) => {
+            k.forEach((X) => {
               X != null && Te(r.readCursor(X), null, (ee) => {
                 const fe = $e[ee];
-                k.writeMove(C[fe].getPath(), x[fe].getPath(), A++);
+                S.writeMove(C[fe].getPath(), x[fe].getPath(), A++);
                 const de = se[fe];
                 de && de.forEach((ae) => {
-                  g[ae] || D !== 1 && K[ae] != null || P.writeMove(N[ae].getPath(), p[ae].getPath(), J++);
+                  g[ae] || D !== 1 && F[ae] != null || P.writeMove(N[ae].getPath(), p[ae].getPath(), J++);
                 });
               });
             }), O = {
               type: u.ConflictType.BLACKHOLE,
-              op1: k.get(),
+              op1: S.get(),
               op2: P.get()
             };
           }
@@ -1421,17 +1424,17 @@ function un() {
       const d = new Error("Transform detected write conflict");
       throw d.conflict = i, d.type = d.name = "writeConflict", d;
     };
-    function jt(i, d, v) {
-      const D = st(i, d, v);
+    function Nt(i, d, v) {
+      const D = ot(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, (v, D) => {
-        (s(v) || me(v)) && D.write("r", !0);
+        (s(v) || _e(v)) && D.write("r", !0);
       }), d.get();
-    }, Nt = (i, d) => {
+    }, Rt = (i, d) => {
       const { type: v, op1: D, op2: O } = i;
       switch (v) {
         case u.ConflictType.DROP_COLLISION:
@@ -1450,21 +1453,21 @@ function un() {
     function yt(i, d, v, D) {
       let O = null;
       for (; ; ) {
-        const C = st(d, v, D);
+        const C = ot(d, v, D);
         if (C.ok) return ne(O, C.result);
         {
           const { conflict: x } = C;
           i(x) || gt(x);
-          const [N, p] = Nt(x, D);
-          d = ne($(d), N), v = ne($(v), p), O = ne(O, p);
+          const [N, p] = Rt(x, D);
+          d = ne(K(d), N), v = ne(K(v), p), O = ne(O, p);
         }
       }
     }
   })(Ze)), Ze;
 }
-var Tt;
-function cn() {
-  return Tt || (Tt = 1, (function(a) {
+var kt;
+function hn() {
+  return kt || (kt = 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() {
         return o[l];
@@ -1474,59 +1477,59 @@ function cn() {
     })), 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 }), t(un(), a);
-    var n = Ut();
+    Object.defineProperty(a, "__esModule", { value: !0 }), t(fn(), a);
+    var n = At();
     Object.defineProperty(a, "ReadCursor", { enumerable: !0, get: function() {
       return n.ReadCursor;
     } }), Object.defineProperty(a, "WriteCursor", { enumerable: !0, get: function() {
       return n.WriteCursor;
     } });
-    var r = At();
+    var r = Mt();
     Object.defineProperty(a, "ConflictType", { enumerable: !0, get: function() {
       return r.ConflictType;
     } });
   })(Ve)), Ve;
 }
-var V = cn();
-class dn {
+var V = hn();
+class pn {
   constructor() {
-    F(this, "drawingManagerData", {});
-    F(this, "_oldDrawingManagerData", {});
-    F(this, "_focusDrawings", []);
-    F(this, "_remove$", new be());
-    F(this, "remove$", this._remove$.asObservable());
-    F(this, "_add$", new be());
-    F(this, "add$", this._add$.asObservable());
-    F(this, "_update$", new be());
-    F(this, "update$", this._update$.asObservable());
-    F(this, "_order$", new be());
-    F(this, "order$", this._order$.asObservable());
-    F(this, "_group$", new be());
-    F(this, "group$", this._group$.asObservable());
-    F(this, "_ungroup$", new be());
-    F(this, "ungroup$", this._ungroup$.asObservable());
-    F(this, "_refreshTransform$", new be());
-    F(this, "refreshTransform$", this._refreshTransform$.asObservable());
-    F(this, "_visible$", new be());
-    F(this, "visible$", this._visible$.asObservable());
+    G(this, "drawingManagerData", {});
+    G(this, "_oldDrawingManagerData", {});
+    G(this, "_focusDrawings", []);
+    G(this, "_remove$", new be());
+    G(this, "remove$", this._remove$.asObservable());
+    G(this, "_add$", new be());
+    G(this, "add$", this._add$.asObservable());
+    G(this, "_update$", new be());
+    G(this, "update$", this._update$.asObservable());
+    G(this, "_order$", new be());
+    G(this, "order$", this._order$.asObservable());
+    G(this, "_group$", new be());
+    G(this, "group$", this._group$.asObservable());
+    G(this, "_ungroup$", new be());
+    G(this, "ungroup$", this._ungroup$.asObservable());
+    G(this, "_refreshTransform$", new be());
+    G(this, "refreshTransform$", this._refreshTransform$.asObservable());
+    G(this, "_visible$", new be());
+    G(this, "visible$", this._visible$.asObservable());
     // private readonly _externalUpdate$ = new Subject<T[]>();
     // readonly externalUpdate$ = this._externalUpdate$.asObservable();
-    F(this, "_focus$", new be());
-    F(this, "focus$", this._focus$.asObservable());
-    F(this, "_featurePluginUpdate$", new be());
-    F(this, "featurePluginUpdate$", this._featurePluginUpdate$.asObservable());
-    F(this, "_featurePluginAdd$", new be());
-    F(this, "featurePluginAdd$", this._featurePluginAdd$.asObservable());
-    F(this, "_featurePluginRemove$", new be());
-    F(this, "featurePluginRemove$", this._featurePluginRemove$.asObservable());
-    F(this, "_featurePluginOrderUpdate$", new be());
-    F(this, "featurePluginOrderUpdate$", this._featurePluginOrderUpdate$.asObservable());
-    F(this, "_featurePluginGroupUpdate$", new be());
-    F(this, "featurePluginGroupUpdate$", this._featurePluginGroupUpdate$.asObservable());
-    F(this, "_featurePluginUngroupUpdate$", new be());
-    F(this, "featurePluginUngroupUpdate$", this._featurePluginUngroupUpdate$.asObservable());
-    F(this, "_visible", !0);
-    F(this, "_editable", !0);
+    G(this, "_focus$", new be());
+    G(this, "focus$", this._focus$.asObservable());
+    G(this, "_featurePluginUpdate$", new be());
+    G(this, "featurePluginUpdate$", this._featurePluginUpdate$.asObservable());
+    G(this, "_featurePluginAdd$", new be());
+    G(this, "featurePluginAdd$", this._featurePluginAdd$.asObservable());
+    G(this, "_featurePluginRemove$", new be());
+    G(this, "featurePluginRemove$", this._featurePluginRemove$.asObservable());
+    G(this, "_featurePluginOrderUpdate$", new be());
+    G(this, "featurePluginOrderUpdate$", this._featurePluginOrderUpdate$.asObservable());
+    G(this, "_featurePluginGroupUpdate$", new be());
+    G(this, "featurePluginGroupUpdate$", this._featurePluginGroupUpdate$.asObservable());
+    G(this, "_featurePluginUngroupUpdate$", new be());
+    G(this, "featurePluginUngroupUpdate$", this._featurePluginUngroupUpdate$.asObservable());
+    G(this, "_visible", !0);
+    G(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 = {};
@@ -1580,8 +1583,8 @@ class dn {
   getBatchAddOp(e) {
     const t = [], n = [], r = [];
     e.forEach((B) => {
-      const { op: _, invertOp: s } = this._addByParam(B);
-      t.push({ unitId: B.unitId, subUnitId: B.subUnitId, drawingId: B.drawingId }), n.push(_), r.push(s);
+      const { op: m, invertOp: s } = this._addByParam(B);
+      t.push({ unitId: B.unitId, subUnitId: B.subUnitId, drawingId: B.drawingId }), n.push(m), r.push(s);
     });
     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 };
@@ -1589,8 +1592,8 @@ class dn {
   getBatchRemoveOp(e) {
     const t = [], n = [];
     e.forEach((E) => {
-      const { op: B, invertOp: _ } = this._removeByParam(E);
-      t.unshift(B), n.push(_);
+      const { op: B, invertOp: m } = this._removeByParam(E);
+      t.unshift(B), n.push(m);
     });
     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 };
@@ -1598,8 +1601,8 @@ class dn {
   getBatchUpdateOp(e) {
     const t = [], n = [], r = [];
     e.forEach((B) => {
-      const { op: _, invertOp: s } = this._updateByParam(B);
-      t.push({ unitId: B.unitId, subUnitId: B.subUnitId, drawingId: B.drawingId }), n.push(_), r.push(s);
+      const { op: m, invertOp: s } = this._updateByParam(B);
+      t.push({ unitId: B.unitId, subUnitId: B.subUnitId, drawingId: B.drawingId }), n.push(m), r.push(s);
     });
     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 };
@@ -1658,9 +1661,9 @@ class dn {
     );
     let E = Number.NEGATIVE_INFINITY;
     return n.forEach((B) => {
-      const { unitId: _, subUnitId: s, drawingId: c } = B, h = this._hasDrawingOrder({ unitId: _, subUnitId: s, drawingId: c });
+      const { unitId: m, subUnitId: s, drawingId: c } = B, h = this._hasDrawingOrder({ unitId: m, subUnitId: s, drawingId: c });
       E = Math.max(E, h), l.push(
-        ...this._getUpdateParamCompareOp(B, this.getDrawingByParam({ unitId: _, subUnitId: s, drawingId: c }))
+        ...this._getUpdateParamCompareOp(B, this.getDrawingByParam({ unitId: m, subUnitId: s, drawingId: c }))
       );
     }), E === Number.NEGATIVE_INFINITY && (E = this._getDrawingOrder(r, u).length), l.push(
       V.insertOp([r, u, "order", E], o)
@@ -1669,9 +1672,9 @@ class dn {
   _getUngroupDrawingOp(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;
+      const { unitId: B, subUnitId: m, drawingId: s } = E;
       l.push(
-        ...this._getUpdateParamCompareOp(E, this.getDrawingByParam({ unitId: B, subUnitId: _, drawingId: s }))
+        ...this._getUpdateParamCompareOp(E, this.getDrawingByParam({ unitId: B, subUnitId: m, drawingId: s }))
       );
     }), l.push(
       V.removeOp([r, u, "data", o], !0)
@@ -1762,8 +1765,8 @@ class dn {
   }
   getForwardDrawingsOp(e) {
     const { unitId: t, subUnitId: n, drawingIds: r } = e, u = [], o = this.getDrawingOrder(t, n), l = [...r];
-    r.forEach((_) => {
-      const s = this._hasDrawingOrder({ unitId: t, subUnitId: n, drawingId: _ });
+    r.forEach((m) => {
+      const s = this._hasDrawingOrder({ unitId: t, subUnitId: n, drawingId: m });
       if (s === -1 || s === o.length - 1)
         return;
       const c = V.moveOp([t, n, "order", s], [t, n, "order", s + 1]);
@@ -1774,8 +1777,8 @@ class dn {
   }
   getBackwardDrawingOp(e) {
     const { unitId: t, subUnitId: n, drawingIds: r } = e, u = [], o = this.getDrawingOrder(t, n), l = [...r];
-    r.forEach((_) => {
-      const s = this._hasDrawingOrder({ unitId: t, subUnitId: n, drawingId: _ });
+    r.forEach((m) => {
+      const s = this._hasDrawingOrder({ unitId: t, subUnitId: n, drawingId: m });
       if (s === -1 || s === 0)
         return;
       const c = V.moveOp([t, n, "order", s], [t, n, "order", s - 1]);
@@ -1809,7 +1812,7 @@ class dn {
     return n.map((u) => {
       const o = this._hasDrawingOrder({ unitId: e, subUnitId: t, drawingId: u });
       return { drawingId: u, zIndex: o };
-    }).sort(r === !1 ? Lt : Gt);
+    }).sort(r === !1 ? Gt : qt);
   }
   _hasDrawingOrder(e) {
     if (e == null)
@@ -1897,39 +1900,39 @@ class dn {
     this._editable = e;
   }
 }
-class fn extends dn {
+class gn extends pn {
 }
-class hn {
+class yn {
   constructor() {
-    F(this, "_waitCount", 0);
-    F(this, "_change$", new be());
-    F(this, "change$", this._change$);
-    F(this, "_imageSourceCache", /* @__PURE__ */ new Map());
+    G(this, "_waitCount", 0);
+    G(this, "_change$", new be());
+    G(this, "change$", this._change$);
+    G(this, "_imageSourceCache", /* @__PURE__ */ new Map());
   }
   setWaitCount(e) {
     this._waitCount = e, this._change$.next(e);
   }
   getImageSourceCache(e, t) {
-    if (t === at.BASE64) {
+    if (t === lt.BASE64) {
       const n = new Image();
       return n.src = e, n;
     }
     return this._imageSourceCache.get(e);
   }
   addImageSourceCache(e, t, n) {
-    t === at.BASE64 || n == null || this._imageSourceCache.set(e, n);
+    t === lt.BASE64 || n == null || this._imageSourceCache.set(e, n);
   }
   async getImage(e) {
     return Promise.resolve(e);
   }
   async saveImage(e) {
     return new Promise((t, n) => {
-      if (!tn.includes(e.type)) {
-        n(new Error(et.ERROR_IMAGE_TYPE)), this._decreaseWaiting();
+      if (!nn.includes(e.type)) {
+        n(new Error(tt.ERROR_IMAGE_TYPE)), this._decreaseWaiting();
         return;
       }
-      if (e.size > en) {
-        n(new Error(et.ERROR_EXCEED_SIZE)), this._decreaseWaiting();
+      if (e.size > tn) {
+        n(new Error(tt.ERROR_EXCEED_SIZE)), this._decreaseWaiting();
         return;
       }
       const r = new FileReader();
@@ -1937,16 +1940,16 @@ class hn {
         var E;
         const o = (E = u.target) == null ? void 0 : E.result;
         if (o == null) {
-          n(new Error(et.ERROR_IMAGE)), this._decreaseWaiting();
+          n(new Error(tt.ERROR_IMAGE)), this._decreaseWaiting();
           return;
         }
-        const l = qt(6);
+        const l = $t(6);
         t({
           imageId: l,
-          imageSourceType: at.BASE64,
+          imageSourceType: lt.BASE64,
           source: o,
           base64Cache: o,
-          status: et.SUCCUSS
+          status: tt.SUCCUSS
         }), this._decreaseWaiting();
       };
     });
@@ -1955,13 +1958,13 @@ class hn {
     this._waitCount -= 1, this._change$.next(this._waitCount);
   }
 }
-class pn extends $t {
+class mn extends Kt {
   constructor() {
     super(...arguments);
-    F(this, "_urlImageDownloader", null);
+    G(this, "_urlImageDownloader", null);
   }
   registerURLImageDownloader(t) {
-    return this._urlImageDownloader = t, Kt(() => {
+    return this._urlImageDownloader = t, Ft(() => {
       this._urlImageDownloader = null;
     });
   }
@@ -1985,49 +1988,47 @@ class pn extends $t {
     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--)
+var _n = Object.getOwnPropertyDescriptor, vn = (a, e, t, n) => {
+  for (var r = n > 1 ? void 0 : n ? _n(e, t) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (r = o(r) || r);
   return r;
-}, dt = (a, e) => (t, n) => e(t, n, a);
-const _n = "UNIVER_DRAWING_PLUGIN";
-var ft;
-let St = (ft = class extends Xt {
-  constructor(a = mt, e, t, n) {
+}, ft = (a, e) => (t, n) => e(t, n, a), Qe;
+let St = (Qe = class extends Jt {
+  constructor(a = vt, e, t, n) {
     super(), this._config = a, this._injector = e, this._configService = t, this._commandService = n;
-    const { ...r } = Jt(
+    const { ...r } = Yt(
       {},
-      mt,
+      vt,
       this._config
     );
-    this._configService.setConfig(rn, r);
+    this._configService.setConfig(an, r);
   }
   onStarting() {
     this._initCommands(), this._initDependencies();
   }
   _initDependencies() {
     var t;
-    Yt([
-      [Zt, { useClass: hn }],
-      [Qt, { useClass: pn }],
-      [kt, { useClass: fn }]
+    Zt([
+      [Qt, { useClass: yn }],
+      [en, { useClass: mn }],
+      [Ut, { useClass: gn }]
     ], (t = this._config) == null ? void 0 : t.override).forEach((n) => this._injector.add(n));
   }
   _initCommands() {
     [
-      nn
+      rn
     ].forEach((a) => this.disposeWithMe(this._commandService.registerCommand(a)));
   }
-}, F(ft, "pluginName", _n), ft);
-St = yn([
-  dt(1, Ft(Vt)),
-  dt(2, Ht),
-  dt(3, zt)
+}, G(Qe, "pluginName", "UNIVER_DRAWING_PLUGIN"), G(Qe, "packageName", _t.name), G(Qe, "version", _t.version), Qe);
+St = vn([
+  ft(1, Vt(Ht)),
+  ft(2, zt),
+  ft(3, Xt)
 ], St);
-function Cn({ unitId: a, subUnitId: e, drawingId: t }, n) {
+function Dn({ unitId: a, subUnitId: e, drawingId: t }, n) {
   return typeof n == "number" ? `${a}#-#${e}#-#${t}#-#${n}` : `${a}#-#${e}#-#${t}`;
 }
-const En = async (a) => new Promise((e, t) => {
+const Pn = async (a) => new Promise((e, t) => {
   const n = new Image();
   n.src = a, n.onload = () => {
     e({
@@ -2040,21 +2041,21 @@ const En = async (a) => new Promise((e, t) => {
   };
 });
 export {
-  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,
+  nn as DRAWING_IMAGE_ALLOW_IMAGE_LIST,
+  tn as DRAWING_IMAGE_ALLOW_SIZE,
+  En as DRAWING_IMAGE_COUNT_LIMIT,
+  Cn as DRAWING_IMAGE_HEIGHT_LIMIT,
+  In as DRAWING_IMAGE_WIDTH_LIMIT,
+  gn as DrawingManagerService,
+  Ut as IDrawingManagerService,
+  Sn as IImageIoService,
+  yn as ImageIoService,
+  Un as ImageSourceType,
+  An as ImageUploadStatusType,
+  rn as SetDrawingSelectedOperation,
+  mn as URLImageService,
+  pn as UnitDrawingService,
   St as UniverDrawingPlugin,
-  Cn as getDrawingShapeKeyByDrawingSearch,
-  En as getImageSize
+  Dn as getDrawingShapeKeyByDrawingSearch,
+  Pn as getImageSize
 };