Skip to content

chore: misc CLI fixes #1939

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.

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
merged 1 commit into from
Jan 6, 2025
Merged

chore: misc CLI fixes #1939

merged 1 commit into from
Jan 6, 2025

Conversation

ymc9
Copy link
Member

@ymc9 ymc9 commented Jan 6, 2025

No description provided.

Copy link
Contributor

coderabbitai bot commented Jan 6, 2025

📝 Walkthrough

Walkthrough

This pull request introduces several modifications across multiple files in the ZenStack CLI package, focusing on improving version handling, error management, and user guidance. The changes primarily involve adding null checks when processing package versions, updating function return types, and modifying console output messages. These updates aim to enhance the robustness of version detection and provide clearer documentation guidance for users initializing or working with ZenStack projects.

Changes

File Change Summary
packages/schema/src/cli/actions/generate.ts Added length check for packages and filter for non-null version strings
packages/schema/src/cli/actions/info.ts Added truthy check before adding version to versions set
packages/schema/src/cli/actions/init.ts Updated console output message with a more general documentation link
packages/schema/src/cli/cli-util.ts Modified getZenStackPackages to return an empty array on error and added explicit return type
packages/schema/src/cli/index.ts Added non-null assertion operator to getVersion() function call
packages/schema/src/utils/version-utils.ts Added explicit return type annotation to getVersion() function

Possibly related PRs


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:

‼️ IMPORTANT
Auto-reply has been disabled for this repository in the CodeRabbit settings. The CodeRabbit bot will not respond to your replies unless it is explicitly tagged.

  • 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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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

@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

🧹 Nitpick comments (4)
packages/schema/src/utils/version-utils.ts (1)

2-2: Explicitly declaring return type improves clarity.

Declaring string | undefined in the function signature helps clarify the usage and ensure that consumers handle the possibility of an undefined result. Since this function reads from different files, consider logging or handling the case when neither package file is found so that users have more insight into why the version is undefined.

packages/schema/src/cli/actions/init.ts (1)

66-66: Documentation link update enhances user onboarding.

Replacing the modeling guide with a direct link to the documentation is helpful for a broader overview. Consider referencing specific relevant pages or guides if advanced usage instructions are needed.

packages/schema/src/cli/cli-util.ts (2)

236-236: Caution on silent fallback.
Returning an empty array might mask errors if the project remains misconfigured. Consider logging a warning or rethrowing an informative exception to aid debugging.

} catch {
-    return [];
+    console.warn('Could not read package.json properly. Returning empty package list.');
+    return [];
}

289-289: Improve user guidance by suggesting how to upgrade
When informing users of a newer version, you might also include quick instructions or references for upgrading, enhancing the user experience and making it easier to stay up to date.

if (latestVersion && currVersion && semver.gt(latestVersion, currVersion)) {
+   console.log(`Upgrade with: npm install -g zenstack@${latestVersion}`);
    console.log(`A newer version ${colors.cyan(latestVersion)} is available.`);
}
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between bcbfb9a and 49726c1.

📒 Files selected for processing (6)
  • packages/schema/src/cli/actions/generate.ts (1 hunks)
  • packages/schema/src/cli/actions/info.ts (1 hunks)
  • packages/schema/src/cli/actions/init.ts (1 hunks)
  • packages/schema/src/cli/cli-util.ts (3 hunks)
  • packages/schema/src/cli/index.ts (1 hunks)
  • packages/schema/src/utils/version-utils.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (6)
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: build-test (20.x)
  • GitHub Check: OSSAR-Scan
  • GitHub Check: build-test (20.x)
  • GitHub Check: dependency-review
  • GitHub Check: build-test (20.x)
🔇 Additional comments (5)
packages/schema/src/cli/actions/info.ts (1)

19-21: Good null check before using version.

By checking if (version) before adding it to versions, you avoid inserting an undefined value. This is a sensible approach that prevents inconsistent data in your version set.

packages/schema/src/cli/actions/generate.ts (1)

40-41: Filtering out undefined versions is a robust approach.

Using .filter((v): v is string => !!v) ensures that only valid string versions make it into the set. This avoids potential type errors down the line. Great attention to detail!

packages/schema/src/cli/index.ts (1)

76-76: Consider handling null or undefined returns from getVersion() without forcing non-null.
While the ! operator suppresses potential undefined behavior, it might be safer to handle the case when getVersion() returns undefined. This can prevent unexpected runtime errors if the version cannot be resolved.

Would you like me to provide a snippet that gracefully handles undefined and falls back to a default value?

packages/schema/src/cli/cli-util.ts (2)

230-230: Good approach on always returning an array.
Explicitly returning an array rather than possibly undefined helps keep consumption logic simpler. This ensures robust handling of unexpected file reads.


248-248: Verify the version type at runtime.
While casting require(resolved).version as a string may be accurate, consider asserting its validity or falling back to undefined if the field doesn’t exist. This helps avoid runtime type mismatches.

- return { pkg, version: require(resolved).version as string };
+ const loadedVersion = require(resolved).version;
+ return { pkg, version: typeof loadedVersion === 'string' ? loadedVersion : undefined };

@ymc9 ymc9 merged commit da08eed into dev Jan 6, 2025
9 checks passed
@ymc9 ymc9 deleted the chore/misc-cli branch January 6, 2025 10:45
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