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

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

@@ -1,5 +0,0 @@
-import type { MergeConfig } from '../../types/conflictTypes.js';
-import type { MergeResult } from '../../types/mergeResult.js';
-export interface MergeNode {
-    merge(config: MergeConfig): MergeResult;
-}

package/lib/merger/nodes/MergeNode.js

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

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

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

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

@@ -1,9 +0,0 @@
-import type { JsonValue } from '../../types/jsonTypes.js';
-import type { MergeNode } from './MergeNode.js';
-export interface MergeNodeFactory {
-    createNode(ancestor: JsonValue, local: JsonValue, other: JsonValue, attribute: string): MergeNode;
-}
-export declare class DefaultMergeNodeFactory implements MergeNodeFactory {
-    createNode(ancestor: JsonValue, local: JsonValue, other: JsonValue, attribute: string): MergeNode;
-}
-export declare const defaultNodeFactory: DefaultMergeNodeFactory;

package/lib/merger/nodes/MergeNodeFactory.js

@@ -1,21 +0,0 @@
-import { every, isArray, isString, isObject as lodashIsObject, some, } from 'lodash-es';
-import { KeyedArrayMergeNode } from './KeyedArrayMergeNode.js';
-import { ensureArray } from './nodeUtils.js';
-import { TextArrayMergeNode } from './TextArrayMergeNode.js';
-import { TextMergeNode } from './TextMergeNode.js';
-const hasObject = (...values) => some(values, lodashIsObject);
-const hasStringArray = (...values) => some(values, value => isArray(value) && every(value, isString));
-export class DefaultMergeNodeFactory {
-    createNode(ancestor, local, other, attribute) {
-        const [ancestorArr, localArr, otherArr] = [ancestor, local, other].map(ensureArray);
-        if (hasStringArray(ancestor, local, other)) {
-            return new TextArrayMergeNode(ancestorArr, localArr, otherArr, attribute);
-        }
-        if (hasObject(ancestor, local, other)) {
-            return new KeyedArrayMergeNode(ancestorArr, localArr, otherArr, attribute);
-        }
-        return new TextMergeNode(ancestor, local, other, attribute);
-    }
-}
-export const defaultNodeFactory = new DefaultMergeNodeFactory();
-//# sourceMappingURL=MergeNodeFactory.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"MergeNodeFactory.js","sourceRoot":"","sources":["../../../src/merger/nodes/MergeNodeFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,OAAO,EACP,QAAQ,EACR,QAAQ,IAAI,cAAc,EAC1B,IAAI,GACL,MAAM,WAAW,CAAA;AAElB,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,MAAM,SAAS,GAAG,CAAC,GAAG,MAAwC,EAAW,EAAE,CACzE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;AAE9B,MAAM,cAAc,GAAG,CAAC,GAAG,MAAwC,EAAW,EAAE,CAC9E,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;AAWjE,MAAM,OAAO,uBAAuB;IAClC,UAAU,CACR,QAAmB,EACnB,KAAgB,EAChB,KAAgB,EAChB,SAAiB;QAEjB,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,CACpE,WAAW,CACZ,CAAA;QAED,IAAI,cAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,IAAI,kBAAkB,CAC3B,WAAwB,EACxB,QAAqB,EACrB,QAAqB,EACrB,SAAS,CACV,CAAA;QACH,CAAC;QAED,IAAI,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;YACtC,OAAO,IAAI,mBAAmB,CAC5B,WAAwB,EACxB,QAAqB,EACrB,QAAqB,EACrB,SAAS,CACV,CAAA;QACH,CAAC;QAED,OAAO,IAAI,aAAa,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;IAC7D,CAAC;CACF;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,uBAAuB,EAAE,CAAA"}

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

@@ -1,20 +0,0 @@
-import type { MergeConfig } from '../../types/conflictTypes.js';
-import type { JsonArray, JsonObject } from '../../types/jsonTypes.js';
-import type { MergeResult } from '../../types/mergeResult.js';
-import type { MergeContext } from '../MergeContext.js';
-import type { MergeNode } from './MergeNode.js';
-export declare class ObjectMergeNode implements MergeNode {
-    private readonly ancestor;
-    private readonly local;
-    private readonly other;
-    constructor(ancestor: JsonObject | JsonArray, local: JsonObject | JsonArray, other: JsonObject | JsonArray);
-    merge(config: MergeConfig): MergeResult;
-}
-export declare class NestedObjectMergeNode implements MergeNode {
-    private readonly ancestor;
-    private readonly local;
-    private readonly other;
-    constructor(ancestor: JsonObject | JsonArray, local: JsonObject | JsonArray, other: JsonObject | JsonArray);
-    merge(config: MergeConfig): MergeResult;
-    mergeWithContext(context: MergeContext): MergeResult;
-}

