pdfmake 0.2.4 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "src/printer.js",
   "browser": "build/pdfmake.js",

package/src/browser-extensions/URLBrowserResolver.js

@@ -6,10 +6,13 @@ if (typeof window !== 'undefined' && !window.Promise) {
 }
 require('core-js/es/object/values');
 
-var fetchUrl = function (url) {
+var fetchUrl = function (url, headers) {
 	return new Promise(function (resolve, reject) {
 		var xhr = new XMLHttpRequest();
 		xhr.open('GET', url, true);
+		for (var headerName in headers) {
+			xhr.setRequestHeader(headerName, headers[headerName]);
+		}
 		xhr.responseType = 'arraybuffer';
 
 		xhr.onreadystatechange = function () {
@@ -53,17 +56,22 @@ function URLBrowserResolver(fs) {
 	this.resolving = {};
 }
 
-URLBrowserResolver.prototype.resolve = function (url) {
+URLBrowserResolver.prototype.resolve = function (url, headers) {
 	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);
+				if (_this.fs.existsSync(url)) {
+					// url was downloaded earlier
 					resolve();
-				}, function (result) {
-					reject(result);
-				});
+				} else {
+					fetchUrl(url, headers).then(function (buffer) {
+						_this.fs.writeFileSync(url, buffer);
+						resolve();
+					}, function (result) {
+						reject(result);
+					});
+				}
 			} else {
 				// cannot be resolved
 				resolve();

package/src/browser-extensions/pdfMake.js

@@ -36,6 +36,14 @@ function canCreatePdf() {
 }
 
 Document.prototype._createDoc = function (options, cb) {
+	var getExtendedUrl = function (url) {
+		if (typeof url === 'object') {
+			return { url: url.url, headers: url.headers };
+		}
+
+		return { url: url, headers: {} };
+	};
+
 	options = options || {};
 	if (this.tableLayouts) {
 		options.tableLayouts = this.tableLayouts;
@@ -58,16 +66,48 @@ Document.prototype._createDoc = function (options, cb) {
 	for (var font in this.fonts) {
 		if (this.fonts.hasOwnProperty(font)) {
 			if (this.fonts[font].normal) {
-				urlResolver.resolve(this.fonts[font].normal);
+				if (Array.isArray(this.fonts[font].normal)) { // TrueType Collection
+					var url = getExtendedUrl(this.fonts[font].normal[0]);
+					urlResolver.resolve(url.url, url.headers);
+					this.fonts[font].normal[0] = url.url;
+				} else {
+					var url = getExtendedUrl(this.fonts[font].normal);
+					urlResolver.resolve(url.url, url.headers);
+					this.fonts[font].normal = url.url;
+				}
 			}
 			if (this.fonts[font].bold) {
-				urlResolver.resolve(this.fonts[font].bold);
+				if (Array.isArray(this.fonts[font].bold)) { // TrueType Collection
+					var url = getExtendedUrl(this.fonts[font].bold[0]);
+					urlResolver.resolve(url.url, url.headers);
+					this.fonts[font].bold[0] = url.url;
+				} else {
+					var url = getExtendedUrl(this.fonts[font].bold);
+					urlResolver.resolve(url.url, url.headers);
+					this.fonts[font].bold = url.url;
+				}
 			}
 			if (this.fonts[font].italics) {
-				urlResolver.resolve(this.fonts[font].italics);
+				if (Array.isArray(this.fonts[font].italics)) { // TrueType Collection
+					var url = getExtendedUrl(this.fonts[font].italics[0]);
+					urlResolver.resolve(url.url, url.headers);
+					this.fonts[font].italics[0] = url.url;
+				} else {
+					var url = getExtendedUrl(this.fonts[font].italics);
+					urlResolver.resolve(url.url, url.headers);
+					this.fonts[font].italics = url.url;
+				}
 			}
 			if (this.fonts[font].bolditalics) {
-				urlResolver.resolve(this.fonts[font].bolditalics);
+				if (Array.isArray(this.fonts[font].bolditalics)) { // TrueType Collection
+					var url = getExtendedUrl(this.fonts[font].bolditalics[0]);
+					urlResolver.resolve(url.url, url.headers);
+					this.fonts[font].bolditalics[0] = url.url;
+				} else {
+					var url = getExtendedUrl(this.fonts[font].bolditalics);
+					urlResolver.resolve(url.url, url.headers);
+					this.fonts[font].bolditalics = url.url;
+				}
 			}
 		}
 	}
@@ -75,7 +115,9 @@ Document.prototype._createDoc = function (options, cb) {
 	if (this.docDefinition.images) {
 		for (var image in this.docDefinition.images) {
 			if (this.docDefinition.images.hasOwnProperty(image)) {
-				urlResolver.resolve(this.docDefinition.images[image]);
+				var url = getExtendedUrl(this.docDefinition.images[image]);
+				urlResolver.resolve(url.url, url.headers);
+				this.docDefinition.images[image] = url.url;
 			}
 		}
 	}

package/src/printer.js

@@ -215,7 +215,11 @@ function calculatePageHeight(pages, margins) {
 		} 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;
+			if (typeof item.item.y1 !== 'undefined') {
+				return item.item.y1 > item.item.y2 ? item.item.y1 : item.item.y2;
+			} else {
+				return item.item.h;
+			}
 		} else {
 			// TODO: add support for next item types
 			return 0;