sf-git-merge-driver 1.0.0-dev-3.13990972267-1 → 1.0.0-dev-3.14022905562-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/README.md +3 -3
- package/lib/constant/conflicConstant.d.ts +6 -0
- package/lib/constant/conflicConstant.js +7 -0
- package/lib/constant/conflicConstant.js.map +1 -0
- package/lib/constant/metadataConstant.d.ts +4 -53
- package/lib/constant/metadataConstant.js +4 -53
- package/lib/constant/metadataConstant.js.map +1 -1
- package/lib/merger/JsonMerger.d.ts +2 -36
- package/lib/merger/JsonMerger.js +151 -532
- package/lib/merger/JsonMerger.js.map +1 -1
- package/lib/merger/XmlMerger.js +1 -1
- package/lib/merger/XmlMerger.js.map +1 -1
- package/lib/merger/conflictMarker.d.ts +2 -0
- package/lib/merger/conflictMarker.js +12 -0
- package/lib/merger/conflictMarker.js.map +1 -0
- package/lib/merger/textAttribute.d.ts +2 -0
- package/lib/merger/textAttribute.js +55 -0
- package/lib/merger/textAttribute.js.map +1 -0
- package/lib/service/MetadataService.d.ts +4 -0
- package/lib/service/MetadataService.js +70 -0
- package/lib/service/MetadataService.js.map +1 -0
- package/lib/service/NamespaceHandler.d.ts +5 -0
- package/lib/service/NamespaceHandler.js +35 -0
- package/lib/service/NamespaceHandler.js.map +1 -0
- package/lib/types/jsonTypes.d.ts +6 -0
- package/lib/types/jsonTypes.js +2 -0
- package/lib/types/jsonTypes.js.map +1 -0
- package/lib/types/mergeScenario.d.ts +17 -0
- package/lib/types/mergeScenario.js +38 -0
- package/lib/types/mergeScenario.js.map +1 -0
- package/lib/utils/mergeUtils.d.ts +4 -0
- package/lib/utils/mergeUtils.js +5 -0
- package/lib/utils/mergeUtils.js.map +1 -0
- package/npm-shrinkwrap.json +237 -16
- package/oclif.manifest.json +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonMerger.js","sourceRoot":"","sources":["../../src/merger/JsonMerger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA,CAAC,mBAAmB;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAA;AAgBpE,MAAM,OAAO,UAAU;IACrB;;OAEG;IACH,YAAY,CACV,QAAgC,EAChC,IAA4B,EAC5B,MAA8B,EAC9B,MAA+B,CAAC,GAAG;IACnC,kBAAkB;;QAElB,qCAAqC;QACrC,MAAM,aAAa,GAAa,EAAE,CAAA;QAClC,IAAI,QAAQ,GAAW,CAAC,CAAA;QACxB,IAAI,QAAQ,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC;YACvC,QAAQ,IAAI,GAAG,CAAA;YACf,aAAa,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC9C,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,EAAE,CAAA;QACf,CAAC;QACD,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;YAC/B,QAAQ,IAAI,EAAE,CAAA;YACd,aAAa,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAC1C,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,EAAE,CAAA;QACX,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YACnC,QAAQ,IAAI,CAAC,CAAA;YACb,aAAa,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;QAC5C,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,EAAE,CAAA;QACb,CAAC;QACD,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAA;QAEnD,oFAAoF;QAEpF,wBAAwB;QACxB,MAAM,aAAa,GAAG,EAAe,CAAA;QACrC,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;YACrC,gFAAgF;YAChF,wBAAwB;YACxB,oBAAoB;YACpB,qBAAqB;YACrB,KAAK;YACL,QACE,IAAI,CAAC,uBAAuB,CAC1B,QAAQ,CAAC,QAAQ,CAAC,EAClB,IAAI,CAAC,QAAQ,CAAC,EACd,MAAM,CAAC,QAAQ,CAAC,CACjB,EACD,CAAC;gBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACd,IAAI,MAAM,EAAE,CAAC;wBACX,aAAa,CAAC,IAAI,CAChB,GAAG,IAAI,CAAC,WAAW,CACjB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EACpC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAChC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAClC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EACxB,QAAQ,EACR,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAC3B,CACF,CAAA;oBACH,CAAC;yBAAM,CAAC;wBACN,IAAI,UAAU,GAAG,EAAE,CAAA;wBACnB,QAAQ,QAAQ,EAAE,CAAC;4BACjB,KAAK,GAAG;gCACN,OAAO,EAAE,CAAA;4BACX,KAAK,EAAE;gCACL,IAAI,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;oCAC1B,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;oCACzB,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CACvB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,CACzD,CAAA;oCACD,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gCAChC,CAAC;qCAAM,CAAC;oCACN,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAA;oCAClD,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;oCACzB,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CACvB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,CACzD,CAAA;oCACD,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;oCAC9B,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAA;oCAC/C,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;oCACrC,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;oCAC1C,UAAU,GAAG,EAAE,CAAA;oCACf,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;oCACzB,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CACvB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAC3D,CAAA;oCACD,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;oCAC9B,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAA;gCACnD,CAAC;gCACD,MAAK;4BACP,KAAK,GAAG;gCACN,IAAI,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;oCAC9B,OAAO,EAAE,CAAA;gCACX,CAAC;qCAAM,CAAC;oCACN,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAA;oCAClD,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;oCACrC,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAA;oCAC/C,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;oCACzB,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CACvB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,CAC7D,CAAA;oCACD,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;oCAC9B,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;oCAC1C,UAAU,GAAG,EAAE,CAAA;oCACf,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;oCACzB,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CACvB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAC3D,CAAA;oCACD,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;oCAC9B,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAA;gCACnD,CAAC;gCACD,MAAK;4BACP,KAAK,GAAG;gCACN,IAAI,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;oCAC5B,OAAO,EAAE,CAAA;gCACX,CAAC;qCAAM,CAAC;oCACN,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAA;oCAClD,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;oCACzB,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CACvB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,CACzD,CAAA;oCACD,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;oCAC9B,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAA;oCAC/C,UAAU,GAAG,EAAE,CAAA;oCACf,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;oCACzB,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CACvB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAC7D,CAAA;oCACD,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;oCAC9B,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;oCAC1C,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;oCACrC,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAA;gCACnD,CAAC;gCACD,MAAK;4BACP;gCACE,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;gCACzB,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CACvB,GAAG,IAAI,CAAC,YAAY,CAClB,QAAQ,CAAC,QAAQ,CAAC,EAClB,IAAI,CAAC,QAAQ,CAAC,EACd,MAAM,CAAC,QAAQ,CAAC,EAChB,UAAU,CACX,CACF,CAAA;gCACD,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gCAC9B,MAAK;wBACT,CAAC;oBACH,CAAC;oBACD,MAAK;gBACP,CAAC;gBACD;oBACE,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC;wBACxC,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;4BACjB,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;wBAC7C,CAAC;6BAAM,CAAC;4BACN,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;4BACjB,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;wBAC7C,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,aAAa,CAAC,IAAI,CAChB,GAAG,IAAI,CAAC,kBAAkB,CACxB,QAAQ,EACR,QAAQ,CAAC,QAAQ,CAAC,EAClB,IAAI,CAAC,QAAQ,CAAC,EACd,MAAM,CAAC,QAAQ,CAAC,CACjB,CACF,CAAA;oBACH,CAAC;oBACD,MAAK;YACT,CAAC;QACH,CAAC;QAED,OAAO,aAAa,CAAA;QACpB,qCAAqC;QACrC,OAAO;QACP,gCAAgC;QAChC,qBAAqB;QACrB,4BAA4B;QAC5B,kCAAkC;QAClC,uBAAuB;QACvB,2BAA2B;QAC3B,MAAM;QACN,8CAA8C;QAC9C,yCAAyC;QACzC,yDAAyD;QACzD,+CAA+C;QAE/C,+CAA+C;QAC/C,qDAAqD;QACrD,yDAAyD;QACzD,8BAA8B;QAC9B,oBAAoB;QACpB,wCAAwC;QACxC,oCAAoC;QACpC,4BAA4B;QAC5B,8DAA8D;QAC9D,eAAe;QAEf,+CAA+C;QAC/C,sCAAsC;QACtC,oCAAoC;QACpC,sCAAsC;QACtC,SAAS;QAET,+BAA+B;QAC/B,4DAA4D;QAC5D,8CAA8C;QAC9C,2DAA2D;QAC3D,kDAAkD;QAElD,sEAAsE;QACtE,4CAA4C;QAC5C,6EAA6E;QAC7E,mBAAmB;QACnB,UAAU;QAEV,yCAAyC;QACzC,mEAAmE;QACnE,oEAAoE;QACpE,8BAA8B;QAC9B,sCAAsC;QACtC,0DAA0D;QAC1D,iBAAiB;QAEjB,4DAA4D;QAC5D,oDAAoD;QAEpD,4BAA4B;QAC5B,oDAAoD;QACpD,yBAAyB;QACzB,oBAAoB;QACpB,sBAAsB;QACtB,mBAAmB;QACnB,UAAU;QACV,QAAQ;QAER,sCAAsC;QACtC,oBAAoB;QACpB,MAAM;QACN,IAAI;QAEJ,4CAA4C;QAC5C,cAAc;IAChB,CAAC;IAEO,kBAAkB,CACxB,MAAc,EACd,QAA0B,EAC1B,IAAsB,EACtB,MAAwB;QAExB,MAAM,MAAM,GAAe,EAAE,CAAA;QAC7B,MAAM,OAAO,GAAe,EAAE,CAAA;QAC9B,MAAM,SAAS,GAAe,EAAE,CAAA;QAChC,IAAI,QAAQ,GAAW,CAAC,CAAA;QACxB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAA;YACxC,QAAQ,IAAI,GAAG,CAAA;QACjB,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACjB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;YACrC,QAAQ,IAAI,EAAE,CAAA;QAChB,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YACnB,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAA;YACzC,QAAQ,IAAI,CAAC,CAAA;QACf,CAAC;QACD,MAAM,UAAU,GAAc,EAAE,CAAA;QAChC,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,CAAC;gBACJ,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAC1B,MAAK;YACP,KAAK,EAAE;gBACL,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBACxB,MAAK;YACP,KAAK,EAAE;gBACL,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;oBACpB,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC1B,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAA;oBAC/C,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBACxB,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAA;oBAC5C,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;oBAClC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;oBACvC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;oBAC1B,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAA;gBAChD,CAAC;gBACD,MAAK;YACP,KAAK,GAAG;gBACN,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;oBACxB,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAA;oBAC/C,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;oBAClC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAA;oBAC5C,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBACvB,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;oBACvC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;oBAC1B,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAA;gBAChD,CAAC;gBACD,MAAK;YACP,KAAK,GAAG;gBACN,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;oBACtB,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAA;oBAC/C,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBACxB,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAA;oBAC5C,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBACvB,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;oBACvC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;oBAClC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAA;gBAChD,CAAC;gBACD,MAAK;YACP,KAAK,GAAG;gBACN,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;oBACpB,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC1B,CAAC;qBAAM,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;oBAC7B,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAC5B,CAAC;qBAAM,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;oBAC/B,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC1B,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAA;oBAC/C,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBACxB,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAA;oBAC5C,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBACvB,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;oBACvC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;oBAC1B,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAA;gBAChD,CAAC;gBACD,MAAK;YACP,QAAQ;QACV,CAAC;QACD,OAAO,UAAU,CAAA;IACnB,CAAC;IAED;;OAEG;IACK,uBAAuB,CAC7B,QAAsC,EACtC,IAAkC,EAClC,MAAoC;QAEpC,OAAO,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;IACjE,CAAC;IAED;;OAEG;IACK,WAAW,CAAC,KAAgB;QAClC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,SAAS,CAAC,KAAK,CAAe,CAAA;IAC5D,CAAC;IAED;;OAEG;IACK,WAAW,CAAC,QAAgB;QAClC,OAAO,QAAQ,IAAI,kBAAkB;YACnC,CAAC,CAAC,kBAAkB,CAAC,QAA2C,CAAC;YACjE,CAAC,CAAC,SAAS,CAAA;IACf,CAAC;IAED;;OAEG;IACK,WAAW,CACjB,QAAmB,EACnB,IAAe,EACf,MAAiB,EACjB,MAAiB,EACjB,SAAiB,EACjB,QAAiB;QAEjB,MAAM,UAAU,GAAG,EAAE,CAAA;QACrB,oEAAoE;QACpE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,UAAU,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YAC7D,OAAO,CAAC,UAAU,CAAC,CAAA;QACrB,CAAC;QAED,kCAAkC;QAClC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,UAAU,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;YACpE,OAAO,CAAC,UAAU,CAAC,CAAA;QACrB,CAAC;QAED,wBAAwB;QACxB,OAAO,IAAI,CAAC,eAAe,CACzB,QAAQ,EACR,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,SAAS,EACT,MAAM,CACP,CAAA;IACH,CAAC;IAED;;OAEG;IACK,eAAe,CACrB,QAAmB,EACnB,IAAe,EACf,MAAiB;QAEjB,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;QAExB,oCAAoC;QACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9D,MAAM,YAAY,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAElE,oEAAoE;YACpE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC;gBACxE,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;YACvB,CAAC;QACH,CAAC;QAED,6CAA6C;QAC7C,IAAI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACjD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YACxB,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;OAEG;IACK,eAAe,CACrB,QAAmB,EACnB,IAAe,EACf,MAAiB,EACjB,QAAgB,EAChB,SAAiB,EACjB,MAAiB;QAEjB,MAAM,UAAU,GAAc,EAAE,CAAA;QAChC,IAAI,QAAQ,GAAW,CAAC,CAAA;QACxB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,QAAQ,IAAI,GAAG,CAAA;QACjB,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,QAAQ,IAAI,EAAE,CAAA;QAChB,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,QAAQ,IAAI,CAAC,CAAA;QACf,CAAC;QACD,gBAAgB;QAChB,oBAAoB;QACpB,kBAAkB;QAClB,uBAAuB;QACvB,iBAAiB;QACjB,uBAAuB;QACvB,eAAe;QACf,IAAI;QACJ,mCAAmC;QACnC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC1C,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QACvC,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC3C,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB;YACE,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;YACxB,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YACzB,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;SAC5B,CAAC,IAAI,EAAE,CACT,CAAA;QACD,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,QAAQ,GAAG,CAAC,CAAA;YACZ,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAClB,QAAQ,IAAI,GAAG,CAAA;YACjB,CAAC;YACD,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnB,QAAQ,IAAI,EAAE,CAAA;YAChB,CAAC;YACD,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,QAAQ,IAAI,CAAC,CAAA;YACf,CAAC;YACD,wCAAwC;YACxC,IAAI,UAAU,GAAG,EAAE,CAAA;YACnB,QAAQ,QAAQ,EAAE,CAAC;gBACjB,KAAK,CAAC;oBACJ,UAAU,CAAC,SAAS,CAAC,GAAG;wBACtB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;qBACvD,CAAA;oBACD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;oBAC3B,MAAK;gBACP,KAAK,EAAE;oBACL,UAAU,CAAC,SAAS,CAAC,GAAG;wBACtB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;qBACrD,CAAA;oBACD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;oBAC3B,MAAK;gBACP,KAAK,GAAG;oBACN,MAAK;gBACP,KAAK,EAAE;oBACL,IAAI,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;wBAC1B,UAAU,CAAC,SAAS,CAAC,GAAG;4BACtB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;yBACrD,CAAA;wBACD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;oBAC7B,CAAC;yBAAM,CAAC;wBACN,gDAAgD;wBAChD,4BAA4B;wBAC5B,0DAA0D;wBAC1D,IAAI;wBACJ,8BAA8B;wBAC9B,+CAA+C;wBAC/C,qCAAqC;wBACrC,0CAA0C;wBAC1C,4BAA4B;wBAC5B,4DAA4D;wBAC5D,IAAI;wBACJ,8BAA8B;wBAC9B,iDAAiD;wBACjD,UAAU,CAAC,SAAS,CAAC,GAAG;4BACtB,GAAG,IAAI,CAAC,YAAY,CAClB,EAAE,EACF,SAAS,CAAC,GAAG,CAAC,EACd,WAAW,CAAC,GAAG,CAAC,EAChB,MAAM,CACP;yBACF,CAAA;wBACD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;oBAC7B,CAAC;oBACD,MAAK;gBACP,KAAK,GAAG;oBACN,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;wBAC/B,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAA;wBAC/C,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;wBAClC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAA;wBAC5C,UAAU,GAAG,EAAE,CAAA;wBACf,UAAU,CAAC,SAAS,CAAC,GAAG;4BACtB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;yBACpD,CAAA;wBACD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;wBAC3B,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;wBACvC,UAAU,GAAG,EAAE,CAAA;wBACf,UAAU,CAAC,SAAS,CAAC,GAAG;4BACtB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;yBACvD,CAAA;wBACD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;wBAC3B,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAA;wBAC9C,4BAA4B;wBAC5B,uEAAuE;wBACvE,IAAI;wBACJ,8BAA8B;oBAChC,CAAC;oBACD,MAAK;gBACP,KAAK,GAAG;oBACN,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;wBAC7B,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAA;wBAC/C,UAAU,GAAG,EAAE,CAAA;wBACf,UAAU,CAAC,SAAS,CAAC,GAAG;4BACtB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;yBACrD,CAAA;wBACD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;wBAC3B,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAA;wBAC5C,UAAU,GAAG,EAAE,CAAA;wBACf,UAAU,CAAC,SAAS,CAAC,GAAG;4BACtB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;yBACpD,CAAA;wBACD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;wBAC3B,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;wBACvC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;wBAClC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAA;wBAC9C,4BAA4B;wBAC5B,qEAAqE;wBACrE,IAAI;wBACJ,8BAA8B;oBAChC,CAAC;oBACD,MAAK;gBACP,KAAK,GAAG;oBACN,IAAI,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;wBAC1B,UAAU,CAAC,SAAS,CAAC,GAAG;4BACtB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;yBACrD,CAAA;oBACH,CAAC;yBAAM,IAAI,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;wBACnC,UAAU,CAAC,SAAS,CAAC,GAAG;4BACtB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;yBACvD,CAAA;oBACH,CAAC;yBAAM,IAAI,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;wBACrC,UAAU,CAAC,SAAS,CAAC,GAAG;4BACtB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;yBACrD,CAAA;oBACH,CAAC;yBAAM,CAAC;wBACN,gDAAgD;wBAChD,wEAAwE;wBACxE,+CAA+C;wBAC/C,uEAAuE;wBACvE,0CAA0C;wBAC1C,0EAA0E;wBAC1E,iDAAiD;wBACjD,UAAU,CAAC,SAAS,CAAC,GAAG;4BACtB,GAAG,IAAI,CAAC,YAAY,CAClB,QAAQ,CAAC,GAAG,CAAC,EACb,SAAS,CAAC,GAAG,CAAC,EACd,WAAW,CAAC,GAAG,CAAC,EAChB,MAAM,CACP;yBACF,CAAA;oBACH,CAAC;oBACD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;oBAC3B,MAAK;gBACP,QAAQ;YACV,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAA;QACjB,wBAAwB;QACxB,2BAA2B;QAC3B,sCAAsC;QAEtC,uCAAuC;QACvC,8CAA8C;QAC9C,gDAAgD;QAChD,mDAAmD;QAEnD,mBAAmB;QACnB,6BAA6B;QAC7B,gDAAgD;QAChD,mCAAmC;QACnC,IAAI;QAEJ,+BAA+B;QAC/B,gDAAgD;QAChD,qCAAqC;QACrC,IAAI;QAEJ,iCAAiC;QACjC,gDAAgD;QAChD,wCAAwC;QACxC,IAAI;QAEJ,kCAAkC;QAClC,4CAA4C;QAC5C,qDAAqD;QACrD,uBAAuB;QAEvB,uBAAuB;QAEvB,uCAAuC;QACvC,6BAA6B;QAC7B,2CAA2C;QAC3C,gDAAgD;QAEhD,2EAA2E;QAC3E,WAAW;QACX,6CAA6C;QAC7C,yCAAyC;QACzC,UAAU;QACV,8BAA8B;QAC9B,QAAQ;QACR,MAAM;QACN,IAAI;QAEJ,gDAAgD;QAChD,2CAA2C;QAC3C,mCAAmC;QACnC,YAAY;QACZ,4EAA4E;QAC5E,IAAI;QACJ,mCAAmC;QAEnC,gBAAgB;IAClB,CAAC;CAgBF"}
|
|
1
|
+
{"version":3,"file":"JsonMerger.js","sourceRoot":"","sources":["../../src/merger/JsonMerger.ts"],"names":[],"mappings":"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"}
|
package/lib/merger/XmlMerger.js
CHANGED
|
@@ -39,7 +39,7 @@ export class XmlMerger {
|
|
|
39
39
|
// console.dir(ancestorObj, {depth:null})
|
|
40
40
|
// Perform deep merge of XML objects
|
|
41
41
|
const jsonMerger = new JsonMerger();
|
|
42
|
-
const mergedObj = jsonMerger.
|
|
42
|
+
const mergedObj = jsonMerger.merge(ancestorObj, ourObj, theirObj);
|
|
43
43
|
// console.log('mergedObj')
|
|
44
44
|
// console.dir(mergedObj, {depth:null})
|
|
45
45
|
// Convert back to XML and format
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XmlMerger.js","sourceRoot":"","sources":["../../src/merger/XmlMerger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,QAAQ,GAAG,0CAA0C,CAAA;AAC3D,MAAM,qBAAqB,GAAG,eAAe,CAAA;AAE7C,MAAM,WAAW,GAAG;IAClB,aAAa,EAAE,SAAS;IACxB,eAAe,EAAE,qBAAqB;IACtC,gBAAgB,EAAE,KAAK;CACxB,CAAA;AAED,MAAM,aAAa,GAAG;IACpB,GAAG,WAAW;IACd,iBAAiB,EAAE,IAAI;IACvB,kBAAkB,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE;IACvD,mBAAmB,EAAE,KAAK;IAC1B,aAAa,EAAE,KAAK;IACpB,uBAAuB;CACxB,CAAA;AAED,MAAM,cAAc,GAAG;IACrB,GAAG,WAAW;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;IAChB,aAAa,EAAE,IAAI;CACpB,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,GAAW,EAAU,EAAE,CAC9C,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;AAE9E,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAU,EAAE,CACpD,GAAG;KACA,OAAO,CAAC,iDAAiD,EAAE,IAAI,CAAC;KAChE,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;AAEpC,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAU,EAAE,CACpD,GAAG;KACA,UAAU,CAAC,YAAY,EAAE,QAAQ,CAAC;KAClC,UAAU,CAAC,8BAA8B,EAAE,SAAS,CAAC;KACrD,UAAU,CAAC,8BAA8B,EAAE,SAAS,CAAC,CAAA;AAE1D,MAAM,OAAO,SAAS;IACpB,eAAe,CACb,eAAuB,EACvB,UAAkB,EAClB,YAAoB;QAEpB,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,aAAa,CAAC,CAAA;QAE3C,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACjD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC3C,mDAAmD;QACnD,yCAAyC;QAEzC,oCAAoC;QAEpC,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAA;QACnC,MAAM,SAAS,GAAG,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"XmlMerger.js","sourceRoot":"","sources":["../../src/merger/XmlMerger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,QAAQ,GAAG,0CAA0C,CAAA;AAC3D,MAAM,qBAAqB,GAAG,eAAe,CAAA;AAE7C,MAAM,WAAW,GAAG;IAClB,aAAa,EAAE,SAAS;IACxB,eAAe,EAAE,qBAAqB;IACtC,gBAAgB,EAAE,KAAK;CACxB,CAAA;AAED,MAAM,aAAa,GAAG;IACpB,GAAG,WAAW;IACd,iBAAiB,EAAE,IAAI;IACvB,kBAAkB,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE;IACvD,mBAAmB,EAAE,KAAK;IAC1B,aAAa,EAAE,KAAK;IACpB,uBAAuB;CACxB,CAAA;AAED,MAAM,cAAc,GAAG;IACrB,GAAG,WAAW;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;IAChB,aAAa,EAAE,IAAI;CACpB,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,GAAW,EAAU,EAAE,CAC9C,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;AAE9E,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAU,EAAE,CACpD,GAAG;KACA,OAAO,CAAC,iDAAiD,EAAE,IAAI,CAAC;KAChE,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;AAEpC,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAU,EAAE,CACpD,GAAG;KACA,UAAU,CAAC,YAAY,EAAE,QAAQ,CAAC;KAClC,UAAU,CAAC,8BAA8B,EAAE,SAAS,CAAC;KACrD,UAAU,CAAC,8BAA8B,EAAE,SAAS,CAAC,CAAA;AAE1D,MAAM,OAAO,SAAS;IACpB,eAAe,CACb,eAAuB,EACvB,UAAkB,EAClB,YAAoB;QAEpB,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,aAAa,CAAC,CAAA;QAE3C,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACjD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC3C,mDAAmD;QACnD,yCAAyC;QAEzC,oCAAoC;QAEpC,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAA;QACnC,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;QACjE,2BAA2B;QAC3B,uCAAuC;QAEvC,iCAAiC;QACjC,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,cAAc,CAAC,CAAA;QAC9C,MAAM,SAAS,GAAW,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAClD,2BAA2B;QAC3B,uCAAuC;QACvC,OAAO,SAAS,CAAC,MAAM;YACrB,CAAC,CAAC,qBAAqB,CACnB,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,CACnE;YACH,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;CACF"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { isEmpty } from 'lodash-es';
|
|
2
|
+
import { BASE, LOCAL, NEWLINE, REMOTE, SEPARATOR, TEXT_TAG, } from '../constant/conflicConstant.js';
|
|
3
|
+
export const addConflictMarkers = (acc, ours, ancestor, theirs) => {
|
|
4
|
+
acc.push({ [TEXT_TAG]: `${NEWLINE}${LOCAL}` });
|
|
5
|
+
acc.push(isEmpty(ours) ? { [TEXT_TAG]: NEWLINE } : ours);
|
|
6
|
+
acc.push({ [TEXT_TAG]: BASE });
|
|
7
|
+
acc.push(isEmpty(ancestor) ? { [TEXT_TAG]: NEWLINE } : ancestor);
|
|
8
|
+
acc.push({ [TEXT_TAG]: SEPARATOR });
|
|
9
|
+
acc.push(isEmpty(theirs) ? { [TEXT_TAG]: NEWLINE } : theirs);
|
|
10
|
+
acc.push({ [TEXT_TAG]: REMOTE });
|
|
11
|
+
};
|
|
12
|
+
//# sourceMappingURL=conflictMarker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conflictMarker.js","sourceRoot":"","sources":["../../src/merger/conflictMarker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EACL,IAAI,EACJ,KAAK,EACL,OAAO,EACP,MAAM,EACN,SAAS,EACT,QAAQ,GACT,MAAM,gCAAgC,CAAA;AAEvC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,GAAc,EACd,IAAgB,EAChB,QAAoB,EACpB,MAAkB,EACZ,EAAE;IACR,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,GAAG,OAAO,GAAG,KAAK,EAAE,EAAE,CAAC,CAAA;IAC9C,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACxD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;IAC9B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;IAChE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;IACnC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IAC5D,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;AAClC,CAAC,CAAA"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { isEqual, isNil } from 'lodash-es';
|
|
2
|
+
import { TEXT_TAG } from '../constant/conflicConstant.js';
|
|
3
|
+
import { MergeScenario, getScenario } from '../types/mergeScenario.js';
|
|
4
|
+
import { addConflictMarkers } from './conflictMarker.js';
|
|
5
|
+
export const mergeTextAttribute = (ancestor, ours, theirs, attrib) => {
|
|
6
|
+
const generateObj = (value) => {
|
|
7
|
+
return isNil(value) ? {} : { [attrib]: [{ [TEXT_TAG]: value }] };
|
|
8
|
+
};
|
|
9
|
+
const objAnc = generateObj(ancestor);
|
|
10
|
+
const objOurs = generateObj(ours);
|
|
11
|
+
const objTheirs = generateObj(theirs);
|
|
12
|
+
const scenario = getScenario(objAnc, objOurs, objTheirs);
|
|
13
|
+
const acc = [];
|
|
14
|
+
// Early return for identical values
|
|
15
|
+
if (isEqual(ours, theirs) &&
|
|
16
|
+
(scenario === MergeScenario.OURS_AND_THEIRS ||
|
|
17
|
+
scenario === MergeScenario.ALL)) {
|
|
18
|
+
return [objOurs];
|
|
19
|
+
}
|
|
20
|
+
// Handle specific merge scenarios
|
|
21
|
+
switch (scenario) {
|
|
22
|
+
case MergeScenario.THEIRS_ONLY:
|
|
23
|
+
acc.push(objTheirs);
|
|
24
|
+
break;
|
|
25
|
+
case MergeScenario.OURS_ONLY:
|
|
26
|
+
acc.push(objOurs);
|
|
27
|
+
break;
|
|
28
|
+
case MergeScenario.OURS_AND_THEIRS:
|
|
29
|
+
addConflictMarkers(acc, objOurs, {}, objTheirs);
|
|
30
|
+
break;
|
|
31
|
+
case MergeScenario.ANCESTOR_AND_THEIRS:
|
|
32
|
+
if (ancestor !== theirs) {
|
|
33
|
+
addConflictMarkers(acc, {}, objAnc, objTheirs);
|
|
34
|
+
}
|
|
35
|
+
break;
|
|
36
|
+
case MergeScenario.ANCESTOR_AND_OURS:
|
|
37
|
+
if (ancestor !== ours) {
|
|
38
|
+
addConflictMarkers(acc, objOurs, objAnc, {});
|
|
39
|
+
}
|
|
40
|
+
break;
|
|
41
|
+
case MergeScenario.ALL:
|
|
42
|
+
if (ancestor === ours) {
|
|
43
|
+
acc.push(objTheirs);
|
|
44
|
+
}
|
|
45
|
+
else if (ancestor === theirs) {
|
|
46
|
+
acc.push(objOurs);
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
addConflictMarkers(acc, objOurs, objAnc, objTheirs);
|
|
50
|
+
}
|
|
51
|
+
break;
|
|
52
|
+
}
|
|
53
|
+
return acc;
|
|
54
|
+
};
|
|
55
|
+
//# sourceMappingURL=textAttribute.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"textAttribute.js","sourceRoot":"","sources":["../../src/merger/textAttribute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAA;AAEzD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAExD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,QAA0B,EAC1B,IAAsB,EACtB,MAAwB,EACxB,MAAc,EACH,EAAE;IACb,MAAM,WAAW,GAAG,CAAC,KAAuB,EAAc,EAAE;QAC1D,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAA;IAClE,CAAC,CAAA;IAED,MAAM,MAAM,GAAe,WAAW,CAAC,QAAQ,CAAC,CAAA;IAChD,MAAM,OAAO,GAAe,WAAW,CAAC,IAAI,CAAC,CAAA;IAC7C,MAAM,SAAS,GAAe,WAAW,CAAC,MAAM,CAAC,CAAA;IACjD,MAAM,QAAQ,GAAkB,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;IACvE,MAAM,GAAG,GAAc,EAAE,CAAA;IAEzB,oCAAoC;IACpC,IACE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;QACrB,CAAC,QAAQ,KAAK,aAAa,CAAC,eAAe;YACzC,QAAQ,KAAK,aAAa,CAAC,GAAG,CAAC,EACjC,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,CAAA;IAClB,CAAC;IAED,kCAAkC;IAClC,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,aAAa,CAAC,WAAW;YAC5B,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACnB,MAAK;QAEP,KAAK,aAAa,CAAC,SAAS;YAC1B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACjB,MAAK;QAEP,KAAK,aAAa,CAAC,eAAe;YAChC,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,CAAC,CAAA;YAC/C,MAAK;QAEP,KAAK,aAAa,CAAC,mBAAmB;YACpC,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;gBACxB,kBAAkB,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;YAChD,CAAC;YACD,MAAK;QAEP,KAAK,aAAa,CAAC,iBAAiB;YAClC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;YAC9C,CAAC;YACD,MAAK;QAEP,KAAK,aAAa,CAAC,GAAG;YACpB,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtB,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACrB,CAAC;iBAAM,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;gBAC/B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACnB,CAAC;iBAAM,CAAC;gBACN,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;YACrD,CAAC;YACD,MAAK;IACT,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
export class MetadataService {
|
|
2
|
+
static getKeyFieldExtractor(metadataType) {
|
|
3
|
+
return metadataType in METADATA_KEY_EXTRACTORS
|
|
4
|
+
? METADATA_KEY_EXTRACTORS[metadataType]
|
|
5
|
+
: undefined;
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
const getPropertyValue = (el, property) => String(el[property]);
|
|
9
|
+
const METADATA_KEY_EXTRACTORS = {
|
|
10
|
+
marketingAppExtActivities: (el) => getPropertyValue(el, 'fullName'),
|
|
11
|
+
alerts: (el) => getPropertyValue(el, 'fullName'),
|
|
12
|
+
fieldUpdates: (el) => getPropertyValue(el, 'fullName'),
|
|
13
|
+
flowActions: (el) => getPropertyValue(el, 'fullName'),
|
|
14
|
+
outboundMessages: (el) => getPropertyValue(el, 'fullName'),
|
|
15
|
+
rules: (el) => getPropertyValue(el, 'fullName'),
|
|
16
|
+
knowledgePublishes: (el) => getPropertyValue(el, 'fullName'),
|
|
17
|
+
tasks: (el) => getPropertyValue(el, 'fullName'),
|
|
18
|
+
send: (el) => getPropertyValue(el, 'fullName'),
|
|
19
|
+
sharingCriteriaRules: (el) => getPropertyValue(el, 'fullName'),
|
|
20
|
+
sharingGuestRules: (el) => getPropertyValue(el, 'fullName'),
|
|
21
|
+
sharingOwnerRules: (el) => getPropertyValue(el, 'fullName'),
|
|
22
|
+
sharingTerritoryRules: (el) => getPropertyValue(el, 'fullName'),
|
|
23
|
+
assignmentRule: (el) => getPropertyValue(el, 'fullName'),
|
|
24
|
+
autoResponseRule: (el) => getPropertyValue(el, 'fullName'),
|
|
25
|
+
escalationRule: (el) => getPropertyValue(el, 'fullName'),
|
|
26
|
+
matchingRules: (el) => getPropertyValue(el, 'fullName'),
|
|
27
|
+
valueTranslation: (el) => getPropertyValue(el, 'masterLabel'),
|
|
28
|
+
categoryGroupVisibilities: (el) => getPropertyValue(el, 'dataCategoryGroup'),
|
|
29
|
+
applicationVisibilities: (el) => getPropertyValue(el, 'application'),
|
|
30
|
+
classAccesses: (el) => getPropertyValue(el, 'apexClass'),
|
|
31
|
+
customMetadataTypeAccesses: (el) => getPropertyValue(el, 'name'),
|
|
32
|
+
customPermissions: (el) => getPropertyValue(el, 'name'),
|
|
33
|
+
customSettingAccesses: (el) => getPropertyValue(el, 'name'),
|
|
34
|
+
externalDataSourceAccesses: (el) => getPropertyValue(el, 'externalDataSource'),
|
|
35
|
+
fieldPermissions: (el) => getPropertyValue(el, 'field'),
|
|
36
|
+
flowAccesses: (el) => getPropertyValue(el, 'flow'),
|
|
37
|
+
loginFlows: (el) => getPropertyValue(el, 'friendlyname'),
|
|
38
|
+
layoutAssignments: (el) => {
|
|
39
|
+
const layout = getPropertyValue(el, 'layout');
|
|
40
|
+
const recordType = getPropertyValue(el, 'recordType');
|
|
41
|
+
return [layout, recordType].filter(x => x !== String(undefined)).join('.');
|
|
42
|
+
},
|
|
43
|
+
loginHours: (el) => Object.keys(el).join(','),
|
|
44
|
+
loginIpRanges: (el) => {
|
|
45
|
+
const startAddress = getPropertyValue(el, 'startAddress');
|
|
46
|
+
const endAddress = getPropertyValue(el, 'endAddress');
|
|
47
|
+
return `${startAddress}-${endAddress}`;
|
|
48
|
+
},
|
|
49
|
+
objectPermissions: (el) => getPropertyValue(el, 'object'),
|
|
50
|
+
pageAccesses: (el) => getPropertyValue(el, 'apexPage'),
|
|
51
|
+
profileActionOverrides: (el) => getPropertyValue(el, 'actionName'),
|
|
52
|
+
recordTypeVisibilities: (el) => getPropertyValue(el, 'recordType'),
|
|
53
|
+
tabVisibilities: (el) => getPropertyValue(el, 'tab'),
|
|
54
|
+
userPermissions: (el) => getPropertyValue(el, 'name'),
|
|
55
|
+
bots: (el) => getPropertyValue(el, 'fullName'),
|
|
56
|
+
customApplications: (el) => getPropertyValue(el, 'name'),
|
|
57
|
+
customLabels: (el) => getPropertyValue(el, 'name'),
|
|
58
|
+
customPageWebLinks: (el) => getPropertyValue(el, 'name'),
|
|
59
|
+
customTabs: (el) => getPropertyValue(el, 'name'),
|
|
60
|
+
flowDefinitions: (el) => getPropertyValue(el, 'fullName'),
|
|
61
|
+
pipelineInspMetricConfigs: (el) => getPropertyValue(el, 'name'),
|
|
62
|
+
prompts: (el) => getPropertyValue(el, 'name'),
|
|
63
|
+
quickActions: (el) => getPropertyValue(el, 'name'),
|
|
64
|
+
reportTypes: (el) => getPropertyValue(el, 'name'),
|
|
65
|
+
scontrols: (el) => getPropertyValue(el, 'name'),
|
|
66
|
+
standardValue: (el) => getPropertyValue(el, 'fullName'),
|
|
67
|
+
customValue: (el) => getPropertyValue(el, 'fullName'),
|
|
68
|
+
labels: (el) => getPropertyValue(el, 'fullName'),
|
|
69
|
+
};
|
|
70
|
+
//# sourceMappingURL=MetadataService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MetadataService.js","sourceRoot":"","sources":["../../src/service/MetadataService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { JsonArray, JsonObject } from '../types/jsonTypes.js';
|
|
2
|
+
export declare class NamespaceHandler {
|
|
3
|
+
processNamespaces(ancestor: JsonObject | JsonArray, ours: JsonObject | JsonArray, theirs: JsonObject | JsonArray): JsonObject;
|
|
4
|
+
addNamespacesToResult(acc: JsonArray, namespaces: JsonObject): void;
|
|
5
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
const NAMESPACE_PREFIX = '@_';
|
|
2
|
+
const NAMESPACE_ROOT = ':@';
|
|
3
|
+
export class NamespaceHandler {
|
|
4
|
+
processNamespaces(ancestor, ours, theirs) {
|
|
5
|
+
const namespaces = {};
|
|
6
|
+
// Look for namespace attributes directly at the root level
|
|
7
|
+
for (const obj of [ancestor, ours, theirs]) {
|
|
8
|
+
for (const key of Object.keys(obj)) {
|
|
9
|
+
// It's an object, check for namespace attributes and remove them
|
|
10
|
+
const childObj = obj[key];
|
|
11
|
+
for (const childKey of Object.keys(childObj)) {
|
|
12
|
+
if (childKey.startsWith(NAMESPACE_PREFIX)) {
|
|
13
|
+
namespaces[childKey] = childObj[childKey];
|
|
14
|
+
delete childObj[childKey]; // Remove namespace attribute after extraction
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
return namespaces;
|
|
20
|
+
}
|
|
21
|
+
addNamespacesToResult(acc, namespaces) {
|
|
22
|
+
if (Object.keys(namespaces).length > 0 && acc.length > 0) {
|
|
23
|
+
// Create a root object if needed
|
|
24
|
+
const rootObject = acc[0];
|
|
25
|
+
// The namespace should be at the top level in the result
|
|
26
|
+
rootObject[NAMESPACE_ROOT] = {};
|
|
27
|
+
// Add each namespace as a child of the root's :@ property
|
|
28
|
+
for (const key of Object.keys(namespaces)) {
|
|
29
|
+
;
|
|
30
|
+
rootObject[NAMESPACE_ROOT][key] = namespaces[key];
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=NamespaceHandler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NamespaceHandler.js","sourceRoot":"","sources":["../../src/service/NamespaceHandler.ts"],"names":[],"mappings":"AAEA,MAAM,gBAAgB,GAAG,IAAI,CAAA;AAC7B,MAAM,cAAc,GAAG,IAAI,CAAA;AAE3B,MAAM,OAAO,gBAAgB;IACpB,iBAAiB,CACtB,QAAgC,EAChC,IAA4B,EAC5B,MAA8B;QAE9B,MAAM,UAAU,GAAe,EAAE,CAAA;QAEjC,2DAA2D;QAC3D,KAAK,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;YAC3C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnC,iEAAiE;gBACjE,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAe,CAAA;gBACvC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC7C,IAAI,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;wBAC1C,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;wBACzC,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAA,CAAC,8CAA8C;oBAC1E,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAA;IACnB,CAAC;IAEM,qBAAqB,CAAC,GAAc,EAAE,UAAsB;QACjE,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzD,iCAAiC;YACjC,MAAM,UAAU,GAAG,GAAG,CAAC,CAAC,CAAe,CAAA;YAEvC,yDAAyD;YACzD,UAAU,CAAC,cAAc,CAAC,GAAG,EAAE,CAAA;YAE/B,0DAA0D;YAC1D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC1C,CAAC;gBAAC,UAAU,CAAC,cAAc,CAAgB,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAA;YACpE,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jsonTypes.js","sourceRoot":"","sources":["../../src/types/jsonTypes.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Enum representing different merge scenarios based on content presence:
|
|
3
|
+
* - First position: Ancestor content present (1) or absent (0)
|
|
4
|
+
* - Second position: Ours content present (1) or absent (0)
|
|
5
|
+
* - Third position: Theirs content present (1) or absent (0)
|
|
6
|
+
*/
|
|
7
|
+
export declare enum MergeScenario {
|
|
8
|
+
NONE = 0,// No content in any source
|
|
9
|
+
THEIRS_ONLY = 1,// Only theirs has content (001)
|
|
10
|
+
OURS_ONLY = 10,// Only ours has content (010)
|
|
11
|
+
OURS_AND_THEIRS = 11,// Both ours and theirs have content, no ancestor (011)
|
|
12
|
+
ANCESTOR_ONLY = 100,// Only ancestor has content (100)
|
|
13
|
+
ANCESTOR_AND_THEIRS = 101,// Ancestor and theirs have content, no ours (101)
|
|
14
|
+
ANCESTOR_AND_OURS = 110,// Ancestor and ours have content, no theirs (110)
|
|
15
|
+
ALL = 111
|
|
16
|
+
}
|
|
17
|
+
export declare const getScenario: (ancestor: any, ours: any, theirs: any) => MergeScenario;
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { isEmpty } from 'lodash-es';
|
|
2
|
+
/**
|
|
3
|
+
* Enum representing different merge scenarios based on content presence:
|
|
4
|
+
* - First position: Ancestor content present (1) or absent (0)
|
|
5
|
+
* - Second position: Ours content present (1) or absent (0)
|
|
6
|
+
* - Third position: Theirs content present (1) or absent (0)
|
|
7
|
+
*/
|
|
8
|
+
export var MergeScenario;
|
|
9
|
+
(function (MergeScenario) {
|
|
10
|
+
MergeScenario[MergeScenario["NONE"] = 0] = "NONE";
|
|
11
|
+
MergeScenario[MergeScenario["THEIRS_ONLY"] = 1] = "THEIRS_ONLY";
|
|
12
|
+
MergeScenario[MergeScenario["OURS_ONLY"] = 10] = "OURS_ONLY";
|
|
13
|
+
MergeScenario[MergeScenario["OURS_AND_THEIRS"] = 11] = "OURS_AND_THEIRS";
|
|
14
|
+
MergeScenario[MergeScenario["ANCESTOR_ONLY"] = 100] = "ANCESTOR_ONLY";
|
|
15
|
+
MergeScenario[MergeScenario["ANCESTOR_AND_THEIRS"] = 101] = "ANCESTOR_AND_THEIRS";
|
|
16
|
+
MergeScenario[MergeScenario["ANCESTOR_AND_OURS"] = 110] = "ANCESTOR_AND_OURS";
|
|
17
|
+
MergeScenario[MergeScenario["ALL"] = 111] = "ALL";
|
|
18
|
+
})(MergeScenario || (MergeScenario = {}));
|
|
19
|
+
export const getScenario = (
|
|
20
|
+
// biome-ignore lint/suspicious/noExplicitAny: <explanation>
|
|
21
|
+
ancestor,
|
|
22
|
+
// biome-ignore lint/suspicious/noExplicitAny: <explanation>
|
|
23
|
+
ours,
|
|
24
|
+
// biome-ignore lint/suspicious/noExplicitAny: <explanation>
|
|
25
|
+
theirs) => {
|
|
26
|
+
let scenario = MergeScenario.NONE;
|
|
27
|
+
if (!isEmpty(ancestor)) {
|
|
28
|
+
scenario += 100;
|
|
29
|
+
}
|
|
30
|
+
if (!isEmpty(ours)) {
|
|
31
|
+
scenario += 10;
|
|
32
|
+
}
|
|
33
|
+
if (!isEmpty(theirs)) {
|
|
34
|
+
scenario += 1;
|
|
35
|
+
}
|
|
36
|
+
return scenario;
|
|
37
|
+
};
|
|
38
|
+
//# sourceMappingURL=mergeScenario.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mergeScenario.js","sourceRoot":"","sources":["../../src/types/mergeScenario.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC;;;;;GAKG;AACH,MAAM,CAAN,IAAY,aASX;AATD,WAAY,aAAa;IACvB,iDAAQ,CAAA;IACR,+DAAe,CAAA;IACf,4DAAc,CAAA;IACd,wEAAoB,CAAA;IACpB,qEAAmB,CAAA;IACnB,iFAAyB,CAAA;IACzB,6EAAuB,CAAA;IACvB,iDAAS,CAAA;AACX,CAAC,EATW,aAAa,KAAb,aAAa,QASxB;AAED,MAAM,CAAC,MAAM,WAAW,GAAG;AACzB,4DAA4D;AAC5D,QAAa;AACb,4DAA4D;AAC5D,IAAS;AACT,4DAA4D;AAC5D,MAAW,EACI,EAAE;IACjB,IAAI,QAAQ,GAAkB,aAAa,CAAC,IAAI,CAAA;IAChD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,QAAQ,IAAI,GAAG,CAAA;IACjB,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACnB,QAAQ,IAAI,EAAE,CAAA;IAChB,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACrB,QAAQ,IAAI,CAAC,CAAA;IACf,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { JsonArray, JsonObject, JsonValue } from '../types/jsonTypes.js';
|
|
2
|
+
export declare const isObject: (ancestor: JsonValue | undefined | null, ours: JsonValue | undefined | null, theirs: JsonValue | undefined | null) => boolean;
|
|
3
|
+
export declare const ensureArray: (value: JsonValue) => JsonArray;
|
|
4
|
+
export declare const getUniqueSortedProps: (...objects: (JsonObject | JsonArray)[]) => string[];
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { castArray, isNil } from 'lodash-es';
|
|
2
|
+
export const isObject = (ancestor, ours, theirs) => typeof [ancestor, theirs, ours].find(ele => !isNil(ele)) === 'object';
|
|
3
|
+
export const ensureArray = (value) => isNil(value) ? [] : castArray(value);
|
|
4
|
+
export const getUniqueSortedProps = (...objects) => Array.from(new Set([...objects].map(Object.keys).flat())).sort();
|
|
5
|
+
//# sourceMappingURL=mergeUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mergeUtils.js","sourceRoot":"","sources":["../../src/utils/mergeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAG5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,QAAsC,EACtC,IAAkC,EAClC,MAAoC,EAC3B,EAAE,CACX,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,QAAQ,CAAA;AAEvE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAgB,EAAa,EAAE,CACzD,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,SAAS,CAAC,KAAK,CAAe,CAAA;AAErD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,GAAG,OAAmC,EAC5B,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA"}
|