git-chopstick-core 0.1.1 → 0.1.3

package/dist/models/status.js

@@ -0,0 +1,135 @@
+import { DiffSelectionType } from './diff/index.js';
+export var GitStatusEntry;
+(function (GitStatusEntry) {
+    GitStatusEntry["Modified"] = "M";
+    GitStatusEntry["Added"] = "A";
+    GitStatusEntry["Deleted"] = "D";
+    GitStatusEntry["Renamed"] = "R";
+    GitStatusEntry["Copied"] = "C";
+    GitStatusEntry["Unchanged"] = ".";
+    GitStatusEntry["Untracked"] = "?";
+    GitStatusEntry["Ignored"] = "!";
+    GitStatusEntry["UpdatedButUnmerged"] = "U";
+})(GitStatusEntry || (GitStatusEntry = {}));
+export var AppFileStatusKind;
+(function (AppFileStatusKind) {
+    AppFileStatusKind["New"] = "New";
+    AppFileStatusKind["Modified"] = "Modified";
+    AppFileStatusKind["Deleted"] = "Deleted";
+    AppFileStatusKind["Copied"] = "Copied";
+    AppFileStatusKind["Renamed"] = "Renamed";
+    AppFileStatusKind["Conflicted"] = "Conflicted";
+    AppFileStatusKind["Untracked"] = "Untracked";
+})(AppFileStatusKind || (AppFileStatusKind = {}));
+export function isConflictedFileStatus(appFileStatus) {
+    return appFileStatus.kind === AppFileStatusKind.Conflicted;
+}
+export function isConflictWithMarkers(conflictedFileStatus) {
+    return 'conflictMarkerCount' in conflictedFileStatus;
+}
+export var UnmergedEntrySummary;
+(function (UnmergedEntrySummary) {
+    UnmergedEntrySummary["AddedByUs"] = "added-by-us";
+    UnmergedEntrySummary["DeletedByUs"] = "deleted-by-us";
+    UnmergedEntrySummary["AddedByThem"] = "added-by-them";
+    UnmergedEntrySummary["DeletedByThem"] = "deleted-by-them";
+    UnmergedEntrySummary["BothDeleted"] = "both-deleted";
+    UnmergedEntrySummary["BothAdded"] = "both-added";
+    UnmergedEntrySummary["BothModified"] = "both-modified";
+})(UnmergedEntrySummary || (UnmergedEntrySummary = {}));
+export class FileChange {
+    path;
+    status;
+    id;
+    constructor(path, status) {
+        this.path = path;
+        this.status = status;
+        if (status.kind === AppFileStatusKind.Renamed ||
+            status.kind === AppFileStatusKind.Copied) {
+            this.id = `${status.kind}+${path}+${status.oldPath}`;
+        }
+        else {
+            this.id = `${status.kind}+${path}`;
+        }
+    }
+    isDeleted() {
+        return this.status.kind === AppFileStatusKind.Deleted;
+    }
+    isNew() {
+        return this.status.kind === AppFileStatusKind.New;
+    }
+    isModified() {
+        return this.status.kind === AppFileStatusKind.Modified;
+    }
+    isUntracked() {
+        return this.status.kind === AppFileStatusKind.Untracked;
+    }
+}
+export class WorkingDirectoryFileChange extends FileChange {
+    selection;
+    constructor(path, status, selection) {
+        super(path, status);
+        this.selection = selection;
+    }
+    withIncludeAll(include) {
+        const newSelection = include
+            ? this.selection.withSelectAll()
+            : this.selection.withSelectNone();
+        return this.withSelection(newSelection);
+    }
+    withSelection(selection) {
+        return new WorkingDirectoryFileChange(this.path, this.status, selection);
+    }
+    isIncludedInCommit() {
+        return this.selection.getSelectionType() === DiffSelectionType.All;
+    }
+    isExcludedFromCommit() {
+        return this.selection.getSelectionType() === DiffSelectionType.None;
+    }
+}
+export class CommittedFileChange extends FileChange {
+    commitish;
+    parentCommitish;
+    constructor(path, status, commitish, parentCommitish) {
+        super(path, status);
+        this.commitish = commitish;
+        this.parentCommitish = parentCommitish;
+    }
+}
+export class WorkingDirectoryStatus {
+    files;
+    includeAll;
+    static fromFiles(files) {
+        return new WorkingDirectoryStatus(files, getIncludeAllState(files));
+    }
+    fileIxById = new Map();
+    constructor(files, includeAll = true) {
+        this.files = files;
+        this.includeAll = includeAll;
+        files.forEach((f, ix) => this.fileIxById.set(f.id, ix));
+    }
+    withIncludeAllFiles(includeAll) {
+        const newFiles = this.files.map(f => f.withIncludeAll(includeAll));
+        return new WorkingDirectoryStatus(newFiles, includeAll);
+    }
+    findFileWithID(id) {
+        const ix = this.fileIxById.get(id);
+        return ix !== undefined ? this.files[ix] || null : null;
+    }
+    findFileIndexByID(id) {
+        const ix = this.fileIxById.get(id);
+        return ix !== undefined ? ix : -1;
+    }
+}
+function getIncludeAllState(files) {
+    if (!files.length)
+        return true;
+    const allSelected = files.every(f => f.selection.getSelectionType() === DiffSelectionType.All);
+    const noneSelected = files.every(f => f.selection.getSelectionType() === DiffSelectionType.None);
+    if (allSelected)
+        return true;
+    if (noneSelected)
+        return false;
+    return null;
+}
+//# sourceMappingURL=status.js.map

