Skip to content

fix: detect query string / fragment directly after a domain #557

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
abhu85 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −2
Open

fix: detect query string / fragment directly after a domain #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions packages/linkifyjs/src/parser.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,15 @@ export function init({ groups }) {
tt(DomainDotTld, tk.SLASH, Url);
tt(DomainDotTldColonPort, tk.SLASH, Url);

// A query string or fragment may also follow the domain (or port) directly,
// without a path slash (e.g. `example.com?q=1`, `example.com#frag`). Mirror
// how the `Url` state treats these tokens: `?` is non-accepting (a trailing
// `?` is trimmed), `#` is accepting.
tt(DomainDotTld, tk.QUERY, UrlNonaccept);
tt(DomainDotTld, tk.POUND, Url);
tt(DomainDotTldColonPort, tk.QUERY, UrlNonaccept);
tt(DomainDotTldColonPort, tk.POUND, Url);

// Note that domains that begin with schemes are treated slighly differently
const SchemeColon = tt(Scheme, tk.COLON); // e.g., 'mailto:'
const SlashSchemeColon = tt(SlashScheme, tk.COLON); // e.g., 'http:'
Expand Down
11 changes: 9 additions & 2 deletions test/spec/linkifyjs/parser.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ const tests = [
['google.com', [Url], ['google.com']],
['I like google.com the most', [Text, Url, Text], ['I like ', 'google.com', ' the most']],
['I like Google.com the most', [Text, Url, Text], ['I like ', 'Google.com', ' the most']],
// Query string / fragment directly after the domain (no path slash) (#516)
['example.com?foo=bar', [Url], ['example.com?foo=bar']],
['example.com?a=1&b=2', [Url], ['example.com?a=1&b=2']],
['example.com:8080?x=1', [Url], ['example.com:8080?x=1']],
['example.com#section', [Url], ['example.com#section']],
// A trailing `?` is sentence punctuation, not a query string, so it is trimmed
['have you seen example.com?', [Text, Url, Text], ['have you seen ', 'example.com', '?']],
[
'there are two tests, brennan.com and nick.ca -- do they work?',
[Text, Url, Text, Url, Text],
Expand Down Expand Up @@ -75,8 +82,8 @@ const tests = [
' ',
'goo.gl/0192n1',
' ',
'google.com',
'?q=asda test ',
'google.com?q=asda',
' test ',
'bit.ly/0912j',
' ',
'www.bob.com',
Expand Down