pdfmake 0.3.5 → 0.3.6

package/js/DocMeasure.js

@@ -86,9 +86,11 @@ class DocMeasure {
       node._width = node._minWidth = node._maxWidth = node.cover.width;
       node._height = node._minHeight = node._maxHeight = node.cover.height;
     } else {
+      let nodeWidth = (0, _variableType.isNumber)(node.width) ? node.width : undefined;
+      let nodeHeight = (0, _variableType.isNumber)(node.height) ? node.height : undefined;
       let ratio = dimensions.width / dimensions.height;
-      node._width = node._minWidth = node._maxWidth = node.width || (node.height ? node.height * ratio : dimensions.width);
-      node._height = node.height || (node.width ? node.width / ratio : dimensions.height);
+      node._width = node._minWidth = node._maxWidth = nodeWidth || (nodeHeight ? nodeHeight * ratio : dimensions.width);
+      node._height = nodeHeight || (nodeWidth ? nodeWidth / ratio : dimensions.height);
       if ((0, _variableType.isNumber)(node.maxWidth) && node.maxWidth < node._width) {
         node._width = node._minWidth = node._maxWidth = node.maxWidth;
         node._height = node._width * dimensions.height / dimensions.width;

package/js/Printer.js

@@ -11,28 +11,13 @@ 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
- *
- * @example
- * var fontDescriptors = {
- *	Roboto: {
- *		normal: 'fonts/Roboto-Regular.ttf',
- *		bold: 'fonts/Roboto-Medium.ttf',
- *		italics: 'fonts/Roboto-Italic.ttf',
- *		bolditalics: 'fonts/Roboto-MediumItalic.ttf'
- *	}
- * };
- *
- * var printer = new PdfPrinter(fontDescriptors);
- */
 class PdfPrinter {
   /**
    * @param {object} fontDescriptors font definition dictionary
    * @param {object} virtualfs
    * @param {object} urlResolver
    */
-  constructor(fontDescriptors, virtualfs = null, urlResolver = null) {
+  constructor(fontDescriptors, virtualfs, urlResolver) {
     this.fontDescriptors = fontDescriptors;
     this.virtualfs = virtualfs;
     this.urlResolver = urlResolver;
@@ -126,9 +111,6 @@ class PdfPrinter {
         headers: {}
       };
     };
-    if (this.urlResolver === null) {
-      return;
-    }
     for (let font in this.fontDescriptors) {
       if (this.fontDescriptors.hasOwnProperty(font)) {
         if (this.fontDescriptors[font].normal) {

package/js/URLResolver.js

@@ -21,6 +21,14 @@ class URLResolver {
   constructor(fs) {
     this.fs = fs;
     this.resolving = {};
+    this.urlAccessPolicy = undefined;
+  }
+
+  /**
+   * @param {(url: string) => boolean} callback
+   */
+  setUrlAccessPolicy(callback) {
+    this.urlAccessPolicy = callback;
   }
   resolve(url, headers = {}) {
     const resolveUrlInternal = async () => {
@@ -28,6 +36,9 @@ class URLResolver {
         if (this.fs.existsSync(url)) {
           return; // url was downloaded earlier
         }
+        if (typeof this.urlAccessPolicy !== 'undefined' && this.urlAccessPolicy(url) !== true) {
+          throw new Error(`Access to URL denied by resource access policy: ${url}`);
+        }
         const buffer = await fetchUrl(url, headers);
         this.fs.writeFileSync(url, buffer);
       }

package/js/base.js

@@ -6,11 +6,12 @@ var _Printer = _interopRequireDefault(require("./Printer"));
 var _virtualFs = _interopRequireDefault(require("./virtual-fs"));
 var _tools = require("./helpers/tools");
 var _variableType = require("./helpers/variableType");
+var _URLResolver = _interopRequireDefault(require("./URLResolver"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class pdfmake {
   constructor() {
     this.virtualfs = _virtualFs.default;
-    this.urlResolver = null;
+    this.urlAccessPolicy = undefined;
   }
 
   /**
@@ -27,10 +28,26 @@ class pdfmake {
     }
     options.progressCallback = this.progressCallback;
     options.tableLayouts = this.tableLayouts;
-    let printer = new _Printer.default(this.fonts, this.virtualfs, this.urlResolver());
+    const isServer = typeof process !== 'undefined' && process?.versions?.node;
+    if (typeof this.urlAccessPolicy === 'undefined' && isServer) {
+      console.warn('No URL access policy defined. Consider using setUrlAccessPolicy() to restrict external resource downloads.');
+    }
+    let urlResolver = new _URLResolver.default(this.virtualfs);
+    urlResolver.setUrlAccessPolicy(this.urlAccessPolicy);
+    let printer = new _Printer.default(this.fonts, this.virtualfs, urlResolver);
     const pdfDocumentPromise = printer.createPdfKitDocument(docDefinition, options);
     return this._transformToDocument(pdfDocumentPromise);
   }
+
+  /**
+   * @param {(url: string) => boolean} callback
+   */
+  setUrlAccessPolicy(callback) {
+    if (callback !== undefined && typeof callback !== 'function') {
+      throw new Error("Parameter 'callback' has an invalid type. Function or undefined expected.");
+    }
+    this.urlAccessPolicy = callback;
+  }
   setProgressCallback(callback) {
     this.progressCallback = callback;
   }

package/js/browser-extensions/index.js

@@ -4,7 +4,6 @@ exports.__esModule = true;
 exports.default = void 0;
 var _base = _interopRequireDefault(require("../base"));
 var _OutputDocumentBrowser = _interopRequireDefault(require("./OutputDocumentBrowser"));
-var _URLResolver = _interopRequireDefault(require("../URLResolver"));
 var _fs = _interopRequireDefault(require("fs"));
 var _configurator = _interopRequireDefault(require("core-js/configurator"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -23,7 +22,6 @@ let defaultClientFonts = {
 class pdfmake extends _base.default {
   constructor() {
     super();
-    this.urlResolver = () => new _URLResolver.default(this.virtualfs);
     this.fonts = defaultClientFonts;
   }
   addFontContainer(fontContainer) {

package/js/index.js

@@ -2,11 +2,9 @@
 
 const pdfmakeBase = require('./base').default;
 const OutputDocumentServer = require('./OutputDocumentServer').default;
-const URLResolver = require('./URLResolver').default;
 class pdfmake extends pdfmakeBase {
   constructor() {
     super();
-    this.urlResolver = () => new URLResolver(this.virtualfs);
   }
   _transformToDocument(doc) {
     return new OutputDocumentServer(doc);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "js/index.js",
   "esnext": "src/index.js",

package/src/DocMeasure.js

@@ -95,10 +95,12 @@ class DocMeasure {
 			node._width = node._minWidth = node._maxWidth = node.cover.width;
 			node._height = node._minHeight = node._maxHeight = node.cover.height;
 		} else {
+			let nodeWidth = isNumber(node.width) ? node.width : undefined;
+			let nodeHeight = isNumber(node.height) ? node.height : undefined;
 			let ratio = dimensions.width / dimensions.height;
 
-			node._width = node._minWidth = node._maxWidth = node.width || (node.height ? (node.height * ratio) : dimensions.width);
-			node._height = node.height || (node.width ? node.width / ratio : dimensions.height);
+			node._width = node._minWidth = node._maxWidth = nodeWidth || (nodeHeight ? (nodeHeight * ratio) : dimensions.width);
+			node._height = nodeHeight || (nodeWidth ? nodeWidth / ratio : dimensions.height);
 
 			if (isNumber(node.maxWidth) && node.maxWidth < node._width) {
 				node._width = node._minWidth = node._maxWidth = node.maxWidth;

package/src/Printer.js

@@ -7,21 +7,6 @@ import Renderer from './Renderer';
 import { isNumber, isValue } from './helpers/variableType';
 import { convertToDynamicContent } from './helpers/tools';
 
-/**
- * Printer which turns document definition into a pdf
- *
- * @example
- * var fontDescriptors = {
- *	Roboto: {
- *		normal: 'fonts/Roboto-Regular.ttf',
- *		bold: 'fonts/Roboto-Medium.ttf',
- *		italics: 'fonts/Roboto-Italic.ttf',
- *		bolditalics: 'fonts/Roboto-MediumItalic.ttf'
- *	}
- * };
- *
- * var printer = new PdfPrinter(fontDescriptors);
- */
 class PdfPrinter {
 
 	/**
@@ -29,7 +14,7 @@ class PdfPrinter {
 	 * @param {object} virtualfs
 	 * @param {object} urlResolver
 	 */
-	constructor(fontDescriptors, virtualfs = null, urlResolver = null) {
+	constructor(fontDescriptors, virtualfs, urlResolver) {
 		this.fontDescriptors = fontDescriptors;
 		this.virtualfs = virtualfs;
 		this.urlResolver = urlResolver;
@@ -127,10 +112,6 @@ class PdfPrinter {
 			return { url: url, headers: {} };
 		};
 
-		if (this.urlResolver === null) {
-			return;
-		}
-
 		for (let font in this.fontDescriptors) {
 			if (this.fontDescriptors.hasOwnProperty(font)) {
 				if (this.fontDescriptors[font].normal) {

package/src/URLResolver.js

@@ -14,6 +14,14 @@ class URLResolver {
 	constructor(fs) {
 		this.fs = fs;
 		this.resolving = {};
+		this.urlAccessPolicy = undefined;
+	}
+
+	/**
+	 * @param {(url: string) => boolean} callback
+	 */
+	setUrlAccessPolicy(callback) {
+		this.urlAccessPolicy = callback;
 	}
 
 	resolve(url, headers = {}) {
@@ -22,6 +30,11 @@ class URLResolver {
 				if (this.fs.existsSync(url)) {
 					return; // url was downloaded earlier
 				}
+
+				if ((typeof this.urlAccessPolicy !== 'undefined') && (this.urlAccessPolicy(url) !== true)) {
+					throw new Error(`Access to URL denied by resource access policy: ${url}`);
+				}
+
 				const buffer = await fetchUrl(url, headers);
 				this.fs.writeFileSync(url, buffer);
 			}

package/src/base.js

@@ -2,12 +2,13 @@ import Printer from './Printer';
 import virtualfs from './virtual-fs';
 import { pack } from './helpers/tools';
 import { isObject } from './helpers/variableType';
+import URLResolver from './URLResolver';
 
 class pdfmake {
 
 	constructor() {
 		this.virtualfs = virtualfs;
-		this.urlResolver = null;
+		this.urlAccessPolicy = undefined;
 	}
 
 	/**
@@ -27,12 +28,33 @@ class pdfmake {
 		options.progressCallback = this.progressCallback;
 		options.tableLayouts = this.tableLayouts;
 
-		let printer = new Printer(this.fonts, this.virtualfs, this.urlResolver());
+		const isServer = typeof process !== 'undefined' && process?.versions?.node;
+		if (typeof this.urlAccessPolicy === 'undefined' && isServer) {
+			console.warn(
+				'No URL access policy defined. Consider using setUrlAccessPolicy() to restrict external resource downloads.'
+			);
+		}
+
+		let urlResolver = new URLResolver(this.virtualfs);
+		urlResolver.setUrlAccessPolicy(this.urlAccessPolicy);
+
+		let printer = new Printer(this.fonts, this.virtualfs, urlResolver);
 		const pdfDocumentPromise = printer.createPdfKitDocument(docDefinition, options);
 
 		return this._transformToDocument(pdfDocumentPromise);
 	}
 
+	/**
+	 * @param {(url: string) => boolean} callback
+	 */
+	setUrlAccessPolicy(callback) {
+		if (callback !== undefined && typeof callback !== 'function') {
+			throw new Error("Parameter 'callback' has an invalid type. Function or undefined expected.");
+		}
+
+		this.urlAccessPolicy = callback;
+	}
+
 	setProgressCallback(callback) {
 		this.progressCallback = callback;
 	}

package/src/browser-extensions/index.js

@@ -1,6 +1,5 @@
 import pdfmakeBase from '../base';
 import OutputDocumentBrowser from './OutputDocumentBrowser';
-import URLResolver from '../URLResolver';
 import fs from 'fs';
 import configurator from 'core-js/configurator';
 
@@ -21,7 +20,6 @@ let defaultClientFonts = {
 class pdfmake extends pdfmakeBase {
 	constructor() {
 		super();
-		this.urlResolver = () => new URLResolver(this.virtualfs);
 		this.fonts = defaultClientFonts;
 	}
 

package/src/index.js

@@ -1,11 +1,9 @@
 const pdfmakeBase = require('./base').default;
 const OutputDocumentServer = require('./OutputDocumentServer').default;
-const URLResolver = require('./URLResolver').default;
 
 class pdfmake extends pdfmakeBase {
 	constructor() {
 		super();
-		this.urlResolver = () => new URLResolver(this.virtualfs);
 	}
 
 	_transformToDocument(doc) {