pdfmake 0.3.0-beta.8 → 0.3.0

package/js/standardPageSizes.js

@@ -0,0 +1,56 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+var _default = exports.default = {
+  '4A0': [4767.87, 6740.79],
+  '2A0': [3370.39, 4767.87],
+  A0: [2383.94, 3370.39],
+  A1: [1683.78, 2383.94],
+  A2: [1190.55, 1683.78],
+  A3: [841.89, 1190.55],
+  A4: [595.28, 841.89],
+  A5: [419.53, 595.28],
+  A6: [297.64, 419.53],
+  A7: [209.76, 297.64],
+  A8: [147.40, 209.76],
+  A9: [104.88, 147.40],
+  A10: [73.70, 104.88],
+  B0: [2834.65, 4008.19],
+  B1: [2004.09, 2834.65],
+  B2: [1417.32, 2004.09],
+  B3: [1000.63, 1417.32],
+  B4: [708.66, 1000.63],
+  B5: [498.90, 708.66],
+  B6: [354.33, 498.90],
+  B7: [249.45, 354.33],
+  B8: [175.75, 249.45],
+  B9: [124.72, 175.75],
+  B10: [87.87, 124.72],
+  C0: [2599.37, 3676.54],
+  C1: [1836.85, 2599.37],
+  C2: [1298.27, 1836.85],
+  C3: [918.43, 1298.27],
+  C4: [649.13, 918.43],
+  C5: [459.21, 649.13],
+  C6: [323.15, 459.21],
+  C7: [229.61, 323.15],
+  C8: [161.57, 229.61],
+  C9: [113.39, 161.57],
+  C10: [79.37, 113.39],
+  RA0: [2437.80, 3458.27],
+  RA1: [1729.13, 2437.80],
+  RA2: [1218.90, 1729.13],
+  RA3: [864.57, 1218.90],
+  RA4: [609.45, 864.57],
+  SRA0: [2551.18, 3628.35],
+  SRA1: [1814.17, 2551.18],
+  SRA2: [1275.59, 1814.17],
+  SRA3: [907.09, 1275.59],
+  SRA4: [637.80, 907.09],
+  EXECUTIVE: [521.86, 756.00],
+  FOLIO: [612.00, 936.00],
+  LEGAL: [612.00, 1008.00],
+  LETTER: [612.00, 792.00],
+  TABLOID: [792.00, 1224.00]
+};

package/js/tableLayouts.js

@@ -0,0 +1,98 @@
+"use strict";
+
+exports.__esModule = true;
+exports.tableLayouts = exports.defaultTableLayout = void 0;
+/*eslint no-unused-vars: ["error", {"args": "none"}]*/
+
+const tableLayouts = exports.tableLayouts = {
+  noBorders: {
+    hLineWidth(i) {
+      return 0;
+    },
+    vLineWidth(i) {
+      return 0;
+    },
+    paddingLeft(i) {
+      return i && 4 || 0;
+    },
+    paddingRight(i, node) {
+      return i < node.table.widths.length - 1 ? 4 : 0;
+    }
+  },
+  headerLineOnly: {
+    hLineWidth(i, node) {
+      if (i === 0 || i === node.table.body.length) {
+        return 0;
+      }
+      return i === node.table.headerRows ? 2 : 0;
+    },
+    vLineWidth(i) {
+      return 0;
+    },
+    paddingLeft(i) {
+      return i === 0 ? 0 : 8;
+    },
+    paddingRight(i, node) {
+      return i === node.table.widths.length - 1 ? 0 : 8;
+    }
+  },
+  lightHorizontalLines: {
+    hLineWidth(i, node) {
+      if (i === 0 || i === node.table.body.length) {
+        return 0;
+      }
+      return i === node.table.headerRows ? 2 : 1;
+    },
+    vLineWidth(i) {
+      return 0;
+    },
+    hLineColor(i) {
+      return i === 1 ? 'black' : '#aaa';
+    },
+    paddingLeft(i) {
+      return i === 0 ? 0 : 8;
+    },
+    paddingRight(i, node) {
+      return i === node.table.widths.length - 1 ? 0 : 8;
+    }
+  }
+};
+const defaultTableLayout = exports.defaultTableLayout = {
+  hLineWidth(i, node) {
+    return 1;
+  },
+  vLineWidth(i, node) {
+    return 1;
+  },
+  hLineColor(i, node) {
+    return 'black';
+  },
+  vLineColor(i, node) {
+    return 'black';
+  },
+  hLineStyle(i, node) {
+    return null;
+  },
+  vLineStyle(i, node) {
+    return null;
+  },
+  paddingLeft(i, node) {
+    return 4;
+  },
+  paddingRight(i, node) {
+    return 4;
+  },
+  paddingTop(i, node) {
+    return 2;
+  },
+  paddingBottom(i, node) {
+    return 2;
+  },
+  fillColor(i, node) {
+    return null;
+  },
+  fillOpacity(i, node) {
+    return 1;
+  },
+  defaultBorder: true
+};

