Skip to content

fix: type error of Enhanced helper #2137

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
Jun 3, 2025
Merged

fix: type error of Enhanced helper #2137

merged 1 commit into from
Jun 3, 2025

Conversation

ymc9
Copy link
Member

@ymc9 ymc9 commented Jun 3, 2025

No description provided.

Copy link
Contributor

coderabbitai bot commented Jun 3, 2025

📝 Walkthrough

Walkthrough

The change simplifies the generic parameter inference in the conditional type definition of the Enhanced<Client> type alias within the Prisma enhancer logic. It replaces specific generic inference with more general type checks, streamlining the type's implementation without altering its overall structure or output.

Changes

File(s) Change Summary
packages/schema/src/plugins/enhancer/enhance/index.ts Simplified conditional generic inference in the Enhanced<Client> type alias implementation.

Possibly related PRs

  • zenstackhq/zenstack#2010: Adds export of the Enhanced type, related by focusing on the same type alias but not its internal implementation.
  • zenstackhq/zenstack#2049: Introduces the Enhanced<Client> type alias, which is directly modified and simplified in the current PR.
✨ 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:

‼️ 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 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

@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)
packages/schema/src/plugins/enhancer/enhance/index.ts (1)

288-295: Request: Add type-level tests & tighten first branch inference
The new Enhanced<Client> alias now matches any _PrismaClient<any, any, any> and only infers ExtArgs for dynamic clients via _Prisma.TypeMap<infer ExtArgs>. To ensure no unintended types slip through and to catch regressions:

  1. Add a tsd (or dtslint) test under packages/schema verifying:
    • Enhanced<typeof prisma> strictly resolves to PrismaClient.
    • Enhanced<typeof extClient> resolves to the correct DynamicClientExtensionThis<…> shape.
  2. Consider tightening the first branch from any to unknown for stricter matching, e.g.:
    Client extends _PrismaClient<unknown, unknown, unknown> ? PrismaClient : 

Example tsd snippet:

import { expectType } from 'tsd';
import { PrismaClient } from '@prisma/client';
import { Enhanced } from '../src/plugins/enhancer/enhance';

declare const prisma: PrismaClient;
expectType<PrismaClient>(null as any as Enhanced<typeof prisma>);

// Simulated extended client
import type { DynamicClientExtensionThis } from '@prisma/client/runtime/library';
type ExtArgs = { foo: string };
declare const extClient: DynamicClientExtensionThis<PrismaClient['_types']['Model'], any, ExtArgs>;
expectType<
  DynamicClientExtensionThis<PrismaClient['_types']['Model'], any, ExtArgs>
>(null as any as Enhanced<typeof extClient>);

This will catch broken inferences in both branches.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 27e0b0e and 93f6b58.

📒 Files selected for processing (1)
  • packages/schema/src/plugins/enhancer/enhance/index.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: build-test (20.x)
  • GitHub Check: dependency-review

@ymc9 ymc9 merged commit 62e60bd into dev Jun 3, 2025
11 checks passed
@ymc9 ymc9 deleted the fix/enhanced-typing branch June 3, 2025 16: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