pdfmake 0.1.66 → 0.1.70

package/package.json

@@ -1,73 +1,74 @@
-{
-  "name": "pdfmake",
-  "version": "0.1.66",
-  "description": "Client/server side PDF printing in pure JavaScript",
-  "main": "src/printer.js",
-  "browser": "build/pdfmake.js",
-  "directories": {
-    "test": "tests"
-  },
-  "dependencies": {
-    "iconv-lite": "^0.6.0",
-    "linebreak": "^1.0.2",
-    "pdfkit": "^0.11.0",
-    "svg-to-pdfkit": "^0.1.8"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.10.3",
-    "@babel/plugin-transform-modules-commonjs": "^7.10.1",
-    "@babel/preset-env": "^7.10.3",
-    "babel-loader": "^8.1.0",
-    "brfs": "^2.0.2",
-    "core-js": "^3.6.5",
-    "eslint-plugin-jsdoc": "^27.1.2",
-    "expose-loader": "^1.0.0",
-    "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.2.0",
-    "rewire": "^5.0.0",
-    "sinon": "^9.0.2",
-    "string-replace-webpack-plugin": "^0.1.3",
-    "transform-loader": "^0.2.4",
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "webpack": "^4.43.0"
-  },
-  "engines": {
-    "node": ">=8"
-  },
-  "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.70",
+  "description": "Client/server side PDF printing in pure JavaScript",
+  "main": "src/printer.js",
+  "browser": "build/pdfmake.js",
+  "directories": {
+    "test": "tests"
+  },
+  "dependencies": {
+    "iconv-lite": "^0.6.2",
+    "linebreak": "^1.0.2",
+    "pdfkit": "^0.11.0",
+    "svg-to-pdfkit": "^0.1.8",
+    "xmldoc": "^1.1.2"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.12.10",
+    "@babel/plugin-transform-modules-commonjs": "^7.12.1",
+    "@babel/preset-env": "^7.12.11",
+    "babel-loader": "^8.2.2",
+    "brfs": "^2.0.2",
+    "core-js": "^3.8.1",
+    "eslint-plugin-jsdoc": "^30.7.9",
+    "expose-loader": "^1.0.3",
+    "fancy-log": "^1.3.3",
+    "file-saver": "^2.0.5",
+    "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.2.0",
+    "rewire": "^5.0.0",
+    "sinon": "^9.2.2",
+    "string-replace-webpack-plugin": "^0.1.3",
+    "terser-webpack-plugin": "2.3.8",
+    "transform-loader": "^0.2.4",
+    "webpack": "^4.44.2"
+  },
+  "engines": {
+    "node": ">=8"
+  },
+  "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/browser-extensions/URLBrowserResolver.js

@@ -1,86 +1,88 @@
 'use strict';
 
 // Internet Explorer polyfills
-require('core-js/features/promise');
+if (typeof window !== 'undefined' && !window.Promise) {
+	require('core-js/features/promise');
+}
 require('core-js/es/object/values');
 
 var fetchUrl = function (url) {
-  return new Promise(function (resolve, reject) {
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', url, true);
-    xhr.responseType = 'arraybuffer';
+	return new Promise(function (resolve, reject) {
+		var xhr = new XMLHttpRequest();
+		xhr.open('GET', url, true);
+		xhr.responseType = 'arraybuffer';
 
-    xhr.onreadystatechange = function () {
-      if (xhr.readyState !== 4) {
-        return;
-      }
+		xhr.onreadystatechange = function () {
+			if (xhr.readyState !== 4) {
+				return;
+			}
 
-      var ok = xhr.status >= 200 && xhr.status < 300;
-      if (!ok) {
-        setTimeout(function () {
-          reject(new TypeError('Failed to fetch (url: "' + url + '")'));
-        }, 0);
-      }
-    };
+			var ok = xhr.status >= 200 && xhr.status < 300;
+			if (!ok) {
+				setTimeout(function () {
+					reject(new TypeError('Failed to fetch (url: "' + url + '")'));
+				}, 0);
+			}
+		};
 
-    xhr.onload = function () {
-      var ok = xhr.status >= 200 && xhr.status < 300;
-      if (ok) {
-        resolve(xhr.response);
-      }
-    };
+		xhr.onload = function () {
+			var ok = xhr.status >= 200 && xhr.status < 300;
+			if (ok) {
+				resolve(xhr.response);
+			}
+		};
 
-    xhr.onerror = function () {
-      setTimeout(function () {
-        reject(new TypeError('Network request failed (url: "' + url + '")'));
-      }, 0);
-    };
+		xhr.onerror = function () {
+			setTimeout(function () {
+				reject(new TypeError('Network request failed (url: "' + url + '")'));
+			}, 0);
+		};
 
-    xhr.ontimeout = function () {
-      setTimeout(function () {
-        reject(new TypeError('Network request failed (url: "' + url + '")'));
-      }, 0);
-    };
+		xhr.ontimeout = function () {
+			setTimeout(function () {
+				reject(new TypeError('Network request failed (url: "' + url + '")'));
+			}, 0);
+		};
 
-    xhr.send();
-  });
+		xhr.send();
+	});
 };
 
 function URLBrowserResolver(fs) {
-  this.fs = fs;
-  this.resolving = {};
+	this.fs = fs;
+	this.resolving = {};
 }
 
 URLBrowserResolver.prototype.resolve = function (url) {
-  if (!this.resolving[url]) {
-    var _this = this;
-    this.resolving[url] = new Promise(function (resolve, reject) {
-      if (url.toLowerCase().indexOf('https://') === 0 || url.toLowerCase().indexOf('http://') === 0) {
-        fetchUrl(url).then(function (buffer) {
-          _this.fs.writeFileSync(url, buffer);
-          resolve();
-        }, function (result) {
-          reject(result);
-        });
-      } else {
-        // cannot be resolved
-        resolve();
-      }
-    });
-  }
+	if (!this.resolving[url]) {
+		var _this = this;
+		this.resolving[url] = new Promise(function (resolve, reject) {
+			if (url.toLowerCase().indexOf('https://') === 0 || url.toLowerCase().indexOf('http://') === 0) {
+				fetchUrl(url).then(function (buffer) {
+					_this.fs.writeFileSync(url, buffer);
+					resolve();
+				}, function (result) {
+					reject(result);
+				});
+			} else {
+				// cannot be resolved
+				resolve();
+			}
+		});
+	}
 
-  return this.resolving[url];
+	return this.resolving[url];
 }
 
 URLBrowserResolver.prototype.resolved = function () {
-  var _this = this;
-  return new Promise(function (resolve, reject) {
-    Promise.all(Object.values(_this.resolving)).then(function () {
-      resolve();
-    }, function (result) {
-      reject(result);
-    });
-  });
+	var _this = this;
+	return new Promise(function (resolve, reject) {
+		Promise.all(Object.values(_this.resolving)).then(function () {
+			resolve();
+		}, function (result) {
+			reject(result);
+		});
+	});
 }
 
 module.exports = URLBrowserResolver;

package/src/browser-extensions/pdfMake.js

@@ -67,6 +67,14 @@ Document.prototype._createDoc = function (options, cb) {
 		}
 	}
 
