pdfmake 0.1.65 → 0.1.69

package/package.json

@@ -1,69 +1,74 @@
-{
-  "name": "pdfmake",
-  "version": "0.1.65",
-  "description": "Client/server side PDF printing in pure JavaScript",
-  "main": "src/printer.js",
-  "browser": "build/pdfmake.js",
-  "directories": {
-    "test": "tests"
-  },
-  "dependencies": {
-    "iconv-lite": "^0.5.1",
-    "linebreak": "^1.0.2",
-    "pdfkit": "^0.11.0",
-    "svg-to-pdfkit": "^0.1.8"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.8.4",
-    "@babel/plugin-transform-modules-commonjs": "^7.8.3",
-    "@babel/preset-env": "^7.8.4",
-    "babel-loader": "^8.0.6",
-    "brfs": "^2.0.2",
-    "eslint-plugin-jsdoc": "^21.0.0",
-    "expose-loader": "^0.7.5",
-    "fancy-log": "^1.3.3",
-    "file-saver": "^2.0.2",
-    "gulp": "^4.0.2",
-    "gulp-each": "^0.5.0",
-    "gulp-eslint": "^6.0.0",
-    "gulp-file-contents-to-json": "^0.2.2",
-    "gulp-spawn-mocha": "^6.0.0",
-    "mocha": "^7.0.1",
-    "rewire": "^4.0.1",
-    "sinon": "^8.1.1",
-    "string-replace-webpack-plugin": "^0.1.3",
-    "transform-loader": "^0.2.4",
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "webpack": "^4.41.5"
-  },
-  "scripts": {
-    "build": "gulp build",
-    "test": "gulp",
-    "playground": "node dev-playground/server.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/bpampuch/pdfmake.git"
-  },
-  "keywords": [
-    "pdf",
-    "javascript",
-    "printing",
-    "layout"
-  ],
-  "author": "Bartek Pampuch <bartosz.pampuch@gmail.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/bpampuch/pdfmake/issues"
-  },
-  "homepage": "http://pdfmake.org",
-  "config": {
-    "blanket": {
-      "pattern": "src",
-      "data-cover-never": [
-        "node_modules",
-        "tests"
-      ]
-    }
-  }
-}
+{
+  "name": "pdfmake",
+  "version": "0.1.69",
+  "description": "Client/server side PDF printing in pure JavaScript",
+  "main": "src/printer.js",
+  "browser": "build/pdfmake.js",
+  "directories": {
+    "test": "tests"
+  },
+  "dependencies": {
+    "iconv-lite": "^0.6.2",
+    "linebreak": "^1.0.2",
+    "pdfkit": "^0.11.0",
+    "svg-to-pdfkit": "^0.1.8",
+    "xmldoc": "^1.1.2"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.12.10",
+    "@babel/plugin-transform-modules-commonjs": "^7.12.1",
+    "@babel/preset-env": "^7.12.11",
+    "babel-loader": "^8.2.2",
+    "brfs": "^2.0.2",
+    "core-js": "^3.8.1",
+    "eslint-plugin-jsdoc": "^30.7.9",
+    "expose-loader": "^1.0.3",
+    "fancy-log": "^1.3.3",
+    "file-saver": "^2.0.5",
+    "gulp": "^4.0.2",
+    "gulp-each": "^0.5.0",
+    "gulp-eslint": "^6.0.0",
+    "gulp-file-contents-to-json": "^0.2.2",
+    "gulp-spawn-mocha": "^6.0.0",
+    "mocha": "7.2.0",
+    "rewire": "^5.0.0",
+    "sinon": "^9.2.2",
+    "string-replace-webpack-plugin": "^0.1.3",
+    "terser-webpack-plugin": "4.2.3",
+    "transform-loader": "^0.2.4",
+    "webpack": "^4.44.2"
+  },
+  "engines": {
+    "node": ">=8"
+  },
+  "scripts": {
+    "build": "gulp build",
+    "test": "gulp",
+    "playground": "node dev-playground/server.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/bpampuch/pdfmake.git"
+  },
+  "keywords": [
+    "pdf",
+    "javascript",
+    "printing",
+    "layout"
+  ],
+  "author": "Bartek Pampuch <bartosz.pampuch@gmail.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/bpampuch/pdfmake/issues"
+  },
+  "homepage": "http://pdfmake.org",
+  "config": {
+    "blanket": {
+      "pattern": "src",
+      "data-cover-never": [
+        "node_modules",
+        "tests"
+      ]
+    }
+  }
+}

package/src/browser-extensions/URLBrowserResolver.js

