git-chopstick-core 0.1.1 → 0.1.2

package/src/git/index.ts

@@ -1,36 +1,46 @@
-export * from './apply'
-export * from './branch'
-export * from './checkout'
-export * from './clone'
-export * from './commit'
-export * from './config'
-export * from './core'
-export * from './description'
-export * from './diff'
-export * from './fetch'
-export * from './for-each-ref'
-export * from './init'
-export * from './log'
-export * from './pull'
-export * from './push'
-export * from './reflog'
-export * from './refs'
-export * from './remote'
-export * from './reset'
-export * from './rev-list'
-export * from './rev-parse'
-export * from './status'
-export * from './update-ref'
-export * from './var'
-export * from './merge'
-export * from './diff-index'
-export * from './checkout-index'
-export * from './revert'
-export * from './rm'
-export * from './submodule'
-export * from './interpret-trailers'
-export * from './gitignore'
-export * from './rebase'
-export * from './format-patch'
-export * from './tag'
-export * from './worktree'
+export * from './add.js'
+export * from './apply.js'
+export * from './branch.js'
+export * from './checkout.js'
+export * from './checkout-index.js'
+export * from './cherry-pick.js'
+export * from './clean.js'
+export * from './clone.js'
+export * from './commit.js'
+export * from './config.js'
+export * from './core.js'
+export * from './description.js'
+export * from './diff.js'
+export * from './diff-index.js'
+export * from './fetch.js'
+export * from './for-each-ref.js'
+export * from './format-patch.js'
+export * from './gitignore.js'
+export * from './init.js'
+export * from './interpret-trailers.js'
+export * from './lfs.js'
+export * from './log.js'
+export * from './merge.js'
+export * from './merge-tree.js'
+export * from './pull.js'
+export * from './push.js'
+export * from './rebase.js'
+export * from './reflog.js'
+export * from './refs.js'
+export * from './remote.js'
+export * from './reorder.js'
+export * from './reset.js'
+export * from './rev-list.js'
+export * from './rev-parse.js'
+export * from './rm.js'
+export * from './squash.js'
+export * from './stage.js'
+export * from './stash.js'
+export * from './status.js'
+export * from './submodule.js'
+export * from './tag.js'
+export * from './update-index.js'
+export * from './update-ref.js'
+export * from './var.js'
+export * from './worktree.js'
+export * from './worktree-include.js'

package/src/git/init.ts

