git-chopstick-core 0.1.2 → 0.1.3

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

@@ -1,165 +0,0 @@
-export enum DiffSelectionType {
-  All = 'All',
-  Partial = 'Partial',
-  None = 'None',
-}
-
-function typeMatchesSelection(
-  selectionType: DiffSelectionType,
-  selected: boolean
-): boolean {
-  switch (selectionType) {
-    case DiffSelectionType.All:
-      return selected
-    case DiffSelectionType.None:
-      return !selected
-    case DiffSelectionType.Partial:
-      return false
-  }
-}
-
-export class DiffSelection {
-  public static fromInitialSelection(
-    initialSelection: DiffSelectionType.All | DiffSelectionType.None
-  ): DiffSelection {
-    return new DiffSelection(initialSelection, null, null)
-  }
-
-  private constructor(
-    private readonly defaultSelectionType: DiffSelectionType.All | DiffSelectionType.None,
-    private readonly divergingLines: Set<number> | null = null,
-    private readonly selectableLines: Set<number> | null = null
-  ) {}
-
-  public getSelectionType(): DiffSelectionType {
-    const divergingLines = this.divergingLines
-    const selectableLines = this.selectableLines
-
-    if (!divergingLines || divergingLines.size === 0) {
-      return this.defaultSelectionType
-    }
-
-    if (selectableLines && selectableLines.size === divergingLines.size) {
-      const allSelectableLinesAreDivergent = [...selectableLines].every(i =>
-        divergingLines.has(i)
-      )
-      if (allSelectableLinesAreDivergent) {
-        return this.defaultSelectionType === DiffSelectionType.All
-          ? DiffSelectionType.None
-          : DiffSelectionType.All
-      }
-    }
-
-    return DiffSelectionType.Partial
-  }
-
-  public isSelected(lineIndex: number): boolean {
-    const lineIsDivergent =
-      !!this.divergingLines && this.divergingLines.has(lineIndex)
-
-    if (this.defaultSelectionType === DiffSelectionType.All) {
-      return !lineIsDivergent
-    }
-    return lineIsDivergent
-  }
-
-  public isRangeSelected(from: number, length: number): DiffSelectionType {
-    if (length <= 0) return DiffSelectionType.None
-
-    const computedSelectionType = this.getSelectionType()
-    if (computedSelectionType !== DiffSelectionType.Partial) {
-      return computedSelectionType
-    }
-
-    if (length === 1) {
-      return this.isSelected(from) ? DiffSelectionType.All : DiffSelectionType.None
-    }
-
-    const to = from + length
-    let foundSelected = false
-    let foundDeselected = false
-    for (let i = from; i < to; i++) {
-      if (this.isSelected(i)) foundSelected = true
-      if (!this.isSelected(i)) foundDeselected = true
-      if (foundSelected && foundDeselected) return DiffSelectionType.Partial
-    }
-
-    return foundSelected ? DiffSelectionType.All : DiffSelectionType.None
-  }
-
-  public isSelectable(lineIndex: number): boolean {
-    return this.selectableLines ? this.selectableLines.has(lineIndex) : true
-  }
-
-  public withLineSelection(lineIndex: number, selected: boolean): DiffSelection {
-    return this.withRangeSelection(lineIndex, 1, selected)
-  }
-
-  public withRangeSelection(from: number, length: number, selected: boolean): DiffSelection {
-    const computedSelectionType = this.getSelectionType()
-    const to = from + length
-
-    if (typeMatchesSelection(computedSelectionType, selected)) {
-      return this
-    }
-
-    if (computedSelectionType === DiffSelectionType.Partial) {
-      const newDivergingLines = new Set<number>(this.divergingLines!)
-
-      if (typeMatchesSelection(this.defaultSelectionType, selected)) {
-        for (let i = from; i < to; i++) {
-          newDivergingLines.delete(i)
-        }
-      } else {
-        for (let i = from; i < to; i++) {
-          if (this.isSelectable(i)) {
-            newDivergingLines.add(i)
-          }
-        }
-      }
-
-      return new DiffSelection(
-        this.defaultSelectionType,
-        newDivergingLines.size === 0 ? null : newDivergingLines,
-        this.selectableLines
-      )
-    }
-
-    const newDivergingLines = new Set<number>()
-    for (let i = from; i < to; i++) {
-      if (this.isSelectable(i)) {
-        newDivergingLines.add(i)
-      }
-    }
-
-    return new DiffSelection(
-      computedSelectionType,
-      newDivergingLines,
-      this.selectableLines
-    )
-  }
-
-  public withToggleLineSelection(lineIndex: number): DiffSelection {
-    return this.withLineSelection(lineIndex, !this.isSelected(lineIndex))
-  }
-
-  public withSelectAll(): DiffSelection {
-    return new DiffSelection(DiffSelectionType.All, null, this.selectableLines)
-  }
-
-  public withSelectNone(): DiffSelection {
-    return new DiffSelection(DiffSelectionType.None, null, this.selectableLines)
-  }
-
-  public withSelectableLines(selectableLines: Set<number>) {
-    const divergingLines = this.divergingLines
-      ? new Set([...this.divergingLines].filter(x => selectableLines.has(x)))
-      : null
-
-    return new DiffSelection(
-      this.defaultSelectionType,
-      divergingLines,
-      selectableLines
-    )
-  }
-}

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

