Aligns typings

Author: eamodio

src/git/models/commit.ts

@@ -17,6 +17,7 @@ import type { RemoteProvider } from '../remotes/remoteProvider';
 import { mapFilesWithStats } from '../utils/-webview/fileChange.utils';
 import { getChangedFilesCount } from '../utils/commit.utils';
 import { isSha, isUncommitted, isUncommittedParent, isUncommittedStaged } from '../utils/revision.utils';
+import type { GitDiffFileStats } from './diff';
 import type { GitFile } from './file';
 import { GitFileChange } from './fileChange';
 import type { PullRequest } from './pullRequest';
@@ -698,11 +699,7 @@ export interface GitCommitLine {
 	line: number;
 }
 
-export interface GitCommitStats<
-	Files extends number | { added: number; deleted: number; changed: number } =
-		| number
-		| { added: number; deleted: number; changed: number },
-> {
+export interface GitCommitStats<Files extends number | GitDiffFileStats = number | GitDiffFileStats> {
 	readonly files: Files;
 	readonly additions: number;
 	readonly deletions: number;

src/git/models/diff.ts

@@ -45,4 +45,10 @@ export interface GitDiffFiles {
 	readonly files: GitFileChange[];
 }
 
+export interface GitDiffFileStats {
+	readonly added: number;
+	readonly deleted: number;
+	readonly changed: number;
+}
+
 export type GitDiffFilter = 'A' | 'C' | 'D' | 'M' | 'R' | 'T' | 'U' | 'X' | 'B' | '*';

src/git/models/status.ts

@@ -5,6 +5,7 @@ import { pluralize } from '../../system/string';
 import { formatDetachedHeadName, getRemoteNameFromBranchName, isDetachedHead } from '../utils/branch.utils';
 import { getUpstreamStatus } from '../utils/status.utils';
 import type { GitBranchStatus, GitTrackingState } from './branch';
+import type { GitDiffFileStats } from './diff';
 import { GitFileConflictStatus, GitFileIndexStatus, GitFileWorkingTreeStatus } from './fileStatus';
 import type { GitRemote } from './remote';
 import type { GitStatusFile } from './statusFile';
@@ -175,7 +176,7 @@ export class GitStatus {
 	}
 
 	@memoize()
-	getDiffStatus(): { added: number; deleted: number; changed: number } {
+	getDiffStatus(): GitDiffFileStats {
 		const diff = {
 			added: 0,
 			deleted: 0,

src/git/parsers/logParser.ts

@@ -227,7 +227,7 @@ export function createLogParser<
 	}
 
 	function* parse(data: string | string[]): Generator<T & TAdditional> {
-		let entry: T & TAdditional = {} as any;
+		let entry = {} as unknown as T & TAdditional;
 		let fieldCount = 0;
 		let field;
 
@@ -251,7 +251,7 @@ export function createLogParser<
 				options?.parseEntry?.(fields, entry);
 				yield entry;
 
-				entry = {} as any;
+				entry = {} as unknown as T & TAdditional;
 			}
 		}
 	}
@@ -302,7 +302,7 @@ export function createLogParserWithFiles<T extends Record<string, unknown>>(
 		let fields: IterableIterator<string>;
 
 		for (const record of records) {
-			entry = {} as any;
+			entry = {} as unknown as ParsedEntryWithFiles<T>;
 			files = [];
 			fields = iterateByDelimiter(record, '\0');
 

src/webviews/home/protocol.ts

@@ -2,6 +2,7 @@ import type { AIModel } from '../../ai/aiProviderService';
 import type { IntegrationDescriptor } from '../../constants.integrations';
 import type { GitBranchMergedStatus } from '../../git/gitProvider';
 import type { GitBranchStatus, GitTrackingState } from '../../git/models/branch';
+import type { GitDiffFileStats } from '../../git/models/diff';
 import type { Issue } from '../../git/models/issue';
 import type { MergeConflict } from '../../git/models/mergeConflict';
 import type { GitPausedOperationStatus } from '../../git/models/pausedOperationStatus';
@@ -79,11 +80,7 @@ export interface GetOverviewBranch {
 
 	wip?: Promise<
 		| {
-				workingTreeState?: {
-					added: number;
-					changed: number;
-					deleted: number;
-				};
+				workingTreeState?: GitDiffFileStats;
 				hasConflicts?: boolean;
 				conflictsCount?: number;
 				pausedOpStatus?: GitPausedOperationStatus;