'
- + (escaped ? code : escape$1(code, true))
+ + (escaped ? code : escape$2(code, true))
+ ''
- + (escaped ? code : escape$1(code, true))
+ + (escaped ? code : escape$2(code, true))
+ ''
- + escape(e.message + '', true)
+ + escape$3(e.message + '', true)
+ '';
}
throw e;
@@ -2580,21 +2523,21 @@ function marked(src, opt, callback) {
marked.options =
marked.setOptions = function(opt) {
- merge(marked.defaults, opt);
+ merge$2(marked.defaults, opt);
changeDefaults(marked.defaults);
return marked;
};
marked.getDefaults = getDefaults;
-marked.defaults = defaults;
+marked.defaults = defaults$5;
/**
* Use Extension
*/
marked.use = function(...args) {
- const opts = merge({}, ...args);
+ const opts = merge$2({}, ...args);
const extensions = marked.defaults.extensions || { renderers: {}, childTokens: {} };
let hasExtensions;
@@ -2654,7 +2597,7 @@ marked.use = function(...args) {
// ==-- Parse "overwrite" extensions --== //
if (pack.renderer) {
- const renderer = marked.defaults.renderer || new Renderer();
+ const renderer = marked.defaults.renderer || new Renderer_1();
for (const prop in pack.renderer) {
const prevRenderer = renderer[prop];
// Replace renderer with func to run extension, but fall back if false
@@ -2669,7 +2612,7 @@ marked.use = function(...args) {
opts.renderer = renderer;
}
if (pack.tokenizer) {
- const tokenizer = marked.defaults.tokenizer || new Tokenizer();
+ const tokenizer = marked.defaults.tokenizer || new Tokenizer_1();
for (const prop in pack.tokenizer) {
const prevTokenizer = tokenizer[prop];
// Replace tokenizer with func to run extension, but fall back if false
@@ -2712,10 +2655,10 @@ marked.walkTokens = function(tokens, callback) {
callback(token);
switch (token.type) {
case 'table': {
- for (const cell of token.tokens.header) {
+ for (const cell of token.header.tokens) {
marked.walkTokens(cell, callback);
}
- for (const row of token.tokens.cells) {
+ for (const row of token.cells.tokens) {
for (const cell of row) {
marked.walkTokens(cell, callback);
}
@@ -2752,20 +2695,20 @@ marked.parseInline = function(src, opt) {
+ Object.prototype.toString.call(src) + ', string expected');
}
- opt = merge({}, marked.defaults, opt || {});
- checkSanitizeDeprecation(opt);
+ opt = merge$2({}, marked.defaults, opt || {});
+ checkSanitizeDeprecation$1(opt);
try {
- const tokens = Lexer.lexInline(src, opt);
+ const tokens = Lexer_1.lexInline(src, opt);
if (opt.walkTokens) {
marked.walkTokens(tokens, opt.walkTokens);
}
- return Parser.parseInline(tokens, opt);
+ return Parser_1.parseInline(tokens, opt);
} catch (e) {
e.message += '\nPlease report this to https://github.com/markedjs/marked.';
if (opt.silent) {
return 'An error occurred:
'
- + escape(e.message + '', true)
+ + escape$3(e.message + '', true)
+ '';
}
throw e;
@@ -2776,18 +2719,18 @@ marked.parseInline = function(src, opt) {
* Expose
*/
-marked.Parser = Parser;
-marked.parser = Parser.parse;
+marked.Parser = Parser_1;
+marked.parser = Parser_1.parse;
-marked.Renderer = Renderer;
-marked.TextRenderer = TextRenderer;
+marked.Renderer = Renderer_1;
+marked.TextRenderer = TextRenderer_1;
-marked.Lexer = Lexer;
-marked.lexer = Lexer.lex;
+marked.Lexer = Lexer_1;
+marked.lexer = Lexer_1.lex;
-marked.Tokenizer = Tokenizer;
+marked.Tokenizer = Tokenizer_1;
-marked.Slugger = Slugger;
+marked.Slugger = Slugger_1;
marked.parse = marked;
diff --git a/lib/marked.js b/lib/marked.js
index 10fe5d2815..8bf291ca32 100644
--- a/lib/marked.js
+++ b/lib/marked.js
@@ -49,61 +49,70 @@
}
function _createForOfIteratorHelperLoose(o, allowArrayLike) {
- var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
- if (it) return (it = it.call(o)).next.bind(it);
-
- if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
- if (it) o = it;
- var i = 0;
- return function () {
- if (i >= o.length) return {
- done: true
- };
- return {
- done: false,
- value: o[i++]
+ var it;
+
+ if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
+ if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
+ if (it) o = it;
+ var i = 0;
+ return function () {
+ if (i >= o.length) return {
+ done: true
+ };
+ return {
+ done: false,
+ value: o[i++]
+ };
};
- };
+ }
+
+ throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
- throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+ it = o[Symbol.iterator]();
+ return it.next.bind(it);
}
- var defaults$5 = {exports: {}};
-
- function getDefaults$1() {
- return {
- baseUrl: null,
- breaks: false,
- extensions: null,
- gfm: true,
- headerIds: true,
- headerPrefix: '',
- highlight: null,
- langPrefix: 'language-',
- mangle: true,
- pedantic: false,
- renderer: null,
- sanitize: false,
- sanitizer: null,
- silent: false,
- smartLists: false,
- smartypants: false,
- tokenizer: null,
- walkTokens: null,
- xhtml: false
- };
+ function createCommonjsModule(fn) {
+ var module = { exports: {} };
+ return fn(module, module.exports), module.exports;
}
- function changeDefaults$1(newDefaults) {
- defaults$5.exports.defaults = newDefaults;
- }
+ var defaults = createCommonjsModule(function (module) {
+ function getDefaults() {
+ return {
+ baseUrl: null,
+ breaks: false,
+ extensions: null,
+ gfm: true,
+ headerIds: true,
+ headerPrefix: '',
+ highlight: null,
+ langPrefix: 'language-',
+ mangle: true,
+ pedantic: false,
+ renderer: null,
+ sanitize: false,
+ sanitizer: null,
+ silent: false,
+ smartLists: false,
+ smartypants: false,
+ tokenizer: null,
+ walkTokens: null,
+ xhtml: false
+ };
+ }
- defaults$5.exports = {
- defaults: getDefaults$1(),
- getDefaults: getDefaults$1,
- changeDefaults: changeDefaults$1
- };
+ function changeDefaults(newDefaults) {
+ module.exports.defaults = newDefaults;
+ }
+
+ module.exports = {
+ defaults: getDefaults(),
+ getDefaults: getDefaults,
+ changeDefaults: changeDefaults
+ };
+ });
/**
* Helpers
@@ -124,7 +133,7 @@
return escapeReplacements[ch];
};
- function escape$2(html, encode) {
+ function escape(html, encode) {
if (encode) {
if (escapeTest.test(html)) {
return html.replace(escapeReplace, getEscapeReplacement);
@@ -140,7 +149,7 @@
var unescapeTest = /&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig;
- function unescape$1(html) {
+ function unescape(html) {
// explicitly match decimal, hex, and named HTML entities
return html.replace(unescapeTest, function (_, n) {
n = n.toLowerCase();
@@ -156,7 +165,7 @@
var caret = /(^|[^\[])\^/g;
- function edit$1(regex, opt) {
+ function edit(regex, opt) {
regex = regex.source || regex;
opt = opt || '';
var obj = {
@@ -176,12 +185,12 @@
var nonWordAndColonTest = /[^\w:]/g;
var originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
- function cleanUrl$1(sanitize, base, href) {
+ function cleanUrl(sanitize, base, href) {
if (sanitize) {
var prot;
try {
- prot = decodeURIComponent(unescape$1(href)).replace(nonWordAndColonTest, '').toLowerCase();
+ prot = decodeURIComponent(unescape(href)).replace(nonWordAndColonTest, '').toLowerCase();
} catch (e) {
return null;
}
@@ -217,7 +226,7 @@
if (justDomain.test(base)) {
baseUrls[' ' + base] = base + '/';
} else {
- baseUrls[' ' + base] = rtrim$1(base, '/', true);
+ baseUrls[' ' + base] = rtrim(base, '/', true);
}
}
@@ -241,11 +250,11 @@
}
}
- var noopTest$1 = {
+ var noopTest = {
exec: function noopTest() {}
};
- function merge$2(obj) {
+ function merge(obj) {
var i = 1,
target,
key;
@@ -263,7 +272,7 @@
return obj;
}
- function splitCells$1(tableRow, count) {
+ function splitCells(tableRow, count) {
// ensure that every cell-delimiting pipe has a space
// before it to distinguish it from an escaped pipe
var row = tableRow.replace(/\|/g, function (match, offset, str) {
@@ -284,7 +293,15 @@
}
}),
cells = row.split(/ \|/);
- var i = 0;
+ var i = 0; // First/last cell in a row cannot be empty if it has no leading/trailing pipe
+
+ if (!cells[0].trim()) {
+ cells.shift();
+ }
+
+ if (!cells[cells.length - 1].trim()) {
+ cells.pop();
+ }
if (cells.length > count) {
cells.splice(count);
@@ -305,7 +322,7 @@
// invert: Remove suffix of non-c chars instead. Default falsey.
- function rtrim$1(str, c, invert) {
+ function rtrim(str, c, invert) {
var l = str.length;
if (l === 0) {
@@ -330,7 +347,7 @@
return str.substr(0, l - suffLen);
}
- function findClosingBracket$1(str, b) {
+ function findClosingBracket(str, b) {
if (str.indexOf(b[1]) === -1) {
return -1;
}
@@ -356,14 +373,14 @@
return -1;
}
- function checkSanitizeDeprecation$1(opt) {
+ function checkSanitizeDeprecation(opt) {
if (opt && opt.sanitize && !opt.silent) {
console.warn('marked(): sanitize and sanitizer parameters are deprecated since version 0.7.0, should not be used and will be removed in the future. Read more here: https://marked.js.org/#/USING_ADVANCED.md#options');
}
} // copied from https://stackoverflow.com/a/5450113/806777
- function repeatString$1(pattern, count) {
+ function repeatString(pattern, count) {
if (count < 1) {
return '';
}
@@ -383,38 +400,40 @@
}
var helpers = {
- escape: escape$2,
- unescape: unescape$1,
- edit: edit$1,
- cleanUrl: cleanUrl$1,
+ escape: escape,
+ unescape: unescape,
+ edit: edit,
+ cleanUrl: cleanUrl,
resolveUrl: resolveUrl,
- noopTest: noopTest$1,
- merge: merge$2,
- splitCells: splitCells$1,
- rtrim: rtrim$1,
- findClosingBracket: findClosingBracket$1,
- checkSanitizeDeprecation: checkSanitizeDeprecation$1,
- repeatString: repeatString$1
+ noopTest: noopTest,
+ merge: merge,
+ splitCells: splitCells,
+ rtrim: rtrim,
+ findClosingBracket: findClosingBracket,
+ checkSanitizeDeprecation: checkSanitizeDeprecation,
+ repeatString: repeatString
};
- var defaults$4 = defaults$5.exports.defaults;
- var rtrim = helpers.rtrim,
- splitCells = helpers.splitCells,
+ var defaults$1 = defaults.defaults;
+ var rtrim$1 = helpers.rtrim,
+ splitCells$1 = helpers.splitCells,
_escape = helpers.escape,
- findClosingBracket = helpers.findClosingBracket;
+ findClosingBracket$1 = helpers.findClosingBracket;
- function outputLink(cap, link, raw) {
+ function outputLink(cap, link, raw, lexer) {
var href = link.href;
var title = link.title ? _escape(link.title) : null;
var text = cap[1].replace(/\\([\[\]])/g, '$1');
if (cap[0].charAt(0) !== '!') {
+ lexer.state.inLink = true;
return {
type: 'link',
raw: raw,
href: href,
title: title,
- text: text
+ text: text,
+ tokens: lexer.inlineTokens(text, [])
};
} else {
return {
@@ -458,7 +477,7 @@
var Tokenizer_1 = /*#__PURE__*/function () {
function Tokenizer(options) {
- this.options = options || defaults$4;
+ this.options = options || defaults$1;
}
var _proto = Tokenizer.prototype;
@@ -489,7 +508,7 @@
type: 'code',
raw: cap[0],
codeBlockStyle: 'indented',
- text: !this.options.pedantic ? rtrim(text, '\n') : text
+ text: !this.options.pedantic ? rtrim$1(text, '\n') : text
};
}
};
@@ -516,7 +535,7 @@
var text = cap[2].trim(); // remove trailing #s
if (/#$/.test(text)) {
- var trimmed = rtrim(text, '#');
+ var trimmed = rtrim$1(text, '#');
if (this.options.pedantic) {
text = trimmed.trim();
@@ -526,51 +545,15 @@
}
}
- return {
+ var token = {
type: 'heading',
raw: cap[0],
depth: cap[1].length,
- text: text
- };
- }
- };
-
- _proto.nptable = function nptable(src) {
- var cap = this.rules.block.nptable.exec(src);
-
- if (cap) {
- var item = {
- type: 'table',
- header: splitCells(cap[1].replace(/^ *| *\| *$/g, '')),
- align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
- cells: cap[3] ? cap[3].replace(/\n$/, '').split('\n') : [],
- raw: cap[0]
+ text: text,
+ tokens: []
};
-
- if (item.header.length === item.align.length) {
- var l = item.align.length;
- var i;
-
- for (i = 0; i < l; i++) {
- if (/^ *-+: *$/.test(item.align[i])) {
- item.align[i] = 'right';
- } else if (/^ *:-+: *$/.test(item.align[i])) {
- item.align[i] = 'center';
- } else if (/^ *:-+ *$/.test(item.align[i])) {
- item.align[i] = 'left';
- } else {
- item.align[i] = null;
- }
- }
-
- l = item.cells.length;
-
- for (i = 0; i < l; i++) {
- item.cells[i] = splitCells(item.cells[i], item.header.length);
- }
-
- return item;
- }
+ this.lexer.inline(token.text, token.tokens);
+ return token;
}
};
@@ -593,6 +576,7 @@
return {
type: 'blockquote',
raw: cap[0],
+ tokens: this.lexer.blockTokens(text, []),
text: text
};
}
@@ -678,7 +662,7 @@
} // trim item newlines at end
- item = rtrim(item, '\n');
+ item = rtrim$1(item, '\n');
if (i !== l - 1) {
raw = raw + '\n';
@@ -709,15 +693,24 @@
}
}
- list.items.push({
+ this.lexer.state.top = false;
+ var token = {
type: 'list_item',
raw: raw,
task: istask,
checked: ischecked,
loose: loose,
- text: item
- });
- }
+ text: item,
+ tokens: this.lexer.blockTokens(item, [])
+ }; // this.lexer.inline(token.text, )
+
+ list.items.push(token);
+ } // l2 = token.items.length;
+ // for (j = 0; j < l2; j++) {
+ // this.inline(token.items[j].tokens);
+ // }
+ // break;
+
return list;
}
@@ -727,12 +720,21 @@
var cap = this.rules.block.html.exec(src);
if (cap) {
- return {
- type: this.options.sanitize ? 'paragraph' : 'html',
+ var token = {
+ type: 'html',
raw: cap[0],
pre: !this.options.sanitizer && (cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style'),
- text: this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(cap[0]) : _escape(cap[0]) : cap[0]
+ text: cap[0]
};
+
+ if (this.options.sanitize) {
+ 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);
+ }
+
+ return token;
}
};
@@ -758,15 +760,19 @@
if (cap) {
var item = {
type: 'table',
- header: splitCells(cap[1].replace(/^ *| *\| *$/g, '')),
+ header: {
+ text: splitCells$1(cap[1])
+ },
align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
- cells: cap[3] ? cap[3].replace(/\n$/, '').split('\n') : []
+ cells: {
+ text: cap[3] ? cap[3].replace(/\n$/, '').split('\n') : []
+ }
};
- if (item.header.length === item.align.length) {
+ if (item.header.text.length === item.align.length) {
item.raw = cap[0];
var l = item.align.length;
- var i;
+ var i, j, k, row;
for (i = 0; i < l; i++) {
if (/^ *-+: *$/.test(item.align[i])) {
@@ -780,10 +786,34 @@
}
}
- l = item.cells.length;
+ l = item.cells.text.length;
for (i = 0; i < l; i++) {
- item.cells[i] = splitCells(item.cells[i].replace(/^ *\| *| *\| *$/g, ''), item.header.length);
+ item.cells.text[i] = splitCells$1(item.cells.text[i], item.header.text.length);
+ } // parse child tokens inside headers and cells
+
+
+ item.header.tokens = [];
+ item.cells.tokens = []; // header child tokens
+
+ l = item.header.text.length;
+
+ for (j = 0; j < l; j++) {
+ item.header.tokens[j] = [];
+ this.lexer.inlineTokens(item.header.text[j], item.header.tokens[j]);
+ } // cell child tokens
+
+
+ l = item.cells.text.length;
+
+ for (j = 0; j < l; j++) {
+ row = item.cells.text[j];
+ item.cells.tokens[j] = [];
+
+ for (k = 0; k < row.length; k++) {
+ item.cells.tokens[j][k] = [];
+ this.lexer.inlineTokens(row[k], item.cells.tokens[j][k]);
+ }
}
return item;
@@ -795,12 +825,15 @@
var cap = this.rules.block.lheading.exec(src);
if (cap) {
- return {
+ var token = {
type: 'heading',
raw: cap[0],
depth: cap[2].charAt(0) === '=' ? 1 : 2,
- text: cap[1]
+ text: cap[1],
+ tokens: []
};
+ this.lexer.inline(token.text, token.tokens);
+ return token;
}
};
@@ -808,11 +841,14 @@
var cap = this.rules.block.paragraph.exec(src);
if (cap) {
- return {
+ var token = {
type: 'paragraph',
raw: cap[0],
- text: cap[1].charAt(cap[1].length - 1) === '\n' ? cap[1].slice(0, -1) : cap[1]
+ text: cap[1].charAt(cap[1].length - 1) === '\n' ? cap[1].slice(0, -1) : cap[1],
+ tokens: []
};
+ this.lexer.inline(token.text, token.tokens);
+ return token;
}
};
@@ -820,11 +856,14 @@
var cap = this.rules.block.text.exec(src);
if (cap) {
- return {
+ var token = {
type: 'text',
raw: cap[0],
- text: cap[0]
+ text: cap[0],
+ tokens: []
};
+ this.lexer.inline(token.text, token.tokens);
+ return token;
}
};
@@ -840,27 +879,27 @@
}
};
- _proto.tag = function tag(src, inLink, inRawBlock) {
+ _proto.tag = function tag(src) {
var cap = this.rules.inline.tag.exec(src);
if (cap) {
- if (!inLink && /^/i.test(cap[0])) {
- inLink = false;
+ if (!this.lexer.state.inLink && /^/i.test(cap[0])) {
+ this.lexer.state.inLink = false;
}
- if (!inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
- inRawBlock = true;
- } else if (inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
- inRawBlock = false;
+ if (!this.lexer.state.inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+ this.lexer.state.inRawBlock = true;
+ } else if (this.lexer.state.inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+ this.lexer.state.inRawBlock = false;
}
return {
type: this.options.sanitize ? 'text' : 'html',
raw: cap[0],
- inLink: inLink,
- inRawBlock: inRawBlock,
+ inLink: this.lexer.state.inLink,
+ inRawBlock: this.lexer.state.inRawBlock,
text: this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(cap[0]) : _escape(cap[0]) : cap[0]
};
}
@@ -879,14 +918,14 @@
} // ending angle bracket cannot be escaped
- var rtrimSlash = rtrim(trimmedUrl.slice(0, -1), '\\');
+ var rtrimSlash = rtrim$1(trimmedUrl.slice(0, -1), '\\');
if ((trimmedUrl.length - rtrimSlash.length) % 2 === 0) {
return;
}
} else {
// find closing parenthesis
- var lastParenIndex = findClosingBracket(cap[2], '()');
+ var lastParenIndex = findClosingBracket$1(cap[2], '()');
if (lastParenIndex > -1) {
var start = cap[0].indexOf('!') === 0 ? 5 : 4;
@@ -926,7 +965,7 @@
return outputLink(cap, {
href: href ? href.replace(this.rules.inline._escapes, '$1') : href,
title: title ? title.replace(this.rules.inline._escapes, '$1') : title
- }, cap[0]);
+ }, cap[0], this.lexer);
}
};
@@ -946,7 +985,7 @@
};
}
- return outputLink(cap, link, cap[0]);
+ return outputLink(cap, link, cap[0], this.lexer);
}
};
@@ -997,18 +1036,23 @@
rLength = Math.min(rLength, rLength + delimTotal + midDelimTotal); // Create `em` if smallest delimiter has odd char count. *a***
if (Math.min(lLength, rLength) % 2) {
+ var _text = src.slice(1, lLength + match.index + rLength);
+
return {
type: 'em',
raw: src.slice(0, lLength + match.index + rLength + 1),
- text: src.slice(1, lLength + match.index + rLength)
+ text: _text,
+ tokens: this.lexer.inlineTokens(_text, [])
};
} // Create 'strong' if smallest delimiter has even char count. **a***
+ var text = src.slice(2, lLength + match.index + rLength - 1);
return {
type: 'strong',
raw: src.slice(0, lLength + match.index + rLength + 1),
- text: src.slice(2, lLength + match.index + rLength - 1)
+ text: text,
+ tokens: this.lexer.inlineTokens(text, [])
};
}
}
@@ -1053,7 +1097,8 @@
return {
type: 'del',
raw: cap[0],
- text: cap[2]
+ text: cap[2],
+ tokens: this.lexer.inlineTokens(cap[2], [])
};
}
};
@@ -1127,13 +1172,13 @@
}
};
- _proto.inlineText = function inlineText(src, inRawBlock, smartypants) {
+ _proto.inlineText = function inlineText(src, smartypants) {
var cap = this.rules.inline.text.exec(src);
if (cap) {
var text;
- if (inRawBlock) {
+ if (this.lexer.state.inRawBlock) {
text = this.options.sanitize ? this.options.sanitizer ? this.options.sanitizer(cap[0]) : _escape(cap[0]) : cap[0];
} else {
text = _escape(this.options.smartypants ? smartypants(cap[0]) : cap[0]);
@@ -1150,14 +1195,14 @@
return Tokenizer;
}();
- var noopTest = helpers.noopTest,
- edit = helpers.edit,
+ var noopTest$1 = helpers.noopTest,
+ edit$1 = helpers.edit,
merge$1 = helpers.merge;
/**
* Block-Level Grammar
*/
- var block$1 = {
+ var block = {
newline: /^(?: *(?:\n|$))+/,
code: /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/,
fences: /^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/,
@@ -1176,76 +1221,68 @@
+ '|(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) closing tag
+ ')',
def: /^ {0,3}\[(label)\]: *\n? *]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,
- nptable: noopTest,
- table: noopTest,
+ table: noopTest$1,
lheading: /^([^\n]+)\n {0,3}(=+|-+) *(?:\n+|$)/,
// regex template, placeholders will be replaced according to different paragraph
// interruption rules of commonmark and the original markdown spec:
_paragraph: /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html| +\n)[^\n]+)*)/,
text: /^[^\n]+/
};
- block$1._label = /(?!\s*\])(?:\\[\[\]]|[^\[\]])+/;
- block$1._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
- block$1.def = edit(block$1.def).replace('label', block$1._label).replace('title', block$1._title).getRegex();
- block$1.bullet = /(?:[*+-]|\d{1,9}[.)])/;
- block$1.item = /^( *)(bull) ?[^\n]*(?:\n(?! *bull ?)[^\n]*)*/;
- block$1.item = edit(block$1.item, 'gm').replace(/bull/g, block$1.bullet).getRegex();
- block$1.listItemStart = edit(/^( *)(bull) */).replace('bull', block$1.bullet).getRegex();
- block$1.list = edit(block$1.list).replace(/bull/g, block$1.bullet).replace('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))').replace('def', '\\n+(?=' + block$1.def.source + ')').getRegex();
- block$1._tag = 'address|article|aside|base|basefont|blockquote|body|caption' + '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption' + '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe' + '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option' + '|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr' + '|track|ul';
- block$1._comment = /|$)/;
- block$1.html = edit(block$1.html, 'i').replace('comment', block$1._comment).replace('tag', block$1._tag).replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex();
- block$1.paragraph = edit(block$1._paragraph).replace('hr', block$1.hr).replace('heading', ' {0,3}#{1,6} ').replace('|lheading', '') // setex headings don't interrupt commonmark paragraphs
+ block._label = /(?!\s*\])(?:\\[\[\]]|[^\[\]])+/;
+ block._title = /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/;
+ block.def = edit$1(block.def).replace('label', block._label).replace('title', block._title).getRegex();
+ block.bullet = /(?:[*+-]|\d{1,9}[.)])/;
+ block.item = /^( *)(bull) ?[^\n]*(?:\n(?! *bull ?)[^\n]*)*/;
+ block.item = edit$1(block.item, 'gm').replace(/bull/g, block.bullet).getRegex();
+ block.listItemStart = edit$1(/^( *)(bull) */).replace('bull', block.bullet).getRegex();
+ block.list = edit$1(block.list).replace(/bull/g, block.bullet).replace('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))').replace('def', '\\n+(?=' + block.def.source + ')').getRegex();
+ block._tag = 'address|article|aside|base|basefont|blockquote|body|caption' + '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption' + '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe' + '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option' + '|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr' + '|track|ul';
+ block._comment = /|$)/;
+ block.html = edit$1(block.html, 'i').replace('comment', block._comment).replace('tag', block._tag).replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex();
+ block.paragraph = edit$1(block._paragraph).replace('hr', block.hr).replace('heading', ' {0,3}#{1,6} ').replace('|lheading', '') // setex headings don't interrupt commonmark paragraphs
.replace('blockquote', ' {0,3}>').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
- .replace('html', ')|<(?:script|pre|style|textarea|!--)').replace('tag', block$1._tag) // pars can be interrupted by type (6) html blocks
+ .replace('html', ')|<(?:script|pre|style|textarea|!--)').replace('tag', block._tag) // pars can be interrupted by type (6) html blocks
.getRegex();
- block$1.blockquote = edit(block$1.blockquote).replace('paragraph', block$1.paragraph).getRegex();
+ block.blockquote = edit$1(block.blockquote).replace('paragraph', block.paragraph).getRegex();
/**
* Normal Block Grammar
*/
- block$1.normal = merge$1({}, block$1);
+ block.normal = merge$1({}, block);
/**
* GFM Block Grammar
*/
- block$1.gfm = merge$1({}, block$1.normal, {
- nptable: '^ *([^|\\n ].*\\|.*)\\n' // Header
- + ' {0,3}([-:]+ *\\|[-| :]*)' // Align
- + '(?:\\n((?:(?!\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)',
- // Cells
- table: '^ *\\|(.+)\\n' // Header
- + ' {0,3}\\|?( *[-:]+[-| :]*)' // Align
+ block.gfm = merge$1({}, block.normal, {
+ table: '^ *([^\\n ].*\\|.*)\\n' // Header
+ + ' {0,3}(?:\\| *)?(:?-+:? *(?:\\| *:?-+:? *)*)\\|?' // Align
+ '(?:\\n *((?:(?!\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)' // Cells
});
- block$1.gfm.nptable = edit(block$1.gfm.nptable).replace('hr', block$1.hr).replace('heading', ' {0,3}#{1,6} ').replace('blockquote', ' {0,3}>').replace('code', ' {4}[^\\n]').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
- .replace('html', ')|<(?:script|pre|style|textarea|!--)').replace('tag', block$1._tag) // tables can be interrupted by type (6) html blocks
- .getRegex();
- block$1.gfm.table = edit(block$1.gfm.table).replace('hr', block$1.hr).replace('heading', ' {0,3}#{1,6} ').replace('blockquote', ' {0,3}>').replace('code', ' {4}[^\\n]').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
- .replace('html', ')|<(?:script|pre|style|textarea|!--)').replace('tag', block$1._tag) // tables can be interrupted by type (6) html blocks
+ block.gfm.table = edit$1(block.gfm.table).replace('hr', block.hr).replace('heading', ' {0,3}#{1,6} ').replace('blockquote', ' {0,3}>').replace('code', ' {4}[^\\n]').replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n').replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
+ .replace('html', ')|<(?:script|pre|style|textarea|!--)').replace('tag', block._tag) // tables can be interrupted by type (6) html blocks
.getRegex();
/**
* Pedantic grammar (original John Gruber's loose markdown specification)
*/
- block$1.pedantic = merge$1({}, block$1.normal, {
- html: edit('^ *(?:comment *(?:\\n|\\s*$)' + '|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)' // closed tag
- + '|An error occurred:
' + escape(e.message + '', true) + ''; + return '
An error occurred:
' + escape$2(e.message + '', true) + ''; } throw e; @@ -2700,13 +2656,13 @@ marked.options = marked.setOptions = function (opt) { - merge(marked.defaults, opt); + merge$2(marked.defaults, opt); changeDefaults(marked.defaults); return marked; }; marked.getDefaults = getDefaults; - marked.defaults = defaults; + marked.defaults = defaults$5; /** * Use Extension */ @@ -2718,7 +2674,7 @@ args[_key] = arguments[_key]; } - var opts = merge.apply(void 0, [{}].concat(args)); + var opts = merge$2.apply(void 0, [{}].concat(args)); var extensions = marked.defaults.extensions || { renderers: {}, childTokens: {} @@ -2797,7 +2753,7 @@ if (pack.renderer) { (function () { - var renderer = marked.defaults.renderer || new Renderer(); + var renderer = marked.defaults.renderer || new Renderer_1(); var _loop = function _loop(prop) { var prevRenderer = renderer[prop]; // Replace renderer with func to run extension, but fall back if false @@ -2827,7 +2783,7 @@ if (pack.tokenizer) { (function () { - var tokenizer = marked.defaults.tokenizer || new Tokenizer(); + var tokenizer = marked.defaults.tokenizer || new Tokenizer_1(); var _loop2 = function _loop2(prop) { var prevTokenizer = tokenizer[prop]; // Replace tokenizer with func to run extension, but fall back if false @@ -2888,12 +2844,12 @@ switch (token.type) { case 'table': { - for (var _iterator2 = _createForOfIteratorHelperLoose(token.tokens.header), _step2; !(_step2 = _iterator2()).done;) { + for (var _iterator2 = _createForOfIteratorHelperLoose(token.header.tokens), _step2; !(_step2 = _iterator2()).done;) { var cell = _step2.value; marked.walkTokens(cell, callback); } - for (var _iterator3 = _createForOfIteratorHelperLoose(token.tokens.cells), _step3; !(_step3 = _iterator3()).done;) { + for (var _iterator3 = _createForOfIteratorHelperLoose(token.cells.tokens), _step3; !(_step3 = _iterator3()).done;) { var row = _step3.value; for (var _iterator4 = _createForOfIteratorHelperLoose(row), _step4; !(_step4 = _iterator4()).done;) { @@ -2944,22 +2900,22 @@ throw new Error('marked.parseInline(): input parameter is of type ' + Object.prototype.toString.call(src) + ', string expected'); } - opt = merge({}, marked.defaults, opt || {}); - checkSanitizeDeprecation(opt); + opt = merge$2({}, marked.defaults, opt || {}); + checkSanitizeDeprecation$1(opt); try { - var tokens = Lexer.lexInline(src, opt); + var tokens = Lexer_1.lexInline(src, opt); if (opt.walkTokens) { marked.walkTokens(tokens, opt.walkTokens); } - return Parser.parseInline(tokens, opt); + return Parser_1.parseInline(tokens, opt); } catch (e) { e.message += '\nPlease report this to https://github.com/markedjs/marked.'; if (opt.silent) { - return '
An error occurred:
' + escape(e.message + '', true) + ''; + return '
An error occurred:
' + escape$2(e.message + '', true) + ''; } throw e; @@ -2970,14 +2926,14 @@ */ - marked.Parser = Parser; - marked.parser = Parser.parse; - marked.Renderer = Renderer; - marked.TextRenderer = TextRenderer; - marked.Lexer = Lexer; - marked.lexer = Lexer.lex; - marked.Tokenizer = Tokenizer; - marked.Slugger = Slugger; + marked.Parser = Parser_1; + marked.parser = Parser_1.parse; + marked.Renderer = Renderer_1; + marked.TextRenderer = TextRenderer_1; + marked.Lexer = Lexer_1; + marked.lexer = Lexer_1.lex; + marked.Tokenizer = Tokenizer_1; + marked.Slugger = Slugger_1; marked.parse = marked; var marked_1 = marked;