sf-git-merge-driver 1.4.0-dev-159.21317248282-1 → 1.4.0

package/lib/merger/conflictMarker.js

@@ -0,0 +1,48 @@
+import { isEmpty } from 'lodash-es';
+import { ANCESTOR_CONFLICT_MARKER, LOCAL_CONFLICT_MARKER, OTHER_CONFLICT_MARKER, SEPARATOR, } from '../constant/conflictConstant.js';
+import { SALESFORCE_EOL } from '../constant/metadataConstant.js';
+import { TEXT_TAG } from '../constant/parserConstant.js';
+const buildMarker = (marker, size, tag) => {
+    return `${marker.repeat(size)} ${tag}`;
+};
+const buildSeparator = (size) => {
+    return `${SEPARATOR.repeat(size)}`;
+};
+const getEmptyValue = () => {
+    return { [TEXT_TAG]: SALESFORCE_EOL };
+};
+const getMarkerValue = (marker, withEol = false) => {
+    return { [TEXT_TAG]: `${withEol ? SALESFORCE_EOL : ''}${marker}` };
+};
+export class ConflictMarker {
+    static hasConflict = false;
+    static baseMarker;
+    static localMarker;
+    static otherMarker;
+    static separatorMarker;
+    static hasConflictMarker() {
+        return ConflictMarker.hasConflict;
+    }
+    static addConflictMarkers(acc, local, ancestor, other) {
+        ConflictMarker.hasConflict = true;
+        const [localValue, ancestorValue, otherValue] = [
+            local,
+            ancestor,
+            other,
+        ].map(value => (isEmpty(value) ? getEmptyValue() : value));
+        acc.push(getMarkerValue(ConflictMarker.localMarker, true));
+        acc.push(localValue);
+        acc.push(getMarkerValue(ConflictMarker.baseMarker));
+        acc.push(ancestorValue);
+        acc.push(getMarkerValue(ConflictMarker.separatorMarker));
+        acc.push(otherValue);
+        acc.push(getMarkerValue(ConflictMarker.otherMarker));
+    }
+    static setConflictConfig(conflictConfig) {
+        ConflictMarker.baseMarker = buildMarker(ANCESTOR_CONFLICT_MARKER, conflictConfig.conflictMarkerSize, conflictConfig.ancestorConflictTag);
+        ConflictMarker.localMarker = buildMarker(LOCAL_CONFLICT_MARKER, conflictConfig.conflictMarkerSize, conflictConfig.localConflictTag);
+        ConflictMarker.otherMarker = buildMarker(OTHER_CONFLICT_MARKER, conflictConfig.conflictMarkerSize, conflictConfig.otherConflictTag);
+        ConflictMarker.separatorMarker = buildSeparator(conflictConfig.conflictMarkerSize);
+    }
+}
+//# sourceMappingURL=conflictMarker.js.map

package/lib/merger/conflictMarker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflictMarker.js","sourceRoot":"","sources":["../../src/merger/conflictMarker.ts"],"names":[],"mappings":"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"}

package/lib/merger/textAttribute.d.ts

@@ -0,0 +1,3 @@
+import type { JsonArray, JsonObject, JsonValue } from '../types/jsonTypes.js';
+export declare const generateObj: (value: JsonValue | null, attrib: string) => JsonObject;
+export declare const mergeTextAttribute: (ancestor: JsonValue | null, local: JsonValue | null, other: JsonValue | null, attrib: string) => JsonArray;

package/lib/merger/textAttribute.js

@@ -0,0 +1,56 @@
+import { deepEqual } from 'fast-equals';
+import { isNil } from 'lodash-es';
+import { TEXT_TAG } from '../constant/parserConstant.js';
+import { getScenario, MergeScenario } from '../types/mergeScenario.js';
+import { ConflictMarker } from './conflictMarker.js';
+export const generateObj = (value, attrib) => {
+    return isNil(value) ? {} : { [attrib]: [{ [TEXT_TAG]: value }] };
+};
+export const mergeTextAttribute = (ancestor, local, other, attrib) => {
+    const objAnc = generateObj(ancestor, attrib);
+    const objlocal = generateObj(local, attrib);
+    const objother = generateObj(other, attrib);
+    const scenario = getScenario(objAnc, objlocal, objother);
+    const acc = [];
+    // Early return for identical values
+    if (deepEqual(local, other) &&
+        (scenario === MergeScenario.LOCAL_AND_OTHER ||
+            scenario === MergeScenario.ALL)) {
+        return [objlocal];
+    }
+    // Handle specific merge scenarios
+    switch (scenario) {
+        case MergeScenario.OTHER_ONLY:
+            acc.push(objother);
+            break;
+        case MergeScenario.LOCAL_ONLY:
+            acc.push(objlocal);
+            break;
+        case MergeScenario.LOCAL_AND_OTHER:
+            ConflictMarker.addConflictMarkers(acc, objlocal, {}, objother);
+            break;
+        case MergeScenario.ANCESTOR_AND_OTHER:
+            if (ancestor !== other) {
+                ConflictMarker.addConflictMarkers(acc, {}, objAnc, objother);
+            }
+            break;
+        case MergeScenario.ANCESTOR_AND_LOCAL:
+            if (ancestor !== local) {
+                ConflictMarker.addConflictMarkers(acc, objlocal, objAnc, {});
+            }
+            break;
+        case MergeScenario.ALL:
+            if (ancestor === local) {
+                acc.push(objother);
+            }
+            else if (ancestor === other) {
+                acc.push(objlocal);
+            }
+            else {
+                ConflictMarker.addConflictMarkers(acc, objlocal, objAnc, objother);
+            }
+            break;
+    }
+    return acc;
+};
+//# sourceMappingURL=textAttribute.js.map

