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

package/lib/merger/MergeOrchestrator.d.ts

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

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

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

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

package/lib/merger/MergeScenarioFactory.js

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

@@ -0,0 +1 @@
+{"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/XmlMerger.d.ts

@@ -1,6 +1,11 @@
+import type { MergeConfig } from '../types/conflictTypes.js';
 export declare class XmlMerger {
+    private readonly config;
+    private readonly formatter;
+    constructor(config: MergeConfig);
     mergeThreeWay(ancestorContent: string, ourContent: string, theirContent: string): {
         output: string;
         hasConflict: boolean;
     };
+    private formatXmlOutput;
 }

package/lib/merger/XmlMerger.js

@@ -1,11 +1,11 @@
 import { __decorate } from "tslib";
 import { XMLBuilder, XMLParser } from 'fast-xml-parser';
+import { CDATA_PROP_NAME, XML_COMMENT_PROP_NAME, XML_DECL, XML_INDENT, } from '../constant/parserConstant.js';
 import { log } from '../utils/LoggingDecorator.js';
+import { ConflictMarkerFormatter } from './ConflictMarkerFormatter.js';
 import { JsonMerger } from './JsonMerger.js';
-const XML_DECL = '<?xml version="1.0" encoding="UTF-8"?>\n';
-const XML_COMMENT_PROP_NAME = '#xml__comment';
 const baseOptions = {
-    cdataPropName: '__cdata',
+    cdataPropName: CDATA_PROP_NAME,
     commentPropName: XML_COMMENT_PROP_NAME,
     ignoreAttributes: false,
     processEntities: false,
@@ -16,41 +16,44 @@ const parserOptions = {
     numberParseOptions: { leadingZeros: false, hex: false },
     parseAttributeValue: false,
     parseTagValue: false,
-    // preserveOrder: true,
 };
 const builderOptions = {
     ...baseOptions,
     format: true,
-    indentBy: '    ',
+    indentBy: XML_INDENT,
     preserveOrder: true,
 };
 const correctComments = (xml) => xml.includes('<!--') ? xml.replace(/\s+<!--(.*?)-->\s+/g, '<!--$1-->') : xml;
-const correctConflictIndent = (xml) => xml
-    .replace(/[ \t]+(<<<<<<<|\|\|\|\|\|\|\||=======|>>>>>>>)/g, '$1')
-    .replace(/^[ \t]*[\n\r]+/gm, '');
-const handleSpecialEntities = (xml) => xml
-    .replaceAll('&amp;#160;', '&#160;')
-    .replaceAll('&lt;&lt;&lt;&lt;&lt;&lt;&lt;', '<<<<<<<')
-    .replaceAll('&gt;&gt;&gt;&gt;&gt;&gt;&gt;', '>>>>>>>');
 export class XmlMerger {
+    config;
+    formatter;
+    constructor(config) {
+        this.config = config;
+        this.formatter = new ConflictMarkerFormatter(config);
+    }
     mergeThreeWay(ancestorContent, ourContent, theirContent) {
         const parser = new XMLParser(parserOptions);
         const ancestorObj = parser.parse(ancestorContent);
         const ourObj = parser.parse(ourContent);
         const theirObj = parser.parse(theirContent);
         // Perform deep merge of XML objects
-        const jsonMerger = new JsonMerger();
+        const jsonMerger = new JsonMerger(this.config);
         const mergedResult = jsonMerger.mergeThreeWay(ancestorObj, ourObj, theirObj);
         // Convert back to XML and format
         const builder = new XMLBuilder(builderOptions);
         const mergedXml = builder.build(mergedResult.output);
         return {
-            output: mergedXml.length
-                ? correctConflictIndent(correctComments(XML_DECL.concat(handleSpecialEntities(mergedXml))))
-                : '',
+            output: mergedXml.length ? this.formatXmlOutput(mergedXml) : '',
             hasConflict: mergedResult.hasConflict,
         };
     }
+    formatXmlOutput(xml) {
+        let result = XML_DECL.concat(xml);
+        result = this.formatter.handleSpecialEntities(result);
+        result = correctComments(result);
+        result = this.formatter.correctConflictIndent(result);
+        return result;
+    }
 }
 __decorate([
     log

package/lib/merger/XmlMerger.js.map

@@ -1 +1 @@
-{"version":3,"file":"XmlMerger.js","sourceRoot":"","sources":["../../src/merger/XmlMerger.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,QAAQ,GAAG,0CAA0C,CAAA;AAC3D,MAAM,qBAAqB,GAAG,eAAe,CAAA;AAE7C,MAAM,WAAW,GAAG;IAClB,aAAa,EAAE,SAAS;IACxB,eAAe,EAAE,qBAAqB;IACtC,gBAAgB,EAAE,KAAK;IACvB,eAAe,EAAE,KAAK;CACvB,CAAA;AAED,MAAM,aAAa,GAAG;IACpB,GAAG,WAAW;IACd,iBAAiB,EAAE,IAAI;IACvB,kBAAkB,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE;IACvD,mBAAmB,EAAE,KAAK;IAC1B,aAAa,EAAE,KAAK;IACpB,uBAAuB;CACxB,CAAA;AAED,MAAM,cAAc,GAAG;IACrB,GAAG,WAAW;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,MAAM;IAChB,aAAa,EAAE,IAAI;CACpB,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,GAAW,EAAU,EAAE,CAC9C,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;AAE9E,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAU,EAAE,CACpD,GAAG;KACA,OAAO,CAAC,iDAAiD,EAAE,IAAI,CAAC;KAChE,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAA;AAEpC,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAU,EAAE,CACpD,GAAG;KACA,UAAU,CAAC,YAAY,EAAE,QAAQ,CAAC;KAClC,UAAU,CAAC,8BAA8B,EAAE,SAAS,CAAC;KACrD,UAAU,CAAC,8BAA8B,EAAE,SAAS,CAAC,CAAA;AAE1D,MAAM,OAAO,SAAS;IAEpB,aAAa,CACX,eAAuB,EACvB,UAAkB,EAClB,YAAoB;QAEpB,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,aAAa,CAAC,CAAA;QAE3C,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACjD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAE3C,oCAAoC;QACpC,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAA;QACnC,MAAM,YAAY,GAAG,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;QAE5E,iCAAiC;QACjC,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,cAAc,CAAC,CAAA;QAC9C,MAAM,SAAS,GAAW,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QAC5D,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,MAAM;gBACtB,CAAC,CAAC,qBAAqB,CACnB,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,CACnE;gBACH,CAAC,CAAC,EAAE;YACN,WAAW,EAAE,YAAY,CAAC,WAAW;SACtC,CAAA;IACH,CAAC;CACF;AA3BC;IADC,GAAG;8CA2BH"}
+{"version":3,"file":"XmlMerger.js","sourceRoot":"","sources":["../../src/merger/XmlMerger.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AACvD,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,QAAQ,EACR,UAAU,GACX,MAAM,+BAA+B,CAAA;AAEtC,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,WAAW,GAAG;IAClB,aAAa,EAAE,eAAe;IAC9B,eAAe,EAAE,qBAAqB;IACtC,gBAAgB,EAAE,KAAK;IACvB,eAAe,EAAE,KAAK;CACvB,CAAA;AAED,MAAM,aAAa,GAAG;IACpB,GAAG,WAAW;IACd,iBAAiB,EAAE,IAAI;IACvB,kBAAkB,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE;IACvD,mBAAmB,EAAE,KAAK;IAC1B,aAAa,EAAE,KAAK;CACrB,CAAA;AAED,MAAM,cAAc,GAAG;IACrB,GAAG,WAAW;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,UAAU;IACpB,aAAa,EAAE,IAAI;CACpB,CAAA;AAED,MAAM,eAAe,GAAG,CAAC,GAAW,EAAU,EAAE,CAC9C,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;AAE9E,MAAM,OAAO,SAAS;IAGS;IAFZ,SAAS,CAAyB;IAEnD,YAA6B,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QAC9C,IAAI,CAAC,SAAS,GAAG,IAAI,uBAAuB,CAAC,MAAM,CAAC,CAAA;IACtD,CAAC;IAGD,aAAa,CACX,eAAuB,EACvB,UAAkB,EAClB,YAAoB;QAEpB,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,aAAa,CAAC,CAAA;QAE3C,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACjD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAE3C,oCAAoC;QACpC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC9C,MAAM,YAAY,GAAG,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;QAE5E,iCAAiC;QACjC,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,cAAc,CAAC,CAAA;QAC9C,MAAM,SAAS,GAAW,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QAC5D,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;YAC/D,WAAW,EAAE,YAAY,CAAC,WAAW;SACtC,CAAA;IACH,CAAC;IAEO,eAAe,CAAC,GAAW;QACjC,IAAI,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACjC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAA;QACrD,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;QAChC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAA;QACrD,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AA/BC;IADC,GAAG;8CAuBH"}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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 AllPresentStrategy implements ScenarioStrategy {
+    execute(context: MergeContext): MergeResult;
+    private mergeChildren;
+}