package/lib/merger/nodes/ObjectMergeNode.js

@@ -1,49 +0,0 @@
-import { combineResults } from '../../types/mergeResult.js';
-import { MergeOrchestrator } from '../MergeOrchestrator.js';
-import { defaultNodeFactory } from './MergeNodeFactory.js';
-import { getUniqueSortedProps } from './nodeUtils.js';
-export class ObjectMergeNode {
-    ancestor;
-    local;
-    other;
-    constructor(ancestor, local, other) {
-        this.ancestor = ancestor;
-        this.local = local;
-        this.other = other;
-    }
-    merge(config) {
-        const props = getUniqueSortedProps(this.ancestor, this.local, this.other);
-        const results = [];
-        for (const key of props) {
-            const ancestorOfKey = this.ancestor[key];
-            const localOfKey = this.local[key];
-            const otherOfKey = this.other[key];
-            const childNode = defaultNodeFactory.createNode(ancestorOfKey, localOfKey, otherOfKey, key);
-            const childResult = childNode.merge(config);
-            results.push({
-                output: childResult.output.map(item => ({ [key]: item })),
-                hasConflict: childResult.hasConflict,
-            });
-        }
-        return combineResults(results);
-    }
-}
-export class NestedObjectMergeNode {
-    ancestor;
-    local;
-    other;
-    constructor(ancestor, local, other) {
-        this.ancestor = ancestor;
-        this.local = local;
-        this.other = other;
-    }
-    merge(config) {
-        const orchestrator = new MergeOrchestrator(config, defaultNodeFactory);
-        return orchestrator.mergeObject(this.ancestor, this.local, this.other);
-    }
-    mergeWithContext(context) {
-        const orchestrator = new MergeOrchestrator(context.config, context.nodeFactory);
-        return orchestrator.mergeObject(this.ancestor, this.local, this.other);
-    }
-}
-//# sourceMappingURL=ObjectMergeNode.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"ObjectMergeNode.js","sourceRoot":"","sources":["../../../src/merger/nodes/ObjectMergeNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAE3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,OAAO,eAAe;IAEP;IACA;IACA;IAHnB,YACmB,QAAgC,EAChC,KAA6B,EAC7B,KAA6B;QAF7B,aAAQ,GAAR,QAAQ,CAAwB;QAChC,UAAK,GAAL,KAAK,CAAwB;QAC7B,UAAK,GAAL,KAAK,CAAwB;IAC7C,CAAC;IAEJ,KAAK,CAAC,MAAmB;QACvB,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QACzE,MAAM,OAAO,GAAkB,EAAE,CAAA;QAEjC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;YACxC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAElC,MAAM,SAAS,GAAG,kBAAkB,CAAC,UAAU,CAC7C,aAAa,EACb,UAAU,EACV,UAAU,EACV,GAAG,CACJ,CAAA;YACD,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YAE3C,OAAO,CAAC,IAAI,CAAC;gBACX,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;gBACzD,WAAW,EAAE,WAAW,CAAC,WAAW;aACrC,CAAC,CAAA;QACJ,CAAC;QAED,OAAO,cAAc,CAAC,OAAO,CAAC,CAAA;IAChC,CAAC;CACF;AAED,MAAM,OAAO,qBAAqB;IAEb;IACA;IACA;IAHnB,YACmB,QAAgC,EAChC,KAA6B,EAC7B,KAA6B;QAF7B,aAAQ,GAAR,QAAQ,CAAwB;QAChC,UAAK,GAAL,KAAK,CAAwB;QAC7B,UAAK,GAAL,KAAK,CAAwB;IAC7C,CAAC;IAEJ,KAAK,CAAC,MAAmB;QACvB,MAAM,YAAY,GAAG,IAAI,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;QACtE,OAAO,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;IACxE,CAAC;IAED,gBAAgB,CAAC,OAAqB;QACpC,MAAM,YAAY,GAAG,IAAI,iBAAiB,CACxC,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,WAAW,CACpB,CAAA;QACD,OAAO,YAAY,CAAC,WAAW,CAC7B,IAAI,CAAC,QAAkC,EACvC,IAAI,CAAC,KAA+B,EACpC,IAAI,CAAC,KAA+B,CACrC,CAAA;IACH,CAAC;CACF"}

