pdfmake 0.3.11 → 0.3.13

package/src/OutputDocument.js

@@ -4,16 +4,29 @@ class OutputDocument {
 	 * @param {Promise<object>} pdfDocumentPromise
 	 */
 	constructor(pdfDocumentPromise) {
-		this.bufferSize = 1073741824;
 		this.pdfDocumentPromise = pdfDocumentPromise;
 		this.bufferPromise = null;
+		this.streamEnded = false;
+		this.streamEndListenerAttached = false;
 	}
 
 	/**
 	 * @returns {Promise<object>}
 	 */
-	getStream() {
-		return this.pdfDocumentPromise;
+	async getStream() {
+		const stream = await this.pdfDocumentPromise;
+		if (this.streamEnded) {
+			throw new Error('PDF stream has already been consumed.');
+		}
+
+		if (!this.streamEndListenerAttached) {
+			stream.once('end', () => {
+				this.streamEnded = true;
+			});
+			this.streamEndListenerAttached = true;
+		}
+
+		return stream;
 	}
 
 	/**
@@ -22,17 +35,15 @@ class OutputDocument {
 	getBuffer() {
 		const getBufferInternal = (async () => {
 			const stream = await this.getStream();
-			return new Promise((resolve) => {
+			return new Promise((resolve, reject) => {
 				let chunks = [];
-				stream.on('readable', () => {
-					let chunk;
-					while ((chunk = stream.read(this.bufferSize)) !== null) {
-						chunks.push(chunk);
-					}
+				stream.on('data', chunk => {
+					chunks.push(chunk);
 				});
 				stream.on('end', () => {
 					resolve(Buffer.concat(chunks));
 				});
+				stream.on('error', reject);
 				stream.end();
 			});
 		});

package/src/OutputDocumentServer.js

@@ -8,6 +8,12 @@ class OutputDocumentServer extends OutputDocument {
 	 * @returns {Promise}
 	 */
 	async write(filename) {
+		await this.pdfDocumentPromise;
+		if (this.bufferPromise !== null) {
+			await fs.promises.writeFile(filename, await this.getBuffer());
+			return;
+		}
+
 		const stream = await this.getStream();
 		const writeStream = fs.createWriteStream(filename);
 

package/src/PDFDocument.js

@@ -1,4 +1,4 @@
-import PDFKit from 'pdfkit';
+import { PDFDocument as PDFKitDocument } from 'pdfkit';
 import { isString } from './helpers/variableType';
 
 const typeName = (bold, italics) => {
@@ -13,7 +13,7 @@ const typeName = (bold, italics) => {
 	return type;
 };
 
-class PDFDocument extends PDFKit {
+class PDFDocument extends PDFKitDocument {
 	constructor(fonts = {}, images = {}, patterns = {}, attachments = {}, options = {}, virtualfs = null, localAccessPolicy = undefined) {
 		super(options);
 
@@ -154,14 +154,13 @@ class PDFDocument extends PDFKit {
 			return obj;
 		};
 
-		if (typeof src === 'object') {
-			return checkRequired(src);
-		}
-
-		let attachment = checkRequired(this.attachments[src]);
+		let attachment = checkRequired(typeof src === 'object' ? src : this.attachments[src]);
 
 		if (this.virtualfs && this.virtualfs.existsSync(attachment.src)) {
-			return this.virtualfs.readFileSync(attachment.src);
+			return {
+				...attachment,
+				src: this.virtualfs.readFileSync(attachment.src)
+			};
 		}
 
 		this.validateLocalFile(attachment.src);

package/src/PageElementWriter.js

@@ -176,9 +176,13 @@ class PageElementWriter extends ElementWriter {
 	/**
 	 * Move to the next column in a column group (snaking columns).
 	 * Handles repeatables and emits columnChanged event.
+	 * @param {Function} [updateContext] - Adjust the new column before inserting repeatables
 	 */
-	moveToNextColumn() {
+	moveToNextColumn(updateContext) {
 		let nextColumn = this.context().moveToNextColumn();
+		if (updateContext) {
+			updateContext(this.context());
+		}
 
 		// Handle repeatables (like table headers) for the new column
 		this.repeatables.forEach(function (rep) {

package/src/Renderer.js

@@ -367,6 +367,12 @@ class Renderer {
 
 			return fontFile;
 		};
+		options.imageCallback = link => {
+			let src = link.replace(/\s+/g, '');
+			this.pdfDocument.validateLocalFile(src);
+
+			return src;
+		};
 
 		SVGtoPDF(this.pdfDocument, svg.svg, svg.x, svg.y, options);
 

package/src/TableProcessor.js

@@ -109,6 +109,7 @@ class TableProcessor {
 		ColumnCalculator.buildColumnWidths(tableNode.table.widths, availableWidth, this.offsets.total, tableNode);
 
 		this.tableWidth = tableNode._offsets.total + getTableInnerContentWidth();
+		this.alignTable(writer.context());
 		this.rowSpanData = prepareRowSpanData();
 		this.cleanUpRepeatables = false;
 
@@ -150,6 +151,17 @@ class TableProcessor {
 		prepareCellBorders(this.tableNode.table.body);
 	}
 
+	alignTable(context) {
+		const freeWidth = Math.max(0, context.availableWidth - this.tableWidth);
+		this.alignmentOffset = this.tableNode.tableAlignment === 'center' ? freeWidth / 2 :
+			(this.tableNode.tableAlignment === 'right' ? freeWidth : 0);
+		if (this.alignmentOffset) {
+			// Keep the container width intact: column widths have already been resolved.
+			// Row snapshots preserve this origin across page breaks.
+			context.addMargin(this.alignmentOffset, -this.alignmentOffset);
+		}
+	}
+
 	onRowBreak(rowIndex, writer) {
 		return () => {
 			let offset = this.rowPaddingTop + (!this.headerRows ? this.topLineWidth : 0);
@@ -376,6 +388,9 @@ class TableProcessor {
 		if (this.cleanUpRepeatables) {
 			writer.popFromRepeatables();
 		}
+		if (this.alignmentOffset) {
+			writer.context().addMargin(-this.alignmentOffset, this.alignmentOffset);
+		}
 	}
 
 	endRow(rowIndex, writer, pageBreaks) {

package/src/TextDecorator.js

@@ -19,7 +19,8 @@ const groupDecorations = (line, pdfDocument) => {
 		for (let ii = 0, ll = decoration.length; ii < ll; ii++) {
 			let decorationItem = decoration[ii];
 			if (!currentGroup || decorationItem !== currentGroup.decoration ||
-				style !== currentGroup.decorationStyle || color !== currentGroup.decorationColor) {
+				style !== currentGroup.decorationStyle || color !== currentGroup.decorationColor ||
+				thickness !== currentGroup.decorationThickness) {
 
 				currentGroup = {
 					line: line,
@@ -79,7 +80,7 @@ class TextDecorator {
 			let max = 0;
 			for (let i = 0, l = group.inlines.length; i < l; i++) {
 				let inline = group.inlines[i];
-				max = inline.fontSize > max ? i : max;
+				max = inline.fontSize > group.inlines[max].fontSize ? i : max;
 			}
 			return group.inlines[max];
 		};
@@ -155,7 +156,7 @@ class TextDecorator {
 			let sh = 0.7, sv = 1;
 			let nbWaves = Math.ceil(totalWidth / (sh * 2)) + 1;
 			let rwx = x + firstInline.x - 1;
-			this.pdfDocument.rect(x + firstInline.x, y - sv, totalWidth, y + sv).clip();
+			this.pdfDocument.rect(x + firstInline.x, y - sv, totalWidth, 2 * sv).clip();
 			this.pdfDocument.lineWidth(lw / 3);
 			this.pdfDocument.moveTo(rwx, y);
 			for (let i = 0; i < nbWaves; i++) {

package/src/browser-extensions/index.js

@@ -2,6 +2,7 @@ import pdfmakeBase from '../base';
 import OutputDocumentBrowser from './OutputDocumentBrowser';
 import fs from 'fs';
 import configurator from 'core-js/configurator';
+import { registerStdFonts } from 'pdfkit';
 
 // core-js: Polyfills will be used only if natives completely unavailable.
 configurator({
@@ -24,7 +25,12 @@ class pdfmake extends pdfmakeBase {
 	}
 
 	addFontContainer(fontContainer) {
-		this.addVirtualFileSystem(fontContainer.vfs);
+		if (fontContainer.standardFonts) {
+			registerStdFonts(...fontContainer.standardFonts);
+		}
+		if (fontContainer.vfs) {
+			this.addVirtualFileSystem(fontContainer.vfs);
+		}
 		this.addFonts(fontContainer.fonts);
 	}
 

package/src/browser-extensions/standard-fonts/Courier.js

@@ -1,12 +1,10 @@
-var fs = require('fs');
-
 var fontContainer = {
-	vfs: {
-		'data/Courier.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Courier.afm', 'utf8'), encoding: 'utf8' },
-		'data/Courier-Bold.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Courier-Bold.afm', 'utf8'), encoding: 'utf8' },
-		'data/Courier-Oblique.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Courier-Oblique.afm', 'utf8'), encoding: 'utf8' },
-		'data/Courier-BoldOblique.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Courier-BoldOblique.afm', 'utf8'), encoding: 'utf8' }
-	},
+	standardFonts: [
+		require('pdfkit/standard-fonts/Courier'),
+		require('pdfkit/standard-fonts/CourierBold'),
+		require('pdfkit/standard-fonts/CourierOblique'),
+		require('pdfkit/standard-fonts/CourierBoldOblique')
+	],
 	fonts: {
 		Courier: {
 			normal: 'Courier',

package/src/browser-extensions/standard-fonts/Helvetica.js

@@ -1,12 +1,10 @@
-var fs = require('fs');
-
 var fontContainer = {
-	vfs: {
-		'data/Helvetica.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Helvetica.afm', 'utf8'), encoding: 'utf8' },
-		'data/Helvetica-Bold.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Helvetica-Bold.afm', 'utf8'), encoding: 'utf8' },
-		'data/Helvetica-Oblique.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Helvetica-Oblique.afm', 'utf8'), encoding: 'utf8' },
-		'data/Helvetica-BoldOblique.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Helvetica-BoldOblique.afm', 'utf8'), encoding: 'utf8' }
-	},
+	standardFonts: [
+		require('pdfkit/standard-fonts/Helvetica'),
+		require('pdfkit/standard-fonts/HelveticaBold'),
+		require('pdfkit/standard-fonts/HelveticaOblique'),
+		require('pdfkit/standard-fonts/HelveticaBoldOblique')
+	],
 	fonts: {
 		Helvetica: {
 			normal: 'Helvetica',

package/src/browser-extensions/standard-fonts/Symbol.js

@@ -1,9 +1,5 @@
-var fs = require('fs');
-
 var fontContainer = {
-	vfs: {
-		'data/Symbol.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Symbol.afm', 'utf8'), encoding: 'utf8' }
-	},
+	standardFonts: [require('pdfkit/standard-fonts/Symbol')],
 	fonts: {
 		Symbol: {
 			normal: 'Symbol'

package/src/browser-extensions/standard-fonts/Times.js

@@ -1,12 +1,10 @@
-var fs = require('fs');
-
 var fontContainer = {
-	vfs: {
-		'data/Times-Roman.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Times-Roman.afm', 'utf8'), encoding: 'utf8' },
-		'data/Times-Bold.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Times-Bold.afm', 'utf8'), encoding: 'utf8' },
-		'data/Times-Italic.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Times-Italic.afm', 'utf8'), encoding: 'utf8' },
-		'data/Times-BoldItalic.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Times-BoldItalic.afm', 'utf8'), encoding: 'utf8' }
-	},
+	standardFonts: [
+		require('pdfkit/standard-fonts/TimesRoman'),
+		require('pdfkit/standard-fonts/TimesBold'),
+		require('pdfkit/standard-fonts/TimesItalic'),
+		require('pdfkit/standard-fonts/TimesBoldItalic')
+	],
 	fonts: {
 		Times: {
 			normal: 'Times-Roman',

package/src/browser-extensions/standard-fonts/ZapfDingbats.js

@@ -1,9 +1,5 @@
-var fs = require('fs');
-
 var fontContainer = {
-	vfs: {
-		'data/ZapfDingbats.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/ZapfDingbats.afm', 'utf8'), encoding: 'utf8' }
-	},
+	standardFonts: [require('pdfkit/standard-fonts/ZapfDingbats')],
 	fonts: {
 		ZapfDingbats: {
 			normal: 'ZapfDingbats'

package/src/columnCalculator.js

@@ -10,7 +10,7 @@ function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode)
 	let fixedColumns = [];
 	let initial_availableWidth = availableWidth;
 
-	columns.forEach(column => {
+	columns.forEach((column, colIndex) => {
 		if (isAutoColumn(column)) {
 			autoColumns.push(column);
 			autoMin += column._minWidth;
@@ -20,11 +20,11 @@ function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode)
 			starMaxMin = Math.max(starMaxMin, column._minWidth);
 			starMaxMax = Math.max(starMaxMax, column._maxWidth);
 		} else {
-			fixedColumns.push(column);
+			fixedColumns.push({ column, colIndex });
 		}
 	});
 
-	fixedColumns.forEach((col, colIndex) => {
+	fixedColumns.forEach(({ column: col, colIndex }) => {
 		// width specified as %
 		if (isString(col.width) && /\d+%/.test(col.width)) {
 			// In tables we have to take into consideration the reserved width for paddings and borders
@@ -38,7 +38,7 @@ function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode)
 					// first column assumes whole borderLeft and half of border right
 					reservedWidth = paddingLeft + paddingRight + borderLeft + (borderRight / 2);
 
-				} else if (colIndex === fixedColumns.length - 1) {
+				} else if (colIndex === columns.length - 1) {
 					// last column assumes whole borderRight and half of border left
 					reservedWidth = paddingLeft + paddingRight + (borderLeft / 2) + borderRight;