Fix email labels with final digits

Related to micromark/micromark-extension-gfm-autolink-literal#7. Related to remarkjs/remark#862. Closes GH-5. Co-authored-by: Rich Trott <[email protected]>
syntax-tree · Sep 24, 2021 · 7555d45 · 7555d45
1 parent e38f737
commit 7555d45
Show file tree

Hide file tree

Showing 3 changed files with 122 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -153,8 +153,12 @@ function findUrl(_, protocol, domain, path, match) {
  * @param {RegExpMatchObject} match
  */
 function findEmail(_, atext, label, match) {
-  // Not an expected previous character.
-  if (!previous(match, true) || /[_-]$/.test(label)) {
+  if (
+    // Not an expected previous character.
+    !previous(match, true) ||
+    // Label ends in not allowed character.
+    /[_-\d]$/.test(label)
+  ) {
     return false
   }
 

diff --git a/test/email-tld-digits.html b/test/email-tld-digits.html
@@ -0,0 +1,39 @@
+<p>[email protected]</p>
+<p><a href="mailto:[email protected]">[email protected]</a></p>
+<p>[email protected]</p>
+<p><a href="mailto:[email protected]">[email protected]</a></p>
+<p><a href="mailto:[email protected]">[email protected]</a></p>
+<p>[email protected]</p>
+<p>[email protected]</p>
+<p>[email protected]</p>
+<p>[email protected]</p>
+<p>[email protected]</p>
+<p>[ [email protected]</p>
+<p>[ [email protected]</p>
+<p>[ [email protected]</p>
+<p>[ [email protected]</p>
+<p>[ [email protected]</p>
+<hr>
+<p>react@a</p>
+<p>react@1</p>
+<p><a href="mailto:[email protected]">[email protected]</a></p>
+<p>[email protected]</p>
+<p><a href="mailto:[email protected]">[email protected]</a></p>
+<p><a href="mailto:[email protected]">[email protected]</a></p>
+<p><a href="mailto:[email protected]">[email protected]</a></p>
+<p><a href="mailto:[email protected]">[email protected]</a></p>
+<p>[email protected]</p>
+<p><a href="mailto:[email protected]">[email protected]</a></p>
+<p>[email protected]</p>
+<hr>
+<p>[ react@a</p>
+<p>[ react@1</p>
+<p>[ <a href="mailto:[email protected]">[email protected]</a></p>
+<p>[ [email protected]</p>
+<p>[ <a href="mailto:[email protected]">[email protected]</a></p>
+<p>[ <a href="mailto:[email protected]">[email protected]</a></p>
+<p>[ <a href="mailto:[email protected]">[email protected]</a></p>
+<p>[ <a href="mailto:[email protected]">[email protected]</a></p>
+<p>[ [email protected]</p>
+<p>[ <a href="mailto:[email protected]">[email protected]</a></p>
+<p>[ [email protected]</p>
diff --git a/test/email-tld-digits.md b/test/email-tld-digits.md
@@ -0,0 +1,77 @@
+[email protected]
+
+[email protected]
+
+[email protected]
+
+[email protected]
+
+[email protected]
+
+[email protected]
+
+[email protected]
+
+[email protected]
+
+[email protected]
+
+[email protected]
+
+[ [email protected]
+
+[ [email protected]
+
+[ [email protected]
+
+[ [email protected]
+
+[ [email protected]
+
+---
+
+react@a
+
+react@1
+
+[email protected]
+
+[email protected]
+
+[email protected]
+
+[email protected]1b
+
+[email protected]
+
+[email protected]
+
+[email protected]
+
+[email protected]
+
+[email protected]1
+
+---
+
+[ react@a
+
+[ react@1
+
+[ [email protected]
+
+[ [email protected]
+
+[ [email protected]
+
+[ [email protected]1b
+
+[ [email protected]
+
+[ [email protected]
+
+[ [email protected]
+
+[ [email protected]
+
+[ [email protected]1