package/lib/merger/nodes/TextArrayMergeNode.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 TextArrayMergeNode 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/TextArrayMergeNode.js

@@ -1,66 +0,0 @@
-import { isNil } from 'lodash-es';
-import { TEXT_TAG } from '../../constant/parserConstant.js';
-import { noConflict } from '../../types/mergeResult.js';
-const generateObj = (value, attrib) => {
-    return isNil(value) ? {} : { [attrib]: [{ [TEXT_TAG]: value }] };
-};
-// Comparator for sorting - handles null/undefined by converting to string
-const compareItems = (a, b) => {
-    const strA = String(a);
-    const strB = String(b);
-    if (strA < strB)
-        return -1;
-    if (strA > strB)
-        return 1;
-    return 0;
-};
-export class TextArrayMergeNode {
-    ancestor;
-    local;
-    other;
-    attribute;
-    constructor(ancestor, local, other, attribute) {
-        this.ancestor = ancestor;
-        this.local = local;
-        this.other = other;
-        this.attribute = attribute;
-    }
-    merge(_config) {
-        const localSet = new Set(this.local);
-        const otherSet = new Set(this.other);
-        // Single pass: collect items that should be in result
-        // An item is included if:
-        // - It exists in local or other (union)
-        // - AND it wasn't removed (existed in ancestor but not in local/other)
-        const resultItems = [];
-        const seen = new Set();
-        for (const item of this.ancestor) {
-            if (seen.has(item))
-                continue;
-            seen.add(item);
-            // Keep if present in both local and other (not removed by either)
-            if (localSet.has(item) && otherSet.has(item)) {
-                resultItems.push(item);
-            }
-        }
-        // Items from local not yet seen are new additions (not in ancestor)
-        for (const item of this.local) {
-            if (seen.has(item))
-                continue;
-            seen.add(item);
-            resultItems.push(item);
-        }
-        // Items from other not yet seen are new additions (not in ancestor)
-        for (const item of this.other) {
-            if (seen.has(item))
-                continue;
-            seen.add(item);
-            resultItems.push(item);
-        }
-        // Sort and transform in single pass using reduce
-        resultItems.sort(compareItems);
-        const merged = resultItems.map(item => generateObj(item, this.attribute));
-        return noConflict(merged);
-    }
-}
-//# sourceMappingURL=TextArrayMergeNode.js.map

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

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

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

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

package/lib/merger/nodes/TextMergeNode.js

