Skip to content

fix: support UUIDs as per RFC spec (#50) #53

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
thetutlage merged 2 commits into from
Feb 25, 2022
Merged

fix: support UUIDs as per RFC spec (#50) #53

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
7716c57
fix: support UUIDs as per RFC spec (#50)
aikrom Feb 9, 2022
064d16b
fixed uuid match regex to check case insensitively
aikrom Feb 23, 2022
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
2 changes: 1 addition & 1 deletion adonis-typings/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ declare module '@ioc:Adonis/Core/Route' {
/**
* Enforce value to be formatted as uuid
*/
uuid(): { match: RegExp }
uuid(): { match: RegExp; cast: (value: string) => string }

/**
* Enforce value to be formatted as slug
Expand Down
7 changes: 5 additions & 2 deletions src/Router/Matchers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ export class RouteMatchers extends Macroable implements RouteMatchersContract {
/**
* Enforce value to be formatted as uuid
*/
public uuid(): { match: RegExp } {
return { match: /^[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/ }
public uuid(): { match: RegExp; cast: (value: string) => string } {
return {
match: /^[0-9a-zA-F]{8}-[0-9a-zA-F]{4}-[0-9a-zA-F]{4}-[0-9a-zA-F]{4}-[0-9a-zA-F]{12}$/,
cast: (value) => value.toLowerCase(),
Comment thread
aikrom marked this conversation as resolved.
}
}

/**
Expand Down