av6-pdf-engine 1.0.9 → 1.1.0

package/dist/index.d.mts

@@ -61,6 +61,12 @@ interface TableCell {
     color?: string;
     fillColor?: string;
     style?: StyleRef;
+    colSpan?: number;
+    rowSpan?: number;
+    paddingTop?: number;
+    paddingRight?: number;
+    paddingBottom?: number;
+    paddingLeft?: number;
 }
 interface TableBlock extends BaseBlock {
     type: "table";
@@ -78,6 +84,12 @@ interface TableBlock extends BaseBlock {
     marginLeft?: number;
     marginRight?: number;
 }
+interface PlacedCell {
+    cell: TableCell;
+    startCol: number;
+    colSpan: number;
+    rowSpan: number;
+}
 
 interface ColumnsBlock extends BaseBlock {
     type: "columns";
@@ -217,6 +229,7 @@ interface FontRegistration {
 interface CustomDocDefinition {
     pageSize?: string;
     margins: PageMargins;
+    pageOrientation?: "portrait" | "landscape";
     /** Optional font registrations (custom TTF/OTF) */
     fonts?: FontRegistration[];
     header?: HeaderDef;
@@ -339,4 +352,4 @@ declare function toPdfEngineError(cause: unknown, fallback: {
 declare function renderCustomPdf(def: CustomDocDefinition, outputPath: string): Promise<void>;
 declare function renderCustomPdfToBuffer(def: CustomDocDefinition): Promise<Buffer>;
 
-export { type Alignment, BARCODE_TYPES, type BarcodeBlock, type BarcodeType, type BaseBlock, type Block, type BuiltInFont, type ColumnsBlock, type CustomDocDefinition, type FontName, type FontRegistration, type FooterDef, type FooterInput, type HeaderDef, type ImageBlock, type InlineTextStyle, type KeyValueGridBlock, type KeyValueItem, type LineBlock, type Orientation, type PDFDoc, type PageBackgroundDef, type PageBreakBlock, type PageContext, type PageMargins, PdfEngineError, PdfEngineErrorCode, type QRErrorLevel, QR_ERROR_LEVEL, type QrCodeBlock, type RenderEnv, type SignatureBlock, type StyleDef, type StyleRef, type TableBlock, type TableCell, type TextBlock, type WatermarkDef, type WatermarkMode, type Width, isPdfEngineError, renderCustomPdf, renderCustomPdfToBuffer, toPdfEngineError };
+export { type Alignment, BARCODE_TYPES, type BarcodeBlock, type BarcodeType, type BaseBlock, type Block, type BuiltInFont, type ColumnsBlock, type CustomDocDefinition, type FontName, type FontRegistration, type FooterDef, type FooterInput, type HeaderDef, type ImageBlock, type InlineTextStyle, type KeyValueGridBlock, type KeyValueItem, type LineBlock, type Orientation, type PDFDoc, type PageBackgroundDef, type PageBreakBlock, type PageContext, type PageMargins, PdfEngineError, PdfEngineErrorCode, type PlacedCell, type QRErrorLevel, QR_ERROR_LEVEL, type QrCodeBlock, type RenderEnv, type SignatureBlock, type StyleDef, type StyleRef, type TableBlock, type TableCell, type TextBlock, type WatermarkDef, type WatermarkMode, type Width, isPdfEngineError, renderCustomPdf, renderCustomPdfToBuffer, toPdfEngineError };

package/dist/index.d.ts

@@ -61,6 +61,12 @@ interface TableCell {
     color?: string;
     fillColor?: string;
     style?: StyleRef;
+    colSpan?: number;
+    rowSpan?: number;
+    paddingTop?: number;
+    paddingRight?: number;
+    paddingBottom?: number;
+    paddingLeft?: number;
 }
 interface TableBlock extends BaseBlock {
     type: "table";
@@ -78,6 +84,12 @@ interface TableBlock extends BaseBlock {
     marginLeft?: number;
     marginRight?: number;
 }
+interface PlacedCell {
+    cell: TableCell;
+    startCol: number;
+    colSpan: number;
+    rowSpan: number;
+}
 
 interface ColumnsBlock extends BaseBlock {
     type: "columns";
@@ -217,6 +229,7 @@ interface FontRegistration {
 interface CustomDocDefinition {
     pageSize?: string;
     margins: PageMargins;
+    pageOrientation?: "portrait" | "landscape";
     /** Optional font registrations (custom TTF/OTF) */
     fonts?: FontRegistration[];
     header?: HeaderDef;
@@ -339,4 +352,4 @@ declare function toPdfEngineError(cause: unknown, fallback: {
 declare function renderCustomPdf(def: CustomDocDefinition, outputPath: string): Promise<void>;
 declare function renderCustomPdfToBuffer(def: CustomDocDefinition): Promise<Buffer>;
 
-export { type Alignment, BARCODE_TYPES, type BarcodeBlock, type BarcodeType, type BaseBlock, type Block, type BuiltInFont, type ColumnsBlock, type CustomDocDefinition, type FontName, type FontRegistration, type FooterDef, type FooterInput, type HeaderDef, type ImageBlock, type InlineTextStyle, type KeyValueGridBlock, type KeyValueItem, type LineBlock, type Orientation, type PDFDoc, type PageBackgroundDef, type PageBreakBlock, type PageContext, type PageMargins, PdfEngineError, PdfEngineErrorCode, type QRErrorLevel, QR_ERROR_LEVEL, type QrCodeBlock, type RenderEnv, type SignatureBlock, type StyleDef, type StyleRef, type TableBlock, type TableCell, type TextBlock, type WatermarkDef, type WatermarkMode, type Width, isPdfEngineError, renderCustomPdf, renderCustomPdfToBuffer, toPdfEngineError };
+export { type Alignment, BARCODE_TYPES, type BarcodeBlock, type BarcodeType, type BaseBlock, type Block, type BuiltInFont, type ColumnsBlock, type CustomDocDefinition, type FontName, type FontRegistration, type FooterDef, type FooterInput, type HeaderDef, type ImageBlock, type InlineTextStyle, type KeyValueGridBlock, type KeyValueItem, type LineBlock, type Orientation, type PDFDoc, type PageBackgroundDef, type PageBreakBlock, type PageContext, type PageMargins, PdfEngineError, PdfEngineErrorCode, type PlacedCell, type QRErrorLevel, QR_ERROR_LEVEL, type QrCodeBlock, type RenderEnv, type SignatureBlock, type StyleDef, type StyleRef, type TableBlock, type TableCell, type TextBlock, type WatermarkDef, type WatermarkMode, type Width, isPdfEngineError, renderCustomPdf, renderCustomPdfToBuffer, toPdfEngineError };

package/dist/index.js

@@ -519,29 +519,117 @@ var processLineBlock = (doc, ctx, block, y, env, ensureSpaceFor) => {
 };
 
 // src/renderer-engine/blocks/table.ts
+var normalizeSpan = (value) => {
+  if (!value || value < 1) return 1;
+  return Math.floor(value);
+};
+var sum = (arr) => arr.reduce((a, b) => a + b, 0);
+var getCellFontName = (cell) => {
+  const isBold = !!cell.bold;
+  const isItalic = !!cell.italic;
+  if (cell.font) return cell.font;
+  if (isBold && isItalic) return "Helvetica-BoldOblique";
+  if (isBold) return "Helvetica-Bold";
+  if (isItalic) return "Helvetica-Oblique";
+  return "Helvetica";
+};
+var decrementActiveSpans = (activeRowSpans) => {
+  for (let i = 0; i < activeRowSpans.length; i++) {
+    if (activeRowSpans[i] > 0) {
+      activeRowSpans[i] -= 1;
+    }
+  }
+};
+var findNextFreeCol = (activeRowSpans, fromIndex) => {
+  let col = fromIndex;
+  while (col < activeRowSpans.length && activeRowSpans[col] > 0) {
+    col++;
+  }
+  return col;
+};
+var buildPlacedRow = (row, totalCols, activeRowSpans) => {
+  const placed = [];
+  let cursor = 0;
+  for (const rawCell of row) {
+    cursor = findNextFreeCol(activeRowSpans, cursor);
+    if (cursor >= totalCols) break;
+    const colSpan = Math.min(normalizeSpan(rawCell.colSpan), totalCols - cursor);
+    const rowSpan = normalizeSpan(rawCell.rowSpan);
+    placed.push({
+      cell: rawCell,
+      startCol: cursor,
+      colSpan,
+      rowSpan
+    });
+    if (rowSpan > 1) {
+      for (let c = cursor; c < cursor + colSpan; c++) {
+        activeRowSpans[c] = Math.max(activeRowSpans[c], rowSpan - 1);
+      }
+    }
+    cursor += colSpan;
+  }
+  return placed;
+};
+var getPlacedCellWidth = (colWidths, startCol, colSpan) => {
+  return sum(colWidths.slice(startCol, startCol + colSpan));
+};
+var getRowSpanGroupHeight = (rowHeights, rowIndex, rowSpan) => {
+  return sum(rowHeights.slice(rowIndex, rowIndex + rowSpan));
+};
 var measureTableHeight = (doc, table, env, styles, computeColumnPixelWidths2) => {
   const localLeft = table.marginLeft ?? 0;
   const localRight = table.marginRight ?? 0;
   const width = Math.max(env.innerWidth - localLeft - localRight, 1);
+  const totalCols = table.widths.length;
   const colWidths = computeColumnPixelWidths2(table.widths, width);
-  let totalHeight = 0;
-  totalHeight += table.marginTop ?? 0;
-  table.body.forEach((row) => {
-    let rowHeight = 0;
-    row.forEach((rawCell, colIndex) => {
+  const rowHeights = [];
+  const activeRowSpans = Array(totalCols).fill(0);
+  const placedRows = [];
+  for (let rowIndex = 0; rowIndex < table.body.length; rowIndex++) {
+    const row = table.body[rowIndex];
+    const placedRow = buildPlacedRow(row, totalCols, activeRowSpans);
+    placedRows.push(placedRow);
+    let rowHeight = 12;
+    placedRow.forEach(({ cell: rawCell, startCol, colSpan }) => {
       const cell = resolveTableCell(styles, rawCell);
-      const colW = colWidths[colIndex] ?? 50;
-      const fontSize = cell.fontSize ?? 10;
-      const isBold = !!cell.bold;
-      const isItalic = !!cell.italic;
-      const fontName = cell.font ? cell.font : isBold && isItalic ? "Helvetica-BoldOblique" : isBold ? "Helvetica-Bold" : isItalic ? "Helvetica-Oblique" : "Helvetica";
-      doc.font(fontName);
-      doc.fontSize(fontSize);
-      const h = doc.heightOfString(cell.text, { width: colW });
-      rowHeight = Math.max(rowHeight, h + 4);
+      const paddingLeft = cell.paddingLeft ?? 2;
+      const paddingRight = cell.paddingRight ?? 2;
+      const paddingTop = cell.paddingTop ?? 2;
+      const paddingBottom = cell.paddingBottom ?? 2;
+      const colW = getPlacedCellWidth(colWidths, startCol, colSpan);
+      const textWidth = Math.max(colW - paddingLeft - paddingRight, 1);
+      doc.font(getCellFontName(cell));
+      doc.fontSize(cell.fontSize ?? 10);
+      const h = doc.heightOfString(cell.text, { width: textWidth }) + paddingTop + paddingBottom;
+      rowHeight = Math.max(rowHeight, h);
     });
-    totalHeight += rowHeight;
-  });
+    rowHeights.push(rowHeight);
+    decrementActiveSpans(activeRowSpans);
+  }
+  for (let rowIndex = 0; rowIndex < placedRows.length; rowIndex++) {
+    const placedRow = placedRows[rowIndex];
+    placedRow.forEach(({ cell: rawCell, startCol, colSpan, rowSpan }) => {
+      if (rowSpan <= 1) return;
+      const cell = resolveTableCell(styles, rawCell);
+      const paddingLeft = cell.paddingLeft ?? 2;
+      const paddingRight = cell.paddingRight ?? 2;
+      const paddingTop = cell.paddingTop ?? 2;
+      const paddingBottom = cell.paddingBottom ?? 2;
+      const colW = getPlacedCellWidth(colWidths, startCol, colSpan);
+      const textWidth = Math.max(colW - paddingLeft - paddingRight, 1);
+      doc.font(getCellFontName(cell));
+      doc.fontSize(cell.fontSize ?? 10);
+      const neededHeight = doc.heightOfString(cell.text, { width: textWidth }) + paddingTop + paddingBottom;
+      const currentGroupHeight = getRowSpanGroupHeight(rowHeights, rowIndex, rowSpan);
+      if (neededHeight > currentGroupHeight) {
+        const deficit = neededHeight - currentGroupHeight;
+        rowHeights[rowIndex + rowSpan - 1] = (rowHeights[rowIndex + rowSpan - 1] ?? 12) + deficit;
+      }
+    });
+  }
+  let totalHeight = 0;
+  totalHeight += table.marginTop ?? 0;
+  totalHeight += sum(rowHeights);
   totalHeight += table.lineGap ?? 6;
   totalHeight += table.marginBottom ?? 0;
   return totalHeight;
@@ -555,6 +643,7 @@ var processTableBlock = (doc, ctx, styles, table, y, env, computeColumnPixelWidt
   const mb = table.marginBottom ?? 0;
   const baseY = y ?? ctx.currentY;
   const startY = baseY + mt;
+  const totalCols = table.widths.length;
   const colWidths = computeColumnPixelWidths2(table.widths, width);
   const layout = table.layout ?? {
     border: "all",
@@ -563,56 +652,84 @@ var processTableBlock = (doc, ctx, styles, table, y, env, computeColumnPixelWidt
   };
   const borderAll = layout.border !== "none";
   const headerRows = table.headerRows ?? 0;
-  const measureRowHeight = (row) => {
-    let rowHeight = 0;
-    row.forEach((rawCell, colIndex) => {
-      const cell = resolveTableCell(styles, rawCell);
-      const colW = colWidths[colIndex] ?? 50;
-      const fontSize = cell.fontSize ?? 10;
-      const fontName = cell.font ? cell.font : cell.bold ? "Helvetica-Bold" : "Helvetica";
-      doc.font(fontName);
-      doc.fontSize(fontSize);
-      const textWidth = Math.max(colW - 4, 1);
-      const h = doc.heightOfString(cell.text, {
-        width: textWidth
-      }) + 4;
-      rowHeight = Math.max(rowHeight, h);
-    });
-    return rowHeight || 12;
+  const buildPlacementAndHeights = (rows) => {
+    const placedRows = [];
+    const rowHeights = [];
+    const activeRowSpans = Array(totalCols).fill(0);
+    for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
+      const row = rows[rowIndex];
+      const placedRow = buildPlacedRow(row, totalCols, activeRowSpans);
+      placedRows.push(placedRow);
+      let rowHeight = 12;
+      placedRow.forEach(({ cell: rawCell, startCol, colSpan }) => {
+        const cell = resolveTableCell(styles, rawCell);
+        const paddingLeft = cell.paddingLeft ?? 2;
+        const paddingRight = cell.paddingRight ?? 2;
+        const paddingTop = cell.paddingTop ?? 2;
+        const paddingBottom = cell.paddingBottom ?? 2;
+        const colW = getPlacedCellWidth(colWidths, startCol, colSpan);
+        const textWidth = Math.max(colW - paddingLeft - paddingRight, 1);
+        doc.font(getCellFontName(cell));
+        doc.fontSize(cell.fontSize ?? 10);
+        const h = doc.heightOfString(cell.text, { width: textWidth }) + paddingTop + paddingBottom;
+        rowHeight = Math.max(rowHeight, h);
+      });
+      rowHeights.push(rowHeight);
+      decrementActiveSpans(activeRowSpans);
+    }
+    for (let rowIndex = 0; rowIndex < placedRows.length; rowIndex++) {
+      const placedRow = placedRows[rowIndex];
+      placedRow.forEach(({ cell: rawCell, startCol, colSpan, rowSpan }) => {
+        if (rowSpan <= 1) return;
+        const cell = resolveTableCell(styles, rawCell);
+        const paddingLeft = cell.paddingLeft ?? 2;
+        const paddingRight = cell.paddingRight ?? 2;
+        const paddingTop = cell.paddingTop ?? 2;
+        const paddingBottom = cell.paddingBottom ?? 2;
+        const colW = getPlacedCellWidth(colWidths, startCol, colSpan);
+        const textWidth = Math.max(colW - paddingLeft - paddingRight, 1);
+        doc.font(getCellFontName(cell));
+        doc.fontSize(cell.fontSize ?? 10);
+        const neededHeight = doc.heightOfString(cell.text, { width: textWidth }) + paddingTop + paddingBottom;
+        const currentGroupHeight = getRowSpanGroupHeight(rowHeights, rowIndex, rowSpan);
+        if (neededHeight > currentGroupHeight) {
+          const deficit = neededHeight - currentGroupHeight;
+          rowHeights[rowIndex + rowSpan - 1] = (rowHeights[rowIndex + rowSpan - 1] ?? 12) + deficit;
+        }
+      });
+    }
+    return { placedRows, rowHeights };
   };
-  const drawRow = (row, rowTop2, rowHeight, isHeaderRow, drawTopBorder) => {
-    row.forEach((rawCell, colIndex) => {
+  const allLayout = buildPlacementAndHeights(table.body);
+  const drawPlacedRow = (placedRow, rowTop2, rowHeight, rowIndex, rowHeights, isHeaderRow, drawTopBorder) => {
+    placedRow.forEach(({ cell: rawCell, startCol, colSpan, rowSpan }) => {
       const cell = resolveTableCell(styles, rawCell);
-      const colW = colWidths[colIndex] ?? 50;
-      const x = baseLeft + colWidths.slice(0, colIndex).reduce((a, b) => a + b, 0);
+      const colW = getPlacedCellWidth(colWidths, startCol, colSpan);
+      const x = baseLeft + sum(colWidths.slice(0, startCol));
       const fontSize = cell.fontSize ?? 10;
+      const drawHeight = getRowSpanGroupHeight(rowHeights, rowIndex, rowSpan);
+      const paddingLeft = cell.paddingLeft ?? 2;
+      const paddingRight = cell.paddingRight ?? 2;
+      const paddingTop = cell.paddingTop ?? 2;
+      const paddingBottom = cell.paddingBottom ?? 2;
       doc.save();
       if (cell.fillColor) {
-        doc.rect(x, rowTop2, colW, rowHeight).fillOpacity(1).fill(cell.fillColor);
+        doc.rect(x, rowTop2, colW, drawHeight).fillOpacity(1).fill(cell.fillColor);
         doc.fillOpacity(1);
       }
-      const isBold = !!cell.bold;
-      const isItalic = !!cell.italic;
-      const fontName = cell.font ? cell.font : isBold && isItalic ? "Helvetica-BoldOblique" : isBold ? "Helvetica-Bold" : isItalic ? "Helvetica-Oblique" : "Helvetica";
-      doc.font(fontName);
+      doc.font(getCellFontName(cell));
       doc.fontSize(fontSize);
-      if (cell.color) {
-        doc.fillColor(cell.color);
-      } else {
-        doc.fillColor("black");
-      }
+      doc.fillColor(cell.color ?? "black");
       const align = cell.align ?? "left";
-      const textWidth = Math.max(colW - 4, 1);
-      const textHeight = doc.heightOfString(cell.text, {
-        width: textWidth
-      });
-      let textY = rowTop2 + 2;
+      const textWidth = Math.max(colW - paddingLeft - paddingRight, 1);
+      const textHeight = doc.heightOfString(cell.text, { width: textWidth });
+      let textY = rowTop2 + paddingTop;
       if (isHeaderRow) {
-        const available = rowHeight - 4;
+        const available = Math.max(drawHeight - paddingTop - paddingBottom, 0);
         const offset = Math.max((available - textHeight) / 2, 0);
-        textY = rowTop2 + 2 + offset;
+        textY = rowTop2 + paddingTop + offset;
       }
-      doc.text(cell.text, x + 2, textY, {
+      doc.text(cell.text, x + paddingLeft, textY, {
         width: textWidth,
         align,
         underline: !!cell.underline,
@@ -620,52 +737,58 @@ var processTableBlock = (doc, ctx, styles, table, y, env, computeColumnPixelWidt
         link: cell.link
       });
       doc.restore();
-    });
-    if (borderAll) {
-      const bottomY = rowTop2 + rowHeight;
-      doc.save();
-      doc.lineWidth(0.5);
-      doc.strokeColor(layout.hLineColor ?? "#ccc");
-      if (drawTopBorder) {
-        doc.moveTo(baseLeft, rowTop2).lineTo(baseLeft + width, rowTop2).stroke();
-      }
-      doc.moveTo(baseLeft, bottomY).lineTo(baseLeft + width, bottomY).stroke();
-      doc.restore();
-      doc.save();
-      doc.lineWidth(0.5);
-      doc.strokeColor(layout.vLineColor ?? "#ccc");
-      let x = baseLeft;
-      colWidths.forEach((colW) => {
+      if (borderAll) {
+        const bottomY = rowTop2 + drawHeight;
+        doc.save();
+        doc.lineWidth(0.5);
+        doc.strokeColor(layout.hLineColor ?? "#ccc");
+        if (drawTopBorder) {
+          doc.moveTo(x, rowTop2).lineTo(x + colW, rowTop2).stroke();
+        }
+        doc.moveTo(x, bottomY).lineTo(x + colW, bottomY).stroke();
+        doc.restore();
+        doc.save();
+        doc.lineWidth(0.5);
+        doc.strokeColor(layout.vLineColor ?? "#ccc");
         doc.moveTo(x, rowTop2).lineTo(x, bottomY).stroke();
-        x += colW;
-      });
-      doc.moveTo(baseLeft + width, rowTop2).lineTo(baseLeft + width, bottomY).stroke();
-      doc.restore();
-    }
+        doc.moveTo(x + colW, rowTop2).lineTo(x + colW, bottomY).stroke();
+        doc.restore();
+      }
+    });
     return rowTop2 + rowHeight;
   };
+  const headerRowsSource = table.body.slice(0, headerRows);
   const drawHeaderRowsOnNewPage = () => {
     if (!headerRows) return doc.page.margins.top + mt;
+    const headerLayout = buildPlacementAndHeights(headerRowsSource);
     let rowTop2 = doc.page.margins.top + mt;
-    for (let i = 0; i < headerRows; i++) {
-      const headerRow = table.body[i];
-      const headerHeight = measureRowHeight(headerRow);
-      rowTop2 = drawRow(headerRow, rowTop2, headerHeight, true, true);
+    for (let i = 0; i < headerLayout.placedRows.length; i++) {
+      rowTop2 = drawPlacedRow(
+        headerLayout.placedRows[i],
+        rowTop2,
+        headerLayout.rowHeights[i],
+        i,
+        headerLayout.rowHeights,
+        true,
+        true
+      );
     }
     return rowTop2;
   };
   let rowTop = startY;
-  table.body.forEach((row, rowIndex) => {
+  for (let rowIndex = 0; rowIndex < table.body.length; rowIndex++) {
     const isHeaderRow = rowIndex < headerRows;
-    const rowHeight = measureRowHeight(row);
+    const placedRow = allLayout.placedRows[rowIndex];
+    const rowHeight = allLayout.rowHeights[rowIndex];
+    const maxRowSpan = Math.max(...placedRow.map((p) => p.rowSpan), 1);
+    const reservedHeight = getRowSpanGroupHeight(allLayout.rowHeights, rowIndex, maxRowSpan);
     const bottomLimit = bottomLimitForContent();
-    if (rowTop + rowHeight > bottomLimit) {
+    if (rowTop + reservedHeight > bottomLimit) {
       finishPage2(true);
       rowTop = headerRows ? drawHeaderRowsOnNewPage() : doc.page.margins.top + mt;
     }
-    const drawTopBorder = true;
-    rowTop = drawRow(row, rowTop, rowHeight, isHeaderRow, drawTopBorder);
-  });
+    rowTop = drawPlacedRow(placedRow, rowTop, rowHeight, rowIndex, allLayout.rowHeights, isHeaderRow, true);
+  }
   const newY = rowTop + (table.lineGap ?? 6) + mb;
   if (y === null) ctx.currentY = newY;
   return newY;
@@ -1109,7 +1232,11 @@ function resolveTableCell(styles, cell) {
     italic: cell.italic ?? styleDef.italic,
     color: cell.color ?? styleDef.color,
     fillColor: cell.fillColor ?? styleDef.fillColor,
-    font: cell.font ?? styleDef.font
+    font: cell.font ?? styleDef.font,
+    paddingTop: cell.paddingTop,
+    paddingRight: cell.paddingRight,
+    paddingBottom: cell.paddingBottom,
+    paddingLeft: cell.paddingLeft
   };
 }
 var getFontNameForText = (tb) => {
@@ -1780,6 +1907,7 @@ async function renderCustomPdf(def, outputPath) {
     const footerBandHeight = def.margins.bottom ?? 0;
     const doc = new import_pdfkit.default({
       size: def.pageSize || "A4",
+      layout: def.pageOrientation === "landscape" ? "landscape" : "portrait",
       margins: {
         top: headerBandHeight,
         bottom: footerBandHeight,
@@ -1884,6 +2012,7 @@ async function renderCustomPdfToBuffer(def) {
     const footerBandHeight = def.margins.bottom ?? 0;
     const doc = new import_pdfkit.default({
       size: def.pageSize || "A4",
+      layout: def.pageOrientation === "landscape" ? "landscape" : "portrait",
       margins: {
         top: headerBandHeight,
         bottom: footerBandHeight,

package/dist/index.mjs

@@ -476,29 +476,117 @@ var processLineBlock = (doc, ctx, block, y, env, ensureSpaceFor) => {
 };
 
 // src/renderer-engine/blocks/table.ts
+var normalizeSpan = (value) => {
+  if (!value || value < 1) return 1;
+  return Math.floor(value);
+};
+var sum = (arr) => arr.reduce((a, b) => a + b, 0);
+var getCellFontName = (cell) => {
+  const isBold = !!cell.bold;
+  const isItalic = !!cell.italic;
+  if (cell.font) return cell.font;
+  if (isBold && isItalic) return "Helvetica-BoldOblique";
+  if (isBold) return "Helvetica-Bold";
+  if (isItalic) return "Helvetica-Oblique";
+  return "Helvetica";
+};
+var decrementActiveSpans = (activeRowSpans) => {
+  for (let i = 0; i < activeRowSpans.length; i++) {
+    if (activeRowSpans[i] > 0) {
+      activeRowSpans[i] -= 1;
+    }
+  }
+};
+var findNextFreeCol = (activeRowSpans, fromIndex) => {
+  let col = fromIndex;
+  while (col < activeRowSpans.length && activeRowSpans[col] > 0) {
+    col++;
+  }
+  return col;
+};
+var buildPlacedRow = (row, totalCols, activeRowSpans) => {
+  const placed = [];
+  let cursor = 0;
+  for (const rawCell of row) {
+    cursor = findNextFreeCol(activeRowSpans, cursor);
+    if (cursor >= totalCols) break;
+    const colSpan = Math.min(normalizeSpan(rawCell.colSpan), totalCols - cursor);
+    const rowSpan = normalizeSpan(rawCell.rowSpan);
+    placed.push({
+      cell: rawCell,
+      startCol: cursor,
+      colSpan,
+      rowSpan
+    });
+    if (rowSpan > 1) {
+      for (let c = cursor; c < cursor + colSpan; c++) {
+        activeRowSpans[c] = Math.max(activeRowSpans[c], rowSpan - 1);
+      }
+    }
+    cursor += colSpan;
+  }
+  return placed;
+};
+var getPlacedCellWidth = (colWidths, startCol, colSpan) => {
+  return sum(colWidths.slice(startCol, startCol + colSpan));
+};
+var getRowSpanGroupHeight = (rowHeights, rowIndex, rowSpan) => {
+  return sum(rowHeights.slice(rowIndex, rowIndex + rowSpan));
+};
 var measureTableHeight = (doc, table, env, styles, computeColumnPixelWidths2) => {
   const localLeft = table.marginLeft ?? 0;
   const localRight = table.marginRight ?? 0;
   const width = Math.max(env.innerWidth - localLeft - localRight, 1);
+  const totalCols = table.widths.length;
   const colWidths = computeColumnPixelWidths2(table.widths, width);
-  let totalHeight = 0;
-  totalHeight += table.marginTop ?? 0;
-  table.body.forEach((row) => {
-    let rowHeight = 0;
-    row.forEach((rawCell, colIndex) => {
+  const rowHeights = [];
+  const activeRowSpans = Array(totalCols).fill(0);
+  const placedRows = [];
+  for (let rowIndex = 0; rowIndex < table.body.length; rowIndex++) {
+    const row = table.body[rowIndex];
+    const placedRow = buildPlacedRow(row, totalCols, activeRowSpans);
+    placedRows.push(placedRow);
+    let rowHeight = 12;
+    placedRow.forEach(({ cell: rawCell, startCol, colSpan }) => {
       const cell = resolveTableCell(styles, rawCell);
-      const colW = colWidths[colIndex] ?? 50;
-      const fontSize = cell.fontSize ?? 10;
-      const isBold = !!cell.bold;
-      const isItalic = !!cell.italic;
-      const fontName = cell.font ? cell.font : isBold && isItalic ? "Helvetica-BoldOblique" : isBold ? "Helvetica-Bold" : isItalic ? "Helvetica-Oblique" : "Helvetica";
-      doc.font(fontName);
-      doc.fontSize(fontSize);
-      const h = doc.heightOfString(cell.text, { width: colW });
-      rowHeight = Math.max(rowHeight, h + 4);
+      const paddingLeft = cell.paddingLeft ?? 2;
+      const paddingRight = cell.paddingRight ?? 2;
+      const paddingTop = cell.paddingTop ?? 2;
+      const paddingBottom = cell.paddingBottom ?? 2;
+      const colW = getPlacedCellWidth(colWidths, startCol, colSpan);
+      const textWidth = Math.max(colW - paddingLeft - paddingRight, 1);
+      doc.font(getCellFontName(cell));
+      doc.fontSize(cell.fontSize ?? 10);
+      const h = doc.heightOfString(cell.text, { width: textWidth }) + paddingTop + paddingBottom;
+      rowHeight = Math.max(rowHeight, h);
     });
-    totalHeight += rowHeight;
-  });
+    rowHeights.push(rowHeight);
+    decrementActiveSpans(activeRowSpans);
+  }
+  for (let rowIndex = 0; rowIndex < placedRows.length; rowIndex++) {
+    const placedRow = placedRows[rowIndex];
+    placedRow.forEach(({ cell: rawCell, startCol, colSpan, rowSpan }) => {
+      if (rowSpan <= 1) return;
+      const cell = resolveTableCell(styles, rawCell);
+      const paddingLeft = cell.paddingLeft ?? 2;
+      const paddingRight = cell.paddingRight ?? 2;
+      const paddingTop = cell.paddingTop ?? 2;
+      const paddingBottom = cell.paddingBottom ?? 2;
+      const colW = getPlacedCellWidth(colWidths, startCol, colSpan);
+      const textWidth = Math.max(colW - paddingLeft - paddingRight, 1);
+      doc.font(getCellFontName(cell));
+      doc.fontSize(cell.fontSize ?? 10);
+      const neededHeight = doc.heightOfString(cell.text, { width: textWidth }) + paddingTop + paddingBottom;
+      const currentGroupHeight = getRowSpanGroupHeight(rowHeights, rowIndex, rowSpan);
+      if (neededHeight > currentGroupHeight) {
+        const deficit = neededHeight - currentGroupHeight;
+        rowHeights[rowIndex + rowSpan - 1] = (rowHeights[rowIndex + rowSpan - 1] ?? 12) + deficit;
+      }
+    });
+  }
+  let totalHeight = 0;
+  totalHeight += table.marginTop ?? 0;
+  totalHeight += sum(rowHeights);
   totalHeight += table.lineGap ?? 6;
   totalHeight += table.marginBottom ?? 0;
   return totalHeight;
@@ -512,6 +600,7 @@ var processTableBlock = (doc, ctx, styles, table, y, env, computeColumnPixelWidt
   const mb = table.marginBottom ?? 0;
   const baseY = y ?? ctx.currentY;
   const startY = baseY + mt;
+  const totalCols = table.widths.length;
   const colWidths = computeColumnPixelWidths2(table.widths, width);
   const layout = table.layout ?? {
     border: "all",
@@ -520,56 +609,84 @@ var processTableBlock = (doc, ctx, styles, table, y, env, computeColumnPixelWidt
   };
   const borderAll = layout.border !== "none";
   const headerRows = table.headerRows ?? 0;
-  const measureRowHeight = (row) => {
-    let rowHeight = 0;
-    row.forEach((rawCell, colIndex) => {
-      const cell = resolveTableCell(styles, rawCell);
-      const colW = colWidths[colIndex] ?? 50;
-      const fontSize = cell.fontSize ?? 10;
-      const fontName = cell.font ? cell.font : cell.bold ? "Helvetica-Bold" : "Helvetica";
-      doc.font(fontName);
-      doc.fontSize(fontSize);
-      const textWidth = Math.max(colW - 4, 1);
-      const h = doc.heightOfString(cell.text, {
-        width: textWidth
-      }) + 4;
-      rowHeight = Math.max(rowHeight, h);
-    });
-    return rowHeight || 12;
+  const buildPlacementAndHeights = (rows) => {
+    const placedRows = [];
+    const rowHeights = [];
+    const activeRowSpans = Array(totalCols).fill(0);
+    for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
+      const row = rows[rowIndex];
+      const placedRow = buildPlacedRow(row, totalCols, activeRowSpans);
+      placedRows.push(placedRow);
+      let rowHeight = 12;
+      placedRow.forEach(({ cell: rawCell, startCol, colSpan }) => {
+        const cell = resolveTableCell(styles, rawCell);
+        const paddingLeft = cell.paddingLeft ?? 2;
+        const paddingRight = cell.paddingRight ?? 2;
+        const paddingTop = cell.paddingTop ?? 2;
+        const paddingBottom = cell.paddingBottom ?? 2;
+        const colW = getPlacedCellWidth(colWidths, startCol, colSpan);
+        const textWidth = Math.max(colW - paddingLeft - paddingRight, 1);
+        doc.font(getCellFontName(cell));
+        doc.fontSize(cell.fontSize ?? 10);
+        const h = doc.heightOfString(cell.text, { width: textWidth }) + paddingTop + paddingBottom;
+        rowHeight = Math.max(rowHeight, h);
+      });
+      rowHeights.push(rowHeight);
+      decrementActiveSpans(activeRowSpans);
+    }
+    for (let rowIndex = 0; rowIndex < placedRows.length; rowIndex++) {
+      const placedRow = placedRows[rowIndex];
+      placedRow.forEach(({ cell: rawCell, startCol, colSpan, rowSpan }) => {
+        if (rowSpan <= 1) return;
+        const cell = resolveTableCell(styles, rawCell);
+        const paddingLeft = cell.paddingLeft ?? 2;
+        const paddingRight = cell.paddingRight ?? 2;
+        const paddingTop = cell.paddingTop ?? 2;
+        const paddingBottom = cell.paddingBottom ?? 2;
+        const colW = getPlacedCellWidth(colWidths, startCol, colSpan);
+        const textWidth = Math.max(colW - paddingLeft - paddingRight, 1);
+        doc.font(getCellFontName(cell));
+        doc.fontSize(cell.fontSize ?? 10);
+        const neededHeight = doc.heightOfString(cell.text, { width: textWidth }) + paddingTop + paddingBottom;
+        const currentGroupHeight = getRowSpanGroupHeight(rowHeights, rowIndex, rowSpan);
+        if (neededHeight > currentGroupHeight) {
+          const deficit = neededHeight - currentGroupHeight;
+          rowHeights[rowIndex + rowSpan - 1] = (rowHeights[rowIndex + rowSpan - 1] ?? 12) + deficit;
+        }
+      });
+    }
+    return { placedRows, rowHeights };
   };
-  const drawRow = (row, rowTop2, rowHeight, isHeaderRow, drawTopBorder) => {
-    row.forEach((rawCell, colIndex) => {
+  const allLayout = buildPlacementAndHeights(table.body);
+  const drawPlacedRow = (placedRow, rowTop2, rowHeight, rowIndex, rowHeights, isHeaderRow, drawTopBorder) => {
+    placedRow.forEach(({ cell: rawCell, startCol, colSpan, rowSpan }) => {
       const cell = resolveTableCell(styles, rawCell);
-      const colW = colWidths[colIndex] ?? 50;
-      const x = baseLeft + colWidths.slice(0, colIndex).reduce((a, b) => a + b, 0);
+      const colW = getPlacedCellWidth(colWidths, startCol, colSpan);
+      const x = baseLeft + sum(colWidths.slice(0, startCol));
       const fontSize = cell.fontSize ?? 10;
+      const drawHeight = getRowSpanGroupHeight(rowHeights, rowIndex, rowSpan);
+      const paddingLeft = cell.paddingLeft ?? 2;
+      const paddingRight = cell.paddingRight ?? 2;
+      const paddingTop = cell.paddingTop ?? 2;
+      const paddingBottom = cell.paddingBottom ?? 2;
       doc.save();
       if (cell.fillColor) {
-        doc.rect(x, rowTop2, colW, rowHeight).fillOpacity(1).fill(cell.fillColor);
+        doc.rect(x, rowTop2, colW, drawHeight).fillOpacity(1).fill(cell.fillColor);
         doc.fillOpacity(1);
       }
-      const isBold = !!cell.bold;
-      const isItalic = !!cell.italic;
-      const fontName = cell.font ? cell.font : isBold && isItalic ? "Helvetica-BoldOblique" : isBold ? "Helvetica-Bold" : isItalic ? "Helvetica-Oblique" : "Helvetica";
-      doc.font(fontName);
+      doc.font(getCellFontName(cell));
       doc.fontSize(fontSize);
-      if (cell.color) {
-        doc.fillColor(cell.color);
-      } else {
-        doc.fillColor("black");
-      }
+      doc.fillColor(cell.color ?? "black");
       const align = cell.align ?? "left";
-      const textWidth = Math.max(colW - 4, 1);
-      const textHeight = doc.heightOfString(cell.text, {
-        width: textWidth
-      });
-      let textY = rowTop2 + 2;
+      const textWidth = Math.max(colW - paddingLeft - paddingRight, 1);
+      const textHeight = doc.heightOfString(cell.text, { width: textWidth });
+      let textY = rowTop2 + paddingTop;
       if (isHeaderRow) {
-        const available = rowHeight - 4;
+        const available = Math.max(drawHeight - paddingTop - paddingBottom, 0);
         const offset = Math.max((available - textHeight) / 2, 0);
-        textY = rowTop2 + 2 + offset;
+        textY = rowTop2 + paddingTop + offset;
       }
-      doc.text(cell.text, x + 2, textY, {
+      doc.text(cell.text, x + paddingLeft, textY, {
         width: textWidth,
         align,
         underline: !!cell.underline,
@@ -577,52 +694,58 @@ var processTableBlock = (doc, ctx, styles, table, y, env, computeColumnPixelWidt
         link: cell.link
       });
       doc.restore();
-    });
-    if (borderAll) {
-      const bottomY = rowTop2 + rowHeight;
-      doc.save();
-      doc.lineWidth(0.5);
-      doc.strokeColor(layout.hLineColor ?? "#ccc");
-      if (drawTopBorder) {
-        doc.moveTo(baseLeft, rowTop2).lineTo(baseLeft + width, rowTop2).stroke();
-      }
-      doc.moveTo(baseLeft, bottomY).lineTo(baseLeft + width, bottomY).stroke();
-      doc.restore();
-      doc.save();
-      doc.lineWidth(0.5);
-      doc.strokeColor(layout.vLineColor ?? "#ccc");
-      let x = baseLeft;
-      colWidths.forEach((colW) => {
+      if (borderAll) {
+        const bottomY = rowTop2 + drawHeight;
+        doc.save();
+        doc.lineWidth(0.5);
+        doc.strokeColor(layout.hLineColor ?? "#ccc");
+        if (drawTopBorder) {
+          doc.moveTo(x, rowTop2).lineTo(x + colW, rowTop2).stroke();
+        }
+        doc.moveTo(x, bottomY).lineTo(x + colW, bottomY).stroke();
+        doc.restore();
+        doc.save();
+        doc.lineWidth(0.5);
+        doc.strokeColor(layout.vLineColor ?? "#ccc");
         doc.moveTo(x, rowTop2).lineTo(x, bottomY).stroke();
-        x += colW;
-      });
-      doc.moveTo(baseLeft + width, rowTop2).lineTo(baseLeft + width, bottomY).stroke();
-      doc.restore();
-    }
+        doc.moveTo(x + colW, rowTop2).lineTo(x + colW, bottomY).stroke();
+        doc.restore();
+      }
+    });
     return rowTop2 + rowHeight;
   };
+  const headerRowsSource = table.body.slice(0, headerRows);
   const drawHeaderRowsOnNewPage = () => {
     if (!headerRows) return doc.page.margins.top + mt;
+    const headerLayout = buildPlacementAndHeights(headerRowsSource);
     let rowTop2 = doc.page.margins.top + mt;
-    for (let i = 0; i < headerRows; i++) {
-      const headerRow = table.body[i];
-      const headerHeight = measureRowHeight(headerRow);
-      rowTop2 = drawRow(headerRow, rowTop2, headerHeight, true, true);
+    for (let i = 0; i < headerLayout.placedRows.length; i++) {
+      rowTop2 = drawPlacedRow(
+        headerLayout.placedRows[i],
+        rowTop2,
+        headerLayout.rowHeights[i],
+        i,
+        headerLayout.rowHeights,
+        true,
+        true
+      );
     }
     return rowTop2;
   };
   let rowTop = startY;
-  table.body.forEach((row, rowIndex) => {
+  for (let rowIndex = 0; rowIndex < table.body.length; rowIndex++) {
     const isHeaderRow = rowIndex < headerRows;
-    const rowHeight = measureRowHeight(row);
+    const placedRow = allLayout.placedRows[rowIndex];
+    const rowHeight = allLayout.rowHeights[rowIndex];
+    const maxRowSpan = Math.max(...placedRow.map((p) => p.rowSpan), 1);
+    const reservedHeight = getRowSpanGroupHeight(allLayout.rowHeights, rowIndex, maxRowSpan);
     const bottomLimit = bottomLimitForContent();
-    if (rowTop + rowHeight > bottomLimit) {
+    if (rowTop + reservedHeight > bottomLimit) {
       finishPage2(true);
       rowTop = headerRows ? drawHeaderRowsOnNewPage() : doc.page.margins.top + mt;
     }
-    const drawTopBorder = true;
-    rowTop = drawRow(row, rowTop, rowHeight, isHeaderRow, drawTopBorder);
-  });
+    rowTop = drawPlacedRow(placedRow, rowTop, rowHeight, rowIndex, allLayout.rowHeights, isHeaderRow, true);
+  }
   const newY = rowTop + (table.lineGap ?? 6) + mb;
   if (y === null) ctx.currentY = newY;
   return newY;
@@ -1066,7 +1189,11 @@ function resolveTableCell(styles, cell) {
     italic: cell.italic ?? styleDef.italic,
     color: cell.color ?? styleDef.color,
     fillColor: cell.fillColor ?? styleDef.fillColor,
-    font: cell.font ?? styleDef.font
+    font: cell.font ?? styleDef.font,
+    paddingTop: cell.paddingTop,
+    paddingRight: cell.paddingRight,
+    paddingBottom: cell.paddingBottom,
+    paddingLeft: cell.paddingLeft
   };
 }
 var getFontNameForText = (tb) => {
@@ -1737,6 +1864,7 @@ async function renderCustomPdf(def, outputPath) {
     const footerBandHeight = def.margins.bottom ?? 0;
     const doc = new PDFDocument({
       size: def.pageSize || "A4",
+      layout: def.pageOrientation === "landscape" ? "landscape" : "portrait",
       margins: {
         top: headerBandHeight,
         bottom: footerBandHeight,
@@ -1841,6 +1969,7 @@ async function renderCustomPdfToBuffer(def) {
     const footerBandHeight = def.margins.bottom ?? 0;
     const doc = new PDFDocument({
       size: def.pageSize || "A4",
+      layout: def.pageOrientation === "landscape" ? "landscape" : "portrait",
       margins: {
         top: headerBandHeight,
         bottom: footerBandHeight,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-pdf-engine",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/index.mjs",