@@ -1,36 +0,0 @@
-import { isNil } from 'lodash-es';
-import { TEXT_TAG } from '../../constant/parserConstant.js';
-import { noConflict } from '../../types/mergeResult.js';
-import { MergeScenario } from '../../types/mergeScenario.js';
-import { getScenario } from '../MergeScenarioFactory.js';
-import { getTextMergeStrategy } from '../strategies/TextMergeStrategy.js';
-const generateObj = (value, attrib) => {
-    return isNil(value) ? {} : { [attrib]: [{ [TEXT_TAG]: value }] };
-};
-export class TextMergeNode {
-    ancestor;
-    local;
-    other;
-    attribute;
-    constructor(ancestor, local, other, attribute) {
-        this.ancestor = ancestor;
-        this.local = local;
-        this.other = other;
-        this.attribute = attribute;
-    }
-    merge(config) {
-        const objAncestor = generateObj(this.ancestor, this.attribute);
-        const objLocal = generateObj(this.local, this.attribute);
-        const objOther = generateObj(this.other, this.attribute);
-        const scenario = getScenario(objAncestor, objLocal, objOther);
-        // Early return for identical values - use strict equality for primitives
-        if (this.local === this.other &&
-            (scenario === MergeScenario.LOCAL_AND_OTHER ||
-                scenario === MergeScenario.ALL)) {
-            return noConflict([objLocal]);
-        }
-        const strategy = getTextMergeStrategy(scenario);
-        return strategy.handle(config, objAncestor, objLocal, objOther, this.ancestor, this.local, this.other);
-    }
-}
-//# sourceMappingURL=TextMergeNode.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"TextMergeNode.js","sourceRoot":"","sources":["../../../src/merger/nodes/TextMergeNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AAI3D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAGzE,MAAM,WAAW,GAAG,CAAC,KAAuB,EAAE,MAAc,EAAc,EAAE;IAC1E,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,OAAO,aAAa;IAEL;IACA;IACA;IACA;IAJnB,YACmB,QAA0B,EAC1B,KAAuB,EACvB,KAAuB,EACvB,SAAiB;QAHjB,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,UAAK,GAAL,KAAK,CAAkB;QACvB,UAAK,GAAL,KAAK,CAAkB;QACvB,cAAS,GAAT,SAAS,CAAQ;IACjC,CAAC;IAEJ,KAAK,CAAC,MAAmB;QACvB,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAC9D,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACxD,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAExD,MAAM,QAAQ,GAAG,WAAW,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAE7D,yEAAyE;QACzE,IACE,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK;YACzB,CAAC,QAAQ,KAAK,aAAa,CAAC,eAAe;gBACzC,QAAQ,KAAK,aAAa,CAAC,GAAG,CAAC,EACjC,CAAC;YACD,OAAO,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,QAAQ,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAA;QAC/C,OAAO,QAAQ,CAAC,MAAM,CACpB,MAAM,EACN,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,KAAK,CACX,CAAA;IACH,CAAC;CACF"}

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

@@ -1,5 +0,0 @@
-import type { JsonArray, JsonObject, JsonValue } from '../../types/jsonTypes.js';
-export declare const ensureArray: (value: JsonValue) => JsonArray;
-export declare const getUniqueSortedProps: (...objects: (JsonObject | JsonArray)[]) => string[];
-export declare const generateObj: (value: JsonValue | null, attrib: string) => JsonObject;
-export declare const toJsonArray: (inputObj: JsonObject | JsonArray) => JsonArray;

package/lib/merger/nodes/nodeUtils.js

@@ -1,20 +0,0 @@
-import { castArray, flatMap, flow, isNil, isObject, reject, sortBy, uniq, } from 'lodash-es';
-import { TEXT_TAG } from '../../constant/parserConstant.js';
-export const ensureArray = (value) => isNil(value) ? [] : castArray(value);
-const extractSortedKeys = flow((objects) => reject(objects, isNil), objects => flatMap(objects, Object.keys), uniq, sortBy);
-export const getUniqueSortedProps = (...objects) => extractSortedKeys(objects);
-export const generateObj = (value, attrib) => (isNil(value) ? {} : { [attrib]: [{ [TEXT_TAG]: value }] });
-export const toJsonArray = (inputObj) => flatMap(getUniqueSortedProps(inputObj), attribute => {
-    const inputObjOfAttr = inputObj[attribute];
-    if (isObject(inputObjOfAttr)) {
-        const inputObjArr = ensureArray(inputObjOfAttr);
-        return flatMap(getUniqueSortedProps(inputObjArr), key => {
-            const value = inputObjArr[key];
-            return isObject(value)
-                ? { [attribute]: toJsonArray(value) }
-                : generateObj(value, attribute);
-        });
-    }
-    return generateObj(inputObjOfAttr, attribute);
-});
-//# sourceMappingURL=nodeUtils.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"nodeUtils.js","sourceRoot":"","sources":["../../../src/merger/nodes/nodeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,OAAO,EACP,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,MAAM,EACN,MAAM,EACN,IAAI,GACL,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AAG3D,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,iBAAiB,GAAG,IAAI,CAC5B,CAAC,OAAmC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,EAC/D,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,EACxC,IAAI,EACJ,MAAM,CACP,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,GAAG,OAAmC,EAC5B,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;AAEzC,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,KAAuB,EACvB,MAAc,EACF,EAAE,CAAC,CAAC,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,CAAC,CAAA;AAE5E,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,QAAgC,EAAa,EAAE,CACzE,OAAO,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,EAAE;IAClD,MAAM,cAAc,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAA;IAE1C,IAAI,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,WAAW,CAAC,cAAc,CAAC,CAAA;QAC/C,OAAO,OAAO,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,EAAE;YACtD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;YAC9B,OAAO,QAAQ,CAAC,KAAK,CAAC;gBACpB,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,KAA+B,CAAC,EAAE;gBAC/D,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QACnC,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,WAAW,CAAC,cAAc,EAAE,SAAS,CAAC,CAAA;AAC/C,CAAC,CAAC,CAAA"}

