react-monaco-json-merge 1.1.14 → 1.1.16

package/dist/index.mjs

@@ -130,7 +130,7 @@ function Xt(e) {
   }
   return e;
 }
-function jn() {
+function Rn() {
   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 jn() {
     }, n);
   };
 }
-function Ke(e) {
+function Ce(e) {
   return function t() {
     for (var r = this, n = arguments.length, o = new Array(n), i = 0; i < n; i++)
       o[i] = arguments[i];
@@ -153,30 +153,30 @@ function Ke(e) {
 function lt(e) {
   return {}.toString.call(e).includes("Object");
 }
-function Rn(e) {
+function jn(e) {
   return !Object.keys(e).length;
 }
-function Ce(e) {
+function Ke(e) {
   return typeof e == "function";
 }
 function Dn(e, t) {
   return Object.prototype.hasOwnProperty.call(e, t);
 }
 function Mn(e, t) {
-  return lt(t) || je("changeType"), Object.keys(t).some(function(r) {
+  return lt(t) || Re("changeType"), Object.keys(t).some(function(r) {
     return !Dn(e, r);
-  }) && je("changeField"), t;
+  }) && Re("changeField"), t;
 }
 function xn(e) {
-  Ce(e) || je("selectorType");
+  Ke(e) || Re("selectorType");
 }
 function $n(e) {
-  Ce(e) || lt(e) || je("handlerType"), lt(e) && Object.values(e).some(function(t) {
-    return !Ce(t);
-  }) && je("handlersType");
+  Ke(e) || lt(e) || Re("handlerType"), lt(e) && Object.values(e).some(function(t) {
+    return !Ke(t);
+  }) && Re("handlersType");
 }
 function Bn(e) {
-  e || je("initialIsRequired"), lt(e) || je("initialType"), Rn(e) && je("initialContent");
+  e || Re("initialIsRequired"), lt(e) || Re("initialType"), jn(e) && Re("initialContent");
 }
 function Fn(e, t) {
   throw new Error(e[t] || e.default);
@@ -191,7 +191,7 @@ 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"
-}, je = Ke(Fn)(Un), it = {
+}, Re = Ce(Fn)(Un), it = {
   changes: Mn,
   selector: xn,
   handler: $n,
@@ -202,7 +202,7 @@ function Vn(e) {
   it.initial(e), it.handler(t);
   var r = {
     current: e
-  }, n = Ke(Gn)(r, t), o = Ke(Hn)(r), i = Ke(it.changes)(e), s = Ke(Jn)(r);
+  }, n = Ce(Gn)(r, t), o = Ce(Hn)(r), i = Ce(it.changes)(e), s = Ce(Jn)(r);
   function c() {
     var u = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : function(l) {
       return l;
@@ -210,18 +210,18 @@ function Vn(e) {
     return it.selector(u), u(r.current);
   }
   function a(u) {
-    jn(n, o, i, s)(u);
+    Rn(n, o, i, s)(u);
   }
   return [c, a];
 }
 function Jn(e, t) {
-  return Ce(t) ? t(e.current) : t;
+  return Ke(t) ? t(e.current) : t;
 }
 function Hn(e, t) {
   return e.current = Xt(Xt({}, e.current), t), t;
 }
 function Gn(e, t, r) {
-  return Ce(t) ? t(e.current) : Object.keys(r).forEach(function(n) {
+  return Ke(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;
@@ -274,9 +274,9 @@ var on = {
 
     For more please check the link https://github.com/suren-atoyan/monaco-loader#config
   `
-}, Qt = Yn(Zn)(on), Kn = {
+}, Qt = Yn(Zn)(on), Cn = {
   config: Xn
-}, Cn = function() {
+}, Kn = function() {
   for (var t = arguments.length, r = new Array(t), n = 0; n < t; n++)
     r[n] = arguments[n];
   return function(o) {
@@ -312,7 +312,7 @@ var tr = ["monaco"], nr = Wn.create({
   monaco: null
 }), cn = Ln(nr, 2), tt = cn[0], dt = cn[1];
 function rr(e) {
-  var t = Kn.config(e), r = t.monaco, n = Tn(t, tr);
+  var t = Cn.config(e), r = t.monaco, n = Tn(t, tr);
   dt(function(o) {
     return {
       config: sn(o.config, n),
@@ -336,7 +336,7 @@ function or() {
       return e.resolve(e.monaco), vt(bt);
     if (window.monaco && window.monaco.editor)
       return an(window.monaco), e.resolve(window.monaco), vt(bt);
-    Cn(ir, cr)(ar);
+    Kn(ir, cr)(ar);
   }
   return vt(bt);
 }
@@ -395,13 +395,13 @@ var bt = new Promise(function(e, t) {
   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 || {}), M = /* @__PURE__ */ ((e) => (e.SAME_CHANGE = "same_change", e.INPUT1_ONLY = "input1_only", e.INPUT2_ONLY = "input2_only", e.TRUE_CONFLICT = "true_conflict", e))(M || {});
+}, 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) {
   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, T) {
-    let k = 0, g = 0;
-    for (; k < f; ) {
+  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;
@@ -411,9 +411,9 @@ function fr(e, t = !1) {
         g = g * 16 + b - 97 + 10;
       else
         break;
-      n++, k++;
+      n++, S++;
     }
-    return k < f && (g = -1), g;
+    return S < f && (g = -1), g;
   }
   function d(f) {
     n = f, o = "", i = 0, s = 16, y = 0;
@@ -431,30 +431,30 @@ function fr(e, t = !1) {
           n++;
       else
         return y = 3, e.substring(f, n);
-    let T = n;
+    let E = 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)); )
           n++;
-        T = n;
+        E = n;
       } else
         y = 3;
-    return e.substring(f, T);
+    return e.substring(f, E);
   }
-  function E() {
-    let f = "", T = n;
+  function N() {
+    let f = "", E = n;
     for (; ; ) {
       if (n >= r) {
-        f += e.substring(T, n), y = 2;
+        f += e.substring(E, n), y = 2;
         break;
       }
-      const k = e.charCodeAt(n);
-      if (k === 34) {
-        f += e.substring(T, n), n++;
+      const S = e.charCodeAt(n);
+      if (S === 34) {
+        f += e.substring(E, n), n++;
         break;
       }
-      if (k === 92) {
-        if (f += e.substring(T, n), n++, n >= r) {
+      if (S === 92) {
+        if (f += e.substring(E, n), n++, n >= r) {
           y = 2;
           break;
         }
@@ -491,12 +491,12 @@ function fr(e, t = !1) {
           default:
             y = 5;
         }
-        T = n;
+        E = n;
         continue;
       }
-      if (k >= 0 && k <= 31)
-        if (Qe(k)) {
-          f += e.substring(T, n), y = 2;
+      if (S >= 0 && S <= 31)
+        if (Qe(S)) {
+          f += e.substring(E, n), y = 2;
           break;
         } else
           y = 6;
@@ -533,20 +533,20 @@ function fr(e, t = !1) {
         return n++, s = 5;
       // strings
       case 34:
-        return n++, o = E(), s = 10;
+        return n++, o = N(), s = 10;
       // comments
       case 47:
-        const T = n - 1;
+        const E = n - 1;
         if (e.charCodeAt(n + 1) === 47) {
           for (n += 2; n < r && !Qe(e.charCodeAt(n)); )
             n++;
-          return o = e.substring(T, n), s = 12;
+          return o = e.substring(E, n), s = 12;
         }
         if (e.charCodeAt(n + 1) === 42) {
           n += 2;
-          const k = r - 1;
+          const S = r - 1;
           let g = !1;
-          for (; n < k; ) {
+          for (; n < S; ) {
             const b = e.charCodeAt(n);
             if (b === 42 && e.charCodeAt(n + 1) === 47) {
               n += 2, g = !0;
@@ -554,7 +554,7 @@ function fr(e, t = !1) {
             }
             n++, Qe(b) && (b === 13 && e.charCodeAt(n) === 10 && n++, c++, u = n);
           }
-          return g || (n++, y = 1), o = e.substring(T, n), s = 13;
+          return g || (n++, y = 1), o = e.substring(E, n), s = 13;
         }
         return o += String.fromCharCode(f), n++, s = 16;
       // numbers
@@ -738,7 +738,7 @@ function hr(e, t, r = ut.DEFAULT) {
       i > 0 && i--, i === 0 && A(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), E = l(t.onArrayEnd), v = a(t.onLiteralValue), h = c(t.onSeparator), m = s(t.onComment), f = c(t.onError), T = r && r.disallowComments, k = r && r.allowTrailingComma;
+  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() {
     for (; ; ) {
       const A = n.scan();
@@ -762,7 +762,7 @@ function hr(e, t, r = ut.DEFAULT) {
           );
           break;
         case 1:
-          T || b(
+          E || b(
             11
             /* ParseErrorCode.UnexpectedEndOfComment */
           );
@@ -783,7 +783,7 @@ function hr(e, t, r = ut.DEFAULT) {
       switch (A) {
         case 12:
         case 13:
-          T ? b(
+          E ? b(
             10
             /* ParseErrorCode.InvalidCommentToken */
           ) : m();
@@ -802,24 +802,24 @@ function hr(e, t, r = ut.DEFAULT) {
       }
     }
   }
-  function b(A, w = [], j = []) {
-    if (f(A), w.length + j.length > 0) {
+  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();
           break;
-        } else if (j.indexOf(X) !== -1)
+        } else if (R.indexOf(X) !== -1)
           break;
         X = g();
       }
     }
   }
-  function R(A) {
+  function j(A) {
     const w = n.getTokenValue();
     return A ? v(w) : (p(w), o.push(w)), g(), !0;
   }
-  function N() {
+  function T() {
     switch (n.getToken()) {
       case 11:
         const A = n.getTokenValue();
@@ -848,7 +848,7 @@ function hr(e, t, r = ut.DEFAULT) {
       2,
       5
       /* SyntaxKind.CommaToken */
-    ]), !1) : (R(!1), n.getToken() === 6 ? (h(":"), g(), V() || b(4, [], [
+    ]), !1) : (j(!1), n.getToken() === 6 ? (h(":"), g(), V() || b(4, [], [
       2,
       5
       /* SyntaxKind.CommaToken */
@@ -858,12 +858,12 @@ function hr(e, t, r = ut.DEFAULT) {
       /* SyntaxKind.CommaToken */
     ]), o.pop(), !0);
   }
-  function D() {
+  function M() {
     y(), g();
     let A = !1;
     for (; n.getToken() !== 2 && n.getToken() !== 17; ) {
       if (n.getToken() === 5) {
-        if (A || b(4, [], []), h(","), g(), n.getToken() === 2 && k)
+        if (A || b(4, [], []), h(","), g(), n.getToken() === 2 && S)
           break;
       } else A && b(6, [], []);
       B() || b(4, [], [
@@ -882,7 +882,7 @@ function hr(e, t, r = ut.DEFAULT) {
     let A = !0, w = !1;
     for (; n.getToken() !== 4 && n.getToken() !== 17; ) {
       if (n.getToken() === 5) {
-        if (w || b(4, [], []), h(","), g(), n.getToken() === 4 && k)
+        if (w || b(4, [], []), h(","), g(), n.getToken() === 4 && S)
           break;
       } else w && b(6, [], []);
       A ? (o.push(0), A = !1) : o[o.length - 1]++, V() || b(4, [], [
@@ -891,7 +891,7 @@ function hr(e, t, r = ut.DEFAULT) {
         /* SyntaxKind.CommaToken */
       ]), w = !0;
     }
-    return E(), A || o.pop(), n.getToken() !== 4 ? b(8, [
+    return N(), A || o.pop(), n.getToken() !== 4 ? b(8, [
       4
       /* SyntaxKind.CloseBracketToken */
     ], []) : g(), !0;
@@ -901,11 +901,11 @@ function hr(e, t, r = ut.DEFAULT) {
       case 3:
         return x();
       case 1:
-        return D();
+        return M();
       case 10:
-        return R(!0);
+        return j(!0);
       default:
-        return N();
+        return T();
     }
   }
   return g(), n.getToken() === 17 ? r.allowEmptyContent ? !0 : (b(4, [], []), !1) : V() ? (n.getToken() !== 17 && b(9, [], []), !0) : (b(4, [], []), !1);
@@ -929,14 +929,14 @@ function gr(e) {
       return "null";
   }
 }
-var Kt;
+var Ct;
 (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";
-})(Kt || (Kt = {}));
-var Ct;
+})(Ct || (Ct = {}));
+var Kt;
 (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";
-})(Ct || (Ct = {}));
+})(Kt || (Kt = {}));
 const ln = pr, un = dr;
 var en;
 (function(e) {
@@ -974,7 +974,7 @@ function yr() {
   }), wt;
 }
 var vr = yr();
-const ye = /* @__PURE__ */ mr(vr), W = (e, t) => {
+const de = /* @__PURE__ */ mr(vr), W = (e, t) => {
   if (!e) return;
   const r = t.replace(/^\//, "").replace(/\[/g, ".").replace(/\]/g, "").split(/[./#]/).filter(Boolean);
   let n = e;
@@ -1360,18 +1360,18 @@ function Pr(e, t) {
 function St(e, t) {
   t === void 0 && (t = !1);
   var r = Pt.get(e.object);
-  jt(r.value, e.object, e.patches, "", t), e.patches.length && _t(r.value, e.patches);
+  Rt(r.value, e.object, e.patches, "", t), e.patches.length && _t(r.value, e.patches);
   var n = e.patches;
   return n.length > 0 && (e.patches = [], e.callback && e.callback(n)), n;
 }
-function jt(e, t, r, n, o) {
+function Rt(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) ? jt(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) }));
+        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 }));
     }
     if (!(!c && i.length == s.length))
@@ -1384,33 +1384,33 @@ function jt(e, t, r, n, o) {
 function We(e, t, r) {
   r === void 0 && (r = !1);
   var n = [];
-  return jt(e, t, n, "", r), n;
+  return Rt(e, t, n, "", r), n;
 }
-const jr = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Rr = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   compare: We,
   generate: St,
   observe: Pr,
   unobserve: _r
 }, Symbol.toStringTag, { value: "Module" }));
-Object.assign({}, Er, jr, {
+Object.assign({}, Er, Rr, {
   JsonPatchError: pn,
   deepClone: we,
   escapePathComponent: Me,
   unescapePathComponent: fn
 });
-const ht = "oneOf", Rt = "anyOf", Dt = "allOf";
+const ht = "oneOf", jt = "anyOf", Dt = "allOf";
 function Mt(e) {
-  return !!(e[ht] || e[Rt] || e[Dt]);
+  return !!(e[ht] || e[jt] || e[Dt]);
 }
 function hn(e) {
-  const t = e[ht] || e[Rt] || e[Dt];
+  const t = e[ht] || e[jt] || e[Dt];
   return Array.isArray(t) ? t : void 0;
 }
 function ct(e) {
-  return e.oneOf ? ht : e.anyOf ? Rt : e.allOf ? Dt : "";
+  return e.oneOf ? ht : e.anyOf ? jt : e.allOf ? Dt : "";
 }
-function Rr(e, t) {
+function jr(e, t) {
   if (typeof t != "object" || t === null || Array.isArray(t))
     return null;
   const r = t, n = /* @__PURE__ */ new Set();
@@ -1436,7 +1436,7 @@ function at(e, t, r = ht) {
         return { selectedIndex: o, schema: i };
     }
   if (typeof e == "object" && e !== null && !Array.isArray(e)) {
-    const o = e, i = Rr(t, e);
+    const o = e, i = jr(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];
@@ -1479,8 +1479,8 @@ function at(e, t, r = ht) {
   return { selectedIndex: 0, schema: t[0] };
 }
 function kt(e, t, r) {
-  const n = !ye(e, t), o = !ye(e, r);
-  return n && o ? ye(t, r) ? M.SAME_CHANGE : M.TRUE_CONFLICT : n ? M.INPUT1_ONLY : o ? M.INPUT2_ONLY : M.SAME_CHANGE;
+  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 Pe(e, t) {
   try {
@@ -1548,79 +1548,79 @@ function Mr(e, t, r, n, o, i) {
   for (const v of y) {
     const h = W(r, v), m = W(n, v), f = W(o, v);
     if (!Array.isArray(h) || !Array.isArray(m) || !Array.isArray(f)) {
-      const N = c.get(v) || [], B = a.get(v) || [];
-      for (const D of N) {
-        const x = D.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+      const T = c.get(v) || [], B = 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(D);
+          A && A.patches1.push(M);
         }
       }
-      for (const D of B) {
-        const x = D.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+      for (const M of B) {
+        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(D);
+          A && A.patches2.push(M);
         }
       }
       continue;
     }
-    const T = qe(i, v, r), k = T != null && T.items ? Array.isArray(T.items) && T.items[0] ? T.items[0] : Array.isArray(T.items) ? null : T.items : null, g = k && typeof k == "object" ? k : null;
+    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 N = Br(h, m, f, g);
-      if (N.size > 0) {
-        const B = /* @__PURE__ */ new Map(), D = /* @__PURE__ */ new Map(), x = /* @__PURE__ */ new Map();
-        for (const [w, j] of N.entries())
-          j.base !== void 0 && B.set(j.base, w), j.input1 !== void 0 && D.set(j.input1, w), j.input2 !== void 0 && x.set(j.input2, w);
+      const T = Br(h, m, f, g);
+      if (T.size > 0) {
+        const B = /* @__PURE__ */ new Map(), M = /* @__PURE__ */ new Map(), x = /* @__PURE__ */ new Map();
+        for (const [w, R] of T.entries())
+          R.base !== void 0 && B.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 j = w.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
-          if (j) {
-            const X = Number.parseInt(j[1], 10), ne = D.get(X);
+          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}`;
               s.has(ae) || s.set(ae, { patches1: [], patches2: [] });
-              const ge = s.get(ae);
-              ge && ge.patches1.push(w);
+              const me = s.get(ae);
+              me && me.patches1.push(w);
             }
           }
         }
         for (const w of A) {
-          const j = w.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);
-          if (j) {
-            const X = Number.parseInt(j[1], 10), ne = x.get(X);
+          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}`;
               s.has(ae) || s.set(ae, { patches1: [], patches2: [] });
-              const ge = s.get(ae);
-              ge && ge.patches2.push(w);
+              const me = s.get(ae);
+              me && me.patches2.push(w);
             }
           }
         }
         continue;
       }
     }
-    const b = c.get(v) || [], R = a.get(v) || [];
-    for (const N of b) {
-      const B = N.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+    const b = c.get(v) || [], j = a.get(v) || [];
+    for (const T of b) {
+      const B = T.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
       if (B) {
-        const D = B[1];
-        s.has(D) || s.set(D, { patches1: [], patches2: [] });
-        const x = s.get(D);
-        x && x.patches1.push(N);
+        const M = B[1];
+        s.has(M) || s.set(M, { patches1: [], patches2: [] });
+        const x = s.get(M);
+        x && x.patches1.push(T);
       }
     }
-    for (const N of R) {
-      const B = N.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
+    for (const T of j) {
+      const B = T.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
       if (B) {
-        const D = B[1];
-        s.has(D) || s.set(D, { patches1: [], patches2: [] });
-        const x = s.get(D);
-        x && x.patches2.push(N);
+        const M = B[1];
+        s.has(M) || s.set(M, { patches1: [], patches2: [] });
+        const x = s.get(M);
+        x && x.patches2.push(T);
       }
     }
   }
@@ -1628,18 +1628,18 @@ function Mr(e, t, r, n, o, i) {
     if (!h) return null;
     const m = v.split("/").filter(Boolean);
     if (m.length < 2) return null;
-    const f = `/${m[0]}`, T = qe(h, f);
-    return T && Mt(T) ? f : null;
-  }, d = [...u], L = [...l], E = /* @__PURE__ */ new Set();
+    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 && E.add(h);
+    h && N.add(h);
   }
   for (const v of L) {
     const h = p(v.path, i);
-    h && E.add(h);
+    h && N.add(h);
   }
-  for (const v of E)
+  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);
@@ -1779,65 +1779,65 @@ 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, E, v) => {
-    if (!n || typeof L != "object" || L === null || Array.isArray(L) || typeof E != "object" || E === null || Array.isArray(E) || typeof v != "object" || v === null || Array.isArray(v)) return !1;
+  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)), T = at(E, m, ct(h)), k = at(v, m, ct(h));
-    return T.selectedIndex !== k.selectedIndex && (f.selectedIndex !== T.selectedIndex || f.selectedIndex !== k.selectedIndex);
+    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);
   };
-  for (const [d, { patches1: L, patches2: E }] of u) {
+  for (const [d, { patches1: L, patches2: N }] of u) {
     y.add(d);
     let v = d;
-    L.length > 0 ? v = L[0].path : E.length > 0 ? v = E[0].path : d.includes("#") && (v = d.split("#")[0]);
+    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];
     else {
-      const D = d.split("/").filter(Boolean);
-      D.length > 1 && (h = `/${D[0]}`);
-    }
-    if ([...L, ...E].every((D) => (D.path.split("/").slice(0, 2).join("/") || `/${D.path.split("/")[1]}`) === h) && h !== v) {
-      const D = W(e, h), x = W(t, h), V = W(r, h);
-      if (p(h, D, x, V)) {
-        const w = D, j = x, X = V;
-        let ne = kt(w, j, X);
-        !ye(w, j) && !ye(w, X) && !ye(j, X) && (ne = M.TRUE_CONFLICT);
-        const ae = [...L, ...E].filter(
+      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
-        ), ge = [], Re = [];
+        ), me = [], je = [];
         for (const Te of ae) {
-          const K = Te.path, ie = e !== void 0 ? W(e, K) : void 0, ee = W(t, K), F = W(r, K);
+          const C = Te.path, ie = e !== void 0 ? W(e, C) : void 0, ee = W(t, C), F = W(r, C);
           let fe = !1, Ie = !1;
-          Te.op === "replace" ? ie !== void 0 && (fe = !ye(ie, ee), Ie = !ye(ie, F)) : Te.op === "add" ? (fe = ie === void 0 && ee !== void 0, Ie = ie === void 0 && F !== void 0) : Te.op === "remove" && (fe = ie !== void 0 && ee === void 0, Ie = ie !== void 0 && F === void 0), ie !== void 0 && (ee !== void 0 && ye(ie, ee) && (fe = !1), F !== void 0 && ye(ie, F) && (Ie = !1)), fe && ge.push(Te), Ie && Re.push(Te);
+          Te.op === "replace" ? ie !== void 0 && (fe = !de(ie, ee), Ie = !de(ie, F)) : Te.op === "add" ? (fe = ie === void 0 && ee !== void 0, Ie = ie === void 0 && F !== void 0) : Te.op === "remove" && (fe = ie !== void 0 && ee === void 0, Ie = ie !== void 0 && F === void 0), ie !== void 0 && (ee !== void 0 && de(ie, ee) && (fe = !1), F !== void 0 && de(ie, F) && (Ie = !1)), fe && me.push(Te), Ie && je.push(Te);
         }
         l.push({
           path: h,
           baseValue: w,
-          input1Value: j,
+          input1Value: R,
           input2Value: X,
           conflictType: ne,
-          patches1: ge,
-          patches2: Re
+          patches1: me,
+          patches2: je
         });
         continue;
       }
     }
-    const f = W(e, v), T = W(t, v), k = W(r, v);
-    let g = kt(f, T, k);
-    const b = f != null, R = T != null, N = k != null;
-    !b && R && N && g !== M.SAME_CHANGE && (g = M.TRUE_CONFLICT), b && ye(f, T) && ye(f, k) || l.push({
+    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,
       // Use representative path for conflict (actual patch paths are in patches1/patches2)
       baseValue: f,
-      input1Value: T,
-      input2Value: k,
+      input1Value: E,
+      input2Value: S,
       conflictType: g,
       patches1: L,
       // JSON Patch operations for base?input1 (contain actual paths with indices)
-      patches2: E
+      patches2: N
       // JSON Patch operations for base?input2 (contain actual paths with indices)
     });
   }
@@ -1849,99 +1849,99 @@ function Ur(e, t, r) {
   if (i.length === 0)
     return [];
   const s = [], c = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Map(), u = [];
-  for (const E of i) {
-    const v = E.path.match(/^(\/[^/]+(?:\/[^/]+)*)\/(\d+)(?:\/|$)/);
+  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(E);
+      m && m.push(N);
     } else
-      u.push(E);
+      u.push(N);
   }
-  for (const [E, v] of a) {
-    const h = W(e, E), m = W(t, E);
+  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 R = b.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-        if (R) {
-          const N = R[1];
-          g.has(N) || g.set(N, []), (y = g.get(N)) == null || y.push(b);
+        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);
         }
       }
-      for (const [b, R] of g)
-        s.push(...Ze(b, R, e, t, void 0)), c.add(b);
+      for (const [b, j] of g)
+        s.push(...Ze(b, j, e, t, void 0)), c.add(b);
       continue;
     }
-    const f = r ? qe(r, E, e) : null, T = f != null && f.items ? Array.isArray(f.items) && f.items[0] ? f.items[0] : Array.isArray(f.items) ? null : f.items : null, k = T && typeof T == "object" ? T : null;
-    if (k) {
-      const g = $r(h, m, k), b = /* @__PURE__ */ new Map(), R = /* @__PURE__ */ new Map();
+    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;
+    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 && R.set(V.input2, x);
-      const N = /* @__PURE__ */ new Map(), B = [];
+        V.input1 !== void 0 && b.set(V.input1, x), V.input2 !== void 0 && j.set(V.input2, x);
+      const T = /* @__PURE__ */ new Map(), B = [];
       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 = R.get(A) : w = b.get(A), w) {
-            N.has(w) || N.set(w, []);
-            const j = N.get(w);
-            j && j.push(x);
+          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);
           } else
             B.push(x);
         }
       }
-      for (const [x, V] of N) {
+      for (const [x, V] of T) {
         const A = g.get(x);
         if (!A) continue;
-        const w = A.input1 !== void 0 ? `${E}/${A.input1}` : `${E}/${A.input2}`;
+        const w = A.input1 !== void 0 ? `${N}/${A.input1}` : `${N}/${A.input2}`;
         s.push(...Ze(w, V, e, t, void 0)), c.add(w);
       }
-      const D = /* @__PURE__ */ new Map();
+      const M = /* @__PURE__ */ new Map();
       for (const x of B) {
         const V = x.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
         if (V) {
           const A = V[1];
-          D.has(A) || D.set(A, []), (p = D.get(A)) == null || p.push(x);
+          M.has(A) || M.set(A, []), (p = M.get(A)) == null || p.push(x);
         }
       }
-      for (const [x, V] of D)
+      for (const [x, V] of M)
         c.has(x) || (s.push(...Ze(x, V, e, t, void 0)), c.add(x));
     } else {
       const g = /* @__PURE__ */ new Map();
       for (const b of v) {
-        const R = b.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);
-        if (R) {
-          const N = R[1];
-          g.has(N) || g.set(N, []), (d = g.get(N)) == null || d.push(b);
+        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);
         }
       }
-      for (const [b, R] of g)
-        s.push(...Ze(b, R, e, t, void 0)), c.add(b);
+      for (const [b, j] of g)
+        s.push(...Ze(b, j, e, t, void 0)), c.add(b);
     }
   }
   const l = /* @__PURE__ */ new Map();
-  for (const E of u) {
-    const v = E.path.split("/").filter(Boolean), h = v.length > 0 ? `/${v[0]}` : "/";
-    l.has(h) || l.set(h, []), (L = l.get(h)) == null || L.push(E);
+  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 [E, v] of l)
-    s.push(...Ze(E, v, e, t, void 0));
+  for (const [N, v] of l)
+    s.push(...Ze(N, v, 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 T = f.path, k = void 0, g = W(r, T), b = W(n, T);
-    let R = !1, N = !1;
-    f.op === "add" ? (R = g !== void 0, N = b !== void 0) : f.op === "remove" ? (R = k !== void 0, N = k !== void 0) : f.op === "replace" && (R = g !== void 0, N = b !== void 0), T === e && (R = !0, N = !0), R && a.push(f), N && u.push(f);
+    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);
   }
-  if (a.length === 0 && u.length === 0 && i !== void 0 && s !== void 0 && c !== void 0 && ye(i, s) && ye(i, c))
+  if (a.length === 0 && u.length === 0 && i !== void 0 && s !== void 0 && c !== void 0 && de(i, s) && de(i, c))
     return [];
-  const l = a.length > 0 ? a : t, y = u.length > 0 ? u : t, p = [...l, ...y], d = p.some((f) => f.op === "add"), L = p.some((f) => f.op === "remove"), E = p.some((f) => f.op === "replace");
-  if (d && !E && !L) {
+  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) {
     if (s !== void 0 && c === void 0)
       return [
         {
@@ -1949,7 +1949,7 @@ function Ze(e, t, r, n, o) {
           baseValue: void 0,
           input1Value: s,
           input2Value: void 0,
-          conflictType: M.INPUT1_ONLY,
+          conflictType: D.INPUT1_ONLY,
           patches1: l,
           // Highlight on input1 (new content) - use filtered patches1
           patches2: []
@@ -1963,7 +1963,7 @@ function Ze(e, t, r, n, o) {
           baseValue: void 0,
           input1Value: void 0,
           input2Value: c,
-          conflictType: M.INPUT2_ONLY,
+          conflictType: D.INPUT2_ONLY,
           patches1: [],
           // No highlighting on input1 (doesn't exist there)
           patches2: y
@@ -1971,7 +1971,7 @@ function Ze(e, t, r, n, o) {
         }
       ];
   }
-  if (L && !d && !E) {
+  if (L && !d && !N) {
     if (s !== void 0 && c === void 0)
       return [
         {
@@ -1979,7 +1979,7 @@ function Ze(e, t, r, n, o) {
           baseValue: s,
           input1Value: s,
           input2Value: void 0,
-          conflictType: M.INPUT1_ONLY,
+          conflictType: D.INPUT1_ONLY,
           patches1: l,
           // Highlight on input1 (removed content) - use filtered patches1
           patches2: []
@@ -1993,7 +1993,7 @@ function Ze(e, t, r, n, o) {
           baseValue: c,
           input1Value: void 0,
           input2Value: c,
-          conflictType: M.INPUT2_ONLY,
+          conflictType: D.INPUT2_ONLY,
           patches1: [],
           // No highlighting on input1 (doesn't exist there)
           patches2: y
@@ -2004,16 +2004,16 @@ function Ze(e, t, r, n, o) {
   const v = kt(i, s, c);
   let h = [], m = [];
   switch (v) {
-    case M.INPUT1_ONLY:
+    case D.INPUT1_ONLY:
       h = l, m = [];
       break;
-    case M.INPUT2_ONLY:
+    case D.INPUT2_ONLY:
       h = [], m = y;
       break;
-    case M.SAME_CHANGE:
+    case D.SAME_CHANGE:
       h = l, m = y;
       break;
-    case M.TRUE_CONFLICT:
+    case D.TRUE_CONFLICT:
       h = l, m = y;
       break;
   }
@@ -2044,33 +2044,34 @@ function Vr(e, t, r, n) {
   const o = [];
   for (let y = 0; y < e.length; y++) {
     const p = e[y];
-    let d, L, E;
-    (((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), E = Pe(n, p.path)) : (d = At(t, [...p.patches1 || [], ...p.patches2 || []]), L = At(r, p.patches1 || []), E = At(n, p.patches2 || []));
-    const v = p.conflictType === M.TRUE_CONFLICT;
+    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 M.SAME_CHANGE:
+      case D.SAME_CHANGE:
         h = te.first, m = te.first;
         break;
-      case M.INPUT1_ONLY:
+      case D.INPUT1_ONLY:
         h = te.first;
         break;
-      case M.INPUT2_ONLY:
+      case D.INPUT2_ONLY:
         m = te.first;
         break;
-      case M.TRUE_CONFLICT:
+      case D.TRUE_CONFLICT:
         m = te.first;
         break;
     }
-    const f = [], T = [];
+    const f = [], E = [];
     if (p.patches1 && (p.patches1.length ?? 0) > 0)
       for (const g of p.patches1) {
-        if (g.op === "remove")
+        const b = !t || t.trim() === "";
+        if (g.op === "remove" && !b)
           continue;
-        const b = Pe(r, g.path);
-        if (b.start !== 1 || b.end !== 1)
-          for (let R = b.start; R <= b.end; R++)
-            f.push({ line: R });
+        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);
@@ -2082,14 +2083,14 @@ function Vr(e, t, r, n) {
           continue;
         const b = Pe(n, g.path);
         if (b.start !== 1 || b.end !== 1)
-          for (let R = b.start; R <= b.end; R++)
-            T.push({ line: R });
+          for (let j = b.start; j <= b.end; j++)
+            E.push({ line: j });
       }
     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) && T.push({ line: g.start });
+      (g.start !== 1 || g.end !== 1) && E.push({ line: g.start });
     }
-    const k = {
+    const S = {
       id: `conflict-${y}`,
       path: p.path,
       // Include path for value extraction during resolution
@@ -2102,19 +2103,19 @@ function Vr(e, t, r, n) {
         endLineNumberExclusive: L.end + 1
       },
       input2Range: {
-        startLineNumber: E.start,
-        endLineNumberExclusive: E.end + 1
+        startLineNumber: N.start,
+        endLineNumberExclusive: N.end + 1
       },
       input1Diffs: f,
-      input2Diffs: T,
+      input2Diffs: E,
       isConflicting: v,
       conflictType: p.conflictType,
       input1State: h,
       input2State: m,
-      handled: p.conflictType === M.SAME_CHANGE,
+      handled: p.conflictType === D.SAME_CHANGE,
       focused: !1
     };
-    o.push(k);
+    o.push(S);
   }
   return o;
 }
@@ -2136,12 +2137,12 @@ function Jr(e, t, r, n = {}) {
       }), y.forEach((d) => {
         p.add(d.path);
       }), u = Array.from(p).map((d) => {
-        const L = W(s, d), E = W(c, d), v = W(a, d), h = !ye(L, E), m = !ye(E, v);
+        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 = M.TRUE_CONFLICT : h ? f = M.INPUT1_ONLY : m ? f = M.INPUT2_ONLY : f = M.SAME_CHANGE, {
+        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,
-          input1Value: E,
+          input1Value: N,
           input2Value: v,
           conflictType: f
         };
@@ -2156,20 +2157,20 @@ function Jr(e, t, r, n = {}) {
 function Hr(e, t, r) {
   const n = e !== t, o = e !== r;
   let i;
-  return n && o ? t === r ? i = M.SAME_CHANGE : i = M.TRUE_CONFLICT : n ? i = M.INPUT1_ONLY : i = M.INPUT2_ONLY, { conflictType: i, input1Changed: n, input2Changed: o };
+  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 };
 }
 function no(e, t, r) {
   var u, l, y;
   const n = [], o = [];
   for (let p = 0; p < Math.max(e.length, t.length, r.length); p++) {
-    const d = e[p] !== void 0 ? e[p] : "", L = t[p] !== void 0 ? t[p] : "", E = r[p] !== void 0 ? r[p] : "", { conflictType: v, input1Changed: h, input2Changed: m } = Hr(d, L, E);
+    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,
-      input2Line: E,
+      input2Line: N,
       conflictType: v
     });
   }
@@ -2177,9 +2178,9 @@ function no(e, t, r) {
     return [];
   let i = ((u = o[0]) == null ? void 0 : u.line) ?? 1, s = (l = o[0]) == null ? void 0 : l.conflictType, c = [], a = [];
   for (let p = 0; p <= o.length; p++) {
-    const d = o[p], L = p === o.length, E = !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 || E || v) {
-      const h = o[p - 1], m = h ? h.line + 1 : i + 1, f = c.length > 0, T = a.length > 0, k = s === M.TRUE_CONFLICT, g = {
+    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 = {
         id: `conflict-${n.length}`,
         baseRange: {
           startLineNumber: i,
@@ -2195,12 +2196,12 @@ function no(e, t, r) {
         },
         input1Diffs: c,
         input2Diffs: a,
-        isConflicting: k,
+        isConflicting: S,
         conflictType: s,
         // Default: accept input2 (ours) by default, or both if same change
-        input1State: s === M.SAME_CHANGE && f ? te.first : te.excluded,
-        input2State: T ? te.first : te.excluded,
-        handled: s === M.SAME_CHANGE,
+        input1State: s === D.SAME_CHANGE && f ? te.first : te.excluded,
+        input2State: E ? te.first : te.excluded,
+        handled: s === D.SAME_CHANGE,
         focused: !1
       };
       n.push(g), !L && d && (i = d.line, s = d.conflictType, c = [], a = []);
@@ -2289,7 +2290,7 @@ function mn(e, t, r, n = "") {
   return null;
 }
 function qr(e, t, r, n, o) {
-  var k;
+  var S;
   const i = [], s = [], c = e.join(`
 `), a = t.join(`
 `), u = r.join(`
@@ -2307,98 +2308,98 @@ function qr(e, t, r, n, o) {
   }
   let d;
   !l || typeof l == "object" && l !== null && Object.keys(l).length === 0 ? d = JSON.parse(JSON.stringify(p)) : d = JSON.parse(JSON.stringify(l));
-  const L = /* @__PURE__ */ new Set(), E = /* @__PURE__ */ new Set(), v = /* @__PURE__ */ new Set(), h = (g, b, R) => null;
+  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, R = g.input2State === te.first || g.input2State === te.second;
-    let N = g.path;
-    if (!N && (N = h(g.baseRange.startLineNumber, g.baseRange.endLineNumberExclusive) || void 0, !N)) {
-      g.conflictType === M.INPUT2_ONLY && R ? d = JSON.parse(JSON.stringify(p)) : g.conflictType === M.INPUT1_ONLY && b ? d = JSON.parse(JSON.stringify(y)) : g.conflictType === M.SAME_CHANGE && (b || R) || R ? d = JSON.parse(JSON.stringify(p)) : b && (d = JSON.parse(JSON.stringify(y)));
+    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)));
       continue;
     }
     try {
-      let B, D = N;
-      const x = (k = g.path) == null ? void 0 : k.match(/^(.*\/\d+)(?:\/.*)?$/);
+      let B, M = T;
+      const x = (S = g.path) == null ? void 0 : S.match(/^(.*\/\d+)(?:\/.*)?$/);
       let V = !1, A = "";
       if (x) {
-        const j = x[1].split("/").filter((X) => X !== "");
-        if (j.length >= 2) {
-          const X = j[j.length - 1];
-          /^\d+$/.test(X) && (V = !0, A = `/${j.slice(0, -1).join("/")}`);
+        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("/")}`);
         }
       }
-      if (b && R)
-        if (g.conflictType === M.SAME_CHANGE)
-          V ? (B = W(p, A), D = A) : B = W(p, N);
+      if (b && j)
+        if (g.conflictType === D.SAME_CHANGE)
+          V ? (B = W(p, A), M = A) : B = W(p, T);
         else {
-          const w = V ? A : N, j = W(y, w), X = W(p, w), ne = o && l && typeof l == "object" && qe(o, w, l) || void 0, ae = mn(j, X, ne, w);
-          ae !== null ? (B = ae, D = w, i.push(`Smart-merged conflict at path ${w}`)) : (B = X, D = w, i.push(`Merge failed at path ${w}, using input2 value`));
+          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 ? (B = ae, M = w, i.push(`Smart-merged conflict at path ${w}`)) : (B = X, M = w, i.push(`Merge failed at path ${w}, using input2 value`));
         }
       else if (b)
         if (V)
-          B = W(y, A), D = A;
+          B = W(y, A), M = A;
         else {
-          const w = N.split("/").filter(Boolean);
+          const w = T.split("/").filter(Boolean);
           if (w.length > 1) {
-            const j = `/${w.slice(0, -1).join("/")}`;
-            if (!v.has(j)) {
-              const X = W(y, j);
+            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, j);
+                const ne = W(d, R);
                 if (typeof ne == "object" && ne !== null && !Array.isArray(ne)) {
-                  for (const [ae, ge] of Object.entries(X)) {
-                    const Re = `${j}/${ae}`;
-                    E.has(Re) || (ne[ae] = ge);
+                  for (const [ae, me] of Object.entries(X)) {
+                    const je = `${R}/${ae}`;
+                    N.has(je) || (ne[ae] = me);
                   }
-                  v.add(j);
+                  v.add(R);
                 }
               }
             }
-            B = W(y, N);
+            B = W(y, T);
           } else
-            B = W(y, N);
+            B = W(y, T);
         }
-      else if (R)
+      else if (j)
         if (V)
-          B = W(p, A), D = A;
+          B = W(p, A), M = A;
         else {
-          const w = N.split("/").filter(Boolean);
+          const w = T.split("/").filter(Boolean);
           if (w.length > 1) {
-            const j = `/${w.slice(0, -1).join("/")}`;
-            if (!v.has(j)) {
-              const X = W(p, j);
+            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, j);
+                const ne = W(d, R);
                 if (typeof ne == "object" && ne !== null && !Array.isArray(ne)) {
-                  for (const [ae, ge] of Object.entries(X)) {
-                    const Re = `${j}/${ae}`;
-                    E.has(Re) || (ne[ae] = ge);
+                  for (const [ae, me] of Object.entries(X)) {
+                    const je = `${R}/${ae}`;
+                    N.has(je) || (ne[ae] = me);
                   }
-                  v.add(j);
+                  v.add(R);
                 }
               }
             }
-            B = W(p, N);
+            B = W(p, T);
           } else
-            B = W(p, N);
+            B = W(p, T);
         }
       else {
-        const w = V ? A : N, j = W(l, w);
-        if (j !== void 0)
-          B = j, D = w;
+        const w = V ? A : T, R = W(l, w);
+        if (R !== void 0)
+          B = R, M = w;
         else
           continue;
       }
-      B !== void 0 && (Gr(d, D, B), L.add(D), E.add(D));
+      B !== void 0 && (Gr(d, M, B), L.add(M), N.add(M));
     } catch (B) {
-      i.push(`Failed to apply conflict at path ${N || g.id}: ${B instanceof Error ? B.message : String(B)}`);
+      i.push(`Failed to apply conflict at path ${T || g.id}: ${B instanceof Error ? B.message : String(B)}`);
     }
   }
   const m = JSON.stringify(d, null, 2);
   for (const g of n) {
     const b = g.path;
     if (!b) continue;
-    const R = g.input1State === te.first || g.input1State === te.second, N = g.input2State === te.first || g.input2State === te.second;
-    if (R && N && g.conflictType === M.TRUE_CONFLICT) {
+    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 B = Wr(m, b);
       B && s.push({
         conflictId: g.id,
@@ -2410,15 +2411,15 @@ function qr(e, t, r, n, o) {
       });
     }
   }
-  let f = !0, T;
+  let f = !0, E;
   try {
     JSON.parse(m);
   } catch (g) {
-    f = !1, T = g instanceof Error ? g.message : "Invalid JSON", s.push({
+    f = !1, E = g instanceof Error ? g.message : "Invalid JSON", s.push({
       conflictId: "validation-error",
       conflictPath: "/",
       type: "error",
-      message: T,
+      message: E,
       startLine: 1,
       endLine: m.split(`
 `).length
@@ -2427,7 +2428,7 @@ function qr(e, t, r, n, o) {
   return {
     content: m,
     isValid: f,
-    validationError: T,
+    validationError: E,
     warnings: i.length > 0 ? i : void 0,
     conflictIssues: s.length > 0 ? s : void 0
   };
@@ -2435,19 +2436,19 @@ function qr(e, t, r, n, o) {
 function Yr(e, t, r) {
   let n = "", o = "", i = "", s = "", c = "", a = "", u = "", l = "";
   switch (e.conflictType) {
-    case M.SAME_CHANGE: {
+    case D.SAME_CHANGE: {
       const y = e.baseRange.startLineNumber === 1 && e.baseRange.endLineNumberExclusive === 2 && // Default "not found" range
       e.input1Range.startLineNumber !== 1 && e.input2Range.startLineNumber !== 1;
       t ? y ? (n = "merge-2way-deletion", o = "merge-same-change", s = r.baseOverviewColor, c = r.changeOverviewColor, a = "", u = "-", l = "+") : (n = "merge-2way-deletion", o = "merge-same-change", i = "merge-change-base", s = r.baseOverviewColor, c = r.changeOverviewColor, a = "", u = "-", l = "") : y ? (n = "merge-same-change", o = "merge-same-change", i = "", s = r.changeOverviewColor, c = r.changeOverviewColor, a = "", u = "+", l = "+") : (n = "merge-change-incoming", o = "merge-same-change", i = "merge-change-base", s = r.changeOverviewColor, c = r.changeOverviewColor, a = r.baseOverviewColor, u = "", l = "");
       break;
     }
-    case M.INPUT1_ONLY:
+    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 = "");
       break;
-    case M.INPUT2_ONLY:
+    case D.INPUT2_ONLY:
       n = "", o = "merge-change-current", i = t ? "" : "merge-change-base", s = "", c = r.changeOverviewColor, a = t ? "" : r.baseOverviewColor, u = "", l = "+";
       break;
-    case M.TRUE_CONFLICT: {
+    case D.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 = "");
@@ -2476,25 +2477,46 @@ function yn(e) {
 }
 function zr(e, t, r) {
   const n = [];
-  if (e.input1Diffs.length > 0 && t.input1Class) {
-    const o = yn(e.input1Diffs);
-    for (const i of o)
-      n.push({
-        range: new r.Range(i, 1, i, Number.MAX_SAFE_INTEGER),
-        options: {
-          isWholeLine: !0,
-          className: t.input1Class,
-          linesDecorationsClassName: t.input1Symbol && t.input1Symbol !== "" ? `diff-symbol diff-symbol-${t.input1Symbol === "+" ? "plus" : "minus"}` : void 0,
-          overviewRuler: t.input1OverviewColor ? {
-            color: t.input1OverviewColor,
-            position: r.editor.OverviewRulerLane.Full
-          } : void 0,
-          minimap: t.input1OverviewColor ? {
-            color: t.input1OverviewColor,
-            position: r.editor.MinimapPosition.Inline
-          } : void 0
-        }
-      });
+  if (t.input1Class) {
+    if (e.input1Diffs.length > 0) {
+      const o = yn(e.input1Diffs);
+      for (const i of o)
+        n.push({
+          range: new r.Range(i, 1, i, Number.MAX_SAFE_INTEGER),
+          options: {
+            isWholeLine: !0,
+            className: t.input1Class,
+            linesDecorationsClassName: t.input1Symbol && t.input1Symbol !== "" ? `diff-symbol diff-symbol-${t.input1Symbol === "+" ? "plus" : "minus"}` : void 0,
+            overviewRuler: t.input1OverviewColor ? {
+              color: t.input1OverviewColor,
+              position: r.editor.OverviewRulerLane.Full
+            } : void 0,
+            minimap: t.input1OverviewColor ? {
+              color: t.input1OverviewColor,
+              position: r.editor.MinimapPosition.Inline
+            } : void 0
+          }
+        });
+    } else if (e.conflictType === D.INPUT1_ONLY) {
+      const o = e.input1Range.startLineNumber, i = e.input1Range.endLineNumberExclusive - 1;
+      for (let s = o; s <= i; s++)
+        n.push({
+          range: new r.Range(s, 1, s, Number.MAX_SAFE_INTEGER),
+          options: {
+            isWholeLine: !0,
+            className: t.input1Class,
+            linesDecorationsClassName: t.input1Symbol && t.input1Symbol !== "" ? `diff-symbol diff-symbol-${t.input1Symbol === "+" ? "plus" : "minus"}` : void 0,
+            overviewRuler: t.input1OverviewColor ? {
+              color: t.input1OverviewColor,
+              position: r.editor.OverviewRulerLane.Full
+            } : void 0,
+            minimap: t.input1OverviewColor ? {
+              color: t.input1OverviewColor,
+              position: r.editor.MinimapPosition.Inline
+            } : void 0
+          }
+        });
+    }
   }
   return n;
 }
@@ -2553,7 +2575,7 @@ function Zr(e, t, r, n) {
     baseDecorations: Qr(e, o, n)
   };
 }
-function Kr(e, t, r, n) {
+function Cr(e, t, r, n) {
   const o = [], i = [], s = [];
   for (const c of e) {
     const a = Zr(c, t, r, n);
@@ -2565,7 +2587,7 @@ function Kr(e, t, r, n) {
     baseDecorations: s
   };
 }
-const Cr = () => /* @__PURE__ */ st("div", { style: { padding: "20px", textAlign: "center", color: "#888" }, children: "Loading Monaco Editor..." }), Nt = "⚠";
+const Kr = () => /* @__PURE__ */ st("div", { style: { padding: "20px", textAlign: "center", color: "#888" }, children: "Loading Monaco Editor..." }), Nt = "⚠";
 function ro(e) {
   const {
     original: t = "",
@@ -2582,38 +2604,38 @@ function ro(e) {
     showResultColumn: p,
     baseIndex: d = 1,
     comparisonMode: L = "split",
-    schema: E,
+    schema: N,
     patches: v,
     labels: h
-  } = e, m = n ? p : !1, f = !n || n === "", T = "json", [k, g] = _e(!1), [b, R] = _e(!0), [N, B] = _e([]), [D, x] = _e(null), [V, A] = _e([]), [w, j] = _e([]), [X, ne] = _e(!1), ae = le(""), ge = Ee((S, O, I, $) => {
+  } = e, m = n ? p : !1, f = !n || n === "", E = "json", [S, g] = _e(!1), [b, j] = _e(!0), [T, B] = _e([]), [M, x] = _e(null), [V, A] = _e([]), [w, R] = _e([]), [X, ne] = _e(!1), ae = le(""), me = Ee((k, O, I, $) => {
     const P = document.createElement("div");
     P.className = "native-checkbox-container";
     const U = document.createElement("input");
-    return U.type = "checkbox", U.className = "native-checkbox", U.checked = S === te.first || S === te.second, U.setAttribute("aria-label", U.checked ? "Undo accept" : "Accept change"), U.addEventListener("click", (Q) => {
+    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(() => {
         $();
       });
     }), P.appendChild(U), P;
-  }, []), [Re, Te] = _e(0), K = le(null), ie = le(null), ee = le(null), F = 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);
+  }, []), [je, Te] = _e(0), C = le(null), ie = le(null), ee = le(null), F = 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);
   Se(() => {
-    let S = !0;
+    let k = !0;
     const O = ur.init();
     return O.then((I) => {
-      S && (fe.current = I, R(!1), g(!0));
+      k && (fe.current = I, j(!1), g(!0));
     }).catch((I) => {
-      S && (I == null ? void 0 : I.type) !== "cancelation" && console.error("Monaco initialization: error:", I);
+      k && (I == null ? void 0 : I.type) !== "cancelation" && console.error("Monaco initialization: error:", I);
     }), () => {
-      S = !1, De.current || O.cancel();
+      k = !1, De.current || O.cancel();
     };
   }, []);
   const xt = Ee(
-    (S, O, I) => {
+    (k, O, I) => {
       if (!fe.current) return [];
-      const $ = (S == null ? void 0 : S.getValue()) || "", P = O.getValue(), U = I.getValue();
+      const $ = (k == null ? void 0 : k.getValue()) || "", P = O.getValue(), U = I.getValue();
       try {
         const Q = performance.now(), Y = Jr($, P, U, {
           comparisonMode: L,
-          schema: E,
+          schema: N,
           patches: v
         }), _ = performance.now() - Q;
         return _ > 100 && console.warn(`JSON Patch diff took ${_.toFixed(2)}ms`), Y;
@@ -2622,21 +2644,21 @@ function ro(e) {
         return console.error("JSON Patch diff error:", Y), [];
       }
     },
-    [L, E, v]
-  ), ze = Ee((S) => {
+    [L, N, v]
+  ), ze = Ee((k) => {
     try {
-      return S.getLayoutInfo().decorationsLeft || 0;
+      return k.getLayoutInfo().decorationsLeft || 0;
     } catch {
       return 0;
     }
-  }, []), Xe = Ee((S) => {
+  }, []), Xe = Ee((k) => {
     try {
-      return S.getLayoutInfo().decorationsWidth || 0;
+      return k.getLayoutInfo().decorationsWidth || 0;
     } catch {
       return 0;
     }
   }, []), nt = Ee(
-    (S) => {
+    (k) => {
       if (!m || !F.current || !ke.current)
         return;
       const O = fe.current;
@@ -2646,7 +2668,7 @@ function ro(e) {
       const U = F.current.getScrollTop();
       if (F.current.getModel()) {
         ke.current.innerHTML = "";
-        for (const Y of S) {
+        for (const Y of k) {
           const _ = Y.startLine, ue = Y.endLine, Z = F.current.getTopForLineNumber(_) - U, H = F.current.getTopForLineNumber(ue) - U, J = F.current.getOption(O.editor.EditorOption.lineHeight), re = 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 = `${re}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 oe = document.createElement("div");
@@ -2656,15 +2678,15 @@ function ro(e) {
     },
     [m, o, ze, Xe]
   ), rt = Ee(
-    (S) => {
+    (k) => {
       var se, re, G, oe;
       if (!F.current || X)
         return;
-      const O = F.current.getModel(), I = (se = K.current) == null ? void 0 : se.getModel(), $ = (re = ee.current) == null ? void 0 : re.getModel(), P = (G = ie.current) == null ? void 0 : G.getModel();
+      const O = F.current.getModel(), I = (se = C.current) == null ? void 0 : se.getModel(), $ = (re = ee.current) == null ? void 0 : re.getModel(), P = (G = ie.current) == null ? void 0 : G.getModel();
       if (!O || !I || !$ || !P)
         return;
-      const U = P.getLinesContent(), Q = I.getLinesContent(), Y = $.getLinesContent(), _ = qr(U, Q, Y, S, E);
-      if (x(_.isValid ? null : _.validationError || "Invalid JSON"), A(_.warnings || []), j(_.conflictIssues || []), Le.current) {
+      const U = P.getLinesContent(), Q = I.getLinesContent(), Y = $.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");
@@ -2672,9 +2694,9 @@ function ro(e) {
       if (O.getValue() !== _.content) {
         const z = F.current.getPosition(), q = F.current.getSelection();
         if (gt.current = !0, O.setValue(_.content), gt.current = !1, z) {
-          const de = O.getLineCount(), C = O.getLineLength(de), ve = {
-            lineNumber: Math.min(z.lineNumber, de),
-            column: z.lineNumber <= de ? Math.min(z.column, O.getLineLength(z.lineNumber) + 1) : C + 1
+          const he = O.getLineCount(), K = O.getLineLength(he), ve = {
+            lineNumber: Math.min(z.lineNumber, he),
+            column: z.lineNumber <= he ? Math.min(z.column, O.getLineLength(z.lineNumber) + 1) : K + 1
           };
           F.current.setPosition(ve), q && !q.isEmpty() && F.current.setSelection(q);
         }
@@ -2694,19 +2716,19 @@ function ro(e) {
         if (nt(_.conflictIssues), F.current && Z) {
           const z = O;
           if (!z._conflictIssueDecorations) {
-            const C = F.current.createDecorationsCollection(
+            const K = F.current.createDecorationsCollection(
               []
             );
-            z._conflictIssueDecorations = C;
+            z._conflictIssueDecorations = K;
           }
-          const q = z._conflictIssueDecorations, de = _.conflictIssues.map((C) => {
+          const q = z._conflictIssueDecorations, he = _.conflictIssues.map((K) => {
             let ve, Ae;
-            return C.type === "error" ? (ve = o === "vs-dark" ? "rgba(255, 0, 0, 0.1)" : "rgba(255, 0, 0, 0.05)", Ae = o === "vs-dark" ? "#ff6666" : "#cc0000") : C.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(C.startLine, 1, C.endLine, Number.MAX_SAFE_INTEGER),
+            return K.type === "error" ? (ve = o === "vs-dark" ? "rgba(255, 0, 0, 0.1)" : "rgba(255, 0, 0, 0.05)", Ae = o === "vs-dark" ? "#ff6666" : "#cc0000") : K.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(K.startLine, 1, K.endLine, Number.MAX_SAFE_INTEGER),
               options: {
                 isWholeLine: !0,
-                className: `conflict-issue-line conflict-issue-${C.type}`,
-                linesDecorationsClassName: `conflict-issue-line-decoration conflict-issue-${C.type}`,
+                className: `conflict-issue-line conflict-issue-${K.type}`,
+                linesDecorationsClassName: `conflict-issue-line-decoration conflict-issue-${K.type}`,
                 backgroundColor: ve,
                 overviewRuler: {
                   color: Ae,
@@ -2719,7 +2741,7 @@ function ro(e) {
               }
             };
           });
-          q.set(de);
+          q.set(he);
         }
       } else if (F.current) {
         const z = O;
@@ -2737,12 +2759,12 @@ function ro(e) {
         }));
       }
     },
-    [y, E, h, o, nt, m, X]
+    [y, N, h, o, nt, m, X]
   ), mt = Ee(
-    (S, O) => {
+    (k, O) => {
       ne(!1), B((I) => {
         const $ = I.map((P) => {
-          if (P.id !== S) return 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 };
         });
@@ -2751,9 +2773,9 @@ function ro(e) {
     },
     [m, rt]
   ), yt = Ee(
-    (S, O, I, $, P, U, Q) => {
+    (k, O, I, $, P, U, Q) => {
       if (!fe.current) return;
-      const _ = $ === 1 ? K.current : ee.current;
+      const _ = $ === 1 ? C.current : ee.current;
       if (!_) return;
       const ue = $ === 1 ? I.input1Range : I.input2Range, Z = $ === 1 ? I.input1State : I.input2State, H = _.getModel();
       if (!H) return;
@@ -2764,33 +2786,33 @@ function ro(e) {
       let q = Be.current.get(O);
       if (!q) {
         q = document.createElement("div"), q.className = "merge-accept-gutter-marker";
-        const he = document.createElement("div");
-        he.className = "background", q.appendChild(he);
+        const ge = document.createElement("div");
+        ge.className = "background", q.appendChild(ge);
         const pe = document.createElement("div");
         pe.className = "checkbox";
-        const me = document.createElement("div");
-        me.className = "checkbox-background";
-        const Ne = ge(Z, $, I.id, () => mt(I.id, $));
-        me.appendChild(Ne), pe.appendChild(me), q.appendChild(pe), S.appendChild(q), Be.current.set(O, q);
+        const ye = document.createElement("div");
+        ye.className = "checkbox-background";
+        const Ne = me(Z, $, I.id, () => mt(I.id, $));
+        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 de = q.querySelector(".checkbox-background");
-      if (de) {
-        de.innerHTML = "";
-        const he = ge(Z, $, I.id, () => mt(I.id, $));
-        de.appendChild(he);
-      }
-      const C = I.handled, ve = I.focused, Ae = z > 30;
-      q.className = "merge-accept-gutter-marker", C && q.classList.add("handled"), ve && q.classList.add("focused"), Ae ? q.classList.add("multi-line") : q.classList.add("single-line");
+      const he = q.querySelector(".checkbox-background");
+      if (he) {
+        he.innerHTML = "";
+        const ge = me(Z, $, I.id, () => mt(I.id, $));
+        he.appendChild(ge);
+      }
+      const K = I.handled, ve = I.focused, Ae = z > 30;
+      q.className = "merge-accept-gutter-marker", K && 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, me = 24;
+        const pe = z / 2 - 12, ye = 24;
         let Ne = pe;
-        const vn = me, bn = U - me - 24, Ht = me, Gt = z - 24 - me;
+        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`;
       }
     },
-    [mt, ge]
+    [mt, me]
   ), ot = Ee(() => {
     if (!m) {
       const H = Be.current;
@@ -2798,14 +2820,14 @@ function ro(e) {
         se.remove(), H.delete(J);
       return;
     }
-    if (!K.current || !ee.current || !$e.current || !Ye.current || !fe.current)
+    if (!C.current || !ee.current || !$e.current || !Ye.current || !fe.current)
       return;
-    const O = o === "vs-dark" || typeof o == "string" && o.includes("dark"), I = ze(K.current), $ = Xe(K.current), P = ze(ee.current), U = Xe(ee.current);
+    const O = o === "vs-dark" || typeof o == "string" && o.includes("dark"), I = ze(C.current), $ = Xe(C.current), P = ze(ee.current), U = Xe(ee.current);
     $e.current.style.left = `${I}px`, $e.current.style.width = `${$}px`, Ye.current.style.left = `${P}px`, Ye.current.style.width = `${U}px`;
-    const Q = K.current.getVisibleRanges();
+    const Q = C.current.getVisibleRanges();
     if (!Q || Q.length === 0) return;
-    const Y = K.current.getScrollTop(), _ = $e.current.clientHeight, ue = /* @__PURE__ */ new Set();
-    for (const H of N)
+    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`;
@@ -2819,21 +2841,21 @@ function ro(e) {
     const Z = Be.current;
     for (const [H, J] of Z.entries())
       ue.has(H) || (J.remove(), Z.delete(H));
-  }, [N, o, m, ze, Xe, yt]), be = Ee((S, O) => {
+  }, [T, o, m, ze, Xe, yt]), be = Ee((k, O) => {
     var I, $, P;
     try {
       if (fe.current) {
         const U = ($ = (I = fe.current.editor).getTheme) == null ? void 0 : $.call(I);
-        if ((P = U == null ? void 0 : U.colors) != null && P[S])
-          return U.colors[S];
+        if ((P = U == null ? void 0 : U.colors) != null && P[k])
+          return U.colors[k];
       }
     } catch {
     }
     return O;
   }, []), $t = Ee(() => {
-    if (!fe.current || !K.current || !ee.current)
+    if (!fe.current || !C.current || !ee.current)
       return;
-    const S = 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)"), $ = be(
+    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)"), $ = be(
       "diffEditor.insertedTextBackground",
       O ? "rgba(155, 185, 85, 0.2)" : "rgba(155, 185, 85, 0.15)"
     ), P = be(
@@ -2852,18 +2874,18 @@ function ro(e) {
       conflictOverviewColor: U,
       changeOverviewColor: Q,
       baseOverviewColor: Y
-    }, { input1Decorations: Z, input2Decorations: H, baseDecorations: J } = Kr(
-      N,
+    }, { input1Decorations: Z, input2Decorations: H, baseDecorations: J } = Cr(
+      T,
       _,
       ue,
-      S
+      k
     ), se = be("input.background", O ? "#3c3c3c" : "#f3f3f3"), re = be("input.border", O ? "#6b6b6b" : "#c8c8c8"), G = be("focusBorder", O ? "#007acc" : "#0078d4"), oe = be("inputOption.activeForeground", O ? "#3794ff" : "#0078d4"), z = "monaco-three-way-diff-dynamic";
     let q = document.getElementById(z);
     q || (q = document.createElement("style"), q.id = z, document.head.appendChild(q));
-    const de = be(
+    const he = be(
       "diffEditor.insertedTextBackground",
       O ? "rgba(100, 100, 255, 0.15)" : "rgba(100, 100, 255, 0.1)"
-    ), C = be(
+    ), K = be(
       "diffEditor.insertedTextBackground",
       O ? "rgba(155, 185, 85, 0.2)" : "rgba(155, 185, 85, 0.15)"
     );
@@ -2882,7 +2904,7 @@ function ro(e) {
 
       /* Single-side change (green for input2/ours, orange for input1/theirs in 3-way) */
       .monaco-editor .merge-change-incoming {
-        background-color: ${C};
+        background-color: ${K};
       }
       .monaco-editor .merge-change-current {
         background-color: ${$};
@@ -2890,7 +2912,7 @@ function ro(e) {
 
       /* Same change on both sides (blue/purple) */
       .monaco-editor .merge-same-change {
-        background-color: ${de};
+        background-color: ${he};
       }
 
       /* Base changes */
@@ -3052,49 +3074,49 @@ function ro(e) {
         outline: 2px solid ${G};
         outline-offset: 2px;
       }
-    `, Fe.current || (Fe.current = K.current.createDecorationsCollection([])), Fe.current.set(Z), Ue.current || (Ue.current = ee.current.createDecorationsCollection([])), Ue.current.set(H), ie.current && (Ve.current || (Ve.current = ie.current.createDecorationsCollection([])), Ve.current.set(J));
-  }, [N, o, f, be]), Bt = Ee(() => {
+    `, Fe.current || (Fe.current = C.current.createDecorationsCollection([])), Fe.current.set(Z), Ue.current || (Ue.current = ee.current.createDecorationsCollection([])), Ue.current.set(H), ie.current && (Ve.current || (Ve.current = ie.current.createDecorationsCollection([])), Ve.current.set(J));
+  }, [T, o, f, be]), Bt = Ee(() => {
     if (!De.current && Ie.current && fe.current && !b) {
-      const S = fe.current;
+      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"), $ = I ? "#444" : "#ddd", P = I ? "#fff" : "#333", U = (C, ve) => {
-        var Ae, Oe, he;
+      const I = o === "vs-dark" || typeof o == "string" && o.includes("dark"), $ = I ? "#444" : "#ddd", P = I ? "#fff" : "#333", U = (K, ve) => {
+        var Ae, Oe, ge;
         try {
-          const pe = (Oe = (Ae = S.editor).getTheme) == null ? void 0 : Oe.call(Ae);
-          if ((he = pe == null ? void 0 : pe.colors) != null && he[C])
-            return pe.colors[C];
+          const pe = (Oe = (Ae = k.editor).getTheme) == null ? void 0 : Oe.call(Ae);
+          if ((ge = pe == null ? void 0 : pe.colors) != null && ge[K])
+            return pe.colors[K];
         } catch {
         }
         return ve;
-      }, Q = U("mergeEditor.conflict.input1.header.background", I ? "#4B1818" : "#FFE6E6"), Y = U("editorGutter.background", I ? "#333" : "#f0f0f0"), _ = U("mergeEditor.conflict.input2.header.background", I ? "#1B4B18" : "#E6FFE6"), ue = U("mergeEditor.result.header.background", I ? "#7F5F00" : "#FFECB3"), Z = (C, ve, Ae = !1) => {
+      }, 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 = (K, 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 ${$}`;
-        const he = document.createElement("div");
-        he.textContent = C, he.style.padding = "4px 8px", he.style.fontSize = "11px", he.style.fontWeight = "500", he.style.backgroundColor = ve, he.style.color = P, he.style.borderBottom = `1px solid ${$}`, Oe.appendChild(he);
+        const ge = document.createElement("div");
+        ge.textContent = K, 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 ${$}`, Oe.appendChild(ge);
         const pe = document.createElement("div");
         pe.style.flex = "1", pe.style.position = "relative", pe.style.overflow = "hidden";
-        const me = document.createElement("div");
-        me.style.position = "absolute", me.style.left = "0", me.style.right = "0", me.style.top = "0", me.style.bottom = "0", pe.appendChild(me);
+        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: me, gutterDiv: Ne };
+        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 re = null;
       if (se) {
         re = Z((h == null ? void 0 : h.base) || "Base", Y, !1);
-        const C = [];
-        d === 0 ? C.push(re.container, H.container, J.container) : d === 1 ? C.push(H.container, re.container, J.container) : d === 2 && C.push(H.container, J.container, re.container), C.forEach((ve) => {
+        const K = [];
+        d === 0 ? K.push(re.container, H.container, J.container) : d === 1 ? K.push(H.container, re.container, J.container) : d === 2 && K.push(H.container, J.container, re.container), K.forEach((ve) => {
           O.appendChild(ve);
         });
       } 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 oe = S.editor.createModel(t || "", T), z = se ? S.editor.createModel(n || "", T) : null, q = S.editor.createModel(r || "", T);
-      if (K.current = S.editor.create(H.editorDiv, {
+      const oe = 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: oe,
         readOnly: !0,
         automaticLayout: !0,
@@ -3102,7 +3124,7 @@ function ro(e) {
         glyphMargin: !1,
         ...i,
         lineDecorationsWidth: m ? 26 : 10
-      }), se && re && (ie.current = S.editor.create(re.editorDiv, {
+      }), se && re && (ie.current = k.editor.create(re.editorDiv, {
         model: z,
         readOnly: !0,
         automaticLayout: !0,
@@ -3110,7 +3132,7 @@ function ro(e) {
         glyphMargin: !1,
         ...i,
         lineDecorationsWidth: 10
-      })), ee.current = S.editor.create(J.editorDiv, {
+      })), ee.current = k.editor.create(J.editorDiv, {
         model: q,
         readOnly: !0,
         automaticLayout: !0,
@@ -3119,71 +3141,71 @@ function ro(e) {
         ...i,
         lineDecorationsWidth: m ? 26 : 10
       }), m && G) {
-        const C = S.editor.createModel(r || "", T);
-        F.current = S.editor.create(G.editorDiv, {
-          model: C,
+        const K = k.editor.createModel(r || "", E);
+        F.current = k.editor.create(G.editorDiv, {
+          model: K,
           automaticLayout: !0,
           folding: !m,
           glyphMargin: !1,
           ...i,
           readOnly: !1,
           lineDecorationsWidth: 26
-        }), C.onDidChangeContent(() => {
+        }), K.onDidChangeContent(() => {
           gt.current || ne(!0);
         });
       }
-      S.editor.setTheme(o);
-      const de = xt(z, oe, q);
-      B(de), De.current = !0, l && K.current && l(K.current, S);
+      k.editor.setTheme(o);
+      const he = xt(z, oe, q);
+      B(he), De.current = !0, l && C.current && l(C.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);
   return Se(() => {
     var P, U, Q, Y, _, ue, Z, H, J, se, re;
-    const S = Ft.current !== m, O = Ut.current !== d, I = Vt.current !== L, $ = Jt.current !== n;
-    if ((S || O || I || $) && De.current) {
-      Ft.current = m, Ut.current = d, Vt.current = L, Jt.current = n, Be.current.forEach((de) => {
-        de.remove();
+    const k = Ft.current !== m, O = Ut.current !== d, I = Vt.current !== L, $ = Jt.current !== n;
+    if ((k || O || I || $) && 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 = K.current) == null ? void 0 : Y.getModel(), oe = (_ = ie.current) == null ? void 0 : _.getModel(), z = (ue = ee.current) == null ? void 0 : ue.getModel(), q = (Z = F.current) == null ? void 0 : Z.getModel();
-      (H = K.current) == null || H.dispose(), (J = ie.current) == null || J.dispose(), (se = ee.current) == null || se.dispose(), (re = F.current) == null || re.dispose(), G == null || G.dispose(), oe == null || oe.dispose(), z == null || z.dispose(), q == null || q.dispose(), De.current = !1, Te((de) => de + 1);
+      const G = (Y = C.current) == null ? void 0 : Y.getModel(), oe = (_ = ie.current) == null ? void 0 : _.getModel(), z = (ue = ee.current) == null ? void 0 : ue.getModel(), q = (Z = F.current) == null ? void 0 : Z.getModel();
+      (H = C.current) == null || H.dispose(), (J = ie.current) == null || J.dispose(), (se = ee.current) == null || se.dispose(), (re = F.current) == null || re.dispose(), G == null || G.dispose(), oe == null || oe.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(() => {
-    !k || !i || (K.current && K.current.updateOptions(i), ee.current && ee.current.updateOptions(i), ie.current && ie.current.updateOptions(i), F.current && F.current.updateOptions(i));
-  }, [i, k]), Se(() => {
-    k && N.length > 0 && ($t(), m && ot());
-  }, [k, N, $t, ot, m]), Se(() => {
-    k && N.length > 0 && m && F.current && rt(N);
-  }, [k, N, m, rt]), Se(() => {
-    if (!k) return;
-    const S = () => {
+    !S || !i || (C.current && C.current.updateOptions(i), ee.current && ee.current.updateOptions(i), ie.current && ie.current.updateOptions(i), F.current && F.current.updateOptions(i));
+  }, [i, S]), Se(() => {
+    S && T.length > 0 && ($t(), m && ot());
+  }, [S, T, $t, ot, m]), Se(() => {
+    S && T.length > 0 && m && F.current && rt(T);
+  }, [S, T, m, rt]), Se(() => {
+    if (!S) return;
+    const k = () => {
       w.length > 0 && nt(w);
     }, O = [], I = () => {
       ot();
     };
-    return K.current && O.push(K.current.onDidScrollChange(I)), ee.current && O.push(ee.current.onDidScrollChange(I)), F.current && m && (O.push(F.current.onDidScrollChange(S)), O.push(F.current.onDidLayoutChange(S))), K.current && O.push(K.current.onDidLayoutChange(I)), ee.current && O.push(ee.current.onDidLayoutChange(I)), () => {
+    return C.current && O.push(C.current.onDidScrollChange(I)), ee.current && O.push(ee.current.onDidScrollChange(I)), F.current && m && (O.push(F.current.onDidScrollChange(k)), O.push(F.current.onDidLayoutChange(k))), C.current && O.push(C.current.onDidLayoutChange(I)), ee.current && O.push(ee.current.onDidLayoutChange(I)), () => {
       O.forEach(($) => {
         $ == null || $.dispose();
       });
     };
-  }, [k, ot, nt, m, w]), Se(() => {
-    if (!k) return;
-    const S = [K.current, ie.current, ee.current];
-    m && F.current && S.push(F.current);
+  }, [S, ot, nt, m, w]), Se(() => {
+    if (!S) return;
+    const k = [C.current, ie.current, ee.current];
+    m && F.current && k.push(F.current);
     const O = [];
     let I = !1;
     const $ = (P) => {
       if (I) return;
       I = !0;
       const U = P.getScrollTop(), Q = P.getScrollLeft();
-      S.forEach((Y) => {
+      k.forEach((Y) => {
         Y && Y !== P && (Y.setScrollTop(U), Y.setScrollLeft(Q));
       }), setTimeout(() => {
         I = !1;
       }, 10);
     };
-    return S.forEach((P) => {
+    return k.forEach((P) => {
       P && O.push(
         P.onDidScrollChange(() => {
           $(P);
@@ -3194,12 +3216,12 @@ function ro(e) {
         P == null || P.dispose();
       });
     };
-  }, [k, m]), Se(() => () => {
+  }, [S, m]), Se(() => () => {
     var P, U, Q, Y, _, ue, Z, H, J, se, re;
     (P = Fe.current) == null || P.set([]), (U = Ue.current) == null || U.set([]), (Q = Ve.current) == null || Q.set([]);
-    const S = (Y = K.current) == null ? void 0 : Y.getModel(), O = (_ = ie.current) == null ? void 0 : _.getModel(), I = (ue = ee.current) == null ? void 0 : ue.getModel(), $ = (Z = F.current) == null ? void 0 : Z.getModel();
-    (H = K.current) == null || H.dispose(), (J = ie.current) == null || J.dispose(), (se = ee.current) == null || se.dispose(), (re = F.current) == null || re.dispose(), S == null || S.dispose(), O == null || O.dispose(), I == null || I.dispose(), $ == null || $.dispose(), De.current = !1, g(!1);
-  }, []), b || !k ? /* @__PURE__ */ st(On, { children: u ?? /* @__PURE__ */ st(Cr, {}) }) : /* @__PURE__ */ st("div", { ref: Ie, style: { width: s, height: c }, className: a });
+    const k = (Y = C.current) == null ? void 0 : Y.getModel(), O = (_ = ie.current) == null ? void 0 : _.getModel(), I = (ue = ee.current) == null ? void 0 : ue.getModel(), $ = (Z = F.current) == null ? void 0 : Z.getModel();
+    (H = C.current) == null || H.dispose(), (J = ie.current) == null || J.dispose(), (se = ee.current) == null || se.dispose(), (re = F.current) == null || re.dispose(), k == null || k.dispose(), O == null || O.dispose(), I == null || I.dispose(), $ == null || $.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 });
 }
 export {
   ro as JsonDiffMergeEditor,