Skip to content

Commit

Permalink
Preserve final base hash in resolved urls.
Browse files Browse the repository at this point in the history
  • Loading branch information
edoardocavazza committed Apr 5, 2024
1 parent 29d027c commit b739ae5
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .changeset/funny-chairs-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@chialab/synapse": patch
---

Preserve final base hash in resolved urls.
2 changes: 1 addition & 1 deletion src/Router/Router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ export class Router extends Emitter<{
return url.href;
}

return `${url.pathname}${url.search}${url.hash}`;
return `${url.pathname}${url.search}${url.hash || (this.base.endsWith('#') ? '#' : '')}`;
}

/**
Expand Down
11 changes: 11 additions & 0 deletions test/Router.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,17 @@ describe('Router', () => {
expect(new Router({ origin: 'http://local', base: '/base' }).resolve('/test?query')).toBe('/base/test?query');
});

test('should resolve a path with base hash', () => {
expect(new Router({ origin: 'http://local', base: '/base#' }).resolve('')).toBe('/base#');
expect(new Router({ origin: 'http://local', base: '/base#' }).resolve('/')).toBe('/base#');
expect(new Router({ origin: 'http://local', base: '/base#' }).resolve('test')).toBe('/base#/test');
expect(new Router({ origin: 'http://local', base: '/base#' }).resolve('/test')).toBe('/base#/test');
expect(new Router({ origin: 'http://local', base: '/base#' }).resolve('test/')).toBe('/base#/test');
expect(new Router({ origin: 'http://local', base: '/base#' }).resolve('/test/')).toBe('/base#/test');
expect(new Router({ origin: 'http://local', base: '/base#' }).resolve('//test//')).toBe('/base#/test');
expect(new Router({ origin: 'http://local', base: '/base#' }).resolve('/test?query')).toBe('/base#/test?query');
});

test('should navigate', async () => {
const router = new Router(
{
Expand Down

0 comments on commit b739ae5

Please sign in to comment.