package/lib/merger/strategies/AllPresentStrategy.d.ts

@@ -1,7 +0,0 @@
-import type { MergeResult } from '../../types/mergeResult.js';
-import type { MergeContext } from '../MergeContext.js';
-import type { ScenarioStrategy } from './ScenarioStrategy.js';
-export declare class AllPresentStrategy implements ScenarioStrategy {
-    execute(context: MergeContext): MergeResult;
-    private mergeChildren;
-}

package/lib/merger/strategies/AllPresentStrategy.js

@@ -1,36 +0,0 @@
-import { combineResults } from '../../types/mergeResult.js';
-import { getUniqueSortedProps } from '../nodes/nodeUtils.js';
-export class AllPresentStrategy {
-    execute(context) {
-        const result = this.mergeChildren(context);
-        // Root level: wrap result with key
-        if (context.rootKey) {
-            if (result.output.length > 0) {
-                return {
-                    output: [{ [context.rootKey.name]: result.output }],
-                    hasConflict: result.hasConflict,
-                };
-            }
-            // Empty result but key exists - preserve empty key
-            return {
-                output: [{ [context.rootKey.name]: [] }],
-                hasConflict: result.hasConflict,
-            };
-        }
-        return result;
-    }
-    mergeChildren(context) {
-        const ancestor = context.ancestor;
-        const local = context.local;
-        const other = context.other;
-        const props = getUniqueSortedProps(ancestor, local, other);
-        const results = [];
-        for (const key of props) {
-            const childNode = context.nodeFactory.createNode(ancestor[key], local[key], other[key], key);
-            const childResult = childNode.merge(context.config);
-            results.push(childResult);
-        }
-        return combineResults(results);
-    }
-}
-//# sourceMappingURL=AllPresentStrategy.js.map

package/lib/merger/strategies/AllPresentStrategy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AllPresentStrategy.js","sourceRoot":"","sources":["../../../src/merger/strategies/AllPresentStrategy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAE3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAG5D,MAAM,OAAO,kBAAkB;IAC7B,OAAO,CAAC,OAAqB;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAE1C,mCAAmC;QACnC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,OAAO;oBACL,MAAM,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;oBACnD,WAAW,EAAE,MAAM,CAAC,WAAW;iBAChC,CAAA;YACH,CAAC;YACD,mDAAmD;YACnD,OAAO;gBACL,MAAM,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;gBACxC,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC,CAAA;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAEO,aAAa,CAAC,OAAqB;QACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAkC,CAAA;QAC3D,MAAM,KAAK,GAAG,OAAO,CAAC,KAA+B,CAAA;QACrD,MAAM,KAAK,GAAG,OAAO,CAAC,KAA+B,CAAA;QACrD,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QAC1D,MAAM,OAAO,GAAkB,EAAE,CAAA;QAEjC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,UAAU,CAC9C,QAAQ,CAAC,GAAG,CAAC,EACb,KAAK,CAAC,GAAG,CAAC,EACV,KAAK,CAAC,GAAG,CAAC,EACV,GAAG,CACJ,CAAA;YACD,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YACnD,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC3B,CAAC;QAED,OAAO,cAAc,CAAC,OAAO,CAAC,CAAA;IAChC,CAAC;CACF"}

package/lib/merger/strategies/AncestorAndLocalStrategy.d.ts

@@ -1,8 +0,0 @@
-import type { MergeResult } from '../../types/mergeResult.js';
-import type { MergeContext } from '../MergeContext.js';
-import type { ScenarioStrategy } from './ScenarioStrategy.js';
-export declare class AncestorAndLocalStrategy implements ScenarioStrategy {
-    execute(context: MergeContext): MergeResult;
-    private executeNested;
-    private executeWithAttribute;
-}

package/lib/merger/strategies/AncestorAndLocalStrategy.js

