pdfmake 0.3.0-beta.9 → 0.3.0

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();
 		});
 	}
 

package/src/PDFDocument.js

@@ -1,4 +1,4 @@
-import PDFKit from '@foliojs-fork/pdfkit';
+import PDFKit from 'pdfkit';
 
 const typeName = (bold, italics) => {
 	let type = 'normal';

package/src/PageElementWriter.js

@@ -1,4 +1,6 @@
 import ElementWriter from './ElementWriter';
+import { normalizePageSize, normalizePageMargin } from './PageSize';
+import DocumentContext from './DocumentContext';
 
 /**
  * An extended ElementWriter which can handle:
@@ -9,6 +11,10 @@ import ElementWriter from './ElementWriter';
  *                 whole block will be rendered on the same page)
  */
 class PageElementWriter extends ElementWriter {
+
+	/**
+	 * @param {DocumentContext} context
+	 */
 	constructor(context) {
 		super(context);
 		this.transactionLevel = 0;
@@ -39,8 +45,8 @@ class PageElementWriter extends ElementWriter {
 		return this._fitOnPage(() => super.addAttachment(attachment, index));
 	}
 
-	addVector(vector, ignoreContextX, ignoreContextY, index) {
-		return super.addVector(vector, ignoreContextX, ignoreContextY, index);
+	addVector(vector, ignoreContextX, ignoreContextY, index, forcePage) {
+		return super.addVector(vector, ignoreContextX, ignoreContextY, index, forcePage);
 	}
 
 	beginClip(width, height) {
@@ -77,6 +83,19 @@ class PageElementWriter extends ElementWriter {
 		});
 	}
 
+	addPage(pageSize, pageOrientation, pageMargin, customProperties = {}) {
+		let prevPage = this.page;
+		let prevY = this.y;
+
+		this.context().addPage(normalizePageSize(pageSize, pageOrientation), normalizePageMargin(pageMargin), customProperties);
+
+		this.emit('pageChanged', {
+			prevPage: prevPage,
+			prevY: prevY,
+			y: this.context().y
+		});
+	}
+
 	beginUnbreakableBlock(width, height) {
 		if (this.transactionLevel++ === 0) {
 			this.originalX = this.context().x;

package/src/Printer.js

@@ -5,6 +5,7 @@ import { normalizePageSize, normalizePageMargin } from './PageSize';
 import { tableLayouts } from './tableLayouts';
 import Renderer from './Renderer';
 import { isNumber, isValue } from './helpers/variableType';
+import { convertToDynamicContent } from './helpers/tools';
 
 /**
  * Printer which turns document definition into a pdf
@@ -42,75 +43,83 @@ class PdfPrinter {
 	 * @param {object} options
 	 * @returns {Promise<PDFDocument>} resolved promise return a pdfkit document
 	 */
-	createPdfKitDocument(docDefinition, options = {}) {
-		return new Promise((resolve, reject) => {
-			this.resolveUrls(docDefinition).then(() => {
-				try {
-					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 || {};
-
-					let pageSize = normalizePageSize(docDefinition.pageSize, docDefinition.pageOrientation);
-
-					let pdfOptions = {
-						size: [pageSize.width, pageSize.height],
-						pdfVersion: docDefinition.version,
-						compress: docDefinition.compress,
-						userPassword: docDefinition.userPassword,
-						ownerPassword: docDefinition.ownerPassword,
-						permissions: docDefinition.permissions,
-						lang: docDefinition.language,
-						fontLayoutCache: typeof options.fontLayoutCache === 'boolean' ? options.fontLayoutCache : true,
-						bufferPages: options.bufferPages || false,
-						autoFirstPage: false,
-						info: createMetadata(docDefinition),
-						font: null
-					};
-
-					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());
-
-					builder.registerTableLayouts(tableLayouts);
-					if (options.tableLayouts) {
-						builder.registerTableLayouts(options.tableLayouts);
-					}
+	async createPdfKitDocument(docDefinition, options = {}) {
+		await this.resolveUrls(docDefinition);
+
+		docDefinition.version = docDefinition.version || '1.3';
+		docDefinition.subset = docDefinition.subset || undefined;
+		docDefinition.tagged = typeof docDefinition.tagged === 'boolean' ? docDefinition.tagged : false;
+		docDefinition.displayTitle = typeof docDefinition.displayTitle === 'boolean' ? docDefinition.displayTitle : false;
+		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 || {};
+
+		if (docDefinition.header && typeof docDefinition.header !== 'function') {
+			docDefinition.header = convertToDynamicContent(docDefinition.header);
+		}
 
-					let pages = builder.layoutDocument(docDefinition.content, this.pdfKitDoc, docDefinition.styles || {}, docDefinition.defaultStyle || { fontSize: 12, font: 'Roboto' }, docDefinition.background, docDefinition.header, docDefinition.footer, docDefinition.watermark, docDefinition.pageBreakBefore);
-					let maxNumberPages = docDefinition.maxPagesNumber || -1;
-					if (isNumber(maxNumberPages) && maxNumberPages > -1) {
-						pages = pages.slice(0, maxNumberPages);
-					}
+		if (docDefinition.footer && typeof docDefinition.footer !== 'function') {
+			docDefinition.footer = convertToDynamicContent(docDefinition.footer);
+		}
 
-					// if pageSize.height is set to Infinity, calculate the actual height of the page that
-					// was laid out using the height of each of the items in the page.
-					if (pageSize.height === Infinity) {
-						let pageHeight = calculatePageHeight(pages, docDefinition.pageMargins);
-						this.pdfKitDoc.options.size = [pageSize.width, pageHeight];
-					}
+		let pageSize = normalizePageSize(docDefinition.pageSize, docDefinition.pageOrientation);
+
+		let pdfOptions = {
+			size: [pageSize.width, pageSize.height],
+			pdfVersion: docDefinition.version,
+			subset: docDefinition.subset,
+			tagged: docDefinition.tagged,
+			displayTitle: docDefinition.displayTitle,
+			compress: docDefinition.compress,
+			userPassword: docDefinition.userPassword,
+			ownerPassword: docDefinition.ownerPassword,
+			permissions: docDefinition.permissions,
+			lang: docDefinition.language,
+			fontLayoutCache: typeof options.fontLayoutCache === 'boolean' ? options.fontLayoutCache : true,
+			bufferPages: options.bufferPages || false,
+			autoFirstPage: false,
+			info: createMetadata(docDefinition),
+			font: null
+		};
 
-					const renderer = new Renderer(this.pdfKitDoc, options.progressCallback);
-					renderer.renderPages(pages);
+		this.pdfKitDoc = new PDFDocument(this.fontDescriptors, docDefinition.images, docDefinition.patterns, docDefinition.attachments, pdfOptions, this.virtualfs);
+		embedFiles(docDefinition, this.pdfKitDoc);
 
-					resolve(this.pdfKitDoc);
-				} catch (e) {
-					reject(e);
-				}
-			}, result => {
-				reject(result);
+		const builder = new LayoutBuilder(pageSize, normalizePageMargin(docDefinition.pageMargins), new SVGMeasure());
+
+		builder.registerTableLayouts(tableLayouts);
+		if (options.tableLayouts) {
+			builder.registerTableLayouts(options.tableLayouts);
+		}
+
+		let pages = builder.layoutDocument(docDefinition.content, this.pdfKitDoc, docDefinition.styles || {}, docDefinition.defaultStyle || { fontSize: 12, font: 'Roboto' }, docDefinition.background, docDefinition.header, docDefinition.footer, docDefinition.watermark, docDefinition.pageBreakBefore);
+		let maxNumberPages = docDefinition.maxPagesNumber || -1;
+		if (isNumber(maxNumberPages) && maxNumberPages > -1) {
+			pages = pages.slice(0, maxNumberPages);
+		}
+
+		// if pageSize.height is set to Infinity, calculate the actual height of the page that
+		// was laid out using the height of each of the items in the page.
+		if (pageSize.height === Infinity) {
+			let pageHeight = calculatePageHeight(pages, docDefinition.pageMargins);
+			pages.forEach(page => {
+				page.pageSize.height = pageHeight;
 			});
-		});
+		}
+
+		const renderer = new Renderer(this.pdfKitDoc, options.progressCallback);
+		renderer.renderPages(pages);
+
+		return this.pdfKitDoc;
 	}
 
 	/**
 	 * @param {object} docDefinition
 	 * @returns {Promise}
 	 */
-	resolveUrls(docDefinition) {
+	async resolveUrls(docDefinition) {
 		const getExtendedUrl = url => {
 			if (typeof url === 'object') {
 				return { url: url.url, headers: url.headers };
@@ -119,96 +128,90 @@ class PdfPrinter {
 			return { url: url, headers: {} };
 		};
 
-		return new Promise((resolve, reject) => {
-			if (this.urlResolver === null) {
-				resolve();
-			}
+		if (this.urlResolver === null) {
+			return;
+		}
 
-			for (let font in this.fontDescriptors) {
-				if (this.fontDescriptors.hasOwnProperty(font)) {
-					if (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;
-						}
+		for (let font in this.fontDescriptors) {
+			if (this.fontDescriptors.hasOwnProperty(font)) {
+				if (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) {
-						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].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) {
-						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].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) {
-						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;
-						}
+				}
+				if (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;
 					}
 				}
 			}
+		}
 
-			if (docDefinition.images) {
-				for (let image in docDefinition.images) {
-					if (docDefinition.images.hasOwnProperty(image)) {
-						let url = getExtendedUrl(docDefinition.images[image]);
-						this.urlResolver.resolve(url.url, url.headers);
-						docDefinition.images[image] = url.url;
-					}
+		if (docDefinition.images) {
+			for (let image in docDefinition.images) {
+				if (docDefinition.images.hasOwnProperty(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.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;
-					}
+		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;
 				}
 			}
+		}
 
-			this.urlResolver.resolved().then(() => {
-				resolve();
-			}, result => {
-				reject(result);
-			});
-		});
+		await this.urlResolver.resolved();
 	}
 }
 

package/src/Renderer.js

@@ -27,7 +27,7 @@ const findFont = (fonts, requiredFonts, defaultFont) => {
  * @returns {number}
  */
 const offsetText = (y, inline) => {
-	var newY = y;
+	let newY = y;
 	if (inline.sup) {
 		newY -= inline.fontSize * 0.75;
 	}
@@ -45,7 +45,6 @@ class Renderer {
 
 	renderPages(pages) {
 		this.pdfDocument._pdfMakePages = pages; // TODO: Why?
-		this.pdfDocument.addPage();
 
 		let totalItems = 0;
 		if (this.progressCallback) {
@@ -57,10 +56,7 @@ class Renderer {
 		let renderedItems = 0;
 
 		for (let i = 0; i < pages.length; i++) {
-			if (i > 0) {
-				this._updatePageOrientationInOptions(pages[i]);
-				this.pdfDocument.addPage(this.pdfDocument.options);
-			}
+			this.pdfDocument.addPage({ size: [pages[i].pageSize.width, pages[i].pageSize.height] });
 
 			let page = pages[i];
 			for (let ii = 0, il = page.items.length; ii < il; ii++) {
@@ -348,6 +344,17 @@ class Renderer {
 		};
 
 		SVGtoPDF(this.pdfDocument, svg.svg, svg.x, svg.y, options);
+
+		if (svg.link) {
+			this.pdfDocument.link(svg.x, svg.y, svg._width, svg._height, svg.link);
+		}
+		if (svg.linkToPage) {
+			this.pdfDocument.ref({ Type: 'Action', S: 'GoTo', D: [svg.linkToPage, 0, 0] }).end();
+			this.pdfDocument.annotate(svg.x, svg.y, svg._width, svg._height, { Subtype: 'Link', Dest: [svg.linkToPage - 1, 'XYZ', null, null, null] });
+		}
+		if (svg.linkToDestination) {
+			this.pdfDocument.goTo(svg.x, svg.y, svg._width, svg._height, svg.linkToDestination);
+		}
 	}
 
 	renderAttachment(attachment) {
@@ -391,15 +398,6 @@ class Renderer {
 		this.pdfDocument.restore();
 	}
 
-	_updatePageOrientationInOptions(currentPage) {
-		let previousPageOrientation = this.pdfDocument.options.size[0] > this.pdfDocument.options.size[1] ? 'landscape' : 'portrait';
-
-		if (currentPage.pageSize.orientation !== previousPageOrientation) {
-			let width = this.pdfDocument.options.size[0];
-			let height = this.pdfDocument.options.size[1];
-			this.pdfDocument.options.size = [height, width];
-		}
-	}
 }
 
 export default Renderer;

package/src/SVGMeasure.js

@@ -7,7 +7,7 @@ import xmldoc from 'xmldoc';
  * @returns {?number}
  */
 const stripUnits = textVal => {
-	var n = parseFloat(textVal);
+	let n = parseFloat(textVal);
 	if (typeof n !== 'number' || isNaN(n)) {
 		return undefined;
 	}
@@ -21,7 +21,7 @@ const stripUnits = textVal => {
  * @returns {object}
  */
 const parseSVG = (svgString) => {
-	var doc;
+	let doc;
 
 	try {
 		doc = new xmldoc.XmlDocument(svgString);

package/src/StyleContextStack.js

@@ -65,6 +65,10 @@ class StyleContextStack {
 			return 0;
 		}
 
+		if (typeof item.section !== 'undefined') { // section node not support style overrides
+			return 0;
+		}
+
 		let styleNames = [];
 
 		if (item.style) {