marked 4.0.17 → 4.1.0

package/lib/marked.cjs

@@ -72,6 +72,7 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
 
 function getDefaults() {
   return {
+    async: false,
     baseUrl: null,
     breaks: false,
     extensions: null,
@@ -412,7 +413,7 @@ function outputLink(cap, link, raw, lexer) {
       href: href,
       title: title,
       text: text,
-      tokens: lexer.inlineTokens(text, [])
+      tokens: lexer.inlineTokens(text)
     };
     lexer.state.inLink = false;
     return token;
@@ -520,15 +521,13 @@ var Tokenizer = /*#__PURE__*/function () {
         }
       }
 
-      var token = {
+      return {
         type: 'heading',
         raw: cap[0],
         depth: cap[1].length,
         text: text,
-        tokens: []
+        tokens: this.lexer.inline(text)
       };
-      this.lexer.inline(token.text, token.tokens);
-      return token;
     }
   };
 
@@ -622,7 +621,8 @@ var Tokenizer = /*#__PURE__*/function () {
         if (!endEarly) {
           var nextBulletRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))");
           var hrRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)");
-          var fencesBeginRegex = new RegExp("^( {0," + Math.min(3, indent - 1) + "})(```|~~~)"); // Check if following lines should be included in List Item
+          var fencesBeginRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:```|~~~)");
+          var headingBeginRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}#"); // Check if following lines should be included in List Item
 
           while (src) {
             rawLine = src.split('\n', 1)[0];
@@ -638,7 +638,7 @@ var Tokenizer = /*#__PURE__*/function () {
             } // End list item if found start of new heading
 
 
-            if (this.rules.block.heading.test(line)) {
+            if (headingBeginRegex.test(line)) {
               break;
             } // End list item if found start of new bullet
 
@@ -757,10 +757,10 @@ var Tokenizer = /*#__PURE__*/function () {
       };
 
       if (this.options.sanitize) {
+        var text = this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]);
         token.type = 'paragraph';
-        token.text = this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]);
-        token.tokens = [];
-        this.lexer.inline(token.text, token.tokens);
+        token.text = text;
+        token.tokens = this.lexer.inline(text);
       }
 
       return token;
@@ -830,8 +830,7 @@ var Tokenizer = /*#__PURE__*/function () {
         l = item.header.length;
 
         for (j = 0; j < l; j++) {
-          item.header[j].tokens = [];
-          this.lexer.inline(item.header[j].text, item.header[j].tokens);
+          item.header[j].tokens = this.lexer.inline(item.header[j].text);
         } // cell child tokens
 
 
@@ -841,8 +840,7 @@ var Tokenizer = /*#__PURE__*/function () {
           row = item.rows[j];
 
           for (k = 0; k < row.length; k++) {
-            row[k].tokens = [];
-            this.lexer.inline(row[k].text, row[k].tokens);
+            row[k].tokens = this.lexer.inline(row[k].text);
           }
         }
 
@@ -855,15 +853,13 @@ var Tokenizer = /*#__PURE__*/function () {
     var cap = this.rules.block.lheading.exec(src);
 
     if (cap) {
-      var token = {
+      return {
         type: 'heading',
         raw: cap[0],
         depth: cap[2].charAt(0) === '=' ? 1 : 2,
         text: cap[1],
-        tokens: []
+        tokens: this.lexer.inline(cap[1])
       };
-      this.lexer.inline(token.text, token.tokens);
-      return token;
     }
   };
 
@@ -871,14 +867,13 @@ var Tokenizer = /*#__PURE__*/function () {
     var cap = this.rules.block.paragraph.exec(src);
 
     if (cap) {
-      var token = {
+      var text = cap[1].charAt(cap[1].length - 1) === '\n' ? cap[1].slice(0, -1) : cap[1];
+      return {
         type: 'paragraph',
         raw: cap[0],
-        text: cap[1].charAt(cap[1].length - 1) === '\n' ? cap[1].slice(0, -1) : cap[1],
-        tokens: []
+        text: text,
+        tokens: this.lexer.inline(text)
       };
-      this.lexer.inline(token.text, token.tokens);
-      return token;
     }
   };
 
@@ -886,14 +881,12 @@ var Tokenizer = /*#__PURE__*/function () {
     var cap = this.rules.block.text.exec(src);
 
     if (cap) {
-      var token = {
+      return {
         type: 'text',
         raw: cap[0],
         text: cap[0],
-        tokens: []
+        tokens: this.lexer.inline(cap[0])
       };
-      this.lexer.inline(token.text, token.tokens);
-      return token;
     }
   };
 
@@ -1072,7 +1065,7 @@ var Tokenizer = /*#__PURE__*/function () {
             type: 'em',
             raw: src.slice(0, lLength + match.index + rLength + 1),
             text: _text,
-            tokens: this.lexer.inlineTokens(_text, [])
+            tokens: this.lexer.inlineTokens(_text)
           };
         } // Create 'strong' if smallest delimiter has even char count. **a***
 
@@ -1082,7 +1075,7 @@ var Tokenizer = /*#__PURE__*/function () {
           type: 'strong',
           raw: src.slice(0, lLength + match.index + rLength + 1),
           text: text,
-          tokens: this.lexer.inlineTokens(text, [])
+          tokens: this.lexer.inlineTokens(text)
         };
       }
     }
@@ -1128,7 +1121,7 @@ var Tokenizer = /*#__PURE__*/function () {
         type: 'del',
         raw: cap[0],
         text: cap[2],
-        tokens: this.lexer.inlineTokens(cap[2], [])
+        tokens: this.lexer.inlineTokens(cap[2])
       };
     }
   };
@@ -1746,10 +1739,15 @@ var Lexer = /*#__PURE__*/function () {
   };
 
   _proto.inline = function inline(src, tokens) {
+    if (tokens === void 0) {
+      tokens = [];
+    }
+
     this.inlineQueue.push({
       src: src,
       tokens: tokens
     });
+    return tokens;
   }
   /**
    * Lexing/Compiling
@@ -2722,22 +2720,32 @@ function marked(src, opt, callback) {
     return;
   }
 
+  function onError(e) {
+    e.message += '\nPlease report this to https://github.com/markedjs/marked.';
+
+    if (opt.silent) {
+      return '<p>An error occurred:</p><pre>' + escape(e.message + '', true) + '</pre>';
+    }
+
+    throw e;
+  }
+
   try {
     var _tokens = Lexer.lex(src, opt);
 
     if (opt.walkTokens) {
+      if (opt.async) {
+        return Promise.all(marked.walkTokens(_tokens, opt.walkTokens)).then(function () {
+          return Parser.parse(_tokens, opt);
+        })["catch"](onError);
+      }
+
       marked.walkTokens(_tokens, opt.walkTokens);
     }
 
     return Parser.parse(_tokens, opt);
   } catch (e) {
-    e.message += '\nPlease report this to https://github.com/markedjs/marked.';
-
-    if (opt.silent) {
-      return '<p>An error occurred:</p><pre>' + escape(e.message + '', true) + '</pre>';
-    }
-
-    throw e;
+    onError(e);
   }
 }
 /**
@@ -2903,11 +2911,14 @@ marked.use = function () {
       var _walkTokens = marked.defaults.walkTokens;
 
       opts.walkTokens = function (token) {
-        pack.walkTokens.call(this, token);
+        var values = [];
+        values.push(pack.walkTokens.call(this, token));
 
         if (_walkTokens) {
-          _walkTokens.call(this, token);
+          values = values.concat(_walkTokens.call(this, token));
         }
+
+        return values;
       };
     }
 
@@ -2924,16 +2935,18 @@ marked.use = function () {
 
 
 marked.walkTokens = function (tokens, callback) {
+  var values = [];
+
   var _loop3 = function _loop3() {
     var token = _step.value;
-    callback.call(marked, token);
+    values = values.concat(callback.call(marked, token));
 
     switch (token.type) {
       case 'table':
         {
           for (var _iterator2 = _createForOfIteratorHelperLoose(token.header), _step2; !(_step2 = _iterator2()).done;) {
             var cell = _step2.value;
-            marked.walkTokens(cell.tokens, callback);
+            values = values.concat(marked.walkTokens(cell.tokens, callback));
           }
 
           for (var _iterator3 = _createForOfIteratorHelperLoose(token.rows), _step3; !(_step3 = _iterator3()).done;) {
@@ -2941,7 +2954,7 @@ marked.walkTokens = function (tokens, callback) {
 
             for (var _iterator4 = _createForOfIteratorHelperLoose(row), _step4; !(_step4 = _iterator4()).done;) {
               var _cell = _step4.value;
-              marked.walkTokens(_cell.tokens, callback);
+              values = values.concat(marked.walkTokens(_cell.tokens, callback));
             }
           }
 
@@ -2950,7 +2963,7 @@ marked.walkTokens = function (tokens, callback) {
 
       case 'list':
         {
-          marked.walkTokens(token.items, callback);
+          values = values.concat(marked.walkTokens(token.items, callback));
           break;
         }
 
@@ -2959,10 +2972,10 @@ marked.walkTokens = function (tokens, callback) {
           if (marked.defaults.extensions && marked.defaults.extensions.childTokens && marked.defaults.extensions.childTokens[token.type]) {
             // Walk any extensions
             marked.defaults.extensions.childTokens[token.type].forEach(function (childTokens) {
-              marked.walkTokens(token[childTokens], callback);
+              values = values.concat(marked.walkTokens(token[childTokens], callback));
             });
           } else if (token.tokens) {
-            marked.walkTokens(token.tokens, callback);
+            values = values.concat(marked.walkTokens(token.tokens, callback));
           }
         }
     }
@@ -2971,6 +2984,8 @@ marked.walkTokens = function (tokens, callback) {
   for (var _iterator = _createForOfIteratorHelperLoose(tokens), _step; !(_step = _iterator()).done;) {
     _loop3();
   }
+
+  return values;
 };
 /**
  * Parse Inline

package/lib/marked.esm.js

@@ -11,6 +11,7 @@
 
 function getDefaults() {
   return {
+    async: false,
     baseUrl: null,
     breaks: false,
     extensions: null,
@@ -329,7 +330,7 @@ function outputLink(cap, link, raw, lexer) {
       href,
       title,
       text,
-      tokens: lexer.inlineTokens(text, [])
+      tokens: lexer.inlineTokens(text)
     };
     lexer.state.inLink = false;
     return token;
@@ -435,15 +436,13 @@ class Tokenizer {
         }
       }
 
-      const token = {
+      return {
         type: 'heading',
         raw: cap[0],
         depth: cap[1].length,
         text,
-        tokens: []
+        tokens: this.lexer.inline(text)
       };
-      this.lexer.inline(token.text, token.tokens);
-      return token;
     }
   }
 
@@ -536,7 +535,8 @@ class Tokenizer {
         if (!endEarly) {
           const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))`);
           const hrRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`);
-          const fencesBeginRegex = new RegExp(`^( {0,${Math.min(3, indent - 1)}})(\`\`\`|~~~)`);
+          const fencesBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:\`\`\`|~~~)`);
+          const headingBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}#`);
 
           // Check if following lines should be included in List Item
           while (src) {
@@ -554,7 +554,7 @@ class Tokenizer {
             }
 
             // End list item if found start of new heading
-            if (this.rules.block.heading.test(line)) {
+            if (headingBeginRegex.test(line)) {
               break;
             }
 
@@ -664,10 +664,10 @@ class Tokenizer {
         text: cap[0]
       };
       if (this.options.sanitize) {
+        const text = this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]);
         token.type = 'paragraph';
-        token.text = this.options.sanitizer ? this.options.sanitizer(cap[0]) : escape(cap[0]);
-        token.tokens = [];
-        this.lexer.inline(token.text, token.tokens);
+        token.text = text;
+        token.tokens = this.lexer.inline(text);
       }
       return token;
     }
