pdfmake 0.2.12 → 0.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "src/printer.js",
   "browser": "build/pdfmake.js",
@@ -45,7 +45,7 @@
     "webpack-cli": "^4.7.2"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=18"
   },
   "scripts": {
     "test": "run-s build mocha",

package/src/browser-extensions/URLBrowserResolver.js

@@ -80,7 +80,7 @@ URLBrowserResolver.prototype.resolve = function (url, headers) {
 	}
 
 	return this.resolving[url];
-}
+};
 
 URLBrowserResolver.prototype.resolved = function () {
 	var _this = this;
@@ -91,6 +91,6 @@ URLBrowserResolver.prototype.resolved = function () {
 			reject(result);
 		});
 	});
-}
+};
 
 module.exports = URLBrowserResolver;

package/src/browser-extensions/pdfMake.js

@@ -25,13 +25,13 @@ function Document(docDefinition, tableLayouts, fonts, vfs) {
 function canCreatePdf() {
 	// Ensure the browser provides the level of support needed
 	try {
-		var arr = new Uint8Array(1)
-		var proto = { foo: function () { return 42 } }
-		Object.setPrototypeOf(proto, Uint8Array.prototype)
-		Object.setPrototypeOf(arr, proto)
-		return arr.foo() === 42
+		var arr = new Uint8Array(1);
+		var proto = { foo: function () { return 42; } };
+		Object.setPrototypeOf(proto, Uint8Array.prototype);
+		Object.setPrototypeOf(arr, proto);
+		return arr.foo() === 42;
 	} catch (e) {
-		return false
+		return false;
 	}
 }
 

package/src/browser-extensions/virtual-fs.js

@@ -9,7 +9,7 @@ VirtualFileSystem.prototype.existsSync = function (filename) {
 	filename = fixFilename(filename);
 	return typeof this.fileSystem[filename] !== 'undefined'
 		|| typeof this.dataSystem[filename] !== 'undefined';
-}
+};
 
 VirtualFileSystem.prototype.readFileSync = function (filename, options) {
 	filename = fixFilename(filename);

package/src/docPreprocessor.js

@@ -250,6 +250,6 @@ DocPreprocessor.prototype._getNodeForNodeRef = function (node) {
 	}
 
 	return node;
-}
+};
 
 module.exports = DocPreprocessor;

package/src/documentContext.js

@@ -26,7 +26,7 @@ function DocumentContext(pageSize, pageMargins) {
 	this.addPage(pageSize);
 }
 
