git-chopstick-core 0.1.0 → 0.1.2

package/src/git/var.ts

@@ -1,6 +1,6 @@
-import { git } from './core'
-import { Repository } from '../models/repository'
-import { CommitIdentity } from '../models/commit-identity'
+import { git } from './core.js'
+import { Repository } from '../models/repository.js'
+import { CommitIdentity } from '../models/commit-identity.js'
 
 /**
  * Gets the author identity, ie the name and email which would

package/src/git/worktree-include.ts

@@ -2,9 +2,9 @@ import * as Fs from 'fs'
 import * as Path from 'path'
 import { readFile, copyFile, mkdir } from 'fs/promises'
 import ignore from 'ignore'
-import type { Repository } from '../models/repository'
-import { git } from './core'
-import { addWorktree, getMainWorktreePath } from './worktree'
+import type { Repository } from '../models/repository.js'
+import { git } from './core.js'
+import { addWorktree, getMainWorktreePath } from './worktree.js'
 
 const WorktreeIncludeFile = '.worktreeinclude'
 

package/src/git/worktree.ts

@@ -1,9 +1,9 @@
-import { git } from './core'
-import { Repository } from '../models/repository'
+import { git } from './core.js'
+import { Repository } from '../models/repository.js'
 import * as Path from 'path'
 import * as Fs from 'fs'
-import type { WorktreeEntry, WorktreeType } from '../models/worktree'
-import { normalizePath } from '../lib/helpers/path'
+import type { WorktreeEntry, WorktreeType } from '../models/worktree.js'
+import { normalizePath } from '../lib/helpers/path.js'
 
 /**
  * Get the set of canonical branch refs (e.g. `refs/heads/feature`)

package/src/index.ts

@@ -0,0 +1,11 @@
+// ── All git operations ──
+export * from './git/index.js'
+
+// ── Git error codes enum (renamed to avoid conflict with GitError class from core.js) ──
+export { GitError as GitErrorCodes, type IGitSpawnOptions } from './git/exec.js'
+
+// ── All domain models ──
+export * from './models/index.js'
+
+// ── Explicit re-exports to resolve ambiguities between git and models ──
+export type { ITrailer } from './models/commit.js'

package/src/lib/diff-parser.ts

@@ -5,8 +5,8 @@ import {
   DiffLine,
   DiffLineType,
   DiffHunkExpansionType,
-} from '../models/diff'
-import { assertNever } from './fatal-error'
+} from '../models/diff/index.js'
+import { assertNever } from './fatal-error.js'
 
 const diffHeaderRe = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/
 

package/src/lib/get-old-path.ts

@@ -1,4 +1,4 @@
-import { FileChange, AppFileStatusKind } from '../models/status'
+import { FileChange, AppFileStatusKind } from '../models/status.js'
 
 export function getOldPathOrDefault(file: FileChange) {
   if (

package/src/lib/git/environment.ts

@@ -1,4 +1,4 @@
-import { IRemote } from '../../models/remote'
+import { IRemote } from '../../models/remote.js'
 
 export async function envForRemoteOperation(
   _url: string | null

package/src/lib/patch-formatter.ts

@@ -1,6 +1,6 @@
-import { DiffSelection } from '../models/diff'
-import { WorkingDirectoryFileChange } from '../models/status'
-import { Repository } from '../models/repository'
+import { DiffSelection } from '../models/diff/index.js'
+import { WorkingDirectoryFileChange } from '../models/status.js'
+import { Repository } from '../models/repository.js'
 
 export async function formatPatch(
   _repository: Repository,

package/src/lib/progress/from-process.ts

@@ -1,5 +1,5 @@
 import { ChildProcess } from 'child_process'
-import { IGitExecutionOptions } from '../../git/core'
+import { IGitExecutionOptions } from '../../git/core.js'
 
 export async function executionOptionsWithProgress(
   options: IGitExecutionOptions,

package/src/lib/progress/index.ts

@@ -1,4 +1,4 @@
-export { executionOptionsWithProgress } from './from-process'
+export { executionOptionsWithProgress } from './from-process.js'
 
 export interface IGitOutput {
   kind: string

package/src/lib/status-parser.ts

@@ -3,8 +3,8 @@ import {
   GitStatusEntry,
   SubmoduleStatus,
   UnmergedEntrySummary,
-} from '../models/status'
-import { splitBuffer } from './split-buffer'
+} from '../models/status.js'
+import { splitBuffer } from './split-buffer.js'
 
 type StatusItem = IStatusHeader | IStatusEntry
 

package/src/models/branch.ts

@@ -75,4 +75,4 @@ export class Branch {
   }
 }
 
-import { Commit } from './commit'
+import { Commit } from './commit.js'

package/src/models/cherry-pick.ts

@@ -1,5 +1,5 @@
-import { IMultiCommitOperationProgress } from './progress'
-import { CommitOneLine } from './commit'
+import { IMultiCommitOperationProgress } from './progress.js'
+import { CommitOneLine } from './commit.js'
 
 export interface ICherryPickSnapshot {
   readonly sha: string

package/src/models/commit.ts

@@ -41,4 +41,4 @@ export class Commit {
   }
 }
 
-import { CommitIdentity } from './commit-identity'
+import { CommitIdentity } from './commit-identity.js'

package/src/models/diff/diff-data.ts

@@ -1,6 +1,6 @@
-import { DiffHunk } from './raw-diff'
-import { Image } from './image'
-import { SubmoduleStatus } from '../status'
+import { DiffHunk } from './raw-diff.js'
+import { Image } from './image.js'
+import { SubmoduleStatus } from '../status.js'
 
 export enum DiffType {
   Text,

package/src/models/diff/index.ts

@@ -1,6 +1,6 @@
-export * from './diff-data'
-export * from './diff-line'
-export * from './diff-selection'
-export * from './image'
-export * from './raw-diff'
-export * from './image-diff'
+export * from './diff-data.js'
+export * from './diff-line.js'
+export * from './diff-selection.js'
+export * from './image.js'
+export * from './raw-diff.js'
+export * from './image-diff.js'

package/src/models/diff/raw-diff.ts

@@ -1,4 +1,4 @@
-import { DiffLine } from './diff-line'
+import { DiffLine } from './diff-line.js'
 
 export enum DiffHunkExpansionType {
   None = 'None',

package/src/models/index.ts

@@ -0,0 +1,36 @@
+export * from './branch.js'
+export * from './cherry-pick.js'
+export * from './clone-options.js'
+export * from './commit.js'
+export * from './commit-identity.js'
+export * from './git-author.js'
+export * from './manual-conflict-resolution.js'
+export * from './merge.js'
+export * from './multi-commit-operation.js'
+export * from './progress.js'
+export * from './remote.js'
+export * from './repository.js'
+export * from './stash-entry.js'
+export * from './worktree.js'
+export * from './diff/index.js'
+
+// computed-action and rebase both export ComputedAction — use explicit exports
+export { ComputedAction } from './computed-action.js'
+export type { RebaseInternalState, RebaseProgressOptions } from './rebase.js'
+
+// status and submodule both export SubmoduleStatus — use explicit exports
+export {
+  AppFileStatusKind,
+  CommittedFileChange,
+  WorkingDirectoryFileChange,
+  WorkingDirectoryStatus,
+  FileChange,
+  isConflictedFileStatus,
+  isConflictWithMarkers,
+  GitStatusEntry,
+  UnmergedEntrySummary,
+} from './status.js'
+export type { AppFileStatus } from './status.js'
+export type { SubmoduleStatus } from './status.js'
+
+export type { SubmoduleEntry } from './submodule.js'

package/src/models/rebase.ts

@@ -1,5 +1,5 @@
-import { IMultiCommitOperationProgress } from './progress'
-import { CommitOneLine } from './commit'
+import { IMultiCommitOperationProgress } from './progress.js'
+import { CommitOneLine } from './commit.js'
 
 export type RebaseInternalState = {
   readonly targetBranch: string

package/src/models/stash-entry.ts

@@ -1,4 +1,4 @@
-import { CommittedFileChange } from './status'
+import { CommittedFileChange } from './status.js'
 
 export interface IStashEntry {
   readonly name: string

package/src/models/status.ts

@@ -1,4 +1,4 @@
-import { DiffSelection, DiffSelectionType } from './diff'
+import { DiffSelection, DiffSelectionType } from './diff/index.js'
 
 export enum GitStatusEntry {
   Modified = 'M',

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/tsconfig.json

@@ -1,17 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "esModuleInterop": true,
-    "strict": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "declaration": true,
-    "sourceMap": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true
-  },
-  "include": ["src/**/*.ts"],
-  "exclude": ["node_modules"]
-}