marked 13.0.1 → 13.0.3

package/bin/main.js

@@ -28,13 +28,12 @@ export async function main(nodeProcess) {
     const options = {
       cwd: nodeProcess.cwd(),
       env: nodeProcess.env,
-      stdio: 'inherit'
+      stdio: 'inherit',
     };
 
     const __dirname = dirname(fileURLToPath(import.meta.url));
     const helpText = await readFile(resolve(__dirname, '../man/marked.1.md'), 'utf8');
 
-    // eslint-disable-next-line promise/param-names
     await new Promise(res => {
       spawn('man', [resolve(__dirname, '../man/marked.1')], options)
         .on('error', () => {
@@ -128,7 +127,7 @@ export async function main(nodeProcess) {
         default:
           if (arg.indexOf('--') === 0) {
             opt = camelize(arg.replace(/^--(no-)?/, ''));
-            if (!marked.defaults.hasOwnProperty(opt)) {
+            if (!(opt in marked.defaults)) {
               continue;
             }
             if (arg.indexOf('--no-') === 0) {
@@ -205,7 +204,7 @@ export async function main(nodeProcess) {
       const defaultConfig = [
         '~/.marked.json',
         '~/.marked.js',
-        '~/.marked/index.js'
+        '~/.marked/index.js',
       ];
 
       for (const configFile of defaultConfig) {

package/lib/marked.cjs

@@ -1,5 +1,5 @@
 /**
- * marked v13.0.1 - a markdown parser
+ * marked v13.0.3 - a markdown parser
  * Copyright (c) 2011-2024, Christopher Jeffrey. (MIT Licensed)
  * https://github.com/markedjs/marked
  */
@@ -25,7 +25,7 @@ function _getDefaults() {
         renderer: null,
         silent: false,
         tokenizer: null,
-        walkTokens: null
+        walkTokens: null,
     };
 }
 exports.defaults = _getDefaults();
@@ -45,7 +45,7 @@ const escapeReplacements = {
     '<': '&lt;',
     '>': '&gt;',
     '"': '&quot;',
-    "'": '&#39;'
+    "'": '&#39;',
 };
 const getEscapeReplacement = (ch) => escapeReplacements[ch];
 function escape$1(html, encode) {
@@ -89,7 +89,7 @@ function edit(regex, opt) {
         },
         getRegex: () => {
             return new RegExp(source, opt);
-        }
+        },
     };
     return obj;
 }
@@ -97,7 +97,7 @@ function cleanUrl(href) {
     try {
         href = encodeURI(href).replace(/%25/g, '%');
     }
-    catch (e) {
+    catch {
         return null;
     }
     return href;
@@ -208,7 +208,7 @@ function outputLink(cap, link, raw, lexer) {
             href,
             title,
             text,
-            tokens: lexer.inlineTokens(text)
+            tokens: lexer.inlineTokens(text),
         };
         lexer.state.inLink = false;
         return token;
@@ -218,7 +218,7 @@ function outputLink(cap, link, raw, lexer) {
         raw,
         href,
         title,
-        text: escape$1(text)
+        text: escape$1(text),
     };
 }
 function indentCodeCompensation(raw, text) {
@@ -257,7 +257,7 @@ class _Tokenizer {
         if (cap && cap[0].length > 0) {
             return {
                 type: 'space',
-                raw: cap[0]
+                raw: cap[0],
             };
         }
     }
@@ -271,7 +271,7 @@ class _Tokenizer {
                 codeBlockStyle: 'indented',
                 text: !this.options.pedantic
                     ? rtrim(text, '\n')
-                    : text
+                    : text,
             };
         }
     }
@@ -284,7 +284,7 @@ class _Tokenizer {
                 type: 'code',
                 raw,
                 lang: cap[2] ? cap[2].trim().replace(this.rules.inline.anyPunctuation, '$1') : cap[2],
-                text
+                text,
             };
         }
     }
@@ -308,7 +308,7 @@ class _Tokenizer {
                 raw: cap[0],
                 depth: cap[1].length,
                 text,
-                tokens: this.lexer.inline(text)
+                tokens: this.lexer.inline(text),
             };
         }
     }
@@ -317,7 +317,7 @@ class _Tokenizer {
         if (cap) {
             return {
                 type: 'hr',
-                raw: rtrim(cap[0], '\n')
+                raw: rtrim(cap[0], '\n'),
             };
         }
     }
@@ -394,7 +394,7 @@ class _Tokenizer {
                 type: 'blockquote',
                 raw,
                 tokens,
-                text
+                text,
             };
         }
     }
@@ -409,7 +409,7 @@ class _Tokenizer {
                 ordered: isordered,
                 start: isordered ? +bull.slice(0, -1) : '',
                 loose: false,
-                items: []
+                items: [],
             };
             bull = isordered ? `\\d{1,9}\\${bull.slice(-1)}` : `\\${bull}`;
             if (this.options.pedantic) {
@@ -417,12 +417,12 @@ class _Tokenizer {
             }
             // Get next list item
             const itemRegex = new RegExp(`^( {0,3}${bull})((?:[\t ][^\\n]*)?(?:\\n|$))`);
-            let raw = '';
-            let itemContents = '';
             let endsWithBlankLine = false;
             // Check if current bullet point can start a new List Item
             while (src) {
                 let endEarly = false;
+                let raw = '';
+                let itemContents = '';
                 if (!(cap = itemRegex.exec(src))) {
                     break;
                 }
@@ -433,19 +433,22 @@ class _Tokenizer {
                 src = src.substring(raw.length);
                 let line = cap[2].split('\n', 1)[0].replace(/^\t+/, (t) => ' '.repeat(3 * t.length));
                 let nextLine = src.split('\n', 1)[0];
+                let blankLine = !line.trim();
                 let indent = 0;
                 if (this.options.pedantic) {
                     indent = 2;
                     itemContents = line.trimStart();
                 }
+                else if (blankLine) {
+                    indent = cap[1].length + 1;
+                }
                 else {
                     indent = cap[2].search(/[^ ]/); // Find first non-space char
                     indent = indent > 4 ? 1 : indent; // Treat indented code blocks (> 4 spaces) as having only 1 indent
                     itemContents = line.slice(indent);
                     indent += cap[1].length;
                 }
-                let blankLine = false;
-                if (!line && /^ *$/.test(nextLine)) { // Items begin with at most one blank line
+                if (blankLine && /^ *$/.test(nextLine)) { // Items begin with at most one blank line
                     raw += nextLine + '\n';
                     src = src.substring(nextLine.length + 1);
                     endEarly = true;
@@ -536,13 +539,13 @@ class _Tokenizer {
                     checked: ischecked,
                     loose: false,
                     text: itemContents,
-                    tokens: []
+                    tokens: [],
                 });
                 list.raw += raw;
             }
             // Do not consume newlines at end of final item. Alternatively, make itemRegex *start* with any newlines to simplify/speed up endsWithBlankLine logic
-            list.items[list.items.length - 1].raw = raw.trimEnd();
-            (list.items[list.items.length - 1]).text = itemContents.trimEnd();
+            list.items[list.items.length - 1].raw = list.items[list.items.length - 1].raw.trimEnd();
+            list.items[list.items.length - 1].text = list.items[list.items.length - 1].text.trimEnd();
             list.raw = list.raw.trimEnd();
             // Item child tokens handled here at end because we needed to have the final item to trim it first
             for (let i = 0; i < list.items.length; i++) {
@@ -572,7 +575,7 @@ class _Tokenizer {
                 block: true,
                 raw: cap[0],
                 pre: cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style',
-                text: cap[0]
+                text: cap[0],
             };
             return token;
         }
@@ -588,7 +591,7 @@ class _Tokenizer {
                 tag,
                 raw: cap[0],
                 href,
-                title
+                title,
             };
         }
     }
@@ -609,7 +612,7 @@ class _Tokenizer {
             raw: cap[0],
             header: [],
             align: [],
-            rows: []
+            rows: [],
         };
         if (headers.length !== aligns.length) {
             // header and align columns must be equal, rows can be different.
@@ -634,7 +637,7 @@ class _Tokenizer {
                 text: headers[i],
                 tokens: this.lexer.inline(headers[i]),
                 header: true,
-                align: item.align[i]
+                align: item.align[i],
             });
         }
         for (const row of rows) {
@@ -643,7 +646,7 @@ class _Tokenizer {
                     text: cell,
                     tokens: this.lexer.inline(cell),
                     header: false,
-                    align: item.align[i]
+                    align: item.align[i],
                 };
             }));
         }
