@abelfubu/dv 0.1.0

package/dist/diff-surface-copy.test.js

@@ -0,0 +1,142 @@
+import { jsx as _jsx } from "@opentuah/react/jsx-runtime";
+// Tests for captureSelectedDiffText — copying selected diff rows from the renderable surface.
+import * as React from "react";
+import { afterEach, describe, expect, it } from "bun:test";
+import { testRender } from "@opentuah/react/test-utils";
+import { getDataPaths } from "@opentuah/core";
+import { DiffView } from "./components/diff-view.js";
+import { captureSelectedDiffText } from "./diff-surface-copy.js";
+getDataPaths().setMaxListeners(50);
+// Logical line order for this diff (matching DiffRenderable grouping):
+// 0: context
+// 1: remove "old"
+// 2: remove "more"
+// 3: add "new"
+// 4: add "more-new"
+// 5: context
+const sampleDiff = `diff --git a/a.ts b/a.ts
+index 1111111..2222222 100644
+--- a/a.ts
++++ b/a.ts
+@@ -1,4 +1,4 @@
+ context
+-old
++new
+-more
++more-new
+ keep
+`;
+async function setupTest(jsx, opts) {
+    const setup = await testRender(jsx, opts);
+    globalThis.IS_REACT_ACT_ENVIRONMENT = false;
+    return setup;
+}
+async function renderUntilStable(testSetup, times = 5) {
+    for (let index = 0; index < times; index++) {
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        await testSetup.renderOnce();
+    }
+}
+function renderDiffView(props) {
+    const ref = React.createRef();
+    const element = (_jsx(DiffView, { ref: ref, diff: props.diff, view: props.view, filetype: props.filetype, themeName: "github", focused: props.focused ?? true, cursorLine: props.selection?.start ?? 0, selection: props.selection ?? null }));
+    return { element, ref };
+}
+describe("captureSelectedDiffText", () => {
+    let testSetup;
+    afterEach(() => {
+        if (testSetup) {
+            testSetup.renderer.destroy();
+            testSetup = undefined;
+        }
+    });
+    it("returns null when no renderable is provided", () => {
+        const result = captureSelectedDiffText(undefined, { start: 0, end: 0 });
+        expect(result.text).toBeNull();
+    });
+    it("copies unified view rendered rows", async () => {
+        const { element, ref } = renderDiffView({
+            diff: sampleDiff,
+            view: "unified",
+            filetype: "ts",
+            selection: { start: 1, end: 3 },
+        });
+        testSetup = await setupTest(element, { width: 80, height: 12 });
+        await renderUntilStable(testSetup);
+        const diffRenderable = ref.current?.getDiffRenderable();
+        expect(diffRenderable).toBeDefined();
+        const result = captureSelectedDiffText(diffRenderable, { start: 1, end: 3 });
+        expect(result.text).toBe("old\nmore\nnew");
+    });
+    it("copies new-side rows in split view", async () => {
+        const { element, ref } = renderDiffView({
+            diff: sampleDiff,
+            view: "split",
+            filetype: "ts",
+            selection: { start: 1, end: 4 },
+        });
+        testSetup = await setupTest(element, { width: 160, height: 12 });
+        await renderUntilStable(testSetup);
+        const diffRenderable = ref.current?.getDiffRenderable();
+        expect(diffRenderable).toBeDefined();
+        const result = captureSelectedDiffText(diffRenderable, { start: 1, end: 4 });
+        // In split view we copy the right side. Removed-only logical rows are empty
+        // padding on the new side; added rows contain the new code.
+        expect(result.text).toBeDefined();
+        expect(result.text).toContain("new");
+        expect(result.text).toContain("more-new");
+        expect(result.text).not.toContain("old");
+    });
+    it("reports the first new line number in unified view", async () => {
+        const { element, ref } = renderDiffView({
+            diff: sampleDiff,
+            view: "unified",
+            filetype: "ts",
+            selection: { start: 2, end: 3 },
+        });
+        testSetup = await setupTest(element, { width: 80, height: 12 });
+        await renderUntilStable(testSetup);
+        const diffRenderable = ref.current?.getDiffRenderable();
+        const result = captureSelectedDiffText(diffRenderable, { start: 2, end: 3 });
+        expect(result.startLineNum).toBe(3);
+    });
+    it("reports the first new line number in split view", async () => {
+        const { element, ref } = renderDiffView({
+            diff: sampleDiff,
+            view: "split",
+            filetype: "ts",
+            selection: { start: 2, end: 4 },
+        });
+        testSetup = await setupTest(element, { width: 160, height: 12 });
+        await renderUntilStable(testSetup);
+        const diffRenderable = ref.current?.getDiffRenderable();
+        const result = captureSelectedDiffText(diffRenderable, { start: 2, end: 4 });
+        expect(result.startLineNum).toBe(3);
+    });
+    it("handles a single-line selection", async () => {
+        const { element, ref } = renderDiffView({
+            diff: sampleDiff,
+            view: "unified",
+            filetype: "ts",
+            selection: { start: 3, end: 3 },
+        });
+        testSetup = await setupTest(element, { width: 80, height: 12 });
+        await renderUntilStable(testSetup);
+        const diffRenderable = ref.current?.getDiffRenderable();
+        const result = captureSelectedDiffText(diffRenderable, { start: 3, end: 3 });
+        expect(result.text).toBe("new");
+    });
+    it("ignores out-of-bounds indices", async () => {
+        const { element, ref } = renderDiffView({
+            diff: sampleDiff,
+            view: "unified",
+            filetype: "ts",
+            selection: { start: 100, end: 105 },
+        });
+        testSetup = await setupTest(element, { width: 80, height: 12 });
+        await renderUntilStable(testSetup);
+        const diffRenderable = ref.current?.getDiffRenderable();
+        const result = captureSelectedDiffText(diffRenderable, { start: 100, end: 105 });
+        expect(result.text).toBe("");
+    });
+});