package/lib/merger/textAttribute.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"textAttribute.js","sourceRoot":"","sources":["../../src/merger/textAttribute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AAExD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,KAAuB,EACvB,MAAc,EACF,EAAE;IACd,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;AAClE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,QAA0B,EAC1B,KAAuB,EACvB,KAAuB,EACvB,MAAc,EACH,EAAE;IACb,MAAM,MAAM,GAAe,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACxD,MAAM,QAAQ,GAAe,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAe,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAkB,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACvE,MAAM,GAAG,GAAc,EAAE,CAAA;IAEzB,oCAAoC;IACpC,IACE,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;QACvB,CAAC,QAAQ,KAAK,aAAa,CAAC,eAAe;YACzC,QAAQ,KAAK,aAAa,CAAC,GAAG,CAAC,EACjC,CAAC;QACD,OAAO,CAAC,QAAQ,CAAC,CAAA;IACnB,CAAC;IAED,kCAAkC;IAClC,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,aAAa,CAAC,UAAU;YAC3B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAClB,MAAK;QAEP,KAAK,aAAa,CAAC,UAAU;YAC3B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAClB,MAAK;QAEP,KAAK,aAAa,CAAC,eAAe;YAChC,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAA;YAC9D,MAAK;QAEP,KAAK,aAAa,CAAC,kBAAkB;YACnC,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACvB,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YAC9D,CAAC;YACD,MAAK;QAEP,KAAK,aAAa,CAAC,kBAAkB;YACnC,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACvB,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;YAC9D,CAAC;YACD,MAAK;QAEP,KAAK,aAAa,CAAC,GAAG;YACpB,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACvB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACpB,CAAC;iBAAM,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBAC9B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACpB,CAAC;iBAAM,CAAC;gBACN,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YACpE,CAAC;YACD,MAAK;IACT,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}

package/lib/service/NamespaceHandler.js

@@ -1,6 +1,7 @@
 import { __decorate } from "tslib";
-import { NAMESPACE_PREFIX, NAMESPACE_ROOT } from '../constant/parserConstant.js';
 import { log } from '../utils/LoggingDecorator.js';
+const NAMESPACE_PREFIX = '@_';
+const NAMESPACE_ROOT = ':@';
 export class NamespaceHandler {
     processNamespaces(ancestor, local, other) {
         const namespaces = {};

package/lib/service/NamespaceHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"NamespaceHandler.js","sourceRoot":"","sources":["../../src/service/NamespaceHandler.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAEhF,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAElD,MAAM,OAAO,gBAAgB;IAEpB,iBAAiB,CACtB,QAAgC,EAChC,KAA6B,EAC7B,KAA6B;QAE7B,MAAM,UAAU,GAAe,EAAE,CAAA;QAEjC,2DAA2D;QAC3D,KAAK,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,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;IAGM,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;AAvCQ;IADN,GAAG;yDAuBH;AAGM;IADN,GAAG;6DAcH"}
+{"version":3,"file":"NamespaceHandler.js","sourceRoot":"","sources":["../../src/service/NamespaceHandler.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAElD,MAAM,gBAAgB,GAAG,IAAI,CAAA;AAC7B,MAAM,cAAc,GAAG,IAAI,CAAA;AAE3B,MAAM,OAAO,gBAAgB;IAEpB,iBAAiB,CACtB,QAAgC,EAChC,KAA6B,EAC7B,KAA6B;QAE7B,MAAM,UAAU,GAAe,EAAE,CAAA;QAEjC,2DAA2D;QAC3D,KAAK,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,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;IAGM,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;AAvCQ;IADN,GAAG;yDAuBH;AAGM;IADN,GAAG;6DAcH"}

package/lib/types/conflictTypes.d.ts

@@ -1,4 +1,4 @@
-export interface MergeConfig {
+export interface conflicConfig {
     conflictMarkerSize: number;
     ancestorConflictTag: string;
     localConflictTag: string;

package/lib/types/mergeScenario.d.ts

@@ -14,3 +14,4 @@ export declare enum MergeScenario {
     ANCESTOR_AND_LOCAL = 110,// Ancestor and local have content, no other (110)
     ALL = 111
 }
+export declare const getScenario: (ancestor: any, local: any, other: any) => MergeScenario;

package/lib/types/mergeScenario.js

@@ -1,3 +1,4 @@
+import { isEmpty } from 'lodash-es';
 /**
  * Enum representing different merge scenarios based on content presence:
  * - First position: Ancestor content present (1) or absent (0)
@@ -15,4 +16,23 @@ export var MergeScenario;
     MergeScenario[MergeScenario["ANCESTOR_AND_LOCAL"] = 110] = "ANCESTOR_AND_LOCAL";
     MergeScenario[MergeScenario["ALL"] = 111] = "ALL";
 })(MergeScenario || (MergeScenario = {}));
+export const getScenario = (
+// biome-ignore lint/suspicious/noExplicitAny: can be any metadata in json format
+ancestor, 
+// biome-ignore lint/suspicious/noExplicitAny: can be any metadata in json format
+local, 
+// biome-ignore lint/suspicious/noExplicitAny: can be any metadata in json format
+other) => {
+    let scenario = MergeScenario.NONE;
+    if (!isEmpty(ancestor)) {
+        scenario += 100;
+    }
+    if (!isEmpty(local)) {
+        scenario += 10;
+    }
+    if (!isEmpty(other)) {
+        scenario += 1;
+    }
+    return scenario;
+};
 //# sourceMappingURL=mergeScenario.js.map

package/lib/types/mergeScenario.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeScenario.js","sourceRoot":"","sources":["../../src/types/mergeScenario.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAN,IAAY,aASX;AATD,WAAY,aAAa;IACvB,iDAAQ,CAAA;IACR,6DAAc,CAAA;IACd,8DAAe,CAAA;IACf,wEAAoB,CAAA;IACpB,qEAAmB,CAAA;IACnB,+EAAwB,CAAA;IACxB,+EAAwB,CAAA;IACxB,iDAAS,CAAA;AACX,CAAC,EATW,aAAa,KAAb,aAAa,QASxB"}
+{"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,6DAAc,CAAA;IACd,8DAAe,CAAA;IACf,wEAAoB,CAAA;IACpB,qEAAmB,CAAA;IACnB,+EAAwB,CAAA;IACxB,+EAAwB,CAAA;IACxB,iDAAS,CAAA;AACX,CAAC,EATW,aAAa,KAAb,aAAa,QASxB;AAED,MAAM,CAAC,MAAM,WAAW,GAAG;AACzB,iFAAiF;AACjF,QAAa;AACb,iFAAiF;AACjF,KAAU;AACV,iFAAiF;AACjF,KAAU,EACK,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,KAAK,CAAC,EAAE,CAAC;QACpB,QAAQ,IAAI,EAAE,CAAA;IAChB,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,QAAQ,IAAI,CAAC,CAAA;IACf,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}

package/lib/utils/mergeUtils.d.ts

@@ -1,2 +1,7 @@
+import type { JsonArray, JsonObject, JsonValue } from '../types/jsonTypes.js';
+export declare const isObject: (ancestor: JsonValue | undefined | null, local: JsonValue | undefined | null, other: JsonValue | undefined | null) => boolean;
+export declare const isStringArray: (ancestor: JsonValue | undefined | null, local: JsonValue | undefined | null, other: JsonValue | undefined | null) => boolean;
+export declare const ensureArray: (value: JsonValue) => JsonArray;
+export declare const getUniqueSortedProps: (...objects: (JsonObject | JsonArray)[]) => string[];
 export declare const detectEol: (text: string) => string;
 export declare const normalizeEol: (text: string, eol?: string) => string;

package/lib/utils/mergeUtils.js

@@ -1,9 +1,23 @@
+import { castArray, isNil } from 'lodash-es';
 import { EOL } from 'os';
 const CR = '\r';
 const LF = '\n';
 const CRLF = `${CR}${LF}`;
 const RE_CRLF = /\r\n/g;
 const RE_LF_OR_CRLF = /\r\n|\n/g;
+export const isObject = (ancestor, local, other) => 
+// typeof [ancestor, other, local].find(ele => !isNil(ele)) === 'object'
+[ancestor, local, other].some(ele => !isNil(ele) && typeof ele === 'object');
+export const isStringArray = (ancestor, local, other) => 
+// typeof [ancestor, other, local].find(ele => !isNil(ele)) === 'object'
+[ancestor, local, other].some(ele => !isNil(ele) &&
+    Array.isArray(ele) &&
+    ele.every(item => typeof item === 'string' || item instanceof String));
+export const ensureArray = (value) => isNil(value) ? [] : castArray(value);
+export const getUniqueSortedProps = (...objects) => Array.from(new Set([...objects]
+    .filter(jsonElement => ![undefined, null].includes(jsonElement))
+    .map(Object.keys)
+    .flat())).sort();
 export const detectEol = (text) => {
     if (!text) {
         return EOL;

package/lib/utils/mergeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeUtils.js","sourceRoot":"","sources":["../../src/utils/mergeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,IAAI,CAAA;AAExB,MAAM,EAAE,GAAG,IAAI,CAAA;AACf,MAAM,EAAE,GAAG,IAAI,CAAA;AACf,MAAM,IAAI,GAAG,GAAG,EAAE,GAAG,EAAE,EAAE,CAAA;AACzB,MAAM,OAAO,GAAG,OAAO,CAAA;AACvB,MAAM,aAAa,GAAG,UAAU,CAAA;AAEhC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAY,EAAU,EAAE;IAChD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,IAAI,KAAK,GAAG,KAAK,CAAA;IAEjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBAChC,OAAO,GAAG,IAAI,CAAA;YAChB,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,IAAI,CAAA;YACd,CAAC;YAED,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC;gBACrB,OAAO,GAAG,CAAA;YACZ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,MAAc,GAAG,EAAU,EAAE;IACtE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,KAAK,GAAG,OAAO,CAAA;IACnB,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,KAAK,GAAG,aAAa,CAAA;IACvB,CAAC;IAED,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACjC,CAAC,CAAA"}
+{"version":3,"file":"mergeUtils.js","sourceRoot":"","sources":["../../src/utils/mergeUtils.ts"],"names":[],"mappings":"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"}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "sf-git-merge-driver",
-  "version": "1.4.0-dev-159.21317248282-1",
+  "version": "1.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "sf-git-merge-driver",
-      "version": "1.4.0-dev-159.21317248282-1",
+      "version": "1.4.0",
       "license": "MIT",
       "dependencies": {
         "@oclif/core": "^4.8.0",

package/oclif.manifest.json

@@ -170,7 +170,7 @@
           "char": "S",
           "name": "ancestor-conflict-tag",
           "summary": "string used to tag ancestor version in conflicts",
-          "default": "base",
+          "default": "BASE",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -179,7 +179,7 @@
           "char": "X",
           "name": "local-conflict-tag",
           "summary": "string used to tag local version in conflicts",
-          "default": "ours",
+          "default": "LOCAL",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -188,7 +188,7 @@
           "char": "Y",
           "name": "other-conflict-tag",
           "summary": "string used to tag other version in conflicts",
-          "default": "theirs",
+          "default": "REMOTE",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -338,5 +338,5 @@
       ]
     }
   },
-  "version": "1.4.0-dev-159.21317248282-1"
+  "version": "1.4.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-git-merge-driver",
-  "description": "Git merge driver for Salesforce metadata XML files - automatically resolves merge conflicts in profiles, permission sets, and 50+ metadata types",
-  "version": "1.4.0-dev-159.21317248282-1",
+  "description": "git remote add origin git@github.com:scolladon/sf-git-merge-driver.git",
+  "version": "1.4.0",
   "exports": "./lib/driver/MergeDriver.js",
   "type": "module",
   "author": "Sébastien Colladon (colladonsebastien@gmail.com)",

package/lib/merger/ConflictMarkerBuilder.d.ts

@@ -1,3 +0,0 @@
-import type { MergeConfig } from '../types/conflictTypes.js';
-import type { JsonArray, JsonObject } from '../types/jsonTypes.js';
-export declare const buildConflictMarkers: (config: MergeConfig, local: JsonObject | JsonArray, ancestor: JsonObject | JsonArray, other: JsonObject | JsonArray) => JsonArray;

package/lib/merger/ConflictMarkerBuilder.js

@@ -1,33 +0,0 @@
-import { isEmpty } from 'lodash-es';
-import { ANCESTOR_CONFLICT_MARKER, LOCAL_CONFLICT_MARKER, OTHER_CONFLICT_MARKER, SEPARATOR, } from '../constant/conflictConstant.js';
-import { SALESFORCE_EOL } from '../constant/metadataConstant.js';
-import { TEXT_TAG } from '../constant/parserConstant.js';
-const buildMarker = (marker, size, tag) => {
-    return `${marker.repeat(size)} ${tag}`;
-};
-const buildSeparator = (size) => {
-    return `${SEPARATOR.repeat(size)}`;
-};
-const getEmptyValue = () => {
-    return { [TEXT_TAG]: SALESFORCE_EOL };
-};
-const getMarkerValue = (marker, withEol = false) => {
-    return { [TEXT_TAG]: `${withEol ? SALESFORCE_EOL : ''}${marker}` };
-};
-export const buildConflictMarkers = (config, local, ancestor, other) => {
-    const localMarker = buildMarker(LOCAL_CONFLICT_MARKER, config.conflictMarkerSize, config.localConflictTag);
-    const baseMarker = buildMarker(ANCESTOR_CONFLICT_MARKER, config.conflictMarkerSize, config.ancestorConflictTag);
-    const otherMarker = buildMarker(OTHER_CONFLICT_MARKER, config.conflictMarkerSize, config.otherConflictTag);
-    const separatorMarker = buildSeparator(config.conflictMarkerSize);
-    const [localValue, ancestorValue, otherValue] = [local, ancestor, other].map(value => (isEmpty(value) ? getEmptyValue() : value));
-    return [
-        getMarkerValue(localMarker, true),
-        localValue,
-        getMarkerValue(baseMarker),
-        ancestorValue,
-        getMarkerValue(separatorMarker),
-        otherValue,
-        getMarkerValue(otherMarker),
-    ];
-};
-//# sourceMappingURL=ConflictMarkerBuilder.js.map

package/lib/merger/ConflictMarkerBuilder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ConflictMarkerBuilder.js","sourceRoot":"","sources":["../../src/merger/ConflictMarkerBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EACL,wBAAwB,EACxB,qBAAqB,EACrB,qBAAqB,EACrB,SAAS,GACV,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AAIxD,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,IAAY,EAAE,GAAW,EAAU,EAAE;IACxE,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;AACxC,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,IAAY,EAAU,EAAE;IAC9C,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAA;AACpC,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,GAAe,EAAE;IACrC,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAA;AACvC,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CACrB,MAAc,EACd,UAAmB,KAAK,EACZ,EAAE;IACd,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,EAAE,CAAA;AACpE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,MAAmB,EACnB,KAA6B,EAC7B,QAAgC,EAChC,KAA6B,EAClB,EAAE;IACb,MAAM,WAAW,GAAG,WAAW,CAC7B,qBAAqB,EACrB,MAAM,CAAC,kBAAkB,EACzB,MAAM,CAAC,gBAAgB,CACxB,CAAA;IACD,MAAM,UAAU,GAAG,WAAW,CAC5B,wBAAwB,EACxB,MAAM,CAAC,kBAAkB,EACzB,MAAM,CAAC,mBAAmB,CAC3B,CAAA;IACD,MAAM,WAAW,GAAG,WAAW,CAC7B,qBAAqB,EACrB,MAAM,CAAC,kBAAkB,EACzB,MAAM,CAAC,gBAAgB,CACxB,CAAA;IACD,MAAM,eAAe,GAAG,cAAc,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;IAEjE,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,GAAG,CAC1E,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CACpD,CAAA;IAED,OAAO;QACL,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC;QACjC,UAAU;QACV,cAAc,CAAC,UAAU,CAAC;QAC1B,aAAa;QACb,cAAc,CAAC,eAAe,CAAC;QAC/B,UAAU;QACV,cAAc,CAAC,WAAW,CAAC;KAC5B,CAAA;AACH,CAAC,CAAA"}

package/lib/merger/ConflictMarkerFormatter.d.ts

@@ -1,14 +0,0 @@
-import type { MergeConfig } from '../types/conflictTypes.js';
-export declare class ConflictMarkerFormatter {
-    private readonly localMarker;
-    private readonly ancestorMarker;
-    private readonly separator;
-    private readonly otherMarker;
-    private readonly localEntity;
-    private readonly otherEntity;
-    private readonly indentRegex;
-    constructor(config: MergeConfig);
-    correctConflictIndent(xml: string): string;
-    handleSpecialEntities(xml: string): string;
-    private escapeRegex;
-}

package/lib/merger/ConflictMarkerFormatter.js

@@ -1,43 +0,0 @@
-import { ANCESTOR_CONFLICT_MARKER, LOCAL_CONFLICT_MARKER, OTHER_CONFLICT_MARKER, SEPARATOR, } from '../constant/conflictConstant.js';
-export class ConflictMarkerFormatter {
-    localMarker;
-    ancestorMarker;
-    separator;
-    otherMarker;
-    localEntity;
-    otherEntity;
-    indentRegex;
-    constructor(config) {
-        const size = config.conflictMarkerSize;
-        // Build marker strings from config size
-        this.localMarker = LOCAL_CONFLICT_MARKER.repeat(size);
-        this.ancestorMarker = ANCESTOR_CONFLICT_MARKER.repeat(size);
-        this.separator = SEPARATOR.repeat(size);
-        this.otherMarker = OTHER_CONFLICT_MARKER.repeat(size);
-        // Build entity-escaped versions for XML processing
-        this.localEntity = '<'.repeat(size);
-        this.otherEntity = '>'.repeat(size);
-        // Build regex pattern for indent correction
-        // Matches any of the conflict markers at start of content
-        const escapedMarkers = [
-            this.escapeRegex(this.localMarker),
-            this.escapeRegex(this.ancestorMarker),
-            this.escapeRegex(this.separator),
-            this.escapeRegex(this.otherMarker),
-        ].join('|');
-        this.indentRegex = new RegExp(`[ \\t]+(${escapedMarkers})`, 'g');
-    }
-    correctConflictIndent(xml) {
-        return xml.replace(this.indentRegex, '$1').replace(/^[ \t]*[\n\r]+/gm, '');
-    }
-    handleSpecialEntities(xml) {
-        return xml
-            .replaceAll(' ', ' ')
-            .replaceAll(this.localEntity, this.localMarker)
-            .replaceAll(this.otherEntity, this.otherMarker);
-    }
-    escapeRegex(str) {
-        return str.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&');
-    }
-}
-//# sourceMappingURL=ConflictMarkerFormatter.js.map

package/lib/merger/ConflictMarkerFormatter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ConflictMarkerFormatter.js","sourceRoot":"","sources":["../../src/merger/ConflictMarkerFormatter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,qBAAqB,EACrB,qBAAqB,EACrB,SAAS,GACV,MAAM,iCAAiC,CAAA;AAGxC,MAAM,OAAO,uBAAuB;IACjB,WAAW,CAAQ;IACnB,cAAc,CAAQ;IACtB,SAAS,CAAQ;IACjB,WAAW,CAAQ;IACnB,WAAW,CAAQ;IACnB,WAAW,CAAQ;IACnB,WAAW,CAAQ;IAEpC,YAAY,MAAmB;QAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,kBAAkB,CAAA;QAEtC,wCAAwC;QACxC,IAAI,CAAC,WAAW,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACrD,IAAI,CAAC,cAAc,GAAG,wBAAwB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC3D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,CAAC,WAAW,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAErD,mDAAmD;QACnD,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAEtC,4CAA4C;QAC5C,0DAA0D;QAC1D,MAAM,cAAc,GAAG;YACrB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC;YAClC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC;YAChC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC;SACnC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACX,IAAI,CAAC,WAAW,GAAG,IAAI,MAAM,CAAC,WAAW,cAAc,GAAG,EAAE,GAAG,CAAC,CAAA;IAClE,CAAC;IAED,qBAAqB,CAAC,GAAW;QAC/B,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;IAC5E,CAAC;IAED,qBAAqB,CAAC,GAAW;QAC/B,OAAO,GAAG;aACP,UAAU,CAAC,YAAY,EAAE,QAAQ,CAAC;aAClC,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC;aAC9C,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;IACnD,CAAC;IAEO,WAAW,CAAC,GAAW;QAC7B,OAAO,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAA;IACnD,CAAC;CACF"}

package/lib/merger/MergeContext.d.ts

@@ -1,17 +0,0 @@
-import type { MergeConfig } from '../types/conflictTypes.js';
-import type { JsonValue } from '../types/jsonTypes.js';
-import type { MergeNodeFactory } from './nodes/MergeNodeFactory.js';
-export interface RootKeyInfo {
-    readonly name: string;
-    readonly existsInLocal: boolean;
-    readonly existsInOther: boolean;
-}
-export interface MergeContext {
-    readonly config: MergeConfig;
-    readonly ancestor: JsonValue;
-    readonly local: JsonValue;
-    readonly other: JsonValue;
-    readonly attribute: string | undefined;
-    readonly nodeFactory: MergeNodeFactory;
-    readonly rootKey: RootKeyInfo | undefined;
-}

package/lib/merger/MergeContext.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=MergeContext.js.map

package/lib/merger/MergeContext.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MergeContext.js","sourceRoot":"","sources":["../../src/merger/MergeContext.ts"],"names":[],"mappings":""}

package/lib/merger/MergeOrchestrator.d.ts

@@ -1,13 +0,0 @@
-import type { MergeConfig } from '../types/conflictTypes.js';
-import type { JsonArray, JsonObject, JsonValue } from '../types/jsonTypes.js';
-import type { MergeResult } from '../types/mergeResult.js';
-import type { RootKeyInfo } from './MergeContext.js';
-import { type MergeNodeFactory } from './nodes/MergeNodeFactory.js';
-export declare class MergeOrchestrator {
-    private readonly config;
-    private readonly nodeFactory;
-    constructor(config: MergeConfig, nodeFactory?: MergeNodeFactory);
-    merge(ancestor: JsonValue, local: JsonValue, other: JsonValue, attribute?: string, rootKey?: RootKeyInfo): MergeResult;
-    private buildEarlyResult;
-    mergeObject(ancestor: JsonObject | JsonArray, local: JsonObject | JsonArray, other: JsonObject | JsonArray): MergeResult;
-}

package/lib/merger/MergeOrchestrator.js

@@ -1,46 +0,0 @@
-import { deepEqual } from 'fast-equals';
-import { noConflict } from '../types/mergeResult.js';
-import { MergeScenario } from '../types/mergeScenario.js';
-import { getScenario } from './MergeScenarioFactory.js';
-import { defaultNodeFactory, } from './nodes/MergeNodeFactory.js';
-import { toJsonArray } from './nodes/nodeUtils.js';
-import { getScenarioStrategy } from './strategies/ScenarioStrategyFactory.js';
-export class MergeOrchestrator {
-    config;
-    nodeFactory;
-    constructor(config, nodeFactory = defaultNodeFactory) {
-        this.config = config;
-        this.nodeFactory = nodeFactory;
-    }
-    merge(ancestor, local, other, attribute, rootKey) {
-        const scenario = getScenario(ancestor, local, other);
-        // Early termination: if all three are equal, skip merge
-        if (scenario === MergeScenario.ALL) {
-            if (deepEqual(ancestor, local) && deepEqual(local, other)) {
-                return this.buildEarlyResult(local, rootKey);
-            }
-        }
-        const strategy = getScenarioStrategy(scenario);
-        const context = {
-            config: this.config,
-            ancestor,
-            local,
-            other,
-            attribute,
-            nodeFactory: this.nodeFactory,
-            rootKey,
-        };
-        return strategy.execute(context);
-    }
-    buildEarlyResult(value, rootKey) {
-        const content = toJsonArray(value);
-        if (rootKey) {
-            return noConflict([{ [rootKey.name]: content }]);
-        }
-        return noConflict(content);
-    }
-    mergeObject(ancestor, local, other) {
-        return this.merge(ancestor, local, other);
-    }
-}
-//# sourceMappingURL=MergeOrchestrator.js.map

package/lib/merger/MergeOrchestrator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MergeOrchestrator.js","sourceRoot":"","sources":["../../src/merger/MergeOrchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAIvC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAEzD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,EACL,kBAAkB,GAEnB,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AAE7E,MAAM,OAAO,iBAAiB;IAET;IACA;IAFnB,YACmB,MAAmB,EACnB,cAAgC,kBAAkB;QADlD,WAAM,GAAN,MAAM,CAAa;QACnB,gBAAW,GAAX,WAAW,CAAuC;IAClE,CAAC;IAEJ,KAAK,CACH,QAAmB,EACnB,KAAgB,EAChB,KAAgB,EAChB,SAAkB,EAClB,OAAqB;QAErB,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QAEpD,wDAAwD;QACxD,IAAI,QAAQ,KAAK,aAAa,CAAC,GAAG,EAAE,CAAC;YACnC,IAAI,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;gBAC1D,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;YAC9C,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAA;QAE9C,MAAM,OAAO,GAAiB;YAC5B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ;YACR,KAAK;YACL,KAAK;YACL,SAAS;YACT,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO;SACR,CAAA;QAED,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAClC,CAAC;IAEO,gBAAgB,CACtB,KAAgB,EAChB,OAAqB;QAErB,MAAM,OAAO,GAAG,WAAW,CAAC,KAA+B,CAAC,CAAA;QAC5D,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,UAAU,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAClD,CAAC;QACD,OAAO,UAAU,CAAC,OAAO,CAAC,CAAA;IAC5B,CAAC;IAED,WAAW,CACT,QAAgC,EAChC,KAA6B,EAC7B,KAA6B;QAE7B,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;IAC3C,CAAC;CACF"}

package/lib/merger/MergeScenarioFactory.d.ts

@@ -1,2 +0,0 @@
-import { MergeScenario } from '../types/mergeScenario.js';
-export declare const getScenario: (ancestor: any, local: any, other: any) => MergeScenario;

package/lib/merger/MergeScenarioFactory.js

@@ -1,22 +0,0 @@
-import { isEmpty } from 'lodash-es';
-import { MergeScenario } from '../types/mergeScenario.js';
-export const getScenario = (
-// biome-ignore lint/suspicious/noExplicitAny: can be any metadata in json format
-ancestor, 
-// biome-ignore lint/suspicious/noExplicitAny: can be any metadata in json format
-local, 
-// biome-ignore lint/suspicious/noExplicitAny: can be any metadata in json format
-other) => {
-    let scenario = MergeScenario.NONE;
-    if (!isEmpty(ancestor)) {
-        scenario += 100;
-    }
-    if (!isEmpty(local)) {
-        scenario += 10;
-    }
-    if (!isEmpty(other)) {
-        scenario += 1;
-    }
-    return scenario;
-};
-//# sourceMappingURL=MergeScenarioFactory.js.map

package/lib/merger/MergeScenarioFactory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MergeScenarioFactory.js","sourceRoot":"","sources":["../../src/merger/MergeScenarioFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAEzD,MAAM,CAAC,MAAM,WAAW,GAAG;AACzB,iFAAiF;AACjF,QAAa;AACb,iFAAiF;AACjF,KAAU;AACV,iFAAiF;AACjF,KAAU,EACK,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,KAAK,CAAC,EAAE,CAAC;QACpB,QAAQ,IAAI,EAAE,CAAA;IAChB,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,QAAQ,IAAI,CAAC,CAAA;IACf,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}

package/lib/merger/nodes/KeyedArrayMergeNode.d.ts

@@ -1,12 +0,0 @@
-import type { MergeConfig } from '../../types/conflictTypes.js';
-import type { JsonArray } from '../../types/jsonTypes.js';
-import type { MergeResult } from '../../types/mergeResult.js';
-import type { MergeNode } from './MergeNode.js';
-export declare class KeyedArrayMergeNode implements MergeNode {
-    private readonly ancestor;
-    private readonly local;
-    private readonly other;
-    private readonly attribute;
-    constructor(ancestor: JsonArray, local: JsonArray, other: JsonArray, attribute: string);
-    merge(config: MergeConfig): MergeResult;
-}

package/lib/merger/nodes/KeyedArrayMergeNode.js

@@ -1,67 +0,0 @@
-import { MetadataService } from '../../service/MetadataService.js';
-import { combineResults, withConflict } from '../../types/mergeResult.js';
-import { buildConflictMarkers } from '../ConflictMarkerBuilder.js';
-import { MergeOrchestrator } from '../MergeOrchestrator.js';
-import { defaultNodeFactory } from './MergeNodeFactory.js';
-import { toJsonArray } from './nodeUtils.js';
-// Build a Map from array using key extractor, collecting keys into provided Set
-const buildKeyedMap = (arr, keyField, keysSet) => {
-    const map = new Map();
-    for (const item of arr) {
-        const key = keyField(item);
-        map.set(key, item);
-        keysSet.add(key);
-    }
-    return map;
-};
-export class KeyedArrayMergeNode {
-    ancestor;
-    local;
-    other;
-    attribute;
-    constructor(ancestor, local, other, attribute) {
-        this.ancestor = ancestor;
-        this.local = local;
-        this.other = other;
-        this.attribute = attribute;
-    }
-    merge(config) {
-        const keyField = MetadataService.getKeyFieldExtractor(this.attribute);
-        if (!keyField) {
-            const localContent = toJsonArray({ [this.attribute]: this.local });
-            const ancestorContent = toJsonArray({ [this.attribute]: this.ancestor });
-            const otherContent = toJsonArray({ [this.attribute]: this.other });
-            const localObj = (localContent.length === 1 ? localContent[0] : localContent);
-            const ancestorObj = (ancestorContent.length === 1 ? ancestorContent[0] : ancestorContent);
-            const otherObj = (otherContent.length === 1 ? otherContent[0] : otherContent);
-            return withConflict(buildConflictMarkers(config, localObj, ancestorObj, otherObj));
-        }
-        // Build maps and collect unique keys in a single pass per array
-        const allKeys = new Set();
-        const keyedAncestor = buildKeyedMap(this.ancestor, keyField, allKeys);
-        const keyedLocal = buildKeyedMap(this.local, keyField, allKeys);
-        const keyedOther = buildKeyedMap(this.other, keyField, allKeys);
-        // Sort keys once
-        const sortedKeys = Array.from(allKeys).sort();
-        const results = [];
-        const orchestrator = new MergeOrchestrator(config, defaultNodeFactory);
-        for (const key of sortedKeys) {
-            const ancestorOfKey = keyedAncestor.get(key);
-            const localOfKey = keyedLocal.get(key);
-            const otherOfKey = keyedOther.get(key);
-            const result = orchestrator.merge(ancestorOfKey ?? {}, localOfKey ?? {}, otherOfKey ?? {}, this.attribute);
-            // istanbul ignore else -- defensive: all current conflict strategies return non-empty output
-            if (result.output.length > 0) {
-                results.push({
-                    output: [{ [this.attribute]: result.output }],
-                    hasConflict: result.hasConflict,
-                });
-            }
-            else if (result.hasConflict) {
-                results.push(result);
-            }
-        }
-        return combineResults(results);
-    }
-}
-//# sourceMappingURL=KeyedArrayMergeNode.js.map

package/lib/merger/nodes/KeyedArrayMergeNode.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"KeyedArrayMergeNode.js","sourceRoot":"","sources":["../../../src/merger/nodes/KeyedArrayMergeNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAIlE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAE3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAI5C,gFAAgF;AAChF,MAAM,aAAa,GAAG,CACpB,GAAc,EACd,QAAsB,EACtB,OAAoB,EACK,EAAE;IAC3B,MAAM,GAAG,GAAG,IAAI,GAAG,EAAsB,CAAA;IACzC,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAkB,CAAC,CAAA;QACxC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAkB,CAAC,CAAA;QAChC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,OAAO,mBAAmB;IAEX;IACA;IACA;IACA;IAJnB,YACmB,QAAmB,EACnB,KAAgB,EAChB,KAAgB,EAChB,SAAiB;QAHjB,aAAQ,GAAR,QAAQ,CAAW;QACnB,UAAK,GAAL,KAAK,CAAW;QAChB,UAAK,GAAL,KAAK,CAAW;QAChB,cAAS,GAAT,SAAS,CAAQ;IACjC,CAAC;IAEJ,KAAK,CAAC,MAAmB;QACvB,MAAM,QAAQ,GAAG,eAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAErE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,YAAY,GAAG,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;YAClE,MAAM,eAAe,GAAG,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;YACxE,MAAM,YAAY,GAAG,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;YAElE,MAAM,QAAQ,GAAG,CACf,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CACjC,CAAA;YAC3B,MAAM,WAAW,GAAG,CAClB,eAAe,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAC1C,CAAA;YAC3B,MAAM,QAAQ,GAAG,CACf,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CACjC,CAAA;YAE3B,OAAO,YAAY,CACjB,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,CAAC,CAC9D,CAAA;QACH,CAAC;QAED,gEAAgE;QAChE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;QACjC,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;QACrE,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;QAC/D,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;QAE/D,iBAAiB;QACjB,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAE7C,MAAM,OAAO,GAAkB,EAAE,CAAA;QACjC,MAAM,YAAY,GAAG,IAAI,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;QAEtE,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;YAC7B,MAAM,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAC5C,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACtC,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAEtC,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAC/B,aAAa,IAAI,EAAE,EACnB,UAAU,IAAI,EAAE,EAChB,UAAU,IAAI,EAAE,EAChB,IAAI,CAAC,SAAS,CACf,CAAA;YAED,6FAA6F;YAC7F,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,OAAO,CAAC,IAAI,CAAC;oBACX,MAAM,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;oBAC7C,WAAW,EAAE,MAAM,CAAC,WAAW;iBAChC,CAAC,CAAA;YACJ,CAAC;iBAAM,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBAC9B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACtB,CAAC;QACH,CAAC;QAED,OAAO,cAAc,CAAC,OAAO,CAAC,CAAA;IAChC,CAAC;CACF"}