sf-git-merge-driver 1.4.0-dev-156.21254415558-1 → 1.4.0-dev-159.21317297551-1

package/lib/merger/strategies/AllPresentStrategy.js

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,64 @@
+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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,64 @@
+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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,45 @@
+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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,6 @@
+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;
+}

package/lib/merger/strategies/LocalOnlyStrategy.js

@@ -0,0 +1,14 @@
+import { noConflict } from '../../types/mergeResult.js';
+import { toJsonArray } from '../nodes/nodeUtils.js';
+export class LocalOnlyStrategy {
+    execute(context) {
+        const content = toJsonArray(context.local);
+        // Root level: wrap with key
+        if (context.rootKey) {
+            return noConflict([{ [context.rootKey.name]: content }]);
+        }
+        // Nested level: return content for parent to wrap
+        return noConflict(content);
+    }
+}
+//# sourceMappingURL=LocalOnlyStrategy.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"LocalOnlyStrategy.js","sourceRoot":"","sources":["../../../src/merger/strategies/LocalOnlyStrategy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGnD,MAAM,OAAO,iBAAiB;IAC5B,OAAO,CAAC,OAAqB;QAC3B,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,KAA+B,CAAC,CAAA;QAEpE,4BAA4B;QAC5B,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,UAAU,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAC1D,CAAC;QAED,kDAAkD;QAClD,OAAO,UAAU,CAAC,OAAO,CAAC,CAAA;IAC5B,CAAC;CACF"}

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

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

package/lib/merger/strategies/NoneStrategy.js

@@ -0,0 +1,8 @@
+import { noConflict } from '../../types/mergeResult.js';
+export class NoneStrategy {
+    execute(_context) {
+        // NONE scenario: nothing exists anywhere, return empty
+        return noConflict([]);
+    }
+}
+//# sourceMappingURL=NoneStrategy.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"NoneStrategy.js","sourceRoot":"","sources":["../../../src/merger/strategies/NoneStrategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAIvD,MAAM,OAAO,YAAY;IACvB,OAAO,CAAC,QAAsB;QAC5B,uDAAuD;QACvD,OAAO,UAAU,CAAC,EAAE,CAAC,CAAA;IACvB,CAAC;CACF"}

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

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

package/lib/merger/strategies/OtherOnlyStrategy.js

@@ -0,0 +1,14 @@
+import { noConflict } from '../../types/mergeResult.js';
+import { toJsonArray } from '../nodes/nodeUtils.js';
+export class OtherOnlyStrategy {
+    execute(context) {
+        const content = toJsonArray(context.other);
+        // Root level: wrap with key
+        if (context.rootKey) {
+            return noConflict([{ [context.rootKey.name]: content }]);
+        }
+        // Nested level: return content for parent to wrap
+        return noConflict(content);
+    }
+}
+//# sourceMappingURL=OtherOnlyStrategy.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"OtherOnlyStrategy.js","sourceRoot":"","sources":["../../../src/merger/strategies/OtherOnlyStrategy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGnD,MAAM,OAAO,iBAAiB;IAC5B,OAAO,CAAC,OAAqB;QAC3B,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,KAA+B,CAAC,CAAA;QAEpE,4BAA4B;QAC5B,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,UAAU,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;QAC1D,CAAC;QAED,kDAAkD;QAClD,OAAO,UAAU,CAAC,OAAO,CAAC,CAAA;IAC5B,CAAC;CACF"}

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

@@ -0,0 +1,5 @@
+import type { MergeResult } from '../../types/mergeResult.js';
+import type { MergeContext } from '../MergeContext.js';
+export interface ScenarioStrategy {
+    execute(context: MergeContext): MergeResult;
+}

package/lib/merger/strategies/ScenarioStrategy.js

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

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

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

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

@@ -0,0 +1,3 @@
+import { MergeScenario } from '../../types/mergeScenario.js';
+import type { ScenarioStrategy } from './ScenarioStrategy.js';
+export declare const getScenarioStrategy: (scenario: MergeScenario) => ScenarioStrategy;

package/lib/merger/strategies/ScenarioStrategyFactory.js

