Reorganizes ctor params for better consistency

Renames models to better align with usage

Author: eamodio

src/env/node/git/sub-providers/contributors.ts

@@ -1,7 +1,7 @@
 import type { Container } from '../../../../container';
 import type { GitCache } from '../../../../git/cache';
 import type { GitContributorsSubProvider } from '../../../../git/gitProvider';
-import type { GitContributorStats } from '../../../../git/models/contributor';
+import type { GitContributorsStats } from '../../../../git/models/contributor';
 import { GitContributor } from '../../../../git/models/contributor';
 import { getContributorsParser } from '../../../../git/parsers/logParser';
 import { calculateContributionScore } from '../../../../git/utils/contributor.utils';
@@ -78,10 +78,10 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 								repoPath,
 								c.author,
 								c.email,
+								isUserMatch(currentUser, c.author, c.email),
 								1,
 								new Date(timestamp),
 								new Date(timestamp),
-								isUserMatch(currentUser, c.author, c.email),
 								c.stats
 									? {
 											...c.stats,
@@ -143,7 +143,7 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 	async getContributorsStats(
 		repoPath: string,
 		options?: { merges?: boolean; since?: string },
-	): Promise<GitContributorStats | undefined> {
+	): Promise<GitContributorsStats | undefined> {
 		if (repoPath == null) return undefined;
 
 		const scope = getLogScope();
@@ -166,7 +166,7 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 				.filter(c => !isNaN(c))
 				.sort((a, b) => b - a);
 
-			const result: GitContributorStats = {
+			const result: GitContributorsStats = {
 				count: contributions.length,
 				contributions: contributions,
 			};

src/git/gitProvider.ts

@@ -9,7 +9,7 @@ import type { GitUri } from './gitUri';
 import type { GitBlame, GitBlameLine } from './models/blame';
 import type { GitBranch } from './models/branch';
 import type { GitCommit, GitCommitStats } from './models/commit';
-import type { GitContributor, GitContributorStats } from './models/contributor';
+import type { GitContributor, GitContributorsStats } from './models/contributor';
 import type { GitDiff, GitDiffFile, GitDiffFiles, GitDiffFilter, GitDiffLine, GitDiffShortStat } from './models/diff';
 import type { GitFile } from './models/file';
 import type { GitFileChange } from './models/fileChange';
@@ -413,7 +413,7 @@ export interface GitContributorsSubProvider {
 	getContributorsStats(
 		repoPath: string,
 		options?: { merges?: boolean; since?: string },
-	): Promise<GitContributorStats | undefined>;
+	): Promise<GitContributorsStats | undefined>;
 	getContributors(
 		repoPath: string,
 		options?: {

src/git/models/contributor.ts

@@ -13,13 +13,13 @@ export function isContributor(contributor: unknown): contributor is GitContribut
 export class GitContributor {
 	constructor(
 		public readonly repoPath: string,
-		public readonly name: string | undefined,
+		public readonly name: string,
 		public readonly email: string | undefined,
+		public readonly current: boolean,
 		public readonly commits: number,
 		public readonly latestCommitDate?: Date,
 		public readonly firstCommitDate?: Date,
-		public readonly current: boolean = false,
-		public readonly stats?: GitCommitStats<number> & { contributionScore: number },
+		public readonly stats?: GitContributorStats,
 		public readonly username?: string | undefined,
 		private readonly avatarUrl?: string | undefined,
 		public readonly id?: string | undefined,
@@ -49,7 +49,11 @@ export class GitContributor {
 	}
 }
 
-export interface GitContributorStats {
+export interface GitContributorStats extends GitCommitStats<number> {
+	readonly contributionScore: number;
+}
+
+export interface GitContributorsStats {
 	readonly count: number;
 	readonly contributions: number[];
 }

src/git/utils/contributor.utils.ts

@@ -1,5 +1,5 @@
 import type { GitCommitStats } from '../models/commit';
-import type { GitContributionTiers, GitContributor, GitContributorStats } from '../models/contributor';
+import type { GitContributionTiers, GitContributor, GitContributorsStats } from '../models/contributor';
 import type { GitUser } from '../models/user';
 
 export interface ContributorScoreOptions {
@@ -43,7 +43,7 @@ export function calculateContributionScore(
 }
 
 export function calculateDistribution<T extends string>(
-	stats: GitContributorStats | undefined,
+	stats: GitContributorsStats | undefined,
 	prefix: T,
 ): Record<`${typeof prefix}${GitContributionTiers}`, number> {
 	if (stats == null) return {} as unknown as Record<`${typeof prefix}${GitContributionTiers}`, number>;

src/plus/integrations/providers/github/sub-providers/contributors.ts

@@ -1,7 +1,7 @@
 import type { Container } from '../../../../../container';
 import type { GitCache } from '../../../../../git/cache';
 import type { GitContributorsSubProvider } from '../../../../../git/gitProvider';
-import type { GitContributorStats } from '../../../../../git/models/contributor';
+import type { GitContributorsStats } from '../../../../../git/models/contributor';
 import { GitContributor } from '../../../../../git/models/contributor';
 import { isUserMatch } from '../../../../../git/utils/user.utils';
 import { log } from '../../../../../system/decorators/log';
@@ -38,12 +38,12 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 				contributors.push(
 					new GitContributor(
 						repoPath,
-						c.name,
+						c.name ?? c.login ?? '',
 						c.email,
+						isUserMatch(currentUser, c.name, c.email, c.login),
 						c.contributions,
 						undefined,
 						undefined,
-						isUserMatch(currentUser, c.name, c.email, c.login),
 						undefined,
 						c.login,
 						c.avatar_url,
@@ -64,7 +64,7 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 	async getContributorsStats(
 		repoPath: string,
 		_options?: { merges?: boolean; since?: string },
-	): Promise<GitContributorStats | undefined> {
+	): Promise<GitContributorsStats | undefined> {
 		if (repoPath == null) return undefined;
 
 		const scope = getLogScope();
@@ -76,7 +76,7 @@ export class ContributorsGitSubProvider implements GitContributorsSubProvider {
 
 			const contributions = results.map(c => c.contributions).sort((a, b) => b - a);
 
-			const result: GitContributorStats = {
+			const result: GitContributorsStats = {
 				count: contributions.length,
 				contributions: contributions,
 			};

src/webviews/plus/graph/graphWebview.ts

@@ -3937,7 +3937,7 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 			const { repoPath, name, email, current } = item.webviewItemValue;
 			return ContributorActions.addAuthors(
 				repoPath,
-				new GitContributor(repoPath, name, email, 0, undefined, undefined, current),
+				new GitContributor(repoPath, name, email, current ?? false, 0),
 			);
 		}