@@ -0,0 +1,88 @@
+'use strict';
+
+// Internet Explorer polyfills
+if (typeof window !== 'undefined' && !window.Promise) {
+	require('core-js/features/promise');
+}
+require('core-js/es/object/values');
+
+var fetchUrl = function (url) {
+	return new Promise(function (resolve, reject) {
+		var xhr = new XMLHttpRequest();
+		xhr.open('GET', url, true);
+		xhr.responseType = 'arraybuffer';
+
+		xhr.onreadystatechange = function () {
+			if (xhr.readyState !== 4) {
+				return;
+			}
+
+			var ok = xhr.status >= 200 && xhr.status < 300;
+			if (!ok) {
+				setTimeout(function () {
+					reject(new TypeError('Failed to fetch (url: "' + url + '")'));
+				}, 0);
+			}
+		};
+
+		xhr.onload = function () {
+			var ok = xhr.status >= 200 && xhr.status < 300;
+			if (ok) {
+				resolve(xhr.response);
+			}
+		};
+
+		xhr.onerror = function () {
+			setTimeout(function () {
+				reject(new TypeError('Network request failed (url: "' + url + '")'));
+			}, 0);
+		};
+
+		xhr.ontimeout = function () {
+			setTimeout(function () {
+				reject(new TypeError('Network request failed (url: "' + url + '")'));
+			}, 0);
+		};
+
+		xhr.send();
+	});
+};
+
+function URLBrowserResolver(fs) {
+	this.fs = fs;
+	this.resolving = {};
+}
+
+URLBrowserResolver.prototype.resolve = function (url) {
+	if (!this.resolving[url]) {
+		var _this = this;
+		this.resolving[url] = new Promise(function (resolve, reject) {
+			if (url.toLowerCase().indexOf('https://') === 0 || url.toLowerCase().indexOf('http://') === 0) {
+				fetchUrl(url).then(function (buffer) {
+					_this.fs.writeFileSync(url, buffer);
+					resolve();
+				}, function (result) {
+					reject(result);
+				});
+			} else {
+				// cannot be resolved
+				resolve();
+			}
+		});
+	}
+
+	return this.resolving[url];
+}
+
+URLBrowserResolver.prototype.resolved = function () {
+	var _this = this;
+	return new Promise(function (resolve, reject) {
+		Promise.all(Object.values(_this.resolving)).then(function () {
+			resolve();
+		}, function (result) {
+			reject(result);
+		});
+	});
+}
+
+module.exports = URLBrowserResolver;

package/src/browser-extensions/pdfMake.js

@@ -30,7 +30,7 @@ function canCreatePdf() {
 	return true;
 }
 
