Skip to content

fix(json): incorrect JSON field type generated for inputs #1996

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 21, 2025
Merged

Conversation

ymc9
Copy link
Member

@ymc9 ymc9 commented Feb 21, 2025

fixes #1991

Copy link
Contributor

coderabbitai bot commented Feb 21, 2025

📝 Walkthrough

Walkthrough

The changes enhance the processing of models with JSON type fields within the EnhancerGenerator class. Two new private properties are introduced to store models with JSON fields and their corresponding regular expression patterns. The constructor now filters and stores these models, while the fixJsonFieldType method is updated to use precompiled regex patterns for type matching. Additionally, a new regression test is added to verify the schema behavior for the Foo and FooOption models, ensuring that the enhanced PrismaClient and JSON field handling work as expected.

Changes

File Change Summary
packages/schema/src/plugins/enhancer/enhance/index.ts Modified EnhancerGenerator: added private properties modelsWithJsonTypeFields and modelsWithJsonTypeFieldsInputOutputPattern; moved JSON field filtering logic to the constructor; updated fixJsonFieldType to leverage precompiled regex patterns.
tests/regression/tests/issue-1991.test.ts Added a new regression test suite for issue 1991. The test defines a schema with Foo and FooOption models, uses loadSchema to compile the schema, and validates record creation using an enhanced PrismaClient.

Sequence Diagram(s)

sequenceDiagram
    participant EG as EnhancerGenerator
    participant DM as Data Models
    participant RP as RegExp Patterns

    EG->>DM: Filter models for JSON fields using isTypeDef
    DM-->>EG: Return models with JSON fields
    EG->>RP: Build regex patterns based on JSON field models
    RP-->>EG: Store patterns in modelsWithJsonTypeFieldsInputOutputPattern
    Note over EG: fixJsonFieldType later uses these patterns for type matching
Loading
sequenceDiagram
    participant T as Test Framework
    participant LS as Schema Loader
    participant PC as Enhanced PrismaClient
    participant DB as Database

    T->>LS: Load schema for Foo and FooOption models
    LS-->>T: Return compiled schema
    T->>PC: Enhance PrismaClient and create FooOption record with meta field
    PC->>DB: Execute record creation
    DB-->>PC: Return creation outcome
    PC-->>T: Provide test result
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 (3)
packages/schema/src/plugins/enhancer/enhance/index.ts (2)

67-68: Consider adding a doc comment for clarity.
Defining a dedicated property for models containing JSON type fields is helpful. A short descriptive doc comment (e.g., usage context, why it’s needed) would improve readability.


807-819: Avoid relying on the non-null assertion (!).
Use a safe check (e.g., if (!model) continue;) to handle unexpected situations or defensive programming. This prevents potential runtime errors if a matching model is somehow missing.

tests/regression/tests/issue-1991.test.ts (1)

3-48: Consider adding a direct assertion to validate the created record.
The test schema and db.fooOption.create invocation look correct, but adding an explicit assertion (e.g., verifying the persisted record’s meta value) would strengthen confidence in the fix.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 94dd30f and d42cce0.

📒 Files selected for processing (2)
  • packages/schema/src/plugins/enhancer/enhance/index.ts (4 hunks)
  • tests/regression/tests/issue-1991.test.ts (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: build-test (20.x)
  • GitHub Check: build-test (20.x)
🔇 Additional comments (4)
packages/schema/src/plugins/enhancer/enhance/index.ts (4)

70-71: Regex property definition looks good.
The setup neatly isolates patterns for JSON field input/output handling. No concerns here.


87-89: Verify that all TypeDef references indeed represent JSON fields.
Currently, the isTypeDef() check alone might include non-JSON type definitions. Consider verifying that these fields also have a @json attribute or otherwise ensuring they truly represent JSON.


91-102: Regex approach for input/output types is concise and maintainable.
The combined patterns cover various Prisma input/output suffixes effectively. Implementation appears correct and understandable.


790-792: Adding specialized handling for the $[Model]Payload type is appropriate.
This selective fix aligns well with the JSON field resolution logic, ensuring typed JSON fields are recognized properly.

@ymc9 ymc9 merged commit 317f535 into dev Feb 21, 2025
11 checks passed
@ymc9 ymc9 deleted the fix/issue-1991 branch February 21, 2025 06:07
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