sf-git-merge-driver 1.0.0-dev-3.13838689861-1 → 1.0.0-dev-3.13895420506-1

package/README.md

@@ -47,7 +47,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.0.0-dev-3.13838689861-1/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.0.0-dev-3.13895420506-1/src/commands/git/merge/driver/install.ts)_
 
 ## `sf git merge driver run`
 
@@ -85,7 +85,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.0.0-dev-3.13838689861-1/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.0.0-dev-3.13895420506-1/src/commands/git/merge/driver/run.ts)_
 
 ## `sf git merge driver uninstall`
 
@@ -112,7 +112,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.0.0-dev-3.13838689861-1/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.0.0-dev-3.13895420506-1/src/commands/git/merge/driver/uninstall.ts)_
 <!-- commandsstop -->
 
 

package/lib/constant/metadataConstant.d.ts

@@ -0,0 +1,54 @@
+export declare const KEY_FIELD_METADATA: {
+    marketingAppExtActivities: string;
+    alerts: string;
+    fieldUpdates: string;
+    flowActions: string;
+    outboundMessages: string;
+    rules: string;
+    knowledgePublishes: string;
+    tasks: string;
+    send: string;
+    sharingCriteriaRules: string;
+    sharingGuestRules: string;
+    sharingOwnerRules: string;
+    sharingTerritoryRules: string;
+    assignmentRule: string;
+    autoResponseRule: string;
+    escalationRule: string;
+    matchingRules: string;
+    valueTranslation: string;
+    categoryGroupVisibilities: string;
+    applicationVisibilities: string;
+    classAccesses: string;
+    customMetadataTypeAccesses: string;
+    customPermissions: string;
+    customSettingAccesses: string;
+    externalDataSourceAccesses: string;
+    fieldPermissions: string;
+    flowAccesses: string;
+    loginFlows: string;
+    layoutAssignments: string;
+    loginHours: string;
+    loginIpRanges: string;
+    objectPermissions: string;
+    pageAccesses: string;
+    profileActionOverrides: string;
+    recordTypeVisibilities: string;
+    tabVisibilities: string;
+    userPermissions: string;
+    bots: string;
+    customApplications: string;
+    customLabels: string;
+    customPageWebLinks: string;
+    customTabs: string;
+    flowDefinitions: string;
+    pipelineInspMetricConfigs: string;
+    prompts: string;
+    quickActions: string;
+    reportTypes: string;
+    scontrols: string;
+    standardValue: string;
+    customValue: string;
+    labels: string;
+};
+export declare const METADATA_TYPES_PATTERNS: string[];

package/lib/constant/metadataConstant.js

@@ -0,0 +1,68 @@
+export const KEY_FIELD_METADATA = {
+    marketingAppExtActivities: 'fullName',
+    alerts: 'fullName',
+    fieldUpdates: 'fullName',
+    flowActions: 'fullName',
+    outboundMessages: 'fullName',
+    rules: 'fullName',
+    knowledgePublishes: 'fullName',
+    tasks: 'fullName',
+    send: 'fullName',
+    sharingCriteriaRules: 'fullName',
+    sharingGuestRules: 'fullName',
+    sharingOwnerRules: 'fullName',
+    sharingTerritoryRules: 'fullName',
+    assignmentRule: 'fullName',
+    autoResponseRule: 'fullName',
+    escalationRule: 'fullName',
+    matchingRules: 'fullName',
+    valueTranslation: 'masterLabel',
+    categoryGroupVisibilities: 'dataCategoryGroup',
+    applicationVisibilities: 'application',
+    classAccesses: 'apexClass',
+    customMetadataTypeAccesses: 'name',
+    customPermissions: 'name',
+    customSettingAccesses: 'name',
+    externalDataSourceAccesses: 'externalDataSource',
+    fieldPermissions: 'field',
+    flowAccesses: 'flow',
+    loginFlows: 'friendlyname',
+    layoutAssignments: '<object>',
+    loginHours: '<array>',
+    loginIpRanges: '<array>',
+    objectPermissions: 'object',
+    pageAccesses: 'apexPage',
+    profileActionOverrides: 'actionName',
+    recordTypeVisibilities: 'recordType',
+    tabVisibilities: 'tab',
+    userPermissions: 'name',
+    bots: 'fullName',
+    customApplications: 'name',
+    customLabels: 'name',
+    customPageWebLinks: 'name',
+    customTabs: 'name',
+    flowDefinitions: 'fullName',
+    pipelineInspMetricConfigs: 'name',
+    prompts: 'name',
+    quickActions: 'name',
+    reportTypes: 'name',
+    scontrols: 'name',
+    standardValue: 'fullName',
+    customValue: 'fullName',
+    labels: 'fullName',
+};
+export const METADATA_TYPES_PATTERNS = [
+    'assignmentRules',
+    'autoResponseRules',
+    'escalationRules',
+    'globalValueSet',
+    'globalValueSetTranslation',
+    'marketingappextension',
+    'matchingRule',
+    'profile',
+    'sharingRules',
+    'standardValueSet',
+    'standardValueSetTranslation',
+    'workflow',
+];
+//# sourceMappingURL=metadataConstant.js.map

