feat(orm)!: Add typed typed mutation hooks #2365 - #2740

Open
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks
Open

feat(orm)!: Add typed typed mutation hooks #2365#2740
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks

Conversation

@genu

@genugenu commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

fixes: #2365

Summary by CodeRabbit

  • New Features

    • Added support for model-specific entity mutation hooks, with strongly typed loaded entities.
    • Model-specific hooks can run alongside catch-all hooks and receive the correct entity snapshots.
    • Per-model configuration for whether after-mutation hooks run inside or outside transactions.
  • Bug Fixes

    • Fixed mutation hook handling so model-specific hooks execute even when only per-model hooks are provided.
    • Improved scheduling so after-mutation hooks correctly follow in-transaction vs out-of-transaction behavior.
  • Breaking Changes

    • Catch-all entity mutation hooks must now be registered under onEntityMutation.$all.
  • Tests

    • Expanded E2E coverage for per-model mutation hooks and updated related regression tests.

@coderabbitai

coderabbitaiBot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

Changes

Entity mutation hooks

Layer / File(s)Summary
Model-scoped hook contracts
packages/orm/src/client/plugin.ts
Adds typed per-model before/after mutation hook arguments and extends EntityMutationHooksDef with model-specific hook definitions.
Hook detection and dispatch
packages/orm/src/client/executor/zenstack-query-executor.ts
Executes catch-all and model-specific hooks independently, including per-model transaction-scope resolution.
Hook registration updates
BREAKINGCHANGES.md, tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts, tests/regression/test/issue-586.test.ts
Moves catch-all hook registrations under onEntityMutation.$all.
Per-model hook behavior tests
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts
Covers model targeting, hook composition, before-entity propagation, and typed loaded entities.

Estimated code review effort: 3 (Moderate) | ~20 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title matches the main change: adding typed mutation hooks for ORM, and it is concise and specific.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

Comment @coderabbitai help to get the list of available commands.

@genu
genuforce-pushed the genu/typed-mutation-hooks branch from 3ebbffb to ce01cebCompareJuly 22, 2026 14:58
@genu
genu marked this pull request as ready for review July 22, 2026 15:00

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (2)
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts (1)

806-831: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Test can silently pass without executing any assertion.

All expect calls are inside afterEntityMutation; there's no outer check confirming the hook actually ran. If per-model after-hook dispatch regresses, this test would still pass with zero assertions executed.