package/js/virtual-fs.js

@@ -0,0 +1,60 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+const normalizeFilename = filename => {
+  if (filename.indexOf(__dirname) === 0) {
+    filename = filename.substring(__dirname.length);
+  }
+  if (filename.indexOf('/') === 0) {
+    filename = filename.substring(1);
+  }
+  return filename;
+};
+class VirtualFileSystem {
+  constructor() {
+    this.storage = {};
+  }
+
+  /**
+   * @param {string} filename
+   * @returns {boolean}
+   */
+  existsSync(filename) {
+    const normalizedFilename = normalizeFilename(filename);
+    return typeof this.storage[normalizedFilename] !== 'undefined';
+  }
+
+  /**
+   * @param {string} filename
+   * @param {?string|?object} options
+   * @returns {string|Buffer}
+   */
+  readFileSync(filename, options) {
+    const normalizedFilename = normalizeFilename(filename);
+    const encoding = typeof options === 'object' ? options.encoding : options;
+    if (!this.existsSync(normalizedFilename)) {
+      throw new Error(`File '${normalizedFilename}' not found in virtual file system`);
+    }
+    const buffer = this.storage[normalizedFilename];
+    if (encoding) {
+      return buffer.toString(encoding);
+    }
+    return buffer;
+  }
+
+  /**
+   * @param {string} filename
+   * @param {string|Buffer} content
+   * @param {?string|?object} options
+   */
+  writeFileSync(filename, content, options) {
+    const normalizedFilename = normalizeFilename(filename);
+    const encoding = typeof options === 'object' ? options.encoding : options;
+    if (!content && !options) {
+      throw new Error('No content');
+    }
+    this.storage[normalizedFilename] = encoding || typeof content === 'string' ? new Buffer(content, encoding) : content;
+  }
+}
+var _default = exports.default = new VirtualFileSystem();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.3.0-beta.8",
+  "version": "0.3.0",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "js/index.js",
   "esnext": "src/index.js",
