marked 13.0.0 → 13.0.2

package/lib/marked.d.cts

@@ -396,15 +396,15 @@ export interface RendererExtension {
 export type TokenizerAndRendererExtension = TokenizerExtension | RendererExtension | (TokenizerExtension & RendererExtension);
 export type HooksApi = Omit<_Hooks, "constructor" | "options">;
 export type HooksObject = {
-	[K in keyof HooksApi]?: (...args: Parameters<HooksApi[K]>) => ReturnType<HooksApi[K]> | Promise<ReturnType<HooksApi[K]>>;
+	[K in keyof HooksApi]?: (this: _Hooks, ...args: Parameters<HooksApi[K]>) => ReturnType<HooksApi[K]> | Promise<ReturnType<HooksApi[K]>>;
 };
 export type RendererApi = Omit<_Renderer, "constructor" | "options" | "parser">;
 export type RendererObject = {
-	[K in keyof RendererApi]?: (...args: Parameters<RendererApi[K]>) => ReturnType<RendererApi[K]> | false;
+	[K in keyof RendererApi]?: (this: _Renderer, ...args: Parameters<RendererApi[K]>) => ReturnType<RendererApi[K]> | false;
 };
 export type TokenizerApi = Omit<_Tokenizer, "constructor" | "options" | "rules" | "lexer">;
 export type TokenizerObject = {
-	[K in keyof TokenizerApi]?: (...args: Parameters<TokenizerApi[K]>) => ReturnType<TokenizerApi[K]> | false;
+	[K in keyof TokenizerApi]?: (this: _Tokenizer, ...args: Parameters<TokenizerApi[K]>) => ReturnType<TokenizerApi[K]> | false;
 };
 export interface MarkedExtension {
 	/**
@@ -636,7 +636,7 @@ export declare namespace marked {
 	var defaults: MarkedOptions;
 	var use: (...args: MarkedExtension[]) => typeof marked;
 	var walkTokens: (tokens: Token[] | TokensList, callback: (token: Token) => MaybePromise | MaybePromise[]) => MaybePromise[];
-	var parseInline: (src: string, options?: MarkedOptions | null | undefined) => string | Promise<string>;
+	var parseInline: (src: string, options?: MarkedOptions | undefined | null) => string | Promise<string>;
 	var Parser: typeof _Parser;
 	var parser: typeof _Parser.parse;
 	var Renderer: typeof _Renderer;
@@ -651,7 +651,7 @@ export declare const options: (options: MarkedOptions) => typeof marked;
 export declare const setOptions: (options: MarkedOptions) => typeof marked;
 export declare const use: (...args: MarkedExtension[]) => typeof marked;
 export declare const walkTokens: (tokens: Token[] | TokensList, callback: (token: Token) => MaybePromise | MaybePromise[]) => MaybePromise[];
-export declare const parseInline: (src: string, options?: MarkedOptions | null | undefined) => string | Promise<string>;
+export declare const parseInline: (src: string, options?: MarkedOptions | undefined | null) => string | Promise<string>;
 export declare const parse: typeof marked;
 export declare const parser: typeof _Parser.parse;
 export declare const lexer: typeof _Lexer.lex;

package/lib/marked.d.ts

@@ -396,15 +396,15 @@ export interface RendererExtension {
 export type TokenizerAndRendererExtension = TokenizerExtension | RendererExtension | (TokenizerExtension & RendererExtension);
 export type HooksApi = Omit<_Hooks, "constructor" | "options">;
 export type HooksObject = {
-	[K in keyof HooksApi]?: (...args: Parameters<HooksApi[K]>) => ReturnType<HooksApi[K]> | Promise<ReturnType<HooksApi[K]>>;
+	[K in keyof HooksApi]?: (this: _Hooks, ...args: Parameters<HooksApi[K]>) => ReturnType<HooksApi[K]> | Promise<ReturnType<HooksApi[K]>>;
 };
 export type RendererApi = Omit<_Renderer, "constructor" | "options" | "parser">;
 export type RendererObject = {
-	[K in keyof RendererApi]?: (...args: Parameters<RendererApi[K]>) => ReturnType<RendererApi[K]> | false;
+	[K in keyof RendererApi]?: (this: _Renderer, ...args: Parameters<RendererApi[K]>) => ReturnType<RendererApi[K]> | false;
 };
 export type TokenizerApi = Omit<_Tokenizer, "constructor" | "options" | "rules" | "lexer">;
 export type TokenizerObject = {
-	[K in keyof TokenizerApi]?: (...args: Parameters<TokenizerApi[K]>) => ReturnType<TokenizerApi[K]> | false;
+	[K in keyof TokenizerApi]?: (this: _Tokenizer, ...args: Parameters<TokenizerApi[K]>) => ReturnType<TokenizerApi[K]> | false;
 };
 export interface MarkedExtension {
 	/**
@@ -636,7 +636,7 @@ export declare namespace marked {
 	var defaults: MarkedOptions;
 	var use: (...args: MarkedExtension[]) => typeof marked;
 	var walkTokens: (tokens: Token[] | TokensList, callback: (token: Token) => MaybePromise | MaybePromise[]) => MaybePromise[];
-	var parseInline: (src: string, options?: MarkedOptions | null | undefined) => string | Promise<string>;
+	var parseInline: (src: string, options?: MarkedOptions | undefined | null) => string | Promise<string>;
 	var Parser: typeof _Parser;
 	var parser: typeof _Parser.parse;
 	var Renderer: typeof _Renderer;
@@ -651,7 +651,7 @@ export declare const options: (options: MarkedOptions) => typeof marked;
 export declare const setOptions: (options: MarkedOptions) => typeof marked;
 export declare const use: (...args: MarkedExtension[]) => typeof marked;
 export declare const walkTokens: (tokens: Token[] | TokensList, callback: (token: Token) => MaybePromise | MaybePromise[]) => MaybePromise[];
-export declare const parseInline: (src: string, options?: MarkedOptions | null | undefined) => string | Promise<string>;
+export declare const parseInline: (src: string, options?: MarkedOptions | undefined | null) => string | Promise<string>;
 export declare const parse: typeof marked;
 export declare const parser: typeof _Parser.parse;
 export declare const lexer: typeof _Lexer.lex;

package/lib/marked.esm.js

@@ -1,5 +1,5 @@
 /**
- * marked v13.0.0 - a markdown parser
+ * marked v13.0.2 - a markdown parser
  * Copyright (c) 2011-2024, Christopher Jeffrey. (MIT Licensed)
  * https://github.com/markedjs/marked
  */
@@ -415,12 +415,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;
                 }
@@ -431,19 +431,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;
@@ -539,8 +542,8 @@ class _Tokenizer {
                 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++) {
@@ -2356,7 +2359,7 @@ class Marked {
                         // eslint-disable-next-line prefer-rest-params
                         return func.apply(this, arguments);
                     }
-                    return func(renderer.parser.parseInline(token.tokens), token.depth, unescape(renderer.parser.parseInline(token.tokens, renderer.parser.textRenderer)));
+                    return func.call(this, renderer.parser.parseInline(token.tokens), token.depth, unescape(renderer.parser.parseInline(token.tokens, renderer.parser.textRenderer)));
                 };
             case 'code':
                 return function (token) {
@@ -2365,7 +2368,7 @@ class Marked {
                         // eslint-disable-next-line prefer-rest-params
                         return func.apply(this, arguments);
                     }
-                    return func(token.text, token.lang, !!token.escaped);
+                    return func.call(this, token.text, token.lang, !!token.escaped);
                 };
             case 'table':
                 return function (token) {
@@ -2400,7 +2403,7 @@ class Marked {
                         }
                         body += this.tablerow({ text: cell });
                     }
-                    return func(header, body);
+                    return func.call(this, header, body);
                 };
             case 'blockquote':
                 return function (token) {
@@ -2410,7 +2413,7 @@ class Marked {
                         return func.apply(this, arguments);
                     }
                     const body = this.parser.parse(token.tokens);
-                    return func(body);
+                    return func.call(this, body);
                 };
             case 'list':
                 return function (token) {
@@ -2459,7 +2462,7 @@ class Marked {
                             tokens: item.tokens
                         });
                     }
