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

package/oclif.manifest.json

@@ -170,7 +170,7 @@
           "char": "S",
           "name": "ancestor-conflict-tag",
           "summary": "string used to tag ancestor version in conflicts",
-          "default": "BASE",
+          "default": "base",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -179,7 +179,7 @@
           "char": "X",
           "name": "local-conflict-tag",
           "summary": "string used to tag local version in conflicts",
-          "default": "LOCAL",
+          "default": "ours",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -188,7 +188,7 @@
           "char": "Y",
           "name": "other-conflict-tag",
           "summary": "string used to tag other version in conflicts",
-          "default": "REMOTE",
+          "default": "theirs",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -338,5 +338,5 @@
       ]
     }
   },
-  "version": "1.3.0"
+  "version": "1.4.0-dev-159.21317248282-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.3.0",
+  "description": "Git merge driver for Salesforce metadata XML files - automatically resolves merge conflicts in profiles, permission sets, and 50+ metadata types",
+  "version": "1.4.0-dev-159.21317248282-1",
   "exports": "./lib/driver/MergeDriver.js",
   "type": "module",
   "author": "Sébastien Colladon (colladonsebastien@gmail.com)",
@@ -11,17 +11,17 @@
   },
   "dependencies": {
     "@oclif/core": "^4.8.0",
-    "@salesforce/core": "^8.24.0",
+    "@salesforce/core": "^8.25.0",
     "@salesforce/sf-plugins-core": "^12.2.6",
     "fast-equals": "^6.0.0",
     "fast-xml-parser": "^5.3.3",
-    "lodash-es": "^4.17.22",
+    "lodash-es": "^4.17.23",
     "simple-git": "^3.30.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.3.10",
-    "@commitlint/config-conventional": "^20.2.0",
-    "@oclif/plugin-help": "^6.2.36",
+    "@biomejs/biome": "2.3.11",
+    "@commitlint/config-conventional": "^20.3.1",
+    "@oclif/plugin-help": "^6.2.37",
     "@salesforce/cli-plugins-testkit": "^5.3.41",
     "@salesforce/dev-config": "^4.3.2",
     "@types/chai": "^5.2.3",
@@ -29,10 +29,10 @@
     "chai": "^6.2.2",
     "husky": "^9.1.7",
     "jest": "^30.2.0",
-    "knip": "^5.78.0",
+    "knip": "^5.82.1",
     "mocha": "^11.7.5",
     "nyc": "^17.1.0",
-    "oclif": "^4.22.61",
+    "oclif": "^4.22.68",
     "shx": "^0.4.0",
     "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",

package/lib/merger/conflictMarker.d.ts

@@ -1,12 +0,0 @@
-import { conflicConfig } from '../types/conflictTypes.js';
-import type { JsonArray, JsonObject } from '../types/jsonTypes.js';
-export declare class ConflictMarker {
-    private static hasConflict;
-    private static baseMarker;
-    private static localMarker;
-    private static otherMarker;
-    private static separatorMarker;
-    static hasConflictMarker(): boolean;
-    static addConflictMarkers(acc: JsonArray, local: JsonObject | JsonArray, ancestor: JsonObject | JsonArray, other: JsonObject | JsonArray): void;
-    static setConflictConfig(conflictConfig: conflicConfig): void;
-}

package/lib/merger/conflictMarker.js

@@ -1,37 +0,0 @@
-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)}`;
-};
-export class ConflictMarker {
-    static hasConflict = false;
-    static baseMarker;
-    static localMarker;
-    static otherMarker;
-    static separatorMarker;
-    static hasConflictMarker() {
-        return ConflictMarker.hasConflict;
-    }
-    static addConflictMarkers(acc, local, ancestor, other) {
-        ConflictMarker.hasConflict = true;
-        acc.push({ [TEXT_TAG]: `${SALESFORCE_EOL}${ConflictMarker.localMarker}` });
-        acc.push(isEmpty(local) ? { [TEXT_TAG]: SALESFORCE_EOL } : local);
-        acc.push({ [TEXT_TAG]: ConflictMarker.baseMarker });
-        acc.push(isEmpty(ancestor) ? { [TEXT_TAG]: SALESFORCE_EOL } : ancestor);
-        acc.push({ [TEXT_TAG]: ConflictMarker.separatorMarker });
-        acc.push(isEmpty(other) ? { [TEXT_TAG]: SALESFORCE_EOL } : other);
-        acc.push({ [TEXT_TAG]: ConflictMarker.otherMarker });
-    }
-    static setConflictConfig(conflictConfig) {
-        ConflictMarker.baseMarker = buildMarker(ANCESTOR_CONFLICT_MARKER, conflictConfig.conflictMarkerSize, conflictConfig.ancestorConflictTag);
-        ConflictMarker.localMarker = buildMarker(LOCAL_CONFLICT_MARKER, conflictConfig.conflictMarkerSize, conflictConfig.localConflictTag);
-        ConflictMarker.otherMarker = buildMarker(OTHER_CONFLICT_MARKER, conflictConfig.conflictMarkerSize, conflictConfig.otherConflictTag);
-        ConflictMarker.separatorMarker = buildSeparator(conflictConfig.conflictMarkerSize);
-    }
-}
-//# sourceMappingURL=conflictMarker.js.map

package/lib/merger/conflictMarker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"conflictMarker.js","sourceRoot":"","sources":["../../src/merger/conflictMarker.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,OAAO,cAAc;IACjB,MAAM,CAAC,WAAW,GAAG,KAAK,CAAA;IAC1B,MAAM,CAAC,UAAU,CAAQ;IACzB,MAAM,CAAC,WAAW,CAAQ;IAC1B,MAAM,CAAC,WAAW,CAAQ;IAC1B,MAAM,CAAC,eAAe,CAAQ;IAE/B,MAAM,CAAC,iBAAiB;QAC7B,OAAO,cAAc,CAAC,WAAW,CAAA;IACnC,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAC9B,GAAc,EACd,KAA6B,EAC7B,QAAgC,EAChC,KAA6B;QAE7B,cAAc,CAAC,WAAW,GAAG,IAAI,CAAA;QACjC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,GAAG,cAAc,GAAG,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;QAC1E,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QACjE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,UAAU,EAAE,CAAC,CAAA;QACnD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QACvE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,eAAe,EAAE,CAAC,CAAA;QACxD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QACjE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,CAAA;IACtD,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAAC,cAA6B;QAC3D,cAAc,CAAC,UAAU,GAAG,WAAW,CACrC,wBAAwB,EACxB,cAAc,CAAC,kBAAkB,EACjC,cAAc,CAAC,mBAAmB,CACnC,CAAA;QACD,cAAc,CAAC,WAAW,GAAG,WAAW,CACtC,qBAAqB,EACrB,cAAc,CAAC,kBAAkB,EACjC,cAAc,CAAC,gBAAgB,CAChC,CAAA;QACD,cAAc,CAAC,WAAW,GAAG,WAAW,CACtC,qBAAqB,EACrB,cAAc,CAAC,kBAAkB,EACjC,cAAc,CAAC,gBAAgB,CAChC,CAAA;QACD,cAAc,CAAC,eAAe,GAAG,cAAc,CAC7C,cAAc,CAAC,kBAAkB,CAClC,CAAA;IACH,CAAC"}

package/lib/merger/textAttribute.d.ts

@@ -1,3 +0,0 @@
-import type { JsonArray, JsonObject, JsonValue } from '../types/jsonTypes.js';
-export declare const generateObj: (value: JsonValue | null, attrib: string) => JsonObject;
-export declare const mergeTextAttribute: (ancestor: JsonValue | null, local: JsonValue | null, other: JsonValue | null, attrib: string) => JsonArray;

package/lib/merger/textAttribute.js

@@ -1,56 +0,0 @@
-import { deepEqual } from 'fast-equals';
-import { isNil } from 'lodash-es';
-import { TEXT_TAG } from '../constant/parserConstant.js';
-import { getScenario, MergeScenario } from '../types/mergeScenario.js';
-import { ConflictMarker } from './conflictMarker.js';
-export const generateObj = (value, attrib) => {
-    return isNil(value) ? {} : { [attrib]: [{ [TEXT_TAG]: value }] };
-};
-export const mergeTextAttribute = (ancestor, local, other, attrib) => {
-    const objAnc = generateObj(ancestor, attrib);
-    const objlocal = generateObj(local, attrib);
-    const objother = generateObj(other, attrib);
-    const scenario = getScenario(objAnc, objlocal, objother);
-    const acc = [];
-    // Early return for identical values
-    if (deepEqual(local, other) &&
-        (scenario === MergeScenario.LOCAL_AND_OTHER ||
-            scenario === MergeScenario.ALL)) {
-        return [objlocal];
-    }
-    // Handle specific merge scenarios
-    switch (scenario) {
-        case MergeScenario.OTHER_ONLY:
-            acc.push(objother);
-            break;
-        case MergeScenario.LOCAL_ONLY:
-            acc.push(objlocal);
-            break;
-        case MergeScenario.LOCAL_AND_OTHER:
-            ConflictMarker.addConflictMarkers(acc, objlocal, {}, objother);
-            break;
-        case MergeScenario.ANCESTOR_AND_OTHER:
-            if (ancestor !== other) {
-                ConflictMarker.addConflictMarkers(acc, {}, objAnc, objother);
-            }
-            break;
-        case MergeScenario.ANCESTOR_AND_LOCAL:
-            if (ancestor !== local) {
-                ConflictMarker.addConflictMarkers(acc, objlocal, objAnc, {});
-            }
-            break;
-        case MergeScenario.ALL:
-            if (ancestor === local) {
-                acc.push(objother);
-            }
-            else if (ancestor === other) {
-                acc.push(objlocal);
-            }
-            else {
-                ConflictMarker.addConflictMarkers(acc, objlocal, objAnc, objother);
-            }
-            break;
-    }
-    return acc;
-};
-//# sourceMappingURL=textAttribute.js.map

package/lib/merger/textAttribute.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"textAttribute.js","sourceRoot":"","sources":["../../src/merger/textAttribute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AAExD,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,KAAuB,EACvB,MAAc,EACF,EAAE;IACd,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,CAAC,MAAM,kBAAkB,GAAG,CAChC,QAA0B,EAC1B,KAAuB,EACvB,KAAuB,EACvB,MAAc,EACH,EAAE;IACb,MAAM,MAAM,GAAe,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACxD,MAAM,QAAQ,GAAe,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAe,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACvD,MAAM,QAAQ,GAAkB,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACvE,MAAM,GAAG,GAAc,EAAE,CAAA;IAEzB,oCAAoC;IACpC,IACE,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;QACvB,CAAC,QAAQ,KAAK,aAAa,CAAC,eAAe;YACzC,QAAQ,KAAK,aAAa,CAAC,GAAG,CAAC,EACjC,CAAC;QACD,OAAO,CAAC,QAAQ,CAAC,CAAA;IACnB,CAAC;IAED,kCAAkC;IAClC,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,aAAa,CAAC,UAAU;YAC3B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAClB,MAAK;QAEP,KAAK,aAAa,CAAC,UAAU;YAC3B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YAClB,MAAK;QAEP,KAAK,aAAa,CAAC,eAAe;YAChC,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAA;YAC9D,MAAK;QAEP,KAAK,aAAa,CAAC,kBAAkB;YACnC,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACvB,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YAC9D,CAAC;YACD,MAAK;QAEP,KAAK,aAAa,CAAC,kBAAkB;YACnC,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACvB,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;YAC9D,CAAC;YACD,MAAK;QAEP,KAAK,aAAa,CAAC,GAAG;YACpB,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACvB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACpB,CAAC;iBAAM,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBAC9B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACpB,CAAC;iBAAM,CAAC;gBACN,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YACpE,CAAC;YACD,MAAK;IACT,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}