Skip to content

[express-serve-static-core] fix stack depth error on long path parameters #54151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
typescript-bot merged 2 commits into from
Jul 8, 2021
Merged

[express-serve-static-core] fix stack depth error on long path parameters #54151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fc8476
fallback to ParamsDictionary for long route parameters that cause sta…
DetachHead Jun 29, 2021
0f83c2c
rewrite GetRouteParameter to work on long paths https://github.com/De…
DetachHead Jul 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions types/express-serve-static-core/express-serve-static-core-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ app.get('/:foo/:bar(\\d:+)/:baz', req => {
req.params.quxx; // $ExpectType string
});

// long path parameters - https://github.com/DefinitelyTyped/DefinitelyTyped/pull/53513#issuecomment-870550063
app.get('/website-api/jobalarm/:jobalarmId/:subscriptionId/search', req => {
req.params.jobalarmId; // $ExpectType string
req.params.subscriptionId; // $ExpectType string
req.params.foo; // $ExpectError
});

// Query can be a custom type
app.get<{}, any, any, { q: string }>('/:foo', req => {
req.query.q; // $ExpectType string
Expand Down
25 changes: 15 additions & 10 deletions types/express-serve-static-core/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,28 @@ export type RequestHandlerParams<
| ErrorRequestHandler<P, ResBody, ReqBody, ReqQuery, Locals>
| Array<RequestHandler<P> | ErrorRequestHandler<P>>;

type GetRouteParameter<RouteAfterColon extends string> = RouteAfterColon extends `${infer Char}${infer Rest}`
? Char extends '/' | '-' | '.'
? ''
: `${Char}${GetRouteParameter<Rest>}`
: RouteAfterColon;
type RemoveTail<S extends string, Tail extends string> = S extends `${infer P}${Tail}` ? P : S;
type GetRouteParameter<S extends string> = RemoveTail<
RemoveTail<RemoveTail<S, `/${string}`>, `-${string}`>,
`.${string}`
>;

// prettier-ignore
export type RouteParameters<Route extends string> = string extends Route
? ParamsDictionary
: Route extends `${string}(${string}`
? ParamsDictionary //TODO: handling for regex parameters
: Route extends `${string}:${infer Rest}`
? (GetRouteParameter<Rest> extends `${infer ParamName}?`
? { [P in ParamName]?: string }
: { [P in GetRouteParameter<Rest>]: string }) &
(Rest extends `${GetRouteParameter<Rest>}${infer Next}` ? RouteParameters<Next> : unknown)
: { };
? (
GetRouteParameter<Rest> extends never
? ParamsDictionary
: GetRouteParameter<Rest> extends `${infer ParamName}?`
? { [P in ParamName]?: string }
: { [P in GetRouteParameter<Rest>]: string }
) &
(Rest extends `${GetRouteParameter<Rest>}${infer Next}`
? RouteParameters<Next> : unknown)
: {};

export interface IRouterMatcher<
T,
Expand Down