sf-git-merge-driver 1.0.1-dev-70.16864618044-1 → 1.0.1-dev-70.16880045046-1

package/README.md

@@ -48,7 +48,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.1-dev-70.16864618044-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.1-dev-70.16880045046-1/src/commands/git/merge/driver/install.ts)_
 
 ## `sf git merge driver run`
 
@@ -92,7 +92,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.1-dev-70.16864618044-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.1-dev-70.16880045046-1/src/commands/git/merge/driver/run.ts)_
 
 ## `sf git merge driver uninstall`
 
@@ -119,7 +119,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.1-dev-70.16864618044-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.1-dev-70.16880045046-1/src/commands/git/merge/driver/uninstall.ts)_
 <!-- commandsstop -->
 
 ## How It Works

package/lib/driver/MergeDriver.d.ts

@@ -1,5 +1,3 @@
 export declare class MergeDriver {
-    private static detectEol;
-    private static applyEol;
     mergeFiles(ancestorFile: string, ourFile: string, theirFile: string): Promise<boolean>;
 }

package/lib/driver/MergeDriver.js

@@ -1,18 +1,8 @@
 import { readFile, writeFile } from 'node:fs/promises';
 import { normalize } from 'node:path';
 import { XmlMerger } from '../merger/XmlMerger.js';
