pdfmake 0.3.0-beta.18 → 0.3.0-beta.19

package/js/browser-extensions/OutputDocumentBrowser.js

@@ -21,20 +21,10 @@ class OutputDocumentBrowser extends _OutputDocument.default {
   /**
    * @returns {Promise<Blob>}
    */
-  getBlob() {
-    return new Promise((resolve, reject) => {
-      this.getBuffer().then(buffer => {
-        try {
-          let blob = new Blob([buffer], {
-            type: 'application/pdf'
-          });
-          resolve(blob);
-        } catch (e) {
-          reject(e);
-        }
-      }, result => {
-        reject(result);
-      });
+  async getBlob() {
+    const buffer = await this.getBuffer();
+    return new Blob([buffer], {
+      type: 'application/pdf'
     });
   }
 
@@ -42,77 +32,50 @@ class OutputDocumentBrowser extends _OutputDocument.default {
    * @param {string} filename
    * @returns {Promise}
    */
-  download(filename = 'file.pdf') {
-    return new Promise((resolve, reject) => {
-      this.getBlob().then(blob => {
-        try {
-          (0, _fileSaver.saveAs)(blob, filename);
-          resolve();
-        } catch (e) {
-          reject(e);
-        }
-      }, result => {
-        reject(result);
-      });
-    });
+  async download(filename = 'file.pdf') {
+    const blob = await this.getBlob();
+    (0, _fileSaver.saveAs)(blob, filename);
   }
 
   /**
    * @param {Window} win
    * @returns {Promise}
    */
-  open(win = null) {
-    return new Promise((resolve, reject) => {
-      if (!win) {
-        win = openWindow();
-      }
-      this.getBlob().then(blob => {
-        try {
-          let urlCreator = window.URL || window.webkitURL;
-          let pdfUrl = urlCreator.createObjectURL(blob);
-          win.location.href = pdfUrl;
+  async open(win = null) {
+    if (!win) {
+      win = openWindow();
+    }
+    const blob = await this.getBlob();
+    try {
+      let urlCreator = window.URL || window.webkitURL;
+      let pdfUrl = urlCreator.createObjectURL(blob);
+      win.location.href = pdfUrl;
 
-          //
-          resolve();
-          /* temporarily disabled
-          if (win === window) {
-          	resolve();
-          } else {
-          	setTimeout(() => {
-          		if (win.window === null) { // is closed by AdBlock
-          			window.location.href = pdfUrl; // open in actual window
-          		}
-          		resolve();
-          	}, 500);
-          }
-          */
-        } catch (e) {
-          win.close();
-          reject(e);
-        }
-      }, result => {
-        reject(result);
-      });
-    });
+      /* temporarily disabled
+      if (win === window) {
+      	return;
+      } else {
+      	setTimeout(() => {
+      		if (win.window === null) { // is closed by AdBlock
+      			window.location.href = pdfUrl; // open in actual window
+      		}
+      		return;
+      	}, 500);
+      }
+      */
+    } finally {
+      win.close();
+    }
   }
 
   /**
    * @param {Window} win
    * @returns {Promise}
    */
-  print(win = null) {
-    return new Promise((resolve, reject) => {
-      this.getStream().then(stream => {
-        stream.setOpenActionAsPrint();
-        return this.open(win).then(() => {
-          resolve();
-        }, result => {
-          reject(result);
-        });
-      }, result => {
-        reject(result);
-      });
-    });
+  async print(win = null) {
+    const stream = await this.getStream();
+    stream.setOpenActionAsPrint();
+    await this.open(win);
   }
 }
 var _default = exports.default = OutputDocumentBrowser;

package/js/browser-extensions/index.js

@@ -4,7 +4,7 @@ exports.__esModule = true;
 exports.default = void 0;
 var _base = _interopRequireDefault(require("../base"));
 var _OutputDocumentBrowser = _interopRequireDefault(require("./OutputDocumentBrowser"));
-var _URLBrowserResolver = _interopRequireDefault(require("./URLBrowserResolver"));
+var _URLResolver = _interopRequireDefault(require("../URLResolver"));
 var _fs = _interopRequireDefault(require("fs"));
 var _configurator = _interopRequireDefault(require("core-js/configurator"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -23,7 +23,7 @@ let defaultClientFonts = {
 class pdfmake extends _base.default {
   constructor() {
     super();
-    this.urlResolver = () => new _URLBrowserResolver.default(this.virtualfs);
+    this.urlResolver = () => new _URLResolver.default(this.virtualfs);
     this.fonts = defaultClientFonts;
   }
   addFontContainer(fontContainer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.3.0-beta.18",
+  "version": "0.3.0-beta.19",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "js/index.js",
   "esnext": "src/index.js",
@@ -10,44 +10,44 @@
   },
   "dependencies": {
     "linebreak": "^1.1.0",
-    "pdfkit": "^0.17.1",
-    "xmldoc": "^2.0.1"
+    "pdfkit": "^0.17.2",
+    "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.42.0",
-    "eslint": "^9.26.0",
-    "eslint-plugin-jsdoc": "^50.6.11",
+    "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",
-    "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": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "scripts": {
     "test": "run-s build mocha lint",

package/src/LayoutBuilder.js

@@ -72,7 +72,17 @@ class LayoutBuilder {
 				return false;
 			}
 
-			linearNodeList = linearNodeList.filter(node => 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(node => {
 				let nodeInfo = {};

package/src/OutputDocument.js

@@ -20,57 +20,43 @@ class OutputDocument {
 	 * @returns {Promise<Buffer>}
 	 */
 	getBuffer() {
-		if (this.bufferPromise === null) {
-			this.bufferPromise = new Promise((resolve, reject) => {
-				this.getStream().then(stream => {
-
-					let chunks = [];
-					let result;
-					stream.on('readable', () => {
-						let chunk;
-						while ((chunk = stream.read(this.bufferSize)) !== null) {
-							chunks.push(chunk);
-						}
-					});
-					stream.on('end', () => {
-						result = Buffer.concat(chunks);
-						resolve(result);
-					});
-					stream.end();
-
-				}, result => {
-					reject(result);
+		const getBufferInternal = (async () => {
+			const stream = await this.getStream();
+			return new Promise((resolve) => {
+				let chunks = [];
+				stream.on('readable', () => {
+					let chunk;
+					while ((chunk = stream.read(this.bufferSize)) !== null) {
+						chunks.push(chunk);
+					}
 				});
+				stream.on('end', () => {
+					resolve(Buffer.concat(chunks));
+				});
+				stream.end();
 			});
-		}
+		});
 
+		if (this.bufferPromise === null) {
+			this.bufferPromise = getBufferInternal();
+		}
 		return this.bufferPromise;
 	}
 
 	/**
 	 * @returns {Promise<string>}
 	 */
-	getBase64() {
-		return new Promise((resolve, reject) => {
-			this.getBuffer().then(buffer => {
-				resolve(buffer.toString('base64'));
-			}, result => {
-				reject(result);
-			});
-		});
+	async getBase64() {
+		const buffer = await this.getBuffer();
+		return buffer.toString('base64');
 	}
 
 	/**
 	 * @returns {Promise<string>}
 	 */
-	getDataUrl() {
-		return new Promise((resolve, reject) => {
-			this.getBase64().then(data => {
-				resolve('data:application/pdf;base64,' + data);
-			}, result => {
-				reject(result);
-			});
-		});
+	async getDataUrl() {
+		const data = await this.getBase64();
+		return 'data:application/pdf;base64,' + data;
 	}
 
 }

package/src/OutputDocumentServer.js

@@ -7,17 +7,12 @@ class OutputDocumentServer extends OutputDocument {
 	 * @param {string} filename
 	 * @returns {Promise}
 	 */
-	write(filename) {
-		return new Promise((resolve, reject) => {
-			this.getStream().then(stream => {
-				stream.pipe(fs.createWriteStream(filename));
-				stream.on('end', () => {
-					resolve();
-				});
-				stream.end();
-			}, result => {
-				reject(result);
-			});
+	async write(filename) {
+		const stream = await this.getStream();
+		return new Promise((resolve) => {
+			stream.pipe(fs.createWriteStream(filename));
+			stream.on('end', resolve);
+			stream.end();
 		});
 	}