@@ -0,0 +1,23 @@
+import { MergeScenario } from '../../types/mergeScenario.js';
+import { AllPresentStrategy } from './AllPresentStrategy.js';
+import { AncestorAndLocalStrategy } from './AncestorAndLocalStrategy.js';
+import { AncestorAndOtherStrategy } from './AncestorAndOtherStrategy.js';
+import { AncestorOnlyStrategy } from './AncestorOnlyStrategy.js';
+import { LocalAndOtherStrategy } from './LocalAndOtherStrategy.js';
+import { LocalOnlyStrategy } from './LocalOnlyStrategy.js';
+import { NoneStrategy } from './NoneStrategy.js';
+import { OtherOnlyStrategy } from './OtherOnlyStrategy.js';
+const strategies = {
+    [MergeScenario.NONE]: new NoneStrategy(),
+    [MergeScenario.OTHER_ONLY]: new OtherOnlyStrategy(),
+    [MergeScenario.LOCAL_ONLY]: new LocalOnlyStrategy(),
+    [MergeScenario.LOCAL_AND_OTHER]: new LocalAndOtherStrategy(),
+    [MergeScenario.ANCESTOR_ONLY]: new AncestorOnlyStrategy(),
+    [MergeScenario.ANCESTOR_AND_OTHER]: new AncestorAndOtherStrategy(),
+    [MergeScenario.ANCESTOR_AND_LOCAL]: new AncestorAndLocalStrategy(),
+    [MergeScenario.ALL]: new AllPresentStrategy(),
+};
+export const getScenarioStrategy = (scenario) => {
+    return strategies[scenario];
+};
+//# sourceMappingURL=ScenarioStrategyFactory.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ScenarioStrategyFactory.js","sourceRoot":"","sources":["../../../src/merger/strategies/ScenarioStrategyFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AACxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAG1D,MAAM,UAAU,GAA4C;IAC1D,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,YAAY,EAAE;IACxC,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,IAAI,iBAAiB,EAAE;IACnD,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,IAAI,iBAAiB,EAAE;IACnD,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,IAAI,qBAAqB,EAAE;IAC5D,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,IAAI,oBAAoB,EAAE;IACzD,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,IAAI,wBAAwB,EAAE;IAClE,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,IAAI,wBAAwB,EAAE;IAClE,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,IAAI,kBAAkB,EAAE;CAC9C,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,QAAuB,EACL,EAAE;IACpB,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAA;AAC7B,CAAC,CAAA"}

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

@@ -0,0 +1,32 @@
+import type { MergeConfig } from '../../types/conflictTypes.js';
+import type { JsonObject } from '../../types/jsonTypes.js';
+import type { MergeResult } from '../../types/mergeResult.js';
+import { MergeScenario } from '../../types/mergeScenario.js';
+export interface TextMergeStrategy {
+    handle(config: MergeConfig, objAncestor: JsonObject, objLocal: JsonObject, objOther: JsonObject, ancestor: unknown, local: unknown, other: unknown): MergeResult;
+}
+export declare class OtherOnlyStrategy implements TextMergeStrategy {
+    handle(_config: MergeConfig, _objAncestor: JsonObject, _objLocal: JsonObject, objOther: JsonObject): MergeResult;
+}
+export declare class LocalOnlyStrategy implements TextMergeStrategy {
+    handle(_config: MergeConfig, _objAncestor: JsonObject, objLocal: JsonObject): MergeResult;
+}
+export declare class LocalAndOtherStrategy implements TextMergeStrategy {
+    handle(config: MergeConfig, _objAncestor: JsonObject, objLocal: JsonObject, objOther: JsonObject, _ancestor: unknown, local: unknown, other: unknown): MergeResult;
+}
+export declare class AncestorAndOtherStrategy implements TextMergeStrategy {
+    handle(config: MergeConfig, objAncestor: JsonObject, _objLocal: JsonObject, objOther: JsonObject, ancestor: unknown, _local: unknown, other: unknown): MergeResult;
+}
+export declare class AncestorAndLocalStrategy implements TextMergeStrategy {
+    handle(config: MergeConfig, objAncestor: JsonObject, objLocal: JsonObject, _objOther: JsonObject, ancestor: unknown, local: unknown): MergeResult;
+}
+export declare class AllPresentStrategy implements TextMergeStrategy {
+    handle(config: MergeConfig, objAncestor: JsonObject, objLocal: JsonObject, objOther: JsonObject, ancestor: unknown, local: unknown, other: unknown): MergeResult;
+}
+export declare class AncestorOnlyStrategy implements TextMergeStrategy {
+    handle(): MergeResult;
+}
+export declare class NoneStrategy implements TextMergeStrategy {
+    handle(): MergeResult;
+}
+export declare const getTextMergeStrategy: (scenario: MergeScenario) => TextMergeStrategy;

package/lib/merger/strategies/TextMergeStrategy.js

