Skip to content

refactor: remove redundant library wrapper patterns#155

Merged
ryoppippi merged 3 commits intomainfrom
refactor/remove-redundant-patterns
Jun 22, 2025
Merged

refactor: remove redundant library wrapper patterns#155
ryoppippi merged 3 commits intomainfrom
refactor/remove-redundant-patterns

Conversation

@ryoppippi
Copy link
Owner

Summary

  • Remove redundant TERMINAL_CONTROL wrapper that simply re-exported ansi-escapes functions
  • Replace manual object recreation in createTotalsObject with spread operator
  • Add comprehensive JSDoc comments for better code understanding

Benefits

  • Reduced bundle size: Eliminates unnecessary wrapper functions
  • Better performance: Direct library usage without extra function calls
  • Improved maintainability: Less redundant code to maintain
  • Better documentation: Clear comments explaining non-obvious usage patterns

Changes

  • terminal-utils: Remove TERMINAL_CONTROL wrapper, use ansi-escapes directly
  • calculate-cost: Use spread operator instead of manual object property recreation
  • JSDoc improvements: Add detailed comments for functions that need explanation

Testing

  • ✅ All existing tests pass
  • ✅ Commands (daily, blocks) work correctly
  • ✅ Live monitoring functionality preserved
  • ✅ Type checking passes
  • ✅ Linting passes

- Remove TERMINAL_CONTROL object that simply re-exported ansi-escapes functions

- Use ansi-escapes directly for better performance and smaller bundle size

- Add comprehensive JSDoc comments explaining usage patterns

- Improve comments for functions that are not self-explanatory

- Keep TerminalManager class for state management and TTY checking
- Replace manual object property recreation with spread operator

- Reduces code redundancy and improves maintainability

- Smaller bundle size due to less repetitive code

- Preserves all existing functionality and type safety
@coderabbitai
Copy link

coderabbitai bot commented Jun 22, 2025

Warning

Rate limit exceeded

@ryoppippi has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 8 minutes and 23 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 32f3df3 and 18603e2.

📒 Files selected for processing (2)
  • src/_terminal-utils.ts (2 hunks)
  • src/calculate-cost.ts (1 hunks)
✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this 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.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @ryoppippi, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request focuses on improving code quality, maintainability, and efficiency by eliminating unnecessary abstractions and enhancing documentation. The changes streamline terminal control logic and modernize object creation patterns, leading to a cleaner and more understandable codebase.

Highlights

  • Refactor: Redundant Wrapper Removal: I've removed the TERMINAL_CONTROL object in src/_terminal-utils.ts which was a redundant wrapper around ansi-escapes functions. The TerminalManager class now directly utilizes ansi-escapes for terminal operations, simplifying the codebase and reducing indirection.
  • Code Conciseness: Object Creation: In src/calculate-cost.ts, the createTotalsObject function has been refactored to use the object spread operator (...totals). This replaces manual property assignment, making the code more concise, readable, and resilient to future changes in the TokenTotals interface.
  • Documentation Improvement: JSDoc: I've added comprehensive JSDoc comments throughout src/_terminal-utils.ts for the TerminalManager class, its methods, and utility functions like createProgressBar and centerText. This significantly improves code understanding and maintainability, especially for non-obvious usage patterns.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@pkg-pr-new
Copy link

pkg-pr-new bot commented Jun 22, 2025

Open in StackBlitz

npm i https://pkg.pr.new/ryoppippi/ccusage@155

commit: 18603e2

@cloudflare-workers-and-pages
Copy link

cloudflare-workers-and-pages bot commented Jun 22, 2025

Deploying with  Cloudflare Workers  Cloudflare Workers

The latest updates on your project. Learn more about integrating Git with Workers.

Status Name Latest Commit Updated (UTC)
✅ Deployment successful!
View logs
ccusage-guide 18603e2 Jun 22 2025, 10:18 AM

@ryoppippi ryoppippi requested a review from Copilot June 22, 2025 10:11
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

The pull request refactors the code by removing a redundant library wrapper, using the spread operator for object creation, and adding JSDoc comments. The changes improve code maintainability, performance, and documentation. The removal of the TERMINAL_CONTROL wrapper and the use of the spread operator in createTotalsObject are good optimizations. The added JSDoc comments enhance code understanding.

