react-monaco-json-merge 1.1.17 → 1.2.1

package/dist/index.mjs

@@ -1,44 +1,44 @@
-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 gt, Fragment as Pn } from "react/jsx-runtime";
+import { useState as _e, useRef as se, useCallback as Ne, useEffect as Se } from "react";
+function tn(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 _n(e) {
   if (Array.isArray(e)) return e;
 }
-function An(e, t, r) {
-  return (t = kn(t)) in e ? Object.defineProperty(e, t, {
+function Rn(e, t, r) {
+  return (t = Fn(t)) in e ? Object.defineProperty(e, t, {
     value: r,
     enumerable: !0,
     configurable: !0,
     writable: !0
   }) : e[t] = r, e;
 }
-function Nn(e, t) {
+function jn(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;
+    var n, o, i, s, c = [], a = !0, f = !1;
     try {
       if (i = (r = r.call(e)).next, t !== 0) for (; !(a = (n = i.call(r)).done) && (c.push(n.value), c.length !== t); a = !0) ;
     } catch (l) {
-      u = !0, o = l;
+      f = !0, o = l;
     } finally {
       try {
         if (!a && r.return != null && (s = r.return(), Object(s) !== s)) return;
       } finally {
-        if (u) throw o;
+        if (f) throw o;
       }
     }
     return c;
   }
 }
-function En() {
+function Dn() {
   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 nn(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 rn(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 ? nn(Object(r), !0).forEach(function(n) {
+      Rn(e, n, r[n]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : nn(Object(r)).forEach(function(n) {
       Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
     });
   }
   return e;
 }
-function Tn(e, t) {
+function xn(e, t) {
   if (e == null) return {};
-  var r, n, o = In(e, t);
+  var r, n, o = Mn(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 Mn(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 $n(e, t) {
+  return _n(e) || jn(e, t) || Un(e, t) || Dn();
 }
-function Sn(e, t) {
+function Bn(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 Fn(e) {
+  var t = Bn(e, "string");
   return typeof t == "symbol" ? t : t + "";
 }
-function _n(e, t) {
+function Un(e, t) {
   if (e) {
-    if (typeof e == "string") return Wt(e, t);
+    if (typeof e == "string") return tn(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) ? tn(e, t) : void 0;
   }
 }
-function Pn(e, t, r) {
+function Vn(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 on(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 sn(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 ? on(Object(r), !0).forEach(function(n) {
+      Vn(e, n, r[n]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(r)) : on(Object(r)).forEach(function(n) {
       Object.defineProperty(e, n, Object.getOwnPropertyDescriptor(r, n));
     });
   }
   return e;
 }
-function Rn() {
+function Jn() {
   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 ct(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 vt(e) {
   return {}.toString.call(e).includes("Object");
 }
-function jn(e) {
+function Hn(e) {
   return !Object.keys(e).length;
 }
-function Ke(e) {
+function at(e) {
   return typeof e == "function";
 }
-function Dn(e, t) {
+function Gn(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 Wn(e, t) {
+  return vt(t) || Me("changeType"), Object.keys(t).some(function(r) {
+    return !Gn(e, r);
+  }) && Me("changeField"), t;
 }
-function xn(e) {
-  Ke(e) || Re("selectorType");
+function qn(e) {
+  at(e) || Me("selectorType");
 }
-function $n(e) {
-  Ke(e) || lt(e) || Re("handlerType"), lt(e) && Object.values(e).some(function(t) {
-    return !Ke(t);
-  }) && Re("handlersType");
+function Yn(e) {
+  at(e) || vt(e) || Me("handlerType"), vt(e) && Object.values(e).some(function(t) {
+    return !at(t);
+  }) && Me("handlersType");
 }
-function Bn(e) {
-  e || Re("initialIsRequired"), lt(e) || Re("initialType"), jn(e) && Re("initialContent");
+function zn(e) {
+  e || Me("initialIsRequired"), vt(e) || Me("initialType"), Hn(e) && Me("initialContent");
 }
-function Fn(e, t) {
+function Cn(e, t) {
   throw new Error(e[t] || e.default);
 }
-var Un = {
+var Xn = {
   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
+}, Me = ct(Cn)(Xn), ht = {
+  changes: Wn,
+  selector: qn,
+  handler: Yn,
+  initial: zn
 };
-function Vn(e) {
+function Kn(e) {
   var t = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
-  it.initial(e), it.handler(t);
+  ht.initial(e), ht.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 = ct(er)(r, t), o = ct(Zn)(r), i = ct(ht.changes)(e), s = ct(Qn)(r);
   function c() {
-    var u = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : function(l) {
+    var f = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : function(l) {
       return l;
     };
-    return it.selector(u), u(r.current);
+    return ht.selector(f), f(r.current);
   }
-  function a(u) {
-    Rn(n, o, i, s)(u);
+  function a(f) {
+    Jn(n, o, i, s)(f);
   }
   return [c, a];
 }
-function Jn(e, t) {
-  return Ke(t) ? t(e.current) : t;
+function Qn(e, t) {
+  return at(t) ? t(e.current) : t;
 }
-function Hn(e, t) {
-  return e.current = Xt(Xt({}, e.current), t), t;
+function Zn(e, t) {
+  return e.current = sn(sn({}, e.current), t), t;
 }
-function Gn(e, t, r) {
-  return Ke(t) ? t(e.current) : Object.keys(r).forEach(function(n) {
+function er(e, t, r) {
+  return at(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 tr = {
+  create: Kn
+}, nr = {
   paths: {
     vs: "https://cdn.jsdelivr.net/npm/monaco-editor@0.54.0/min/vs"
   }
 };
-function Yn(e) {
+function rr(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 or(e) {
   return {}.toString.call(e).includes("Object");
 }
-function Xn(e) {
-  return e || Qt("configIsRequired"), zn(e) || Qt("configType"), e.urls ? (Qn(), {
+function ir(e) {
+  return e || cn("configIsRequired"), or(e) || cn("configType"), e.urls ? (sr(), {
     paths: {
       vs: e.urls.monacoBase
     }
   }) : e;
 }
-function Qn() {
-  console.warn(on.deprecation);
+function sr() {
+  console.warn(gn.deprecation);
 }
-function Zn(e, t) {
+function cr(e, t) {
   throw new Error(e[t] || e.default);
 }
-var on = {
+var gn = {
   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() {
+}, cn = rr(cr)(gn), ar = {
+  config: ir
+}, lr = 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 mn(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], mn(e[r], t[r]));
+  }), rn(rn({}, e), t);
 }
-var er = {
+var ur = {
   type: "cancelation",
   msg: "operation is manually canceled"
 };
-function vt(e) {
+function Lt(e) {
   var t = !1, r = new Promise(function(n, o) {
     e.then(function(i) {
-      return t ? o(er) : n(i);
+      return t ? o(ur) : n(i);
     }), e.catch(o);
   });
   return r.cancel = function() {
     return t = !0;
   }, r;
 }
-var tr = ["monaco"], nr = Wn.create({
-  config: qn,
+var fr = ["monaco"], pr = tr.create({
+  config: nr,
   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) {
+}), yn = $n(pr, 2), ut = yn[0], At = yn[1];
+function dr(e) {
+  var t = ar.config(e), r = t.monaco, n = xn(t, fr);
+  At(function(o) {
     return {
-      config: sn(o.config, n),
+      config: mn(o.config, n),
       monaco: r
     };
   });
 }
-function or() {
-  var e = tt(function(t) {
+function hr() {
+  var e = ut(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 (At({
       isInitialized: !0
     }), e.monaco)
-      return e.resolve(e.monaco), vt(bt);
+      return e.resolve(e.monaco), Lt(kt);
     if (window.monaco && window.monaco.editor)
-      return an(window.monaco), e.resolve(window.monaco), vt(bt);
-    Kn(ir, cr)(ar);
+      return vn(window.monaco), e.resolve(window.monaco), Lt(kt);
+    lr(gr, yr)(vr);
   }
-  return vt(bt);
+  return Lt(kt);
 }
-function ir(e) {
+function gr(e) {
   return document.body.appendChild(e);
 }
-function sr(e) {
+function mr(e) {
   var t = document.createElement("script");
   return e && (t.src = e), t;
 }
-function cr(e) {
-  var t = tt(function(n) {
+function yr(e) {
+  var t = ut(function(n) {
     var o = n.config, i = n.reject;
     return {
       config: o,
       reject: i
     };
-  }), r = sr("".concat(t.config.paths.vs, "/loader.js"));
+  }), r = mr("".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 vr() {
+  var e = ut(function(r) {
     var n = r.config, o = r.resolve, i = r.reject;
     return {
       config: n,
@@ -370,154 +370,154 @@ 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);
+    vn(n), e.resolve(n);
   }, function(r) {
     e.reject(r);
   });
 }
-function an(e) {
-  tt().monaco || dt({
+function vn(e) {
+  ut().monaco || At({
     monaco: e
   });
 }
-function lr() {
-  return tt(function(e) {
+function br() {
+  return ut(function(e) {
     var t = e.monaco;
     return t;
   });
 }
-var bt = new Promise(function(e, t) {
-  return dt({
+var kt = new Promise(function(e, t) {
+  return At({
     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) {
+}), wr = {
+  config: dr,
+  init: hr,
+  __getMonacoInstance: br
+}, oe = /* @__PURE__ */ ((e) => (e[e.excluded = 0] = "excluded", e[e.first = 1] = "first", e[e.second = 2] = "second", e))(oe || {}), $ = /* @__PURE__ */ ((e) => (e.SAME_CHANGE = "same_change", e.INPUT1_ONLY = "input1_only", e.INPUT2_ONLY = "input2_only", e.TRUE_CONFLICT = "true_conflict", e))($ || {});
+function Or(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) {
-    let S = 0, g = 0;
-    for (; S < f; ) {
-      let b = e.charCodeAt(n);
-      if (b >= 48 && b <= 57)
-        g = g * 16 + b - 48;
-      else if (b >= 65 && b <= 70)
-        g = g * 16 + b - 65 + 10;
-      else if (b >= 97 && b <= 102)
-        g = g * 16 + b - 97 + 10;
+  let n = 0, o = "", i = 0, s = 16, c = 0, a = 0, f = 0, l = 0, y = 0;
+  function d(u, A) {
+    let S = 0, p = 0;
+    for (; S < u; ) {
+      let v = e.charCodeAt(n);
+      if (v >= 48 && v <= 57)
+        p = p * 16 + v - 48;
+      else if (v >= 65 && v <= 70)
+        p = p * 16 + v - 65 + 10;
+      else if (v >= 97 && v <= 102)
+        p = p * 16 + v - 97 + 10;
       else
         break;
       n++, S++;
     }
-    return S < f && (g = -1), g;
+    return S < u && (p = -1), p;
   }
-  function d(f) {
-    n = f, o = "", i = 0, s = 16, y = 0;
+  function h(u) {
+    n = u, o = "", i = 0, s = 16, y = 0;
   }
-  function L() {
-    let f = n;
+  function T() {
+    let u = n;
     if (e.charCodeAt(n) === 48)
       n++;
     else
-      for (n++; n < e.length && Je(e.charCodeAt(n)); )
+      for (n++; n < e.length && Ce(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 && Ce(e.charCodeAt(n)))
+        for (n++; n < e.length && Ce(e.charCodeAt(n)); )
           n++;
       else
-        return y = 3, e.substring(f, n);
-    let E = n;
+        return y = 3, e.substring(u, n);
+    let A = 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 && Ce(e.charCodeAt(n))) {
+        for (n++; n < e.length && Ce(e.charCodeAt(n)); )
           n++;
-        E = n;
+        A = n;
       } else
         y = 3;
-    return e.substring(f, E);
+    return e.substring(u, A);
   }
   function N() {
-    let f = "", E = n;
+    let u = "", A = n;
     for (; ; ) {
       if (n >= r) {
-        f += e.substring(E, n), y = 2;
+        u += e.substring(A, n), y = 2;
         break;
       }
       const S = e.charCodeAt(n);
       if (S === 34) {
-        f += e.substring(E, n), n++;
+        u += e.substring(A, n), n++;
         break;
       }
       if (S === 92) {
-        if (f += e.substring(E, n), n++, n >= r) {
+        if (u += e.substring(A, n), n++, n >= r) {
           y = 2;
           break;
         }
         switch (e.charCodeAt(n++)) {
           case 34:
-            f += '"';
+            u += '"';
             break;
           case 92:
-            f += "\\";
+            u += "\\";
             break;
           case 47:
-            f += "/";
+            u += "/";
             break;
           case 98:
-            f += "\b";
+            u += "\b";
             break;
           case 102:
-            f += "\f";
+            u += "\f";
             break;
           case 110:
-            f += `
+            u += `
 `;
             break;
           case 114:
-            f += "\r";
+            u += "\r";
             break;
           case 116:
-            f += "	";
+            u += "	";
             break;
           case 117:
-            const b = p(4);
-            b >= 0 ? f += String.fromCharCode(b) : y = 4;
+            const v = d(4);
+            v >= 0 ? u += String.fromCharCode(v) : y = 4;
             break;
           default:
             y = 5;
         }
-        E = n;
+        A = n;
         continue;
       }
       if (S >= 0 && S <= 31)
-        if (Qe(S)) {
-          f += e.substring(E, n), y = 2;
+        if (it(S)) {
+          u += e.substring(A, n), y = 2;
           break;
         } else
           y = 6;
       n++;
     }
-    return f;
+    return u;
   }
-  function v() {
-    if (o = "", y = 0, i = n, a = c, l = u, n >= r)
+  function m() {
+    if (o = "", y = 0, i = n, a = c, l = f, n >= r)
       return i = r, s = 17;
-    let f = e.charCodeAt(n);
-    if (Ot(f)) {
+    let u = e.charCodeAt(n);
+    if (St(u)) {
       do
-        n++, o += String.fromCharCode(f), f = e.charCodeAt(n);
-      while (Ot(f));
+        n++, o += String.fromCharCode(u), u = e.charCodeAt(n);
+      while (St(u));
       return s = 15;
     }
-    if (Qe(f))
-      return n++, o += String.fromCharCode(f), f === 13 && e.charCodeAt(n) === 10 && (n++, o += `
-`), c++, u = n, s = 14;
-    switch (f) {
+    if (it(u))
+      return n++, o += String.fromCharCode(u), u === 13 && e.charCodeAt(n) === 10 && (n++, o += `
+`), c++, f = n, s = 14;
+    switch (u) {
       // tokens: []{}:,
       case 123:
         return n++, s = 1;
@@ -536,30 +536,30 @@ function fr(e, t = !1) {
         return n++, o = N(), s = 10;
       // comments
       case 47:
-        const E = n - 1;
+        const A = n - 1;
         if (e.charCodeAt(n + 1) === 47) {
-          for (n += 2; n < r && !Qe(e.charCodeAt(n)); )
+          for (n += 2; n < r && !it(e.charCodeAt(n)); )
             n++;
-          return o = e.substring(E, n), s = 12;
+          return o = e.substring(A, n), s = 12;
         }
         if (e.charCodeAt(n + 1) === 42) {
           n += 2;
           const S = r - 1;
-          let g = !1;
+          let p = !1;
           for (; n < S; ) {
-            const b = e.charCodeAt(n);
-            if (b === 42 && e.charCodeAt(n + 1) === 47) {
-              n += 2, g = !0;
+            const v = e.charCodeAt(n);
+            if (v === 42 && e.charCodeAt(n + 1) === 47) {
+              n += 2, p = !0;
               break;
             }
-            n++, Qe(b) && (b === 13 && e.charCodeAt(n) === 10 && n++, c++, u = n);
+            n++, it(v) && (v === 13 && e.charCodeAt(n) === 10 && n++, c++, f = n);
           }
-          return g || (n++, y = 1), o = e.substring(E, n), s = 13;
+          return p || (n++, y = 1), o = e.substring(A, n), s = 13;
         }
-        return o += String.fromCharCode(f), n++, s = 16;
+        return o += String.fromCharCode(u), n++, s = 16;
       // numbers
       case 45:
-        if (o += String.fromCharCode(f), n++, n === r || !Je(e.charCodeAt(n)))
+        if (o += String.fromCharCode(u), n++, n === r || !Ce(e.charCodeAt(n)))
           return s = 16;
       // found a minus, followed by a number so
       // we fall through to proceed with scanning
@@ -574,11 +574,11 @@ function fr(e, t = !1) {
       case 55:
       case 56:
       case 57:
-        return o += L(), s = 11;
+        return o += T(), s = 11;
       // literals and unknown symbols
       default:
-        for (; n < r && h(f); )
-          n++, f = e.charCodeAt(n);
+        for (; n < r && g(u); )
+          n++, u = e.charCodeAt(n);
         if (i !== n) {
           switch (o = e.substring(i, n), o) {
             case "true":
@@ -590,13 +590,13 @@ function fr(e, t = !1) {
           }
           return s = 16;
         }
-        return o += String.fromCharCode(f), n++, s = 16;
+        return o += String.fromCharCode(u), n++, s = 16;
     }
   }
-  function h(f) {
-    if (Ot(f) || Qe(f))
+  function g(u) {
+    if (St(u) || it(u))
       return !1;
-    switch (f) {
+    switch (u) {
       case 125:
       case 93:
       case 123:
@@ -609,17 +609,17 @@ function fr(e, t = !1) {
     }
     return !0;
   }
-  function m() {
-    let f;
+  function O() {
+    let u;
     do
-      f = v();
-    while (f >= 12 && f <= 15);
-    return f;
+      u = m();
+    while (u >= 12 && u <= 15);
+    return u;
   }
   return {
-    setPosition: d,
+    setPosition: h,
     getPosition: () => n,
-    scan: t ? m : v,
+    scan: t ? O : m,
     getToken: () => s,
     getTokenValue: () => o,
     getTokenOffset: () => i,
@@ -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 it(e) {
   return e === 10 || e === 13;
 }
-function Je(e) {
+function Ce(e) {
   return e >= 48 && e <= 57;
 }
-var Zt;
+var an;
 (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 = {}));
+})(an || (an = {}));
 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 Xe = 200;
+new Array(Xe).fill(0).map((e, t) => `
+` + " ".repeat(t)), new Array(Xe).fill(0).map((e, t) => "\r" + " ".repeat(t)), new Array(Xe).fill(0).map((e, t) => `\r
+` + " ".repeat(t)), new Array(Xe).fill(0).map((e, t) => `
+` + "	".repeat(t)), new Array(Xe).fill(0).map((e, t) => "\r" + "	".repeat(t)), new Array(Xe).fill(0).map((e, t) => `\r
 ` + "	".repeat(t));
-var ut;
+var bt;
 (function(e) {
   e.DEFAULT = {
     allowTrailingComma: !1
   };
-})(ut || (ut = {}));
-function pr(e, t = [], r = ut.DEFAULT) {
+})(bt || (bt = {}));
+function Ar(e, t = [], r = bt.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,36 +663,36 @@ function pr(e, t = [], r = ut.DEFAULT) {
   function i(a) {
     return n.children.push(a), a;
   }
-  hr(e, {
+  Er(e, {
     onObjectBegin: (a) => {
       n = i({ type: "object", offset: a, length: -1, parent: n, children: [] });
     },
-    onObjectProperty: (a, u, l) => {
-      n = i({ type: "property", offset: u, length: -1, parent: n, children: [] }), n.children.push({ type: "string", value: a, offset: u, length: l, parent: n });
+    onObjectProperty: (a, f, l) => {
+      n = i({ type: "property", offset: f, length: -1, parent: n, children: [] }), n.children.push({ type: "string", value: a, offset: f, length: l, parent: n });
     },
-    onObjectEnd: (a, u) => {
-      o(a + u), n.length = a + u - n.offset, n = n.parent, o(a + u);
+    onObjectEnd: (a, f) => {
+      o(a + f), n.length = a + f - n.offset, n = n.parent, o(a + f);
     },
-    onArrayBegin: (a, u) => {
+    onArrayBegin: (a, f) => {
       n = i({ type: "array", offset: a, length: -1, parent: n, children: [] });
     },
-    onArrayEnd: (a, u) => {
-      n.length = a + u - n.offset, n = n.parent, o(a + u);
+    onArrayEnd: (a, f) => {
+      n.length = a + f - n.offset, n = n.parent, o(a + f);
     },
-    onLiteralValue: (a, u, l) => {
-      i({ type: gr(a), offset: u, length: l, parent: n, value: a }), o(u + l);
+    onLiteralValue: (a, f, l) => {
+      i({ type: Tr(a), offset: f, length: l, parent: n, value: a }), o(f + l);
     },
-    onSeparator: (a, u, l) => {
-      n.type === "property" && (a === ":" ? n.colonOffset = u : a === "," && o(u));
+    onSeparator: (a, f, l) => {
+      n.type === "property" && (a === ":" ? n.colonOffset = f : a === "," && o(f));
     },
-    onError: (a, u, l) => {
-      t.push({ error: a, offset: u, length: l });
+    onError: (a, f, l) => {
+      t.push({ error: a, offset: f, length: l });
     }
   }, r);
   const c = n.children[0];
   return c && delete c.parent, c;
 }
-function dr(e, t) {
+function Nr(e, t) {
   if (!e)
     return;
   let r = e;
@@ -716,80 +716,80 @@ function dr(e, t) {
     }
   return r;
 }
-function hr(e, t, r = ut.DEFAULT) {
-  const n = fr(e, !1), o = [];
+function Er(e, t, r = bt.DEFAULT) {
+  const n = Or(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(L) {
+    return L ? () => i === 0 && L(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(L) {
+    return L ? (I) => i === 0 && L(I, 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(L) {
+    return L ? (I) => i === 0 && L(I, 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 f(L) {
+    return L ? () => {
+      i > 0 ? i++ : L(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(L) {
+    return L ? () => {
+      i > 0 && i--, i === 0 && L(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;
-  function g() {
+  const y = f(t.onObjectBegin), d = a(t.onObjectProperty), h = l(t.onObjectEnd), T = f(t.onArrayBegin), N = l(t.onArrayEnd), m = a(t.onLiteralValue), g = c(t.onSeparator), O = s(t.onComment), u = c(t.onError), A = r && r.disallowComments, S = r && r.allowTrailingComma;
+  function p() {
     for (; ; ) {
-      const A = n.scan();
+      const L = n.scan();
       switch (n.getTokenError()) {
         case 4:
-          b(
+          v(
             14
             /* ParseErrorCode.InvalidUnicode */
           );
           break;
         case 5:
-          b(
+          v(
             15
             /* ParseErrorCode.InvalidEscapeCharacter */
           );
           break;
         case 3:
-          b(
+          v(
             13
             /* ParseErrorCode.UnexpectedEndOfNumber */
           );
           break;
         case 1:
-          E || b(
+          A || v(
             11
             /* ParseErrorCode.UnexpectedEndOfComment */
           );
           break;
         case 2:
-          b(
+          v(
             12
             /* ParseErrorCode.UnexpectedEndOfString */
           );
           break;
         case 6:
-          b(
+          v(
             16
             /* ParseErrorCode.InvalidCharacter */
           );
           break;
       }
-      switch (A) {
+      switch (L) {
         case 12:
         case 13:
-          E ? b(
+          A ? v(
             10
             /* ParseErrorCode.InvalidCommentToken */
-          ) : m();
+          ) : O();
           break;
         case 16:
-          b(
+          v(
             1
             /* ParseErrorCode.InvalidSymbol */
           );
@@ -798,119 +798,119 @@ function hr(e, t, r = ut.DEFAULT) {
         case 14:
           break;
         default:
-          return A;
+          return L;
       }
     }
   }
-  function b(A, w = [], R = []) {
-    if (f(A), w.length + R.length > 0) {
-      let X = n.getToken();
-      for (; X !== 17; ) {
-        if (w.indexOf(X) !== -1) {
-          g();
+  function v(L, I = [], D = []) {
+    if (u(L), I.length + D.length > 0) {
+      let K = n.getToken();
+      for (; K !== 17; ) {
+        if (I.indexOf(K) !== -1) {
+          p();
           break;
-        } else if (R.indexOf(X) !== -1)
+        } else if (D.indexOf(K) !== -1)
           break;
-        X = g();
+        K = p();
       }
     }
   }
-  function j(A) {
-    const w = n.getTokenValue();
-    return A ? v(w) : (p(w), o.push(w)), g(), !0;
+  function R(L) {
+    const I = n.getTokenValue();
+    return L ? m(I) : (d(I), o.push(I)), p(), !0;
   }
-  function T() {
+  function P() {
     switch (n.getToken()) {
       case 11:
-        const A = n.getTokenValue();
-        let w = Number(A);
-        isNaN(w) && (b(
+        const L = n.getTokenValue();
+        let I = Number(L);
+        isNaN(I) && (v(
           2
           /* ParseErrorCode.InvalidNumberFormat */
-        ), w = 0), v(w);
+        ), I = 0), m(I);
         break;
       case 7:
-        v(null);
+        m(null);
         break;
       case 8:
-        v(!0);
+        m(!0);
         break;
       case 9:
-        v(!1);
+        m(!1);
         break;
       default:
         return !1;
     }
-    return g(), !0;
+    return p(), !0;
   }
-  function F() {
-    return n.getToken() !== 10 ? (b(3, [], [
+  function x() {
+    return n.getToken() !== 10 ? (v(3, [], [
       2,
       5
       /* SyntaxKind.CommaToken */
-    ]), !1) : (j(!1), n.getToken() === 6 ? (h(":"), g(), V() || b(4, [], [
+    ]), !1) : (R(!1), n.getToken() === 6 ? (g(":"), p(), F() || v(4, [], [
       2,
       5
       /* SyntaxKind.CommaToken */
-    ])) : b(5, [], [
+    ])) : v(5, [], [
       2,
       5
       /* SyntaxKind.CommaToken */
     ]), o.pop(), !0);
   }
   function M() {
-    y(), g();
-    let A = !1;
+    y(), p();
+    let L = !1;
     for (; n.getToken() !== 2 && n.getToken() !== 17; ) {
       if (n.getToken() === 5) {
-        if (A || b(4, [], []), h(","), g(), n.getToken() === 2 && S)
+        if (L || v(4, [], []), g(","), p(), n.getToken() === 2 && S)
           break;
-      } else A && b(6, [], []);
-      F() || b(4, [], [
+      } else L && v(6, [], []);
+      x() || v(4, [], [
         2,
         5
         /* SyntaxKind.CommaToken */
-      ]), A = !0;
+      ]), L = !0;
     }
-    return d(), n.getToken() !== 2 ? b(7, [
+    return h(), n.getToken() !== 2 ? v(7, [
       2
       /* SyntaxKind.CloseBraceToken */
-    ], []) : g(), !0;
+    ], []) : p(), !0;
   }
-  function x() {
-    L(), g();
-    let A = !0, w = !1;
+  function B() {
+    T(), p();
+    let L = !0, I = !1;
     for (; n.getToken() !== 4 && n.getToken() !== 17; ) {
       if (n.getToken() === 5) {
-        if (w || b(4, [], []), h(","), g(), n.getToken() === 4 && S)
+        if (I || v(4, [], []), g(","), p(), n.getToken() === 4 && S)
           break;
-      } else w && b(6, [], []);
-      A ? (o.push(0), A = !1) : o[o.length - 1]++, V() || b(4, [], [
+      } else I && v(6, [], []);
+      L ? (o.push(0), L = !1) : o[o.length - 1]++, F() || v(4, [], [
         4,
         5
         /* SyntaxKind.CommaToken */
-      ]), w = !0;
+      ]), I = !0;
     }
-    return N(), A || o.pop(), n.getToken() !== 4 ? b(8, [
+    return N(), L || o.pop(), n.getToken() !== 4 ? v(8, [
       4
       /* SyntaxKind.CloseBracketToken */
-    ], []) : g(), !0;
+    ], []) : p(), !0;
   }
-  function V() {
+  function F() {
     switch (n.getToken()) {
       case 3:
-        return x();
+        return B();
       case 1:
         return M();
       case 10:
-        return j(!0);
+        return R(!0);
       default:
-        return T();
+        return P();
     }
   }
-  return g(), n.getToken() === 17 ? r.allowEmptyContent ? !0 : (b(4, [], []), !1) : V() ? (n.getToken() !== 17 && b(9, [], []), !0) : (b(4, [], []), !1);
+  return p(), n.getToken() === 17 ? r.allowEmptyContent ? !0 : (v(4, [], []), !1) : F() ? (n.getToken() !== 17 && v(9, [], []), !0) : (v(4, [], []), !1);
 }
-function gr(e) {
+function Tr(e) {
   switch (typeof e) {
     case "boolean":
       return "boolean";
@@ -929,25 +929,25 @@ function gr(e) {
       return "null";
   }
 }
-var Ct;
+var ln;
 (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;
+})(ln || (ln = {}));
+var un;
 (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;
+})(un || (un = {}));
+const bn = Ar, wn = Nr;
+var fn;
 (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) {
+})(fn || (fn = {}));
+function Ir(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 Pt, pn;
+function Lr() {
+  return pn || (pn = 1, Pt = 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,84 @@ function yr() {
       return !0;
     }
     return t !== t && r !== r;
-  }), wt;
+  }), Pt;
+}
+var kr = Lr();
+const he = /* @__PURE__ */ Ir(kr);
+function _t(e) {
+  if (typeof e != "object" || e === null)
+    return !1;
+  const t = Object.getPrototypeOf(e);
+  return (t === null || t === Object.prototype || Object.getPrototypeOf(t) === null) && !(Symbol.toStringTag in e) && !(Symbol.iterator in e);
+}
+function Rt(e, t) {
+  return Array.isArray(e) && e.length > 0 ? [...e, t] : [t];
+}
+function Sr(e, t = {}) {
+  if (!_t(e) && !Array.isArray(e))
+    throw new TypeError("Expected a plain object or array");
+  const { deep: r = !1, compare: n, ignoreKeys: o } = t, i = /* @__PURE__ */ new WeakMap(), s = (l) => Array.isArray(o) ? o.includes(l.key) : typeof o == "function" ? o(l) : !1, c = (l) => typeof r == "boolean" ? r : typeof r == "function" ? r(l) : !1, a = (l, y, d) => {
+    const h = i.get(l);
+    if (h !== void 0)
+      return h;
+    const T = [];
+    T.length = l.length, i.set(l, T);
+    for (const N of l.keys()) {
+      if (!(N in l))
+        continue;
+      const m = l[N], g = String(N), O = Rt(y, g), u = {
+        key: g,
+        value: m,
+        path: O,
+        depth: d + 1
+      };
+      if (Array.isArray(m)) {
+        T[N] = c(u) ? a(m, O, d + 1) : m;
+        continue;
+      }
+      if (_t(m)) {
+        T[N] = c(u) ? f(m, O, d + 1) : m;
+        continue;
+      }
+      T[N] = m;
+    }
+    return T;
+  }, f = (l, y = [], d = 0) => {
+    const h = i.get(l);
+    if (h !== void 0)
+      return h;
+    const T = {}, N = Object.keys(l), m = [], g = [];
+    for (const A of N) {
+      const S = l[A], p = Rt(y, A);
+      s({
+        key: A,
+        value: S,
+        path: p,
+        depth: d
+      }) ? m.push(A) : g.push(A);
+    }
+    const O = g.sort(n), u = [...m, ...O];
+    i.set(l, T);
+    for (const A of u) {
+      const S = l[A], p = Rt(y, A), v = {
+        key: A,
+        value: S,
+        path: p,
+        depth: d
+      };
+      let R = S;
+      c(v) && (Array.isArray(S) ? R = a(S, p, d) : _t(S) && (R = f(S, p, d + 1)));
+      const P = Object.getOwnPropertyDescriptor(l, A);
+      P.get || P.set ? Object.defineProperty(T, A, P) : Object.defineProperty(T, A, {
+        ...P,
+        value: R
+      });
+    }
+    return T;
+  };
+  return Array.isArray(e) ? a(e, [], -1) : f(e, [], 0);
 }
-var vr = yr();
-const de = /* @__PURE__ */ mr(vr), W = (e, t) => {
+const J = (e, t) => {
   if (!e) return;
   const r = t.replace(/^\//, "").replace(/\[/g, ".").replace(/\]/g, "").split(/[./#]/).filter(Boolean);
   let n = e;
@@ -998,7 +1072,7 @@ const de = /* @__PURE__ */ mr(vr), W = (e, t) => {
  * (c) 2017-2022 Joachim Wester
  * MIT licensed
  */
-var br = /* @__PURE__ */ (function() {
+var Pr = /* @__PURE__ */ (function() {
   var e = function(t, r) {
     return e = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(n, o) {
       n.__proto__ = o;
@@ -1013,11 +1087,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);
+})(), _r = Object.prototype.hasOwnProperty;
+function xt(e, t) {
+  return _r.call(e, t);
 }
-function Tt(e) {
+function Mt(e) {
   if (Array.isArray(e)) {
     for (var t = new Array(e.length), r = 0; r < t.length; r++)
       t[r] = "" + r;
@@ -1027,10 +1101,10 @@ function Tt(e) {
     return Object.keys(e);
   var n = [];
   for (var o in e)
-    Et(e, o) && n.push(o);
+    xt(e, o) && n.push(o);
   return n;
 }
-function we(e) {
+function Oe(e) {
   switch (typeof e) {
     case "object":
       return JSON.parse(JSON.stringify(e));
@@ -1042,7 +1116,7 @@ function we(e) {
       return e;
   }
 }
-function It(e) {
+function $t(e) {
   for (var t = 0, r = e.length, n; t < r; ) {
     if (n = e.charCodeAt(t), n >= 48 && n <= 57) {
       t++;
@@ -1052,29 +1126,29 @@ function It(e) {
   }
   return !0;
 }
-function Me(e) {
+function Je(e) {
   return e.indexOf("/") === -1 && e.indexOf("~") === -1 ? e : e.replace(/~/g, "~0").replace(/\//g, "~1");
 }
-function fn(e) {
+function On(e) {
   return e.replace(/~1/g, "/").replace(/~0/g, "~");
 }
-function Lt(e) {
+function Bt(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 (Bt(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 = Mt(e), o = n.length, i = 0; i < o; i++)
+        if (Bt(e[n[i]]))
           return !0;
     }
   }
   return !1;
 }
-function nn(e, t) {
+function dn(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 +1157,17 @@ function nn(e, t) {
   return r.join(`
 `);
 }
-var pn = (
+var An = (
   /** @class */
   (function(e) {
-    br(t, e);
+    Pr(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, dn(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 = dn(r, { name: n, index: o, operation: i, tree: s }), a;
     }
     return t;
   })(Error)
-), ce = pn, wr = we, Ge = {
+), ce = An, Rr = Oe, Ke = {
   add: function(e, t, r) {
     return e[t] = this.value, { newDocument: r };
   },
@@ -1106,24 +1180,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 = wt(r, this.path);
+    n && (n = Oe(n));
+    var o = He(r, { op: "remove", path: this.from }).removed;
+    return He(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 = wt(r, this.from);
+    return He(r, { op: "add", path: this.path, value: Oe(n) }), { newDocument: r };
   },
   test: function(e, t, r) {
-    return { newDocument: r, test: et(e[t], this.value) };
+    return { newDocument: r, test: lt(e[t], this.value) };
   },
   _get: function(e, t, r) {
     return this.value = e[t], { newDocument: r };
   }
-}, Ar = {
+}, jr = {
   add: function(e, t, r) {
-    return It(t) ? e.splice(t, 0, this.value) : e[t] = this.value, { newDocument: r, index: t };
+    return $t(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,28 +1207,28 @@ 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: Ke.move,
+  copy: Ke.copy,
+  test: Ke.test,
+  _get: Ke._get
 };
-function ft(e, t) {
+function wt(e, t) {
   if (t == "")
     return e;
   var r = { op: "_get", path: t };
-  return xe(e, r), r.value;
+  return He(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 He(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) : Ot(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 = wt(e, t.from), t.op === "move" && (s.removed = e), s;
     if (t.op === "test") {
-      if (s.test = et(e, t.value), s.test === !1)
+      if (s.test = lt(e, t.value), s.test === !1)
         throw new ce("Test operation failed", "TEST_OPERATION_FAILED", i, t, e);
       return s.newDocument = e, s;
     } else {
@@ -1167,56 +1241,56 @@ function xe(e, t, r, n, o, i) {
       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 = Oe(e));
+    var c = t.path || "", a = c.split("/"), f = e, l = 1, y = a.length, d = void 0, h = void 0, T = void 0;
+    for (typeof r == "function" ? T = r : T = Ot; ; ) {
+      if (h = a[l], h && h.indexOf("~") != -1 && (h = On(h)), o && (h == "__proto__" || h == "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 (d === "-")
-          d = u.length;
+      if (r && d === void 0 && (f[h] === void 0 ? d = a.slice(0, l).join("/") : l == y - 1 && (d = t.path), d !== void 0 && T(t, 0, e, d)), l++, Array.isArray(f)) {
+        if (h === "-")
+          h = f.length;
         else {
-          if (r && !It(d))
+          if (r && !$t(h))
             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);
+          $t(h) && (h = ~~h);
         }
         if (l >= y) {
-          if (r && t.op === "add" && d > u.length)
+          if (r && t.op === "add" && h > f.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);
+          var s = jr[t.op].call(t, f, h, e);
           if (s.test === !1)
             throw new ce("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 = Ke[t.op].call(t, f, h, e);
         if (s.test === !1)
           throw new ce("Test operation failed", "TEST_OPERATION_FAILED", i, t, e);
         return s;
       }
-      if (u = u[d], r && l < y && (!u || typeof u != "object"))
+      if (f = f[h], r && l < y && (!f || typeof f != "object"))
         throw new ce("Cannot perform operation at the desired path", "OPERATION_PATH_UNRESOLVABLE", i, t, e);
     }
   }
 }
-function _t(e, t, r, n, o) {
+function Vt(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));
+  n || (e = Oe(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] = He(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 Dr(e, t, r) {
+  var n = He(e, t);
   if (n.test === !1)
     throw new ce("Test operation failed", "TEST_OPERATION_FAILED", r, t, e);
   return n.newDocument;
 }
-function pt(e, t, r, n) {
+function Ot(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]) {
+  if (Ke[e.op]) {
     if (typeof e.path != "string")
       throw new ce("Operation `path` property is not a string", "OPERATION_PATH_INVALID", t, e, r);
     if (e.path.indexOf("/") !== 0 && e.path.length > 0)
@@ -1225,7 +1299,7 @@ function pt(e, t, r, n) {
       throw new ce("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))
+    if ((e.op === "add" || e.op === "replace" || e.op === "test") && Bt(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);
     if (r) {
       if (e.op == "add") {
@@ -1236,21 +1310,21 @@ function pt(e, t, r, n) {
         if (e.path !== n)
           throw new ce("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 = Nn([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);
       }
     }
   } else throw new ce("Operation `op` property is not one of operations defined in RFC-6902", "OPERATION_OP_INVALID", t, e, r);
 }
-function dn(e, t, r) {
+function Nn(e, t, r) {
   try {
     if (!Array.isArray(e))
       throw new ce("Patch sequence must be an array", "SEQUENCE_NOT_AN_ARRAY");
     if (t)
-      _t(we(t), we(e), r || !0);
+      Vt(Oe(t), Oe(e), r || !0);
     else {
-      r = r || pt;
+      r = r || Ot;
       for (var n = 0; n < e.length; n++)
         r(e[n], n, t, void 0);
     }
@@ -1260,7 +1334,7 @@ function dn(e, t, r) {
     throw o;
   }
 }
-function et(e, t) {
+function lt(e, t) {
   if (e === t)
     return !0;
   if (e && t && typeof e == "object" && typeof t == "object") {
@@ -1269,7 +1343,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 (!lt(e[o], t[o]))
           return !1;
       return !0;
     }
@@ -1282,30 +1356,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], !lt(e[s], t[s]))
         return !1;
     return !0;
   }
   return e !== e && t !== t;
 }
-const Er = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const xr = /* @__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
+  _areEquals: lt,
+  applyOperation: He,
+  applyPatch: Vt,
+  applyReducer: Dr,
+  deepClone: Rr,
+  getValueByPointer: wt,
+  validate: Nn,
+  validator: Ot
 }, 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 Jt = /* @__PURE__ */ new WeakMap(), Mr = (
   /** @class */
   /* @__PURE__ */ (function() {
     function e(t) {
@@ -1313,7 +1387,7 @@ var Pt = /* @__PURE__ */ new WeakMap(), Tr = (
     }
     return e;
   })()
-), Ir = (
+), $r = (
   /** @class */
   /* @__PURE__ */ (function() {
     function e(t, r) {
@@ -1322,95 +1396,95 @@ var Pt = /* @__PURE__ */ new WeakMap(), Tr = (
     return e;
   })()
 );
-function Lr(e) {
-  return Pt.get(e);
+function Br(e) {
+  return Jt.get(e);
 }
-function Sr(e, t) {
+function Fr(e, t) {
   return e.observers.get(t);
 }
-function kr(e, t) {
+function Ur(e, t) {
   e.observers.delete(t.callback);
 }
-function _r(e, t) {
+function Vr(e, t) {
   t.unobserve();
 }
-function Pr(e, t) {
-  var r = [], n, o = Lr(e);
+function Jr(e, t) {
+  var r = [], n, o = Br(e);
   if (!o)
-    o = new Tr(e), Pt.set(e, o);
+    o = new Mr(e), Jt.set(e, o);
   else {
-    var i = Sr(o, t);
+    var i = Fr(o, t);
     n = i && i.observer;
   }
   if (n)
     return n;
-  if (n = {}, o.value = we(e), t) {
+  if (n = {}, o.value = Oe(e), t) {
     n.callback = t, n.next = null;
     var s = function() {
-      St(n);
+      Ft(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;
+    Ft(n), clearTimeout(n.next), Ur(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 $r(t, n)), n;
 }
-function St(e, t) {
+function Ft(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 = Jt.get(e.object);
+  Ht(r.value, e.object, e.patches, "", t), e.patches.length && Vt(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 Ht(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--) {
-      var u = s[a], l = e[u];
-      if (Et(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 }));
+    for (var i = Mt(t), s = Mt(e), c = !1, a = s.length - 1; a >= 0; a--) {
+      var f = s[a], l = e[f];
+      if (xt(t, f) && !(t[f] === void 0 && l !== void 0 && Array.isArray(t) === !1)) {
+        var y = t[f];
+        typeof l == "object" && l != null && typeof y == "object" && y != null && Array.isArray(l) === Array.isArray(y) ? Ht(l, y, r, n + "/" + Je(f), o) : l !== y && (o && r.push({ op: "test", path: n + "/" + Je(f), value: Oe(l) }), r.push({ op: "replace", path: n + "/" + Je(f), value: Oe(y) }));
+      } else Array.isArray(e) === Array.isArray(t) ? (o && r.push({ op: "test", path: n + "/" + Je(f), value: Oe(l) }), r.push({ op: "remove", path: n + "/" + Je(f) }), 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]) });
+        var f = i[a];
+        !xt(e, f) && t[f] !== void 0 && r.push({ op: "add", path: n + "/" + Je(f), value: Oe(t[f]) });
       }
   }
 }
-function We(e, t, r) {
+function Qe(e, t, r) {
   r === void 0 && (r = !1);
   var n = [];
-  return Rt(e, t, n, "", r), n;
+  return Ht(e, t, n, "", r), n;
 }
-const Rr = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Hr = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  compare: We,
-  generate: St,
-  observe: Pr,
-  unobserve: _r
+  compare: Qe,
+  generate: Ft,
+  observe: Jr,
+  unobserve: Vr
 }, Symbol.toStringTag, { value: "Module" }));
-Object.assign({}, Er, Rr, {
-  JsonPatchError: pn,
-  deepClone: we,
-  escapePathComponent: Me,
-  unescapePathComponent: fn
+Object.assign({}, xr, Hr, {
+  JsonPatchError: An,
+  deepClone: Oe,
+  escapePathComponent: Je,
+  unescapePathComponent: On
 });
-const ht = "oneOf", jt = "anyOf", Dt = "allOf";
-function Mt(e) {
-  return !!(e[ht] || e[jt] || e[Dt]);
+const Nt = "oneOf", Gt = "anyOf", Wt = "allOf";
+function qt(e) {
+  return !!(e[Nt] || e[Gt] || e[Wt]);
 }
-function hn(e) {
-  const t = e[ht] || e[jt] || e[Dt];
+function En(e) {
+  const t = e[Nt] || e[Gt] || e[Wt];
   return Array.isArray(t) ? t : void 0;
 }
-function ct(e) {
-  return e.oneOf ? ht : e.anyOf ? jt : e.allOf ? Dt : "";
+function mt(e) {
+  return e.oneOf ? Nt : e.anyOf ? Gt : e.allOf ? Wt : "";
 }
-function jr(e, t) {
+function Gr(e, t) {
   if (typeof t != "object" || t === null || Array.isArray(t))
     return null;
   const r = t, n = /* @__PURE__ */ new Set();
@@ -1425,7 +1499,7 @@ function jr(e, t) {
       return { field: o, value: r[o] };
   return null;
 }
-function at(e, t, r = ht) {
+function yt(e, t, r = Nt) {
   var n;
   if (t.length === 0)
     throw new Error("No variants provided to chooseSubschemaSync");
@@ -1436,7 +1510,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 = Gr(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];
@@ -1449,10 +1523,10 @@ function at(e, t, r = ht) {
         const a = c.required || [];
         if (a.every((l) => l in o) && a.length > 0) {
           let l = !0;
-          for (const [y, p] of Object.entries(c.properties))
-            if (p && typeof p == "object" && "const" in p) {
-              const d = p.const;
-              if (o[y] !== d) {
+          for (const [y, d] of Object.entries(c.properties))
+            if (d && typeof d == "object" && "const" in d) {
+              const h = d.const;
+              if (o[y] !== h) {
                 l = !1;
                 break;
               }
@@ -1478,32 +1552,39 @@ function at(e, t, r = ht) {
   }
   return { selectedIndex: 0, schema: t[0] };
 }
-function kt(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;
+function Wr(e) {
+  if (typeof e == "object" && e !== null) {
+    const t = Sr(e, { deep: !0 });
+    return JSON.stringify(t, null, 2);
+  }
+  return JSON.stringify(e, null, 2);
+}
+function Ut(e, t, r) {
+  const n = !he(e, t), o = !he(e, r);
+  return n && o ? he(t, r) ? $.SAME_CHANGE : $.TRUE_CONFLICT : n ? $.INPUT1_ONLY : o ? $.INPUT2_ONLY : $.SAME_CHANGE;
 }
-function Pe(e, t) {
+function xe(e, t) {
   try {
-    const r = ln(e);
+    const r = bn(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 : wn(r, n);
     return o ? {
-      start: rn(e, o.offset),
-      end: rn(e, o.offset + o.length)
+      start: hn(e, o.offset),
+      end: hn(e, o.offset + o.length)
     } : { start: 1, end: 1 };
   } catch {
     return { start: 1, end: 1 };
   }
 }
-function rn(e, t) {
+function hn(e, t) {
   return e.substring(0, t).split(`
 `).length;
 }
-function Dr(e, t) {
+function qr(e, t) {
   const r = /* @__PURE__ */ new Map(), n = (o) => {
     const i = o.split("/").filter(Boolean);
     return i.length > 0 ? `/${i[0]}` : "/";
@@ -1522,150 +1603,150 @@ function Dr(e, t) {
   }
   return r;
 }
-function Mr(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+)(?:\/|$)/);
-    if (h) {
-      const m = h[1];
-      c.has(m) || c.set(m, []);
-      const f = c.get(m);
-      f && f.push(v);
+function Yr(e, t, r, n, o, i) {
+  const s = /* @__PURE__ */ new Map(), c = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), f = [], l = [];
+  for (const m of e) {
+    const g = m.path.match(/^(\/[^/]+(?:\/[^/]+)*)\/(\d+)(?:\/|$)/);
+    if (g) {
+      const O = g[1];
+      c.has(O) || c.set(O, []);
+      const u = c.get(O);
+      u && u.push(m);
     } else
-      u.push(v);
-  }
-  for (const v of t) {
-    const h = v.path.match(/^(\/[^/]+(?:\/[^/]+)*)\/(\d+)(?:\/|$)/);
-    if (h) {
-      const m = h[1];
-      a.has(m) || a.set(m, []);
-      const f = a.get(m);
-      f && f.push(v);
+      f.push(m);
+  }
+  for (const m of t) {
+    const g = m.path.match(/^(\/[^/]+(?:\/[^/]+)*)\/(\d+)(?:\/|$)/);
+    if (g) {
+      const O = g[1];
+      a.has(O) || a.set(O, []);
+      const u = a.get(O);
+      u && u.push(m);
     } else
-      l.push(v);
+      l.push(m);
   }
   const y = /* @__PURE__ */ new Set([...c.keys(), ...a.keys()]);
-  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];
-          s.has(V) || s.set(V, { patches1: [], patches2: [] });
-          const A = s.get(V);
-          A && A.patches1.push(M);
+  for (const m of y) {
+    const g = J(r, m), O = J(n, m), u = J(o, m);
+    if (!Array.isArray(g) || !Array.isArray(O) || !Array.isArray(u)) {
+      const P = c.get(m) || [], x = a.get(m) || [];
+      for (const M of P) {
+        const B = M.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+        if (B) {
+          const F = B[1];
+          s.has(F) || s.set(F, { patches1: [], patches2: [] });
+          const L = s.get(F);
+          L && L.patches1.push(M);
         }
       }
-      for (const M of F) {
-        const x = M.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-        if (x) {
-          const V = x[1];
-          s.has(V) || s.set(V, { patches1: [], patches2: [] });
-          const A = s.get(V);
-          A && A.patches2.push(M);
+      for (const M of x) {
+        const B = M.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+        if (B) {
+          const F = B[1];
+          s.has(F) || s.set(F, { patches1: [], patches2: [] });
+          const L = s.get(F);
+          L && L.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;
-    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+)(?:\/|$)/);
-          if (R) {
-            const X = Number.parseInt(R[1], 10), ne = M.get(X);
-            if (ne !== void 0) {
-              const ae = `${v}#${ne}`;
+    const A = Ze(i, m, r), S = A != null && A.items ? Array.isArray(A.items) && A.items[0] ? A.items[0] : Array.isArray(A.items) ? null : A.items : null, p = S && typeof S == "object" ? S : null;
+    if (p) {
+      const P = Xr(g, O, u, p);
+      if (P.size > 0) {
+        const x = /* @__PURE__ */ new Map(), M = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
+        for (const [I, D] of P.entries())
+          D.base !== void 0 && x.set(D.base, I), D.input1 !== void 0 && M.set(D.input1, I), D.input2 !== void 0 && B.set(D.input2, I);
+        const F = c.get(m) || [], L = a.get(m) || [];
+        for (const I of F) {
+          const D = I.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
+          if (D) {
+            const K = Number.parseInt(D[1], 10), ie = M.get(K);
+            if (ie !== void 0) {
+              const ae = `${m}#${ie}`;
               s.has(ae) || s.set(ae, { patches1: [], patches2: [] });
-              const me = s.get(ae);
-              me && me.patches1.push(w);
+              const ge = s.get(ae);
+              ge && ge.patches1.push(I);
             }
           }
         }
-        for (const w of A) {
-          const R = w.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
-          if (R) {
-            const X = Number.parseInt(R[1], 10), ne = x.get(X);
-            if (ne !== void 0) {
-              const ae = `${v}#${ne}`;
+        for (const I of L) {
+          const D = I.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
+          if (D) {
+            const K = Number.parseInt(D[1], 10), ie = B.get(K);
+            if (ie !== void 0) {
+              const ae = `${m}#${ie}`;
               s.has(ae) || s.set(ae, { patches1: [], patches2: [] });
-              const me = s.get(ae);
-              me && me.patches2.push(w);
+              const ge = s.get(ae);
+              ge && ge.patches2.push(I);
             }
           }
         }
         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 v = c.get(m) || [], R = a.get(m) || [];
+    for (const P of v) {
+      const x = P.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+      if (x) {
+        const M = x[1];
         s.has(M) || s.set(M, { patches1: [], patches2: [] });
-        const x = s.get(M);
-        x && x.patches1.push(T);
+        const B = s.get(M);
+        B && B.patches1.push(P);
       }
     }
-    for (const T of j) {
-      const F = T.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-      if (F) {
-        const M = F[1];
+    for (const P of R) {
+      const x = P.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+      if (x) {
+        const M = x[1];
         s.has(M) || s.set(M, { patches1: [], patches2: [] });
-        const x = s.get(M);
-        x && x.patches2.push(T);
-      }
-    }
-  }
-  const p = (v, h) => {
-    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();
-  for (const v of d) {
-    const h = p(v.path, i);
-    h && N.add(h);
-  }
-  for (const v of L) {
-    const h = p(v.path, i);
-    h && N.add(h);
-  }
-  for (const v of N)
-    s.has(v) || s.set(v, { patches1: [], patches2: [] });
-  for (const v of d) {
-    const h = v.path, m = p(h, i);
-    if (m) {
-      const f = s.get(m);
-      f && f.patches1.push(v);
+        const B = s.get(M);
+        B && B.patches2.push(P);
+      }
+    }
+  }
+  const d = (m, g) => {
+    if (!g) return null;
+    const O = m.split("/").filter(Boolean);
+    if (O.length < 2) return null;
+    const u = `/${O[0]}`, A = Ze(g, u);
+    return A && qt(A) ? u : null;
+  }, h = [...f], T = [...l], N = /* @__PURE__ */ new Set();
+  for (const m of h) {
+    const g = d(m.path, i);
+    g && N.add(g);
+  }
+  for (const m of T) {
+    const g = d(m.path, i);
+    g && N.add(g);
+  }
+  for (const m of N)
+    s.has(m) || s.set(m, { patches1: [], patches2: [] });
+  for (const m of h) {
+    const g = m.path, O = d(g, i);
+    if (O) {
+      const u = s.get(O);
+      u && u.patches1.push(m);
     } else {
-      s.has(h) || s.set(h, { patches1: [], patches2: [] });
-      const f = s.get(h);
-      f && f.patches1.push(v);
+      s.has(g) || s.set(g, { patches1: [], patches2: [] });
+      const u = s.get(g);
+      u && u.patches1.push(m);
     }
   }
-  for (const v of L) {
-    const h = v.path, m = p(h, i);
-    if (m) {
-      const f = s.get(m);
-      f && f.patches2.push(v);
+  for (const m of T) {
+    const g = m.path, O = d(g, i);
+    if (O) {
+      const u = s.get(O);
+      u && u.patches2.push(m);
     } else {
-      s.has(h) || s.set(h, { patches1: [], patches2: [] });
-      const f = s.get(h);
-      f && f.patches2.push(v);
+      s.has(g) || s.set(g, { patches1: [], patches2: [] });
+      const u = s.get(g);
+      u && u.patches2.push(m);
     }
   }
   return s;
 }
-function qe(e, t, r) {
+function Ze(e, t, r) {
   if (!e)
     return null;
   const n = t.split("/").filter(Boolean);
@@ -1673,14 +1754,14 @@ function qe(e, t, r) {
     return e;
   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;
+    const c = n[s], a = Number.parseInt(c, 10), f = !Number.isNaN(a) && String(a) === c;
+    if (o && qt(o)) {
+      const l = En(o), y = mt(o), d = r ? J(r, i || "/") : void 0;
       if (l && l.length > 0)
-        if (p !== void 0)
+        if (d !== void 0)
           try {
-            const { schema: d } = at(p, l, y);
-            o = d;
+            const { schema: h } = yt(d, l, y);
+            o = h;
           } catch {
             l.length > 0 && l[0] && (o = l[0]);
           }
@@ -1689,7 +1770,7 @@ function qe(e, t, r) {
     }
     if (!o)
       return null;
-    if (u)
+    if (f)
       if (o.items)
         if (Array.isArray(o.items)) {
           const l = a < o.items.length ? o.items[a] : null;
@@ -1707,7 +1788,7 @@ function qe(e, t, r) {
   }
   return o;
 }
-function gn(e) {
+function Tn(e) {
   if (!e || typeof e != "object")
     return [];
   const t = [];
@@ -1727,115 +1808,115 @@ function gn(e) {
   }
   return t;
 }
-function xr(e) {
-  const t = gn(e);
+function zr(e) {
+  const t = Tn(e);
   return t.length > 0 ? t[0] : null;
 }
-function $r(e, t, r) {
-  const n = /* @__PURE__ */ new Map(), o = gn(r);
+function Cr(e, t, r) {
+  const n = /* @__PURE__ */ new Map(), o = Tn(r);
   if (o.length === 0)
     return n;
   const i = (c) => {
     if (typeof c != "object" || c === null)
       return null;
-    const a = c, u = [];
+    const a = c, f = [];
     for (const l of o) {
       const y = a[l];
-      y != null && u.push(`${l}:${JSON.stringify(y)}`);
+      y != null && f.push(`${l}:${JSON.stringify(y)}`);
     }
-    return u.length > 0 ? u.join("|") : null;
+    return f.length > 0 ? f.join("|") : null;
   }, s = (c, a) => {
-    c.forEach((u, l) => {
-      const y = i(u);
+    c.forEach((f, l) => {
+      const y = i(f);
       if (y) {
         n.has(y) || n.set(y, {});
-        const p = n.get(y);
-        p && (p[a] = l);
+        const d = n.get(y);
+        d && (d[a] = l);
       }
     });
   };
   return s(e, "input1"), s(t, "input2"), n;
 }
-function Br(e, t, r, n) {
-  const o = /* @__PURE__ */ new Map(), i = xr(n);
+function Xr(e, t, r, n) {
+  const o = /* @__PURE__ */ new Map(), i = zr(n);
   if (!i)
     return o;
   const s = (c, a) => {
-    c.forEach((u, l) => {
-      if (typeof u == "object" && u !== null) {
-        const y = u[i];
+    c.forEach((f, l) => {
+      if (typeof f == "object" && f !== null) {
+        const y = f[i];
         if (y != null) {
-          const p = String(y);
-          o.has(p) || o.set(p, {});
-          const d = o.get(p);
-          d && (d[a] = l);
+          const d = String(y);
+          o.has(d) || o.set(d, {});
+          const h = o.get(d);
+          h && (h[a] = l);
         }
       }
     });
   };
   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);
-    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);
+function Kr(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 = Qe(o, i), a = Qe(o, s);
+  let f = qr(c, a);
+  n && (f = Yr(c, a, e, t, r, n));
+  const l = [], y = /* @__PURE__ */ new Set(), d = (h, T, N, m) => {
+    if (!n || typeof T != "object" || T === null || Array.isArray(T) || typeof N != "object" || N === null || Array.isArray(N) || typeof m != "object" || m === null || Array.isArray(m)) return !1;
+    const g = Ze(n, h, T);
+    if (!g || !qt(g)) return !1;
+    const O = En(g);
+    if (!O || O.length < 2) return !1;
+    const u = yt(T, O, mt(g)), A = yt(N, O, mt(g)), S = yt(m, O, mt(g));
+    return A.selectedIndex !== S.selectedIndex && (u.selectedIndex !== A.selectedIndex || u.selectedIndex !== S.selectedIndex);
   };
-  for (const [d, { patches1: L, patches2: N }] 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]);
-    let h = d;
-    if (d.includes("#"))
-      h = d.split("#")[0];
+  for (const [h, { patches1: T, patches2: N }] of f) {
+    y.add(h);
+    let m = h;
+    T.length > 0 ? m = T[0].path : N.length > 0 ? m = N[0].path : h.includes("#") && (m = h.split("#")[0]);
+    let g = h;
+    if (h.includes("#"))
+      g = h.split("#")[0];
     else {
-      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);
+      const M = h.split("/").filter(Boolean);
+      M.length > 1 && (g = `/${M[0]}`);
+    }
+    if ([...T, ...N].every((M) => (M.path.split("/").slice(0, 2).join("/") || `/${M.path.split("/")[1]}`) === g) && g !== m) {
+      const M = J(e, g), B = J(t, g), F = J(r, g);
+      if (d(g, M, B, F)) {
+        const I = M, D = B, K = F;
+        let ie = Ut(I, D, K);
+        !he(I, D) && !he(I, K) && !he(D, K) && (ie = $.TRUE_CONFLICT);
+        const ae = [...T, ...N].filter(
+          (Ae) => Ae.path.startsWith(`${g}/`) || Ae.path === g
+        ), ge = [], Pe = [];
+        for (const Ae of ae) {
+          const $e = Ae.path, Ee = e !== void 0 ? J(e, $e) : void 0, Be = J(t, $e), Z = J(r, $e);
+          let pe = !1, ee = !1;
+          Ae.op === "replace" ? Ee !== void 0 && (pe = !he(Ee, Be), ee = !he(Ee, Z)) : Ae.op === "add" ? (pe = Ee === void 0 && Be !== void 0, ee = Ee === void 0 && Z !== void 0) : Ae.op === "remove" && (pe = Ee !== void 0 && Be === void 0, ee = Ee !== void 0 && Z === void 0), Ee !== void 0 && (Be !== void 0 && he(Ee, Be) && (pe = !1), Z !== void 0 && he(Ee, Z) && (ee = !1)), pe && ge.push(Ae), ee && Pe.push(Ae);
         }
         l.push({
-          path: h,
-          baseValue: w,
-          input1Value: R,
-          input2Value: X,
-          conflictType: ne,
-          patches1: me,
-          patches2: je
+          path: g,
+          baseValue: I,
+          input1Value: D,
+          input2Value: K,
+          conflictType: ie,
+          patches1: ge,
+          patches2: Pe
         });
         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({
-      path: v,
+    const u = J(e, m), A = J(t, m), S = J(r, m);
+    let p = Ut(u, A, S);
+    const v = u != null, R = A != null, P = S != null;
+    !v && R && P && p !== $.SAME_CHANGE && (p = $.TRUE_CONFLICT), v && he(u, A) && he(u, S) || l.push({
+      path: m,
       // Use representative path for conflict (actual patch paths are in patches1/patches2)
-      baseValue: f,
-      input1Value: E,
+      baseValue: u,
+      input1Value: A,
       input2Value: S,
-      conflictType: g,
-      patches1: L,
+      conflictType: p,
+      patches1: T,
       // JSON Patch operations for base?input1 (contain actual paths with indices)
       patches2: N
       // JSON Patch operations for base?input2 (contain actual paths with indices)
@@ -1843,105 +1924,105 @@ function Fr(e, t, r, n) {
   }
   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, d, h, T;
+  const n = typeof e == "object" && e !== null || Array.isArray(e) ? e : {}, o = typeof t == "object" && t !== null || Array.isArray(t) ? t : {}, i = Qe(n, o);
   if (i.length === 0)
     return [];
-  const s = [], c = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Map(), u = [];
+  const s = [], c = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Map(), f = [];
   for (const N of i) {
-    const v = N.path.match(/^(\/[^/]+(?:\/[^/]+)*)\/(\d+)(?:\/|$)/);
-    if (v) {
-      const h = v[1];
-      a.has(h) || a.set(h, []);
-      const m = a.get(h);
-      m && m.push(N);
+    const m = N.path.match(/^(\/[^/]+(?:\/[^/]+)*)\/(\d+)(?:\/|$)/);
+    if (m) {
+      const g = m[1];
+      a.has(g) || a.set(g, []);
+      const O = a.get(g);
+      O && O.push(N);
     } else
-      u.push(N);
-  }
-  for (const [N, v] of a) {
-    const h = W(e, N), m = W(t, N);
-    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);
+      f.push(N);
+  }
+  for (const [N, m] of a) {
+    const g = J(e, N), O = J(t, N);
+    if (!Array.isArray(g) || !Array.isArray(O)) {
+      const p = /* @__PURE__ */ new Map();
+      for (const v of m) {
+        const R = v.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+        if (R) {
+          const P = R[1];
+          p.has(P) || p.set(P, []), (y = p.get(P)) == null || y.push(v);
         }
       }
-      for (const [b, j] of g)
-        s.push(...Ze(b, j, e, t, void 0)), c.add(b);
+      for (const [v, R] of p)
+        s.push(...st(v, R, e, t, void 0)), c.add(v);
       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 u = r ? Ze(r, N, e) : null, A = u != null && u.items ? Array.isArray(u.items) && u.items[0] ? u.items[0] : Array.isArray(u.items) ? null : u.items : null, S = A && typeof A == "object" ? A : 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+)(?:\/|$)/);
-        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 p = Cr(g, O, S), v = /* @__PURE__ */ new Map(), R = /* @__PURE__ */ new Map();
+      for (const [B, F] of p.entries())
+        F.input1 !== void 0 && v.set(F.input1, B), F.input2 !== void 0 && R.set(F.input2, B);
+      const P = /* @__PURE__ */ new Map(), x = [];
+      for (const B of m) {
+        const F = B.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
+        if (F) {
+          const L = Number.parseInt(F[1], 10);
+          let I;
+          if (B.op === "add" ? I = R.get(L) : I = v.get(L), I) {
+            P.has(I) || P.set(I, []);
+            const D = P.get(I);
+            D && D.push(B);
           } else
-            F.push(x);
+            x.push(B);
         }
       }
-      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 [B, F] of P) {
+        const L = p.get(B);
+        if (!L) continue;
+        const I = L.input1 !== void 0 ? `${N}/${L.input1}` : `${N}/${L.input2}`;
+        s.push(...st(I, F, e, t, void 0)), c.add(I);
       }
       const M = /* @__PURE__ */ new Map();
-      for (const x of F) {
-        const V = x.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-        if (V) {
-          const A = V[1];
-          M.has(A) || M.set(A, []), (p = M.get(A)) == null || p.push(x);
+      for (const B of x) {
+        const F = B.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+        if (F) {
+          const L = F[1];
+          M.has(L) || M.set(L, []), (d = M.get(L)) == null || d.push(B);
         }
       }
-      for (const [x, V] of M)
-        c.has(x) || (s.push(...Ze(x, V, e, t, void 0)), c.add(x));
+      for (const [B, F] of M)
+        c.has(B) || (s.push(...st(B, F, e, t, void 0)), c.add(B));
     } 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 p = /* @__PURE__ */ new Map();
+      for (const v of m) {
+        const R = v.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+        if (R) {
+          const P = R[1];
+          p.has(P) || p.set(P, []), (h = p.get(P)) == null || h.push(v);
         }
       }
-      for (const [b, j] of g)
-        s.push(...Ze(b, j, e, t, void 0)), c.add(b);
+      for (const [v, R] of p)
+        s.push(...st(v, R, e, t, void 0)), c.add(v);
     }
   }
   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 N of f) {
+    const m = N.path.split("/").filter(Boolean), g = m.length > 0 ? `/${m[0]}` : "/";
+    l.has(g) || l.set(g, []), (T = l.get(g)) == null || T.push(N);
   }
-  for (const [N, v] of l)
-    s.push(...Ze(N, v, e, t, void 0));
+  for (const [N, m] of l)
+    s.push(...st(N, m, e, t, void 0));
   return s;
 }
-function Ze(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);
+function st(e, t, r, n, o) {
+  const i = o !== void 0 ? J(o, e) : void 0, s = J(r, e), c = J(n, e), a = [], f = [];
+  for (const u of t) {
+    const A = u.path, S = J(r, A), p = J(n, A);
+    let v = !1, R = !1;
+    u.op === "add" ? (v = !1, R = p !== void 0) : u.op === "remove" ? (v = S !== void 0, R = !1) : u.op === "replace" && (v = S !== void 0 && !he(S, p), R = p !== void 0 && !he(S, p)), A === e && (v = !0, R = !0), v && a.push(u), R && f.push(u);
   }
-  if (a.length === 0 && u.length === 0 && i !== void 0 && s !== void 0 && c !== void 0 && de(i, s) && de(i, c))
+  if (a.length === 0 && f.length === 0 && i !== void 0 && s !== void 0 && c !== void 0 && he(i, s) && he(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 = f.length > 0 ? f : t, d = [...l, ...y], h = d.some((u) => u.op === "add"), T = d.some((u) => u.op === "remove"), N = d.some((u) => u.op === "replace");
+  if (h && !N && !T) {
     if (s !== void 0 && c === void 0)
       return [
         {
@@ -1949,7 +2030,7 @@ function Ze(e, t, r, n, o) {
           baseValue: void 0,
           input1Value: s,
           input2Value: void 0,
-          conflictType: D.INPUT1_ONLY,
+          conflictType: $.INPUT1_ONLY,
           patches1: l,
           // Highlight on input1 (new content) - use filtered patches1
           patches2: []
@@ -1963,7 +2044,7 @@ function Ze(e, t, r, n, o) {
           baseValue: void 0,
           input1Value: void 0,
           input2Value: c,
-          conflictType: D.INPUT2_ONLY,
+          conflictType: $.INPUT2_ONLY,
           patches1: [],
           // No highlighting on input1 (doesn't exist there)
           patches2: y
@@ -1971,7 +2052,7 @@ function Ze(e, t, r, n, o) {
         }
       ];
   }
-  if (L && !d && !N) {
+  if (T && !h && !N) {
     if (s !== void 0 && c === void 0)
       return [
         {
@@ -1979,7 +2060,7 @@ function Ze(e, t, r, n, o) {
           baseValue: s,
           input1Value: s,
           input2Value: void 0,
-          conflictType: D.INPUT1_ONLY,
+          conflictType: $.INPUT1_ONLY,
           patches1: l,
           // Highlight on input1 (removed content) - use filtered patches1
           patches2: []
@@ -1993,7 +2074,7 @@ function Ze(e, t, r, n, o) {
           baseValue: c,
           input1Value: void 0,
           input2Value: c,
-          conflictType: D.INPUT2_ONLY,
+          conflictType: $.INPUT2_ONLY,
           patches1: [],
           // No highlighting on input1 (doesn't exist there)
           patches2: y
@@ -2001,20 +2082,20 @@ function Ze(e, t, r, n, o) {
         }
       ];
   }
-  const v = kt(i, s, c);
-  let h = [], m = [];
-  switch (v) {
-    case D.INPUT1_ONLY:
-      h = l, m = [];
+  const m = Ut(i, s, c);
+  let g = [], O = [];
+  switch (m) {
+    case $.INPUT1_ONLY:
+      g = l, O = [];
       break;
-    case D.INPUT2_ONLY:
-      h = [], m = y;
+    case $.INPUT2_ONLY:
+      g = [], O = y;
       break;
-    case D.SAME_CHANGE:
-      h = l, m = y;
+    case $.SAME_CHANGE:
+      g = l, O = y;
       break;
-    case D.TRUE_CONFLICT:
-      h = l, m = y;
+    case $.TRUE_CONFLICT:
+      g = l, O = y;
       break;
   }
   return [
@@ -2023,194 +2104,194 @@ function Ze(e, t, r, n, o) {
       baseValue: i,
       input1Value: s,
       input2Value: c,
-      conflictType: v,
-      patches1: h,
-      patches2: m
+      conflictType: m,
+      patches1: g,
+      patches2: O
     }
   ];
 }
-function At(e, t) {
+function jt(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 = xe(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) {
-  var i, s, c, a, u, l;
+function Zr(e, t, r, n) {
+  var i, s, c, a, f, 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;
-    switch (p.conflictType) {
-      case D.SAME_CHANGE:
-        h = te.first, m = te.first;
+    const d = e[y];
+    let h, T, N;
+    (((i = d.patches1) == null ? void 0 : i.length) ?? 0) === 0 && (((s = d.patches2) == null ? void 0 : s.length) ?? 0) === 0 ? (h = t ? xe(t, d.path) : { start: 1, end: 1 }, T = xe(r, d.path), N = xe(n, d.path)) : (h = jt(t, [...d.patches1 || [], ...d.patches2 || []]), T = jt(r, d.patches1 || []), N = jt(n, d.patches2 || []));
+    const m = d.conflictType === $.TRUE_CONFLICT;
+    let g = oe.excluded, O = oe.excluded;
+    switch (d.conflictType) {
+      case $.SAME_CHANGE:
+        g = oe.first, O = oe.first;
         break;
-      case D.INPUT1_ONLY:
-        h = te.first;
+      case $.INPUT1_ONLY:
+        g = oe.first;
         break;
-      case D.INPUT2_ONLY:
-        m = te.first;
+      case $.INPUT2_ONLY:
+        O = oe.first;
         break;
-      case D.TRUE_CONFLICT:
-        m = te.first;
+      case $.TRUE_CONFLICT:
+        O = oe.first;
         break;
     }
-    const f = [], E = [];
-    if (p.patches1 && (p.patches1.length ?? 0) > 0)
-      for (const g of p.patches1) {
-        const b = !t || t.trim() === "";
-        if (g.op === "remove" && !b)
+    const u = [], A = [];
+    if (d.patches1 && (d.patches1.length ?? 0) > 0)
+      for (const p of d.patches1) {
+        const v = !t || t.trim() === "";
+        if (p.op === "remove" && !v)
           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 });
-      }
-    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);
-      (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")
+        const R = xe(r, p.path);
+        if (R.start !== 1 || R.end !== 1)
+          for (let P = R.start; P <= R.end; P++)
+            u.push({ line: P });
+      }
+    else if ((((c = d.patches1) == null ? void 0 : c.length) ?? 0) === 0 && (((a = d.patches2) == null ? void 0 : a.length) ?? 0) === 0) {
+      const p = xe(r, d.path);
+      (p.start !== 1 || p.end !== 1) && u.push({ line: p.start });
+    }
+    if (d.patches2 && (d.patches2.length ?? 0) > 0)
+      for (const p of d.patches2) {
+        if (p.op === "remove")
           continue;
-        const b = Pe(n, g.path);
-        if (b.start !== 1 || b.end !== 1)
-          for (let j = b.start; j <= b.end; j++)
-            E.push({ line: j });
+        const v = xe(n, p.path);
+        if (v.start !== 1 || v.end !== 1)
+          for (let R = v.start; R <= v.end; R++)
+            A.push({ line: R });
       }
-    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 });
+    else if ((((f = d.patches1) == null ? void 0 : f.length) ?? 0) === 0 && (((l = d.patches2) == null ? void 0 : l.length) ?? 0) === 0) {
+      const p = xe(n, d.path);
+      (p.start !== 1 || p.end !== 1) && A.push({ line: p.start });
     }
     const S = {
       id: `conflict-${y}`,
-      path: p.path,
+      path: d.path,
       // Include path for value extraction during resolution
       baseRange: {
-        startLineNumber: d.start,
-        endLineNumberExclusive: d.end + 1
+        startLineNumber: h.start,
+        endLineNumberExclusive: h.end + 1
       },
       input1Range: {
-        startLineNumber: L.start,
-        endLineNumberExclusive: L.end + 1
+        startLineNumber: T.start,
+        endLineNumberExclusive: T.end + 1
       },
       input2Range: {
         startLineNumber: N.start,
         endLineNumberExclusive: N.end + 1
       },
-      input1Diffs: f,
-      input2Diffs: E,
-      isConflicting: v,
-      conflictType: p.conflictType,
-      input1State: h,
-      input2State: m,
-      handled: p.conflictType === D.SAME_CHANGE,
+      input1Diffs: u,
+      input2Diffs: A,
+      isConflicting: m,
+      conflictType: d.conflictType,
+      input1State: g,
+      input2State: O,
+      handled: d.conflictType === $.SAME_CHANGE,
       focused: !1
     };
     o.push(S);
   }
   return o;
 }
-function Jr(e, t, r, n = {}) {
+function eo(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");
   try {
     const s = e ? JSON.parse(e) : void 0, c = JSON.parse(t), a = JSON.parse(r);
-    let u;
+    let f;
     if (s === void 0)
-      u = Ur(c, a, i);
+      f = Qr(c, a, i);
     else if (o === "split")
-      u = Fr(s, c, a, i);
+      f = Kr(s, c, a, i);
     else {
-      const l = We(s, c), y = We(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);
-        let f;
-        return h && m ? f = D.TRUE_CONFLICT : h ? f = D.INPUT1_ONLY : m ? f = D.INPUT2_ONLY : f = D.SAME_CHANGE, {
-          path: d,
-          baseValue: L,
+      const l = Qe(s, c), y = Qe(c, a), d = /* @__PURE__ */ new Set();
+      l.forEach((h) => {
+        d.add(h.path);
+      }), y.forEach((h) => {
+        d.add(h.path);
+      }), f = Array.from(d).map((h) => {
+        const T = J(s, h), N = J(c, h), m = J(a, h), g = !he(T, N), O = !he(N, m);
+        let u;
+        return g && O ? u = $.TRUE_CONFLICT : g ? u = $.INPUT1_ONLY : O ? u = $.INPUT2_ONLY : u = $.SAME_CHANGE, {
+          path: h,
+          baseValue: T,
           input1Value: N,
-          input2Value: v,
-          conflictType: f
+          input2Value: m,
+          conflictType: u
         };
       });
     }
-    return Vr(u, e, t, r);
+    return Zr(f, 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 to(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 = $.SAME_CHANGE : i = $.TRUE_CONFLICT : n ? i = $.INPUT1_ONLY : i = $.INPUT2_ONLY, { conflictType: i, input1Changed: n, input2Changed: o };
 }
-function no(e, t, r) {
-  var u, l, y;
+function yo(e, t, r) {
+  var f, 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);
-    (h || m) && o.push({
-      line: p + 1,
-      input1Changed: h,
-      input2Changed: m,
-      baseLine: d,
-      input1Line: L,
+  for (let d = 0; d < Math.max(e.length, t.length, r.length); d++) {
+    const h = e[d] !== void 0 ? e[d] : "", T = t[d] !== void 0 ? t[d] : "", N = r[d] !== void 0 ? r[d] : "", { conflictType: m, input1Changed: g, input2Changed: O } = to(h, T, N);
+    (g || O) && o.push({
+      line: d + 1,
+      input1Changed: g,
+      input2Changed: O,
+      baseLine: h,
+      input1Line: T,
       input2Line: N,
-      conflictType: v
+      conflictType: m
     });
   }
   if (o.length === 0)
     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 = {
+  let i = ((f = o[0]) == null ? void 0 : f.line) ?? 1, s = (l = o[0]) == null ? void 0 : l.conflictType, c = [], a = [];
+  for (let d = 0; d <= o.length; d++) {
+    const h = o[d], T = d === o.length, N = !T && h && o[d - 1] && h.line > (((y = o[d - 1]) == null ? void 0 : y.line) ?? 0) + 1, m = !T && h && h.conflictType !== s;
+    if (T || N || m) {
+      const g = o[d - 1], O = g ? g.line + 1 : i + 1, u = c.length > 0, A = a.length > 0, S = s === $.TRUE_CONFLICT, p = {
         id: `conflict-${n.length}`,
         baseRange: {
           startLineNumber: i,
-          endLineNumberExclusive: m
+          endLineNumberExclusive: O
         },
         input1Range: {
           startLineNumber: i,
-          endLineNumberExclusive: m
+          endLineNumberExclusive: O
         },
         input2Range: {
           startLineNumber: i,
-          endLineNumberExclusive: m
+          endLineNumberExclusive: O
         },
         input1Diffs: c,
         input2Diffs: a,
         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 === $.SAME_CHANGE && u ? oe.first : oe.excluded,
+        input2State: A ? oe.first : oe.excluded,
+        handled: s === $.SAME_CHANGE,
         focused: !1
       };
-      n.push(g), !L && d && (i = d.line, s = d.conflictType, c = [], a = []);
+      n.push(p), !T && h && (i = h.line, s = h.conflictType, c = [], a = []);
     }
-    !L && d && (d.input1Changed && c.push({ line: d.line }), d.input2Changed && a.push({ line: d.line }));
+    !T && h && (h.input1Changed && c.push({ line: h.line }), h.input2Changed && a.push({ line: h.line }));
   }
   return n;
 }
-function Gr(e, t, r) {
+function no(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);
@@ -2221,11 +2302,11 @@ function Gr(e, t, r) {
   const n = t.split("/").filter((c) => c !== "");
   let o = e;
   for (let c = 0; c < n.length - 1; c++) {
-    const a = n[c], u = Number.parseInt(a, 10);
-    if (!Number.isNaN(u) && String(u) === a) {
+    const a = n[c], f = Number.parseInt(a, 10);
+    if (!Number.isNaN(f) && String(f) === a) {
       if (!Array.isArray(o))
         throw new Error(`Path ${t}: segment ${a} expects array but got ${typeof o}`);
-      o = o[u];
+      o = o[f];
     } else {
       if (!o || typeof o != "object" || Array.isArray(o))
         throw new Error(`Path ${t}: segment ${a} expects object but got ${typeof o}`);
@@ -2244,43 +2325,43 @@ function Gr(e, t, r) {
     o[i] = r;
   }
 }
-function Wr(e, t) {
+function ro(e, t) {
   try {
-    const r = ln(e);
+    const r = bn(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 = wn(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(`
+`).length, c = o.offset + o.length, f = e.substring(0, c).split(`
 `).length;
-    return { startLine: s, endLine: u };
+    return { startLine: s, endLine: f };
   } catch {
     return null;
   }
 }
-function mn(e, t, r, n = "") {
+function In(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 ? Ze(r, n, e) : null, a = c != null && c.properties && typeof c.properties == "object" && !Array.isArray(c.properties) ? c.properties : void 0, f = 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);
-          if (d !== null)
-            s[l] = d;
+          const y = a == null ? void 0 : a[l], d = n ? `${n}/${l}` : `/${l}`, h = In(s[l], i[l], y, d);
+          if (h !== null)
+            s[l] = h;
           else
             return null;
         }
-      } else if (u === !0 || u === void 0 || (a == null ? void 0 : a[l]) !== void 0)
+      } else if (f === !0 || f === void 0 || (a == null ? void 0 : a[l]) !== void 0)
         s[l] = i[l];
       else {
-        if (u === !1)
+        if (f === !1)
           return null;
-        if (typeof u == "object")
+        if (typeof f == "object")
           s[l] = i[l];
         else
           return null;
@@ -2289,169 +2370,169 @@ function mn(e, t, r, n = "") {
   }
   return null;
 }
-function qr(e, t, r, n, o) {
+function oo(e, t, r, n, o) {
   var S;
   const i = [], s = [], c = e.join(`
 `), a = t.join(`
-`), u = r.join(`
+`), f = r.join(`
 `);
-  let l, y, p;
+  let l, y, d;
   try {
-    l = c ? JSON.parse(c) : {}, y = a ? JSON.parse(a) : {}, p = u ? JSON.parse(u) : {};
-  } catch (g) {
+    l = c ? JSON.parse(c) : {}, y = a ? JSON.parse(a) : {}, d = f ? JSON.parse(f) : {};
+  } catch (p) {
     return {
       content: c || "",
       isValid: !1,
-      validationError: `Failed to parse input JSON: ${g instanceof Error ? g.message : String(g)}`,
+      validationError: `Failed to parse input JSON: ${p instanceof Error ? p.message : String(p)}`,
       warnings: i
     };
   }
-  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;
-  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)));
+  let h;
+  !l || typeof l == "object" && l !== null && Object.keys(l).length === 0 ? h = JSON.parse(JSON.stringify(d)) : h = JSON.parse(JSON.stringify(l));
+  const T = /* @__PURE__ */ new Set(), N = /* @__PURE__ */ new Set(), m = /* @__PURE__ */ new Set(), g = (p, v, R) => null;
+  for (const p of n) {
+    const v = p.input1State === oe.first || p.input1State === oe.second, R = p.input2State === oe.first || p.input2State === oe.second;
+    let P = p.path;
+    if (!P && (P = g(p.baseRange.startLineNumber, p.baseRange.endLineNumberExclusive) || void 0, !P)) {
+      p.conflictType === $.INPUT2_ONLY && R ? h = JSON.parse(JSON.stringify(d)) : p.conflictType === $.INPUT1_ONLY && v ? h = JSON.parse(JSON.stringify(y)) : p.conflictType === $.SAME_CHANGE && (v || R) || R ? h = JSON.parse(JSON.stringify(d)) : v && (h = 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 !== "");
-        if (R.length >= 2) {
-          const X = R[R.length - 1];
-          /^\d+$/.test(X) && (V = !0, A = `/${R.slice(0, -1).join("/")}`);
+      let x, M = P;
+      const B = (S = p.path) == null ? void 0 : S.match(/^(.*\/\d+)(?:\/.*)?$/);
+      let F = !1, L = "";
+      if (B) {
+        const D = B[1].split("/").filter((K) => K !== "");
+        if (D.length >= 2) {
+          const K = D[D.length - 1];
+          /^\d+$/.test(K) && (F = !0, L = `/${D.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 (v && R)
+        if (p.conflictType === $.SAME_CHANGE)
+          F ? (x = J(d, L), M = L) : x = J(d, P);
         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 I = F ? L : P, D = J(y, I), K = J(d, I), ie = o && l && typeof l == "object" && Ze(o, I, l) || void 0, ae = In(D, K, ie, I);
+          ae !== null ? (x = ae, M = I, i.push(`Smart-merged conflict at path ${I}`)) : (x = K, M = I, i.push(`Merge failed at path ${I}, using input2 value`));
         }
-      else if (b)
-        if (V)
-          F = W(y, A), M = A;
+      else if (v)
+        if (F)
+          x = J(y, L), M = L;
         else {
-          const w = T.split("/").filter(Boolean);
-          if (w.length > 1) {
-            const R = `/${w.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 I = P.split("/").filter(Boolean);
+          if (I.length > 1) {
+            const D = `/${I.slice(0, -1).join("/")}`;
+            if (!m.has(D)) {
+              const K = J(y, D);
+              if (typeof K == "object" && K !== null && !Array.isArray(K)) {
+                const ie = J(h, D);
+                if (typeof ie == "object" && ie !== null && !Array.isArray(ie)) {
+                  for (const [ae, ge] of Object.entries(K)) {
+                    const Pe = `${D}/${ae}`;
+                    N.has(Pe) || (ie[ae] = ge);
                   }
-                  v.add(R);
+                  m.add(D);
                 }
               }
             }
-            F = W(y, T);
+            x = J(y, P);
           } else
-            F = W(y, T);
+            x = J(y, P);
         }
-      else if (j)
-        if (V)
-          F = W(p, A), M = A;
+      else if (R)
+        if (F)
+          x = J(d, L), M = L;
         else {
-          const w = T.split("/").filter(Boolean);
-          if (w.length > 1) {
-            const R = `/${w.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 I = P.split("/").filter(Boolean);
+          if (I.length > 1) {
+            const D = `/${I.slice(0, -1).join("/")}`;
+            if (!m.has(D)) {
+              const K = J(d, D);
+              if (typeof K == "object" && K !== null && !Array.isArray(K)) {
+                const ie = J(h, D);
+                if (typeof ie == "object" && ie !== null && !Array.isArray(ie)) {
+                  for (const [ae, ge] of Object.entries(K)) {
+                    const Pe = `${D}/${ae}`;
+                    N.has(Pe) || (ie[ae] = ge);
                   }
-                  v.add(R);
+                  m.add(D);
                 }
               }
             }
-            F = W(p, T);
+            x = J(d, P);
           } else
-            F = W(p, T);
+            x = J(d, P);
         }
       else {
-        const w = V ? A : T, R = W(l, w);
-        if (R !== void 0)
-          F = R, M = w;
+        const I = F ? L : P, D = J(l, I);
+        if (D !== void 0)
+          x = D, M = I;
         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)}`);
-    }
-  }
-  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({
-        conflictId: g.id,
-        conflictPath: b,
+      x !== void 0 && (no(h, M, x), T.add(M), N.add(M));
+    } catch (x) {
+      i.push(`Failed to apply conflict at path ${P || p.id}: ${x instanceof Error ? x.message : String(x)}`);
+    }
+  }
+  const O = JSON.stringify(h, null, 2);
+  for (const p of n) {
+    const v = p.path;
+    if (!v) continue;
+    const R = p.input1State === oe.first || p.input1State === oe.second, P = p.input2State === oe.first || p.input2State === oe.second;
+    if (R && P && p.conflictType === $.TRUE_CONFLICT) {
+      const x = ro(O, v);
+      x && s.push({
+        conflictId: p.id,
+        conflictPath: v,
         type: "warning",
         message: "Both conflicting changes were accepted - please review and manually resolve",
-        startLine: F.startLine,
-        endLine: F.endLine
+        startLine: x.startLine,
+        endLine: x.endLine
       });
     }
   }
-  let f = !0, E;
+  let u = !0, A;
   try {
-    JSON.parse(m);
-  } catch (g) {
-    f = !1, E = g instanceof Error ? g.message : "Invalid JSON", s.push({
+    JSON.parse(O);
+  } catch (p) {
+    u = !1, A = p instanceof Error ? p.message : "Invalid JSON", s.push({
       conflictId: "validation-error",
       conflictPath: "/",
       type: "error",
-      message: E,
+      message: A,
       startLine: 1,
-      endLine: m.split(`
+      endLine: O.split(`
 `).length
     });
   }
   return {
-    content: m,
-    isValid: f,
-    validationError: E,
+    content: O,
+    isValid: u,
+    validationError: A,
     warnings: i.length > 0 ? i : void 0,
     conflictIssues: s.length > 0 ? s : void 0
   };
 }
-function Yr(e, t, r) {
-  let n = "", o = "", i = "", s = "", c = "", a = "", u = "", l = "";
+function io(e, t, r) {
+  let n = "", o = "", i = "", s = "", c = "", a = "", f = "", l = "";
   switch (e.conflictType) {
-    case D.SAME_CHANGE: {
+    case $.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 = "");
+      t ? y ? (n = "merge-2way-deletion", o = "merge-same-change", s = r.baseOverviewColor, c = r.changeOverviewColor, a = "", f = "-", l = "+") : (n = "merge-2way-deletion", o = "merge-same-change", i = "merge-change-base", s = r.baseOverviewColor, c = r.changeOverviewColor, a = "", f = "-", l = "") : y ? (n = "merge-same-change", o = "merge-same-change", i = "", s = r.changeOverviewColor, c = r.changeOverviewColor, a = "", f = "+", l = "+") : (n = "merge-change-incoming", o = "merge-same-change", i = "merge-change-base", s = r.changeOverviewColor, c = r.changeOverviewColor, a = r.baseOverviewColor, f = "", l = "");
       break;
     }
-    case D.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 = "");
+    case $.INPUT1_ONLY:
+      t ? (n = "merge-2way-deletion", o = "", s = r.baseOverviewColor, c = "", f = "-", l = "") : (n = "merge-change-incoming", o = "", i = "merge-change-base", s = r.conflictOverviewColor, c = "", a = r.baseOverviewColor, f = "-", l = "");
       break;
-    case D.INPUT2_ONLY:
-      n = "", o = "merge-change-current", i = t ? "" : "merge-change-base", s = "", c = r.changeOverviewColor, a = t ? "" : r.baseOverviewColor, u = "", l = "+";
+    case $.INPUT2_ONLY:
+      n = "", o = "merge-change-current", i = t ? "" : "merge-change-base", s = "", c = r.changeOverviewColor, a = t ? "" : r.baseOverviewColor, f = "", l = "+";
       break;
-    case D.TRUE_CONFLICT: {
+    case $.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 = "");
+      t ? y ? (n = "merge-2way-deletion", o = "merge-change-current", s = r.baseOverviewColor, c = r.changeOverviewColor, a = "", f = "-", l = "+") : (n = "merge-2way-deletion", o = "merge-conflict-current", i = "merge-conflict-base", s = r.baseOverviewColor, c = r.conflictOverviewColor, a = r.baseOverviewColor, f = "-", l = "+") : y ? (n = "merge-change-incoming", o = "merge-change-current", i = "", s = r.changeOverviewColor, c = r.changeOverviewColor, a = "", f = "+", l = "+") : (n = "merge-conflict-incoming", o = "merge-conflict-current", i = "merge-conflict-base", s = r.conflictOverviewColor, c = r.conflictOverviewColor, a = r.baseOverviewColor, f = "", l = "");
       break;
     }
   }
@@ -2462,11 +2543,11 @@ function Yr(e, t, r) {
     input1OverviewColor: s,
     input2OverviewColor: c,
     baseOverviewColor: a,
-    input1Symbol: u,
+    input1Symbol: f,
     input2Symbol: l
   };
 }
-function yn(e) {
+function Ln(e) {
   const t = /* @__PURE__ */ new Set();
   for (const r of e)
     if (r && typeof r == "object" && "line" in r) {
@@ -2475,11 +2556,11 @@ function yn(e) {
     }
   return Array.from(t).sort((r, n) => r - n);
 }
-function zr(e, t, r) {
+function so(e, t, r) {
   const n = [];
   if (t.input1Class) {
     if (e.input1Diffs.length > 0) {
-      const o = yn(e.input1Diffs);
+      const o = Ln(e.input1Diffs);
       for (const i of o)
         n.push({
           range: new r.Range(i, 1, i, Number.MAX_SAFE_INTEGER),
@@ -2497,7 +2578,7 @@ function zr(e, t, r) {
             } : void 0
           }
         });
-    } else if (e.conflictType === D.INPUT1_ONLY) {
+    } else if (e.conflictType === $.INPUT1_ONLY) {
       const o = e.input1Range.startLineNumber, i = e.input1Range.endLineNumberExclusive - 1;
       for (let s = o; s <= i; s++)
         n.push({
@@ -2520,10 +2601,10 @@ function zr(e, t, r) {
   }
   return n;
 }
-function Xr(e, t, r) {
+function co(e, t, r) {
   const n = [];
   if (e.input2Diffs.length > 0 && t.input2Class) {
-    const o = yn(e.input2Diffs);
+    const o = Ln(e.input2Diffs);
     for (const i of o)
       n.push({
         range: new r.Range(i, 1, i, Number.MAX_SAFE_INTEGER),
@@ -2544,7 +2625,7 @@ function Xr(e, t, r) {
   }
   return n;
 }
-function Qr(e, t, r) {
+function ao(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 +2648,18 @@ function Qr(e, t, r) {
     }
   }), n;
 }
-function Zr(e, t, r, n) {
-  const o = Yr(e, t, r);
+function lo(e, t, r, n) {
+  const o = io(e, t, r);
   return {
-    input1Decorations: zr(e, o, n),
-    input2Decorations: Xr(e, o, n),
-    baseDecorations: Qr(e, o, n)
+    input1Decorations: so(e, o, n),
+    input2Decorations: co(e, o, n),
+    baseDecorations: ao(e, o, n)
   };
 }
-function Cr(e, t, r, n) {
+function uo(e, t, r, n) {
   const o = [], i = [], s = [];
   for (const c of e) {
-    const a = Zr(c, t, r, n);
+    const a = lo(c, t, r, n);
     o.push(...a.input1Decorations), i.push(...a.input2Decorations), s.push(...a.baseDecorations);
   }
   return {
@@ -2587,8 +2668,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 fo = () => /* @__PURE__ */ gt("div", { style: { padding: "20px", textAlign: "center", color: "#888" }, children: "Loading Monaco Editor..." }), Dt = "⚠";
+function vo(e) {
   const {
     original: t = "",
     modified: r = "",
@@ -2598,333 +2679,334 @@ function ro(e) {
     width: s = "100%",
     height: c = "100%",
     className: a,
-    loading: u,
+    loading: f,
     onMount: l,
     onMergeResolve: y,
-    showResultColumn: p,
-    baseIndex: d = 1,
-    comparisonMode: L = "split",
+    showResultColumn: d,
+    baseIndex: h = 1,
+    comparisonMode: T = "split",
     schema: N,
-    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";
+    patches: m,
+    labels: g,
+    sortKeys: O = !1
+  } = e, u = n ? d : !1, A = !n || n === "", S = "json", [p, v] = _e(!1), [R, P] = _e(!0), [x, M] = _e([]), [B, F] = _e(null), [L, I] = _e([]), [D, K] = _e([]), [ie, ae] = _e(!1), [ge, Pe] = _e(/* @__PURE__ */ new Set()), Ae = se(""), $e = Ne((_, b, E, w) => {
+    const k = document.createElement("div");
+    k.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();
+    return U.type = "checkbox", U.className = "native-checkbox", U.checked = _ === oe.first || _ === oe.second, U.setAttribute("aria-label", U.checked ? "Undo accept" : "Accept change"), U.addEventListener("click", (X) => {
+      X.preventDefault(), X.stopPropagation(), requestAnimationFrame(() => {
+        w();
       });
-    }), 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(U), k;
+  }, []), [Ee, Be] = _e(0), Z = se(null), pe = se(null), ee = se(null), G = se(null), be = se(null), et = se(null), Fe = se(!1), Et = se(!1), Ge = se(null), tt = se(null), Re = se(null), We = se(/* @__PURE__ */ new Map()), Te = se(null), je = se(/* @__PURE__ */ new Map()), qe = se(null), Ye = se(null), ze = se(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 _ = !0;
+    const b = wr.init();
+    return b.then((E) => {
+      _ && (be.current = E, P(!1), v(!0));
+    }).catch((E) => {
+      _ && (E == null ? void 0 : E.type) !== "cancelation" && console.error("Monaco initialization: error:", E);
     }), () => {
-      k = !1, De.current || O.cancel();
+      _ = !1, Fe.current || b.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 Yt = Ne(
+    (_, b, E) => {
+      if (!be.current) return [];
+      const w = (_ == null ? void 0 : _.getValue()) || "", k = b.getValue(), U = E.getValue();
       try {
-        const Q = performance.now(), Y = Jr(B, P, U, {
-          comparisonMode: L,
+        const X = performance.now(), Y = eo(w, k, U, {
+          comparisonMode: T,
           schema: N,
-          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);
+          patches: m
+        }), j = performance.now() - X;
+        return j > 100 && console.warn(`JSON Patch diff took ${j.toFixed(2)}ms`), Y;
+      } catch (X) {
+        const Y = X instanceof Error ? X.message : String(X);
         return console.error("JSON Patch diff error:", Y), [];
       }
     },
-    [L, N, v]
-  ), ze = Ee((k) => {
+    [T, N, m]
+  ), nt = Ne((_) => {
     try {
-      return k.getLayoutInfo().decorationsLeft || 0;
+      return _.getLayoutInfo().decorationsLeft || 0;
     } catch {
       return 0;
     }
-  }, []), Xe = Ee((k) => {
+  }, []), rt = Ne((_) => {
     try {
-      return k.getLayoutInfo().decorationsWidth || 0;
+      return _.getLayoutInfo().decorationsWidth || 0;
     } catch {
       return 0;
     }
-  }, []), nt = Ee(
-    (k) => {
-      if (!m || !$.current || !ke.current)
+  }, []), ft = Ne(
+    (_) => {
+      if (!u || !G.current || !Re.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 b = be.current;
+      if (!b) return;
+      const E = o === "vs-dark" || typeof o == "string" && o.includes("dark"), w = nt(G.current), k = rt(G.current);
+      Re.current.style.left = `${w}px`, Re.current.style.width = `${k}px`;
+      const U = G.current.getScrollTop();
+      if (G.current.getModel()) {
+        Re.current.innerHTML = "";
+        for (const Y of _) {
+          const j = Y.startLine, ue = Y.endLine, ne = G.current.getTopForLineNumber(j) - U, W = G.current.getTopForLineNumber(ue) - U, V = G.current.getOption(b.editor.EditorOption.lineHeight), le = ue > j ? W - ne + V : V, H = document.createElement("div");
+          H.className = `conflict-issue-marker conflict-issue-${Y.type}`, H.setAttribute("data-conflict-id", Y.conflictId), H.setAttribute("data-issue-type", Y.type), H.title = Y.message, H.style.position = "absolute", H.style.top = `${Math.max(0, ne)}px`, H.style.height = `${le}px`, H.style.width = "26px", H.style.display = "flex", H.style.alignItems = "center", H.style.justifyContent = "center", H.style.cursor = "help", H.style.pointerEvents = "auto";
+          const te = document.createElement("div");
+          te.className = "issue-icon", Y.type === "error" ? (te.textContent = "✗", te.style.color = E ? "#ff6666" : "#cc0000") : Y.type === "warning" ? (te.textContent = Dt, te.style.color = E ? "#ffaa00" : "#ff8800") : Y.type === "smart-merge" && (te.textContent = "↕", te.style.color = E ? "#0096ff" : "#0078d4"), te.style.fontSize = "14px", te.style.fontWeight = "bold", H.appendChild(te), Re.current.appendChild(H);
         }
       }
     },
-    [m, o, ze, Xe]
-  ), rt = Ee(
-    (k) => {
-      var se, oe, G, ie;
-      if (!$.current || X)
+    [u, o, nt, rt]
+  ), pt = Ne(
+    (_) => {
+      var re, le, H, te;
+      if (!G.current || ie)
         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 b = G.current.getModel(), E = (re = Z.current) == null ? void 0 : re.getModel(), w = (le = ee.current) == null ? void 0 : le.getModel(), k = (H = pe.current) == null ? void 0 : H.getModel();
+      if (!b || !E || !w || !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 U = k.getLinesContent(), X = E.getLinesContent(), Y = w.getLinesContent(), j = oo(U, X, Y, _, N);
+      if (F(j.isValid ? null : j.validationError || "Invalid JSON"), I(j.warnings || []), K(j.conflictIssues || []), Te.current) {
+        const z = (g == null ? void 0 : g.result) || "Result";
+        j.isValid ? j.warnings && j.warnings.length > 0 ? (Te.current.textContent = `${z} ${Dt}`, Te.current.title = j.warnings.join(`
+`)) : (Te.current.textContent = z, Te.current.style.color = "", Te.current.title = "") : (Te.current.textContent = `${z} ${Dt} Invalid JSON`, Te.current.style.color = "#ff4444", Te.current.title = j.validationError || "Invalid JSON - please fix manually");
+      }
+      if (b.getValue() !== j.content) {
+        const z = G.current.getPosition(), q = G.current.getSelection();
+        if (Et.current = !0, b.setValue(j.content), Et.current = !1, z) {
+          const de = b.getLineCount(), me = b.getLineLength(de), C = {
+            lineNumber: Math.min(z.lineNumber, de),
+            column: z.lineNumber <= de ? Math.min(z.column, b.getLineLength(z.lineNumber) + 1) : me + 1
           };
-          $.current.setPosition(ve), q && !q.isEmpty() && $.current.setSelection(q);
+          G.current.setPosition(C), q && !q.isEmpty() && G.current.setSelection(q);
         }
       }
-      const Z = fe.current, H = O;
-      let J = H._invalidDecorations;
-      if (!_.isValid && $.current && Z ? (J || (J = $.current.createDecorationsCollection([]), H._invalidDecorations = J), J.set([
+      const ne = be.current, W = b;
+      let V = W._invalidDecorations;
+      if (!j.isValid && G.current && ne ? (V || (V = G.current.createDecorationsCollection([]), W._invalidDecorations = V), V.set([
         {
-          range: new Z.Range(1, 1, O.getLineCount(), Number.MAX_SAFE_INTEGER),
+          range: new ne.Range(1, 1, b.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;
+      ])) : j.isValid && V && G.current && V.set([]), j.conflictIssues && j.conflictIssues.length > 0) {
+        if (ft(j.conflictIssues), G.current && ne) {
+          const z = b;
           if (!z._conflictIssueDecorations) {
-            const ee = $.current.createDecorationsCollection(
+            const me = G.current.createDecorationsCollection(
               []
             );
-            z._conflictIssueDecorations = ee;
+            z._conflictIssueDecorations = me;
           }
-          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 = z._conflictIssueDecorations, de = j.conflictIssues.map((me) => {
+            let C, ye;
+            return me.type === "error" ? (C = o === "vs-dark" ? "rgba(255, 0, 0, 0.1)" : "rgba(255, 0, 0, 0.05)", ye = o === "vs-dark" ? "#ff6666" : "#cc0000") : me.type === "warning" ? (C = o === "vs-dark" ? "rgba(255, 170, 0, 0.1)" : "rgba(255, 136, 0, 0.05)", ye = o === "vs-dark" ? "#ffaa00" : "#ff8800") : (C = o === "vs-dark" ? "rgba(0, 150, 255, 0.1)" : "rgba(0, 120, 212, 0.05)", ye = o === "vs-dark" ? "#0096ff" : "#0078d4"), {
+              range: new ne.Range(me.startLine, 1, me.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-${me.type}`,
+                linesDecorationsClassName: `conflict-issue-line-decoration conflict-issue-${me.type}`,
+                backgroundColor: C,
                 overviewRuler: {
-                  color: Ae,
-                  position: Z.editor.OverviewRulerLane.Right
+                  color: ye,
+                  position: ne.editor.OverviewRulerLane.Right
                 },
                 minimap: {
-                  color: Ae,
-                  position: Z.editor.MinimapPosition.Inline
+                  color: ye,
+                  position: ne.editor.MinimapPosition.Inline
                 }
               }
             };
           });
-          q.set(he);
+          q.set(de);
         }
-      } else if ($.current) {
-        const z = O;
-        z._conflictIssueDecorations && z._conflictIssueDecorations.set([]), ke.current && m && (ke.current.innerHTML = "");
+      } else if (G.current) {
+        const z = b;
+        z._conflictIssueDecorations && z._conflictIssueDecorations.set([]), Re.current && u && (Re.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 z = `${j.content}|${j.isValid}|${(te = j.warnings) == null ? void 0 : te.join(",")}`;
+        Ae.current !== z && (Ae.current = z, 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, N, g, o, ft, u, ie]
+  ), Tt = Ne(
+    (_, b) => {
+      ae(!1), M((E) => {
+        const w = E.map((k) => {
+          if (k.id !== _) return k;
+          const X = (b === 1 ? k.input1State : k.input2State) === oe.excluded ? oe.first : oe.excluded;
+          return b === 1 ? { ...k, input1State: X } : { ...k, input2State: X };
         });
-        return m && $.current && rt(B), B;
+        return u && G.current && pt(w), w;
       });
     },
-    [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();
-      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)
+    [u, pt]
+  ), It = Ne(
+    (_, b, E, w, k, U, X) => {
+      if (!be.current) return;
+      const j = w === 1 ? Z.current : ee.current;
+      if (!j) return;
+      const ue = w === 1 ? E.input1Range : E.input2Range, ne = w === 1 ? E.input1State : E.input2State, W = j.getModel();
+      if (!W) return;
+      const V = W.getLineCount(), re = Math.max(1, Math.min(ue.startLineNumber, V)), le = Math.max(1, Math.min(ue.endLineNumberExclusive - 1, V));
+      if (re > V || le < 1 || re > le)
         return;
-      const G = _.getTopForLineNumber(se) - P, z = _.getBottomForLineNumber(oe) - P - G;
-      let q = Be.current.get(O);
+      const H = j.getTopForLineNumber(re) - k, z = j.getBottomForLineNumber(le) - k - H;
+      let q = We.current.get(b);
       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 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 Ie = document.createElement("div");
+        Ie.className = "background", q.appendChild(Ie);
+        const fe = document.createElement("div");
+        fe.className = "checkbox";
+        const Q = document.createElement("div");
+        Q.className = "checkbox-background";
+        const ve = $e(ne, w, E.id, () => Tt(E.id, w));
+        Q.appendChild(ve), fe.appendChild(Q), q.appendChild(fe), _.appendChild(q), We.current.set(b, q);
+      }
+      q.style.top = `${H}px`, q.style.height = `${z}px`;
+      const de = q.querySelector(".checkbox-background");
+      if (de) {
+        de.innerHTML = "";
+        const Ie = $e(ne, w, E.id, () => Tt(E.id, w));
+        de.appendChild(Ie);
+      }
+      const me = E.handled, C = E.focused, ye = z > 30;
+      q.className = "merge-accept-gutter-marker", me && q.classList.add("handled"), C && q.classList.add("focused"), ye ? q.classList.add("multi-line") : q.classList.add("single-line");
+      const Ue = q.querySelector(".checkbox");
+      if (Ue) {
+        const fe = z / 2 - 12, Q = 24;
+        let ve = fe;
+        const De = Q, Le = U - Q - 24, ke = Q, Ve = z - 24 - Q;
+        ke < Ve && (ve = Math.max(De, Math.min(ve + H, Le)) - H, ve = Math.max(ke, Math.min(ve, Ve))), Ue.style.top = `${ve + 5}px`;
       }
     },
-    [mt, me]
-  ), ot = Ee(() => {
-    if (!m) {
-      const H = Be.current;
-      for (const [J, se] of H.entries())
-        se.remove(), H.delete(J);
+    [Tt, $e]
+  ), dt = Ne(() => {
+    if (!u) {
+      const W = We.current;
+      for (const [V, re] of W.entries())
+        re.remove(), W.delete(V);
       return;
     }
-    if (!C.current || !K.current || !$e.current || !Ye.current || !fe.current)
+    if (!Z.current || !ee.current || !Ge.current || !tt.current || !be.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)
-      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);
+    const b = o === "vs-dark" || typeof o == "string" && o.includes("dark"), E = nt(Z.current), w = rt(Z.current), k = nt(ee.current), U = rt(ee.current);
+    Ge.current.style.left = `${E}px`, Ge.current.style.width = `${w}px`, tt.current.style.left = `${k}px`, tt.current.style.width = `${U}px`;
+    const X = Z.current.getVisibleRanges();
+    if (!X || X.length === 0) return;
+    const Y = Z.current.getScrollTop(), j = Ge.current.clientHeight, ue = /* @__PURE__ */ new Set();
+    for (const W of x)
+      if (!(W.input1Diffs.length === 0 && W.input2Diffs.length === 0)) {
+        if (W.input1Diffs.length > 0) {
+          const V = `${W.id}-input1`;
+          ue.add(V), It(Ge.current, V, W, 1, Y, j, b);
         }
-        if (H.input2Diffs.length > 0) {
-          const J = `${H.id}-input2`;
-          ue.add(J), yt(Ye.current, J, H, 2, Y, _, O);
+        if (W.input2Diffs.length > 0) {
+          const V = `${W.id}-input2`;
+          ue.add(V), It(tt.current, V, W, 2, Y, j, b);
         }
       }
-    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 ne = We.current;
+    for (const [W, V] of ne.entries())
+      ue.has(W) || (V.remove(), ne.delete(W));
+  }, [x, o, u, nt, rt, It]), we = Ne((_, b) => {
+    var E, w, 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 (be.current) {
+        const U = (w = (E = be.current.editor).getTheme) == null ? void 0 : w.call(E);
+        if ((k = U == null ? void 0 : U.colors) != null && k[_])
+          return U.colors[_];
       }
     } catch {
     }
-    return O;
-  }, []), $t = Ee(() => {
-    if (!fe.current || !C.current || !K.current)
+    return b;
+  }, []), zt = Ne(() => {
+    if (!be.current || !Z.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 _ = be.current, b = o === "vs-dark" || typeof o == "string" && o.includes("dark"), E = we("mergeEditor.change.background", b ? "rgba(255, 166, 0, 0.2)" : "rgba(255, 166, 0, 0.15)"), w = we(
       "diffEditor.insertedTextBackground",
-      O ? "rgba(155, 185, 85, 0.2)" : "rgba(155, 185, 85, 0.15)"
-    ), P = be(
+      b ? "rgba(155, 185, 85, 0.2)" : "rgba(155, 185, 85, 0.15)"
+    ), k = we(
       "mergeEditor.changeBase.background",
-      O ? "rgba(255, 100, 100, 0.2)" : "rgba(255, 100, 100, 0.15)"
-    ), U = be(
+      b ? "rgba(255, 100, 100, 0.2)" : "rgba(255, 100, 100, 0.15)"
+    ), U = we(
       "editorOverviewRuler.modifiedForeground",
-      O ? "rgba(255, 166, 0, 0.8)" : "rgba(255, 166, 0, 1)"
-    ), Q = be(
+      b ? "rgba(255, 166, 0, 0.8)" : "rgba(255, 166, 0, 1)"
+    ), X = we(
       "editorOverviewRuler.addedForeground",
-      O ? "rgba(155, 185, 85, 0.8)" : "rgba(155, 185, 85, 1)"
-    ), Y = be(
+      b ? "rgba(155, 185, 85, 0.8)" : "rgba(155, 185, 85, 1)"
+    ), Y = we(
       "editorOverviewRuler.deletedForeground",
-      O ? "rgba(255, 100, 100, 0.8)" : "rgba(255, 100, 100, 1)"
-    ), _ = f, ue = {
+      b ? "rgba(255, 100, 100, 0.8)" : "rgba(255, 100, 100, 1)"
+    ), j = A, ue = {
       conflictOverviewColor: U,
-      changeOverviewColor: Q,
+      changeOverviewColor: X,
       baseOverviewColor: Y
-    }, { input1Decorations: Z, input2Decorations: H, baseDecorations: J } = Cr(
-      T,
-      _,
+    }, { input1Decorations: ne, input2Decorations: W, baseDecorations: V } = uo(
+      x,
+      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";
+      _
+    ), re = we("input.background", b ? "#3c3c3c" : "#f3f3f3"), le = we("input.border", b ? "#6b6b6b" : "#c8c8c8"), H = we("focusBorder", b ? "#007acc" : "#0078d4"), te = we("inputOption.activeForeground", b ? "#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(
+    const de = we(
       "diffEditor.insertedTextBackground",
-      O ? "rgba(100, 100, 255, 0.15)" : "rgba(100, 100, 255, 0.1)"
-    ), ee = be(
+      b ? "rgba(100, 100, 255, 0.15)" : "rgba(100, 100, 255, 0.1)"
+    ), me = we(
       "diffEditor.insertedTextBackground",
-      O ? "rgba(155, 185, 85, 0.2)" : "rgba(155, 185, 85, 0.15)"
+      b ? "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: ${E};
       }
 
       /* 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: ${me};
       }
       .monaco-editor .merge-change-current {
-        background-color: ${B};
+        background-color: ${w};
       }
 
       /* Same change on both sides (blue/purple) */
       .monaco-editor .merge-same-change {
-        background-color: ${he};
+        background-color: ${de};
       }
 
       /* 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: ${b ? "rgba(255, 0, 0, 0.2)" : "rgba(255, 0, 0, 0.1)"};
+        outline: 1px solid ${b ? "rgba(255, 100, 100, 0.5)" : "rgba(255, 0, 0, 0.3)"};
       }
 
       /* Diff symbols (+ and -) in line decorations - positioned in code area */
@@ -2956,7 +3038,7 @@ function ro(e) {
         pointer-events: none;
         font-family: "Courier New", monospace;
         width: 20px;
-        color: ${O ? "#9BB955" : "#6A9955"};
+        color: ${b ? "#9BB955" : "#6A9955"};
       }
 
       .monaco-editor .diff-symbol.diff-symbol-minus::before {
@@ -2975,7 +3057,7 @@ function ro(e) {
         pointer-events: none;
         font-family: "Courier New", monospace;
         width: 20px;
-        color: ${O ? "#FF6464" : "#CC0000"};
+        color: ${b ? "#FF6464" : "#CC0000"};
       }
 
       /* VSCode-style checkbox gutter - positioned at Monaco's glyph margin */
@@ -3018,12 +3100,12 @@ function ro(e) {
         width: 14px;
         height: 14px;
         border-radius: 3px;
-        background-color: ${se};
-        border: 1px solid ${oe};
+        background-color: ${re};
+        border: 1px solid ${le};
       }
 
       .merge-accept-gutter-marker.focused .checkbox-background {
-        border-color: ${G};
+        border-color: ${H};
         border-width: 2px;
       }
 
@@ -3046,7 +3128,7 @@ function ro(e) {
         height: 16px;
         cursor: pointer;
         margin: 0;
-        accent-color: ${ie};
+        accent-color: ${te};
       }
 
       /* Result column status indicator */
@@ -3071,172 +3153,228 @@ function ro(e) {
       }
 
       .native-checkbox:focus {
-        outline: 2px solid ${G};
+        outline: 2px solid ${H};
         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;
+    `, qe.current || (qe.current = Z.current.createDecorationsCollection([])), qe.current.set(ne), Ye.current || (Ye.current = ee.current.createDecorationsCollection([])), Ye.current.set(W), pe.current && (ze.current || (ze.current = pe.current.createDecorationsCollection([])), ze.current.set(V));
+  }, [x, o, A, we]), Ct = Ne(() => {
+    if (!Fe.current && et.current && be.current && !R) {
+      const _ = be.current, b = (C) => {
+        if (!O || !C) return C;
         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 ye = JSON.parse(C);
+          return Wr(ye);
         } catch {
+          return C;
         }
-        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);
+      };
+      et.current.innerHTML = "", je.current.clear();
+      const E = document.createElement("div");
+      E.style.display = "flex", E.style.height = "100%", E.style.width = "100%";
+      const w = o === "vs-dark" || typeof o == "string" && o.includes("dark"), k = w ? "#444" : "#ddd", U = w ? "#fff" : "#333", X = (C, ye) => {
+        var Ue, Ie, fe;
+        try {
+          const Q = (Ie = (Ue = _.editor).getTheme) == null ? void 0 : Ie.call(Ue);
+          if ((fe = Q == null ? void 0 : Q.colors) != null && fe[C])
+            return Q.colors[C];
+        } catch {
+        }
+        return ye;
+      }, Y = X("mergeEditor.conflict.input1.header.background", w ? "#4B1818" : "#FFE6E6"), j = X("editorGutter.background", w ? "#333" : "#f0f0f0"), ue = X("mergeEditor.conflict.input2.header.background", w ? "#1B4B18" : "#E6FFE6"), ne = X("mergeEditor.result.header.background", w ? "#7F5F00" : "#FFECB3"), W = (C, ye, Ue, Ie = !1) => {
+        const fe = document.createElement("div");
+        fe.style.flex = "1", fe.style.display = "flex", fe.style.flexDirection = "column", fe.style.borderRight = `1px solid ${k}`, fe.style.overflow = "hidden", fe.style.transition = "flex 0.2s ease, min-width 0.2s ease, max-width 0.2s ease", fe.dataset.columnKey = C;
+        const Q = document.createElement("div");
+        Q.style.padding = "4px 8px", Q.style.fontSize = "11px", Q.style.fontWeight = "500", Q.style.backgroundColor = Ue, Q.style.color = U, Q.style.borderBottom = `1px solid ${k}`, Q.style.display = "flex", Q.style.alignItems = "center", Q.style.gap = "4px", Q.style.height = "22px", Q.style.boxSizing = "content-box", Q.style.whiteSpace = "nowrap", Q.style.overflow = "hidden";
+        const ve = document.createElement("span");
+        ve.textContent = ye, ve.style.flex = "1", ve.style.overflow = "hidden", ve.style.textOverflow = "ellipsis", Q.appendChild(ve);
+        const De = document.createElement("div");
+        De.className = "column-collapse-icon", De.title = "Collapse column", De.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>', De.addEventListener("click", (kn) => {
+          kn.stopPropagation(), Pe((en) => {
+            const ot = new Set(en);
+            if (ot.has(C))
+              ot.delete(C);
+            else {
+              if (Array.from(je.current.keys()).filter((Sn) => !ot.has(Sn)).length <= 1) return en;
+              ot.add(C);
+            }
+            return ot;
+          });
+        }), Q.appendChild(De), fe.appendChild(Q);
+        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 ke = document.createElement("div");
+        ke.style.position = "absolute", ke.style.left = "0", ke.style.right = "0", ke.style.top = "0", ke.style.bottom = "0", Le.appendChild(ke);
+        let Ve = null;
+        return Ie && (Ve = document.createElement("div"), Ve.className = "merge-editor-gutter", Le.appendChild(Ve)), fe.appendChild(Le), je.current.set(C, { container: fe, editorWrapper: Le, labelDiv: Q, labelText: ve, collapseIcon: De }), { container: fe, editorDiv: ke, gutterDiv: Ve };
+      }, V = W("input1", (g == null ? void 0 : g.input1) || "Theirs", Y, u), re = W("input2", (g == null ? void 0 : g.input2) || "Ours", ue, u);
+      V.gutterDiv && (Ge.current = V.gutterDiv), re.gutterDiv && (tt.current = re.gutterDiv);
+      const le = !!n;
+      let H = null;
+      if (le) {
+        H = W("base", (g == null ? void 0 : g.base) || "Base", j, !1);
+        const C = [];
+        h === 0 ? C.push(H.container, V.container, re.container) : h === 1 ? C.push(V.container, H.container, re.container) : h === 2 && C.push(V.container, re.container, H.container), C.forEach((ye) => {
+          E.appendChild(ye);
         });
       } else
-        O.appendChild(H.container), O.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,
+        E.appendChild(V.container), E.appendChild(re.container);
+      let te = null;
+      if (u && le) {
+        te = W("result", (g == null ? void 0 : g.result) || "Result", ne, !0);
+        const C = je.current.get("result");
+        Te.current = (C == null ? void 0 : C.labelText) ?? te.container.querySelector("span"), te.gutterDiv && (Re.current = te.gutterDiv), E.appendChild(te.container);
+      }
+      et.current.appendChild(E);
+      const z = _.editor.createModel(b(t || ""), S), q = le ? _.editor.createModel(b(n || ""), S) : null, de = _.editor.createModel(b(r || ""), S);
+      if (Z.current = _.editor.create(V.editorDiv, {
+        model: z,
         readOnly: !0,
         automaticLayout: !0,
-        folding: !m,
+        folding: !u,
         glyphMargin: !1,
         ...i,
-        lineDecorationsWidth: m ? 26 : 10
-      }), se && oe && (re.current = k.editor.create(oe.editorDiv, {
-        model: z,
+        lineDecorationsWidth: u ? 26 : 10
+      }), le && H && (pe.current = _.editor.create(H.editorDiv, {
+        model: q,
         readOnly: !0,
         automaticLayout: !0,
-        folding: !m,
+        folding: !u,
         glyphMargin: !1,
         ...i,
         lineDecorationsWidth: 10
-      })), K.current = k.editor.create(J.editorDiv, {
-        model: q,
+      })), ee.current = _.editor.create(re.editorDiv, {
+        model: de,
         readOnly: !0,
         automaticLayout: !0,
-        folding: !m,
+        folding: !u,
         glyphMargin: !1,
         ...i,
-        lineDecorationsWidth: m ? 26 : 10
-      }), m && G) {
-        const ee = k.editor.createModel(r || "", E);
-        $.current = k.editor.create(G.editorDiv, {
-          model: ee,
+        lineDecorationsWidth: u ? 26 : 10
+      }), u && te) {
+        const C = _.editor.createModel(b(r || ""), S);
+        G.current = _.editor.create(te.editorDiv, {
+          model: C,
           automaticLayout: !0,
-          folding: !m,
+          folding: !u,
           glyphMargin: !1,
           ...i,
           readOnly: !1,
           lineDecorationsWidth: 26
-        }), ee.onDidChangeContent(() => {
-          gt.current || ne(!0);
+        }), C.onDidChangeContent(() => {
+          Et.current || ae(!0);
         });
       }
-      k.editor.setTheme(o);
-      const he = xt(z, ie, q);
-      F(he), De.current = !0, l && C.current && K.current && l(
+      _.editor.setTheme(o);
+      const me = Yt(q, z, de);
+      M(me), Fe.current = !0, l && Z.current && ee.current && l(
         {
-          input1: C.current,
-          input2: K.current,
-          base: re.current,
-          result: $.current
+          input1: Z.current,
+          input2: ee.current,
+          base: pe.current,
+          result: G.current
         },
-        k
+        _
       );
     }
-  }, [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,
+    u,
+    h,
+    R,
+    Yt,
+    l,
+    g,
+    O
+  ]), Xt = se(u), Kt = se(h), Qt = se(T), Zt = se(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) => {
-        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));
-  }, [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(() => {
-    if (!S) return;
-    const k = () => {
-      w.length > 0 && nt(w);
-    }, O = [], I = () => {
-      ot();
+    var k, U, X, Y, j, ue, ne, W, V, re, le;
+    const _ = Xt.current !== u, b = Kt.current !== h, E = Qt.current !== T, w = Zt.current !== n;
+    if ((_ || b || E || w) && Fe.current) {
+      Xt.current = u, Kt.current = h, Qt.current = T, Zt.current = n, We.current.forEach((de) => {
+        de.remove();
+      }), We.current.clear(), je.current.clear(), Pe(/* @__PURE__ */ new Set()), (k = qe.current) == null || k.set([]), (U = Ye.current) == null || U.set([]), (X = ze.current) == null || X.set([]), qe.current = null, Ye.current = null, ze.current = null;
+      const H = (Y = Z.current) == null ? void 0 : Y.getModel(), te = (j = pe.current) == null ? void 0 : j.getModel(), z = (ue = ee.current) == null ? void 0 : ue.getModel(), q = (ne = G.current) == null ? void 0 : ne.getModel();
+      (W = Z.current) == null || W.dispose(), (V = pe.current) == null || V.dispose(), (re = ee.current) == null || re.dispose(), (le = G.current) == null || le.dispose(), H == null || H.dispose(), te == null || te.dispose(), z == null || z.dispose(), q == null || q.dispose(), Fe.current = !1, Be((de) => de + 1);
+    }
+  }, [u, h, T, n]), Se(() => {
+    !R && be.current && et.current && !Fe.current && Ct();
+  }, [R, Ct]), Se(() => {
+    !p || !i || (Z.current && Z.current.updateOptions(i), ee.current && ee.current.updateOptions(i), pe.current && pe.current.updateOptions(i), G.current && G.current.updateOptions(i));
+  }, [i, p]), Se(() => {
+    p && x.length > 0 && (zt(), u && dt());
+  }, [p, x, zt, dt, u]), Se(() => {
+    p && x.length > 0 && u && G.current && pt(x);
+  }, [p, x, u, pt]), Se(() => {
+    if (!p) return;
+    const _ = () => {
+      D.length > 0 && ft(D);
+    }, b = [], E = () => {
+      dt();
     };
-    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 Z.current && b.push(Z.current.onDidScrollChange(E)), ee.current && b.push(ee.current.onDidScrollChange(E)), G.current && u && (b.push(G.current.onDidScrollChange(_)), b.push(G.current.onDidLayoutChange(_))), Z.current && b.push(Z.current.onDidLayoutChange(E)), ee.current && b.push(ee.current.onDidLayoutChange(E)), () => {
+      b.forEach((w) => {
+        w == null || w.dispose();
       });
     };
-  }, [S, ot, nt, m, w]), 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));
+  }, [p, dt, ft, u, D]), Se(() => {
+    if (!p) return;
+    const _ = [Z.current, pe.current, ee.current];
+    u && G.current && _.push(G.current);
+    const b = [];
+    let E = !1;
+    const w = (k) => {
+      if (E) return;
+      E = !0;
+      const U = k.getScrollTop(), X = k.getScrollLeft();
+      _.forEach((Y) => {
+        Y && Y !== k && (Y.setScrollTop(U), Y.setScrollLeft(X));
       }), setTimeout(() => {
-        I = !1;
+        E = !1;
       }, 10);
     };
-    return k.forEach((P) => {
-      P && O.push(
-        P.onDidScrollChange(() => {
-          B(P);
+    return _.forEach((k) => {
+      k && b.push(
+        k.onDidScrollChange(() => {
+          w(k);
         })
       );
     }), () => {
-      O.forEach((P) => {
-        P == null || P.dispose();
+      b.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 });
+  }, [p, u]), Se(() => {
+    if (!p) return;
+    const b = Array.from(je.current.keys()).filter((E) => !ge.has(E)).length;
+    for (const [E, w] of je.current.entries()) {
+      const k = ge.has(E), U = b > 1 || k;
+      k ? (w.container.style.flex = "0 0 28px", w.container.style.minWidth = "28px", w.container.style.maxWidth = "28px", w.editorWrapper.style.opacity = "0", w.editorWrapper.style.pointerEvents = "none", w.labelDiv.style.justifyContent = "center", w.labelText.style.display = "none", w.collapseIcon.style.transform = "rotate(180deg)", w.collapseIcon.title = "Expand column") : (w.container.style.flex = "1", w.container.style.minWidth = "", w.container.style.maxWidth = "", w.editorWrapper.style.opacity = "1", w.editorWrapper.style.pointerEvents = "", w.labelDiv.style.justifyContent = "", w.labelText.style.display = "", w.collapseIcon.style.transform = "", w.collapseIcon.title = "Collapse column"), !k && !U ? (w.collapseIcon.classList.add("column-collapse-icon--disabled"), w.collapseIcon.title = "Cannot collapse last column") : w.collapseIcon.classList.remove("column-collapse-icon--disabled");
+    }
+    requestAnimationFrame(() => {
+      var E;
+      for (const [w] of je.current.entries())
+        if (!ge.has(w)) {
+          const k = w === "input1" ? Z : w === "input2" ? ee : w === "base" ? pe : w === "result" ? G : null;
+          (E = k == null ? void 0 : k.current) == null || E.layout();
+        }
+    });
+  }, [p, ge]), Se(() => () => {
+    var k, U, X, Y, j, ue, ne, W, V, re, le;
+    (k = qe.current) == null || k.set([]), (U = Ye.current) == null || U.set([]), (X = ze.current) == null || X.set([]);
+    const _ = (Y = Z.current) == null ? void 0 : Y.getModel(), b = (j = pe.current) == null ? void 0 : j.getModel(), E = (ue = ee.current) == null ? void 0 : ue.getModel(), w = (ne = G.current) == null ? void 0 : ne.getModel();
+    (W = Z.current) == null || W.dispose(), (V = pe.current) == null || V.dispose(), (re = ee.current) == null || re.dispose(), (le = G.current) == null || le.dispose(), _ == null || _.dispose(), b == null || b.dispose(), E == null || E.dispose(), w == null || w.dispose(), Fe.current = !1, v(!1);
+  }, []), R || !p ? /* @__PURE__ */ gt(Pn, { children: f ?? /* @__PURE__ */ gt(fo, {}) }) : /* @__PURE__ */ gt("div", { ref: et, 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
+  vo as JsonDiffMergeEditor,
+  Kr as analyzeConflicts,
+  Qr as analyzeTwoWayConflicts,
+  yo as computeDiffs,
+  eo as computeDiffsJsonPatch,
+  to as computeLineConflictType
 };
 //# sourceMappingURL=index.mjs.map