sf-git-merge-driver 1.8.2 → 1.9.0
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/README.md +3 -3
- package/bin/merge-driver.cjs +3 -3
- package/lib/service/MetadataService.js +2 -0
- package/lib/service/MetadataService.js.map +1 -1
- package/npm-shrinkwrap.json +106 -106
- package/oclif.manifest.json +1 -1
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -462,7 +462,7 @@ EXAMPLES
|
|
|
462
462
|
$ sf git merge driver install --force
|
|
463
463
|
```
|
|
464
464
|
|
|
465
|
-
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.
|
|
465
|
+
_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.9.0/src/commands/git/merge/driver/install.ts)_
|
|
466
466
|
|
|
467
467
|
## `sf git merge driver run`
|
|
468
468
|
|
|
@@ -509,7 +509,7 @@ EXAMPLES
|
|
|
509
509
|
- output-file is the path to the file where the merged content will be written
|
|
510
510
|
```
|
|
511
511
|
|
|
512
|
-
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.
|
|
512
|
+
_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.9.0/src/commands/git/merge/driver/run.ts)_
|
|
513
513
|
|
|
514
514
|
## `sf git merge driver uninstall`
|
|
515
515
|
|
|
@@ -549,7 +549,7 @@ EXAMPLES
|
|
|
549
549
|
$ sf git merge driver uninstall --dry-run
|
|
550
550
|
```
|
|
551
551
|
|
|
552
|
-
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.
|
|
552
|
+
_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.9.0/src/commands/git/merge/driver/uninstall.ts)_
|
|
553
553
|
<!-- commandsstop -->
|
|
554
554
|
|
|
555
555
|
## Changelog
|
package/bin/merge-driver.cjs
CHANGED
|
@@ -14,10 +14,10 @@ ${_t.repeat(e)}`,St[e]=t),t},ke=class{buf="";markers;constructor(t){this.markers
|
|
|
14
14
|
`:n)}},Lt=(e,t)=>t===`
|
|
15
15
|
`?e:e.replace(/\r?\n/g,t),Pe=16*1024,se=class{config;constructor(t){this.config=t}async writeTo(t,r,n,o=`
|
|
16
16
|
`,s=!0){if(r.length===0)return;let i=kr(this.config),a={buf:"",depth:0,endedWithGt:!1,isFirstTopLevelAfterDecl:!0};if(Vr(a,r,n,i),!s){let p=Lt(a.buf,o);t.write(p)||await(0,Fe.once)(t,"drain");return}let l=new ke(this.config),u="",h=async()=>{let p=Lt(u,o);u="",t.write(p)||await(0,Fe.once)(t,"drain")};for(let p=0;p<a.buf.length;p+=Pe)u+=l.push(a.buf.slice(p,p+Pe)),u.length>=Pe&&await h();u+=l.end(),await h()}};var ie=require("node:fs"),ae=require("node:os"),Ke=require("node:path");var kt="sf-git-merge-driver";function Xr(e){return typeof e=="function"?e():e}function V(e,...t){let r=t.map(n=>typeof n=="function"?n:()=>n);return()=>e.reduce((n,o,s)=>n+o+(s<r.length?r[s]():""),"")}var j={trace:10,debug:20,info:30,warn:40,error:50,fatal:60},Dt=j.warn;function Ur(e){if(!e)return Dt;let t=Number(e);if(Number.isInteger(t)&&t>=0)return t;let r=e.toLowerCase();return r in j?j[r]:Dt}var $t=Ur(process.env.SF_LOG_LEVEL??process.env.SFDX_LOG_LEVEL),Vt=e=>e>=$t,Gt=j,Yr=process.env.SF_LOG_STDERR==="true",Br=(0,ae.hostname)(),zr=process.pid,Wt=(0,Ke.join)((0,ae.homedir)(),".sf"),Kt=!1;function qr(){if(!Kt){Kt=!0;try{(0,ie.mkdirSync)(Wt,{recursive:!0})}catch{}}}function Hr(){let e=new Date,t=e.getFullYear(),r=String(e.getMonth()+1).padStart(2,"0"),n=String(e.getDate()).padStart(2,"0");return(0,Ke.join)(Wt,`sf-${t}-${r}-${n}.log`)}function Jr(e,t,r){let n={level:e,time:Date.now(),pid:zr,hostname:Br,name:kt,msg:t};r!==void 0&&(n.meta=r);let o=`${JSON.stringify(n)}
|
|
17
|
-
`;qr();try{(0,ie.appendFileSync)(Hr(),o)}catch{}Yr&&process.stderr.write(o)}function B(e,t,r){e<$t||Jr(e,String(Xr(t)),r)}var M={trace(e,t){B(j.trace,e,t)},debug(e,t){B(j.debug,e,t)},info(e,t){B(j.info,e,t)},warn(e,t){B(j.warn,e,t)},error(e,t){B(j.error,e,t)}};var Zr=Vt(Gt.trace);function G(e){return function(t,r,n){if(!Zr)return;let o=n.value;n.value=function(...s){M.trace(V`${e}.${r}: entry`);let i=()=>o.call(this,...s);if(o.constructor.name==="AsyncFunction")return i().then(a=>(M.trace(V`${e}.${r}: exit`),a),a=>{throw M.trace(V`${e}.${r}: exit (error)`),a});try{let a=i();return M.trace(V`${e}.${r}: exit`),a}catch(a){throw M.trace(V`${e}.${r}: exit (error)`),a}}}}var O=e=>Array.isArray(e)?{}:e;var W=(e,...t)=>{for(let r of t)for(let n of r)e.push(n)},Xt=(e,t)=>{let r=new Set(t),n=e.filter(i=>r.has(i)),o=new Set(e),s=t.filter(i=>o.has(i));if(n.length!==s.length)return!1;for(let i=0;i<n.length;i++)if(n[i]!==s[i])return!1;return!0},ce=(e,t)=>{let r=e.length,n=t.length;if(r===0||n===0)return[];let o=n+1,s=new Int32Array((r+1)*o);for(let u=1;u<=r;u++){let h=(u-1)*o,p=u*o;for(let f=1;f<=n;f++)if(e[u-1]===t[f-1])s[p+f]=s[h+(f-1)]+1;else{let m=s[h+f],b=s[p+(f-1)];s[p+f]=m>=b?m:b}}let i=[],a=r,l=n;for(;a>0&&l>0;)e[a-1]===t[l-1]?(i.push(e[a-1]),a--,l--):s[(a-1)*o+l]>s[a*o+(l-1)]?a--:l--;return i.reverse(),i};var Qr=[],en={output:Qr,hasConflict:!1},C=e=>{if(e.length===1)return e[0];let t=[],r=!1;for(let n of e)W(t,n.output),r=r||n.hasConflict;return{output:t,hasConflict:r}},d=e=>e.length===0?en:{output:e,hasConflict:!1},w=e=>({output:e,hasConflict:!0});var z=(e,t)=>e.output.length>0?{output:[{[t]:e.output}],hasConflict:e.hasConflict}:d([{[t]:[]}]),q=(e,t)=>{let r=e==null?[]:Array.isArray(e)?e:[e];return d(t?[{[t]:r}]:r)};var g;(function(e){e[e.NONE=0]="NONE",e[e.OTHER_ONLY=1]="OTHER_ONLY",e[e.LOCAL_ONLY=2]="LOCAL_ONLY",e[e.LOCAL_AND_OTHER=3]="LOCAL_AND_OTHER",e[e.ANCESTOR_ONLY=4]="ANCESTOR_ONLY",e[e.ANCESTOR_AND_OTHER=5]="ANCESTOR_AND_OTHER",e[e.ANCESTOR_AND_LOCAL=6]="ANCESTOR_AND_LOCAL",e[e.ALL=7]="ALL"})(g||(g={}));var $e=e=>e==null?!1:typeof e=="string"||Array.isArray(e)?e.length>0:typeof e=="object"?Object.keys(e).length>0:!0,le=(e,t,r)=>{let n=g.NONE;return $e(e)&&(n|=g.ANCESTOR_ONLY),$e(t)&&(n|=g.LOCAL_ONLY),$e(r)&&(n|=g.OTHER_ONLY),n};var H=class{static getKeyFieldExtractor(t){return t in Ut?Ut[t]:void 0}static isOrderedAttribute(t){return tn.has(t)}},tn=new Set(["customValue","standardValue","value","values","filterItems","summaryFilterItems"]),c=(e,t)=>String(e[t]),Ve=e=>{let t=c(e,"field"),r=c(e,"operation"),n=c(e,"value"),o=c(e,"valueField");return[t,r,n,o].filter(s=>s!==String(void 0)).join(".")},rn=e=>{let t=c(e,"masterLabel");return t!==String(void 0)?t:c(e,"picklist")},Ut={labels:e=>c(e,"fullName"),applicationVisibilities:e=>c(e,"application"),categoryGroupVisibilities:e=>c(e,"dataCategoryGroup"),classAccesses:e=>c(e,"apexClass"),customMetadataTypeAccesses:e=>c(e,"name"),customPermissions:e=>c(e,"name"),customSettingAccesses:e=>c(e,"name"),externalDataSourceAccesses:e=>c(e,"externalDataSource"),fieldPermissions:e=>c(e,"field"),flowAccesses:e=>c(e,"flow"),layoutAssignments:e=>{let t=c(e,"layout"),r=c(e,"recordType");return[t,r].filter(n=>n!==String(void 0)).join(".")},loginFlows:e=>c(e,"friendlyname"),loginHours:e=>typeof e=="object"&&e!==null?Object.keys(e).join(","):"",loginIpRanges:e=>{let t=c(e,"startAddress"),r=c(e,"endAddress");return`${t}-${r}`},objectPermissions:e=>c(e,"object"),pageAccesses:e=>c(e,"apexPage"),profileActionOverrides:e=>c(e,"actionName"),recordTypeVisibilities:e=>c(e,"recordType"),tabVisibilities:e=>c(e,"tab"),userPermissions:e=>c(e,"name"),dataspaceScopes:e=>c(e,"dataspaceScope"),emailRoutingAddressAccesses:e=>c(e,"name"),externalCredentialPrincipalAccesses:e=>c(e,"externalCredentialPrincipal"),sharingCriteriaRules:e=>c(e,"fullName"),sharingGuestRules:e=>c(e,"fullName"),sharingOwnerRules:e=>c(e,"fullName"),sharingTerritoryRules:e=>c(e,"fullName"),criteriaItems:Ve,filterItems:Ve,summaryFilterItems:Ve,valueSettings:e=>c(e,"valueName"),alerts:e=>c(e,"fullName"),recipients:e=>c(e,"type"),fieldUpdates:e=>c(e,"fullName"),flowActions:e=>c(e,"fullName"),flowInputs:e=>c(e,"name"),flowAutomation:e=>c(e,"fullName"),knowledgePublishes:e=>c(e,"fullName"),outboundMessages:e=>c(e,"fullName"),rules:e=>c(e,"fullName"),actions:e=>c(e,"name"),send:e=>c(e,"fullName"),tasks:e=>c(e,"fullName"),assignmentRule:e=>c(e,"fullName"),autoResponseRule:e=>c(e,"fullName"),escalationRule:e=>c(e,"fullName"),marketingAppExtActions:e=>c(e,"apiName"),marketingAppExtActivities:e=>c(e,"fullName"),matchingRules:e=>c(e,"fullName"),matchingRuleItems:e=>{let t=c(e,"fieldName"),r=c(e,"matchingMethod");return`${t}-${r}`},customValue:e=>c(e,"fullName"),standardValue:e=>c(e,"fullName"),valueTranslation:e=>c(e,"masterLabel"),botBlocks:e=>c(e,"fullName"),botBlockVersions:e=>c(e,"fullName"),botDialogs:e=>c(e,"developerName"),botSteps:e=>c(e,"stepIdentifier"),botMessages:e=>c(e,"messageIdentifier"),botVariableOperation:e=>c(e,"variableOperationIdentifier"),botTemplates:e=>c(e,"fullName"),bots:e=>c(e,"fullName"),botVersions:e=>c(e,"fullName"),conversationMessageDefinitions:e=>c(e,"name"),constantValueTranslations:e=>c(e,"name"),customApplications:e=>c(e,"name"),customLabels:e=>c(e,"name"),customPageWebLinks:e=>c(e,"name"),customTabs:e=>c(e,"name"),desFieldTemplateMessages:e=>c(e,"name"),flowDefinitions:e=>c(e,"fullName"),flows:e=>c(e,"fullName"),identityVerificationCustomFieldLabels:e=>c(e,"name"),pipelineInspMetricConfigs:e=>c(e,"name"),prompts:e=>c(e,"name"),promptVersions:e=>c(e,"name"),quickActions:e=>c(e,"name"),reportTypes:e=>c(e,"name"),sections:e=>{let t=c(e,"name"),r=c(e,"section");return[t,r].filter(n=>n!==String(void 0))[0]},columns:e=>c(e,"name"),scontrols:e=>c(e,"name"),caseValues:e=>{let t=c(e,"article"),r=c(e,"caseType"),n=c(e,"plural"),o=c(e,"possessive");return[t,r,n,o].filter(s=>s!==String(void 0)).join(".")},fieldSets:e=>c(e,"name"),fields:e=>c(e,"name"),picklistValues:rn,values:e=>c(e,"fullName"),value:e=>c(e,"fullName"),layouts:e=>c(e,"layout"),quickActionParametersTranslation:e=>c(e,"name"),recordTypes:e=>c(e,"name"),sharingReasons:e=>c(e,"name"),standardFields:e=>c(e,"name"),validationRules:e=>c(e,"name"),webLinks:e=>c(e,"name"),workflowTasks:e=>c(e,"name"),types:e=>c(e,"name")};var Ge=e=>Array.isArray(e)?e.length===0:Object.keys(e).length===0,_=(e,t,r)=>{let n=Ge(e)?{}:e,o=Ge(t)?{}:t,s=Ge(r)?{}:r;return Nt(n,o,s)};var ue=(e,t)=>{let r=new Map;for(let n of e){let o=t(n);r.set(o,n)}return r},Yt=(e,t,r,n)=>{let o=new Set,s=new Map,i=new Map,a=new Map,l=(u,h)=>{for(let p of u){let f=p,m=n(f);h.set(m,f),o.add(m)}};return l(e,s),l(t,i),l(r,a),{keyedAncestor:s,keyedLocal:i,keyedOther:a,allKeys:o}};function T(e,t){let r=[[e,t]];for(;r.length>0;){let[n,o]=r.pop();if(n===o)continue;if(n===null||o===null||typeof n!="object"||typeof o!="object")return!1;if(Array.isArray(n)){if(!Array.isArray(o)||n.length!==o.length)return!1;for(let l=n.length-1;l>=0;l--)r.push([n[l],o[l]]);continue}if(Array.isArray(o))return!1;let s=n,i=o,a=Object.keys(s);if(a.length!==Object.keys(i).length)return!1;for(let l of a){if(!(l in i))return!1;r.push([s[l],i[l]])}}return!0}var Bt=(e,t)=>{if(e.size!==t.size)return!1;for(let r of e)if(!t.has(r))return!1;return!0},We=(e,t)=>{for(let r of e)if(t.has(r))return!0;return!1};var nn=(e,t,r)=>{let n=new Set(e),o=new Set(t),s=new Set(r);return{localDeleted:new Set(e.filter(i=>!o.has(i))),otherDeleted:new Set(e.filter(i=>!s.has(i))),localAdded:new Set(t.filter(i=>!n.has(i))),otherAdded:new Set(r.filter(i=>!n.has(i))),allKeys:new Set([...e,...t,...r])}},fe=class{ancestor;local;other;attribute;keyField;constructor(t,r,n,o,s){this.ancestor=t,this.local=r,this.other=n,this.attribute=o,this.keyField=s}merge(t){let r=this.buildArrayMergeState(),n=this.analyzeOrderings(r);return n.canMerge?n.localMoved.size>0||n.otherMoved.size>0?this.processDivergedOrderings(t,r,n):this.processWithSpine(t,r):this.buildFullArrayConflict(t,r)}buildArrayMergeState(){let t=this.ancestor.map(o=>this.keyField(o)),r=this.local.map(o=>this.keyField(o)),n=this.other.map(o=>this.keyField(o));return{ancestorKeys:t,localKeys:r,otherKeys:n,ancestorMap:ue(this.ancestor,this.keyField),localMap:ue(this.local,this.keyField),otherMap:ue(this.other,this.keyField),ancestorPos:new Map(t.map((o,s)=>[o,s])),localPos:new Map(r.map((o,s)=>[o,s])),otherPos:new Map(n.map((o,s)=>[o,s])),ancestorSet:new Set(t)}}analyzeOrderings(t){if(Xt(t.localKeys,t.otherKeys))return{canMerge:!0,localMoved:new Set,otherMoved:new Set};let r=this.getMovedElements(t,t.localPos),n=this.getMovedElements(t,t.otherPos);return We(r,n)?{canMerge:!1,localMoved:r,otherMoved:n}:r.size===0&&n.size===0?{canMerge:!1,localMoved:r,otherMoved:n}:{canMerge:!0,localMoved:r,otherMoved:n}}getMovedElements(t,r){let n=new Set;for(let o=0;o<t.ancestorKeys.length;o++){let s=t.ancestorKeys[o],i=r.get(s);if(i!==void 0)for(let a=o+1;a<t.ancestorKeys.length;a++){let l=t.ancestorKeys[a],u=r.get(l);u!==void 0&&i>u&&(n.add(s),n.add(l))}}return n}processDivergedOrderings(t,r,n){let o=this.computeMergedKeyOrder(r,n);return o===null?this.buildFullArrayConflict(t,r):this.processKeyOrder(t,r,o)}computeMergedKeyOrder(t,r){let{localMoved:n,otherMoved:o}=r,s=t.localKeys.filter(f=>n.has(f)),i=t.otherKeys.filter(f=>o.has(f)),a=t.localKeys.filter(f=>!n.has(f)&&!t.ancestorSet.has(f)),l=t.otherKeys.filter(f=>!o.has(f)&&!t.ancestorSet.has(f)&&!t.localMap.has(f));if(a.length>0&&l.length>0)return null;let u=[],h=!1,p=!1;for(let f of t.ancestorKeys)n.has(f)?h||(W(u,s),h=!0):o.has(f)?p||(W(u,i),p=!0):u.push(f);return W(u,a,l),u}processWithSpine(t,r){let n=ce(ce(r.ancestorKeys,r.localKeys),ce(r.ancestorKeys,r.otherKeys));return this.processSpine(t,n,r)}processKeyOrder(t,r,n){let o=[];for(let s of n){let i=this.mergeElementWithPresenceCheck(t,s,r);i&&i.output.length>0&&o.push(i)}return C(o)}mergeElementWithPresenceCheck(t,r,n){let o=n.ancestorMap.has(r),s=n.localMap.has(r),i=n.otherMap.has(r);return o&&s&&i?this.mergeElement(t,r,n):this.mergeGapElement(t,r,n)}wrapKeys(t,r){return t.map(n=>({[this.attribute]:r.get(n)}))}buildFullArrayConflict(t,r){return w([_(this.wrapKeys(r.localKeys,r.localMap),this.wrapKeys(r.ancestorKeys,r.ancestorMap),this.wrapKeys(r.otherKeys,r.otherMap))])}processSpine(t,r,n){let o=[],s=0,i=0,a=0;for(let u of r){let h=n.ancestorPos.get(u),p=n.localPos.get(u),f=n.otherPos.get(u),m={ancestor:n.ancestorKeys.slice(s,h),local:n.localKeys.slice(i,p),other:n.otherKeys.slice(a,f)};o.push(this.mergeGap(t,m,n)),o.push(this.mergeElement(t,u,n)),s=h+1,i=p+1,a=f+1}let l={ancestor:n.ancestorKeys.slice(s),local:n.localKeys.slice(i),other:n.otherKeys.slice(a)};return o.push(this.mergeGap(t,l,n)),C(o)}mergeGap(t,r,n){let o=nn(r.ancestor,r.local,r.other),s=this.detectGapConflict(t,r,o,n);return s||this.mergeGapElements(t,o,n)}detectGapConflict(t,r,n,o){let{localDeleted:s,otherDeleted:i,localAdded:a,otherAdded:l}=n,u=s.size>0&&i.size>0&&!Bt(s,i),h=a.size>0&&l.size>0&&!We(a,l);return u||h?this.buildGapConflict(t,r,o):null}buildGapConflict(t,r,n){return w([_(this.wrapKeys(r.local,n.localMap),this.wrapKeys(r.ancestor,n.ancestorMap),this.wrapKeys(r.other,n.otherMap))])}mergeGapElements(t,r,n){let o=[];for(let s of r.allKeys){let i=this.mergeGapElement(t,s,n);i&&o.push(i)}return C(o)}mergeGapElement(t,r,n){let o=n.ancestorMap.get(r),s=n.localMap.get(r),i=n.otherMap.get(r);return o!==void 0?s===void 0?i===void 0||T(o,i)?null:this.buildElementConflict(t,null,o,i):T(o,s)?null:this.buildElementConflict(t,s,o,null):s!==void 0&&i!==void 0?T(s,i)?d([this.wrapElement(s)]):this.buildElementConflict(t,s,null,i):d([this.wrapElement(s??i)])}wrapElement(t){return{[this.attribute]:t}}mergeElement(t,r,n){let o=n.ancestorMap.get(r),s=n.localMap.get(r),i=n.otherMap.get(r);return T(o,i)&&s?d([this.wrapElement(s)]):T(o,s)&&i?d([this.wrapElement(i)]):T(s,i)?d([this.wrapElement(s)]):this.buildElementConflict(t,s,o,i)}buildElementConflict(t,r,n,o){let s=i=>i?this.wrapElement(i):{};return w([_(s(r),s(n),s(o))])}};var Xe=class{ancestor;local;other;attribute;constructor(t,r,n,o){this.ancestor=t,this.local=r,this.other=n,this.attribute=o}merge(t){return w([_({[this.attribute]:this.local},{[this.attribute]:this.ancestor},{[this.attribute]:this.other})])}},Ue=class{ancestor;local;other;attribute;keyField;constructor(t,r,n,o,s){this.ancestor=t,this.local=r,this.other=n,this.attribute=o,this.keyField=s}merge(t){let{keyedAncestor:r,keyedLocal:n,keyedOther:o,allKeys:s}=Yt(this.ancestor,this.local,this.other,this.keyField),i=[],a=new x(t,F);for(let l of Array.from(s).sort()){let u=a.merge(r.get(l)??{},n.get(l)??{},o.get(l)??{},this.attribute);u.output.length>0&&i.push({output:[{[this.attribute]:u.output}],hasConflict:u.hasConflict})}return C(i)}},he=class{ancestor;local;other;attribute;keyField;isOrdered;constructor(t,r,n,o,s,i){this.ancestor=t,this.local=r,this.other=n,this.attribute=o,this.keyField=s,this.isOrdered=i}merge(t){return this.keyField?(this.isOrdered?new fe(this.ancestor,this.local,this.other,this.attribute,this.keyField):new Ue(this.ancestor,this.local,this.other,this.attribute,this.keyField)).merge(t):new Xe(this.ancestor,this.local,this.other,this.attribute).merge(t)}};var X=(...e)=>{let t=new Set;for(let r of e)if(r!=null)for(let n of Object.keys(r))t.add(n);return[...t].sort()};var pe=class{ancestor;local;other;attribute;constructor(t,r,n,o){this.ancestor=t,this.local=r,this.other=n,this.attribute=o}merge(t){let r=O(this.ancestor),n=O(this.local),o=O(this.other),s=X(this.ancestor,this.local,this.other),i=[];for(let l of s){let h=F.createNode(r[l],n[l],o[l],l).merge(t);i.push(h)}let a=C(i);return a.output.length===0?d([]):z(a,this.attribute)}};var on=(e,t)=>String(e).localeCompare(String(t)),de=class{ancestor;local;other;attribute;constructor(t,r,n,o){this.ancestor=t,this.local=r,this.other=n,this.attribute=o}merge(t){let r=new Set(this.local),n=new Set(this.other),o=new Set(this.ancestor),s=new Set;for(let a of this.ancestor)r.has(a)&&n.has(a)&&s.add(a);for(let a of this.local)o.has(a)||s.add(a);for(let a of this.other)o.has(a)||s.add(a);let i=[...s].sort(on).map(a=>a==null?{}:{[this.attribute]:a});return d(i)}};var Ye=class{handle({objOther:t}){return d([t])}},Be=class{handle({objLocal:t}){return d([t])}},ze=class{handle({objLocal:t,objOther:r,local:n,other:o}){return n===o?d([t]):w([_(t,{},r)])}},qe=class{handle({objAncestor:t,objOther:r,ancestor:n,other:o}){return n!==o?w([_({},t,r)]):d([])}},He=class{handle({objAncestor:t,objLocal:r,ancestor:n,local:o}){return n!==o?w([_(r,t,{})]):d([])}},Je=class{handle({objAncestor:t,objLocal:r,objOther:n,ancestor:o,local:s,other:i}){return o===s?d([n]):o===i?d([r]):s===i?d([r]):w([_(r,t,n)])}},Ze=class{handle(){return d([])}},Qe=class{handle(){return d([])}},sn={[g.NONE]:new Qe,[g.OTHER_ONLY]:new Ye,[g.LOCAL_ONLY]:new Be,[g.LOCAL_AND_OTHER]:new ze,[g.ANCESTOR_AND_OTHER]:new qe,[g.ANCESTOR_AND_LOCAL]:new He,[g.ALL]:new Je,[g.ANCESTOR_ONLY]:new Ze},zt=e=>sn[e];var et=(e,t)=>e==null?{}:{[t]:e},me=class{ancestor;local;other;attribute;constructor(t,r,n,o){this.ancestor=t,this.local=r,this.other=n,this.attribute=o}merge(t){let r=et(this.ancestor,this.attribute),n=et(this.local,this.attribute),o=et(this.other,this.attribute),s=le(r,n,o);return zt(s).handle({config:t,objAncestor:r,objLocal:n,objOther:o,ancestor:this.ancestor,local:this.local,other:this.other})}};var qt=e=>e==null?[]:Array.isArray(e)?e:[e],Ht=e=>typeof e=="object"&&e!==null,an=(...e)=>e.some(Ht),cn=(...e)=>e.some(t=>Array.isArray(t)&&t.every(r=>typeof r=="string")),ln=e=>Ht(e)&&!Array.isArray(e),un=(e,t)=>{let r=e.some(ln),n=e.some(Array.isArray);return!t&&r&&!n},tt=class{createNode(t,r,n,o){if(cn(t,r,n)){let[i,a,l]=[t,r,n].map(qt);return new de(i,a,l,o)}let s=H.getKeyFieldExtractor(o);if(un([t,r,n],s!==void 0))return new pe(t,r,n,o);if(an(t,r,n)){let[i,a,l]=[t,r,n].map(qt);return new he(i,a,l,o,s,H.isOrderedAttribute(o))}return new me(t,r,n,o)}},F=new tt;var ge=class{mergeChildren(t,r){let n=t.local,o=t.other,s=O(n),i=O(o),a=r===void 0?void 0:O(r),l=X(r??{},n,o),u=[];for(let p of l){let m=t.nodeFactory.createNode(a===void 0?void 0:a[p],s[p],i[p],p).merge(t.config);u.push(m)}let h=C(u);return t.rootKey?z(h,t.rootKey.name):h}},ye=class{execute(t){let r=this.getTarget(t),n=T(t.ancestor,r);return t.rootKey?this.executeWithRootKey(t,t.rootKey,r,n):this.executeWithoutRootKey(t,r,n)}executeWithRootKey(t,r,n,o){let{name:s}=r,i=this.getExistsInSecondary(r);if(!i&&o)return d([]);if(!i){let a={[s]:n},l={[s]:t.ancestor};return w(this.buildConflict(t,a,l))}return z(this.executeNested(t),s)}executeWithoutRootKey(t,r,n){return n?d([]):t.attribute?this.executeWithAttribute(t,t.attribute):w(this.buildConflict(t,r,t.ancestor))}executeNested(t){return new x(t.config,t.nodeFactory).merge(t.ancestor,t.local,t.other)}executeWithAttribute(t,r){let n=new x(t.config,t.nodeFactory),o=this.mergeTarget(n,t),s=n.merge({},t.ancestor,{},void 0),i={[r]:o.output},a={[r]:s.output};return w(this.buildConflict(t,i,a))}},rt=class{execute(t){return d([])}},nt=class{execute(t){return q(t.other,t.rootKey?.name)}},ot=class{execute(t){return q(t.local,t.rootKey?.name)}},st=class extends ge{execute(t){let r=t.local,n=t.other;return T(r,n)?q(r,t.rootKey?.name):this.mergeChildren(t,void 0)}},it=class{execute(t){if(t.rootKey){let{name:r,existsInLocal:n,existsInOther:o}=t.rootKey;return n||o?d([{[r]:[]}]):d([])}return d([])}},at=class extends ye{getTarget(t){return t.local}getExistsInSecondary(t){return t.existsInOther}buildConflict(t,r,n){return[_(r,n,{})]}mergeTarget(t,r){return t.merge({},r.local,{},void 0)}},ct=class extends ye{getTarget(t){return t.other}getExistsInSecondary(t){return t.existsInLocal}buildConflict(t,r,n){return[_({},n,r)]}mergeTarget(t,r){return t.merge({},{},r.other,void 0)}},lt=class extends ge{execute(t){return T(t.ancestor,t.local)&&T(t.local,t.other)?q(t.local,t.rootKey?.name):this.mergeChildren(t,t.ancestor)}},fn={[g.ALL]:new lt,[g.ANCESTOR_AND_LOCAL]:new at,[g.ANCESTOR_AND_OTHER]:new ct,[g.ANCESTOR_ONLY]:new it,[g.LOCAL_AND_OTHER]:new st,[g.LOCAL_ONLY]:new ot,[g.NONE]:new rt,[g.OTHER_ONLY]:new nt},Jt=e=>fn[e];var x=class{config;nodeFactory;constructor(t,r=F){this.config=t,this.nodeFactory=r}merge(t,r,n,o,s){let i=le(t,r,n),a=Jt(i),l={config:this.config,ancestor:t,local:r,other:n,attribute:o,nodeFactory:this.nodeFactory,rootKey:s};return a.execute(l)}};var J=class{orchestrator;constructor(t){this.orchestrator=new x(t,F)}mergeThreeWay(t,r,n){let o=O(t),s=O(r),i=O(n),a=[],l=X(t,r,n);for(let h of l){let p=this.orchestrator.merge(o[h],s[h],i[h],void 0,{name:h,existsInLocal:h in s,existsInOther:h in i});a.push(p)}let u=C(a);return{output:u.output,hasConflict:u.hasConflict}}};D([G("JsonMerger")],J.prototype,"mergeThreeWay",null);var hn=(...e)=>Object.assign({},...e),Z=class{parser;writer;jsonMerger;constructor(t){this.parser=new te,this.writer=new se(t),this.jsonMerger=new J(t)}async mergeThreeWay(t,r,n,o,s=`
|
|
17
|
+
`;qr();try{(0,ie.appendFileSync)(Hr(),o)}catch{}Yr&&process.stderr.write(o)}function B(e,t,r){e<$t||Jr(e,String(Xr(t)),r)}var M={trace(e,t){B(j.trace,e,t)},debug(e,t){B(j.debug,e,t)},info(e,t){B(j.info,e,t)},warn(e,t){B(j.warn,e,t)},error(e,t){B(j.error,e,t)}};var Zr=Vt(Gt.trace);function G(e){return function(t,r,n){if(!Zr)return;let o=n.value;n.value=function(...s){M.trace(V`${e}.${r}: entry`);let i=()=>o.call(this,...s);if(o.constructor.name==="AsyncFunction")return i().then(a=>(M.trace(V`${e}.${r}: exit`),a),a=>{throw M.trace(V`${e}.${r}: exit (error)`),a});try{let a=i();return M.trace(V`${e}.${r}: exit`),a}catch(a){throw M.trace(V`${e}.${r}: exit (error)`),a}}}}var O=e=>Array.isArray(e)?{}:e;var W=(e,...t)=>{for(let r of t)for(let n of r)e.push(n)},Xt=(e,t)=>{let r=new Set(t),n=e.filter(i=>r.has(i)),o=new Set(e),s=t.filter(i=>o.has(i));if(n.length!==s.length)return!1;for(let i=0;i<n.length;i++)if(n[i]!==s[i])return!1;return!0},ce=(e,t)=>{let r=e.length,n=t.length;if(r===0||n===0)return[];let o=n+1,s=new Int32Array((r+1)*o);for(let u=1;u<=r;u++){let h=(u-1)*o,p=u*o;for(let f=1;f<=n;f++)if(e[u-1]===t[f-1])s[p+f]=s[h+(f-1)]+1;else{let m=s[h+f],b=s[p+(f-1)];s[p+f]=m>=b?m:b}}let i=[],a=r,l=n;for(;a>0&&l>0;)e[a-1]===t[l-1]?(i.push(e[a-1]),a--,l--):s[(a-1)*o+l]>s[a*o+(l-1)]?a--:l--;return i.reverse(),i};var Qr=[],en={output:Qr,hasConflict:!1},C=e=>{if(e.length===1)return e[0];let t=[],r=!1;for(let n of e)W(t,n.output),r=r||n.hasConflict;return{output:t,hasConflict:r}},d=e=>e.length===0?en:{output:e,hasConflict:!1},w=e=>({output:e,hasConflict:!0});var z=(e,t)=>e.output.length>0?{output:[{[t]:e.output}],hasConflict:e.hasConflict}:d([{[t]:[]}]),q=(e,t)=>{let r=e==null?[]:Array.isArray(e)?e:[e];return d(t?[{[t]:r}]:r)};var g;(function(e){e[e.NONE=0]="NONE",e[e.OTHER_ONLY=1]="OTHER_ONLY",e[e.LOCAL_ONLY=2]="LOCAL_ONLY",e[e.LOCAL_AND_OTHER=3]="LOCAL_AND_OTHER",e[e.ANCESTOR_ONLY=4]="ANCESTOR_ONLY",e[e.ANCESTOR_AND_OTHER=5]="ANCESTOR_AND_OTHER",e[e.ANCESTOR_AND_LOCAL=6]="ANCESTOR_AND_LOCAL",e[e.ALL=7]="ALL"})(g||(g={}));var $e=e=>e==null?!1:typeof e=="string"||Array.isArray(e)?e.length>0:typeof e=="object"?Object.keys(e).length>0:!0,le=(e,t,r)=>{let n=g.NONE;return $e(e)&&(n|=g.ANCESTOR_ONLY),$e(t)&&(n|=g.LOCAL_ONLY),$e(r)&&(n|=g.OTHER_ONLY),n};var H=class{static getKeyFieldExtractor(t){return t in Ut?Ut[t]:void 0}static isOrderedAttribute(t){return tn.has(t)}},tn=new Set(["customValue","standardValue","value","values","filterItems","summaryFilterItems"]),c=(e,t)=>String(e[t]),Ve=e=>{let t=c(e,"field"),r=c(e,"operation"),n=c(e,"value"),o=c(e,"valueField");return[t,r,n,o].filter(s=>s!==String(void 0)).join(".")},rn=e=>{let t=c(e,"masterLabel");return t!==String(void 0)?t:c(e,"picklist")},Ut={labels:e=>c(e,"fullName"),applicationVisibilities:e=>c(e,"application"),categoryGroupVisibilities:e=>c(e,"dataCategoryGroup"),classAccesses:e=>c(e,"apexClass"),customMetadataTypeAccesses:e=>c(e,"name"),customPermissions:e=>c(e,"name"),customSettingAccesses:e=>c(e,"name"),externalDataSourceAccesses:e=>c(e,"externalDataSource"),fieldPermissions:e=>c(e,"field"),flowAccesses:e=>c(e,"flow"),layoutAssignments:e=>{let t=c(e,"layout"),r=c(e,"recordType");return[t,r].filter(n=>n!==String(void 0)).join(".")},loginFlows:e=>c(e,"friendlyname"),loginHours:e=>typeof e=="object"&&e!==null?Object.keys(e).join(","):"",loginIpRanges:e=>{let t=c(e,"startAddress"),r=c(e,"endAddress");return`${t}-${r}`},objectPermissions:e=>c(e,"object"),pageAccesses:e=>c(e,"apexPage"),profileActionOverrides:e=>c(e,"actionName"),recordTypeVisibilities:e=>c(e,"recordType"),servicePresenceStatusAccesses:e=>c(e,"servicePresenceStatus"),tabVisibilities:e=>c(e,"tab"),userPermissions:e=>c(e,"name"),dataspaceScopes:e=>c(e,"dataspaceScope"),emailRoutingAddressAccesses:e=>c(e,"name"),externalCredentialPrincipalAccesses:e=>c(e,"externalCredentialPrincipal"),tabSettings:e=>c(e,"tab"),sharingCriteriaRules:e=>c(e,"fullName"),sharingGuestRules:e=>c(e,"fullName"),sharingOwnerRules:e=>c(e,"fullName"),sharingTerritoryRules:e=>c(e,"fullName"),criteriaItems:Ve,filterItems:Ve,summaryFilterItems:Ve,valueSettings:e=>c(e,"valueName"),alerts:e=>c(e,"fullName"),recipients:e=>c(e,"type"),fieldUpdates:e=>c(e,"fullName"),flowActions:e=>c(e,"fullName"),flowInputs:e=>c(e,"name"),flowAutomation:e=>c(e,"fullName"),knowledgePublishes:e=>c(e,"fullName"),outboundMessages:e=>c(e,"fullName"),rules:e=>c(e,"fullName"),actions:e=>c(e,"name"),send:e=>c(e,"fullName"),tasks:e=>c(e,"fullName"),assignmentRule:e=>c(e,"fullName"),autoResponseRule:e=>c(e,"fullName"),escalationRule:e=>c(e,"fullName"),marketingAppExtActions:e=>c(e,"apiName"),marketingAppExtActivities:e=>c(e,"fullName"),matchingRules:e=>c(e,"fullName"),matchingRuleItems:e=>{let t=c(e,"fieldName"),r=c(e,"matchingMethod");return`${t}-${r}`},customValue:e=>c(e,"fullName"),standardValue:e=>c(e,"fullName"),valueTranslation:e=>c(e,"masterLabel"),botBlocks:e=>c(e,"fullName"),botBlockVersions:e=>c(e,"fullName"),botDialogs:e=>c(e,"developerName"),botSteps:e=>c(e,"stepIdentifier"),botMessages:e=>c(e,"messageIdentifier"),botVariableOperation:e=>c(e,"variableOperationIdentifier"),botTemplates:e=>c(e,"fullName"),bots:e=>c(e,"fullName"),botVersions:e=>c(e,"fullName"),conversationMessageDefinitions:e=>c(e,"name"),constantValueTranslations:e=>c(e,"name"),customApplications:e=>c(e,"name"),customLabels:e=>c(e,"name"),customPageWebLinks:e=>c(e,"name"),customTabs:e=>c(e,"name"),desFieldTemplateMessages:e=>c(e,"name"),flowDefinitions:e=>c(e,"fullName"),flows:e=>c(e,"fullName"),identityVerificationCustomFieldLabels:e=>c(e,"name"),pipelineInspMetricConfigs:e=>c(e,"name"),prompts:e=>c(e,"name"),promptVersions:e=>c(e,"name"),quickActions:e=>c(e,"name"),reportTypes:e=>c(e,"name"),sections:e=>{let t=c(e,"name"),r=c(e,"section");return[t,r].filter(n=>n!==String(void 0))[0]},columns:e=>c(e,"name"),scontrols:e=>c(e,"name"),caseValues:e=>{let t=c(e,"article"),r=c(e,"caseType"),n=c(e,"plural"),o=c(e,"possessive");return[t,r,n,o].filter(s=>s!==String(void 0)).join(".")},fieldSets:e=>c(e,"name"),fields:e=>c(e,"name"),picklistValues:rn,values:e=>c(e,"fullName"),value:e=>c(e,"fullName"),layouts:e=>c(e,"layout"),quickActionParametersTranslation:e=>c(e,"name"),recordTypes:e=>c(e,"name"),sharingReasons:e=>c(e,"name"),standardFields:e=>c(e,"name"),validationRules:e=>c(e,"name"),webLinks:e=>c(e,"name"),workflowTasks:e=>c(e,"name"),types:e=>c(e,"name")};var Ge=e=>Array.isArray(e)?e.length===0:Object.keys(e).length===0,_=(e,t,r)=>{let n=Ge(e)?{}:e,o=Ge(t)?{}:t,s=Ge(r)?{}:r;return Nt(n,o,s)};var ue=(e,t)=>{let r=new Map;for(let n of e){let o=t(n);r.set(o,n)}return r},Yt=(e,t,r,n)=>{let o=new Set,s=new Map,i=new Map,a=new Map,l=(u,h)=>{for(let p of u){let f=p,m=n(f);h.set(m,f),o.add(m)}};return l(e,s),l(t,i),l(r,a),{keyedAncestor:s,keyedLocal:i,keyedOther:a,allKeys:o}};function T(e,t){let r=[[e,t]];for(;r.length>0;){let[n,o]=r.pop();if(n===o)continue;if(n===null||o===null||typeof n!="object"||typeof o!="object")return!1;if(Array.isArray(n)){if(!Array.isArray(o)||n.length!==o.length)return!1;for(let l=n.length-1;l>=0;l--)r.push([n[l],o[l]]);continue}if(Array.isArray(o))return!1;let s=n,i=o,a=Object.keys(s);if(a.length!==Object.keys(i).length)return!1;for(let l of a){if(!(l in i))return!1;r.push([s[l],i[l]])}}return!0}var Bt=(e,t)=>{if(e.size!==t.size)return!1;for(let r of e)if(!t.has(r))return!1;return!0},We=(e,t)=>{for(let r of e)if(t.has(r))return!0;return!1};var nn=(e,t,r)=>{let n=new Set(e),o=new Set(t),s=new Set(r);return{localDeleted:new Set(e.filter(i=>!o.has(i))),otherDeleted:new Set(e.filter(i=>!s.has(i))),localAdded:new Set(t.filter(i=>!n.has(i))),otherAdded:new Set(r.filter(i=>!n.has(i))),allKeys:new Set([...e,...t,...r])}},fe=class{ancestor;local;other;attribute;keyField;constructor(t,r,n,o,s){this.ancestor=t,this.local=r,this.other=n,this.attribute=o,this.keyField=s}merge(t){let r=this.buildArrayMergeState(),n=this.analyzeOrderings(r);return n.canMerge?n.localMoved.size>0||n.otherMoved.size>0?this.processDivergedOrderings(t,r,n):this.processWithSpine(t,r):this.buildFullArrayConflict(t,r)}buildArrayMergeState(){let t=this.ancestor.map(o=>this.keyField(o)),r=this.local.map(o=>this.keyField(o)),n=this.other.map(o=>this.keyField(o));return{ancestorKeys:t,localKeys:r,otherKeys:n,ancestorMap:ue(this.ancestor,this.keyField),localMap:ue(this.local,this.keyField),otherMap:ue(this.other,this.keyField),ancestorPos:new Map(t.map((o,s)=>[o,s])),localPos:new Map(r.map((o,s)=>[o,s])),otherPos:new Map(n.map((o,s)=>[o,s])),ancestorSet:new Set(t)}}analyzeOrderings(t){if(Xt(t.localKeys,t.otherKeys))return{canMerge:!0,localMoved:new Set,otherMoved:new Set};let r=this.getMovedElements(t,t.localPos),n=this.getMovedElements(t,t.otherPos);return We(r,n)?{canMerge:!1,localMoved:r,otherMoved:n}:r.size===0&&n.size===0?{canMerge:!1,localMoved:r,otherMoved:n}:{canMerge:!0,localMoved:r,otherMoved:n}}getMovedElements(t,r){let n=new Set;for(let o=0;o<t.ancestorKeys.length;o++){let s=t.ancestorKeys[o],i=r.get(s);if(i!==void 0)for(let a=o+1;a<t.ancestorKeys.length;a++){let l=t.ancestorKeys[a],u=r.get(l);u!==void 0&&i>u&&(n.add(s),n.add(l))}}return n}processDivergedOrderings(t,r,n){let o=this.computeMergedKeyOrder(r,n);return o===null?this.buildFullArrayConflict(t,r):this.processKeyOrder(t,r,o)}computeMergedKeyOrder(t,r){let{localMoved:n,otherMoved:o}=r,s=t.localKeys.filter(f=>n.has(f)),i=t.otherKeys.filter(f=>o.has(f)),a=t.localKeys.filter(f=>!n.has(f)&&!t.ancestorSet.has(f)),l=t.otherKeys.filter(f=>!o.has(f)&&!t.ancestorSet.has(f)&&!t.localMap.has(f));if(a.length>0&&l.length>0)return null;let u=[],h=!1,p=!1;for(let f of t.ancestorKeys)n.has(f)?h||(W(u,s),h=!0):o.has(f)?p||(W(u,i),p=!0):u.push(f);return W(u,a,l),u}processWithSpine(t,r){let n=ce(ce(r.ancestorKeys,r.localKeys),ce(r.ancestorKeys,r.otherKeys));return this.processSpine(t,n,r)}processKeyOrder(t,r,n){let o=[];for(let s of n){let i=this.mergeElementWithPresenceCheck(t,s,r);i&&i.output.length>0&&o.push(i)}return C(o)}mergeElementWithPresenceCheck(t,r,n){let o=n.ancestorMap.has(r),s=n.localMap.has(r),i=n.otherMap.has(r);return o&&s&&i?this.mergeElement(t,r,n):this.mergeGapElement(t,r,n)}wrapKeys(t,r){return t.map(n=>({[this.attribute]:r.get(n)}))}buildFullArrayConflict(t,r){return w([_(this.wrapKeys(r.localKeys,r.localMap),this.wrapKeys(r.ancestorKeys,r.ancestorMap),this.wrapKeys(r.otherKeys,r.otherMap))])}processSpine(t,r,n){let o=[],s=0,i=0,a=0;for(let u of r){let h=n.ancestorPos.get(u),p=n.localPos.get(u),f=n.otherPos.get(u),m={ancestor:n.ancestorKeys.slice(s,h),local:n.localKeys.slice(i,p),other:n.otherKeys.slice(a,f)};o.push(this.mergeGap(t,m,n)),o.push(this.mergeElement(t,u,n)),s=h+1,i=p+1,a=f+1}let l={ancestor:n.ancestorKeys.slice(s),local:n.localKeys.slice(i),other:n.otherKeys.slice(a)};return o.push(this.mergeGap(t,l,n)),C(o)}mergeGap(t,r,n){let o=nn(r.ancestor,r.local,r.other),s=this.detectGapConflict(t,r,o,n);return s||this.mergeGapElements(t,o,n)}detectGapConflict(t,r,n,o){let{localDeleted:s,otherDeleted:i,localAdded:a,otherAdded:l}=n,u=s.size>0&&i.size>0&&!Bt(s,i),h=a.size>0&&l.size>0&&!We(a,l);return u||h?this.buildGapConflict(t,r,o):null}buildGapConflict(t,r,n){return w([_(this.wrapKeys(r.local,n.localMap),this.wrapKeys(r.ancestor,n.ancestorMap),this.wrapKeys(r.other,n.otherMap))])}mergeGapElements(t,r,n){let o=[];for(let s of r.allKeys){let i=this.mergeGapElement(t,s,n);i&&o.push(i)}return C(o)}mergeGapElement(t,r,n){let o=n.ancestorMap.get(r),s=n.localMap.get(r),i=n.otherMap.get(r);return o!==void 0?s===void 0?i===void 0||T(o,i)?null:this.buildElementConflict(t,null,o,i):T(o,s)?null:this.buildElementConflict(t,s,o,null):s!==void 0&&i!==void 0?T(s,i)?d([this.wrapElement(s)]):this.buildElementConflict(t,s,null,i):d([this.wrapElement(s??i)])}wrapElement(t){return{[this.attribute]:t}}mergeElement(t,r,n){let o=n.ancestorMap.get(r),s=n.localMap.get(r),i=n.otherMap.get(r);return T(o,i)&&s?d([this.wrapElement(s)]):T(o,s)&&i?d([this.wrapElement(i)]):T(s,i)?d([this.wrapElement(s)]):this.buildElementConflict(t,s,o,i)}buildElementConflict(t,r,n,o){let s=i=>i?this.wrapElement(i):{};return w([_(s(r),s(n),s(o))])}};var Xe=class{ancestor;local;other;attribute;constructor(t,r,n,o){this.ancestor=t,this.local=r,this.other=n,this.attribute=o}merge(t){return w([_({[this.attribute]:this.local},{[this.attribute]:this.ancestor},{[this.attribute]:this.other})])}},Ue=class{ancestor;local;other;attribute;keyField;constructor(t,r,n,o,s){this.ancestor=t,this.local=r,this.other=n,this.attribute=o,this.keyField=s}merge(t){let{keyedAncestor:r,keyedLocal:n,keyedOther:o,allKeys:s}=Yt(this.ancestor,this.local,this.other,this.keyField),i=[],a=new x(t,F);for(let l of Array.from(s).sort()){let u=a.merge(r.get(l)??{},n.get(l)??{},o.get(l)??{},this.attribute);u.output.length>0&&i.push({output:[{[this.attribute]:u.output}],hasConflict:u.hasConflict})}return C(i)}},he=class{ancestor;local;other;attribute;keyField;isOrdered;constructor(t,r,n,o,s,i){this.ancestor=t,this.local=r,this.other=n,this.attribute=o,this.keyField=s,this.isOrdered=i}merge(t){return this.keyField?(this.isOrdered?new fe(this.ancestor,this.local,this.other,this.attribute,this.keyField):new Ue(this.ancestor,this.local,this.other,this.attribute,this.keyField)).merge(t):new Xe(this.ancestor,this.local,this.other,this.attribute).merge(t)}};var X=(...e)=>{let t=new Set;for(let r of e)if(r!=null)for(let n of Object.keys(r))t.add(n);return[...t].sort()};var pe=class{ancestor;local;other;attribute;constructor(t,r,n,o){this.ancestor=t,this.local=r,this.other=n,this.attribute=o}merge(t){let r=O(this.ancestor),n=O(this.local),o=O(this.other),s=X(this.ancestor,this.local,this.other),i=[];for(let l of s){let h=F.createNode(r[l],n[l],o[l],l).merge(t);i.push(h)}let a=C(i);return a.output.length===0?d([]):z(a,this.attribute)}};var on=(e,t)=>String(e).localeCompare(String(t)),de=class{ancestor;local;other;attribute;constructor(t,r,n,o){this.ancestor=t,this.local=r,this.other=n,this.attribute=o}merge(t){let r=new Set(this.local),n=new Set(this.other),o=new Set(this.ancestor),s=new Set;for(let a of this.ancestor)r.has(a)&&n.has(a)&&s.add(a);for(let a of this.local)o.has(a)||s.add(a);for(let a of this.other)o.has(a)||s.add(a);let i=[...s].sort(on).map(a=>a==null?{}:{[this.attribute]:a});return d(i)}};var Ye=class{handle({objOther:t}){return d([t])}},Be=class{handle({objLocal:t}){return d([t])}},ze=class{handle({objLocal:t,objOther:r,local:n,other:o}){return n===o?d([t]):w([_(t,{},r)])}},qe=class{handle({objAncestor:t,objOther:r,ancestor:n,other:o}){return n!==o?w([_({},t,r)]):d([])}},He=class{handle({objAncestor:t,objLocal:r,ancestor:n,local:o}){return n!==o?w([_(r,t,{})]):d([])}},Je=class{handle({objAncestor:t,objLocal:r,objOther:n,ancestor:o,local:s,other:i}){return o===s?d([n]):o===i?d([r]):s===i?d([r]):w([_(r,t,n)])}},Ze=class{handle(){return d([])}},Qe=class{handle(){return d([])}},sn={[g.NONE]:new Qe,[g.OTHER_ONLY]:new Ye,[g.LOCAL_ONLY]:new Be,[g.LOCAL_AND_OTHER]:new ze,[g.ANCESTOR_AND_OTHER]:new qe,[g.ANCESTOR_AND_LOCAL]:new He,[g.ALL]:new Je,[g.ANCESTOR_ONLY]:new Ze},zt=e=>sn[e];var et=(e,t)=>e==null?{}:{[t]:e},me=class{ancestor;local;other;attribute;constructor(t,r,n,o){this.ancestor=t,this.local=r,this.other=n,this.attribute=o}merge(t){let r=et(this.ancestor,this.attribute),n=et(this.local,this.attribute),o=et(this.other,this.attribute),s=le(r,n,o);return zt(s).handle({config:t,objAncestor:r,objLocal:n,objOther:o,ancestor:this.ancestor,local:this.local,other:this.other})}};var qt=e=>e==null?[]:Array.isArray(e)?e:[e],Ht=e=>typeof e=="object"&&e!==null,an=(...e)=>e.some(Ht),cn=(...e)=>e.some(t=>Array.isArray(t)&&t.every(r=>typeof r=="string")),ln=e=>Ht(e)&&!Array.isArray(e),un=(e,t)=>{let r=e.some(ln),n=e.some(Array.isArray);return!t&&r&&!n},tt=class{createNode(t,r,n,o){if(cn(t,r,n)){let[i,a,l]=[t,r,n].map(qt);return new de(i,a,l,o)}let s=H.getKeyFieldExtractor(o);if(un([t,r,n],s!==void 0))return new pe(t,r,n,o);if(an(t,r,n)){let[i,a,l]=[t,r,n].map(qt);return new he(i,a,l,o,s,H.isOrderedAttribute(o))}return new me(t,r,n,o)}},F=new tt;var ge=class{mergeChildren(t,r){let n=t.local,o=t.other,s=O(n),i=O(o),a=r===void 0?void 0:O(r),l=X(r??{},n,o),u=[];for(let p of l){let m=t.nodeFactory.createNode(a===void 0?void 0:a[p],s[p],i[p],p).merge(t.config);u.push(m)}let h=C(u);return t.rootKey?z(h,t.rootKey.name):h}},ye=class{execute(t){let r=this.getTarget(t),n=T(t.ancestor,r);return t.rootKey?this.executeWithRootKey(t,t.rootKey,r,n):this.executeWithoutRootKey(t,r,n)}executeWithRootKey(t,r,n,o){let{name:s}=r,i=this.getExistsInSecondary(r);if(!i&&o)return d([]);if(!i){let a={[s]:n},l={[s]:t.ancestor};return w(this.buildConflict(t,a,l))}return z(this.executeNested(t),s)}executeWithoutRootKey(t,r,n){return n?d([]):t.attribute?this.executeWithAttribute(t,t.attribute):w(this.buildConflict(t,r,t.ancestor))}executeNested(t){return new x(t.config,t.nodeFactory).merge(t.ancestor,t.local,t.other)}executeWithAttribute(t,r){let n=new x(t.config,t.nodeFactory),o=this.mergeTarget(n,t),s=n.merge({},t.ancestor,{},void 0),i={[r]:o.output},a={[r]:s.output};return w(this.buildConflict(t,i,a))}},rt=class{execute(t){return d([])}},nt=class{execute(t){return q(t.other,t.rootKey?.name)}},ot=class{execute(t){return q(t.local,t.rootKey?.name)}},st=class extends ge{execute(t){let r=t.local,n=t.other;return T(r,n)?q(r,t.rootKey?.name):this.mergeChildren(t,void 0)}},it=class{execute(t){if(t.rootKey){let{name:r,existsInLocal:n,existsInOther:o}=t.rootKey;return n||o?d([{[r]:[]}]):d([])}return d([])}},at=class extends ye{getTarget(t){return t.local}getExistsInSecondary(t){return t.existsInOther}buildConflict(t,r,n){return[_(r,n,{})]}mergeTarget(t,r){return t.merge({},r.local,{},void 0)}},ct=class extends ye{getTarget(t){return t.other}getExistsInSecondary(t){return t.existsInLocal}buildConflict(t,r,n){return[_({},n,r)]}mergeTarget(t,r){return t.merge({},{},r.other,void 0)}},lt=class extends ge{execute(t){return T(t.ancestor,t.local)&&T(t.local,t.other)?q(t.local,t.rootKey?.name):this.mergeChildren(t,t.ancestor)}},fn={[g.ALL]:new lt,[g.ANCESTOR_AND_LOCAL]:new at,[g.ANCESTOR_AND_OTHER]:new ct,[g.ANCESTOR_ONLY]:new it,[g.LOCAL_AND_OTHER]:new st,[g.LOCAL_ONLY]:new ot,[g.NONE]:new rt,[g.OTHER_ONLY]:new nt},Jt=e=>fn[e];var x=class{config;nodeFactory;constructor(t,r=F){this.config=t,this.nodeFactory=r}merge(t,r,n,o,s){let i=le(t,r,n),a=Jt(i),l={config:this.config,ancestor:t,local:r,other:n,attribute:o,nodeFactory:this.nodeFactory,rootKey:s};return a.execute(l)}};var J=class{orchestrator;constructor(t){this.orchestrator=new x(t,F)}mergeThreeWay(t,r,n){let o=O(t),s=O(r),i=O(n),a=[],l=X(t,r,n);for(let h of l){let p=this.orchestrator.merge(o[h],s[h],i[h],void 0,{name:h,existsInLocal:h in s,existsInOther:h in i});a.push(p)}let u=C(a);return{output:u.output,hasConflict:u.hasConflict}}};D([G("JsonMerger")],J.prototype,"mergeThreeWay",null);var hn=(...e)=>Object.assign({},...e),Z=class{parser;writer;jsonMerger;constructor(t){this.parser=new te,this.writer=new se(t),this.jsonMerger=new J(t)}async mergeThreeWay(t,r,n,o,s=`
|
|
18
18
|
`){let i=await Promise.allSettled([this.parser.parseStream(t),this.parser.parseStream(r),this.parser.parseStream(n)]),a=i.find(m=>m.status==="rejected");if(a)throw a.reason;let[l,u,h]=i.map(m=>m.value),p=hn(l.namespaces,u.namespaces,h.namespaces),f=this.jsonMerger.mergeThreeWay(l.content,u.content,h.content);return f.output.length&&await this.writer.writeTo(o,f.output,p,s,f.hasConflict),{hasConflict:f.hasConflict}}};D([G("XmlMerger")],Z.prototype,"mergeThreeWay",null);var Qt=require("node:fs/promises"),pn=`\r
|
|
19
19
|
`,dn=`
|
|
20
|
-
`,Zt=4096,mn=10,gn=13,er=async e=>{let t=await(0,Qt.open)(e,"r");try{let r=Buffer.alloc(Zt),{bytesRead:n}=await t.read(r,0,Zt,0),o=r.subarray(0,n),s=o.indexOf(mn);return s>0&&o[s-1]===gn?pn:dn}finally{await t.close()}};var yn=".sf-merge-tmp",An="1.
|
|
20
|
+
`,Zt=4096,mn=10,gn=13,er=async e=>{let t=await(0,Qt.open)(e,"r");try{let r=Buffer.alloc(Zt),{bytesRead:n}=await t.read(r,0,Zt,0),o=r.subarray(0,n),s=o.indexOf(mn);return s>0&&o[s-1]===gn?pn:dn}finally{await t.close()}};var yn=".sf-merge-tmp",An="1.9.0",tr=()=>{},bn=async e=>{try{await(0,be.unlink)(e)}catch{}},Q=class{config;constructor(t){this.config=t}async mergeFiles(t,r,n){let o=(0,ut.normalize)(r),s=o+yn,i=[],a;M.info(`pipeline=streaming v=${An}`);try{let l=await er(o),[u,h,p]=[t,r,n].map(ut.normalize).map(b=>{let S=(0,Ae.createReadStream)(b);return S.on("error",tr),S});i.push(u,h,p),a=(0,Ae.createWriteStream)(s),a.on("error",tr);let f=new Z(this.config),{hasConflict:m}=await f.mergeThreeWay(u,h,p,a,l);return a.end(),await(0,rr.finished)(a),await(0,be.rename)(s,o),m}catch(l){if(l!==null&&typeof l=="object"&&l.code==="ENOENT")throw l;return M.error("Merge failed; leaving ours unchanged",l),!0}finally{for(let l of i)l.destroy();a?.destroy(),await bn(s)}}};D([G("MergeDriver")],Q.prototype,"mergeFiles",null);var wn=`Usage: sf-git-merge-driver -O <ancestor> -A <local> -B <other> -P <output> [-L n] [-S tag] [-X tag] [-Y tag]
|
|
21
21
|
|
|
22
22
|
Flags:
|
|
23
23
|
-O ancestor file (required, must exist)
|
|
@@ -31,7 +31,7 @@ Flags:
|
|
|
31
31
|
--version Print version and exit
|
|
32
32
|
--help Show this message and exit
|
|
33
33
|
`,pt=2,dt=1,ft=0;function sr(e){Number(e.split(".")[0])<20&&(process.stderr.write(`sf-git-merge-driver requires Node.js >= 20 (got ${e})
|
|
34
|
-
`),process.exit(pt))}var we=e=>e instanceof Error?e.message:String(e),nr=new Set(["-O","-A","-B","-P","-L","-S","-X","-Y"]);function ir(e){let t={},r=0;for(;r<e.length;){let f=e[r];if(!nr.has(f))throw new Error(`unknown argument: ${f}`);let m=e[r+1];if(m===void 0||nr.has(m))throw new Error(`missing value for ${f}`);t[f]=m,r+=2}let n=f=>{let m=t[f];if(m===void 0)throw new Error(`missing required flag: ${f}`);return m},o=(f,m)=>{let b=t[f];return b===void 0||b===""?m:b},s=n("-O"),i=n("-A"),a=n("-B"),l=n("-P"),u=t["-L"],h=7;if(u!==void 0&&u!==""){let f=Number(u);if(!Number.isInteger(f)||f<1||f>100)throw new Error(`-L must be an integer 1-${100} (got '${u}')`);h=f}let p={conflictMarkerSize:h,ancestorConflictTag:o("-S",Te),localConflictTag:o("-X",Ne),otherConflictTag:o("-Y",Se)};return{ancestorFile:s,localFile:i,otherFile:a,outputFile:l,config:p}}async function ar(e){if(e.includes("--version"))return process.stdout.write(`1.
|
|
34
|
+
`),process.exit(pt))}var we=e=>e instanceof Error?e.message:String(e),nr=new Set(["-O","-A","-B","-P","-L","-S","-X","-Y"]);function ir(e){let t={},r=0;for(;r<e.length;){let f=e[r];if(!nr.has(f))throw new Error(`unknown argument: ${f}`);let m=e[r+1];if(m===void 0||nr.has(m))throw new Error(`missing value for ${f}`);t[f]=m,r+=2}let n=f=>{let m=t[f];if(m===void 0)throw new Error(`missing required flag: ${f}`);return m},o=(f,m)=>{let b=t[f];return b===void 0||b===""?m:b},s=n("-O"),i=n("-A"),a=n("-B"),l=n("-P"),u=t["-L"],h=7;if(u!==void 0&&u!==""){let f=Number(u);if(!Number.isInteger(f)||f<1||f>100)throw new Error(`-L must be an integer 1-${100} (got '${u}')`);h=f}let p={conflictMarkerSize:h,ancestorConflictTag:o("-S",Te),localConflictTag:o("-X",Ne),otherConflictTag:o("-Y",Se)};return{ancestorFile:s,localFile:i,otherFile:a,outputFile:l,config:p}}async function ar(e){if(e.includes("--version"))return process.stdout.write(`1.9.0
|
|
35
35
|
`),ft;if(e.includes("--help"))return process.stdout.write(wn),ft;let t;try{t=ir(e)}catch(r){return process.stderr.write(`sf-git-merge-driver: ${we(r)}
|
|
36
36
|
`),pt}try{return await new Q(t.config).mergeFiles(t.ancestorFile,t.localFile,t.otherFile)?dt:ft}catch(r){return r&&typeof r=="object"&&r.code==="ENOENT"?(process.stderr.write(`sf-git-merge-driver: ${we(r)}
|
|
37
37
|
`),pt):(process.stderr.write(`sf-git-merge-driver: ${we(r)}
|
|
@@ -67,11 +67,13 @@ const METADATA_KEY_EXTRACTORS = {
|
|
|
67
67
|
pageAccesses: (el) => getPropertyValue(el, 'apexPage'), // Profile // PermissionSet
|
|
68
68
|
profileActionOverrides: (el) => getPropertyValue(el, 'actionName'), // Profile
|
|
69
69
|
recordTypeVisibilities: (el) => getPropertyValue(el, 'recordType'), // Profile // PermissionSet
|
|
70
|
+
servicePresenceStatusAccesses: (el) => getPropertyValue(el, 'servicePresenceStatus'), // Profile // PermissionSet
|
|
70
71
|
tabVisibilities: (el) => getPropertyValue(el, 'tab'), // Profile // PermissionSet
|
|
71
72
|
userPermissions: (el) => getPropertyValue(el, 'name'), // Profile // PermissionSet
|
|
72
73
|
dataspaceScopes: (el) => getPropertyValue(el, 'dataspaceScope'), // PermissionSet
|
|
73
74
|
emailRoutingAddressAccesses: (el) => getPropertyValue(el, 'name'), // PermissionSet
|
|
74
75
|
externalCredentialPrincipalAccesses: (el) => getPropertyValue(el, 'externalCredentialPrincipal'), // PermissionSet
|
|
76
|
+
tabSettings: (el) => getPropertyValue(el, 'tab'), // PermissionSet
|
|
75
77
|
sharingCriteriaRules: (el) => getPropertyValue(el, 'fullName'), // SharingRules
|
|
76
78
|
sharingGuestRules: (el) => getPropertyValue(el, 'fullName'), // SharingRules
|
|
77
79
|
sharingOwnerRules: (el) => getPropertyValue(el, 'fullName'), // SharingRules
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetadataService.js","sourceRoot":"","sources":["../../src/service/MetadataService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"MetadataService.js","sourceRoot":"","sources":["../../src/service/MetadataService.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,eAAe;IACnB,MAAM,CAAC,oBAAoB,CAChC,YAAoB;QAEpB,OAAO,YAAY,IAAI,uBAAuB;YAC5C,CAAC,CAAC,uBAAuB,CACrB,YAAoD,CACrD;YACH,CAAC,CAAC,SAAS,CAAA;IACf,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,SAAiB;QAChD,OAAO,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAC1C,CAAC;CACF;AAED,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACjC,aAAa,EAAE,uCAAuC;IACtD,eAAe,EAAE,mBAAmB;IACpC,OAAO,EAAE,uBAAuB;IAChC,QAAQ,EAAE,aAAa;IACvB,aAAa,EAAE,cAAc;IAC7B,oBAAoB,EAAE,cAAc;CACrC,CAAC,CAAA;AAEF,MAAM,gBAAgB,GAAG,CAAC,EAAa,EAAE,QAAgB,EAAE,EAAE,CAC3D,MAAM,CAAE,EAA8B,CAAC,QAAQ,CAAC,CAAC,CAAA;AAEnD,MAAM,gBAAgB,GAAG,CAAC,EAAa,EAAE,EAAE;IACzC,MAAM,KAAK,GAAG,gBAAgB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAC3C,MAAM,SAAS,GAAG,gBAAgB,CAAC,EAAE,EAAE,WAAW,CAAC,CAAA;IACnD,MAAM,KAAK,GAAG,gBAAgB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IAC3C,MAAM,UAAU,GAAG,gBAAgB,CAAC,EAAE,EAAE,YAAY,CAAC,CAAA;IACrD,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC;SACzC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC;SACpC,IAAI,CAAC,GAAG,CAAC,CAAA;AACd,CAAC,CAAA;AAED,kEAAkE;AAClE,qCAAqC;AACrC,+EAA+E;AAC/E,4EAA4E;AAC5E,kEAAkE;AAClE,gEAAgE;AAChE,kEAAkE;AAClE,qDAAqD;AACrD,MAAM,oBAAoB,GAAG,CAAC,EAAa,EAAE,EAAE;IAC7C,MAAM,WAAW,GAAG,gBAAgB,CAAC,EAAE,EAAE,aAAa,CAAC,CAAA;IACvD,OAAO,WAAW,KAAK,MAAM,CAAC,SAAS,CAAC;QACtC,CAAC,CAAC,WAAW;QACb,CAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,uBAAuB,GAAG;IAC9B,MAAM,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,eAAe;IAC5E,uBAAuB,EAAE,CAAC,EAAa,EAAE,EAAE,CACzC,gBAAgB,CAAC,EAAE,EAAE,aAAa,CAAC,EAAE,2BAA2B;IAClE,yBAAyB,EAAE,CAAC,EAAa,EAAE,EAAE,CAC3C,gBAAgB,CAAC,EAAE,EAAE,mBAAmB,CAAC,EAAE,UAAU;IACvD,aAAa,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,2BAA2B;IAChG,0BAA0B,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,2BAA2B;IACxG,iBAAiB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,6DAA6D;IACjI,qBAAqB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,2BAA2B;IACnG,0BAA0B,EAAE,CAAC,EAAa,EAAE,EAAE,CAC5C,gBAAgB,CAAC,EAAE,EAAE,oBAAoB,CAAC,EAAE,2BAA2B;IACzE,gBAAgB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,2BAA2B;IAC/F,YAAY,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,2BAA2B;IAC1F,iBAAiB,EAAE,CAAC,EAAa,EAAE,EAAE;QACnC,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;QAC7C,MAAM,UAAU,GAAG,gBAAgB,CAAC,EAAE,EAAE,YAAY,CAAC,CAAA;QACrD,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC5E,CAAC,EAAE,UAAU;IACb,UAAU,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,cAAc,CAAC,EAAE,UAAU;IAC/E,UAAU,EAAE,CAAC,EAAa,EAAE,EAAE,CAC5B,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,UAAU;IACpF,aAAa,EAAE,CAAC,EAAa,EAAE,EAAE;QAC/B,MAAM,YAAY,GAAG,gBAAgB,CAAC,EAAE,EAAE,cAAc,CAAC,CAAA;QACzD,MAAM,UAAU,GAAG,gBAAgB,CAAC,EAAE,EAAE,YAAY,CAAC,CAAA;QACrD,OAAO,GAAG,YAAY,IAAI,UAAU,EAAE,CAAA;IACxC,CAAC,EAAE,UAAU;IACb,iBAAiB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,2BAA2B;IACjG,YAAY,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,2BAA2B;IAC9F,sBAAsB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,YAAY,CAAC,EAAE,UAAU;IACzF,sBAAsB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,YAAY,CAAC,EAAE,2BAA2B;IAC1G,6BAA6B,EAAE,CAAC,EAAa,EAAE,EAAE,CAC/C,gBAAgB,CAAC,EAAE,EAAE,uBAAuB,CAAC,EAAE,2BAA2B;IAC5E,eAAe,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,2BAA2B;IAC5F,eAAe,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,2BAA2B;IAC7F,eAAe,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,gBAAgB,CAAC,EAAE,gBAAgB;IAC5F,2BAA2B,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,gBAAgB;IAC9F,mCAAmC,EAAE,CAAC,EAAa,EAAE,EAAE,CACrD,gBAAgB,CAAC,EAAE,EAAE,6BAA6B,CAAC,EAAE,gBAAgB;IACvE,WAAW,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,gBAAgB;IAC7E,oBAAoB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,eAAe;IAC1F,iBAAiB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,eAAe;IACvF,iBAAiB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,eAAe;IACvF,qBAAqB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,eAAe;IAC3F,aAAa,EAAE,gBAAgB,EAAE,0EAA0E;IAC3G,WAAW,EAAE,gBAAgB,EAAE,cAAc;IAC7C,kBAAkB,EAAE,gBAAgB,EAAE,cAAc;IACpD,aAAa,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,cAAc;IACnF,oGAAoG;IACpG,2GAA2G;IAC3G,MAAM,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,WAAW;IACxE,UAAU,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW;IACxE,YAAY,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,WAAW;IAC9E,WAAW,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,WAAW;IAC7E,UAAU,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW;IACxE,cAAc,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,WAAW;IAChF,kBAAkB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,WAAW;IACpF,gBAAgB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,WAAW;IAClF,KAAK,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,WAAW;IACvE,OAAO,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW;IACrE,2GAA2G;IAC3G,IAAI,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,WAAW;IACtE,KAAK,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,WAAW;IACvE,cAAc,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,kBAAkB;IACvF,+IAA+I;IAC/I,gBAAgB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,oBAAoB;IAC3F,cAAc,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,kBAAkB;IACvF,sBAAsB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,wBAAwB;IACpG,yBAAyB,EAAE,CAAC,EAAa,EAAE,EAAE,CAC3C,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,wBAAwB;IAC5D,aAAa,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,gBAAgB;IACpF,iBAAiB,EAAE,CAAC,EAAa,EAAE,EAAE;QACnC,MAAM,SAAS,GAAG,gBAAgB,CAAC,EAAE,EAAE,WAAW,CAAC,CAAA;QACnD,MAAM,cAAc,GAAG,gBAAgB,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAA;QAC7D,OAAO,GAAG,SAAS,IAAI,cAAc,EAAE,CAAA;IACzC,CAAC,EAAE,gBAAgB;IACnB,WAAW,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,iBAAiB;IACnF,aAAa,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,mBAAmB;IACvF,gBAAgB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,aAAa,CAAC,EAAE,2DAA2D;IACrI,SAAS,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,eAAe;IAC/E,gBAAgB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,eAAe;IACtF,UAAU,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,eAAe,CAAC,EAAE,eAAe;IACrF,QAAQ,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,gBAAgB,CAAC,EAAE,eAAe;IACpF,WAAW,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,mBAAmB,CAAC,EAAE,eAAe;IAC1F,oBAAoB,EAAE,CAAC,EAAa,EAAE,EAAE,CACtC,gBAAgB,CAAC,EAAE,EAAE,6BAA6B,CAAC,EAAE,eAAe;IACtE,YAAY,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,eAAe;IAClF,IAAI,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,eAAe;IAC1E,WAAW,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,eAAe;IACjF,8BAA8B,EAAE,CAAC,EAAa,EAAE,EAAE,CAChD,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IAC/C,yBAAyB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IAC3F,kBAAkB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IACpF,YAAY,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IAC9E,kBAAkB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IACpF,UAAU,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IAC5E,wBAAwB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IAC1F,eAAe,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,eAAe;IACrF,KAAK,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,eAAe;IAC3E,qCAAqC,EAAE,CAAC,EAAa,EAAE,EAAE,CACvD,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IAC/C,yBAAyB,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IAC3F,OAAO,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IACzE,cAAc,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IAChF,YAAY,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IAC9E,WAAW,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IAC7E,QAAQ,EAAE,CAAC,EAAa,EAAE,EAAE;QAC1B,MAAM,IAAI,GAAG,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA,CAAC,eAAe;QACzD,MAAM,OAAO,GAAG,gBAAgB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAA,CAAC,0BAA0B;QAC1E,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAChE,CAAC,EAAE,qFAAqF;IACxF,OAAO,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IACzE,SAAS,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,eAAe;IAE3E,UAAU,EAAE,CAAC,EAAa,EAAE,EAAE;QAC5B,MAAM,OAAO,GAAG,gBAAgB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAA;QAC/C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;QACjD,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;QAC7C,MAAM,UAAU,GAAG,gBAAgB,CAAC,EAAE,EAAE,YAAY,CAAC,CAAA;QACrD,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC;aAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC;aACpC,IAAI,CAAC,GAAG,CAAC,CAAA;IACd,CAAC,EAAE,0BAA0B;IAC7B,SAAS,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,0BAA0B;IACtF,MAAM,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,0BAA0B;IACnF,cAAc,EAAE,oBAAoB,EAAE,gEAAgE;IACtG,MAAM,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,aAAa;IAC1E,KAAK,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,cAAc;IAC1E,OAAO,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,0BAA0B;IACtF,gCAAgC,EAAE,CAAC,EAAa,EAAE,EAAE,CAClD,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,0BAA0B;IAC1D,WAAW,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,0BAA0B;IACxF,cAAc,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,0BAA0B;IAC3F,cAAc,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,0BAA0B;IAC3F,eAAe,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,0BAA0B;IAC5F,QAAQ,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,0BAA0B;IACrF,aAAa,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,0BAA0B;IAC1F,8BAA8B;IAC9B,KAAK,EAAE,CAAC,EAAa,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,8CAA8C;CACvG,CAAA"}
|
package/npm-shrinkwrap.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sf-git-merge-driver",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.9.0",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "sf-git-merge-driver",
|
|
9
|
-
"version": "1.
|
|
9
|
+
"version": "1.9.0",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@oclif/core": "^4.11.2",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
22
|
"@biomejs/biome": "2.4.15",
|
|
23
|
-
"@commitlint/config-conventional": "^21.0.
|
|
23
|
+
"@commitlint/config-conventional": "^21.0.1",
|
|
24
24
|
"@oclif/plugin-help": "^6.2.48",
|
|
25
25
|
"@salesforce/cli-plugins-testkit": "^5.3.57",
|
|
26
26
|
"@salesforce/dev-config": "^4.3.3",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"chai": "^6.2.2",
|
|
34
34
|
"esbuild": "^0.28.0",
|
|
35
35
|
"husky": "^9.1.7",
|
|
36
|
-
"knip": "^6.
|
|
36
|
+
"knip": "^6.13.1",
|
|
37
37
|
"mocha": "^11.7.5",
|
|
38
38
|
"nyc": "^18.0.0",
|
|
39
39
|
"oclif": "^4.23.0",
|
|
@@ -1653,13 +1653,13 @@
|
|
|
1653
1653
|
}
|
|
1654
1654
|
},
|
|
1655
1655
|
"node_modules/@commitlint/config-conventional": {
|
|
1656
|
-
"version": "21.0.
|
|
1657
|
-
"resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-21.0.
|
|
1658
|
-
"integrity": "sha512-
|
|
1656
|
+
"version": "21.0.1",
|
|
1657
|
+
"resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-21.0.1.tgz",
|
|
1658
|
+
"integrity": "sha512-gRorrkfWOh/+V5X8GYWWbQvrzPczopGMS4CCNrQdHkK4xWElv82BDvIsDhJZWTlI7TazOlYea6VATufCsFs+sw==",
|
|
1659
1659
|
"dev": true,
|
|
1660
1660
|
"license": "MIT",
|
|
1661
1661
|
"dependencies": {
|
|
1662
|
-
"@commitlint/types": "^21.0.
|
|
1662
|
+
"@commitlint/types": "^21.0.1",
|
|
1663
1663
|
"conventional-changelog-conventionalcommits": "^9.2.0"
|
|
1664
1664
|
},
|
|
1665
1665
|
"engines": {
|
|
@@ -1667,9 +1667,9 @@
|
|
|
1667
1667
|
}
|
|
1668
1668
|
},
|
|
1669
1669
|
"node_modules/@commitlint/types": {
|
|
1670
|
-
"version": "21.0.
|
|
1671
|
-
"resolved": "https://registry.npmjs.org/@commitlint/types/-/types-21.0.
|
|
1672
|
-
"integrity": "sha512-
|
|
1670
|
+
"version": "21.0.1",
|
|
1671
|
+
"resolved": "https://registry.npmjs.org/@commitlint/types/-/types-21.0.1.tgz",
|
|
1672
|
+
"integrity": "sha512-4u7w8jcoCUFWhjWnASYzZHAP34OqOtuFBN87nQmFvqda03YU0T6z+yB4w0gSAMpekiRqqGk5rt+qSlW+a2vSEg==",
|
|
1673
1673
|
"dev": true,
|
|
1674
1674
|
"license": "MIT",
|
|
1675
1675
|
"dependencies": {
|
|
@@ -3557,9 +3557,9 @@
|
|
|
3557
3557
|
}
|
|
3558
3558
|
},
|
|
3559
3559
|
"node_modules/@oxc-parser/binding-android-arm-eabi": {
|
|
3560
|
-
"version": "0.
|
|
3561
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm-eabi/-/binding-android-arm-eabi-0.
|
|
3562
|
-
"integrity": "sha512-
|
|
3560
|
+
"version": "0.130.0",
|
|
3561
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm-eabi/-/binding-android-arm-eabi-0.130.0.tgz",
|
|
3562
|
+
"integrity": "sha512-h/xYU8/7ADWzVSf5I+YalLpj33LOy9CI/zgbJNIZ5eunRBG+Czqa3lZsvuPHHf3rOt6z1c5+UzoxjbAzAvhwVw==",
|
|
3563
3563
|
"cpu": [
|
|
3564
3564
|
"arm"
|
|
3565
3565
|
],
|
|
@@ -3574,9 +3574,9 @@
|
|
|
3574
3574
|
}
|
|
3575
3575
|
},
|
|
3576
3576
|
"node_modules/@oxc-parser/binding-android-arm64": {
|
|
3577
|
-
"version": "0.
|
|
3578
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm64/-/binding-android-arm64-0.
|
|
3579
|
-
"integrity": "sha512-
|
|
3577
|
+
"version": "0.130.0",
|
|
3578
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm64/-/binding-android-arm64-0.130.0.tgz",
|
|
3579
|
+
"integrity": "sha512-oFWFJrsGv9siFM4HjMqKNB7IuIZD/SMmZdCXl8xyx7lDplGvPKyewpOo272rSWgMXe2Wx7bWI0Yj+gkHv4qbeg==",
|
|
3580
3580
|
"cpu": [
|
|
3581
3581
|
"arm64"
|
|
3582
3582
|
],
|
|
@@ -3591,9 +3591,9 @@
|
|
|
3591
3591
|
}
|
|
3592
3592
|
},
|
|
3593
3593
|
"node_modules/@oxc-parser/binding-darwin-arm64": {
|
|
3594
|
-
"version": "0.
|
|
3595
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.
|
|
3596
|
-
"integrity": "sha512-
|
|
3594
|
+
"version": "0.130.0",
|
|
3595
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.130.0.tgz",
|
|
3596
|
+
"integrity": "sha512-sGUzupdTplK9jQg7eJZ878HfEgQjJNBc6dAYVWJ9W5aU+J8rLfRJhTVsKThiu1pNwm6Y1qKCcbC6WhNWSXR3Ig==",
|
|
3597
3597
|
"cpu": [
|
|
3598
3598
|
"arm64"
|
|
3599
3599
|
],
|
|
@@ -3608,9 +3608,9 @@
|
|
|
3608
3608
|
}
|
|
3609
3609
|
},
|
|
3610
3610
|
"node_modules/@oxc-parser/binding-darwin-x64": {
|
|
3611
|
-
"version": "0.
|
|
3612
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.
|
|
3613
|
-
"integrity": "sha512-
|
|
3611
|
+
"version": "0.130.0",
|
|
3612
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.130.0.tgz",
|
|
3613
|
+
"integrity": "sha512-PsB4cdCISbC00Uy8eiD8bc2AkGWjZqrSrJnkBFuG2ptrrf6mZ2F5gLFSjOAVMMgZPg8B1D7OydJwLWSfyI2Plg==",
|
|
3614
3614
|
"cpu": [
|
|
3615
3615
|
"x64"
|
|
3616
3616
|
],
|
|
@@ -3625,9 +3625,9 @@
|
|
|
3625
3625
|
}
|
|
3626
3626
|
},
|
|
3627
3627
|
"node_modules/@oxc-parser/binding-freebsd-x64": {
|
|
3628
|
-
"version": "0.
|
|
3629
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-freebsd-x64/-/binding-freebsd-x64-0.
|
|
3630
|
-
"integrity": "sha512-
|
|
3628
|
+
"version": "0.130.0",
|
|
3629
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-freebsd-x64/-/binding-freebsd-x64-0.130.0.tgz",
|
|
3630
|
+
"integrity": "sha512-DgABp3l38hS77JbXCV4qk1+n6DPym5u8zzwuweokezm2tX194nDSJDENbDRECxVsiNbprKATLbk+Z5wlHT0OHw==",
|
|
3631
3631
|
"cpu": [
|
|
3632
3632
|
"x64"
|
|
3633
3633
|
],
|
|
@@ -3642,9 +3642,9 @@
|
|
|
3642
3642
|
}
|
|
3643
3643
|
},
|
|
3644
3644
|
"node_modules/@oxc-parser/binding-linux-arm-gnueabihf": {
|
|
3645
|
-
"version": "0.
|
|
3646
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.
|
|
3647
|
-
"integrity": "sha512-
|
|
3645
|
+
"version": "0.130.0",
|
|
3646
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.130.0.tgz",
|
|
3647
|
+
"integrity": "sha512-4Kn3CTEmwFrzhTSC/JuUW16qovmaMdX7jeSKbL8w0pLtLww7To1a2XJi9Z5uD8QWUkfUHhqfV+VD6dVzBnWzoA==",
|
|
3648
3648
|
"cpu": [
|
|
3649
3649
|
"arm"
|
|
3650
3650
|
],
|
|
@@ -3659,9 +3659,9 @@
|
|
|
3659
3659
|
}
|
|
3660
3660
|
},
|
|
3661
3661
|
"node_modules/@oxc-parser/binding-linux-arm-musleabihf": {
|
|
3662
|
-
"version": "0.
|
|
3663
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.
|
|
3664
|
-
"integrity": "sha512-
|
|
3662
|
+
"version": "0.130.0",
|
|
3663
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.130.0.tgz",
|
|
3664
|
+
"integrity": "sha512-D35KZM3F4rRu1uAFKyBlg3Gaf/ybCjyaPR1hfgvk5ex8NtcTmRgc0JgSighEyNg96TPrFhemFba68SZuxaha8w==",
|
|
3665
3665
|
"cpu": [
|
|
3666
3666
|
"arm"
|
|
3667
3667
|
],
|
|
@@ -3676,9 +3676,9 @@
|
|
|
3676
3676
|
}
|
|
3677
3677
|
},
|
|
3678
3678
|
"node_modules/@oxc-parser/binding-linux-arm64-gnu": {
|
|
3679
|
-
"version": "0.
|
|
3680
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.
|
|
3681
|
-
"integrity": "sha512-
|
|
3679
|
+
"version": "0.130.0",
|
|
3680
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.130.0.tgz",
|
|
3681
|
+
"integrity": "sha512-Q9o7oVlo955KHwS8l1u0bCzIx+JsZUA3XToLXC+MsMhye/9LeBQbt84nh120cl2XLy+TEzvugYDiHShg5yaX6Q==",
|
|
3682
3682
|
"cpu": [
|
|
3683
3683
|
"arm64"
|
|
3684
3684
|
],
|
|
@@ -3696,9 +3696,9 @@
|
|
|
3696
3696
|
}
|
|
3697
3697
|
},
|
|
3698
3698
|
"node_modules/@oxc-parser/binding-linux-arm64-musl": {
|
|
3699
|
-
"version": "0.
|
|
3700
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.
|
|
3701
|
-
"integrity": "sha512-
|
|
3699
|
+
"version": "0.130.0",
|
|
3700
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.130.0.tgz",
|
|
3701
|
+
"integrity": "sha512-EiJ/gC0ljbcwVpycC8YWw6ggMbtsPX8XMOt0mPx0aqWeMsNR+L9m05Flbvd5T+GlivG+GkSWQL7tM9SRFpM/dw==",
|
|
3702
3702
|
"cpu": [
|
|
3703
3703
|
"arm64"
|
|
3704
3704
|
],
|
|
@@ -3716,9 +3716,9 @@
|
|
|
3716
3716
|
}
|
|
3717
3717
|
},
|
|
3718
3718
|
"node_modules/@oxc-parser/binding-linux-ppc64-gnu": {
|
|
3719
|
-
"version": "0.
|
|
3720
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.
|
|
3721
|
-
"integrity": "sha512-
|
|
3719
|
+
"version": "0.130.0",
|
|
3720
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.130.0.tgz",
|
|
3721
|
+
"integrity": "sha512-b+h/lsLLurp756dMGizNs5uPaJfyEdWrTcV5t8M609jWm1DEHB1StpRXCkyvwtkJx3m+qL5BNQ0dEKan/4yGFA==",
|
|
3722
3722
|
"cpu": [
|
|
3723
3723
|
"ppc64"
|
|
3724
3724
|
],
|
|
@@ -3736,9 +3736,9 @@
|
|
|
3736
3736
|
}
|
|
3737
3737
|
},
|
|
3738
3738
|
"node_modules/@oxc-parser/binding-linux-riscv64-gnu": {
|
|
3739
|
-
"version": "0.
|
|
3740
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.
|
|
3741
|
-
"integrity": "sha512-
|
|
3739
|
+
"version": "0.130.0",
|
|
3740
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.130.0.tgz",
|
|
3741
|
+
"integrity": "sha512-O19Cil83XAyjEFfo8WhkMwY58ALqZ7ckjGL+25mjMIuF84urWBeANH0FC8B8BsSSygWU3/1aY3ADdDbp+wlBnw==",
|
|
3742
3742
|
"cpu": [
|
|
3743
3743
|
"riscv64"
|
|
3744
3744
|
],
|
|
@@ -3756,9 +3756,9 @@
|
|
|
3756
3756
|
}
|
|
3757
3757
|
},
|
|
3758
3758
|
"node_modules/@oxc-parser/binding-linux-riscv64-musl": {
|
|
3759
|
-
"version": "0.
|
|
3760
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.
|
|
3761
|
-
"integrity": "sha512-
|
|
3759
|
+
"version": "0.130.0",
|
|
3760
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.130.0.tgz",
|
|
3761
|
+
"integrity": "sha512-BgXRVC0+83n3YzCscLQjj6nbyeBIVeZYPTI4fFMAE4WNm2+4RXhWp03IVizL7esIz36kgmT48aebk1iM+cs8sw==",
|
|
3762
3762
|
"cpu": [
|
|
3763
3763
|
"riscv64"
|
|
3764
3764
|
],
|
|
@@ -3776,9 +3776,9 @@
|
|
|
3776
3776
|
}
|
|
3777
3777
|
},
|
|
3778
3778
|
"node_modules/@oxc-parser/binding-linux-s390x-gnu": {
|
|
3779
|
-
"version": "0.
|
|
3780
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.
|
|
3781
|
-
"integrity": "sha512-
|
|
3779
|
+
"version": "0.130.0",
|
|
3780
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.130.0.tgz",
|
|
3781
|
+
"integrity": "sha512-6tJz0xvnGhsokE7N1WlUSBXibpYmT9xSJFS1Ce41Km/+8gQvdlW8MLhRv8PD0L7ix8vRG0FDDepp3jdOFzdVdw==",
|
|
3782
3782
|
"cpu": [
|
|
3783
3783
|
"s390x"
|
|
3784
3784
|
],
|
|
@@ -3796,9 +3796,9 @@
|
|
|
3796
3796
|
}
|
|
3797
3797
|
},
|
|
3798
3798
|
"node_modules/@oxc-parser/binding-linux-x64-gnu": {
|
|
3799
|
-
"version": "0.
|
|
3800
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.
|
|
3801
|
-
"integrity": "sha512-
|
|
3799
|
+
"version": "0.130.0",
|
|
3800
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.130.0.tgz",
|
|
3801
|
+
"integrity": "sha512-9aCWj83dp3heTQGmGnZGdIWgxjZrr/7VQ0TGFHH5PKByxJKF2Hcr4qvaSUHhhGEa3MSsDjTL1YDP8RAgdL5/Cg==",
|
|
3802
3802
|
"cpu": [
|
|
3803
3803
|
"x64"
|
|
3804
3804
|
],
|
|
@@ -3816,9 +3816,9 @@
|
|
|
3816
3816
|
}
|
|
3817
3817
|
},
|
|
3818
3818
|
"node_modules/@oxc-parser/binding-linux-x64-musl": {
|
|
3819
|
-
"version": "0.
|
|
3820
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.
|
|
3821
|
-
"integrity": "sha512-
|
|
3819
|
+
"version": "0.130.0",
|
|
3820
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.130.0.tgz",
|
|
3821
|
+
"integrity": "sha512-afXt87aZBqrUVli8TB/I8H1G50RDWcwirjWtXGXYqJ2ZqWEiErH7V72j3LUSDZaivmtu2OLX0KQ/mbhP81mr7A==",
|
|
3822
3822
|
"cpu": [
|
|
3823
3823
|
"x64"
|
|
3824
3824
|
],
|
|
@@ -3836,9 +3836,9 @@
|
|
|
3836
3836
|
}
|
|
3837
3837
|
},
|
|
3838
3838
|
"node_modules/@oxc-parser/binding-openharmony-arm64": {
|
|
3839
|
-
"version": "0.
|
|
3840
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-openharmony-arm64/-/binding-openharmony-arm64-0.
|
|
3841
|
-
"integrity": "sha512-
|
|
3839
|
+
"version": "0.130.0",
|
|
3840
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-openharmony-arm64/-/binding-openharmony-arm64-0.130.0.tgz",
|
|
3841
|
+
"integrity": "sha512-I0NCrZV/YZuCGWgqwNN/GO/iXlLF2z+Wgc7u+Aa9N4P51oYeIa0XT+zVBUne4csO9GqxskXgI4g8JzzWGRpfOw==",
|
|
3842
3842
|
"cpu": [
|
|
3843
3843
|
"arm64"
|
|
3844
3844
|
],
|
|
@@ -3853,9 +3853,9 @@
|
|
|
3853
3853
|
}
|
|
3854
3854
|
},
|
|
3855
3855
|
"node_modules/@oxc-parser/binding-wasm32-wasi": {
|
|
3856
|
-
"version": "0.
|
|
3857
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.
|
|
3858
|
-
"integrity": "sha512-
|
|
3856
|
+
"version": "0.130.0",
|
|
3857
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.130.0.tgz",
|
|
3858
|
+
"integrity": "sha512-sJgQkGaBX0WJvPUDfwciex6IcTk5O5NLQ1bhEb6f3nBruh1GshKMRSMt2bxZlYrgBzjyBbJzsnO+InPG0bg+fA==",
|
|
3859
3859
|
"cpu": [
|
|
3860
3860
|
"wasm32"
|
|
3861
3861
|
],
|
|
@@ -3872,9 +3872,9 @@
|
|
|
3872
3872
|
}
|
|
3873
3873
|
},
|
|
3874
3874
|
"node_modules/@oxc-parser/binding-win32-arm64-msvc": {
|
|
3875
|
-
"version": "0.
|
|
3876
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.
|
|
3877
|
-
"integrity": "sha512-
|
|
3875
|
+
"version": "0.130.0",
|
|
3876
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.130.0.tgz",
|
|
3877
|
+
"integrity": "sha512-bjcma99sQrNh6RY4mPO9yTkfxql6TDFoN3HWdK31RCKXwNhcDgJXW/l8PUtzKNiQ+9vpKJfJtQq+LklBuxSOBA==",
|
|
3878
3878
|
"cpu": [
|
|
3879
3879
|
"arm64"
|
|
3880
3880
|
],
|
|
@@ -3889,9 +3889,9 @@
|
|
|
3889
3889
|
}
|
|
3890
3890
|
},
|
|
3891
3891
|
"node_modules/@oxc-parser/binding-win32-ia32-msvc": {
|
|
3892
|
-
"version": "0.
|
|
3893
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.
|
|
3894
|
-
"integrity": "sha512-
|
|
3892
|
+
"version": "0.130.0",
|
|
3893
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.130.0.tgz",
|
|
3894
|
+
"integrity": "sha512-hRYbv6HhpSTzT4xTiIkadLI7upLQxuOdLPR/9nL1fTjwhgutBTPXrwaAPb/jTFVx6/8C7Jb5HcUKhmNwloTbFA==",
|
|
3895
3895
|
"cpu": [
|
|
3896
3896
|
"ia32"
|
|
3897
3897
|
],
|
|
@@ -3906,9 +3906,9 @@
|
|
|
3906
3906
|
}
|
|
3907
3907
|
},
|
|
3908
3908
|
"node_modules/@oxc-parser/binding-win32-x64-msvc": {
|
|
3909
|
-
"version": "0.
|
|
3910
|
-
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.
|
|
3911
|
-
"integrity": "sha512-
|
|
3909
|
+
"version": "0.130.0",
|
|
3910
|
+
"resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.130.0.tgz",
|
|
3911
|
+
"integrity": "sha512-RBpA9TsRucJq6HNVNCFF1iKg+QeTkLdZf7hi4xaOGCPvMZWvDHjQgSOEZMUpuW4JNciHbxNhLEYmz5CVygjVGQ==",
|
|
3912
3912
|
"cpu": [
|
|
3913
3913
|
"x64"
|
|
3914
3914
|
],
|
|
@@ -3923,9 +3923,9 @@
|
|
|
3923
3923
|
}
|
|
3924
3924
|
},
|
|
3925
3925
|
"node_modules/@oxc-project/types": {
|
|
3926
|
-
"version": "0.
|
|
3927
|
-
"resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.
|
|
3928
|
-
"integrity": "sha512-
|
|
3926
|
+
"version": "0.130.0",
|
|
3927
|
+
"resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.130.0.tgz",
|
|
3928
|
+
"integrity": "sha512-ibD2usx9JRu7f5pu2tMKMI4cpA4NgXJQoYRP4pQ7Pxmn1l6k/53qWtQWZayhYy3X4QZkt90Ot+mJEaeXouio6Q==",
|
|
3929
3929
|
"dev": true,
|
|
3930
3930
|
"license": "MIT",
|
|
3931
3931
|
"funding": {
|
|
@@ -9227,9 +9227,9 @@
|
|
|
9227
9227
|
}
|
|
9228
9228
|
},
|
|
9229
9229
|
"node_modules/knip": {
|
|
9230
|
-
"version": "6.
|
|
9231
|
-
"resolved": "https://registry.npmjs.org/knip/-/knip-6.
|
|
9232
|
-
"integrity": "sha512-
|
|
9230
|
+
"version": "6.13.1",
|
|
9231
|
+
"resolved": "https://registry.npmjs.org/knip/-/knip-6.13.1.tgz",
|
|
9232
|
+
"integrity": "sha512-hvSnb+YDpDWW1LXub4U0JFfkQhscwgInWuQOv99WTutPZavf1cEP3GwxzEzO2JJpGI9yATk6l0jPLY1V3fp1sQ==",
|
|
9233
9233
|
"dev": true,
|
|
9234
9234
|
"funding": [
|
|
9235
9235
|
{
|
|
@@ -9248,14 +9248,14 @@
|
|
|
9248
9248
|
"get-tsconfig": "4.14.0",
|
|
9249
9249
|
"jiti": "^2.7.0",
|
|
9250
9250
|
"minimist": "^1.2.8",
|
|
9251
|
-
"oxc-parser": "^0.
|
|
9251
|
+
"oxc-parser": "^0.130.0",
|
|
9252
9252
|
"oxc-resolver": "^11.19.1",
|
|
9253
9253
|
"picomatch": "^4.0.4",
|
|
9254
9254
|
"smol-toml": "^1.6.1",
|
|
9255
9255
|
"strip-json-comments": "5.0.3",
|
|
9256
9256
|
"tinyglobby": "^0.2.16",
|
|
9257
9257
|
"unbash": "^3.0.0",
|
|
9258
|
-
"yaml": "^2.
|
|
9258
|
+
"yaml": "^2.9.0",
|
|
9259
9259
|
"zod": "^4.1.11"
|
|
9260
9260
|
},
|
|
9261
9261
|
"bin": {
|
|
@@ -10869,13 +10869,13 @@
|
|
|
10869
10869
|
}
|
|
10870
10870
|
},
|
|
10871
10871
|
"node_modules/oxc-parser": {
|
|
10872
|
-
"version": "0.
|
|
10873
|
-
"resolved": "https://registry.npmjs.org/oxc-parser/-/oxc-parser-0.
|
|
10874
|
-
"integrity": "sha512-
|
|
10872
|
+
"version": "0.130.0",
|
|
10873
|
+
"resolved": "https://registry.npmjs.org/oxc-parser/-/oxc-parser-0.130.0.tgz",
|
|
10874
|
+
"integrity": "sha512-X0PJ+NmOok8qP3vK9uaW431ngkdM9UPEK7KG466urtIL2+EYTEgbZK2yqe2MWKJKBjRlFweP/pJPx0x9muMEVw==",
|
|
10875
10875
|
"dev": true,
|
|
10876
10876
|
"license": "MIT",
|
|
10877
10877
|
"dependencies": {
|
|
10878
|
-
"@oxc-project/types": "^0.
|
|
10878
|
+
"@oxc-project/types": "^0.130.0"
|
|
10879
10879
|
},
|
|
10880
10880
|
"engines": {
|
|
10881
10881
|
"node": "^20.19.0 || >=22.12.0"
|
|
@@ -10884,26 +10884,26 @@
|
|
|
10884
10884
|
"url": "https://github.com/sponsors/Boshen"
|
|
10885
10885
|
},
|
|
10886
10886
|
"optionalDependencies": {
|
|
10887
|
-
"@oxc-parser/binding-android-arm-eabi": "0.
|
|
10888
|
-
"@oxc-parser/binding-android-arm64": "0.
|
|
10889
|
-
"@oxc-parser/binding-darwin-arm64": "0.
|
|
10890
|
-
"@oxc-parser/binding-darwin-x64": "0.
|
|
10891
|
-
"@oxc-parser/binding-freebsd-x64": "0.
|
|
10892
|
-
"@oxc-parser/binding-linux-arm-gnueabihf": "0.
|
|
10893
|
-
"@oxc-parser/binding-linux-arm-musleabihf": "0.
|
|
10894
|
-
"@oxc-parser/binding-linux-arm64-gnu": "0.
|
|
10895
|
-
"@oxc-parser/binding-linux-arm64-musl": "0.
|
|
10896
|
-
"@oxc-parser/binding-linux-ppc64-gnu": "0.
|
|
10897
|
-
"@oxc-parser/binding-linux-riscv64-gnu": "0.
|
|
10898
|
-
"@oxc-parser/binding-linux-riscv64-musl": "0.
|
|
10899
|
-
"@oxc-parser/binding-linux-s390x-gnu": "0.
|
|
10900
|
-
"@oxc-parser/binding-linux-x64-gnu": "0.
|
|
10901
|
-
"@oxc-parser/binding-linux-x64-musl": "0.
|
|
10902
|
-
"@oxc-parser/binding-openharmony-arm64": "0.
|
|
10903
|
-
"@oxc-parser/binding-wasm32-wasi": "0.
|
|
10904
|
-
"@oxc-parser/binding-win32-arm64-msvc": "0.
|
|
10905
|
-
"@oxc-parser/binding-win32-ia32-msvc": "0.
|
|
10906
|
-
"@oxc-parser/binding-win32-x64-msvc": "0.
|
|
10887
|
+
"@oxc-parser/binding-android-arm-eabi": "0.130.0",
|
|
10888
|
+
"@oxc-parser/binding-android-arm64": "0.130.0",
|
|
10889
|
+
"@oxc-parser/binding-darwin-arm64": "0.130.0",
|
|
10890
|
+
"@oxc-parser/binding-darwin-x64": "0.130.0",
|
|
10891
|
+
"@oxc-parser/binding-freebsd-x64": "0.130.0",
|
|
10892
|
+
"@oxc-parser/binding-linux-arm-gnueabihf": "0.130.0",
|
|
10893
|
+
"@oxc-parser/binding-linux-arm-musleabihf": "0.130.0",
|
|
10894
|
+
"@oxc-parser/binding-linux-arm64-gnu": "0.130.0",
|
|
10895
|
+
"@oxc-parser/binding-linux-arm64-musl": "0.130.0",
|
|
10896
|
+
"@oxc-parser/binding-linux-ppc64-gnu": "0.130.0",
|
|
10897
|
+
"@oxc-parser/binding-linux-riscv64-gnu": "0.130.0",
|
|
10898
|
+
"@oxc-parser/binding-linux-riscv64-musl": "0.130.0",
|
|
10899
|
+
"@oxc-parser/binding-linux-s390x-gnu": "0.130.0",
|
|
10900
|
+
"@oxc-parser/binding-linux-x64-gnu": "0.130.0",
|
|
10901
|
+
"@oxc-parser/binding-linux-x64-musl": "0.130.0",
|
|
10902
|
+
"@oxc-parser/binding-openharmony-arm64": "0.130.0",
|
|
10903
|
+
"@oxc-parser/binding-wasm32-wasi": "0.130.0",
|
|
10904
|
+
"@oxc-parser/binding-win32-arm64-msvc": "0.130.0",
|
|
10905
|
+
"@oxc-parser/binding-win32-ia32-msvc": "0.130.0",
|
|
10906
|
+
"@oxc-parser/binding-win32-x64-msvc": "0.130.0"
|
|
10907
10907
|
}
|
|
10908
10908
|
},
|
|
10909
10909
|
"node_modules/oxc-resolver": {
|
|
@@ -14083,9 +14083,9 @@
|
|
|
14083
14083
|
"license": "ISC"
|
|
14084
14084
|
},
|
|
14085
14085
|
"node_modules/ws": {
|
|
14086
|
-
"version": "8.20.
|
|
14087
|
-
"resolved": "https://registry.npmjs.org/ws/-/ws-8.20.
|
|
14088
|
-
"integrity": "sha512-
|
|
14086
|
+
"version": "8.20.1",
|
|
14087
|
+
"resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz",
|
|
14088
|
+
"integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==",
|
|
14089
14089
|
"license": "MIT",
|
|
14090
14090
|
"engines": {
|
|
14091
14091
|
"node": ">=10.0.0"
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sf-git-merge-driver",
|
|
3
3
|
"description": "Git merge driver for Salesforce metadata XML files - automatically resolves merge conflicts in profiles, permission sets, and 50+ metadata types",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.9.0",
|
|
5
5
|
"exports": "./lib/driver/MergeDriver.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"bin": {
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
23
|
"@biomejs/biome": "2.4.15",
|
|
24
|
-
"@commitlint/config-conventional": "^21.0.
|
|
24
|
+
"@commitlint/config-conventional": "^21.0.1",
|
|
25
25
|
"@oclif/plugin-help": "^6.2.48",
|
|
26
26
|
"@salesforce/cli-plugins-testkit": "^5.3.57",
|
|
27
27
|
"@salesforce/dev-config": "^4.3.3",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"chai": "^6.2.2",
|
|
35
35
|
"esbuild": "^0.28.0",
|
|
36
36
|
"husky": "^9.1.7",
|
|
37
|
-
"knip": "^6.
|
|
37
|
+
"knip": "^6.13.1",
|
|
38
38
|
"mocha": "^11.7.5",
|
|
39
39
|
"nyc": "^18.0.0",
|
|
40
40
|
"oclif": "^4.23.0",
|