fix(server): inference fix for inputs with middleware #5017
Conversation
This file contains 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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
KATT
commented
Nov 9, 2023
Comment on lines
36
to
40
| type Input = AppRouterInputs['strWithMiddleware']; | ||
| // ^? | ||
| type Output = AppRouterOutputs['strWithMiddleware']; | ||
| expectTypeOf<Input>().toBeString(); | ||
| expectTypeOf<Output>().toBeString(); |
There was a problem hiding this comment.
This is the one that's failing
There was a problem hiding this comment.
I think this happens because of Overwrite<string, string> which results in the garbled nonsense you're seeing in the inferred type.
This part is obviously the culprit -- it needs some handling to only overwrite in cases that make sense. I might not have time to work on this right now or in the coming days but I'll try something tonight if I can
_input_in: UnsetMarker extends TNext['_input_in']
? TPrev['_input_in']
: Overwrite<TPrev['_input_in'], TNext['_input_in']>;
_input_out: UnsetMarker extends TNext['_input_out']
? TPrev['_input_out']
: Overwrite<TPrev['_input_out'], TNext['_input_out']>
There was a problem hiding this comment.
I think the proper solution would be a sane implementation of Overwrite that only does things you'd expect. Example pseudo:
Given A and B,
- If they are both objects, overwrite A's keys with B's keys
- If only A is object, return A
- If only B is object, return B
- If A extends any, return A
- If B extends any, return B
- Otherwise return never
But are there any other practical usecases for Overwrite?
EDIT: alternative pseudo:
- If they are both objects, overwrite A's keys with B
- If both extend any, return B
- Otherwise return the one that extends any, or if neither: never
There was a problem hiding this comment.
I think it makes more sense for an intuitive meaning of "Overwrite" so that key-wise overwrite happens when both are objects, and otherwise TWith just replaces TType entirely.
1 task
Overwrite<string,string> resulted in a mangled object type because the existing implementation iterated over the string type's keys (e.g. 'charCodeAt') This commit changes the implementation so that keys are only iterated and overwritten in the case of objects. Otherwise, a non-never TWith type will entirely replace TType, e.g. Overwrite<string, number> results in 'number'.
jussisaurio
force-pushed
the
inference-fix
branch
from
c9a489b
to
7dc04a7
Compare
renovate bot
added a commit
to ettorepuccetti/terrarossa
that referenced
this pull request
Nov 10, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@trpc/client](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`10.43.2` -> `10.43.3`](https://renovatebot.com/diffs/npm/@trpc%2fclient/10.43.2/10.43.3) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [@trpc/next](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`10.43.2` -> `10.43.3`](https://renovatebot.com/diffs/npm/@trpc%2fnext/10.43.2/10.43.3) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [@trpc/react-query](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`10.43.2` -> `10.43.3`](https://renovatebot.com/diffs/npm/@trpc%2freact-query/10.43.2/10.43.3) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [@trpc/server](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`10.43.2` -> `10.43.3`](https://renovatebot.com/diffs/npm/@trpc%2fserver/10.43.2/10.43.3) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>trpc/trpc (@​trpc/client)</summary> ### [`v10.43.3`](https://togithub.com/trpc/trpc/releases/tag/v10.43.3) [Compare Source](https://togithub.com/trpc/trpc/compare/v10.43.2...v10.43.3) #### What's Changed - fix(server): inference fix for inputs using primitives with middleware by [@​jussisaurio](https://togithub.com/jussisaurio) & [@​KATT](https://togithub.com/KATT) in [trpc/trpc#5017 #### New Contributors - [@​junya-ishibuchi](https://togithub.com/junya-ishibuchi) made their first contribution in [trpc/trpc#5023 **Full Changelog**: trpc/trpc@v10.43.2...v10.43.3 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 3am,before 9am" (UTC), Automerge - "after 3am,before 9am" (UTC). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/ettorepuccetti/terrarossa). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40Ni4wIiwidXBkYXRlZEluVmVyIjoiMzcuNDYuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate bot
added a commit
to dotkom/monoweb
that referenced
this pull request
Nov 13, 2023
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@trpc/client](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`^10.43.0` -> `^10.43.3`](https://renovatebot.com/diffs/npm/@trpc%2fclient/10.43.0/10.43.3) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [@trpc/next](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`^10.43.0` -> `^10.43.3`](https://renovatebot.com/diffs/npm/@trpc%2fnext/10.43.0/10.43.3) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [@trpc/react-query](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`^10.43.0` -> `^10.43.3`](https://renovatebot.com/diffs/npm/@trpc%2freact-query/10.43.0/10.43.3) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | | [@trpc/server](https://trpc.io) ([source](https://togithub.com/trpc/trpc)) | [`^10.43.0` -> `^10.43.3`](https://renovatebot.com/diffs/npm/@trpc%2fserver/10.43.0/10.43.3) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>trpc/trpc (@​trpc/client)</summary> ### [`v10.43.3`](https://togithub.com/trpc/trpc/releases/tag/v10.43.3) [Compare Source](https://togithub.com/trpc/trpc/compare/v10.43.2...v10.43.3) ##### What's Changed - fix(server): inference fix for inputs using primitives with middleware by [@​jussisaurio](https://togithub.com/jussisaurio) & [@​KATT](https://togithub.com/KATT) in [trpc/trpc#5017 ##### New Contributors - [@​junya-ishibuchi](https://togithub.com/junya-ishibuchi) made their first contribution in [trpc/trpc#5023 **Full Changelog**: trpc/trpc@v10.43.2...v10.43.3 ### [`v10.43.2`](https://togithub.com/trpc/trpc/releases/tag/v10.43.2) [Compare Source](https://togithub.com/trpc/trpc/compare/v10.43.1...v10.43.2) ##### What's Changed - fix(next): omit "fetch" from options by [@​withyellow](https://togithub.com/withyellow) in [trpc/trpc#5003 ##### New Contributors - [@​spirobel](https://togithub.com/spirobel) made their first contribution in [trpc/trpc#5007 - [@​AvaYnE2](https://togithub.com/AvaYnE2) made their first contribution in [trpc/trpc#4835 - [@​withyellow](https://togithub.com/withyellow) made their first contribution in [trpc/trpc#5003 **Full Changelog**: trpc/trpc@v10.43.1...v10.43.2 ### [`v10.43.1`](https://togithub.com/trpc/trpc/releases/tag/v10.43.1) [Compare Source](https://togithub.com/trpc/trpc/compare/v10.43.0...v10.43.1) ##### What's Changed - fix(server + client): incorrect inferred input type when using standalone middleware by [@​jussisaurio](https://togithub.com/jussisaurio) in [trpc/trpc#4973 - fix(server + client): fix some issues with inferring Record types as procedure outputs by [@​jussisaurio](https://togithub.com/jussisaurio) in [trpc/trpc#4986 ##### New Contributors - [@​MadaShindeInai](https://togithub.com/MadaShindeInai) made their first contribution in [trpc/trpc#4979 **Full Changelog**: trpc/trpc@v10.43.0...v10.43.1 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/dotkom/monoweb). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40Ni4wIiwidXBkYXRlZEluVmVyIjoiMzcuNDYuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
](https://renovatebot.com){kind=link}
1 task
jussisaurio
added a commit
that referenced
this pull request
Nov 14, 2023
3 tasks
jussisaurio
added a commit
that referenced
this pull request
Nov 15, 2023
KATT
added a commit
that referenced
this pull request
Nov 17, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Closes #
🎯 Changes
What changes are made in this PR? Is it a feature or a bug fix?
✅ Checklist