@@ -1,64 +0,0 @@
-import { deepEqual } from 'fast-equals';
-import { noConflict, withConflict } from '../../types/mergeResult.js';
-import { buildConflictMarkers } from '../ConflictMarkerBuilder.js';
-import { MergeOrchestrator } from '../MergeOrchestrator.js';
-import { toJsonArray } from '../nodes/nodeUtils.js';
-const extractContent = (arr) => {
-    return (arr.length === 1 ? arr[0] : arr);
-};
-export class AncestorAndLocalStrategy {
-    execute(context) {
-        const localUnchanged = deepEqual(context.ancestor, context.local);
-        // Root level handling
-        if (context.rootKey) {
-            const { name, existsInOther } = context.rootKey;
-            // Other key missing and local unchanged = other deletion wins
-            if (!existsInOther && localUnchanged) {
-                return noConflict([]);
-            }
-            // Other key missing and local changed = conflict at root level
-            if (!existsInOther && !localUnchanged) {
-                const localObj = {
-                    [name]: toJsonArray(context.local),
-                };
-                const ancestorObj = {
-                    [name]: toJsonArray(context.ancestor),
-                };
-                return withConflict(buildConflictMarkers(context.config, localObj, ancestorObj, {}));
-            }
-            // Other key exists with empty value - delegate to nested merge, wrap result
-            const result = this.executeNested(context);
-            if (result.output.length > 0) {
-                return {
-                    output: [{ [name]: result.output }],
-                    hasConflict: result.hasConflict,
-                };
-            }
-            // Empty result but key exists - preserve empty key
-            return noConflict([{ [name]: [] }]);
-        }
-        // Nested level: local unchanged means return empty (other deleted)
-        if (localUnchanged) {
-            return noConflict([]);
-        }
-        // Nested level with attribute (keyed array element)
-        if (context.attribute) {
-            return this.executeWithAttribute(context);
-        }
-        // Nested level conflict
-        return withConflict(buildConflictMarkers(context.config, extractContent(toJsonArray(context.local)), extractContent(toJsonArray(context.ancestor)), {}));
-    }
-    executeNested(context) {
-        const orchestrator = new MergeOrchestrator(context.config, context.nodeFactory);
-        return orchestrator.merge(context.ancestor, context.local, context.other);
-    }
-    executeWithAttribute(context) {
-        const orchestrator = new MergeOrchestrator(context.config, context.nodeFactory);
-        const localResult = orchestrator.merge({}, context.local, {}, undefined);
-        const ancestorResult = orchestrator.merge({}, context.ancestor, {}, undefined);
-        const localProp = { [context.attribute]: localResult.output };
-        const ancestorProp = { [context.attribute]: ancestorResult.output };
-        return withConflict(buildConflictMarkers(context.config, localProp, ancestorProp, {}));
-    }
-}
-//# sourceMappingURL=AncestorAndLocalStrategy.js.map

package/lib/merger/strategies/AncestorAndLocalStrategy.js.map

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

package/lib/merger/strategies/AncestorAndOtherStrategy.d.ts

@@ -1,8 +0,0 @@
-import type { MergeResult } from '../../types/mergeResult.js';
-import type { MergeContext } from '../MergeContext.js';
-import type { ScenarioStrategy } from './ScenarioStrategy.js';
-export declare class AncestorAndOtherStrategy implements ScenarioStrategy {
-    execute(context: MergeContext): MergeResult;
-    private executeNested;
-    private executeWithAttribute;
-}

package/lib/merger/strategies/AncestorAndOtherStrategy.js

