Skip to content

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

Merged
yamadashy merged 1 commit intomainfrom
feature/print-human-readable
Nov 23, 2024
Merged

feat(cli): Add number formatting and fix statistics calculation#177
yamadashy merged 1 commit intomainfrom
feature/print-human-readable

Conversation

@yamadashy
Copy link
Owner

This PR improves the readability of statistics output and fixes how total character and token counts are calculated. Previously, the totals were showing the sum of individual files rather than the metrics of the final output file.

@bolt-new-by-stackblitz
Copy link

Review PR in StackBlitz Codeflow Run & review this pull request in StackBlitz Codeflow.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Nov 23, 2024

📝 Walkthrough
📝 Walkthrough

Walkthrough

The changes in this pull request involve modifications to two files: src/cli/cliPrint.ts and src/core/packager.ts. In cliPrint.ts, the formatting of output messages related to file counts and security checks has been improved by utilizing toLocaleString() for better readability. Additionally, a new variable was introduced to align separator lines with the number of top files displayed. In packager.ts, the calculation methods for totalCharacters and totalTokens were updated to derive these values directly from the output string rather than from file metrics, while maintaining the function's overall structure.

Changes

File Change Summary
src/cli/cliPrint.ts Enhanced output formatting using toLocaleString() for file counts and security checks. Added a variable to adjust the length of the separator line in printTopFiles.
src/core/packager.ts Updated pack function to calculate totalCharacters from the output string and totalTokens using tokenCounter.countTokens, removing previous calculations from fileMetrics.
tests/core/packager.test.ts Adjusted test expectations for totalCharacters and totalTokens. Refined tests for security checks and clipboard functionality.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant CLI
    participant Packager

    User->>CLI: Request output summary
    CLI->>CLI: Call printSummary()
    CLI->>CLI: Format counts using toLocaleString()
    CLI->>User: Display formatted summary

    User->>Packager: Trigger pack function
    Packager->>Packager: Calculate totalCharacters from output
    Packager->>Packager: Calculate totalTokens using tokenCounter
    Packager->>User: Return pack results
Loading

Possibly related PRs

  • feat: added copy functionality from #152 #160: The changes in this PR introduce clipboard functionality in the pack function, which is directly related to the enhancements made in the src/cli/cliPrint.ts file regarding output formatting and logging, as both involve improving how output is managed and presented.

Warning

Rate limit exceeded

@yamadashy has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 8 minutes and 51 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between 56c13de and 875ff5c.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 56c13de and 875ff5c.

📒 Files selected for processing (3)
  • src/cli/cliPrint.ts (4 hunks)
  • src/core/packager.ts (1 hunks)
  • tests/core/packager.test.ts (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (2)
  • src/cli/cliPrint.ts
  • src/core/packager.ts
🔇 Additional comments (1)
tests/core/packager.test.ts (1)

98-99: Verify the consistency between test assertions and implementation.

The new assertions for total characters (11) and total tokens (10) appear to be derived from different sources than the individual file metrics:

  • Total characters (11) matches the length of the mock output string "mock output"
  • Total tokens (10) matches the mocked TokenCounter.countTokens return value
  • However, individual file metrics still show 19 characters and 10 tokens per file

This suggests a change in how totals are calculated, moving from sum of file metrics to output-based calculation.

Let's verify the implementation changes in the packager:

✅ Verification successful

Test assertions correctly reflect the implementation's output-based calculation

The test assertions are consistent with the implementation in src/core/packager.ts. The implementation shows:

  • totalCharacters is calculated from the final output length: output.length
  • totalTokens is calculated from the final output: tokenCounter.countTokens(output)

This explains why:

  • Total characters (11) matches the mock output "mock output"
  • Total tokens (10) matches the mocked TokenCounter.countTokens return value
  • Individual file metrics are separate and not used in the total calculations
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the changes in total calculation logic
# Expected: Find changes that move from file-based to output-based calculation

# Search for totalCharacters calculation
rg -A 5 'totalCharacters.*=' src/core/packager.ts

# Search for totalTokens calculation
rg -A 5 'totalTokens.*=' src/core/packager.ts

Length of output: 462


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@yamadashy yamadashy force-pushed the feature/print-human-readable branch from 81ed6e0 to 56c13de Compare November 23, 2024 08:28
Copy link

@standard-input standard-input bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues flagged.
Standard Input can make mistakes. Check important info.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (3)
src/cli/cliPrint.ts (2)

30-32: Consider adding thousands separators for better readability of large numbers.

The addition of toLocaleString() and units improves the clarity of statistics. For even better readability with very large numbers, consider adding a helper function to format numbers with appropriate unit suffixes (K, M, B).

Example implementation:

function formatNumber(num: number): string {
  const units = ['', 'K', 'M', 'B'];
  const order = Math.floor(Math.log10(Math.abs(num)) / 3);
  if (order < 0 || order >= units.length) return num.toLocaleString();
  const scaled = num / Math.pow(10, order * 3);
  return `${scaled.toFixed(1)}${units[order]}`;
}

68-68: Consider a more descriptive variable name.

While the dynamic separator line alignment is a good improvement, the variable name topFilesLengthStrLen could be more descriptive.

Consider renaming to something more clear:

-  const topFilesLengthStrLen = topFilesLength.toString().length;
+  const digitCountInTopFilesNumber = topFilesLength.toString().length;

Also applies to: 70-70

src/core/packager.ts (1)

108-110: Consider optimizing token counting performance.

The current implementation counts tokens twice: once per file for individual metrics and once for the total. Consider storing the individual token counts and summing them if the output generation doesn't modify the tokens.

- const totalTokens = tokenCounter.countTokens(output);
+ // If output generation preserves tokens, use the sum of individual counts
+ const totalTokens = Object.values(fileTokenCounts).reduce((sum, count) => sum + count, 0);

Note: Only apply this optimization if you can verify that the output generation process doesn't modify the tokens. If you're unsure, the current implementation is safer as it guarantees accuracy.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 556e8e3 and 56c13de.

📒 Files selected for processing (2)
  • src/cli/cliPrint.ts (4 hunks)
  • src/core/packager.ts (1 hunks)
🔇 Additional comments (3)
src/cli/cliPrint.ts (2)

18-20: LGTM! Improved number formatting for better readability.

The addition of toLocaleString() enhances the readability of large numbers in the security check message.


80-80: LGTM! Consistent formatting of statistics.

The formatting of character and token counts is consistent with other changes and improves readability.

src/core/packager.ts (1)

107-108: LGTM! Improved accuracy of character count calculation.

The change to calculate totalCharacters directly from the output string length is more accurate than summing individual file metrics, as it correctly reflects any transformations applied during output generation.

@yamadashy yamadashy force-pushed the feature/print-human-readable branch from 56c13de to 875ff5c Compare November 23, 2024 08:38
@codecov
Copy link

codecov bot commented Nov 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.07%. Comparing base (556e8e3) to head (875ff5c).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #177      +/-   ##
==========================================
+ Coverage   92.05%   92.07%   +0.01%     
==========================================
  Files          35       35              
  Lines        1889     1892       +3     
  Branches      431      429       -2     
==========================================
+ Hits         1739     1742       +3     
  Misses        150      150              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.


🚨 Try these New Features:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant