Skip to content

feat(cli): Add number formatting and fix statistics calculation #177

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
yamadashy merged 1 commit into from
Nov 23, 2024
Merged

feat(cli): Add number formatting and fix statistics calculation #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions src/cli/cliPrint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ export const printSummary = (
let securityCheckMessage = '';
if (config.security.enableSecurityCheck) {
if (suspiciousFilesResults.length > 0) {
securityCheckMessage = pc.yellow(`${suspiciousFilesResults.length} suspicious file(s) detected and excluded`);
securityCheckMessage = pc.yellow(
`${suspiciousFilesResults.length.toLocaleString()} suspicious file(s) detected and excluded`,
);
} else {
securityCheckMessage = pc.white('✔ No suspicious files detected');
}
Expand All @@ -25,9 +27,9 @@ export const printSummary = (

logger.log(pc.white('📊 Pack Summary:'));
logger.log(pc.dim('────────────────'));
logger.log(`${pc.white(' Total Files:')} ${pc.white(totalFiles.toString())}`);
logger.log(`${pc.white(' Total Chars:')} ${pc.white(totalCharacters.toString())}`);
logger.log(`${pc.white(' Total Tokens:')} ${pc.white(totalTokens.toString())}`);
logger.log(`${pc.white(' Total Files:')} ${pc.white(totalFiles.toLocaleString())} files`);
logger.log(`${pc.white(' Total Chars:')} ${pc.white(totalCharacters.toLocaleString())} chars`);
logger.log(`${pc.white(' Total Tokens:')} ${pc.white(totalTokens.toLocaleString())} tokens`);
logger.log(`${pc.white(' Output:')} ${pc.white(outputPath)}`);
logger.log(`${pc.white(' Security:')} ${pc.white(securityCheckMessage)}`);
};
Expand Down Expand Up @@ -63,8 +65,9 @@ export const printTopFiles = (
fileTokenCounts: Record<string, number>,
topFilesLength: number,
) => {
const topFilesLengthStrLen = topFilesLength.toString().length;
logger.log(pc.white(`📈 Top ${topFilesLength} Files by Character Count and Token Count:`));
logger.log(pc.dim('──────────────────────────────────────────────────────'));
logger.log(pc.dim(`─────────────────────────────────────────────────${'─'.repeat(topFilesLengthStrLen)}`));

const topFiles = Object.entries(fileCharCounts)
.sort((a, b) => b[1] - a[1])
Expand All @@ -74,7 +77,7 @@ export const printTopFiles = (
const tokenCount = fileTokenCounts[filePath];
const indexString = `${index + 1}.`.padEnd(3, ' ');
logger.log(
`${pc.white(`${indexString}`)} ${pc.white(filePath)} ${pc.dim(`(${charCount} chars, ${tokenCount} tokens)`)}`,
`${pc.white(`${indexString}`)} ${pc.white(filePath)} ${pc.dim(`(${charCount.toLocaleString()} chars, ${tokenCount.toLocaleString()} tokens)`)}`,
);
});
};
Expand Down
8 changes: 4 additions & 4 deletions src/core/packager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ export const pack = async (
},
);

tokenCounter.free();

const totalFiles = processedFiles.length;
const totalCharacters = fileMetrics.reduce((sum, fileMetric) => sum + fileMetric.charCount, 0);
const totalTokens = fileMetrics.reduce((sum, fileMetric) => sum + fileMetric.tokenCount, 0);
const totalCharacters = output.length;
const totalTokens = tokenCounter.countTokens(output);

tokenCounter.free();

const fileCharCounts: Record<string, number> = {};
const fileTokenCounts: Record<string, number> = {};
Expand Down
4 changes: 2 additions & 2 deletions tests/core/packager.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ describe('packager', () => {

// Check the result of pack function
expect(result.totalFiles).toBe(2);
expect(result.totalCharacters).toBe(38);
expect(result.totalTokens).toBe(20);
expect(result.totalCharacters).toBe(11);
expect(result.totalTokens).toBe(10);
expect(result.fileCharCounts).toEqual({
'file1.txt': 19,
[file2Path]: 19,
Expand Down