react-monaco-json-merge 1.2.0 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/editor.d.ts.map +1 -1
- package/dist/index.cjs +33 -33
- package/dist/index.cjs.map +1 -1
- package/dist/index.mjs +1459 -1356
- package/dist/index.mjs.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/utils/jsonPatchDiff.d.ts.map +1 -1
- package/package.json +1 -1
package/dist/index.cjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const
|
|
2
|
-
In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}function
|
|
1
|
+
"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const ot=require("react/jsx-runtime"),j=require("react");function Qt(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 _n(e){if(Array.isArray(e))return e}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 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,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){f=!0,o=l}finally{try{if(!a&&r.return!=null&&(s=r.return(),Object(s)!==s))return}finally{if(f)throw o}}return c}}function Dn(){throw new TypeError(`Invalid attempt to destructure non-iterable instance.
|
|
2
|
+
In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}function Zt(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(o){return Object.getOwnPropertyDescriptor(e,o).enumerable})),r.push.apply(r,n)}return r}function en(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){Rn(e,n,r[n])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):Zt(Object(r)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(r,n))})}return e}function xn(e,t){if(e==null)return{};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 Mn(e,t){if(e==null)return{};var r={};for(var n in e)if({}.hasOwnProperty.call(e,n)){if(t.indexOf(n)!==-1)continue;r[n]=e[n]}return r}function $n(e,t){return _n(e)||jn(e,t)||Un(e,t)||Dn()}function Bn(e,t){if(typeof e!="object"||!e)return e;var r=e[Symbol.toPrimitive];if(r!==void 0){var n=r.call(e,t);if(typeof n!="object")return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return(t==="string"?String:Number)(e)}function Fn(e){var t=Bn(e,"string");return typeof t=="symbol"?t:t+""}function Un(e,t){if(e){if(typeof e=="string")return Qt(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)?Qt(e,t):void 0}}function Vn(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function tn(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(o){return Object.getOwnPropertyDescriptor(e,o).enumerable})),r.push.apply(r,n)}return r}function nn(e){for(var t=1;t<arguments.length;t++){var r=arguments[t]!=null?arguments[t]:{};t%2?tn(Object(r),!0).forEach(function(n){Vn(e,n,r[n])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):tn(Object(r)).forEach(function(n){Object.defineProperty(e,n,Object.getOwnPropertyDescriptor(r,n))})}return e}function Jn(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r];return function(n){return t.reduceRight(function(o,i){return i(o)},n)}}function it(e){return function t(){for(var r=this,n=arguments.length,o=new Array(n),i=0;i<n;i++)o[i]=arguments[i];return o.length>=e.length?e.apply(this,o):function(){for(var s=arguments.length,c=new Array(s),a=0;a<s;a++)c[a]=arguments[a];return t.apply(r,[].concat(o,c))}}}function gt(e){return{}.toString.call(e).includes("Object")}function Hn(e){return!Object.keys(e).length}function st(e){return typeof e=="function"}function Gn(e,t){return Object.prototype.hasOwnProperty.call(e,t)}function Wn(e,t){return gt(t)||je("changeType"),Object.keys(t).some(function(r){return!Gn(e,r)})&&je("changeField"),t}function Cn(e){st(e)||je("selectorType")}function qn(e){st(e)||gt(e)||je("handlerType"),gt(e)&&Object.values(e).some(function(t){return!st(t)})&&je("handlersType")}function Yn(e){e||je("initialIsRequired"),gt(e)||je("initialType"),Hn(e)&&je("initialContent")}function zn(e,t){throw new Error(e[t]||e.default)}var Xn={initialIsRequired:"initial state is required",initialType:"initial state should be an object",initialContent:"initial state shouldn't be an empty object",handlerType:"handler should be an object or a function",handlersType:"all handlers should be a functions",selectorType:"selector should be a function",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=it(zn)(Xn),pt={changes:Wn,selector:Cn,handler:qn,initial:Yn};function Kn(e){var t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{};pt.initial(e),pt.handler(t);var r={current:e},n=it(er)(r,t),o=it(Zn)(r),i=it(pt.changes)(e),s=it(Qn)(r);function c(){var f=arguments.length>0&&arguments[0]!==void 0?arguments[0]:function(l){return l};return pt.selector(f),f(r.current)}function a(f){Jn(n,o,i,s)(f)}return[c,a]}function Qn(e,t){return st(t)?t(e.current):t}function Zn(e,t){return e.current=nn(nn({},e.current),t),t}function er(e,t,r){return st(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 tr={create:Kn},nr={paths:{vs:"https://cdn.jsdelivr.net/npm/monaco-editor@0.54.0/min/vs"}};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];return o.length>=e.length?e.apply(this,o):function(){for(var s=arguments.length,c=new Array(s),a=0;a<s;a++)c[a]=arguments[a];return t.apply(r,[].concat(o,c))}}}function or(e){return{}.toString.call(e).includes("Object")}function ir(e){return e||rn("configIsRequired"),or(e)||rn("configType"),e.urls?(sr(),{paths:{vs:e.urls.monacoBase}}):e}function sr(){console.warn(pn.deprecation)}function cr(e,t){throw new Error(e[t]||e.default)}var pn={configIsRequired:"the configuration object is required",configType:"the configuration object should be an object",default:"an unknown error accured in `@monaco-editor/loader` package",deprecation:`Deprecation warning!
|
|
3
3
|
You are using deprecated way of configuration.
|
|
4
4
|
|
|
5
5
|
Instead of using
|
|
@@ -8,34 +8,34 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
|
|
|
8
8
|
monaco.config({ paths: { vs: '...' } })
|
|
9
9
|
|
|
10
10
|
For more please check the link https://github.com/suren-atoyan/monaco-loader#config
|
|
11
|
-
`},
|
|
12
|
-
`;break;case 114:
|
|
13
|
-
`),c++,
|
|
14
|
-
`+" ".repeat(t)),new Array(
|
|
15
|
-
`+" ".repeat(t)),new Array(
|
|
16
|
-
`+" ".repeat(t)),new Array(
|
|
17
|
-
`+" ".repeat(t));var
|
|
11
|
+
`},rn=rr(cr)(pn),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){return r.reduceRight(function(i,s){return s(i)},o)}};function dn(e,t){return Object.keys(t).forEach(function(r){t[r]instanceof Object&&e[r]&&Object.assign(t[r],dn(e[r],t[r]))}),en(en({},e),t)}var ur={type:"cancelation",msg:"operation is manually canceled"};function Et(e){var t=!1,r=new Promise(function(n,o){e.then(function(i){return t?o(ur):n(i)}),e.catch(o)});return r.cancel=function(){return t=!0},r}var fr=["monaco"],pr=tr.create({config:nr,isInitialized:!1,resolve:null,reject:null,monaco:null}),hn=$n(pr,2),at=hn[0],bt=hn[1];function dr(e){var t=ar.config(e),r=t.monaco,n=xn(t,fr);bt(function(o){return{config:dn(o.config,n),monaco:r}})}function hr(){var e=at(function(t){var r=t.monaco,n=t.isInitialized,o=t.resolve;return{monaco:r,isInitialized:n,resolve:o}});if(!e.isInitialized){if(bt({isInitialized:!0}),e.monaco)return e.resolve(e.monaco),Et(Tt);if(window.monaco&&window.monaco.editor)return gn(window.monaco),e.resolve(window.monaco),Et(Tt);lr(gr,yr)(vr)}return Et(Tt)}function gr(e){return document.body.appendChild(e)}function mr(e){var t=document.createElement("script");return e&&(t.src=e),t}function yr(e){var t=at(function(n){var o=n.config,i=n.reject;return{config:o,reject:i}}),r=mr("".concat(t.config.paths.vs,"/loader.js"));return r.onload=function(){return e()},r.onerror=t.reject,r}function vr(){var e=at(function(r){var n=r.config,o=r.resolve,i=r.reject;return{config:n,resolve:o,reject:i}}),t=window.require;t.config(e.config),t(["vs/editor/editor.main"],function(r){var n=r.m;gn(n),e.resolve(n)},function(r){e.reject(r)})}function gn(e){at().monaco||bt({monaco:e})}function br(){return at(function(e){var t=e.monaco;return t})}var Tt=new Promise(function(e,t){return bt({resolve:e,reject:t})}),wr={config:dr,init:hr,__getMonacoInstance:br},ie=(e=>(e[e.excluded=0]="excluded",e[e.first=1]="first",e[e.second=2]="second",e))(ie||{}),B=(e=>(e.SAME_CHANGE="same_change",e.INPUT1_ONLY="input1_only",e.INPUT2_ONLY="input2_only",e.TRUE_CONFLICT="true_conflict",e))(B||{});function Or(e,t=!1){const r=e.length;let n=0,o="",i=0,s=16,c=0,a=0,f=0,l=0,y=0;function d(u,A){let L=0,p=0;for(;L<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++,L++}return L<u&&(p=-1),p}function h(u){n=u,o="",i=0,s=16,y=0}function T(){let u=n;if(e.charCodeAt(n)===48)n++;else for(n++;n<e.length&&Ce(e.charCodeAt(n));)n++;if(n<e.length&&e.charCodeAt(n)===46)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(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&&Ce(e.charCodeAt(n))){for(n++;n<e.length&&Ce(e.charCodeAt(n));)n++;A=n}else y=3;return e.substring(u,A)}function N(){let u="",A=n;for(;;){if(n>=r){u+=e.substring(A,n),y=2;break}const L=e.charCodeAt(n);if(L===34){u+=e.substring(A,n),n++;break}if(L===92){if(u+=e.substring(A,n),n++,n>=r){y=2;break}switch(e.charCodeAt(n++)){case 34:u+='"';break;case 92:u+="\\";break;case 47:u+="/";break;case 98:u+="\b";break;case 102:u+="\f";break;case 110:u+=`
|
|
12
|
+
`;break;case 114:u+="\r";break;case 116:u+=" ";break;case 117:const v=d(4);v>=0?u+=String.fromCharCode(v):y=4;break;default:y=5}A=n;continue}if(L>=0&&L<=31)if(nt(L)){u+=e.substring(A,n),y=2;break}else y=6;n++}return u}function m(){if(o="",y=0,i=n,a=c,l=f,n>=r)return i=r,s=17;let u=e.charCodeAt(n);if(It(u)){do n++,o+=String.fromCharCode(u),u=e.charCodeAt(n);while(It(u));return s=15}if(nt(u))return n++,o+=String.fromCharCode(u),u===13&&e.charCodeAt(n)===10&&(n++,o+=`
|
|
13
|
+
`),c++,f=n,s=14;switch(u){case 123:return n++,s=1;case 125:return n++,s=2;case 91:return n++,s=3;case 93:return n++,s=4;case 58:return n++,s=6;case 44:return n++,s=5;case 34:return n++,o=N(),s=10;case 47:const A=n-1;if(e.charCodeAt(n+1)===47){for(n+=2;n<r&&!nt(e.charCodeAt(n));)n++;return o=e.substring(A,n),s=12}if(e.charCodeAt(n+1)===42){n+=2;const L=r-1;let p=!1;for(;n<L;){const v=e.charCodeAt(n);if(v===42&&e.charCodeAt(n+1)===47){n+=2,p=!0;break}n++,nt(v)&&(v===13&&e.charCodeAt(n)===10&&n++,c++,f=n)}return p||(n++,y=1),o=e.substring(A,n),s=13}return o+=String.fromCharCode(u),n++,s=16;case 45:if(o+=String.fromCharCode(u),n++,n===r||!Ce(e.charCodeAt(n)))return s=16;case 48:case 49:case 50:case 51:case 52:case 53:case 54:case 55:case 56:case 57:return o+=T(),s=11;default:for(;n<r&&g(u);)n++,u=e.charCodeAt(n);if(i!==n){switch(o=e.substring(i,n),o){case"true":return s=8;case"false":return s=9;case"null":return s=7}return s=16}return o+=String.fromCharCode(u),n++,s=16}}function g(u){if(It(u)||nt(u))return!1;switch(u){case 125:case 93:case 123:case 91:case 34:case 58:case 44:case 47:return!1}return!0}function O(){let u;do u=m();while(u>=12&&u<=15);return u}return{setPosition:h,getPosition:()=>n,scan:t?O:m,getToken:()=>s,getTokenValue:()=>o,getTokenOffset:()=>i,getTokenLength:()=>n-i,getTokenStartLine:()=>a,getTokenStartCharacter:()=>i-l,getTokenError:()=>y}}function It(e){return e===32||e===9}function nt(e){return e===10||e===13}function Ce(e){return e>=48&&e<=57}var on;(function(e){e[e.lineFeed=10]="lineFeed",e[e.carriageReturn=13]="carriageReturn",e[e.space=32]="space",e[e._0=48]="_0",e[e._1=49]="_1",e[e._2=50]="_2",e[e._3=51]="_3",e[e._4=52]="_4",e[e._5=53]="_5",e[e._6=54]="_6",e[e._7=55]="_7",e[e._8=56]="_8",e[e._9=57]="_9",e[e.a=97]="a",e[e.b=98]="b",e[e.c=99]="c",e[e.d=100]="d",e[e.e=101]="e",e[e.f=102]="f",e[e.g=103]="g",e[e.h=104]="h",e[e.i=105]="i",e[e.j=106]="j",e[e.k=107]="k",e[e.l=108]="l",e[e.m=109]="m",e[e.n=110]="n",e[e.o=111]="o",e[e.p=112]="p",e[e.q=113]="q",e[e.r=114]="r",e[e.s=115]="s",e[e.t=116]="t",e[e.u=117]="u",e[e.v=118]="v",e[e.w=119]="w",e[e.x=120]="x",e[e.y=121]="y",e[e.z=122]="z",e[e.A=65]="A",e[e.B=66]="B",e[e.C=67]="C",e[e.D=68]="D",e[e.E=69]="E",e[e.F=70]="F",e[e.G=71]="G",e[e.H=72]="H",e[e.I=73]="I",e[e.J=74]="J",e[e.K=75]="K",e[e.L=76]="L",e[e.M=77]="M",e[e.N=78]="N",e[e.O=79]="O",e[e.P=80]="P",e[e.Q=81]="Q",e[e.R=82]="R",e[e.S=83]="S",e[e.T=84]="T",e[e.U=85]="U",e[e.V=86]="V",e[e.W=87]="W",e[e.X=88]="X",e[e.Y=89]="Y",e[e.Z=90]="Z",e[e.asterisk=42]="asterisk",e[e.backslash=92]="backslash",e[e.closeBrace=125]="closeBrace",e[e.closeBracket=93]="closeBracket",e[e.colon=58]="colon",e[e.comma=44]="comma",e[e.dot=46]="dot",e[e.doubleQuote=34]="doubleQuote",e[e.minus=45]="minus",e[e.openBrace=123]="openBrace",e[e.openBracket=91]="openBracket",e[e.plus=43]="plus",e[e.slash=47]="slash",e[e.formFeed=12]="formFeed",e[e.tab=9]="tab"})(on||(on={}));new Array(20).fill(0).map((e,t)=>" ".repeat(t));const qe=200;new Array(qe).fill(0).map((e,t)=>`
|
|
14
|
+
`+" ".repeat(t)),new Array(qe).fill(0).map((e,t)=>"\r"+" ".repeat(t)),new Array(qe).fill(0).map((e,t)=>`\r
|
|
15
|
+
`+" ".repeat(t)),new Array(qe).fill(0).map((e,t)=>`
|
|
16
|
+
`+" ".repeat(t)),new Array(qe).fill(0).map((e,t)=>"\r"+" ".repeat(t)),new Array(qe).fill(0).map((e,t)=>`\r
|
|
17
|
+
`+" ".repeat(t));var mt;(function(e){e.DEFAULT={allowTrailingComma:!1}})(mt||(mt={}));function Ar(e,t=[],r=mt.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)}function i(a){return n.children.push(a),a}Er(e,{onObjectBegin:a=>{n=i({type:"object",offset:a,length:-1,parent:n,children:[]})},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,f)=>{o(a+f),n.length=a+f-n.offset,n=n.parent,o(a+f)},onArrayBegin:(a,f)=>{n=i({type:"array",offset:a,length:-1,parent:n,children:[]})},onArrayEnd:(a,f)=>{n.length=a+f-n.offset,n=n.parent,o(a+f)},onLiteralValue:(a,f,l)=>{i({type:Tr(a),offset:f,length:l,parent:n,value:a}),o(f+l)},onSeparator:(a,f,l)=>{n.type==="property"&&(a===":"?n.colonOffset=f:a===","&&o(f))},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 Nr(e,t){if(!e)return;let r=e;for(let n of t)if(typeof n=="string"){if(r.type!=="object"||!Array.isArray(r.children))return;let o=!1;for(const i of r.children)if(Array.isArray(i.children)&&i.children[0].value===n&&i.children.length===2){r=i.children[1],o=!0;break}if(!o)return}else{const o=n;if(r.type!=="array"||o<0||!Array.isArray(r.children)||o>=r.children.length)return;r=r.children[o]}return r}function Er(e,t,r=mt.DEFAULT){const n=Or(e,!1),o=[];let i=0;function s(k){return k?()=>i===0&&k(n.getTokenOffset(),n.getTokenLength(),n.getTokenStartLine(),n.getTokenStartCharacter()):()=>!0}function c(k){return k?I=>i===0&&k(I,n.getTokenOffset(),n.getTokenLength(),n.getTokenStartLine(),n.getTokenStartCharacter()):()=>!0}function a(k){return k?I=>i===0&&k(I,n.getTokenOffset(),n.getTokenLength(),n.getTokenStartLine(),n.getTokenStartCharacter(),()=>o.slice()):()=>!0}function f(k){return k?()=>{i>0?i++:k(n.getTokenOffset(),n.getTokenLength(),n.getTokenStartLine(),n.getTokenStartCharacter(),()=>o.slice())===!1&&(i=1)}:()=>!0}function l(k){return k?()=>{i>0&&i--,i===0&&k(n.getTokenOffset(),n.getTokenLength(),n.getTokenStartLine(),n.getTokenStartCharacter())}:()=>!0}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,L=r&&r.allowTrailingComma;function p(){for(;;){const k=n.scan();switch(n.getTokenError()){case 4:v(14);break;case 5:v(15);break;case 3:v(13);break;case 1:A||v(11);break;case 2:v(12);break;case 6:v(16);break}switch(k){case 12:case 13:A?v(10):O();break;case 16:v(1);break;case 15:case 14:break;default:return k}}}function v(k,I=[],x=[]){if(u(k),I.length+x.length>0){let Q=n.getToken();for(;Q!==17;){if(I.indexOf(Q)!==-1){p();break}else if(x.indexOf(Q)!==-1)break;Q=p()}}}function R(k){const I=n.getTokenValue();return k?m(I):(d(I),o.push(I)),p(),!0}function P(){switch(n.getToken()){case 11:const k=n.getTokenValue();let I=Number(k);isNaN(I)&&(v(2),I=0),m(I);break;case 7:m(null);break;case 8:m(!0);break;case 9:m(!1);break;default:return!1}return p(),!0}function M(){return n.getToken()!==10?(v(3,[],[2,5]),!1):(R(!1),n.getToken()===6?(g(":"),p(),U()||v(4,[],[2,5])):v(5,[],[2,5]),o.pop(),!0)}function $(){y(),p();let k=!1;for(;n.getToken()!==2&&n.getToken()!==17;){if(n.getToken()===5){if(k||v(4,[],[]),g(","),p(),n.getToken()===2&&L)break}else k&&v(6,[],[]);M()||v(4,[],[2,5]),k=!0}return h(),n.getToken()!==2?v(7,[2],[]):p(),!0}function F(){T(),p();let k=!0,I=!1;for(;n.getToken()!==4&&n.getToken()!==17;){if(n.getToken()===5){if(I||v(4,[],[]),g(","),p(),n.getToken()===4&&L)break}else I&&v(6,[],[]);k?(o.push(0),k=!1):o[o.length-1]++,U()||v(4,[],[4,5]),I=!0}return N(),k||o.pop(),n.getToken()!==4?v(8,[4],[]):p(),!0}function U(){switch(n.getToken()){case 3:return F();case 1:return $();case 10:return R(!0);default:return P()}}return p(),n.getToken()===17?r.allowEmptyContent?!0:(v(4,[],[]),!1):U()?(n.getToken()!==17&&v(9,[],[]),!0):(v(4,[],[]),!1)}function Tr(e){switch(typeof e){case"boolean":return"boolean";case"number":return"number";case"string":return"string";case"object":{if(e){if(Array.isArray(e))return"array"}else return"null";return"object"}default:return"null"}}var sn;(function(e){e[e.None=0]="None",e[e.UnexpectedEndOfComment=1]="UnexpectedEndOfComment",e[e.UnexpectedEndOfString=2]="UnexpectedEndOfString",e[e.UnexpectedEndOfNumber=3]="UnexpectedEndOfNumber",e[e.InvalidUnicode=4]="InvalidUnicode",e[e.InvalidEscapeCharacter=5]="InvalidEscapeCharacter",e[e.InvalidCharacter=6]="InvalidCharacter"})(sn||(sn={}));var cn;(function(e){e[e.OpenBraceToken=1]="OpenBraceToken",e[e.CloseBraceToken=2]="CloseBraceToken",e[e.OpenBracketToken=3]="OpenBracketToken",e[e.CloseBracketToken=4]="CloseBracketToken",e[e.CommaToken=5]="CommaToken",e[e.ColonToken=6]="ColonToken",e[e.NullKeyword=7]="NullKeyword",e[e.TrueKeyword=8]="TrueKeyword",e[e.FalseKeyword=9]="FalseKeyword",e[e.StringLiteral=10]="StringLiteral",e[e.NumericLiteral=11]="NumericLiteral",e[e.LineCommentTrivia=12]="LineCommentTrivia",e[e.BlockCommentTrivia=13]="BlockCommentTrivia",e[e.LineBreakTrivia=14]="LineBreakTrivia",e[e.Trivia=15]="Trivia",e[e.Unknown=16]="Unknown",e[e.EOF=17]="EOF"})(cn||(cn={}));const mn=Ar,yn=Nr;var an;(function(e){e[e.InvalidSymbol=1]="InvalidSymbol",e[e.InvalidNumberFormat=2]="InvalidNumberFormat",e[e.PropertyNameExpected=3]="PropertyNameExpected",e[e.ValueExpected=4]="ValueExpected",e[e.ColonExpected=5]="ColonExpected",e[e.CommaExpected=6]="CommaExpected",e[e.CloseBraceExpected=7]="CloseBraceExpected",e[e.CloseBracketExpected=8]="CloseBracketExpected",e[e.EndOfFileExpected=9]="EndOfFileExpected",e[e.InvalidCommentToken=10]="InvalidCommentToken",e[e.UnexpectedEndOfComment=11]="UnexpectedEndOfComment",e[e.UnexpectedEndOfString=12]="UnexpectedEndOfString",e[e.UnexpectedEndOfNumber=13]="UnexpectedEndOfNumber",e[e.InvalidUnicode=14]="InvalidUnicode",e[e.InvalidEscapeCharacter=15]="InvalidEscapeCharacter",e[e.InvalidCharacter=16]="InvalidCharacter"})(an||(an={}));function Ir(e){return e&&e.__esModule&&Object.prototype.hasOwnProperty.call(e,"default")?e.default:e}var kt,ln;function kr(){return ln||(ln=1,kt=function e(t,r){if(t===r)return!0;if(t&&r&&typeof t=="object"&&typeof r=="object"){if(t.constructor!==r.constructor)return!1;var n,o,i;if(Array.isArray(t)){if(n=t.length,n!=r.length)return!1;for(o=n;o--!==0;)if(!e(t[o],r[o]))return!1;return!0}if(t.constructor===RegExp)return t.source===r.source&&t.flags===r.flags;if(t.valueOf!==Object.prototype.valueOf)return t.valueOf()===r.valueOf();if(t.toString!==Object.prototype.toString)return t.toString()===r.toString();if(i=Object.keys(t),n=i.length,n!==Object.keys(r).length)return!1;for(o=n;o--!==0;)if(!Object.prototype.hasOwnProperty.call(r,i[o]))return!1;for(o=n;o--!==0;){var s=i[o];if(!e(t[s],r[s]))return!1}return!0}return t!==t&&r!==r}),kt}var Sr=kr();const he=Ir(Sr);function St(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 Lt(e,t){return Array.isArray(e)&&e.length>0?[...e,t]:[t]}function Lr(e,t={}){if(!St(e)&&!Array.isArray(e))throw new TypeError("Expected a plain object or array");const{deep:r=!1,compare:n,ignoreKeys:o}=t,i=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=Lt(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(St(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 L=l[A],p=Lt(y,A);s({key:A,value:L,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 L=l[A],p=Lt(y,A),v={key:A,value:L,path:p,depth:d};let R=L;c(v)&&(Array.isArray(L)?R=a(L,p,d):St(L)&&(R=f(L,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)}const H=(e,t)=>{if(!e)return;const r=t.replace(/^\//,"").replace(/\[/g,".").replace(/\]/g,"").split(/[./#]/).filter(Boolean);let n=e;for(const o of r){if(!n||typeof n!="object")return;if(Array.isArray(n)){const i=Number.parseInt(o,10);if(Number.isNaN(i)||i<0||i>=n.length)return;n=n[i]}else if(o in n)n=n[o];else return}return n};/*!
|
|
18
18
|
* https://github.com/Starcounter-Jack/JSON-Patch
|
|
19
19
|
* (c) 2017-2022 Joachim Wester
|
|
20
20
|
* MIT licensed
|
|
21
|
-
*/var
|
|
22
|
-
`)}var
|
|
21
|
+
*/var Pr=(function(){var e=function(t,r){return e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(n,o){n.__proto__=o}||function(n,o){for(var i in o)o.hasOwnProperty(i)&&(n[i]=o[i])},e(t,r)};return function(t,r){e(t,r);function n(){this.constructor=t}t.prototype=r===null?Object.create(r):(n.prototype=r.prototype,new n)}})(),_r=Object.prototype.hasOwnProperty;function Rt(e,t){return _r.call(e,t)}function jt(e){if(Array.isArray(e)){for(var t=new Array(e.length),r=0;r<t.length;r++)t[r]=""+r;return t}if(Object.keys)return Object.keys(e);var n=[];for(var o in e)Rt(e,o)&&n.push(o);return n}function Oe(e){switch(typeof e){case"object":return JSON.parse(JSON.stringify(e));case"undefined":return null;default:return e}}function Dt(e){for(var t=0,r=e.length,n;t<r;){if(n=e.charCodeAt(t),n>=48&&n<=57){t++;continue}return!1}return!0}function Fe(e){return e.indexOf("/")===-1&&e.indexOf("~")===-1?e:e.replace(/~/g,"~0").replace(/\//g,"~1")}function vn(e){return e.replace(/~1/g,"/").replace(/~0/g,"~")}function xt(e){if(e===void 0)return!0;if(e){if(Array.isArray(e)){for(var t=0,r=e.length;t<r;t++)if(xt(e[t]))return!0}else if(typeof e=="object"){for(var n=jt(e),o=n.length,i=0;i<o;i++)if(xt(e[n[i]]))return!0}}return!1}function un(e,t){var r=[e];for(var n in t){var o=typeof t[n]=="object"?JSON.stringify(t[n],null,2):t[n];typeof o<"u"&&r.push(n+": "+o)}return r.join(`
|
|
22
|
+
`)}var bn=(function(e){Pr(t,e);function t(r,n,o,i,s){var c=this.constructor,a=e.call(this,un(r,{name:n,index:o,operation:i,tree:s}))||this;return a.name=n,a.index=o,a.operation=i,a.tree=s,Object.setPrototypeOf(a,c.prototype),a.message=un(r,{name:n,index:o,operation:i,tree:s}),a}return t})(Error),ce=bn,Rr=Oe,Ye={add:function(e,t,r){return e[t]=this.value,{newDocument:r}},remove:function(e,t,r){var n=e[t];return delete e[t],{newDocument:r,removed:n}},replace:function(e,t,r){var n=e[t];return e[t]=this.value,{newDocument:r,removed:n}},move:function(e,t,r){var n=yt(r,this.path);n&&(n=Oe(n));var o=Ue(r,{op:"remove",path:this.from}).removed;return Ue(r,{op:"add",path:this.path,value:o}),{newDocument:r,removed:n}},copy:function(e,t,r){var n=yt(r,this.from);return Ue(r,{op:"add",path:this.path,value:Oe(n)}),{newDocument:r}},test:function(e,t,r){return{newDocument:r,test:ct(e[t],this.value)}},_get:function(e,t,r){return this.value=e[t],{newDocument:r}}},jr={add:function(e,t,r){return Dt(t)?e.splice(t,0,this.value):e[t]=this.value,{newDocument:r,index:t}},remove:function(e,t,r){var n=e.splice(t,1);return{newDocument:r,removed:n[0]}},replace:function(e,t,r){var n=e[t];return e[t]=this.value,{newDocument:r,removed:n}},move:Ye.move,copy:Ye.copy,test:Ye.test,_get:Ye._get};function yt(e,t){if(t=="")return e;var r={op:"_get",path:t};return Ue(e,r),r.value}function Ue(e,t,r,n,o,i){if(r===void 0&&(r=!1),n===void 0&&(n=!0),o===void 0&&(o=!0),i===void 0&&(i=0),r&&(typeof r=="function"?r(t,0,e,t.path):vt(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=yt(e,t.from),t.op==="move"&&(s.removed=e),s;if(t.op==="test"){if(s.test=ct(e,t.value),s.test===!1)throw new ce("Test operation failed","TEST_OPERATION_FAILED",i,t,e);return s.newDocument=e,s}else{if(t.op==="remove")return s.removed=e,s.newDocument=null,s;if(t.op==="_get")return t.value=e,s;if(r)throw new ce("Operation `op` property is not one of operations defined in RFC-6902","OPERATION_OP_INVALID",i,t,e);return s}}else{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=vt;;){if(h=a[l],h&&h.indexOf("~")!=-1&&(h=vn(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&&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&&!Dt(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);Dt(h)&&(h=~~h)}if(l>=y){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=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=Ye[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(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 Bt(e,t,r,n,o){if(n===void 0&&(n=!0),o===void 0&&(o=!0),r&&!Array.isArray(t))throw new ce("Patch sequence must be an array","SEQUENCE_NOT_AN_ARRAY");n||(e=Oe(e));for(var i=new Array(t.length),s=0,c=t.length;s<c;s++)i[s]=Ue(e,t[s],r,!0,o,s),e=i[s].newDocument;return i.newDocument=e,i}function Dr(e,t,r){var n=Ue(e,t);if(n.test===!1)throw new ce("Test operation failed","TEST_OPERATION_FAILED",r,t,e);return n.newDocument}function vt(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(Ye[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)throw new ce('Operation `path` property must start with "/"',"OPERATION_PATH_INVALID",t,e,r);if((e.op==="move"||e.op==="copy")&&typeof e.from!="string")throw new ce("Operation `from` property is not present (applicable in `move` and `copy` operations)","OPERATION_FROM_REQUIRED",t,e,r);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")&&xt(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"){var o=e.path.split("/").length,i=n.split("/").length;if(o!==i+1&&o!==i)throw new ce("Cannot perform an `add` operation at the desired path","OPERATION_PATH_CANNOT_ADD",t,e,r)}else if(e.op==="replace"||e.op==="remove"||e.op==="_get"){if(e.path!==n)throw new ce("Cannot perform the operation at a path that does not exist","OPERATION_PATH_UNRESOLVABLE",t,e,r)}else if(e.op==="move"||e.op==="copy"){var s={op:"_get",path:e.from,value:void 0},c=wn([s],r);if(c&&c.name==="OPERATION_PATH_UNRESOLVABLE")throw new ce("Cannot perform the operation from a path that does not exist","OPERATION_FROM_UNRESOLVABLE",t,e,r)}}}else throw new ce("Operation `op` property is not one of operations defined in RFC-6902","OPERATION_OP_INVALID",t,e,r)}function wn(e,t,r){try{if(!Array.isArray(e))throw new ce("Patch sequence must be an array","SEQUENCE_NOT_AN_ARRAY");if(t)Bt(Oe(t),Oe(e),r||!0);else{r=r||vt;for(var n=0;n<e.length;n++)r(e[n],n,t,void 0)}}catch(o){if(o instanceof ce)return o;throw o}}function ct(e,t){if(e===t)return!0;if(e&&t&&typeof e=="object"&&typeof t=="object"){var r=Array.isArray(e),n=Array.isArray(t),o,i,s;if(r&&n){if(i=e.length,i!=t.length)return!1;for(o=i;o--!==0;)if(!ct(e[o],t[o]))return!1;return!0}if(r!=n)return!1;var c=Object.keys(e);if(i=c.length,i!==Object.keys(t).length)return!1;for(o=i;o--!==0;)if(!t.hasOwnProperty(c[o]))return!1;for(o=i;o--!==0;)if(s=c[o],!ct(e[s],t[s]))return!1;return!0}return e!==e&&t!==t}const xr=Object.freeze(Object.defineProperty({__proto__:null,JsonPatchError:ce,_areEquals:ct,applyOperation:Ue,applyPatch:Bt,applyReducer:Dr,deepClone:Rr,getValueByPointer:yt,validate:wn,validator:vt},Symbol.toStringTag,{value:"Module"}));/*!
|
|
23
23
|
* https://github.com/Starcounter-Jack/JSON-Patch
|
|
24
24
|
* (c) 2017-2021 Joachim Wester
|
|
25
25
|
* MIT license
|
|
26
|
-
*/var
|
|
27
|
-
`).length}function Ur(e,t){const r=new Map,n=o=>{const i=o.split("/").filter(Boolean);return i.length>0?`/${i[0]}`:"/"};for(const o of e){const i=n(o.path);r.has(i)||r.set(i,{patches1:[],patches2:[]});const s=r.get(i);s&&s.patches1.push(o)}for(const o of t){const i=n(o.path);r.has(i)||r.set(i,{patches1:[],patches2:[]});const s=r.get(i);s&&s.patches2.push(o)}return r}function Vr(e,t,r,n,o,i){const s=new Map,c=new Map,a=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)}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)}else l.push(v)}const y=new Set([...c.keys(),...a.keys()]);for(const v of y){const h=q(r,v),m=q(n,v),f=q(o,v);if(!Array.isArray(h)||!Array.isArray(m)||!Array.isArray(f)){const L=c.get(v)||[],V=a.get(v)||[];for(const $ of L){const B=$.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);if(B){const J=B[1];s.has(J)||s.set(J,{patches1:[],patches2:[]});const E=s.get(J);E&&E.patches1.push($)}}for(const $ of V){const B=$.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);if(B){const J=B[1];s.has(J)||s.set(J,{patches1:[],patches2:[]});const E=s.get(J);E&&E.patches2.push($)}}continue}const I=Ce(i,v,r),k=I!=null&&I.items?Array.isArray(I.items)&&I.items[0]?I.items[0]:Array.isArray(I.items)?null:I.items:null,g=k&&typeof k=="object"?k:null;if(g){const L=Gr(h,m,f,g);if(L.size>0){const V=new Map,$=new Map,B=new Map;for(const[A,D]of L.entries())D.base!==void 0&&V.set(D.base,A),D.input1!==void 0&&$.set(D.input1,A),D.input2!==void 0&&B.set(D.input2,A);const J=c.get(v)||[],E=a.get(v)||[];for(const A of J){const D=A.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);if(D){const Q=Number.parseInt(D[1],10),oe=$.get(Q);if(oe!==void 0){const ie=`${v}#${oe}`;s.has(ie)||s.set(ie,{patches1:[],patches2:[]});const ge=s.get(ie);ge&&ge.patches1.push(A)}}}for(const A of E){const D=A.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);if(D){const Q=Number.parseInt(D[1],10),oe=B.get(Q);if(oe!==void 0){const ie=`${v}#${oe}`;s.has(ie)||s.set(ie,{patches1:[],patches2:[]});const ge=s.get(ie);ge&&ge.patches2.push(A)}}}continue}}const b=c.get(v)||[],x=a.get(v)||[];for(const L of b){const V=L.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);if(V){const $=V[1];s.has($)||s.set($,{patches1:[],patches2:[]});const B=s.get($);B&&B.patches1.push(L)}}for(const L of x){const V=L.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);if(V){const $=V[1];s.has($)||s.set($,{patches1:[],patches2:[]});const B=s.get($);B&&B.patches2.push(L)}}}const p=(v,h)=>{if(!h)return null;const m=v.split("/").filter(Boolean);if(m.length<2)return null;const f=`/${m[0]}`,I=Ce(h,f);return I&&Ut(I)?f:null},d=[...u],_=[...l],T=new Set;for(const v of d){const h=p(v.path,i);h&&T.add(h)}for(const v of _){const h=p(v.path,i);h&&T.add(h)}for(const v of T)s.has(v)||s.set(v,{patches1:[],patches2:[]});for(const v of d){const h=v.path,m=p(h,i);if(m){const f=s.get(m);f&&f.patches1.push(v)}else{s.has(h)||s.set(h,{patches1:[],patches2:[]});const f=s.get(h);f&&f.patches1.push(v)}}for(const v of _){const h=v.path,m=p(h,i);if(m){const f=s.get(m);f&&f.patches2.push(v)}else{s.has(h)||s.set(h,{patches1:[],patches2:[]});const f=s.get(h);f&&f.patches2.push(v)}}return s}function Ce(e,t,r){if(!e)return null;const n=t.split("/").filter(Boolean);if(n.length===0)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&&Ut(o)){const l=vn(o),y=pt(o),p=r?q(r,i||"/"):void 0;if(l&&l.length>0)if(p!==void 0)try{const{schema:d}=dt(p,l,y);o=d}catch{l.length>0&&l[0]&&(o=l[0])}else l.length>0&&l[0]&&(o=l[0])}if(!o)return null;if(u)if(o.items)if(Array.isArray(o.items)){const l=a<o.items.length?o.items[a]:null;o=l&&typeof l=="object"?l:null}else typeof o.items=="object"?o=o.items:o=null;else return null;else if(o.properties&&typeof o.properties=="object"&&!Array.isArray(o.properties))o=o.properties[c]||null;else return null;if(!o)return null;i=i?`${i}/${c}`:`/${c}`}return o}function bn(e){if(!e||typeof e!="object")return[];const t=[];if(e.properties&&typeof e.properties=="object"&&!Array.isArray(e.properties)){const r=e.properties;for(const[o,i]of Object.entries(r))i&&typeof i=="object"&&"const"in i&&t.push(o);for(const[o,i]of Object.entries(r))if(i&&typeof i=="object"){const s=i.format;(s==="uuid"||s==="objectid")&&(t.includes(o)||t.push(o))}const n=["id","uuid","_id","key"];for(const o of n)o in r&&!t.includes(o)&&t.push(o);"type"in r&&!t.includes("type")&&t.push("type"),"name"in r&&!t.includes("name")&&t.push("name")}return t}function Jr(e){const t=bn(e);return t.length>0?t[0]:null}function Hr(e,t,r){const n=new Map,o=bn(r);if(o.length===0)return n;const i=c=>{if(typeof c!="object"||c===null)return null;const a=c,u=[];for(const l of o){const y=a[l];y!=null&&u.push(`${l}:${JSON.stringify(y)}`)}return u.length>0?u.join("|"):null},s=(c,a)=>{c.forEach((u,l)=>{const y=i(u);if(y){n.has(y)||n.set(y,{});const p=n.get(y);p&&(p[a]=l)}})};return s(e,"input1"),s(t,"input2"),n}function Gr(e,t,r,n){const o=new Map,i=Jr(n);if(!i)return o;const s=(c,a)=>{c.forEach((u,l)=>{if(typeof u=="object"&&u!==null){const y=u[i];if(y!=null){const p=String(y);o.has(p)||o.set(p,{});const d=o.get(p);d&&(d[a]=l)}}})};return s(e,"base"),s(t,"input1"),s(r,"input2"),o}function wn(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 u=Ur(c,a);n&&(u=Vr(c,a,e,t,r,n));const l=[],y=new Set,p=(d,_,T,v)=>{if(!n||typeof _!="object"||_===null||Array.isArray(_)||typeof T!="object"||T===null||Array.isArray(T)||typeof v!="object"||v===null||Array.isArray(v))return!1;const h=Ce(n,d,_);if(!h||!Ut(h))return!1;const m=vn(h);if(!m||m.length<2)return!1;const f=dt(_,m,pt(h)),I=dt(T,m,pt(h)),k=dt(v,m,pt(h));return I.selectedIndex!==k.selectedIndex&&(f.selectedIndex!==I.selectedIndex||f.selectedIndex!==k.selectedIndex)};for(const[d,{patches1:_,patches2:T}]of u){y.add(d);let v=d;_.length>0?v=_[0].path:T.length>0?v=T[0].path:d.includes("#")&&(v=d.split("#")[0]);let h=d;if(d.includes("#"))h=d.split("#")[0];else{const $=d.split("/").filter(Boolean);$.length>1&&(h=`/${$[0]}`)}if([..._,...T].every($=>($.path.split("/").slice(0,2).join("/")||`/${$.path.split("/")[1]}`)===h)&&h!==v){const $=q(e,h),B=q(t,h),J=q(r,h);if(p(h,$,B,J)){const A=$,D=B,Q=J;let oe=Dt(A,D,Q);!de(A,D)&&!de(A,Q)&&!de(D,Q)&&(oe=M.TRUE_CONFLICT);const ie=[..._,...T].filter(be=>be.path.startsWith(`${h}/`)||be.path===h),ge=[],Le=[];for(const be of ie){const st=be.path,Ne=e!==void 0?q(e,st):void 0,Z=q(t,st),pe=q(r,st);let te=!1,F=!1;be.op==="replace"?Ne!==void 0&&(te=!de(Ne,Z),F=!de(Ne,pe)):be.op==="add"?(te=Ne===void 0&&Z!==void 0,F=Ne===void 0&&pe!==void 0):be.op==="remove"&&(te=Ne!==void 0&&Z===void 0,F=Ne!==void 0&&pe===void 0),Ne!==void 0&&(Z!==void 0&&de(Ne,Z)&&(te=!1),pe!==void 0&&de(Ne,pe)&&(F=!1)),te&&ge.push(be),F&&Le.push(be)}l.push({path:h,baseValue:A,input1Value:D,input2Value:Q,conflictType:oe,patches1:ge,patches2:Le});continue}}const f=q(e,v),I=q(t,v),k=q(r,v);let g=Dt(f,I,k);const b=f!=null,x=I!=null,L=k!=null;!b&&x&&L&&g!==M.SAME_CHANGE&&(g=M.TRUE_CONFLICT),b&&de(f,I)&&de(f,k)||l.push({path:v,baseValue:f,input1Value:I,input2Value:k,conflictType:g,patches1:_,patches2:T})}return l}function On(e,t,r){var y,p,d,_;const n=typeof e=="object"&&e!==null||Array.isArray(e)?e:{},o=typeof t=="object"&&t!==null||Array.isArray(t)?t:{},i=qe(n,o);if(i.length===0)return[];const s=[],c=new Set,a=new Map,u=[];for(const T of i){const v=T.path.match(/^(\/[^/]+(?:\/[^/]+)*)\/(\d+)(?:\/|$)/);if(v){const h=v[1];a.has(h)||a.set(h,[]);const m=a.get(h);m&&m.push(T)}else u.push(T)}for(const[T,v]of a){const h=q(e,T),m=q(t,T);if(!Array.isArray(h)||!Array.isArray(m)){const g=new Map;for(const b of v){const x=b.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);if(x){const L=x[1];g.has(L)||g.set(L,[]),(y=g.get(L))==null||y.push(b)}}for(const[b,x]of g)s.push(...et(b,x,e,t,void 0)),c.add(b);continue}const f=r?Ce(r,T,e):null,I=f!=null&&f.items?Array.isArray(f.items)&&f.items[0]?f.items[0]:Array.isArray(f.items)?null:f.items:null,k=I&&typeof I=="object"?I:null;if(k){const g=Hr(h,m,k),b=new Map,x=new Map;for(const[B,J]of g.entries())J.input1!==void 0&&b.set(J.input1,B),J.input2!==void 0&&x.set(J.input2,B);const L=new Map,V=[];for(const B of v){const J=B.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);if(J){const E=Number.parseInt(J[1],10);let A;if(B.op==="add"?A=x.get(E):A=b.get(E),A){L.has(A)||L.set(A,[]);const D=L.get(A);D&&D.push(B)}else V.push(B)}}for(const[B,J]of L){const E=g.get(B);if(!E)continue;const A=E.input1!==void 0?`${T}/${E.input1}`:`${T}/${E.input2}`;s.push(...et(A,J,e,t,void 0)),c.add(A)}const $=new Map;for(const B of V){const J=B.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);if(J){const E=J[1];$.has(E)||$.set(E,[]),(p=$.get(E))==null||p.push(B)}}for(const[B,J]of $)c.has(B)||(s.push(...et(B,J,e,t,void 0)),c.add(B))}else{const g=new Map;for(const b of v){const x=b.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);if(x){const L=x[1];g.has(L)||g.set(L,[]),(d=g.get(L))==null||d.push(b)}}for(const[b,x]of g)s.push(...et(b,x,e,t,void 0)),c.add(b)}}const l=new Map;for(const T of u){const v=T.path.split("/").filter(Boolean),h=v.length>0?`/${v[0]}`:"/";l.has(h)||l.set(h,[]),(_=l.get(h))==null||_.push(T)}for(const[T,v]of l)s.push(...et(T,v,e,t,void 0));return s}function et(e,t,r,n,o){const i=o!==void 0?q(o,e):void 0,s=q(r,e),c=q(n,e),a=[],u=[];for(const f of t){const I=f.path,k=q(r,I),g=q(n,I);let b=!1,x=!1;f.op==="add"?(b=!1,x=g!==void 0):f.op==="remove"?(b=k!==void 0,x=!1):f.op==="replace"&&(b=k!==void 0&&!de(k,g),x=g!==void 0&&!de(k,g)),I===e&&(b=!0,x=!0),b&&a.push(f),x&&u.push(f)}if(a.length===0&&u.length===0&&i!==void 0&&s!==void 0&&c!==void 0&&de(i,s)&&de(i,c))return[];const l=a.length>0?a:t,y=u.length>0?u:t,p=[...l,...y],d=p.some(f=>f.op==="add"),_=p.some(f=>f.op==="remove"),T=p.some(f=>f.op==="replace");if(d&&!T&&!_){if(s!==void 0&&c===void 0)return[{path:e,baseValue:void 0,input1Value:s,input2Value:void 0,conflictType:M.INPUT1_ONLY,patches1:l,patches2:[]}];if(c!==void 0&&s===void 0)return[{path:e,baseValue:void 0,input1Value:void 0,input2Value:c,conflictType:M.INPUT2_ONLY,patches1:[],patches2:y}]}if(_&&!d&&!T){if(s!==void 0&&c===void 0)return[{path:e,baseValue:s,input1Value:s,input2Value:void 0,conflictType:M.INPUT1_ONLY,patches1:l,patches2:[]}];if(c!==void 0&&s===void 0)return[{path:e,baseValue:c,input1Value:void 0,input2Value:c,conflictType:M.INPUT2_ONLY,patches1:[],patches2:y}]}const v=Dt(i,s,c);let h=[],m=[];switch(v){case M.INPUT1_ONLY:h=l,m=[];break;case M.INPUT2_ONLY:h=[],m=y;break;case M.SAME_CHANGE:h=l,m=y;break;case M.TRUE_CONFLICT:h=l,m=y;break}return[{path:e,baseValue:i,input1Value:s,input2Value:c,conflictType:v,patches1:h,patches2:m}]}function Lt(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);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 Wr(e,t,r,n){var i,s,c,a,u,l;const o=[];for(let y=0;y<e.length;y++){const p=e[y];let d,_,T;(((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},_=Pe(r,p.path),T=Pe(n,p.path)):(d=Lt(t,[...p.patches1||[],...p.patches2||[]]),_=Lt(r,p.patches1||[]),T=Lt(n,p.patches2||[]));const v=p.conflictType===M.TRUE_CONFLICT;let h=re.excluded,m=re.excluded;switch(p.conflictType){case M.SAME_CHANGE:h=re.first,m=re.first;break;case M.INPUT1_ONLY:h=re.first;break;case M.INPUT2_ONLY:m=re.first;break;case M.TRUE_CONFLICT:m=re.first;break}const f=[],I=[];if(p.patches1&&(p.patches1.length??0)>0)for(const g of p.patches1){const b=!t||t.trim()==="";if(g.op==="remove"&&!b)continue;const x=Pe(r,g.path);if(x.start!==1||x.end!==1)for(let L=x.start;L<=x.end;L++)f.push({line:L})}else if((((c=p.patches1)==null?void 0:c.length)??0)===0&&(((a=p.patches2)==null?void 0:a.length)??0)===0){const g=Pe(r,p.path);(g.start!==1||g.end!==1)&&f.push({line:g.start})}if(p.patches2&&(p.patches2.length??0)>0)for(const g of p.patches2){if(g.op==="remove")continue;const b=Pe(n,g.path);if(b.start!==1||b.end!==1)for(let x=b.start;x<=b.end;x++)I.push({line:x})}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)&&I.push({line:g.start})}const k={id:`conflict-${y}`,path:p.path,baseRange:{startLineNumber:d.start,endLineNumberExclusive:d.end+1},input1Range:{startLineNumber:_.start,endLineNumberExclusive:_.end+1},input2Range:{startLineNumber:T.start,endLineNumberExclusive:T.end+1},input1Diffs:f,input2Diffs:I,isConflicting:v,conflictType:p.conflictType,input1State:h,input2State:m,handled:p.conflictType===M.SAME_CHANGE,focused:!1};o.push(k)}return o}function An(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;if(s===void 0)u=On(c,a,i);else if(o==="split")u=wn(s,c,a,i);else{const l=qe(s,c),y=qe(c,a),p=new Set;l.forEach(d=>{p.add(d.path)}),y.forEach(d=>{p.add(d.path)}),u=Array.from(p).map(d=>{const _=q(s,d),T=q(c,d),v=q(a,d),h=!de(_,T),m=!de(T,v);let f;return h&&m?f=M.TRUE_CONFLICT:h?f=M.INPUT1_ONLY:m?f=M.INPUT2_ONLY:f=M.SAME_CHANGE,{path:d,baseValue:_,input1Value:T,input2Value:v,conflictType:f}})}return Wr(u,e,t,r)}catch(s){const c=s instanceof Error?s.message:String(s);throw new Error(`JSON Patch diff computation failed: ${c}`)}}function Nn(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}}function qr(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]:"",_=t[p]!==void 0?t[p]:"",T=r[p]!==void 0?r[p]:"",{conflictType:v,input1Changed:h,input2Changed:m}=Nn(d,_,T);(h||m)&&o.push({line:p+1,input1Changed:h,input2Changed:m,baseLine:d,input1Line:_,input2Line:T,conflictType:v})}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],_=p===o.length,T=!_&&d&&o[p-1]&&d.line>(((y=o[p-1])==null?void 0:y.line)??0)+1,v=!_&&d&&d.conflictType!==s;if(_||T||v){const h=o[p-1],m=h?h.line+1:i+1,f=c.length>0,I=a.length>0,k=s===M.TRUE_CONFLICT,g={id:`conflict-${n.length}`,baseRange:{startLineNumber:i,endLineNumberExclusive:m},input1Range:{startLineNumber:i,endLineNumberExclusive:m},input2Range:{startLineNumber:i,endLineNumberExclusive:m},input1Diffs:c,input2Diffs:a,isConflicting:k,conflictType:s,input1State:s===M.SAME_CHANGE&&f?re.first:re.excluded,input2State:I?re.first:re.excluded,handled:s===M.SAME_CHANGE,focused:!1};n.push(g),!_&&d&&(i=d.line,s=d.conflictType,c=[],a=[])}!_&&d&&(d.input1Changed&&c.push({line:d.line}),d.input2Changed&&a.push({line:d.line}))}return n}function Cr(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);return}throw new Error(`Cannot assign root value: expected object, got ${typeof 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){if(!Array.isArray(o))throw new Error(`Path ${t}: segment ${a} expects array but got ${typeof o}`);o=o[u]}else{if(!o||typeof o!="object"||Array.isArray(o))throw new Error(`Path ${t}: segment ${a} expects object but got ${typeof o}`);const l=o;a in l||(l[a]={}),o=l[a]}}const i=n[n.length-1],s=Number.parseInt(i,10);if(!Number.isNaN(s)&&String(s)===i){if(!Array.isArray(o))throw new Error(`Path ${t}: last segment expects array but got ${typeof o}`);o[s]=r}else{if(!o||typeof o!="object"||Array.isArray(o))throw new Error(`Path ${t}: last segment expects object but got ${typeof o}`);o[i]=r}}function Yr(e,t){try{const r=dn(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=hn(r,n);if(!o)return null;const s=e.substring(0,o.offset).split(`
|
|
28
|
-
`).length,c=o.offset+o.length,
|
|
29
|
-
`).length;return{startLine:s,endLine:
|
|
26
|
+
*/var Ft=new WeakMap,Mr=(function(){function e(t){this.observers=new Map,this.obj=t}return e})(),$r=(function(){function e(t,r){this.callback=t,this.observer=r}return e})();function Br(e){return Ft.get(e)}function Fr(e,t){return e.observers.get(t)}function Ur(e,t){e.observers.delete(t.callback)}function Vr(e,t){t.unobserve()}function Jr(e,t){var r=[],n,o=Br(e);if(!o)o=new Mr(e),Ft.set(e,o);else{var i=Fr(o,t);n=i&&i.observer}if(n)return n;if(n={},o.value=Oe(e),t){n.callback=t,n.next=null;var s=function(){Mt(n)},c=function(){clearTimeout(n.next),n.next=setTimeout(s)};typeof window<"u"&&(window.addEventListener("mouseup",c),window.addEventListener("keyup",c),window.addEventListener("mousedown",c),window.addEventListener("keydown",c),window.addEventListener("change",c))}return n.patches=r,n.object=e,n.unobserve=function(){Mt(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 Mt(e,t){t===void 0&&(t=!1);var r=Ft.get(e.object);Ut(r.value,e.object,e.patches,"",t),e.patches.length&&Bt(r.value,e.patches);var n=e.patches;return n.length>0&&(e.patches=[],e.callback&&e.callback(n)),n}function Ut(e,t,r,n,o){if(t!==e){typeof t.toJSON=="function"&&(t=t.toJSON());for(var i=jt(t),s=jt(e),c=!1,a=s.length-1;a>=0;a--){var f=s[a],l=e[f];if(Rt(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)?Ut(l,y,r,n+"/"+Fe(f),o):l!==y&&(o&&r.push({op:"test",path:n+"/"+Fe(f),value:Oe(l)}),r.push({op:"replace",path:n+"/"+Fe(f),value:Oe(y)}))}else Array.isArray(e)===Array.isArray(t)?(o&&r.push({op:"test",path:n+"/"+Fe(f),value:Oe(l)}),r.push({op:"remove",path:n+"/"+Fe(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 f=i[a];!Rt(e,f)&&t[f]!==void 0&&r.push({op:"add",path:n+"/"+Fe(f),value:Oe(t[f])})}}}function ze(e,t,r){r===void 0&&(r=!1);var n=[];return Ut(e,t,n,"",r),n}const Hr=Object.freeze(Object.defineProperty({__proto__:null,compare:ze,generate:Mt,observe:Jr,unobserve:Vr},Symbol.toStringTag,{value:"Module"}));Object.assign({},xr,Hr,{JsonPatchError:bn,deepClone:Oe,escapePathComponent:Fe,unescapePathComponent:vn});const wt="oneOf",Vt="anyOf",Jt="allOf";function Ht(e){return!!(e[wt]||e[Vt]||e[Jt])}function On(e){const t=e[wt]||e[Vt]||e[Jt];return Array.isArray(t)?t:void 0}function dt(e){return e.oneOf?wt:e.anyOf?Vt:e.allOf?Jt:""}function Gr(e,t){if(typeof t!="object"||t===null||Array.isArray(t))return null;const r=t,n=new Set;for(const o of e){const i=o.properties;if(i)for(const[s,c]of Object.entries(i))c&&typeof c=="object"&&"const"in c&&n.add(s)}for(const o of n)if(o in r)return{field:o,value:r[o]};return null}function ht(e,t,r=wt){var n;if(t.length===0)throw new Error("No variants provided to chooseSubschemaSync");if(e===null)for(let o=0;o<t.length;o++){const i=t[o];if(i.const===null)return{selectedIndex:o,schema:i}}if(typeof e=="object"&&e!==null&&!Array.isArray(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];if(a&&typeof a=="object"&&"const"in a&&a.const===i.value)return{selectedIndex:s,schema:c}}for(let s=0;s<t.length;s++){const c=t[s];if(c.type==="object"&&c.properties){const a=c.required||[];if(a.every(l=>l in o)&&a.length>0){let l=!0;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}}if(l)return{selectedIndex:s,schema:c}}}}}for(let o=0;o<t.length;o++){const i=t[o];if(i.const!==void 0&&i.const===e)return{selectedIndex:o,schema:i}}for(let o=0;o<t.length;o++){const i=t[o];if(i.type){const s=Array.isArray(e)?"array":typeof e;if((Array.isArray(i.type)?i.type[0]:i.type)===s)return{selectedIndex:o,schema:i}}}return{selectedIndex:0,schema:t[0]}}function Wr(e){if(typeof e=="object"&&e!==null){const t=Lr(e,{deep:!0});return JSON.stringify(t,null,2)}return JSON.stringify(e,null,2)}function $t(e,t,r){const n=!he(e,t),o=!he(e,r);return n&&o?he(t,r)?B.SAME_CHANGE:B.TRUE_CONFLICT:n?B.INPUT1_ONLY:o?B.INPUT2_ONLY:B.SAME_CHANGE}function Re(e,t){try{const r=mn(e);if(!r)return{start:1,end:1};const n=t.split("/").filter(Boolean).map(s=>{const c=Number.parseInt(s,10);return!Number.isNaN(c)&&String(c)===s?c:s}),o=n.length===0?r:yn(r,n);return o?{start:fn(e,o.offset),end:fn(e,o.offset+o.length)}:{start:1,end:1}}catch{return{start:1,end:1}}}function fn(e,t){return e.substring(0,t).split(`
|
|
27
|
+
`).length}function Cr(e,t){const r=new Map,n=o=>{const i=o.split("/").filter(Boolean);return i.length>0?`/${i[0]}`:"/"};for(const o of e){const i=n(o.path);r.has(i)||r.set(i,{patches1:[],patches2:[]});const s=r.get(i);s&&s.patches1.push(o)}for(const o of t){const i=n(o.path);r.has(i)||r.set(i,{patches1:[],patches2:[]});const s=r.get(i);s&&s.patches2.push(o)}return r}function qr(e,t,r,n,o,i){const s=new Map,c=new Map,a=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 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(m)}const y=new Set([...c.keys(),...a.keys()]);for(const m of y){const g=H(r,m),O=H(n,m),u=H(o,m);if(!Array.isArray(g)||!Array.isArray(O)||!Array.isArray(u)){const P=c.get(m)||[],M=a.get(m)||[];for(const $ of P){const F=$.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);if(F){const U=F[1];s.has(U)||s.set(U,{patches1:[],patches2:[]});const k=s.get(U);k&&k.patches1.push($)}}for(const $ of M){const F=$.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);if(F){const U=F[1];s.has(U)||s.set(U,{patches1:[],patches2:[]});const k=s.get(U);k&&k.patches2.push($)}}continue}const A=Xe(i,m,r),L=A!=null&&A.items?Array.isArray(A.items)&&A.items[0]?A.items[0]:Array.isArray(A.items)?null:A.items:null,p=L&&typeof L=="object"?L:null;if(p){const P=Xr(g,O,u,p);if(P.size>0){const M=new Map,$=new Map,F=new Map;for(const[I,x]of P.entries())x.base!==void 0&&M.set(x.base,I),x.input1!==void 0&&$.set(x.input1,I),x.input2!==void 0&&F.set(x.input2,I);const U=c.get(m)||[],k=a.get(m)||[];for(const I of U){const x=I.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);if(x){const Q=Number.parseInt(x[1],10),se=$.get(Q);if(se!==void 0){const ae=`${m}#${se}`;s.has(ae)||s.set(ae,{patches1:[],patches2:[]});const ge=s.get(ae);ge&&ge.patches1.push(I)}}}for(const I of k){const x=I.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);if(x){const Q=Number.parseInt(x[1],10),se=F.get(Q);if(se!==void 0){const ae=`${m}#${se}`;s.has(ae)||s.set(ae,{patches1:[],patches2:[]});const ge=s.get(ae);ge&&ge.patches2.push(I)}}}continue}}const v=c.get(m)||[],R=a.get(m)||[];for(const P of v){const M=P.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);if(M){const $=M[1];s.has($)||s.set($,{patches1:[],patches2:[]});const F=s.get($);F&&F.patches1.push(P)}}for(const P of R){const M=P.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);if(M){const $=M[1];s.has($)||s.set($,{patches1:[],patches2:[]});const F=s.get($);F&&F.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=Xe(g,u);return A&&Ht(A)?u:null},h=[...f],T=[...l],N=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(g)||s.set(g,{patches1:[],patches2:[]});const u=s.get(g);u&&u.patches1.push(m)}}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(g)||s.set(g,{patches1:[],patches2:[]});const u=s.get(g);u&&u.patches2.push(m)}}return s}function Xe(e,t,r){if(!e)return null;const n=t.split("/").filter(Boolean);if(n.length===0)return e;let o=e,i="";for(let s=0;s<n.length;s++){const c=n[s],a=Number.parseInt(c,10),f=!Number.isNaN(a)&&String(a)===c;if(o&&Ht(o)){const l=On(o),y=dt(o),d=r?H(r,i||"/"):void 0;if(l&&l.length>0)if(d!==void 0)try{const{schema:h}=ht(d,l,y);o=h}catch{l.length>0&&l[0]&&(o=l[0])}else l.length>0&&l[0]&&(o=l[0])}if(!o)return null;if(f)if(o.items)if(Array.isArray(o.items)){const l=a<o.items.length?o.items[a]:null;o=l&&typeof l=="object"?l:null}else typeof o.items=="object"?o=o.items:o=null;else return null;else if(o.properties&&typeof o.properties=="object"&&!Array.isArray(o.properties))o=o.properties[c]||null;else return null;if(!o)return null;i=i?`${i}/${c}`:`/${c}`}return o}function An(e){if(!e||typeof e!="object")return[];const t=[];if(e.properties&&typeof e.properties=="object"&&!Array.isArray(e.properties)){const r=e.properties;for(const[o,i]of Object.entries(r))i&&typeof i=="object"&&"const"in i&&t.push(o);for(const[o,i]of Object.entries(r))if(i&&typeof i=="object"){const s=i.format;(s==="uuid"||s==="objectid")&&(t.includes(o)||t.push(o))}const n=["id","uuid","_id","key"];for(const o of n)o in r&&!t.includes(o)&&t.push(o);"type"in r&&!t.includes("type")&&t.push("type"),"name"in r&&!t.includes("name")&&t.push("name")}return t}function Yr(e){const t=An(e);return t.length>0?t[0]:null}function zr(e,t,r){const n=new Map,o=An(r);if(o.length===0)return n;const i=c=>{if(typeof c!="object"||c===null)return null;const a=c,f=[];for(const l of o){const y=a[l];y!=null&&f.push(`${l}:${JSON.stringify(y)}`)}return f.length>0?f.join("|"):null},s=(c,a)=>{c.forEach((f,l)=>{const y=i(f);if(y){n.has(y)||n.set(y,{});const d=n.get(y);d&&(d[a]=l)}})};return s(e,"input1"),s(t,"input2"),n}function Xr(e,t,r,n){const o=new Map,i=Yr(n);if(!i)return o;const s=(c,a)=>{c.forEach((f,l)=>{if(typeof f=="object"&&f!==null){const y=f[i];if(y!=null){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 Nn(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=ze(o,i),a=ze(o,s);let f=Cr(c,a);n&&(f=qr(c,a,e,t,r,n));const l=[],y=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=Xe(n,h,T);if(!g||!Ht(g))return!1;const O=On(g);if(!O||O.length<2)return!1;const u=ht(T,O,dt(g)),A=ht(N,O,dt(g)),L=ht(m,O,dt(g));return A.selectedIndex!==L.selectedIndex&&(u.selectedIndex!==A.selectedIndex||u.selectedIndex!==L.selectedIndex)};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 $=h.split("/").filter(Boolean);$.length>1&&(g=`/${$[0]}`)}if([...T,...N].every($=>($.path.split("/").slice(0,2).join("/")||`/${$.path.split("/")[1]}`)===g)&&g!==m){const $=H(e,g),F=H(t,g),U=H(r,g);if(d(g,$,F,U)){const I=$,x=F,Q=U;let se=$t(I,x,Q);!he(I,x)&&!he(I,Q)&&!he(x,Q)&&(se=B.TRUE_CONFLICT);const ae=[...T,...N].filter(Ae=>Ae.path.startsWith(`${g}/`)||Ae.path===g),ge=[],Se=[];for(const Ae of ae){const De=Ae.path,Ne=e!==void 0?H(e,De):void 0,xe=H(t,De),ee=H(r,De);let pe=!1,te=!1;Ae.op==="replace"?Ne!==void 0&&(pe=!he(Ne,xe),te=!he(Ne,ee)):Ae.op==="add"?(pe=Ne===void 0&&xe!==void 0,te=Ne===void 0&&ee!==void 0):Ae.op==="remove"&&(pe=Ne!==void 0&&xe===void 0,te=Ne!==void 0&&ee===void 0),Ne!==void 0&&(xe!==void 0&&he(Ne,xe)&&(pe=!1),ee!==void 0&&he(Ne,ee)&&(te=!1)),pe&&ge.push(Ae),te&&Se.push(Ae)}l.push({path:g,baseValue:I,input1Value:x,input2Value:Q,conflictType:se,patches1:ge,patches2:Se});continue}}const u=H(e,m),A=H(t,m),L=H(r,m);let p=$t(u,A,L);const v=u!=null,R=A!=null,P=L!=null;!v&&R&&P&&p!==B.SAME_CHANGE&&(p=B.TRUE_CONFLICT),v&&he(u,A)&&he(u,L)||l.push({path:m,baseValue:u,input1Value:A,input2Value:L,conflictType:p,patches1:T,patches2:N})}return l}function En(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=ze(n,o);if(i.length===0)return[];const s=[],c=new Set,a=new Map,f=[];for(const N of i){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 f.push(N)}for(const[N,m]of a){const g=H(e,N),O=H(t,N);if(!Array.isArray(g)||!Array.isArray(O)){const p=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[v,R]of p)s.push(...rt(v,R,e,t,void 0)),c.add(v);continue}const u=r?Xe(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,L=A&&typeof A=="object"?A:null;if(L){const p=zr(g,O,L),v=new Map,R=new Map;for(const[F,U]of p.entries())U.input1!==void 0&&v.set(U.input1,F),U.input2!==void 0&&R.set(U.input2,F);const P=new Map,M=[];for(const F of m){const U=F.path.match(/^\/[^/]+(?:\/[^/]+)*\/(\d+)(?:\/|$)/);if(U){const k=Number.parseInt(U[1],10);let I;if(F.op==="add"?I=R.get(k):I=v.get(k),I){P.has(I)||P.set(I,[]);const x=P.get(I);x&&x.push(F)}else M.push(F)}}for(const[F,U]of P){const k=p.get(F);if(!k)continue;const I=k.input1!==void 0?`${N}/${k.input1}`:`${N}/${k.input2}`;s.push(...rt(I,U,e,t,void 0)),c.add(I)}const $=new Map;for(const F of M){const U=F.path.match(/^(\/[^/]+(?:\/[^/]+)*\/\d+)(?:\/|$)/);if(U){const k=U[1];$.has(k)||$.set(k,[]),(d=$.get(k))==null||d.push(F)}}for(const[F,U]of $)c.has(F)||(s.push(...rt(F,U,e,t,void 0)),c.add(F))}else{const p=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[v,R]of p)s.push(...rt(v,R,e,t,void 0)),c.add(v)}}const l=new Map;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,m]of l)s.push(...rt(N,m,e,t,void 0));return s}function rt(e,t,r,n,o){const i=o!==void 0?H(o,e):void 0,s=H(r,e),c=H(n,e),a=[],f=[];for(const u of t){const A=u.path,L=H(r,A),p=H(n,A);let v=!1,R=!1;u.op==="add"?(v=!1,R=p!==void 0):u.op==="remove"?(v=L!==void 0,R=!1):u.op==="replace"&&(v=L!==void 0&&!he(L,p),R=p!==void 0&&!he(L,p)),A===e&&(v=!0,R=!0),v&&a.push(u),R&&f.push(u)}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=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[{path:e,baseValue:void 0,input1Value:s,input2Value:void 0,conflictType:B.INPUT1_ONLY,patches1:l,patches2:[]}];if(c!==void 0&&s===void 0)return[{path:e,baseValue:void 0,input1Value:void 0,input2Value:c,conflictType:B.INPUT2_ONLY,patches1:[],patches2:y}]}if(T&&!h&&!N){if(s!==void 0&&c===void 0)return[{path:e,baseValue:s,input1Value:s,input2Value:void 0,conflictType:B.INPUT1_ONLY,patches1:l,patches2:[]}];if(c!==void 0&&s===void 0)return[{path:e,baseValue:c,input1Value:void 0,input2Value:c,conflictType:B.INPUT2_ONLY,patches1:[],patches2:y}]}const m=$t(i,s,c);let g=[],O=[];switch(m){case B.INPUT1_ONLY:g=l,O=[];break;case B.INPUT2_ONLY:g=[],O=y;break;case B.SAME_CHANGE:g=l,O=y;break;case B.TRUE_CONFLICT:g=l,O=y;break}return[{path:e,baseValue:i,input1Value:s,input2Value:c,conflictType:m,patches1:g,patches2:O}]}function Pt(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=Re(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 Kr(e,t,r,n){var i,s,c,a,f,l;const o=[];for(let y=0;y<e.length;y++){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?Re(t,d.path):{start:1,end:1},T=Re(r,d.path),N=Re(n,d.path)):(h=Pt(t,[...d.patches1||[],...d.patches2||[]]),T=Pt(r,d.patches1||[]),N=Pt(n,d.patches2||[]));const m=d.conflictType===B.TRUE_CONFLICT;let g=ie.excluded,O=ie.excluded;switch(d.conflictType){case B.SAME_CHANGE:g=ie.first,O=ie.first;break;case B.INPUT1_ONLY:g=ie.first;break;case B.INPUT2_ONLY:O=ie.first;break;case B.TRUE_CONFLICT:O=ie.first;break}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 R=Re(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=Re(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 v=Re(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((((f=d.patches1)==null?void 0:f.length)??0)===0&&(((l=d.patches2)==null?void 0:l.length)??0)===0){const p=Re(n,d.path);(p.start!==1||p.end!==1)&&A.push({line:p.start})}const L={id:`conflict-${y}`,path:d.path,baseRange:{startLineNumber:h.start,endLineNumberExclusive:h.end+1},input1Range:{startLineNumber:T.start,endLineNumberExclusive:T.end+1},input2Range:{startLineNumber:N.start,endLineNumberExclusive:N.end+1},input1Diffs:u,input2Diffs:A,isConflicting:m,conflictType:d.conflictType,input1State:g,input2State:O,handled:d.conflictType===B.SAME_CHANGE,focused:!1};o.push(L)}return o}function Tn(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 f;if(s===void 0)f=En(c,a,i);else if(o==="split")f=Nn(s,c,a,i);else{const l=ze(s,c),y=ze(c,a),d=new Set;l.forEach(h=>{d.add(h.path)}),y.forEach(h=>{d.add(h.path)}),f=Array.from(d).map(h=>{const T=H(s,h),N=H(c,h),m=H(a,h),g=!he(T,N),O=!he(N,m);let u;return g&&O?u=B.TRUE_CONFLICT:g?u=B.INPUT1_ONLY:O?u=B.INPUT2_ONLY:u=B.SAME_CHANGE,{path:h,baseValue:T,input1Value:N,input2Value:m,conflictType:u}})}return Kr(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 In(e,t,r){const n=e!==t,o=e!==r;let i;return n&&o?t===r?i=B.SAME_CHANGE:i=B.TRUE_CONFLICT:n?i=B.INPUT1_ONLY:i=B.INPUT2_ONLY,{conflictType:i,input1Changed:n,input2Changed:o}}function Qr(e,t,r){var f,l,y;const n=[],o=[];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}=In(h,T,N);(g||O)&&o.push({line:d+1,input1Changed:g,input2Changed:O,baseLine:h,input1Line:T,input2Line:N,conflictType:m})}if(o.length===0)return[];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,L=s===B.TRUE_CONFLICT,p={id:`conflict-${n.length}`,baseRange:{startLineNumber:i,endLineNumberExclusive:O},input1Range:{startLineNumber:i,endLineNumberExclusive:O},input2Range:{startLineNumber:i,endLineNumberExclusive:O},input1Diffs:c,input2Diffs:a,isConflicting:L,conflictType:s,input1State:s===B.SAME_CHANGE&&u?ie.first:ie.excluded,input2State:A?ie.first:ie.excluded,handled:s===B.SAME_CHANGE,focused:!1};n.push(p),!T&&h&&(i=h.line,s=h.conflictType,c=[],a=[])}!T&&h&&(h.input1Changed&&c.push({line:h.line}),h.input2Changed&&a.push({line:h.line}))}return n}function Zr(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);return}throw new Error(`Cannot assign root value: expected object, got ${typeof r}`)}const n=t.split("/").filter(c=>c!=="");let o=e;for(let c=0;c<n.length-1;c++){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[f]}else{if(!o||typeof o!="object"||Array.isArray(o))throw new Error(`Path ${t}: segment ${a} expects object but got ${typeof o}`);const l=o;a in l||(l[a]={}),o=l[a]}}const i=n[n.length-1],s=Number.parseInt(i,10);if(!Number.isNaN(s)&&String(s)===i){if(!Array.isArray(o))throw new Error(`Path ${t}: last segment expects array but got ${typeof o}`);o[s]=r}else{if(!o||typeof o!="object"||Array.isArray(o))throw new Error(`Path ${t}: last segment expects object but got ${typeof o}`);o[i]=r}}function eo(e,t){try{const r=mn(e);if(!r)return null;const n=t.split("/").filter(l=>l!=="").map(l=>{const y=Number.parseInt(l,10);return!Number.isNaN(y)&&String(y)===l?y:l}),o=yn(r,n);if(!o)return null;const s=e.substring(0,o.offset).split(`
|
|
28
|
+
`).length,c=o.offset+o.length,f=e.substring(0,c).split(`
|
|
29
|
+
`).length;return{startLine:s,endLine:f}}catch{return null}}function kn(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?Xe(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],d=n?`${n}/${l}`:`/${l}`,h=kn(s[l],i[l],y,d);if(h!==null)s[l]=h;else return null}}else if(f===!0||f===void 0||(a==null?void 0:a[l])!==void 0)s[l]=i[l];else{if(f===!1)return null;if(typeof f=="object")s[l]=i[l];else return null}return s}return null}function to(e,t,r,n,o){var L;const i=[],s=[],c=e.join(`
|
|
30
30
|
`),a=t.join(`
|
|
31
|
-
`),
|
|
32
|
-
`);let l,y,
|
|
33
|
-
`).length})}return{content:
|
|
34
|
-
`)):(
|
|
31
|
+
`),f=r.join(`
|
|
32
|
+
`);let l,y,d;try{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: ${p instanceof Error?p.message:String(p)}`,warnings:i}}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=new Set,N=new Set,m=new Set,g=(p,v,R)=>null;for(const p of n){const v=p.input1State===ie.first||p.input1State===ie.second,R=p.input2State===ie.first||p.input2State===ie.second;let P=p.path;if(!P&&(P=g(p.baseRange.startLineNumber,p.baseRange.endLineNumberExclusive)||void 0,!P)){p.conflictType===B.INPUT2_ONLY&&R?h=JSON.parse(JSON.stringify(d)):p.conflictType===B.INPUT1_ONLY&&v?h=JSON.parse(JSON.stringify(y)):p.conflictType===B.SAME_CHANGE&&(v||R)||R?h=JSON.parse(JSON.stringify(d)):v&&(h=JSON.parse(JSON.stringify(y)));continue}try{let M,$=P;const F=(L=p.path)==null?void 0:L.match(/^(.*\/\d+)(?:\/.*)?$/);let U=!1,k="";if(F){const x=F[1].split("/").filter(Q=>Q!=="");if(x.length>=2){const Q=x[x.length-1];/^\d+$/.test(Q)&&(U=!0,k=`/${x.slice(0,-1).join("/")}`)}}if(v&&R)if(p.conflictType===B.SAME_CHANGE)U?(M=H(d,k),$=k):M=H(d,P);else{const I=U?k:P,x=H(y,I),Q=H(d,I),se=o&&l&&typeof l=="object"&&Xe(o,I,l)||void 0,ae=kn(x,Q,se,I);ae!==null?(M=ae,$=I,i.push(`Smart-merged conflict at path ${I}`)):(M=Q,$=I,i.push(`Merge failed at path ${I}, using input2 value`))}else if(v)if(U)M=H(y,k),$=k;else{const I=P.split("/").filter(Boolean);if(I.length>1){const x=`/${I.slice(0,-1).join("/")}`;if(!m.has(x)){const Q=H(y,x);if(typeof Q=="object"&&Q!==null&&!Array.isArray(Q)){const se=H(h,x);if(typeof se=="object"&&se!==null&&!Array.isArray(se)){for(const[ae,ge]of Object.entries(Q)){const Se=`${x}/${ae}`;N.has(Se)||(se[ae]=ge)}m.add(x)}}}M=H(y,P)}else M=H(y,P)}else if(R)if(U)M=H(d,k),$=k;else{const I=P.split("/").filter(Boolean);if(I.length>1){const x=`/${I.slice(0,-1).join("/")}`;if(!m.has(x)){const Q=H(d,x);if(typeof Q=="object"&&Q!==null&&!Array.isArray(Q)){const se=H(h,x);if(typeof se=="object"&&se!==null&&!Array.isArray(se)){for(const[ae,ge]of Object.entries(Q)){const Se=`${x}/${ae}`;N.has(Se)||(se[ae]=ge)}m.add(x)}}}M=H(d,P)}else M=H(d,P)}else{const I=U?k:P,x=H(l,I);if(x!==void 0)M=x,$=I;else continue}M!==void 0&&(Zr(h,$,M),T.add($),N.add($))}catch(M){i.push(`Failed to apply conflict at path ${P||p.id}: ${M instanceof Error?M.message:String(M)}`)}}const O=JSON.stringify(h,null,2);for(const p of n){const v=p.path;if(!v)continue;const R=p.input1State===ie.first||p.input1State===ie.second,P=p.input2State===ie.first||p.input2State===ie.second;if(R&&P&&p.conflictType===B.TRUE_CONFLICT){const M=eo(O,v);M&&s.push({conflictId:p.id,conflictPath:v,type:"warning",message:"Both conflicting changes were accepted - please review and manually resolve",startLine:M.startLine,endLine:M.endLine})}}let u=!0,A;try{JSON.parse(O)}catch(p){u=!1,A=p instanceof Error?p.message:"Invalid JSON",s.push({conflictId:"validation-error",conflictPath:"/",type:"error",message:A,startLine:1,endLine:O.split(`
|
|
33
|
+
`).length})}return{content:O,isValid:u,validationError:A,warnings:i.length>0?i:void 0,conflictIssues:s.length>0?s:void 0}}function no(e,t,r){let n="",o="",i="",s="",c="",a="",f="",l="";switch(e.conflictType){case B.SAME_CHANGE:{const y=e.baseRange.startLineNumber===1&&e.baseRange.endLineNumberExclusive===2&&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="",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 B.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 B.INPUT2_ONLY:n="",o="merge-change-current",i=t?"":"merge-change-base",s="",c=r.changeOverviewColor,a=t?"":r.baseOverviewColor,f="",l="+";break;case B.TRUE_CONFLICT:{const y=e.baseRange.startLineNumber===1&&e.baseRange.endLineNumberExclusive===2&&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="",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}}return{input1Class:n,input2Class:o,baseClass:i,input1OverviewColor:s,input2OverviewColor:c,baseOverviewColor:a,input1Symbol:f,input2Symbol:l}}function Sn(e){const t=new Set;for(const r of e)if(r&&typeof r=="object"&&"line"in r){const n=r.line;n>0&&t.add(n)}return Array.from(t).sort((r,n)=>r-n)}function ro(e,t,r){const n=[];if(t.input1Class){if(e.input1Diffs.length>0){const o=Sn(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===B.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}function oo(e,t,r){const n=[];if(e.input2Diffs.length>0&&t.input2Class){const o=Sn(e.input2Diffs);for(const i of o)n.push({range:new r.Range(i,1,i,Number.MAX_SAFE_INTEGER),options:{isWholeLine:!0,className:t.input2Class,linesDecorationsClassName:t.input2Symbol&&t.input2Symbol!==""?`diff-symbol diff-symbol-${t.input2Symbol==="+"?"plus":"minus"}`:void 0,overviewRuler:t.input2OverviewColor?{color:t.input2OverviewColor,position:r.editor.OverviewRulerLane.Full}:void 0,minimap:t.input2OverviewColor?{color:t.input2OverviewColor,position:r.editor.MinimapPosition.Inline}:void 0}})}return n}function io(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(e.baseRange.startLineNumber,1,e.baseRange.endLineNumberExclusive-1,Number.MAX_SAFE_INTEGER),options:{isWholeLine:!0,className:t.baseClass,overviewRuler:{color:t.baseOverviewColor,position:r.editor.OverviewRulerLane.Full},minimap:{color:t.baseOverviewColor,position:r.editor.MinimapPosition.Inline}}}),n}function so(e,t,r,n){const o=no(e,t,r);return{input1Decorations:ro(e,o,n),input2Decorations:oo(e,o,n),baseDecorations:io(e,o,n)}}function co(e,t,r,n){const o=[],i=[],s=[];for(const c of e){const a=so(c,t,r,n);o.push(...a.input1Decorations),i.push(...a.input2Decorations),s.push(...a.baseDecorations)}return{input1Decorations:o,input2Decorations:i,baseDecorations:s}}const ao=()=>ot.jsx("div",{style:{padding:"20px",textAlign:"center",color:"#888"},children:"Loading Monaco Editor..."}),_t="⚠";function lo(e){const{original:t="",modified:r="",base:n="",theme:o="vs",options:i={},width:s="100%",height:c="100%",className:a,loading:f,onMount:l,onMergeResolve:y,showResultColumn:d,baseIndex:h=1,comparisonMode:T="split",schema:N,patches:m,labels:g,sortKeys:O=!1}=e,u=n?d:!1,A=!n||n==="",L="json",[p,v]=j.useState(!1),[R,P]=j.useState(!0),[M,$]=j.useState([]),[F,U]=j.useState(null),[k,I]=j.useState([]),[x,Q]=j.useState([]),[se,ae]=j.useState(!1),[ge,Se]=j.useState(new Set),Ae=j.useRef(""),De=j.useCallback((_,b,E,w)=>{const S=document.createElement("div");S.className="native-checkbox-container";const V=document.createElement("input");return V.type="checkbox",V.className="native-checkbox",V.checked=_===ie.first||_===ie.second,V.setAttribute("aria-label",V.checked?"Undo accept":"Accept change"),V.addEventListener("click",K=>{K.preventDefault(),K.stopPropagation(),requestAnimationFrame(()=>{w()})}),S.appendChild(V),S},[]),[Ne,xe]=j.useState(0),ee=j.useRef(null),pe=j.useRef(null),te=j.useRef(null),W=j.useRef(null),be=j.useRef(null),Ke=j.useRef(null),Me=j.useRef(!1),Ot=j.useRef(!1),Ve=j.useRef(null),Qe=j.useRef(null),Le=j.useRef(null),Je=j.useRef(new Map),Ee=j.useRef(null),Pe=j.useRef(new Map),He=j.useRef(null),Ge=j.useRef(null),We=j.useRef(null);j.useEffect(()=>{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)}),()=>{_=!1,Me.current||b.cancel()}},[]);const Gt=j.useCallback((_,b,E)=>{if(!be.current)return[];const w=(_==null?void 0:_.getValue())||"",S=b.getValue(),V=E.getValue();try{const K=performance.now(),Y=Tn(w,S,V,{comparisonMode:T,schema:N,patches:m}),D=performance.now()-K;return D>100&&console.warn(`JSON Patch diff took ${D.toFixed(2)}ms`),Y}catch(K){const Y=K instanceof Error?K.message:String(K);return console.error("JSON Patch diff error:",Y),[]}},[T,N,m]),Ze=j.useCallback(_=>{try{return _.getLayoutInfo().decorationsLeft||0}catch{return 0}},[]),et=j.useCallback(_=>{try{return _.getLayoutInfo().decorationsWidth||0}catch{return 0}},[]),lt=j.useCallback(_=>{if(!u||!W.current||!Le.current)return;const b=be.current;if(!b)return;const E=o==="vs-dark"||typeof o=="string"&&o.includes("dark"),w=Ze(W.current),S=et(W.current);Le.current.style.left=`${w}px`,Le.current.style.width=`${S}px`;const V=W.current.getScrollTop();if(W.current.getModel()){Le.current.innerHTML="";for(const Y of _){const D=Y.startLine,ue=Y.endLine,re=W.current.getTopForLineNumber(D)-V,C=W.current.getTopForLineNumber(ue)-V,J=W.current.getOption(b.editor.EditorOption.lineHeight),le=ue>D?C-re+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,re)}px`,G.style.height=`${le}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 ne=document.createElement("div");ne.className="issue-icon",Y.type==="error"?(ne.textContent="✗",ne.style.color=E?"#ff6666":"#cc0000"):Y.type==="warning"?(ne.textContent=_t,ne.style.color=E?"#ffaa00":"#ff8800"):Y.type==="smart-merge"&&(ne.textContent="↕",ne.style.color=E?"#0096ff":"#0078d4"),ne.style.fontSize="14px",ne.style.fontWeight="bold",G.appendChild(ne),Le.current.appendChild(G)}}},[u,o,Ze,et]),ut=j.useCallback(_=>{var oe,le,G,ne;if(!W.current||se)return;const b=W.current.getModel(),E=(oe=ee.current)==null?void 0:oe.getModel(),w=(le=te.current)==null?void 0:le.getModel(),S=(G=pe.current)==null?void 0:G.getModel();if(!b||!E||!w||!S)return;const V=S.getLinesContent(),K=E.getLinesContent(),Y=w.getLinesContent(),D=to(V,K,Y,_,N);if(U(D.isValid?null:D.validationError||"Invalid JSON"),I(D.warnings||[]),Q(D.conflictIssues||[]),Ee.current){const z=(g==null?void 0:g.result)||"Result";D.isValid?D.warnings&&D.warnings.length>0?(Ee.current.textContent=`${z} ${_t}`,Ee.current.title=D.warnings.join(`
|
|
34
|
+
`)):(Ee.current.textContent=z,Ee.current.style.color="",Ee.current.title=""):(Ee.current.textContent=`${z} ${_t} Invalid JSON`,Ee.current.style.color="#ff4444",Ee.current.title=D.validationError||"Invalid JSON - please fix manually")}if(b.getValue()!==D.content){const z=W.current.getPosition(),q=W.current.getSelection();if(Ot.current=!0,b.setValue(D.content),Ot.current=!1,z){const de=b.getLineCount(),me=b.getLineLength(de),X={lineNumber:Math.min(z.lineNumber,de),column:z.lineNumber<=de?Math.min(z.column,b.getLineLength(z.lineNumber)+1):me+1};W.current.setPosition(X),q&&!q.isEmpty()&&W.current.setSelection(q)}}const re=be.current,C=b;let J=C._invalidDecorations;if(!D.isValid&&W.current&&re?(J||(J=W.current.createDecorationsCollection([]),C._invalidDecorations=J),J.set([{range:new re.Range(1,1,b.getLineCount(),Number.MAX_SAFE_INTEGER),options:{isWholeLine:!1,className:"merge-result-invalid",hoverMessage:{value:D.validationError||"Invalid JSON - please fix manually"}}}])):D.isValid&&J&&W.current&&J.set([]),D.conflictIssues&&D.conflictIssues.length>0){if(lt(D.conflictIssues),W.current&&re){const z=b;if(!z._conflictIssueDecorations){const me=W.current.createDecorationsCollection([]);z._conflictIssueDecorations=me}const q=z._conflictIssueDecorations,de=D.conflictIssues.map(me=>{let X,ye;return me.type==="error"?(X=o==="vs-dark"?"rgba(255, 0, 0, 0.1)":"rgba(255, 0, 0, 0.05)",ye=o==="vs-dark"?"#ff6666":"#cc0000"):me.type==="warning"?(X=o==="vs-dark"?"rgba(255, 170, 0, 0.1)":"rgba(255, 136, 0, 0.05)",ye=o==="vs-dark"?"#ffaa00":"#ff8800"):(X=o==="vs-dark"?"rgba(0, 150, 255, 0.1)":"rgba(0, 120, 212, 0.05)",ye=o==="vs-dark"?"#0096ff":"#0078d4"),{range:new re.Range(me.startLine,1,me.endLine,Number.MAX_SAFE_INTEGER),options:{isWholeLine:!0,className:`conflict-issue-line conflict-issue-${me.type}`,linesDecorationsClassName:`conflict-issue-line-decoration conflict-issue-${me.type}`,backgroundColor:X,overviewRuler:{color:ye,position:re.editor.OverviewRulerLane.Right},minimap:{color:ye,position:re.editor.MinimapPosition.Inline}}}});q.set(de)}}else if(W.current){const z=b;z._conflictIssueDecorations&&z._conflictIssueDecorations.set([]),Le.current&&u&&(Le.current.innerHTML="")}if(y){const z=`${D.content}|${D.isValid}|${(ne=D.warnings)==null?void 0:ne.join(",")}`;Ae.current!==z&&(Ae.current=z,queueMicrotask(()=>{y(D.content,{isValid:D.isValid,validationError:D.validationError,warnings:D.warnings,conflictIssues:D.conflictIssues})}))}},[y,N,g,o,lt,u,se]),At=j.useCallback((_,b)=>{ae(!1),$(E=>{const w=E.map(S=>{if(S.id!==_)return S;const K=(b===1?S.input1State:S.input2State)===ie.excluded?ie.first:ie.excluded;return b===1?{...S,input1State:K}:{...S,input2State:K}});return u&&W.current&&ut(w),w})},[u,ut]),Nt=j.useCallback((_,b,E,w,S,V,K)=>{if(!be.current)return;const D=w===1?ee.current:te.current;if(!D)return;const ue=w===1?E.input1Range:E.input2Range,re=w===1?E.input1State:E.input2State,C=D.getModel();if(!C)return;const J=C.getLineCount(),oe=Math.max(1,Math.min(ue.startLineNumber,J)),le=Math.max(1,Math.min(ue.endLineNumberExclusive-1,J));if(oe>J||le<1||oe>le)return;const G=D.getTopForLineNumber(oe)-S,z=D.getBottomForLineNumber(le)-S-G;let q=Je.current.get(b);if(!q){q=document.createElement("div"),q.className="merge-accept-gutter-marker";const Te=document.createElement("div");Te.className="background",q.appendChild(Te);const fe=document.createElement("div");fe.className="checkbox";const Z=document.createElement("div");Z.className="checkbox-background";const ve=De(re,w,E.id,()=>At(E.id,w));Z.appendChild(ve),fe.appendChild(Z),q.appendChild(fe),_.appendChild(q),Je.current.set(b,q)}q.style.top=`${G}px`,q.style.height=`${z}px`;const de=q.querySelector(".checkbox-background");if(de){de.innerHTML="";const Te=De(re,w,E.id,()=>At(E.id,w));de.appendChild(Te)}const me=E.handled,X=E.focused,ye=z>30;q.className="merge-accept-gutter-marker",me&&q.classList.add("handled"),X&&q.classList.add("focused"),ye?q.classList.add("multi-line"):q.classList.add("single-line");const $e=q.querySelector(".checkbox");if($e){const fe=z/2-12,Z=24;let ve=fe;const _e=Z,Ie=V-Z-24,ke=Z,Be=z-24-Z;ke<Be&&(ve=Math.max(_e,Math.min(ve+G,Ie))-G,ve=Math.max(ke,Math.min(ve,Be))),$e.style.top=`${ve+5}px`}},[At,De]),ft=j.useCallback(()=>{if(!u){const C=Je.current;for(const[J,oe]of C.entries())oe.remove(),C.delete(J);return}if(!ee.current||!te.current||!Ve.current||!Qe.current||!be.current)return;const b=o==="vs-dark"||typeof o=="string"&&o.includes("dark"),E=Ze(ee.current),w=et(ee.current),S=Ze(te.current),V=et(te.current);Ve.current.style.left=`${E}px`,Ve.current.style.width=`${w}px`,Qe.current.style.left=`${S}px`,Qe.current.style.width=`${V}px`;const K=ee.current.getVisibleRanges();if(!K||K.length===0)return;const Y=ee.current.getScrollTop(),D=Ve.current.clientHeight,ue=new Set;for(const C of M)if(!(C.input1Diffs.length===0&&C.input2Diffs.length===0)){if(C.input1Diffs.length>0){const J=`${C.id}-input1`;ue.add(J),Nt(Ve.current,J,C,1,Y,D,b)}if(C.input2Diffs.length>0){const J=`${C.id}-input2`;ue.add(J),Nt(Qe.current,J,C,2,Y,D,b)}}const re=Je.current;for(const[C,J]of re.entries())ue.has(C)||(J.remove(),re.delete(C))},[M,o,u,Ze,et,Nt]),we=j.useCallback((_,b)=>{var E,w,S;try{if(be.current){const V=(w=(E=be.current.editor).getTheme)==null?void 0:w.call(E);if((S=V==null?void 0:V.colors)!=null&&S[_])return V.colors[_]}}catch{}return b},[]),Wt=j.useCallback(()=>{if(!be.current||!ee.current||!te.current)return;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",b?"rgba(155, 185, 85, 0.2)":"rgba(155, 185, 85, 0.15)"),S=we("mergeEditor.changeBase.background",b?"rgba(255, 100, 100, 0.2)":"rgba(255, 100, 100, 0.15)"),V=we("editorOverviewRuler.modifiedForeground",b?"rgba(255, 166, 0, 0.8)":"rgba(255, 166, 0, 1)"),K=we("editorOverviewRuler.addedForeground",b?"rgba(155, 185, 85, 0.8)":"rgba(155, 185, 85, 1)"),Y=we("editorOverviewRuler.deletedForeground",b?"rgba(255, 100, 100, 0.8)":"rgba(255, 100, 100, 1)"),D=A,ue={conflictOverviewColor:V,changeOverviewColor:K,baseOverviewColor:Y},{input1Decorations:re,input2Decorations:C,baseDecorations:J}=co(M,D,ue,_),oe=we("input.background",b?"#3c3c3c":"#f3f3f3"),le=we("input.border",b?"#6b6b6b":"#c8c8c8"),G=we("focusBorder",b?"#007acc":"#0078d4"),ne=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 de=we("diffEditor.insertedTextBackground",b?"rgba(100, 100, 255, 0.15)":"rgba(100, 100, 255, 0.1)"),me=we("diffEditor.insertedTextBackground",b?"rgba(155, 185, 85, 0.2)":"rgba(155, 185, 85, 0.15)");q.textContent=`
|
|
35
35
|
/* True conflict - both sides changed differently (orange/amber) */
|
|
36
36
|
.monaco-editor .merge-conflict-incoming,
|
|
37
37
|
.monaco-editor .merge-conflict-current {
|
|
38
|
-
background-color: ${
|
|
38
|
+
background-color: ${E};
|
|
39
39
|
}
|
|
40
40
|
|
|
41
41
|
/* 2-way diff mode: red for deletions (input1 column) - must override merge-change-incoming */
|
|
@@ -46,15 +46,15 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
|
|
|
46
46
|
|
|
47
47
|
/* Single-side change (green for input2/ours, orange for input1/theirs in 3-way) */
|
|
48
48
|
.monaco-editor .merge-change-incoming {
|
|
49
|
-
background-color: ${
|
|
49
|
+
background-color: ${me};
|
|
50
50
|
}
|
|
51
51
|
.monaco-editor .merge-change-current {
|
|
52
|
-
background-color: ${
|
|
52
|
+
background-color: ${w};
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
/* Same change on both sides (blue/purple) */
|
|
56
56
|
.monaco-editor .merge-same-change {
|
|
57
|
-
background-color: ${
|
|
57
|
+
background-color: ${de};
|
|
58
58
|
}
|
|
59
59
|
|
|
60
60
|
/* Base changes */
|
|
@@ -65,8 +65,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
|
|
|
65
65
|
|
|
66
66
|
/* Invalid JSON in result column */
|
|
67
67
|
.monaco-editor .merge-result-invalid {
|
|
68
|
-
background-color: ${
|
|
69
|
-
outline: 1px solid ${
|
|
68
|
+
background-color: ${b?"rgba(255, 0, 0, 0.2)":"rgba(255, 0, 0, 0.1)"};
|
|
69
|
+
outline: 1px solid ${b?"rgba(255, 100, 100, 0.5)":"rgba(255, 0, 0, 0.3)"};
|
|
70
70
|
}
|
|
71
71
|
|
|
72
72
|
/* Diff symbols (+ and -) in line decorations - positioned in code area */
|
|
@@ -98,7 +98,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
|
|
|
98
98
|
pointer-events: none;
|
|
99
99
|
font-family: "Courier New", monospace;
|
|
100
100
|
width: 20px;
|
|
101
|
-
color: ${
|
|
101
|
+
color: ${b?"#9BB955":"#6A9955"};
|
|
102
102
|
}
|
|
103
103
|
|
|
104
104
|
.monaco-editor .diff-symbol.diff-symbol-minus::before {
|
|
@@ -117,7 +117,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
|
|
|
117
117
|
pointer-events: none;
|
|
118
118
|
font-family: "Courier New", monospace;
|
|
119
119
|
width: 20px;
|
|
120
|
-
color: ${
|
|
120
|
+
color: ${b?"#FF6464":"#CC0000"};
|
|
121
121
|
}
|
|
122
122
|
|
|
123
123
|
/* VSCode-style checkbox gutter - positioned at Monaco's glyph margin */
|
|
@@ -160,12 +160,12 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
|
|
|
160
160
|
width: 14px;
|
|
161
161
|
height: 14px;
|
|
162
162
|
border-radius: 3px;
|
|
163
|
-
background-color: ${
|
|
164
|
-
border: 1px solid ${
|
|
163
|
+
background-color: ${oe};
|
|
164
|
+
border: 1px solid ${le};
|
|
165
165
|
}
|
|
166
166
|
|
|
167
167
|
.merge-accept-gutter-marker.focused .checkbox-background {
|
|
168
|
-
border-color: ${
|
|
168
|
+
border-color: ${G};
|
|
169
169
|
border-width: 2px;
|
|
170
170
|
}
|
|
171
171
|
|
|
@@ -188,7 +188,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
|
|
|
188
188
|
height: 16px;
|
|
189
189
|
cursor: pointer;
|
|
190
190
|
margin: 0;
|
|
191
|
-
accent-color: ${
|
|
191
|
+
accent-color: ${ne};
|
|
192
192
|
}
|
|
193
193
|
|
|
194
194
|
/* Result column status indicator */
|
|
@@ -213,8 +213,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
|
|
|
213
213
|
}
|
|
214
214
|
|
|
215
215
|
.native-checkbox:focus {
|
|
216
|
-
outline: 2px solid ${
|
|
216
|
+
outline: 2px solid ${G};
|
|
217
217
|
outline-offset: 2px;
|
|
218
218
|
}
|
|
219
|
-
`,
|
|
219
|
+
`,He.current||(He.current=ee.current.createDecorationsCollection([])),He.current.set(re),Ge.current||(Ge.current=te.current.createDecorationsCollection([])),Ge.current.set(C),pe.current&&(We.current||(We.current=pe.current.createDecorationsCollection([])),We.current.set(J))},[M,o,A,we]),Ct=j.useCallback(()=>{if(!Me.current&&Ke.current&&be.current&&!R){const _=be.current,b=X=>{if(!O||!X)return X;try{const ye=JSON.parse(X);return Wr(ye)}catch{return X}};Ke.current.innerHTML="",Pe.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"),S=w?"#444":"#ddd",V=w?"#fff":"#333",K=(X,ye)=>{var $e,Te,fe;try{const Z=(Te=($e=_.editor).getTheme)==null?void 0:Te.call($e);if((fe=Z==null?void 0:Z.colors)!=null&&fe[X])return Z.colors[X]}catch{}return ye},Y=K("mergeEditor.conflict.input1.header.background",w?"#4B1818":"#FFE6E6"),D=K("editorGutter.background",w?"#333":"#f0f0f0"),ue=K("mergeEditor.conflict.input2.header.background",w?"#1B4B18":"#E6FFE6"),re=K("mergeEditor.result.header.background",w?"#7F5F00":"#FFECB3"),C=(X,ye,$e,Te=!1)=>{const fe=document.createElement("div");fe.style.flex="1",fe.style.display="flex",fe.style.flexDirection="column",fe.style.borderRight=`1px solid ${S}`,fe.style.overflow="hidden",fe.style.transition="flex 0.2s ease, min-width 0.2s ease, max-width 0.2s ease",fe.dataset.columnKey=X;const Z=document.createElement("div");Z.style.padding="4px 8px",Z.style.fontSize="11px",Z.style.fontWeight="500",Z.style.backgroundColor=$e,Z.style.color=V,Z.style.borderBottom=`1px solid ${S}`,Z.style.display="flex",Z.style.alignItems="center",Z.style.gap="4px",Z.style.height="22px",Z.style.boxSizing="content-box",Z.style.whiteSpace="nowrap",Z.style.overflow="hidden";const ve=document.createElement("span");ve.textContent=ye,ve.style.flex="1",ve.style.overflow="hidden",ve.style.textOverflow="ellipsis",Z.appendChild(ve);const _e=document.createElement("div");_e.className="column-collapse-icon",_e.title="Collapse column",_e.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>',_e.addEventListener("click",Ln=>{Ln.stopPropagation(),Se(Kt=>{const tt=new Set(Kt);if(tt.has(X))tt.delete(X);else{if(Array.from(Pe.current.keys()).filter(Pn=>!tt.has(Pn)).length<=1)return Kt;tt.add(X)}return tt})}),Z.appendChild(_e),fe.appendChild(Z);const Ie=document.createElement("div");Ie.style.flex="1",Ie.style.position="relative",Ie.style.overflow="hidden",Ie.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",Ie.appendChild(ke);let Be=null;return Te&&(Be=document.createElement("div"),Be.className="merge-editor-gutter",Ie.appendChild(Be)),fe.appendChild(Ie),Pe.current.set(X,{container:fe,editorWrapper:Ie,labelDiv:Z,labelText:ve,collapseIcon:_e}),{container:fe,editorDiv:ke,gutterDiv:Be}},J=C("input1",(g==null?void 0:g.input1)||"Theirs",Y,u),oe=C("input2",(g==null?void 0:g.input2)||"Ours",ue,u);J.gutterDiv&&(Ve.current=J.gutterDiv),oe.gutterDiv&&(Qe.current=oe.gutterDiv);const le=!!n;let G=null;if(le){G=C("base",(g==null?void 0:g.base)||"Base",D,!1);const X=[];h===0?X.push(G.container,J.container,oe.container):h===1?X.push(J.container,G.container,oe.container):h===2&&X.push(J.container,oe.container,G.container),X.forEach(ye=>{E.appendChild(ye)})}else E.appendChild(J.container),E.appendChild(oe.container);let ne=null;if(u&&le){ne=C("result",(g==null?void 0:g.result)||"Result",re,!0);const X=Pe.current.get("result");Ee.current=(X==null?void 0:X.labelText)??ne.container.querySelector("span"),ne.gutterDiv&&(Le.current=ne.gutterDiv),E.appendChild(ne.container)}Ke.current.appendChild(E);const z=_.editor.createModel(b(t||""),L),q=le?_.editor.createModel(b(n||""),L):null,de=_.editor.createModel(b(r||""),L);if(ee.current=_.editor.create(J.editorDiv,{model:z,readOnly:!0,automaticLayout:!0,folding:!u,glyphMargin:!1,...i,lineDecorationsWidth:u?26:10}),le&&G&&(pe.current=_.editor.create(G.editorDiv,{model:q,readOnly:!0,automaticLayout:!0,folding:!u,glyphMargin:!1,...i,lineDecorationsWidth:10})),te.current=_.editor.create(oe.editorDiv,{model:de,readOnly:!0,automaticLayout:!0,folding:!u,glyphMargin:!1,...i,lineDecorationsWidth:u?26:10}),u&&ne){const X=_.editor.createModel(b(r||""),L);W.current=_.editor.create(ne.editorDiv,{model:X,automaticLayout:!0,folding:!u,glyphMargin:!1,...i,readOnly:!1,lineDecorationsWidth:26}),X.onDidChangeContent(()=>{Ot.current||ae(!0)})}_.editor.setTheme(o);const me=Gt(q,z,de);$(me),Me.current=!0,l&&ee.current&&te.current&&l({input1:ee.current,input2:te.current,base:pe.current,result:W.current},_)}},[i,o,t,r,n,u,h,R,Gt,l,g,O]),qt=j.useRef(u),Yt=j.useRef(h),zt=j.useRef(T),Xt=j.useRef(n);return j.useEffect(()=>{var S,V,K,Y,D,ue,re,C,J,oe,le;const _=qt.current!==u,b=Yt.current!==h,E=zt.current!==T,w=Xt.current!==n;if((_||b||E||w)&&Me.current){qt.current=u,Yt.current=h,zt.current=T,Xt.current=n,Je.current.forEach(de=>{de.remove()}),Je.current.clear(),Pe.current.clear(),Se(new Set),(S=He.current)==null||S.set([]),(V=Ge.current)==null||V.set([]),(K=We.current)==null||K.set([]),He.current=null,Ge.current=null,We.current=null;const G=(Y=ee.current)==null?void 0:Y.getModel(),ne=(D=pe.current)==null?void 0:D.getModel(),z=(ue=te.current)==null?void 0:ue.getModel(),q=(re=W.current)==null?void 0:re.getModel();(C=ee.current)==null||C.dispose(),(J=pe.current)==null||J.dispose(),(oe=te.current)==null||oe.dispose(),(le=W.current)==null||le.dispose(),G==null||G.dispose(),ne==null||ne.dispose(),z==null||z.dispose(),q==null||q.dispose(),Me.current=!1,xe(de=>de+1)}},[u,h,T,n]),j.useEffect(()=>{!R&&be.current&&Ke.current&&!Me.current&&Ct()},[R,Ct]),j.useEffect(()=>{!p||!i||(ee.current&&ee.current.updateOptions(i),te.current&&te.current.updateOptions(i),pe.current&&pe.current.updateOptions(i),W.current&&W.current.updateOptions(i))},[i,p]),j.useEffect(()=>{p&&M.length>0&&(Wt(),u&&ft())},[p,M,Wt,ft,u]),j.useEffect(()=>{p&&M.length>0&&u&&W.current&&ut(M)},[p,M,u,ut]),j.useEffect(()=>{if(!p)return;const _=()=>{x.length>0&<(x)},b=[],E=()=>{ft()};return ee.current&&b.push(ee.current.onDidScrollChange(E)),te.current&&b.push(te.current.onDidScrollChange(E)),W.current&&u&&(b.push(W.current.onDidScrollChange(_)),b.push(W.current.onDidLayoutChange(_))),ee.current&&b.push(ee.current.onDidLayoutChange(E)),te.current&&b.push(te.current.onDidLayoutChange(E)),()=>{b.forEach(w=>{w==null||w.dispose()})}},[p,ft,lt,u,x]),j.useEffect(()=>{if(!p)return;const _=[ee.current,pe.current,te.current];u&&W.current&&_.push(W.current);const b=[];let E=!1;const w=S=>{if(E)return;E=!0;const V=S.getScrollTop(),K=S.getScrollLeft();_.forEach(Y=>{Y&&Y!==S&&(Y.setScrollTop(V),Y.setScrollLeft(K))}),setTimeout(()=>{E=!1},10)};return _.forEach(S=>{S&&b.push(S.onDidScrollChange(()=>{w(S)}))}),()=>{b.forEach(S=>{S==null||S.dispose()})}},[p,u]),j.useEffect(()=>{if(!p)return;const b=Array.from(Pe.current.keys()).filter(E=>!ge.has(E)).length;for(const[E,w]of Pe.current.entries()){const S=ge.has(E),V=b>1||S;S?(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"),!S&&!V?(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 Pe.current.entries())if(!ge.has(w)){const S=w==="input1"?ee:w==="input2"?te:w==="base"?pe:w==="result"?W:null;(E=S==null?void 0:S.current)==null||E.layout()}})},[p,ge]),j.useEffect(()=>()=>{var S,V,K,Y,D,ue,re,C,J,oe,le;(S=He.current)==null||S.set([]),(V=Ge.current)==null||V.set([]),(K=We.current)==null||K.set([]);const _=(Y=ee.current)==null?void 0:Y.getModel(),b=(D=pe.current)==null?void 0:D.getModel(),E=(ue=te.current)==null?void 0:ue.getModel(),w=(re=W.current)==null?void 0:re.getModel();(C=ee.current)==null||C.dispose(),(J=pe.current)==null||J.dispose(),(oe=te.current)==null||oe.dispose(),(le=W.current)==null||le.dispose(),_==null||_.dispose(),b==null||b.dispose(),E==null||E.dispose(),w==null||w.dispose(),Me.current=!1,v(!1)},[]),R||!p?ot.jsx(ot.Fragment,{children:f??ot.jsx(ao,{})}):ot.jsx("div",{ref:Ke,style:{width:s,height:c},className:a})}exports.JsonDiffMergeEditor=lo;exports.analyzeConflicts=Nn;exports.analyzeTwoWayConflicts=En;exports.computeDiffs=Qr;exports.computeDiffsJsonPatch=Tn;exports.computeLineConflictType=In;
|
|
220
220
|
//# sourceMappingURL=index.cjs.map
|