Release v4.3.3 (#535)

* Fix parsing bugs with some special encoded URLs

* Email parse fix

Not for mailto

Author: nfrasser

packages/linkifyjs/src/parser.mjs

@@ -152,10 +152,6 @@ export function init({ groups }) {
 	tt(Email, tk.DOT, EmailDomainDot);
 	tt(Email, tk.HYPHEN, EmailDomainHyphen);
 
-	// Final possible email states
-	const EmailColon = tt(Email, tk.COLON); // URL followed by colon (potential port number here)
-	/*const EmailColonPort = */ ta(EmailColon, groups.numeric, mtk.Email); // URL followed by colon and port number
-
 	// Account for dots and hyphens. Hyphens are usually parts of domain names
 	// (but not TLDs)
 	const DomainHyphen = tt(Domain, tk.HYPHEN); // domain followed by hyphen
@@ -236,17 +232,19 @@ export function init({ groups }) {
 		// Continue not accepting for open brackets
 		tt(UrlNonaccept, OPEN, UrlOpen);
 
-		// Closing bracket component. This character WILL be included in the URL
-		tt(UrlOpen, CLOSE, Url);
-
-		// URL that beings with an opening bracket, followed by a symbols.
+		// URL that begins with an opening bracket, followed by a symbols.
 		// Note that the final state can still be `UrlOpen` (if the URL has a
 		// single opening bracket for some reason).
 		const UrlOpenQ = makeState(mtk.Url);
 		ta(UrlOpen, qsAccepting, UrlOpenQ);
 
 		const UrlOpenSyms = makeState(); // UrlOpen followed by some symbols it cannot end it
-		ta(UrlOpen, qsNonAccepting);
+		ta(UrlOpen, qsNonAccepting, UrlOpenSyms);
+
+		// Closing bracket component. This character WILL be included in the URL.
+		// Must come after qsNonAccepting (which includes all close-bracket tokens)
+		// so that CLOSE -> Url wins over CLOSE -> UrlOpenSyms.
+		tt(UrlOpen, CLOSE, Url);
 
 		// URL that begins with an opening bracket, followed by some symbols
 		ta(UrlOpenQ, qsAccepting, UrlOpenQ);

test/spec/linkifyjs/parser.test.mjs

@@ -332,6 +332,12 @@ const tests = [
 			'.',
 		],
 	],
+	[
+		'https://zh.wikipedia.org/wiki/%E7%B4%85_(%E5%BC%B5%E5%9C%8B%E6%A6%AE%E5%B0%88%E8%BC%AF)',
+		[Url],
+		['https://zh.wikipedia.org/wiki/%E7%B4%85_(%E5%BC%B5%E5%9C%8B%E6%A6%AE%E5%B0%88%E8%BC%AF)'],
+	],
+	['toto@example.com:123', [Email, Text], ['toto@example.com', ':123']],
 ];
 
 describe('linkifyjs/parser#run()', () => {