package/dist/diff-utils.d.ts

@@ -0,0 +1,196 @@
+/**
+ * Check if the current directory is inside a git repository.
+ * If not, print a friendly error message and exit.
+ */
+export declare function ensureGitRepo(): void;
+/**
+ * Get the absolute path to the git repository root.
+ */
+export declare function getGitRepoRoot(): string;
+/**
+ * Strip submodule status lines from git diff output.
+ * git diff --submodule=diff adds various status lines that the diff parser doesn't understand:
+ * - "Submodule name hash1..hash2:" (header before submodule diff)
+ * - "Submodule name contains modified content"
+ * - "Submodule name contains untracked content"
+ * - "Submodule name (new commits)"
+ * - "Submodule name (commits not present)"
+ */
+export declare function stripSubmoduleHeaders(diffOutput: string): string;
+/**
+ * Metadata extracted from git diff rename/copy headers.
+ * git diff -M adds these headers which the `diff` npm package silently skips.
+ */
+export interface RenameInfo {
+    type: "rename" | "copy";
+    from: string;
+    to: string;
+    similarity: number;
+}
+/**
+ * Preprocess raw git diff output to handle rename/copy detection.
+ *
+ * The `diff` npm package's parsePatch does not understand git's rename/copy
+ * headers (similarity index, rename from/to, copy from/to). For pure renames
+ * (100% similarity, no content changes), it produces broken entries because
+ * there are no ---/+++ or @@ lines for it to parse.
+ *
+ * This function:
+ * 1. Injects synthetic --- and +++ headers for pure renames/copies so parsePatch
+ *    creates proper entries with correct filenames
+ * 2. Extracts rename/copy metadata (type, from, to, similarity) for each file section
+ *
+ * @returns processedDiff: diff string safe for parsePatch, renameInfo: metadata per file index
+ */
+export declare function preprocessDiff(rawDiff: string): {
+    processedDiff: string;
+    renameInfo: Map<number, RenameInfo>;
+};
+/**
+ * Parse git diff output with rename/copy detection support.
+ * Preprocesses the diff for pure renames, delegates to parsePatch from the `diff` package,
+ * and enriches results with rename metadata.
+ *
+ * Use this instead of calling parsePatch directly when processing git diff -M output.
+ *
+ * Generic to preserve the concrete type returned by parsePatch (e.g. StructuredPatch).
+ */
+export declare function parseGitDiffFiles<T>(rawDiff: string, parsePatch: (diff: string) => T[]): (T & {
+    renameFrom?: string;
+    renameTo?: string;
+    similarity?: number;
+})[];
+export declare const IGNORED_FILES: string[];
+export interface ParsedFile {
+    oldFileName?: string;
+    newFileName?: string;
+    oldHeader?: string;
+    newHeader?: string;
+    hunks: Array<{
+        lines: string[];
+    }>;
+    rawDiff?: string;
+    /** Set when this file was renamed (git diff -M) */
+    renameFrom?: string;
+    renameTo?: string;
+    /** Similarity percentage for renames/copies (0-100) */
+    similarity?: number;
+}
+/** Default number of context lines around each diff hunk */
+export declare const DEFAULT_CONTEXT_LINES = 6;
+export interface GitCommandOptions {
+    staged?: boolean;
+    commit?: string;
+    base?: string;
+    head?: string;
+    context?: string | number;
+    filter?: string | string[];
+    positionalFilters?: string[];
+}
+/**
+ * Normalize file filter patterns from both --filter and positional args after --.
+ */
+export declare function getFilterPatterns(options: Pick<GitCommandOptions, "filter" | "positionalFilters">): string[];
+/**
+ * Check whether a filepath matches any user-provided file filter glob.
+ * No patterns means "match everything".
+ */
+export declare function matchesFileFilters(filePath: string, patterns: string[]): boolean;
+/**
+ * Apply critique --filter globs to already-parsed diff files.
+ * This is used after appending submodule diffs, where git pathspec filters are
+ * no longer sufficient.
+ */
+export declare function filterParsedFilesByPatterns<T extends ParsedFile>(files: T[], options: Pick<GitCommandOptions, "filter" | "positionalFilters">): T[];
+/**
+ * Build git command string based on options
+ */
+export declare function buildGitCommand(options: GitCommandOptions): string;
+/**
+ * Get submodule paths that have dirty working trees (uncommitted changes).
+ * Returns only submodules with actual uncommitted modifications, not those
+ * that merely point to a different commit than what the parent repo recorded.
+ *
+ * Uses `git submodule status` which prefixes each line with:
+ * - ' ' (space): submodule matches recorded commit and is clean
+ * - '+': submodule is at a different commit than recorded
+ * - '-': submodule is not initialized
+ * - 'U': submodule has merge conflicts
+ *
+ * A submodule with '+' prefix AND a trailing dirty marker (e.g. " (modified content)")
+ * or one where `git status --porcelain` inside it is non-empty has dirty changes.
+ */
+export declare function getDirtySubmodulePaths(): string[];
+/**
+ * Build a git diff command that only shows diffs for specific submodule paths.
+ * Used to get the actual file-level diffs inside dirty submodules.
+ */
+export declare function buildSubmoduleDiffCommand(submodulePaths: string[], options: Pick<GitCommandOptions, "context">): string;
+/**
+ * Get paths of untracked files in the working tree.
+ */
+export declare function getUntrackedFilePaths(): string[];
+/**
+ * Generate a synthetic git diff for an untracked file.
+ * Produces output equivalent to `git add -N <file> && git diff <file>`.
+ */
+export declare function buildUntrackedFileDiff(filePath: string): string;
+/**
+ * Get file status from parsed diff file
+ * - added: oldFileName is /dev/null (new file)
+ * - deleted: newFileName is /dev/null (removed file)
+ * - renamed: file has renameFrom/renameTo metadata, or oldFileName !== newFileName
+ *   (with --no-prefix, different filenames means rename since there's no a/ b/ prefix)
+ * - modified: both files exist with same name (changed file)
+ */
+export declare function getFileStatus(file: {
+    oldFileName?: string;
+    newFileName?: string;
+    renameFrom?: string;
+    renameTo?: string;
+}): "added" | "modified" | "deleted" | "renamed";
+/**
+ * Get filename from parsed diff file, handling /dev/null for new/deleted files.
+ * For renames, returns the new name (destination).
+ */
+export declare function getFileName(file: {
+    oldFileName?: string;
+    newFileName?: string;
+    renameTo?: string;
+}): string;
+/**
+ * Get the old filename for display purposes (e.g., "old-name.ts -> new-name.ts").
+ * Returns undefined if the file was not renamed.
+ */
+export declare function getOldFileName(file: {
+    oldFileName?: string;
+    newFileName?: string;
+    renameFrom?: string;
+    renameTo?: string;
+}): string | undefined;
+/**
+ * Count additions and deletions from hunks
+ */
+export declare function countChanges(hunks: Array<{
+    lines: string[];
+}>): {
+    additions: number;
+    deletions: number;
+};
+/**
+ * Determine view mode based on changes and terminal width
+ * @param splitThreshold - minimum cols for split view (default 100 for TUI, 150 for web)
+ */
+export declare function getViewMode(additions: number, deletions: number, cols: number, splitThreshold?: number): "split" | "unified";
+/**
+ * Filter and sort parsed diff files, add rawDiff
+ */
+export declare function processFiles<T extends ParsedFile>(files: T[], formatPatch: (file: T) => string): (T & {
+    rawDiff: string;
+})[];
+/**
+ * Detect filetype from filename for syntax highlighting
+ * Maps to tree-sitter parsers available in @opentuah/core and parsers-config.ts
+ */
+export declare function detectFiletype(filePath: string): string | undefined;
+//# sourceMappingURL=diff-utils.d.ts.map

package/dist/diff-utils.d.ts.map

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