@@ -9,44 +9,45 @@
     "test": "tests"
   },
   "dependencies": {
-    "@foliojs-fork/linebreak": "^1.1.1",
-    "@foliojs-fork/pdfkit": "^0.14.0",
-    "iconv-lite": "^0.6.3",
-    "xmldoc": "^1.3.0"
+    "linebreak": "^1.1.0",
+    "pdfkit": "^0.17.2",
+    "xmldoc": "^2.0.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.23.4",
-    "@babel/core": "^7.23.6",
-    "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-    "@babel/preset-env": "^7.23.6",
+    "@babel/cli": "^7.28.3",
+    "@babel/core": "^7.28.5",
+    "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+    "@babel/preset-env": "^7.28.5",
+    "@eslint/js": "^9.39.2",
     "assert": "^2.1.0",
-    "babel-loader": "^9.1.3",
+    "babel-loader": "^10.0.0",
     "brfs": "^2.0.2",
     "browserify-zlib": "^0.2.0",
-    "buffer": "6.0.3",
-    "core-js": "3.19.0",
-    "eslint": "^8.55.0",
-    "eslint-plugin-jsdoc": "^46.9.1",
-    "expose-loader": "^4.1.0",
+    "buffer": "^6.0.3",
+    "core-js": "^3.47.0",
+    "eslint": "^9.39.2",
+    "eslint-plugin-jsdoc": "^61.5.0",
+    "expose-loader": "^5.0.1",
     "file-saver": "^2.0.5",
-    "mocha": "^10.2.0",
+    "globals": "^16.5.0",
+    "mocha": "^11.7.5",
     "npm-run-all": "^4.1.5",
     "process": "^0.11.10",
-    "rewire": "^7.0.0",
-    "shx": "^0.3.4",
-    "sinon": "^17.0.1",
-    "source-map-loader": "^4.0.1",
+    "rewire": "^9.0.1",
+    "shx": "^0.4.0",
+    "sinon": "^21.0.1",
+    "source-map-loader": "^5.0.0",
     "stream-browserify": "^3.0.0",
     "string-replace-webpack-plugin": "^0.1.3",
     "svg-to-pdfkit": "^0.1.8",
-    "terser-webpack-plugin": "^5.3.9",
+    "terser-webpack-plugin": "^5.3.16",
     "transform-loader": "^0.2.4",
     "util": "^0.12.5",
-    "webpack": "^5.89.0",
-    "webpack-cli": "^5.1.4"
+    "webpack": "^5.104.1",
+    "webpack-cli": "^6.0.1"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=20"
   },
   "scripts": {
     "test": "run-s build mocha lint",

package/src/DocMeasure.js

@@ -34,12 +34,18 @@ class DocMeasure {
 		return this.measureNode(docStructure);
 	}
 
+	measureBlock(node) {
+		return this.measureNode(node);
+	}
+
 	measureNode(node) {
 		return this.styleStack.auto(node, () => {
 			// TODO: refactor + rethink whether this is the proper way to handle margins
 			node._margin = getNodeMargin(node, this.styleStack);
 
-			if (node.columns) {
+			if (node.section) {
+				return extendMargins(this.measureSection(node));
+			} else if (node.columns) {
 				return extendMargins(this.measureColumns(node));
 			} else if (node.stack) {
 				return extendMargins(this.measureVerticalContainer(node));
@@ -128,8 +134,14 @@ class DocMeasure {
 		this.convertIfBase64Image(node);
 
 		let image = this.pdfDocument.provideImage(node.image);
+
 		let imageSize = { width: image.width, height: image.height };
 
+		// If EXIF orientation calls for it, swap width and height
+		if (image.orientation > 4) {
+			imageSize = { width: image.height, height: image.width };
+		}
+
 		this.measureImageWithDimensions(node, imageSize);
 
 		return node;
@@ -433,16 +445,17 @@ class DocMeasure {
 				if (item.listMarker._inlines) {
 					node._gapSize.width = Math.max(node._gapSize.width, item.listMarker._inlines[0].width);
 				}
-			}  // TODO: else - nested lists numbering
+
+				if (node.reversed) {
+					counter--;
+				} else {
+					counter++;
+				}
+			}
 
 			node._minWidth = Math.max(node._minWidth, items[i]._minWidth);
 			node._maxWidth = Math.max(node._maxWidth, items[i]._maxWidth);
 
-			if (node.reversed) {
-				counter--;
-			} else {
-				counter++;
-			}
 		}
 
 		node._minWidth += node._gapSize.width;
@@ -458,6 +471,14 @@ class DocMeasure {
 		return node;
 	}
 
+	measureSection(node) {
+		// TODO: properties
+
+		node.section = this.measureNode(node.section);
+
+		return node;
+	}
+
 	measureColumns(node) {
 		let columns = node.columns;
 		node._gap = this.styleStack.getProperty('columnGap') || 0;

package/src/DocPreprocessor.js

@@ -20,10 +20,17 @@ class DocPreprocessor {
 		this.parentNode = null;
 		this.tocs = [];
 		this.nodeReferences = [];
-		return this.preprocessNode(docStructure);
+		return this.preprocessNode(docStructure, true);
 	}
 
-	preprocessNode(node) {
+	preprocessBlock(node) {
+		this.parentNode = null;
+		this.tocs = [];
+		this.nodeReferences = [];
+		return this.preprocessNode(node);
+	}
+
+	preprocessNode(node, isSectionAllowed = false) {
 		// expand shortcuts and casting values
 		if (Array.isArray(node)) {
 			node = { stack: node };
@@ -33,10 +40,16 @@ class DocPreprocessor {
 			node.text = convertValueToString(node.text);
 		}
 
-		if (node.columns) {
+		if (node.section) {
+			if (!isSectionAllowed) {
+				throw new Error(`Incorrect document structure, section node is only allowed at the root level of document structure: ${stringifyNode(node)}`);
+			}
+
+			return this.preprocessSection(node);
+		} else if (node.columns) {
 			return this.preprocessColumns(node);
 		} else if (node.stack) {
-			return this.preprocessVerticalContainer(node);
+			return this.preprocessVerticalContainer(node, isSectionAllowed);
 		} else if (node.ul) {
 			return this.preprocessList(node);
 		} else if (node.ol) {
@@ -64,6 +77,12 @@ class DocPreprocessor {
 		}
 	}
 
+	preprocessSection(node) {
+		node.section = this.preprocessNode(node.section);
+
+		return node;
+	}
+
 	preprocessColumns(node) {
 		let columns = node.columns;
 
@@ -74,11 +93,11 @@ class DocPreprocessor {
 		return node;
 	}
 
-	preprocessVerticalContainer(node) {
+	preprocessVerticalContainer(node, isSectionAllowed) {
 		let items = node.stack;
 
 		for (let i = 0, l = items.length; i < l; i++) {
-			items[i] = this.preprocessNode(items[i]);
+			items[i] = this.preprocessNode(items[i], isSectionAllowed);
 		}
 
 		return node;

package/src/DocumentContext.js

@@ -6,31 +6,27 @@ import { EventEmitter } from 'events';
  * It facilitates column divisions and vertical sync
  */
 class DocumentContext extends EventEmitter {
-	constructor(pageSize, pageMargins) {
+	constructor() {
 		super();
 		this.pages = [];
-
-		this.pageMargins = pageMargins;
-
-		this.x = pageMargins.left;
-		this.availableWidth = pageSize.width - pageMargins.left - pageMargins.right;
-		this.availableHeight = 0;
+		this.pageMargins = undefined;
+		this.x = undefined;
+		this.availableWidth = undefined;
+		this.availableHeight = undefined;
 		this.page = -1;
 
 		this.snapshots = [];
-		this.endingCell = null;
 		this.backgroundLength = [];
-
-		this.addPage(pageSize);
 	}
 
-	beginColumnGroup() {
+	beginColumnGroup(marginXTopParent, bottomByPage = {}) {
 		this.snapshots.push({
 			x: this.x,
 			y: this.y,
 			availableHeight: this.availableHeight,
 			availableWidth: this.availableWidth,
 			page: this.page,
+			bottomByPage: bottomByPage ? bottomByPage : {},
 			bottomMost: {
 				x: this.x,
 				y: this.y,
@@ -38,19 +34,34 @@ class DocumentContext extends EventEmitter {
 				availableWidth: this.availableWidth,
 				page: this.page
 			},
-			endingCell: this.endingCell,
 			lastColumnWidth: this.lastColumnWidth
 		});
 
 		this.lastColumnWidth = 0;
+		if (marginXTopParent) {
+			this.marginXTopParent = marginXTopParent;
+		}
+	}
+
+	updateBottomByPage() {
+		const lastSnapshot = this.snapshots[this.snapshots.length - 1];
+		const lastPage = this.page;
+		let previousBottom = -Number.MIN_VALUE;
+		if (lastSnapshot.bottomByPage[lastPage]) {
+			previousBottom = lastSnapshot.bottomByPage[lastPage];
+		}
+		lastSnapshot.bottomByPage[lastPage] = Math.max(previousBottom, this.y);
+	}
+
+	resetMarginXTopParent() {
+		this.marginXTopParent = null;
 	}
 
 	beginColumn(width, offset, endingCell) {
 		let saved = this.snapshots[this.snapshots.length - 1];
 
-		this.calculateBottomMost(saved);
+		this.calculateBottomMost(saved, endingCell);
 
-		this.endingCell = endingCell;
 		this.page = saved.page;
 		this.x = this.x + this.lastColumnWidth + (offset || 0);
 		this.y = saved.y;
@@ -60,19 +71,18 @@ class DocumentContext extends EventEmitter {
 		this.lastColumnWidth = width;
 	}
 
-	calculateBottomMost(destContext) {
-		if (this.endingCell) {
-			this.saveContextInEndingCell(this.endingCell);
-			this.endingCell = null;
+	calculateBottomMost(destContext, endingCell) {
+		if (endingCell) {
+			this.saveContextInEndingCell(endingCell);
 		} else {
 			destContext.bottomMost = bottomMostContext(this, destContext.bottomMost);
 		}
 	}
 
-	markEnding(endingCell) {
+	markEnding(endingCell, originalXOffset, discountY) {
 		this.page = endingCell._columnEndingContext.page;
-		this.x = endingCell._columnEndingContext.x;
-		this.y = endingCell._columnEndingContext.y;
+		this.x = endingCell._columnEndingContext.x + originalXOffset;
+		this.y = endingCell._columnEndingContext.y - discountY;
 		this.availableWidth = endingCell._columnEndingContext.availableWidth;
 		this.availableHeight = endingCell._columnEndingContext.availableHeight;
 		this.lastColumnWidth = endingCell._columnEndingContext.lastColumnWidth;
@@ -89,12 +99,11 @@ class DocumentContext extends EventEmitter {
 		};
 	}
 
-	completeColumnGroup(height) {
+	completeColumnGroup(height, endingCell) {
 		let saved = this.snapshots.pop();
 
-		this.calculateBottomMost(saved);
+		this.calculateBottomMost(saved, endingCell);
 
-		this.endingCell = null;
 		this.x = saved.x;
 
 		let y = saved.bottomMost.y;
@@ -116,6 +125,7 @@ class DocumentContext extends EventEmitter {
 			this.availableHeight -= (y - saved.bottomMost.y);
 		}
 		this.lastColumnWidth = saved.lastColumnWidth;
+		return saved.bottomByPage;
 	}
 
 	addMargin(left, right) {
@@ -133,14 +143,19 @@ class DocumentContext extends EventEmitter {
 	initializePage() {
 		this.y = this.pageMargins.top;
 		this.availableHeight = this.getCurrentPage().pageSize.height - this.pageMargins.top - this.pageMargins.bottom;
-		this.pageSnapshot().availableWidth = this.getCurrentPage().pageSize.width - this.pageMargins.left - this.pageMargins.right;
+		const { pageCtx, isSnapshot } = this.pageSnapshot();
+		pageCtx.availableWidth = this.getCurrentPage().pageSize.width - this.pageMargins.left - this.pageMargins.right;
+		if (isSnapshot && this.marginXTopParent) {
+			pageCtx.availableWidth -= this.marginXTopParent[0];
+			pageCtx.availableWidth -= this.marginXTopParent[1];
+		}
 	}
 
 	pageSnapshot() {
 		if (this.snapshots[0]) {
-			return this.snapshots[0];
+			return { pageCtx: this.snapshots[0], isSnapshot: true };
 		} else {
-			return this;
+			return { pageCtx: this, isSnapshot: false };
 		}
 	}
 
@@ -171,7 +186,6 @@ class DocumentContext extends EventEmitter {
 			availableHeight: this.availableHeight,
 			availableWidth: this.availableWidth,
 			page: this.page,
-			endingCell: this.endingCell,
 			lastColumnWidth: this.lastColumnWidth
 		});
 	}
@@ -184,7 +198,6 @@ class DocumentContext extends EventEmitter {
 		this.availableWidth = saved.availableWidth;
 		this.availableHeight = saved.availableHeight;
 		this.page = saved.page;
-		this.endingCell = saved.endingCell;
 		this.lastColumnWidth = saved.lastColumnWidth;
 	}
 
@@ -193,13 +206,23 @@ class DocumentContext extends EventEmitter {
 		let prevPage = this.page;
 		let prevY = this.y;
 
+		// If we are in a column group
+		if (this.snapshots.length > 0) {
+			let lastSnapshot = this.snapshots[this.snapshots.length - 1];
+			// We have to update prevY accordingly by also taking into consideration
+			// the 'y' of cells that don't break page
+			if (lastSnapshot.bottomMost && lastSnapshot.bottomMost.y) {
+				prevY = Math.max(this.y, lastSnapshot.bottomMost.y);
+			}
+		}
+
 		let createNewPage = nextPageIndex >= this.pages.length;
 		if (createNewPage) {
 			let currentAvailableWidth = this.availableWidth;
 			let currentPageOrientation = this.getCurrentPage().pageSize.orientation;
 
 			let pageSize = getPageSize(this.getCurrentPage(), pageOrientation);
-			this.addPage(pageSize);
+			this.addPage(pageSize, null, this.getCurrentPage().customProperties);
 
 			if (currentPageOrientation === pageSize.orientation) {
 				this.availableWidth = currentAvailableWidth;
@@ -217,14 +240,20 @@ class DocumentContext extends EventEmitter {
 		};
 	}
 
-	addPage(pageSize) {
-		let page = { items: [], pageSize: pageSize };
+	addPage(pageSize, pageMargin = null, customProperties = {}) {
+		if (pageMargin !== null) {
+			this.pageMargins = pageMargin;
+			this.x = pageMargin.left;
+			this.availableWidth = pageSize.width - pageMargin.left - pageMargin.right;
+		}
+
+		let page = { items: [], pageSize: pageSize, pageMargins: this.pageMargins, customProperties: customProperties };
 		this.pages.push(page);
 		this.backgroundLength.push(0);
 		this.page = this.pages.length - 1;
 		this.initializePage();
 
-		this.emit('pageAdded');
+		this.emit('pageAdded', page);
 
 		return page;
 	}