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

package/js/DocMeasure.js

@@ -117,6 +117,15 @@ class DocMeasure {
       width: image.width,
       height: image.height
     };
+    if (image.constructor.name === 'JPEG') {
+      // If EXIF orientation calls for it, swap width and height
+      if (image.orientation > 4) {
+        imageSize = {
+          width: image.height,
+          height: image.width
+        };
+      }
+    }
     this.measureImageWithDimensions(node, imageSize);
     return node;
   }

package/js/DocumentContext.js

@@ -9,17 +9,16 @@ var _events = require("events");
  * It facilitates column divisions and vertical sync
  */
 class DocumentContext extends _events.EventEmitter {
-  constructor(pageSize, pageMargins) {
+  constructor() {
     super();
     this.pages = [];
-    this.pageMargins = pageMargins;
-    this.x = pageMargins.left;
-    this.availableWidth = pageSize.width - pageMargins.left - pageMargins.right;
-    this.availableHeight = 0;
+    this.pageMargins = undefined;
+    this.x = undefined;
+    this.availableWidth = undefined;
+    this.availableHeight = undefined;
     this.page = -1;
     this.snapshots = [];
     this.backgroundLength = [];
-    this.addPage(pageSize);
   }
   beginColumnGroup(marginXTopParent, bottomByPage = {}) {
     this.snapshots.push({
@@ -220,10 +219,16 @@ class DocumentContext extends _events.EventEmitter {
       y: this.y
     };
   }
-  addPage(pageSize) {
+  addPage(pageSize, pageMargin = null) {
+    if (pageMargin !== null) {
+      this.pageMargins = pageMargin;
+      this.x = pageMargin.left;
+      this.availableWidth = pageSize.width - pageMargin.left - pageMargin.right;
+    }
     let page = {
       items: [],
-      pageSize: pageSize
+      pageSize: pageSize,
+      pageMargins: this.pageMargins
     };
     this.pages.push(page);
     this.backgroundLength.push(0);

package/js/ElementWriter.js

@@ -12,11 +12,18 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  * their positions based on the context
  */
 class ElementWriter extends _events.EventEmitter {
+  /**
+   * @param {DocumentContext} context
+   */
   constructor(context) {
     super();
     this._context = context;
     this.contextStack = [];
   }
+
+  /**
+   * @returns {DocumentContext}
+   */
   context() {
     return this._context;
   }
@@ -306,7 +313,7 @@ class ElementWriter extends _events.EventEmitter {
    * pushContext(width, height) - creates and pushes a new context with the specified width and height
    * pushContext() - creates a new context for unbreakable blocks (with current availableWidth and full-page-height)
    *
-   * @param {object|number} contextOrWidth
+   * @param {DocumentContext|number} contextOrWidth
    * @param {number} height
    */
   pushContext(contextOrWidth, height) {
@@ -315,8 +322,10 @@ class ElementWriter extends _events.EventEmitter {
       contextOrWidth = this.context().availableWidth;
     }
     if ((0, _variableType.isNumber)(contextOrWidth)) {
-      contextOrWidth = new _DocumentContext.default({
-        width: contextOrWidth,
+      let width = contextOrWidth;
+      contextOrWidth = new _DocumentContext.default();
+      contextOrWidth.addPage({
+        width: width,
         height: height
       }, {
         left: 0,

package/js/LayoutBuilder.js

@@ -135,11 +135,11 @@ class LayoutBuilder {
     this.linearNodeList = [];
     docStructure = this.docPreprocessor.preprocessDocument(docStructure);
     docStructure = this.docMeasure.measureDocument(docStructure);
-    this.writer = new _PageElementWriter.default(new _DocumentContext.default(this.pageSize, this.pageMargins));
+    this.writer = new _PageElementWriter.default(new _DocumentContext.default());
     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) {
@@ -163,18 +163,13 @@ class LayoutBuilder {
       context.backgroundLength[context.page] += pageBackground.positions.length;
     }
   }
-  addStaticRepeatable(headerOrFooter, sizeFunction) {
-    this.addDynamicRepeatable(() =>
-    // copy to new object
-    JSON.parse(JSON.stringify(headerOrFooter)), sizeFunction);
-  }
   addDynamicRepeatable(nodeGetter, sizeFunction) {
     let pages = this.writer.context().pages;
     for (let pageIndex = 0, l = pages.length; pageIndex < l; pageIndex++) {
       this.writer.context().page = pageIndex;
       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));
@@ -195,15 +190,11 @@ class LayoutBuilder {
       width: pageSize.width,
       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);
     }
   }
   addWatermark(watermark, pdfDocument, defaultStyle) {
@@ -216,31 +207,36 @@ class LayoutBuilder {
       // empty watermark text
       return;
     }
-    watermark.font = watermark.font || defaultStyle.font || 'Roboto';
-    watermark.fontSize = watermark.fontSize || 'auto';
-    watermark.color = watermark.color || 'black';
-    watermark.opacity = (0, _variableType.isNumber)(watermark.opacity) ? watermark.opacity : 0.6;
-    watermark.bold = watermark.bold || false;
-    watermark.italics = watermark.italics || false;
-    watermark.angle = (0, _variableType.isValue)(watermark.angle) ? watermark.angle : null;
-    if (watermark.angle === null) {
-      watermark.angle = Math.atan2(this.pageSize.height, this.pageSize.width) * -180 / Math.PI;
-    }
-    if (watermark.fontSize === 'auto') {
-      watermark.fontSize = getWatermarkFontSize(this.pageSize, 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
-    };
-    watermarkObject._size = getWatermarkSize(watermark, pdfDocument);
     let pages = this.writer.context().pages;
     for (let i = 0, l = pages.length; i < l; i++) {
-      pages[i].watermark = watermarkObject;
+      pages[i].watermark = getWatermarkObject({
+        ...watermark
+      }, pages[i].pageSize, pdfDocument, defaultStyle);
+    }
+    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 = (0, _variableType.isNumber)(watermark.opacity) ? watermark.opacity : 0.6;
+      watermark.bold = watermark.bold || false;
+      watermark.italics = watermark.italics || false;
+      watermark.angle = (0, _variableType.isValue)(watermark.angle) ? watermark.angle : null;
+      if (watermark.angle === null) {
+        watermark.angle = Math.atan2(pageSize.height, pageSize.width) * -180 / Math.PI;
+      }
+      if (watermark.fontSize === 'auto') {
+        watermark.fontSize = getWatermarkFontSize(pageSize, 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
+      };
+      watermarkObject._size = getWatermarkSize(watermark, pdfDocument);
+      return watermarkObject;
     }
     function getWatermarkSize(watermark, pdfDocument) {
       let textInlines = new _TextInlines.default(pdfDocument);

package/js/PageElementWriter.js

@@ -3,6 +3,8 @@
 exports.__esModule = true;
 exports.default = void 0;
 var _ElementWriter = _interopRequireDefault(require("./ElementWriter"));
+var _PageSize = require("./PageSize");
+var _DocumentContext = _interopRequireDefault(require("./DocumentContext"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * An extended ElementWriter which can handle:
@@ -13,6 +15,9 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  *                 whole block will be rendered on the same page)
  */
 class PageElementWriter extends _ElementWriter.default {
+  /**
+   * @param {DocumentContext} context
+   */
   constructor(context) {
     super(context);
     this.transactionLevel = 0;
@@ -68,6 +73,16 @@ class PageElementWriter extends _ElementWriter.default {
       y: this.context().y
     });
   }
+  addPage(pageSize, pageOrientation, pageMargin) {
+    let prevPage = this.page;
+    let prevY = this.y;
+    this.context().addPage((0, _PageSize.normalizePageSize)(pageSize, pageOrientation), (0, _PageSize.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/js/Printer.js

@@ -9,6 +9,7 @@ var _PageSize = require("./PageSize");
 var _tableLayouts = require("./tableLayouts");
 var _Renderer = _interopRequireDefault(require("./Renderer"));
 var _variableType = require("./helpers/variableType");
+var _tools = require("./helpers/tools");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Printer which turns document definition into a pdf
@@ -58,6 +59,12 @@ class PdfPrinter {
           docDefinition.attachments = docDefinition.attachments || {};
           docDefinition.pageMargins = (0, _variableType.isValue)(docDefinition.pageMargins) ? docDefinition.pageMargins : 40;
           docDefinition.patterns = docDefinition.patterns || {};
+          if (docDefinition.header && typeof docDefinition.header !== 'function') {
+            docDefinition.header = (0, _tools.convertToDynamicContent)(docDefinition.header);
+          }
+          if (docDefinition.footer && typeof docDefinition.footer !== 'function') {
+            docDefinition.footer = (0, _tools.convertToDynamicContent)(docDefinition.footer);
+          }
           let pageSize = (0, _PageSize.normalizePageSize)(docDefinition.pageSize, docDefinition.pageOrientation);
           let pdfOptions = {
             size: [pageSize.width, pageSize.height],

package/js/Renderer.js

@@ -29,7 +29,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,7 @@ class Renderer {
   }
   renderPages(pages) {
     this.pdfDocument._pdfMakePages = pages; // TODO: Why?
-    this.pdfDocument.addPage();
+
     let totalItems = 0;
     if (this.progressCallback) {
       pages.forEach(page => {
@@ -54,10 +54,9 @@ 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++) {
         let item = page.items[ii];
@@ -380,13 +379,5 @@ 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];
-    }
-  }
 }
 var _default = exports.default = Renderer;

package/js/SVGMeasure.js

@@ -11,7 +11,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  * @returns {?number}
  */
 const stripUnits = textVal => {
-  var n = parseFloat(textVal);
+  let n = parseFloat(textVal);
   if (typeof n !== 'number' || isNaN(n)) {
     return undefined;
   }
@@ -25,7 +25,7 @@ const stripUnits = textVal => {
  * @returns {object}
  */
 const parseSVG = svgString => {
-  var doc;
+  let doc;
   try {
     doc = new _xmldoc.default.XmlDocument(svgString);
   } catch (err) {

package/js/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/js/URLResolver.js

@@ -15,6 +15,7 @@ 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 => {
@@ -25,6 +26,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 = [];
       res.on('end', () => resolve(Buffer.concat(chunks)));

package/js/helpers/tools.js

@@ -1,6 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
+exports.convertToDynamicContent = convertToDynamicContent;
 exports.offsetVector = offsetVector;
 exports.pack = pack;
 function pack(...args) {
@@ -37,4 +38,9 @@ function offsetVector(vector, x, y) {
       }
       break;
   }
+}
+function convertToDynamicContent(staticContent) {
+  return () =>
+  // copy to new object
+  JSON.parse(JSON.stringify(staticContent));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.3.0-beta.12",
+  "version": "0.3.0-beta.13",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "js/index.js",
   "esnext": "src/index.js",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@foliojs-fork/linebreak": "^1.1.2",
-    "@foliojs-fork/pdfkit": "^0.15.1",
+    "@foliojs-fork/pdfkit": "^0.15.2",
     "iconv-lite": "^0.6.3",
     "xmldoc": "^1.3.0"
   },

package/src/3rd-party/svg-to-pdfkit/LICENSE

@@ -1,9 +1,9 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 SVG-to-PDFKit contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2019 SVG-to-PDFKit contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/src/DocMeasure.js

@@ -128,8 +128,16 @@ class DocMeasure {
 		this.convertIfBase64Image(node);
 
 		let image = this.pdfDocument.provideImage(node.image);
+
 		let imageSize = { width: image.width, height: image.height };
 
+		if (image.constructor.name === 'JPEG') {
+			// If EXIF orientation calls for it, swap width and height
+			if (image.orientation > 4) {
+				imageSize = { width: image.height, height: image.width };
+			}
+		}
+
 		this.measureImageWithDimensions(node, imageSize);
 
 		return node;

package/src/DocumentContext.js

@@ -6,21 +6,17 @@ import { EventEmitter } from 'events';
  * It facilitates column divisions and vertical sync
  */
 class DocumentContext extends EventEmitter {
-	constructor(pageSize, pageMargins) {
+	constructor() {
 		super();
 		this.pages = [];
-
-		this.pageMargins = pageMargins;
-
-		this.x = pageMargins.left;
-		this.availableWidth = pageSize.width - pageMargins.left - pageMargins.right;
-		this.availableHeight = 0;
+		this.pageMargins = undefined;
+		this.x = undefined;
+		this.availableWidth = undefined;
+		this.availableHeight = undefined;
 		this.page = -1;
 
 		this.snapshots = [];
 		this.backgroundLength = [];
-
-		this.addPage(pageSize);
 	}
 
 	beginColumnGroup(marginXTopParent, bottomByPage = {}) {
@@ -30,7 +26,7 @@ class DocumentContext extends EventEmitter {
 			availableHeight: this.availableHeight,
 			availableWidth: this.availableWidth,
 			page: this.page,
-      bottomByPage: bottomByPage ? bottomByPage : {},
+			bottomByPage: bottomByPage ? bottomByPage : {},
 			bottomMost: {
 				x: this.x,
 				y: this.y,
@@ -47,7 +43,7 @@ class DocumentContext extends EventEmitter {
 		}
 	}
 
-	updateBottomByPage () {
+	updateBottomByPage() {
 		const lastSnapshot = this.snapshots[this.snapshots.length - 1];
 		const lastPage = this.page;
 		let previousBottom = -Number.MIN_VALUE;
@@ -244,8 +240,14 @@ class DocumentContext extends EventEmitter {
 		};
 	}
 
-	addPage(pageSize) {
-		let page = { items: [], pageSize: pageSize };
+	addPage(pageSize, pageMargin = null) {
+		if (pageMargin !== null) {
+			this.pageMargins = pageMargin;
+			this.x = pageMargin.left;
+			this.availableWidth = pageSize.width - pageMargin.left - pageMargin.right;
+		}
+
+		let page = { items: [], pageSize: pageSize, pageMargins: this.pageMargins };
 		this.pages.push(page);
 		this.backgroundLength.push(0);
 		this.page = this.pages.length - 1;

package/src/ElementWriter.js

@@ -8,12 +8,19 @@ import { EventEmitter } from 'events';
  * their positions based on the context
  */
 class ElementWriter extends EventEmitter {
+
+	/**
+	 * @param {DocumentContext} context
+	 */
 	constructor(context) {
 		super();
 		this._context = context;
 		this.contextStack = [];
 	}
 
+	/**
+	 * @returns {DocumentContext}
+	 */
 	context() {
 		return this._context;
 	}
@@ -371,7 +378,7 @@ class ElementWriter extends EventEmitter {
 	 * pushContext(width, height) - creates and pushes a new context with the specified width and height
 	 * pushContext() - creates a new context for unbreakable blocks (with current availableWidth and full-page-height)
 	 *
-	 * @param {object|number} contextOrWidth
+	 * @param {DocumentContext|number} contextOrWidth
 	 * @param {number} height
 	 */
 	pushContext(contextOrWidth, height) {
@@ -381,7 +388,9 @@ class ElementWriter extends EventEmitter {
 		}
 
 		if (isNumber(contextOrWidth)) {
-			contextOrWidth = new DocumentContext({ width: contextOrWidth, height: height }, { left: 0, right: 0, top: 0, bottom: 0 });
+			let width = contextOrWidth;
+			contextOrWidth = new DocumentContext();
+			contextOrWidth.addPage({ width: width, height: height }, { left: 0, right: 0, top: 0, bottom: 0 });
 		}
 
 		this.contextStack.push(this.context());