Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/angular/ssr/src/routes/ng-routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ export async function extractRoutesAndCreateRouteTree(
}

const fullRoute = joinUrlParts(baseHref, route);
routeTree.insert(fullRoute.replace(URL_PARAMETER_REGEXP, '*'), metadata);
routeTree.insert(fullRoute, metadata);
}

return {
Expand Down
4 changes: 3 additions & 1 deletion packages/angular/ssr/src/routes/route-tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ export class RouteTree<AdditionalMetadata extends Record<string, unknown> = {}>
insert(route: string, metadata: RouteTreeNodeMetadataWithoutRoute & AdditionalMetadata): void {
let node = this.root;
const segments = this.getPathSegments(route);
const normalizedSegments: string[] = [];

for (const segment of segments) {
// Replace parameterized segments (e.g., :id) with a wildcard (*) for matching
Expand All @@ -143,12 +144,13 @@ export class RouteTree<AdditionalMetadata extends Record<string, unknown> = {}>
}

node = childNode;
normalizedSegments.push(normalizedSegment);
}

// At the leaf node, store the full route and its associated metadata
node.metadata = {
...metadata,
route: segments.join('/'),
route: normalizedSegments.join('/'),
};

node.insertionIndex = this.insertionIndexCounter++;
Expand Down
18 changes: 9 additions & 9 deletions packages/angular/ssr/test/routes/route-tree_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('RouteTree', () => {
expect(routeTreeObj).toEqual([
{ redirectTo: '/home-page', route: '/home', renderMode: RenderMode.Server },
{ redirectTo: '/about-page', route: '/about', renderMode: RenderMode.Server },
{ route: '/products/:id', renderMode: RenderMode.Server },
{ route: '/products/*', renderMode: RenderMode.Server },
{ redirectTo: '/api/details-page', route: '/api/details', renderMode: RenderMode.Server },
]);

Expand All @@ -46,7 +46,7 @@ describe('RouteTree', () => {
renderMode: RenderMode.Server,
});
expect(newRouteTree.match('/products/123')).toEqual({
route: '/products/:id',
route: '/products/*',
renderMode: RenderMode.Server,
});
expect(newRouteTree.match('/api/details')).toEqual({
Expand All @@ -71,7 +71,7 @@ describe('RouteTree', () => {

expect(newRouteTree.match('/shop/categories/electronics/products/123')).toEqual({
redirectTo: '/shop/products',
route: '/shop/categories/:category/products/:id',
route: '/shop/categories/*/products/*',
renderMode: RenderMode.Server,
});
expect(newRouteTree.match('/shop/cart')).toEqual({
Expand Down Expand Up @@ -127,7 +127,7 @@ describe('RouteTree', () => {
const routeTreeObj = routeTree.toObject();
expect(routeTreeObj).toEqual([
{ route: '/first', renderMode: RenderMode.Server },
{ route: '/:id', renderMode: RenderMode.Server },
{ route: '/*', renderMode: RenderMode.Server },
{ route: '/second', renderMode: RenderMode.Server },
]);

Expand All @@ -137,11 +137,11 @@ describe('RouteTree', () => {
renderMode: RenderMode.Server,
});
expect(newRouteTree.match('/second')).toEqual({
route: '/:id',
route: '/*',
renderMode: RenderMode.Server,
});
expect(newRouteTree.match('/third')).toEqual({
route: '/:id',
route: '/*',
renderMode: RenderMode.Server,
});
});
Expand Down Expand Up @@ -217,7 +217,7 @@ describe('RouteTree', () => {
it('should handle parameterized segments as wildcards', () => {
routeTree.insert('/users/:id', { renderMode: RenderMode.Server });
expect(routeTree.match('/users/123')).toEqual({
route: '/users/:id',
route: '/users/*',
renderMode: RenderMode.Server,
});
});
Expand All @@ -229,11 +229,11 @@ describe('RouteTree', () => {
});

expect(routeTree.match('/shop/categories/electronics')).toEqual({
route: '/shop/categories/:category',
route: '/shop/categories/*',
renderMode: RenderMode.Server,
});
expect(routeTree.match('/shop/categories/electronics/products/456')).toEqual({
route: '/shop/categories/:category/products/:id',
route: '/shop/categories/*/products/*',
renderMode: RenderMode.Server,
});
});
Expand Down