jspdf-md-renderer 1.5.0 → 1.6.0

package/README.md

@@ -69,6 +69,14 @@ This section showcases how to create simple and nested lists.
     1. Nested Subtopic 2.2.1
     2. Nested Subtopic 2.2.2
 
+### Emphasis and Strong Emphasis
+- *Italic* text using asterisks.
+- _Italic_ text using underscores.
+- **Bold** text using double asterisks.
+- __Bold__ text using double underscores.
+- ***Bold and Italic*** text using triple asterisks.
+- ___Bold and Italic___ text using triple underscores.
+
 `;
 
 const generatePDF = async () => {
@@ -146,17 +154,19 @@ The following Markdown elements are currently supported by `jspdf-md-renderer`:
 - **Lists**:
     - Unordered lists: `-`, `*`, `+`
     - Ordered lists: `1.`, `2.`, `3.`, etc.
+- **Horizontal Rules**: `---`, `***`, `___`
+- **Text Styles**:
+    - Bold: `**bold**` or `__bold__`
+    - Italic: `*italic*` or `_italic_`
+    - Bold Italic: `***bold italic***` or `___bold italic___`
 - **Code Blocks** (fenced and indented):
     ````markdown
     ```js
     console.log('Hello, world!');
     ```
     ````
+
 ### Proposed for Future Implementation:
-- **Emphasis**:
-    - **Bold**: `**bold text**` or `__bold text__`
-    - _Italic_: `*italic text*` or `_italic text_`
-    - **_Bold Italic_**: `***bold italic***`
 - **Blockquotes**:
     ```markdown
     > This is a blockquote.

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const W=require("marked");var r=(t=>(t.Heading="heading",t.Paragraph="paragraph",t.List="list",t.ListItem="list_item",t.Blockquote="blockquote",t.Code="code",t.CodeSpan="codespan",t.Table="table",t.Html="html",t.Hr="hr",t.Image="image",t.Link="link",t.Strong="strong",t.Em="em",t.TableHeader="table_header",t.TableCell="table_cell",t.Raw="raw",t.Text="text",t))(r||{});const S=async t=>{const a=await W.marked.lexer(t,{async:!0});return p(a)},p=t=>{const a=[];return t.forEach(e=>{try{const g=m[e.type];g?a.push(g(e)):a.push({type:r.Raw,content:e.raw})}catch(g){console.error("Failed to handle token ==>",e,g)}}),a},m={[r.Heading]:t=>({type:r.Heading,depth:t.depth,content:t.text,items:t.tokens?p(t.tokens):[]}),[r.Paragraph]:t=>({type:r.Paragraph,content:t.text,items:t.tokens?p(t.tokens):[]}),[r.List]:t=>({type:r.List,ordered:t.ordered,start:t.start,items:t.items?p(t.items):[]}),[r.ListItem]:t=>({type:r.ListItem,content:t.text,items:t.tokens?p(t.tokens):[]}),[r.Code]:t=>({type:r.Code,lang:t.lang,code:t.text}),[r.Table]:t=>({type:r.Table,header:t.header.map(a=>({type:r.TableHeader,content:a})),rows:t.rows.map(a=>a.map(e=>({type:r.TableCell,content:e})))}),[r.Image]:t=>({type:r.Image,src:t.href,alt:t.text}),[r.Link]:t=>({type:r.Link,href:t.href,text:t.text,items:t.tokens?p(t.tokens):[]}),[r.Strong]:t=>({type:r.Strong,content:t.text,items:t.tokens?p(t.tokens):[]}),[r.Em]:t=>({type:r.Em,content:t.text,items:t.tokens?p(t.tokens):[]}),[r.Text]:t=>({type:r.Text,content:t.text,items:t.tokens?p(t.tokens):[]}),[r.Hr]:t=>({type:r.Hr,content:t.raw,items:t.tokens?p(t.tokens):[]}),[r.CodeSpan]:t=>({type:r.CodeSpan,content:t.text,items:t.tokens?p(t.tokens):[]})},c=(t,a)=>{var e,g;typeof a.pageBreakHandler=="function"?a.pageBreakHandler():t.addPage((e=a.page)==null?void 0:e.format,(g=a.page)==null?void 0:g.orientation)},d=(t,a)=>t.getTextDimensions("H").h*a.page.defaultLineHeightFactor,w=(t,a,e,g,i,n)=>{const s=6-((a==null?void 0:a.depth)??0)>0?6-((a==null?void 0:a.depth)??0):0;if(t.setFontSize(i.page.defaultFontSize+s),a!=null&&a.items&&(a==null?void 0:a.items.length)>0)for(const x of(a==null?void 0:a.items)??[])e=n(x,g,!1);else t.text((a==null?void 0:a.content)??"",e.x+g,e.y,{align:"left",maxWidth:i.page.maxContentWidth-g}),e.y+=1.5*d(t,i);return t.setFontSize(i.page.defaultFontSize),e},L=(t,a,e,g,i,n,s,x,y)=>{const l=(x-e)/(a.length-1);let h=i;const f=n+g*s;for(const b of a)t.text(b.text,h,f,{align:"justify",lineHeightFactor:y,maxWidth:x}),h+=b.wordLength+l},z=(t,a,e,g,i,n,s,x)=>{const y=t.map(l=>l.text).join(" ");a.text(y,e,g+i*n,{align:"justify",lineHeightFactor:x,maxWidth:s})},H=(t,a,e,g,i,n)=>{const s={x:e,y:g},x=t.getTextDimensions("A").h*n,y=a.split(" ");let l=0,h=[],f=0;for(const b of y){const C=t.getTextWidth(b+"a");C+f>=i&&(L(t,h,f,l++,e,g,x,i,n),h=[],f=0),h.push({text:b,wordLength:C}),f+=C}return h.length>0&&z(h,t,e,g,l,x,i,n),s.y=g+l*x,s.x=t.getTextWidth(a)+e,s},E=(t,a,e,g,i,n)=>{t.setFontSize(i.page.defaultFontSize);let s=a.content;const x=t.getTextDimensions("A").h*i.page.defaultLineHeightFactor;if(a!=null&&a.items&&(a==null?void 0:a.items.length)>0)for(const y of(a==null?void 0:a.items)??[])e=n(y,g,!1);else{if(e.y+t.splitTextToSize(s??"",i.page.maxContentWidth-g).length*x-3*x>=i.page.maxContentHeight){const y=t.splitTextToSize(s??"",i.page.maxContentWidth-g),l=[],h=e.y;for(let f=0;f<y.length;f++)if(e.y-2*x<i.page.maxContentHeight)l.push(y[f]),e.y+=i.page.lineSpace;else{f<=y.length-1&&(s=y.slice(f).join(""));break}l.length>0&&(e=H(t,l.join(" "),e.x+g,h,i.page.maxContentWidth-g,i.page.defaultLineHeightFactor)),c(t,i),e.y=i.page.topmargin}e.y=H(t,s??"",e.x+g,e.y,i.page.maxContentWidth-g,i.page.defaultLineHeightFactor).y+d(t,i),e.x=i.page.xpading}return e},I=(t,a,e,g,i,n)=>{var s;t.setFontSize(i.page.defaultFontSize);for(const[x,y]of((s=a==null?void 0:a.items)==null?void 0:s.entries())??[]){const l=a.ordered?(a.start??0)+x:a.start;e=n(y,g+1,!0,l,a.ordered),e.y+=d(t,i)*.2}return e},F=(t,a,e,g,i)=>{const n=t.getFont().fontName,s=t.getFont().fontStyle,x=t.getFontSize(),y=h=>{switch(h){case"normal":return 0;case"bold":return 1;case"italic":return 1.5;case"bolditalic":return 2.5;default:return 0}},l=(h,f)=>{f==="bold"?t.setFont(i.font.bold.name&&i.font.bold.name!==""?i.font.bold.name:n,i.font.bold.style||"bold"):f==="italic"?t.setFont(i.font.regular.name,"italic"):f==="bolditalic"?t.setFont(i.font.bold.name&&i.font.bold.name!==""?i.font.bold.name:n,"bolditalic"):t.setFont(i.font.regular.name,s);const b=t.getTextWidth(h);e.x+b>i.page.xpading+i.page.maxContentWidth&&(e.x=i.page.xpading,e.y+=d(t,i));const C=t.getTextWidth(" ");t.text(h,e.x+g,e.y,{baseline:"top"}),e.x+=b+C*y(f)+(f==="normal"?g*.7:0)};if(a.type==="text"&&a.items&&a.items.length>0)for(const h of a.items)if(h.type==="em"||h.type==="strong"){const f=h.type==="em"?"italic":"bold";if(h.items&&h.items.length>0)for(const b of h.items)b.type==="strong"&&f==="italic"||b.type==="em"&&f==="bold"?l(b.content||"","bolditalic"):l(b.content||"",f);else l(h.content||"",f)}else l(h.content||"","normal");else a.type==="em"?l(a.content||"","italic"):a.type==="strong"?l(a.content||"","bold"):l(a.content||"","normal");return t.setFont(n,s),t.setFontSize(x),e},u=(t,a,e,g,i,n,s,x)=>{const y=g*i.page.indent,l=x?`${s}. `:"• ";if(e.y+d(t,i)>=i.page.maxContentHeight&&(c(t,i),e.y=i.page.topmargin),t.setFont(i.font.regular.name,i.font.regular.style),t.text(l,e.x+y,e.y,{baseline:"top"}),e.x+=t.getTextWidth(l),a.items&&a.items.length>0)for(const h of a.items)e=F(t,h,e,y,i);else a.content&&(t.text(a.content,e.x,e.y,{baseline:"top"}),e.x+=t.getTextWidth(a.content));return e.y+=d(t,i),e.x=i.page.xpading,e},P=(t,a,e,g,i,n,s,x,y,l=!0)=>{if(a!=null&&a.items&&(a==null?void 0:a.items.length)>0)for(const h of(a==null?void 0:a.items)??[])e=s(h,g,i,x,y,l);else{const h=g*n.page.indent,f=i?y?`${x}. `:"• ":"",b=t.splitTextToSize(f+a.content,n.page.maxContentWidth-h);e.y+b.length*d(t,n)>=n.page.maxContentHeight&&(c(t,n),e.y=n.page.topmargin),l?(e.y=H(t,f+a.content,e.x+h,e.y,n.page.maxContentWidth-h,n.page.defaultLineHeightFactor).y+d(t,n),e.x=n.page.xpading):(t.text(f+a.content,e.x+h,e.y,{baseline:"top"}),e.x+=t.getTextWidth(f+a.content),e.x>=n.page.xpading+n.page.maxContentWidth&&(c(t,n),e.x=n.page.xpading,e.y+=d(t,n)))}return e},T=(t,a,e)=>{const g=t.internal.pageSize.getWidth();return t.setLineDashPattern([1,1],0),t.setLineWidth(.1),t.line(e.page.xpading,a.y,g-e.page.xpading,a.y),t.setLineWidth(.1),t.setLineDashPattern([],0),a.y+=d(t,e),a},j=(t,a,e,g,i,n)=>{const s=g*n.page.indent;e.y+t.splitTextToSize(a.code??"",n.page.maxContentWidth-s).length*d(t,n)-2*d(t,n)>=n.page.maxContentHeight&&(c(t,n),e.y=n.page.topmargin);const x=t.splitTextToSize(a.code??"",n.page.maxContentWidth-s).length*d(t,n);return e.y+=n.page.lineSpace,t.setFillColor("#EEEEEE"),t.setDrawColor("#eee"),t.roundedRect(e.x,e.y-n.page.lineSpace,n.page.maxContentWidth,x,2,2,"FD"),t.setFontSize(10),t.text(a.lang??"",e.x+n.page.maxContentWidth-t.getTextWidth(a.lang??"")-n.page.lineSpace/2,e.y),t.setFontSize(n.page.defaultFontSize),t.text(a.code??"",e.x+4,e.y),e.y+=x,e},R=async(t,a,e)=>{const g=await S(a);console.log(g);let i={x:e.cursor.x,y:e.cursor.y};const n=(s,x=0,y=!1,l=0,h=!1,f=!0)=>{const b=x*e.page.indent;switch(i.y+t.splitTextToSize(s.content??"",e.page.maxContentWidth-b).length*d(t,e)>=e.page.maxContentHeight&&(c(t,e),i.y=e.page.topmargin),s.type){case r.Heading:i=w(t,s,i,b,e,n);break;case r.Paragraph:i=E(t,s,i,b,e,n);break;case r.List:i=I(t,s,i,x,e,n);break;case r.ListItem:i=u(t,s,i,x,e,n,l,h);break;case r.Hr:i=T(t,i,e);break;case r.Code:i=j(t,s,i,x,y,e);break;case r.Strong:case r.Em:i=F(t,s,i,b,e);break;case r.Raw:case r.Text:i=P(t,s,i,x,y,e,n,l,h,f);break;default:console.warn(`Warning: Unsupported element type encountered: ${s.type}. 
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const W=require("marked");var s=(t=>(t.Heading="heading",t.Paragraph="paragraph",t.List="list",t.ListItem="list_item",t.Blockquote="blockquote",t.Code="code",t.CodeSpan="codespan",t.Table="table",t.Html="html",t.Hr="hr",t.Image="image",t.Link="link",t.Strong="strong",t.Em="em",t.TableHeader="table_header",t.TableCell="table_cell",t.Raw="raw",t.Text="text",t))(s||{});const S=async t=>{const a=await W.marked.lexer(t,{async:!0});return d(a)},d=t=>{const a=[];return t.forEach(e=>{try{const g=m[e.type];g?a.push(g(e)):a.push({type:s.Raw,content:e.raw})}catch(g){console.error("Failed to handle token ==>",e,g)}}),a},m={[s.Heading]:t=>({type:s.Heading,depth:t.depth,content:t.text,items:t.tokens?d(t.tokens):[]}),[s.Paragraph]:t=>({type:s.Paragraph,content:t.text,items:t.tokens?d(t.tokens):[]}),[s.List]:t=>({type:s.List,ordered:t.ordered,start:t.start,items:t.items?d(t.items):[]}),[s.ListItem]:t=>({type:s.ListItem,content:t.text,items:t.tokens?d(t.tokens):[]}),[s.Code]:t=>({type:s.Code,lang:t.lang,code:t.text}),[s.Table]:t=>({type:s.Table,header:t.header.map(a=>({type:s.TableHeader,content:a})),rows:t.rows.map(a=>a.map(e=>({type:s.TableCell,content:e})))}),[s.Image]:t=>({type:s.Image,src:t.href,alt:t.text}),[s.Link]:t=>({type:s.Link,href:t.href,text:t.text,items:t.tokens?d(t.tokens):[]}),[s.Strong]:t=>({type:s.Strong,content:t.text,items:t.tokens?d(t.tokens):[]}),[s.Em]:t=>({type:s.Em,content:t.text,items:t.tokens?d(t.tokens):[]}),[s.Text]:t=>({type:s.Text,content:t.text,items:t.tokens?d(t.tokens):[]}),[s.Hr]:t=>({type:s.Hr,content:t.raw,items:t.tokens?d(t.tokens):[]}),[s.CodeSpan]:t=>({type:s.CodeSpan,content:t.text,items:t.tokens?d(t.tokens):[]})},c=(t,a)=>{var e,g;typeof a.pageBreakHandler=="function"?a.pageBreakHandler():t.addPage((e=a.page)==null?void 0:e.format,(g=a.page)==null?void 0:g.orientation)},p=(t,a)=>t.getTextDimensions("H").h*a.page.defaultLineHeightFactor,w=(t,a,e,g,i,n)=>{const h=6-((a==null?void 0:a.depth)??0)>0?6-((a==null?void 0:a.depth)??0):0;if(t.setFontSize(i.page.defaultFontSize+h),a!=null&&a.items&&(a==null?void 0:a.items.length)>0)for(const f of(a==null?void 0:a.items)??[])e=n(f,g,!1);else t.text((a==null?void 0:a.content)??"",e.x+g,e.y,{align:"left",maxWidth:i.page.maxContentWidth-g}),e.y+=1.5*p(t,i);return t.setFontSize(i.page.defaultFontSize),e},L=(t,a,e,g,i,n,h,f,y)=>{const l=(f-e)/(a.length-1);let r=i;const x=n+g*h;for(const b of a)t.text(b.text,r,x,{align:"justify",lineHeightFactor:y,maxWidth:f}),r+=b.wordLength+l},z=(t,a,e,g,i,n,h,f)=>{const y=t.map(l=>l.text).join(" ");a.text(y,e,g+i*n,{align:"justify",lineHeightFactor:f,maxWidth:h})},H=(t,a,e,g,i,n)=>{const h={x:e,y:g},f=t.getTextDimensions("A").h*n,y=a.split(" ");let l=0,r=[],x=0;for(const b of y){const C=t.getTextWidth(b+"a");C+x>=i&&(L(t,r,x,l++,e,g,f,i,n),r=[],x=0),r.push({text:b,wordLength:C}),x+=C}return r.length>0&&z(r,t,e,g,l,f,i,n),h.y=g+l*f,h.x=t.getTextWidth(a)+e,h},I=(t,a,e,g,i,n)=>{t.setFontSize(i.page.defaultFontSize);let h=a.content;const f=t.getTextDimensions("A").h*i.page.defaultLineHeightFactor;if(a!=null&&a.items&&(a==null?void 0:a.items.length)>0)for(const y of(a==null?void 0:a.items)??[])e=n(y,g,!1);else{if(e.y+t.splitTextToSize(h??"",i.page.maxContentWidth-g).length*f-3*f>=i.page.maxContentHeight){const y=t.splitTextToSize(h??"",i.page.maxContentWidth-g),l=[],r=e.y;for(let x=0;x<y.length;x++)if(e.y-2*f<i.page.maxContentHeight)l.push(y[x]),e.y+=i.page.lineSpace;else{x<=y.length-1&&(h=y.slice(x).join(""));break}l.length>0&&(e=H(t,l.join(" "),e.x+g,r,i.page.maxContentWidth-g,i.page.defaultLineHeightFactor)),c(t,i),e.y=i.page.topmargin}e.y=H(t,h??"",e.x+g,e.y,i.page.maxContentWidth-g,i.page.defaultLineHeightFactor).y+p(t,i),e.x=i.page.xpading}return e},u=(t,a,e,g,i,n)=>{var h;t.setFontSize(i.page.defaultFontSize);for(const[f,y]of((h=a==null?void 0:a.items)==null?void 0:h.entries())??[]){const l=a.ordered?(a.start??0)+f:a.start;e=n(y,g+1,!0,l,a.ordered),e.y+=p(t,i)*.2}return e},F=(t,a,e,g,i)=>{const n=t.getFont().fontName,h=t.getFont().fontStyle,f=t.getFontSize(),y=r=>{switch(r){case"normal":return 0;case"bold":return 1;case"italic":return 1.5;case"bolditalic":return 2.5;default:return 0}},l=(r,x)=>{x==="bold"?t.setFont(i.font.bold.name&&i.font.bold.name!==""?i.font.bold.name:n,i.font.bold.style||"bold"):x==="italic"?t.setFont(i.font.regular.name,"italic"):x==="bolditalic"?t.setFont(i.font.bold.name&&i.font.bold.name!==""?i.font.bold.name:n,"bolditalic"):t.setFont(i.font.regular.name,h);const b=t.getTextWidth(r);e.x+b>i.page.xpading+i.page.maxContentWidth&&(e.x=i.page.xpading,e.y+=p(t,i));const C=t.getTextWidth(" ");t.text(r,e.x+g,e.y,{baseline:"top"}),e.x+=b+C*y(x)+(x==="normal"?g*.7:0)};if(a.type==="text"&&a.items&&a.items.length>0)for(const r of a.items)if(r.type==="em"||r.type==="strong"){const x=r.type==="em"?"italic":"bold";if(r.items&&r.items.length>0)for(const b of r.items)b.type==="strong"&&x==="italic"||b.type==="em"&&x==="bold"?l(b.content||"","bolditalic"):l(b.content||"",x);else l(r.content||"",x)}else l(r.content||"","normal");else a.type==="em"?l(a.content||"","italic"):a.type==="strong"?l(a.content||"","bold"):l(a.content||"","normal");return t.setFont(n,h),t.setFontSize(f),e},E=(t,a,e,g,i,n,h,f)=>{const y=g*i.page.indent,l=f?`${h}. `:"• ";e.y+p(t,i)>=i.page.maxContentHeight&&(c(t,i),e.y=i.page.topmargin),t.setFont(i.font.regular.name,i.font.regular.style),t.text(l,e.x+y,e.y,{baseline:"top"});const r=t.getTextWidth(l);if(e.x+=r,a.items&&a.items.length>0)for(const x of a.items){if(e.y+p(t,i)>=i.page.maxContentHeight&&(c(t,i),e.y=i.page.topmargin),x.type===s.List)n(x,g+1,!0,h,x.ordered??!1);else if(x.type===s.ListItem){const b=a.type===s.List?g:g+1;n(x,b,!0,h,f)}else e=F(t,x,e,y,i);e.x=i.page.xpading,e.y+=p(t,i)}else if(a.content){t.text(a.content,e.x+y,e.y,{baseline:"top"});const x=t.getTextWidth(a.content);e.x+=x}return e},P=(t,a,e,g,i,n,h,f,y,l=!0)=>{if(a!=null&&a.items&&(a==null?void 0:a.items.length)>0)for(const r of(a==null?void 0:a.items)??[])e=h(r,g,i,f,y,l);else{const r=g*n.page.indent,x=i?y?`${f}. `:"• ":"",b=t.splitTextToSize(x+a.content,n.page.maxContentWidth-r);e.y+b.length*p(t,n)>=n.page.maxContentHeight&&(c(t,n),e.y=n.page.topmargin),l?(e.y=H(t,x+a.content,e.x+r,e.y,n.page.maxContentWidth-r,n.page.defaultLineHeightFactor).y+p(t,n),e.x=n.page.xpading):(t.text(x+a.content,e.x+r,e.y,{baseline:"top"}),e.x+=t.getTextWidth(x+a.content),e.x>=n.page.xpading+n.page.maxContentWidth&&(c(t,n),e.x=n.page.xpading,e.y+=p(t,n)))}return e},T=(t,a,e)=>{const g=t.internal.pageSize.getWidth();return t.setLineDashPattern([1,1],0),t.setLineWidth(.1),t.line(e.page.xpading,a.y,g-e.page.xpading,a.y),t.setLineWidth(.1),t.setLineDashPattern([],0),a.y+=p(t,e),a},j=(t,a,e,g,i,n)=>{const h=g*n.page.indent;e.y+t.splitTextToSize(a.code??"",n.page.maxContentWidth-h).length*p(t,n)-2*p(t,n)>=n.page.maxContentHeight&&(c(t,n),e.y=n.page.topmargin);const f=t.splitTextToSize(a.code??"",n.page.maxContentWidth-h).length*p(t,n);return e.y+=n.page.lineSpace,t.setFillColor("#EEEEEE"),t.setDrawColor("#eee"),t.roundedRect(e.x,e.y-n.page.lineSpace,n.page.maxContentWidth,f,2,2,"FD"),t.setFontSize(10),t.text(a.lang??"",e.x+n.page.maxContentWidth-t.getTextWidth(a.lang??"")-n.page.lineSpace/2,e.y),t.setFontSize(n.page.defaultFontSize),t.text(a.code??"",e.x+4,e.y),e.y+=f,e},D=async(t,a,e)=>{const g=await S(a);console.log(g);let i={x:e.cursor.x,y:e.cursor.y};const n=(h,f=0,y=!1,l=0,r=!1,x=!0)=>{const b=f*e.page.indent;switch(i.y+t.splitTextToSize(h.content??"",e.page.maxContentWidth-b).length*p(t,e)>=e.page.maxContentHeight&&(c(t,e),i.y=e.page.topmargin),h.type){case s.Heading:i=w(t,h,i,b,e,n);break;case s.Paragraph:i=I(t,h,i,b,e,n);break;case s.List:i=u(t,h,i,f,e,n);break;case s.ListItem:i=E(t,h,i,f,e,n,l,r);break;case s.Hr:i=T(t,i,e);break;case s.Code:i=j(t,h,i,f,y,e);break;case s.Strong:case s.Em:i=F(t,h,i,b,e);break;case s.Raw:case s.Text:i=P(t,h,i,f,y,e,n,l,r,x);break;default:console.warn(`Warning: Unsupported element type encountered: ${h.type}. 
                     If you believe this element type should be supported, please create an issue at:
                     https://github.com/JeelGajera/jspdf-md-renderer/issues
-                    with details of the element and expected behavior. Thank you for helping improve this library!`);break}return i};for(const s of g)n(s);e.endCursorYHandler(i.y)};exports.MdTextParser=S;exports.MdTextRender=R;
+                    with details of the element and expected behavior. Thank you for helping improve this library!`);break}return i};for(const h of g)n(h);e.endCursorYHandler(i.y)};exports.MdTextParser=S;exports.MdTextRender=D;

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { marked as S } from "marked";
-var h = /* @__PURE__ */ ((t) => (t.Heading = "heading", t.Paragraph = "paragraph", t.List = "list", t.ListItem = "list_item", t.Blockquote = "blockquote", t.Code = "code", t.CodeSpan = "codespan", t.Table = "table", t.Html = "html", t.Hr = "hr", t.Image = "image", t.Link = "link", t.Strong = "strong", t.Em = "em", t.TableHeader = "table_header", t.TableCell = "table_cell", t.Raw = "raw", t.Text = "text", t))(h || {});
-const W = async (t) => {
-  const a = await S.lexer(t, { async: !0 });
+import { marked as W } from "marked";
+var s = /* @__PURE__ */ ((t) => (t.Heading = "heading", t.Paragraph = "paragraph", t.List = "list", t.ListItem = "list_item", t.Blockquote = "blockquote", t.Code = "code", t.CodeSpan = "codespan", t.Table = "table", t.Html = "html", t.Hr = "hr", t.Image = "image", t.Link = "link", t.Strong = "strong", t.Em = "em", t.TableHeader = "table_header", t.TableCell = "table_cell", t.Raw = "raw", t.Text = "text", t))(s || {});
+const S = async (t) => {
+  const a = await W.lexer(t, { async: !0 });
   return d(a);
 }, d = (t) => {
   const a = [];
@@ -9,7 +9,7 @@ const W = async (t) => {
     try {
       const g = m[e.type];
       g ? a.push(g(e)) : a.push({
-        type: h.Raw,
+        type: s.Raw,
         content: e.raw
       });
     } catch (g) {
@@ -17,79 +17,79 @@ const W = async (t) => {
     }
   }), a;
 }, m = {
-  [h.Heading]: (t) => ({
-    type: h.Heading,
+  [s.Heading]: (t) => ({
+    type: s.Heading,
     depth: t.depth,
     content: t.text,
     items: t.tokens ? d(t.tokens) : []
   }),
-  [h.Paragraph]: (t) => ({
-    type: h.Paragraph,
+  [s.Paragraph]: (t) => ({
+    type: s.Paragraph,
     content: t.text,
     items: t.tokens ? d(t.tokens) : []
   }),
-  [h.List]: (t) => ({
-    type: h.List,
+  [s.List]: (t) => ({
+    type: s.List,
     ordered: t.ordered,
     start: t.start,
     items: t.items ? d(t.items) : []
   }),
-  [h.ListItem]: (t) => ({
-    type: h.ListItem,
+  [s.ListItem]: (t) => ({
+    type: s.ListItem,
     content: t.text,
     items: t.tokens ? d(t.tokens) : []
   }),
-  [h.Code]: (t) => ({
-    type: h.Code,
+  [s.Code]: (t) => ({
+    type: s.Code,
     lang: t.lang,
     code: t.text
   }),
-  [h.Table]: (t) => ({
-    type: h.Table,
+  [s.Table]: (t) => ({
+    type: s.Table,
     header: t.header.map((a) => ({
-      type: h.TableHeader,
+      type: s.TableHeader,
       content: a
     })),
     rows: t.rows.map(
       (a) => a.map((e) => ({
-        type: h.TableCell,
+        type: s.TableCell,
         content: e
       }))
     )
   }),
-  [h.Image]: (t) => ({
-    type: h.Image,
+  [s.Image]: (t) => ({
+    type: s.Image,
     src: t.href,
     alt: t.text
   }),
-  [h.Link]: (t) => ({
-    type: h.Link,
+  [s.Link]: (t) => ({
+    type: s.Link,
     href: t.href,
     text: t.text,
     items: t.tokens ? d(t.tokens) : []
   }),
-  [h.Strong]: (t) => ({
-    type: h.Strong,
+  [s.Strong]: (t) => ({
+    type: s.Strong,
     content: t.text,
     items: t.tokens ? d(t.tokens) : []
   }),
-  [h.Em]: (t) => ({
-    type: h.Em,
+  [s.Em]: (t) => ({
+    type: s.Em,
     content: t.text,
     items: t.tokens ? d(t.tokens) : []
   }),
-  [h.Text]: (t) => ({
-    type: h.Text,
+  [s.Text]: (t) => ({
+    type: s.Text,
     content: t.text,
     items: t.tokens ? d(t.tokens) : []
   }),
-  [h.Hr]: (t) => ({
-    type: h.Hr,
+  [s.Hr]: (t) => ({
+    type: s.Hr,
     content: t.raw,
     items: t.tokens ? d(t.tokens) : []
   }),
-  [h.CodeSpan]: (t) => ({
-    type: h.CodeSpan,
+  [s.CodeSpan]: (t) => ({
+    type: s.CodeSpan,
     content: t.text,
     items: t.tokens ? d(t.tokens) : []
   })
@@ -97,8 +97,8 @@ const W = async (t) => {
   var e, g;
   typeof a.pageBreakHandler == "function" ? a.pageBreakHandler() : t.addPage((e = a.page) == null ? void 0 : e.format, (g = a.page) == null ? void 0 : g.orientation);
 }, p = (t, a) => t.getTextDimensions("H").h * a.page.defaultLineHeightFactor, w = (t, a, e, g, i, n) => {
-  const s = 6 - ((a == null ? void 0 : a.depth) ?? 0) > 0 ? 6 - ((a == null ? void 0 : a.depth) ?? 0) : 0;
-  if (t.setFontSize(i.page.defaultFontSize + s), a != null && a.items && (a == null ? void 0 : a.items.length) > 0)
+  const h = 6 - ((a == null ? void 0 : a.depth) ?? 0) > 0 ? 6 - ((a == null ? void 0 : a.depth) ?? 0) : 0;
+  if (t.setFontSize(i.page.defaultFontSize + h), a != null && a.items && (a == null ? void 0 : a.items.length) > 0)
     for (const r of (a == null ? void 0 : a.items) ?? [])
       e = n(r, g, !1);
   else
@@ -107,88 +107,88 @@ const W = async (t) => {
       maxWidth: i.page.maxContentWidth - g
     }), e.y += 1.5 * p(t, i);
   return t.setFontSize(i.page.defaultFontSize), e;
-}, L = (t, a, e, g, i, n, s, r, y) => {
-  const f = (r - e) / (a.length - 1);
-  let x = i;
-  const l = n + g * s;
+}, L = (t, a, e, g, i, n, h, r, y) => {
+  const l = (r - e) / (a.length - 1);
+  let f = i;
+  const x = n + g * h;
   for (const b of a)
-    t.text(b.text, x, l, {
+    t.text(b.text, f, x, {
       align: "justify",
       lineHeightFactor: y,
       maxWidth: r
-    }), x += b.wordLength + f;
-}, z = (t, a, e, g, i, n, s, r) => {
-  const y = t.map((f) => f.text).join(" ");
+    }), f += b.wordLength + l;
+}, z = (t, a, e, g, i, n, h, r) => {
+  const y = t.map((l) => l.text).join(" ");
   a.text(y, e, g + i * n, {
     align: "justify",
     lineHeightFactor: r,
-    maxWidth: s
+    maxWidth: h
   });
 }, H = (t, a, e, g, i, n) => {
-  const s = {
+  const h = {
     x: e,
     y: g
   }, r = t.getTextDimensions("A").h * n, y = a.split(" ");
-  let f = 0, x = [], l = 0;
+  let l = 0, f = [], x = 0;
   for (const b of y) {
     const C = t.getTextWidth(b + "a");
-    C + l >= i && (L(
+    C + x >= i && (L(
       t,
+      f,
       x,
-      l,
-      f++,
+      l++,
       e,
       g,
       r,
       i,
       n
-    ), x = [], l = 0), x.push({ text: b, wordLength: C }), l += C;
+    ), f = [], x = 0), f.push({ text: b, wordLength: C }), x += C;
   }
-  return x.length > 0 && z(
-    x,
+  return f.length > 0 && z(
+    f,
     t,
     e,
     g,
-    f,
+    l,
     r,
     i,
     n
-  ), s.y = g + f * r, s.x = t.getTextWidth(a) + e, s;
-}, E = (t, a, e, g, i, n) => {
+  ), h.y = g + l * r, h.x = t.getTextWidth(a) + e, h;
+}, I = (t, a, e, g, i, n) => {
   t.setFontSize(i.page.defaultFontSize);
-  let s = a.content;
+  let h = a.content;
   const r = t.getTextDimensions("A").h * i.page.defaultLineHeightFactor;
   if (a != null && a.items && (a == null ? void 0 : a.items.length) > 0)
     for (const y of (a == null ? void 0 : a.items) ?? [])
       e = n(y, g, !1);
   else {
     if (e.y + t.splitTextToSize(
-      s ?? "",
+      h ?? "",
       i.page.maxContentWidth - g
     ).length * r - 3 * r >= i.page.maxContentHeight) {
       const y = t.splitTextToSize(
-        s ?? "",
+        h ?? "",
         i.page.maxContentWidth - g
-      ), f = [], x = e.y;
-      for (let l = 0; l < y.length; l++)
+      ), l = [], f = e.y;
+      for (let x = 0; x < y.length; x++)
         if (e.y - 2 * r < i.page.maxContentHeight)
-          f.push(y[l]), e.y += i.page.lineSpace;
+          l.push(y[x]), e.y += i.page.lineSpace;
         else {
-          l <= y.length - 1 && (s = y.slice(l).join(""));
+          x <= y.length - 1 && (h = y.slice(x).join(""));
           break;
         }
-      f.length > 0 && (e = H(
+      l.length > 0 && (e = H(
         t,
-        f.join(" "),
+        l.join(" "),
         e.x + g,
-        x,
+        f,
         i.page.maxContentWidth - g,
         i.page.defaultLineHeightFactor
       )), c(t, i), e.y = i.page.topmargin;
     }
     e.y = H(
       t,
-      s ?? "",
+      h ?? "",
       e.x + g,
       e.y,
       i.page.maxContentWidth - g,
@@ -196,23 +196,23 @@ const W = async (t) => {
     ).y + p(t, i), e.x = i.page.xpading;
   }
   return e;
-}, I = (t, a, e, g, i, n) => {
-  var s;
+}, E = (t, a, e, g, i, n) => {
+  var h;
   t.setFontSize(i.page.defaultFontSize);
-  for (const [r, y] of ((s = a == null ? void 0 : a.items) == null ? void 0 : s.entries()) ?? []) {
-    const f = a.ordered ? (a.start ?? 0) + r : a.start;
+  for (const [r, y] of ((h = a == null ? void 0 : a.items) == null ? void 0 : h.entries()) ?? []) {
+    const l = a.ordered ? (a.start ?? 0) + r : a.start;
     e = n(
       y,
       g + 1,
       !0,
-      f,
+      l,
       a.ordered
     ), e.y += p(t, i) * 0.2;
   }
   return e;
 }, F = (t, a, e, g, i) => {
-  const n = t.getFont().fontName, s = t.getFont().fontStyle, r = t.getFontSize(), y = (x) => {
-    switch (x) {
+  const n = t.getFont().fontName, h = t.getFont().fontStyle, r = t.getFontSize(), y = (f) => {
+    switch (f) {
       case "normal":
         return 0;
       case "bold":
@@ -224,80 +224,99 @@ const W = async (t) => {
       default:
         return 0;
     }
-  }, f = (x, l) => {
-    l === "bold" ? t.setFont(
+  }, l = (f, x) => {
+    x === "bold" ? t.setFont(
       i.font.bold.name && i.font.bold.name !== "" ? i.font.bold.name : n,
       i.font.bold.style || "bold"
-    ) : l === "italic" ? t.setFont(i.font.regular.name, "italic") : l === "bolditalic" ? t.setFont(
+    ) : x === "italic" ? t.setFont(i.font.regular.name, "italic") : x === "bolditalic" ? t.setFont(
       i.font.bold.name && i.font.bold.name !== "" ? i.font.bold.name : n,
       "bolditalic"
-    ) : t.setFont(i.font.regular.name, s);
-    const b = t.getTextWidth(x);
+    ) : t.setFont(i.font.regular.name, h);
+    const b = t.getTextWidth(f);
     e.x + b > i.page.xpading + i.page.maxContentWidth && (e.x = i.page.xpading, e.y += p(t, i));
     const C = t.getTextWidth(" ");
-    t.text(x, e.x + g, e.y, { baseline: "top" }), e.x += b + C * y(l) + (l === "normal" ? g * 0.7 : 0);
+    t.text(f, e.x + g, e.y, { baseline: "top" }), e.x += b + C * y(x) + (x === "normal" ? g * 0.7 : 0);
   };
   if (a.type === "text" && a.items && a.items.length > 0)
-    for (const x of a.items)
-      if (x.type === "em" || x.type === "strong") {
-        const l = x.type === "em" ? "italic" : "bold";
-        if (x.items && x.items.length > 0)
-          for (const b of x.items)
-            b.type === "strong" && l === "italic" || b.type === "em" && l === "bold" ? f(
+    for (const f of a.items)
+      if (f.type === "em" || f.type === "strong") {
+        const x = f.type === "em" ? "italic" : "bold";
+        if (f.items && f.items.length > 0)
+          for (const b of f.items)
+            b.type === "strong" && x === "italic" || b.type === "em" && x === "bold" ? l(
               b.content || "",
               "bolditalic"
-            ) : f(
+            ) : l(
               b.content || "",
-              l
+              x
             );
         else
-          f(x.content || "", l);
+          l(f.content || "", x);
       } else
-        f(x.content || "", "normal");
-  else a.type === "em" ? f(a.content || "", "italic") : a.type === "strong" ? f(a.content || "", "bold") : f(a.content || "", "normal");
-  return t.setFont(n, s), t.setFontSize(r), e;
-}, P = (t, a, e, g, i, n, s, r) => {
-  const y = g * i.page.indent, f = r ? `${s}. ` : "• ";
-  if (e.y + p(t, i) >= i.page.maxContentHeight && (c(t, i), e.y = i.page.topmargin), t.setFont(i.font.regular.name, i.font.regular.style), t.text(f, e.x + y, e.y, { baseline: "top" }), e.x += t.getTextWidth(f), a.items && a.items.length > 0)
-    for (const x of a.items)
-      e = F(
-        t,
-        x,
-        e,
-        y,
-        i
-      );
-  else a.content && (t.text(a.content, e.x, e.y, { baseline: "top" }), e.x += t.getTextWidth(a.content));
-  return e.y += p(t, i), e.x = i.page.xpading, e;
-}, u = (t, a, e, g, i, n, s, r, y, f = !0) => {
+        l(f.content || "", "normal");
+  else a.type === "em" ? l(a.content || "", "italic") : a.type === "strong" ? l(a.content || "", "bold") : l(a.content || "", "normal");
+  return t.setFont(n, h), t.setFontSize(r), e;
+}, u = (t, a, e, g, i, n, h, r) => {
+  const y = g * i.page.indent, l = r ? `${h}. ` : "• ";
+  e.y + p(t, i) >= i.page.maxContentHeight && (c(t, i), e.y = i.page.topmargin), t.setFont(i.font.regular.name, i.font.regular.style), t.text(l, e.x + y, e.y, { baseline: "top" });
+  const f = t.getTextWidth(l);
+  if (e.x += f, a.items && a.items.length > 0)
+    for (const x of a.items) {
+      if (e.y + p(t, i) >= i.page.maxContentHeight && (c(t, i), e.y = i.page.topmargin), x.type === s.List)
+        n(x, g + 1, !0, h, x.ordered ?? !1);
+      else if (x.type === s.ListItem) {
+        const b = a.type === s.List ? g : g + 1;
+        n(x, b, !0, h, r);
+      } else
+        e = F(
+          t,
+          x,
+          e,
+          y,
+          i
+        );
+      e.x = i.page.xpading, e.y += p(t, i);
+    }
+  else if (a.content) {
+    t.text(
+      a.content,
+      e.x + y,
+      e.y,
+      { baseline: "top" }
+    );
+    const x = t.getTextWidth(a.content);
+    e.x += x;
+  }
+  return e;
+}, P = (t, a, e, g, i, n, h, r, y, l = !0) => {
   if (a != null && a.items && (a == null ? void 0 : a.items.length) > 0)
-    for (const x of (a == null ? void 0 : a.items) ?? [])
-      e = s(
-        x,
+    for (const f of (a == null ? void 0 : a.items) ?? [])
+      e = h(
+        f,
         g,
         i,
         r,
         y,
-        f
+        l
       );
   else {
-    const x = g * n.page.indent, l = i ? y ? `${r}. ` : "• " : "", b = t.splitTextToSize(
-      l + a.content,
-      n.page.maxContentWidth - x
+    const f = g * n.page.indent, x = i ? y ? `${r}. ` : "• " : "", b = t.splitTextToSize(
+      x + a.content,
+      n.page.maxContentWidth - f
     );
-    e.y + b.length * p(t, n) >= n.page.maxContentHeight && (c(t, n), e.y = n.page.topmargin), f ? (e.y = H(
+    e.y + b.length * p(t, n) >= n.page.maxContentHeight && (c(t, n), e.y = n.page.topmargin), l ? (e.y = H(
       t,
-      l + a.content,
-      e.x + x,
+      x + a.content,
+      e.x + f,
       e.y,
-      n.page.maxContentWidth - x,
+      n.page.maxContentWidth - f,
       n.page.defaultLineHeightFactor
     ).y + p(t, n), e.x = n.page.xpading) : (t.text(
-      l + a.content,
-      e.x + x,
+      x + a.content,
+      e.x + f,
       e.y,
       { baseline: "top" }
-    ), e.x += t.getTextWidth(l + a.content), e.x >= n.page.xpading + n.page.maxContentWidth && (c(t, n), e.x = n.page.xpading, e.y += p(t, n)));
+    ), e.x += t.getTextWidth(x + a.content), e.x >= n.page.xpading + n.page.maxContentWidth && (c(t, n), e.x = n.page.xpading, e.y += p(t, n)));
   }
   return e;
 }, j = (t, a, e) => {
@@ -309,14 +328,14 @@ const W = async (t) => {
     a.y
   ), t.setLineWidth(0.1), t.setLineDashPattern([], 0), a.y += p(t, e), a;
 }, D = (t, a, e, g, i, n) => {
-  const s = g * n.page.indent;
+  const h = g * n.page.indent;
   e.y + t.splitTextToSize(
     a.code ?? "",
-    n.page.maxContentWidth - s
+    n.page.maxContentWidth - h
   ).length * p(t, n) - 2 * p(t, n) >= n.page.maxContentHeight && (c(t, n), e.y = n.page.topmargin);
   const r = t.splitTextToSize(
     a.code ?? "",
-    n.page.maxContentWidth - s
+    n.page.maxContentWidth - h
   ).length * p(t, n);
   return e.y += n.page.lineSpace, t.setFillColor("#EEEEEE"), t.setDrawColor("#eee"), t.roundedRect(
     e.x,
@@ -331,102 +350,102 @@ const W = async (t) => {
     e.x + n.page.maxContentWidth - t.getTextWidth(a.lang ?? "") - n.page.lineSpace / 2,
     e.y
   ), t.setFontSize(n.page.defaultFontSize), t.text(a.code ?? "", e.x + 4, e.y), e.y += r, e;
-}, T = async (t, a, e) => {
-  const g = await W(a);
+}, R = async (t, a, e) => {
+  const g = await S(a);
   console.log(g);
   let i = {
     x: e.cursor.x,
     y: e.cursor.y
   };
-  const n = (s, r = 0, y = !1, f = 0, x = !1, l = !0) => {
+  const n = (h, r = 0, y = !1, l = 0, f = !1, x = !0) => {
     const b = r * e.page.indent;
     switch (i.y + t.splitTextToSize(
-      s.content ?? "",
+      h.content ?? "",
       e.page.maxContentWidth - b
-    ).length * p(t, e) >= e.page.maxContentHeight && (c(t, e), i.y = e.page.topmargin), s.type) {
-      case h.Heading:
+    ).length * p(t, e) >= e.page.maxContentHeight && (c(t, e), i.y = e.page.topmargin), h.type) {
+      case s.Heading:
         i = w(
           t,
-          s,
+          h,
           i,
           b,
           e,
           n
         );
         break;
-      case h.Paragraph:
-        i = E(
+      case s.Paragraph:
+        i = I(
           t,
-          s,
+          h,
           i,
           b,
           e,
           n
         );
         break;
-      case h.List:
-        i = I(
+      case s.List:
+        i = E(
           t,
-          s,
+          h,
           i,
           r,
           e,
           n
         );
         break;
-      case h.ListItem:
-        i = P(
+      case s.ListItem:
+        i = u(
           t,
-          s,
+          h,
           i,
           r,
           e,
           n,
-          f,
-          x
+          l,
+          f
         );
         break;
-      case h.Hr:
+      case s.Hr:
         i = j(t, i, e);
         break;
-      case h.Code:
+      case s.Code:
         i = D(
           t,
-          s,
+          h,
           i,
           r,
           y,
           e
         );
         break;
-      case h.Strong:
-      case h.Em:
+      case s.Strong:
+      case s.Em:
         i = F(
           t,
-          s,
+          h,
           i,
           b,
           e
         );
         break;
-      case h.Raw:
-      case h.Text:
-        i = u(
+      case s.Raw:
+      case s.Text:
+        i = P(
           t,
-          s,
+          h,
           i,
           r,
           y,
           e,
           n,
+          l,
           f,
-          x,
-          l
+          x
         );
         break;
       default:
         console.warn(
-          `Warning: Unsupported element type encountered: ${s.type}. 
+          `Warning: Unsupported element type encountered: ${h.type}. 
                     If you believe this element type should be supported, please create an issue at:
                     https://github.com/JeelGajera/jspdf-md-renderer/issues
                     with details of the element and expected behavior. Thank you for helping improve this library!`
@@ -435,11 +454,11 @@ const W = async (t) => {
     }
     return i;
   };
-  for (const s of g)
-    n(s);
+  for (const h of g)
+    n(h);
   e.endCursorYHandler(i.y);
 };
 export {
-  W as MdTextParser,
-  T as MdTextRender
+  S as MdTextParser,
+  R as MdTextRender
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jspdf-md-renderer",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "A jsPDF utility to render Markdown directly into formatted PDFs with custom designs.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",