@@ -1,6 +0,0 @@
-export enum ImageDiffType {
-  TwoUp,
-  Swipe,
-  OnionSkin,
-  Difference,
-}

package/src/models/diff/image.ts

@@ -1,8 +0,0 @@
-export class Image {
-  public constructor(
-    public readonly rawContents: ArrayBufferLike,
-    public readonly contents: string,
-    public readonly mediaType: string,
-    public readonly bytes: number
-  ) {}
-}

package/src/models/diff/index.ts

@@ -1,6 +0,0 @@
-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,41 +0,0 @@
-import { DiffLine } from './diff-line.js'
-
-export enum DiffHunkExpansionType {
-  None = 'None',
-  Up = 'Up',
-  Down = 'Down',
-  Both = 'Both',
-  Short = 'Short',
-}
-
-export class DiffHunk {
-  public constructor(
-    public readonly header: DiffHunkHeader,
-    public readonly lines: ReadonlyArray<DiffLine>,
-    public readonly unifiedDiffStart: number,
-    public readonly unifiedDiffEnd: number,
-    public readonly expansionType: DiffHunkExpansionType
-  ) {}
-}
-
-export class DiffHunkHeader {
-  public constructor(
-    public readonly oldStartLine: number,
-    public readonly oldLineCount: number,
-    public readonly newStartLine: number,
-    public readonly newLineCount: number
-  ) {}
-
-  public toDiffLineRepresentation() {
-    return `@@ -${this.oldStartLine},${this.oldLineCount} +${this.newStartLine},${this.newLineCount} @@`
-  }
-}
-
-export interface IRawDiff {
-  readonly header: string
-  readonly contents: string
-  readonly hunks: ReadonlyArray<DiffHunk>
-  readonly isBinary: boolean
-  readonly maxLineNumber: number
-  readonly hasHiddenBidiChars: boolean
-}

package/src/models/git-author.ts

@@ -1,16 +0,0 @@
-export class GitAuthor {
-  public static parse(value: string): GitAuthor | null {
-    const m = value.match(/^(.*?)\s*<(.+?)>\s*$/)
-    if (!m) return null
-    return new GitAuthor(m[1], m[2])
-  }
-
-  public constructor(
-    public readonly name: string,
-    public readonly email: string
-  ) {}
-
-  public toString(): string {
-    return `${this.name} <${this.email}>`
-  }
-}

package/src/models/index.ts

@@ -1,36 +0,0 @@
-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/manual-conflict-resolution.ts

@@ -1,4 +0,0 @@
-export enum ManualConflictResolution {
-  theirs = 'theirs',
-  ours = 'ours',
-}

package/src/models/merge.ts

@@ -1,6 +0,0 @@
-export type MergeTreeResult = {
-  readonly sha: string
-  readonly tree: string
-  readonly conflicted: boolean
-  readonly mergeBase: string
-}

package/src/models/multi-commit-operation.ts

