Skip to content

fix(quality): reduce total complexity in git diff #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcarvin8 merged 2 commits into from
Apr 14, 2026
Merged

fix(quality): reduce total complexity in git diff #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a9e2e7
fix(quality): reduce total complexity in git diff
mcarvin8 Apr 14, 2026
f8a8402
refactor: reduce return points
mcarvin8 Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
235 changes: 136 additions & 99 deletions src/git/gitDiff.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ function compileRegex(pattern: string, label: string): RegExp {
}
}

function commitMessagePassesFilters(message: string, includeRes: RegExp[], excludeRes: RegExp[]): boolean {
for (const ex of excludeRes) {
if (ex.test(message)) return false;
}
if (includeRes.length > 0 && !includeRes.some((r) => r.test(message))) return false;
return true;
}

/**
* Filter commits by message. Excludes are applied first; then if `includePatterns` is non-empty,
* the message must match at least one include pattern.
Expand All @@ -65,13 +73,7 @@ export function filterCommitsByMessageRegexes(
const includeRes = includes.map((p, i) => compileRegex(p, `commit message include pattern[${i}]`));
const excludeRes = excludes.map((p, i) => compileRegex(p, `commit message exclude pattern[${i}]`));

return commits.filter((c) => {
for (const ex of excludeRes) {
if (ex.test(c.message)) return false;
}
if (includeRes.length > 0 && !includeRes.some((r) => r.test(c.message))) return false;
return true;
});
return commits.filter((c) => commitMessagePassesFilters(c.message, includeRes, excludeRes));
}

export async function getRepoRoot(git: SimpleGit): Promise<string> {
Expand Down Expand Up @@ -239,14 +241,18 @@ export async function getChangedFiles(
return Array.from(fileSet);
}

/** First character of git name-status / synthetic tokens (e.g. R100 → R). */
const GIT_STATUS_BY_FIRST_CHAR: Record<string, DiffStatus> = {
A: 'added',
D: 'deleted',
R: 'renamed',
C: 'copied',
T: 'type-changed',
M: 'modified',
};

function mapGitStatus(statusCode: string): DiffStatus {
if (statusCode.startsWith('A')) return 'added';
if (statusCode.startsWith('D')) return 'deleted';
if (statusCode.startsWith('R')) return 'renamed';
if (statusCode.startsWith('C')) return 'copied';
if (statusCode.startsWith('T')) return 'type-changed';
if (statusCode.startsWith('M')) return 'modified';
return 'unknown';
return GIT_STATUS_BY_FIRST_CHAR[statusCode.charAt(0)] ?? 'unknown';
}

