Skip to content

Optional paths #1128

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Optional paths #1128

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c858c3
fix: url pattern build to handle optional paths
IncognitaDev Apr 10, 2025
a19a629
fix: optional path ranking
IncognitaDev Apr 10, 2025
2a524c8
Merge branch 'optional-path-rank' into optional-paths
IncognitaDev Apr 10, 2025
c037c94
fix: url pattern search fallback
IncognitaDev Apr 29, 2025
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
22 changes: 16 additions & 6 deletions website/handlers/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ const rankRoute = (pattern: string): number =>
pattern
.split("/")
.reduce((acc, routePart) => {
if (routePart.startsWith("}?")) {
if (routePart.includes("*")) {
return acc - 2;
}
return acc - 1;
}
if (routePart === "*") {
return acc;
}
Expand Down Expand Up @@ -79,17 +85,20 @@ export const router = (
}
for (const { pathTemplate: routePath, handler } of routes) {
const pattern = urlPatternCache[routePath] ??= (() => {
let url;
if (URL.canParse(routePath)) {
url = new URL(routePath);
} else {
url = new URL(routePath, "http://localhost:8000");
return new URLPattern(routePath);
}
const patternWithDefaultOrigin = new URLPattern(
routePath,
"http://localhost:8000",
);

return new URLPattern({
pathname: url.pathname,
...(url.search ? { search: url.search } : {}),
pathname: patternWithDefaultOrigin.pathname,
search: patternWithDefaultOrigin.search || "*",
});
})();

const res = pattern.exec(req.url);
const groups = res?.pathname.groups ?? {};
if (res !== null) {
Expand Down Expand Up @@ -151,6 +160,7 @@ const prepareRoutes = (audiences: Routes[], ctx: AppContext) => {
((highPriorityA ? HIGH_PRIORITY_ROUTE_RANK_BASE_VALUE : 0) +
rankRoute(routeStringA))
);

return {
routes: builtRoutes.map((route) => ({
pathTemplate: route[0],
Expand Down
Loading