sf-git-merge-driver 1.0.0-dev-3.13704714225-2

package/LICENSE.md

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2025 Sebastien Colladon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -0,0 +1,74 @@
+# Salesforce Metadata Git Merge Driver
+
+A custom Git merge driver designed specifically for Salesforce metadata files. This tool helps resolve merge conflicts in Salesforce XML metadata files by understanding their structure and intelligently merging changes.
+
+## Features
+
+- Intelligent merging of Salesforce XML metadata files
+- Handles complex metadata structures like arrays with unique identifiers
+- Supports both local and global installation
+- Easy to use with SFDX CLI plugin commands
+
+## Installation
+
+### As SFDX Plugin
+
+```bash
+sf plugins install sf-git-merge-driver
+```
+
+### Local Repository Installation
+
+```bash
+sf git merge driver install
+```
+
+This will:
+- Configure your Git settings to use the merge driver
+- Add appropriate entries to your `.gitattributes` file
+- Set up the driver to handle XML files
+
+## Uninstallation
+
+```bash
+sf git merge driver uninstall
+```
+
+## How It Works
+
+The merge driver works by:
+1. Converting XML to JSON for easier processing
+2. Using a specialized three-way merge algorithm that understands Salesforce metadata structures
+3. Intelligently resolving conflicts based on metadata type
+4. Converting the merged result back to properly formatted XML
+
+## Configuration
+
+The driver is configured to work with `.xml` files by default. The installation adds the following to your `.gitattributes` file:
+
+```
+*.xml merge=salesforce-source
+```
+
+## Changelog
+
+[changelog.md](CHANGELOG.md) is available for consultation.
+
+## Versioning
+
+Versioning follows [SemVer](http://semver.org/) specification.
+
+## Authors
+
+- **Kevin Gossent** - [yohanim](https://github.com/yohanim)
+- **Sebastien Colladon** - [scolladon](https://github.com/scolladon)
+
+## Contributing
+
+Contributions are what make the trailblazer community such an amazing place. I regard this component as a way to inspire and learn from others. Any contributions you make are **appreciated**.
+
+See [contributing.md](CONTRIBUTING.md) for sgd contribution principles.
+
+## License
+
+This project license is MIT - see the [LICENSE.md](LICENSE.md) file for details

package/bin/dev.cmd

@@ -0,0 +1,3 @@
+@echo off
+
+node --loader ts-node/esm --no-warnings=ExperimentalWarning "%~dp0\dev" %*

package/bin/dev.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env -S NODE_OPTIONS="--no-warnings=ExperimentalWarning" npx ts-node --project tsconfig.json --esm
+async function main() {
+  const { execute } = await import('@oclif/core')
+  await execute({ development: true, dir: import.meta.url })
+}
+
+await main()

package/bin/run.cmd

@@ -0,0 +1,3 @@
+@echo off
+
+node "%~dp0\run" %*

package/bin/run.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+async function main() {
+  const { execute } = await import('@oclif/core')
+  await execute({ dir: import.meta.url })
+}
+
+await main()

package/lib/commands/git/merge/driver/install.d.ts

@@ -0,0 +1,8 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+export default class Install extends SfCommand<void> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly flags: {};
+    run(): Promise<void>;
+}

package/lib/commands/git/merge/driver/install.js

@@ -0,0 +1,21 @@
+import { Messages } from '@salesforce/core';
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { InstallService } from '../../../../service/installService.js';
+import { UninstallService } from '../../../../service/uninstallService.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('sf-git-merge-driver', 'install');
+export default class Install extends SfCommand {
+    static summary = messages.getMessage('summary');
+    static description = messages.getMessage('description');
+    static examples = messages.getMessages('examples');
+    static flags = {};
+    async run() {
+        try {
+            await new UninstallService().uninstallMergeDriver();
+            // biome-ignore lint/suspicious/noEmptyBlockStatements: <explanation>
+        }
+        catch { }
+        await new InstallService().installMergeDriver();
+    }
+}
+//# sourceMappingURL=install.js.map

package/lib/commands/git/merge/driver/install.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAE1E,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,qBAAqB,EAAE,SAAS,CAAC,CAAA;AAExE,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,SAAe;IAC3C,MAAM,CAAmB,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACjE,MAAM,CAAmB,WAAW,GACzC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC7B,MAAM,CAAmB,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IAEpE,MAAM,CAAmB,KAAK,GAAG,EAAE,CAAA;IAEnC,KAAK,CAAC,GAAG;QACd,IAAI,CAAC;YACH,MAAM,IAAI,gBAAgB,EAAE,CAAC,oBAAoB,EAAE,CAAA;YACnD,qEAAqE;QACvE,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QACV,MAAM,IAAI,cAAc,EAAE,CAAC,kBAAkB,EAAE,CAAA;IACjD,CAAC"}

package/lib/commands/git/merge/driver/uninstall.d.ts

@@ -0,0 +1,8 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+export default class Uninstall extends SfCommand<void> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly flags: {};
+    run(): Promise<void>;
+}

package/lib/commands/git/merge/driver/uninstall.js

@@ -0,0 +1,15 @@
+import { Messages } from '@salesforce/core';
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { UninstallService } from '../../../../service/uninstallService.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('sf-git-merge-driver', 'uninstall');
+export default class Uninstall extends SfCommand {
+    static summary = messages.getMessage('summary');
+    static description = messages.getMessage('description');
+    static examples = messages.getMessages('examples');
+    static flags = {};
+    async run() {
+        await new UninstallService().uninstallMergeDriver();
+    }
+}
+//# sourceMappingURL=uninstall.js.map

package/lib/commands/git/merge/driver/uninstall.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../../src/commands/git/merge/driver/uninstall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AAE1E,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAA;AAE1E,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAe;IAC7C,MAAM,CAAmB,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACjE,MAAM,CAAmB,WAAW,GACzC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;IAC7B,MAAM,CAAmB,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;IAEpE,MAAM,CAAmB,KAAK,GAAG,EAAE,CAAA;IAEnC,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,gBAAgB,EAAE,CAAC,oBAAoB,EAAE,CAAA;IACrD,CAAC"}

package/lib/constant/driverConstant.d.ts

@@ -0,0 +1 @@
+export declare const DRIVER_NAME = "salesforce-source";

package/lib/constant/driverConstant.js

@@ -0,0 +1,2 @@
+export const DRIVER_NAME = 'salesforce-source';
+//# sourceMappingURL=driverConstant.js.map

package/lib/constant/driverConstant.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"driverConstant.js","sourceRoot":"","sources":["../../src/constant/driverConstant.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,mBAAmB,CAAA"}

package/lib/driver/MergeDriver.d.ts

@@ -0,0 +1,3 @@
+export declare class MergeDriver {
+    mergeFiles(ancestorFile: any, ourFile: any, theirFile: any, outputFile: any): Promise<void>;
+}

package/lib/driver/MergeDriver.js

@@ -0,0 +1,17 @@
+import { readFile, writeFile } from 'node:fs/promises';
+import { XmlMerger } from '../merger/XmlMerger.js';
+export class MergeDriver {
+    async mergeFiles(ancestorFile, ourFile, theirFile, outputFile) {
+        // Read all three versions
+        const [ancestorContent, ourContent, theirContent] = await Promise.all([
+            readFile(ancestorFile, 'utf8'),
+            readFile(ourFile, 'utf8'),
+            readFile(theirFile, 'utf8'),
+        ]);
+        const xmlMerger = new XmlMerger();
+        const mergedContent = await xmlMerger.tripartXmlMerge(ancestorContent, ourContent, theirContent);
+        // Write the merged content to the output file
+        await writeFile(outputFile, mergedContent);
+    }
+}
+//# sourceMappingURL=MergeDriver.js.map

package/lib/driver/MergeDriver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MergeDriver.js","sourceRoot":"","sources":["../../src/driver/MergeDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,MAAM,OAAO,WAAW;IACtB,KAAK,CAAC,UAAU,CAAC,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU;QAC3D,0BAA0B;QAC1B,MAAM,CAAC,eAAe,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;YAC9B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;YACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;SAC5B,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAA;QAEjC,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,eAAe,CACnD,eAAe,EACf,UAAU,EACV,YAAY,CACb,CAAA;QAED,8CAA8C;QAC9C,MAAM,SAAS,CAAC,UAAU,EAAE,aAAa,CAAC,CAAA;IAC5C,CAAC;CACF"}

package/lib/index.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env -S NODE_OPTIONS="--no-warnings=ExperimentalWarning" npx ts-node --project tsconfig.json --esm
+export {};

package/lib/index.js

@@ -0,0 +1,18 @@
+#!/usr/bin/env -S NODE_OPTIONS="--no-warnings=ExperimentalWarning" npx ts-node --project tsconfig.json --esm
+import { MergeDriver } from './driver/MergeDriver.js';
+if (process.argv.length >= 6) {
+    const [, , ancestorFile, ourFile, theirFile, outputFile] = process.argv;
+    const mergeDriver = new MergeDriver();
+    mergeDriver
+        .mergeFiles(ancestorFile, ourFile, theirFile, outputFile)
+        .then(() => process.exit(0));
+}
+else {
+    console.error('Usage: sf-git-merge-driver %O %A %B %P');
+    console.error('  %O: ancestor file');
+    console.error('  %A: our file');
+    console.error('  %B: their file');
+    console.error('  %P: output file path');
+    process.exit(1);
+}
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,AAAD,EAAG,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,GAAG,OAAO,CAAC,IAAI,CAAA;IACvE,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAA;IACrC,WAAW;SACR,UAAU,CAAC,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC;SACxD,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAChC,CAAC;KAAM,CAAC;IACN,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAA;IACvD,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;IAC/B,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IACjC,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAA;IACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC"}

package/lib/merger/JsonMerger.d.ts

@@ -0,0 +1,14 @@
+type JsonValue = string | number | boolean | null | JsonObject | JsonArray;
+interface JsonObject {
+    [key: string]: JsonValue;
+}
+interface JsonArray extends Array<JsonValue> {
+}
+export declare class JsonMerger {
+    private readonly idFields;
+    mergeObjects(ancestor: JsonValue | undefined, ours: JsonValue, theirs: JsonValue): JsonValue;
+    private mergeArrays;
+    private hasIdField;
+    private createIdMap;
+}
+export {};

package/lib/merger/JsonMerger.js

@@ -0,0 +1,90 @@
+export class JsonMerger {
+    idFields = [
+        'fullName',
+        'name',
+        'field',
+        'label',
+        'id',
+        '@_name',
+    ];
+    mergeObjects(ancestor, ours, theirs) {
+        // Handle null/undefined cases
+        if (ours === null || theirs === null)
+            return ours ?? theirs;
+        if (typeof ours !== typeof theirs)
+            return ours;
+        // Handle arrays (special case for Salesforce metadata)
+        if (Array.isArray(ours) && Array.isArray(theirs)) {
+            return this.mergeArrays(Array.isArray(ancestor) ? ancestor : undefined, ours, theirs);
+        }
+        // Handle objects
+        if (typeof ours === 'object' && typeof theirs === 'object') {
+            const result = { ...ours };
+            const ancestorObj = (ancestor ?? {});
+            const theirsObj = theirs;
+            // Process all keys from both objects
+            const allKeys = new Set([...Object.keys(ours), ...Object.keys(theirs)]);
+            for (const key of allKeys) {
+                if (!(key in theirsObj))
+                    continue; // Keep our version
+                if (!(key in result)) {
+                    result[key] = theirsObj[key]; // Take their version
+                    continue;
+                }
+                // Recursively merge when both have the key
+                result[key] = this.mergeObjects(ancestorObj[key], result[key], theirsObj[key]);
+            }
+            return result;
+        }
+        // For primitive values, use their changes if we didn't modify from ancestor
+        if (theirs !== ancestor && ours === ancestor)
+            return theirs;
+        return ours; // Default to our version
+    }
+    mergeArrays(ancestor, ours, theirs) {
+        // Find the first matching ID field that exists in both arrays
+        const idField = this.idFields.find(field => ours.some(item => this.hasIdField(item, field)) &&
+            theirs.some(item => this.hasIdField(item, field)));
+        if (!idField)
+            return ours; // No common identifier, keep our version
+        // Create lookup maps
+        const ourMap = this.createIdMap(ours, idField);
+        const theirMap = this.createIdMap(theirs, idField);
+        const ancestorMap = ancestor
+            ? this.createIdMap(ancestor, idField)
+            : new Map();
+        const result = [...ours];
+        const processed = new Set();
+        // Process all items from both arrays
+        for (const [id, ourItem] of ourMap) {
+            const theirItem = theirMap.get(id);
+            if (theirItem) {
+                // Item exists in both versions, merge them
+                const index = result.findIndex(item => this.hasIdField(item, idField) && item[idField] === id);
+                if (index !== -1) {
+                    result[index] = this.mergeObjects(ancestorMap.get(id), ourItem, theirItem);
+                }
+            }
+            processed.add(id);
+        }
+        // Add items that only exist in their version
+        for (const [id, theirItem] of theirMap) {
+            if (!processed.has(id)) {
+                result.push(theirItem);
+            }
+        }
+        return result;
+    }
+    hasIdField(item, field) {
+        return (item !== null &&
+            typeof item === 'object' &&
+            !Array.isArray(item) &&
+            field in item);
+    }
+    createIdMap(arr, idField) {
+        return new Map(arr
+            .filter(item => this.hasIdField(item, idField))
+            .map(item => [String(item[idField]), item]));
+    }
+}
+//# sourceMappingURL=JsonMerger.js.map

package/lib/merger/JsonMerger.js.map

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

package/lib/merger/XmlMerger.d.ts

@@ -0,0 +1,3 @@
+export declare class XmlMerger {
+    tripartXmlMerge(ancestorContent: string, ourContent: string, theirContent: string): Promise<any>;
+}

package/lib/merger/XmlMerger.js

@@ -0,0 +1,32 @@
+import { XMLBuilder, XMLParser } from 'fast-xml-parser';
+import { JsonMerger } from './JsonMerger.js';
+const options = {
+    attributeNamePrefix: '@_',
+    commentPropName: '#comment',
+    format: true,
+    ignoreAttributes: false,
+    ignoreNameSpace: false,
+    indentBy: '    ',
+    parseAttributeValue: false,
+    parseNodeValue: false,
+    parseTagValue: false,
+    processEntities: false,
+    suppressEmptyNode: false,
+    trimValues: true,
+};
+export class XmlMerger {
+    async tripartXmlMerge(ancestorContent, ourContent, theirContent) {
+        const parser = new XMLParser(options);
+        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 mergedObj = jsonMerger.mergeObjects(ancestorObj, ourObj, theirObj);
+        // Convert back to XML and format
+        const builder = new XMLBuilder(options);
+        const mergedXml = builder.build(mergedObj);
+        return mergedXml;
+    }
+}
+//# sourceMappingURL=XmlMerger.js.map

package/lib/merger/XmlMerger.js.map

@@ -0,0 +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,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,OAAO,GAAG;IACd,mBAAmB,EAAE,IAAI;IACzB,eAAe,EAAE,UAAU;IAC3B,MAAM,EAAE,IAAI;IACZ,gBAAgB,EAAE,KAAK;IACvB,eAAe,EAAE,KAAK;IACtB,QAAQ,EAAE,MAAM;IAChB,mBAAmB,EAAE,KAAK;IAC1B,cAAc,EAAE,KAAK;IACrB,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,KAAK;IACtB,iBAAiB,EAAE,KAAK;IACxB,UAAU,EAAE,IAAI;CACjB,CAAA;AAED,MAAM,OAAO,SAAS;IACpB,KAAK,CAAC,eAAe,CACnB,eAAuB,EACvB,UAAkB,EAClB,YAAoB;QAEpB,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,CAAA;QAErC,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;QAEpC,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAA;QACnC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;QAExE,iCAAiC;QACjC,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAA;QACvC,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAC1C,OAAO,SAAS,CAAA;IAClB,CAAC;CACF"}

package/lib/service/installService.d.ts

@@ -0,0 +1,3 @@
+export declare class InstallService {
+    installMergeDriver(): Promise<void>;
+}

package/lib/service/installService.js

@@ -0,0 +1,24 @@
+import { appendFile, chmod, copyFile, mkdir } from 'node:fs/promises';
+import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { simpleGit } from 'simple-git';
+import { DRIVER_NAME } from '../constant/driverConstant.js';
+const currentDir = fileURLToPath(new URL('.', import.meta.url));
+const libIndexPath = join(currentDir, '../../lib/index.js');
+const binaryPath = 'node_modules/.bin';
+const localBinPath = `${binaryPath}/sf-git-merge-driver`;
+export class InstallService {
+    async installMergeDriver() {
+        await mkdir(binaryPath, { recursive: true });
+        await copyFile(libIndexPath, localBinPath);
+        await chmod(localBinPath, 0o755);
+        const git = simpleGit();
+        await git.addConfig(`merge.${DRIVER_NAME}.name`, 'Salesforce source merge driver');
+        await git.addConfig(`merge.${DRIVER_NAME}.driver`, `${localBinPath} %O %A %B %P`);
+        await git.addConfig(`merge.${DRIVER_NAME}.recursive`, 'true');
+        const content = ['*.xml'].map(pattern => `${pattern} merge=${DRIVER_NAME}`).join('\n') +
+            '\n';
+        await appendFile('.gitattributes', content, { flag: 'a' });
+    }
+}
+//# sourceMappingURL=installService.js.map

package/lib/service/installService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"installService.js","sourceRoot":"","sources":["../../src/service/installService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACrE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAE3D,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;AAC/D,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAA;AAC3D,MAAM,UAAU,GAAG,mBAAmB,CAAA;AACtC,MAAM,YAAY,GAAG,GAAG,UAAU,sBAAsB,CAAA;AAExD,MAAM,OAAO,cAAc;IAClB,KAAK,CAAC,kBAAkB;QAC7B,MAAM,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC5C,MAAM,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;QAC1C,MAAM,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;QAEhC,MAAM,GAAG,GAAG,SAAS,EAAE,CAAA;QACvB,MAAM,GAAG,CAAC,SAAS,CACjB,SAAS,WAAW,OAAO,EAC3B,gCAAgC,CACjC,CAAA;QACD,MAAM,GAAG,CAAC,SAAS,CACjB,SAAS,WAAW,SAAS,EAC7B,GAAG,YAAY,cAAc,CAC9B,CAAA;QACD,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,WAAW,YAAY,EAAE,MAAM,CAAC,CAAA;QAE7D,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,UAAU,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YACtE,IAAI,CAAA;QAEN,MAAM,UAAU,CAAC,gBAAgB,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;IAC5D,CAAC;CACF"}

package/lib/service/uninstallService.d.ts

@@ -0,0 +1,3 @@
+export declare class UninstallService {
+    uninstallMergeDriver(): Promise<void>;
+}

package/lib/service/uninstallService.js

@@ -0,0 +1,29 @@
+import { readFile, unlink, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { simpleGit } from 'simple-git';
+import { DRIVER_NAME } from '../constant/driverConstant.js';
+const MERGE_DRIVER_CONFIG = new RegExp(`.* merge\\s*=\\s*${DRIVER_NAME}$`);
+const localBinPath = join(process.cwd(), 'node_modules/.bin/sf-git-merge-driver');
+export class UninstallService {
+    async uninstallMergeDriver() {
+        try {
+            await unlink(localBinPath);
+            // biome-ignore lint/suspicious/noEmptyBlockStatements: <explanation>
+        }
+        catch { }
+        const git = simpleGit();
+        try {
+            await git.raw(['config', '--remove-section', `merge.${DRIVER_NAME}`]);
+            // biome-ignore lint/suspicious/noEmptyBlockStatements: <explanation>
+        }
+        catch { }
+        const gitAttributes = await readFile('.gitattributes', {
+            encoding: 'utf8',
+        });
+        const filteredAttributes = gitAttributes
+            .split('\n')
+            .filter(line => !MERGE_DRIVER_CONFIG.test(line));
+        await writeFile('.gitattributes', filteredAttributes.join('\n'));
+    }
+}
+//# sourceMappingURL=uninstallService.js.map

package/lib/service/uninstallService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uninstallService.js","sourceRoot":"","sources":["../../src/service/uninstallService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAE3D,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,oBAAoB,WAAW,GAAG,CAAC,CAAA;AAC1E,MAAM,YAAY,GAAG,IAAI,CACvB,OAAO,CAAC,GAAG,EAAE,EACb,uCAAuC,CACxC,CAAA;AAED,MAAM,OAAO,gBAAgB;IACpB,KAAK,CAAC,oBAAoB;QAC/B,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,YAAY,CAAC,CAAA;YAC1B,qEAAqE;QACvE,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAEV,MAAM,GAAG,GAAG,SAAS,EAAE,CAAA;QACvB,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,kBAAkB,EAAE,SAAS,WAAW,EAAE,CAAC,CAAC,CAAA;YACrE,qEAAqE;QACvE,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAEV,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,gBAAgB,EAAE;YACrD,QAAQ,EAAE,MAAM;SACjB,CAAC,CAAA;QACF,MAAM,kBAAkB,GAAG,aAAa;aACrC,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAClD,MAAM,SAAS,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAClE,CAAC;CACF"}

package/messages/install.md

@@ -0,0 +1,13 @@
+# summary
+
+Installs a local git merge driver for the given org and branch.
+
+# description
+
+Installs a local git merge driver for the given org and branch, by updating the `.gitattributes` files in the project and creating a new merge driver configuration file in the `.git/config` of the project.
+
+# examples
+
+- Install the driver for a given project:
+
+  <%= config.bin %> <%= command.id %>

package/messages/uninstall.md

@@ -0,0 +1,13 @@
+# summary
+
+Uninstalls the local git merge driver for the given org and branch.
+
+# description
+
+Uninstalls the local git merge driver for the given org and branch, by removing the merge driver content in the `.gitattributes` files in the project and deleting the merge driver configuration file in the `.git/config` of the project.
+
+# examples
+
+- Uninstall the driver for a given project:
+
+  <%= config.bin %> <%= command.id %>