@@ -1,64 +0,0 @@
-import { deepEqual } from 'fast-equals';
-import { noConflict, withConflict } from '../../types/mergeResult.js';
-import { buildConflictMarkers } from '../ConflictMarkerBuilder.js';
-import { MergeOrchestrator } from '../MergeOrchestrator.js';
-import { toJsonArray } from '../nodes/nodeUtils.js';
-const extractContent = (arr) => {
-    return (arr.length === 1 ? arr[0] : arr);
-};
-export class AncestorAndOtherStrategy {
-    execute(context) {
-        const otherUnchanged = deepEqual(context.ancestor, context.other);
-        // Root level handling
-        if (context.rootKey) {
-            const { name, existsInLocal } = context.rootKey;
-            // Local key missing and other unchanged = local deletion wins
-            if (!existsInLocal && otherUnchanged) {
-                return noConflict([]);
-            }
-            // Local key missing and other changed = conflict at root level
-            if (!existsInLocal && !otherUnchanged) {
-                const ancestorObj = {
-                    [name]: toJsonArray(context.ancestor),
-                };
-                const otherObj = {
-                    [name]: toJsonArray(context.other),
-                };
-                return withConflict(buildConflictMarkers(context.config, {}, ancestorObj, otherObj));
-            }
-            // Local key exists with empty value - delegate to nested merge, wrap result
-            const result = this.executeNested(context);
-            if (result.output.length > 0) {
-                return {
-                    output: [{ [name]: result.output }],
-                    hasConflict: result.hasConflict,
-                };
-            }
-            // Empty result but key exists - preserve empty key
-            return noConflict([{ [name]: [] }]);
-        }
-        // Nested level: other unchanged means return empty (local deleted)
-        if (otherUnchanged) {
-            return noConflict([]);
-        }
-        // Nested level with attribute (keyed array element)
-        if (context.attribute) {
-            return this.executeWithAttribute(context);
-        }
-        // Nested level conflict
-        return withConflict(buildConflictMarkers(context.config, {}, extractContent(toJsonArray(context.ancestor)), extractContent(toJsonArray(context.other))));
-    }
-    executeNested(context) {
-        const orchestrator = new MergeOrchestrator(context.config, context.nodeFactory);
-        return orchestrator.merge(context.ancestor, context.local, context.other);
-    }
-    executeWithAttribute(context) {
-        const orchestrator = new MergeOrchestrator(context.config, context.nodeFactory);
-        const ancestorResult = orchestrator.merge({}, context.ancestor, {}, undefined);
-        const otherResult = orchestrator.merge({}, {}, context.other, undefined);
-        const ancestorProp = { [context.attribute]: ancestorResult.output };
-        const otherProp = { [context.attribute]: otherResult.output };
-        return withConflict(buildConflictMarkers(context.config, {}, ancestorProp, otherProp));
-    }
-}
-//# sourceMappingURL=AncestorAndOtherStrategy.js.map

package/lib/merger/strategies/AncestorAndOtherStrategy.js.map

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

package/lib/merger/strategies/AncestorOnlyStrategy.d.ts

@@ -1,6 +0,0 @@
-import type { MergeResult } from '../../types/mergeResult.js';
-import type { MergeContext } from '../MergeContext.js';
-import type { ScenarioStrategy } from './ScenarioStrategy.js';
-export declare class AncestorOnlyStrategy implements ScenarioStrategy {
-    execute(context: MergeContext): MergeResult;
-}

package/lib/merger/strategies/AncestorOnlyStrategy.js

@@ -1,19 +0,0 @@
-import { noConflict } from '../../types/mergeResult.js';
-export class AncestorOnlyStrategy {
-    execute(context) {
-        // ANCESTOR_ONLY: deleted in both local and other
-        // Root level: check if key should exist in result
-        if (context.rootKey) {
-            const { name, existsInLocal, existsInOther } = context.rootKey;
-            if (existsInLocal || existsInOther) {
-                // Key exists with empty value - preserve empty key
-                return noConflict([{ [name]: [] }]);
-            }
-            // Key completely deleted - return nothing
-            return noConflict([]);
-        }
-        // Nested level: return empty (deleted)
-        return noConflict([]);
-    }
-}
-//# sourceMappingURL=AncestorOnlyStrategy.js.map

package/lib/merger/strategies/AncestorOnlyStrategy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AncestorOnlyStrategy.js","sourceRoot":"","sources":["../../../src/merger/strategies/AncestorOnlyStrategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAIvD,MAAM,OAAO,oBAAoB;IAC/B,OAAO,CAAC,OAAqB;QAC3B,iDAAiD;QAEjD,kDAAkD;QAClD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,OAAO,CAAA;YAC9D,IAAI,aAAa,IAAI,aAAa,EAAE,CAAC;gBACnC,mDAAmD;gBACnD,OAAO,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;YACrC,CAAC;YACD,0CAA0C;YAC1C,OAAO,UAAU,CAAC,EAAE,CAAC,CAAA;QACvB,CAAC;QAED,uCAAuC;QACvC,OAAO,UAAU,CAAC,EAAE,CAAC,CAAA;IACvB,CAAC;CACF"}

package/lib/merger/strategies/LocalAndOtherStrategy.d.ts

