pdfmake 0.2.14 → 0.2.16

package/build-vfs.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 
-const vfsBefore = "this.pdfMake = this.pdfMake || {}; this.pdfMake.vfs = ";
-const vfsAfter = ";";
+const vfsBefore = "var vfs = ";
+const vfsAfter = "; var _global = typeof window === 'object' ? window : typeof global === 'object' ? global : typeof self === 'object' ? self : this; if (typeof _global.pdfMake !== 'undefined' && typeof _global.pdfMake.addVirtualFileSystem !== 'undefined') { _global.pdfMake.addVirtualFileSystem(vfs); } if (typeof module !== 'undefined') { module.exports = vfs; }";
 const sourcePath = process.argv[2];
 const vfsFilename = process.argv[3] ? process.argv[3] : './build/vfs_fonts.js';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "src/printer.js",
   "browser": "build/pdfmake.js",
@@ -8,41 +8,43 @@
     "test": "tests"
   },
   "dependencies": {
-    "@foliojs-fork/linebreak": "^1.1.1",
-    "@foliojs-fork/pdfkit": "^0.14.0",
+    "@foliojs-fork/linebreak": "^1.1.2",
+    "@foliojs-fork/pdfkit": "^0.15.2",
     "iconv-lite": "^0.6.3",
-    "xmldoc": "^1.1.2"
+    "xmldoc": "^1.3.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.5",
-    "@babel/core": "^7.14.6",
-    "@babel/plugin-transform-modules-commonjs": "^7.14.5",
-    "@babel/preset-env": "^7.14.7",
-    "assert": "^2.0.0",
-    "babel-loader": "^8.2.2",
+    "@babel/cli": "^7.25.9",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
+    "@eslint/js": "^9.14.0",
+    "assert": "^2.1.0",
+    "babel-loader": "^9.2.1",
     "brfs": "^2.0.2",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "core-js": "3.19.0",
-    "eslint": "^7.29.0",
-    "eslint-plugin-jsdoc": "^35.4.1",
-    "expose-loader": "^3.0.0",
+    "eslint": "^9.14.0",
+    "eslint-plugin-jsdoc": "^50.4.3",
+    "expose-loader": "^5.0.0",
     "file-saver": "^2.0.5",
-    "mocha": "^9.0.1",
+    "globals": "^15.11.0",
+    "mocha": "^10.8.2",
     "npm-run-all": "^4.1.5",
     "process": "^0.11.10",
-    "rewire": "^5.0.0",
-    "shx": "^0.3.3",
-    "sinon": "^11.1.1",
-    "source-map-loader": "^4.0.1",
+    "rewire": "^7.0.0",
+    "shx": "^0.3.4",
+    "sinon": "^19.0.2",
+    "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.1.4",
+    "terser-webpack-plugin": "^5.3.10",
     "transform-loader": "^0.2.4",
-    "util": "^0.12.4",
-    "webpack": "^5.42.0",
-    "webpack-cli": "^4.7.2"
+    "util": "^0.12.5",
+    "webpack": "^5.96.1",
+    "webpack-cli": "^5.1.4"
   },
   "engines": {
     "node": ">=18"

package/src/browser-extensions/pdfMake.js

@@ -2,7 +2,8 @@
 
 var isFunction = require('../helpers').isFunction;
 var isUndefined = require('../helpers').isUndefined;
-var isNull = require('../helpers').isNull;
+//var isNull = require('../helpers').isNull;
+var pack = require('../helpers').pack;
 var FileSaver = require('file-saver');
 var saveAs = FileSaver.saveAs;
 
@@ -15,6 +16,10 @@ var defaultClientFonts = {
 	}
 };
 
+var globalVfs;
+var globalFonts;
+var globalTableLayouts;
+
 function Document(docDefinition, tableLayouts, fonts, vfs) {
 	this.docDefinition = docDefinition;
 	this.tableLayouts = tableLayouts || null;
@@ -321,9 +326,30 @@ module.exports = {
 		}
 		return new Document(
 			docDefinition,
-			tableLayouts || global.pdfMake.tableLayouts,
-			fonts || global.pdfMake.fonts,
-			vfs || global.pdfMake.vfs
+			tableLayouts || globalTableLayouts || global.pdfMake.tableLayouts,
+			fonts || globalFonts || global.pdfMake.fonts,
+			vfs || globalVfs || global.pdfMake.vfs
 		);
+	},
+	addVirtualFileSystem: function (vfs) {
+		globalVfs = vfs;
+	},
+	addFonts: function (fonts) {
+		globalFonts = pack(globalFonts, fonts);
+	},
+	setFonts: function (fonts) {
+		globalFonts = fonts;
+	},
+	clearFonts: function () {
+		globalFonts = undefined;
+	},
+	addTableLayouts: function (tableLayouts) {
+		globalTableLayouts = pack(globalTableLayouts, tableLayouts);
+	},
+	setTableLayouts: function (tableLayouts) {
+		globalTableLayouts = tableLayouts;
+	},
+	clearTableLayouts: function () {
+		globalTableLayouts = undefined;
 	}
 };

package/src/documentContext.js

@@ -26,13 +26,14 @@ function DocumentContext(pageSize, pageMargins) {
 	this.addPage(pageSize);
 }
 
-DocumentContext.prototype.beginColumnGroup = function (marginXTopParent) {
+DocumentContext.prototype.beginColumnGroup = function (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,
@@ -49,6 +50,16 @@ DocumentContext.prototype.beginColumnGroup = function (marginXTopParent) {
 	}
 };
 
+DocumentContext.prototype.updateBottomByPage = function () {
+	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);
+};
+
 DocumentContext.prototype.resetMarginXTopParent = function () {
 	this.marginXTopParent = null;
 };
@@ -121,6 +132,7 @@ DocumentContext.prototype.completeColumnGroup = function (height, endingCell) {
 		this.availableHeight -= (y - saved.bottomMost.y);
 	}
 	this.lastColumnWidth = saved.lastColumnWidth;
+	return saved.bottomByPage;
 };
 
 DocumentContext.prototype.addMargin = function (left, right) {

package/src/imageMeasure.js

@@ -26,7 +26,16 @@ ImageMeasure.prototype.measureImage = function (src) {
 		image = this.pdfKitDoc._imageRegistry[src];
 	}
 
-	return { width: image.width, height: image.height };
+	var imageSize = { width: image.width, height: image.height };
+
+	if (typeof image === 'object' && image.constructor.name === 'JPEG') {
+		// If EXIF orientation calls for it, swap width and height
+		if (image.orientation > 4) {
+			imageSize = { width: image.height, height: image.width };
+		}
+	}
+
+	return imageSize;
 
 	function realImageSrc(src) {
 		var img = that.imageDictionary[src];