@@ -657,7 +660,7 @@ class _Tokenizer {
                 raw: cap[0],
                 depth: cap[2].charAt(0) === '=' ? 1 : 2,
                 text: cap[1],
-                tokens: this.lexer.inline(cap[1])
+                tokens: this.lexer.inline(cap[1]),
             };
         }
     }
@@ -671,7 +674,7 @@ class _Tokenizer {
                 type: 'paragraph',
                 raw: cap[0],
                 text,
-                tokens: this.lexer.inline(text)
+                tokens: this.lexer.inline(text),
             };
         }
     }
@@ -682,7 +685,7 @@ class _Tokenizer {
                 type: 'text',
                 raw: cap[0],
                 text: cap[0],
-                tokens: this.lexer.inline(cap[0])
+                tokens: this.lexer.inline(cap[0]),
             };
         }
     }
@@ -692,7 +695,7 @@ class _Tokenizer {
             return {
                 type: 'escape',
                 raw: cap[0],
-                text: escape$1(cap[1])
+                text: escape$1(cap[1]),
             };
         }
     }
@@ -717,7 +720,7 @@ class _Tokenizer {
                 inLink: this.lexer.state.inLink,
                 inRawBlock: this.lexer.state.inRawBlock,
                 block: false,
-                text: cap[0]
+                text: cap[0],
             };
         }
     }