package/lib/constant/metadataConstant.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadataConstant.js","sourceRoot":"","sources":["../../src/constant/metadataConstant.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,yBAAyB,EAAE,UAAU;IACrC,MAAM,EAAE,UAAU;IAClB,YAAY,EAAE,UAAU;IACxB,WAAW,EAAE,UAAU;IACvB,gBAAgB,EAAE,UAAU;IAC5B,KAAK,EAAE,UAAU;IACjB,kBAAkB,EAAE,UAAU;IAC9B,KAAK,EAAE,UAAU;IACjB,IAAI,EAAE,UAAU;IAChB,oBAAoB,EAAE,UAAU;IAChC,iBAAiB,EAAE,UAAU;IAC7B,iBAAiB,EAAE,UAAU;IAC7B,qBAAqB,EAAE,UAAU;IACjC,cAAc,EAAE,UAAU;IAC1B,gBAAgB,EAAE,UAAU;IAC5B,cAAc,EAAE,UAAU;IAC1B,aAAa,EAAE,UAAU;IACzB,gBAAgB,EAAE,aAAa;IAC/B,yBAAyB,EAAE,mBAAmB;IAC9C,uBAAuB,EAAE,aAAa;IACtC,aAAa,EAAE,WAAW;IAC1B,0BAA0B,EAAE,MAAM;IAClC,iBAAiB,EAAE,MAAM;IACzB,qBAAqB,EAAE,MAAM;IAC7B,0BAA0B,EAAE,oBAAoB;IAChD,gBAAgB,EAAE,OAAO;IACzB,YAAY,EAAE,MAAM;IACpB,UAAU,EAAE,cAAc;IAC1B,iBAAiB,EAAE,UAAU;IAC7B,UAAU,EAAE,SAAS;IACrB,aAAa,EAAE,SAAS;IACxB,iBAAiB,EAAE,QAAQ;IAC3B,YAAY,EAAE,UAAU;IACxB,sBAAsB,EAAE,YAAY;IACpC,sBAAsB,EAAE,YAAY;IACpC,eAAe,EAAE,KAAK;IACtB,eAAe,EAAE,MAAM;IACvB,IAAI,EAAE,UAAU;IAChB,kBAAkB,EAAE,MAAM;IAC1B,YAAY,EAAE,MAAM;IACpB,kBAAkB,EAAE,MAAM;IAC1B,UAAU,EAAE,MAAM;IAClB,eAAe,EAAE,UAAU;IAC3B,yBAAyB,EAAE,MAAM;IACjC,OAAO,EAAE,MAAM;IACf,YAAY,EAAE,MAAM;IACpB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,MAAM;IACjB,aAAa,EAAE,UAAU;IACzB,WAAW,EAAE,UAAU;IACvB,MAAM,EAAE,UAAU;CACnB,CAAA;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,iBAAiB;IACjB,mBAAmB;IACnB,iBAAiB;IACjB,gBAAgB;IAChB,2BAA2B;IAC3B,uBAAuB;IACvB,cAAc;IACd,SAAS;IACT,cAAc;IACd,kBAAkB;IAClB,6BAA6B;IAC7B,UAAU;CACX,CAAA"}

package/lib/merger/JsonMerger.d.ts

