pdfmake 0.1.61 → 0.1.65

package/package.json

@@ -1,69 +1,69 @@
-{
-  "name": "pdfmake",
-  "version": "0.1.61",
-  "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.0",
-    "linebreak": "^1.0.2",
-    "pdfkit": "^0.10.0",
-    "svg-to-pdfkit": "^0.1.7"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.6.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.6.0",
-    "@babel/preset-env": "^7.6.0",
-    "babel-loader": "^8.0.6",
-    "brfs": "^2.0.2",
-    "eslint-plugin-jsdoc": "^15.9.2",
-    "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": "^5.0.1",
-    "mocha": "^6.2.0",
-    "rewire": "^4.0.1",
-    "sinon": "^7.4.2",
-    "string-replace-webpack-plugin": "^0.1.3",
-    "transform-loader": "^0.2.4",
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "webpack": "^4.40.2"
-  },
-  "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.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"
+      ]
+    }
+  }
+}

package/src/docMeasure.js

@@ -210,6 +210,8 @@ DocMeasure.prototype.measureSVG = function (node) {
 
 	this.measureImageWithDimensions(node, dimensions);
 
+	node.font = this.styleStack.getProperty('font');
+
 	// scale SVG based on final dimension
 	node.svg = this.svgMeasure.writeDimensions(node.svg, {
 		width: node._width,
@@ -601,6 +603,7 @@ DocMeasure.prototype.measureTable = function (node) {
 		return function () {
 			if (isObject(data)) {
 				data.fillColor = _this.styleStack.getProperty('fillColor');
+				data.fillOpacity = _this.styleStack.getProperty('fillOpacity');
 			}
 			return _this.measureNode(data);
 		};
@@ -647,6 +650,9 @@ DocMeasure.prototype.measureTable = function (node) {
 			fillColor: function (i, node) {
 				return null;
 			},
+			fillOpacity: function (i, node) {
+				return 1;
+			},
 			defaultBorder: true
 		};
 
@@ -729,7 +735,8 @@ DocMeasure.prototype.measureTable = function (node) {
 				_span: true,
 				_minWidth: 0,
 				_maxWidth: 0,
-				fillColor: table.body[row][col].fillColor
+				fillColor: table.body[row][col].fillColor,
+				fillOpacity: table.body[row][col].fillOpacity
 			};
 		}
 	}

package/src/fontProvider.js

@@ -33,9 +33,22 @@ function FontProvider(fontDescriptors, pdfKitDoc) {
 	}
 }
 
-FontProvider.prototype.provideFont = function (familyName, bold, italics) {
-	var type = typeName(bold, italics);
+FontProvider.prototype.getFontType = function (bold, italics) {
+	return typeName(bold, italics);
+}
+
+FontProvider.prototype.getFontFile = function (familyName, bold, italics) {
+	var type = this.getFontType(bold, italics);
 	if (!this.fonts[familyName] || !this.fonts[familyName][type]) {
+		return null;
+	}
+
+	return this.fonts[familyName][type];
+}
+
+FontProvider.prototype.provideFont = function (familyName, bold, italics) {
+	var type = this.getFontType(bold, italics);
+	if (this.getFontFile(familyName, bold, italics) === null) {
 		throw new Error('Font \'' + familyName + '\' in style \'' + type + '\' is not defined in the font section of the document definition.');
 	}
 

package/src/layoutBuilder.js

@@ -19,6 +19,7 @@ var getNodeId = require('./helpers').getNodeId;
 var isFunction = require('./helpers').isFunction;
 var TextTools = require('./textTools');
 var StyleContextStack = require('./styleContextStack');
+var isNumber = require('./helpers').isNumber;
 
 function addAll(target, otherArray) {
 	otherArray.forEach(function (item) {
@@ -91,40 +92,35 @@ LayoutBuilder.prototype.layoutDocument = function (docStructure, fontProvider, s
 			node.nodeInfo = nodeInfo;
 		});
 
-		return linearNodeList.some(function (node, index, followingNodeList) {
+		for (var index = 0; index < linearNodeList.length; index++) {
+			var node = linearNodeList[index];
 			if (node.pageBreak !== 'before' && !node.pageBreakCalculated) {
 				node.pageBreakCalculated = true;
 				var pageNumber = node.nodeInfo.pageNumbers[0];
-
-				var followingNodesOnPage = followingNodeList.slice(index + 1).filter(function (node0) {
-					return node0.nodeInfo.pageNumbers.indexOf(pageNumber) > -1;
-				});
-
-				var nodesOnNextPage = followingNodeList.slice(index + 1).filter(function (node0) {
-					return node0.nodeInfo.pageNumbers.indexOf(pageNumber + 1) > -1;
-				});
-
-				var previousNodesOnPage = followingNodeList.slice(0, index).filter(function (node0) {
-					return node0.nodeInfo.pageNumbers.indexOf(pageNumber) > -1;
-				});
-
-				if (
-					pageBreakBeforeFct(
-						node.nodeInfo,
-						followingNodesOnPage.map(function (node) {
-							return node.nodeInfo;
-						}),
-						nodesOnNextPage.map(function (node) {
-							return node.nodeInfo;
-						}),
-						previousNodesOnPage.map(function (node) {
-							return node.nodeInfo;
-						}))) {
+				var followingNodesOnPage = [];
+				var nodesOnNextPage = [];
+				var previousNodesOnPage = [];
+				for (var ii = index + 1, l = linearNodeList.length; ii < l; ii++) {
+					if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber) > -1) {
+						followingNodesOnPage.push(linearNodeList[ii].nodeInfo);
+					}
+					if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber + 1) > -1) {
+						nodesOnNextPage.push(linearNodeList[ii].nodeInfo);
+					}
+				}
+				for (var ii = 0; ii < index; ii++) {
+					if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber) > -1) {
+						previousNodesOnPage.push(linearNodeList[ii].nodeInfo);
+					}
+				}
+				if (pageBreakBeforeFct(node.nodeInfo, followingNodesOnPage, nodesOnNextPage, previousNodesOnPage)) {
 					node.pageBreak = 'before';
 					return true;
 				}
 			}
-		});
+		}
+
+		return false;
 	}
 
 	this.docPreprocessor = new DocPreprocessor();
