react-monaco-json-merge 1.1.17 → 1.2.0

package/dist/index.mjs

@@ -1,22 +1,22 @@
-import { jsx as st, Fragment as On } from "react/jsx-runtime";
-import { useState as _e, useRef as le, useCallback as Ee, useEffect as Se } from "react";
-function Wt(e, t) {
+import { jsx as ht, Fragment as In } from "react/jsx-runtime";
+import { useState as Pe, useRef as ae, useCallback as Te, useEffect as Se } from "react";
+function Zt(e, t) {
   (t == null || t > e.length) && (t = e.length);
   for (var r = 0, n = Array(t); r < t; r++) n[r] = e[r];
   return n;
 }
-function wn(e) {
+function Ln(e) {
   if (Array.isArray(e)) return e;
 }
-function An(e, t, r) {
-  return (t = kn(t)) in e ? Object.defineProperty(e, t, {
+function Sn(e, t, r) {
+  return (t = xn(t)) in e ? Object.defineProperty(e, t, {
     value: r,
     enumerable: !0,
     configurable: !0,
     writable: !0
   }) : e[t] = r, e;
 }
-function Nn(e, t) {
+function kn(e, t) {
   var r = e == null ? null : typeof Symbol < "u" && e[Symbol.iterator] || e["@@iterator"];
   if (r != null) {
     var n, o, i, s, c = [], a = !0, u = !1;
@@ -34,11 +34,11 @@ function Nn(e, t) {
     return c;
   }
 }
-function En() {
+function _n() {
   throw new TypeError(`Invalid attempt to destructure non-iterable instance.
 In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`);
 }
-function qt(e, t) {
+function Kt(e, t) {
   var r = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
     var n = Object.getOwnPropertySymbols(e);
@@ -48,27 +48,27 @@ function qt(e, t) {
   }
   return r;
 }
-function Yt(e) {
+function en(e) {
   for (var t = 1; t < arguments.length; t++) {
     var r = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? qt(Object(r), !0).forEach(function(n) {
-      An(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : qt(Object(r)).forEach(function(n) {
+    t % 2 ? Kt(Object(r), !0).forEach(function(n) {
+      Sn(e, n, r[n]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : Kt(Object(r)).forEach(function(n) {
       Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
     });
   }
   return e;
 }
-function Tn(e, t) {
+function Pn(e, t) {
   if (e == null) return {};
-  var r, n, o = In(e, t);
+  var r, n, o = jn(e, t);
   if (Object.getOwnPropertySymbols) {
     var i = Object.getOwnPropertySymbols(e);
     for (n = 0; n < i.length; n++) r = i[n], t.indexOf(r) === -1 && {}.propertyIsEnumerable.call(e, r) && (o[r] = e[r]);
   }
   return o;
 }
-function In(e, t) {
+function jn(e, t) {
   if (e == null) return {};
   var r = {};
   for (var n in e) if ({}.hasOwnProperty.call(e, n)) {
@@ -77,10 +77,10 @@ function In(e, t) {
   }
   return r;
 }
-function Ln(e, t) {
-  return wn(e) || Nn(e, t) || _n(e, t) || En();
+function Rn(e, t) {
+  return Ln(e) || kn(e, t) || Mn(e, t) || _n();
 }
-function Sn(e, t) {
+function Dn(e, t) {
   if (typeof e != "object" || !e) return e;
   var r = e[Symbol.toPrimitive];
   if (r !== void 0) {
@@ -90,18 +90,18 @@ function Sn(e, t) {
   }
   return (t === "string" ? String : Number)(e);
 }
-function kn(e) {
-  var t = Sn(e, "string");
+function xn(e) {
+  var t = Dn(e, "string");
   return typeof t == "symbol" ? t : t + "";
 }
-function _n(e, t) {
+function Mn(e, t) {
   if (e) {
-    if (typeof e == "string") return Wt(e, t);
+    if (typeof e == "string") return Zt(e, t);
     var r = {}.toString.call(e).slice(8, -1);
-    return r === "Object" && e.constructor && (r = e.constructor.name), r === "Map" || r === "Set" ? Array.from(e) : r === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? Wt(e, t) : void 0;
+    return r === "Object" && e.constructor && (r = e.constructor.name), r === "Map" || r === "Set" ? Array.from(e) : r === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r) ? Zt(e, t) : void 0;
   }
 }
-function Pn(e, t, r) {
+function $n(e, t, r) {
   return t in e ? Object.defineProperty(e, t, {
     value: r,
     enumerable: !0,
@@ -109,7 +109,7 @@ function Pn(e, t, r) {
     writable: !0
   }) : e[t] = r, e;
 }
-function zt(e, t) {
+function tn(e, t) {
   var r = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
     var n = Object.getOwnPropertySymbols(e);
@@ -119,18 +119,18 @@ function zt(e, t) {
   }
   return r;
 }
-function Xt(e) {
+function nn(e) {
   for (var t = 1; t < arguments.length; t++) {
     var r = arguments[t] != null ? arguments[t] : {};
-    t % 2 ? zt(Object(r), !0).forEach(function(n) {
-      Pn(e, n, r[n]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : zt(Object(r)).forEach(function(n) {
+    t % 2 ? tn(Object(r), !0).forEach(function(n) {
+      $n(e, n, r[n]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : tn(Object(r)).forEach(function(n) {
       Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
     });
   }
   return e;
 }
-function Rn() {
+function Bn() {
   for (var e = arguments.length, t = new Array(e), r = 0; r < e; r++)
     t[r] = arguments[r];
   return function(n) {
@@ -139,7 +139,7 @@ function Rn() {
     }, n);
   };
 }
-function Ce(e) {
+function ot(e) {
   return function t() {
     for (var r = this, n = arguments.length, o = new Array(n), i = 0; i < n; i++)
       o[i] = arguments[i];
@@ -150,38 +150,38 @@ function Ce(e) {
     };
   };
 }
-function lt(e) {
+function yt(e) {
   return {}.toString.call(e).includes("Object");
 }
-function jn(e) {
+function Fn(e) {
   return !Object.keys(e).length;
 }
-function Ke(e) {
+function it(e) {
   return typeof e == "function";
 }
-function Dn(e, t) {
+function Un(e, t) {
   return Object.prototype.hasOwnProperty.call(e, t);
 }
-function Mn(e, t) {
-  return lt(t) || Re("changeType"), Object.keys(t).some(function(r) {
-    return !Dn(e, r);
-  }) && Re("changeField"), t;
+function Vn(e, t) {
+  return yt(t) || xe("changeType"), Object.keys(t).some(function(r) {
+    return !Un(e, r);
+  }) && xe("changeField"), t;
 }
-function xn(e) {
-  Ke(e) || Re("selectorType");
+function Jn(e) {
+  it(e) || xe("selectorType");
 }
-function $n(e) {
-  Ke(e) || lt(e) || Re("handlerType"), lt(e) && Object.values(e).some(function(t) {
-    return !Ke(t);
-  }) && Re("handlersType");
+function Hn(e) {
+  it(e) || yt(e) || xe("handlerType"), yt(e) && Object.values(e).some(function(t) {
+    return !it(t);
+  }) && xe("handlersType");
 }
-function Bn(e) {
-  e || Re("initialIsRequired"), lt(e) || Re("initialType"), jn(e) && Re("initialContent");
+function Gn(e) {
+  e || xe("initialIsRequired"), yt(e) || xe("initialType"), Fn(e) && xe("initialContent");
 }
-function Fn(e, t) {
+function Wn(e, t) {
   throw new Error(e[t] || e.default);
 }
-var Un = {
+var qn = {
   initialIsRequired: "initial state is required",
   initialType: "initial state should be an object",
   initialContent: "initial state shouldn't be an empty object",
@@ -191,49 +191,49 @@ var Un = {
   changeType: "provided value of changes should be an object",
   changeField: 'it seams you want to change a field in the state which is not specified in the "initial" state',
   default: "an unknown error accured in `state-local` package"
-}, Re = Ce(Fn)(Un), it = {
-  changes: Mn,
-  selector: xn,
-  handler: $n,
-  initial: Bn
+}, xe = ot(Wn)(qn), dt = {
+  changes: Vn,
+  selector: Jn,
+  handler: Hn,
+  initial: Gn
 };
-function Vn(e) {
+function Yn(e) {
   var t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-  it.initial(e), it.handler(t);
+  dt.initial(e), dt.handler(t);
   var r = {
     current: e
-  }, n = Ce(Gn)(r, t), o = Ce(Hn)(r), i = Ce(it.changes)(e), s = Ce(Jn)(r);
+  }, n = ot(Xn)(r, t), o = ot(Cn)(r), i = ot(dt.changes)(e), s = ot(zn)(r);
   function c() {
     var u = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : function(l) {
       return l;
     };
-    return it.selector(u), u(r.current);
+    return dt.selector(u), u(r.current);
   }
   function a(u) {
-    Rn(n, o, i, s)(u);
+    Bn(n, o, i, s)(u);
   }
   return [c, a];
 }
-function Jn(e, t) {
-  return Ke(t) ? t(e.current) : t;
+function zn(e, t) {
+  return it(t) ? t(e.current) : t;
 }
-function Hn(e, t) {
-  return e.current = Xt(Xt({}, e.current), t), t;
+function Cn(e, t) {
+  return e.current = nn(nn({}, e.current), t), t;
 }
-function Gn(e, t, r) {
-  return Ke(t) ? t(e.current) : Object.keys(r).forEach(function(n) {
+function Xn(e, t, r) {
+  return it(t) ? t(e.current) : Object.keys(r).forEach(function(n) {
     var o;
     return (o = t[n]) === null || o === void 0 ? void 0 : o.call(t, e.current[n]);
   }), r;
 }
-var Wn = {
-  create: Vn
-}, qn = {
+var Qn = {
+  create: Yn
+}, Zn = {
   paths: {
     vs: "https://cdn.jsdelivr.net/npm/monaco-editor@0.54.0/min/vs"
   }
 };
-function Yn(e) {
+function Kn(e) {
   return function t() {
     for (var r = this, n = arguments.length, o = new Array(n), i = 0; i < n; i++)
       o[i] = arguments[i];
@@ -244,23 +244,23 @@ function Yn(e) {
     };
   };
 }
-function zn(e) {
+function er(e) {
   return {}.toString.call(e).includes("Object");
 }
-function Xn(e) {
-  return e || Qt("configIsRequired"), zn(e) || Qt("configType"), e.urls ? (Qn(), {
+function tr(e) {
+  return e || rn("configIsRequired"), er(e) || rn("configType"), e.urls ? (nr(), {
     paths: {
       vs: e.urls.monacoBase
     }
   }) : e;
 }
-function Qn() {
-  console.warn(on.deprecation);
+function nr() {
+  console.warn(pn.deprecation);
 }
-function Zn(e, t) {
+function rr(e, t) {
   throw new Error(e[t] || e.default);
 }
-var on = {
+var pn = {
   configIsRequired: "the configuration object is required",
   configType: "the configuration object should be an object",
   default: "an unknown error accured in `@monaco-editor/loader` package",
@@ -274,9 +274,9 @@ var on = {
 
     For more please check the link https://github.com/suren-atoyan/monaco-loader#config
   `
-}, Qt = Yn(Zn)(on), Cn = {
-  config: Xn
-}, Kn = function() {
+}, rn = Kn(rr)(pn), or = {
+  config: tr
+}, ir = function() {
   for (var t = arguments.length, r = new Array(t), n = 0; n < t; n++)
     r[n] = arguments[n];
   return function(o) {
@@ -285,43 +285,43 @@ var on = {
     }, o);
   };
 };
-function sn(e, t) {
+function dn(e, t) {
   return Object.keys(t).forEach(function(r) {
-    t[r] instanceof Object && e[r] && Object.assign(t[r], sn(e[r], t[r]));
-  }), Yt(Yt({}, e), t);
+    t[r] instanceof Object && e[r] && Object.assign(t[r], dn(e[r], t[r]));
+  }), en(en({}, e), t);
 }
-var er = {
+var sr = {
   type: "cancelation",
   msg: "operation is manually canceled"
 };
-function vt(e) {
+function It(e) {
   var t = !1, r = new Promise(function(n, o) {
     e.then(function(i) {
-      return t ? o(er) : n(i);
+      return t ? o(sr) : n(i);
     }), e.catch(o);
   });
   return r.cancel = function() {
     return t = !0;
   }, r;
 }
-var tr = ["monaco"], nr = Wn.create({
-  config: qn,
+var cr = ["monaco"], ar = Qn.create({
+  config: Zn,
   isInitialized: !1,
   resolve: null,
   reject: null,
   monaco: null
-}), cn = Ln(nr, 2), tt = cn[0], dt = cn[1];
-function rr(e) {
-  var t = Cn.config(e), r = t.monaco, n = Tn(t, tr);
-  dt(function(o) {
+}), hn = Rn(ar, 2), ct = hn[0], Ot = hn[1];
+function lr(e) {
+  var t = or.config(e), r = t.monaco, n = Pn(t, cr);
+  Ot(function(o) {
     return {
-      config: sn(o.config, n),
+      config: dn(o.config, n),
       monaco: r
     };
   });
 }
-function or() {
-  var e = tt(function(t) {
+function ur() {
+  var e = ct(function(t) {
     var r = t.monaco, n = t.isInitialized, o = t.resolve;
     return {
       monaco: r,
@@ -330,37 +330,37 @@ function or() {
     };
   });
   if (!e.isInitialized) {
-    if (dt({
+    if (Ot({
       isInitialized: !0
     }), e.monaco)
-      return e.resolve(e.monaco), vt(bt);
+      return e.resolve(e.monaco), It(Lt);
     if (window.monaco && window.monaco.editor)
-      return an(window.monaco), e.resolve(window.monaco), vt(bt);
-    Kn(ir, cr)(ar);
+      return gn(window.monaco), e.resolve(window.monaco), It(Lt);
+    ir(fr, dr)(hr);
   }
-  return vt(bt);
+  return It(Lt);
 }
-function ir(e) {
+function fr(e) {
   return document.body.appendChild(e);
 }
-function sr(e) {
+function pr(e) {
   var t = document.createElement("script");
   return e && (t.src = e), t;
 }
-function cr(e) {
-  var t = tt(function(n) {
+function dr(e) {
+  var t = ct(function(n) {
     var o = n.config, i = n.reject;
     return {
       config: o,
       reject: i
     };
-  }), r = sr("".concat(t.config.paths.vs, "/loader.js"));
+  }), r = pr("".concat(t.config.paths.vs, "/loader.js"));
   return r.onload = function() {
     return e();
   }, r.onerror = t.reject, r;
 }
-function ar() {
-  var e = tt(function(r) {
+function hr() {
+  var e = ct(function(r) {
     var n = r.config, o = r.resolve, i = r.reject;
     return {
       config: n,
@@ -370,36 +370,36 @@ function ar() {
   }), t = window.require;
   t.config(e.config), t(["vs/editor/editor.main"], function(r) {
     var n = r.m;
-    an(n), e.resolve(n);
+    gn(n), e.resolve(n);
   }, function(r) {
     e.reject(r);
   });
 }
-function an(e) {
-  tt().monaco || dt({
+function gn(e) {
+  ct().monaco || Ot({
     monaco: e
   });
 }
-function lr() {
-  return tt(function(e) {
+function gr() {
+  return ct(function(e) {
     var t = e.monaco;
     return t;
   });
 }
-var bt = new Promise(function(e, t) {
-  return dt({
+var Lt = new Promise(function(e, t) {
+  return Ot({
     resolve: e,
     reject: t
   });
-}), ur = {
-  config: rr,
-  init: or,
-  __getMonacoInstance: lr
-}, te = /* @__PURE__ */ ((e) => (e[e.excluded = 0] = "excluded", e[e.first = 1] = "first", e[e.second = 2] = "second", e))(te || {}), D = /* @__PURE__ */ ((e) => (e.SAME_CHANGE = "same_change", e.INPUT1_ONLY = "input1_only", e.INPUT2_ONLY = "input2_only", e.TRUE_CONFLICT = "true_conflict", e))(D || {});
-function fr(e, t = !1) {
+}), mr = {
+  config: lr,
+  init: ur,
+  __getMonacoInstance: gr
+}, ne = /* @__PURE__ */ ((e) => (e[e.excluded = 0] = "excluded", e[e.first = 1] = "first", e[e.second = 2] = "second", e))(ne || {}), x = /* @__PURE__ */ ((e) => (e.SAME_CHANGE = "same_change", e.INPUT1_ONLY = "input1_only", e.INPUT2_ONLY = "input2_only", e.TRUE_CONFLICT = "true_conflict", e))(x || {});
+function yr(e, t = !1) {
   const r = e.length;
   let n = 0, o = "", i = 0, s = 16, c = 0, a = 0, u = 0, l = 0, y = 0;
-  function p(f, E) {
+  function p(f, I) {
     let S = 0, g = 0;
     for (; S < f; ) {
       let b = e.charCodeAt(n);
@@ -418,43 +418,43 @@ function fr(e, t = !1) {
   function d(f) {
     n = f, o = "", i = 0, s = 16, y = 0;
   }
-  function L() {
+  function _() {
     let f = n;
     if (e.charCodeAt(n) === 48)
       n++;
     else
-      for (n++; n < e.length && Je(e.charCodeAt(n)); )
+      for (n++; n < e.length && qe(e.charCodeAt(n)); )
         n++;
     if (n < e.length && e.charCodeAt(n) === 46)
-      if (n++, n < e.length && Je(e.charCodeAt(n)))
-        for (n++; n < e.length && Je(e.charCodeAt(n)); )
+      if (n++, n < e.length && qe(e.charCodeAt(n)))
+        for (n++; n < e.length && qe(e.charCodeAt(n)); )
           n++;
       else
         return y = 3, e.substring(f, n);
-    let E = n;
+    let I = n;
     if (n < e.length && (e.charCodeAt(n) === 69 || e.charCodeAt(n) === 101))
-      if (n++, (n < e.length && e.charCodeAt(n) === 43 || e.charCodeAt(n) === 45) && n++, n < e.length && Je(e.charCodeAt(n))) {
-        for (n++; n < e.length && Je(e.charCodeAt(n)); )
+      if (n++, (n < e.length && e.charCodeAt(n) === 43 || e.charCodeAt(n) === 45) && n++, n < e.length && qe(e.charCodeAt(n))) {
+        for (n++; n < e.length && qe(e.charCodeAt(n)); )
           n++;
-        E = n;
+        I = n;
       } else
         y = 3;
-    return e.substring(f, E);
+    return e.substring(f, I);
   }
-  function N() {
-    let f = "", E = n;
+  function T() {
+    let f = "", I = n;
     for (; ; ) {
       if (n >= r) {
-        f += e.substring(E, n), y = 2;
+        f += e.substring(I, n), y = 2;
         break;
       }
       const S = e.charCodeAt(n);
       if (S === 34) {
-        f += e.substring(E, n), n++;
+        f += e.substring(I, n), n++;
         break;
       }
       if (S === 92) {
-        if (f += e.substring(E, n), n++, n >= r) {
+        if (f += e.substring(I, n), n++, n >= r) {
           y = 2;
           break;
         }
@@ -491,12 +491,12 @@ function fr(e, t = !1) {
           default:
             y = 5;
         }
-        E = n;
+        I = n;
         continue;
       }
       if (S >= 0 && S <= 31)
-        if (Qe(S)) {
-          f += e.substring(E, n), y = 2;
+        if (nt(S)) {
+          f += e.substring(I, n), y = 2;
           break;
         } else
           y = 6;
@@ -508,13 +508,13 @@ function fr(e, t = !1) {
     if (o = "", y = 0, i = n, a = c, l = u, n >= r)
       return i = r, s = 17;
     let f = e.charCodeAt(n);
-    if (Ot(f)) {
+    if (St(f)) {
       do
         n++, o += String.fromCharCode(f), f = e.charCodeAt(n);
-      while (Ot(f));
+      while (St(f));
       return s = 15;
     }
-    if (Qe(f))
+    if (nt(f))
       return n++, o += String.fromCharCode(f), f === 13 && e.charCodeAt(n) === 10 && (n++, o += `
 `), c++, u = n, s = 14;
     switch (f) {
@@ -533,14 +533,14 @@ function fr(e, t = !1) {
         return n++, s = 5;
       // strings
       case 34:
-        return n++, o = N(), s = 10;
+        return n++, o = T(), s = 10;
       // comments
       case 47:
-        const E = n - 1;
+        const I = n - 1;
         if (e.charCodeAt(n + 1) === 47) {
-          for (n += 2; n < r && !Qe(e.charCodeAt(n)); )
+          for (n += 2; n < r && !nt(e.charCodeAt(n)); )
             n++;
-          return o = e.substring(E, n), s = 12;
+          return o = e.substring(I, n), s = 12;
         }
         if (e.charCodeAt(n + 1) === 42) {
           n += 2;
@@ -552,14 +552,14 @@ function fr(e, t = !1) {
               n += 2, g = !0;
               break;
             }
-            n++, Qe(b) && (b === 13 && e.charCodeAt(n) === 10 && n++, c++, u = n);
+            n++, nt(b) && (b === 13 && e.charCodeAt(n) === 10 && n++, c++, u = n);
           }
-          return g || (n++, y = 1), o = e.substring(E, n), s = 13;
+          return g || (n++, y = 1), o = e.substring(I, n), s = 13;
         }
         return o += String.fromCharCode(f), n++, s = 16;
       // numbers
       case 45:
-        if (o += String.fromCharCode(f), n++, n === r || !Je(e.charCodeAt(n)))
+        if (o += String.fromCharCode(f), n++, n === r || !qe(e.charCodeAt(n)))
           return s = 16;
       // found a minus, followed by a number so
       // we fall through to proceed with scanning
@@ -574,7 +574,7 @@ function fr(e, t = !1) {
       case 55:
       case 56:
       case 57:
-        return o += L(), s = 11;
+        return o += _(), s = 11;
       // literals and unknown symbols
       default:
         for (; n < r && h(f); )
@@ -594,7 +594,7 @@ function fr(e, t = !1) {
     }
   }
   function h(f) {
-    if (Ot(f) || Qe(f))
+    if (St(f) || nt(f))
       return !1;
     switch (f) {
       case 125:
@@ -629,33 +629,33 @@ function fr(e, t = !1) {
     getTokenError: () => y
   };
 }
-function Ot(e) {
+function St(e) {
   return e === 32 || e === 9;
 }
-function Qe(e) {
+function nt(e) {
   return e === 10 || e === 13;
 }
-function Je(e) {
+function qe(e) {
   return e >= 48 && e <= 57;
 }
-var Zt;
+var on;
 (function(e) {
   e[e.lineFeed = 10] = "lineFeed", e[e.carriageReturn = 13] = "carriageReturn", e[e.space = 32] = "space", e[e._0 = 48] = "_0", e[e._1 = 49] = "_1", e[e._2 = 50] = "_2", e[e._3 = 51] = "_3", e[e._4 = 52] = "_4", e[e._5 = 53] = "_5", e[e._6 = 54] = "_6", e[e._7 = 55] = "_7", e[e._8 = 56] = "_8", e[e._9 = 57] = "_9", e[e.a = 97] = "a", e[e.b = 98] = "b", e[e.c = 99] = "c", e[e.d = 100] = "d", e[e.e = 101] = "e", e[e.f = 102] = "f", e[e.g = 103] = "g", e[e.h = 104] = "h", e[e.i = 105] = "i", e[e.j = 106] = "j", e[e.k = 107] = "k", e[e.l = 108] = "l", e[e.m = 109] = "m", e[e.n = 110] = "n", e[e.o = 111] = "o", e[e.p = 112] = "p", e[e.q = 113] = "q", e[e.r = 114] = "r", e[e.s = 115] = "s", e[e.t = 116] = "t", e[e.u = 117] = "u", e[e.v = 118] = "v", e[e.w = 119] = "w", e[e.x = 120] = "x", e[e.y = 121] = "y", e[e.z = 122] = "z", e[e.A = 65] = "A", e[e.B = 66] = "B", e[e.C = 67] = "C", e[e.D = 68] = "D", e[e.E = 69] = "E", e[e.F = 70] = "F", e[e.G = 71] = "G", e[e.H = 72] = "H", e[e.I = 73] = "I", e[e.J = 74] = "J", e[e.K = 75] = "K", e[e.L = 76] = "L", e[e.M = 77] = "M", e[e.N = 78] = "N", e[e.O = 79] = "O", e[e.P = 80] = "P", e[e.Q = 81] = "Q", e[e.R = 82] = "R", e[e.S = 83] = "S", e[e.T = 84] = "T", e[e.U = 85] = "U", e[e.V = 86] = "V", e[e.W = 87] = "W", e[e.X = 88] = "X", e[e.Y = 89] = "Y", e[e.Z = 90] = "Z", e[e.asterisk = 42] = "asterisk", e[e.backslash = 92] = "backslash", e[e.closeBrace = 125] = "closeBrace", e[e.closeBracket = 93] = "closeBracket", e[e.colon = 58] = "colon", e[e.comma = 44] = "comma", e[e.dot = 46] = "dot", e[e.doubleQuote = 34] = "doubleQuote", e[e.minus = 45] = "minus", e[e.openBrace = 123] = "openBrace", e[e.openBracket = 91] = "openBracket", e[e.plus = 43] = "plus", e[e.slash = 47] = "slash", e[e.formFeed = 12] = "formFeed", e[e.tab = 9] = "tab";
-})(Zt || (Zt = {}));
+})(on || (on = {}));
 new Array(20).fill(0).map((e, t) => " ".repeat(t));
-const He = 200;
-new Array(He).fill(0).map((e, t) => `
-` + " ".repeat(t)), new Array(He).fill(0).map((e, t) => "\r" + " ".repeat(t)), new Array(He).fill(0).map((e, t) => `\r
-` + " ".repeat(t)), new Array(He).fill(0).map((e, t) => `
-` + "	".repeat(t)), new Array(He).fill(0).map((e, t) => "\r" + "	".repeat(t)), new Array(He).fill(0).map((e, t) => `\r
+const Ye = 200;
+new Array(Ye).fill(0).map((e, t) => `
+` + " ".repeat(t)), new Array(Ye).fill(0).map((e, t) => "\r" + " ".repeat(t)), new Array(Ye).fill(0).map((e, t) => `\r
+` + " ".repeat(t)), new Array(Ye).fill(0).map((e, t) => `
+` + "	".repeat(t)), new Array(Ye).fill(0).map((e, t) => "\r" + "	".repeat(t)), new Array(Ye).fill(0).map((e, t) => `\r
 ` + "	".repeat(t));
-var ut;
+var vt;
 (function(e) {
   e.DEFAULT = {
     allowTrailingComma: !1
   };
-})(ut || (ut = {}));
-function pr(e, t = [], r = ut.DEFAULT) {
+})(vt || (vt = {}));
+function vr(e, t = [], r = vt.DEFAULT) {
   let n = { type: "array", offset: -1, length: -1, children: [], parent: void 0 };
   function o(a) {
     n.type === "property" && (n.length = a - n.offset, n = n.parent);
@@ -663,7 +663,7 @@ function pr(e, t = [], r = ut.DEFAULT) {
   function i(a) {
     return n.children.push(a), a;
   }
-  hr(e, {
+  wr(e, {
     onObjectBegin: (a) => {
       n = i({ type: "object", offset: a, length: -1, parent: n, children: [] });
     },
@@ -680,7 +680,7 @@ function pr(e, t = [], r = ut.DEFAULT) {
       n.length = a + u - n.offset, n = n.parent, o(a + u);
     },
     onLiteralValue: (a, u, l) => {
-      i({ type: gr(a), offset: u, length: l, parent: n, value: a }), o(u + l);
+      i({ type: Or(a), offset: u, length: l, parent: n, value: a }), o(u + l);
     },
     onSeparator: (a, u, l) => {
       n.type === "property" && (a === ":" ? n.colonOffset = u : a === "," && o(u));
@@ -692,7 +692,7 @@ function pr(e, t = [], r = ut.DEFAULT) {
   const c = n.children[0];
   return c && delete c.parent, c;
 }
-function dr(e, t) {
+function br(e, t) {
   if (!e)
     return;
   let r = e;
@@ -716,32 +716,32 @@ function dr(e, t) {
     }
   return r;
 }
-function hr(e, t, r = ut.DEFAULT) {
-  const n = fr(e, !1), o = [];
+function wr(e, t, r = vt.DEFAULT) {
+  const n = yr(e, !1), o = [];
   let i = 0;
-  function s(A) {
-    return A ? () => i === 0 && A(n.getTokenOffset(), n.getTokenLength(), n.getTokenStartLine(), n.getTokenStartCharacter()) : () => !0;
+  function s(E) {
+    return E ? () => i === 0 && E(n.getTokenOffset(), n.getTokenLength(), n.getTokenStartLine(), n.getTokenStartCharacter()) : () => !0;
   }
-  function c(A) {
-    return A ? (w) => i === 0 && A(w, n.getTokenOffset(), n.getTokenLength(), n.getTokenStartLine(), n.getTokenStartCharacter()) : () => !0;
+  function c(E) {
+    return E ? (A) => i === 0 && E(A, n.getTokenOffset(), n.getTokenLength(), n.getTokenStartLine(), n.getTokenStartCharacter()) : () => !0;
   }
-  function a(A) {
-    return A ? (w) => i === 0 && A(w, n.getTokenOffset(), n.getTokenLength(), n.getTokenStartLine(), n.getTokenStartCharacter(), () => o.slice()) : () => !0;
+  function a(E) {
+    return E ? (A) => i === 0 && E(A, n.getTokenOffset(), n.getTokenLength(), n.getTokenStartLine(), n.getTokenStartCharacter(), () => o.slice()) : () => !0;
   }
-  function u(A) {
-    return A ? () => {
-      i > 0 ? i++ : A(n.getTokenOffset(), n.getTokenLength(), n.getTokenStartLine(), n.getTokenStartCharacter(), () => o.slice()) === !1 && (i = 1);
+  function u(E) {
+    return E ? () => {
+      i > 0 ? i++ : E(n.getTokenOffset(), n.getTokenLength(), n.getTokenStartLine(), n.getTokenStartCharacter(), () => o.slice()) === !1 && (i = 1);
     } : () => !0;
   }
-  function l(A) {
-    return A ? () => {
-      i > 0 && i--, i === 0 && A(n.getTokenOffset(), n.getTokenLength(), n.getTokenStartLine(), n.getTokenStartCharacter());
+  function l(E) {
+    return E ? () => {
+      i > 0 && i--, i === 0 && E(n.getTokenOffset(), n.getTokenLength(), n.getTokenStartLine(), n.getTokenStartCharacter());
     } : () => !0;
   }
-  const y = u(t.onObjectBegin), p = a(t.onObjectProperty), d = l(t.onObjectEnd), L = u(t.onArrayBegin), N = l(t.onArrayEnd), v = a(t.onLiteralValue), h = c(t.onSeparator), m = s(t.onComment), f = c(t.onError), E = r && r.disallowComments, S = r && r.allowTrailingComma;
+  const y = u(t.onObjectBegin), p = a(t.onObjectProperty), d = l(t.onObjectEnd), _ = u(t.onArrayBegin), T = l(t.onArrayEnd), v = a(t.onLiteralValue), h = c(t.onSeparator), m = s(t.onComment), f = c(t.onError), I = r && r.disallowComments, S = r && r.allowTrailingComma;
   function g() {
     for (; ; ) {
-      const A = n.scan();
+      const E = n.scan();
       switch (n.getTokenError()) {
         case 4:
           b(
@@ -762,7 +762,7 @@ function hr(e, t, r = ut.DEFAULT) {
           );
           break;
         case 1:
-          E || b(
+          I || b(
             11
             /* ParseErrorCode.UnexpectedEndOfComment */
           );
@@ -780,10 +780,10 @@ function hr(e, t, r = ut.DEFAULT) {
           );
           break;
       }
-      switch (A) {
+      switch (E) {
         case 12:
         case 13:
-          E ? b(
+          I ? b(
             10
             /* ParseErrorCode.InvalidCommentToken */
           ) : m();
@@ -798,15 +798,15 @@ function hr(e, t, r = ut.DEFAULT) {
         case 14:
           break;
         default:
-          return A;
+          return E;
       }
     }
   }
-  function b(A, w = [], R = []) {
-    if (f(A), w.length + R.length > 0) {
+  function b(E, A = [], R = []) {
+    if (f(E), A.length + R.length > 0) {
       let X = n.getToken();
       for (; X !== 17; ) {
-        if (w.indexOf(X) !== -1) {
+        if (A.indexOf(X) !== -1) {
           g();
           break;
         } else if (R.indexOf(X) !== -1)
@@ -815,19 +815,19 @@ function hr(e, t, r = ut.DEFAULT) {
       }
     }
   }
-  function j(A) {
-    const w = n.getTokenValue();
-    return A ? v(w) : (p(w), o.push(w)), g(), !0;
+  function D(E) {
+    const A = n.getTokenValue();
+    return E ? v(A) : (p(A), o.push(A)), g(), !0;
   }
-  function T() {
+  function L() {
     switch (n.getToken()) {
       case 11:
-        const A = n.getTokenValue();
-        let w = Number(A);
-        isNaN(w) && (b(
+        const E = n.getTokenValue();
+        let A = Number(E);
+        isNaN(A) && (b(
           2
           /* ParseErrorCode.InvalidNumberFormat */
-        ), w = 0), v(w);
+        ), A = 0), v(A);
         break;
       case 7:
         v(null);
@@ -843,12 +843,12 @@ function hr(e, t, r = ut.DEFAULT) {
     }
     return g(), !0;
   }
-  function F() {
+  function U() {
     return n.getToken() !== 10 ? (b(3, [], [
       2,
       5
       /* SyntaxKind.CommaToken */
-    ]), !1) : (j(!1), n.getToken() === 6 ? (h(":"), g(), V() || b(4, [], [
+    ]), !1) : (D(!1), n.getToken() === 6 ? (h(":"), g(), V() || b(4, [], [
       2,
       5
       /* SyntaxKind.CommaToken */
@@ -860,38 +860,38 @@ function hr(e, t, r = ut.DEFAULT) {
   }
   function M() {
     y(), g();
-    let A = !1;
+    let E = !1;
     for (; n.getToken() !== 2 && n.getToken() !== 17; ) {
       if (n.getToken() === 5) {
-        if (A || b(4, [], []), h(","), g(), n.getToken() === 2 && S)
+        if (E || b(4, [], []), h(","), g(), n.getToken() === 2 && S)
           break;
-      } else A && b(6, [], []);
-      F() || b(4, [], [
+      } else E && b(6, [], []);
+      U() || b(4, [], [
         2,
         5
         /* SyntaxKind.CommaToken */
-      ]), A = !0;
+      ]), E = !0;
     }
     return d(), n.getToken() !== 2 ? b(7, [
       2
       /* SyntaxKind.CloseBraceToken */
     ], []) : g(), !0;
   }
-  function x() {
-    L(), g();
-    let A = !0, w = !1;
+  function $() {
+    _(), g();
+    let E = !0, A = !1;
     for (; n.getToken() !== 4 && n.getToken() !== 17; ) {
       if (n.getToken() === 5) {
-        if (w || b(4, [], []), h(","), g(), n.getToken() === 4 && S)
+        if (A || b(4, [], []), h(","), g(), n.getToken() === 4 && S)
           break;
-      } else w && b(6, [], []);
-      A ? (o.push(0), A = !1) : o[o.length - 1]++, V() || b(4, [], [
+      } else A && b(6, [], []);
+      E ? (o.push(0), E = !1) : o[o.length - 1]++, V() || b(4, [], [
         4,
         5
         /* SyntaxKind.CommaToken */
-      ]), w = !0;
+      ]), A = !0;
     }
-    return N(), A || o.pop(), n.getToken() !== 4 ? b(8, [
+    return T(), E || o.pop(), n.getToken() !== 4 ? b(8, [
       4
       /* SyntaxKind.CloseBracketToken */
     ], []) : g(), !0;
@@ -899,18 +899,18 @@ function hr(e, t, r = ut.DEFAULT) {
   function V() {
     switch (n.getToken()) {
       case 3:
-        return x();
+        return $();
       case 1:
         return M();
       case 10:
-        return j(!0);
+        return D(!0);
       default:
-        return T();
+        return L();
     }
   }
   return g(), n.getToken() === 17 ? r.allowEmptyContent ? !0 : (b(4, [], []), !1) : V() ? (n.getToken() !== 17 && b(9, [], []), !0) : (b(4, [], []), !1);
 }
-function gr(e) {
+function Or(e) {
   switch (typeof e) {
     case "boolean":
       return "boolean";
@@ -929,25 +929,25 @@ function gr(e) {
       return "null";
   }
 }
-var Ct;
+var sn;
 (function(e) {
   e[e.None = 0] = "None", e[e.UnexpectedEndOfComment = 1] = "UnexpectedEndOfComment", e[e.UnexpectedEndOfString = 2] = "UnexpectedEndOfString", e[e.UnexpectedEndOfNumber = 3] = "UnexpectedEndOfNumber", e[e.InvalidUnicode = 4] = "InvalidUnicode", e[e.InvalidEscapeCharacter = 5] = "InvalidEscapeCharacter", e[e.InvalidCharacter = 6] = "InvalidCharacter";
-})(Ct || (Ct = {}));
-var Kt;
+})(sn || (sn = {}));
+var cn;
 (function(e) {
   e[e.OpenBraceToken = 1] = "OpenBraceToken", e[e.CloseBraceToken = 2] = "CloseBraceToken", e[e.OpenBracketToken = 3] = "OpenBracketToken", e[e.CloseBracketToken = 4] = "CloseBracketToken", e[e.CommaToken = 5] = "CommaToken", e[e.ColonToken = 6] = "ColonToken", e[e.NullKeyword = 7] = "NullKeyword", e[e.TrueKeyword = 8] = "TrueKeyword", e[e.FalseKeyword = 9] = "FalseKeyword", e[e.StringLiteral = 10] = "StringLiteral", e[e.NumericLiteral = 11] = "NumericLiteral", e[e.LineCommentTrivia = 12] = "LineCommentTrivia", e[e.BlockCommentTrivia = 13] = "BlockCommentTrivia", e[e.LineBreakTrivia = 14] = "LineBreakTrivia", e[e.Trivia = 15] = "Trivia", e[e.Unknown = 16] = "Unknown", e[e.EOF = 17] = "EOF";
-})(Kt || (Kt = {}));
-const ln = pr, un = dr;
-var en;
+})(cn || (cn = {}));
+const mn = vr, yn = br;
+var an;
 (function(e) {
   e[e.InvalidSymbol = 1] = "InvalidSymbol", e[e.InvalidNumberFormat = 2] = "InvalidNumberFormat", e[e.PropertyNameExpected = 3] = "PropertyNameExpected", e[e.ValueExpected = 4] = "ValueExpected", e[e.ColonExpected = 5] = "ColonExpected", e[e.CommaExpected = 6] = "CommaExpected", e[e.CloseBraceExpected = 7] = "CloseBraceExpected", e[e.CloseBracketExpected = 8] = "CloseBracketExpected", e[e.EndOfFileExpected = 9] = "EndOfFileExpected", e[e.InvalidCommentToken = 10] = "InvalidCommentToken", e[e.UnexpectedEndOfComment = 11] = "UnexpectedEndOfComment", e[e.UnexpectedEndOfString = 12] = "UnexpectedEndOfString", e[e.UnexpectedEndOfNumber = 13] = "UnexpectedEndOfNumber", e[e.InvalidUnicode = 14] = "InvalidUnicode", e[e.InvalidEscapeCharacter = 15] = "InvalidEscapeCharacter", e[e.InvalidCharacter = 16] = "InvalidCharacter";
-})(en || (en = {}));
-function mr(e) {
+})(an || (an = {}));
+function Ar(e) {
   return e && e.__esModule && Object.prototype.hasOwnProperty.call(e, "default") ? e.default : e;
 }
-var wt, tn;
-function yr() {
-  return tn || (tn = 1, wt = function e(t, r) {
+var kt, ln;
+function Nr() {
+  return ln || (ln = 1, kt = function e(t, r) {
     if (t === r) return !0;
     if (t && r && typeof t == "object" && typeof r == "object") {
       if (t.constructor !== r.constructor) return !1;
@@ -971,10 +971,10 @@ function yr() {
       return !0;
     }
     return t !== t && r !== r;
-  }), wt;
+  }), kt;
 }
-var vr = yr();
-const de = /* @__PURE__ */ mr(vr), W = (e, t) => {
+var Er = Nr();
+const de = /* @__PURE__ */ Ar(Er), W = (e, t) => {
   if (!e) return;
   const r = t.replace(/^\//, "").replace(/\[/g, ".").replace(/\]/g, "").split(/[./#]/).filter(Boolean);
   let n = e;
@@ -998,7 +998,7 @@ const de = /* @__PURE__ */ mr(vr), W = (e, t) => {
  * (c) 2017-2022 Joachim Wester
  * MIT licensed
  */
-var br = /* @__PURE__ */ (function() {
+var Tr = /* @__PURE__ */ (function() {
   var e = function(t, r) {
     return e = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(n, o) {
       n.__proto__ = o;
@@ -1013,11 +1013,11 @@ var br = /* @__PURE__ */ (function() {
     }
     t.prototype = r === null ? Object.create(r) : (n.prototype = r.prototype, new n());
   };
-})(), Or = Object.prototype.hasOwnProperty;
-function Et(e, t) {
-  return Or.call(e, t);
+})(), Ir = Object.prototype.hasOwnProperty;
+function jt(e, t) {
+  return Ir.call(e, t);
 }
-function Tt(e) {
+function Rt(e) {
   if (Array.isArray(e)) {
     for (var t = new Array(e.length), r = 0; r < t.length; r++)
       t[r] = "" + r;
@@ -1027,10 +1027,10 @@ function Tt(e) {
     return Object.keys(e);
   var n = [];
   for (var o in e)
-    Et(e, o) && n.push(o);
+    jt(e, o) && n.push(o);
   return n;
 }
-function we(e) {
+function Ae(e) {
   switch (typeof e) {
     case "object":
       return JSON.parse(JSON.stringify(e));
@@ -1042,7 +1042,7 @@ function we(e) {
       return e;
   }
 }
-function It(e) {
+function Dt(e) {
   for (var t = 0, r = e.length, n; t < r; ) {
     if (n = e.charCodeAt(t), n >= 48 && n <= 57) {
       t++;
@@ -1052,29 +1052,29 @@ function It(e) {
   }
   return !0;
 }
-function Me(e) {
+function Fe(e) {
   return e.indexOf("/") === -1 && e.indexOf("~") === -1 ? e : e.replace(/~/g, "~0").replace(/\//g, "~1");
 }
-function fn(e) {
+function vn(e) {
   return e.replace(/~1/g, "/").replace(/~0/g, "~");
 }
-function Lt(e) {
+function xt(e) {
   if (e === void 0)
     return !0;
   if (e) {
     if (Array.isArray(e)) {
       for (var t = 0, r = e.length; t < r; t++)
-        if (Lt(e[t]))
+        if (xt(e[t]))
           return !0;
     } else if (typeof e == "object") {
-      for (var n = Tt(e), o = n.length, i = 0; i < o; i++)
-        if (Lt(e[n[i]]))
+      for (var n = Rt(e), o = n.length, i = 0; i < o; i++)
+        if (xt(e[n[i]]))
           return !0;
     }
   }
   return !1;
 }
-function nn(e, t) {
+function un(e, t) {
   var r = [e];
   for (var n in t) {
     var o = typeof t[n] == "object" ? JSON.stringify(t[n], null, 2) : t[n];
@@ -1083,17 +1083,17 @@ function nn(e, t) {
   return r.join(`
 `);
 }
-var pn = (
+var bn = (
   /** @class */
   (function(e) {
-    br(t, e);
+    Tr(t, e);
     function t(r, n, o, i, s) {
-      var c = this.constructor, a = e.call(this, nn(r, { name: n, index: o, operation: i, tree: s })) || this;
-      return a.name = n, a.index = o, a.operation = i, a.tree = s, Object.setPrototypeOf(a, c.prototype), a.message = nn(r, { name: n, index: o, operation: i, tree: s }), a;
+      var c = this.constructor, a = e.call(this, un(r, { name: n, index: o, operation: i, tree: s })) || this;
+      return a.name = n, a.index = o, a.operation = i, a.tree = s, Object.setPrototypeOf(a, c.prototype), a.message = un(r, { name: n, index: o, operation: i, tree: s }), a;
     }
     return t;
   })(Error)
-), ce = pn, wr = we, Ge = {
+), le = bn, Lr = Ae, ze = {
   add: function(e, t, r) {
     return e[t] = this.value, { newDocument: r };
   },
@@ -1106,24 +1106,24 @@ var pn = (
     return e[t] = this.value, { newDocument: r, removed: n };
   },
   move: function(e, t, r) {
-    var n = ft(r, this.path);
-    n && (n = we(n));
-    var o = xe(r, { op: "remove", path: this.from }).removed;
-    return xe(r, { op: "add", path: this.path, value: o }), { newDocument: r, removed: n };
+    var n = bt(r, this.path);
+    n && (n = Ae(n));
+    var o = Ue(r, { op: "remove", path: this.from }).removed;
+    return Ue(r, { op: "add", path: this.path, value: o }), { newDocument: r, removed: n };
   },
   copy: function(e, t, r) {
-    var n = ft(r, this.from);
-    return xe(r, { op: "add", path: this.path, value: we(n) }), { newDocument: r };
+    var n = bt(r, this.from);
+    return Ue(r, { op: "add", path: this.path, value: Ae(n) }), { newDocument: r };
   },
   test: function(e, t, r) {
-    return { newDocument: r, test: et(e[t], this.value) };
+    return { newDocument: r, test: st(e[t], this.value) };
   },
   _get: function(e, t, r) {
     return this.value = e[t], { newDocument: r };
   }
-}, Ar = {
+}, Sr = {
   add: function(e, t, r) {
-    return It(t) ? e.splice(t, 0, this.value) : e[t] = this.value, { newDocument: r, index: t };
+    return Dt(t) ? e.splice(t, 0, this.value) : e[t] = this.value, { newDocument: r, index: t };
   },
   remove: function(e, t, r) {
     var n = e.splice(t, 1);
@@ -1133,29 +1133,29 @@ var pn = (
     var n = e[t];
     return e[t] = this.value, { newDocument: r, removed: n };
   },
-  move: Ge.move,
-  copy: Ge.copy,
-  test: Ge.test,
-  _get: Ge._get
+  move: ze.move,
+  copy: ze.copy,
+  test: ze.test,
+  _get: ze._get
 };
-function ft(e, t) {
+function bt(e, t) {
   if (t == "")
     return e;
   var r = { op: "_get", path: t };
-  return xe(e, r), r.value;
+  return Ue(e, r), r.value;
 }
-function xe(e, t, r, n, o, i) {
-  if (r === void 0 && (r = !1), n === void 0 && (n = !0), o === void 0 && (o = !0), i === void 0 && (i = 0), r && (typeof r == "function" ? r(t, 0, e, t.path) : pt(t, 0)), t.path === "") {
+function Ue(e, t, r, n, o, i) {
+  if (r === void 0 && (r = !1), n === void 0 && (n = !0), o === void 0 && (o = !0), i === void 0 && (i = 0), r && (typeof r == "function" ? r(t, 0, e, t.path) : wt(t, 0)), t.path === "") {
     var s = { newDocument: e };
     if (t.op === "add")
       return s.newDocument = t.value, s;
     if (t.op === "replace")
       return s.newDocument = t.value, s.removed = e, s;
     if (t.op === "move" || t.op === "copy")
-      return s.newDocument = ft(e, t.from), t.op === "move" && (s.removed = e), s;
+      return s.newDocument = bt(e, t.from), t.op === "move" && (s.removed = e), s;
     if (t.op === "test") {
-      if (s.test = et(e, t.value), s.test === !1)
-        throw new ce("Test operation failed", "TEST_OPERATION_FAILED", i, t, e);
+      if (s.test = st(e, t.value), s.test === !1)
+        throw new le("Test operation failed", "TEST_OPERATION_FAILED", i, t, e);
       return s.newDocument = e, s;
     } else {
       if (t.op === "remove")
@@ -1163,104 +1163,104 @@ function xe(e, t, r, n, o, i) {
       if (t.op === "_get")
         return t.value = e, s;
       if (r)
-        throw new ce("Operation `op` property is not one of operations defined in RFC-6902", "OPERATION_OP_INVALID", i, t, e);
+        throw new le("Operation `op` property is not one of operations defined in RFC-6902", "OPERATION_OP_INVALID", i, t, e);
       return s;
     }
   } else {
-    n || (e = we(e));
-    var c = t.path || "", a = c.split("/"), u = e, l = 1, y = a.length, p = void 0, d = void 0, L = void 0;
-    for (typeof r == "function" ? L = r : L = pt; ; ) {
-      if (d = a[l], d && d.indexOf("~") != -1 && (d = fn(d)), o && (d == "__proto__" || d == "prototype" && l > 0 && a[l - 1] == "constructor"))
+    n || (e = Ae(e));
+    var c = t.path || "", a = c.split("/"), u = e, l = 1, y = a.length, p = void 0, d = void 0, _ = void 0;
+    for (typeof r == "function" ? _ = r : _ = wt; ; ) {
+      if (d = a[l], d && d.indexOf("~") != -1 && (d = vn(d)), o && (d == "__proto__" || d == "prototype" && l > 0 && a[l - 1] == "constructor"))
         throw new TypeError("JSON-Patch: modifying `__proto__` or `constructor/prototype` prop is banned for security reasons, if this was on purpose, please set `banPrototypeModifications` flag false and pass it to this function. More info in fast-json-patch README");
-      if (r && p === void 0 && (u[d] === void 0 ? p = a.slice(0, l).join("/") : l == y - 1 && (p = t.path), p !== void 0 && L(t, 0, e, p)), l++, Array.isArray(u)) {
+      if (r && p === void 0 && (u[d] === void 0 ? p = a.slice(0, l).join("/") : l == y - 1 && (p = t.path), p !== void 0 && _(t, 0, e, p)), l++, Array.isArray(u)) {
         if (d === "-")
           d = u.length;
         else {
-          if (r && !It(d))
-            throw new ce("Expected an unsigned base-10 integer value, making the new referenced value the array element with the zero-based index", "OPERATION_PATH_ILLEGAL_ARRAY_INDEX", i, t, e);
-          It(d) && (d = ~~d);
+          if (r && !Dt(d))
+            throw new le("Expected an unsigned base-10 integer value, making the new referenced value the array element with the zero-based index", "OPERATION_PATH_ILLEGAL_ARRAY_INDEX", i, t, e);
+          Dt(d) && (d = ~~d);
         }
         if (l >= y) {
           if (r && t.op === "add" && d > u.length)
-            throw new ce("The specified index MUST NOT be greater than the number of elements in the array", "OPERATION_VALUE_OUT_OF_BOUNDS", i, t, e);
-          var s = Ar[t.op].call(t, u, d, e);
+            throw new le("The specified index MUST NOT be greater than the number of elements in the array", "OPERATION_VALUE_OUT_OF_BOUNDS", i, t, e);
+          var s = Sr[t.op].call(t, u, d, e);
           if (s.test === !1)
-            throw new ce("Test operation failed", "TEST_OPERATION_FAILED", i, t, e);
+            throw new le("Test operation failed", "TEST_OPERATION_FAILED", i, t, e);
           return s;
         }
       } else if (l >= y) {
-        var s = Ge[t.op].call(t, u, d, e);
+        var s = ze[t.op].call(t, u, d, e);
         if (s.test === !1)
-          throw new ce("Test operation failed", "TEST_OPERATION_FAILED", i, t, e);
+          throw new le("Test operation failed", "TEST_OPERATION_FAILED", i, t, e);
         return s;
       }
       if (u = u[d], r && l < y && (!u || typeof u != "object"))
-        throw new ce("Cannot perform operation at the desired path", "OPERATION_PATH_UNRESOLVABLE", i, t, e);
+        throw new le("Cannot perform operation at the desired path", "OPERATION_PATH_UNRESOLVABLE", i, t, e);
     }
   }
 }
-function _t(e, t, r, n, o) {
+function Bt(e, t, r, n, o) {
   if (n === void 0 && (n = !0), o === void 0 && (o = !0), r && !Array.isArray(t))
-    throw new ce("Patch sequence must be an array", "SEQUENCE_NOT_AN_ARRAY");
-  n || (e = we(e));
+    throw new le("Patch sequence must be an array", "SEQUENCE_NOT_AN_ARRAY");
+  n || (e = Ae(e));
   for (var i = new Array(t.length), s = 0, c = t.length; s < c; s++)
-    i[s] = xe(e, t[s], r, !0, o, s), e = i[s].newDocument;
+    i[s] = Ue(e, t[s], r, !0, o, s), e = i[s].newDocument;
   return i.newDocument = e, i;
 }
-function Nr(e, t, r) {
-  var n = xe(e, t);
+function kr(e, t, r) {
+  var n = Ue(e, t);
   if (n.test === !1)
-    throw new ce("Test operation failed", "TEST_OPERATION_FAILED", r, t, e);
+    throw new le("Test operation failed", "TEST_OPERATION_FAILED", r, t, e);
   return n.newDocument;
 }
-function pt(e, t, r, n) {
+function wt(e, t, r, n) {
   if (typeof e != "object" || e === null || Array.isArray(e))
-    throw new ce("Operation is not an object", "OPERATION_NOT_AN_OBJECT", t, e, r);
-  if (Ge[e.op]) {
+    throw new le("Operation is not an object", "OPERATION_NOT_AN_OBJECT", t, e, r);
+  if (ze[e.op]) {
     if (typeof e.path != "string")
-      throw new ce("Operation `path` property is not a string", "OPERATION_PATH_INVALID", t, e, r);
+      throw new le("Operation `path` property is not a string", "OPERATION_PATH_INVALID", t, e, r);
     if (e.path.indexOf("/") !== 0 && e.path.length > 0)
-      throw new ce('Operation `path` property must start with "/"', "OPERATION_PATH_INVALID", t, e, r);
+      throw new le('Operation `path` property must start with "/"', "OPERATION_PATH_INVALID", t, e, r);
     if ((e.op === "move" || e.op === "copy") && typeof e.from != "string")
-      throw new ce("Operation `from` property is not present (applicable in `move` and `copy` operations)", "OPERATION_FROM_REQUIRED", t, e, r);
+      throw new le("Operation `from` property is not present (applicable in `move` and `copy` operations)", "OPERATION_FROM_REQUIRED", t, e, r);
     if ((e.op === "add" || e.op === "replace" || e.op === "test") && e.value === void 0)
-      throw new ce("Operation `value` property is not present (applicable in `add`, `replace` and `test` operations)", "OPERATION_VALUE_REQUIRED", t, e, r);
-    if ((e.op === "add" || e.op === "replace" || e.op === "test") && Lt(e.value))
-      throw new ce("Operation `value` property is not present (applicable in `add`, `replace` and `test` operations)", "OPERATION_VALUE_CANNOT_CONTAIN_UNDEFINED", t, e, r);
+      throw new le("Operation `value` property is not present (applicable in `add`, `replace` and `test` operations)", "OPERATION_VALUE_REQUIRED", t, e, r);
+    if ((e.op === "add" || e.op === "replace" || e.op === "test") && xt(e.value))
+      throw new le("Operation `value` property is not present (applicable in `add`, `replace` and `test` operations)", "OPERATION_VALUE_CANNOT_CONTAIN_UNDEFINED", t, e, r);
     if (r) {
       if (e.op == "add") {
         var o = e.path.split("/").length, i = n.split("/").length;
         if (o !== i + 1 && o !== i)
-          throw new ce("Cannot perform an `add` operation at the desired path", "OPERATION_PATH_CANNOT_ADD", t, e, r);
+          throw new le("Cannot perform an `add` operation at the desired path", "OPERATION_PATH_CANNOT_ADD", t, e, r);
       } else if (e.op === "replace" || e.op === "remove" || e.op === "_get") {
         if (e.path !== n)
-          throw new ce("Cannot perform the operation at a path that does not exist", "OPERATION_PATH_UNRESOLVABLE", t, e, r);
+          throw new le("Cannot perform the operation at a path that does not exist", "OPERATION_PATH_UNRESOLVABLE", t, e, r);
       } else if (e.op === "move" || e.op === "copy") {
-        var s = { op: "_get", path: e.from, value: void 0 }, c = dn([s], r);
+        var s = { op: "_get", path: e.from, value: void 0 }, c = wn([s], r);
         if (c && c.name === "OPERATION_PATH_UNRESOLVABLE")
-          throw new ce("Cannot perform the operation from a path that does not exist", "OPERATION_FROM_UNRESOLVABLE", t, e, r);
+          throw new le("Cannot perform the operation from a path that does not exist", "OPERATION_FROM_UNRESOLVABLE", t, e, r);
       }
     }
-  } else throw new ce("Operation `op` property is not one of operations defined in RFC-6902", "OPERATION_OP_INVALID", t, e, r);
+  } else throw new le("Operation `op` property is not one of operations defined in RFC-6902", "OPERATION_OP_INVALID", t, e, r);
 }
-function dn(e, t, r) {
+function wn(e, t, r) {
   try {
     if (!Array.isArray(e))
-      throw new ce("Patch sequence must be an array", "SEQUENCE_NOT_AN_ARRAY");
+      throw new le("Patch sequence must be an array", "SEQUENCE_NOT_AN_ARRAY");
     if (t)
-      _t(we(t), we(e), r || !0);
+      Bt(Ae(t), Ae(e), r || !0);
     else {
-      r = r || pt;
+      r = r || wt;
       for (var n = 0; n < e.length; n++)
         r(e[n], n, t, void 0);
     }
   } catch (o) {
-    if (o instanceof ce)
+    if (o instanceof le)
       return o;
     throw o;
   }
 }
-function et(e, t) {
+function st(e, t) {
   if (e === t)
     return !0;
   if (e && t && typeof e == "object" && typeof t == "object") {
@@ -1269,7 +1269,7 @@ function et(e, t) {
       if (i = e.length, i != t.length)
         return !1;
       for (o = i; o-- !== 0; )
-        if (!et(e[o], t[o]))
+        if (!st(e[o], t[o]))
           return !1;
       return !0;
     }
@@ -1282,30 +1282,30 @@ function et(e, t) {
       if (!t.hasOwnProperty(c[o]))
         return !1;
     for (o = i; o-- !== 0; )
-      if (s = c[o], !et(e[s], t[s]))
+      if (s = c[o], !st(e[s], t[s]))
         return !1;
     return !0;
   }
   return e !== e && t !== t;
 }
-const Er = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const _r = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  JsonPatchError: ce,
-  _areEquals: et,
-  applyOperation: xe,
-  applyPatch: _t,
-  applyReducer: Nr,
-  deepClone: wr,
-  getValueByPointer: ft,
-  validate: dn,
-  validator: pt
+  JsonPatchError: le,
+  _areEquals: st,
+  applyOperation: Ue,
+  applyPatch: Bt,
+  applyReducer: kr,
+  deepClone: Lr,
+  getValueByPointer: bt,
+  validate: wn,
+  validator: wt
 }, Symbol.toStringTag, { value: "Module" }));
 /*!
  * https://github.com/Starcounter-Jack/JSON-Patch
  * (c) 2017-2021 Joachim Wester
  * MIT license
  */
-var Pt = /* @__PURE__ */ new WeakMap(), Tr = (
+var Ft = /* @__PURE__ */ new WeakMap(), Pr = (
   /** @class */
   /* @__PURE__ */ (function() {
     function e(t) {
@@ -1313,7 +1313,7 @@ var Pt = /* @__PURE__ */ new WeakMap(), Tr = (
     }
     return e;
   })()
-), Ir = (
+), jr = (
   /** @class */
   /* @__PURE__ */ (function() {
     function e(t, r) {
@@ -1322,95 +1322,95 @@ var Pt = /* @__PURE__ */ new WeakMap(), Tr = (
     return e;
   })()
 );
-function Lr(e) {
-  return Pt.get(e);
+function Rr(e) {
+  return Ft.get(e);
 }
-function Sr(e, t) {
+function Dr(e, t) {
   return e.observers.get(t);
 }
-function kr(e, t) {
+function xr(e, t) {
   e.observers.delete(t.callback);
 }
-function _r(e, t) {
+function Mr(e, t) {
   t.unobserve();
 }
-function Pr(e, t) {
-  var r = [], n, o = Lr(e);
+function $r(e, t) {
+  var r = [], n, o = Rr(e);
   if (!o)
-    o = new Tr(e), Pt.set(e, o);
+    o = new Pr(e), Ft.set(e, o);
   else {
-    var i = Sr(o, t);
+    var i = Dr(o, t);
     n = i && i.observer;
   }
   if (n)
     return n;
-  if (n = {}, o.value = we(e), t) {
+  if (n = {}, o.value = Ae(e), t) {
     n.callback = t, n.next = null;
     var s = function() {
-      St(n);
+      Mt(n);
     }, c = function() {
       clearTimeout(n.next), n.next = setTimeout(s);
     };
     typeof window < "u" && (window.addEventListener("mouseup", c), window.addEventListener("keyup", c), window.addEventListener("mousedown", c), window.addEventListener("keydown", c), window.addEventListener("change", c));
   }
   return n.patches = r, n.object = e, n.unobserve = function() {
-    St(n), clearTimeout(n.next), kr(o, n), typeof window < "u" && (window.removeEventListener("mouseup", c), window.removeEventListener("keyup", c), window.removeEventListener("mousedown", c), window.removeEventListener("keydown", c), window.removeEventListener("change", c));
-  }, o.observers.set(t, new Ir(t, n)), n;
+    Mt(n), clearTimeout(n.next), xr(o, n), typeof window < "u" && (window.removeEventListener("mouseup", c), window.removeEventListener("keyup", c), window.removeEventListener("mousedown", c), window.removeEventListener("keydown", c), window.removeEventListener("change", c));
+  }, o.observers.set(t, new jr(t, n)), n;
 }
-function St(e, t) {
+function Mt(e, t) {
   t === void 0 && (t = !1);
-  var r = Pt.get(e.object);
-  Rt(r.value, e.object, e.patches, "", t), e.patches.length && _t(r.value, e.patches);
+  var r = Ft.get(e.object);
+  Ut(r.value, e.object, e.patches, "", t), e.patches.length && Bt(r.value, e.patches);
   var n = e.patches;
   return n.length > 0 && (e.patches = [], e.callback && e.callback(n)), n;
 }
-function Rt(e, t, r, n, o) {
+function Ut(e, t, r, n, o) {
   if (t !== e) {
     typeof t.toJSON == "function" && (t = t.toJSON());
-    for (var i = Tt(t), s = Tt(e), c = !1, a = s.length - 1; a >= 0; a--) {
+    for (var i = Rt(t), s = Rt(e), c = !1, a = s.length - 1; a >= 0; a--) {
       var u = s[a], l = e[u];
-      if (Et(t, u) && !(t[u] === void 0 && l !== void 0 && Array.isArray(t) === !1)) {
+      if (jt(t, u) && !(t[u] === void 0 && l !== void 0 && Array.isArray(t) === !1)) {
         var y = t[u];
-        typeof l == "object" && l != null && typeof y == "object" && y != null && Array.isArray(l) === Array.isArray(y) ? Rt(l, y, r, n + "/" + Me(u), o) : l !== y && (o && r.push({ op: "test", path: n + "/" + Me(u), value: we(l) }), r.push({ op: "replace", path: n + "/" + Me(u), value: we(y) }));
-      } else Array.isArray(e) === Array.isArray(t) ? (o && r.push({ op: "test", path: n + "/" + Me(u), value: we(l) }), r.push({ op: "remove", path: n + "/" + Me(u) }), c = !0) : (o && r.push({ op: "test", path: n, value: e }), r.push({ op: "replace", path: n, value: t }));
+        typeof l == "object" && l != null && typeof y == "object" && y != null && Array.isArray(l) === Array.isArray(y) ? Ut(l, y, r, n + "/" + Fe(u), o) : l !== y && (o && r.push({ op: "test", path: n + "/" + Fe(u), value: Ae(l) }), r.push({ op: "replace", path: n + "/" + Fe(u), value: Ae(y) }));
+      } else Array.isArray(e) === Array.isArray(t) ? (o && r.push({ op: "test", path: n + "/" + Fe(u), value: Ae(l) }), r.push({ op: "remove", path: n + "/" + Fe(u) }), c = !0) : (o && r.push({ op: "test", path: n, value: e }), r.push({ op: "replace", path: n, value: t }));
     }
     if (!(!c && i.length == s.length))
       for (var a = 0; a < i.length; a++) {
         var u = i[a];
-        !Et(e, u) && t[u] !== void 0 && r.push({ op: "add", path: n + "/" + Me(u), value: we(t[u]) });
+        !jt(e, u) && t[u] !== void 0 && r.push({ op: "add", path: n + "/" + Fe(u), value: Ae(t[u]) });
       }
   }
 }
-function We(e, t, r) {
+function Ce(e, t, r) {
   r === void 0 && (r = !1);
   var n = [];
-  return Rt(e, t, n, "", r), n;
+  return Ut(e, t, n, "", r), n;
 }
-const Rr = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Br = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  compare: We,
-  generate: St,
-  observe: Pr,
-  unobserve: _r
+  compare: Ce,
+  generate: Mt,
+  observe: $r,
+  unobserve: Mr
 }, Symbol.toStringTag, { value: "Module" }));
-Object.assign({}, Er, Rr, {
-  JsonPatchError: pn,
-  deepClone: we,
-  escapePathComponent: Me,
-  unescapePathComponent: fn
+Object.assign({}, _r, Br, {
+  JsonPatchError: bn,
+  deepClone: Ae,
+  escapePathComponent: Fe,
+  unescapePathComponent: vn
 });
-const ht = "oneOf", jt = "anyOf", Dt = "allOf";
-function Mt(e) {
-  return !!(e[ht] || e[jt] || e[Dt]);
+const At = "oneOf", Vt = "anyOf", Jt = "allOf";
+function Ht(e) {
+  return !!(e[At] || e[Vt] || e[Jt]);
 }
-function hn(e) {
-  const t = e[ht] || e[jt] || e[Dt];
+function On(e) {
+  const t = e[At] || e[Vt] || e[Jt];
   return Array.isArray(t) ? t : void 0;
 }
-function ct(e) {
-  return e.oneOf ? ht : e.anyOf ? jt : e.allOf ? Dt : "";
+function gt(e) {
+  return e.oneOf ? At : e.anyOf ? Vt : e.allOf ? Jt : "";
 }
-function jr(e, t) {
+function Fr(e, t) {
   if (typeof t != "object" || t === null || Array.isArray(t))
     return null;
   const r = t, n = /* @__PURE__ */ new Set();
@@ -1425,7 +1425,7 @@ function jr(e, t) {
       return { field: o, value: r[o] };
   return null;
 }
-function at(e, t, r = ht) {
+function mt(e, t, r = At) {
   var n;
   if (t.length === 0)
     throw new Error("No variants provided to chooseSubschemaSync");
@@ -1436,7 +1436,7 @@ function at(e, t, r = ht) {
         return { selectedIndex: o, schema: i };
     }
   if (typeof e == "object" && e !== null && !Array.isArray(e)) {
-    const o = e, i = jr(t, e);
+    const o = e, i = Fr(t, e);
     if (i)
       for (let s = 0; s < t.length; s++) {
         const c = t[s], a = (n = c.properties) == null ? void 0 : n[i.field];
@@ -1478,32 +1478,32 @@ function at(e, t, r = ht) {
   }
   return { selectedIndex: 0, schema: t[0] };
 }
-function kt(e, t, r) {
+function $t(e, t, r) {
   const n = !de(e, t), o = !de(e, r);
-  return n && o ? de(t, r) ? D.SAME_CHANGE : D.TRUE_CONFLICT : n ? D.INPUT1_ONLY : o ? D.INPUT2_ONLY : D.SAME_CHANGE;
+  return n && o ? de(t, r) ? x.SAME_CHANGE : x.TRUE_CONFLICT : n ? x.INPUT1_ONLY : o ? x.INPUT2_ONLY : x.SAME_CHANGE;
 }
-function Pe(e, t) {
+function De(e, t) {
   try {
-    const r = ln(e);
+    const r = mn(e);
     if (!r)
       return { start: 1, end: 1 };
     const n = t.split("/").filter(Boolean).map((s) => {
       const c = Number.parseInt(s, 10);
       return !Number.isNaN(c) && String(c) === s ? c : s;
-    }), o = n.length === 0 ? r : un(r, n);
+    }), o = n.length === 0 ? r : yn(r, n);
     return o ? {
-      start: rn(e, o.offset),
-      end: rn(e, o.offset + o.length)
+      start: fn(e, o.offset),
+      end: fn(e, o.offset + o.length)
     } : { start: 1, end: 1 };
   } catch {
     return { start: 1, end: 1 };
   }
 }
-function rn(e, t) {
+function fn(e, t) {
   return e.substring(0, t).split(`
 `).length;
 }
-function Dr(e, t) {
+function Ur(e, t) {
   const r = /* @__PURE__ */ new Map(), n = (o) => {
     const i = o.split("/").filter(Boolean);
     return i.length > 0 ? `/${i[0]}` : "/";
@@ -1522,7 +1522,7 @@ function Dr(e, t) {
   }
   return r;
 }
-function Mr(e, t, r, n, o, i) {
+function Vr(e, t, r, n, o, i) {
   const s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), u = [], l = [];
   for (const v of e) {
     const h = v.path.match(/^(\/[^/]+(?:\/[^/]+)*)\/(\d+)(?:\/|$)/);
@@ -1548,79 +1548,79 @@ function Mr(e, t, r, n, o, i) {
   for (const v of y) {
     const h = W(r, v), m = W(n, v), f = W(o, v);
     if (!Array.isArray(h) || !Array.isArray(m) || !Array.isArray(f)) {
-      const T = c.get(v) || [], F = a.get(v) || [];
-      for (const M of T) {
-        const x = M.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-        if (x) {
-          const V = x[1];
+      const L = c.get(v) || [], U = a.get(v) || [];
+      for (const M of L) {
+        const $ = M.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+        if ($) {
+          const V = $[1];
           s.has(V) || s.set(V, { patches1: [], patches2: [] });
-          const A = s.get(V);
-          A && A.patches1.push(M);
+          const E = s.get(V);
+          E && E.patches1.push(M);
         }
       }
-      for (const M of F) {
-        const x = M.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-        if (x) {
-          const V = x[1];
+      for (const M of U) {
+        const $ = M.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+        if ($) {
+          const V = $[1];
           s.has(V) || s.set(V, { patches1: [], patches2: [] });
-          const A = s.get(V);
-          A && A.patches2.push(M);
+          const E = s.get(V);
+          E && E.patches2.push(M);
         }
       }
       continue;
     }
-    const E = qe(i, v, r), S = E != null && E.items ? Array.isArray(E.items) && E.items[0] ? E.items[0] : Array.isArray(E.items) ? null : E.items : null, g = S && typeof S == "object" ? S : null;
+    const I = Xe(i, v, r), S = I != null && I.items ? Array.isArray(I.items) && I.items[0] ? I.items[0] : Array.isArray(I.items) ? null : I.items : null, g = S && typeof S == "object" ? S : null;
     if (g) {
-      const T = Br(h, m, f, g);
-      if (T.size > 0) {
-        const F = /* @__PURE__ */ new Map(), M = /* @__PURE__ */ new Map(), x = /* @__PURE__ */ new Map();
-        for (const [w, R] of T.entries())
-          R.base !== void 0 && F.set(R.base, w), R.input1 !== void 0 && M.set(R.input1, w), R.input2 !== void 0 && x.set(R.input2, w);
-        const V = c.get(v) || [], A = a.get(v) || [];
-        for (const w of V) {
-          const R = w.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
+      const L = Gr(h, m, f, g);
+      if (L.size > 0) {
+        const U = /* @__PURE__ */ new Map(), M = /* @__PURE__ */ new Map(), $ = /* @__PURE__ */ new Map();
+        for (const [A, R] of L.entries())
+          R.base !== void 0 && U.set(R.base, A), R.input1 !== void 0 && M.set(R.input1, A), R.input2 !== void 0 && $.set(R.input2, A);
+        const V = c.get(v) || [], E = a.get(v) || [];
+        for (const A of V) {
+          const R = A.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
           if (R) {
-            const X = Number.parseInt(R[1], 10), ne = M.get(X);
-            if (ne !== void 0) {
-              const ae = `${v}#${ne}`;
-              s.has(ae) || s.set(ae, { patches1: [], patches2: [] });
-              const me = s.get(ae);
-              me && me.patches1.push(w);
+            const X = Number.parseInt(R[1], 10), re = M.get(X);
+            if (re !== void 0) {
+              const oe = `${v}#${re}`;
+              s.has(oe) || s.set(oe, { patches1: [], patches2: [] });
+              const ge = s.get(oe);
+              ge && ge.patches1.push(A);
             }
           }
         }
-        for (const w of A) {
-          const R = w.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
+        for (const A of E) {
+          const R = A.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
           if (R) {
-            const X = Number.parseInt(R[1], 10), ne = x.get(X);
-            if (ne !== void 0) {
-              const ae = `${v}#${ne}`;
-              s.has(ae) || s.set(ae, { patches1: [], patches2: [] });
-              const me = s.get(ae);
-              me && me.patches2.push(w);
+            const X = Number.parseInt(R[1], 10), re = $.get(X);
+            if (re !== void 0) {
+              const oe = `${v}#${re}`;
+              s.has(oe) || s.set(oe, { patches1: [], patches2: [] });
+              const ge = s.get(oe);
+              ge && ge.patches2.push(A);
             }
           }
         }
         continue;
       }
     }
-    const b = c.get(v) || [], j = a.get(v) || [];
-    for (const T of b) {
-      const F = T.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-      if (F) {
-        const M = F[1];
+    const b = c.get(v) || [], D = a.get(v) || [];
+    for (const L of b) {
+      const U = L.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+      if (U) {
+        const M = U[1];
         s.has(M) || s.set(M, { patches1: [], patches2: [] });
-        const x = s.get(M);
-        x && x.patches1.push(T);
+        const $ = s.get(M);
+        $ && $.patches1.push(L);
       }
     }
-    for (const T of j) {
-      const F = T.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-      if (F) {
-        const M = F[1];
+    for (const L of D) {
+      const U = L.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+      if (U) {
+        const M = U[1];
         s.has(M) || s.set(M, { patches1: [], patches2: [] });
-        const x = s.get(M);
-        x && x.patches2.push(T);
+        const $ = s.get(M);
+        $ && $.patches2.push(L);
       }
     }
   }
@@ -1628,18 +1628,18 @@ function Mr(e, t, r, n, o, i) {
     if (!h) return null;
     const m = v.split("/").filter(Boolean);
     if (m.length < 2) return null;
-    const f = `/${m[0]}`, E = qe(h, f);
-    return E && Mt(E) ? f : null;
-  }, d = [...u], L = [...l], N = /* @__PURE__ */ new Set();
+    const f = `/${m[0]}`, I = Xe(h, f);
+    return I && Ht(I) ? f : null;
+  }, d = [...u], _ = [...l], T = /* @__PURE__ */ new Set();
   for (const v of d) {
     const h = p(v.path, i);
-    h && N.add(h);
+    h && T.add(h);
   }
-  for (const v of L) {
+  for (const v of _) {
     const h = p(v.path, i);
-    h && N.add(h);
+    h && T.add(h);
   }
-  for (const v of N)
+  for (const v of T)
     s.has(v) || s.set(v, { patches1: [], patches2: [] });
   for (const v of d) {
     const h = v.path, m = p(h, i);
@@ -1652,7 +1652,7 @@ function Mr(e, t, r, n, o, i) {
       f && f.patches1.push(v);
     }
   }
-  for (const v of L) {
+  for (const v of _) {
     const h = v.path, m = p(h, i);
     if (m) {
       const f = s.get(m);
@@ -1665,7 +1665,7 @@ function Mr(e, t, r, n, o, i) {
   }
   return s;
 }
-function qe(e, t, r) {
+function Xe(e, t, r) {
   if (!e)
     return null;
   const n = t.split("/").filter(Boolean);
@@ -1674,12 +1674,12 @@ function qe(e, t, r) {
   let o = e, i = "";
   for (let s = 0; s < n.length; s++) {
     const c = n[s], a = Number.parseInt(c, 10), u = !Number.isNaN(a) && String(a) === c;
-    if (o && Mt(o)) {
-      const l = hn(o), y = ct(o), p = r ? W(r, i || "/") : void 0;
+    if (o && Ht(o)) {
+      const l = On(o), y = gt(o), p = r ? W(r, i || "/") : void 0;
       if (l && l.length > 0)
         if (p !== void 0)
           try {
-            const { schema: d } = at(p, l, y);
+            const { schema: d } = mt(p, l, y);
             o = d;
           } catch {
             l.length > 0 && l[0] && (o = l[0]);
@@ -1707,7 +1707,7 @@ function qe(e, t, r) {
   }
   return o;
 }
-function gn(e) {
+function An(e) {
   if (!e || typeof e != "object")
     return [];
   const t = [];
@@ -1727,12 +1727,12 @@ function gn(e) {
   }
   return t;
 }
-function xr(e) {
-  const t = gn(e);
+function Jr(e) {
+  const t = An(e);
   return t.length > 0 ? t[0] : null;
 }
-function $r(e, t, r) {
-  const n = /* @__PURE__ */ new Map(), o = gn(r);
+function Hr(e, t, r) {
+  const n = /* @__PURE__ */ new Map(), o = An(r);
   if (o.length === 0)
     return n;
   const i = (c) => {
@@ -1756,8 +1756,8 @@ function $r(e, t, r) {
   };
   return s(e, "input1"), s(t, "input2"), n;
 }
-function Br(e, t, r, n) {
-  const o = /* @__PURE__ */ new Map(), i = xr(n);
+function Gr(e, t, r, n) {
+  const o = /* @__PURE__ */ new Map(), i = Jr(n);
   if (!i)
     return o;
   const s = (c, a) => {
@@ -1775,23 +1775,23 @@ function Br(e, t, r, n) {
   };
   return s(e, "base"), s(t, "input1"), s(r, "input2"), o;
 }
-function Fr(e, t, r, n) {
-  const o = typeof e == "object" && e !== null || Array.isArray(e) ? e : {}, i = typeof t == "object" && t !== null || Array.isArray(t) ? t : {}, s = typeof r == "object" && r !== null || Array.isArray(r) ? r : {}, c = We(o, i), a = We(o, s);
-  let u = Dr(c, a);
-  n && (u = Mr(c, a, e, t, r, n));
-  const l = [], y = /* @__PURE__ */ new Set(), p = (d, L, N, v) => {
-    if (!n || typeof L != "object" || L === null || Array.isArray(L) || typeof N != "object" || N === null || Array.isArray(N) || typeof v != "object" || v === null || Array.isArray(v)) return !1;
-    const h = qe(n, d, L);
-    if (!h || !Mt(h)) return !1;
-    const m = hn(h);
+function Wr(e, t, r, n) {
+  const o = typeof e == "object" && e !== null || Array.isArray(e) ? e : {}, i = typeof t == "object" && t !== null || Array.isArray(t) ? t : {}, s = typeof r == "object" && r !== null || Array.isArray(r) ? r : {}, c = Ce(o, i), a = Ce(o, s);
+  let u = Ur(c, a);
+  n && (u = Vr(c, a, e, t, r, n));
+  const l = [], y = /* @__PURE__ */ new Set(), p = (d, _, T, v) => {
+    if (!n || typeof _ != "object" || _ === null || Array.isArray(_) || typeof T != "object" || T === null || Array.isArray(T) || typeof v != "object" || v === null || Array.isArray(v)) return !1;
+    const h = Xe(n, d, _);
+    if (!h || !Ht(h)) return !1;
+    const m = On(h);
     if (!m || m.length < 2) return !1;
-    const f = at(L, m, ct(h)), E = at(N, m, ct(h)), S = at(v, m, ct(h));
-    return E.selectedIndex !== S.selectedIndex && (f.selectedIndex !== E.selectedIndex || f.selectedIndex !== S.selectedIndex);
+    const f = mt(_, m, gt(h)), I = mt(T, m, gt(h)), S = mt(v, m, gt(h));
+    return I.selectedIndex !== S.selectedIndex && (f.selectedIndex !== I.selectedIndex || f.selectedIndex !== S.selectedIndex);
   };
-  for (const [d, { patches1: L, patches2: N }] of u) {
+  for (const [d, { patches1: _, patches2: T }] of u) {
     y.add(d);
     let v = d;
-    L.length > 0 ? v = L[0].path : N.length > 0 ? v = N[0].path : d.includes("#") && (v = d.split("#")[0]);
+    _.length > 0 ? v = _[0].path : T.length > 0 ? v = T[0].path : d.includes("#") && (v = d.split("#")[0]);
     let h = d;
     if (d.includes("#"))
       h = d.split("#")[0];
@@ -1799,149 +1799,149 @@ function Fr(e, t, r, n) {
       const M = d.split("/").filter(Boolean);
       M.length > 1 && (h = `/${M[0]}`);
     }
-    if ([...L, ...N].every((M) => (M.path.split("/").slice(0, 2).join("/") || `/${M.path.split("/")[1]}`) === h) && h !== v) {
-      const M = W(e, h), x = W(t, h), V = W(r, h);
-      if (p(h, M, x, V)) {
-        const w = M, R = x, X = V;
-        let ne = kt(w, R, X);
-        !de(w, R) && !de(w, X) && !de(R, X) && (ne = D.TRUE_CONFLICT);
-        const ae = [...L, ...N].filter(
-          (Te) => Te.path.startsWith(`${h}/`) || Te.path === h
-        ), me = [], je = [];
-        for (const Te of ae) {
-          const C = Te.path, re = e !== void 0 ? W(e, C) : void 0, K = W(t, C), $ = W(r, C);
-          let fe = !1, Ie = !1;
-          Te.op === "replace" ? re !== void 0 && (fe = !de(re, K), Ie = !de(re, $)) : Te.op === "add" ? (fe = re === void 0 && K !== void 0, Ie = re === void 0 && $ !== void 0) : Te.op === "remove" && (fe = re !== void 0 && K === void 0, Ie = re !== void 0 && $ === void 0), re !== void 0 && (K !== void 0 && de(re, K) && (fe = !1), $ !== void 0 && de(re, $) && (Ie = !1)), fe && me.push(Te), Ie && je.push(Te);
+    if ([..._, ...T].every((M) => (M.path.split("/").slice(0, 2).join("/") || `/${M.path.split("/")[1]}`) === h) && h !== v) {
+      const M = W(e, h), $ = W(t, h), V = W(r, h);
+      if (p(h, M, $, V)) {
+        const A = M, R = $, X = V;
+        let re = $t(A, R, X);
+        !de(A, R) && !de(A, X) && !de(R, X) && (re = x.TRUE_CONFLICT);
+        const oe = [..._, ...T].filter(
+          (be) => be.path.startsWith(`${h}/`) || be.path === h
+        ), ge = [], ke = [];
+        for (const be of oe) {
+          const at = be.path, Ne = e !== void 0 ? W(e, at) : void 0, Q = W(t, at), pe = W(r, at);
+          let ee = !1, B = !1;
+          be.op === "replace" ? Ne !== void 0 && (ee = !de(Ne, Q), B = !de(Ne, pe)) : be.op === "add" ? (ee = Ne === void 0 && Q !== void 0, B = Ne === void 0 && pe !== void 0) : be.op === "remove" && (ee = Ne !== void 0 && Q === void 0, B = Ne !== void 0 && pe === void 0), Ne !== void 0 && (Q !== void 0 && de(Ne, Q) && (ee = !1), pe !== void 0 && de(Ne, pe) && (B = !1)), ee && ge.push(be), B && ke.push(be);
         }
         l.push({
           path: h,
-          baseValue: w,
+          baseValue: A,
           input1Value: R,
           input2Value: X,
-          conflictType: ne,
-          patches1: me,
-          patches2: je
+          conflictType: re,
+          patches1: ge,
+          patches2: ke
         });
         continue;
       }
     }
-    const f = W(e, v), E = W(t, v), S = W(r, v);
-    let g = kt(f, E, S);
-    const b = f != null, j = E != null, T = S != null;
-    !b && j && T && g !== D.SAME_CHANGE && (g = D.TRUE_CONFLICT), b && de(f, E) && de(f, S) || l.push({
+    const f = W(e, v), I = W(t, v), S = W(r, v);
+    let g = $t(f, I, S);
+    const b = f != null, D = I != null, L = S != null;
+    !b && D && L && g !== x.SAME_CHANGE && (g = x.TRUE_CONFLICT), b && de(f, I) && de(f, S) || l.push({
       path: v,
       // Use representative path for conflict (actual patch paths are in patches1/patches2)
       baseValue: f,
-      input1Value: E,
+      input1Value: I,
       input2Value: S,
       conflictType: g,
-      patches1: L,
+      patches1: _,
       // JSON Patch operations for base?input1 (contain actual paths with indices)
-      patches2: N
+      patches2: T
       // JSON Patch operations for base?input2 (contain actual paths with indices)
     });
   }
   return l;
 }
-function Ur(e, t, r) {
-  var y, p, d, L;
-  const n = typeof e == "object" && e !== null || Array.isArray(e) ? e : {}, o = typeof t == "object" && t !== null || Array.isArray(t) ? t : {}, i = We(n, o);
+function qr(e, t, r) {
+  var y, p, d, _;
+  const n = typeof e == "object" && e !== null || Array.isArray(e) ? e : {}, o = typeof t == "object" && t !== null || Array.isArray(t) ? t : {}, i = Ce(n, o);
   if (i.length === 0)
     return [];
   const s = [], c = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Map(), u = [];
-  for (const N of i) {
-    const v = N.path.match(/^(\/[^/]+(?:\/[^/]+)*)\/(\d+)(?:\/|$)/);
+  for (const T of i) {
+    const v = T.path.match(/^(\/[^/]+(?:\/[^/]+)*)\/(\d+)(?:\/|$)/);
     if (v) {
       const h = v[1];
       a.has(h) || a.set(h, []);
       const m = a.get(h);
-      m && m.push(N);
+      m && m.push(T);
     } else
-      u.push(N);
+      u.push(T);
   }
-  for (const [N, v] of a) {
-    const h = W(e, N), m = W(t, N);
+  for (const [T, v] of a) {
+    const h = W(e, T), m = W(t, T);
     if (!Array.isArray(h) || !Array.isArray(m)) {
       const g = /* @__PURE__ */ new Map();
       for (const b of v) {
-        const j = b.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-        if (j) {
-          const T = j[1];
-          g.has(T) || g.set(T, []), (y = g.get(T)) == null || y.push(b);
+        const D = b.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+        if (D) {
+          const L = D[1];
+          g.has(L) || g.set(L, []), (y = g.get(L)) == null || y.push(b);
         }
       }
-      for (const [b, j] of g)
-        s.push(...Ze(b, j, e, t, void 0)), c.add(b);
+      for (const [b, D] of g)
+        s.push(...rt(b, D, e, t, void 0)), c.add(b);
       continue;
     }
-    const f = r ? qe(r, N, e) : null, E = f != null && f.items ? Array.isArray(f.items) && f.items[0] ? f.items[0] : Array.isArray(f.items) ? null : f.items : null, S = E && typeof E == "object" ? E : null;
+    const f = r ? Xe(r, T, e) : null, I = f != null && f.items ? Array.isArray(f.items) && f.items[0] ? f.items[0] : Array.isArray(f.items) ? null : f.items : null, S = I && typeof I == "object" ? I : null;
     if (S) {
-      const g = $r(h, m, S), b = /* @__PURE__ */ new Map(), j = /* @__PURE__ */ new Map();
-      for (const [x, V] of g.entries())
-        V.input1 !== void 0 && b.set(V.input1, x), V.input2 !== void 0 && j.set(V.input2, x);
-      const T = /* @__PURE__ */ new Map(), F = [];
-      for (const x of v) {
-        const V = x.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
+      const g = Hr(h, m, S), b = /* @__PURE__ */ new Map(), D = /* @__PURE__ */ new Map();
+      for (const [$, V] of g.entries())
+        V.input1 !== void 0 && b.set(V.input1, $), V.input2 !== void 0 && D.set(V.input2, $);
+      const L = /* @__PURE__ */ new Map(), U = [];
+      for (const $ of v) {
+        const V = $.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
         if (V) {
-          const A = Number.parseInt(V[1], 10);
-          let w;
-          if (x.op === "add" ? w = j.get(A) : w = b.get(A), w) {
-            T.has(w) || T.set(w, []);
-            const R = T.get(w);
-            R && R.push(x);
+          const E = Number.parseInt(V[1], 10);
+          let A;
+          if ($.op === "add" ? A = D.get(E) : A = b.get(E), A) {
+            L.has(A) || L.set(A, []);
+            const R = L.get(A);
+            R && R.push($);
           } else
-            F.push(x);
+            U.push($);
         }
       }
-      for (const [x, V] of T) {
-        const A = g.get(x);
-        if (!A) continue;
-        const w = A.input1 !== void 0 ? `${N}/${A.input1}` : `${N}/${A.input2}`;
-        s.push(...Ze(w, V, e, t, void 0)), c.add(w);
+      for (const [$, V] of L) {
+        const E = g.get($);
+        if (!E) continue;
+        const A = E.input1 !== void 0 ? `${T}/${E.input1}` : `${T}/${E.input2}`;
+        s.push(...rt(A, V, e, t, void 0)), c.add(A);
       }
       const M = /* @__PURE__ */ new Map();
-      for (const x of F) {
-        const V = x.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+      for (const $ of U) {
+        const V = $.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
         if (V) {
-          const A = V[1];
-          M.has(A) || M.set(A, []), (p = M.get(A)) == null || p.push(x);
+          const E = V[1];
+          M.has(E) || M.set(E, []), (p = M.get(E)) == null || p.push($);
         }
       }
-      for (const [x, V] of M)
-        c.has(x) || (s.push(...Ze(x, V, e, t, void 0)), c.add(x));
+      for (const [$, V] of M)
+        c.has($) || (s.push(...rt($, V, e, t, void 0)), c.add($));
     } else {
       const g = /* @__PURE__ */ new Map();
       for (const b of v) {
-        const j = b.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-        if (j) {
-          const T = j[1];
-          g.has(T) || g.set(T, []), (d = g.get(T)) == null || d.push(b);
+        const D = b.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+        if (D) {
+          const L = D[1];
+          g.has(L) || g.set(L, []), (d = g.get(L)) == null || d.push(b);
         }
       }
-      for (const [b, j] of g)
-        s.push(...Ze(b, j, e, t, void 0)), c.add(b);
+      for (const [b, D] of g)
+        s.push(...rt(b, D, e, t, void 0)), c.add(b);
     }
   }
   const l = /* @__PURE__ */ new Map();
-  for (const N of u) {
-    const v = N.path.split("/").filter(Boolean), h = v.length > 0 ? `/${v[0]}` : "/";
-    l.has(h) || l.set(h, []), (L = l.get(h)) == null || L.push(N);
+  for (const T of u) {
+    const v = T.path.split("/").filter(Boolean), h = v.length > 0 ? `/${v[0]}` : "/";
+    l.has(h) || l.set(h, []), (_ = l.get(h)) == null || _.push(T);
   }
-  for (const [N, v] of l)
-    s.push(...Ze(N, v, e, t, void 0));
+  for (const [T, v] of l)
+    s.push(...rt(T, v, e, t, void 0));
   return s;
 }
-function Ze(e, t, r, n, o) {
+function rt(e, t, r, n, o) {
   const i = o !== void 0 ? W(o, e) : void 0, s = W(r, e), c = W(n, e), a = [], u = [];
   for (const f of t) {
-    const E = f.path, S = W(r, E), g = W(n, E);
-    let b = !1, j = !1;
-    f.op === "add" ? (b = !1, j = g !== void 0) : f.op === "remove" ? (b = S !== void 0, j = !1) : f.op === "replace" && (b = S !== void 0 && !de(S, g), j = g !== void 0 && !de(S, g)), E === e && (b = !0, j = !0), b && a.push(f), j && u.push(f);
+    const I = f.path, S = W(r, I), g = W(n, I);
+    let b = !1, D = !1;
+    f.op === "add" ? (b = !1, D = g !== void 0) : f.op === "remove" ? (b = S !== void 0, D = !1) : f.op === "replace" && (b = S !== void 0 && !de(S, g), D = g !== void 0 && !de(S, g)), I === e && (b = !0, D = !0), b && a.push(f), D && u.push(f);
   }
   if (a.length === 0 && u.length === 0 && i !== void 0 && s !== void 0 && c !== void 0 && de(i, s) && de(i, c))
     return [];
-  const l = a.length > 0 ? a : t, y = u.length > 0 ? u : t, p = [...l, ...y], d = p.some((f) => f.op === "add"), L = p.some((f) => f.op === "remove"), N = p.some((f) => f.op === "replace");
-  if (d && !N && !L) {
+  const l = a.length > 0 ? a : t, y = u.length > 0 ? u : t, p = [...l, ...y], d = p.some((f) => f.op === "add"), _ = p.some((f) => f.op === "remove"), T = p.some((f) => f.op === "replace");
+  if (d && !T && !_) {
     if (s !== void 0 && c === void 0)
       return [
         {
@@ -1949,7 +1949,7 @@ function Ze(e, t, r, n, o) {
           baseValue: void 0,
           input1Value: s,
           input2Value: void 0,
-          conflictType: D.INPUT1_ONLY,
+          conflictType: x.INPUT1_ONLY,
           patches1: l,
           // Highlight on input1 (new content) - use filtered patches1
           patches2: []
@@ -1963,7 +1963,7 @@ function Ze(e, t, r, n, o) {
           baseValue: void 0,
           input1Value: void 0,
           input2Value: c,
-          conflictType: D.INPUT2_ONLY,
+          conflictType: x.INPUT2_ONLY,
           patches1: [],
           // No highlighting on input1 (doesn't exist there)
           patches2: y
@@ -1971,7 +1971,7 @@ function Ze(e, t, r, n, o) {
         }
       ];
   }
-  if (L && !d && !N) {
+  if (_ && !d && !T) {
     if (s !== void 0 && c === void 0)
       return [
         {
@@ -1979,7 +1979,7 @@ function Ze(e, t, r, n, o) {
           baseValue: s,
           input1Value: s,
           input2Value: void 0,
-          conflictType: D.INPUT1_ONLY,
+          conflictType: x.INPUT1_ONLY,
           patches1: l,
           // Highlight on input1 (removed content) - use filtered patches1
           patches2: []
@@ -1993,7 +1993,7 @@ function Ze(e, t, r, n, o) {
           baseValue: c,
           input1Value: void 0,
           input2Value: c,
-          conflictType: D.INPUT2_ONLY,
+          conflictType: x.INPUT2_ONLY,
           patches1: [],
           // No highlighting on input1 (doesn't exist there)
           patches2: y
@@ -2001,19 +2001,19 @@ function Ze(e, t, r, n, o) {
         }
       ];
   }
-  const v = kt(i, s, c);
+  const v = $t(i, s, c);
   let h = [], m = [];
   switch (v) {
-    case D.INPUT1_ONLY:
+    case x.INPUT1_ONLY:
       h = l, m = [];
       break;
-    case D.INPUT2_ONLY:
+    case x.INPUT2_ONLY:
       h = [], m = y;
       break;
-    case D.SAME_CHANGE:
+    case x.SAME_CHANGE:
       h = l, m = y;
       break;
-    case D.TRUE_CONFLICT:
+    case x.TRUE_CONFLICT:
       h = l, m = y;
       break;
   }
@@ -2029,66 +2029,66 @@ function Ze(e, t, r, n, o) {
     }
   ];
 }
-function At(e, t) {
+function _t(e, t) {
   if (!t || t.length === 0)
     return { start: 1, end: 1 };
   let r = Number.MAX_SAFE_INTEGER, n = 0, o = !1;
   for (const i of t) {
-    const s = Pe(e, i.path);
+    const s = De(e, i.path);
     s.start === 1 && s.end === 1 || (r = Math.min(r, s.start), n = Math.max(n, s.end), o = !0);
   }
   return !o || r === Number.MAX_SAFE_INTEGER || n === 0 ? { start: 1, end: 1 } : { start: r, end: n };
 }
-function Vr(e, t, r, n) {
+function Yr(e, t, r, n) {
   var i, s, c, a, u, l;
   const o = [];
   for (let y = 0; y < e.length; y++) {
     const p = e[y];
-    let d, L, N;
-    (((i = p.patches1) == null ? void 0 : i.length) ?? 0) === 0 && (((s = p.patches2) == null ? void 0 : s.length) ?? 0) === 0 ? (d = t ? Pe(t, p.path) : { start: 1, end: 1 }, L = Pe(r, p.path), N = Pe(n, p.path)) : (d = At(t, [...p.patches1 || [], ...p.patches2 || []]), L = At(r, p.patches1 || []), N = At(n, p.patches2 || []));
-    const v = p.conflictType === D.TRUE_CONFLICT;
-    let h = te.excluded, m = te.excluded;
+    let d, _, T;
+    (((i = p.patches1) == null ? void 0 : i.length) ?? 0) === 0 && (((s = p.patches2) == null ? void 0 : s.length) ?? 0) === 0 ? (d = t ? De(t, p.path) : { start: 1, end: 1 }, _ = De(r, p.path), T = De(n, p.path)) : (d = _t(t, [...p.patches1 || [], ...p.patches2 || []]), _ = _t(r, p.patches1 || []), T = _t(n, p.patches2 || []));
+    const v = p.conflictType === x.TRUE_CONFLICT;
+    let h = ne.excluded, m = ne.excluded;
     switch (p.conflictType) {
-      case D.SAME_CHANGE:
-        h = te.first, m = te.first;
+      case x.SAME_CHANGE:
+        h = ne.first, m = ne.first;
         break;
-      case D.INPUT1_ONLY:
-        h = te.first;
+      case x.INPUT1_ONLY:
+        h = ne.first;
         break;
-      case D.INPUT2_ONLY:
-        m = te.first;
+      case x.INPUT2_ONLY:
+        m = ne.first;
         break;
-      case D.TRUE_CONFLICT:
-        m = te.first;
+      case x.TRUE_CONFLICT:
+        m = ne.first;
         break;
     }
-    const f = [], E = [];
+    const f = [], I = [];
     if (p.patches1 && (p.patches1.length ?? 0) > 0)
       for (const g of p.patches1) {
         const b = !t || t.trim() === "";
         if (g.op === "remove" && !b)
           continue;
-        const j = Pe(r, g.path);
-        if (j.start !== 1 || j.end !== 1)
-          for (let T = j.start; T <= j.end; T++)
-            f.push({ line: T });
+        const D = De(r, g.path);
+        if (D.start !== 1 || D.end !== 1)
+          for (let L = D.start; L <= D.end; L++)
+            f.push({ line: L });
       }
     else if ((((c = p.patches1) == null ? void 0 : c.length) ?? 0) === 0 && (((a = p.patches2) == null ? void 0 : a.length) ?? 0) === 0) {
-      const g = Pe(r, p.path);
+      const g = De(r, p.path);
       (g.start !== 1 || g.end !== 1) && f.push({ line: g.start });
     }
     if (p.patches2 && (p.patches2.length ?? 0) > 0)
       for (const g of p.patches2) {
         if (g.op === "remove")
           continue;
-        const b = Pe(n, g.path);
+        const b = De(n, g.path);
         if (b.start !== 1 || b.end !== 1)
-          for (let j = b.start; j <= b.end; j++)
-            E.push({ line: j });
+          for (let D = b.start; D <= b.end; D++)
+            I.push({ line: D });
       }
     else if ((((u = p.patches1) == null ? void 0 : u.length) ?? 0) === 0 && (((l = p.patches2) == null ? void 0 : l.length) ?? 0) === 0) {
-      const g = Pe(n, p.path);
-      (g.start !== 1 || g.end !== 1) && E.push({ line: g.start });
+      const g = De(n, p.path);
+      (g.start !== 1 || g.end !== 1) && I.push({ line: g.start });
     }
     const S = {
       id: `conflict-${y}`,
@@ -2099,27 +2099,27 @@ function Vr(e, t, r, n) {
         endLineNumberExclusive: d.end + 1
       },
       input1Range: {
-        startLineNumber: L.start,
-        endLineNumberExclusive: L.end + 1
+        startLineNumber: _.start,
+        endLineNumberExclusive: _.end + 1
       },
       input2Range: {
-        startLineNumber: N.start,
-        endLineNumberExclusive: N.end + 1
+        startLineNumber: T.start,
+        endLineNumberExclusive: T.end + 1
       },
       input1Diffs: f,
-      input2Diffs: E,
+      input2Diffs: I,
       isConflicting: v,
       conflictType: p.conflictType,
       input1State: h,
       input2State: m,
-      handled: p.conflictType === D.SAME_CHANGE,
+      handled: p.conflictType === x.SAME_CHANGE,
       focused: !1
     };
     o.push(S);
   }
   return o;
 }
-function Jr(e, t, r, n = {}) {
+function zr(e, t, r, n = {}) {
   const { comparisonMode: o = "split", schema: i } = n;
   if (!t || !r)
     throw new Error("JSON Patch diff requires non-empty input1 and input2 strings");
@@ -2127,50 +2127,50 @@ function Jr(e, t, r, n = {}) {
     const s = e ? JSON.parse(e) : void 0, c = JSON.parse(t), a = JSON.parse(r);
     let u;
     if (s === void 0)
-      u = Ur(c, a, i);
+      u = qr(c, a, i);
     else if (o === "split")
-      u = Fr(s, c, a, i);
+      u = Wr(s, c, a, i);
     else {
-      const l = We(s, c), y = We(c, a), p = /* @__PURE__ */ new Set();
+      const l = Ce(s, c), y = Ce(c, a), p = /* @__PURE__ */ new Set();
       l.forEach((d) => {
         p.add(d.path);
       }), y.forEach((d) => {
         p.add(d.path);
       }), u = Array.from(p).map((d) => {
-        const L = W(s, d), N = W(c, d), v = W(a, d), h = !de(L, N), m = !de(N, v);
+        const _ = W(s, d), T = W(c, d), v = W(a, d), h = !de(_, T), m = !de(T, v);
         let f;
-        return h && m ? f = D.TRUE_CONFLICT : h ? f = D.INPUT1_ONLY : m ? f = D.INPUT2_ONLY : f = D.SAME_CHANGE, {
+        return h && m ? f = x.TRUE_CONFLICT : h ? f = x.INPUT1_ONLY : m ? f = x.INPUT2_ONLY : f = x.SAME_CHANGE, {
           path: d,
-          baseValue: L,
-          input1Value: N,
+          baseValue: _,
+          input1Value: T,
           input2Value: v,
           conflictType: f
         };
       });
     }
-    return Vr(u, e, t, r);
+    return Yr(u, e, t, r);
   } catch (s) {
     const c = s instanceof Error ? s.message : String(s);
     throw new Error(`JSON Patch diff computation failed: ${c}`);
   }
 }
-function Hr(e, t, r) {
+function Cr(e, t, r) {
   const n = e !== t, o = e !== r;
   let i;
-  return n && o ? t === r ? i = D.SAME_CHANGE : i = D.TRUE_CONFLICT : n ? i = D.INPUT1_ONLY : i = D.INPUT2_ONLY, { conflictType: i, input1Changed: n, input2Changed: o };
+  return n && o ? t === r ? i = x.SAME_CHANGE : i = x.TRUE_CONFLICT : n ? i = x.INPUT1_ONLY : i = x.INPUT2_ONLY, { conflictType: i, input1Changed: n, input2Changed: o };
 }
-function no(e, t, r) {
+function uo(e, t, r) {
   var u, l, y;
   const n = [], o = [];
   for (let p = 0; p < Math.max(e.length, t.length, r.length); p++) {
-    const d = e[p] !== void 0 ? e[p] : "", L = t[p] !== void 0 ? t[p] : "", N = r[p] !== void 0 ? r[p] : "", { conflictType: v, input1Changed: h, input2Changed: m } = Hr(d, L, N);
+    const d = e[p] !== void 0 ? e[p] : "", _ = t[p] !== void 0 ? t[p] : "", T = r[p] !== void 0 ? r[p] : "", { conflictType: v, input1Changed: h, input2Changed: m } = Cr(d, _, T);
     (h || m) && o.push({
       line: p + 1,
       input1Changed: h,
       input2Changed: m,
       baseLine: d,
-      input1Line: L,
-      input2Line: N,
+      input1Line: _,
+      input2Line: T,
       conflictType: v
     });
   }
@@ -2178,9 +2178,9 @@ function no(e, t, r) {
     return [];
   let i = ((u = o[0]) == null ? void 0 : u.line) ?? 1, s = (l = o[0]) == null ? void 0 : l.conflictType, c = [], a = [];
   for (let p = 0; p <= o.length; p++) {
-    const d = o[p], L = p === o.length, N = !L && d && o[p - 1] && d.line > (((y = o[p - 1]) == null ? void 0 : y.line) ?? 0) + 1, v = !L && d && d.conflictType !== s;
-    if (L || N || v) {
-      const h = o[p - 1], m = h ? h.line + 1 : i + 1, f = c.length > 0, E = a.length > 0, S = s === D.TRUE_CONFLICT, g = {
+    const d = o[p], _ = p === o.length, T = !_ && d && o[p - 1] && d.line > (((y = o[p - 1]) == null ? void 0 : y.line) ?? 0) + 1, v = !_ && d && d.conflictType !== s;
+    if (_ || T || v) {
+      const h = o[p - 1], m = h ? h.line + 1 : i + 1, f = c.length > 0, I = a.length > 0, S = s === x.TRUE_CONFLICT, g = {
         id: `conflict-${n.length}`,
         baseRange: {
           startLineNumber: i,
@@ -2199,18 +2199,18 @@ function no(e, t, r) {
         isConflicting: S,
         conflictType: s,
         // Default: accept input2 (ours) by default, or both if same change
-        input1State: s === D.SAME_CHANGE && f ? te.first : te.excluded,
-        input2State: E ? te.first : te.excluded,
-        handled: s === D.SAME_CHANGE,
+        input1State: s === x.SAME_CHANGE && f ? ne.first : ne.excluded,
+        input2State: I ? ne.first : ne.excluded,
+        handled: s === x.SAME_CHANGE,
         focused: !1
       };
-      n.push(g), !L && d && (i = d.line, s = d.conflictType, c = [], a = []);
+      n.push(g), !_ && d && (i = d.line, s = d.conflictType, c = [], a = []);
     }
-    !L && d && (d.input1Changed && c.push({ line: d.line }), d.input2Changed && a.push({ line: d.line }));
+    !_ && d && (d.input1Changed && c.push({ line: d.line }), d.input2Changed && a.push({ line: d.line }));
   }
   return n;
 }
-function Gr(e, t, r) {
+function Xr(e, t, r) {
   if (!t || t === "/") {
     if (typeof e == "object" && e !== null && !Array.isArray(e) && typeof r == "object" && r !== null && !Array.isArray(r)) {
       Object.assign(e, r);
@@ -2244,14 +2244,14 @@ function Gr(e, t, r) {
     o[i] = r;
   }
 }
-function Wr(e, t) {
+function Qr(e, t) {
   try {
-    const r = ln(e);
+    const r = mn(e);
     if (!r) return null;
     const n = t.split("/").filter((l) => l !== "").map((l) => {
       const y = Number.parseInt(l, 10);
       return !Number.isNaN(y) && String(y) === l ? y : l;
-    }), o = un(r, n);
+    }), o = yn(r, n);
     if (!o) return null;
     const s = e.substring(0, o.offset).split(`
 `).length, c = o.offset + o.length, u = e.substring(0, c).split(`
@@ -2261,15 +2261,15 @@ function Wr(e, t) {
     return null;
   }
 }
-function mn(e, t, r, n = "") {
+function Nn(e, t, r, n = "") {
   if (JSON.stringify(e) === JSON.stringify(t))
     return e;
   if (e !== null && t !== null && typeof e == "object" && typeof t == "object" && !Array.isArray(e) && !Array.isArray(t)) {
-    const o = e, i = t, s = { ...o }, c = r ? qe(r, n, e) : null, a = c != null && c.properties && typeof c.properties == "object" && !Array.isArray(c.properties) ? c.properties : void 0, u = c == null ? void 0 : c.additionalProperties;
+    const o = e, i = t, s = { ...o }, c = r ? Xe(r, n, e) : null, a = c != null && c.properties && typeof c.properties == "object" && !Array.isArray(c.properties) ? c.properties : void 0, u = c == null ? void 0 : c.additionalProperties;
     for (const l of Object.keys(i))
       if (l in s) {
         if (JSON.stringify(s[l]) !== JSON.stringify(i[l])) {
-          const y = a == null ? void 0 : a[l], p = n ? `${n}/${l}` : `/${l}`, d = mn(s[l], i[l], y, p);
+          const y = a == null ? void 0 : a[l], p = n ? `${n}/${l}` : `/${l}`, d = Nn(s[l], i[l], y, p);
           if (d !== null)
             s[l] = d;
           else
@@ -2289,7 +2289,7 @@ function mn(e, t, r, n = "") {
   }
   return null;
 }
-function qr(e, t, r, n, o) {
+function Zr(e, t, r, n, o) {
   var S;
   const i = [], s = [], c = e.join(`
 `), a = t.join(`
@@ -2308,118 +2308,118 @@ function qr(e, t, r, n, o) {
   }
   let d;
   !l || typeof l == "object" && l !== null && Object.keys(l).length === 0 ? d = JSON.parse(JSON.stringify(p)) : d = JSON.parse(JSON.stringify(l));
-  const L = /* @__PURE__ */ new Set(), N = /* @__PURE__ */ new Set(), v = /* @__PURE__ */ new Set(), h = (g, b, j) => null;
+  const _ = /* @__PURE__ */ new Set(), T = /* @__PURE__ */ new Set(), v = /* @__PURE__ */ new Set(), h = (g, b, D) => null;
   for (const g of n) {
-    const b = g.input1State === te.first || g.input1State === te.second, j = g.input2State === te.first || g.input2State === te.second;
-    let T = g.path;
-    if (!T && (T = h(g.baseRange.startLineNumber, g.baseRange.endLineNumberExclusive) || void 0, !T)) {
-      g.conflictType === D.INPUT2_ONLY && j ? d = JSON.parse(JSON.stringify(p)) : g.conflictType === D.INPUT1_ONLY && b ? d = JSON.parse(JSON.stringify(y)) : g.conflictType === D.SAME_CHANGE && (b || j) || j ? d = JSON.parse(JSON.stringify(p)) : b && (d = JSON.parse(JSON.stringify(y)));
+    const b = g.input1State === ne.first || g.input1State === ne.second, D = g.input2State === ne.first || g.input2State === ne.second;
+    let L = g.path;
+    if (!L && (L = h(g.baseRange.startLineNumber, g.baseRange.endLineNumberExclusive) || void 0, !L)) {
+      g.conflictType === x.INPUT2_ONLY && D ? d = JSON.parse(JSON.stringify(p)) : g.conflictType === x.INPUT1_ONLY && b ? d = JSON.parse(JSON.stringify(y)) : g.conflictType === x.SAME_CHANGE && (b || D) || D ? d = JSON.parse(JSON.stringify(p)) : b && (d = JSON.parse(JSON.stringify(y)));
       continue;
     }
     try {
-      let F, M = T;
-      const x = (S = g.path) == null ? void 0 : S.match(/^(.*\/\d+)(?:\/.*)?$/);
-      let V = !1, A = "";
-      if (x) {
-        const R = x[1].split("/").filter((X) => X !== "");
+      let U, M = L;
+      const $ = (S = g.path) == null ? void 0 : S.match(/^(.*\/\d+)(?:\/.*)?$/);
+      let V = !1, E = "";
+      if ($) {
+        const R = $[1].split("/").filter((X) => X !== "");
         if (R.length >= 2) {
           const X = R[R.length - 1];
-          /^\d+$/.test(X) && (V = !0, A = `/${R.slice(0, -1).join("/")}`);
+          /^\d+$/.test(X) && (V = !0, E = `/${R.slice(0, -1).join("/")}`);
         }
       }
-      if (b && j)
-        if (g.conflictType === D.SAME_CHANGE)
-          V ? (F = W(p, A), M = A) : F = W(p, T);
+      if (b && D)
+        if (g.conflictType === x.SAME_CHANGE)
+          V ? (U = W(p, E), M = E) : U = W(p, L);
         else {
-          const w = V ? A : T, R = W(y, w), X = W(p, w), ne = o && l && typeof l == "object" && qe(o, w, l) || void 0, ae = mn(R, X, ne, w);
-          ae !== null ? (F = ae, M = w, i.push(`Smart-merged conflict at path ${w}`)) : (F = X, M = w, i.push(`Merge failed at path ${w}, using input2 value`));
+          const A = V ? E : L, R = W(y, A), X = W(p, A), re = o && l && typeof l == "object" && Xe(o, A, l) || void 0, oe = Nn(R, X, re, A);
+          oe !== null ? (U = oe, M = A, i.push(`Smart-merged conflict at path ${A}`)) : (U = X, M = A, i.push(`Merge failed at path ${A}, using input2 value`));
         }
       else if (b)
         if (V)
-          F = W(y, A), M = A;
+          U = W(y, E), M = E;
         else {
-          const w = T.split("/").filter(Boolean);
-          if (w.length > 1) {
-            const R = `/${w.slice(0, -1).join("/")}`;
+          const A = L.split("/").filter(Boolean);
+          if (A.length > 1) {
+            const R = `/${A.slice(0, -1).join("/")}`;
             if (!v.has(R)) {
               const X = W(y, R);
               if (typeof X == "object" && X !== null && !Array.isArray(X)) {
-                const ne = W(d, R);
-                if (typeof ne == "object" && ne !== null && !Array.isArray(ne)) {
-                  for (const [ae, me] of Object.entries(X)) {
-                    const je = `${R}/${ae}`;
-                    N.has(je) || (ne[ae] = me);
+                const re = W(d, R);
+                if (typeof re == "object" && re !== null && !Array.isArray(re)) {
+                  for (const [oe, ge] of Object.entries(X)) {
+                    const ke = `${R}/${oe}`;
+                    T.has(ke) || (re[oe] = ge);
                   }
                   v.add(R);
                 }
               }
             }
-            F = W(y, T);
+            U = W(y, L);
           } else
-            F = W(y, T);
+            U = W(y, L);
         }
-      else if (j)
+      else if (D)
         if (V)
-          F = W(p, A), M = A;
+          U = W(p, E), M = E;
         else {
-          const w = T.split("/").filter(Boolean);
-          if (w.length > 1) {
-            const R = `/${w.slice(0, -1).join("/")}`;
+          const A = L.split("/").filter(Boolean);
+          if (A.length > 1) {
+            const R = `/${A.slice(0, -1).join("/")}`;
             if (!v.has(R)) {
               const X = W(p, R);
               if (typeof X == "object" && X !== null && !Array.isArray(X)) {
-                const ne = W(d, R);
-                if (typeof ne == "object" && ne !== null && !Array.isArray(ne)) {
-                  for (const [ae, me] of Object.entries(X)) {
-                    const je = `${R}/${ae}`;
-                    N.has(je) || (ne[ae] = me);
+                const re = W(d, R);
+                if (typeof re == "object" && re !== null && !Array.isArray(re)) {
+                  for (const [oe, ge] of Object.entries(X)) {
+                    const ke = `${R}/${oe}`;
+                    T.has(ke) || (re[oe] = ge);
                   }
                   v.add(R);
                 }
               }
             }
-            F = W(p, T);
+            U = W(p, L);
           } else
-            F = W(p, T);
+            U = W(p, L);
         }
       else {
-        const w = V ? A : T, R = W(l, w);
+        const A = V ? E : L, R = W(l, A);
         if (R !== void 0)
-          F = R, M = w;
+          U = R, M = A;
         else
           continue;
       }
-      F !== void 0 && (Gr(d, M, F), L.add(M), N.add(M));
-    } catch (F) {
-      i.push(`Failed to apply conflict at path ${T || g.id}: ${F instanceof Error ? F.message : String(F)}`);
+      U !== void 0 && (Xr(d, M, U), _.add(M), T.add(M));
+    } catch (U) {
+      i.push(`Failed to apply conflict at path ${L || g.id}: ${U instanceof Error ? U.message : String(U)}`);
     }
   }
   const m = JSON.stringify(d, null, 2);
   for (const g of n) {
     const b = g.path;
     if (!b) continue;
-    const j = g.input1State === te.first || g.input1State === te.second, T = g.input2State === te.first || g.input2State === te.second;
-    if (j && T && g.conflictType === D.TRUE_CONFLICT) {
-      const F = Wr(m, b);
-      F && s.push({
+    const D = g.input1State === ne.first || g.input1State === ne.second, L = g.input2State === ne.first || g.input2State === ne.second;
+    if (D && L && g.conflictType === x.TRUE_CONFLICT) {
+      const U = Qr(m, b);
+      U && s.push({
         conflictId: g.id,
         conflictPath: b,
         type: "warning",
         message: "Both conflicting changes were accepted - please review and manually resolve",
-        startLine: F.startLine,
-        endLine: F.endLine
+        startLine: U.startLine,
+        endLine: U.endLine
       });
     }
   }
-  let f = !0, E;
+  let f = !0, I;
   try {
     JSON.parse(m);
   } catch (g) {
-    f = !1, E = g instanceof Error ? g.message : "Invalid JSON", s.push({
+    f = !1, I = g instanceof Error ? g.message : "Invalid JSON", s.push({
       conflictId: "validation-error",
       conflictPath: "/",
       type: "error",
-      message: E,
+      message: I,
       startLine: 1,
       endLine: m.split(`
 `).length
@@ -2428,27 +2428,27 @@ function qr(e, t, r, n, o) {
   return {
     content: m,
     isValid: f,
-    validationError: E,
+    validationError: I,
     warnings: i.length > 0 ? i : void 0,
     conflictIssues: s.length > 0 ? s : void 0
   };
 }
-function Yr(e, t, r) {
+function Kr(e, t, r) {
   let n = "", o = "", i = "", s = "", c = "", a = "", u = "", l = "";
   switch (e.conflictType) {
-    case D.SAME_CHANGE: {
+    case x.SAME_CHANGE: {
       const y = e.baseRange.startLineNumber === 1 && e.baseRange.endLineNumberExclusive === 2 && // Default "not found" range
       e.input1Range.startLineNumber !== 1 && e.input2Range.startLineNumber !== 1;
       t ? y ? (n = "merge-2way-deletion", o = "merge-same-change", s = r.baseOverviewColor, c = r.changeOverviewColor, a = "", u = "-", l = "+") : (n = "merge-2way-deletion", o = "merge-same-change", i = "merge-change-base", s = r.baseOverviewColor, c = r.changeOverviewColor, a = "", u = "-", l = "") : y ? (n = "merge-same-change", o = "merge-same-change", i = "", s = r.changeOverviewColor, c = r.changeOverviewColor, a = "", u = "+", l = "+") : (n = "merge-change-incoming", o = "merge-same-change", i = "merge-change-base", s = r.changeOverviewColor, c = r.changeOverviewColor, a = r.baseOverviewColor, u = "", l = "");
       break;
     }
-    case D.INPUT1_ONLY:
+    case x.INPUT1_ONLY:
       t ? (n = "merge-2way-deletion", o = "", s = r.baseOverviewColor, c = "", u = "-", l = "") : (n = "merge-change-incoming", o = "", i = "merge-change-base", s = r.conflictOverviewColor, c = "", a = r.baseOverviewColor, u = "-", l = "");
       break;
-    case D.INPUT2_ONLY:
+    case x.INPUT2_ONLY:
       n = "", o = "merge-change-current", i = t ? "" : "merge-change-base", s = "", c = r.changeOverviewColor, a = t ? "" : r.baseOverviewColor, u = "", l = "+";
       break;
-    case D.TRUE_CONFLICT: {
+    case x.TRUE_CONFLICT: {
       const y = e.baseRange.startLineNumber === 1 && e.baseRange.endLineNumberExclusive === 2 && // Default "not found" range
       e.input1Range.startLineNumber !== 1 && e.input2Range.startLineNumber !== 1;
       t ? y ? (n = "merge-2way-deletion", o = "merge-change-current", s = r.baseOverviewColor, c = r.changeOverviewColor, a = "", u = "-", l = "+") : (n = "merge-2way-deletion", o = "merge-conflict-current", i = "merge-conflict-base", s = r.baseOverviewColor, c = r.conflictOverviewColor, a = r.baseOverviewColor, u = "-", l = "+") : y ? (n = "merge-change-incoming", o = "merge-change-current", i = "", s = r.changeOverviewColor, c = r.changeOverviewColor, a = "", u = "+", l = "+") : (n = "merge-conflict-incoming", o = "merge-conflict-current", i = "merge-conflict-base", s = r.conflictOverviewColor, c = r.conflictOverviewColor, a = r.baseOverviewColor, u = "", l = "");
@@ -2466,7 +2466,7 @@ function Yr(e, t, r) {
     input2Symbol: l
   };
 }
-function yn(e) {
+function En(e) {
   const t = /* @__PURE__ */ new Set();
   for (const r of e)
     if (r && typeof r == "object" && "line" in r) {
@@ -2475,11 +2475,11 @@ function yn(e) {
     }
   return Array.from(t).sort((r, n) => r - n);
 }
-function zr(e, t, r) {
+function eo(e, t, r) {
   const n = [];
   if (t.input1Class) {
     if (e.input1Diffs.length > 0) {
-      const o = yn(e.input1Diffs);
+      const o = En(e.input1Diffs);
       for (const i of o)
         n.push({
           range: new r.Range(i, 1, i, Number.MAX_SAFE_INTEGER),
@@ -2497,7 +2497,7 @@ function zr(e, t, r) {
             } : void 0
           }
         });
-    } else if (e.conflictType === D.INPUT1_ONLY) {
+    } else if (e.conflictType === x.INPUT1_ONLY) {
       const o = e.input1Range.startLineNumber, i = e.input1Range.endLineNumberExclusive - 1;
       for (let s = o; s <= i; s++)
         n.push({
@@ -2520,10 +2520,10 @@ function zr(e, t, r) {
   }
   return n;
 }
-function Xr(e, t, r) {
+function to(e, t, r) {
   const n = [];
   if (e.input2Diffs.length > 0 && t.input2Class) {
-    const o = yn(e.input2Diffs);
+    const o = En(e.input2Diffs);
     for (const i of o)
       n.push({
         range: new r.Range(i, 1, i, Number.MAX_SAFE_INTEGER),
@@ -2544,7 +2544,7 @@ function Xr(e, t, r) {
   }
   return n;
 }
-function Qr(e, t, r) {
+function no(e, t, r) {
   const n = [], o = e.baseRange.startLineNumber === 1 && e.baseRange.endLineNumberExclusive === 2;
   return (e.input1Diffs.length > 0 || e.input2Diffs.length > 0) && !o && n.push({
     range: new r.Range(
@@ -2567,18 +2567,18 @@ function Qr(e, t, r) {
     }
   }), n;
 }
-function Zr(e, t, r, n) {
-  const o = Yr(e, t, r);
+function ro(e, t, r, n) {
+  const o = Kr(e, t, r);
   return {
-    input1Decorations: zr(e, o, n),
-    input2Decorations: Xr(e, o, n),
-    baseDecorations: Qr(e, o, n)
+    input1Decorations: eo(e, o, n),
+    input2Decorations: to(e, o, n),
+    baseDecorations: no(e, o, n)
   };
 }
-function Cr(e, t, r, n) {
+function oo(e, t, r, n) {
   const o = [], i = [], s = [];
   for (const c of e) {
-    const a = Zr(c, t, r, n);
+    const a = ro(c, t, r, n);
     o.push(...a.input1Decorations), i.push(...a.input2Decorations), s.push(...a.baseDecorations);
   }
   return {
@@ -2587,8 +2587,8 @@ function Cr(e, t, r, n) {
     baseDecorations: s
   };
 }
-const Kr = () => /* @__PURE__ */ st("div", { style: { padding: "20px", textAlign: "center", color: "#888" }, children: "Loading Monaco Editor..." }), Nt = "⚠";
-function ro(e) {
+const io = () => /* @__PURE__ */ ht("div", { style: { padding: "20px", textAlign: "center", color: "#888" }, children: "Loading Monaco Editor..." }), Pt = "⚠";
+function fo(e) {
   const {
     original: t = "",
     modified: r = "",
@@ -2603,311 +2603,311 @@ function ro(e) {
     onMergeResolve: y,
     showResultColumn: p,
     baseIndex: d = 1,
-    comparisonMode: L = "split",
-    schema: N,
+    comparisonMode: _ = "split",
+    schema: T,
     patches: v,
     labels: h
-  } = e, m = n ? p : !1, f = !n || n === "", E = "json", [S, g] = _e(!1), [b, j] = _e(!0), [T, F] = _e([]), [M, x] = _e(null), [V, A] = _e([]), [w, R] = _e([]), [X, ne] = _e(!1), ae = le(""), me = Ee((k, O, I, B) => {
-    const P = document.createElement("div");
-    P.className = "native-checkbox-container";
-    const U = document.createElement("input");
-    return U.type = "checkbox", U.className = "native-checkbox", U.checked = k === te.first || k === te.second, U.setAttribute("aria-label", U.checked ? "Undo accept" : "Accept change"), U.addEventListener("click", (Q) => {
-      Q.preventDefault(), Q.stopPropagation(), requestAnimationFrame(() => {
-        B();
+  } = e, m = n ? p : !1, f = !n || n === "", I = "json", [S, g] = Pe(!1), [b, D] = Pe(!0), [L, U] = Pe([]), [M, $] = Pe(null), [V, E] = Pe([]), [A, R] = Pe([]), [X, re] = Pe(!1), [oe, ge] = Pe(/* @__PURE__ */ new Set()), ke = ae(""), be = Te((P, w, N, O) => {
+    const k = document.createElement("div");
+    k.className = "native-checkbox-container";
+    const F = document.createElement("input");
+    return F.type = "checkbox", F.className = "native-checkbox", F.checked = P === ne.first || P === ne.second, F.setAttribute("aria-label", F.checked ? "Undo accept" : "Accept change"), F.addEventListener("click", (Z) => {
+      Z.preventDefault(), Z.stopPropagation(), requestAnimationFrame(() => {
+        O();
       });
-    }), P.appendChild(U), P;
-  }, []), [je, Te] = _e(0), C = le(null), re = le(null), K = le(null), $ = le(null), fe = le(null), Ie = le(null), De = le(!1), gt = le(!1), $e = le(null), Ye = le(null), ke = le(null), Be = le(/* @__PURE__ */ new Map()), Le = le(null), Fe = le(null), Ue = le(null), Ve = le(null);
+    }), k.appendChild(F), k;
+  }, []), [at, Ne] = Pe(0), Q = ae(null), pe = ae(null), ee = ae(null), B = ae(null), we = ae(null), Qe = ae(null), Me = ae(!1), Nt = ae(!1), Ve = ae(null), Ze = ae(null), je = ae(null), Je = ae(/* @__PURE__ */ new Map()), Ie = ae(null), Re = ae(/* @__PURE__ */ new Map()), He = ae(null), Ge = ae(null), We = ae(null);
   Se(() => {
-    let k = !0;
-    const O = ur.init();
-    return O.then((I) => {
-      k && (fe.current = I, j(!1), g(!0));
-    }).catch((I) => {
-      k && (I == null ? void 0 : I.type) !== "cancelation" && console.error("Monaco initialization: error:", I);
+    let P = !0;
+    const w = mr.init();
+    return w.then((N) => {
+      P && (we.current = N, D(!1), g(!0));
+    }).catch((N) => {
+      P && (N == null ? void 0 : N.type) !== "cancelation" && console.error("Monaco initialization: error:", N);
     }), () => {
-      k = !1, De.current || O.cancel();
+      P = !1, Me.current || w.cancel();
     };
   }, []);
-  const xt = Ee(
-    (k, O, I) => {
-      if (!fe.current) return [];
-      const B = (k == null ? void 0 : k.getValue()) || "", P = O.getValue(), U = I.getValue();
+  const Gt = Te(
+    (P, w, N) => {
+      if (!we.current) return [];
+      const O = (P == null ? void 0 : P.getValue()) || "", k = w.getValue(), F = N.getValue();
       try {
-        const Q = performance.now(), Y = Jr(B, P, U, {
-          comparisonMode: L,
-          schema: N,
+        const Z = performance.now(), z = zr(O, k, F, {
+          comparisonMode: _,
+          schema: T,
           patches: v
-        }), _ = performance.now() - Q;
-        return _ > 100 && console.warn(`JSON Patch diff took ${_.toFixed(2)}ms`), Y;
-      } catch (Q) {
-        const Y = Q instanceof Error ? Q.message : String(Q);
-        return console.error("JSON Patch diff error:", Y), [];
+        }), j = performance.now() - Z;
+        return j > 100 && console.warn(`JSON Patch diff took ${j.toFixed(2)}ms`), z;
+      } catch (Z) {
+        const z = Z instanceof Error ? Z.message : String(Z);
+        return console.error("JSON Patch diff error:", z), [];
       }
     },
-    [L, N, v]
-  ), ze = Ee((k) => {
+    [_, T, v]
+  ), Ke = Te((P) => {
     try {
-      return k.getLayoutInfo().decorationsLeft || 0;
+      return P.getLayoutInfo().decorationsLeft || 0;
     } catch {
       return 0;
     }
-  }, []), Xe = Ee((k) => {
+  }, []), et = Te((P) => {
     try {
-      return k.getLayoutInfo().decorationsWidth || 0;
+      return P.getLayoutInfo().decorationsWidth || 0;
     } catch {
       return 0;
     }
-  }, []), nt = Ee(
-    (k) => {
-      if (!m || !$.current || !ke.current)
+  }, []), lt = Te(
+    (P) => {
+      if (!m || !B.current || !je.current)
         return;
-      const O = fe.current;
-      if (!O) return;
-      const I = o === "vs-dark" || typeof o == "string" && o.includes("dark"), B = ze($.current), P = Xe($.current);
-      ke.current.style.left = `${B}px`, ke.current.style.width = `${P}px`;
-      const U = $.current.getScrollTop();
-      if ($.current.getModel()) {
-        ke.current.innerHTML = "";
-        for (const Y of k) {
-          const _ = Y.startLine, ue = Y.endLine, Z = $.current.getTopForLineNumber(_) - U, H = $.current.getTopForLineNumber(ue) - U, J = $.current.getOption(O.editor.EditorOption.lineHeight), oe = ue > _ ? H - Z + J : J, G = document.createElement("div");
-          G.className = `conflict-issue-marker conflict-issue-${Y.type}`, G.setAttribute("data-conflict-id", Y.conflictId), G.setAttribute("data-issue-type", Y.type), G.title = Y.message, G.style.position = "absolute", G.style.top = `${Math.max(0, Z)}px`, G.style.height = `${oe}px`, G.style.width = "26px", G.style.display = "flex", G.style.alignItems = "center", G.style.justifyContent = "center", G.style.cursor = "help", G.style.pointerEvents = "auto";
-          const ie = document.createElement("div");
-          ie.className = "issue-icon", Y.type === "error" ? (ie.textContent = "✗", ie.style.color = I ? "#ff6666" : "#cc0000") : Y.type === "warning" ? (ie.textContent = Nt, ie.style.color = I ? "#ffaa00" : "#ff8800") : Y.type === "smart-merge" && (ie.textContent = "↕", ie.style.color = I ? "#0096ff" : "#0078d4"), ie.style.fontSize = "14px", ie.style.fontWeight = "bold", G.appendChild(ie), ke.current.appendChild(G);
+      const w = we.current;
+      if (!w) return;
+      const N = o === "vs-dark" || typeof o == "string" && o.includes("dark"), O = Ke(B.current), k = et(B.current);
+      je.current.style.left = `${O}px`, je.current.style.width = `${k}px`;
+      const F = B.current.getScrollTop();
+      if (B.current.getModel()) {
+        je.current.innerHTML = "";
+        for (const z of P) {
+          const j = z.startLine, ue = z.endLine, te = B.current.getTopForLineNumber(j) - F, H = B.current.getTopForLineNumber(ue) - F, J = B.current.getOption(w.editor.EditorOption.lineHeight), ie = ue > j ? H - te + J : J, G = document.createElement("div");
+          G.className = `conflict-issue-marker conflict-issue-${z.type}`, G.setAttribute("data-conflict-id", z.conflictId), G.setAttribute("data-issue-type", z.type), G.title = z.message, G.style.position = "absolute", G.style.top = `${Math.max(0, te)}px`, G.style.height = `${ie}px`, G.style.width = "26px", G.style.display = "flex", G.style.alignItems = "center", G.style.justifyContent = "center", G.style.cursor = "help", G.style.pointerEvents = "auto";
+          const se = document.createElement("div");
+          se.className = "issue-icon", z.type === "error" ? (se.textContent = "✗", se.style.color = N ? "#ff6666" : "#cc0000") : z.type === "warning" ? (se.textContent = Pt, se.style.color = N ? "#ffaa00" : "#ff8800") : z.type === "smart-merge" && (se.textContent = "↕", se.style.color = N ? "#0096ff" : "#0078d4"), se.style.fontSize = "14px", se.style.fontWeight = "bold", G.appendChild(se), je.current.appendChild(G);
         }
       }
     },
-    [m, o, ze, Xe]
-  ), rt = Ee(
-    (k) => {
-      var se, oe, G, ie;
-      if (!$.current || X)
+    [m, o, Ke, et]
+  ), ut = Te(
+    (P) => {
+      var ce, ie, G, se;
+      if (!B.current || X)
         return;
-      const O = $.current.getModel(), I = (se = C.current) == null ? void 0 : se.getModel(), B = (oe = K.current) == null ? void 0 : oe.getModel(), P = (G = re.current) == null ? void 0 : G.getModel();
-      if (!O || !I || !B || !P)
+      const w = B.current.getModel(), N = (ce = Q.current) == null ? void 0 : ce.getModel(), O = (ie = ee.current) == null ? void 0 : ie.getModel(), k = (G = pe.current) == null ? void 0 : G.getModel();
+      if (!w || !N || !O || !k)
         return;
-      const U = P.getLinesContent(), Q = I.getLinesContent(), Y = B.getLinesContent(), _ = qr(U, Q, Y, k, N);
-      if (x(_.isValid ? null : _.validationError || "Invalid JSON"), A(_.warnings || []), R(_.conflictIssues || []), Le.current) {
-        const z = (h == null ? void 0 : h.result) || "Result";
-        _.isValid ? _.warnings && _.warnings.length > 0 ? (Le.current.textContent = `${z} ${Nt}`, Le.current.title = _.warnings.join(`
-`)) : (Le.current.textContent = z, Le.current.style.color = "", Le.current.title = "") : (Le.current.textContent = `${z} ${Nt} Invalid JSON`, Le.current.style.color = "#ff4444", Le.current.title = _.validationError || "Invalid JSON - please fix manually");
-      }
-      if (O.getValue() !== _.content) {
-        const z = $.current.getPosition(), q = $.current.getSelection();
-        if (gt.current = !0, O.setValue(_.content), gt.current = !1, z) {
-          const he = O.getLineCount(), ee = O.getLineLength(he), ve = {
-            lineNumber: Math.min(z.lineNumber, he),
-            column: z.lineNumber <= he ? Math.min(z.column, O.getLineLength(z.lineNumber) + 1) : ee + 1
+      const F = k.getLinesContent(), Z = N.getLinesContent(), z = O.getLinesContent(), j = Zr(F, Z, z, P, T);
+      if ($(j.isValid ? null : j.validationError || "Invalid JSON"), E(j.warnings || []), R(j.conflictIssues || []), Ie.current) {
+        const C = (h == null ? void 0 : h.result) || "Result";
+        j.isValid ? j.warnings && j.warnings.length > 0 ? (Ie.current.textContent = `${C} ${Pt}`, Ie.current.title = j.warnings.join(`
+`)) : (Ie.current.textContent = C, Ie.current.style.color = "", Ie.current.title = "") : (Ie.current.textContent = `${C} ${Pt} Invalid JSON`, Ie.current.style.color = "#ff4444", Ie.current.title = j.validationError || "Invalid JSON - please fix manually");
+      }
+      if (w.getValue() !== j.content) {
+        const C = B.current.getPosition(), q = B.current.getSelection();
+        if (Nt.current = !0, w.setValue(j.content), Nt.current = !1, C) {
+          const he = w.getLineCount(), Y = w.getLineLength(he), ye = {
+            lineNumber: Math.min(C.lineNumber, he),
+            column: C.lineNumber <= he ? Math.min(C.column, w.getLineLength(C.lineNumber) + 1) : Y + 1
           };
-          $.current.setPosition(ve), q && !q.isEmpty() && $.current.setSelection(q);
+          B.current.setPosition(ye), q && !q.isEmpty() && B.current.setSelection(q);
         }
       }
-      const Z = fe.current, H = O;
+      const te = we.current, H = w;
       let J = H._invalidDecorations;
-      if (!_.isValid && $.current && Z ? (J || (J = $.current.createDecorationsCollection([]), H._invalidDecorations = J), J.set([
+      if (!j.isValid && B.current && te ? (J || (J = B.current.createDecorationsCollection([]), H._invalidDecorations = J), J.set([
         {
-          range: new Z.Range(1, 1, O.getLineCount(), Number.MAX_SAFE_INTEGER),
+          range: new te.Range(1, 1, w.getLineCount(), Number.MAX_SAFE_INTEGER),
           options: {
             isWholeLine: !1,
             className: "merge-result-invalid",
-            hoverMessage: { value: _.validationError || "Invalid JSON - please fix manually" }
+            hoverMessage: { value: j.validationError || "Invalid JSON - please fix manually" }
           }
         }
-      ])) : _.isValid && J && $.current && J.set([]), _.conflictIssues && _.conflictIssues.length > 0) {
-        if (nt(_.conflictIssues), $.current && Z) {
-          const z = O;
-          if (!z._conflictIssueDecorations) {
-            const ee = $.current.createDecorationsCollection(
+      ])) : j.isValid && J && B.current && J.set([]), j.conflictIssues && j.conflictIssues.length > 0) {
+        if (lt(j.conflictIssues), B.current && te) {
+          const C = w;
+          if (!C._conflictIssueDecorations) {
+            const Y = B.current.createDecorationsCollection(
               []
             );
-            z._conflictIssueDecorations = ee;
+            C._conflictIssueDecorations = Y;
           }
-          const q = z._conflictIssueDecorations, he = _.conflictIssues.map((ee) => {
-            let ve, Ae;
-            return ee.type === "error" ? (ve = o === "vs-dark" ? "rgba(255, 0, 0, 0.1)" : "rgba(255, 0, 0, 0.05)", Ae = o === "vs-dark" ? "#ff6666" : "#cc0000") : ee.type === "warning" ? (ve = o === "vs-dark" ? "rgba(255, 170, 0, 0.1)" : "rgba(255, 136, 0, 0.05)", Ae = o === "vs-dark" ? "#ffaa00" : "#ff8800") : (ve = o === "vs-dark" ? "rgba(0, 150, 255, 0.1)" : "rgba(0, 120, 212, 0.05)", Ae = o === "vs-dark" ? "#0096ff" : "#0078d4"), {
-              range: new Z.Range(ee.startLine, 1, ee.endLine, Number.MAX_SAFE_INTEGER),
+          const q = C._conflictIssueDecorations, he = j.conflictIssues.map((Y) => {
+            let ye, Ee;
+            return Y.type === "error" ? (ye = o === "vs-dark" ? "rgba(255, 0, 0, 0.1)" : "rgba(255, 0, 0, 0.05)", Ee = o === "vs-dark" ? "#ff6666" : "#cc0000") : Y.type === "warning" ? (ye = o === "vs-dark" ? "rgba(255, 170, 0, 0.1)" : "rgba(255, 136, 0, 0.05)", Ee = o === "vs-dark" ? "#ffaa00" : "#ff8800") : (ye = o === "vs-dark" ? "rgba(0, 150, 255, 0.1)" : "rgba(0, 120, 212, 0.05)", Ee = o === "vs-dark" ? "#0096ff" : "#0078d4"), {
+              range: new te.Range(Y.startLine, 1, Y.endLine, Number.MAX_SAFE_INTEGER),
               options: {
                 isWholeLine: !0,
-                className: `conflict-issue-line conflict-issue-${ee.type}`,
-                linesDecorationsClassName: `conflict-issue-line-decoration conflict-issue-${ee.type}`,
-                backgroundColor: ve,
+                className: `conflict-issue-line conflict-issue-${Y.type}`,
+                linesDecorationsClassName: `conflict-issue-line-decoration conflict-issue-${Y.type}`,
+                backgroundColor: ye,
                 overviewRuler: {
-                  color: Ae,
-                  position: Z.editor.OverviewRulerLane.Right
+                  color: Ee,
+                  position: te.editor.OverviewRulerLane.Right
                 },
                 minimap: {
-                  color: Ae,
-                  position: Z.editor.MinimapPosition.Inline
+                  color: Ee,
+                  position: te.editor.MinimapPosition.Inline
                 }
               }
             };
           });
           q.set(he);
         }
-      } else if ($.current) {
-        const z = O;
-        z._conflictIssueDecorations && z._conflictIssueDecorations.set([]), ke.current && m && (ke.current.innerHTML = "");
+      } else if (B.current) {
+        const C = w;
+        C._conflictIssueDecorations && C._conflictIssueDecorations.set([]), je.current && m && (je.current.innerHTML = "");
       }
       if (y) {
-        const z = `${_.content}|${_.isValid}|${(ie = _.warnings) == null ? void 0 : ie.join(",")}`;
-        ae.current !== z && (ae.current = z, queueMicrotask(() => {
-          y(_.content, {
-            isValid: _.isValid,
-            validationError: _.validationError,
-            warnings: _.warnings,
-            conflictIssues: _.conflictIssues
+        const C = `${j.content}|${j.isValid}|${(se = j.warnings) == null ? void 0 : se.join(",")}`;
+        ke.current !== C && (ke.current = C, queueMicrotask(() => {
+          y(j.content, {
+            isValid: j.isValid,
+            validationError: j.validationError,
+            warnings: j.warnings,
+            conflictIssues: j.conflictIssues
           });
         }));
       }
     },
-    [y, N, h, o, nt, m, X]
-  ), mt = Ee(
-    (k, O) => {
-      ne(!1), F((I) => {
-        const B = I.map((P) => {
-          if (P.id !== k) return P;
-          const Q = (O === 1 ? P.input1State : P.input2State) === te.excluded ? te.first : te.excluded;
-          return O === 1 ? { ...P, input1State: Q } : { ...P, input2State: Q };
+    [y, T, h, o, lt, m, X]
+  ), Et = Te(
+    (P, w) => {
+      re(!1), U((N) => {
+        const O = N.map((k) => {
+          if (k.id !== P) return k;
+          const Z = (w === 1 ? k.input1State : k.input2State) === ne.excluded ? ne.first : ne.excluded;
+          return w === 1 ? { ...k, input1State: Z } : { ...k, input2State: Z };
         });
-        return m && $.current && rt(B), B;
+        return m && B.current && ut(O), O;
       });
     },
-    [m, rt]
-  ), yt = Ee(
-    (k, O, I, B, P, U, Q) => {
-      if (!fe.current) return;
-      const _ = B === 1 ? C.current : K.current;
-      if (!_) return;
-      const ue = B === 1 ? I.input1Range : I.input2Range, Z = B === 1 ? I.input1State : I.input2State, H = _.getModel();
+    [m, ut]
+  ), Tt = Te(
+    (P, w, N, O, k, F, Z) => {
+      if (!we.current) return;
+      const j = O === 1 ? Q.current : ee.current;
+      if (!j) return;
+      const ue = O === 1 ? N.input1Range : N.input2Range, te = O === 1 ? N.input1State : N.input2State, H = j.getModel();
       if (!H) return;
-      const J = H.getLineCount(), se = Math.max(1, Math.min(ue.startLineNumber, J)), oe = Math.max(1, Math.min(ue.endLineNumberExclusive - 1, J));
-      if (se > J || oe < 1 || se > oe)
+      const J = H.getLineCount(), ce = Math.max(1, Math.min(ue.startLineNumber, J)), ie = Math.max(1, Math.min(ue.endLineNumberExclusive - 1, J));
+      if (ce > J || ie < 1 || ce > ie)
         return;
-      const G = _.getTopForLineNumber(se) - P, z = _.getBottomForLineNumber(oe) - P - G;
-      let q = Be.current.get(O);
+      const G = j.getTopForLineNumber(ce) - k, C = j.getBottomForLineNumber(ie) - k - G;
+      let q = Je.current.get(w);
       if (!q) {
         q = document.createElement("div"), q.className = "merge-accept-gutter-marker";
-        const ge = document.createElement("div");
-        ge.className = "background", q.appendChild(ge);
-        const pe = document.createElement("div");
-        pe.className = "checkbox";
-        const ye = document.createElement("div");
-        ye.className = "checkbox-background";
-        const Ne = me(Z, B, I.id, () => mt(I.id, B));
-        ye.appendChild(Ne), pe.appendChild(ye), q.appendChild(pe), k.appendChild(q), Be.current.set(O, q);
-      }
-      q.style.top = `${G}px`, q.style.height = `${z}px`;
+        const fe = document.createElement("div");
+        fe.className = "background", q.appendChild(fe);
+        const K = document.createElement("div");
+        K.className = "checkbox";
+        const me = document.createElement("div");
+        me.className = "checkbox-background";
+        const ve = be(te, O, N.id, () => Et(N.id, O));
+        me.appendChild(ve), K.appendChild(me), q.appendChild(K), P.appendChild(q), Je.current.set(w, q);
+      }
+      q.style.top = `${G}px`, q.style.height = `${C}px`;
       const he = q.querySelector(".checkbox-background");
       if (he) {
         he.innerHTML = "";
-        const ge = me(Z, B, I.id, () => mt(I.id, B));
-        he.appendChild(ge);
-      }
-      const ee = I.handled, ve = I.focused, Ae = z > 30;
-      q.className = "merge-accept-gutter-marker", ee && q.classList.add("handled"), ve && q.classList.add("focused"), Ae ? q.classList.add("multi-line") : q.classList.add("single-line");
-      const Oe = q.querySelector(".checkbox");
-      if (Oe) {
-        const pe = z / 2 - 12, ye = 24;
-        let Ne = pe;
-        const vn = ye, bn = U - ye - 24, Ht = ye, Gt = z - 24 - ye;
-        Ht < Gt && (Ne = Math.max(vn, Math.min(Ne + G, bn)) - G, Ne = Math.max(Ht, Math.min(Ne, Gt))), Oe.style.top = `${Ne + 5}px`;
+        const fe = be(te, O, N.id, () => Et(N.id, O));
+        he.appendChild(fe);
+      }
+      const Y = N.handled, ye = N.focused, Ee = C > 30;
+      q.className = "merge-accept-gutter-marker", Y && q.classList.add("handled"), ye && q.classList.add("focused"), Ee ? q.classList.add("multi-line") : q.classList.add("single-line");
+      const $e = q.querySelector(".checkbox");
+      if ($e) {
+        const K = C / 2 - 12, me = 24;
+        let ve = K;
+        const Le = me, _e = F - me - 24, Be = me, pt = C - 24 - me;
+        Be < pt && (ve = Math.max(Le, Math.min(ve + G, _e)) - G, ve = Math.max(Be, Math.min(ve, pt))), $e.style.top = `${ve + 5}px`;
       }
     },
-    [mt, me]
-  ), ot = Ee(() => {
+    [Et, be]
+  ), ft = Te(() => {
     if (!m) {
-      const H = Be.current;
-      for (const [J, se] of H.entries())
-        se.remove(), H.delete(J);
+      const H = Je.current;
+      for (const [J, ce] of H.entries())
+        ce.remove(), H.delete(J);
       return;
     }
-    if (!C.current || !K.current || !$e.current || !Ye.current || !fe.current)
+    if (!Q.current || !ee.current || !Ve.current || !Ze.current || !we.current)
       return;
-    const O = o === "vs-dark" || typeof o == "string" && o.includes("dark"), I = ze(C.current), B = Xe(C.current), P = ze(K.current), U = Xe(K.current);
-    $e.current.style.left = `${I}px`, $e.current.style.width = `${B}px`, Ye.current.style.left = `${P}px`, Ye.current.style.width = `${U}px`;
-    const Q = C.current.getVisibleRanges();
-    if (!Q || Q.length === 0) return;
-    const Y = C.current.getScrollTop(), _ = $e.current.clientHeight, ue = /* @__PURE__ */ new Set();
-    for (const H of T)
+    const w = o === "vs-dark" || typeof o == "string" && o.includes("dark"), N = Ke(Q.current), O = et(Q.current), k = Ke(ee.current), F = et(ee.current);
+    Ve.current.style.left = `${N}px`, Ve.current.style.width = `${O}px`, Ze.current.style.left = `${k}px`, Ze.current.style.width = `${F}px`;
+    const Z = Q.current.getVisibleRanges();
+    if (!Z || Z.length === 0) return;
+    const z = Q.current.getScrollTop(), j = Ve.current.clientHeight, ue = /* @__PURE__ */ new Set();
+    for (const H of L)
       if (!(H.input1Diffs.length === 0 && H.input2Diffs.length === 0)) {
         if (H.input1Diffs.length > 0) {
           const J = `${H.id}-input1`;
-          ue.add(J), yt($e.current, J, H, 1, Y, _, O);
+          ue.add(J), Tt(Ve.current, J, H, 1, z, j, w);
         }
         if (H.input2Diffs.length > 0) {
           const J = `${H.id}-input2`;
-          ue.add(J), yt(Ye.current, J, H, 2, Y, _, O);
+          ue.add(J), Tt(Ze.current, J, H, 2, z, j, w);
         }
       }
-    const Z = Be.current;
-    for (const [H, J] of Z.entries())
-      ue.has(H) || (J.remove(), Z.delete(H));
-  }, [T, o, m, ze, Xe, yt]), be = Ee((k, O) => {
-    var I, B, P;
+    const te = Je.current;
+    for (const [H, J] of te.entries())
+      ue.has(H) || (J.remove(), te.delete(H));
+  }, [L, o, m, Ke, et, Tt]), Oe = Te((P, w) => {
+    var N, O, k;
     try {
-      if (fe.current) {
-        const U = (B = (I = fe.current.editor).getTheme) == null ? void 0 : B.call(I);
-        if ((P = U == null ? void 0 : U.colors) != null && P[k])
-          return U.colors[k];
+      if (we.current) {
+        const F = (O = (N = we.current.editor).getTheme) == null ? void 0 : O.call(N);
+        if ((k = F == null ? void 0 : F.colors) != null && k[P])
+          return F.colors[P];
       }
     } catch {
     }
-    return O;
-  }, []), $t = Ee(() => {
-    if (!fe.current || !C.current || !K.current)
+    return w;
+  }, []), Wt = Te(() => {
+    if (!we.current || !Q.current || !ee.current)
       return;
-    const k = fe.current, O = o === "vs-dark" || typeof o == "string" && o.includes("dark"), I = be("mergeEditor.change.background", O ? "rgba(255, 166, 0, 0.2)" : "rgba(255, 166, 0, 0.15)"), B = be(
+    const P = we.current, w = o === "vs-dark" || typeof o == "string" && o.includes("dark"), N = Oe("mergeEditor.change.background", w ? "rgba(255, 166, 0, 0.2)" : "rgba(255, 166, 0, 0.15)"), O = Oe(
       "diffEditor.insertedTextBackground",
-      O ? "rgba(155, 185, 85, 0.2)" : "rgba(155, 185, 85, 0.15)"
-    ), P = be(
+      w ? "rgba(155, 185, 85, 0.2)" : "rgba(155, 185, 85, 0.15)"
+    ), k = Oe(
       "mergeEditor.changeBase.background",
-      O ? "rgba(255, 100, 100, 0.2)" : "rgba(255, 100, 100, 0.15)"
-    ), U = be(
+      w ? "rgba(255, 100, 100, 0.2)" : "rgba(255, 100, 100, 0.15)"
+    ), F = Oe(
       "editorOverviewRuler.modifiedForeground",
-      O ? "rgba(255, 166, 0, 0.8)" : "rgba(255, 166, 0, 1)"
-    ), Q = be(
+      w ? "rgba(255, 166, 0, 0.8)" : "rgba(255, 166, 0, 1)"
+    ), Z = Oe(
       "editorOverviewRuler.addedForeground",
-      O ? "rgba(155, 185, 85, 0.8)" : "rgba(155, 185, 85, 1)"
-    ), Y = be(
+      w ? "rgba(155, 185, 85, 0.8)" : "rgba(155, 185, 85, 1)"
+    ), z = Oe(
       "editorOverviewRuler.deletedForeground",
-      O ? "rgba(255, 100, 100, 0.8)" : "rgba(255, 100, 100, 1)"
-    ), _ = f, ue = {
-      conflictOverviewColor: U,
-      changeOverviewColor: Q,
-      baseOverviewColor: Y
-    }, { input1Decorations: Z, input2Decorations: H, baseDecorations: J } = Cr(
-      T,
-      _,
+      w ? "rgba(255, 100, 100, 0.8)" : "rgba(255, 100, 100, 1)"
+    ), j = f, ue = {
+      conflictOverviewColor: F,
+      changeOverviewColor: Z,
+      baseOverviewColor: z
+    }, { input1Decorations: te, input2Decorations: H, baseDecorations: J } = oo(
+      L,
+      j,
       ue,
-      k
-    ), se = be("input.background", O ? "#3c3c3c" : "#f3f3f3"), oe = be("input.border", O ? "#6b6b6b" : "#c8c8c8"), G = be("focusBorder", O ? "#007acc" : "#0078d4"), ie = be("inputOption.activeForeground", O ? "#3794ff" : "#0078d4"), z = "monaco-three-way-diff-dynamic";
-    let q = document.getElementById(z);
-    q || (q = document.createElement("style"), q.id = z, document.head.appendChild(q));
-    const he = be(
+      P
+    ), ce = Oe("input.background", w ? "#3c3c3c" : "#f3f3f3"), ie = Oe("input.border", w ? "#6b6b6b" : "#c8c8c8"), G = Oe("focusBorder", w ? "#007acc" : "#0078d4"), se = Oe("inputOption.activeForeground", w ? "#3794ff" : "#0078d4"), C = "monaco-three-way-diff-dynamic";
+    let q = document.getElementById(C);
+    q || (q = document.createElement("style"), q.id = C, document.head.appendChild(q));
+    const he = Oe(
       "diffEditor.insertedTextBackground",
-      O ? "rgba(100, 100, 255, 0.15)" : "rgba(100, 100, 255, 0.1)"
-    ), ee = be(
+      w ? "rgba(100, 100, 255, 0.15)" : "rgba(100, 100, 255, 0.1)"
+    ), Y = Oe(
       "diffEditor.insertedTextBackground",
-      O ? "rgba(155, 185, 85, 0.2)" : "rgba(155, 185, 85, 0.15)"
+      w ? "rgba(155, 185, 85, 0.2)" : "rgba(155, 185, 85, 0.15)"
     );
     q.textContent = `
       /* True conflict - both sides changed differently (orange/amber) */
       .monaco-editor .merge-conflict-incoming,
       .monaco-editor .merge-conflict-current {
-        background-color: ${I};
+        background-color: ${N};
       }
 
       /* 2-way diff mode: red for deletions (input1 column) - must override merge-change-incoming */
       .monaco-editor .merge-2way-deletion,
       .monaco-editor .monaco-editor .merge-2way-deletion {
-        background-color: ${P} !important;
+        background-color: ${k} !important;
       }
 
       /* Single-side change (green for input2/ours, orange for input1/theirs in 3-way) */
       .monaco-editor .merge-change-incoming {
-        background-color: ${ee};
+        background-color: ${Y};
       }
       .monaco-editor .merge-change-current {
-        background-color: ${B};
+        background-color: ${O};
       }
 
       /* Same change on both sides (blue/purple) */
@@ -2918,13 +2918,13 @@ function ro(e) {
       /* Base changes */
       .monaco-editor .merge-conflict-base,
       .monaco-editor .merge-change-base {
-        background-color: ${P};
+        background-color: ${k};
       }
 
       /* Invalid JSON in result column */
       .monaco-editor .merge-result-invalid {
-        background-color: ${O ? "rgba(255, 0, 0, 0.2)" : "rgba(255, 0, 0, 0.1)"};
-        outline: 1px solid ${O ? "rgba(255, 100, 100, 0.5)" : "rgba(255, 0, 0, 0.3)"};
+        background-color: ${w ? "rgba(255, 0, 0, 0.2)" : "rgba(255, 0, 0, 0.1)"};
+        outline: 1px solid ${w ? "rgba(255, 100, 100, 0.5)" : "rgba(255, 0, 0, 0.3)"};
       }
 
       /* Diff symbols (+ and -) in line decorations - positioned in code area */
@@ -2956,7 +2956,7 @@ function ro(e) {
         pointer-events: none;
         font-family: "Courier New", monospace;
         width: 20px;
-        color: ${O ? "#9BB955" : "#6A9955"};
+        color: ${w ? "#9BB955" : "#6A9955"};
       }
 
       .monaco-editor .diff-symbol.diff-symbol-minus::before {
@@ -2975,7 +2975,7 @@ function ro(e) {
         pointer-events: none;
         font-family: "Courier New", monospace;
         width: 20px;
-        color: ${O ? "#FF6464" : "#CC0000"};
+        color: ${w ? "#FF6464" : "#CC0000"};
       }
 
       /* VSCode-style checkbox gutter - positioned at Monaco's glyph margin */
@@ -3018,8 +3018,8 @@ function ro(e) {
         width: 14px;
         height: 14px;
         border-radius: 3px;
-        background-color: ${se};
-        border: 1px solid ${oe};
+        background-color: ${ce};
+        border: 1px solid ${ie};
       }
 
       .merge-accept-gutter-marker.focused .checkbox-background {
@@ -3046,7 +3046,7 @@ function ro(e) {
         height: 16px;
         cursor: pointer;
         margin: 0;
-        accent-color: ${ie};
+        accent-color: ${se};
       }
 
       /* Result column status indicator */
@@ -3074,65 +3074,85 @@ function ro(e) {
         outline: 2px solid ${G};
         outline-offset: 2px;
       }
-    `, Fe.current || (Fe.current = C.current.createDecorationsCollection([])), Fe.current.set(Z), Ue.current || (Ue.current = K.current.createDecorationsCollection([])), Ue.current.set(H), re.current && (Ve.current || (Ve.current = re.current.createDecorationsCollection([])), Ve.current.set(J));
-  }, [T, o, f, be]), Bt = Ee(() => {
-    if (!De.current && Ie.current && fe.current && !b) {
-      const k = fe.current;
-      Ie.current.innerHTML = "";
-      const O = document.createElement("div");
-      O.style.display = "flex", O.style.height = "100%", O.style.width = "100%";
-      const I = o === "vs-dark" || typeof o == "string" && o.includes("dark"), B = I ? "#444" : "#ddd", P = I ? "#fff" : "#333", U = (ee, ve) => {
-        var Ae, Oe, ge;
+    `, He.current || (He.current = Q.current.createDecorationsCollection([])), He.current.set(te), Ge.current || (Ge.current = ee.current.createDecorationsCollection([])), Ge.current.set(H), pe.current && (We.current || (We.current = pe.current.createDecorationsCollection([])), We.current.set(J));
+  }, [L, o, f, Oe]), qt = Te(() => {
+    if (!Me.current && Qe.current && we.current && !b) {
+      const P = we.current;
+      Qe.current.innerHTML = "", Re.current.clear();
+      const w = document.createElement("div");
+      w.style.display = "flex", w.style.height = "100%", w.style.width = "100%";
+      const N = o === "vs-dark" || typeof o == "string" && o.includes("dark"), O = N ? "#444" : "#ddd", k = N ? "#fff" : "#333", F = (Y, ye) => {
+        var Ee, $e, fe;
         try {
-          const pe = (Oe = (Ae = k.editor).getTheme) == null ? void 0 : Oe.call(Ae);
-          if ((ge = pe == null ? void 0 : pe.colors) != null && ge[ee])
-            return pe.colors[ee];
+          const K = ($e = (Ee = P.editor).getTheme) == null ? void 0 : $e.call(Ee);
+          if ((fe = K == null ? void 0 : K.colors) != null && fe[Y])
+            return K.colors[Y];
         } catch {
         }
-        return ve;
-      }, Q = U("mergeEditor.conflict.input1.header.background", I ? "#4B1818" : "#FFE6E6"), Y = U("editorGutter.background", I ? "#333" : "#f0f0f0"), _ = U("mergeEditor.conflict.input2.header.background", I ? "#1B4B18" : "#E6FFE6"), ue = U("mergeEditor.result.header.background", I ? "#7F5F00" : "#FFECB3"), Z = (ee, ve, Ae = !1) => {
-        const Oe = document.createElement("div");
-        Oe.style.flex = "1", Oe.style.display = "flex", Oe.style.flexDirection = "column", Oe.style.borderRight = `1px solid ${B}`;
-        const ge = document.createElement("div");
-        ge.textContent = ee, ge.style.padding = "4px 8px", ge.style.fontSize = "11px", ge.style.fontWeight = "500", ge.style.backgroundColor = ve, ge.style.color = P, ge.style.borderBottom = `1px solid ${B}`, Oe.appendChild(ge);
-        const pe = document.createElement("div");
-        pe.style.flex = "1", pe.style.position = "relative", pe.style.overflow = "hidden";
-        const ye = document.createElement("div");
-        ye.style.position = "absolute", ye.style.left = "0", ye.style.right = "0", ye.style.top = "0", ye.style.bottom = "0", pe.appendChild(ye);
-        let Ne = null;
-        return Ae && (Ne = document.createElement("div"), Ne.className = "merge-editor-gutter", pe.appendChild(Ne)), Oe.appendChild(pe), { container: Oe, editorDiv: ye, gutterDiv: Ne };
-      }, H = Z((h == null ? void 0 : h.input1) || "Theirs", Q, m), J = Z((h == null ? void 0 : h.input2) || "Ours", _, m);
-      H.gutterDiv && ($e.current = H.gutterDiv), J.gutterDiv && (Ye.current = J.gutterDiv);
-      const se = !!n;
-      let oe = null;
-      if (se) {
-        oe = Z((h == null ? void 0 : h.base) || "Base", Y, !1);
-        const ee = [];
-        d === 0 ? ee.push(oe.container, H.container, J.container) : d === 1 ? ee.push(H.container, oe.container, J.container) : d === 2 && ee.push(H.container, J.container, oe.container), ee.forEach((ve) => {
-          O.appendChild(ve);
+        return ye;
+      }, Z = F("mergeEditor.conflict.input1.header.background", N ? "#4B1818" : "#FFE6E6"), z = F("editorGutter.background", N ? "#333" : "#f0f0f0"), j = F("mergeEditor.conflict.input2.header.background", N ? "#1B4B18" : "#E6FFE6"), ue = F("mergeEditor.result.header.background", N ? "#7F5F00" : "#FFECB3"), te = (Y, ye, Ee, $e = !1) => {
+        const fe = document.createElement("div");
+        fe.style.flex = "1", fe.style.display = "flex", fe.style.flexDirection = "column", fe.style.borderRight = `1px solid ${O}`, fe.style.overflow = "hidden", fe.style.transition = "flex 0.2s ease, min-width 0.2s ease, max-width 0.2s ease", fe.dataset.columnKey = Y;
+        const K = document.createElement("div");
+        K.style.padding = "4px 8px", K.style.fontSize = "11px", K.style.fontWeight = "500", K.style.backgroundColor = Ee, K.style.color = k, K.style.borderBottom = `1px solid ${O}`, K.style.display = "flex", K.style.alignItems = "center", K.style.gap = "4px", K.style.height = "22px", K.style.boxSizing = "content-box", K.style.whiteSpace = "nowrap", K.style.overflow = "hidden";
+        const me = document.createElement("span");
+        me.textContent = ye, me.style.flex = "1", me.style.overflow = "hidden", me.style.textOverflow = "ellipsis", K.appendChild(me);
+        const ve = document.createElement("div");
+        ve.className = "column-collapse-icon", ve.title = "Collapse column", ve.innerHTML = '<svg width="12" height="12" viewBox="0 0 12 12" fill="none" style="display:block"><path d="M8 2L4 6L8 10" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>', ve.addEventListener("click", (pt) => {
+          pt.stopPropagation(), ge((Qt) => {
+            const tt = new Set(Qt);
+            if (tt.has(Y))
+              tt.delete(Y);
+            else {
+              if (Array.from(Re.current.keys()).filter((Tn) => !tt.has(Tn)).length <= 1) return Qt;
+              tt.add(Y);
+            }
+            return tt;
+          });
+        }), K.appendChild(ve), fe.appendChild(K);
+        const Le = document.createElement("div");
+        Le.style.flex = "1", Le.style.position = "relative", Le.style.overflow = "hidden", Le.style.transition = "opacity 0.2s ease";
+        const _e = document.createElement("div");
+        _e.style.position = "absolute", _e.style.left = "0", _e.style.right = "0", _e.style.top = "0", _e.style.bottom = "0", Le.appendChild(_e);
+        let Be = null;
+        return $e && (Be = document.createElement("div"), Be.className = "merge-editor-gutter", Le.appendChild(Be)), fe.appendChild(Le), Re.current.set(Y, { container: fe, editorWrapper: Le, labelDiv: K, labelText: me, collapseIcon: ve }), { container: fe, editorDiv: _e, gutterDiv: Be };
+      }, H = te("input1", (h == null ? void 0 : h.input1) || "Theirs", Z, m), J = te("input2", (h == null ? void 0 : h.input2) || "Ours", j, m);
+      H.gutterDiv && (Ve.current = H.gutterDiv), J.gutterDiv && (Ze.current = J.gutterDiv);
+      const ce = !!n;
+      let ie = null;
+      if (ce) {
+        ie = te("base", (h == null ? void 0 : h.base) || "Base", z, !1);
+        const Y = [];
+        d === 0 ? Y.push(ie.container, H.container, J.container) : d === 1 ? Y.push(H.container, ie.container, J.container) : d === 2 && Y.push(H.container, J.container, ie.container), Y.forEach((ye) => {
+          w.appendChild(ye);
         });
       } else
-        O.appendChild(H.container), O.appendChild(J.container);
+        w.appendChild(H.container), w.appendChild(J.container);
       let G = null;
-      m && se && (G = Z((h == null ? void 0 : h.result) || "Result", ue, !0), Le.current = G.container.querySelector("div"), G.gutterDiv && (ke.current = G.gutterDiv), O.appendChild(G.container)), Ie.current.appendChild(O);
-      const ie = k.editor.createModel(t || "", E), z = se ? k.editor.createModel(n || "", E) : null, q = k.editor.createModel(r || "", E);
-      if (C.current = k.editor.create(H.editorDiv, {
-        model: ie,
+      if (m && ce) {
+        G = te("result", (h == null ? void 0 : h.result) || "Result", ue, !0);
+        const Y = Re.current.get("result");
+        Ie.current = (Y == null ? void 0 : Y.labelText) ?? G.container.querySelector("span"), G.gutterDiv && (je.current = G.gutterDiv), w.appendChild(G.container);
+      }
+      Qe.current.appendChild(w);
+      const se = P.editor.createModel(t || "", I), C = ce ? P.editor.createModel(n || "", I) : null, q = P.editor.createModel(r || "", I);
+      if (Q.current = P.editor.create(H.editorDiv, {
+        model: se,
         readOnly: !0,
         automaticLayout: !0,
         folding: !m,
         glyphMargin: !1,
         ...i,
         lineDecorationsWidth: m ? 26 : 10
-      }), se && oe && (re.current = k.editor.create(oe.editorDiv, {
-        model: z,
+      }), ce && ie && (pe.current = P.editor.create(ie.editorDiv, {
+        model: C,
         readOnly: !0,
         automaticLayout: !0,
         folding: !m,
         glyphMargin: !1,
         ...i,
         lineDecorationsWidth: 10
-      })), K.current = k.editor.create(J.editorDiv, {
+      })), ee.current = P.editor.create(J.editorDiv, {
         model: q,
         readOnly: !0,
         automaticLayout: !0,
@@ -3141,102 +3161,117 @@ function ro(e) {
         ...i,
         lineDecorationsWidth: m ? 26 : 10
       }), m && G) {
-        const ee = k.editor.createModel(r || "", E);
-        $.current = k.editor.create(G.editorDiv, {
-          model: ee,
+        const Y = P.editor.createModel(r || "", I);
+        B.current = P.editor.create(G.editorDiv, {
+          model: Y,
           automaticLayout: !0,
           folding: !m,
           glyphMargin: !1,
           ...i,
           readOnly: !1,
           lineDecorationsWidth: 26
-        }), ee.onDidChangeContent(() => {
-          gt.current || ne(!0);
+        }), Y.onDidChangeContent(() => {
+          Nt.current || re(!0);
         });
       }
-      k.editor.setTheme(o);
-      const he = xt(z, ie, q);
-      F(he), De.current = !0, l && C.current && K.current && l(
+      P.editor.setTheme(o);
+      const he = Gt(C, se, q);
+      U(he), Me.current = !0, l && Q.current && ee.current && l(
         {
-          input1: C.current,
-          input2: K.current,
-          base: re.current,
-          result: $.current
+          input1: Q.current,
+          input2: ee.current,
+          base: pe.current,
+          result: B.current
         },
-        k
+        P
       );
     }
-  }, [i, o, t, r, n, m, d, b, xt, l, h]), Ft = le(m), Ut = le(d), Vt = le(L), Jt = le(n);
+  }, [i, o, t, r, n, m, d, b, Gt, l, h]), Yt = ae(m), zt = ae(d), Ct = ae(_), Xt = ae(n);
   return Se(() => {
-    var P, U, Q, Y, _, ue, Z, H, J, se, oe;
-    const k = Ft.current !== m, O = Ut.current !== d, I = Vt.current !== L, B = Jt.current !== n;
-    if ((k || O || I || B) && De.current) {
-      Ft.current = m, Ut.current = d, Vt.current = L, Jt.current = n, Be.current.forEach((he) => {
+    var k, F, Z, z, j, ue, te, H, J, ce, ie;
+    const P = Yt.current !== m, w = zt.current !== d, N = Ct.current !== _, O = Xt.current !== n;
+    if ((P || w || N || O) && Me.current) {
+      Yt.current = m, zt.current = d, Ct.current = _, Xt.current = n, Je.current.forEach((he) => {
         he.remove();
-      }), Be.current.clear(), (P = Fe.current) == null || P.set([]), (U = Ue.current) == null || U.set([]), (Q = Ve.current) == null || Q.set([]), Fe.current = null, Ue.current = null, Ve.current = null;
-      const G = (Y = C.current) == null ? void 0 : Y.getModel(), ie = (_ = re.current) == null ? void 0 : _.getModel(), z = (ue = K.current) == null ? void 0 : ue.getModel(), q = (Z = $.current) == null ? void 0 : Z.getModel();
-      (H = C.current) == null || H.dispose(), (J = re.current) == null || J.dispose(), (se = K.current) == null || se.dispose(), (oe = $.current) == null || oe.dispose(), G == null || G.dispose(), ie == null || ie.dispose(), z == null || z.dispose(), q == null || q.dispose(), De.current = !1, Te((he) => he + 1);
-    }
-  }, [m, d, L, n]), Se(() => {
-    !b && fe.current && Ie.current && !De.current && Bt();
-  }, [b, Bt]), Se(() => {
-    !S || !i || (C.current && C.current.updateOptions(i), K.current && K.current.updateOptions(i), re.current && re.current.updateOptions(i), $.current && $.current.updateOptions(i));
+      }), Je.current.clear(), Re.current.clear(), ge(/* @__PURE__ */ new Set()), (k = He.current) == null || k.set([]), (F = Ge.current) == null || F.set([]), (Z = We.current) == null || Z.set([]), He.current = null, Ge.current = null, We.current = null;
+      const G = (z = Q.current) == null ? void 0 : z.getModel(), se = (j = pe.current) == null ? void 0 : j.getModel(), C = (ue = ee.current) == null ? void 0 : ue.getModel(), q = (te = B.current) == null ? void 0 : te.getModel();
+      (H = Q.current) == null || H.dispose(), (J = pe.current) == null || J.dispose(), (ce = ee.current) == null || ce.dispose(), (ie = B.current) == null || ie.dispose(), G == null || G.dispose(), se == null || se.dispose(), C == null || C.dispose(), q == null || q.dispose(), Me.current = !1, Ne((he) => he + 1);
+    }
+  }, [m, d, _, n]), Se(() => {
+    !b && we.current && Qe.current && !Me.current && qt();
+  }, [b, qt]), Se(() => {
+    !S || !i || (Q.current && Q.current.updateOptions(i), ee.current && ee.current.updateOptions(i), pe.current && pe.current.updateOptions(i), B.current && B.current.updateOptions(i));
   }, [i, S]), Se(() => {
-    S && T.length > 0 && ($t(), m && ot());
-  }, [S, T, $t, ot, m]), Se(() => {
-    S && T.length > 0 && m && $.current && rt(T);
-  }, [S, T, m, rt]), Se(() => {
+    S && L.length > 0 && (Wt(), m && ft());
+  }, [S, L, Wt, ft, m]), Se(() => {
+    S && L.length > 0 && m && B.current && ut(L);
+  }, [S, L, m, ut]), Se(() => {
     if (!S) return;
-    const k = () => {
-      w.length > 0 && nt(w);
-    }, O = [], I = () => {
-      ot();
+    const P = () => {
+      A.length > 0 && lt(A);
+    }, w = [], N = () => {
+      ft();
     };
-    return C.current && O.push(C.current.onDidScrollChange(I)), K.current && O.push(K.current.onDidScrollChange(I)), $.current && m && (O.push($.current.onDidScrollChange(k)), O.push($.current.onDidLayoutChange(k))), C.current && O.push(C.current.onDidLayoutChange(I)), K.current && O.push(K.current.onDidLayoutChange(I)), () => {
-      O.forEach((B) => {
-        B == null || B.dispose();
+    return Q.current && w.push(Q.current.onDidScrollChange(N)), ee.current && w.push(ee.current.onDidScrollChange(N)), B.current && m && (w.push(B.current.onDidScrollChange(P)), w.push(B.current.onDidLayoutChange(P))), Q.current && w.push(Q.current.onDidLayoutChange(N)), ee.current && w.push(ee.current.onDidLayoutChange(N)), () => {
+      w.forEach((O) => {
+        O == null || O.dispose();
       });
     };
-  }, [S, ot, nt, m, w]), Se(() => {
+  }, [S, ft, lt, m, A]), Se(() => {
     if (!S) return;
-    const k = [C.current, re.current, K.current];
-    m && $.current && k.push($.current);
-    const O = [];
-    let I = !1;
-    const B = (P) => {
-      if (I) return;
-      I = !0;
-      const U = P.getScrollTop(), Q = P.getScrollLeft();
-      k.forEach((Y) => {
-        Y && Y !== P && (Y.setScrollTop(U), Y.setScrollLeft(Q));
+    const P = [Q.current, pe.current, ee.current];
+    m && B.current && P.push(B.current);
+    const w = [];
+    let N = !1;
+    const O = (k) => {
+      if (N) return;
+      N = !0;
+      const F = k.getScrollTop(), Z = k.getScrollLeft();
+      P.forEach((z) => {
+        z && z !== k && (z.setScrollTop(F), z.setScrollLeft(Z));
       }), setTimeout(() => {
-        I = !1;
+        N = !1;
       }, 10);
     };
-    return k.forEach((P) => {
-      P && O.push(
-        P.onDidScrollChange(() => {
-          B(P);
+    return P.forEach((k) => {
+      k && w.push(
+        k.onDidScrollChange(() => {
+          O(k);
         })
       );
     }), () => {
-      O.forEach((P) => {
-        P == null || P.dispose();
+      w.forEach((k) => {
+        k == null || k.dispose();
       });
     };
-  }, [S, m]), Se(() => () => {
-    var P, U, Q, Y, _, ue, Z, H, J, se, oe;
-    (P = Fe.current) == null || P.set([]), (U = Ue.current) == null || U.set([]), (Q = Ve.current) == null || Q.set([]);
-    const k = (Y = C.current) == null ? void 0 : Y.getModel(), O = (_ = re.current) == null ? void 0 : _.getModel(), I = (ue = K.current) == null ? void 0 : ue.getModel(), B = (Z = $.current) == null ? void 0 : Z.getModel();
-    (H = C.current) == null || H.dispose(), (J = re.current) == null || J.dispose(), (se = K.current) == null || se.dispose(), (oe = $.current) == null || oe.dispose(), k == null || k.dispose(), O == null || O.dispose(), I == null || I.dispose(), B == null || B.dispose(), De.current = !1, g(!1);
-  }, []), b || !S ? /* @__PURE__ */ st(On, { children: u ?? /* @__PURE__ */ st(Kr, {}) }) : /* @__PURE__ */ st("div", { ref: Ie, style: { width: s, height: c }, className: a });
+  }, [S, m]), Se(() => {
+    if (!S) return;
+    const w = Array.from(Re.current.keys()).filter((N) => !oe.has(N)).length;
+    for (const [N, O] of Re.current.entries()) {
+      const k = oe.has(N), F = w > 1 || k;
+      k ? (O.container.style.flex = "0 0 28px", O.container.style.minWidth = "28px", O.container.style.maxWidth = "28px", O.editorWrapper.style.opacity = "0", O.editorWrapper.style.pointerEvents = "none", O.labelDiv.style.justifyContent = "center", O.labelText.style.display = "none", O.collapseIcon.style.transform = "rotate(180deg)", O.collapseIcon.title = "Expand column") : (O.container.style.flex = "1", O.container.style.minWidth = "", O.container.style.maxWidth = "", O.editorWrapper.style.opacity = "1", O.editorWrapper.style.pointerEvents = "", O.labelDiv.style.justifyContent = "", O.labelText.style.display = "", O.collapseIcon.style.transform = "", O.collapseIcon.title = "Collapse column"), !k && !F ? (O.collapseIcon.classList.add("column-collapse-icon--disabled"), O.collapseIcon.title = "Cannot collapse last column") : O.collapseIcon.classList.remove("column-collapse-icon--disabled");
+    }
+    requestAnimationFrame(() => {
+      var N;
+      for (const [O] of Re.current.entries())
+        if (!oe.has(O)) {
+          const k = O === "input1" ? Q : O === "input2" ? ee : O === "base" ? pe : O === "result" ? B : null;
+          (N = k == null ? void 0 : k.current) == null || N.layout();
+        }
+    });
+  }, [S, oe]), Se(() => () => {
+    var k, F, Z, z, j, ue, te, H, J, ce, ie;
+    (k = He.current) == null || k.set([]), (F = Ge.current) == null || F.set([]), (Z = We.current) == null || Z.set([]);
+    const P = (z = Q.current) == null ? void 0 : z.getModel(), w = (j = pe.current) == null ? void 0 : j.getModel(), N = (ue = ee.current) == null ? void 0 : ue.getModel(), O = (te = B.current) == null ? void 0 : te.getModel();
+    (H = Q.current) == null || H.dispose(), (J = pe.current) == null || J.dispose(), (ce = ee.current) == null || ce.dispose(), (ie = B.current) == null || ie.dispose(), P == null || P.dispose(), w == null || w.dispose(), N == null || N.dispose(), O == null || O.dispose(), Me.current = !1, g(!1);
+  }, []), b || !S ? /* @__PURE__ */ ht(In, { children: u ?? /* @__PURE__ */ ht(io, {}) }) : /* @__PURE__ */ ht("div", { ref: Qe, style: { width: s, height: c }, className: a });
 }
 export {
-  ro as JsonDiffMergeEditor,
-  Fr as analyzeConflicts,
-  Ur as analyzeTwoWayConflicts,
-  no as computeDiffs,
-  Jr as computeDiffsJsonPatch,
-  Hr as computeLineConflictType
+  fo as JsonDiffMergeEditor,
+  Wr as analyzeConflicts,
+  qr as analyzeTwoWayConflicts,
+  uo as computeDiffs,
+  zr as computeDiffsJsonPatch,
+  Cr as computeLineConflictType
 };
 //# sourceMappingURL=index.mjs.map