pdfmake 0.3.0-beta.12 → 0.3.0-beta.13

package/src/LayoutBuilder.js

@@ -172,14 +172,18 @@ class LayoutBuilder {
 		docStructure = this.docPreprocessor.preprocessDocument(docStructure);
 		docStructure = this.docMeasure.measureDocument(docStructure);
 
-		this.writer = new PageElementWriter(
-			new DocumentContext(this.pageSize, this.pageMargins));
+		this.writer = new PageElementWriter(new DocumentContext());
 
 		this.writer.context().addListener('pageAdded', () => {
 			this.addBackground(background);
 		});
 
-		this.addBackground(background);
+		this.writer.addPage(
+			this.pageSize,
+			null,
+			this.pageMargins
+		);
+
 		this.processNode(docStructure);
 		this.addHeadersAndFooters(header, footer);
 		if (watermark != null) {
@@ -206,11 +210,6 @@ class LayoutBuilder {
 		}
 	}
 
-	addStaticRepeatable(headerOrFooter, sizeFunction) {
-		this.addDynamicRepeatable(() => // copy to new object
-			JSON.parse(JSON.stringify(headerOrFooter)), sizeFunction);
-	}
-
 	addDynamicRepeatable(nodeGetter, sizeFunction) {
 		let pages = this.writer.context().pages;
 
@@ -220,7 +219,7 @@ class LayoutBuilder {
 			let node = nodeGetter(pageIndex + 1, l, this.writer.context().pages[pageIndex].pageSize);
 
 			if (node) {
-				let sizes = sizeFunction(this.writer.context().getCurrentPage().pageSize, this.pageMargins);
+				let sizes = sizeFunction(this.writer.context().getCurrentPage().pageSize, this.writer.context().getCurrentPage().pageMargins);
 				this.writer.beginUnbreakableBlock(sizes.width, sizes.height);
 				node = this.docPreprocessor.preprocessDocument(node);
 				this.processNode(this.docMeasure.measureDocument(node));
@@ -244,16 +243,12 @@ class LayoutBuilder {
 			height: pageMargins.bottom
 		});
 
-		if (typeof header === 'function') {
+		if (header) {
 			this.addDynamicRepeatable(header, headerSizeFct);
-		} else if (header) {
-			this.addStaticRepeatable(header, headerSizeFct);
 		}
 
-		if (typeof footer === 'function') {
+		if (footer) {
 			this.addDynamicRepeatable(footer, footerSizeFct);
-		} else if (footer) {
-			this.addStaticRepeatable(footer, footerSizeFct);
 		}
 	}
 
@@ -266,36 +261,40 @@ class LayoutBuilder {
 			return;
 		}
 
-		watermark.font = watermark.font || defaultStyle.font || 'Roboto';
-		watermark.fontSize = watermark.fontSize || 'auto';
-		watermark.color = watermark.color || 'black';
-		watermark.opacity = isNumber(watermark.opacity) ? watermark.opacity : 0.6;
-		watermark.bold = watermark.bold || false;
-		watermark.italics = watermark.italics || false;
-		watermark.angle = isValue(watermark.angle) ? watermark.angle : null;
-
-		if (watermark.angle === null) {
-			watermark.angle = Math.atan2(this.pageSize.height, this.pageSize.width) * -180 / Math.PI;
+		let pages = this.writer.context().pages;
+		for (let i = 0, l = pages.length; i < l; i++) {
+			pages[i].watermark = getWatermarkObject({ ...watermark }, pages[i].pageSize, pdfDocument, defaultStyle);
 		}
 
-		if (watermark.fontSize === 'auto') {
-			watermark.fontSize = getWatermarkFontSize(this.pageSize, watermark, pdfDocument);
-		}
+		function getWatermarkObject(watermark, pageSize, pdfDocument, defaultStyle) {
+			watermark.font = watermark.font || defaultStyle.font || 'Roboto';
+			watermark.fontSize = watermark.fontSize || 'auto';
+			watermark.color = watermark.color || 'black';
+			watermark.opacity = isNumber(watermark.opacity) ? watermark.opacity : 0.6;
+			watermark.bold = watermark.bold || false;
+			watermark.italics = watermark.italics || false;
+			watermark.angle = isValue(watermark.angle) ? watermark.angle : null;
+
+			if (watermark.angle === null) {
+				watermark.angle = Math.atan2(pageSize.height, pageSize.width) * -180 / Math.PI;
+			}
 
-		let watermarkObject = {
-			text: watermark.text,
-			font: pdfDocument.provideFont(watermark.font, watermark.bold, watermark.italics),
-			fontSize: watermark.fontSize,
-			color: watermark.color,
-			opacity: watermark.opacity,
-			angle: watermark.angle
-		};
+			if (watermark.fontSize === 'auto') {
+				watermark.fontSize = getWatermarkFontSize(pageSize, watermark, pdfDocument);
+			}
 
-		watermarkObject._size = getWatermarkSize(watermark, pdfDocument);
+			let watermarkObject = {
+				text: watermark.text,
+				font: pdfDocument.provideFont(watermark.font, watermark.bold, watermark.italics),
+				fontSize: watermark.fontSize,
+				color: watermark.color,
+				opacity: watermark.opacity,
+				angle: watermark.angle
+			};
 
-		let pages = this.writer.context().pages;
-		for (let i = 0, l = pages.length; i < l; i++) {
-			pages[i].watermark = watermarkObject;
+			watermarkObject._size = getWatermarkSize(watermark, pdfDocument);
+
+			return watermarkObject;
 		}
 
 		function getWatermarkSize(watermark, pdfDocument) {
@@ -629,12 +628,12 @@ class LayoutBuilder {
 	* @property {number} target.prevY - Updated to the maximum `prevY` value between `break1` and `break2`.
 	* @property {number} target.y - Updated to the minimum `y` value between `break1` and `break2`.
 	*/
-	_resolveBreakY (break1, break2, target) {
+	_resolveBreakY(break1, break2, target) {
 		target.prevY = Math.max(break1.prevY, break2.prevY);
 		target.y = Math.min(break1.y, break2.y);
 	};
 
-	_storePageBreakData (data, startsRowSpan, pageBreaks, tableNode) {
+	_storePageBreakData(data, startsRowSpan, pageBreaks, tableNode) {
 		if (!startsRowSpan) {
 			let pageDesc = this._getPageBreak(pageBreaks, data.prevPage);
 			let pageDescBySpan = this._getPageBreakListBySpan(tableNode, data.prevPage, data.rowIndex);
@@ -835,7 +834,7 @@ class LayoutBuilder {
 		}
 
 		return {
-			pageBreaksBySpan : pageBreaksByRowSpan,
+			pageBreaksBySpan: pageBreaksByRowSpan,
 			pageBreaks: pageBreaks,
 			positions: positions
 		};

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;
@@ -77,6 +83,19 @@ class PageElementWriter extends ElementWriter {
 		});
 	}
 
+	addPage(pageSize, pageOrientation, pageMargin) {
+		let prevPage = this.page;
+		let prevY = this.y;
+
+		this.context().addPage(normalizePageSize(pageSize, pageOrientation), normalizePageMargin(pageMargin));
+
+		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
@@ -56,6 +57,14 @@ class PdfPrinter {
 					docDefinition.pageMargins = isValue(docDefinition.pageMargins) ? docDefinition.pageMargins : 40;
 					docDefinition.patterns = docDefinition.patterns || {};
 
+					if (docDefinition.header && typeof docDefinition.header !== 'function') {
+						docDefinition.header = convertToDynamicContent(docDefinition.header);
+					}
+
+					if (docDefinition.footer && typeof docDefinition.footer !== 'function') {
+						docDefinition.footer = convertToDynamicContent(docDefinition.footer);
+					}
+
 					let pageSize = normalizePageSize(docDefinition.pageSize, docDefinition.pageOrientation);
 
 					let pdfOptions = {

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++) {
@@ -353,7 +349,7 @@ class Renderer {
 			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.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) {
@@ -402,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/TextInlines.js

@@ -45,7 +45,7 @@ class TextInlines {
 	 * Converts an array of strings (or inline-definition-objects) into a collection
 	 * of inlines and calculated minWidth/maxWidth and their min/max widths
 	 *
-	 * @param {Array} textArray an array of inline-definition-objects (or strings)
+	 * @param {Array|object} textArray an array of inline-definition-objects (or strings)
 	 * @param {StyleContextStack} styleContextStack current style stack
 	 * @returns {object} collection of inlines, minWidth, maxWidth
 	 */

package/src/URLResolver.js

@@ -11,6 +11,8 @@ const fetchUrl = (url, headers = {}) => {
 
 		h.get(url, options, res => {
 			if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) { // redirect url
+				res.resume();
+				
 				fetchUrl(res.headers.location).then(buffer => {
 					resolve(buffer);
 				}, result => {
@@ -22,6 +24,8 @@ const fetchUrl = (url, headers = {}) => {
 			const ok = res.statusCode >= 200 && res.statusCode < 300;
 			if (!ok) {
 				reject(new TypeError(`Failed to fetch (status code: ${res.statusCode}, url: "${url}")`));
+				res.resume();
+				return;
 			}
 
 			const chunks = [];

package/src/helpers/tools.js

@@ -37,3 +37,8 @@ export function offsetVector(vector, x, y) {
 			break;
 	}
 }
+
+export function convertToDynamicContent(staticContent) {
+	return () => // copy to new object
+		JSON.parse(JSON.stringify(staticContent));
+}

package/standard-fonts/Helvetica.js

@@ -6,4 +6,3 @@ module.exports = {
 		bolditalics: 'Helvetica-BoldOblique'
 	}
 };
-

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WebPackConfiguration">
-    <option name="mode" value="DISABLED" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/pdfmake.iml" filepath="$PROJECT_DIR$/.idea/pdfmake.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/pdfmake.iml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

package/eslint.config.mjs

@@ -1,52 +0,0 @@
-import jsdoc from "eslint-plugin-jsdoc";
-import globals from "globals";
-import js from "@eslint/js";
-
-export default [
-	{
-		ignores: ["src/3rd-party/svg-to-pdfkit/*"],
-	},
-
-	js.configs.recommended,
-
-	{
-		plugins: {
-			jsdoc,
-		},
-
-		languageOptions: {
-			globals: {
-				...globals.browser,
-				...globals.node,
-				...globals.mocha,
-			},
-
-			ecmaVersion: 9,
-			sourceType: "module",
-		},
-
-		rules: {
-			semi: 2,
-			"no-throw-literal": 2,
-			"no-prototype-builtins": 0,
-			"jsdoc/check-examples": 0,
-			"jsdoc/check-param-names": 1,
-			"jsdoc/check-tag-names": 1,
-			"jsdoc/check-types": 1,
-			"jsdoc/no-undefined-types": 1,
-			"jsdoc/require-description": 0,
-			"jsdoc/require-description-complete-sentence": 0,
-			"jsdoc/require-example": 0,
-			"jsdoc/require-hyphen-before-param-description": 0,
-			"jsdoc/require-param": 1,
-			"jsdoc/require-param-description": 0,
-			"jsdoc/require-param-name": 1,
-			"jsdoc/require-param-type": 1,
-			"jsdoc/require-returns": 1,
-			"jsdoc/require-returns-check": 1,
-			"jsdoc/require-returns-description": 0,
-			"jsdoc/require-returns-type": 1,
-			"jsdoc/valid-types": 1,
-		},
-	}
-];