guito 1.0.2 → 1.0.3

package/bin/working-tree.js

@@ -1,5 +1,5 @@
-import { readFile } from 'node:fs/promises';
-import { isAbsolute, join, relative, resolve, sep } from 'node:path';
+import { mkdir, readFile, rm, writeFile } from 'node:fs/promises';
+import { dirname, isAbsolute, join, relative, resolve, sep } from 'node:path';
 /** NUL-delimited metadata is authoritative: patch headers quote unusual filenames. */
 function names(raw) {
     const fields = raw.split('\0');
@@ -137,5 +137,74 @@ export function workingTree(git, parse) {
             throw new Error('Stage changes before committing.');
         await git.commit([message.trim(), ...(description ? [description] : [])]);
     }
-    return { snapshot, stage, unstage, commit };
+    async function conflictPath(path) {
+        const [selected] = await validate([path]);
+        const unmerged = await git.raw([
+            '--literal-pathspecs', 'ls-files', '--unmerged', '-z', '--', selected,
+        ]);
+        if (!unmerged)
+            throw new Error(`File is no longer conflicted: ${selected}`);
+        return selected;
+    }
+    async function conflictStage(path, stage) {
+        try {
+            const content = await git.raw(['show', `:${stage}:${path}`]);
+            return { content: content.includes('\0') ? '' : content, binary: content.includes('\0') };
+        }
+        catch {
+            // A missing stage represents a deletion on that side of the merge.
+            return { content: null, binary: false };
+        }
+    }
+    /** Returns the three index stages and the current marker-filled worktree result. */
+    async function conflict(path) {
+        const selected = await conflictPath(path);
+        const root = (await git.revparse(['--show-toplevel'])).trim();
+        let result = null;
+        let resultBinary = false;
+        try {
+            const buffer = await readFile(join(root, selected));
+            resultBinary = buffer.includes(0);
+            if (!resultBinary)
+                result = buffer.toString('utf8');
+        }
+        catch {
+            // Delete/modify conflicts can currently have no worktree file.
+        }
+        const [base, ours, theirs] = await Promise.all([
+            conflictStage(selected, 1), conflictStage(selected, 2), conflictStage(selected, 3),
+        ]);
+        return { path: selected, base, ours, theirs, result: { content: result, binary: resultBinary } };
+    }
+    /** Writes or selects a result and stages it, which marks the path resolved. */
+    async function resolveConflict(path, resolution, content) {
+        const selected = await conflictPath(path);
+        if (!['content', 'ours', 'theirs', 'delete'].includes(String(resolution))) {
+            throw new Error('Choose a valid conflict resolution.');
+        }
+        const root = (await git.revparse(['--show-toplevel'])).trim();
+        const absolute = join(root, selected);
+        if (resolution === 'content') {
+            if (typeof content !== 'string' || content.includes('\0')) {
+                throw new Error('Conflict result must be text.');
+            }
+            await mkdir(dirname(absolute), { recursive: true });
+            await writeFile(absolute, content);
+        }
+        else if (resolution === 'delete') {
+            await rm(absolute, { force: true, recursive: true });
+        }
+        else {
+            const stage = resolution === 'ours' ? 2 : 3;
+            const selectedStage = await conflictStage(selected, stage);
+            if (selectedStage.content === null) {
+                await rm(absolute, { force: true, recursive: true });
+            }
+            else {
+                await git.raw(['--literal-pathspecs', 'checkout', `--${resolution}`, '--', selected]);
+            }
+        }
+        await git.raw(['--literal-pathspecs', 'add', '-A', '--', selected]);
+    }
+    return { snapshot, stage, unstage, commit, conflict, resolveConflict };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "guito",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Easily explore your git repositories.",
   "homepage": "https://github.com/danisss9/Guito#readme",
   "repository": {