gitx.do 0.0.1

package/dist/ops/merge.d.ts

@@ -0,0 +1,385 @@
+/**
+ * Three-way merge implementation for Git
+ *
+ * This module provides functionality for merging branches using
+ * three-way merge algorithm, including conflict detection and resolution.
+ */
+/**
+ * Types of merge conflicts that can occur
+ */
+export type ConflictType = 'content' | 'add-add' | 'modify-delete' | 'delete-modify' | 'rename-rename' | 'rename-delete' | 'directory-file';
+/**
+ * Merge strategies available
+ */
+export type MergeStrategy = 'recursive' | 'ours' | 'theirs' | 'octopus' | 'subtree';
+/**
+ * Status of a merge operation
+ */
+export type MergeStatus = 'fast-forward' | 'merged' | 'conflicted' | 'up-to-date' | 'aborted' | 'in-progress';
+/**
+ * Represents a conflict marker position in a file
+ */
+export interface ConflictMarker {
+    /** Line number where marker starts (1-indexed) */
+    startLine: number;
+    /** Line number where marker ends (1-indexed) */
+    endLine: number;
+    /** The conflicting content from the base version */
+    baseContent?: string;
+    /** The conflicting content from our (current) version */
+    oursContent: string;
+    /** The conflicting content from theirs (merged) version */
+    theirsContent: string;
+}
+/**
+ * Represents a single merge conflict
+ */
+export interface MergeConflict {
+    /** Type of conflict */
+    type: ConflictType;
+    /** Path to the conflicted file */
+    path: string;
+    /** SHA of the file in base (common ancestor) */
+    baseSha?: string;
+    /** SHA of the file in our (current) branch */
+    oursSha?: string;
+    /** SHA of the file in their (merged) branch */
+    theirsSha?: string;
+    /** Mode of the file in base */
+    baseMode?: string;
+    /** Mode of the file in ours */
+    oursMode?: string;
+    /** Mode of the file in theirs */
+    theirsMode?: string;
+    /** Content with conflict markers if type is 'content' */
+    conflictedContent?: Uint8Array;
+    /** Detailed conflict markers for content conflicts */
+    markers?: ConflictMarker[];
+    /** Original path if this was a rename */
+    originalPath?: string;
+    /** Renamed path(s) in case of rename conflicts */
+    renamedPaths?: {
+        ours?: string;
+        theirs?: string;
+    };
+}
+/**
+ * Options for merge operations
+ */
+export interface MergeOptions {
+    /** Merge strategy to use (default: 'recursive') */
+    strategy?: MergeStrategy;
+    /** Whether to allow fast-forward merges (default: true) */
+    allowFastForward?: boolean;
+    /** Force fast-forward only, fail if not possible (default: false) */
+    fastForwardOnly?: boolean;
+    /** Automatically resolve conflicts using strategy (default: false) */
+    autoResolve?: boolean;
+    /** Strategy option for conflict resolution when autoResolve is true */
+    conflictStrategy?: 'ours' | 'theirs' | 'union';
+    /** Commit message for merge commit */
+    message?: string;
+    /** Do not create a merge commit, leave changes staged */
+    noCommit?: boolean;
+    /** Squash commits from the merged branch */
+    squash?: boolean;
+    /** For octopus merges: list of additional branch SHAs */
+    additionalBranches?: string[];
+    /** Rename detection threshold (0-100, default: 50) */
+    renameThreshold?: number;
+    /** Whether to detect renames (default: true) */
+    detectRenames?: boolean;
+    /** Whether to detect copies (default: false) */
+    detectCopies?: boolean;
+    /** Author for the merge commit */
+    author?: {
+        name: string;
+        email: string;
+        timestamp?: number;
+        timezone?: string;
+    };
+    /** Committer for the merge commit */
+    committer?: {
+        name: string;
+        email: string;
+        timestamp?: number;
+        timezone?: string;
+    };
+}
+/**
+ * Statistics about the merge operation
+ */
+export interface MergeStats {
+    /** Number of files added */
+    filesAdded: number;
+    /** Number of files modified */
+    filesModified: number;
+    /** Number of files deleted */
+    filesDeleted: number;
+    /** Number of files renamed */
+    filesRenamed: number;
+    /** Number of binary files changed */
+    binaryFilesChanged: number;
+    /** Total lines added (text files only) */
+    linesAdded: number;
+    /** Total lines removed (text files only) */
+    linesRemoved: number;
+}
+/**
+ * Result of a merge operation
+ */
+export interface MergeResult {
+    /** Status of the merge */
+    status: MergeStatus;
+    /** SHA of the resulting merge commit (if created) */
+    commitSha?: string;
+    /** SHA of the resulting tree */
+    treeSha?: string;
+    /** Common ancestor commit SHA */
+    baseSha?: string;
+    /** SHA of the current branch before merge */
+    oursSha: string;
+    /** SHA of the merged branch */
+    theirsSha: string;
+    /** List of conflicts if status is 'conflicted' */
+    conflicts?: MergeConflict[];
+    /** Statistics about the merge */
+    stats?: MergeStats;
+    /** Message for the merge (user-provided or auto-generated) */
+    message?: string;
+    /** Whether the merge was a fast-forward */
+    fastForward: boolean;
+}
+/**
+ * State of an in-progress merge (stored in .git/MERGE_HEAD, etc.)
+ */
+export interface MergeState {
+    /** SHA of the commit being merged */
+    mergeHead: string;
+    /** SHA of the original HEAD before merge */
+    origHead: string;
+    /** Commit message for the merge */
+    message: string;
+    /** Merge mode (for special merges) */
+    mode?: 'squash' | 'no-ff';
+    /** List of unresolved conflicts */
+    unresolvedConflicts: MergeConflict[];
+    /** List of resolved conflicts */
+    resolvedConflicts: MergeConflict[];
+    /** Options used for the merge */
+    options: MergeOptions;
+}
+/**
+ * Options for resolving a conflict
+ */
+export interface ResolveOptions {
+    /** Resolution strategy */
+    resolution: 'ours' | 'theirs' | 'base' | 'custom';
+    /** Custom content when resolution is 'custom' */
+    customContent?: Uint8Array;
+    /** Custom mode when resolution is 'custom' */
+    customMode?: string;
+}
+/**
+ * Result of conflict resolution
+ */
+export interface ResolveResult {
+    /** Whether resolution was successful */
+    success: boolean;
+    /** Path that was resolved */
+    path: string;
+    /** Error message if resolution failed */
+    error?: string;
+    /** Remaining unresolved conflicts */
+    remainingConflicts: number;
+}
+/**
+ * Result of abort or continue operations
+ */
+export interface MergeOperationResult {
+    /** Whether the operation was successful */
+    success: boolean;
+    /** Error message if operation failed */
+    error?: string;
+    /** Current HEAD SHA after operation */
+    headSha?: string;
+    /** Status message */
+    message?: string;
+}
+/**
+ * Extended object type that may include parsed commit/tree data
+ */
+interface ExtendedObject {
+    type: string;
+    data: Uint8Array;
+    tree?: string;
+    parents?: string[];
+    entries?: Array<{
+        mode: string;
+        name: string;
+        sha: string;
+    }>;
+}
+/**
+ * Interface for the storage layer used by merge operations
+ */
+export interface MergeStorage {
+    /** Read an object by SHA */
+    readObject(sha: string): Promise<ExtendedObject | null>;
+    /** Write an object and return its SHA */
+    writeObject(type: string, data: Uint8Array): Promise<string>;
+    /** Read a reference */
+    readRef(ref: string): Promise<string | null>;
+    /** Write a reference */
+    writeRef(ref: string, sha: string): Promise<void>;
+    /** Read merge state */
+    readMergeState(): Promise<MergeState | null>;
+    /** Write merge state */
+    writeMergeState(state: MergeState): Promise<void>;
+    /** Delete merge state */
+    deleteMergeState(): Promise<void>;
+    /** Stage a file for the index */
+    stageFile(path: string, sha: string, mode: string, stage?: number): Promise<void>;
+    /** Get the current index */
+    getIndex(): Promise<Map<string, {
+        sha: string;
+        mode: string;
+        stage: number;
+    }>>;
+}
+/**
+ * Performs a three-way merge between the current branch and another commit.
+ *
+ * This function implements Git's three-way merge algorithm:
+ * 1. Find the common ancestor (merge base) of the two commits
+ * 2. Compare both sides against the base to identify changes
+ * 3. Apply non-conflicting changes automatically
+ * 4. Identify and report conflicts for manual resolution
+ *
+ * @param storage - The storage interface for reading/writing objects
+ * @param oursSha - SHA of the current branch's HEAD commit
+ * @param theirsSha - SHA of the commit to merge
+ * @param options - Merge options
+ * @returns MergeResult with status and any conflicts
+ *
+ * @example
+ * ```typescript
+ * const result = await merge(storage, 'abc123', 'def456', {
+ *   message: 'Merge feature branch',
+ *   allowFastForward: true
+ * })
+ *
+ * if (result.status === 'conflicted') {
+ *   console.log('Conflicts:', result.conflicts)
+ * }
+ * ```
+ */
+export declare function merge(storage: MergeStorage, oursSha: string, theirsSha: string, options?: MergeOptions): Promise<MergeResult>;
+/**
+ * Resolves a single merge conflict.
+ *
+ * After a merge results in conflicts, use this function to resolve
+ * individual files. Once all conflicts are resolved, use continueMerge()
+ * to complete the merge.
+ *
+ * @param storage - The storage interface
+ * @param path - Path to the conflicted file
+ * @param options - Resolution options
+ * @returns ResolveResult indicating success and remaining conflicts
+ *
+ * @example
+ * ```typescript
+ * // Resolve using "ours" strategy
+ * await resolveConflict(storage, 'src/file.ts', { resolution: 'ours' })
+ *
+ * // Resolve with custom content
+ * await resolveConflict(storage, 'src/file.ts', {
+ *   resolution: 'custom',
+ *   customContent: new TextEncoder().encode('merged content')
+ * })
+ * ```
+ */
+export declare function resolveConflict(storage: MergeStorage, path: string, options: ResolveOptions): Promise<ResolveResult>;
+/**
+ * Aborts an in-progress merge operation.
+ *
+ * This restores the repository to its state before the merge began,
+ * discarding any changes made during conflict resolution.
+ *
+ * @param storage - The storage interface
+ * @returns MergeOperationResult indicating success
+ *
+ * @example
+ * ```typescript
+ * const result = await abortMerge(storage)
+ * if (result.success) {
+ *   console.log('Merge aborted, HEAD is now', result.headSha)
+ * }
+ * ```
+ */
+export declare function abortMerge(storage: MergeStorage): Promise<MergeOperationResult>;
+/**
+ * Continues a merge after all conflicts have been resolved.
+ *
+ * This creates the merge commit with the resolved files and
+ * cleans up the merge state.
+ *
+ * @param storage - The storage interface
+ * @param message - Optional commit message (overrides stored message)
+ * @returns MergeOperationResult with the new commit SHA
+ *
+ * @example
+ * ```typescript
+ * // After resolving all conflicts
+ * const result = await continueMerge(storage)
+ * if (result.success) {
+ *   console.log('Merge completed with commit', result.headSha)
+ * }
+ * ```
+ */
+export declare function continueMerge(storage: MergeStorage, message?: string): Promise<MergeOperationResult>;
+/**
+ * Finds the best common ancestor (merge base) for two commits.
+ *
+ * @param storage - The storage interface
+ * @param commit1 - First commit SHA
+ * @param commit2 - Second commit SHA
+ * @returns SHA of the merge base, or null if no common ancestor exists
+ */
+export declare function findMergeBase(storage: MergeStorage, commit1: string, commit2: string): Promise<string | null>;
+/**
+ * Performs a content-level three-way merge on text files.
+ *
+ * @param base - Content of the base (common ancestor) version
+ * @param ours - Content of our (current) version
+ * @param theirs - Content of their (merged) version
+ * @returns Merged content and any conflict markers
+ */
+export declare function mergeContent(base: Uint8Array, ours: Uint8Array, theirs: Uint8Array): {
+    merged: Uint8Array;
+    hasConflicts: boolean;
+    markers: ConflictMarker[];
+};
+/**
+ * Checks if a file is binary (non-text).
+ *
+ * @param content - File content to check
+ * @returns true if the file appears to be binary
+ */
+export declare function isBinaryFile(content: Uint8Array): boolean;
+/**
+ * Gets the current merge state if a merge is in progress.
+ *
+ * @param storage - The storage interface
+ * @returns MergeState if merge is in progress, null otherwise
+ */
+export declare function getMergeState(storage: MergeStorage): Promise<MergeState | null>;
+/**
+ * Checks if a merge is currently in progress.
+ *
+ * @param storage - The storage interface
+ * @returns true if a merge is in progress
+ */
+export declare function isMergeInProgress(storage: MergeStorage): Promise<boolean>;
+export {};
+//# sourceMappingURL=merge.d.ts.map

package/dist/ops/merge.d.ts.map

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