package/dist/models/status.js.map

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

package/dist/models/submodule.d.ts

@@ -0,0 +1,12 @@
+export type SubmoduleEntry = {
+    readonly path: string;
+    readonly url: string;
+    readonly describe?: string;
+    readonly sha: string;
+    readonly status: SubmoduleStatus;
+};
+export type SubmoduleStatus = {
+    readonly commitChanged: boolean;
+    readonly modifiedChanges: boolean;
+    readonly untrackedChanges: boolean;
+};

package/dist/models/submodule.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=submodule.js.map

package/dist/models/submodule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"submodule.js","sourceRoot":"","sources":["../../src/models/submodule.ts"],"names":[],"mappings":""}

package/dist/models/worktree.d.ts

@@ -0,0 +1,10 @@
+export type WorktreeType = 'main' | 'linked';
+export type WorktreeEntry = {
+    readonly path: string;
+    readonly head: string;
+    readonly branch: string | null;
+    readonly isDetached: boolean;
+    readonly type: WorktreeType;
+    readonly isLocked: boolean;
+    readonly isPrunable: boolean;
+};

package/dist/models/worktree.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=worktree.js.map

package/dist/models/worktree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/models/worktree.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,23 +1,62 @@
 {
   "name": "git-chopstick-core",
-  "version": "0.1.1",
-  
+  "version": "0.1.3",
   "type": "module",
-  "main": "./src/index.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "import": "./src/index.ts"
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./git": {
+      "import": "./dist/git/index.js",
+      "types": "./dist/git/index.d.ts"
+    },
+    "./models": {
+      "import": "./dist/models/index.js",
+      "types": "./dist/models/index.d.ts"
+    },
+    "./models/diff": {
+      "import": "./dist/models/diff/index.js",
+      "types": "./dist/models/diff/index.d.ts"
+    },
+    "./lib/progress": {
+      "import": "./dist/lib/progress/index.js",
+      "types": "./dist/lib/progress/index.d.ts"
+    },
+    "./*": {
+      "import": "./dist/*.js",
+      "types": "./dist/*.d.ts"
     }
   },
+  "files": [
+    "dist"
+  ],
   "description": "Git backend library extracted from GitHub Desktop",
   "scripts": {
-    "typecheck": "tsc --noEmit"
+    "clean": "rm -rf dist",
+    "build": "npm run clean && tsc",
+    "typecheck": "tsc --noEmit",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "byline": "^5.0.0",
     "ignore": "^7.0.5",
     "memoize-one": "^6.0.0"
   },