@@ -5,10 +5,33 @@ interface JsonObject {
 interface JsonArray extends Array<JsonValue> {
 }
 export declare class JsonMerger {
-    private readonly idFields;
+    /**
+     * Main entry point for merging JSON values
+     */
     mergeObjects(ancestor: JsonValue | undefined, ours: JsonValue, theirs: JsonValue): JsonValue;
+    /**
+     * Ensures a value is an array
+     */
+    private ensureArray;
+    /**
+     * Gets the key field for a property from KEY_FIELD_METADATA
+     */
+    private getKeyField;
+    /**
+     * Merges arrays using the specified key field if available
+     */
     private mergeArrays;
-    private hasIdField;
-    private createIdMap;
+    /**
+     * Merges arrays by position
+     */
+    private mergeByPosition;
+    /**
+     * Merges arrays using a key field
+     */
+    private mergeByKeyField;
+    /**
+     * Gets the key value for an item using the specified key field
+     */
+    private getItemKey;
 }
 export {};

package/lib/merger/JsonMerger.js

@@ -1,90 +1,173 @@
+import { castArray, differenceWith, isEqual, isNil, unionWith } from 'lodash-es';
+import { KEY_FIELD_METADATA } from '../constant/metadataConstant.js';
 export class JsonMerger {
-    idFields = [
-        'fullName',
-        'name',
-        'field',
-        'label',
-        'id',
-        '@_name',
-    ];
+    /**
+     * Main entry point for merging JSON values
+     */
     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;
+        // Handle root object (e.g., Profile)
+        if (typeof ours === 'object' &&
+            ours !== null &&
+            !Array.isArray(ours) &&
+            typeof theirs === 'object' &&
+            theirs !== null &&
+            !Array.isArray(theirs)) {
+            // Get the base attribute (e.g., Profile)
+            const baseKey = Object.keys(ours)[0];
+            if (baseKey && Object.keys(theirs)[0] === baseKey) {
+                const result = { ...ours };
+                // Get the content of the base attribute
+                const ourContent = ours[baseKey];
+                const theirContent = theirs[baseKey];
+                const ancestorContent = ancestor &&
+                    typeof ancestor === 'object' &&
+                    !Array.isArray(ancestor) &&
+                    baseKey in ancestor
+                    ? ancestor[baseKey]
+                    : {};
+                // Get all properties from both contents
+                const allProperties = new Set([
+                    ...Object.keys(ourContent),
+                    ...Object.keys(theirContent),
+                ]);
+                // Process each property
+                const mergedContent = { ...ourContent };
+                for (const property of allProperties) {
+                    // Skip if property doesn't exist in their content
+                    if (!(property in theirContent))
+                        continue;
+                    // Use their version if property doesn't exist in our content
+                    if (!(property in mergedContent)) {
+                        mergedContent[property] = this.ensureArray(theirContent[property]);
+                        continue;
+                    }
+                    // Ensure both values are arrays
+                    const ourArray = this.ensureArray(mergedContent[property]);
+                    const theirArray = this.ensureArray(theirContent[property]);
+                    const ancestorArray = property in ancestorContent
+                        ? this.ensureArray(ancestorContent[property])
+                        : [];
+                    // Get the key field for this property if available
+                    const keyField = this.getKeyField(property);
+                    // Merge the arrays
+                    mergedContent[property] = this.mergeArrays(ancestorArray, ourArray, theirArray, keyField);
                 }
-                // Recursively merge when both have the key
-                result[key] = this.mergeObjects(ancestorObj[key], result[key], theirsObj[key]);
+                result[baseKey] = mergedContent;
+                return result;
             }
-            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
+        // Default to our version for other cases
+        return ours;
+    }
+    /**
+     * Ensures a value is an array
+     */
+    ensureArray(value) {
+        return isNil(value) ? [] : castArray(value);
+    }
+    /**
+     * Gets the key field for a property from KEY_FIELD_METADATA
+     */
+    getKeyField(property) {
+        return property in KEY_FIELD_METADATA
+            ? KEY_FIELD_METADATA[property]
+            : undefined;
+    }
+    /**
+     * Merges arrays using the specified key field if available
+     */
+    mergeArrays(ancestor, ours, theirs, keyField) {
+        // If no key field, use unionWith to merge arrays without duplicates
+        if (!keyField) {
+            return unionWith([...ours], theirs, isEqual);
+        }
+        // Special case for array position
+        if (keyField === '<array>') {
+            return this.mergeByPosition(ancestor, ours, theirs);
+        }
+        // Merge using key field
+        return this.mergeByKeyField(ancestor, ours, theirs, keyField);
     }
-    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();
+    /**
+     * Merges arrays by position
+     */
+    mergeByPosition(ancestor, ours, theirs) {
         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);
-                }
+        // Merge items at the same positions
+        for (let i = 0; i < Math.min(ours.length, theirs.length); i++) {
+            const ancestorItem = i < ancestor.length ? ancestor[i] : undefined;
+            // If they changed it from ancestor but we didn't, use their version
+            if (!isEqual(theirs[i], ancestorItem) && isEqual(ours[i], ancestorItem)) {
+                result[i] = theirs[i];
             }
-            processed.add(id);
         }
         // Add items that only exist in their version
-        for (const [id, theirItem] of theirMap) {
-            if (!processed.has(id)) {
-                result.push(theirItem);
+        if (theirs.length > ours.length) {
+            for (let i = ours.length; i < theirs.length; i++) {
+                result.push(theirs[i]);
             }
         }
         return result;
     }
-    hasIdField(item, field) {
-        return (item !== null &&
-            typeof item === 'object' &&
-            !Array.isArray(item) &&
-            field in item);
+    /**
+     * Merges arrays using a key field
+     */
+    mergeByKeyField(ancestor, ours, theirs, keyField) {
+        const result = [...ours];
+        const processed = new Set();
+        // Create maps for efficient lookups
+        const ourMap = new Map();
+        const theirMap = new Map();
+        const ancestorMap = new Map();
+        // Populate maps
+        for (const item of ours) {
+            const key = this.getItemKey(item, keyField);
+            if (key)
+                ourMap.set(key, item);
+        }
+        for (const item of theirs) {
+            const key = this.getItemKey(item, keyField);
+            if (key)
+                theirMap.set(key, item);
+        }
+        for (const item of ancestor) {
+            const key = this.getItemKey(item, keyField);
+            if (key)
+                ancestorMap.set(key, item);
+        }
+        // Process items in our version
+        for (let i = 0; i < result.length; i++) {
+            const key = this.getItemKey(result[i], keyField);
+            if (!key)
+                continue;
+            processed.add(key);
+            // If item exists in both versions
+            if (theirMap.has(key)) {
+                const theirItem = theirMap.get(key);
+                const ancestorItem = ancestorMap.get(key);
+                // If they changed it from ancestor but we didn't, use their version
+                if (!isEqual(theirItem, ancestorItem) &&
+                    isEqual(result[i], ancestorItem)) {
+                    result[i] = theirItem;
+                }
+            }
+        }
+        // Add items that only exist in their version
+        const uniqueTheirItems = differenceWith(Array.from(theirMap.values()), result, (a, b) => this.getItemKey(a, keyField) === this.getItemKey(b, keyField));
+        result.push(...uniqueTheirItems);
+        return result;
     }
-    createIdMap(arr, idField) {
-        return new Map(arr
-            .filter(item => this.hasIdField(item, idField))
-            .map(item => [String(item[idField]), item]));
+    /**
+     * Gets the key value for an item using the specified key field
+     */
+    getItemKey(item, keyField) {
+        if (typeof item === 'object' &&
+            item !== null &&
+            !Array.isArray(item) &&
+            keyField in item) {
+            return String(item[keyField]);
+        }
+        return undefined;
     }
 }
 //# sourceMappingURL=JsonMerger.js.map

package/lib/merger/JsonMerger.js.map

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

package/lib/service/installService.js

@@ -1,14 +1,16 @@
 import { appendFile } from 'node:fs/promises';
 import { simpleGit } from 'simple-git';
 import { DRIVER_NAME, RUN_PLUGIN_COMMAND } from '../constant/driverConstant.js';
+import { METADATA_TYPES_PATTERNS } from '../constant/metadataConstant.js';
 export class InstallService {
     async installMergeDriver() {
         const git = simpleGit();
         await git.addConfig(`merge.${DRIVER_NAME}.name`, 'Salesforce source merge driver');
         await git.addConfig(`merge.${DRIVER_NAME}.driver`, `${RUN_PLUGIN_COMMAND} --ancestor-file %O --our-file %A --theirs-file %B --output-file %P`);
         await git.addConfig(`merge.${DRIVER_NAME}.recursive`, 'true');
-        const content = ['*.xml'].map(pattern => `${pattern} merge=${DRIVER_NAME}`).join('\n') +
-            '\n';
+        // Configure merge driver for each metadata type pattern
+        const patterns = METADATA_TYPES_PATTERNS.map(pattern => `*.${pattern}.xml merge=${DRIVER_NAME}`).join('\n');
+        const content = `${patterns}\n`;
         await appendFile('.gitattributes', content, { flag: 'a' });
     }
 }

package/lib/service/installService.js.map

@@ -1 +1 @@
-{"version":3,"file":"installService.js","sourceRoot":"","sources":["../../src/service/installService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAE/E,MAAM,OAAO,cAAc;IAClB,KAAK,CAAC,kBAAkB;QAC7B,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,kBAAkB,qEAAqE,CAC3F,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"}
+{"version":3,"file":"installService.js","sourceRoot":"","sources":["../../src/service/installService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AAEzE,MAAM,OAAO,cAAc;IAClB,KAAK,CAAC,kBAAkB;QAC7B,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,kBAAkB,qEAAqE,CAC3F,CAAA;QACD,MAAM,GAAG,CAAC,SAAS,CAAC,SAAS,WAAW,YAAY,EAAE,MAAM,CAAC,CAAA;QAE7D,wDAAwD;QACxD,MAAM,QAAQ,GAAG,uBAAuB,CAAC,GAAG,CAC1C,OAAO,CAAC,EAAE,CAAC,KAAK,OAAO,cAAc,WAAW,EAAE,CACnD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACZ,MAAM,OAAO,GAAG,GAAG,QAAQ,IAAI,CAAA;QAE/B,MAAM,UAAU,CAAC,gBAAgB,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAA;IAC5D,CAAC;CACF"}

package/lib/service/uninstallService.js

@@ -1,7 +1,8 @@
 import { readFile, writeFile } from 'node:fs/promises';
 import { simpleGit } from 'simple-git';
 import { DRIVER_NAME } from '../constant/driverConstant.js';
-const MERGE_DRIVER_CONFIG = new RegExp(`.* merge\\s*=\\s*${DRIVER_NAME}$`);
+// This match lines like: "*.profile-meta.xml merge=sf-git-merge-driver"
+const MERGE_DRIVER_CONFIG = new RegExp(`.*\s+merge\s*=\s*${DRIVER_NAME}$`);
 export class UninstallService {
     async uninstallMergeDriver() {
         const git = simpleGit();

package/lib/service/uninstallService.js.map

@@ -1 +1 @@
-{"version":3,"file":"uninstallService.js","sourceRoot":"","sources":["../../src/service/uninstallService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,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;AAE1E,MAAM,OAAO,gBAAgB;IACpB,KAAK,CAAC,oBAAoB;QAC/B,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"}
+{"version":3,"file":"uninstallService.js","sourceRoot":"","sources":["../../src/service/uninstallService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAE3D,wEAAwE;AACxE,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,oBAAoB,WAAW,GAAG,CAAC,CAAA;AAE1E,MAAM,OAAO,gBAAgB;IACpB,KAAK,CAAC,oBAAoB;QAC/B,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/npm-shrinkwrap.json

@@ -1,18 +1,19 @@
 {
   "name": "sf-git-merge-driver",
-  "version": "1.0.0-dev-3.13838689861-1",
+  "version": "1.0.0-dev-3.13895420506-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "sf-git-merge-driver",
-      "version": "1.0.0-dev-3.13838689861-1",
+      "version": "1.0.0-dev-3.13895420506-1",
       "license": "MIT",
       "dependencies": {
         "@oclif/core": "^4.2.8",
         "@salesforce/core": "^8.8.5",
         "@salesforce/sf-plugins-core": "^12.2.0",
         "fast-xml-parser": "^5.0.8",
+        "lodash-es": "^4.17.21",
         "simple-git": "^3.27.0"
       },
       "devDependencies": {
@@ -10507,6 +10508,12 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "license": "MIT"
     },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
+      "license": "MIT"
+    },
     "node_modules/lodash.flattendeep": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",

package/oclif.manifest.json

@@ -248,5 +248,5 @@
       ]
     }
   },
-  "version": "1.0.0-dev-3.13838689861-1"
+  "version": "1.0.0-dev-3.13895420506-1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-git-merge-driver",
   "description": "git remote add origin git@github.com:scolladon/sf-git-merge-driver.git",
-  "version": "1.0.0-dev-3.13838689861-1",
+  "version": "1.0.0-dev-3.13895420506-1",
   "exports": "./lib/driver/MergeDriver.js",
   "type": "module",
   "author": "Sébastien Colladon (colladonsebastien@gmail.com)",
@@ -14,6 +14,7 @@
     "@salesforce/core": "^8.8.5",
     "@salesforce/sf-plugins-core": "^12.2.0",
     "fast-xml-parser": "^5.0.8",
+    "lodash-es": "^4.17.21",
     "simple-git": "^3.27.0"
   },
   "devDependencies": {