@@ -258,7 +254,7 @@ LayoutBuilder.prototype.addWatermark = function (watermark, fontProvider, defaul
 	watermark.font = watermark.font || defaultStyle.font || 'Roboto';
 	watermark.fontSize = watermark.fontSize || 'auto';
 	watermark.color = watermark.color || 'black';
-	watermark.opacity = watermark.opacity || 0.6;
+	watermark.opacity = isNumber(watermark.opacity) ? watermark.opacity : 0.6;
 	watermark.bold = watermark.bold || false;
 	watermark.italics = watermark.italics || false;
 	watermark.angle = !isUndefined(watermark.angle) && !isNull(watermark.angle) ? watermark.angle : null;
@@ -433,6 +429,16 @@ LayoutBuilder.prototype.processNode = function (node) {
 
 		if (node.pageBreak === 'before') {
 			self.writer.moveToNextPage(node.pageOrientation);
+		} else if (node.pageBreak === 'beforeOdd') {
+			self.writer.moveToNextPage(node.pageOrientation);
+			if ((self.writer.context().page + 1) % 2 === 1) {
+				self.writer.moveToNextPage(node.pageOrientation);
+			}
+		} else if (node.pageBreak === 'beforeEven') {
+			self.writer.moveToNextPage(node.pageOrientation);
+			if ((self.writer.context().page + 1) % 2 === 0) {
+				self.writer.moveToNextPage(node.pageOrientation);
+			}
 		}
 
 		if (margin) {
@@ -449,6 +455,16 @@ LayoutBuilder.prototype.processNode = function (node) {
 
 		if (node.pageBreak === 'after') {
 			self.writer.moveToNextPage(node.pageOrientation);
+		} else if (node.pageBreak === 'afterOdd') {
+			self.writer.moveToNextPage(node.pageOrientation);
+			if ((self.writer.context().page + 1) % 2 === 1) {
+				self.writer.moveToNextPage(node.pageOrientation);
+			}
+		} else if (node.pageBreak === 'afterEven') {
+			self.writer.moveToNextPage(node.pageOrientation);
+			if ((self.writer.context().page + 1) % 2 === 0) {
+				self.writer.moveToNextPage(node.pageOrientation);
+			}
 		}
 	}
 };

package/src/printer.js

@@ -39,18 +39,6 @@ var findFont = function (fonts, requiredFonts, defaultFont) {
 	return defaultFont;
 };
 
-var typeName = function (bold, italics) {
-	var type = 'normal';
-	if (bold && italics) {
-		type = 'bolditalics';
-	} else if (bold) {
-		type = 'bold';
-	} else if (italics) {
-		type = 'italics';
-	}
-	return type;
-};
-
 ////////////////////////////////////////
 // PdfPrinter
 
@@ -124,6 +112,7 @@ PdfPrinter.prototype.createPdfKitDocument = function (docDefinition, options) {
 	docDefinition.version = docDefinition.version || '1.3';
 	docDefinition.compress = isBoolean(docDefinition.compress) ? docDefinition.compress : true;
 	docDefinition.images = docDefinition.images || {};
+	docDefinition.pageMargins = ((docDefinition.pageMargins !== undefined) && (docDefinition.pageMargins !== null)) ? docDefinition.pageMargins : 40;
 
 	var pageSize = fixPageSize(docDefinition.pageSize, docDefinition.pageOrientation);
 
@@ -145,7 +134,7 @@ PdfPrinter.prototype.createPdfKitDocument = function (docDefinition, options) {
 
 	this.fontProvider = new FontProvider(this.fontDescriptors, this.pdfKitDoc);
 
-	var builder = new LayoutBuilder(pageSize, fixPageMargins(docDefinition.pageMargins || 40), new ImageMeasure(this.pdfKitDoc, docDefinition.images), new SVGMeasure());
+	var builder = new LayoutBuilder(pageSize, fixPageMargins(docDefinition.pageMargins), new ImageMeasure(this.pdfKitDoc, docDefinition.images), new SVGMeasure());
 
 	registerDefaultTableLayouts(builder);
 	if (options.tableLayouts) {
@@ -271,10 +260,6 @@ function fixPageSize(pageSize, pageOrientation) {
 }
 
 function fixPageMargins(margin) {
-	if (!margin) {
-		return null;
-	}
-
 	if (isNumber(margin)) {
 		margin = { left: margin, right: margin, top: margin, bottom: margin };
 	} else if (isArray(margin)) {
@@ -490,7 +475,8 @@ function renderLine(line, x, y, pdfKitDoc) {
 			options.features = inline.fontFeatures;
 		}
 
-		pdfKitDoc.opacity(inline.opacity || 1);
+		var opacity = isNumber(inline.opacity) ? inline.opacity : 1;
+		pdfKitDoc.opacity(opacity);
 		pdfKitDoc.fill(inline.color || 'black');
 
 		pdfKitDoc._font = inline.font;
@@ -602,37 +588,51 @@ function renderVector(vector, pdfKitDoc) {
 		vector.color = gradient;
 	}
 
+	var fillOpacity = isNumber(vector.fillOpacity) ? vector.fillOpacity : 1;
+	var strokeOpacity = isNumber(vector.strokeOpacity) ? vector.strokeOpacity : 1;
+
 	if (vector.color && vector.lineColor) {
-		pdfKitDoc.fillColor(vector.color, vector.fillOpacity || 1);
-		pdfKitDoc.strokeColor(vector.lineColor, vector.strokeOpacity || 1);
+		pdfKitDoc.fillColor(vector.color, fillOpacity);
+		pdfKitDoc.strokeColor(vector.lineColor, strokeOpacity);
 		pdfKitDoc.fillAndStroke();
 	} else if (vector.color) {
-		pdfKitDoc.fillColor(vector.color, vector.fillOpacity || 1);
+		pdfKitDoc.fillColor(vector.color, fillOpacity);
 		pdfKitDoc.fill();
 	} else {
-		pdfKitDoc.strokeColor(vector.lineColor || 'black', vector.strokeOpacity || 1);
+		pdfKitDoc.strokeColor(vector.lineColor || 'black', strokeOpacity);
 		pdfKitDoc.stroke();
 	}
 }
 
 function renderImage(image, x, y, pdfKitDoc) {
-	pdfKitDoc.opacity(image.opacity || 1);
+	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.link) {
 		pdfKitDoc.link(image.x, image.y, image._width, image._height, image.link);
 	}
+	if (image.linkToPage) {
+		pdfKitDoc.ref({ Type: 'Action', S: 'GoTo', D: [image.linkToPage, 0, 0] }).end();
+		pdfKitDoc.annotate(image.x, image.y, image._width, image._height, { Subtype: 'Link', Dest: [image.linkToPage - 1, 'XYZ', null, null, null] });
+	}
+	if (image.linkToDestination) {
+		pdfKitDoc.goTo(image.x, image.y, image._width, image._height, image.linkToDestination);
+	}
 }
 
 function renderSVG(svg, x, y, pdfKitDoc, fontProvider) {
 	var options = Object.assign({ width: svg._width, height: svg._height, assumePt: true }, svg.options);
-	options.fontCallback = function (family, bold, italic, fontOptions) {
-		fontOptions.fauxBold = bold;
-		fontOptions.fauxItalic = italic;
-
+	options.fontCallback = function (family, bold, italic) {
 		var fontsFamily = family.split(',').map(function (f) { return f.trim().replace(/('|")/g, ''); });
-		var font = findFont(fontProvider.fonts, fontsFamily, 'Roboto'); // TODO: default font from dd
+		var font = findFont(fontProvider.fonts, fontsFamily, svg.font || 'Roboto');
+
+		var fontFile = fontProvider.getFontFile(font, bold, italic);
+		if (fontFile === null) {
+			var type = fontProvider.getFontType(bold, italic);
+			throw new Error('Font \'' + font + '\' in style \'' + type + '\' is not defined in the font section of the document definition.');
+		}
 
-		return fontProvider.fonts[font][typeName(bold, italic)];
+		return fontFile;
 	};
 
 	getSvgToPDF()(pdfKitDoc, svg.svg, svg.x, svg.y, options);

package/src/styleContextStack.js

@@ -94,6 +94,7 @@ StyleContextStack.prototype.autopush = function (item) {
 		'color',
 		'columnGap',
 		'fillColor',
+		'fillOpacity',
 		'decoration',
 		'decorationStyle',
 		'decorationColor',

package/src/tableProcessor.js

@@ -2,6 +2,7 @@
 
 var ColumnCalculator = require('./columnCalculator');
 var isFunction = require('./helpers').isFunction;
+var isNumber = require('./helpers').isNumber;
 
 function TableProcessor(tableNode) {
 	this.tableNode = tableNode;
@@ -419,9 +420,13 @@ TableProcessor.prototype.endRow = function (rowIndex, writer, pageBreaks) {
 
 			if (i < l - 1) {
 				var fillColor = body[rowIndex][colIndex].fillColor;
+				var fillOpacity = body[rowIndex][colIndex].fillOpacity;
 				if (!fillColor) {
 					fillColor = isFunction(this.layout.fillColor) ? this.layout.fillColor(rowIndex, this.tableNode, colIndex) : this.layout.fillColor;
 				}
+				if (!isNumber(fillOpacity)) {
+					fillOpacity = isFunction(this.layout.fillOpacity) ? this.layout.fillOpacity(rowIndex, this.tableNode, colIndex) : this.layout.fillOpacity;
+                                }
 				if (fillColor) {
 					var widthLeftBorder = leftCellBorder ? this.layout.vLineWidth(colIndex, this.tableNode) : 0;
 					var widthRightBorder;
@@ -444,7 +449,8 @@ TableProcessor.prototype.endRow = function (rowIndex, writer, pageBreaks) {
 						w: x2f - x1f,
 						h: y2f - y1f,
 						lineWidth: 0,
-						color: fillColor
+						color: fillColor,
+						fillOpacity: fillOpacity
 					}, false, true, writer.context().backgroundLength[writer.context().page]);
 				}
 			}

package/webpack.config.js

@@ -46,7 +46,7 @@ module.exports = {
 			},
 			{
 				test: /\.js$/,
-				include: /(pdfkit|saslprep|unicode-trie|unicode-properties|dfa|linebreak)/,
+				include: /(pdfkit|saslprep|unicode-trie|unicode-properties|dfa|linebreak|png-js)/,
 				use: {
 					loader: 'babel-loader',
 					options: {