pdfmake 0.3.0-beta.1 → 0.3.0-beta.3

package/src/Printer.js

@@ -49,6 +49,7 @@ class PdfPrinter {
 					docDefinition.version = docDefinition.version || '1.3';
 					docDefinition.compress = typeof docDefinition.compress === 'boolean' ? docDefinition.compress : true;
 					docDefinition.images = docDefinition.images || {};
+					docDefinition.attachments = docDefinition.attachments || {};
 					docDefinition.pageMargins = isValue(docDefinition.pageMargins) ? docDefinition.pageMargins : 40;
 					docDefinition.patterns = docDefinition.patterns || {};
 
@@ -68,7 +69,8 @@ class PdfPrinter {
 						font: null
 					};
 
-					this.pdfKitDoc = new PDFDocument(this.fontDescriptors, docDefinition.images, docDefinition.patterns, pdfOptions, this.virtualfs);
+					this.pdfKitDoc = new PDFDocument(this.fontDescriptors, docDefinition.images, docDefinition.patterns, docDefinition.attachments, pdfOptions, this.virtualfs);
+					embedFiles(docDefinition, this.pdfKitDoc);
 
 					const builder = new LayoutBuilder(pageSize, normalizePageMargin(docDefinition.pageMargins), new SVGMeasure());
 
@@ -108,6 +110,14 @@ class PdfPrinter {
 	 * @returns {Promise}
 	 */
 	resolveUrls(docDefinition) {
+		const getExtendedUrl = url => {
+			if (typeof url === 'object') {
+				return { url: url.url, headers: url.headers };
+			}
+
+			return { url: url, headers: {} };
+		};
+
 		return new Promise((resolve, reject) => {
 			if (this.urlResolver === null) {
 				resolve();
@@ -116,16 +126,48 @@ class PdfPrinter {
 			for (let font in this.fontDescriptors) {
 				if (this.fontDescriptors.hasOwnProperty(font)) {
 					if (this.fontDescriptors[font].normal) {
-						this.urlResolver.resolve(this.fontDescriptors[font].normal);
+						if (Array.isArray(this.fontDescriptors[font].normal)) { // TrueType Collection
+							let url = getExtendedUrl(this.fontDescriptors[font].normal[0]);
+							this.urlResolver.resolve(url.url, url.headers);
+							this.fontDescriptors[font].normal[0] = url.url;
+						} else {
+							let url = getExtendedUrl(this.fontDescriptors[font].normal);
+							this.urlResolver.resolve(url.url, url.headers);
+							this.fontDescriptors[font].normal = url.url;
+						}
 					}
 					if (this.fontDescriptors[font].bold) {
-						this.urlResolver.resolve(this.fontDescriptors[font].bold);
+						if (Array.isArray(this.fontDescriptors[font].bold)) { // TrueType Collection
+							let url = getExtendedUrl(this.fontDescriptors[font].bold[0]);
+							this.urlResolver.resolve(url.url, url.headers);
+							this.fontDescriptors[font].bold[0] = url.url;
+						} else {
+							let url = getExtendedUrl(this.fontDescriptors[font].bold);
+							this.urlResolver.resolve(url.url, url.headers);
+							this.fontDescriptors[font].bold = url.url;
+						}
 					}
 					if (this.fontDescriptors[font].italics) {
-						this.urlResolver.resolve(this.fontDescriptors[font].italics);
+						if (Array.isArray(this.fontDescriptors[font].italics)) { // TrueType Collection
+							let url = getExtendedUrl(this.fontDescriptors[font].italics[0]);
+							this.urlResolver.resolve(url.url, url.headers);
+							this.fontDescriptors[font].italics[0] = url.url;
+						} else {
+							let url = getExtendedUrl(this.fontDescriptors[font].italics);
+							this.urlResolver.resolve(url.url, url.headers);
+							this.fontDescriptors[font].italics = url.url;
+						}
 					}
 					if (this.fontDescriptors[font].bolditalics) {
-						this.urlResolver.resolve(this.fontDescriptors[font].bolditalics);
+						if (Array.isArray(this.fontDescriptors[font].bolditalics)) { // TrueType Collection
+							let url = getExtendedUrl(this.fontDescriptors[font].bolditalics[0]);
+							this.urlResolver.resolve(url.url, url.headers);
+							this.fontDescriptors[font].bolditalics[0] = url.url;
+						} else {
+							let url = getExtendedUrl(this.fontDescriptors[font].bolditalics);
+							this.urlResolver.resolve(url.url, url.headers);
+							this.fontDescriptors[font].bolditalics = url.url;
+						}
 					}
 				}
 			}
@@ -133,7 +175,29 @@ class PdfPrinter {
 			if (docDefinition.images) {
 				for (let image in docDefinition.images) {
 					if (docDefinition.images.hasOwnProperty(image)) {
-						this.urlResolver.resolve(docDefinition.images[image]);
+						let url = getExtendedUrl(docDefinition.images[image]);
+						this.urlResolver.resolve(url.url, url.headers);
+						docDefinition.images[image] = url.url;
+					}
+				}
+			}
+
+			if (docDefinition.attachments) {
+				for (let attachment in docDefinition.attachments) {
+					if (docDefinition.attachments.hasOwnProperty(attachment) && docDefinition.attachments[attachment].src) {
+						let url = getExtendedUrl(docDefinition.attachments[attachment].src);
+						this.urlResolver.resolve(url.url, url.headers);
+						docDefinition.attachments[attachment].src = url.url;
+					}
+				}
+			}
+
+			if (docDefinition.files) {
+				for (let file in docDefinition.files) {
+					if (docDefinition.files.hasOwnProperty(file) && docDefinition.files[file].src) {
+						let url = getExtendedUrl(docDefinition.files[file].src);
+						this.urlResolver.resolve(url.url, url.headers);
+						docDefinition.files[file].src = url.url;
 					}
 				}
 			}
@@ -180,6 +244,23 @@ function createMetadata(docDefinition) {
 	return info;
 }
 
+function embedFiles(docDefinition, pdfKitDoc) {
+	if (docDefinition.files) {
+		for (const key in docDefinition.files) {
+			const file = docDefinition.files[key];
+
+			if (!file.src) return;
+
+			if (pdfKitDoc.virtualfs && pdfKitDoc.virtualfs.existsSync(file.src)) {
+				file.src = pdfKitDoc.virtualfs.readFileSync(file.src);
+			}
+
+			file.name = file.name || key;
+			pdfKitDoc.file(file.src, file);
+		}
+	}
+}
+
 function calculatePageHeight(pages, margins) {
 	function getItemHeight(item) {
 		if (typeof item.item.getHeight === 'function') {
@@ -187,7 +268,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;

package/src/Renderer.js

@@ -78,6 +78,9 @@ class Renderer {
 					case 'svg':
 						this.renderSVG(item.item);
 						break;
+					case 'attachment':
+						this.renderAttachment(item.item);
+						break;
 					case 'beginClip':
 						this.beginClip(item.item);
 						break;
@@ -306,6 +309,27 @@ class Renderer {
 		if (image.linkToDestination) {
 			this.pdfDocument.goTo(image.x, image.y, image._width, image._height, image.linkToDestination);
 		}
+		if (image.linkToFile) {
+			const attachment = this.pdfDocument.provideAttachment(image.linkToFile);
+			this.pdfDocument.fileAnnotation(
+				image.x,
+				image.y,
+				image._width,
+				image._height,
+				attachment,
+				// add empty rectangle as file annotation appearance with the same size as the rendered image
+				{
+					AP: {
+						N: {
+							Type: 'XObject',
+							Subtype: 'Form',
+							FormType: 1,
+							BBox: [image.x, image.y, image._width, image._height]
+						}
+					},
+				}
+			);
+		}
 	}
 
 	renderSVG(svg) {
@@ -326,6 +350,17 @@ class Renderer {
 		SVGtoPDF(this.pdfDocument, svg.svg, svg.x, svg.y, options);
 	}
 
+	renderAttachment(attachment) {
+		const file = this.pdfDocument.provideAttachment(attachment.attachment);
+
+		const options = {};
+		if (attachment.icon) {
+			options.Name = attachment.icon;
+		}
+
+		this.pdfDocument.fileAnnotation(attachment.x, attachment.y, attachment._width, attachment._height, file, options);
+	}
+
 	beginClip(rect) {
 		this.pdfDocument.save();
 		this.pdfDocument.addContent(`${rect.x} ${rect.y} ${rect.width} ${rect.height} re`);

package/src/URLResolver.js

@@ -1,12 +1,15 @@
 import http from 'http';
 import https from 'https';
 
-const fetchUrl = url => {
+const fetchUrl = (url, headers = {}) => {
 	return new Promise((resolve, reject) => {
 		const parsedUrl = new URL(url);
 		const h = (parsedUrl.protocol === 'https:') ? https : http;
+		let options = {
+			headers: headers
+		};
 
-		h.get(url, res => {
+		h.get(url, options, res => {
 			if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) { // redirect url
 				fetchUrl(res.headers.location).then(buffer => {
 					resolve(buffer);
@@ -34,16 +37,21 @@ class URLResolver {
 		this.resolving = {};
 	}
 
-	resolve(url) {
+	resolve(url, headers = {}) {
 		if (!this.resolving[url]) {
 			this.resolving[url] = new Promise((resolve, reject) => {
 				if (url.toLowerCase().indexOf('https://') === 0 || url.toLowerCase().indexOf('http://') === 0) {
-					fetchUrl(url).then(buffer => {
-						this.fs.writeFileSync(url, buffer);
+					if (this.fs.existsSync(url)) {
+						// url was downloaded earlier
 						resolve();
-					}, result => {
-						reject(result);
-					});
+					} else {
+						fetchUrl(url, headers).then(buffer => {
+							this.fs.writeFileSync(url, buffer);
+							resolve();
+						}, result => {
+							reject(result);
+						});
+					}
 				} else {
 					// cannot be resolved
 					resolve();

package/src/browser-extensions/URLBrowserResolver.js

@@ -1,7 +1,10 @@
-const fetchUrl = url => {
+const fetchUrl = (url, headers = {}) => {
 	return new Promise((resolve, reject) => {
 		const xhr = new XMLHttpRequest();
 		xhr.open('GET', url, true);
+		for (let headerName in headers) {
+			xhr.setRequestHeader(headerName, headers[headerName]);
+		}
 		xhr.responseType = 'arraybuffer';
 
 		xhr.onreadystatechange = () => {
@@ -46,11 +49,11 @@ class URLBrowserResolver {
 		this.resolving = {};
 	}
 
-	resolve(url) {
+	resolve(url, headers = {}) {
 		if (!this.resolving[url]) {
 			this.resolving[url] = new Promise((resolve, reject) => {
 				if (url.toLowerCase().indexOf('https://') === 0 || url.toLowerCase().indexOf('http://') === 0) {
-					fetchUrl(url).then(buffer => {
+					fetchUrl(url, headers).then(buffer => {
 						this.fs.writeFileSync(url, buffer);
 						resolve();
 					}, result => {