-DocumentContext.prototype.beginColumnGroup = function () {
+DocumentContext.prototype.beginColumnGroup = function (marginXTopParent) {
 	this.snapshots.push({
 		x: this.x,
 		y: this.y,
@@ -44,6 +44,13 @@ DocumentContext.prototype.beginColumnGroup = function () {
 	});
 
 	this.lastColumnWidth = 0;
+	if (marginXTopParent) {
+		this.marginXTopParent = marginXTopParent;
+	}
+};
+
+DocumentContext.prototype.resetMarginXTopParent = function () {
+	this.marginXTopParent = null;
 };
 
 DocumentContext.prototype.beginColumn = function (width, offset, endingCell) {
@@ -68,10 +75,10 @@ DocumentContext.prototype.calculateBottomMost = function (destContext, endingCel
 	}
 };
 
-DocumentContext.prototype.markEnding = function (endingCell) {
+DocumentContext.prototype.markEnding = function (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;
@@ -131,14 +138,19 @@ DocumentContext.prototype.moveDown = function (offset) {
 DocumentContext.prototype.initializePage = function () {
 	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];
+	}
 };
 
 DocumentContext.prototype.pageSnapshot = function () {
 	if (this.snapshots[0]) {
-		return this.snapshots[0];
+		return { pageCtx: this.snapshots[0], isSnapshot: true };
 	} else {
-		return this;
+		return { pageCtx: this, isSnapshot: false };
 	}
 };
 
@@ -221,6 +233,16 @@ DocumentContext.prototype.moveToNextPage = function (pageOrientation) {
 	var prevPage = this.page;
 	var prevY = this.y;
 
+	// If we are in a column group
+	if (this.snapshots.length > 0) {
+		var 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);
+		}
+	}
+
 	var createNewPage = nextPageIndex >= this.pages.length;
 	if (createNewPage) {
 		var currentAvailableWidth = this.availableWidth;

package/src/elementWriter.js

@@ -116,7 +116,7 @@ ElementWriter.prototype.addImage = function (image, index, type) {
 };
 
 ElementWriter.prototype.addSVG = function (image, index) {
-	return this.addImage(image, index, 'svg')
+	return this.addImage(image, index, 'svg');
 };
 
 ElementWriter.prototype.addQr = function (qr, index) {
@@ -261,10 +261,21 @@ ElementWriter.prototype.addFragment = function (block, useBlockXOffset, useBlock
 				var v = pack(item.item);
 
 				offsetVector(v, useBlockXOffset ? (block.xOffset || 0) : ctx.x, useBlockYOffset ? (block.yOffset || 0) : ctx.y);
-				page.items.push({
-					type: 'vector',
-					item: v
-				});
+				if (v._isFillColorFromUnbreakable) {
+					// If the item is a fillColor from an unbreakable block
+					// We have to add it at the beginning of the items body array of the page
+					delete v._isFillColorFromUnbreakable;
+					const endOfBackgroundItemsIndex = ctx.backgroundLength[ctx.page];
+					page.items.splice(endOfBackgroundItemsIndex, 0, {
+						type: 'vector',
+						item: v
+					});
+				} else {
+					page.items.push({
+						type: 'vector',
+						item: v
+					});
+				}
 				break;
 
 			case 'image':

package/src/fontProvider.js

@@ -35,7 +35,7 @@ function FontProvider(fontDescriptors, pdfKitDoc) {
 
 FontProvider.prototype.getFontType = function (bold, italics) {
 	return typeName(bold, italics);
-}
+};
 
 FontProvider.prototype.getFontFile = function (familyName, bold, italics) {
 	var type = this.getFontType(bold, italics);
@@ -44,7 +44,7 @@ FontProvider.prototype.getFontFile = function (familyName, bold, italics) {
 	}
 
 	return this.fonts[familyName][type];
-}
+};
 
 FontProvider.prototype.provideFont = function (familyName, bold, italics) {
 	var type = this.getFontType(bold, italics);

package/src/helpers.js

@@ -38,7 +38,7 @@ function isUndefined(variable) {
  */
 function isPositiveInteger(variable) {
 	if (!isNumber(variable) || !Number.isInteger(variable) || variable <= 0) {
-			return false;
+		return false;
 	}
 	return true;
 }

package/src/imageMeasure.js

@@ -1,55 +1,55 @@
-'use strict';
-
-var fs = require('fs');
-
-function ImageMeasure(pdfKitDoc, imageDictionary) {
-	this.pdfKitDoc = pdfKitDoc;
-	this.imageDictionary = imageDictionary || {};
-}
-
-ImageMeasure.prototype.measureImage = function (src) {
-	var image;
-	var that = this;
-
-	if (!this.pdfKitDoc._imageRegistry[src]) {
-		try {
-			image = this.pdfKitDoc.openImage(realImageSrc(src));
-			if (!image) {
-				throw 'No image';
-			}
-		} catch (error) {
-			throw 'Invalid image: ' + error.toString() + '\nImages dictionary should contain dataURL entries (or local file paths in node.js)';
-		}
-		image.embed(this.pdfKitDoc);
-		this.pdfKitDoc._imageRegistry[src] = image;
-	} else {
-		image = this.pdfKitDoc._imageRegistry[src];
-	}
-
-	return { width: image.width, height: image.height };
-
-	function realImageSrc(src) {
-		var img = that.imageDictionary[src];
-
-		if (!img) {
-			return src;
-		}
-
-		if (typeof img === 'object') {
-			throw 'Not supported image definition: ' + JSON.stringify(img);
-		}
-
-		if (fs.existsSync(img)) {
-			return fs.readFileSync(img);
-		}
-
-		var index = img.indexOf('base64,');
-		if (index < 0) {
-			return that.imageDictionary[src];
-		}
-
-		return Buffer.from(img.substring(index + 7), 'base64');
-	}
-};
-
-module.exports = ImageMeasure;
+'use strict';
+
+var fs = require('fs');
+
+function ImageMeasure(pdfKitDoc, imageDictionary) {
+	this.pdfKitDoc = pdfKitDoc;
+	this.imageDictionary = imageDictionary || {};
+}
+
+ImageMeasure.prototype.measureImage = function (src) {
+	var image;
+	var that = this;
+
+	if (!this.pdfKitDoc._imageRegistry[src]) {
+		try {
+			image = this.pdfKitDoc.openImage(realImageSrc(src));
+			if (!image) {
+				throw 'No image';
+			}
+		} catch (error) {
+			throw 'Invalid image: ' + error.toString() + '\nImages dictionary should contain dataURL entries (or local file paths in node.js)';
+		}
+		image.embed(this.pdfKitDoc);
+		this.pdfKitDoc._imageRegistry[src] = image;
+	} else {
+		image = this.pdfKitDoc._imageRegistry[src];
+	}
+
+	return { width: image.width, height: image.height };
+
+	function realImageSrc(src) {
+		var img = that.imageDictionary[src];
+
+		if (!img) {
+			return src;
+		}
+
+		if (typeof img === 'object') {
+			throw 'Not supported image definition: ' + JSON.stringify(img);
+		}
+
+		if (fs.existsSync(img)) {
+			return fs.readFileSync(img);
+		}
+
+		var index = img.indexOf('base64,');
+		if (index < 0) {
+			return that.imageDictionary[src];
+		}
+
+		return Buffer.from(img.substring(index + 7), 'base64');
+	}
+};
+
+module.exports = ImageMeasure;