✅ Proposed fix
 it('per-model hooks infer correct entity types', async () => {
+ expect.assertions(2);
const client = _client.$use({
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts` around lines 806 -
831, Add an outer execution flag to the “per-model hooks infer correct entity
types” test, set it inside User.afterEntityMutation after the hook runs, and
assert it after client.user.create completes. Keep the existing entity type and
email assertions unchanged.
packages/orm/src/client/executor/zenstack-query-executor.ts (1)

376-386: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Optional: extract shared per-model hook lookup.

The (onEntityMutation as Record<string, any>)[mutationInfo.model] lookup pattern is duplicated between callBeforeMutationHooks and callAfterMutationHooks. A small private helper (e.g. getModelHooks(onEntityMutation, model)) would remove the duplication, though the current repetition is small and low-risk.

Also applies to: 417-429

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/orm/src/client/executor/zenstack-query-executor.ts` around lines 376
- 386, Extract the duplicated per-model hook lookup into a private helper, such
as getModelHooks, and use it in both callBeforeMutationHooks and
callAfterMutationHooks. Keep the helper’s behavior equivalent to the existing
onEntityMutation Record lookup for mutationInfo.model.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 125-132: Update the hasEntityMutationPluginsWithAfterMutationHooks
getter to accept the mutationModel and check only that model’s per-model
afterEntityMutation hook, while preserving catch-all hook detection. Update the
needLoadAfterMutationEntities call site to pass the existing mutationModel,
preventing hooks registered for other models from triggering entity loading.
---
Nitpick comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 376-386: Extract the duplicated per-model hook lookup into a
private helper, such as getModelHooks, and use it in both
callBeforeMutationHooks and callAfterMutationHooks. Keep the helper’s behavior
equivalent to the existing onEntityMutation Record lookup for
mutationInfo.model.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts`:
- Around line 806-831: Add an outer execution flag to the “per-model hooks infer
correct entity types” test, set it inside User.afterEntityMutation after the
hook runs, and assert it after client.user.create completes. Keep the existing
entity type and email assertions unchanged.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: c7f981f2-b6a7-49fb-a7d5-79f609339101

📥 Commits

Reviewing files that changed from the base of the PR and between b83efad and ce01ceb.

📒 Files selected for processing (3)
  • packages/orm/src/client/executor/zenstack-query-executor.ts
  • packages/orm/src/client/plugin.ts
  • tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts

Comment threadpackages/orm/src/client/executor/zenstack-query-executor.ts
@genugenu changed the title feat(orm)!: Add typed typed mutation hooks Fixes #2365feat(orm)!: Add typed typed mutation hooks #2365Jul 22, 2026
@ymc9

ymc9 commented Aug 21, 2026

Copy link
Copy Markdown
Member

Hi @genu , my apologies for missing this PR. Looks good and I'll merge before the release of 3.10 since it's breaking.

Sign up for freeto 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.

Add type inference to loadBeforeMutationEntities and loadAfterMutationEntities

2 participants

@genu@ymc9
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

feat(orm)!: Add typed typed mutation hooks #2365 - #2740

Open
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks
Open

feat(orm)!: Add typed typed mutation hooks #2365#2740
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks

Conversation

@genu

@genugenu commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

fixes: #2365

Summary by CodeRabbit

  • New Features

    • Added support for model-specific entity mutation hooks, with strongly typed loaded entities.
    • Model-specific hooks can run alongside catch-all hooks and receive the correct entity snapshots.
    • Per-model configuration for whether after-mutation hooks run inside or outside transactions.
  • Bug Fixes

    • Fixed mutation hook handling so model-specific hooks execute even when only per-model hooks are provided.
    • Improved scheduling so after-mutation hooks correctly follow in-transaction vs out-of-transaction behavior.
  • Breaking Changes

    • Catch-all entity mutation hooks must now be registered under onEntityMutation.$all.
  • Tests

    • Expanded E2E coverage for per-model mutation hooks and updated related regression tests.

@coderabbitai

coderabbitaiBot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

Changes

Entity mutation hooks

Layer / File(s)Summary
Model-scoped hook contracts
packages/orm/src/client/plugin.ts
Adds typed per-model before/after mutation hook arguments and extends EntityMutationHooksDef with model-specific hook definitions.
Hook detection and dispatch
packages/orm/src/client/executor/zenstack-query-executor.ts
Executes catch-all and model-specific hooks independently, including per-model transaction-scope resolution.
Hook registration updates
BREAKINGCHANGES.md, tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts, tests/regression/test/issue-586.test.ts
Moves catch-all hook registrations under onEntityMutation.$all.
Per-model hook behavior tests
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts
Covers model targeting, hook composition, before-entity propagation, and typed loaded entities.

Estimated code review effort: 3 (Moderate) | ~20 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title matches the main change: adding typed mutation hooks for ORM, and it is concise and specific.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

Comment @coderabbitai help to get the list of available commands.

@genu
genuforce-pushed the genu/typed-mutation-hooks branch from 3ebbffb to ce01cebCompareJuly 22, 2026 14:58
@genu
genu marked this pull request as ready for review July 22, 2026 15:00

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (2)
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts (1)

806-831: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Test can silently pass without executing any assertion.

All expect calls are inside afterEntityMutation; there's no outer check confirming the hook actually ran. If per-model after-hook dispatch regresses, this test would still pass with zero assertions executed.

✅ Proposed fix
 it('per-model hooks infer correct entity types', async () => {
+ expect.assertions(2);
const client = _client.$use({
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts` around lines 806 -
831, Add an outer execution flag to the “per-model hooks infer correct entity
types” test, set it inside User.afterEntityMutation after the hook runs, and
assert it after client.user.create completes. Keep the existing entity type and
email assertions unchanged.
packages/orm/src/client/executor/zenstack-query-executor.ts (1)

376-386: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Optional: extract shared per-model hook lookup.

The (onEntityMutation as Record<string, any>)[mutationInfo.model] lookup pattern is duplicated between callBeforeMutationHooks and callAfterMutationHooks. A small private helper (e.g. getModelHooks(onEntityMutation, model)) would remove the duplication, though the current repetition is small and low-risk.

Also applies to: 417-429

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/orm/src/client/executor/zenstack-query-executor.ts` around lines 376
- 386, Extract the duplicated per-model hook lookup into a private helper, such
as getModelHooks, and use it in both callBeforeMutationHooks and
callAfterMutationHooks. Keep the helper’s behavior equivalent to the existing
onEntityMutation Record lookup for mutationInfo.model.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 125-132: Update the hasEntityMutationPluginsWithAfterMutationHooks
getter to accept the mutationModel and check only that model’s per-model
afterEntityMutation hook, while preserving catch-all hook detection. Update the
needLoadAfterMutationEntities call site to pass the existing mutationModel,
preventing hooks registered for other models from triggering entity loading.
---
Nitpick comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 376-386: Extract the duplicated per-model hook lookup into a
private helper, such as getModelHooks, and use it in both
callBeforeMutationHooks and callAfterMutationHooks. Keep the helper’s behavior
equivalent to the existing onEntityMutation Record lookup for
mutationInfo.model.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts`:
- Around line 806-831: Add an outer execution flag to the “per-model hooks infer
correct entity types” test, set it inside User.afterEntityMutation after the
hook runs, and assert it after client.user.create completes. Keep the existing
entity type and email assertions unchanged.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: c7f981f2-b6a7-49fb-a7d5-79f609339101

📥 Commits

Reviewing files that changed from the base of the PR and between b83efad and ce01ceb.

📒 Files selected for processing (3)
  • packages/orm/src/client/executor/zenstack-query-executor.ts
  • packages/orm/src/client/plugin.ts
  • tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts

Comment threadpackages/orm/src/client/executor/zenstack-query-executor.ts
@genugenu changed the title feat(orm)!: Add typed typed mutation hooks Fixes #2365feat(orm)!: Add typed typed mutation hooks #2365Jul 22, 2026
@ymc9

ymc9 commented Aug 21, 2026

Copy link
Copy Markdown
Member

Hi @genu , my apologies for missing this PR. Looks good and I'll merge before the release of 3.10 since it's breaking.

Sign up for freeto 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.

Add type inference to loadBeforeMutationEntities and loadAfterMutationEntities

2 participants

@genu@ymc9
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(orm)!: Add typed typed mutation hooks #2365 - #2740

Open
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks
Open

feat(orm)!: Add typed typed mutation hooks #2365#2740
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks

Conversation

@genu

@genugenu commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

fixes: #2365

Summary by CodeRabbit

  • New Features

    • Added support for model-specific entity mutation hooks, with strongly typed loaded entities.
    • Model-specific hooks can run alongside catch-all hooks and receive the correct entity snapshots.
    • Per-model configuration for whether after-mutation hooks run inside or outside transactions.
  • Bug Fixes

    • Fixed mutation hook handling so model-specific hooks execute even when only per-model hooks are provided.
    • Improved scheduling so after-mutation hooks correctly follow in-transaction vs out-of-transaction behavior.
  • Breaking Changes

    • Catch-all entity mutation hooks must now be registered under onEntityMutation.$all.
  • Tests

    • Expanded E2E coverage for per-model mutation hooks and updated related regression tests.

@coderabbitai

coderabbitaiBot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

Changes

Entity mutation hooks

Layer / File(s)Summary
Model-scoped hook contracts
packages/orm/src/client/plugin.ts
Adds typed per-model before/after mutation hook arguments and extends EntityMutationHooksDef with model-specific hook definitions.
Hook detection and dispatch
packages/orm/src/client/executor/zenstack-query-executor.ts
Executes catch-all and model-specific hooks independently, including per-model transaction-scope resolution.
Hook registration updates
BREAKINGCHANGES.md, tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts, tests/regression/test/issue-586.test.ts
Moves catch-all hook registrations under onEntityMutation.$all.
Per-model hook behavior tests
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts
Covers model targeting, hook composition, before-entity propagation, and typed loaded entities.

Estimated code review effort: 3 (Moderate) | ~20 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title matches the main change: adding typed mutation hooks for ORM, and it is concise and specific.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

Comment @coderabbitai help to get the list of available commands.

@genu
genuforce-pushed the genu/typed-mutation-hooks branch from 3ebbffb to ce01cebCompareJuly 22, 2026 14:58
@genu
genu marked this pull request as ready for review July 22, 2026 15:00

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (2)
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts (1)

806-831: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Test can silently pass without executing any assertion.

All expect calls are inside afterEntityMutation; there's no outer check confirming the hook actually ran. If per-model after-hook dispatch regresses, this test would still pass with zero assertions executed.

✅ Proposed fix
 it('per-model hooks infer correct entity types', async () => {
+ expect.assertions(2);
const client = _client.$use({
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts` around lines 806 -
831, Add an outer execution flag to the “per-model hooks infer correct entity
types” test, set it inside User.afterEntityMutation after the hook runs, and
assert it after client.user.create completes. Keep the existing entity type and
email assertions unchanged.
packages/orm/src/client/executor/zenstack-query-executor.ts (1)

376-386: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Optional: extract shared per-model hook lookup.

The (onEntityMutation as Record<string, any>)[mutationInfo.model] lookup pattern is duplicated between callBeforeMutationHooks and callAfterMutationHooks. A small private helper (e.g. getModelHooks(onEntityMutation, model)) would remove the duplication, though the current repetition is small and low-risk.

Also applies to: 417-429

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/orm/src/client/executor/zenstack-query-executor.ts` around lines 376
- 386, Extract the duplicated per-model hook lookup into a private helper, such
as getModelHooks, and use it in both callBeforeMutationHooks and
callAfterMutationHooks. Keep the helper’s behavior equivalent to the existing
onEntityMutation Record lookup for mutationInfo.model.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 125-132: Update the hasEntityMutationPluginsWithAfterMutationHooks
getter to accept the mutationModel and check only that model’s per-model
afterEntityMutation hook, while preserving catch-all hook detection. Update the
needLoadAfterMutationEntities call site to pass the existing mutationModel,
preventing hooks registered for other models from triggering entity loading.
---
Nitpick comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 376-386: Extract the duplicated per-model hook lookup into a
private helper, such as getModelHooks, and use it in both
callBeforeMutationHooks and callAfterMutationHooks. Keep the helper’s behavior
equivalent to the existing onEntityMutation Record lookup for
mutationInfo.model.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts`:
- Around line 806-831: Add an outer execution flag to the “per-model hooks infer
correct entity types” test, set it inside User.afterEntityMutation after the
hook runs, and assert it after client.user.create completes. Keep the existing
entity type and email assertions unchanged.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: c7f981f2-b6a7-49fb-a7d5-79f609339101

📥 Commits

Reviewing files that changed from the base of the PR and between b83efad and ce01ceb.

📒 Files selected for processing (3)
  • packages/orm/src/client/executor/zenstack-query-executor.ts
  • packages/orm/src/client/plugin.ts
  • tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts

Comment threadpackages/orm/src/client/executor/zenstack-query-executor.ts
@genugenu changed the title feat(orm)!: Add typed typed mutation hooks Fixes #2365feat(orm)!: Add typed typed mutation hooks #2365Jul 22, 2026
@ymc9

ymc9 commented Aug 21, 2026

Copy link
Copy Markdown
Member

Hi @genu , my apologies for missing this PR. Looks good and I'll merge before the release of 3.10 since it's breaking.

Sign up for freeto 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.

Add type inference to loadBeforeMutationEntities and loadAfterMutationEntities

2 participants

@genu@ymc9
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(orm)!: Add typed typed mutation hooks #2365 - #2740

Open
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks
Open

feat(orm)!: Add typed typed mutation hooks #2365#2740
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks

Conversation

@genu

@genugenu commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

fixes: #2365

Summary by CodeRabbit

  • New Features

    • Added support for model-specific entity mutation hooks, with strongly typed loaded entities.
    • Model-specific hooks can run alongside catch-all hooks and receive the correct entity snapshots.
    • Per-model configuration for whether after-mutation hooks run inside or outside transactions.
  • Bug Fixes

    • Fixed mutation hook handling so model-specific hooks execute even when only per-model hooks are provided.
    • Improved scheduling so after-mutation hooks correctly follow in-transaction vs out-of-transaction behavior.
  • Breaking Changes

    • Catch-all entity mutation hooks must now be registered under onEntityMutation.$all.
  • Tests

    • Expanded E2E coverage for per-model mutation hooks and updated related regression tests.

@coderabbitai

coderabbitaiBot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

Changes

Entity mutation hooks

Layer / File(s)Summary
Model-scoped hook contracts
packages/orm/src/client/plugin.ts
Adds typed per-model before/after mutation hook arguments and extends EntityMutationHooksDef with model-specific hook definitions.
Hook detection and dispatch
packages/orm/src/client/executor/zenstack-query-executor.ts
Executes catch-all and model-specific hooks independently, including per-model transaction-scope resolution.
Hook registration updates
BREAKINGCHANGES.md, tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts, tests/regression/test/issue-586.test.ts
Moves catch-all hook registrations under onEntityMutation.$all.
Per-model hook behavior tests
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts
Covers model targeting, hook composition, before-entity propagation, and typed loaded entities.

Estimated code review effort: 3 (Moderate) | ~20 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title matches the main change: adding typed mutation hooks for ORM, and it is concise and specific.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

Comment @coderabbitai help to get the list of available commands.

@genu
genuforce-pushed the genu/typed-mutation-hooks branch from 3ebbffb to ce01cebCompareJuly 22, 2026 14:58
@genu
genu marked this pull request as ready for review July 22, 2026 15:00

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (2)
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts (1)

806-831: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Test can silently pass without executing any assertion.

All expect calls are inside afterEntityMutation; there's no outer check confirming the hook actually ran. If per-model after-hook dispatch regresses, this test would still pass with zero assertions executed.

✅ Proposed fix
 it('per-model hooks infer correct entity types', async () => {
+ expect.assertions(2);
const client = _client.$use({
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts` around lines 806 -
831, Add an outer execution flag to the “per-model hooks infer correct entity
types” test, set it inside User.afterEntityMutation after the hook runs, and
assert it after client.user.create completes. Keep the existing entity type and
email assertions unchanged.
packages/orm/src/client/executor/zenstack-query-executor.ts (1)

376-386: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Optional: extract shared per-model hook lookup.

The (onEntityMutation as Record<string, any>)[mutationInfo.model] lookup pattern is duplicated between callBeforeMutationHooks and callAfterMutationHooks. A small private helper (e.g. getModelHooks(onEntityMutation, model)) would remove the duplication, though the current repetition is small and low-risk.

Also applies to: 417-429

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/orm/src/client/executor/zenstack-query-executor.ts` around lines 376
- 386, Extract the duplicated per-model hook lookup into a private helper, such
as getModelHooks, and use it in both callBeforeMutationHooks and
callAfterMutationHooks. Keep the helper’s behavior equivalent to the existing
onEntityMutation Record lookup for mutationInfo.model.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 125-132: Update the hasEntityMutationPluginsWithAfterMutationHooks
getter to accept the mutationModel and check only that model’s per-model
afterEntityMutation hook, while preserving catch-all hook detection. Update the
needLoadAfterMutationEntities call site to pass the existing mutationModel,
preventing hooks registered for other models from triggering entity loading.
---
Nitpick comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 376-386: Extract the duplicated per-model hook lookup into a
private helper, such as getModelHooks, and use it in both
callBeforeMutationHooks and callAfterMutationHooks. Keep the helper’s behavior
equivalent to the existing onEntityMutation Record lookup for
mutationInfo.model.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts`:
- Around line 806-831: Add an outer execution flag to the “per-model hooks infer
correct entity types” test, set it inside User.afterEntityMutation after the
hook runs, and assert it after client.user.create completes. Keep the existing
entity type and email assertions unchanged.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: c7f981f2-b6a7-49fb-a7d5-79f609339101

📥 Commits

Reviewing files that changed from the base of the PR and between b83efad and ce01ceb.

📒 Files selected for processing (3)
  • packages/orm/src/client/executor/zenstack-query-executor.ts
  • packages/orm/src/client/plugin.ts
  • tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts

Comment threadpackages/orm/src/client/executor/zenstack-query-executor.ts
@genugenu changed the title feat(orm)!: Add typed typed mutation hooks Fixes #2365feat(orm)!: Add typed typed mutation hooks #2365Jul 22, 2026
@ymc9

ymc9 commented Aug 21, 2026

Copy link
Copy Markdown
Member

Hi @genu , my apologies for missing this PR. Looks good and I'll merge before the release of 3.10 since it's breaking.

Sign up for freeto 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.

Add type inference to loadBeforeMutationEntities and loadAfterMutationEntities

2 participants

@genu@ymc9
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

feat(orm)!: Add typed typed mutation hooks #2365 - #2740

Open
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks
Open

feat(orm)!: Add typed typed mutation hooks #2365#2740
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks

Conversation

@genu

@genugenu commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

fixes: #2365

Summary by CodeRabbit

  • New Features

    • Added support for model-specific entity mutation hooks, with strongly typed loaded entities.
    • Model-specific hooks can run alongside catch-all hooks and receive the correct entity snapshots.
    • Per-model configuration for whether after-mutation hooks run inside or outside transactions.
  • Bug Fixes

    • Fixed mutation hook handling so model-specific hooks execute even when only per-model hooks are provided.
    • Improved scheduling so after-mutation hooks correctly follow in-transaction vs out-of-transaction behavior.
  • Breaking Changes

    • Catch-all entity mutation hooks must now be registered under onEntityMutation.$all.
  • Tests

    • Expanded E2E coverage for per-model mutation hooks and updated related regression tests.

@coderabbitai

coderabbitaiBot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

Changes

Entity mutation hooks

Layer / File(s)Summary
Model-scoped hook contracts
packages/orm/src/client/plugin.ts
Adds typed per-model before/after mutation hook arguments and extends EntityMutationHooksDef with model-specific hook definitions.
Hook detection and dispatch
packages/orm/src/client/executor/zenstack-query-executor.ts
Executes catch-all and model-specific hooks independently, including per-model transaction-scope resolution.
Hook registration updates
BREAKINGCHANGES.md, tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts, tests/regression/test/issue-586.test.ts
Moves catch-all hook registrations under onEntityMutation.$all.
Per-model hook behavior tests
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts
Covers model targeting, hook composition, before-entity propagation, and typed loaded entities.

Estimated code review effort: 3 (Moderate) | ~20 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title matches the main change: adding typed mutation hooks for ORM, and it is concise and specific.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

Comment @coderabbitai help to get the list of available commands.

@genu
genuforce-pushed the genu/typed-mutation-hooks branch from 3ebbffb to ce01cebCompareJuly 22, 2026 14:58
@genu
genu marked this pull request as ready for review July 22, 2026 15:00

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (2)
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts (1)

806-831: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Test can silently pass without executing any assertion.

All expect calls are inside afterEntityMutation; there's no outer check confirming the hook actually ran. If per-model after-hook dispatch regresses, this test would still pass with zero assertions executed.

✅ Proposed fix
 it('per-model hooks infer correct entity types', async () => {
+ expect.assertions(2);
const client = _client.$use({
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts` around lines 806 -
831, Add an outer execution flag to the “per-model hooks infer correct entity
types” test, set it inside User.afterEntityMutation after the hook runs, and
assert it after client.user.create completes. Keep the existing entity type and
email assertions unchanged.
packages/orm/src/client/executor/zenstack-query-executor.ts (1)

376-386: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Optional: extract shared per-model hook lookup.

The (onEntityMutation as Record<string, any>)[mutationInfo.model] lookup pattern is duplicated between callBeforeMutationHooks and callAfterMutationHooks. A small private helper (e.g. getModelHooks(onEntityMutation, model)) would remove the duplication, though the current repetition is small and low-risk.

Also applies to: 417-429

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/orm/src/client/executor/zenstack-query-executor.ts` around lines 376
- 386, Extract the duplicated per-model hook lookup into a private helper, such
as getModelHooks, and use it in both callBeforeMutationHooks and
callAfterMutationHooks. Keep the helper’s behavior equivalent to the existing
onEntityMutation Record lookup for mutationInfo.model.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 125-132: Update the hasEntityMutationPluginsWithAfterMutationHooks
getter to accept the mutationModel and check only that model’s per-model
afterEntityMutation hook, while preserving catch-all hook detection. Update the
needLoadAfterMutationEntities call site to pass the existing mutationModel,
preventing hooks registered for other models from triggering entity loading.
---
Nitpick comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 376-386: Extract the duplicated per-model hook lookup into a
private helper, such as getModelHooks, and use it in both
callBeforeMutationHooks and callAfterMutationHooks. Keep the helper’s behavior
equivalent to the existing onEntityMutation Record lookup for
mutationInfo.model.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts`:
- Around line 806-831: Add an outer execution flag to the “per-model hooks infer
correct entity types” test, set it inside User.afterEntityMutation after the
hook runs, and assert it after client.user.create completes. Keep the existing
entity type and email assertions unchanged.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: c7f981f2-b6a7-49fb-a7d5-79f609339101

📥 Commits

Reviewing files that changed from the base of the PR and between b83efad and ce01ceb.

📒 Files selected for processing (3)
  • packages/orm/src/client/executor/zenstack-query-executor.ts
  • packages/orm/src/client/plugin.ts
  • tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts

Comment threadpackages/orm/src/client/executor/zenstack-query-executor.ts
@genugenu changed the title feat(orm)!: Add typed typed mutation hooks Fixes #2365feat(orm)!: Add typed typed mutation hooks #2365Jul 22, 2026
@ymc9

ymc9 commented Aug 21, 2026

Copy link
Copy Markdown
Member

Hi @genu , my apologies for missing this PR. Looks good and I'll merge before the release of 3.10 since it's breaking.

Sign up for freeto 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.

Add type inference to loadBeforeMutationEntities and loadAfterMutationEntities

2 participants

@genu@ymc9
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(orm)!: Add typed typed mutation hooks #2365 - #2740

Open
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks
Open

feat(orm)!: Add typed typed mutation hooks #2365#2740
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks

Conversation

@genu

@genugenu commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

fixes: #2365

Summary by CodeRabbit

  • New Features

    • Added support for model-specific entity mutation hooks, with strongly typed loaded entities.
    • Model-specific hooks can run alongside catch-all hooks and receive the correct entity snapshots.
    • Per-model configuration for whether after-mutation hooks run inside or outside transactions.
  • Bug Fixes

    • Fixed mutation hook handling so model-specific hooks execute even when only per-model hooks are provided.
    • Improved scheduling so after-mutation hooks correctly follow in-transaction vs out-of-transaction behavior.
  • Breaking Changes

    • Catch-all entity mutation hooks must now be registered under onEntityMutation.$all.
  • Tests

    • Expanded E2E coverage for per-model mutation hooks and updated related regression tests.

@coderabbitai

coderabbitaiBot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

Changes

Entity mutation hooks

Layer / File(s)Summary
Model-scoped hook contracts
packages/orm/src/client/plugin.ts
Adds typed per-model before/after mutation hook arguments and extends EntityMutationHooksDef with model-specific hook definitions.
Hook detection and dispatch
packages/orm/src/client/executor/zenstack-query-executor.ts
Executes catch-all and model-specific hooks independently, including per-model transaction-scope resolution.
Hook registration updates
BREAKINGCHANGES.md, tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts, tests/regression/test/issue-586.test.ts
Moves catch-all hook registrations under onEntityMutation.$all.
Per-model hook behavior tests
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts
Covers model targeting, hook composition, before-entity propagation, and typed loaded entities.

Estimated code review effort: 3 (Moderate) | ~20 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title matches the main change: adding typed mutation hooks for ORM, and it is concise and specific.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

Comment @coderabbitai help to get the list of available commands.

@genu
genuforce-pushed the genu/typed-mutation-hooks branch from 3ebbffb to ce01cebCompareJuly 22, 2026 14:58
@genu
genu marked this pull request as ready for review July 22, 2026 15:00

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (2)
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts (1)

806-831: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Test can silently pass without executing any assertion.

All expect calls are inside afterEntityMutation; there's no outer check confirming the hook actually ran. If per-model after-hook dispatch regresses, this test would still pass with zero assertions executed.

✅ Proposed fix
 it('per-model hooks infer correct entity types', async () => {
+ expect.assertions(2);
const client = _client.$use({
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts` around lines 806 -
831, Add an outer execution flag to the “per-model hooks infer correct entity
types” test, set it inside User.afterEntityMutation after the hook runs, and
assert it after client.user.create completes. Keep the existing entity type and
email assertions unchanged.
packages/orm/src/client/executor/zenstack-query-executor.ts (1)

376-386: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Optional: extract shared per-model hook lookup.

The (onEntityMutation as Record<string, any>)[mutationInfo.model] lookup pattern is duplicated between callBeforeMutationHooks and callAfterMutationHooks. A small private helper (e.g. getModelHooks(onEntityMutation, model)) would remove the duplication, though the current repetition is small and low-risk.

Also applies to: 417-429

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/orm/src/client/executor/zenstack-query-executor.ts` around lines 376
- 386, Extract the duplicated per-model hook lookup into a private helper, such
as getModelHooks, and use it in both callBeforeMutationHooks and
callAfterMutationHooks. Keep the helper’s behavior equivalent to the existing
onEntityMutation Record lookup for mutationInfo.model.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 125-132: Update the hasEntityMutationPluginsWithAfterMutationHooks
getter to accept the mutationModel and check only that model’s per-model
afterEntityMutation hook, while preserving catch-all hook detection. Update the
needLoadAfterMutationEntities call site to pass the existing mutationModel,
preventing hooks registered for other models from triggering entity loading.
---
Nitpick comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 376-386: Extract the duplicated per-model hook lookup into a
private helper, such as getModelHooks, and use it in both
callBeforeMutationHooks and callAfterMutationHooks. Keep the helper’s behavior
equivalent to the existing onEntityMutation Record lookup for
mutationInfo.model.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts`:
- Around line 806-831: Add an outer execution flag to the “per-model hooks infer
correct entity types” test, set it inside User.afterEntityMutation after the
hook runs, and assert it after client.user.create completes. Keep the existing
entity type and email assertions unchanged.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: c7f981f2-b6a7-49fb-a7d5-79f609339101

📥 Commits

Reviewing files that changed from the base of the PR and between b83efad and ce01ceb.

📒 Files selected for processing (3)
  • packages/orm/src/client/executor/zenstack-query-executor.ts
  • packages/orm/src/client/plugin.ts
  • tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts

Comment threadpackages/orm/src/client/executor/zenstack-query-executor.ts
@genugenu changed the title feat(orm)!: Add typed typed mutation hooks Fixes #2365feat(orm)!: Add typed typed mutation hooks #2365Jul 22, 2026
@ymc9

ymc9 commented Aug 21, 2026

Copy link
Copy Markdown
Member

Hi @genu , my apologies for missing this PR. Looks good and I'll merge before the release of 3.10 since it's breaking.

Sign up for freeto 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.

Add type inference to loadBeforeMutationEntities and loadAfterMutationEntities

2 participants

@genu@ymc9
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(orm)!: Add typed typed mutation hooks #2365 - #2740

Open
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks
Open

feat(orm)!: Add typed typed mutation hooks #2365#2740
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks

Conversation

@genu

@genugenu commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

fixes: #2365

Summary by CodeRabbit

  • New Features

    • Added support for model-specific entity mutation hooks, with strongly typed loaded entities.
    • Model-specific hooks can run alongside catch-all hooks and receive the correct entity snapshots.
    • Per-model configuration for whether after-mutation hooks run inside or outside transactions.
  • Bug Fixes

    • Fixed mutation hook handling so model-specific hooks execute even when only per-model hooks are provided.
    • Improved scheduling so after-mutation hooks correctly follow in-transaction vs out-of-transaction behavior.
  • Breaking Changes

    • Catch-all entity mutation hooks must now be registered under onEntityMutation.$all.
  • Tests

    • Expanded E2E coverage for per-model mutation hooks and updated related regression tests.

@coderabbitai

coderabbitaiBot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

Changes

Entity mutation hooks

Layer / File(s)Summary
Model-scoped hook contracts
packages/orm/src/client/plugin.ts
Adds typed per-model before/after mutation hook arguments and extends EntityMutationHooksDef with model-specific hook definitions.
Hook detection and dispatch
packages/orm/src/client/executor/zenstack-query-executor.ts
Executes catch-all and model-specific hooks independently, including per-model transaction-scope resolution.
Hook registration updates
BREAKINGCHANGES.md, tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts, tests/regression/test/issue-586.test.ts
Moves catch-all hook registrations under onEntityMutation.$all.
Per-model hook behavior tests
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts
Covers model targeting, hook composition, before-entity propagation, and typed loaded entities.

Estimated code review effort: 3 (Moderate) | ~20 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title matches the main change: adding typed mutation hooks for ORM, and it is concise and specific.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

Comment @coderabbitai help to get the list of available commands.

@genu
genuforce-pushed the genu/typed-mutation-hooks branch from 3ebbffb to ce01cebCompareJuly 22, 2026 14:58
@genu
genu marked this pull request as ready for review July 22, 2026 15:00

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (2)
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts (1)

806-831: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Test can silently pass without executing any assertion.

All expect calls are inside afterEntityMutation; there's no outer check confirming the hook actually ran. If per-model after-hook dispatch regresses, this test would still pass with zero assertions executed.

✅ Proposed fix
 it('per-model hooks infer correct entity types', async () => {
+ expect.assertions(2);
const client = _client.$use({
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts` around lines 806 -
831, Add an outer execution flag to the “per-model hooks infer correct entity
types” test, set it inside User.afterEntityMutation after the hook runs, and
assert it after client.user.create completes. Keep the existing entity type and
email assertions unchanged.
packages/orm/src/client/executor/zenstack-query-executor.ts (1)

376-386: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Optional: extract shared per-model hook lookup.

The (onEntityMutation as Record<string, any>)[mutationInfo.model] lookup pattern is duplicated between callBeforeMutationHooks and callAfterMutationHooks. A small private helper (e.g. getModelHooks(onEntityMutation, model)) would remove the duplication, though the current repetition is small and low-risk.

Also applies to: 417-429

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/orm/src/client/executor/zenstack-query-executor.ts` around lines 376
- 386, Extract the duplicated per-model hook lookup into a private helper, such
as getModelHooks, and use it in both callBeforeMutationHooks and
callAfterMutationHooks. Keep the helper’s behavior equivalent to the existing
onEntityMutation Record lookup for mutationInfo.model.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 125-132: Update the hasEntityMutationPluginsWithAfterMutationHooks
getter to accept the mutationModel and check only that model’s per-model
afterEntityMutation hook, while preserving catch-all hook detection. Update the
needLoadAfterMutationEntities call site to pass the existing mutationModel,
preventing hooks registered for other models from triggering entity loading.
---
Nitpick comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 376-386: Extract the duplicated per-model hook lookup into a
private helper, such as getModelHooks, and use it in both
callBeforeMutationHooks and callAfterMutationHooks. Keep the helper’s behavior
equivalent to the existing onEntityMutation Record lookup for
mutationInfo.model.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts`:
- Around line 806-831: Add an outer execution flag to the “per-model hooks infer
correct entity types” test, set it inside User.afterEntityMutation after the
hook runs, and assert it after client.user.create completes. Keep the existing
entity type and email assertions unchanged.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: c7f981f2-b6a7-49fb-a7d5-79f609339101

📥 Commits

Reviewing files that changed from the base of the PR and between b83efad and ce01ceb.

📒 Files selected for processing (3)
  • packages/orm/src/client/executor/zenstack-query-executor.ts
  • packages/orm/src/client/plugin.ts
  • tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts

Comment threadpackages/orm/src/client/executor/zenstack-query-executor.ts
@genugenu changed the title feat(orm)!: Add typed typed mutation hooks Fixes #2365feat(orm)!: Add typed typed mutation hooks #2365Jul 22, 2026
@ymc9

ymc9 commented Aug 21, 2026

Copy link
Copy Markdown
Member

Hi @genu , my apologies for missing this PR. Looks good and I'll merge before the release of 3.10 since it's breaking.

Sign up for freeto 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.

Add type inference to loadBeforeMutationEntities and loadAfterMutationEntities

2 participants

@genu@ymc9
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

feat(orm)!: Add typed typed mutation hooks #2365 - #2740

Open
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks
Open

feat(orm)!: Add typed typed mutation hooks #2365#2740
genu wants to merge 5 commits into
zenstackhq:devfrom
genu:genu/typed-mutation-hooks

Conversation

@genu

@genugenu commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

fixes: #2365

Summary by CodeRabbit

  • New Features

    • Added support for model-specific entity mutation hooks, with strongly typed loaded entities.
    • Model-specific hooks can run alongside catch-all hooks and receive the correct entity snapshots.
    • Per-model configuration for whether after-mutation hooks run inside or outside transactions.
  • Bug Fixes

    • Fixed mutation hook handling so model-specific hooks execute even when only per-model hooks are provided.
    • Improved scheduling so after-mutation hooks correctly follow in-transaction vs out-of-transaction behavior.
  • Breaking Changes

    • Catch-all entity mutation hooks must now be registered under onEntityMutation.$all.
  • Tests

    • Expanded E2E coverage for per-model mutation hooks and updated related regression tests.

@coderabbitai

coderabbitaiBot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

Changes

Entity mutation hooks

Layer / File(s)Summary
Model-scoped hook contracts
packages/orm/src/client/plugin.ts
Adds typed per-model before/after mutation hook arguments and extends EntityMutationHooksDef with model-specific hook definitions.
Hook detection and dispatch
packages/orm/src/client/executor/zenstack-query-executor.ts
Executes catch-all and model-specific hooks independently, including per-model transaction-scope resolution.
Hook registration updates
BREAKINGCHANGES.md, tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts, tests/regression/test/issue-586.test.ts
Moves catch-all hook registrations under onEntityMutation.$all.
Per-model hook behavior tests
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts
Covers model targeting, hook composition, before-entity propagation, and typed loaded entities.

Estimated code review effort: 3 (Moderate) | ~20 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Title check✅ PassedThe title matches the main change: adding typed mutation hooks for ORM, and it is concise and specific.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

Comment @coderabbitai help to get the list of available commands.

@genu
genuforce-pushed the genu/typed-mutation-hooks branch from 3ebbffb to ce01cebCompareJuly 22, 2026 14:58
@genu
genu marked this pull request as ready for review July 22, 2026 15:00

@coderabbitaicoderabbitaiBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (2)
tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts (1)

806-831: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Test can silently pass without executing any assertion.

All expect calls are inside afterEntityMutation; there's no outer check confirming the hook actually ran. If per-model after-hook dispatch regresses, this test would still pass with zero assertions executed.

✅ Proposed fix
 it('per-model hooks infer correct entity types', async () => {
+ expect.assertions(2);
const client = _client.$use({
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts` around lines 806 -
831, Add an outer execution flag to the “per-model hooks infer correct entity
types” test, set it inside User.afterEntityMutation after the hook runs, and
assert it after client.user.create completes. Keep the existing entity type and
email assertions unchanged.
packages/orm/src/client/executor/zenstack-query-executor.ts (1)

376-386: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Optional: extract shared per-model hook lookup.

The (onEntityMutation as Record<string, any>)[mutationInfo.model] lookup pattern is duplicated between callBeforeMutationHooks and callAfterMutationHooks. A small private helper (e.g. getModelHooks(onEntityMutation, model)) would remove the duplication, though the current repetition is small and low-risk.

Also applies to: 417-429

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/orm/src/client/executor/zenstack-query-executor.ts` around lines 376
- 386, Extract the duplicated per-model hook lookup into a private helper, such
as getModelHooks, and use it in both callBeforeMutationHooks and
callAfterMutationHooks. Keep the helper’s behavior equivalent to the existing
onEntityMutation Record lookup for mutationInfo.model.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 125-132: Update the hasEntityMutationPluginsWithAfterMutationHooks
getter to accept the mutationModel and check only that model’s per-model
afterEntityMutation hook, while preserving catch-all hook detection. Update the
needLoadAfterMutationEntities call site to pass the existing mutationModel,
preventing hooks registered for other models from triggering entity loading.
---
Nitpick comments:
In `@packages/orm/src/client/executor/zenstack-query-executor.ts`:
- Around line 376-386: Extract the duplicated per-model hook lookup into a
private helper, such as getModelHooks, and use it in both
callBeforeMutationHooks and callAfterMutationHooks. Keep the helper’s behavior
equivalent to the existing onEntityMutation Record lookup for
mutationInfo.model.
In `@tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts`:
- Around line 806-831: Add an outer execution flag to the “per-model hooks infer
correct entity types” test, set it inside User.afterEntityMutation after the
hook runs, and assert it after client.user.create completes. Keep the existing
entity type and email assertions unchanged.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: c7f981f2-b6a7-49fb-a7d5-79f609339101

📥 Commits

Reviewing files that changed from the base of the PR and between b83efad and ce01ceb.

📒 Files selected for processing (3)
  • packages/orm/src/client/executor/zenstack-query-executor.ts
  • packages/orm/src/client/plugin.ts
  • tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts

Comment threadpackages/orm/src/client/executor/zenstack-query-executor.ts
@genugenu changed the title feat(orm)!: Add typed typed mutation hooks Fixes #2365feat(orm)!: Add typed typed mutation hooks #2365Jul 22, 2026
@ymc9

ymc9 commented Aug 21, 2026

Copy link
Copy Markdown
Member

Hi @genu , my apologies for missing this PR. Looks good and I'll merge before the release of 3.10 since it's breaking.

Sign up for freeto 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.

Add type inference to loadBeforeMutationEntities and loadAfterMutationEntities

2 participants

@genu@ymc9