sf-git-merge-driver 1.5.4 → 1.6.1

package/README.md

@@ -2,6 +2,7 @@
 
 [![License](https://img.shields.io/badge/License-MIT-blue)]()
 [![Compatibility](https://img.shields.io/badge/Windows%20%7C%20Mac%20%7C%20Linux-Supported-success)]()
+[![Performance](https://img.shields.io/badge/Performance-Dashboard-58a6ff)](https://scolladon.github.io/sf-git-merge-driver/dev/bench/runtime/)
 
 An intelligent Git merge driver specifically designed for Salesforce metadata files. **Eliminates hours** of manual merge conflicts resolution.
 
@@ -330,7 +331,7 @@ EXAMPLES
     $ sf git merge driver install
 ```
 
-_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.5.4/src/commands/git/merge/driver/install.ts)_
+_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.6.1/src/commands/git/merge/driver/install.ts)_
 
 ## `sf git merge driver run`
 
@@ -374,7 +375,7 @@ EXAMPLES
   - output-file is the path to the file where the merged content will be written
 ```
 
-_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.5.4/src/commands/git/merge/driver/run.ts)_
+_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.6.1/src/commands/git/merge/driver/run.ts)_
 
 ## `sf git merge driver uninstall`
 
@@ -404,7 +405,7 @@ EXAMPLES
     $ sf git merge driver uninstall
 ```
 
-_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.5.4/src/commands/git/merge/driver/uninstall.ts)_
+_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.6.1/src/commands/git/merge/driver/uninstall.ts)_
 <!-- commandsstop -->
 
 ## Changelog

package/lib/adapter/FlxXmlParser.d.ts

@@ -0,0 +1,5 @@
+import type { ParsedXml, XmlParser } from './XmlParser.js';
+export declare class FlxXmlParser implements XmlParser {
+    private readonly parser;
+    parse(xml: string): ParsedXml;
+}

package/lib/adapter/FlxXmlParser.js

@@ -0,0 +1,47 @@
+import FlxParser from '@nodable/flexible-xml-parser';
+import { CDATA_PROP_NAME, NAMESPACE_PREFIX, XML_COMMENT_PROP_NAME, } from '../constant/parserConstant.js';
+// valueParsers works at runtime but is missing from the type definitions
+const flxOptions = {
+    skip: { attributes: false, declaration: true },
+    tags: { valueParsers: [] },
+    attributes: { valueParsers: [] },
+    nameFor: { cdata: CDATA_PROP_NAME, comment: XML_COMMENT_PROP_NAME },
+    entityParseOptions: { default: false },
+};
+const cleanParserBugs = (record) => {
+    for (const key of Object.keys(record)) {
+        const val = record[key];
+        if (typeof val !== 'object' || val === null)
+            continue;
+        const child = val;
+        delete child['@_version'];
+        delete child['@_encoding'];
+        if (CDATA_PROP_NAME in child && '#text' in child && child['#text'] === '') {
+            delete child['#text'];
+        }
+        cleanParserBugs(child);
+    }
+};
+const extractNamespaces = (parsed) => {
+    const namespaces = {};
+    for (const key of Object.keys(parsed)) {
+        const childObj = parsed[key];
+        for (const childKey of Object.keys(childObj)) {
+            if (childKey.startsWith(NAMESPACE_PREFIX)) {
+                namespaces[childKey] = childObj[childKey];
+                delete childObj[childKey];
+            }
+        }
+    }
+    return namespaces;
+};
+export class FlxXmlParser {
+    parser = new FlxParser(flxOptions);
+    parse(xml) {
+        const raw = this.parser.parse(xml);
+        cleanParserBugs(raw);
+        const namespaces = extractNamespaces(raw);
+        return { content: raw, namespaces };
+    }
+}
+//# sourceMappingURL=FlxXmlParser.js.map

package/lib/adapter/FlxXmlParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FlxXmlParser.js","sourceRoot":"","sources":["../../src/adapter/FlxXmlParser.ts"],"names":[],"mappings":"AAAA,OAAO,SAA8B,MAAM,8BAA8B,CAAA;AACzE,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,qBAAqB,GACtB,MAAM,+BAA+B,CAAA;AAItC,yEAAyE;AACzE,MAAM,UAAU,GAAG;IACjB,IAAI,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE;IAC9C,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;IAC1B,UAAU,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;IAChC,OAAO,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,qBAAqB,EAAE;IACnE,kBAAkB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;CACzB,CAAA;AAEf,MAAM,eAAe,GAAG,CAAC,MAA+B,EAAQ,EAAE;IAChE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;QACvB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;YAAE,SAAQ;QACrD,MAAM,KAAK,GAAG,GAA8B,CAAA;QAC5C,OAAO,KAAK,CAAC,WAAW,CAAC,CAAA;QACzB,OAAO,KAAK,CAAC,YAAY,CAAC,CAAA;QAC1B,IAAI,eAAe,IAAI,KAAK,IAAI,OAAO,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YAC1E,OAAO,KAAK,CAAC,OAAO,CAAC,CAAA;QACvB,CAAC;QACD,eAAe,CAAC,KAAK,CAAC,CAAA;IACxB,CAAC;AACH,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,CAAC,MAAkB,EAAc,EAAE;IAC3D,MAAM,UAAU,GAAe,EAAE,CAAA;IACjC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAe,CAAA;QAC1C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,IAAI,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAC1C,UAAU,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;gBACzC,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAA;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,OAAO,YAAY;IACN,MAAM,GAAG,IAAI,SAAS,CAAC,UAAU,CAAC,CAAA;IAEnD,KAAK,CAAC,GAAW;QACf,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAe,CAAA;QAChD,eAAe,CAAC,GAA8B,CAAC,CAAA;QAC/C,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;QACzC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,CAAA;IACrC,CAAC;CACF"}

package/lib/adapter/FxpXmlSerializer.d.ts

@@ -0,0 +1,10 @@
+import type { MergeConfig } from '../types/conflictTypes.js';
+import type { JsonArray, JsonObject } from '../types/jsonTypes.js';
+import type { XmlSerializer } from './XmlSerializer.js';
+export declare class FxpXmlSerializer implements XmlSerializer {
+    private readonly formatter;
+    private readonly convert;
+    private readonly builder;
+    constructor(config: MergeConfig);
+    serialize(mergedOutput: JsonArray, namespaces: JsonObject): string;
+}

package/lib/adapter/FxpXmlSerializer.js

@@ -0,0 +1,106 @@
+import { XMLBuilder } from 'fast-xml-parser';
+import { ANCESTOR_CONFLICT_MARKER, LOCAL_CONFLICT_MARKER, OTHER_CONFLICT_MARKER, SEPARATOR, } from '../constant/conflictConstant.js';
+import { SALESFORCE_EOL } from '../constant/metadataConstant.js';
+import { CDATA_PROP_NAME, NAMESPACE_ROOT, TEXT_TAG, XML_COMMENT_PROP_NAME, XML_DECL, XML_INDENT, } from '../constant/parserConstant.js';
+import { ConflictMarkerFormatter } from '../merger/ConflictMarkerFormatter.js';
+import { isConflictBlock } from '../types/conflictBlock.js';
+const builderOptions = {
+    cdataPropName: CDATA_PROP_NAME,
+    commentPropName: XML_COMMENT_PROP_NAME,
+    ignoreAttributes: false,
+    processEntities: false,
+    format: true,
+    indentBy: XML_INDENT,
+    preserveOrder: true,
+};
+// ============================================================================
+// Compact → Ordered Format Converter (created per-serialization with config)
+// ============================================================================
+const isObj = (x) => typeof x === 'object' && x !== null;
+const createConverter = (config) => {
+    const wrapText = (value, attribute) => value == null ? {} : { [attribute]: [{ [TEXT_TAG]: value }] };
+    const expandConflictContent = (content) => {
+        if (content.length === 0)
+            return [{ [TEXT_TAG]: SALESFORCE_EOL }];
+        return content.flatMap((item) => {
+            if (isConflictBlock(item))
+                return expandConflict(item);
+            if (isObj(item))
+                return compactToOrdered(item);
+            return { [TEXT_TAG]: item };
+        });
+    };
+    const expandConflict = (block) => {
+        const localMarker = `${SALESFORCE_EOL}${LOCAL_CONFLICT_MARKER.repeat(config.conflictMarkerSize)} ${config.localConflictTag}`;
+        const baseMarker = `${ANCESTOR_CONFLICT_MARKER.repeat(config.conflictMarkerSize)} ${config.ancestorConflictTag}`;
+        const separator = SEPARATOR.repeat(config.conflictMarkerSize);
+        const otherMarker = `${OTHER_CONFLICT_MARKER.repeat(config.conflictMarkerSize)} ${config.otherConflictTag}`;
+        return [
+            { [TEXT_TAG]: localMarker },
+            ...expandConflictContent(block.local),
+            { [TEXT_TAG]: baseMarker },
+            ...expandConflictContent(block.ancestor),
+            { [TEXT_TAG]: separator },
+            ...expandConflictContent(block.other),
+            { [TEXT_TAG]: otherMarker },
+        ];
+    };
+    const convertItem = (item) => {
+        if (isConflictBlock(item))
+            return expandConflict(item);
+        if (isObj(item))
+            return compactToOrdered(item);
+        return [{ [TEXT_TAG]: item }];
+    };
+    const compactToOrdered = (input) => {
+        const keys = Object.keys(input).sort();
+        return keys.flatMap(attribute => {
+            const value = input[attribute];
+            if (Array.isArray(value)) {
+                const children = value.flatMap(convertItem);
+                return { [attribute]: children };
+            }
+            if (isObj(value)) {
+                if (isConflictBlock(value))
+                    return expandConflict(value);
+                return { [attribute]: compactToOrdered(value) };
+            }
+            return wrapText(value, attribute);
+        });
+    };
+    return compactToOrdered;
+};
+// ============================================================================
+// Namespace + Post-processing
+// ============================================================================
+const insertNamespaces = (output, namespaces) => {
+    if (Object.keys(namespaces).length === 0 || output.length === 0)
+        return;
+    const root = output[0];
+    root[NAMESPACE_ROOT] = { ...namespaces };
+};
+const correctComments = (xml) => xml.includes('<!--') ? xml.replace(/\s+<!--(.*?)-->\s+/g, '<!--$1-->') : xml;
+// ============================================================================
+// Serializer
+// ============================================================================
+export class FxpXmlSerializer {
+    formatter;
+    convert;
+    builder;
+    constructor(config) {
+        this.formatter = new ConflictMarkerFormatter(config);
+        this.convert = createConverter(config);
+        this.builder = new XMLBuilder(builderOptions);
+    }
+    serialize(mergedOutput, namespaces) {
+        const ordered = mergedOutput.flatMap((item) => isObj(item) ? this.convert(item) : [{ [TEXT_TAG]: item }]);
+        insertNamespaces(ordered, namespaces);
+        const xml = this.builder.build(ordered);
+        let result = XML_DECL.concat(xml);
+        result = this.formatter.handleSpecialEntities(result);
+        result = correctComments(result);
+        result = this.formatter.correctConflictIndent(result);
+        return result;
+    }
+}
+//# sourceMappingURL=FxpXmlSerializer.js.map

package/lib/adapter/FxpXmlSerializer.js.map

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

package/lib/adapter/XmlParser.d.ts

@@ -0,0 +1,8 @@
+import type { JsonObject } from '../types/jsonTypes.js';
+export interface ParsedXml {
+    readonly content: JsonObject;
+    readonly namespaces: JsonObject;
+}
+export interface XmlParser {
+    parse(xml: string): ParsedXml;
+}

package/lib/adapter/XmlParser.js

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

package/lib/adapter/XmlParser.js.map

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

package/lib/adapter/XmlSerializer.d.ts

@@ -0,0 +1,4 @@
+import type { JsonArray, JsonObject } from '../types/jsonTypes.js';
+export interface XmlSerializer {
+    serialize(mergedOutput: JsonArray, namespaces: JsonObject): string;
+}

package/lib/adapter/XmlSerializer.js

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

package/lib/adapter/XmlSerializer.js.map

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

package/lib/merger/ConflictMarkerBuilder.d.ts

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

package/lib/merger/ConflictMarkerBuilder.js

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

package/lib/merger/ConflictMarkerBuilder.js.map

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

package/lib/merger/JsonMerger.js

@@ -1,18 +1,15 @@
 import { __decorate } from "tslib";
-import { NamespaceHandler } from '../service/NamespaceHandler.js';
 import { combineResults } from '../types/mergeResult.js';
 import { log } from '../utils/LoggingDecorator.js';
 import { MergeOrchestrator } from './MergeOrchestrator.js';
+import { getUniqueSortedProps } from './mergePropertyKeys.js';
 import { defaultNodeFactory } from './nodes/MergeNodeFactory.js';
-import { getUniqueSortedProps } from './nodes/nodeUtils.js';
 export class JsonMerger {
     orchestrator;
     constructor(config) {
         this.orchestrator = new MergeOrchestrator(config, defaultNodeFactory);
     }
     mergeThreeWay(ancestor, local, other) {
-        const namespaceHandler = new NamespaceHandler();
-        const namespaces = namespaceHandler.processNamespaces(ancestor, local, other);
         const results = [];
         const props = getUniqueSortedProps(ancestor, local, other);
         for (const key of props) {
@@ -24,7 +21,6 @@ export class JsonMerger {
             results.push(result);
         }
         const combined = combineResults(results);
-        namespaceHandler.addNamespacesToResult(combined.output, namespaces);
         return {
             output: combined.output,
             hasConflict: combined.hasConflict,

package/lib/merger/JsonMerger.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonMerger.js","sourceRoot":"","sources":["../../src/merger/JsonMerger.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAIjE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAE3D,MAAM,OAAO,UAAU;IACJ,YAAY,CAAmB;IAEhD,YAAY,MAAmB;QAC7B,IAAI,CAAC,YAAY,GAAG,IAAI,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;IACvE,CAAC;IAGM,aAAa,CAClB,QAAgC,EAChC,KAA6B,EAC7B,KAA6B;QAE7B,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAA;QAC/C,MAAM,UAAU,GAAG,gBAAgB,CAAC,iBAAiB,CACnD,QAAQ,EACR,KAAK,EACL,KAAK,CACN,CAAA;QAED,MAAM,OAAO,GAAkB,EAAE,CAAA;QACjC,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QAE1D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CACpC,QAAQ,CAAC,GAAG,CAAC,EACb,KAAK,CAAC,GAAG,CAAC,EACV,KAAK,CAAC,GAAG,CAAC,EACV,SAAS,EACT;gBACE,IAAI,EAAE,GAAG;gBACT,aAAa,EAAE,GAAG,IAAI,KAAK;gBAC3B,aAAa,EAAE,GAAG,IAAI,KAAK;aAC5B,CACF,CAAA;YACD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACtB,CAAC;QAED,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;QACxC,gBAAgB,CAAC,qBAAqB,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAEnE,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,WAAW,EAAE,QAAQ,CAAC,WAAW;SAClC,CAAA;IACH,CAAC;CACF;AAtCQ;IADN,GAAG;+CAsCH"}
+{"version":3,"file":"JsonMerger.js","sourceRoot":"","sources":["../../src/merger/JsonMerger.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAEhE,MAAM,OAAO,UAAU;IACJ,YAAY,CAAmB;IAEhD,YAAY,MAAmB;QAC7B,IAAI,CAAC,YAAY,GAAG,IAAI,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;IACvE,CAAC;IAGM,aAAa,CAClB,QAAgC,EAChC,KAA6B,EAC7B,KAA6B;QAE7B,MAAM,OAAO,GAAkB,EAAE,CAAA;QACjC,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;QAE1D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CACpC,QAAQ,CAAC,GAAG,CAAC,EACb,KAAK,CAAC,GAAG,CAAC,EACV,KAAK,CAAC,GAAG,CAAC,EACV,SAAS,EACT;gBACE,IAAI,EAAE,GAAG;gBACT,aAAa,EAAE,GAAG,IAAI,KAAK;gBAC3B,aAAa,EAAE,GAAG,IAAI,KAAK;aAC5B,CACF,CAAA;YACD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACtB,CAAC;QAED,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;QACxC,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,WAAW,EAAE,QAAQ,CAAC,WAAW;SAClC,CAAA;IACH,CAAC;CACF;AA7BQ;IADN,GAAG;+CA6BH"}

package/lib/merger/MergeScenarioFactory.js

@@ -1,15 +1,25 @@
-import { isEmpty } from 'lodash-es';
 import { MergeScenario } from '../types/mergeScenario.js';
+const isPresent = (value) => {
+    if (value == null)
+        return false;
+    if (typeof value === 'string')
+        return value.length > 0;
+    if (Array.isArray(value))
+        return value.length > 0;
+    if (typeof value === 'object')
+        return Object.keys(value).length > 0;
+    return true;
+};
 export const getScenario = (ancestor, local, other) => {
     let scenario = MergeScenario.NONE;
-    if (!isEmpty(ancestor)) {
-        scenario += 100;
+    if (isPresent(ancestor)) {
+        scenario |= MergeScenario.ANCESTOR_ONLY;
     }
-    if (!isEmpty(local)) {
-        scenario += 10;
+    if (isPresent(local)) {
+        scenario |= MergeScenario.LOCAL_ONLY;
     }
-    if (!isEmpty(other)) {
-        scenario += 1;
+    if (isPresent(other)) {
+        scenario |= MergeScenario.OTHER_ONLY;
     }
     return scenario;
 };

package/lib/merger/MergeScenarioFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"MergeScenarioFactory.js","sourceRoot":"","sources":["../../src/merger/MergeScenarioFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAEzD,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,QAAmB,EACnB,KAAgB,EAChB,KAAgB,EACD,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"}
+{"version":3,"file":"MergeScenarioFactory.js","sourceRoot":"","sources":["../../src/merger/MergeScenarioFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAEzD,MAAM,SAAS,GAAG,CAAC,KAAgB,EAAW,EAAE;IAC9C,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,KAAK,CAAA;IAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAA;IACtD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAA;IACjD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA;IACnE,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,QAAmB,EACnB,KAAgB,EAChB,KAAgB,EACD,EAAE;IACjB,IAAI,QAAQ,GAAG,aAAa,CAAC,IAAc,CAAA;IAC3C,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxB,QAAQ,IAAI,aAAa,CAAC,aAAa,CAAA;IACzC,CAAC;IACD,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,QAAQ,IAAI,aAAa,CAAC,UAAU,CAAA;IACtC,CAAC;IACD,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,QAAQ,IAAI,aAAa,CAAC,UAAU,CAAA;IACtC,CAAC;IACD,OAAO,QAAyB,CAAA;AAClC,CAAC,CAAA"}

package/lib/merger/XmlMerger.d.ts

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

package/lib/merger/XmlMerger.js

@@ -1,57 +1,31 @@
 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 { FlxXmlParser } from '../adapter/FlxXmlParser.js';
+import { FxpXmlSerializer } from '../adapter/FxpXmlSerializer.js';
 import { log } from '../utils/LoggingDecorator.js';
-import { ConflictMarkerFormatter } from './ConflictMarkerFormatter.js';
 import { JsonMerger } from './JsonMerger.js';
-const baseOptions = {
-    cdataPropName: CDATA_PROP_NAME,
-    commentPropName: XML_COMMENT_PROP_NAME,
-    ignoreAttributes: false,
-    processEntities: false,
-};
-const parserOptions = {
-    ...baseOptions,
-    ignoreDeclaration: true,
-    numberParseOptions: { leadingZeros: false, hex: false },
-    parseAttributeValue: false,
-    parseTagValue: false,
-};
-const builderOptions = {
-    ...baseOptions,
-    format: true,
-    indentBy: XML_INDENT,
-    preserveOrder: true,
-};
-const correctComments = (xml) => xml.includes('<!--') ? xml.replace(/\s+<!--(.*?)-->\s+/g, '<!--$1-->') : xml;
+const mergeNamespaces = (...maps) => Object.assign({}, ...maps);
 export class XmlMerger {
-    config;
-    formatter;
+    parser;
+    serializer;
+    jsonMerger;
     constructor(config) {
-        this.config = config;
-        this.formatter = new ConflictMarkerFormatter(config);
+        this.parser = new FlxXmlParser();
+        this.serializer = new FxpXmlSerializer(config);
+        this.jsonMerger = new JsonMerger(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);
-        const jsonMerger = new JsonMerger(this.config);
-        const mergedResult = jsonMerger.mergeThreeWay(ancestorObj, ourObj, theirObj);
-        const builder = new XMLBuilder(builderOptions);
-        const mergedXml = builder.build(mergedResult.output);
+        const ancestor = this.parser.parse(ancestorContent);
+        const local = this.parser.parse(ourContent);
+        const other = this.parser.parse(theirContent);
+        const namespaces = mergeNamespaces(ancestor.namespaces, local.namespaces, other.namespaces);
+        const mergedResult = this.jsonMerger.mergeThreeWay(ancestor.content, local.content, other.content);
         return {
-            output: mergedXml.length ? this.formatXmlOutput(mergedXml) : '',
+            output: mergedResult.output.length
+                ? this.serializer.serialize(mergedResult.output, namespaces)
+                : '',
             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,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,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,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;AA7BC;IADC,GAAG;8CAqBH"}
+{"version":3,"file":"XmlMerger.js","sourceRoot":"","sources":["../../src/merger/XmlMerger.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAKjE,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,eAAe,GAAG,CAAC,GAAG,IAAkB,EAAc,EAAE,CAC5D,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAA;AAE5B,MAAM,OAAO,SAAS;IACH,MAAM,CAAW;IACjB,UAAU,CAAe;IACzB,UAAU,CAAY;IAEvC,YAAY,MAAmB;QAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,YAAY,EAAE,CAAA;QAChC,IAAI,CAAC,UAAU,GAAG,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAA;QAC9C,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;IAC1C,CAAC;IAGD,aAAa,CACX,eAAuB,EACvB,UAAkB,EAClB,YAAoB;QAEpB,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACnD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAE7C,MAAM,UAAU,GAAG,eAAe,CAChC,QAAQ,CAAC,UAAU,EACnB,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,UAAU,CACjB,CAAA;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAChD,QAAQ,CAAC,OAAO,EAChB,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,OAAO,CACd,CAAA;QAED,OAAO;YACL,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,MAAM;gBAChC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC;gBAC5D,CAAC,CAAC,EAAE;YACN,WAAW,EAAE,YAAY,CAAC,WAAW;SACtC,CAAA;IACH,CAAC;CACF;AA5BC;IADC,GAAG;8CA4BH"}

package/lib/merger/mergePropertyKeys.d.ts

@@ -0,0 +1,2 @@
+import type { JsonArray, JsonObject } from '../types/jsonTypes.js';
+export declare const getUniqueSortedProps: (...objects: (JsonObject | JsonArray)[]) => string[];

package/lib/merger/mergePropertyKeys.js

@@ -0,0 +1,11 @@
+export const getUniqueSortedProps = (...objects) => {
+    const keys = new Set();
+    for (const obj of objects) {
+        if (obj != null) {
+            for (const key of Object.keys(obj))
+                keys.add(key);
+        }
+    }
+    return [...keys].sort();
+};
+//# sourceMappingURL=mergePropertyKeys.js.map

package/lib/merger/mergePropertyKeys.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergePropertyKeys.js","sourceRoot":"","sources":["../../src/merger/mergePropertyKeys.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,GAAG,OAAmC,EAC5B,EAAE;IACZ,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAC9B,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YAChB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;gBAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;AACzB,CAAC,CAAA"}

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

@@ -0,0 +1,3 @@
+import type { JsonArray, JsonObject } from '../../types/jsonTypes.js';
+export type KeyExtractor = (item: JsonObject) => string;
+export declare const buildKeyedMap: (arr: JsonArray, keyField: KeyExtractor) => Map<string, JsonObject>;

package/lib/merger/nodes/KeyedArrayIndex.js

@@ -0,0 +1,9 @@
+export const buildKeyedMap = (arr, keyField) => {
+    const map = new Map();
+    for (const item of arr) {
+        const key = keyField(item);
+        map.set(key, item);
+    }
+    return map;
+};
+//# sourceMappingURL=KeyedArrayIndex.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"KeyedArrayIndex.js","sourceRoot":"","sources":["../../../src/merger/nodes/KeyedArrayIndex.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,GAAc,EACd,QAAsB,EACG,EAAE;IAC3B,MAAM,GAAG,GAAG,IAAI,GAAG,EAAsB,CAAA;IACzC,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAkB,CAAC,CAAA;QACxC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAkB,CAAC,CAAA;IAClC,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}

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

@@ -1,12 +1,15 @@
 import type { MergeConfig } from '../../types/conflictTypes.js';
 import type { JsonArray } from '../../types/jsonTypes.js';
 import type { MergeResult } from '../../types/mergeResult.js';
+import type { KeyExtractor } from './KeyedArrayIndex.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);
+    private readonly keyField;
+    private readonly isOrdered;
+    constructor(ancestor: JsonArray, local: JsonArray, other: JsonArray, attribute: string, keyField: KeyExtractor | undefined, isOrdered: boolean);
     merge(config: MergeConfig): MergeResult;
 }