-                    return func(body, ordered, start);
+                    return func.call(this, body, ordered, start);
                 };
             case 'html':
                 return function (token) {
@@ -2468,7 +2471,7 @@ class Marked {
                         // eslint-disable-next-line prefer-rest-params
                         return func.apply(this, arguments);
                     }
-                    return func(token.text, token.block);
+                    return func.call(this, token.text, token.block);
                 };
             case 'paragraph':
                 return function (token) {
@@ -2477,7 +2480,7 @@ class Marked {
                         // eslint-disable-next-line prefer-rest-params
                         return func.apply(this, arguments);
                     }
-                    return func(this.parser.parseInline(token.tokens));
+                    return func.call(this, this.parser.parseInline(token.tokens));
                 };
             case 'escape':
                 return function (token) {
@@ -2486,7 +2489,7 @@ class Marked {
                         // eslint-disable-next-line prefer-rest-params
                         return func.apply(this, arguments);
                     }
-                    return func(token.text);
+                    return func.call(this, token.text);
                 };
             case 'link':
                 return function (token) {
@@ -2495,7 +2498,7 @@ class Marked {
                         // eslint-disable-next-line prefer-rest-params
                         return func.apply(this, arguments);
                     }
-                    return func(token.href, token.title, this.parser.parseInline(token.tokens));
+                    return func.call(this, token.href, token.title, this.parser.parseInline(token.tokens));
                 };
             case 'image':
                 return function (token) {
@@ -2504,7 +2507,7 @@ class Marked {
                         // eslint-disable-next-line prefer-rest-params
                         return func.apply(this, arguments);
                     }
-                    return func(token.href, token.title, token.text);
+                    return func.call(this, token.href, token.title, token.text);
                 };
             case 'strong':
                 return function (token) {
@@ -2513,7 +2516,7 @@ class Marked {
                         // eslint-disable-next-line prefer-rest-params
                         return func.apply(this, arguments);
                     }
-                    return func(this.parser.parseInline(token.tokens));
+                    return func.call(this, this.parser.parseInline(token.tokens));
                 };
             case 'em':
                 return function (token) {
@@ -2522,7 +2525,7 @@ class Marked {
                         // eslint-disable-next-line prefer-rest-params
                         return func.apply(this, arguments);
                     }
-                    return func(this.parser.parseInline(token.tokens));
+                    return func.call(this, this.parser.parseInline(token.tokens));
                 };
             case 'codespan':
                 return function (token) {
@@ -2531,7 +2534,7 @@ class Marked {
                         // eslint-disable-next-line prefer-rest-params
                         return func.apply(this, arguments);
                     }
-                    return func(token.text);
+                    return func.call(this, token.text);
                 };
             case 'del':
                 return function (token) {
@@ -2540,7 +2543,7 @@ class Marked {
                         // eslint-disable-next-line prefer-rest-params
                         return func.apply(this, arguments);
                     }
-                    return func(this.parser.parseInline(token.tokens));
+                    return func.call(this, this.parser.parseInline(token.tokens));
                 };
             case 'text':
                 return function (token) {
@@ -2549,7 +2552,7 @@ class Marked {
                         // eslint-disable-next-line prefer-rest-params
                         return func.apply(this, arguments);
                     }
-                    return func(token.text);
+                    return func.call(this, token.text);
                 };
             // do nothing
         }