Skip to content

feat: export Enhanced type to infer typeof enhanced PrismaClient #2010

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
Feb 24, 2025

Conversation

ymc9
Copy link
Member

@ymc9 ymc9 commented Feb 24, 2025

No description provided.

Copy link
Contributor

coderabbitai bot commented Feb 24, 2025

📝 Walkthrough

Walkthrough

The changes update type exports in the ZenStack runtime and schema packages. The export statements in both declaration files now include the new Enhanced type (alongside the existing auth, enhance, and PrismaClient). A new type alias Enhanced<Client> is added to the schema enhancer module to improve type inference based on client extensions. Additionally, an integration test has been introduced to verify the enhanced typing for both standard and extended Prisma client usage.

Changes

File(s) Change Summary
packages/runtime/res/enhance.d.ts, packages/runtime/src/enhance.d.ts Updated export statements to include type PrismaClient and newly added type Enhanced alongside existing exports (auth, enhance).
packages/schema/src/.../enhance/index.ts Added a new type alias Enhanced<Client> for enhanced type inference and introduced an updated enhance function signature with improved typing.
tests/integration/tests/enhancements/typing/enhancement-typing.test.ts Introduced a new integration test suite to verify the correct typing behavior of the Prisma client with and without client extensions, ensuring that both standard and enhanced functionalities work as expected.

Sequence Diagram(s)

sequenceDiagram
    participant T as Test Code
    participant P as PrismaClient
    participant E as enhance() Function
    participant EC as Enhanced Client

    T->>P: Instantiate PrismaClient
    T->>E: Call enhance(prisma, context?, options?)
    E->>EC: Determine and apply type enhancements
    alt With Client Extension
        EC-->>T: Return enhanced client with logging extension
    else Without Client Extension
        EC-->>T: Return basic enhanced client
    end
Loading

Possibly related PRs

✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

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 (1)
tests/integration/tests/enhancements/typing/enhancement-typing.test.ts (1)

31-31: Consider removing type assertions and console.log statements.

The test could be improved:

  1. Replace as any type assertions with proper type construction to avoid masking potential type issues
  2. Use test assertions instead of console.log for verifying results
-    const db = {} as any as Enhanced<typeof prisma>;
+    const db: Enhanced<typeof prisma> = enhance(prisma);

-    console.log(r);
+    expect(r).toBeDefined();
+    expect(r.title).toBe('Post1');

Also applies to: 46-46

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between be57ad1 and eb6fbca.

📒 Files selected for processing (4)
  • packages/runtime/res/enhance.d.ts (1 hunks)
  • packages/runtime/src/enhance.d.ts (1 hunks)
  • packages/schema/src/plugins/enhancer/enhance/index.ts (1 hunks)
  • tests/integration/tests/enhancements/typing/enhancement-typing.test.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (6)
  • GitHub Check: build-test (20.x)
  • GitHub Check: build-test (20.x)
  • GitHub Check: OSSAR-Scan
  • GitHub Check: build-test (20.x)
  • GitHub Check: dependency-review
  • GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (4)
packages/runtime/res/enhance.d.ts (1)

1-1: LGTM!

The export statement correctly includes the new Enhanced type alongside existing exports.

packages/runtime/src/enhance.d.ts (1)

1-2: LGTM!

The export statement correctly includes the new Enhanced type, and the TS expect error comment is appropriate for re-exporting generated code.

packages/schema/src/plugins/enhancer/enhance/index.ts (1)

270-281: Excellent type definition with comprehensive type inference!

The Enhanced type alias is well-designed:

  • Handles both standard PrismaClient and extended client cases
  • Preserves type information from client extensions
  • Includes clear documentation and usage example
  • Handles Prisma version differences for ClientOptions
tests/integration/tests/enhancements/typing/enhancement-typing.test.ts (1)

3-60: Great test coverage for type enhancements!

The test suite effectively verifies:

  • Type inference for standard PrismaClient
  • Type inference with client extensions
  • Optional fields with auth defaults
  • Preservation of extended methods

@ymc9 ymc9 merged commit 767d59d into dev Feb 24, 2025
11 checks passed
@ymc9 ymc9 deleted the feat/enhanced-client-typing branch February 24, 2025 19:02
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