Skip to content

Commit 013f6cb

Browse files
gregjacobsgregjacobs
committed
In addition to unicode letter characters, also accept combining marks for URLs, emails, hashtags, and mentions
1 parent 819e009 commit 013f6cb

File tree

6 files changed

+82
-25
lines changed

6 files changed

+82
-25
lines changed

‎src/matcher/email-matcher.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Matcher } from "./matcher";
2-
import { alphaNumericCharsStr, getDomainNameStr } from "../regex-lib";
2+
import { alphaNumericAndMarksCharsStr, getDomainNameStr } from "../regex-lib";
33
import { tldRegex } from "./tld-regex";
44
import { EmailMatch } from "../match/email-match";
55
import { Match } from "../match/match";
@@ -23,10 +23,9 @@ export class EmailMatcher extends Matcher {
2323
* @property {RegExp} matcherRegex
2424
*/
2525
protected matcherRegex = (function() {
26-
var alphaNumericChars = alphaNumericCharsStr,
27-
specialCharacters = '!#$%&\'*+\\-\\/=?^_`{|}~',
26+
var specialCharacters = '!#$%&\'*+\\-\\/=?^_`{|}~',
2827
restrictedSpecialCharacters = '\\s"(),:;<>@\\[\\]',
29-
validCharacters = alphaNumericChars + specialCharacters,
28+
validCharacters = alphaNumericAndMarksCharsStr + specialCharacters,
3029
validRestrictedCharacters = validCharacters + restrictedSpecialCharacters,
3130
emailRegex = new RegExp( '(?:[' + validCharacters + '](?:[' + validCharacters + ']|\\.(?!\\.|@))*|\\"[' + validRestrictedCharacters + '.]+\\")@');
3231

‎src/matcher/hashtag-matcher.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Matcher, MatcherConfig } from "./matcher";
22
import { HashtagServices } from "../autolinker";
3-
import { alphaNumericCharsStr } from "../regex-lib";
3+
import { alphaNumericAndMarksCharsStr } from "../regex-lib";
44
import { HashtagMatch } from "../match/hashtag-match";
55
import { Match } from "../match/match";
66

@@ -29,7 +29,7 @@ export class HashtagMatcher extends Matcher {
2929
* @protected
3030
* @property {RegExp} matcherRegex
3131
*/
32-
protected matcherRegex = new RegExp( '#[_' + alphaNumericCharsStr + ']{1,139}', 'g' );
32+
protected matcherRegex = new RegExp( '#[_' + alphaNumericAndMarksCharsStr + ']{1,139}', 'g' );
3333

3434
/**
3535
* The regular expression to use to check the character before a username match to
@@ -40,7 +40,7 @@ export class HashtagMatcher extends Matcher {
4040
* @protected
4141
* @property {RegExp} nonWordCharRegex
4242
*/
43-
protected nonWordCharRegex = new RegExp( '[^' + alphaNumericCharsStr + ']' );
43+
protected nonWordCharRegex = new RegExp( '[^' + alphaNumericAndMarksCharsStr + ']' );
4444

4545

4646
/**

‎src/matcher/mention-matcher.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Matcher, MatcherConfig } from "./matcher";
2-
import { alphaNumericCharsStr } from "../regex-lib";
2+
import { alphaNumericAndMarksCharsStr } from "../regex-lib";
33
import { MentionServices } from "../autolinker";
44
import { MentionMatch } from "../match/mention-match";
55
import { Match } from "../match/match";
@@ -30,9 +30,9 @@ export class MentionMatcher extends Matcher {
3030
* @property {Object} matcherRegexes
3131
*/
3232
protected readonly matcherRegexes: {[key: string]: RegExp} = {
33-
'twitter': new RegExp( '@[_' + alphaNumericCharsStr + ']{1,20}', 'g' ),
34-
'instagram': new RegExp( '@[_.' + alphaNumericCharsStr + ']{1,50}', 'g' ),
35-
'soundcloud': new RegExp( '@[_.' + alphaNumericCharsStr + "\-" + ']{1,50}', 'g' )
33+
'twitter': new RegExp( '@[_' + alphaNumericAndMarksCharsStr + ']{1,20}', 'g' ),
34+
'instagram': new RegExp( '@[_.' + alphaNumericAndMarksCharsStr + ']{1,50}', 'g' ),
35+
'soundcloud': new RegExp( '@[_.' + alphaNumericAndMarksCharsStr + "\-" + ']{1,50}', 'g' )
3636
};
3737

3838
/**
@@ -44,7 +44,7 @@ export class MentionMatcher extends Matcher {
4444
* @private
4545
* @property {RegExp} nonWordCharRegex
4646
*/
47-
protected readonly nonWordCharRegex = new RegExp( '[^' + alphaNumericCharsStr + ']' );
47+
protected readonly nonWordCharRegex = new RegExp( '[^' + alphaNumericAndMarksCharsStr + ']' );
4848

4949

5050
/**

‎src/matcher/url-matcher.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Matcher, MatcherConfig } from "./matcher";
2-
import { alphaNumericCharsStr, getDomainNameStr } from "../regex-lib";
2+
import { alphaNumericCharsStr, alphaNumericAndMarksCharsStr, getDomainNameStr } from "../regex-lib";
33
import { StripPrefixConfig, UrlMatchTypeOptions } from "../autolinker";
44
import { tldRegex } from "./tld-regex";
55
import { UrlMatch } from "../match/url-match";
@@ -76,7 +76,7 @@ export class UrlMatcher extends Matcher {
7676

7777
// Allow optional path, query string, and hash anchor, not ending in the following characters: "?!:,.;"
7878
// http://blog.codinghorror.com/the-problem-with-urls/
79-
urlSuffixRegex = new RegExp( '[/?#](?:[' + alphaNumericCharsStr + '\\-+&@#/%=~_()|\'$*\\[\\]?!:,.;\u2713]*[' + alphaNumericCharsStr + '\\-+&@#/%=~_()|\'$*\\[\\]\u2713])?' );
79+
urlSuffixRegex = new RegExp( '[/?#](?:[' + alphaNumericAndMarksCharsStr + '\\-+&@#/%=~_()|\'$*\\[\\]?!:,.;\u2713]*[' + alphaNumericAndMarksCharsStr + '\\-+&@#/%=~_()|\'$*\\[\\]\u2713])?' );
8080

8181
return new RegExp( [
8282
'(?:', // parens to cover match for scheme (optional), and domain
@@ -123,7 +123,7 @@ export class UrlMatcher extends Matcher {
123123
* @protected
124124
* @type {RegExp} wordCharRegExp
125125
*/
126-
protected wordCharRegExp = new RegExp( '[' + alphaNumericCharsStr + ']' );
126+
protected wordCharRegExp = new RegExp( '[' + alphaNumericAndMarksCharsStr + ']' );
127127

128128

129129
/**
@@ -308,7 +308,7 @@ export class UrlMatcher extends Matcher {
308308
urlMatch = urlMatch.slice(offset);
309309
}
310310

311-
let re = new RegExp("^((.?\/\/)?[-." + alphaNumericCharsStr + "]*[-" + alphaNumericCharsStr + "]\\.[-" + alphaNumericCharsStr + "]+)");
311+
let re = new RegExp( "^((.?\/\/)?[-." + alphaNumericAndMarksCharsStr + "]*[-" + alphaNumericAndMarksCharsStr + "]\\.[-" + alphaNumericAndMarksCharsStr + "]+)" );
312312
let res = re.exec( urlMatch );
313313
if ( res === null ) {
314314
return -1;

‎src/regex-lib.ts

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* These would be the characters matched by unicode regex engines `\p{L}`
1616
* escape ("all letters").
1717
*
18-
* Taken from the XRegExp library: http://xregexp.com/
18+
* Taken from the XRegExp library: http://xregexp.com/ (thanks @https://github.com/slevithan)
1919
* Specifically: http://xregexp.com/v/3.2.0/xregexp-all.js, the 'Letter'
2020
* regex's bmp
2121
*
@@ -33,6 +33,43 @@
3333
export const alphaCharsStr = /A-Za-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16F1-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC/
3434
.source; // see note in above variable description
3535

36+
/**
37+
* The string form of a regular expression that would match all of the
38+
* combining mark characters in the unicode character set when placed in a
39+
* RegExp character class (`[]`).
40+
*
41+
* These would be the characters matched by unicode regex engines `\p{M}`
42+
* escape ("all marks").
43+
*
44+
* Taken from the XRegExp library: http://xregexp.com/ (thanks @https://github.com/slevithan)
45+
* Specifically: http://xregexp.com/v/3.2.0/xregexp-all.js, the 'Mark'
46+
* regex's bmp
47+
*
48+
* VERY IMPORTANT: This set of characters is defined inside of a Regular
49+
* Expression literal rather than a string literal to prevent UglifyJS from
50+
* compressing the unicode escape sequences into their actual unicode
51+
* characters. If Uglify compresses these into the unicode characters
52+
* themselves, this results in the error "Range out of order in character
53+
* class" when these characters are used inside of a Regular Expression
54+
* character class (`[]`). See usages of this const. Alternatively, we can set
55+
* the UglifyJS option `ascii_only` to true for the build, but that doesn't
56+
* help others who are pulling in Autolinker into their own build and running
57+
* UglifyJS themselves.
58+
*/
59+
export const marksStr = /\u0300-\u036F\u0483-\u0489\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7\u06E8\u06EA-\u06ED\u0711\u0730-\u074A\u07A6-\u07B0\u07EB-\u07F3\u0816-\u0819\u081B-\u0823\u0825-\u0827\u0829-\u082D\u0859-\u085B\u08D4-\u08E1\u08E3-\u0903\u093A-\u093C\u093E-\u094F\u0951-\u0957\u0962\u0963\u0981-\u0983\u09BC\u09BE-\u09C4\u09C7\u09C8\u09CB-\u09CD\u09D7\u09E2\u09E3\u0A01-\u0A03\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A70\u0A71\u0A75\u0A81-\u0A83\u0ABC\u0ABE-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AE2\u0AE3\u0B01-\u0B03\u0B3C\u0B3E-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B62\u0B63\u0B82\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD7\u0C00-\u0C03\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C62\u0C63\u0C81-\u0C83\u0CBC\u0CBE-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CE2\u0CE3\u0D01-\u0D03\u0D3E-\u0D44\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0D62\u0D63\u0D82\u0D83\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DF2\u0DF3\u0E31\u0E34-\u0E3A\u0E47-\u0E4E\u0EB1\u0EB4-\u0EB9\u0EBB\u0EBC\u0EC8-\u0ECD\u0F18\u0F19\u0F35\u0F37\u0F39\u0F3E\u0F3F\u0F71-\u0F84\u0F86\u0F87\u0F8D-\u0F97\u0F99-\u0FBC\u0FC6\u102B-\u103E\u1056-\u1059\u105E-\u1060\u1062-\u1064\u1067-\u106D\u1071-\u1074\u1082-\u108D\u108F\u109A-\u109D\u135D-\u135F\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17B4-\u17D3\u17DD\u180B-\u180D\u1885\u1886\u18A9\u1920-\u192B\u1930-\u193B\u1A17-\u1A1B\u1A55-\u1A5E\u1A60-\u1A7C\u1A7F\u1AB0-\u1ABE\u1B00-\u1B04\u1B34-\u1B44\u1B6B-\u1B73\u1B80-\u1B82\u1BA1-\u1BAD\u1BE6-\u1BF3\u1C24-\u1C37\u1CD0-\u1CD2\u1CD4-\u1CE8\u1CED\u1CF2-\u1CF4\u1CF8\u1CF9\u1DC0-\u1DF5\u1DFB-\u1DFF\u20D0-\u20F0\u2CEF-\u2CF1\u2D7F\u2DE0-\u2DFF\u302A-\u302F\u3099\u309A\uA66F-\uA672\uA674-\uA67D\uA69E\uA69F\uA6F0\uA6F1\uA802\uA806\uA80B\uA823-\uA827\uA880\uA881\uA8B4-\uA8C5\uA8E0-\uA8F1\uA926-\uA92D\uA947-\uA953\uA980-\uA983\uA9B3-\uA9C0\uA9E5\uAA29-\uAA36\uAA43\uAA4C\uAA4D\uAA7B-\uAA7D\uAAB0\uAAB2-\uAAB4\uAAB7\uAAB8\uAABE\uAABF\uAAC1\uAAEB-\uAAEF\uAAF5\uAAF6\uABE3-\uABEA\uABEC\uABED\uFB1E\uFE00-\uFE0F\uFE20-\uFE2F/
60+
.source; // see note in above variable description
61+
62+
/**
63+
* The string form of a regular expression that would match all of the
64+
* alphabetic ("letter") chars and combining marks in the unicode character set
65+
* when placed in a RegExp character class (`[]`). This includes all
66+
* international alphabetic characters.
67+
*
68+
* These would be the characters matched by unicode regex engines `\p{L}\p{M}`
69+
* escapes.
70+
*/
71+
export const alphaCharsAndMarksStr = alphaCharsStr + marksStr;
72+
3673
/**
3774
* The string form of a regular expression that would match all of the
3875
* decimal number chars in the unicode character set when placed in a RegExp
@@ -41,7 +78,7 @@ export const alphaCharsStr = /A-Za-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u0
4178
* These would be the characters matched by unicode regex engines `\p{Nd}`
4279
* escape ("all decimal numbers")
4380
*
44-
* Taken from the XRegExp library: http://xregexp.com/
81+
* Taken from the XRegExp library: http://xregexp.com/ (thanks @https://github.com/slevithan)
4582
* Specifically: http://xregexp.com/v/3.2.0/xregexp-all.js, the 'Decimal_Number'
4683
* regex's bmp
4784
*
@@ -61,20 +98,31 @@ export const decimalNumbersStr = /0-9\u0660-\u0669\u06F0-\u06F9\u07C0-\u07C9\u09
6198

6299
/**
63100
* The string form of a regular expression that would match all of the
64-
* letters and decimal number chars in the unicode character set when placed
65-
* in a RegExp character class (`[]`).
101+
* letters and decimal number chars in the unicode character set when placed in
102+
* a RegExp character class (`[]`).
103+
*
104+
* These would be the characters matched by unicode regex engines
105+
* `[\p{L}\p{Nd}]` escape ("all letters and decimal numbers")
106+
*/
107+
export const alphaNumericCharsStr = alphaCharsAndMarksStr + decimalNumbersStr;
108+
109+
/**
110+
* The string form of a regular expression that would match all of the
111+
* letters, combining marks, and decimal number chars in the unicode character
112+
* set when placed in a RegExp character class (`[]`).
66113
*
67-
* These would be the characters matched by unicode regex engines `[\p{L}\p{Nd}]`
68-
* escape ("all letters and decimal numbers")
114+
* These would be the characters matched by unicode regex engines
115+
* `[\p{L}\p{M}\p{Nd}]` escape ("all letters, combining marks, and decimal
116+
* numbers")
69117
*/
70-
export const alphaNumericCharsStr = alphaCharsStr + decimalNumbersStr;
118+
export const alphaNumericAndMarksCharsStr = alphaCharsAndMarksStr + decimalNumbersStr;
71119

72120

73121
// Simplified IP regular expression
74122
const ipStr = '(?:[' + decimalNumbersStr + ']{1,3}\\.){3}[' + decimalNumbersStr + ']{1,3}';
75123

76124
// Protected domain label which do not allow "-" character on the beginning and the end of a single label
77-
const domainLabelStr = '[' + alphaNumericCharsStr + '](?:[' + alphaNumericCharsStr + '\\-]{0,61}[' + alphaNumericCharsStr + '])?';
125+
const domainLabelStr = '[' + alphaNumericAndMarksCharsStr + '](?:[' + alphaNumericAndMarksCharsStr + '\\-]{0,61}[' + alphaNumericAndMarksCharsStr + '])?';
78126

79127
const getDomainLabelStr = (group: number) => {
80128
return '(?=(' + domainLabelStr + '))\\' + group;
@@ -93,4 +141,4 @@ export const getDomainNameStr = ( group: number ) => {
93141
* A regular expression to match domain names of a URL or email address.
94142
* Ex: 'google', 'yahoo', 'some-other-company', etc.
95143
*/
96-
export const domainNameRegex = new RegExp( '[' + alphaNumericCharsStr + '.\\-]*[' + alphaNumericCharsStr + '\\-]' );
144+
export const domainNameRegex = new RegExp( '[' + alphaNumericAndMarksCharsStr + '.\\-]*[' + alphaNumericAndMarksCharsStr + '\\-]' );

‎tests/matcher/url-matcher.spec.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ describe( "Autolinker.matcher.Url", function() {
124124
expect( othermatches.length ).toBe( 0 );
125125
});
126126

127+
127128
it( 'should match an address with multiple dots in path string', function() {
128129
var matches = matcher.parseMatches( 'https://gitlab.example.com/space/repo/compare/master...develop' );
129130
var othermatches = matcher.parseMatches( 'https://www.google.it/search?q=autolink.js&oq=autolink.js&aqs=chrome..69i57j0l4.5161j0j7&sourceid=chrome&ie=UTF-8' );
@@ -132,6 +133,15 @@ describe( "Autolinker.matcher.Url", function() {
132133
expect( othermatches.length ).toBe( 1 );
133134
});
134135

136+
137+
it( 'should match katakana with dakuten characters (symbol with combining mark - two unicode characters)', function() {
138+
var matches = matcher.parseMatches( 'https://website.com/files/name-ボ.pdf' );
139+
140+
expect( matches.length ).toBe( 1 );
141+
MatchChecker.expectUrlMatch( matches[ 0 ], 'https://website.com/files/name-ボ.pdf', 0 );
142+
} );
143+
144+
135145
describe( 'protocol-relative URLs', function() {
136146

137147
it( 'should match a protocol-relative URL at the beginning of the string', function() {

0 commit comments

Comments
 (0)