pdfmake 0.2.20 → 0.2.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.2.20",
+  "version": "0.2.22",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "src/printer.js",
   "browser": "build/pdfmake.js",
@@ -10,40 +10,40 @@
   "dependencies": {
     "@foliojs-fork/linebreak": "^1.1.2",
     "@foliojs-fork/pdfkit": "^0.15.3",
-    "iconv-lite": "^0.6.3",
-    "xmldoc": "^2.0.1"
+    "iconv-lite": "^0.7.1",
+    "xmldoc": "^2.0.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.27.2",
-    "@babel/core": "^7.27.1",
+    "@babel/cli": "^7.28.3",
+    "@babel/core": "^7.28.5",
     "@babel/plugin-transform-modules-commonjs": "^7.27.1",
-    "@babel/preset-env": "^7.27.2",
-    "@eslint/js": "^9.26.0",
+    "@babel/preset-env": "^7.28.5",
+    "@eslint/js": "^9.39.2",
     "assert": "^2.1.0",
     "babel-loader": "^10.0.0",
     "brfs": "^2.0.2",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "core-js": "3.19.0",
-    "eslint": "^9.26.0",
-    "eslint-plugin-jsdoc": "^50.6.11",
+    "eslint": "^9.39.2",
+    "eslint-plugin-jsdoc": "^61.5.0",
     "expose-loader": "^5.0.1",
     "file-saver": "^2.0.5",
-    "globals": "^16.1.0",
-    "mocha": "^11.2.2",
+    "globals": "^16.5.0",
+    "mocha": "^11.7.5",
     "npm-run-all": "^4.1.5",
     "process": "^0.11.10",
-    "rewire": "^7.0.0",
+    "rewire": "^9.0.1",
     "shx": "^0.4.0",
-    "sinon": "^20.0.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.14",
+    "terser-webpack-plugin": "^5.3.16",
     "transform-loader": "^0.2.4",
     "util": "^0.12.5",
-    "webpack": "^5.99.8",
+    "webpack": "^5.104.1",
     "webpack-cli": "^6.0.1"
   },
   "engines": {

package/src/browser-extensions/pdfMake.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var isFunction = require('../helpers').isFunction;
+var isObject = require('../helpers').isObject;
 var isUndefined = require('../helpers').isUndefined;
 //var isNull = require('../helpers').isNull;
 var pack = require('../helpers').pack;
@@ -321,6 +322,10 @@ Document.prototype.getStream = function (options, cb) {
 
 module.exports = {
 	createPdf: function (docDefinition, tableLayouts, fonts, vfs) {
+		if (!isObject(docDefinition)) {
+			throw new Error("Parameter 'docDefinition' has an invalid type. Object expected.");
+		}
+
 		if (!canCreatePdf()) {
 			throw 'Your browser does not provide the level of support needed';
 		}

package/src/layoutBuilder.js

@@ -66,9 +66,17 @@ LayoutBuilder.prototype.layoutDocument = function (docStructure, fontProvider, s
 			return false;
 		}
 
-		linearNodeList = linearNodeList.filter(function (node) {
-			return node.positions.length > 0;
-		});
+		const hasRenderableContent = node => {
+			if (!node || node.positions.length === 0) {
+				return false;
+			}
+			if (node.text === '' && !node.listMarker) {
+				return false;
+			}
+			return true;
+		};
+
+		linearNodeList = linearNodeList.filter(hasRenderableContent);
 
 		linearNodeList.forEach(function (node) {
 			var nodeInfo = {};

package/src/printer.js

@@ -15,6 +15,7 @@ var isNumber = require('./helpers').isNumber;
 var isBoolean = require('./helpers').isBoolean;
 var isArray = require('./helpers').isArray;
 var isUndefined = require('./helpers').isUndefined;
+var isObject = require('./helpers').isObject;
 var isPattern = require('./helpers').isPattern;
 var getPattern = require('./helpers').getPattern;
 var SVGtoPDF = require('./3rd-party/svg-to-pdfkit');
@@ -111,6 +112,14 @@ function PdfPrinter(fontDescriptors) {
 PdfPrinter.prototype.createPdfKitDocument = function (docDefinition, options) {
 	options = options || {};
 
+	if (!isObject(docDefinition)) {
+		throw new Error("Parameter 'docDefinition' has an invalid type. Object expected.");
+	}
+
+	if (!isObject(options)) {
+		throw new Error("Parameter 'options' has an invalid type. Object expected.");
+	}
+
 	docDefinition.version = docDefinition.version || '1.3';
 	docDefinition.subset = docDefinition.subset || undefined;
 	docDefinition.tagged = typeof docDefinition.tagged === 'boolean' ? docDefinition.tagged : false;
@@ -677,7 +686,7 @@ function renderImage(image, x, y, pdfKitDoc) {
 }
 
 function renderSVG(svg, x, y, pdfKitDoc, fontProvider) {
-	var options = Object.assign({ width: svg._width, height: svg._height, assumePt: true }, svg.options);
+	var options = Object.assign({ width: svg._width, height: svg._height, assumePt: true, useCSS: !isString(svg.svg) }, svg.options);
 	options.fontCallback = function (family, bold, italic) {
 		var fontsFamily = family.split(',').map(function (f) { return f.trim().replace(/('|")/g, ''); });
 		var font = findFont(fontProvider.fonts, fontsFamily, svg.font || 'Roboto');

package/src/svgMeasure.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var xmldoc = require('xmldoc');
+var isString = require('./helpers').isString;
 
 /** Strip unit postfix, parse number, but return undefined instead of NaN for bad input */
 function stripUnits(textVal) {
@@ -18,11 +19,11 @@ function parseSVG(svgString) {
 	try {
 		doc = new xmldoc.XmlDocument(svgString);
 	} catch (err) {
-		throw new Error('SVGMeasure: ' + err);
+		throw new Error('Invalid svg document (' + err + ')');
 	}
 
 	if (doc.name !== "svg") {
-		throw new Error('SVGMeasure: expected <svg> document');
+		throw new Error('Invalid svg document (expected <svg>)');
 	}
 
 	return doc;
@@ -31,17 +32,30 @@ function parseSVG(svgString) {
 function SVGMeasure() {
 }
 
-SVGMeasure.prototype.measureSVG = function (svgString) {
-
-	var doc = parseSVG(svgString);
+SVGMeasure.prototype.measureSVG = function (svg) {
+	var width, height, viewBox;
+
+	if (isString(svg)) {
+		var doc = parseSVG(svg);
+
+		width = doc.attr.width;
+		height = doc.attr.height;
+		viewBox = doc.attr.viewBox;
+	} else if (typeof SVGElement !== 'undefined' && svg instanceof SVGElement && typeof getComputedStyle === 'function') {
+		width = svg.getAttribute("width");
+		height = svg.getAttribute("height");
+		viewBox = svg.getAttribute("viewBox");
+	} else {
+		throw new Error('Invalid SVG document');
+	}
 
-	var docWidth = stripUnits(doc.attr.width);
-	var docHeight = stripUnits(doc.attr.height);
+	var docWidth = stripUnits(width);
+	var docHeight = stripUnits(height);
 
-	if ((docWidth == undefined || docHeight == undefined) && typeof doc.attr.viewBox == 'string') {
-		var viewBoxParts = doc.attr.viewBox.split(/[,\s]+/);
+	if ((docWidth == undefined || docHeight == undefined) && typeof viewBox == 'string') {
+		var viewBoxParts = viewBox.split(/[,\s]+/);
 		if (viewBoxParts.length !== 4) {
-			throw new Error("Unexpected svg viewbox format, should have 4 entries but found: '" + doc.attr.viewBox + "'");
+			throw new Error("Unexpected svg viewBox format, should have 4 entries but found: '" + viewBox + "'");
 		}
 		if (docWidth == undefined) {
 			docWidth = stripUnits(viewBoxParts[2]);
@@ -57,14 +71,28 @@ SVGMeasure.prototype.measureSVG = function (svgString) {
 	};
 };
 
-SVGMeasure.prototype.writeDimensions = function (svgString, dimensions) {
+SVGMeasure.prototype.writeDimensions = function (svg, dimensions) {
+	if (isString(svg)) {
+		var doc = parseSVG(svg);
+
+		if (typeof doc.attr.viewBox !== 'string') {
+			doc.attr.viewBox = `0 0 ${stripUnits(doc.attr.width)} ${stripUnits(doc.attr.height)}`;
+		}
+
+		doc.attr.width = "" + dimensions.width;
+		doc.attr.height = "" + dimensions.height;
+
+		return doc.toString();
+	}
 
-	var doc = parseSVG(svgString);
+	if (!svg.hasAttribute('viewBox')) {
+		svg.setAttribute('viewBox', `0 0 ${stripUnits(svg.getAttribute('width'))} ${stripUnits(svg.getAttribute('height'))}`);
+	}
 
-	doc.attr.width = "" + dimensions.width;
-	doc.attr.height = "" + dimensions.height;
+	svg.setAttribute('width', "" + dimensions.width);
+	svg.setAttribute('height', "" + dimensions.height);
 
-	return doc.toString();
+	return svg;
 };
 
 module.exports = SVGMeasure;

package/src/textTools.js

@@ -118,8 +118,19 @@ TextTools.prototype.widthOfString = function (text, font, fontSize, characterSpa
 	return widthOfString(text, font, fontSize, characterSpacing, fontFeatures);
 };
 
-function splitWords(text, noWrap) {
+function splitWords(text, noWrap, breakAll) {
+	if (breakAll === undefined) {
+		breakAll = false;
+	}
+
 	var results = [];
+
+	if (text === undefined || text === null) {
+		text = '';
+	} else {
+		text = String(text);
+	}
+
 	text = text.replace(/\t/g, '    ');
 
 	if (noWrap) {
@@ -127,6 +138,19 @@ function splitWords(text, noWrap) {
 		return results;
 	}
 
+	if (text.length === 0) {
+	 	results.push({ text: '' });
+	 	return results;
+	}
+	if (breakAll) {
+		return text.split('').map(c => {
+			if(c.match(/^\n$|^\r$/)) { // new line
+				return { text: '', lineEnd: true };
+			}
+			return { text: c };
+		});
+	}
+
 	var breaker = new LineBreaker(text);
 	var last = 0;
 	var bk;
@@ -205,15 +229,16 @@ function normalizeTextArray(array, styleContextStack) {
 		var style = null;
 		var words;
 
+		var breakAll = getStyleProperty(item || {}, styleContextStack, 'wordBreak', 'normal') === 'break-all';
 		var noWrap = getStyleProperty(item || {}, styleContextStack, 'noWrap', false);
 		if (isObject(item)) {
 			if (item._textRef && item._textRef._textNodeRef.text) {
 				item.text = item._textRef._textNodeRef.text;
 			}
-			words = splitWords(normalizeString(item.text), noWrap);
+			words = splitWords(normalizeString(item.text), noWrap, breakAll);
 			style = copyStyle(item);
 		} else {
-			words = splitWords(normalizeString(item), noWrap);
+			words = splitWords(normalizeString(item), noWrap, breakAll);
 		}
 
 		if (lastWord && words.length) {