@univerjs/drawing 0.5.3 → 0.5.4

package/lib/es/index.js

@@ -1,14 +1,14 @@
-var $t = Object.defineProperty;
-var Nt = (a, e, n) => e in a ? $t(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n;
-var F = (a, e, n) => Nt(a, typeof e != "symbol" ? e + "" : e, n);
-import { sortRules as Rt, sortRulesByDesc as xt, createIdentifier as Bt, ImageSourceType as at, ImageUploadStatusType as Qe, Tools as Wt, Inject as Gt, Injector as Lt, Plugin as qt, merge as Kt, mergeOverrideWithDependencies as Ft, IConfigService as Vt, IImageIoService as Ht } from "@univerjs/core";
-import { IImageIoService as bn, ImageSourceType as Cn, ImageUploadStatusType as In } from "@univerjs/core";
-import { Subject as be } from "rxjs";
-const gn = 500, yn = 500, _n = 10, zt = 5 * 1024 * 1024, Xt = ["image/png", "image/jpeg", "image/jpg", "image/gif", "image/bmp"];
-var Ye = {}, et = {}, tt = {}, _t;
-function Jt() {
-  if (_t) return tt;
-  _t = 1, Object.defineProperty(tt, "__esModule", { value: !0 });
+var Nt = Object.defineProperty;
+var Rt = (a, e, n) => e in a ? Nt(a, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : a[e] = n;
+var F = (a, e, n) => Rt(a, typeof e != "symbol" ? e + "" : e, n);
+import { sortRules as xt, sortRulesByDesc as Bt, createIdentifier as Wt, CommandType as Gt, ImageSourceType as at, ImageUploadStatusType as Qe, Tools as Lt, Inject as qt, Injector as Kt, Plugin as Ft, merge as Vt, mergeOverrideWithDependencies as Ht, IConfigService as zt, ICommandService as Xt, IImageIoService as Jt } from "@univerjs/core";
+import { IImageIoService as En, ImageSourceType as Dn, ImageUploadStatusType as Pn } from "@univerjs/core";
+import { Subject as ve } from "rxjs";
+const mn = 500, On = 500, wn = 10, Yt = 5 * 1024 * 1024, Zt = ["image/png", "image/jpeg", "image/jpg", "image/gif", "image/bmp"];
+var Ye = {}, et = {}, tt = {}, mt;
+function Qt() {
+  if (mt) return tt;
+  mt = 1, Object.defineProperty(tt, "__esModule", { value: !0 });
   function a(t, r) {
     if (Array.isArray(r))
       return !1;
@@ -33,10 +33,10 @@ function Jt() {
   }
   return tt.default = n, tt;
 }
-var nt = {}, vt;
-function Yt() {
-  if (vt) return nt;
-  vt = 1, Object.defineProperty(nt, "__esModule", { value: !0 });
+var nt = {}, Ot;
+function en() {
+  if (Ot) return nt;
+  Ot = 1, Object.defineProperty(nt, "__esModule", { value: !0 });
   function a(e) {
     if (e === null)
       return null;
@@ -52,9 +52,9 @@ function Yt() {
   }
   return nt.default = a, nt;
 }
-var lt = {}, mt;
+var lt = {}, wt;
 function Mt() {
-  return mt || (mt = 1, function(a) {
+  return wt || (wt = 1, function(a) {
     Object.defineProperty(a, "__esModule", { value: !0 }), a.eachChildOf = a.advancer = a.readCursor = a.writeCursor = a.WriteCursor = a.ReadCursor = a.isValidPathItem = void 0;
     function e(_, s) {
       if (!_)
@@ -65,8 +65,8 @@ function Mt() {
       typeof _ == typeof s ? _ > s : typeof _ == "string" && typeof s == "number"
     );
     function r(_, s) {
-      for (let c in _) {
-        const h = c;
+      for (let d in _) {
+        const h = d;
         s.write(h, _[h]);
       }
     }
@@ -80,9 +80,9 @@ function Mt() {
       }
       getPath() {
         const s = [];
-        let c = this.container, h = this.parents.length - 1, S = this.idx;
-        for (; S >= 0; )
-          s.unshift(c[S]), S === 0 ? (S = this.indexes[h * 2], c = this.parents[h--]) : S -= n(c[S - 1]) ? 2 : 1;
+        let d = this.container, h = this.parents.length - 1, k = this.idx;
+        for (; k >= 0; )
+          s.unshift(d[k]), k === 0 ? (k = this.indexes[h * 2], d = this.parents[h--]) : k -= n(d[k - 1]) ? 2 : 1;
         return s;
       }
     }
@@ -103,17 +103,17 @@ function Mt() {
         if (!this.container || s >= this.container.length || n(this.container[s]) && s + 1 >= this.container.length)
           return !1;
         n(this.container[s]) && s++;
-        const c = this.container[s];
-        return Array.isArray(c) ? (this.indexes.push(this.idx), this.parents.push(this.container), this.indexes.push(s), this.idx = 0, this.container = c) : this.idx = s, !0;
+        const d = this.container[s];
+        return Array.isArray(d) ? (this.indexes.push(this.idx), this.parents.push(this.container), this.indexes.push(s), this.idx = 0, this.container = d) : this.idx = s, !0;
       }
       nextSibling() {
         if (e(this.parents.length === this.indexes.length / 2), this.idx > 0 || this.parents.length === 0)
           return !1;
-        const s = this.indexes[this.indexes.length - 1] + 1, c = this.parents[this.parents.length - 1];
-        return s >= c.length ? !1 : (e(!isNaN(s)), this.indexes[this.indexes.length - 1] = s, this.container = c[s], !0);
+        const s = this.indexes[this.indexes.length - 1] + 1, d = this.parents[this.parents.length - 1];
+        return s >= d.length ? !1 : (e(!isNaN(s)), this.indexes[this.indexes.length - 1] = s, this.container = d[s], !0);
       }
-      _init(s, c, h, S) {
-        this.container = s, this.idx = c, this.parents = h.slice(), this.indexes = S.slice();
+      _init(s, d, h, k) {
+        this.container = s, this.idx = d, this.parents = h.slice(), this.indexes = k.slice();
       }
       clone() {
         const s = new o();
@@ -130,20 +130,20 @@ function Mt() {
       // TODO(cleanup): Consider moving these functions out of cursor, since
       // they're really just helper methods.
       // It'd be really nice to do this using generators.
-      traverse(s, c) {
+      traverse(s, d) {
         const h = this.getComponent();
-        h && c(h, s);
-        for (const S of this)
-          s && s.descend(S), this.traverse(s, c), s && s.ascend();
+        h && d(h, s);
+        for (const k of this)
+          s && s.descend(k), this.traverse(s, d), s && s.ascend();
       }
-      eachPick(s, c) {
-        this.traverse(s, (h, S) => {
-          h.p != null && c(h.p, S);
+      eachPick(s, d) {
+        this.traverse(s, (h, k) => {
+          h.p != null && d(h.p, k);
         });
       }
-      eachDrop(s, c) {
-        this.traverse(s, (h, S) => {
-          h.d != null && c(h.d, S);
+      eachDrop(s, d) {
+        this.traverse(s, (h, k) => {
+          h.d != null && d(h.d, k);
         });
       }
     }
@@ -155,24 +155,24 @@ function Mt() {
       flushDescent() {
         e(this.parents.length === this.indexes.length / 2), this.container === null && (this._op = this.container = []);
         for (let s = 0; s < this.pendingDescent.length; s++) {
-          const c = this.pendingDescent[s];
+          const d = this.pendingDescent[s];
           let h = this.idx + 1;
           if (h < this.container.length && n(this.container[h]) && h++, e(h === this.container.length || !n(this.container[h])), h === this.container.length)
-            this.container.push(c), this.idx = h;
-          else if (this.container[h] === c)
+            this.container.push(d), this.idx = h;
+          else if (this.container[h] === d)
             this.idx = h;
           else {
             if (!Array.isArray(this.container[h])) {
-              const S = this.container.splice(h, this.container.length - h);
-              this.container.push(S), this.lcIdx > -1 && (this.lcIdx = h);
+              const k = this.container.splice(h, this.container.length - h);
+              this.container.push(k), this.lcIdx > -1 && (this.lcIdx = h);
             }
-            for (this.indexes.push(this.idx), this.parents.push(this.container), this.lcIdx !== -1 && (e(t(c, this.container[this.lcIdx][0])), h = this.lcIdx + 1, this.lcIdx = -1); h < this.container.length && t(c, this.container[h][0]); )
+            for (this.indexes.push(this.idx), this.parents.push(this.container), this.lcIdx !== -1 && (e(t(d, this.container[this.lcIdx][0])), h = this.lcIdx + 1, this.lcIdx = -1); h < this.container.length && t(d, this.container[h][0]); )
               h++;
-            if (this.indexes.push(h), this.idx = 0, h < this.container.length && this.container[h][0] === c)
+            if (this.indexes.push(h), this.idx = 0, h < this.container.length && this.container[h][0] === d)
               this.container = this.container[h];
             else {
-              const S = [c];
-              this.container.splice(h, 0, S), this.container = S;
+              const k = [d];
+              this.container.splice(h, 0, k), this.container = k;
             }
           }
         }
@@ -190,13 +190,13 @@ function Mt() {
         if (s < this.container.length && n(this.container[s]))
           return this.container[s];
         {
-          const c = {};
-          return this.container.splice(s, 0, c), c;
+          const d = {};
+          return this.container.splice(s, 0, d), d;
         }
       }
-      write(s, c) {
+      write(s, d) {
         const h = this.getComponent();
-        e(h[s] == null || h[s] === c, "Internal consistency error: Overwritten component. File a bug"), h[s] = c;
+        e(h[s] == null || h[s] === d, "Internal consistency error: Overwritten component. File a bug"), h[s] = d;
       }
       get() {
         return this._op;
@@ -212,34 +212,34 @@ function Mt() {
       ascend() {
         this.pendingDescent.length ? this.pendingDescent.pop() : super.ascend();
       }
-      mergeTree(s, c = r) {
+      mergeTree(s, d = r) {
         if (s === null)
           return;
         if (e(Array.isArray(s)), s === this._op)
           throw Error("Cannot merge into my own tree");
-        const h = this.lcIdx, S = this.parents.length;
+        const h = this.lcIdx, k = this.parents.length;
         let Y = 0;
         for (let pe = 0; pe < s.length; pe++) {
           const Z = s[pe];
-          typeof Z == "string" || typeof Z == "number" ? (Y++, this.descend(Z)) : Array.isArray(Z) ? this.mergeTree(Z, c) : typeof Z == "object" && c(Z, this);
+          typeof Z == "string" || typeof Z == "number" ? (Y++, this.descend(Z)) : Array.isArray(Z) ? this.mergeTree(Z, d) : typeof Z == "object" && d(Z, this);
         }
         for (; Y--; )
           this.ascend();
-        this.lcIdx = this.parents.length === S ? h : -1;
+        this.lcIdx = this.parents.length === k ? h : -1;
       }
-      at(s, c) {
-        this.descendPath(s), c(this);
+      at(s, d) {
+        this.descendPath(s), d(this);
         for (let h = 0; h < s.length; h++)
           this.ascend();
         return this;
       }
       // This is used by helpers, so the strict ordering guarantees are
       // relaxed.
-      writeAtPath(s, c, h) {
-        return this.at(s, () => this.write(c, h)), this.reset(), this;
+      writeAtPath(s, d, h) {
+        return this.at(s, () => this.write(d, h)), this.reset(), this;
       }
-      writeMove(s, c, h = 0) {
-        return this.writeAtPath(s, "p", h).writeAtPath(c, "d", h);
+      writeMove(s, d, h = 0) {
+        return this.writeAtPath(s, "p", h).writeAtPath(d, "d", h);
       }
       getPath() {
         const s = super.getPath();
@@ -247,12 +247,12 @@ function Mt() {
       }
     }
     a.WriteCursor = l, a.writeCursor = () => new l(), a.readCursor = (_) => new o(_);
-    function E(_, s, c) {
-      let h, S;
-      S = h = _ ? _.descendFirst() : !1;
+    function E(_, s, d) {
+      let h, k;
+      k = h = _ ? _.descendFirst() : !1;
       function Y(pe) {
         let Z;
-        for (; S; ) {
+        for (; k; ) {
           const Ce = Z = _.getKey();
           if (pe != null) {
             let Ge = !1;
@@ -261,7 +261,7 @@ function Mt() {
             if (Z === pe && !Ge)
               return _;
           }
-          c && typeof Z == "number" && c(Z, _.getComponent()), S = _.nextSibling();
+          d && typeof Z == "number" && d(Z, _.getComponent()), k = _.nextSibling();
         }
         return null;
       }
@@ -270,28 +270,28 @@ function Mt() {
       }, Y;
     }
     a.advancer = E;
-    function x(_, s, c) {
-      let h, S, Y, pe;
-      for (h = S = _ && _.descendFirst(), Y = pe = s && s.descendFirst(); h || Y; ) {
+    function x(_, s, d) {
+      let h, k, Y, pe;
+      for (h = k = _ && _.descendFirst(), Y = pe = s && s.descendFirst(); h || Y; ) {
         let Z = h ? _.getKey() : null, Ce = Y ? s.getKey() : null;
-        Z !== null && Ce !== null && (t(Ce, Z) ? Ce = null : Z !== Ce && (Z = null)), c(Z == null ? Ce : Z, Z != null ? _ : null, Ce != null ? s : null), Z != null && h && (h = _.nextSibling()), Ce != null && Y && (Y = s.nextSibling());
+        Z !== null && Ce !== null && (t(Ce, Z) ? Ce = null : Z !== Ce && (Z = null)), d(Z == null ? Ce : Z, Z != null ? _ : null, Ce != null ? s : null), Z != null && h && (h = _.nextSibling()), Ce != null && Y && (Y = s.nextSibling());
       }
-      S && _.ascend(), pe && s.ascend();
+      k && _.ascend(), pe && s.ascend();
     }
     a.eachChildOf = x;
   }(lt)), lt;
 }
-var ut = {}, Ot;
-function Ut() {
-  return Ot || (Ot = 1, function(a) {
+var ut = {}, bt;
+function St() {
+  return bt || (bt = 1, function(a) {
     Object.defineProperty(a, "__esModule", { value: !0 }), a.ConflictType = void 0, function(e) {
       e[e.RM_UNEXPECTED_CONTENT = 1] = "RM_UNEXPECTED_CONTENT", e[e.DROP_COLLISION = 2] = "DROP_COLLISION", e[e.BLACKHOLE = 3] = "BLACKHOLE";
     }(a.ConflictType || (a.ConflictType = {}));
   }(ut)), ut;
 }
-var Fe = {}, Ve = {}, wt;
-function ht() {
-  return wt || (wt = 1, Object.defineProperty(Ve, "__esModule", { value: !0 }), Ve.uniToStrPos = Ve.strPosToUni = void 0, Ve.strPosToUni = (a, e = a.length) => {
+var Fe = {}, Ve = {}, vt;
+function pt() {
+  return vt || (vt = 1, Object.defineProperty(Ve, "__esModule", { value: !0 }), Ve.uniToStrPos = Ve.strPosToUni = void 0, Ve.strPosToUni = (a, e = a.length) => {
     let n = 0, t = 0;
     for (; t < e; t++) {
       const r = a.charCodeAt(t);
@@ -309,16 +309,16 @@ function ht() {
     return n;
   }), Ve;
 }
-var ct = {}, bt;
-function ft() {
-  return bt || (bt = 1, function(a) {
+var dt = {}, Ct;
+function ht() {
+  return Ct || (Ct = 1, function(a) {
     Object.defineProperty(a, "__esModule", { value: !0 }), a.uniSlice = a.dlen = a.eachOp = void 0;
-    const e = ht(), n = (f) => {
+    const e = pt(), n = (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 L = f[b];
+      for (let v = 0; v < f.length; v++) {
+        const L = f[v];
         switch (typeof L) {
           case "object":
             if (typeof L.d != "number" && typeof L.d != "string")
@@ -343,28 +343,28 @@ function ft() {
         throw Error("Op has a trailing skip");
     };
     function t(f, y) {
-      let b = 0, L = 0;
+      let v = 0, L = 0;
       for (let z = 0; z < f.length; z++) {
         const q = f[z];
-        switch (y(q, b, L), typeof q) {
+        switch (y(q, v, L), typeof q) {
           case "object":
-            b += a.dlen(q.d);
+            v += a.dlen(q.d);
             break;
           case "string":
             L += e.strPosToUni(q);
             break;
           case "number":
-            b += q, L += q;
+            v += q, L += q;
             break;
         }
       }
     }
     a.eachOp = t;
     function r(f, y) {
-      const b = [], L = l(b);
+      const v = [], L = l(v);
       return t(f, (z, q, Ee) => {
         L(y(z, q, Ee));
-      }), s(b);
+      }), s(v);
     }
     const u = (f) => f, o = (f) => r(f, u);
     a.dlen = (f) => typeof f == "number" ? f : e.strPosToUni(f);
@@ -373,46 +373,46 @@ function ft() {
         f.push(y);
       else if (typeof y == typeof f[f.length - 1])
         if (typeof y == "object") {
-          const b = f[f.length - 1];
-          b.d = typeof b.d == "string" && typeof y.d == "string" ? b.d + y.d : a.dlen(b.d) + a.dlen(y.d);
+          const v = f[f.length - 1];
+          v.d = typeof v.d == "string" && typeof y.d == "string" ? v.d + y.d : a.dlen(v.d) + a.dlen(y.d);
         } else
           f[f.length - 1] += y;
       else
         f.push(y);
     }, E = (f) => typeof f == "number" ? f : typeof f == "string" ? e.strPosToUni(f) : typeof f.d == "number" ? f.d : e.strPosToUni(f.d);
-    a.uniSlice = (f, y, b) => {
-      const L = e.uniToStrPos(f, y), z = b == null ? 1 / 0 : e.uniToStrPos(f, b);
+    a.uniSlice = (f, y, v) => {
+      const L = e.uniToStrPos(f, y), z = v == null ? 1 / 0 : e.uniToStrPos(f, v);
       return f.slice(L, z);
     };
-    const x = (f, y, b) => typeof f == "number" ? b == null ? f - y : Math.min(f, b) - y : a.uniSlice(f, y, b), _ = (f) => {
-      let y = 0, b = 0;
+    const x = (f, y, v) => typeof f == "number" ? v == null ? f - y : Math.min(f, v) - y : a.uniSlice(f, y, v), _ = (f) => {
+      let y = 0, v = 0;
       return { take: (q, Ee) => {
         if (y === f.length)
           return q === -1 ? null : q;
-        const ce = f[y];
+        const de = f[y];
         let ne;
-        if (typeof ce == "number")
-          return q === -1 || ce - b <= q ? (ne = ce - b, ++y, b = 0, ne) : (b += q, q);
-        if (typeof ce == "string") {
-          if (q === -1 || Ee === "i" || e.strPosToUni(ce.slice(b)) <= q)
-            return ne = ce.slice(b), ++y, b = 0, ne;
+        if (typeof de == "number")
+          return q === -1 || de - v <= q ? (ne = de - v, ++y, v = 0, ne) : (v += q, q);
+        if (typeof de == "string") {
+          if (q === -1 || Ee === "i" || e.strPosToUni(de.slice(v)) <= q)
+            return ne = de.slice(v), ++y, v = 0, ne;
           {
-            const le = b + e.uniToStrPos(ce.slice(b), q);
-            return ne = ce.slice(b, le), b = le, ne;
+            const le = v + e.uniToStrPos(de.slice(v), q);
+            return ne = de.slice(v, le), v = le, ne;
           }
         } else {
-          if (q === -1 || Ee === "d" || a.dlen(ce.d) - b <= q)
-            return ne = { d: x(ce.d, b) }, ++y, b = 0, ne;
+          if (q === -1 || Ee === "d" || a.dlen(de.d) - v <= q)
+            return ne = { d: x(de.d, v) }, ++y, v = 0, ne;
           {
-            let le = x(ce.d, b, b + q);
-            return b += q, { d: le };
+            let le = x(de.d, v, v + q);
+            return v += q, { d: le };
           }
         }
       }, peek: () => f[y] };
     }, s = (f) => (f.length > 0 && typeof f[f.length - 1] == "number" && f.pop(), f);
-    function c(f, y, b) {
-      if (b !== "left" && b !== "right")
-        throw Error("side (" + b + ") must be 'left' or 'right'");
+    function d(f, y, v) {
+      if (v !== "left" && v !== "right")
+        throw Error("side (" + v + ") must be 'left' or 'right'");
       n(f), n(y);
       const L = [], z = l(L), { take: q, peek: Ee } = _(f);
       for (let ne = 0; ne < y.length; ne++) {
@@ -424,7 +424,7 @@ function ft() {
               De = q(ge, "i"), z(De), typeof De != "string" && (ge -= E(De));
             break;
           case "string":
-            b === "left" && typeof Ee() == "string" && z(q(-1)), z(e.strPosToUni(le));
+            v === "left" && typeof Ee() == "string" && z(q(-1)), z(e.strPosToUni(le));
             break;
           case "object":
             for (ge = a.dlen(le.d); ge > 0; )
@@ -441,32 +441,32 @@ function ft() {
             break;
         }
       }
-      let ce;
-      for (; ce = q(-1); )
-        z(ce);
+      let de;
+      for (; de = q(-1); )
+        z(de);
       return s(L);
     }
     function h(f, y) {
       n(f), n(y);
-      const b = [], L = l(b), { take: z } = _(f);
+      const v = [], L = l(v), { take: z } = _(f);
       for (let Ee = 0; Ee < y.length; Ee++) {
-        const ce = y[Ee];
+        const de = y[Ee];
         let ne, le;
-        switch (typeof ce) {
+        switch (typeof de) {
           case "number":
-            for (ne = ce; ne > 0; )
+            for (ne = de; ne > 0; )
               le = z(ne, "d"), L(le), typeof le != "object" && (ne -= E(le));
             break;
           case "string":
-            L(ce);
+            L(de);
             break;
           case "object":
-            ne = a.dlen(ce.d);
+            ne = a.dlen(de.d);
             let ge = 0;
             for (; ge < ne; )
               switch (le = z(ne - ge, "d"), typeof le) {
                 case "number":
-                  L({ d: x(ce.d, ge, ge + le) }), ge += le;
+                  L({ d: x(de.d, ge, ge + le) }), ge += le;
                   break;
                 case "string":
                   ge += e.strPosToUni(le);
@@ -480,30 +480,30 @@ function ft() {
       let q;
       for (; q = z(-1); )
         L(q);
-      return s(b);
+      return s(v);
     }
-    const S = (f, y) => {
-      let b = 0;
-      for (let L = 0; L < y.length && f > b; L++) {
+    const k = (f, y) => {
+      let v = 0;
+      for (let L = 0; L < y.length && f > v; L++) {
         const z = y[L];
         switch (typeof z) {
           case "number": {
-            b += z;
+            v += z;
             break;
           }
           case "string":
             const q = e.strPosToUni(z);
-            b += q, f += q;
+            v += q, f += q;
             break;
           case "object":
-            f -= Math.min(a.dlen(z.d), f - b);
+            f -= Math.min(a.dlen(z.d), f - v);
             break;
         }
       }
       return f;
-    }, Y = (f, y) => typeof f == "number" ? S(f, y) : f.map((b) => S(b, y));
-    function pe(f, y, b) {
-      return r(f, (L, z) => typeof L == "object" && typeof L.d == "number" ? { d: b.slice(y, z, z + L.d) } : L);
+    }, Y = (f, y) => typeof f == "number" ? k(f, y) : f.map((v) => k(v, y));
+    function pe(f, y, v) {
+      return r(f, (L, z) => typeof L == "object" && typeof L.d == "number" ? { d: v.slice(y, z, z + L.d) } : L);
     }
     function Z(f) {
       return r(f, (y) => {
@@ -526,11 +526,11 @@ function ft() {
     }
     function Ge(f) {
       let y = !0;
-      return t(f, (b) => {
-        typeof b == "object" && typeof b.d == "number" && (y = !1);
+      return t(f, (v) => {
+        typeof v == "object" && typeof v.d == "number" && (y = !1);
       }), y;
     }
-    function ve(f) {
+    function me(f) {
       return {
         name: "text-unicode",
         uri: "http://sharejs.org/types/text-unicode",
@@ -549,11 +549,11 @@ function ft() {
         },
         /** Apply an operation to a document snapshot
          */
-        apply(y, b) {
-          n(b);
+        apply(y, v) {
+          n(v);
           const L = f.builder(y);
-          for (let z = 0; z < b.length; z++) {
-            const q = b[z];
+          for (let z = 0; z < v.length; z++) {
+            const q = v[z];
             switch (typeof q) {
               case "number":
                 L.skip(q);
@@ -568,30 +568,30 @@ function ft() {
           }
           return L.build();
         },
-        transform: c,
+        transform: d,
         compose: h,
-        transformPosition: S,
+        transformPosition: k,
         transformSelection: Y,
         isInvertible: Ge,
-        makeInvertible(y, b) {
-          return pe(y, b, f);
+        makeInvertible(y, v) {
+          return pe(y, v, f);
         },
         stripInvertible: Ce,
         invert: Z,
-        invertWithDoc(y, b) {
-          return Z(pe(y, b, f));
+        invertWithDoc(y, v) {
+          return Z(pe(y, v, f));
         },
         isNoop: (y) => y.length === 0
       };
     }
-    a.default = ve;
-  }(ct)), ct;
+    a.default = me;
+  }(dt)), dt;
 }
-var rt = {}, Ct;
-function Zt() {
-  if (Ct) return rt;
-  Ct = 1, Object.defineProperty(rt, "__esModule", { value: !0 });
-  const a = ft(), e = ht();
+var rt = {}, It;
+function tn() {
+  if (It) return rt;
+  It = 1, Object.defineProperty(rt, "__esModule", { value: !0 });
+  const a = ht(), e = pt();
   function n(t, r) {
     return {
       // Returns the text content of the document
@@ -631,69 +631,69 @@ function Zt() {
   }
   return rt.default = n, n.provides = { text: !0 }, rt;
 }
-var It;
-function Qt() {
-  return It || (It = 1, function(a) {
-    var e = Fe.__createBinding || (Object.create ? function(c, h, S, Y) {
-      Y === void 0 && (Y = S), Object.defineProperty(c, Y, { enumerable: !0, get: function() {
-        return h[S];
+var Et;
+function nn() {
+  return Et || (Et = 1, function(a) {
+    var e = Fe.__createBinding || (Object.create ? function(d, h, k, Y) {
+      Y === void 0 && (Y = k), Object.defineProperty(d, Y, { enumerable: !0, get: function() {
+        return h[k];
       } });
-    } : function(c, h, S, Y) {
-      Y === void 0 && (Y = S), c[Y] = h[S];
-    }), n = Fe.__setModuleDefault || (Object.create ? function(c, h) {
-      Object.defineProperty(c, "default", { enumerable: !0, value: h });
-    } : function(c, h) {
-      c.default = h;
-    }), t = Fe.__importStar || function(c) {
-      if (c && c.__esModule) return c;
+    } : function(d, h, k, Y) {
+      Y === void 0 && (Y = k), d[Y] = h[k];
+    }), n = Fe.__setModuleDefault || (Object.create ? function(d, h) {
+      Object.defineProperty(d, "default", { enumerable: !0, value: h });
+    } : function(d, h) {
+      d.default = h;
+    }), t = Fe.__importStar || function(d) {
+      if (d && d.__esModule) return d;
       var h = {};
-      if (c != null) for (var S in c) Object.hasOwnProperty.call(c, S) && e(h, c, S);
-      return n(h, c), h;
-    }, r = Fe.__importDefault || function(c) {
-      return c && c.__esModule ? c : { default: c };
+      if (d != null) for (var k in d) Object.hasOwnProperty.call(d, k) && e(h, d, k);
+      return n(h, d), h;
+    }, r = Fe.__importDefault || function(d) {
+      return d && d.__esModule ? d : { default: d };
     };
     Object.defineProperty(a, "__esModule", { value: !0 }), a.type = a.remove = a.insert = void 0;
-    const u = ht(), o = t(ft()), l = r(Zt()), E = {
-      create(c) {
-        return c;
+    const u = pt(), o = t(ht()), l = r(tn()), E = {
+      create(d) {
+        return d;
       },
-      toString(c) {
-        return c;
+      toString(d) {
+        return d;
       },
-      builder(c) {
-        if (typeof c != "string")
-          throw Error("Invalid document snapshot: " + c);
+      builder(d) {
+        if (typeof d != "string")
+          throw Error("Invalid document snapshot: " + d);
         const h = [];
         return {
-          skip(S) {
-            let Y = u.uniToStrPos(c, S);
-            if (Y > c.length)
+          skip(k) {
+            let Y = u.uniToStrPos(d, k);
+            if (Y > d.length)
               throw Error("The op is too long for this document");
-            h.push(c.slice(0, Y)), c = c.slice(Y);
+            h.push(d.slice(0, Y)), d = d.slice(Y);
           },
-          append(S) {
-            h.push(S);
+          append(k) {
+            h.push(k);
           },
-          del(S) {
-            c = c.slice(u.uniToStrPos(c, S));
+          del(k) {
+            d = d.slice(u.uniToStrPos(d, k));
           },
           build() {
-            return h.join("") + c;
+            return h.join("") + d;
           }
         };
       },
       slice: o.uniSlice
     }, x = o.default(E), _ = Object.assign(Object.assign({}, x), { api: l.default });
-    a.type = _, a.insert = (c, h) => h.length === 0 ? [] : c === 0 ? [h] : [c, h], a.remove = (c, h) => o.dlen(h) === 0 ? [] : c === 0 ? [{ d: h }] : [c, { d: h }];
-    var s = ft();
+    a.type = _, a.insert = (d, h) => h.length === 0 ? [] : d === 0 ? [h] : [d, h], a.remove = (d, h) => o.dlen(h) === 0 ? [] : d === 0 ? [{ d: h }] : [d, { d: h }];
+    var s = ht();
     Object.defineProperty(a, "makeType", { enumerable: !0, get: function() {
       return s.default;
     } });
   }(Fe)), Fe;
 }
-var Et;
-function en() {
-  return Et || (Et = 1, function(a) {
+var Dt;
+function rn() {
+  return Dt || (Dt = 1, function(a) {
     var e = et.__importDefault || function(i) {
       return i && i.__esModule ? i : {
         default: i
@@ -702,9 +702,9 @@ function en() {
     Object.defineProperty(a, "__esModule", {
       value: !0
     }), a.editOp = a.replaceOp = a.insertOp = a.moveOp = a.removeOp = a.type = void 0;
-    const n = e(Jt()), t = e(Yt()), r = Mt(), u = Ut();
-    function o(i, d) {
-      if (!i) throw new Error(d);
+    const n = e(Qt()), t = e(en()), r = Mt(), u = St();
+    function o(i, c) {
+      if (!i) throw new Error(c);
     }
     a.type = {
       name: "json1",
@@ -719,19 +719,19 @@ function en() {
       checkValidOp: z,
       normalize: q,
       apply: Ee,
-      transformPosition: ce,
+      transformPosition: de,
       compose: ne,
       tryTransform: st,
-      transform: St,
+      transform: jt,
       makeInvertible: De,
       invert: le,
       invertWithDoc: kt,
       RM_UNEXPECTED_CONTENT: u.ConflictType.RM_UNEXPECTED_CONTENT,
       DROP_COLLISION: u.ConflictType.DROP_COLLISION,
       BLACKHOLE: u.ConflictType.BLACKHOLE,
-      transformNoConflict: (i, d, m) => gt(() => !0, i, d, m),
+      transformNoConflict: (i, c, O) => yt(() => !0, i, c, O),
       typeAllowingConflictsPred: (i) => Object.assign(Object.assign({}, a.type), {
-        transform: (d, m, D) => gt(i, d, m, D)
+        transform: (c, O, D) => yt(i, c, O, D)
       })
     };
     const l = (i) => i ? i.getComponent() : null;
@@ -739,27 +739,27 @@ function en() {
       return i && typeof i == "object" && !Array.isArray(i);
     }
     const x = (i) => Array.isArray(i) ? i.slice() : i !== null && typeof i == "object" ? Object.assign({}, i) : i, _ = (i) => i && (i.p != null || i.r !== void 0), s = (i) => i && (i.d != null || i.i !== void 0);
-    function c(i, d) {
-      return o(i != null), typeof d == "number" ? (o(Array.isArray(i), "Invalid key - child is not an array"), (i = i.slice()).splice(d, 1)) : (o(E(i), "Invalid key - child is not an object"), delete (i = Object.assign({}, i))[d]), i;
+    function d(i, c) {
+      return o(i != null), typeof c == "number" ? (o(Array.isArray(i), "Invalid key - child is not an array"), (i = i.slice()).splice(c, 1)) : (o(E(i), "Invalid key - child is not an object"), delete (i = Object.assign({}, i))[c]), i;
     }
-    function h(i, d, m) {
-      return typeof d == "number" ? (o(i != null, "Container is missing for key"), o(Array.isArray(i), "Cannot use numerical key for object container"), o(i.length >= d, "Cannot insert into out of bounds index"), i.splice(d, 0, m)) : (o(E(i), "Cannot insert into missing item"), o(i[d] === void 0, "Trying to overwrite value at key. Your op needs to remove it first"), i[d] = m), m;
+    function h(i, c, O) {
+      return typeof c == "number" ? (o(i != null, "Container is missing for key"), o(Array.isArray(i), "Cannot use numerical key for object container"), o(i.length >= c, "Cannot insert into out of bounds index"), i.splice(c, 0, O)) : (o(E(i), "Cannot insert into missing item"), o(i[c] === void 0, "Trying to overwrite value at key. Your op needs to remove it first"), i[c] = O), O;
     }
-    a.removeOp = (i, d = !0) => r.writeCursor().writeAtPath(i, "r", d).get(), a.moveOp = (i, d) => r.writeCursor().writeMove(i, d).get(), a.insertOp = (i, d) => r.writeCursor().writeAtPath(i, "i", d).get(), a.replaceOp = (i, d, m) => r.writeCursor().at(i, (D) => {
-      D.write("r", d), D.write("i", m);
-    }).get(), a.editOp = (i, d, m, D = !1) => r.writeCursor().at(i, (O) => y(O, d, m, D)).get();
-    const S = (i, d) => i != null && (typeof d == "number" ? Array.isArray(i) : typeof i == "object"), Y = (i, d) => S(i, d) ? i[d] : void 0, pe = {};
+    a.removeOp = (i, c = !0) => r.writeCursor().writeAtPath(i, "r", c).get(), a.moveOp = (i, c) => r.writeCursor().writeMove(i, c).get(), a.insertOp = (i, c) => r.writeCursor().writeAtPath(i, "i", c).get(), a.replaceOp = (i, c, O) => r.writeCursor().at(i, (D) => {
+      D.write("r", c), D.write("i", O);
+    }).get(), a.editOp = (i, c, O, D = !1) => r.writeCursor().at(i, (w) => y(w, c, O, D)).get();
+    const k = (i, c) => i != null && (typeof c == "number" ? Array.isArray(i) : typeof i == "object"), Y = (i, c) => k(i, c) ? i[c] : void 0, pe = {};
     function Z(i) {
-      let d = i.type ? i.type : i;
-      d.name && (pe[d.name] = d), d.uri && (pe[d.uri] = d);
+      let c = i.type ? i.type : i;
+      c.name && (pe[c.name] = c), c.uri && (pe[c.uri] = c);
     }
     const Ce = (i) => {
-      const d = pe[i];
-      if (d) return d;
+      const c = pe[i];
+      if (c) return c;
       throw Error("Missing type: " + i);
     };
-    Z(Qt());
-    const Ge = (i, d) => i + d;
+    Z(nn());
+    const Ge = (i, c) => i + c;
     Z({
       name: "number",
       apply: Ge,
@@ -767,453 +767,453 @@ function en() {
       invert: (i) => -i,
       transform: (i) => i
     });
-    const ve = (i) => i == null ? null : i.et ? Ce(i.et) : i.es ? pe["text-unicode"] : i.ena != null ? pe.number : null, f = (i) => i.es ? i.es : i.ena != null ? i.ena : i.e, y = (i, d, m, D = !1) => {
-      const [O, I] = typeof d == "string" ? [Ce(d), d] : [d, d.name];
-      !D && O.isNoop && O.isNoop(m) || (I === "number" ? i.write("ena", m) : I === "text-unicode" ? i.write("es", m) : (i.write("et", I), i.write("e", m)));
+    const me = (i) => i == null ? null : i.et ? Ce(i.et) : i.es ? pe["text-unicode"] : i.ena != null ? pe.number : null, f = (i) => i.es ? i.es : i.ena != null ? i.ena : i.e, y = (i, c, O, D = !1) => {
+      const [w, I] = typeof c == "string" ? [Ce(c), c] : [c, c.name];
+      !D && w.isNoop && w.isNoop(O) || (I === "number" ? i.write("ena", O) : I === "text-unicode" ? i.write("es", O) : (i.write("et", I), i.write("e", O)));
     };
-    function b(i) {
+    function v(i) {
       o(typeof i == "number"), o(i >= 0), o(i === (0 | i));
     }
     function L(i) {
-      typeof i == "number" ? b(i) : o(typeof i == "string");
+      typeof i == "number" ? v(i) : o(typeof i == "string");
     }
     function z(i) {
       if (i === null) return;
-      const d = /* @__PURE__ */ new Set(), m = /* @__PURE__ */ new Set(), D = (I) => {
+      const c = /* @__PURE__ */ new Set(), O = /* @__PURE__ */ new Set(), D = (I) => {
         let R = !0, $ = !1;
         for (let p in I) {
-          const v = I[p];
-          if (R = !1, o(p === "p" || p === "r" || p === "d" || p === "i" || p === "e" || p === "es" || p === "ena" || p === "et", "Invalid component item '" + p + "'"), p === "p") b(v), o(!d.has(v)), d.add(v), o(I.r === void 0);
-          else if (p === "d") b(v), o(!m.has(v)), m.add(v), o(I.i === void 0);
+          const m = I[p];
+          if (R = !1, o(p === "p" || p === "r" || p === "d" || p === "i" || p === "e" || p === "es" || p === "ena" || p === "et", "Invalid component item '" + p + "'"), p === "p") v(m), o(!c.has(m)), c.add(m), o(I.r === void 0);
+          else if (p === "d") v(m), o(!O.has(m)), O.add(m), o(I.i === void 0);
           else if (p === "e" || p === "es" || p === "ena") {
             o(!$), $ = !0;
-            const w = ve(I);
-            o(w, "Missing type in edit"), w.checkValidOp && w.checkValidOp(f(I));
+            const b = me(I);
+            o(b, "Missing type in edit"), b.checkValidOp && b.checkValidOp(f(I));
           }
         }
         o(!R);
-      }, O = (I, R, $) => {
+      }, w = (I, R, $) => {
         if (!Array.isArray(I)) throw Error("Op must be null or a list");
         if (I.length === 0) throw Error("Empty descent");
         R || L(I[0]);
-        let p = 1, v = 0, w = 0;
+        let p = 1, m = 0, b = 0;
         for (let C = 0; C < I.length; C++) {
           const N = I[C];
           if (o(N != null), Array.isArray(N)) {
-            const B = O(N, !1);
-            if (v) {
-              const g = typeof w, U = typeof B;
-              g === U ? o(w < B, "descent keys are not in order") : o(g === "number" && U === "string");
+            const B = w(N, !1);
+            if (m) {
+              const g = typeof b, S = typeof B;
+              g === S ? o(b < B, "descent keys are not in order") : o(g === "number" && S === "string");
             }
-            w = B, v++, p = 3;
+            b = B, m++, p = 3;
           } else typeof N == "object" ? (o(p === 1, `Prev not scalar - instead ${p}`), D(N), p = 2) : (o(p !== 3), L(N), o(r.isValidPathItem(N), "Invalid path key"), p = 1);
         }
-        return o(v !== 1, "Operation makes multiple descents. Remove some []"), o(p === 2 || p === 3), I[0];
+        return o(m !== 1, "Operation makes multiple descents. Remove some []"), o(p === 2 || p === 3), I[0];
       };
-      O(i, !0), o(d.size === m.size, "Mismatched picks and drops in op");
-      for (let I = 0; I < d.size; I++) o(d.has(I)), o(m.has(I));
+      w(i, !0), o(c.size === O.size, "Mismatched picks and drops in op");
+      for (let I = 0; I < c.size; I++) o(c.has(I)), o(O.has(I));
     }
     function q(i) {
-      let d = 0, m = [];
+      let c = 0, O = [];
       const D = r.writeCursor();
-      return D.mergeTree(i, (O, I) => {
-        const R = ve(O);
+      return D.mergeTree(i, (w, I) => {
+        const R = me(w);
         if (R) {
-          const p = f(O);
+          const p = f(w);
           y(I, R, R.normalize ? R.normalize(p) : p);
         }
-        for (const p of ["r", "p", "i", "d"]) if (O[p] !== void 0) {
-          const v = p === "p" || p === "d" ? ($ = O[p], m[$] == null && (m[$] = d++), m[$]) : O[p];
-          I.write(p, v);
+        for (const p of ["r", "p", "i", "d"]) if (w[p] !== void 0) {
+          const m = p === "p" || p === "d" ? ($ = w[p], O[$] == null && (O[$] = c++), O[$]) : w[p];
+          I.write(p, m);
         }
         var $;
       }), D.get();
     }
-    function Ee(i, d) {
-      if (z(d), d === null) return i;
-      const m = [];
-      return function D(O, I) {
-        let R = O, $ = 0, p = {
-          root: O
-        }, v = 0, w = p, C = "root";
+    function Ee(i, c) {
+      if (z(c), c === null) return i;
+      const O = [];
+      return function D(w, I) {
+        let R = w, $ = 0, p = {
+          root: w
+        }, m = 0, b = p, C = "root";
         function N() {
-          for (; v < $; v++) {
-            let B = I[v];
-            typeof B != "object" && (o(S(w, C)), w = w[C] = x(w[C]), C = B);
+          for (; m < $; m++) {
+            let B = I[m];
+            typeof B != "object" && (o(k(b, C)), b = b[C] = x(b[C]), C = B);
           }
         }
         for (; $ < I.length; $++) {
           const B = I[$];
           if (Array.isArray(B)) {
             const g = D(R, B);
-            g !== R && g !== void 0 && (N(), R = w[C] = g);
+            g !== R && g !== void 0 && (N(), R = b[C] = g);
           } else if (typeof B == "object") {
-            B.d != null ? (N(), R = h(w, C, m[B.d])) : B.i !== void 0 && (N(), R = h(w, C, B.i));
-            const g = ve(B);
-            if (g) N(), R = w[C] = g.apply(R, f(B));
+            B.d != null ? (N(), R = h(b, C, O[B.d])) : B.i !== void 0 && (N(), R = h(b, C, B.i));
+            const g = me(B);
+            if (g) N(), R = b[C] = g.apply(R, f(B));
             else if (B.e !== void 0) throw Error("Subtype " + B.et + " undefined");
           } else R = Y(R, B);
         }
         return p.root;
-      }(i = function D(O, I) {
+      }(i = function D(w, I) {
         const R = [];
         let $ = 0;
         for (; $ < I.length; $++) {
           const C = I[$];
           if (Array.isArray(C)) break;
-          typeof C != "object" && (R.push(O), O = Y(O, C));
+          typeof C != "object" && (R.push(w), w = Y(w, C));
         }
-        for (let C = I.length - 1; C >= $; C--) O = D(O, I[C]);
+        for (let C = I.length - 1; C >= $; C--) w = D(w, I[C]);
         for (--$; $ >= 0; $--) {
           const C = I[$];
           if (typeof C != "object") {
             const N = R.pop();
-            O = O === Y(N, C) ? N : O === void 0 ? c(N, C) : (v = C, w = O, (p = x(p = N))[v] = w, p);
-          } else _(C) && (o(O !== void 0, "Cannot pick up or remove undefined"), C.p != null && (m[C.p] = O), O = void 0);
+            w = w === Y(N, C) ? N : w === void 0 ? d(N, C) : (m = C, b = w, (p = x(p = N))[m] = b, p);
+          } else _(C) && (o(w !== void 0, "Cannot pick up or remove undefined"), C.p != null && (O[C.p] = w), w = void 0);
         }
-        var p, v, w;
-        return O;
-      }(i, d), d);
+        var p, m, b;
+        return w;
+      }(i, c), c);
     }
-    function ce(i, d) {
-      i = i.slice(), z(d);
-      const m = r.readCursor(d);
-      let D, O, I = !1;
+    function de(i, c) {
+      i = i.slice(), z(c);
+      const O = r.readCursor(c);
+      let D, w, I = !1;
       const R = [];
       for (let p = 0; ; p++) {
-        const v = i[p], w = m.getComponent();
-        if (w && (w.r !== void 0 ? I = !0 : w.p != null && (I = !1, D = w.p, O = p)), p >= i.length) break;
+        const m = i[p], b = O.getComponent();
+        if (b && (b.r !== void 0 ? I = !0 : b.p != null && (I = !1, D = b.p, w = p)), p >= i.length) break;
         let C = 0;
-        const N = r.advancer(m, void 0, (g, U) => {
-          _(U) && C++;
+        const N = r.advancer(O, void 0, (g, S) => {
+          _(S) && C++;
         });
         R.unshift(N);
-        const B = N(v);
-        if (typeof v == "number" && (i[p] -= C), !B) break;
+        const B = N(m);
+        if (typeof m == "number" && (i[p] -= C), !B) break;
       }
       if (R.forEach((p) => p.end()), I) return null;
       const $ = () => {
         let p = 0;
         if (D != null) {
-          const v = m.getPath();
-          p = v.length, i = v.concat(i.slice(O));
+          const m = O.getPath();
+          p = m.length, i = m.concat(i.slice(w));
         }
         for (; p < i.length; p++) {
-          const v = i[p], w = l(m), C = ve(w);
+          const m = i[p], b = l(O), C = me(b);
           if (C) {
-            const g = f(w);
+            const g = f(b);
             C.transformPosition && (i[p] = C.transformPosition(i[p], g));
             break;
           }
           let N = 0;
-          const B = r.advancer(m, (g, U) => s(U) ? ~(g - N) : g - N, (g, U) => {
-            s(U) && N++;
-          })(v);
-          if (typeof v == "number" && (i[p] += N), !B) break;
+          const B = r.advancer(O, (g, S) => s(S) ? ~(g - N) : g - N, (g, S) => {
+            s(S) && N++;
+          })(m);
+          if (typeof m == "number" && (i[p] += N), !B) break;
         }
       };
-      return D != null ? m.eachDrop(null, (p) => {
+      return D != null ? O.eachDrop(null, (p) => {
         p === D && $();
       }) : $(), i;
     }
-    function ne(i, d) {
-      if (z(i), z(d), i == null) return d;
-      if (d == null) return i;
-      let m = 0;
-      const D = r.readCursor(i), O = r.readCursor(d), I = r.writeCursor(), R = [], $ = [], p = [], v = [], w = [], C = [], N = /* @__PURE__ */ new Set();
+    function ne(i, c) {
+      if (z(i), z(c), i == null) return c;
+      if (c == null) return i;
+      let O = 0;
+      const D = r.readCursor(i), w = r.readCursor(c), I = r.writeCursor(), R = [], $ = [], p = [], m = [], b = [], C = [], N = /* @__PURE__ */ new Set();
       D.traverse(null, (g) => {
         g.p != null && (p[g.p] = D.clone());
-      }), O.traverse(null, (g) => {
-        g.d != null && (v[g.d] = O.clone());
+      }), w.traverse(null, (g) => {
+        g.d != null && (m[g.d] = w.clone());
       });
       const B = r.writeCursor();
-      return function g(U, re, te, K, se, $e, Oe, ye) {
+      return function g(S, re, te, K, se, $e, we, ye) {
         o(re || te);
         const oe = l(re), Pe = l(te), Ae = !!Pe && Pe.r !== void 0, Le = !!oe && oe.i !== void 0, Te = oe ? oe.d : null, Ie = Pe ? Pe.p : null, Ne = ($e || Ae) && Ie == null;
-        if (Ie != null) K = v[Ie], Oe = $[Ie] = new r.WriteCursor();
+        if (Ie != null) K = m[Ie], we = $[Ie] = new r.WriteCursor();
         else if (Pe && Pe.r !== void 0) K = null;
         else {
           const T = l(K);
           T && T.d != null && (K = null);
         }
         const Q = l(K);
-        if (Te != null) if (U = p[Te], ye = R[Te] = new r.WriteCursor(), Ne) $e && !Ae && ye.write("r", !0);
+        if (Te != null) if (S = p[Te], ye = R[Te] = new r.WriteCursor(), Ne) $e && !Ae && ye.write("r", !0);
         else {
-          const T = w[Te] = m++;
-          Oe.write("d", T);
+          const T = b[Te] = O++;
+          we.write("d", T);
         }
-        else if (oe && oe.i !== void 0) U = null;
+        else if (oe && oe.i !== void 0) S = null;
         else {
-          const T = l(U);
-          T && T.p != null && (U = null);
+          const T = l(S);
+          T && T.p != null && (S = null);
         }
         let A;
         Le ? (o(se === void 0), A = oe.i) : A = se;
-        const W = (Ie == null ? !Le || $e || Ae : A === void 0) ? null : Oe.getComponent();
+        const W = (Ie == null ? !Le || $e || Ae : A === void 0) ? null : we.getComponent();
         if (Ie != null) {
           if (!(se !== void 0 || Le)) {
-            const T = Te != null ? w[Te] : m++;
+            const T = Te != null ? b[Te] : O++;
             C[Ie] = T, ye.write("p", T);
           }
         } else Ae && (Le || se !== void 0 || (Pe.r, ye.write("r", Pe.r)));
-        const M = Ne ? null : ve(oe), P = ve(Q);
+        const M = Ne ? null : me(oe), P = me(Q);
         if ((M || P) && (M && M.name, P && P.name), M && P) {
           o(M === P);
           const T = f(oe), G = f(Q), he = M.compose(T, G);
-          y(Oe, M, he), N.add(Q);
-        } else M ? y(Oe, M, f(oe)) : P && (y(Oe, P, f(Q)), N.add(Q));
-        const k = typeof A == "object" && A != null;
-        let J = !1, X = 0, ee = 0, fe = 0, de = 0, ae = 0;
-        const me = r.advancer(K, (T, G) => s(G) ? de - T - 1 : T - de, (T, G) => {
-          s(G) && de++;
-        }), H = r.advancer(U, (T, G) => _(G) ? X - T - 1 : T - X, (T, G) => {
+          y(we, M, he), N.add(Q);
+        } else M ? y(we, M, f(oe)) : P && (y(we, P, f(Q)), N.add(Q));
+        const U = typeof A == "object" && A != null;
+        let J = !1, X = 0, ee = 0, fe = 0, ce = 0, ae = 0;
+        const Oe = r.advancer(K, (T, G) => s(G) ? ce - T - 1 : T - ce, (T, G) => {
+          s(G) && ce++;
+        }), H = r.advancer(S, (T, G) => _(G) ? X - T - 1 : T - X, (T, G) => {
           _(G) && X++;
         });
         if (r.eachChildOf(re, te, (T, G, he) => {
-          let we, Re, qe = T, Me = T, Je = T;
+          let be, Re, qe = T, Me = T, Je = T;
           if (typeof T == "number") {
             let _e = T + fe;
-            Re = me(_e), Me = _e + de;
+            Re = Oe(_e), Me = _e + ce;
             let ue = T + ee;
-            we = H(ue), s(l(Re)) && (we = null), qe = ue + X, Je = T + ae, o(qe >= 0, "p1PickKey is negative"), o(Me >= 0, "p2DropKey is negative");
-            const Ue = s(l(G)), xe = _(l(he));
-            (Ue || xe && !Ne) && ae--, Ue && ee--, xe && fe--;
-          } else we = H(T), Re = me(T);
-          ye.descend(qe), Oe.descend(Me);
-          const ze = k && !s(l(G)) ? A[Je] : void 0, Se = g(we, G, he, Re, ze, Ne, Oe, ye);
+            be = H(ue), s(l(Re)) && (be = null), qe = ue + X, Je = T + ae, o(qe >= 0, "p1PickKey is negative"), o(Me >= 0, "p2DropKey is negative");
+            const Se = s(l(G)), xe = _(l(he));
+            (Se || xe && !Ne) && ae--, Se && ee--, xe && fe--;
+          } else be = H(T), Re = Oe(T);
+          ye.descend(qe), we.descend(Me);
+          const ze = U && !s(l(G)) ? A[Je] : void 0, ke = g(be, G, he, Re, ze, Ne, we, ye);
           var je, j, ie;
-          k && !Ne ? ze !== Se && (J || (A = Array.isArray(A) ? A.slice() : Object.assign({}, A), J = !0), je = A, ie = Se, typeof (j = Je) == "number" ? (o(Array.isArray(je)), o(j < je.length)) : (o(!Array.isArray(je)), o(je[j] !== void 0)), ie === void 0 ? typeof j == "number" ? je.splice(j, 1) : delete je[j] : je[j] = ie) : o(Se === void 0), Oe.ascend(), ye.ascend();
-        }), H.end(), me.end(), W != null) W.i = A;
+          U && !Ne ? ze !== ke && (J || (A = Array.isArray(A) ? A.slice() : Object.assign({}, A), J = !0), je = A, ie = ke, typeof (j = Je) == "number" ? (o(Array.isArray(je)), o(j < je.length)) : (o(!Array.isArray(je)), o(je[j] !== void 0)), ie === void 0 ? typeof j == "number" ? je.splice(j, 1) : delete je[j] : je[j] = ie) : o(ke === void 0), we.ascend(), ye.ascend();
+        }), H.end(), Oe.end(), W != null) W.i = A;
         else if (!$e && !Ae && Ie == null) return A;
-      }(D, D.clone(), O, O.clone(), void 0, !1, I, B), I.reset(), I.mergeTree(B.get()), I.reset(), I.get(), R.map((g) => g.get()), $.map((g) => g.get()), D.traverse(I, (g, U) => {
+      }(D, D.clone(), w, w.clone(), void 0, !1, I, B), I.reset(), I.mergeTree(B.get()), I.reset(), I.get(), R.map((g) => g.get()), $.map((g) => g.get()), D.traverse(I, (g, S) => {
         const re = g.p;
         if (re != null) {
-          const te = w[re];
-          te != null && U.write("p", te);
+          const te = b[re];
+          te != null && S.write("p", te);
           const K = R[re];
-          K && K.get(), K && U.mergeTree(K.get());
-        } else g.r !== void 0 && U.write("r", g.r);
-      }), I.reset(), I.get(), O.traverse(I, (g, U) => {
+          K && K.get(), K && S.mergeTree(K.get());
+        } else g.r !== void 0 && S.write("r", g.r);
+      }), I.reset(), I.get(), w.traverse(I, (g, S) => {
         const re = g.d;
         if (re != null) {
           const K = C[re];
-          K != null && U.write("d", K);
+          K != null && S.write("d", K);
           const se = $[re];
-          se && U.mergeTree(se.get());
-        } else g.i !== void 0 && U.write("i", g.i);
-        const te = ve(g);
-        te && !N.has(g) && y(U, te, f(g));
+          se && S.mergeTree(se.get());
+        } else g.i !== void 0 && S.write("i", g.i);
+        const te = me(g);
+        te && !N.has(g) && y(S, te, f(g));
       }), I.get();
     }
     function le(i) {
       if (i == null) return null;
-      const d = new r.ReadCursor(i), m = new r.WriteCursor();
+      const c = new r.ReadCursor(i), O = new r.WriteCursor();
       let D;
-      const O = [], I = [];
-      return function R($, p, v) {
-        const w = $.getComponent();
+      const w = [], I = [];
+      return function R($, p, m) {
+        const b = $.getComponent();
         let C, N = !1;
-        if (w) {
-          w.p != null && (p.write("d", w.p), O[w.p] = $.clone()), w.r !== void 0 && p.write("i", w.r), w.d != null && (p.write("p", w.d), v = void 0), w.i !== void 0 && (v = C = w.i);
-          const g = ve(w);
-          g && (v === void 0 ? (D || (D = /* @__PURE__ */ new Set()), D.add(w)) : (f(w), v = g.apply(v, f(w)), N = !0));
+        if (b) {
+          b.p != null && (p.write("d", b.p), w[b.p] = $.clone()), b.r !== void 0 && p.write("i", b.r), b.d != null && (p.write("p", b.d), m = void 0), b.i !== void 0 && (m = C = b.i);
+          const g = me(b);
+          g && (m === void 0 ? (D || (D = /* @__PURE__ */ new Set()), D.add(b)) : (f(b), m = g.apply(m, f(b)), N = !0));
         }
         let B = 0;
         for (const g of $) {
           p.descend(g);
-          const U = typeof g == "number" ? g - B : g, re = Y(v, U);
+          const S = typeof g == "number" ? g - B : g, re = Y(m, S);
           s($.getComponent()) && B++;
           const te = R($, p, re);
-          if (v !== void 0 && te !== void 0) {
-            if (N || (N = !0, v = x(v)), !S(v, U)) throw Error("Cannot modify child - invalid operation");
-            v[U] = te;
+          if (m !== void 0 && te !== void 0) {
+            if (N || (N = !0, m = x(m)), !k(m, S)) throw Error("Cannot modify child - invalid operation");
+            m[S] = te;
           }
           p.ascend();
         }
-        if (C === void 0) return N ? v : void 0;
-        p.write("r", v);
-      }(d, m, void 0), D && (m.reset(), function R($, p, v) {
-        const w = p.getComponent();
-        if (w) {
-          const g = w.d;
-          if (g != null && ($ = O[g], v = I[g] = r.writeCursor()), D.has(w)) {
-            const U = ve(w);
-            if (!U.invert) throw Error(`Cannot invert subtype ${U.name}`);
-            y(v, U, U.invert(f(w)));
+        if (C === void 0) return N ? m : void 0;
+        p.write("r", m);
+      }(c, O, void 0), D && (O.reset(), function R($, p, m) {
+        const b = p.getComponent();
+        if (b) {
+          const g = b.d;
+          if (g != null && ($ = w[g], m = I[g] = r.writeCursor()), D.has(b)) {
+            const S = me(b);
+            if (!S.invert) throw Error(`Cannot invert subtype ${S.name}`);
+            y(m, S, S.invert(f(b)));
           }
         }
         let C = 0, N = 0;
-        const B = r.advancer($, (g, U) => _(U) ? C - g - 1 : g - C, (g, U) => {
-          _(U) && C++;
+        const B = r.advancer($, (g, S) => _(S) ? C - g - 1 : g - C, (g, S) => {
+          _(S) && C++;
         });
         for (const g of p) if (typeof g == "number") {
-          const U = g - N, re = B(U), te = U + C;
-          v.descend(te), R(re, p, v), s(p.getComponent()) && N++, v.ascend();
-        } else v.descend(g), R(B(g), p, v), v.ascend();
+          const S = g - N, re = B(S), te = S + C;
+          m.descend(te), R(re, p, m), s(p.getComponent()) && N++, m.ascend();
+        } else m.descend(g), R(B(g), p, m), m.ascend();
         B.end();
-      }(d.clone(), d, m), I.length && (m.reset(), d.traverse(m, (R, $) => {
+      }(c.clone(), c, O), I.length && (O.reset(), c.traverse(O, (R, $) => {
         const p = R.p;
         if (p != null) {
-          const v = I[p];
-          v && v.get(), v && $.mergeTree(v.get());
+          const m = I[p];
+          m && m.get(), m && $.mergeTree(m.get());
         }
-      }))), m.get();
+      }))), O.get();
     }
-    const ge = (i, d) => i.some((m) => typeof m == "object" && (Array.isArray(m) ? ge(m, d) : d(m)));
-    function De(i, d) {
+    const ge = (i, c) => i.some((O) => typeof O == "object" && (Array.isArray(O) ? ge(O, c) : c(O)));
+    function De(i, c) {
       if (i == null || !ge(i, (p) => {
-        var v;
-        return p.r !== void 0 || ((v = ve(p)) === null || v === void 0 ? void 0 : v.makeInvertible) != null;
+        var m;
+        return p.r !== void 0 || ((m = me(p)) === null || m === void 0 ? void 0 : m.makeInvertible) != null;
       })) return i;
-      const m = new r.ReadCursor(i), D = new r.WriteCursor();
-      let O = !1;
-      const I = [], R = [], $ = (p, v, w) => {
+      const O = new r.ReadCursor(i), D = new r.WriteCursor();
+      let w = !1;
+      const I = [], R = [], $ = (p, m, b) => {
         const C = p.getComponent();
         let N = !1;
         if (C) {
-          C.d != null && v.write("d", C.d), C.i !== void 0 && v.write("i", C.i);
+          C.d != null && m.write("d", C.d), C.i !== void 0 && m.write("i", C.i);
           const g = C.p;
-          if (g != null && (I[g] = p.clone(), o(w !== void 0, "Operation picks up at an invalid key"), R[g] = w, v.write("p", C.p)), C.r !== void 0 && w === void 0) throw Error("Invalid doc / op in makeInvertible: removed item missing from doc");
-          const U = ve(C);
-          U && (U.makeInvertible ? O = !0 : y(v, U, f(C), !0));
+          if (g != null && (I[g] = p.clone(), o(b !== void 0, "Operation picks up at an invalid key"), R[g] = b, m.write("p", C.p)), C.r !== void 0 && b === void 0) throw Error("Invalid doc / op in makeInvertible: removed item missing from doc");
+          const S = me(C);
+          S && (S.makeInvertible ? w = !0 : y(m, S, f(C), !0));
         }
         let B = 0;
         for (const g of p) {
-          v.descend(g);
-          const U = typeof g == "number" ? g - B : g, re = Y(w, U), te = $(p, v, re);
-          re !== te && (N || (N = !0, w = x(w)), te === void 0 ? (w = c(w, U), typeof g == "number" && B++) : w[U] = te), v.ascend();
+          m.descend(g);
+          const S = typeof g == "number" ? g - B : g, re = Y(b, S), te = $(p, m, re);
+          re !== te && (N || (N = !0, b = x(b)), te === void 0 ? (b = d(b, S), typeof g == "number" && B++) : b[S] = te), m.ascend();
         }
-        return C && (C.r !== void 0 ? (v.write("r", t.default(w)), w = void 0) : C.p != null && (w = void 0)), w;
+        return C && (C.r !== void 0 ? (m.write("r", t.default(b)), b = void 0) : C.p != null && (b = void 0)), b;
       };
-      return $(m, D, d), D.get(), O && (D.reset(), function p(v, w, C, N, B) {
-        const g = w.getComponent();
+      return $(O, D, c), D.get(), w && (D.reset(), function p(m, b, C, N, B) {
+        const g = b.getComponent();
         if (g) {
-          g.i !== void 0 ? (N = g.i, B = !0) : g.d != null && (N = R[g.d], v = I[g.d], B = !1, g.d);
-          let K = ve(g);
+          g.i !== void 0 ? (N = g.i, B = !0) : g.d != null && (N = R[g.d], m = I[g.d], B = !1, g.d);
+          let K = me(g);
           if (K && K.makeInvertible) {
             const se = f(g);
             y(C, K, K.makeInvertible(se, N), !0);
           }
         }
-        let U = 0, re = 0;
-        const te = r.advancer(v, (K, se) => _(se) ? U - K - 1 : K - U, (K, se) => {
-          _(se) && U++;
+        let S = 0, re = 0;
+        const te = r.advancer(m, (K, se) => _(se) ? S - K - 1 : K - S, (K, se) => {
+          _(se) && S++;
         });
-        for (const K of w) if (typeof K == "number") {
-          const se = K - re, $e = te(se), Oe = se + U, ye = Y(N, B ? se : Oe);
-          C.descend(K), p($e, w, C, ye, B), s(w.getComponent()) && re++, C.ascend();
+        for (const K of b) if (typeof K == "number") {
+          const se = K - re, $e = te(se), we = se + S, ye = Y(N, B ? se : we);
+          C.descend(K), p($e, b, C, ye, B), s(b.getComponent()) && re++, C.ascend();
         } else {
           const se = Y(N, K);
-          C.descend(K), p(te(K), w, C, se, B), C.ascend();
+          C.descend(K), p(te(K), b, C, se, B), C.ascend();
         }
         te.end();
-      }(m.clone(), m, D, d, !1)), D.get();
+      }(O.clone(), O, D, c, !1)), D.get();
     }
-    function kt(i, d) {
-      return le(De(i, d));
+    function kt(i, c) {
+      return le(De(i, c));
     }
     const it = (i) => {
       if (i == null) return null;
-      const d = i.slice();
-      for (let m = 0; m < i.length; m++) {
-        const D = d[m];
-        Array.isArray(D) && (d[m] = it(D));
+      const c = i.slice();
+      for (let O = 0; O < i.length; O++) {
+        const D = c[O];
+        Array.isArray(D) && (c[O] = it(D));
       }
-      return d;
+      return c;
     };
-    function st(i, d, m) {
-      o(m === "left" || m === "right", "Direction must be left or right");
-      const D = m === "left" ? 0 : 1;
-      if (d == null) return {
+    function st(i, c, O) {
+      o(O === "left" || O === "right", "Direction must be left or right");
+      const D = O === "left" ? 0 : 1;
+      if (c == null) return {
         ok: !0,
         result: i
       };
-      z(i), z(d);
-      let O = null;
-      const I = [], R = [], $ = [], p = [], v = [], w = [], C = [], N = [], B = [], g = [], U = [], re = [], te = [], K = [], se = [];
+      z(i), z(c);
+      let w = null;
+      const I = [], R = [], $ = [], p = [], m = [], b = [], C = [], N = [], B = [], g = [], S = [], re = [], te = [], K = [], se = [];
       let $e = 0;
-      const Oe = r.readCursor(i), ye = r.readCursor(d), oe = r.writeCursor();
+      const we = r.readCursor(i), ye = r.readCursor(c), oe = r.writeCursor();
       if (function Q(A, W = null, M) {
         const P = l(W);
-        P && (P.r !== void 0 ? M = W.clone() : P.p != null && (M = null, w[P.p] = A.clone()));
-        const k = A.getComponent();
+        P && (P.r !== void 0 ? M = W.clone() : P.p != null && (M = null, b[P.p] = A.clone()));
+        const U = A.getComponent();
         let J;
-        k && (J = k.p) != null && (v[J] = W ? W.clone() : null, $[J] = A.clone(), M && (g[J] = !0, B[J] = M), P && P.p != null && (K[J] = P.p));
+        U && (J = U.p) != null && (m[J] = W ? W.clone() : null, $[J] = A.clone(), M && (g[J] = !0, B[J] = M), P && P.p != null && (K[J] = P.p));
         const X = r.advancer(W);
         for (const ee of A) Q(A, X(ee), M);
         X.end();
-      }(ye, Oe, null), function Q(A, W, M, P, k) {
+      }(ye, we, null), function Q(A, W, M, P, U) {
         const J = M.getComponent();
         let X, ee = !1;
-        J && ((X = J.d) != null ? (p[X] = M.clone(), P != null && (se[P] == null && (se[P] = []), se[P].push(X)), g[X], A = v[X] || null, W = $[X] || null, g[X] ? (k && (U[X] = !0), k = B[X] || null) : !k || D !== 1 && K[X] != null || O == null && (O = {
+        J && ((X = J.d) != null ? (p[X] = M.clone(), P != null && (se[P] == null && (se[P] = []), se[P].push(X)), g[X], A = m[X] || null, W = $[X] || null, g[X] ? (U && (S[X] = !0), U = B[X] || null) : !U || D !== 1 && K[X] != null || w == null && (w = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-          op1: a.removeOp(k.getPath()),
+          op1: a.removeOp(U.getPath()),
           op2: a.moveOp(W.getPath(), M.getPath())
-        }), ee = !0) : J.i !== void 0 && (A = W = null, ee = !0, k && O == null && (O = {
+        }), ee = !0) : J.i !== void 0 && (A = W = null, ee = !0, U && w == null && (w = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-          op1: a.removeOp(k.getPath()),
+          op1: a.removeOp(U.getPath()),
           op2: a.insertOp(M.getPath(), J.i)
         })));
         const fe = l(A);
-        fe && (fe.r !== void 0 ? k = A.clone() : fe.p != null && (fe.p, P = fe.p, k = null));
-        const de = ve(J);
-        de && k && O == null && (O = {
+        fe && (fe.r !== void 0 ? U = A.clone() : fe.p != null && (fe.p, P = fe.p, U = null));
+        const ce = me(J);
+        ce && U && w == null && (w = {
           type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-          op1: a.removeOp(k.getPath()),
-          op2: a.editOp(M.getPath(), de, f(J), !0)
+          op1: a.removeOp(U.getPath()),
+          op2: a.editOp(M.getPath(), ce, f(J), !0)
         });
-        let ae = 0, me = 0;
+        let ae = 0, Oe = 0;
         const H = r.advancer(W, (G, he) => _(he) ? ae - G - 1 : G - ae, (G, he) => {
           _(he) && ae++;
         }), T = r.advancer(A);
         for (const G of M) if (typeof G == "number") {
-          const he = G - me, we = H(he);
-          me += +Q(T(he + ae), we, M, P, k);
+          const he = G - Oe, be = H(he);
+          Oe += +Q(T(he + ae), be, M, P, U);
         } else {
           const he = H(G);
-          Q(T(G), he, M, P, k);
+          Q(T(G), he, M, P, U);
         }
         return H.end(), T.end(), ee;
-      }(Oe, ye, ye.clone(), null, null), p.map((Q) => Q && Q.get()), O) return {
+      }(we, ye, ye.clone(), null, null), p.map((Q) => Q && Q.get()), w) return {
         ok: !1,
-        conflict: O
+        conflict: w
       };
-      U.map((Q) => !!Q);
+      S.map((Q) => !!Q);
       const Pe = [];
       let Ae = null;
-      (function Q(A, W, M, P, k) {
+      (function Q(A, W, M, P, U) {
         let J = !1;
         const X = l(W);
         if (_(X)) {
           const H = X.p;
-          H != null ? (M = p[H], P = re[H] = r.writeCursor(), J = !0, k = null) : (M = null, k = W.clone());
+          H != null ? (M = p[H], P = re[H] = r.writeCursor(), J = !0, U = null) : (M = null, U = W.clone());
         } else s(l(M)) && (M = null);
         const ee = A.getComponent();
         if (ee) {
           const H = ee.p;
-          H != null ? (k && (N[H] = k), Pe[H] = k || D === 1 && J ? null : P.getComponent(), I[H] = A.clone(), M && (C[H] = M.clone())) : ee.r !== void 0 && (k || P.write("r", !0), (k || J) && (Ae == null && (Ae = /* @__PURE__ */ new Set()), Ae.add(ee)));
+          H != null ? (U && (N[H] = U), Pe[H] = U || D === 1 && J ? null : P.getComponent(), I[H] = A.clone(), M && (C[H] = M.clone())) : ee.r !== void 0 && (U || P.write("r", !0), (U || J) && (Ae == null && (Ae = /* @__PURE__ */ new Set()), Ae.add(ee)));
         }
-        let fe = 0, de = 0;
+        let fe = 0, ce = 0;
         const ae = r.advancer(W, void 0, (H, T) => {
           _(T) && fe++;
-        }), me = r.advancer(M, (H, T) => s(T) ? ~(H - de) : H - de, (H, T) => {
-          s(T) && de++;
+        }), Oe = r.advancer(M, (H, T) => s(T) ? ~(H - ce) : H - ce, (H, T) => {
+          s(T) && ce++;
         });
         if (A) for (const H of A) if (typeof H == "string") {
-          const T = ae(H), G = me(H);
-          P.descend(H), Q(A, T, G, P, k), P.ascend();
+          const T = ae(H), G = Oe(H);
+          P.descend(H), Q(A, T, G, P, U), P.ascend();
         } else {
-          const T = ae(H), G = H - fe, he = _(l(T)) ? null : me(G), we = G + de;
-          o(we >= 0), P.descend(we), Q(A, T, he, P, k), P.ascend();
+          const T = ae(H), G = H - fe, he = _(l(T)) ? null : Oe(G), be = G + ce;
+          o(be >= 0), P.descend(be), Q(A, T, he, P, U), P.ascend();
         }
-        ae.end(), me.end();
-      })(Oe, ye, ye.clone(), oe, null), oe.reset();
+        ae.end(), Oe.end();
+      })(we, ye, ye.clone(), oe, null), oe.reset();
       let Le = [];
-      if (function Q(A, W, M, P, k, J) {
+      if (function Q(A, W, M, P, U, J) {
         o(W);
         const X = W.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 ce = (j, ie, _e) => j ? a.moveOp(j.getPath(), ie.getPath()) : a.insertOp(ie.getPath(), _e.i);
         if (s(X)) {
           const j = X.d;
           j != null && (R[j] = W.clone());
@@ -1221,51 +1221,51 @@ function en() {
           let _e = !1;
           if (X.i !== void 0 || j != null && ie) {
             let ue;
-            ee && (ee.i !== void 0 || (ue = ee.d) != null && !g[ue]) && (_e = ue != null ? j != null && j === K[ue] : n.default(ee.i, X.i), _e || ue != null && D !== 1 && K[ue] != null || O == null && (O = {
+            ee && (ee.i !== void 0 || (ue = ee.d) != null && !g[ue]) && (_e = ue != null ? j != null && j === K[ue] : n.default(ee.i, X.i), _e || ue != null && D !== 1 && K[ue] != null || w == null && (w = {
               type: u.ConflictType.DROP_COLLISION,
-              op1: de(j != null ? I[j] : null, W, X),
-              op2: de(ue != null ? $[ue] : null, P, ee)
-            })), _e || (J ? O == null && (O = {
+              op1: ce(j != null ? I[j] : null, W, X),
+              op2: ce(ue != null ? $[ue] : null, P, ee)
+            })), _e || (J ? w == null && (w = {
               type: u.ConflictType.RM_UNEXPECTED_CONTENT,
-              op1: de(j != null ? I[j] : null, W, X),
+              op1: ce(j != null ? I[j] : null, W, X),
               op2: a.removeOp(J.getPath())
-            }) : (j != null ? (Le[$e] = j, k.write("d", ie.p = $e++)) : k.write("i", t.default(X.i)), fe = !0));
+            }) : (j != null ? (Le[$e] = j, U.write("d", ie.p = $e++)) : U.write("i", t.default(X.i)), fe = !0));
           } else if (j != null && !ie) {
             const ue = N[j];
             ue && (J = ue.clone());
           }
-          j != null ? (A = I[j], M = w[j], P = C[j]) : X.i !== void 0 && (A = M = null, _e || (P = null));
+          j != null ? (A = I[j], M = b[j], P = C[j]) : X.i !== void 0 && (A = M = null, _e || (P = null));
         } else _(l(A)) && (A = M = P = null);
-        const ae = l(A), me = l(M);
-        if (_(me)) {
-          const j = me.p;
-          me.r !== void 0 && (!ae || ae.r === void 0) || g[j] ? (P = null, J = M.clone()) : j != null && (P = p[j], D !== 1 && K[j] != null || ((k = te[j]) || (k = te[j] = r.writeCursor()), k.reset(), J = null));
+        const ae = l(A), Oe = l(M);
+        if (_(Oe)) {
+          const j = Oe.p;
+          Oe.r !== void 0 && (!ae || ae.r === void 0) || g[j] ? (P = null, J = M.clone()) : j != null && (P = p[j], D !== 1 && K[j] != null || ((U = te[j]) || (U = te[j] = r.writeCursor()), U.reset(), J = null));
         } else !s(X) && s(ee) && (P = null);
         ee = P != null ? P.getComponent() : null;
-        const H = ve(X);
+        const H = me(X);
         if (H) {
           const j = f(X);
-          if (J) O == null && (O = {
+          if (J) w == null && (w = {
             type: u.ConflictType.RM_UNEXPECTED_CONTENT,
             op1: a.editOp(W.getPath(), H, j, !0),
             op2: a.removeOp(J.getPath())
           });
           else {
-            const ie = ve(ee);
+            const ie = me(ee);
             let _e;
             if (ie) {
               if (H !== ie) throw Error("Transforming incompatible types");
               const ue = f(ee);
-              _e = H.transform(j, ue, m);
+              _e = H.transform(j, ue, O);
             } else _e = t.default(j);
-            y(k, H, _e);
+            y(U, H, _e);
           }
         }
-        let T = 0, G = 0, he = 0, we = 0, Re = 0, qe = 0, Me = A != null && A.descendFirst(), Je = Me;
+        let T = 0, G = 0, he = 0, be = 0, Re = 0, qe = 0, Me = A != null && A.descendFirst(), Je = Me;
         const ze = r.advancer(M, void 0, (j, ie) => {
           _(ie) && he++;
         });
-        let Se = P != null && P.descendFirst(), je = Se;
+        let ke = P != null && P.descendFirst(), je = ke;
         for (const j of W) if (typeof j == "number") {
           let ie;
           const _e = s(W.getComponent()), ue = j - G;
@@ -1273,28 +1273,28 @@ function en() {
             let Be;
             for (; Me && typeof (Be = A.getKey()) == "number"; ) {
               Be += T;
-              const ke = A.getComponent(), Xe = _(ke);
+              const Ue = A.getComponent(), Xe = _(Ue);
               if (Be > ue || Be === ue && (!Xe || D === 0 && _e)) break;
               if (Xe) {
                 T--;
-                const Ke = ke.p;
-                K.includes(Ke), ke.d, l(te[ke.d]), _(l(te[ke.d])), (ke.r === void 0 || Ae && Ae.has(ke)) && (Ke == null || !Pe[Ke] || D !== 1 && K.includes(Ke)) || Re--;
+                const Ke = Ue.p;
+                K.includes(Ke), Ue.d, l(te[Ue.d]), _(l(te[Ue.d])), (Ue.r === void 0 || Ae && Ae.has(Ue)) && (Ke == null || !Pe[Ke] || D !== 1 && K.includes(Ke)) || Re--;
               }
               Me = A.nextSibling();
             }
             ie = Me && Be === ue ? A : null;
           }
-          const Ue = ue - T;
-          let xe = ze(Ue);
-          const ot = Ue - he;
+          const Se = ue - T;
+          let xe = ze(Se);
+          const ot = Se - he;
           let Ze = null;
           {
-            let Be, ke;
-            for (; Se && typeof (Be = P.getKey()) == "number"; ) {
-              ke = Be - we;
+            let Be, Ue;
+            for (; ke && typeof (Be = P.getKey()) == "number"; ) {
+              Ue = Be - be;
               const Xe = P.getComponent(), Ke = s(Xe);
-              if (ke > ot) break;
-              if (ke === ot) {
+              if (Ue > ot) break;
+              if (Ue === ot) {
                 if (!Ke) {
                   Ze = P;
                   break;
@@ -1310,36 +1310,36 @@ function en() {
               }
               if (Ke) {
                 const We = Xe.d;
-                g[We], K[We], Xe.i === void 0 && (g[We] || K[We] != null && D !== 1) ? (g[We] || K[We] != null && D === 0) && (we++, qe--) : we++;
+                g[We], K[We], Xe.i === void 0 && (g[We] || K[We] != null && D !== 1) ? (g[We] || K[We] != null && D === 0) && (be++, qe--) : be++;
               }
-              Se = P.nextSibling();
+              ke = P.nextSibling();
             }
           }
-          const yt = ot + we + Re + qe;
-          o(yt >= 0, "trying to descend to a negative index"), k.descend(yt), _e && (ie = xe = Ze = null, G++), Q(ie, W, xe, Ze, k, J) && qe++, k.ascend();
+          const _t = ot + be + Re + qe;
+          o(_t >= 0, "trying to descend to a negative index"), U.descend(_t), _e && (ie = xe = Ze = null, G++), Q(ie, W, xe, Ze, U, J) && qe++, U.ascend();
         } else {
           let ie;
           for (; Me && (ie = A.getKey(), typeof ie != "string" || !(ie > j || ie === j)); ) Me = A.nextSibling();
           const _e = Me && ie === j ? A : null, ue = ze(j);
-          let Ue;
-          for (; Se && (Ue = P.getKey(), typeof Ue != "string" || !(Ue > j || Ue === j)); ) Se = P.nextSibling();
-          const xe = Se && Ue === j ? P : null;
-          k.descend(j), Q(_e, W, ue, xe, k, J), k.ascend();
+          let Se;
+          for (; ke && (Se = P.getKey(), typeof Se != "string" || !(Se > j || Se === j)); ) ke = P.nextSibling();
+          const xe = ke && Se === j ? P : null;
+          U.descend(j), Q(_e, W, ue, xe, U, J), U.ascend();
         }
         return ze.end(), Je && A.ascend(), je && P.ascend(), fe;
-      }(Oe, Oe.clone(), ye, ye.clone(), oe, null), O) return {
+      }(we, we.clone(), ye, ye.clone(), oe, null), w) return {
         ok: !1,
-        conflict: O
+        conflict: w
       };
       oe.reset();
       const Te = (Q, A, W) => Q.traverse(A, (M, P) => {
         M.d != null && W(M.d, Q, P);
       });
       (g.length || re.length) && (Te(ye, oe, (Q, A, W) => {
-        g[Q] && !U[Q] && W.write("r", !0), re[Q] && W.mergeTree(re[Q].get());
+        g[Q] && !S[Q] && W.write("r", !0), re[Q] && W.mergeTree(re[Q].get());
       }), oe.reset());
       const Ie = [], Ne = [];
-      if ((te.length || g.length) && !O) {
+      if ((te.length || g.length) && !w) {
         const Q = r.readCursor(it(oe.get()));
         if (Te(Q, null, (A, W) => {
           Ie[A] = W.clone();
@@ -1347,11 +1347,11 @@ function en() {
           A && Te(r.readCursor(A.get()), null, (W, M) => {
             Ie[W] = M.clone();
           });
-        }), function A(W, M, P, k, J, X) {
+        }), function A(W, M, P, U, J, X) {
           const ee = l(M);
           if (ee && _(ee)) if (ee.p != null) {
             const T = ee.p;
-            Ie[T].getPath(), P = Ie[T], k = Ne[T] = r.writeCursor();
+            Ie[T].getPath(), P = Ie[T], U = Ne[T] = r.writeCursor();
           } else ee.r !== void 0 && (P = null);
           else s(l(P)) && (P = null);
           const fe = W.getComponent();
@@ -1359,42 +1359,42 @@ function en() {
             let T;
             if ((T = fe.d) != null) {
               const G = te[T];
-              G && (G.get(), k.mergeTree(G.get()), P = r.readCursor(G.get()));
+              G && (G.get(), U.mergeTree(G.get()), P = r.readCursor(G.get()));
             }
           }
-          let de = 0, ae = 0;
-          const me = r.advancer(M, void 0, (T, G) => {
-            _(G) && de--;
+          let ce = 0, ae = 0;
+          const Oe = r.advancer(M, void 0, (T, G) => {
+            _(G) && ce--;
           }), H = r.advancer(P, (T, G) => s(G) ? -(T - ae) - 1 : T - ae, (T, G) => {
             s(G) && ae++;
           });
           for (const T of W) if (typeof T == "number") {
-            const G = me(T), he = T + de, we = H(he), Re = he + ae;
-            k.descend(Re), A(W, G, we, k), k.ascend();
-          } else k.descend(T), A(W, me(T), H(T), k), k.ascend();
-          me.end(), H.end();
-        }(ye, Q, Q.clone(), oe), oe.reset(), O) return {
+            const G = Oe(T), he = T + ce, be = H(he), Re = he + ae;
+            U.descend(Re), A(W, G, be, U), U.ascend();
+          } else U.descend(T), A(W, Oe(T), H(T), U), U.ascend();
+          Oe.end(), H.end();
+        }(ye, Q, Q.clone(), oe), oe.reset(), w) return {
           ok: !1,
-          conflict: O
+          conflict: w
         };
         if (oe.get(), Ne.length) {
           const A = Ne.map((M) => M ? M.get() : null), W = r.readCursor(it(oe.get()));
-          if (Te(W, oe, (M, P, k) => {
+          if (Te(W, oe, (M, P, U) => {
             const J = A[M];
-            J && (k.mergeTree(J), A[M] = null);
+            J && (U.mergeTree(J), A[M] = null);
           }), A.find((M) => M)) {
             const M = r.writeCursor(), P = r.writeCursor();
-            let k = 0, J = 0;
+            let U = 0, J = 0;
             A.forEach((X) => {
               X != null && Te(r.readCursor(X), null, (ee) => {
                 const fe = Le[ee];
-                M.writeMove(I[fe].getPath(), R[fe].getPath(), k++);
-                const de = se[fe];
-                de && de.forEach((ae) => {
+                M.writeMove(I[fe].getPath(), R[fe].getPath(), U++);
+                const ce = se[fe];
+                ce && ce.forEach((ae) => {
                   g[ae] || D !== 1 && K[ae] != null || P.writeMove($[ae].getPath(), p[ae].getPath(), J++);
                 });
               });
-            }), O = {
+            }), w = {
               type: u.ConflictType.BLACKHOLE,
               op1: M.get(),
               op2: P.get()
@@ -1402,62 +1402,62 @@ function en() {
           }
         }
       }
-      return O ? {
+      return w ? {
         ok: !1,
-        conflict: O
+        conflict: w
       } : {
         ok: !0,
         result: oe.get()
       };
     }
-    const pt = (i) => {
-      const d = new Error("Transform detected write conflict");
-      throw d.conflict = i, d.type = d.name = "writeConflict", d;
+    const gt = (i) => {
+      const c = new Error("Transform detected write conflict");
+      throw c.conflict = i, c.type = c.name = "writeConflict", c;
     };
-    function St(i, d, m) {
-      const D = st(i, d, m);
+    function jt(i, c, O) {
+      const D = st(i, c, O);
       if (D.ok) return D.result;
-      pt(D.conflict);
+      gt(D.conflict);
     }
     const He = (i) => {
-      const d = r.writeCursor();
-      return r.readCursor(i).traverse(d, (m, D) => {
-        (s(m) || ve(m)) && D.write("r", !0);
-      }), d.get();
-    }, jt = (i, d) => {
-      const { type: m, op1: D, op2: O } = i;
-      switch (m) {
+      const c = r.writeCursor();
+      return r.readCursor(i).traverse(c, (O, D) => {
+        (s(O) || me(O)) && D.write("r", !0);
+      }), c.get();
+    }, $t = (i, c) => {
+      const { type: O, op1: D, op2: w } = i;
+      switch (O) {
         case u.ConflictType.DROP_COLLISION:
-          return d === "left" ? [null, He(O)] : [He(D), null];
+          return c === "left" ? [null, He(w)] : [He(D), null];
         case u.ConflictType.RM_UNEXPECTED_CONTENT:
           let I = !1;
           return r.readCursor(D).traverse(null, (R) => {
             R.r !== void 0 && (I = !0);
-          }), I ? [null, He(O)] : [He(D), null];
+          }), I ? [null, He(w)] : [He(D), null];
         case u.ConflictType.BLACKHOLE:
-          return [He(D), He(O)];
+          return [He(D), He(w)];
         default:
-          throw Error("Unrecognised conflict: " + m);
+          throw Error("Unrecognised conflict: " + O);
       }
     };
-    function gt(i, d, m, D) {
-      let O = null;
+    function yt(i, c, O, D) {
+      let w = null;
       for (; ; ) {
-        const I = st(d, m, D);
-        if (I.ok) return ne(O, I.result);
+        const I = st(c, O, D);
+        if (I.ok) return ne(w, I.result);
         {
           const { conflict: R } = I;
-          i(R) || pt(R);
-          const [$, p] = jt(R, D);
-          d = ne(q(d), $), m = ne(q(m), p), O = ne(O, p);
+          i(R) || gt(R);
+          const [$, p] = $t(R, D);
+          c = ne(q(c), $), O = ne(q(O), p), w = ne(w, p);
         }
       }
     }
   }(et)), et;
 }
-var Dt;
-function tn() {
-  return Dt || (Dt = 1, function(a) {
+var Pt;
+function sn() {
+  return Pt || (Pt = 1, function(a) {
     var e = Ye.__createBinding || (Object.create ? function(u, o, l, E) {
       E === void 0 && (E = l), Object.defineProperty(u, E, { enumerable: !0, get: function() {
         return o[l];
@@ -1467,56 +1467,56 @@ function tn() {
     }), n = Ye.__exportStar || function(u, o) {
       for (var l in u) l !== "default" && !o.hasOwnProperty(l) && e(o, u, l);
     };
-    Object.defineProperty(a, "__esModule", { value: !0 }), n(en(), a);
+    Object.defineProperty(a, "__esModule", { value: !0 }), n(rn(), a);
     var t = Mt();
     Object.defineProperty(a, "ReadCursor", { enumerable: !0, get: function() {
       return t.ReadCursor;
     } }), Object.defineProperty(a, "WriteCursor", { enumerable: !0, get: function() {
       return t.WriteCursor;
     } });
-    var r = Ut();
+    var r = St();
     Object.defineProperty(a, "ConflictType", { enumerable: !0, get: function() {
       return r.ConflictType;
     } });
   }(Ye)), Ye;
 }
-var V = tn();
-class nn {
+var V = sn();
+class on {
   constructor() {
     F(this, "drawingManagerData", {});
     F(this, "_oldDrawingManagerData", {});
     F(this, "_focusDrawings", []);
-    F(this, "_remove$", new be());
+    F(this, "_remove$", new ve());
     F(this, "remove$", this._remove$.asObservable());
-    F(this, "_add$", new be());
+    F(this, "_add$", new ve());
     F(this, "add$", this._add$.asObservable());
-    F(this, "_update$", new be());
+    F(this, "_update$", new ve());
     F(this, "update$", this._update$.asObservable());
-    F(this, "_order$", new be());
+    F(this, "_order$", new ve());
     F(this, "order$", this._order$.asObservable());
-    F(this, "_group$", new be());
+    F(this, "_group$", new ve());
     F(this, "group$", this._group$.asObservable());
-    F(this, "_ungroup$", new be());
+    F(this, "_ungroup$", new ve());
     F(this, "ungroup$", this._ungroup$.asObservable());
-    F(this, "_refreshTransform$", new be());
+    F(this, "_refreshTransform$", new ve());
     F(this, "refreshTransform$", this._refreshTransform$.asObservable());
-    F(this, "_visible$", new be());
+    F(this, "_visible$", new ve());
     F(this, "visible$", this._visible$.asObservable());
     // private readonly _externalUpdate$ = new Subject<T[]>();
     // readonly externalUpdate$ = this._externalUpdate$.asObservable();
-    F(this, "_focus$", new be());
+    F(this, "_focus$", new ve());
     F(this, "focus$", this._focus$.asObservable());
-    F(this, "_featurePluginUpdate$", new be());
+    F(this, "_featurePluginUpdate$", new ve());
     F(this, "featurePluginUpdate$", this._featurePluginUpdate$.asObservable());
-    F(this, "_featurePluginAdd$", new be());
+    F(this, "_featurePluginAdd$", new ve());
     F(this, "featurePluginAdd$", this._featurePluginAdd$.asObservable());
-    F(this, "_featurePluginRemove$", new be());
+    F(this, "_featurePluginRemove$", new ve());
     F(this, "featurePluginRemove$", this._featurePluginRemove$.asObservable());
-    F(this, "_featurePluginOrderUpdate$", new be());
+    F(this, "_featurePluginOrderUpdate$", new ve());
     F(this, "featurePluginOrderUpdate$", this._featurePluginOrderUpdate$.asObservable());
-    F(this, "_featurePluginGroupUpdate$", new be());
+    F(this, "_featurePluginGroupUpdate$", new ve());
     F(this, "featurePluginGroupUpdate$", this._featurePluginGroupUpdate$.asObservable());
-    F(this, "_featurePluginUngroupUpdate$", new be());
+    F(this, "_featurePluginUngroupUpdate$", new ve());
     F(this, "featurePluginUngroupUpdate$", this._featurePluginUngroupUpdate$.asObservable());
     F(this, "_visible", !0);
     F(this, "_editable", !0);
@@ -1651,9 +1651,9 @@ class nn {
     );
     let E = Number.NEGATIVE_INFINITY;
     return t.forEach((x) => {
-      const { unitId: _, subUnitId: s, drawingId: c } = x, h = this._hasDrawingOrder({ unitId: _, subUnitId: s, drawingId: c });
+      const { unitId: _, subUnitId: s, drawingId: d } = x, h = this._hasDrawingOrder({ unitId: _, subUnitId: s, drawingId: d });
       E = Math.max(E, h), l.push(
-        ...this._getUpdateParamCompareOp(x, this.getDrawingByParam({ unitId: _, subUnitId: s, drawingId: c }))
+        ...this._getUpdateParamCompareOp(x, this.getDrawingByParam({ unitId: _, subUnitId: s, drawingId: d }))
       );
     }), E === Number.NEGATIVE_INFINITY && (E = this._getDrawingOrder(r, u).length), l.push(
       V.insertOp([r, u, "order", E], o)
@@ -1724,7 +1724,7 @@ class nn {
     return this._getCurrentBySearch({ unitId: n, subUnitId: t, drawingId: r });
   }
   focusDrawing(e) {
-    if (e == null) {
+    if (e == null || e.length === 0) {
       this._focusDrawings = [], this._focus$.next([]);
       return;
     }
@@ -1759,8 +1759,8 @@ class nn {
       const s = this._hasDrawingOrder({ unitId: n, subUnitId: t, drawingId: _ });
       if (s === -1 || s === o.length - 1)
         return;
-      const c = V.moveOp([n, t, "order", s], [n, t, "order", s + 1]);
-      u.push(c), l.includes(o[s + 1]) || l.push(o[s + 1]);
+      const d = V.moveOp([n, t, "order", s], [n, t, "order", s + 1]);
+      u.push(d), l.includes(o[s + 1]) || l.push(o[s + 1]);
     });
     const E = u.reduce(V.type.compose, null);
     return { undo: V.type.invertWithDoc(E, this.drawingManagerData), redo: E, unitId: n, subUnitId: t, objects: { ...e, drawingIds: l } };
@@ -1771,8 +1771,8 @@ class nn {
       const s = this._hasDrawingOrder({ unitId: n, subUnitId: t, drawingId: _ });
       if (s === -1 || s === 0)
         return;
-      const c = V.moveOp([n, t, "order", s], [n, t, "order", s - 1]);
-      u.push(c), l.includes(o[s - 1]) || l.push(o[s - 1]);
+      const d = V.moveOp([n, t, "order", s], [n, t, "order", s - 1]);
+      u.push(d), l.includes(o[s - 1]) || l.push(o[s - 1]);
     });
     const E = u.reduce(V.type.compose, null);
     return { undo: V.type.invertWithDoc(E, this.drawingManagerData), redo: E, unitId: n, subUnitId: t, objects: { ...e, drawingIds: l } };
@@ -1780,8 +1780,8 @@ class nn {
   getFrontDrawingsOp(e) {
     const { unitId: n, subUnitId: t, drawingIds: r } = e, u = this._getOrderFromSearchParams(n, t, r), o = [...r], l = this.getDrawingOrder(n, t), E = [];
     u.forEach((s) => {
-      const { drawingId: c } = s, h = this._getDrawingCount(n, t) - 1, S = V.moveOp([n, t, "order", this._getDrawingOrder(n, t).indexOf(c)], [n, t, "order", h]);
-      E.push(S), o.includes(l[h]) || o.push(l[h]);
+      const { drawingId: d } = s, h = this._getDrawingCount(n, t) - 1, k = V.moveOp([n, t, "order", this._getDrawingOrder(n, t).indexOf(d)], [n, t, "order", h]);
+      E.push(k), o.includes(l[h]) || o.push(l[h]);
     });
     const x = E.reduce(V.type.compose, null);
     return { undo: V.type.invertWithDoc(x, this.drawingManagerData), redo: x, unitId: n, subUnitId: t, objects: { ...e, drawingIds: o } };
@@ -1789,7 +1789,7 @@ class nn {
   getBackDrawingsOp(e) {
     const { unitId: n, subUnitId: t, drawingIds: r } = e, u = this._getOrderFromSearchParams(n, t, r, !0), o = [...r], l = this.getDrawingOrder(n, t), E = [];
     u.forEach((s) => {
-      const { drawingId: c } = s, h = V.moveOp([n, t, "order", this._getDrawingOrder(n, t).indexOf(c)], [n, t, "order", 0]);
+      const { drawingId: d } = s, h = V.moveOp([n, t, "order", this._getDrawingOrder(n, t).indexOf(d)], [n, t, "order", 0]);
       E.push(h), o.includes(l[0]) || o.push(l[0]);
     });
     const x = E.reduce(V.type.compose, null);
@@ -1802,7 +1802,7 @@ class nn {
     return t.map((u) => {
       const o = this._hasDrawingOrder({ unitId: e, subUnitId: n, drawingId: u });
       return { drawingId: u, zIndex: o };
-    }).sort(r === !1 ? Rt : xt);
+    }).sort(r === !1 ? xt : Bt);
   }
   _hasDrawingOrder(e) {
     if (e == null)
@@ -1890,12 +1890,12 @@ class nn {
     this._editable = e;
   }
 }
-class rn extends nn {
+class an extends on {
 }
-function vn({ unitId: a, subUnitId: e, drawingId: n }, t) {
+function bn({ unitId: a, subUnitId: e, drawingId: n }, t) {
   return typeof t == "number" ? `${a}#-#${e}#-#${n}#-#${t}` : `${a}#-#${e}#-#${n}`;
 }
-const mn = async (a) => new Promise((e, n) => {
+const vn = async (a) => new Promise((e, n) => {
   const t = new Image();
   t.src = a, t.onload = () => {
     e({
@@ -1906,11 +1906,18 @@ const mn = async (a) => new Promise((e, n) => {
   }, t.onerror = (r) => {
     n(r);
   };
-}), sn = "drawing.config", Pt = {}, on = Bt("univer.drawing-manager.service");
-class an {
+}), Ut = Wt("univer.drawing-manager.service"), ln = {
+  id: "drawing.operation.set-drawing-selected",
+  type: Gt.OPERATION,
+  handler: (a, e) => {
+    const n = a.get(Ut);
+    return e == null ? !1 : (n.focusDrawing(e), !0);
+  }
+}, un = "drawing.config", Tt = {};
+class dn {
   constructor() {
     F(this, "_waitCount", 0);
-    F(this, "_change$", new be());
+    F(this, "_change$", new ve());
     F(this, "change$", this._change$);
     F(this, "_imageSourceCache", /* @__PURE__ */ new Map());
   }
@@ -1932,11 +1939,11 @@ class an {
   }
   async saveImage(e) {
     return new Promise((n, t) => {
-      if (!Xt.includes(e.type)) {
+      if (!Zt.includes(e.type)) {
         t(new Error(Qe.ERROR_IMAGE_TYPE)), this._decreaseWaiting();
         return;
       }
-      if (e.size > zt) {
+      if (e.size > Yt) {
         t(new Error(Qe.ERROR_EXCEED_SIZE)), this._decreaseWaiting();
         return;
       }
@@ -1948,7 +1955,7 @@ class an {
           t(new Error(Qe.ERROR_IMAGE)), this._decreaseWaiting();
           return;
         }
-        const l = Wt.generateRandomId(6);
+        const l = Lt.generateRandomId(6);
         n({
           imageId: l,
           imageSourceType: at.BASE64,
@@ -1963,52 +1970,59 @@ class an {
     this._waitCount -= 1, this._change$.next(this._waitCount);
   }
 }
-var ln = Object.defineProperty, un = Object.getOwnPropertyDescriptor, cn = (a, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? un(e, n) : e, u = a.length - 1, o; u >= 0; u--)
+var cn = Object.defineProperty, fn = Object.getOwnPropertyDescriptor, hn = (a, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? fn(e, n) : e, u = a.length - 1, o; u >= 0; u--)
     (o = a[u]) && (r = (t ? o(e, n, r) : o(r)) || r);
-  return t && r && ln(e, n, r), r;
-}, Tt = (a, e) => (n, t) => e(n, t, a);
-const dn = "UNIVER_DRAWING_PLUGIN";
-var dt;
-let At = (dt = class extends qt {
-  constructor(a = Pt, e, n) {
-    super(), this._config = a, this._injector = e, this._configService = n;
-    const { ...t } = Kt(
+  return t && r && cn(e, n, r), r;
+}, ct = (a, e) => (n, t) => e(n, t, a);
+const pn = "UNIVER_DRAWING_PLUGIN";
+var ft;
+let At = (ft = class extends Ft {
+  constructor(a = Tt, e, n, t) {
+    super(), this._config = a, this._injector = e, this._configService = n, this._commandService = t;
+    const { ...r } = Vt(
       {},
-      Pt,
+      Tt,
       this._config
     );
-    this._configService.setConfig(sn, t);
+    this._configService.setConfig(un, r);
   }
   onStarting() {
-    this._initDependencies();
+    this._initCommands(), this._initDependencies();
   }
   _initDependencies() {
     var n;
-    Ft([
-      [Ht, { useClass: an }],
-      [on, { useClass: rn }]
+    Ht([
+      [Jt, { useClass: dn }],
+      [Ut, { useClass: an }]
     ], (n = this._config) == null ? void 0 : n.override).forEach((t) => this._injector.add(t));
   }
-}, F(dt, "pluginName", dn), dt);
-At = cn([
-  Tt(1, Gt(Lt)),
-  Tt(2, Vt)
+  _initCommands() {
+    [
+      ln
+    ].forEach((a) => this.disposeWithMe(this._commandService.registerCommand(a)));
+  }
+}, F(ft, "pluginName", pn), ft);
+At = hn([
+  ct(1, qt(Kt)),
+  ct(2, zt),
+  ct(3, Xt)
 ], At);
 export {
-  Xt as DRAWING_IMAGE_ALLOW_IMAGE_LIST,
-  zt as DRAWING_IMAGE_ALLOW_SIZE,
-  _n as DRAWING_IMAGE_COUNT_LIMIT,
-  yn as DRAWING_IMAGE_HEIGHT_LIMIT,
-  gn as DRAWING_IMAGE_WIDTH_LIMIT,
-  rn as DrawingManagerService,
-  on as IDrawingManagerService,
-  bn as IImageIoService,
-  an as ImageIoService,
-  Cn as ImageSourceType,
-  In as ImageUploadStatusType,
-  nn as UnitDrawingService,
+  Zt as DRAWING_IMAGE_ALLOW_IMAGE_LIST,
+  Yt as DRAWING_IMAGE_ALLOW_SIZE,
+  wn as DRAWING_IMAGE_COUNT_LIMIT,
+  On as DRAWING_IMAGE_HEIGHT_LIMIT,
+  mn as DRAWING_IMAGE_WIDTH_LIMIT,
+  an as DrawingManagerService,
+  Ut as IDrawingManagerService,
+  En as IImageIoService,
+  dn as ImageIoService,
+  Dn as ImageSourceType,
+  Pn as ImageUploadStatusType,
+  ln as SetDrawingSelectedOperation,
+  on as UnitDrawingService,
   At as UniverDrawingPlugin,
-  vn as getDrawingShapeKeyByDrawingSearch,
-  mn as getImageSize
+  bn as getDrawingShapeKeyByDrawingSearch,
+  vn as getImageSize
 };