@@ -0,0 +1,80 @@
+import { noConflict, withConflict } from '../../types/mergeResult.js';
+import { MergeScenario } from '../../types/mergeScenario.js';
+import { buildConflictMarkers } from '../ConflictMarkerBuilder.js';
+export class OtherOnlyStrategy {
+    handle(_config, _objAncestor, _objLocal, objOther) {
+        return noConflict([objOther]);
+    }
+}
+export class LocalOnlyStrategy {
+    handle(_config, _objAncestor, objLocal) {
+        return noConflict([objLocal]);
+    }
+}
+export class LocalAndOtherStrategy {
+    handle(config, _objAncestor, objLocal, objOther, _ancestor, local, other) {
+        // If both sides added the same value, no conflict
+        if (local === other) {
+            return noConflict([objLocal]);
+        }
+        return withConflict(buildConflictMarkers(config, objLocal, {}, objOther));
+    }
+}
+export class AncestorAndOtherStrategy {
+    handle(config, objAncestor, _objLocal, objOther, ancestor, _local, other) {
+        if (ancestor !== other) {
+            return withConflict(buildConflictMarkers(config, {}, objAncestor, objOther));
+        }
+        return noConflict([]);
+    }
+}
+export class AncestorAndLocalStrategy {
+    handle(config, objAncestor, objLocal, _objOther, ancestor, local) {
+        if (ancestor !== local) {
+            return withConflict(buildConflictMarkers(config, objLocal, objAncestor, {}));
+        }
+        return noConflict([]);
+    }
+}
+export class AllPresentStrategy {
+    handle(config, objAncestor, objLocal, objOther, ancestor, local, other) {
+        // No change in local - take other's value
+        if (ancestor === local) {
+            return noConflict([objOther]);
+        }
+        // No change in other - take local's value
+        if (ancestor === other) {
+            return noConflict([objLocal]);
+        }
+        // Both changed to same value - no conflict
+        if (local === other) {
+            return noConflict([objLocal]);
+        }
+        // Real conflict - build markers
+        return withConflict(buildConflictMarkers(config, objLocal, objAncestor, objOther));
+    }
+}
+export class AncestorOnlyStrategy {
+    handle() {
+        return noConflict([]);
+    }
+}
+export class NoneStrategy {
+    handle() {
+        return noConflict([]);
+    }
+}
+const strategies = {
+    [MergeScenario.NONE]: new NoneStrategy(),
+    [MergeScenario.OTHER_ONLY]: new OtherOnlyStrategy(),
+    [MergeScenario.LOCAL_ONLY]: new LocalOnlyStrategy(),
+    [MergeScenario.LOCAL_AND_OTHER]: new LocalAndOtherStrategy(),
+    [MergeScenario.ANCESTOR_AND_OTHER]: new AncestorAndOtherStrategy(),
+    [MergeScenario.ANCESTOR_AND_LOCAL]: new AncestorAndLocalStrategy(),
+    [MergeScenario.ALL]: new AllPresentStrategy(),
+    [MergeScenario.ANCESTOR_ONLY]: new AncestorOnlyStrategy(),
+};
+export const getTextMergeStrategy = (scenario) => {
+    return strategies[scenario];
+};
+//# sourceMappingURL=TextMergeStrategy.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"TextMergeStrategy.js","sourceRoot":"","sources":["../../../src/merger/strategies/TextMergeStrategy.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAclE,MAAM,OAAO,iBAAiB;IAC5B,MAAM,CACJ,OAAoB,EACpB,YAAwB,EACxB,SAAqB,EACrB,QAAoB;QAEpB,OAAO,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/B,CAAC;CACF;AAED,MAAM,OAAO,iBAAiB;IAC5B,MAAM,CACJ,OAAoB,EACpB,YAAwB,EACxB,QAAoB;QAEpB,OAAO,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/B,CAAC;CACF;AAED,MAAM,OAAO,qBAAqB;IAChC,MAAM,CACJ,MAAmB,EACnB,YAAwB,EACxB,QAAoB,EACpB,QAAoB,EACpB,SAAkB,EAClB,KAAc,EACd,KAAc;QAEd,kDAAkD;QAClD,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACpB,OAAO,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC/B,CAAC;QACD,OAAO,YAAY,CAAC,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAA;IAC3E,CAAC;CACF;AAED,MAAM,OAAO,wBAAwB;IACnC,MAAM,CACJ,MAAmB,EACnB,WAAuB,EACvB,SAAqB,EACrB,QAAoB,EACpB,QAAiB,EACjB,MAAe,EACf,KAAc;QAEd,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;YACvB,OAAO,YAAY,CACjB,oBAAoB,CAAC,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,CACxD,CAAA;QACH,CAAC;QACD,OAAO,UAAU,CAAC,EAAE,CAAC,CAAA;IACvB,CAAC;CACF;AAED,MAAM,OAAO,wBAAwB;IACnC,MAAM,CACJ,MAAmB,EACnB,WAAuB,EACvB,QAAoB,EACpB,SAAqB,EACrB,QAAiB,EACjB,KAAc;QAEd,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;YACvB,OAAO,YAAY,CACjB,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,CAAC,CACxD,CAAA;QACH,CAAC;QACD,OAAO,UAAU,CAAC,EAAE,CAAC,CAAA;IACvB,CAAC;CACF;AAED,MAAM,OAAO,kBAAkB;IAC7B,MAAM,CACJ,MAAmB,EACnB,WAAuB,EACvB,QAAoB,EACpB,QAAoB,EACpB,QAAiB,EACjB,KAAc,EACd,KAAc;QAEd,0CAA0C;QAC1C,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;YACvB,OAAO,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC/B,CAAC;QACD,0CAA0C;QAC1C,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;YACvB,OAAO,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC/B,CAAC;QACD,2CAA2C;QAC3C,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACpB,OAAO,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC/B,CAAC;QACD,gCAAgC;QAChC,OAAO,YAAY,CACjB,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,CAAC,CAC9D,CAAA;IACH,CAAC;CACF;AAED,MAAM,OAAO,oBAAoB;IAC/B,MAAM;QACJ,OAAO,UAAU,CAAC,EAAE,CAAC,CAAA;IACvB,CAAC;CACF;AAED,MAAM,OAAO,YAAY;IACvB,MAAM;QACJ,OAAO,UAAU,CAAC,EAAE,CAAC,CAAA;IACvB,CAAC;CACF;AAED,MAAM,UAAU,GAA6C;IAC3D,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,YAAY,EAAE;IACxC,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,IAAI,iBAAiB,EAAE;IACnD,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,IAAI,iBAAiB,EAAE;IACnD,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,IAAI,qBAAqB,EAAE;IAC5D,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,IAAI,wBAAwB,EAAE;IAClE,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,IAAI,wBAAwB,EAAE;IAClE,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,IAAI,kBAAkB,EAAE;IAC7C,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,IAAI,oBAAoB,EAAE;CAC1D,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,QAAuB,EACJ,EAAE;IACrB,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAA;AAC7B,CAAC,CAAA"}