function mergeStatus(existing: DiffStatus, next: DiffStatus): DiffStatus {
Expand All @@ -261,27 +267,40 @@ type ParsedNameEntry = {
oldPath?: string;
};

function parseNameStatusLines(nameStatusOutput: string): ParsedNameEntry[] {
const entries: ParsedNameEntry[] = [];
for (const rawLine of nameStatusOutput.split(/\r?\n/)) {
const line = rawLine.trim();
if (!line) continue;
const parts = line.split('\t');
if (parts.length < 2) continue;
function parseNameStatusLine(line: string): ParsedNameEntry | null {
const parts = line.split('\t');
let entry: ParsedNameEntry | null = null;

if (parts.length >= 2) {
const statusToken = parts[0] ?? '';
const status = mapGitStatus(statusToken);
if (statusToken.startsWith('R') || statusToken.startsWith('C')) {
if (parts.length < 3) continue;
const isRenameOrCopy = statusToken.startsWith('R') || statusToken.startsWith('C');

if (isRenameOrCopy && parts.length >= 3) {
const oldPath = parts[1];
const newPath = parts[2];
if (oldPath === undefined || newPath === undefined) continue;
entries.push({ path: newPath, status, oldPath });
} else {
if (oldPath !== undefined && newPath !== undefined) {
entry = { path: newPath, status, oldPath };
}
} else if (!isRenameOrCopy) {
const pathOnly = parts[1];
if (pathOnly === undefined) continue;
entries.push({ path: pathOnly, status });
if (pathOnly !== undefined) {
entry = { path: pathOnly, status };
}
}
}

return entry;
}

function parseNameStatusLines(nameStatusOutput: string): ParsedNameEntry[] {
const entries: ParsedNameEntry[] = [];
for (const rawLine of nameStatusOutput.split(/\r?\n/)) {
const line = rawLine.trim();
if (!line) continue;
const entry = parseNameStatusLine(line);
if (entry) entries.push(entry);
}
return entries;
}

Expand Down Expand Up @@ -312,43 +331,52 @@ function numStatPathToLookupKey(pathField: string): string {
return `${dirRaw}${toSeg}`;
}

function parseNumStatLine(line: string): { key: string; additions: number; deletions: number } | null {
const parts = line.split('\t');
if (parts.length < 3) return null;

const addStr = parts[0] ?? '';
const delStr = parts[1] ?? '';
const pathField = parts.slice(2).join('\t');

const additions = addStr !== '-' ? Number.parseInt(addStr, 10) || 0 : 0;
const deletions = delStr !== '-' ? Number.parseInt(delStr, 10) || 0 : 0;

const key = numStatPathToLookupKey(pathField);
return { key, additions, deletions };
}

function accumulateNumStat(numStatOutput: string, into: Map<string, { additions: number; deletions: number }>): void {
for (const rawLine of numStatOutput.split(/\r?\n/)) {
const line = rawLine.trim();
if (!line) continue;
const parts = line.split('\t');
if (parts.length < 3) continue;

const addStr = parts[0] ?? '';
const delStr = parts[1] ?? '';
const pathField = parts.slice(2).join('\t');

const additions = addStr !== '-' ? Number.parseInt(addStr, 10) || 0 : 0;
const deletions = delStr !== '-' ? Number.parseInt(delStr, 10) || 0 : 0;

const key = numStatPathToLookupKey(pathField);
const prev = into.get(key) ?? { additions: 0, deletions: 0 };
into.set(key, { additions: prev.additions + additions, deletions: prev.deletions + deletions });
const parsed = parseNumStatLine(line);
if (!parsed) continue;
const prev = into.get(parsed.key) ?? { additions: 0, deletions: 0 };
into.set(parsed.key, { additions: prev.additions + parsed.additions, deletions: prev.deletions + parsed.deletions });
}
}

const STATUS_TO_SYNTHETIC_PREFIX: Record<DiffStatus, string> = {
added: 'A',
deleted: 'D',
renamed: 'R100',
copied: 'C100',
'type-changed': 'T',
modified: 'M',
unknown: 'X',
};

function diffStatusToSyntheticPrefix(status: DiffStatus): string {
switch (status) {
case 'added':
return 'A';
case 'deleted':
return 'D';
case 'renamed':
return 'R100';
case 'copied':
return 'C100';
case 'type-changed':
return 'T';
case 'modified':
return 'M';
default:
return 'X';
return STATUS_TO_SYNTHETIC_PREFIX[status];
}

function buildSyntheticDiffLine(meta: ParsedNameEntry, counts: { additions: number; deletions: number }): string {
const prefix = diffStatusToSyntheticPrefix(meta.status);
if (meta.oldPath) {
return `${prefix}\t${counts.additions}\t${counts.deletions}\t${meta.oldPath}\t${meta.path}`;
}
return `${prefix}\t${counts.additions}\t${counts.deletions}\t${meta.path}`;
}

/**
Expand All @@ -364,17 +392,61 @@ function buildDiffSummaryFromGitOutputs(nameStatusOutput: string, numStatOutput:

for (const [path, meta] of mergedName) {
const counts = numMap.get(path) ?? { additions: 0, deletions: 0 };
const prefix = diffStatusToSyntheticPrefix(meta.status);
if (meta.oldPath) {
syntheticLines.push(`${prefix}\t${counts.additions}\t${counts.deletions}\t${meta.oldPath}\t${path}`);
} else {
syntheticLines.push(`${prefix}\t${counts.additions}\t${counts.deletions}\t${path}`);
}
syntheticLines.push(buildSyntheticDiffLine(meta, counts));
}

return parseDiffSummary(syntheticLines.join('\n'));
}

type ParsedDiffSummaryLine = {
status: DiffStatus;
additions: number;
deletions: number;
oldPath?: string;
newPath: string;
};

function parseTabDiffSummaryLine(line: string): ParsedDiffSummaryLine | null {
const parts = line.split('\t');
if (parts.length < 3) return null;

const statusToken = parts.shift() ?? '';
const status = mapGitStatus(statusToken);
const add0 = parts[0];
const del0 = parts[1];
const additions = add0 && add0 !== '-' ? Number.parseInt(add0, 10) || 0 : 0;
const deletions = del0 && del0 !== '-' ? Number.parseInt(del0, 10) || 0 : 0;

if (parts.length === 3) {
return { status, additions, deletions, newPath: parts[2]! };
}
if (parts.length === 4) {
return { status, additions, deletions, oldPath: parts[2], newPath: parts[3]! };
}
return null;
}

function mergeParsedDiffSummaryLine(fileMap: Map<string, DiffFileSummary>, p: ParsedDiffSummaryLine): void {
const { newPath, status, additions, deletions, oldPath } = p;
const existing = fileMap.get(newPath);
if (existing) {
existing.additions += additions;
existing.deletions += deletions;
existing.status = mergeStatus(existing.status, status);
if (oldPath) existing.oldPath = existing.oldPath ?? oldPath;
existing.newPath = existing.newPath ?? newPath;
} else {
fileMap.set(newPath, {
path: newPath,
status,
additions,
deletions,
oldPath,
newPath: oldPath ? newPath : undefined,
});
}
}

/** Exported for tests; also used to merge synthetic lines when the same path appears more than once. */
export function parseDiffSummary(diffOutput: string): DiffSummary {
const fileMap = new Map<string, DiffFileSummary>();
Expand All @@ -383,43 +455,8 @@ export function parseDiffSummary(diffOutput: string): DiffSummary {
const line = rawLine.trim();
if (!line) continue;

const parts = line.split('\t');
if (parts.length < 3) continue;

const statusToken = parts.shift() ?? '';
const status = mapGitStatus(statusToken);
const additions = parts[0] && parts[0] !== '-' ? Number.parseInt(parts[0], 10) || 0 : 0;
const deletions = parts[1] && parts[1] !== '-' ? Number.parseInt(parts[1], 10) || 0 : 0;

let oldPath: string | undefined;
let newPath: string;
if (parts.length === 3) {
newPath = parts[2];
} else if (parts.length === 4) {
oldPath = parts[2];
newPath = parts[3];
} else {
continue;
}

const path = newPath;
const existing = fileMap.get(path);
if (existing) {
existing.additions += additions;
existing.deletions += deletions;
existing.status = mergeStatus(existing.status, status);
if (oldPath) existing.oldPath = existing.oldPath ?? oldPath;
existing.newPath = existing.newPath ?? newPath;
} else {
fileMap.set(path, {
path,
status,
additions,
deletions,
oldPath,
newPath: oldPath ? newPath : undefined,
});
}
const parsed = parseTabDiffSummaryLine(line);
if (parsed) mergeParsedDiffSummaryLine(fileMap, parsed);
}

const files = Array.from(fileMap.values());
Expand Down
Loading