@@ -1,7 +0,0 @@
-import type { MergeResult } from '../../types/mergeResult.js';
-import type { MergeContext } from '../MergeContext.js';
-import type { ScenarioStrategy } from './ScenarioStrategy.js';
-export declare class LocalAndOtherStrategy implements ScenarioStrategy {
-    execute(context: MergeContext): MergeResult;
-    private mergeChildren;
-}

package/lib/merger/strategies/LocalAndOtherStrategy.js

@@ -1,45 +0,0 @@
-import { deepEqual } from 'fast-equals';
-import { combineResults, noConflict } from '../../types/mergeResult.js';
-import { getUniqueSortedProps, toJsonArray } from '../nodes/nodeUtils.js';
-export class LocalAndOtherStrategy {
-    execute(context) {
-        const local = context.local;
-        const other = context.other;
-        // If identical, return other
-        if (deepEqual(local, other)) {
-            const content = toJsonArray(other);
-            // Root level: wrap with key
-            if (context.rootKey) {
-                return noConflict([{ [context.rootKey.name]: content }]);
-            }
-            return noConflict(content);
-        }
-        // Different - merge children
-        const result = this.mergeChildren(context);
-        // Root level: wrap result with key
-        if (context.rootKey) {
-            if (result.output.length > 0) {
-                return {
-                    output: [{ [context.rootKey.name]: result.output }],
-                    hasConflict: result.hasConflict,
-                };
-            }
-            // Empty result but keys exist - preserve empty key
-            return noConflict([{ [context.rootKey.name]: [] }]);
-        }
-        return result;
-    }
-    mergeChildren(context) {
-        const local = context.local;
-        const other = context.other;
-        const props = getUniqueSortedProps({}, local, other);
-        const results = [];
-        for (const key of props) {
-            const childNode = context.nodeFactory.createNode(undefined, local[key], other[key], key);
-            const childResult = childNode.merge(context.config);
-            results.push(childResult);
-        }
-        return combineResults(results);
-    }
-}
-//# sourceMappingURL=LocalAndOtherStrategy.js.map

package/lib/merger/strategies/LocalAndOtherStrategy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LocalAndOtherStrategy.js","sourceRoot":"","sources":["../../../src/merger/strategies/LocalAndOtherStrategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAGvC,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvE,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGzE,MAAM,OAAO,qBAAqB;IAChC,OAAO,CAAC,OAAqB;QAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,KAA+B,CAAA;QACrD,MAAM,KAAK,GAAG,OAAO,CAAC,KAA+B,CAAA;QAErD,6BAA6B;QAC7B,IAAI,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;YAElC,4BAA4B;YAC5B,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,OAAO,UAAU,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;YAC1D,CAAC;YAED,OAAO,UAAU,CAAC,OAAO,CAAC,CAAA;QAC5B,CAAC;QAED,6BAA6B;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;QAE1C,mCAAmC;QACnC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,OAAO;oBACL,MAAM,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;oBACnD,WAAW,EAAE,MAAM,CAAC,WAAW;iBAChC,CAAA;YACH,CAAC;YACD,mDAAmD;YACnD,OAAO,UAAU,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;QACrD,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAEO,aAAa,CAAC,OAAqB;QACzC,MAAM,KAAK,GAAG,OAAO,CAAC,KAA+B,CAAA;QACrD,MAAM,KAAK,GAAG,OAAO,CAAC,KAA+B,CAAA;QACrD,MAAM,KAAK,GAAG,oBAAoB,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QACpD,MAAM,OAAO,GAAkB,EAAE,CAAA;QAEjC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,UAAU,CAC9C,SAAkB,EAClB,KAAK,CAAC,GAAG,CAAC,EACV,KAAK,CAAC,GAAG,CAAC,EACV,GAAG,CACJ,CAAA;YACD,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YACnD,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAC3B,CAAC;QAED,OAAO,cAAc,CAAC,OAAO,CAAC,CAAA;IAChC,CAAC;CACF"}

package/lib/merger/strategies/LocalOnlyStrategy.d.ts

@@ -1,6 +0,0 @@
-import type { MergeResult } from '../../types/mergeResult.js';
-import type { MergeContext } from '../MergeContext.js';
-import type { ScenarioStrategy } from './ScenarioStrategy.js';
-export declare class LocalOnlyStrategy implements ScenarioStrategy {
-    execute(context: MergeContext): MergeResult;
-}