Path types #16
Merged
Path types #16
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
pleek91
commented
Dec 17, 2023
Comment on lines
+61
to
64
| ? TPath['params'] | ||
| : TPath extends string | ||
| ? ExtractParamsFromPathString<UnifyParamEnds<TPath>> | ||
| ? Path<TPath, {}>['params'] | ||
| : never |
There was a problem hiding this comment.
Here is where you can see rather than extracting param types it just accepts what Path returns for the params type.
pleek91
commented
Dec 17, 2023
| TPath extends string | ||
| > = ReplaceAll<ReplaceAll<TPath, '-', ParamEnd>, '_', ParamEnd> | ||
|
|
||
| export type ExtractParamsFromPathString< | ||
| TPath extends string, | ||
| TParams extends Record<string, Param> = Record<never, never> | ||
| TParams extends Record<string, Param | undefined> = Record<never, never> |
There was a problem hiding this comment.
These | undefined additions just account for the user defined param types being an optional record which adds | undefined to every property.
pleek91
commented
Dec 17, 2023
| @@ -11,7 +11,7 @@ export type Path< | |||
| P extends PathParams<T> = any | |||
| > = { | |||
| path: T, | |||
| params: P, | |||
| params: Identity<ExtractParamsFromPathString<T, P>>, | |||
There was a problem hiding this comment.
Here's the implementation of path params. Essentially just moving the ExtractParamsFromPathString type here rather than using it in the route method types.
pleek91
commented
Dec 17, 2023
Comment on lines
+75
to
+79
| > = UnifyParamEnds<TPath> extends `${infer Path}${ParamEnd}` | ||
| ? ExtractParamsFromPathString<Path, TParams> | ||
| : TPath extends `${string}:${infer Param}${ParamEnd}${infer Rest}` | ||
| : UnifyParamEnds<TPath> extends `${string}:${infer Param}${ParamEnd}${infer Rest}` | ||
| ? MergeParams<{ [P in ExtractParamName<Param>]: ExtractPathParamType<Param, TParams> }, ExtractParamsFromPathString<Rest, TParams>> | ||
| : TPath extends `${string}:${infer Param}` | ||
| : UnifyParamEnds<TPath> extends `${string}:${infer Param}` |
There was a problem hiding this comment.
I moved wrapping the path in UnifyParamEnds into this type so that we don't have to remember wrap any path string we pass into this type in it.
stackoverfloweth
approved these changes
Dec 18, 2023
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.
Description
Path originally just returned the same types as its arguments. Which was never really correct but allowed for all the other types to be written. Implementing the type path should actually return by having all route method types use Path and having Path be responsible for extracting param types.