@@ -1,6 +0,0 @@
-export enum MultiCommitOperationKind {
-  Squash = 'Squash',
-  Reorder = 'Reorder',
-  CherryPick = 'CherryPick',
-  Amend = 'Amend',
-}

package/src/models/progress.ts

@@ -1,67 +0,0 @@
-interface IProgress {
-  readonly value: number
-  readonly title?: string
-  readonly description?: string
-}
-
-export interface IGenericProgress extends IProgress {
-  kind: 'generic'
-}
-
-export interface ICheckoutProgress extends IProgress {
-  kind: 'checkout'
-  readonly target: string
-  readonly description: string
-}
-
-export interface IFetchProgress extends IProgress {
-  kind: 'fetch'
-  readonly remote: string
-}
-
-export interface IPullProgress extends IProgress {
-  kind: 'pull'
-  readonly remote: string
-}
-
-export interface IPushProgress extends IProgress {
-  kind: 'push'
-  readonly remote: string
-  readonly branch: string
-}
-
-export interface ICloneProgress extends IProgress {
-  kind: 'clone'
-}
-
-export interface IRevertProgress extends IProgress {
-  kind: 'revert'
-}
-
-export interface IMultiCommitOperationProgress extends IProgress {
-  readonly kind: 'multiCommitOperation'
-  readonly currentCommitSummary: string
-  readonly position: number
-  readonly totalCommitCount: number
-}
-
-export type Progress =
-  | IGenericProgress
-  | ICheckoutProgress
-  | IFetchProgress
-  | IPullProgress
-  | IPushProgress
-  | IRevertProgress
-  | IMultiCommitOperationProgress
-
-export function clampProgress<T extends Progress>(
-  minimum: number,
-  maximum: number,
-  progressCallback: (progress: T) => void
-): (progress: T) => void {
-  return (progress: T) =>
-    progressCallback({
-      ...progress,
-      value: minimum + progress.value * (maximum - minimum),
-    })
-}

package/src/models/rebase.ts

@@ -1,20 +0,0 @@
-import { IMultiCommitOperationProgress } from './progress.js'
-import { CommitOneLine } from './commit.js'
-
-export type RebaseInternalState = {
-  readonly targetBranch: string
-  readonly baseBranchTip: string
-  readonly originalBranchTip: string
-}
-
-export type RebaseProgressOptions = {
-  commits: ReadonlyArray<CommitOneLine>
-  progressCallback: (progress: IMultiCommitOperationProgress) => void
-}
-
-export enum ComputedAction {
-  Clean = 'Clean',
-  Conflicts = 'Conflicts',
-  Invalid = 'Invalid',
-  Loading = 'Loading',
-}

package/src/models/remote.ts

@@ -1,10 +0,0 @@
-export interface IRemote {
-  readonly name: string
-  readonly url: string
-}
-
-export function remoteEquals(x: IRemote | null, y: IRemote | null) {
-  if (x === y) return true
-  if (x === null || y === null) return false
-  return x.name === y.name && x.url === y.url
-}

package/src/models/repository.ts

@@ -1,16 +0,0 @@
-import * as Path from 'path'
-
-export class Repository {
-  public readonly name: string
-
-  public constructor(
-    public readonly path: string,
-    public readonly id: number
-  ) {
-    this.name = Path.basename(path)
-  }
-
-  public get resolvedGitDir(): string {
-    return Path.join(this.path, '.git')
-  }
-}

package/src/models/stash-entry.ts

@@ -1,25 +0,0 @@
-import { CommittedFileChange } from './status.js'
-
-export interface IStashEntry {
-  readonly name: string
-  readonly branchName: string
-  readonly stashSha: string
-  readonly files: StashedFileChanges
-  readonly tree: string
-  readonly parents: ReadonlyArray<string>
-}
-
-export enum StashedChangesLoadStates {
-  NotLoaded = 'NotLoaded',
-  Loading = 'Loading',
-  Loaded = 'Loaded',
-}
-
-export type StashedFileChanges =
-  | {
-      readonly kind: StashedChangesLoadStates.NotLoaded | StashedChangesLoadStates.Loading
-    }
-  | {
-      readonly kind: StashedChangesLoadStates.Loaded
-      readonly files: ReadonlyArray<CommittedFileChange>
-    }