+	if (this.docDefinition.images) {
+		for (var image in this.docDefinition.images) {
+			if (this.docDefinition.images.hasOwnProperty(image)) {
+				urlResolver.resolve(this.docDefinition.images[image]);
+			}
+		}
+	}
+
 	var _this = this;
 
 	urlResolver.resolved().then(function () {

package/src/browser-extensions/virtual-fs.js

@@ -5,6 +5,12 @@ function VirtualFileSystem() {
 	this.dataSystem = {};
 }
 
+VirtualFileSystem.prototype.existsSync = function (filename) {
+	filename = fixFilename(filename);
+	return typeof this.fileSystem[filename] !== 'undefined'
+		|| typeof this.dataSystem[filename] !== 'undefined';
+}
+
 VirtualFileSystem.prototype.readFileSync = function (filename, options) {
 	filename = fixFilename(filename);
 

package/src/imageMeasure.js

@@ -1,5 +1,7 @@
 'use strict';
 
+var fs = require('fs');
+
 function ImageMeasure(pdfKitDoc, imageDictionary) {
 	this.pdfKitDoc = pdfKitDoc;
 	this.imageDictionary = imageDictionary || {};
@@ -33,6 +35,10 @@ ImageMeasure.prototype.measureImage = function (src) {
 			return src;
 		}
 
+		if (fs.existsSync(img)) {
+			return fs.readFileSync(img);
+		}
+
 		var index = img.indexOf('base64,');
 		if (index < 0) {
 			return that.imageDictionary[src];