@speajus/markdown-to-pdf 1.0.5 → 1.0.6

package/dist/renderer.js

@@ -76,12 +76,38 @@ async function renderMarkdownToPdf(markdown, options) {
     }
     const tokens = marked_1.marked.lexer(markdown);
     const contentWidth = doc.page.width - margins.left - margins.right;
+    // ── Table cell context ──────────────────────────────────────────────────
+    // When rendering inline tokens inside a table cell, the first text output
+    // must be positioned at the cell's (x, y) with the cell's width/align.
+    // Subsequent text outputs in the same cell use PDFKit's continued-flow.
+    let cellCtx = null;
+    // ── Heading context ───────────────────────────────────────────────────
+    // When rendering inline tokens inside a heading, font helpers use the
+    // heading's style (font, fontSize, color) instead of the body style.
+    let headingCtx = null;
     function ensureSpace(needed) {
         if (doc.y + needed > doc.page.height - margins.bottom) {
             doc.addPage();
         }
     }
+    /** Derive the italic variant of a PDFKit built-in font name. */
+    function italicVariant(font) {
+        if (font.startsWith('Times'))
+            return font.replace(/-Bold$/, '-BoldItalic').replace(/^Times-Roman$/, 'Times-Italic');
+        // Helvetica / Courier families use "Oblique"
+        if (font.endsWith('-Bold'))
+            return font + 'Oblique';
+        return font + '-Oblique';
+    }
     function applyBodyFont(bold, italic) {
+        if (headingCtx) {
+            // Inside a heading — use heading style as the base.
+            let font = headingCtx.font;
+            if (italic)
+                font = italicVariant(font);
+            doc.font(font).fontSize(headingCtx.fontSize).fillColor(headingCtx.color);
+            return;
+        }
         let font = theme.body.font;
         if (bold && italic)
             font = 'Helvetica-BoldOblique';
@@ -92,6 +118,10 @@ async function renderMarkdownToPdf(markdown, options) {
         doc.font(font).fontSize(theme.body.fontSize).fillColor(theme.body.color);
     }
     function resetBodyFont() {
+        if (headingCtx) {
+            doc.font(headingCtx.font).fontSize(headingCtx.fontSize).fillColor(headingCtx.color);
+            return;
+        }
         doc.font(theme.body.font).fontSize(theme.body.fontSize).fillColor(theme.body.color);
     }
     /**
@@ -121,6 +151,13 @@ async function renderMarkdownToPdf(markdown, options) {
         else {
             opts = xOrOpts ?? {};
         }
+        // If inside a table cell and this is the first text output, apply cell positioning.
+        if (cellCtx && !cellCtx.used && firstX === undefined) {
+            firstX = cellCtx.x;
+            firstY = cellCtx.y;
+            opts = { ...opts, width: cellCtx.width, align: cellCtx.align };
+            cellCtx.used = true;
+        }
         const hasEmoji = (0, emoji_js_1.containsEmoji)(text);
         // ── Fast path: no emoji handling needed ──────────────────────────────
         if ((!emojiEnabled && !colorEmojiEnabled) || !hasEmoji) {
@@ -286,27 +323,52 @@ async function renderMarkdownToPdf(markdown, options) {
         doc.font(cs.font).fontSize(cs.fontSize);
         const textW = doc.widthOfString(text);
         const textH = doc.currentLineHeight();
-        // Read the real flow X position from PDFKit's internal LineWrapper.
-        // After continued:true, doc.x stays at the left margin — the actual
-        // cursor position is _wrapper.startX + _wrapper.continuedX.
-        const w = doc._wrapper;
-        const flowX = w ? (w.startX + w.continuedX) : doc.x;
-        const flowY = doc.y;
+        // Determine flow position.  If this is the first output in a table cell,
+        // use the cell context coordinates; otherwise read from the LineWrapper.
+        let flowX;
+        let flowY;
+        let useCellPos = false;
+        let cellExtra = {};
+        if (cellCtx && !cellCtx.used) {
+            flowX = cellCtx.x;
+            flowY = cellCtx.y;
+            useCellPos = true;
+            cellExtra = { width: cellCtx.width, align: cellCtx.align };
+            cellCtx.used = true;
+        }
+        else {
+            // Read the real flow X position from PDFKit's internal LineWrapper.
+            // After continued:true, doc.x stays at the left margin — the actual
+            // cursor position is _wrapper.startX + _wrapper.continuedX.
+            const w = doc._wrapper;
+            flowX = w ? (w.startX + w.continuedX) : doc.x;
+            flowY = doc.y;
+        }
         // Draw background at the current flow position (behind the text)
         doc.save();
         doc.roundedRect(flowX - hPad, flowY, textW + hPad * 2, textH + vPad * 2, 2)
             .fill(cs.backgroundColor);
         doc.restore();
-        // Render inline — no explicit x,y so PDFKit's flow advances correctly
+        // Render inline — use positioned form for cell context, flow form otherwise
         doc.font(cs.font).fontSize(cs.fontSize).fillColor(cs.color);
-        doc.text(text, { continued });
+        if (useCellPos) {
+            doc.text(text, flowX, flowY, { continued, ...cellExtra });
+        }
+        else {
+            doc.text(text, { continued });
+        }
         resetBodyFont();
     }
     function renderLink(tok, continued) {
-        doc.font(theme.body.font).fontSize(theme.body.fontSize).fillColor(theme.linkColor);
+        if (headingCtx) {
+            doc.font(headingCtx.font).fontSize(headingCtx.fontSize).fillColor(theme.linkColor);
+        }
+        else {
+            doc.font(theme.body.font).fontSize(theme.body.fontSize).fillColor(theme.linkColor);
+        }
         const linkText = tok.text || tok.href;
         renderTextWithEmoji(linkText, { continued, underline: true, link: tok.href });
-        doc.fillColor(theme.body.color);
+        doc.fillColor(headingCtx ? headingCtx.color : theme.body.color);
     }
     async function renderInlineTokens(inlineTokens, continued, insideBold = false, insideItalic = false) {
         for (let i = 0; i < inlineTokens.length; i++) {
@@ -321,7 +383,7 @@ async function renderMarkdownToPdf(markdown, options) {
                     }
                     else {
                         applyBodyFont(insideBold, insideItalic);
-                        renderTextWithEmoji(t.text, { continued: cont });
+                        renderTextWithEmoji(t.text, { continued: cont, underline: false, strike: false });
                     }
                     break;
                 }
@@ -349,12 +411,12 @@ async function renderMarkdownToPdf(markdown, options) {
                 }
                 case 'del': {
                     applyBodyFont(insideBold, insideItalic);
-                    renderTextWithEmoji(tok.text, { continued: cont, strike: true });
+                    renderTextWithEmoji(tok.text, { continued: cont, strike: true, underline: false });
                     break;
                 }
                 case 'escape': {
                     applyBodyFont(insideBold, insideItalic);
-                    renderTextWithEmoji(tok.text, { continued: cont });
+                    renderTextWithEmoji(tok.text, { continued: cont, underline: false, strike: false });
                     break;
                 }
                 case 'br': {
@@ -365,7 +427,7 @@ async function renderMarkdownToPdf(markdown, options) {
                     const raw = tok.text ?? tok.raw ?? '';
                     if (raw) {
                         applyBodyFont(insideBold, insideItalic);
-                        renderTextWithEmoji(raw, { continued: cont });
+                        renderTextWithEmoji(raw, { continued: cont, underline: false, strike: false });
                     }
                     break;
                 }
@@ -430,6 +492,21 @@ async function renderMarkdownToPdf(markdown, options) {
             doc.moveDown(0.2);
         }
     }
+    async function renderCellTokens(cell, x, y, width, align, bold) {
+        const savedY = doc.y;
+        if (cell.tokens && cell.tokens.length > 0) {
+            cellCtx = { x, y, width, align, used: false };
+            applyBodyFont(bold, false);
+            await renderInlineTokens(cell.tokens, false, bold, false);
+            cellCtx = null;
+        }
+        else {
+            // Fallback: plain text (no inline tokens)
+            applyBodyFont(bold, false);
+            renderTextWithEmoji(cell.text, x, y, { width, align });
+        }
+        doc.y = savedY;
+    }
     async function renderTable(table) {
         const colCount = table.header.length;
         if (colCount === 0)
@@ -445,14 +522,9 @@ async function renderMarkdownToPdf(markdown, options) {
         doc.save();
         doc.rect(startX, y, contentWidth, rowH).fill(theme.table.headerBackground);
         doc.restore();
-        doc.font('Helvetica-Bold').fontSize(theme.body.fontSize).fillColor(theme.body.color);
         for (let c = 0; c < colCount; c++) {
             const cellX = startX + c * colWidth;
-            renderTextWithEmoji(table.header[c].text, cellX + cellPad, y + textInsetY, {
-                width: colWidth - cellPad * 2,
-                height: rowH,
-                align: table.align[c] || 'left',
-            });
+            await renderCellTokens(table.header[c], cellX + cellPad, y + textInsetY, colWidth - cellPad * 2, table.align[c] || 'left', true);
         }
         // Header border
         doc.save();
@@ -465,16 +537,11 @@ async function renderMarkdownToPdf(markdown, options) {
         doc.restore();
         y += rowH;
         // Body rows
-        resetBodyFont();
         for (const row of table.rows) {
             ensureSpace(rowH);
             for (let c = 0; c < colCount; c++) {
                 const cellX = startX + c * colWidth;
-                renderTextWithEmoji(row[c].text, cellX + cellPad, y + textInsetY, {
-                    width: colWidth - cellPad * 2,
-                    height: rowH,
-                    align: table.align[c] || 'left',
-                });
+                await renderCellTokens(row[c], cellX + cellPad, y + textInsetY, colWidth - cellPad * 2, table.align[c] || 'left', false);
             }
             doc.save();
             doc.strokeColor(theme.table.borderColor).lineWidth(0.5);
@@ -502,7 +569,14 @@ async function renderMarkdownToPdf(markdown, options) {
                 ensureSpace(spaceAbove + style.fontSize + spaceBelow);
                 doc.moveDown(spaceAbove / doc.currentLineHeight());
                 doc.font(style.font).fontSize(style.fontSize).fillColor(style.color);
-                renderTextWithEmoji(t.text);
+                headingCtx = style;
+                if (t.tokens && t.tokens.length > 0) {
+                    await renderInlineTokens(t.tokens, false, style.bold ?? false, style.italic ?? false);
+                }
+                else {
+                    renderTextWithEmoji(t.text);
+                }
+                headingCtx = null;
                 doc.moveDown(spaceBelow / doc.currentLineHeight());
                 resetBodyFont();
                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speajus/markdown-to-pdf",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "A new project created with Intent by Augment.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",