Skip to content

Commit

Permalink
feat(util): Add resolveBaseUrl function (#7918)
Browse files Browse the repository at this point in the history
  • Loading branch information
zharinov committed Dec 9, 2020
1 parent 2458285 commit d8df51f
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 0 deletions.
48 changes: 48 additions & 0 deletions lib/util/url.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { resolveBaseUrl } from './url';

describe('util/url', () => {
test.each([
['http://foo.io', '', 'http://foo.io'],
['http://foo.io/', '', 'http://foo.io'],
['http://foo.io', '/', 'http://foo.io/'],
['http://foo.io/', '/', 'http://foo.io/'],

['http://foo.io', '/aaa', 'http://foo.io/aaa'],
['http://foo.io', 'aaa', 'http://foo.io/aaa'],
['http://foo.io/', '/aaa', 'http://foo.io/aaa'],
['http://foo.io/', 'aaa', 'http://foo.io/aaa'],
['http://foo.io', '/aaa/', 'http://foo.io/aaa/'],
['http://foo.io', 'aaa/', 'http://foo.io/aaa/'],
['http://foo.io/', '/aaa/', 'http://foo.io/aaa/'],
['http://foo.io/', 'aaa/', 'http://foo.io/aaa/'],

['http://foo.io/aaa', '/bbb', 'http://foo.io/aaa/bbb'],
['http://foo.io/aaa', 'bbb', 'http://foo.io/aaa/bbb'],
['http://foo.io/aaa/', '/bbb', 'http://foo.io/aaa/bbb'],
['http://foo.io/aaa/', 'bbb', 'http://foo.io/aaa/bbb'],

['http://foo.io/aaa', '/bbb/', 'http://foo.io/aaa/bbb/'],
['http://foo.io/aaa', 'bbb/', 'http://foo.io/aaa/bbb/'],
['http://foo.io/aaa/', '/bbb/', 'http://foo.io/aaa/bbb/'],
['http://foo.io/aaa/', 'bbb/', 'http://foo.io/aaa/bbb/'],

['http://foo.io', 'http://bar.io/bbb', 'http://bar.io/bbb'],
['http://foo.io/', 'http://bar.io/bbb', 'http://bar.io/bbb'],
['http://foo.io/aaa', 'http://bar.io/bbb', 'http://bar.io/bbb'],
['http://foo.io/aaa/', 'http://bar.io/bbb', 'http://bar.io/bbb'],

['http://foo.io', 'http://bar.io/bbb/', 'http://bar.io/bbb/'],
['http://foo.io/', 'http://bar.io/bbb/', 'http://bar.io/bbb/'],
['http://foo.io/aaa', 'http://bar.io/bbb/', 'http://bar.io/bbb/'],
['http://foo.io/aaa/', 'http://bar.io/bbb/', 'http://bar.io/bbb/'],

['http://foo.io', 'aaa?bbb=z', 'http://foo.io/aaa?bbb=z'],
['http://foo.io', '/aaa?bbb=z', 'http://foo.io/aaa?bbb=z'],
['http://foo.io/', 'aaa?bbb=z', 'http://foo.io/aaa?bbb=z'],
['http://foo.io/', '/aaa?bbb=z', 'http://foo.io/aaa?bbb=z'],

['http://foo.io', 'aaa/?bbb=z', 'http://foo.io/aaa?bbb=z'],
])('%s + %s => %s', (baseUrl, x, result) => {
expect(resolveBaseUrl(baseUrl, x)).toBe(result);
});
});
16 changes: 16 additions & 0 deletions lib/util/url.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
import urlJoin from 'url-join';

export function ensureTrailingSlash(url: string): string {
return url.replace(/\/?$/, '/');
}

export function resolveBaseUrl(baseUrl: string, input: string | URL): string {
const inputString = input.toString();

let host;
let pathname;
try {
({ host, pathname } = new URL(inputString));
} catch (e) {
pathname = inputString;
}

return host ? inputString : urlJoin(baseUrl, pathname || '');
}

0 comments on commit d8df51f

Please sign in to comment.