-Document.prototype._createDoc = function (options) {
+Document.prototype._createDoc = function (options, cb) {
 	options = options || {};
 	if (this.tableLayouts) {
 		options.tableLayouts = this.tableLayouts;
@@ -41,9 +41,49 @@ Document.prototype._createDoc = function (options) {
 	var printer = new PdfPrinter(this.fonts);
 	require('fs').bindFS(this.vfs); // bind virtual file system to file system
 
-	var doc = printer.createPdfKitDocument(this.docDefinition, options);
+	if (!isFunction(cb)) {
+		var doc = printer.createPdfKitDocument(this.docDefinition, options);
 
-	return doc;
+		return doc;
+	}
+
+	var URLBrowserResolver = require('./URLBrowserResolver');
+	var urlResolver = new URLBrowserResolver(require('fs'));
+
+	for (var font in this.fonts) {
+		if (this.fonts.hasOwnProperty(font)) {
+			if (this.fonts[font].normal) {
+				urlResolver.resolve(this.fonts[font].normal);
+			}
+			if (this.fonts[font].bold) {
+				urlResolver.resolve(this.fonts[font].bold);
+			}
+			if (this.fonts[font].italics) {
+				urlResolver.resolve(this.fonts[font].italics);
+			}
+			if (this.fonts[font].bolditalics) {
+				urlResolver.resolve(this.fonts[font].bolditalics);
+			}
+		}
+	}
+
+	if (this.docDefinition.images) {
+		for (var image in this.docDefinition.images) {
+			if (this.docDefinition.images.hasOwnProperty(image)) {
+				urlResolver.resolve(this.docDefinition.images[image]);
+			}
+		}
+	}
+
+	var _this = this;
+
+	urlResolver.resolved().then(function () {
+		var doc = printer.createPdfKitDocument(_this.docDefinition, options);
+
+		cb(doc);
+	}, function (result) {
+		throw result;
+	});
 };
 
 Document.prototype._flushDoc = function (doc, callback) {
@@ -67,9 +107,12 @@ Document.prototype._getPages = function (options, cb) {
 	if (!cb) {
 		throw '_getPages is an async method and needs a callback argument';
 	}
-	var doc = this._createDoc(options);
-	this._flushDoc(doc, function (ignoreBuffer, pages) {
-		cb(pages);
+	var _this = this;
+
+	this._createDoc(options, function (doc) {
+		_this._flushDoc(doc, function (ignoreBuffer, pages) {
+			cb(pages);
+		});
 	});
 };
 
@@ -203,15 +246,25 @@ Document.prototype.getBuffer = function (cb, options) {
 	if (!cb) {
 		throw 'getBuffer is an async method and needs a callback argument';
 	}
-	var doc = this._createDoc(options);
-	this._flushDoc(doc, function (buffer) {
-		cb(buffer);
+
+	var _this = this;
+
+	this._createDoc(options, function (doc) {
+		_this._flushDoc(doc, function (buffer) {
+			cb(buffer);
+		});
 	});
 };
 
-Document.prototype.getStream = function (options) {
-	var doc = this._createDoc(options);
-	return doc;
+Document.prototype.getStream = function (options, cb) {
+	if (!isFunction(cb)) {
+		var doc = this._createDoc(options);
+		return doc;
+	}
+
+	this._createDoc(options, function (doc) {
+		cb(doc);
+	});
 };
 
 module.exports = {

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

@@ -5,6 +5,12 @@ function VirtualFileSystem() {
 	this.dataSystem = {};
 }
 
+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/imageMeasure.js

@@ -1,5 +1,7 @@
 'use strict';
 
+var fs = require('fs');
+
 function ImageMeasure(pdfKitDoc, imageDictionary) {
 	this.pdfKitDoc = pdfKitDoc;
 	this.imageDictionary = imageDictionary || {};
@@ -33,6 +35,10 @@ ImageMeasure.prototype.measureImage = function (src) {
 			return src;
 		}
 
+		if (fs.existsSync(img)) {
+			return fs.readFileSync(img);
+		}
+
 		var index = img.indexOf('base64,');
 		if (index < 0) {
 			return that.imageDictionary[src];

package/src/printer.js

@@ -207,6 +207,8 @@ function calculatePageHeight(pages, margins) {
 			return item.item.getHeight();
 		} else if (item.item._height) {
 			return item.item._height;
+		} else if (item.type === 'vector') {
+			return item.item.y1 > item.item.y2 ? item.item.y1 : item.item.y2;
 		} else {
 			// TODO: add support for next item types
 			return 0;
@@ -214,7 +216,7 @@ function calculatePageHeight(pages, margins) {
 	}
 
 	function getBottomPosition(item) {
-		var top = item.item.y;
+		var top = item.item.y || 0;
 		var height = getItemHeight(item);
 		return top + height;
 	}
@@ -406,6 +408,25 @@ function renderPages(pages, fontProvider, pdfKitDoc, progressCallback) {
 	}
 }
 
+/**
+ * Shift the "y" height of the text baseline up or down (superscript or subscript,
+ * respectively). The exact shift can / should be changed according to standard
+ * conventions.
+ *
+ * @param {number} y
+ * @param {any} inline
+ */
+function offsetText(y, inline) {
+	var newY = y;
+	if (inline.sup) {
+		newY -= inline.fontSize * 0.75;
+	}
+	if (inline.sub) {
+		newY += inline.fontSize * 0.35;
+	}
+	return newY;
+}
+
 function renderLine(line, x, y, pdfKitDoc) {
 	function preparePageNodeRefLine(_pageNodeRef, inline) {
 		var newWidth;
@@ -481,18 +502,20 @@ function renderLine(line, x, y, pdfKitDoc) {
 
 		pdfKitDoc._font = inline.font;
 		pdfKitDoc.fontSize(inline.fontSize);
-		pdfKitDoc.text(inline.text, x + inline.x, y + shiftToBaseline, options);
+
+		var shiftedY = offsetText(y + shiftToBaseline, inline);
+		pdfKitDoc.text(inline.text, x + inline.x, shiftedY, options);
 
 		if (inline.linkToPage) {
 			var _ref = pdfKitDoc.ref({ Type: 'Action', S: 'GoTo', D: [inline.linkToPage, 0, 0] }).end();
-			pdfKitDoc.annotate(x + inline.x, y + shiftToBaseline, inline.width, inline.height, {
+			pdfKitDoc.annotate(x + inline.x, shiftedY, inline.width, inline.height, {
 				Subtype: 'Link',
 				Dest: [inline.linkToPage - 1, 'XYZ', null, null, null]
 			});
 		}
 
 	}
-
+	// Decorations won't draw correctly for superscript
 	textDecorator.drawDecorations(line, x, y, pdfKitDoc);
 }
 
@@ -607,7 +630,18 @@ function renderVector(vector, pdfKitDoc) {
 function renderImage(image, x, y, pdfKitDoc) {
 	var opacity = isNumber(image.opacity) ? image.opacity : 1;
 	pdfKitDoc.opacity(opacity);
-	pdfKitDoc.image(image.image, image.x, image.y, { width: image._width, height: image._height });
+	if (image.cover) {
+		var align = image.cover.align || 'center';
+		var valign = image.cover.valign || 'center';
+		var width = image.cover.width ? image.cover.width : image.width;
+		var height = image.cover.height ? image.cover.height : image.height;
+		pdfKitDoc.save();
+		pdfKitDoc.rect(image.x, image.y, width, height).clip();
+		pdfKitDoc.image(image.image, image.x, image.y, { cover: [width, height], align, valign });
+		pdfKitDoc.restore();
+	} else {
+		pdfKitDoc.image(image.image, image.x, image.y, { width: image._width, height: image._height });
+	}
 	if (image.link) {
 		pdfKitDoc.link(image.x, image.y, image._width, image._height, image.link);
 	}

package/src/styleContextStack.js

@@ -103,7 +103,9 @@ StyleContextStack.prototype.autopush = function (item) {
 		'characterSpacing',
 		'noWrap',
 		'markerColor',
-		'leadingIndent'
+		'leadingIndent',
+		'sup',
+		'sub'
 		//'tableCellPadding'
 		// 'cellBorder',
 		// 'headerCellBorder',

package/src/svgMeasure.js

@@ -1,106 +1,70 @@
 'use strict';
 
-function SVGMeasure() {
-}
+var xmldoc = require('xmldoc');
 
-SVGMeasure.prototype.getSVGNode = function (svgString) {
-	// remove newlines
-	svgString = svgString.replace(/\r?\n|\r/g, "");
-
-	var svgNodeMatches = svgString.match(/<svg(.*?)>/);
+/** Strip unit postfix, parse number, but return undefined instead of NaN for bad input */
+function stripUnits(textVal) {
+	var n = parseFloat(textVal);
+	if (typeof n !== 'number' || isNaN(n)) {
+		return undefined;
+	}
+	return n;
+}
 
-	if (svgNodeMatches) {
-		// extract svg node <svg ... >
-		return svgNodeMatches[0];
+/** Make sure it's valid XML and the root tage is <svg/>, returns xmldoc DOM */
+function parseSVG(svgString) {
+	var doc;
+	
+	try {
+		doc = new xmldoc.XmlDocument(svgString);
+	} catch (err) {
+		throw new Error('SVGMeasure: ' + err);
 	}
 
-	return "";
-};
+	if (doc.name !== "svg") {
+		throw new Error('SVGMeasure: expected <svg> document');
+	}
 
-SVGMeasure.prototype.getHeightAndWidth = function (svgString) {
-	var svgNode = this.getSVGNode(svgString);
+	return doc;
+}
 
-	var widthMatches = svgNode.match(/width="([0-9]+(\.[0-9]+)?)(em|ex|px|in|cm|mm|pt|pc|%)?"/);
-	var heightMatches = svgNode.match(/height="([0-9]+(\.[0-9]+)?)(em|ex|px|in|cm|mm|pt|pc|%)?"/);
+function SVGMeasure() {
+}
 
-	if (widthMatches || heightMatches) {
-		return {
-			width: widthMatches ? +widthMatches[1] : undefined,
-			height: heightMatches ? +heightMatches[1] : undefined
-		};
-	}
-};
+SVGMeasure.prototype.measureSVG = function (svgString) {
 
-SVGMeasure.prototype.getViewboxHeightAndWidth = function (svgString) {
-	var svgNode = this.getSVGNode(svgString);
+	var doc = parseSVG(svgString);
 
-	var viewboxMatches = svgNode.match(/viewBox="([+-]?(\d*\.)?\d+(,|\s+|,\s+)[+-]?(\d*\.)?\d+(,|\s+|,\s+)[+-]?(\d*\.)?\d+(,|\s+|,\s+)[+-]?(\d*\.)?\d+)"/);
-	if (viewboxMatches) {
-		var viewboxStr = viewboxMatches[1];
-		var allVieboxEntries = viewboxStr.split(" ");
+	var docWidth = stripUnits(doc.attr.width);
+	var docHeight = stripUnits(doc.attr.height);
 
-		var viewboxEntries = []; // weeding out empty strings
-		for (var i = 0; i < allVieboxEntries.length; i++) {
-			if (allVieboxEntries[i]) {
-				viewboxEntries.push(allVieboxEntries[i]);
-			}
+	if ((docWidth == undefined || docHeight == undefined) && typeof doc.attr.viewBox == 'string') {
+		var viewBoxParts = doc.attr.viewBox.split(/[,\s]+/);
+		if (viewBoxParts.length !== 4) {
+			throw new Error("Unexpected svg viewbox format, should have 4 entries but found: '" + doc.attr.viewBox + "'");
 		}
-
-		if (viewboxEntries.length === 4) {
-			return { width: +viewboxEntries[2], height: +viewboxEntries[3] };
+		if (docWidth == undefined) {
+			docWidth = stripUnits(viewBoxParts[2]);
+		}
+		if (docHeight == undefined) {
+			docHeight = stripUnits(viewBoxParts[3]);
 		}
-
-		throw new Error("Unexpected svg viewbox format, should have 4 entries but found: '" + viewboxStr + "'");
 	}
-};
-
-SVGMeasure.prototype.measureSVG = function (svgString) {
-
-	var heightAndWidth = this.getHeightAndWidth(svgString);
-	var viewboxHeightAndWidth = this.getViewboxHeightAndWidth(svgString);
 
-	return heightAndWidth || viewboxHeightAndWidth || {};
+	return {
+		width: docWidth,
+		height: docHeight
+	};
 };
 
 SVGMeasure.prototype.writeDimensions = function (svgString, dimensions) {
 
-	var svgNode = this.getSVGNode(svgString);
-
-	if (svgNode) {
-
-		var nodeDimensions = this.getHeightAndWidth(svgString);
-
-		if (dimensions.width) {
-
-			var newWidth = 'width="' + dimensions.width + '"';
+	var doc = parseSVG(svgString);
 
-			if (nodeDimensions && nodeDimensions.width) {
-				// replace existing width
-				svgNode = svgNode.replace(/width="[0-9]+(\.[0-9]+)?(em|ex|px|in|cm|mm|pt|pc|%)?"/, newWidth);
-			} else {
-				// insert new width
-				svgNode = svgNode.replace(">", " " + newWidth + ">");
-			}
-		}
-
-		if (dimensions.height) {
-
-			var newHeight = 'height="' + dimensions.height + '"';
-
-			if (nodeDimensions && nodeDimensions.height) {
-				// replace existing height
-				svgNode = svgNode.replace(/height="[0-9]+(\.[0-9]+)?(em|ex|px|in|cm|mm|pt|pc|%)?"/, newHeight);
-			} else {
-				// insert new height
-				svgNode = svgNode.replace(">", " " + newHeight + ">");
-			}
-		}
-
-		// insert updated svg node
-		return svgString.replace(/<svg(.*?)>/, svgNode);
-	}
+	doc.attr.width = "" + dimensions.width;
+	doc.attr.height = "" + dimensions.height;
 
-	return svgString;
+	return doc.toString();
 };
 
 module.exports = SVGMeasure;

package/src/textTools.js

@@ -315,6 +315,13 @@ function measure(fontProvider, textArray, styleContextStack) {
 		var preserveLeadingSpaces = getStyleProperty(item, styleContextStack, 'preserveLeadingSpaces', false);
 		var preserveTrailingSpaces = getStyleProperty(item, styleContextStack, 'preserveTrailingSpaces', false);
 		var opacity = getStyleProperty(item, styleContextStack, 'opacity', 1);
+		var sup = getStyleProperty(item, styleContextStack, 'sup', false);
+		var sub = getStyleProperty(item, styleContextStack, 'sub', false);
+
+		if ((sup || sub) && item.fontSize === undefined) {
+			// font size reduction taken from here: https://en.wikipedia.org/wiki/Subscript_and_superscript#Desktop_publishing
+			fontSize *= 0.58
+		}
 
 		var font = fontProvider.provideFont(fontName, bold, italics);
 
@@ -352,6 +359,8 @@ function measure(fontProvider, textArray, styleContextStack) {
 		item.linkToDestination = linkToDestination;
 		item.noWrap = noWrap;
 		item.opacity = opacity;
+		item.sup = sup;
+		item.sub = sub;
 	});
 
 	return normalized;