@@ -1,5 +1,5 @@
-import { getDefaultBranch } from '../lib/helpers/default-branch'
-import { git } from './core'
+import { getDefaultBranch } from '../lib/helpers/default-branch.js'
+import { git } from './core.js'
 
 /** Init a new git repository in the given path. */
 export async function initGitRepository(path: string): Promise<void> {

package/src/git/interpret-trailers.ts

@@ -1,6 +1,6 @@
-import { git } from './core'
-import { Repository } from '../models/repository'
-import { getConfigValue } from './config'
+import { git } from './core.js'
+import { Repository } from '../models/repository.js'
+import { getConfigValue } from './config.js'
 
 /**
  * A representation of a Git commit message trailer.

package/src/git/lfs.ts

@@ -1,5 +1,5 @@
-import { git } from './core'
-import { Repository } from '../models/repository'
+import { git } from './core.js'
+import { Repository } from '../models/repository.js'
 
 /** Install the global LFS filters. */
 export async function installGlobalLFSFilters(force: boolean): Promise<void> {

package/src/git/log.ts

@@ -1,4 +1,4 @@
-import { git } from './core'
+import { git } from './core.js'
 import {
   CommittedFileChange,
   AppFileStatusKind,
@@ -7,13 +7,13 @@ import {
   UntrackedFileStatus,
   AppFileStatus,
   SubmoduleStatus,
-} from '../models/status'
-import { Repository } from '../models/repository'
-import { Commit } from '../models/commit'
-import { CommitIdentity } from '../models/commit-identity'
-import { parseRawUnfoldedTrailers } from './interpret-trailers'
-import { createLogParser } from './git-delimiter-parser'
-import { forceUnwrap } from '../lib/fatal-error'
+} from '../models/status.js'
+import { Repository } from '../models/repository.js'
+import { Commit } from '../models/commit.js'
+import { CommitIdentity } from '../models/commit-identity.js'
+import { parseRawUnfoldedTrailers } from './interpret-trailers.js'
+import { createLogParser } from './git-delimiter-parser.js'
+import { forceUnwrap } from '../lib/fatal-error.js'
 import assert from 'assert'
 
 // File mode 160000 is used by git specifically for submodules:

package/src/git/merge-tree.ts

@@ -1,8 +1,8 @@
-import { Branch } from '../models/branch'
-import { ComputedAction } from '../models/computed-action'
-import { Repository } from '../models/repository'
-import { git, isGitError } from './core'
-import { GitError } from './exec'
+import { Branch } from '../models/branch.js'
+import { ComputedAction } from '../models/computed-action.js'
+import { Repository } from '../models/repository.js'
+import { git, isGitError } from './core.js'
+import { GitError } from './exec.js'
 
 type MergeTreeResult =
   | { kind: ComputedAction.Clean }

package/src/git/merge.ts

@@ -1,9 +1,9 @@
 import { join } from 'path'
-import { git, HookCallbackOptions } from './core'
-import { GitError } from './exec'
-import { Repository } from '../models/repository'
-import { pathExists } from '../lib/path-exists'
-import { createMultiOperationTerminalOutputCallback } from './multi-operation-terminal-output'
+import { git, HookCallbackOptions } from './core.js'
+import { GitError } from './exec.js'
+import { Repository } from '../models/repository.js'
+import { pathExists } from '../lib/path-exists.js'
+import { createMultiOperationTerminalOutputCallback } from './multi-operation-terminal-output.js'
 
 export enum MergeResult {
   /** The merge completed successfully */

package/src/git/multi-operation-terminal-output.ts

@@ -1,10 +1,10 @@
-import noop from '../lib/noop'
+import noop from '../lib/noop.js'
 import {
   TerminalOutput,
   TerminalOutputCallback,
   TerminalOutputListener,
-} from './core'
-import { pushTerminalChunk } from './push-terminal-chunk'
+} from './core.js'
+import { pushTerminalChunk } from './push-terminal-chunk.js'
 
 /**
  * Creates a callback that aggregates terminal output from multiple Git

package/src/git/pull.ts

@@ -5,13 +5,13 @@ import {
   IGitStringExecutionOptions,
   TerminalOutput,
   TerminalOutputCallback,
-} from './core'
-import { Repository } from '../models/repository'
-import { IPullProgress } from '../models/progress'
-import { PullProgressParser, executionOptionsWithProgress } from '../lib/progress'
-import { IRemote } from '../models/remote'
-import { envForRemoteOperation } from './environment'
-import { getConfigValue } from './config'
+} from './core.js'
+import { Repository } from '../models/repository.js'
+import { IPullProgress } from '../models/progress.js'
+import { PullProgressParser, executionOptionsWithProgress } from '../lib/progress/index.js'
+import { IRemote } from '../models/remote.js'
+import { envForRemoteOperation } from './environment.js'
+import { getConfigValue } from './config.js'
 
 /**
  * Pull from the specified remote.

package/src/git/push-terminal-chunk.ts

@@ -1,4 +1,4 @@
-import { coerceToString } from './coerce-to-string'
+import { coerceToString } from './coerce-to-string.js'
 
 /**
  * Appends a chunk of terminal output to a buffer while maintaining a maximum capacity.

package/src/git/push.ts

@@ -1,10 +1,10 @@
-import { git, HookCallbackOptions, IGitStringExecutionOptions } from './core'
-import { Repository } from '../models/repository'
-import { IPushProgress } from '../models/progress'
-import { PushProgressParser, executionOptionsWithProgress } from '../lib/progress'
-import { IRemote } from '../models/remote'
-import { envForRemoteOperation } from './environment'
-import { Branch } from '../models/branch'
+import { git, HookCallbackOptions, IGitStringExecutionOptions } from './core.js'
+import { Repository } from '../models/repository.js'
+import { IPushProgress } from '../models/progress.js'
+import { PushProgressParser, executionOptionsWithProgress } from '../lib/progress/index.js'
+import { IRemote } from '../models/remote.js'
+import { envForRemoteOperation } from './environment.js'
+import { Branch } from '../models/branch.js'
 
 export type PushOptions = {
   /**

package/src/git/rebase.ts

@@ -1,19 +1,19 @@
 import { ChildProcess } from 'child_process'
-import { GitError } from './exec'
+import { GitError } from './exec.js'
 import byline from 'byline'
 
-import { Repository } from '../models/repository'
-import { RebaseInternalState, RebaseProgressOptions } from '../models/rebase'
-import { IMultiCommitOperationProgress } from '../models/progress'
+import { Repository } from '../models/repository.js'
+import { RebaseInternalState, RebaseProgressOptions } from '../models/rebase.js'
+import { IMultiCommitOperationProgress } from '../models/progress.js'
 import {
   WorkingDirectoryFileChange,
   AppFileStatusKind,
-} from '../models/status'
-import { ManualConflictResolution } from '../models/manual-conflict-resolution'
-import { Commit, CommitOneLine } from '../models/commit'
+} from '../models/status.js'
+import { ManualConflictResolution } from '../models/manual-conflict-resolution.js'
+import { Commit, CommitOneLine } from '../models/commit.js'
 
-import { merge } from '../lib/merge'
-import { formatRebaseValue } from '../lib/rebase'
+import { merge } from '../lib/merge.js'
+import { formatRebaseValue } from '../lib/rebase.js'
 
 import {
   git,
@@ -22,15 +22,15 @@ import {
   IGitStringExecutionOptions,
   IGitStringResult,
   HookCallbackOptions,
-} from './core'
-import { stageManualConflictResolution } from './stage'
-import { stageFiles } from './update-index'
-import { getStatus } from './status'
-import { getCommitsBetweenCommits } from './rev-list'
-import { Branch } from '../models/branch'
+} from './core.js'
+import { stageManualConflictResolution } from './stage.js'
+import { stageFiles } from './update-index.js'
+import { getStatus } from './status.js'
+import { getCommitsBetweenCommits } from './rev-list.js'
+import { Branch } from '../models/branch.js'
 import { join } from 'path'
 import { readFile } from 'fs/promises'
-import { pathExists } from '../lib/path-exists'
+import { pathExists } from '../lib/path-exists.js'
 
 /** The app-specific results from attempting to rebase a repository */
 export enum RebaseResult {

package/src/git/reflog.ts

@@ -1,5 +1,5 @@
-import { git } from './core'
-import { Repository } from '../models/repository'
+import { git } from './core.js'
+import { Repository } from '../models/repository.js'
 
 /**
  * Get the `limit` most recently checked out branches.

package/src/git/refs.ts

@@ -1,5 +1,5 @@
-import { git } from './core'
-import { Repository } from '../models/repository'
+import { git } from './core.js'
+import { Repository } from '../models/repository.js'
 
 /**
  * Format a local branch in the ref syntax, ensuring situations when the branch

package/src/git/remote.ts

@@ -1,10 +1,10 @@
-import { git } from './core'
-import { GitError } from './exec'
+import { git } from './core.js'
+import { GitError } from './exec.js'
 
-import { Repository } from '../models/repository'
-import { IRemote } from '../models/remote'
-import { envForRemoteOperation } from './environment'
-import { getSymbolicRef } from './refs'
+import { Repository } from '../models/repository.js'
+import { IRemote } from '../models/remote.js'
+import { envForRemoteOperation } from './environment.js'
+import { getSymbolicRef } from './refs.js'
 import memoizeOne from 'memoize-one'
 
 /**

package/src/git/reorder.ts

@@ -1,11 +1,11 @@
 import { appendFile, rm } from 'fs/promises'
-import { getCommits, revRange } from '.'
-import { Commit } from '../models/commit'
-import { MultiCommitOperationKind } from '../models/multi-commit-operation'
-import { IMultiCommitOperationProgress } from '../models/progress'
-import { Repository } from '../models/repository'
-import { getTempFilePath } from '../lib/file-system'
-import { rebaseInteractive, RebaseResult } from './rebase'
+import { getCommits, revRange } from './index.js'
+import { Commit } from '../models/commit.js'
+import { MultiCommitOperationKind } from '../models/multi-commit-operation.js'
+import { IMultiCommitOperationProgress } from '../models/progress.js'
+import { Repository } from '../models/repository.js'
+import { getTempFilePath } from '../lib/file-system.js'
+import { rebaseInteractive, RebaseResult } from './rebase.js'
 
 /**
  * Reorders provided commits by calling interactive rebase.

package/src/git/reset.ts

@@ -1,6 +1,6 @@
-import { git } from './core'
-import { Repository } from '../models/repository'
-import { assertNever } from '../lib/fatal-error'
+import { git } from './core.js'
+import { Repository } from '../models/repository.js'
+import { assertNever } from '../lib/fatal-error.js'
 
 /** The reset modes which are supported. */
 export const enum GitResetMode {

package/src/git/rev-list.ts

@@ -1,8 +1,8 @@
-import { GitError } from './exec'
-import { git } from './core'
-import { Repository } from '../models/repository'
-import { Branch, BranchType, IAheadBehind } from '../models/branch'
-import { CommitOneLine } from '../models/commit'
+import { GitError } from './exec.js'
+import { git } from './core.js'
+import { Repository } from '../models/repository.js'
+import { Branch, BranchType, IAheadBehind } from '../models/branch.js'
+import { CommitOneLine } from '../models/commit.js'
 
 /**
  * Convert two refs into the Git range syntax representing the set of commits

package/src/git/rev-parse.ts

@@ -1,5 +1,5 @@
-import { git } from './core'
-import { directoryExists } from '../lib/directory-exists'
+import { git } from './core.js'
+import { directoryExists } from '../lib/directory-exists.js'
 import { resolve } from 'path'
 
 export type RepositoryType =

package/src/git/revert.ts

@@ -1,16 +1,16 @@
-import { git, IGitStringExecutionOptions } from './core'
+import { git, IGitStringExecutionOptions } from './core.js'
 
-import { Repository } from '../models/repository'
-import { Commit } from '../models/commit'
-import { IRevertProgress } from '../models/progress'
+import { Repository } from '../models/repository.js'
+import { Commit } from '../models/commit.js'
+import { IRevertProgress } from '../models/progress.js'
 
-import { executionOptionsWithProgress } from '../lib/progress/from-process'
-import { RevertProgressParser } from '../lib/progress/revert'
+import { executionOptionsWithProgress } from '../lib/progress/from-process.js'
+import { RevertProgressParser } from '../lib/progress/revert.js'
 import {
   envForRemoteOperation,
   getFallbackUrlForProxyResolve,
-} from './environment'
-import { IRemote } from '../models/remote'
+} from './environment.js'
+import { IRemote } from '../models/remote.js'
 
 /**
  * Creates a new commit that reverts the changes of a previous commit

package/src/git/rm.ts

@@ -1,6 +1,6 @@
-import { git } from './core'
-import { Repository } from '../models/repository'
-import { WorkingDirectoryFileChange } from '../models/status'
+import { git } from './core.js'
+import { Repository } from '../models/repository.js'
+import { WorkingDirectoryFileChange } from '../models/status.js'
 
 /**
  * Remove all files from the index

package/src/git/show.ts

@@ -1,8 +1,8 @@
-import { git, isMaxBufferExceededError } from './core'
+import { git, isMaxBufferExceededError } from './core.js'
 
-import { Repository } from '../models/repository'
-import { GitError } from './exec'
-import { coerceToBuffer } from './coerce-to-buffer'
+import { Repository } from '../models/repository.js'
+import { GitError } from './exec.js'
+import { coerceToBuffer } from './coerce-to-buffer.js'
 
 /**
  * Retrieve the binary contents of a blob from the repository at a given

package/src/git/spawn.ts

@@ -1,6 +1,6 @@
-import { spawnGit as spawn, IGitSpawnOptions } from './exec'
-import * as GitPerf from '../lib/git-perf'
-import { withTrampolineEnv } from '../lib/trampoline/trampoline-environment'
+import { spawnGit as spawn, IGitSpawnOptions } from './exec.js'
+import * as GitPerf from '../lib/git-perf.js'
+import { withTrampolineEnv } from '../lib/trampoline/trampoline-environment.js'
 
 type SpawnOptions = IGitSpawnOptions & {
   /**

package/src/git/squash.ts

@@ -1,11 +1,11 @@
 import { appendFile, rm, writeFile } from 'fs/promises'
-import { getCommits, revRange } from '.'
-import { Commit } from '../models/commit'
-import { MultiCommitOperationKind } from '../models/multi-commit-operation'
-import { IMultiCommitOperationProgress } from '../models/progress'
-import { Repository } from '../models/repository'
-import { getTempFilePath } from '../lib/file-system'
-import { rebaseInteractive, RebaseResult } from './rebase'
+import { getCommits, revRange } from './index.js'
+import { Commit } from '../models/commit.js'
+import { MultiCommitOperationKind } from '../models/multi-commit-operation.js'
+import { IMultiCommitOperationProgress } from '../models/progress.js'
+import { Repository } from '../models/repository.js'
+import { getTempFilePath } from '../lib/file-system.js'
+import { rebaseInteractive, RebaseResult } from './rebase.js'
 
 /**
  * Squashes provided commits by calling interactive rebase.

package/src/git/stage.ts

@@ -1,15 +1,15 @@
-import { Repository } from '../models/repository'
+import { Repository } from '../models/repository.js'
 import {
   WorkingDirectoryFileChange,
   isConflictedFileStatus,
   GitStatusEntry,
   isConflictWithMarkers,
-} from '../models/status'
-import { ManualConflictResolution } from '../models/manual-conflict-resolution'
-import { assertNever } from '../lib/fatal-error'
-import { removeConflictedFile } from './rm'
-import { checkoutConflictedFile } from './checkout'
-import { addConflictedFile } from './add'
+} from '../models/status.js'
+import { ManualConflictResolution } from '../models/manual-conflict-resolution.js'
+import { assertNever } from '../lib/fatal-error.js'
+import { removeConflictedFile } from './rm.js'
+import { checkoutConflictedFile } from './checkout.js'
+import { addConflictedFile } from './add.js'
 
 /**
  * Stages a file with the given manual resolution method. Useful for resolving binary conflicts at commit-time.

package/src/git/stash.ts

@@ -1,20 +1,20 @@
-import { GitError as DugiteError } from './exec'
-import { git, GitError } from './core'
-import { Repository } from '../models/repository'
+import { GitError as DugiteError } from './exec.js'
+import { git, GitError } from './core.js'
+import { Repository } from '../models/repository.js'
 import {
   IStashEntry,
   StashedChangesLoadStates,
   StashedFileChanges,
-} from '../models/stash-entry'
+} from '../models/stash-entry.js'
 import {
   WorkingDirectoryFileChange,
   CommittedFileChange,
-} from '../models/status'
-import { parseRawLogWithNumstat } from './log'
-import { stageFiles } from './update-index'
-import { Branch } from '../models/branch'
-import { createLogParser } from './git-delimiter-parser'
-import { coerceToString } from './coerce-to-string'
+} from '../models/status.js'
+import { parseRawLogWithNumstat } from './log.js'
+import { stageFiles } from './update-index.js'
+import { Branch } from '../models/branch.js'
+import { createLogParser } from './git-delimiter-parser.js'
+import { coerceToString } from './coerce-to-string.js'
 
 export const DesktopStashEntryMarker = '!!GitHub_Desktop'
 

package/src/git/status.ts

@@ -1,4 +1,4 @@
-import { getFilesWithConflictMarkers } from './diff-check'
+import { getFilesWithConflictMarkers } from './diff-check.js'
 import {
   WorkingDirectoryStatus,
   WorkingDirectoryFileChange,
@@ -9,7 +9,7 @@ import {
   UnmergedEntry,
   ConflictedFileStatus,
   UnmergedEntrySummary,
-} from '../models/status'
+} from '../models/status.js'
 import {
   parsePorcelainStatus,
   mapStatus,
@@ -17,17 +17,17 @@ import {
   IStatusHeader,
   isStatusHeader,
   isStatusEntry,
-} from '../lib/status-parser'
-import { DiffSelectionType, DiffSelection } from '../models/diff'
-import { Repository } from '../models/repository'
-import { IAheadBehind } from '../models/branch'
-import { fatalError } from '../lib/fatal-error'
-import { isMergeHeadSet, isSquashMsgSet } from './merge'
-import { getBinaryPaths } from './diff'
-import { getRebaseInternalState } from './rebase'
-import { RebaseInternalState } from '../models/rebase'
-import { isCherryPickHeadFound } from './cherry-pick'
-import { git } from '.'
+} from '../lib/status-parser.js'
+import { DiffSelectionType, DiffSelection } from '../models/diff/index.js'
+import { Repository } from '../models/repository.js'
+import { IAheadBehind } from '../models/branch.js'
+import { fatalError } from '../lib/fatal-error.js'
+import { isMergeHeadSet, isSquashMsgSet } from './merge.js'
+import { getBinaryPaths } from './diff.js'
+import { getRebaseInternalState } from './rebase.js'
+import { RebaseInternalState } from '../models/rebase.js'
+import { isCherryPickHeadFound } from './cherry-pick.js'
+import { git } from './index.js'
 
 /** The encapsulation of the result from 'git status' */
 export interface IStatusResult {

package/src/git/submodule.ts

@@ -1,15 +1,15 @@
-import { git, IGitStringExecutionOptions } from './core'
-import { Repository } from '../models/repository'
-import { SubmoduleEntry } from '../models/submodule'
-import { pathExists } from '../lib/path-exists'
-import { executionOptionsWithProgress, IGitOutput } from '../lib/progress/index'
+import { git, IGitStringExecutionOptions } from './core.js'
+import { Repository } from '../models/repository.js'
+import { SubmoduleEntry } from '../models/submodule.js'
+import { pathExists } from '../lib/path-exists.js'
+import { executionOptionsWithProgress, IGitOutput } from '../lib/progress/index.js'
 import {
   envForRemoteOperation,
   getFallbackUrlForProxyResolve,
-} from './environment'
-import { AuthenticationErrors } from './authentication'
-import { IRemote } from '../models/remote'
-import { Progress } from '../models/progress'
+} from './environment.js'
+import { AuthenticationErrors } from './authentication.js'
+import { IRemote } from '../models/remote.js'
+import { Progress } from '../models/progress.js'
 import { join, resolve } from 'path'
 import { readFile } from 'fs/promises'
 

package/src/git/tag.ts

@@ -1,7 +1,7 @@
-import { git } from './core'
-import { Repository } from '../models/repository'
-import { IRemote } from '../models/remote'
-import { envForRemoteOperation } from './environment'
+import { git } from './core.js'
+import { Repository } from '../models/repository.js'
+import { IRemote } from '../models/remote.js'
+import { envForRemoteOperation } from './environment.js'
 
 /**
  * Create a new tag on the given target commit.

package/src/git/update-index.ts

@@ -1,11 +1,11 @@
-import { git } from './core'
-import { Repository } from '../models/repository'
-import { DiffSelectionType } from '../models/diff'
-import { applyPatchToIndex } from './apply'
+import { git } from './core.js'
+import { Repository } from '../models/repository.js'
+import { DiffSelectionType } from '../models/diff/index.js'
+import { applyPatchToIndex } from './apply.js'
 import {
   WorkingDirectoryFileChange,
   AppFileStatusKind,
-} from '../models/status'
+} from '../models/status.js'
 
 interface IUpdateIndexOptions {
   /**

package/src/git/update-ref.ts

@@ -1,5 +1,5 @@
-import { git } from './core'
-import { Repository } from '../models/repository'
+import { git } from './core.js'
+import { Repository } from '../models/repository.js'
 
 /**
  * Update the ref to a new value.