Replace use of startsWith and endsWith with regex

fix markedjs#1876
jhildenbiddle · Dec 14, 2020 · 06eec11 · 06eec11
1 parent 68af334
commit 06eec11
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/lib/marked.esm.js b/lib/marked.esm.js
@@ -438,11 +438,11 @@ var Tokenizer_1 = class Tokenizer {
       let text = cap[2].trim();
 
       // remove trailing #s
-      if (text.endsWith('#')) {
+      if (/#$/.test(text)) {
         const trimmed = rtrim$1(text, '#');
         if (this.options.pedantic) {
           text = trimmed.trim();
-        } else if (!trimmed || trimmed.endsWith(' ')) {
+        } else if (!trimmed || / $/.test(trimmed)) {
           // CommonMark requires space before trailing #s
           text = trimmed.trim();
         }
@@ -785,9 +785,9 @@ var Tokenizer_1 = class Tokenizer {
     const cap = this.rules.inline.link.exec(src);
     if (cap) {
       const trimmedUrl = cap[2].trim();
-      if (!this.options.pedantic && trimmedUrl.startsWith('<')) {
+      if (!this.options.pedantic && /^</.test(trimmedUrl)) {
         // commonmark requires matching angle brackets
-        if (!trimmedUrl.endsWith('>')) {
+        if (!(/>$/.test(trimmedUrl))) {
           return;
         }
 
@@ -822,8 +822,8 @@ var Tokenizer_1 = class Tokenizer {
       }
 
       href = href.trim();
-      if (href.startsWith('<')) {
-        if (this.options.pedantic && !trimmedUrl.endsWith('>')) {
+      if (/^</.test(href)) {
+        if (this.options.pedantic && !(/>$/.test(trimmedUrl))) {
           // pedantic allows starting angle bracket without ending angle bracket
           href = href.slice(1);
         } else {
@@ -906,7 +906,7 @@ var Tokenizer_1 = class Tokenizer {
     if (cap) {
       let text = cap[2].replace(/\n/g, ' ');
       const hasNonSpaceChars = /[^ ]/.test(text);
-      const hasSpaceCharsOnBothEnds = text.startsWith(' ') && text.endsWith(' ');
+      const hasSpaceCharsOnBothEnds = /^ /.test(text) && / $/.test(text);
       if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) {
         text = text.substring(1, text.length - 1);
       }

diff --git a/lib/marked.js b/lib/marked.js
@@ -534,12 +534,12 @@
       if (cap) {
         var text = cap[2].trim(); // remove trailing #s
 
-        if (text.endsWith('#')) {
+        if (/#$/.test(text)) {
           var trimmed = rtrim$1(text, '#');
 
           if (this.options.pedantic) {
             text = trimmed.trim();
-          } else if (!trimmed || trimmed.endsWith(' ')) {
+          } else if (!trimmed || / $/.test(trimmed)) {
             // CommonMark requires space before trailing #s
             text = trimmed.trim();
           }
@@ -879,9 +879,9 @@
       if (cap) {
         var trimmedUrl = cap[2].trim();
 
-        if (!this.options.pedantic && trimmedUrl.startsWith('<')) {
+        if (!this.options.pedantic && /^</.test(trimmedUrl)) {
           // commonmark requires matching angle brackets
-          if (!trimmedUrl.endsWith('>')) {
+          if (!/>$/.test(trimmedUrl)) {
             return;
           } // ending angle bracket cannot be escaped
 
@@ -921,8 +921,8 @@
 
         href = href.trim();
 
-        if (href.startsWith('<')) {
-          if (this.options.pedantic && !trimmedUrl.endsWith('>')) {
+        if (/^</.test(href)) {
+          if (this.options.pedantic && !/>$/.test(trimmedUrl)) {
             // pedantic allows starting angle bracket without ending angle bracket
             href = href.slice(1);
           } else {
@@ -1017,7 +1017,7 @@
       if (cap) {
         var text = cap[2].replace(/\n/g, ' ');
         var hasNonSpaceChars = /[^ ]/.test(text);
-        var hasSpaceCharsOnBothEnds = text.startsWith(' ') && text.endsWith(' ');
+        var hasSpaceCharsOnBothEnds = /^ /.test(text) && / $/.test(text);
 
         if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) {
           text = text.substring(1, text.length - 1);

diff --git a/marked.min.js b/marked.min.js
diff --git a/src/Tokenizer.js b/src/Tokenizer.js
@@ -124,11 +124,11 @@ module.exports = class Tokenizer {
       let text = cap[2].trim();
 
       // remove trailing #s
-      if (text.endsWith('#')) {
+      if (/#$/.test(text)) {
         const trimmed = rtrim(text, '#');
         if (this.options.pedantic) {
           text = trimmed.trim();
-        } else if (!trimmed || trimmed.endsWith(' ')) {
+        } else if (!trimmed || / $/.test(trimmed)) {
           // CommonMark requires space before trailing #s
           text = trimmed.trim();
         }
@@ -471,9 +471,9 @@ module.exports = class Tokenizer {
     const cap = this.rules.inline.link.exec(src);
     if (cap) {
       const trimmedUrl = cap[2].trim();
-      if (!this.options.pedantic && trimmedUrl.startsWith('<')) {
+      if (!this.options.pedantic && /^</.test(trimmedUrl)) {
         // commonmark requires matching angle brackets
-        if (!trimmedUrl.endsWith('>')) {
+        if (!(/>$/.test(trimmedUrl))) {
           return;
         }
 
@@ -508,8 +508,8 @@ module.exports = class Tokenizer {
       }
 
       href = href.trim();
-      if (href.startsWith('<')) {
-        if (this.options.pedantic && !trimmedUrl.endsWith('>')) {
+      if (/^</.test(href)) {
+        if (this.options.pedantic && !(/>$/.test(trimmedUrl))) {
           // pedantic allows starting angle bracket without ending angle bracket
           href = href.slice(1);
         } else {
@@ -592,7 +592,7 @@ module.exports = class Tokenizer {
     if (cap) {
       let text = cap[2].replace(/\n/g, ' ');
       const hasNonSpaceChars = /[^ ]/.test(text);
-      const hasSpaceCharsOnBothEnds = text.startsWith(' ') && text.endsWith(' ');
+      const hasSpaceCharsOnBothEnds = /^ /.test(text) && / $/.test(text);
       if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) {
         text = text.substring(1, text.length - 1);
       }