@@ -725,8 +725,7 @@ class Tokenizer {
         // header child tokens
         l = item.header.length;
         for (j = 0; j < l; j++) {
-          item.header[j].tokens = [];
-          this.lexer.inline(item.header[j].text, item.header[j].tokens);
+          item.header[j].tokens = this.lexer.inline(item.header[j].text);
         }
 
         // cell child tokens
@@ -734,8 +733,7 @@ class Tokenizer {
         for (j = 0; j < l; j++) {
           row = item.rows[j];
           for (k = 0; k < row.length; k++) {
-            row[k].tokens = [];
-            this.lexer.inline(row[k].text, row[k].tokens);
+            row[k].tokens = this.lexer.inline(row[k].text);
           }
         }
 
@@ -747,45 +745,40 @@ class Tokenizer {
   lheading(src) {
     const cap = this.rules.block.lheading.exec(src);
     if (cap) {
-      const token = {
+      return {
         type: 'heading',
         raw: cap[0],
         depth: cap[2].charAt(0) === '=' ? 1 : 2,
         text: cap[1],
-        tokens: []
+        tokens: this.lexer.inline(cap[1])
       };
-      this.lexer.inline(token.text, token.tokens);
-      return token;
     }
   }
 
   paragraph(src) {
     const cap = this.rules.block.paragraph.exec(src);
     if (cap) {
-      const token = {
+      const text = cap[1].charAt(cap[1].length - 1) === '\n'
+        ? cap[1].slice(0, -1)
+        : cap[1];
+      return {
         type: 'paragraph',
         raw: cap[0],
-        text: cap[1].charAt(cap[1].length - 1) === '\n'
-          ? cap[1].slice(0, -1)
-          : cap[1],
-        tokens: []
+        text,
+        tokens: this.lexer.inline(text)
       };
-      this.lexer.inline(token.text, token.tokens);
-      return token;
     }
   }
 
   text(src) {
     const cap = this.rules.block.text.exec(src);
     if (cap) {
-      const token = {
+      return {
         type: 'text',
         raw: cap[0],
         text: cap[0],
-        tokens: []
+        tokens: this.lexer.inline(cap[0])
       };
-      this.lexer.inline(token.text, token.tokens);
-      return token;
     }
   }
 
@@ -954,7 +947,7 @@ class Tokenizer {
             type: 'em',
             raw: src.slice(0, lLength + match.index + rLength + 1),
             text,
-            tokens: this.lexer.inlineTokens(text, [])
+            tokens: this.lexer.inlineTokens(text)
           };
         }
 
@@ -964,7 +957,7 @@ class Tokenizer {
           type: 'strong',
           raw: src.slice(0, lLength + match.index + rLength + 1),
           text,
-          tokens: this.lexer.inlineTokens(text, [])
+          tokens: this.lexer.inlineTokens(text)
         };
       }
     }
@@ -1005,7 +998,7 @@ class Tokenizer {
         type: 'del',
         raw: cap[0],
         text: cap[2],
-        tokens: this.lexer.inlineTokens(cap[2], [])
+        tokens: this.lexer.inlineTokens(cap[2])
       };
     }
   }
@@ -1703,8 +1696,9 @@ class Lexer {
     return tokens;
   }
 
-  inline(src, tokens) {
+  inline(src, tokens = []) {
     this.inlineQueue.push({ src, tokens });
+    return tokens;
   }
 
   /**
@@ -2553,13 +2547,7 @@ function marked(src, opt, callback) {
     return;
   }
 
-  try {
-    const tokens = Lexer.lex(src, opt);
-    if (opt.walkTokens) {
-      marked.walkTokens(tokens, opt.walkTokens);
-    }
-    return Parser.parse(tokens, opt);
-  } catch (e) {
+  function onError(e) {
     e.message += '\nPlease report this to https://github.com/markedjs/marked.';
     if (opt.silent) {
       return '<p>An error occurred:</p><pre>'
@@ -2568,6 +2556,23 @@ function marked(src, opt, callback) {
     }
     throw e;
   }
+
+  try {
+    const tokens = Lexer.lex(src, opt);
+    if (opt.walkTokens) {
+      if (opt.async) {
+        return Promise.all(marked.walkTokens(tokens, opt.walkTokens))
+          .then(() => {
+            return Parser.parse(tokens, opt);
+          })
+          .catch(onError);
+      }
+      marked.walkTokens(tokens, opt.walkTokens);
+    }
+    return Parser.parse(tokens, opt);
+  } catch (e) {
+    onError(e);
+  }
 }
 
 /**
@@ -2684,10 +2689,12 @@ marked.use = function(...args) {
     if (pack.walkTokens) {
       const walkTokens = marked.defaults.walkTokens;
       opts.walkTokens = function(token) {
-        pack.walkTokens.call(this, token);
+        let values = [];
+        values.push(pack.walkTokens.call(this, token));
         if (walkTokens) {
-          walkTokens.call(this, token);
+          values = values.concat(walkTokens.call(this, token));
         }
+        return values;
       };
     }
 
@@ -2704,35 +2711,37 @@ marked.use = function(...args) {
  */
 
 marked.walkTokens = function(tokens, callback) {
+  let values = [];
   for (const token of tokens) {
-    callback.call(marked, token);
+    values = values.concat(callback.call(marked, token));
     switch (token.type) {
       case 'table': {
         for (const cell of token.header) {
-          marked.walkTokens(cell.tokens, callback);
+          values = values.concat(marked.walkTokens(cell.tokens, callback));
         }
         for (const row of token.rows) {
           for (const cell of row) {
-            marked.walkTokens(cell.tokens, callback);
+            values = values.concat(marked.walkTokens(cell.tokens, callback));
           }
         }
         break;
       }
       case 'list': {
-        marked.walkTokens(token.items, callback);
+        values = values.concat(marked.walkTokens(token.items, callback));
         break;
       }
       default: {
         if (marked.defaults.extensions && marked.defaults.extensions.childTokens && marked.defaults.extensions.childTokens[token.type]) { // Walk any extensions
           marked.defaults.extensions.childTokens[token.type].forEach(function(childTokens) {
-            marked.walkTokens(token[childTokens], callback);
+            values = values.concat(marked.walkTokens(token[childTokens], callback));
           });
         } else if (token.tokens) {
-          marked.walkTokens(token.tokens, callback);
+          values = values.concat(marked.walkTokens(token.tokens, callback));
         }
       }
     }
   }
+  return values;
 };
 
 /**