Add smart merging with match_on option
#234
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
skryukov
force-pushed
the
merge-strategies
branch
from
ab2ae71 to
6ee52a2
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR introduces a match_on option to enable smart merging on specific object keys when using merge, deep_merge, and deferred merge props. It updates the API surfaces, rendering logic, tests, and documentation to support generating a new matchPropsOn field in the Inertia response.
- Extend
merge,deep_merge, anddeferhelpers to accept amatch_onparameter. - Enhance the renderer to collect and output
matchPropsOnbased on provided keys. - Update specs, dummy controller, and docs to demonstrate and validate smart merging behavior.
Reviewed Changes
Copilot reviewed 10 out of 10 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| spec/inertia/rendering_spec.rb | Tests updated to expect match_on props and new matchPropsOn. |
| spec/dummy/app/controllers/inertia_render_test_controller.rb | Added examples of merge(match_on:) and defer(..., match_on:). |
| lib/inertia_rails/renderer.rb | Built all_merge_props, collected matchPropsOn, and adjusted existing merge logic. |
| lib/inertia_rails/merge_prop.rb | Added match_on attribute to MergeProp. |
| lib/inertia_rails/defer_prop.rb | Added match_on attribute to DeferProp. |
| lib/inertia_rails/inertia_rails.rb | Updated helper methods (merge, deep_merge, defer) to pass match_on. |
| lib/inertia_rails/generators/helper.rb | Renamed guess_typescript to uses_typescript?. |
| lib/inertia_rails/generators/controller_template_base.rb | Updated default for :typescript option to call uses_typescript?. |
| docs/guide/merging-props.md | Added documentation and examples for match_on. |
| docs/guide/deferred-props.md | Linked merging-props guide under “Combining with mergeable props.” |
bknoles
approved these changes
Jul 25, 2025
BrandonShar
approved these changes
Jul 27, 2025
| @@ -23,7 +23,7 @@ def guess_the_default_framework(package_json_path = DEFAULT_PACKAGE_PATH) | |||
| end | |||
| end | |||
|
|
|||
| def guess_typescript | |||
| def uses_typescript? | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See inertiajs/inertia-laravel#747 and inertiajs/inertia-laravel#732