+  "peerDependencies": {
+    "@types/byline": "*",
+    "@types/node": ">=20.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@types/byline": {
+      "optional": true
+    },
+    "@types/node": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@types/byline": "^4.2.36",
     "@types/node": "^22.19.20",

package/examples/get-status.ts

@@ -1,84 +0,0 @@
-/**
- * Example: Open a repo and show its current status.
- *
- * Usage:
- *   bun examples/get-status.ts /path/to/some/repo
- */
-
-import { Repository } from '../src/models/repository'
-import { getStatus } from '../src/git/status'
-
-async function main() {
-  const repoPath = process.argv[2]
-  if (!repoPath) {
-    console.error('Usage: bun examples/get-status.ts <path-to-repo>')
-    process.exit(1)
-  }
-
-  const repo = new Repository(repoPath, 1)
-
-  console.log(`\n📂 Repository: ${repo.name}`)
-  console.log(`   Path: ${repo.path}\n`)
-
-  const status = await getStatus(repo)
-
-  if (!status) {
-    console.log('❌ Could not read repository status (not a git repo?)')
-    process.exit(1)
-  }
-
-  // Branch info
-  console.log(`🌿 Branch: ${status.currentBranch ?? '(detached HEAD)'}`)
-  if (status.currentUpstreamBranch) {
-    console.log(`   Upstream: ${status.currentUpstreamBranch}`)
-  }
-  if (status.branchAheadBehind) {
-    const { ahead, behind } = status.branchAheadBehind
-    console.log(`   Ahead: ${ahead}  |  Behind: ${behind}`)
-  }
-  console.log(`   Tip: ${status.currentTip?.slice(0, 7) ?? 'N/A'}`)
-
-  // Conflicted files
-  if (status.doConflictedFilesExist) {
-    console.log(`\n⚠️  Conflicts detected!`)
-  }
-
-  // Working directory changes
-  const files = status.workingDirectory.files
-  console.log(`\n📝 Changed files: ${files.length}`)
-
-  // Group by status kind
-  const byKind = new Map<string, string[]>()
-  for (const file of files) {
-    const kind = file.status.kind
-    const list = byKind.get(kind) ?? []
-    list.push(file.status.kind === 'Renamed' || file.status.kind === 'Copied'
-      ? `${file.path} (was: ${file.status.oldPath})`
-      : file.path)
-    byKind.set(kind, list)
-  }
-
-  for (const [kind, paths] of byKind) {
-    console.log(`   ${kind}:`)
-    for (const p of paths) {
-      console.log(`     - ${p}`)
-    }
-  }
-
-  // Merge/rebase state
-  if (status.mergeHeadFound) {
-    console.log(`\n🔀 Merge in progress`)
-  }
-  if (status.rebaseInternalState) {
-    console.log(`\n🔄 Rebase in progress`)
-    console.log(`   Target: ${status.rebaseInternalState.targetBranch}`)
-  }
-  if (status.isCherryPickingHeadFound) {
-    console.log(`\n🍒 Cherry-pick in progress`)
-  }
-}
-
-main().catch(err => {
-  console.error('Error:', err)
-  process.exit(1)
-})

package/src/git/add.ts

@@ -1,16 +0,0 @@
-import { git } from './core'
-import { Repository } from '../models/repository'
-import { WorkingDirectoryFileChange } from '../models/status'
-
-/**
- * Add a conflicted file to the index.
- *
- * Typically done after having resolved conflicts either manually
- * or through checkout --theirs/--ours.
- */
-export async function addConflictedFile(
-  repository: Repository,
-  file: WorkingDirectoryFileChange
-) {
-  await git(['add', '--', file.path], repository.path, 'addConflictedFile')
-}

package/src/git/apply.ts

@@ -1,154 +0,0 @@
-import { GitError as DugiteError } from './exec'
-import { git } from './core'
-import {
-  WorkingDirectoryFileChange,
-  AppFileStatusKind,
-} from '../models/status'
-import { DiffType, ITextDiff, DiffSelection } from '../models/diff'
-import { Repository } from '../models/repository'
-import { getWorkingDirectoryDiff } from './diff'
-import { formatPatch, formatPatchToDiscardChanges } from '../lib/patch-formatter'
-import { assertNever } from '../lib/fatal-error'
-
-export async function applyPatchToIndex(
-  repository: Repository,
-  file: WorkingDirectoryFileChange
-): Promise<void> {
-  // If the file was a rename we have to recreate that rename since we've
-  // just blown away the index. Think of this block of weird looking commands
-  // as running `git mv`.
-  if (file.status.kind === AppFileStatusKind.Renamed) {
-    // Make sure the index knows of the removed file. We could use
-    // update-index --force-remove here but we're not since it's
-    // possible that someone staged a rename and then recreated the
-    // original file and we don't have any guarantees for in which order
-    // partial stages vs full-file stages happen. By using git add the
-    // worst that could happen is that we re-stage a file already staged
-    // by updateIndex.
-    await git(
-      ['add', '--update', '--', file.status.oldPath],
-      repository.path,
-      'applyPatchToIndex'
-    )
-
-    // Figure out the blob oid of the removed file
-    // <mode> SP <type> SP <object> TAB <file>
-    const oldFile = await git(
-      ['ls-tree', 'HEAD', '--', file.status.oldPath],
-      repository.path,
-      'applyPatchToIndex'
-    )
-
-    const [info] = oldFile.stdout.split('\t', 1)
-    const [mode, , oid] = info.split(' ', 3)
-
-    // Add the old file blob to the index under the new name
-    await git(
-      ['update-index', '--add', '--cacheinfo', mode, oid, file.path],
-      repository.path,
-      'applyPatchToIndex'
-    )
-  }
-
-  const applyArgs: string[] = [
-    'apply',
-    '--cached',
-    '--unidiff-zero',
-    '--whitespace=nowarn',
-    '-',
-  ]
-
-  const diff = await getWorkingDirectoryDiff(repository, file)
-
-  if (diff.kind !== DiffType.Text && diff.kind !== DiffType.LargeText) {
-    const { kind } = diff
-    switch (diff.kind) {
-      case DiffType.Binary:
-      case DiffType.Submodule:
-      case DiffType.Image:
-        throw new Error(
-          `Can't create partial commit in binary file: ${file.path}`
-        )
-      case DiffType.Unrenderable:
-        throw new Error(
-          `File diff is too large to generate a partial commit: ${file.path}`
-        )
-      default:
-        assertNever(diff, `Unknown diff kind: ${kind}`)
-    }
-  }
-
-  const patch = await formatPatch(repository, file, file.selection)
-  await git(applyArgs, repository.path, 'applyPatchToIndex', { stdin: patch })
-
-  return Promise.resolve()
-}
-
-/**
- * Test a patch to see if it will apply cleanly.
- *
- * @param workTree work tree (which should be checked out to a specific commit)
- * @param patch a Git patch (or patch series) to try applying
- * @returns whether the patch applies cleanly
- *
- * See `formatPatch` to generate a patch series from existing Git commits
- */
-export async function checkPatch(
-  workTree: { path: string },
-  patch: string
-): Promise<boolean> {
-  const result = await git(
-    ['apply', '--check', '-'],
-    workTree.path,
-    'checkPatch',
-    {
-      stdin: patch,
-      encoding: 'utf8' as any,
-      expectedErrors: new Set<DugiteError>([DugiteError.PatchDoesNotApply]),
-    }
-  )
-
-  if (result.gitError === DugiteError.PatchDoesNotApply) {
-    // other errors will be thrown if encountered, so this is fine for now
-    return false
-  }
-
-  return true
-}
-
-/**
- * Discards the local changes for the specified file based on the passed diff
- * and a selection of lines from it.
- *
- * When passed an empty selection, this method won't do anything. When passed a
- * full selection, all changes from the file will be discarded.
- *
- * @param repository The repository in which to update the working directory
- *                   with information from the index
- *
- * @param filePath   The relative path in the working directory of the file to use
- *
- * @param diff       The diff containing the file local changes
- *
- * @param selection  The selection of changes from the diff to discard
- */
-export async function discardChangesFromSelection(
-  repository: Repository,
-  filePath: string,
-  diff: ITextDiff,
-  selection: DiffSelection
-) {
-  const file = new WorkingDirectoryFileChange(filePath, { kind: AppFileStatusKind.Modified }, selection)
-  const patch = await formatPatchToDiscardChanges(repository, file)
-
-  if (patch === null || patch === '') {
-    // When the patch is null we don't need to apply it since it will be a noop.
-    return
-  }
-
-  const args = ['apply', '--unidiff-zero', '--whitespace=nowarn', '-']
-
-  await git(args, repository.path, 'discardChangesFromSelection', {
-    stdin: patch,
-  })
-}

package/src/git/authentication.ts

@@ -1,19 +0,0 @@
-import { GitError as DugiteError } from './exec'
-
-/** Get the environment for authenticating remote operations. */
-export function envForAuthentication(): Record<string, string | undefined> {
-  return {
-    // supported since Git 2.3, this is used to ensure we never interactively prompt
-    // for credentials - even as a fallback
-    GIT_TERMINAL_PROMPT: '0',
-    GIT_TRACE: localStorage.getItem('git-trace') || '0',
-  }
-}
-
-/** The set of errors which fit under the "authentication failed" umbrella. */
-export const AuthenticationErrors: ReadonlySet<DugiteError> = new Set([
-  DugiteError.HTTPSAuthenticationFailed,
-  DugiteError.SSHAuthenticationFailed,
-  DugiteError.HTTPSRepositoryNotFound,
-  DugiteError.SSHRepositoryNotFound,
-])