fix(zmodel): don't inherit @@map attribute from base

[ymc9]

Fixes #1167

Summary by CodeRabbit

• New Features
  • Enhanced schema loading capabilities to better handle file and image assets.
• Bug Fixes
  • Improved handling of relative and absolute paths in schema utilities.
• Tests
  • Added a regression test for improved schema loading.

[coderabbitai]

Walkthrough

Walkthrough

This update introduces improvements and fixes in handling schema generation, particularly addressing issues with delegating models and @@map() usage, and enhancing asset schema loading. It refines path resolution in import URIs and filters out specific attributes during model merging, aiming to streamline the generation process and resolve specific bugs reported by users.

Changes

File Path	Change Summary
packages/.../ast-utils.ts	- Added isAbsolute import - Filtered attributes - Improved path handling
tests/.../issue-1167.test.ts	- New test for schema loading issue

Assessment against linked issues

Objective	Addressed	Explanation
Delegating models can't use @@map() (#1167)	✅
Resolve the error related to generating PrismaClient enhancer with unique constraint names (#1058)	❓	Changes do not directly mention constraint names, unclear if it impacts this issue.
Allow multiple fields in a model to reference the same model (#653)	❌	The provided changes do not address the validation error for multiple fields referencing the same model.

Related issues

• Error when generating from schema with polymorphic models - given constraint name ... has to be unique in the following namespace... #1058: While the changes do not directly address constraint name uniqueness, the improvement in schema handling could indirectly affect the generation of PrismaClient enhancer, warranting a closer look.
• Zenstack does not let me define multiple fields that are referencing the same model #653: The changes do not seem to address the specific issue of multiple fields referencing the same model, but the overall improvements in schema handling suggest a review to ensure no indirect solutions or related enhancements were made.

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

• X
• Mastodon
• Reddit
• LinkedIn

---

Tips

Chat

There are 3 ways to chat with CodeRabbit:

Note: Auto-reply has been disabled for this repository by the repository owner. 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 tests 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 generate interesting stats about this repository and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @coderabbitai read src/utils.ts and generate unit tests.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

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 as PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• The JSON schema for the configuration file is available here.
• 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/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

[coderabbitai]

Review Status

Actionable comments generated: 0

Configuration used: CodeRabbit UI

Commits

Files that changed from the base of the PR and between a0ca15d and d5423df.

Files selected for processing (2)

• packages/schema/src/utils/ast-utils.ts (3 hunks)
• tests/integration/tests/regression/issue-1167.test.ts (1 hunks)

Additional comments: 4

tests/integration/tests/regression/issue-1167.test.ts (1)

• 3-19: The test setup and schema definition correctly replicate the issue described in Delegating models can't use @@map() #1167. However, it's recommended to add assertions to verify that the schema is loaded correctly and that the @@map attribute is handled as expected, ensuring the fix resolves the issue without introducing new ones.

packages/schema/src/utils/ast-utils.ts (3)

• 31-31: The addition of the isAbsolute import from node:path is appropriate for enhancing path handling in the resolveImportUri function.
• 71-72: The modification to exclude the @@map attribute from being inherited by derived models in the mergeBaseModel function is crucial for resolving the issue described in the PR objectives. This change effectively prevents the duplication and conflict observed with the @@map attribute during schema generation.
• 147-148: The adjustments to the resolveImportUri function to handle relative and absolute paths more clearly are a significant improvement. By using the isAbsolute function, the path handling becomes more accurate and robust, enhancing the framework's ability to resolve schema imports correctly.