@@ -772,7 +775,7 @@ class _Tokenizer {
             }
             return outputLink(cap, {
                 href: href ? href.replace(this.rules.inline.anyPunctuation, '$1') : href,
-                title: title ? title.replace(this.rules.inline.anyPunctuation, '$1') : title
+                title: title ? title.replace(this.rules.inline.anyPunctuation, '$1') : title,
             }, cap[0], this.lexer);
         }
     }
@@ -787,7 +790,7 @@ class _Tokenizer {
                 return {
                     type: 'text',
                     raw: text,
-                    text
+                    text,
                 };
             }
             return outputLink(cap, link, cap[0], this.lexer);
@@ -839,7 +842,7 @@ class _Tokenizer {
                         type: 'em',
                         raw,
                         text,
-                        tokens: this.lexer.inlineTokens(text)
+                        tokens: this.lexer.inlineTokens(text),
                     };
                 }
                 // Create 'strong' if smallest delimiter has even char count. **a***
@@ -848,7 +851,7 @@ class _Tokenizer {
                     type: 'strong',
                     raw,
                     text,
-                    tokens: this.lexer.inlineTokens(text)
+                    tokens: this.lexer.inlineTokens(text),
                 };
             }
         }
@@ -866,7 +869,7 @@ class _Tokenizer {
             return {
                 type: 'codespan',
                 raw: cap[0],
-                text
+                text,
             };
         }
     }
@@ -875,7 +878,7 @@ class _Tokenizer {
         if (cap) {
             return {
                 type: 'br',
-                raw: cap[0]
+                raw: cap[0],
             };
         }
     }
@@ -886,7 +889,7 @@ class _Tokenizer {
                 type: 'del',
                 raw: cap[0],
                 text: cap[2],
-                tokens: this.lexer.inlineTokens(cap[2])
+                tokens: this.lexer.inlineTokens(cap[2]),
             };
         }
     }
@@ -911,9 +914,9 @@ class _Tokenizer {
                     {
                         type: 'text',
                         raw: text,
-                        text
-                    }
-                ]
+                        text,
+                    },
+                ],
             };
         }
     }
@@ -949,9 +952,9 @@ class _Tokenizer {
                     {
                         type: 'text',
                         raw: text,
-                        text
-                    }
-                ]
+                        text,
+                    },
+                ],
             };
         }
     }
@@ -968,7 +971,7 @@ class _Tokenizer {
             return {
                 type: 'text',
                 raw: cap[0],
-                text
+                text,
             };
         }
     }