package/lib/service/NamespaceHandler.js

@@ -1,7 +1,6 @@
 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":";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"}
+{"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"}

package/lib/types/conflictTypes.d.ts

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

package/lib/types/mergeResult.d.ts

@@ -0,0 +1,8 @@
+import type { JsonArray } from './jsonTypes.js';
+export interface MergeResult {
+    output: JsonArray;
+    hasConflict: boolean;
+}
+export declare const combineResults: (results: MergeResult[]) => MergeResult;
+export declare const noConflict: (output: JsonArray) => MergeResult;
+export declare const withConflict: (output: JsonArray) => MergeResult;

package/lib/types/mergeResult.js

@@ -0,0 +1,33 @@
+// Pre-allocated constant for the common empty no-conflict case
+// Used by NoneStrategy, AncestorOnlyStrategy, and equality-based early returns
+const EMPTY_ARRAY = [];
+const EMPTY_NO_CONFLICT = {
+    output: EMPTY_ARRAY,
+    hasConflict: false,
+};
+export const combineResults = (results) => {
+    // Fast path: no results
+    if (results.length === 0) {
+        return EMPTY_NO_CONFLICT;
+    }
+    // Fast path: single result
+    if (results.length === 1) {
+        return results[0];
+    }
+    return {
+        output: results.flatMap(r => r.output),
+        hasConflict: results.some(r => r.hasConflict),
+    };
+};
+export const noConflict = (output) => {
+    // Reuse constant for empty arrays
+    if (output.length === 0) {
+        return EMPTY_NO_CONFLICT;
+    }
+    return { output, hasConflict: false };
+};
+export const withConflict = (output) => ({
+    output,
+    hasConflict: true,
+});
+//# sourceMappingURL=mergeResult.js.map

package/lib/types/mergeResult.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeResult.js","sourceRoot":"","sources":["../../src/types/mergeResult.ts"],"names":[],"mappings":"AAOA,+DAA+D;AAC/D,+EAA+E;AAC/E,MAAM,WAAW,GAAc,EAAE,CAAA;AACjC,MAAM,iBAAiB,GAAgB;IACrC,MAAM,EAAE,WAAW;IACnB,WAAW,EAAE,KAAK;CACnB,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAsB,EAAe,EAAE;IACpE,wBAAwB;IACxB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,iBAAiB,CAAA;IAC1B,CAAC;IACD,2BAA2B;IAC3B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IACD,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QACtC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;KAC9C,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAe,EAAE;IAC3D,kCAAkC;IAClC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,iBAAiB,CAAA;IAC1B,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,CAAA;AACvC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAiB,EAAe,EAAE,CAAC,CAAC;IAC/D,MAAM;IACN,WAAW,EAAE,IAAI;CAClB,CAAC,CAAA"}