Comment on lines 23 to 27
hideCursor(): void {
if (!this.cursorHidden && this.stream.isTTY) {
this.stream.write(TERMINAL_CONTROL.HIDE_CURSOR);
this.stream.write(ansiEscapes.cursorHide);
this.cursorHidden = true;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

Consider adding a comment explaining why the cursor is hidden only in TTY environments. This would improve code understanding for future developers.

if (!this.cursorHidden && this.stream.isTTY) {
			// Only hide cursor in TTY environments to prevent issues with non-interactive streams
			this.stream.write(ansiEscapes.cursorHide);
			this.cursorHidden = true;
		}

Comment on lines 45 to 49
clearScreen(): void {
if (this.stream.isTTY) {
this.stream.write(TERMINAL_CONTROL.CLEAR_SCREEN);
this.stream.write(TERMINAL_CONTROL.MOVE_TO_TOP);
}
}

/**
* Clears the current line
*/
clearLine(): void {
if (this.stream.isTTY) {
this.stream.write(TERMINAL_CONTROL.CLEAR_LINE);
}
}

/**
* Moves cursor up by n lines
*/
moveUp(lines: number): void {
if (this.stream.isTTY && lines > 0) {
this.stream.write(TERMINAL_CONTROL.MOVE_UP(lines));
}
}

/**
* Moves cursor to beginning of line
*/
moveToLineStart(): void {
if (this.stream.isTTY) {
this.stream.write(TERMINAL_CONTROL.MOVE_TO_COLUMN(1));
this.stream.write(ansiEscapes.clearScreen);
this.stream.write(ansiEscapes.cursorTo(0, 0));
}
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

Consider adding a comment explaining why the screen is cleared and the cursor is moved to the top-left corner only in TTY environments.

if (this.stream.isTTY) {
			// Only clear screen in TTY environments to prevent issues with non-interactive streams
			this.stream.write(ansiEscapes.clearScreen);
			this.stream.write(ansiEscapes.cursorTo(0, 0));
		}

Comment on lines 91 to 94
return {
inputTokens: totals.inputTokens,
outputTokens: totals.outputTokens,
cacheCreationTokens: totals.cacheCreationTokens,
cacheReadTokens: totals.cacheReadTokens,
...totals,
totalTokens: getTotalTokens(totals),
totalCost: totals.totalCost,
};
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

Consider including totalCost in the spread operator to avoid explicitly excluding it and keep the object complete.

return {
		...totals,
		totalTokens: getTotalTokens(totals),
		totalCost: totals.totalCost, // Include totalCost in the object
	};

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

Refactors terminal utilities to remove redundant wrappers and streamlines object creation in cost calculation.

  • Replace manual property mapping in createTotalsObject with spread operator for brevity
  • Remove TERMINAL_CONTROL wrapper and inline ansi-escapes calls in TerminalManager
  • Enrich code with comprehensive JSDoc for clearer developer guidance

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
src/calculate-cost.ts Simplified createTotalsObject by spreading totals
src/_terminal-utils.ts Removed TERMINAL_CONTROL, updated TerminalManager methods and JSDoc
Comments suppressed due to low confidence (1)

src/_terminal-utils.ts:45

  • The methods clearLine, moveUp, and moveToLineStart were removed from TerminalManager. If any callers still rely on those operations, they will break. Please verify no existing code depends on them or provide equivalent methods.
	clearScreen(): void {

outputTokens: totals.outputTokens,
cacheCreationTokens: totals.cacheCreationTokens,
cacheReadTokens: totals.cacheReadTokens,
...totals,
Copy link

Copilot AI Jun 22, 2025

Choose a reason for hiding this comment

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

Using a spread here will include all properties from totals. If TokenTotals gains new fields in the future that shouldn’t be part of the returned object, this could introduce unintended keys. Consider explicitly listing only the properties you need or adding a comment about which fields are expected.

Suggested change
...totals,
inputTokens: totals.inputTokens,
outputTokens: totals.outputTokens,
cacheCreationTokens: totals.cacheCreationTokens,
cacheReadTokens: totals.cacheReadTokens,
totalCost: totals.totalCost,

Copilot uses AI. Check for mistakes.
Added inline comments explaining why cursor hiding and screen clearing operations are restricted to TTY environments to prevent issues with non-interactive streams like files or pipes.
@ryoppippi ryoppippi merged commit 88502dc into main Jun 22, 2025
11 checks passed
@ryoppippi ryoppippi deleted the refactor/remove-redundant-patterns branch June 22, 2025 10:20
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.

2 participants