+import { detectEol, normalizeEol } from '../utils/mergeUtils.js';
 export class MergeDriver {
-    static detectEol(text) {
-        if (text.includes('\r\n'))
-            return '\r\n';
-        return '\n';
-    }
-    static applyEol(text, eol) {
-        // XML Merge Driver default to \n
-        if (eol === '\r\n')
-            return text.split(/\r\n|\n/).join(eol);
-        return text;
-    }
     async mergeFiles(ancestorFile, ourFile, theirFile) {
         // Read all three versions
         const [ancestorContent, ourContent, theirContent] = await Promise.all([ancestorFile, ourFile, theirFile]
@@ -20,8 +10,8 @@ export class MergeDriver {
             .map(path => readFile(path, 'utf8')));
         const xmlMerger = new XmlMerger();
         const mergedContent = xmlMerger.mergeThreeWay(ancestorContent, ourContent, theirContent);
-        const targetEol = MergeDriver.detectEol(ourContent);
-        const outputWithEol = MergeDriver.applyEol(mergedContent.output, targetEol);
+        const targetEol = detectEol(ourContent);
+        const outputWithEol = normalizeEol(mergedContent.output, targetEol);
         process.stderr.write(`[SF-MERGE-DEBUG] wrote to ourFile: ${normalize(ourFile)}\n`);
         process.stderr.write(`[SF-MERGE-DEBUG] content: ${outputWithEol}\n`);
         process.stderr.write(`[SF-MERGE-DEBUG] hasConflict: ${mergedContent.hasConflict}\n`);

package/lib/driver/MergeDriver.js.map

@@ -1 +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,WAAW,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,MAAM,OAAO,WAAW;IACd,MAAM,CAAC,SAAS,CAAC,IAAY;QACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,MAAM,CAAA;QACxC,OAAO,IAAI,CAAA;IACb,CAAC;IAEO,MAAM,CAAC,QAAQ,CAAC,IAAY,EAAE,GAAW;QAC/C,iCAAiC;QACjC,IAAI,GAAG,KAAK,MAAM;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC1D,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,UAAU,CACd,YAAoB,EACpB,OAAe,EACf,SAAiB;QAEjB,0BAA0B;QAC1B,MAAM,CAAC,eAAe,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CACnE,CAAC,YAAY,EAAE,OAAO,EAAE,SAAS,CAAC;aAC/B,GAAG,CAAC,SAAS,CAAC;aACd,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CACvC,CAAA;QAED,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAA;QAEjC,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAC3C,eAAe,EACf,UAAU,EACV,YAAY,CACb,CAAA;QAED,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QACnD,MAAM,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAE3E,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,sCAAsC,SAAS,CAAC,OAAO,CAAC,IAAI,CAC7D,CAAA;QACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,aAAa,IAAI,CAAC,CAAA;QACpE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,iCAAiC,aAAa,CAAC,WAAW,IAAI,CAC/D,CAAA;QAED,2CAA2C;QAC3C,MAAM,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,CAAA;QAClD,OAAO,aAAa,CAAC,WAAW,CAAA;IAClC,CAAC;CACF"}
+{"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,WAAW,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAEhE,MAAM,OAAO,WAAW;IACtB,KAAK,CAAC,UAAU,CACd,YAAoB,EACpB,OAAe,EACf,SAAiB;QAEjB,0BAA0B;QAC1B,MAAM,CAAC,eAAe,EAAE,UAAU,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CACnE,CAAC,YAAY,EAAE,OAAO,EAAE,SAAS,CAAC;aAC/B,GAAG,CAAC,SAAS,CAAC;aACd,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CACvC,CAAA;QAED,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAA;QAEjC,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAC3C,eAAe,EACf,UAAU,EACV,YAAY,CACb,CAAA;QAED,MAAM,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,CAAA;QACvC,MAAM,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAEnE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,sCAAsC,SAAS,CAAC,OAAO,CAAC,IAAI,CAC7D,CAAA;QACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,aAAa,IAAI,CAAC,CAAA;QACpE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,iCAAiC,aAAa,CAAC,WAAW,IAAI,CAC/D,CAAA;QAED,2CAA2C;QAC3C,MAAM,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,CAAA;QAClD,OAAO,aAAa,CAAC,WAAW,CAAA;IAClC,CAAC;CACF"}

package/lib/utils/mergeUtils.d.ts

@@ -2,3 +2,5 @@ import type { JsonArray, JsonObject, JsonValue } from '../types/jsonTypes.js';
 export declare const isObject: (ancestor: JsonValue | undefined | null, local: JsonValue | undefined | null, other: JsonValue | undefined | null) => boolean;
 export declare const ensureArray: (value: JsonValue) => JsonArray;
 export declare const getUniqueSortedProps: (...objects: (JsonObject | JsonArray)[]) => string[];
+export declare const detectEol: (text: string) => string;
+export declare const normalizeEol: (text: string, eol: string) => string;

package/lib/utils/mergeUtils.js

@@ -1,5 +1,17 @@
 import { castArray, isNil } from 'lodash-es';
+const LF_OR_CRLF_REGEX = /\r?\n/g;
+const CRLF_ONLY_REGEX = /\r\n/g;
+const CRLF = '\r\n';
+const LF = '\n';
 export const isObject = (ancestor, local, other) => typeof [ancestor, other, local].find(ele => !isNil(ele)) === 'object';
 export const ensureArray = (value) => isNil(value) ? [] : castArray(value);
 export const getUniqueSortedProps = (...objects) => Array.from(new Set([...objects].map(Object.keys).flat())).sort();
+export const detectEol = (text) => text.includes(CRLF) ? CRLF : LF;
+export const normalizeEol = (text, eol) => {
+    if (!eol || !text) {
+        return text;
+    }
+    const regex = eol === CRLF ? LF_OR_CRLF_REGEX : CRLF_ONLY_REGEX;
+    return text.replace(regex, eol);
+};
 //# sourceMappingURL=mergeUtils.js.map

package/lib/utils/mergeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeUtils.js","sourceRoot":"","sources":["../../src/utils/mergeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAG5C,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,QAAsC,EACtC,KAAmC,EACnC,KAAmC,EAC1B,EAAE,CACX,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,QAAQ,CAAA;AAEvE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAgB,EAAa,EAAE,CACzD,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,SAAS,CAAC,KAAK,CAAe,CAAA;AAErD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,GAAG,OAAmC,EAC5B,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA"}
+{"version":3,"file":"mergeUtils.js","sourceRoot":"","sources":["../../src/utils/mergeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAG5C,MAAM,gBAAgB,GAAG,QAAQ,CAAA;AACjC,MAAM,eAAe,GAAG,OAAO,CAAA;AAC/B,MAAM,IAAI,GAAG,MAAM,CAAA;AACnB,MAAM,EAAE,GAAG,IAAI,CAAA;AAEf,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,QAAsC,EACtC,KAAmC,EACnC,KAAmC,EAC1B,EAAE,CACX,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,QAAQ,CAAA;AAEvE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAgB,EAAa,EAAE,CACzD,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,SAAS,CAAC,KAAK,CAAe,CAAA;AAErD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,GAAG,OAAmC,EAC5B,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;AAE/E,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAY,EAAU,EAAE,CAChD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAA;AAEjC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,GAAW,EAAU,EAAE;IAChE,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,KAAK,GAAG,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,eAAe,CAAA;IAC/D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACjC,CAAC,CAAA"}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "sf-git-merge-driver",
-  "version": "1.0.1-dev-70.16864618044-1",
+  "version": "1.0.1-dev-70.16880045046-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "sf-git-merge-driver",
-      "version": "1.0.1-dev-70.16864618044-1",
+      "version": "1.0.1-dev-70.16880045046-1",
       "license": "MIT",
       "dependencies": {
         "@oclif/core": "^4.5.2",

package/oclif.manifest.json

@@ -284,5 +284,5 @@
       ]
     }
   },
-  "version": "1.0.1-dev-70.16864618044-1"
+  "version": "1.0.1-dev-70.16880045046-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.1-dev-70.16864618044-1",
+  "version": "1.0.1-dev-70.16880045046-1",
   "exports": "./lib/driver/MergeDriver.js",
   "type": "module",
   "author": "Sébastien Colladon (colladonsebastien@gmail.com)",