gamelet-cli 0.6.2 → 0.6.4

package/build/src/gamelet/merges.js

@@ -1,144 +1,144 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSourceMerged = exports.sourceMerge = void 0;
-const file_1 = require("../utils/file");
-const node_diff3_1 = require("node-diff3");
-/**
- *   file local base
- * 1.  o    o    o     diff3
- * 2.  o    o    x     diff2
- * 3.  o    x    o     use file if file != base
- * 4.  x    o    o     del local if local == base
- * 5.  o    x    x     use file
- * 6.  x    o    x     (do nothing)
- * 7.  x    x    o     (do nothing)
- * 8.  x    x    x     (do nothing)
- *
- */
-exports.sourceMerge = function (filename, remoteFile, baseFile, folder) {
-    let localFilepath = `${folder}/${filename}`;
-    // 4.
-    if (remoteFile === null && file_1.fileExists(localFilepath) && baseFile !== null) {
-        return file_1.getFileString(localFilepath)
-            .then(content => {
-            if (content == baseFile) {
-                console.log(`Source deleted: ${filename}`);
-                return file_1.unlink(localFilepath);
-            }
-            else {
-                return Promise.resolve(true);
-            }
-        })
-            .then(() => {
-            return {
-                code: 4,
-                name: 'deleted',
-                filename: filename,
-            };
-        });
-    }
-    // 3.
-    if (remoteFile !== null && !file_1.fileExists(localFilepath) && baseFile !== null) {
-        if (remoteFile != baseFile) {
-            console.log(`Source created: ${filename}`);
-            return file_1.saveData(localFilepath, remoteFile)
-                .then(() => {
-                return {
-                    code: 3,
-                    name: 'added',
-                    filename: filename,
-                };
-            });
-        }
-        else {
-            return Promise.resolve({
-                code: 3,
-                name: '',
-                filename: filename,
-            });
-        }
-    }
-    // 5.
-    if (remoteFile !== null && !file_1.fileExists(localFilepath) && baseFile === null) {
-        return file_1.saveData(localFilepath, remoteFile)
-            .then(() => {
-            return {
-                code: 5,
-                name: 'added',
-                filename: filename,
-            };
-        });
-    }
-    if (remoteFile !== null && file_1.fileExists(localFilepath)) {
-        return file_1.getFileString(localFilepath)
-            .then(localContent => {
-            let remote = remoteFile.split("\n");
-            let local = localContent.split("\n");
-            let conflictLine = local.findIndex(line => line.match(/^\s*(<<<|>>>)/));
-            if (conflictLine != -1) {
-                return Promise.reject(file_1.vscodeLink(`${localFilepath}:${conflictLine + 1}`, `Resolve the conflict first:`));
-            }
-            // 1. 2,
-            if (baseFile == remoteFile) {
-                return {
-                    code: 1,
-                    name: '',
-                    filename: filename,
-                };
-            }
-            let base = baseFile ? baseFile.split("\n") : [];
-            let merge = node_diff3_1.mergeDiff3(local, base, remote, { label: { a: 'local', o: 'base', b: 'remote', }, excludeFalseConflicts: true });
-            let content = merge.result.join("\n");
-            return file_1.saveData(localFilepath, content)
-                .then(() => {
-                if (merge.conflict) {
-                    conflictLine = merge.result.findIndex(line => line.match(/^\s*(<<<|>>>)/));
-                    console.error(file_1.vscodeLink(`${localFilepath}:${conflictLine + 1}`, `Merge conflict required:`));
-                    return {
-                        code: 1,
-                        name: 'conflict',
-                        filename: filename,
-                    };
-                }
-                else {
-                    console.log(`Source merged: ${filename}`);
-                    return {
-                        code: 1,
-                        name: 'merged',
-                        filename: filename,
-                    };
-                }
-            });
-        });
-    }
-    else {
-        return Promise.resolve({
-            code: 6,
-            name: '',
-            filename: filename,
-        });
-    }
-};
-exports.isSourceMerged = function (filename, remoteFile, baseFile, folder) {
-    let localFilepath = `${folder}/${filename}`;
-    if (remoteFile != baseFile) {
-        return Promise.resolve(false);
-    }
-    if (file_1.fileExists(localFilepath)) {
-        return file_1.getFileString(localFilepath)
-            .then(localContent => {
-            let local = localContent.split("\n");
-            let conflictLine = local.findIndex(line => line.match(/^\s*(<<<|>>>)/));
-            if (conflictLine != -1) {
-                return Promise.reject(file_1.vscodeLink(`${localFilepath}:${conflictLine + 1}`, `Resolve the conflict first:`));
-            }
-            else {
-                return Promise.resolve(true);
-            }
-        });
-    }
-    else {
-        return Promise.resolve(true);
-    }
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSourceMerged = exports.sourceMerge = void 0;
+const file_1 = require("../utils/file");
+const node_diff3_1 = require("node-diff3");
+/**
+ *   file local base
+ * 1.  o    o    o     diff3
+ * 2.  o    o    x     diff2
+ * 3.  o    x    o     use file if file != base
+ * 4.  x    o    o     del local if local == base
+ * 5.  o    x    x     use file
+ * 6.  x    o    x     (do nothing)
+ * 7.  x    x    o     (do nothing)
+ * 8.  x    x    x     (do nothing)
+ *
+ */
+exports.sourceMerge = function (filename, remoteFile, baseFile, folder) {
+    let localFilepath = `${folder}/${filename}`;
+    // 4.
+    if (remoteFile === null && file_1.fileExists(localFilepath) && baseFile !== null) {
+        return file_1.getFileString(localFilepath)
+            .then(content => {
+            if (content == baseFile) {
+                console.log(`Source deleted: ${filename}`);
+                return file_1.unlink(localFilepath);
+            }
+            else {
+                return Promise.resolve(true);
+            }
+        })
+            .then(() => {
+            return {
+                code: 4,
+                name: 'deleted',
+                filename: filename,
+            };
+        });
+    }
+    // 3.
+    if (remoteFile !== null && !file_1.fileExists(localFilepath) && baseFile !== null) {
+        if (remoteFile != baseFile) {
+            console.log(`Source created: ${filename}`);
+            return file_1.saveData(localFilepath, remoteFile)
+                .then(() => {
+                return {
+                    code: 3,
+                    name: 'added',
+                    filename: filename,
+                };
+            });
+        }
+        else {
+            return Promise.resolve({
+                code: 3,
+                name: '',
+                filename: filename,
+            });
+        }
+    }
+    // 5.
+    if (remoteFile !== null && !file_1.fileExists(localFilepath) && baseFile === null) {
+        return file_1.saveData(localFilepath, remoteFile)
+            .then(() => {
+            return {
+                code: 5,
+                name: 'added',
+                filename: filename,
+            };
+        });
+    }
+    if (remoteFile !== null && file_1.fileExists(localFilepath)) {
+        return file_1.getFileString(localFilepath)
+            .then(localContent => {
+            let remote = remoteFile.split("\n");
+            let local = localContent.split("\n");
+            let conflictLine = local.findIndex(line => line.match(/^\s*(<<<|>>>)/));
+            if (conflictLine != -1) {
+                return Promise.reject(file_1.vscodeLink(`${localFilepath}:${conflictLine + 1}`, `Resolve the conflict first:`));
+            }
+            // 1. 2,
+            if (baseFile == remoteFile) {
+                return {
+                    code: 1,
+                    name: '',
+                    filename: filename,
+                };
+            }
+            let base = baseFile ? baseFile.split("\n") : [];
+            let merge = node_diff3_1.mergeDiff3(local, base, remote, { label: { a: 'local', o: 'base', b: 'remote', }, excludeFalseConflicts: true });
+            let content = merge.result.join("\n");
+            return file_1.saveData(localFilepath, content)
+                .then(() => {
+                if (merge.conflict) {
+                    conflictLine = merge.result.findIndex(line => line.match(/^\s*(<<<|>>>)/));
+                    console.error(file_1.vscodeLink(`${localFilepath}:${conflictLine + 1}`, `Merge conflict required:`));
+                    return {
+                        code: 1,
+                        name: 'conflict',
+                        filename: filename,
+                    };
+                }
+                else {
+                    console.log(`Source merged: ${filename}`);
+                    return {
+                        code: 1,
+                        name: 'merged',
+                        filename: filename,
+                    };
+                }
+            });
+        });
+    }
+    else {
+        return Promise.resolve({
+            code: 6,
+            name: '',
+            filename: filename,
+        });
+    }
+};
+exports.isSourceMerged = function (filename, remoteFile, baseFile, folder) {
+    let localFilepath = `${folder}/${filename}`;
+    if (remoteFile != baseFile) {
+        return Promise.resolve(false);
+    }
+    if (file_1.fileExists(localFilepath)) {
+        return file_1.getFileString(localFilepath)
+            .then(localContent => {
+            let local = localContent.split("\n");
+            let conflictLine = local.findIndex(line => line.match(/^\s*(<<<|>>>)/));
+            if (conflictLine != -1) {
+                return Promise.reject(file_1.vscodeLink(`${localFilepath}:${conflictLine + 1}`, `Resolve the conflict first:`));
+            }
+            else {
+                return Promise.resolve(true);
+            }
+        });
+    }
+    else {
+        return Promise.resolve(true);
+    }
+};
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVyZ2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2dhbWVsZXQvbWVyZ2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHdDQUF3RjtBQUN4RiwyQ0FBd0M7QUFReEM7Ozs7Ozs7Ozs7O0dBV0c7QUFDVSxRQUFBLFdBQVcsR0FBRyxVQUFVLFFBQVEsRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLE1BQU07SUFDdkUsSUFBSSxhQUFhLEdBQUcsR0FBRyxNQUFNLElBQUksUUFBUSxFQUFFLENBQUM7SUFFNUMsS0FBSztJQUNMLElBQUksVUFBVSxLQUFLLElBQUksSUFBSSxpQkFBVSxDQUFDLGFBQWEsQ0FBQyxJQUFJLFFBQVEsS0FBSyxJQUFJLEVBQUU7UUFDdkUsT0FBTyxvQkFBYSxDQUFDLGFBQWEsQ0FBQzthQUM5QixJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUU7WUFDWixJQUFJLE9BQU8sSUFBSSxRQUFRLEVBQUU7Z0JBQ3JCLE9BQU8sQ0FBQyxHQUFHLENBQUMsbUJBQW1CLFFBQVEsRUFBRSxDQUFDLENBQUE7Z0JBQzFDLE9BQU8sYUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFBO2FBQy9CO2lCQUFNO2dCQUNILE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQzthQUNoQztRQUNMLENBQUMsQ0FBQzthQUNELElBQUksQ0FBQyxHQUFHLEVBQUU7WUFDUCxPQUFPO2dCQUNILElBQUksRUFBRSxDQUFDO2dCQUNQLElBQUksRUFBRSxTQUFTO2dCQUNmLFFBQVEsRUFBRSxRQUFRO2FBQ3JCLENBQUE7UUFDTCxDQUFDLENBQUMsQ0FBQTtLQUNUO0lBRUQsS0FBSztJQUNMLElBQUksVUFBVSxLQUFLLElBQUksSUFBSSxDQUFDLGlCQUFVLENBQUMsYUFBYSxDQUFDLElBQUksUUFBUSxLQUFLLElBQUksRUFBRTtRQUN4RSxJQUFJLFVBQVUsSUFBSSxRQUFRLEVBQUU7WUFDeEIsT0FBTyxDQUFDLEdB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