@@ -1052,7 +1055,7 @@ const blockNormal = {
     newline,
     paragraph,
     table: noopTest,
-    text: blockText
+    text: blockText,
 };
 /**
  * GFM Block Grammar
@@ -1082,7 +1085,7 @@ const blockGfm = {
         .replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
         .replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
         .replace('tag', _tag) // pars can be interrupted by type (6) html blocks
-        .getRegex()
+        .getRegex(),
 };
 /**
  * Pedantic grammar (original John Gruber's loose markdown specification)
@@ -1112,7 +1115,7 @@ const blockPedantic = {
         .replace('|list', '')
         .replace('|html', '')
         .replace('|tag', '')
-        .getRegex()
+        .getRegex(),
 };
 /**
  * Inline-Level Grammar
@@ -1206,7 +1209,7 @@ const inlineNormal = {
     reflinkSearch,
     tag,
     text: inlineText,
-    url: noopTest
+    url: noopTest,
 };
 /**
  * Pedantic Inline Grammar
@@ -1218,7 +1221,7 @@ const inlinePedantic = {
         .getRegex(),
     reflink: edit(/^!?\[(label)\]\s*\[([^\]]*)\]/)
         .replace('label', _inlineLabel)
-        .getRegex()
+        .getRegex(),
 };
 /**
  * GFM Inline Grammar
@@ -1231,7 +1234,7 @@ const inlineGfm = {
         .getRegex(),
     _backpedal: /(?:[^?!.,:;*_'"~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_'"~)]+(?!$))+/,
     del: /^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,
-    text: /^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\<!\[`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)))/
+    text: /^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\<!\[`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)))/,
 };
 /**
  * GFM + Line Breaks Inline Grammar
@@ -1242,7 +1245,7 @@ const inlineBreaks = {
     text: edit(inlineGfm.text)
         .replace('\\b_', '\\b_| {2,}\\n')
         .replace(/\{2,\}/g, '*')
-        .getRegex()
+        .getRegex(),
 };
 /**
  * exports
@@ -1250,13 +1253,13 @@ const inlineBreaks = {
 const block = {
     normal: blockNormal,
     gfm: blockGfm,
-    pedantic: blockPedantic
+    pedantic: blockPedantic,
 };
 const inline = {
     normal: inlineNormal,
     gfm: inlineGfm,
     breaks: inlineBreaks,
-    pedantic: inlinePedantic
+    pedantic: inlinePedantic,
 };
 
 /**
@@ -1281,11 +1284,11 @@ class _Lexer {
         this.state = {
             inLink: false,
             inRawBlock: false,
-            top: true
+            top: true,
         };
         const rules = {
             block: block.normal,
-            inline: inline.normal
+            inline: inline.normal,
         };
         if (this.options.pedantic) {
             rules.block = block.pedantic;
@@ -1308,7 +1311,7 @@ class _Lexer {
     static get rules() {
         return {
             block,
-            inline
+            inline,
         };
     }
     /**
@@ -1440,7 +1443,7 @@ class _Lexer {
                 else if (!this.tokens.links[token.tag]) {
                     this.tokens.links[token.tag] = {
                         href: token.href,
-                        title: token.title
+                        title: token.title,
                     };
                 }
                 continue;
@@ -1756,7 +1759,7 @@ class _Renderer {
                     item.tokens.unshift({
                         type: 'text',
                         raw: checkbox + ' ',
-                        text: checkbox + ' '
+                        text: checkbox + ' ',
                     });
                 }
             }
@@ -1992,7 +1995,7 @@ class _Parser {
                             type: 'paragraph',
                             raw: body,
                             text: body,
-                            tokens: [{ type: 'text', raw: body, text: body }]
+                            tokens: [{ type: 'text', raw: body, text: body }],
                         });
                     }
                     else {
@@ -2096,7 +2099,7 @@ class _Hooks {
     static passThroughHooks = new Set([
         'preprocess',
         'postprocess',
-        'processAllTokens'
+        'processAllTokens',
     ]);
     /**
      * Process markdown before marked
@@ -2251,13 +2254,13 @@ class Marked {
                     }
                     const rendererProp = prop;
                     let rendererFunc = pack.renderer[rendererProp];
+                    if (!pack.useNewRenderer) {
+                        // TODO: Remove this in next major version
+                        rendererFunc = this.#convertRendererFunction(rendererFunc, rendererProp, renderer);
+                    }
                     const prevRenderer = renderer[rendererProp];
                     // Replace renderer with func to run extension, but fall back if false
                     renderer[rendererProp] = (...args) => {
-                        if (!pack.useNewRenderer) {
-                            // TODO: Remove this in next major version
-                            rendererFunc = this.#convertRendererFunction(rendererFunc, rendererProp, renderer);
-                        }
                         let ret = rendererFunc.apply(renderer, args);
                         if (ret === false) {
                             ret = prevRenderer.apply(renderer, args);
@@ -2384,7 +2387,7 @@ class Marked {
                             text: token.header[j].text,
                             tokens: token.header[j].tokens,
                             header: true,
-                            align: token.align[j]
+                            align: token.align[j],
                         });
                     }
                     header += this.tablerow({ text: cell });
@@ -2397,7 +2400,7 @@ class Marked {
                                 text: row[k].text,
                                 tokens: row[k].tokens,
                                 header: false,
-                                align: token.align[k]
+                                align: token.align[k],
                             });
                         }
                         body += this.tablerow({ text: cell });
@@ -2442,7 +2445,7 @@ class Marked {
                                 else {
                                     item.tokens.unshift({
                                         type: 'text',
-                                        text: checkbox + ' '
+                                        text: checkbox + ' ',
                                     });
                                 }
                             }
@@ -2458,7 +2461,7 @@ class Marked {
                             task,
                             checked: !!checked,
                             loose,
-                            tokens: item.tokens
+                            tokens: item.tokens,
                         });
                     }
                     return func.call(this, body, ordered, start);