pdfmake 0.2.19 → 0.2.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.2.19",
+  "version": "0.2.21",
   "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.0"
+    "iconv-lite": "^0.7.1",
+    "xmldoc": "^2.0.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.27.0",
-    "@babel/core": "^7.26.10",
-    "@babel/plugin-transform-modules-commonjs": "^7.26.3",
-    "@babel/preset-env": "^7.26.9",
-    "@eslint/js": "^9.25.1",
+    "@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": "^10.0.0",
     "brfs": "^2.0.2",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "core-js": "3.19.0",
-    "eslint": "^9.25.1",
-    "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.0.0",
-    "mocha": "^11.1.0",
+    "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.7",
+    "webpack": "^5.104.1",
     "webpack-cli": "^6.0.1"
   },
   "engines": {

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 = {};
@@ -1043,6 +1051,27 @@ LayoutBuilder.prototype.buildNextLine = function (textNode) {
 		return newInline;
 	}
 
+	function findMaxFitLength(text, maxWidth, measureFn) {
+		let low = 1;
+		let high = text.length;
+		let bestFit = 1;
+
+		while (low <= high) {
+			const mid = Math.floor((low + high) / 2);
+			const part = text.substring(0, mid);
+			const width = measureFn(part);
+
+			if (width <= maxWidth) {
+				bestFit = mid;
+				low = mid + 1;
+			} else {
+				high = mid - 1;
+			}
+		}
+
+		return bestFit;
+	}
+
 	if (!textNode._inlines || textNode._inlines.length === 0) {
 		return null;
 	}
@@ -1058,11 +1087,9 @@ LayoutBuilder.prototype.buildNextLine = function (textNode) {
 		isForceContinue = false;
 
 		if (!inline.noWrap && inline.text.length > 1 && inline.width > line.getAvailableWidth()) {
-			var widthPerChar = inline.width / inline.text.length;
-			var maxChars = Math.floor(line.getAvailableWidth() / widthPerChar);
-			if (maxChars < 1) {
-				maxChars = 1;
-			}
+			var maxChars = findMaxFitLength(inline.text, line.getAvailableWidth(), function (txt) {
+				return textTools.widthOfString(txt, inline.font, inline.fontSize, inline.characterSpacing, inline.fontFeatures)
+			});
 			if (maxChars < inline.text.length) {
 				var newInline = cloneInline(inline);
 

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) {