pdfmake 0.3.0-beta.11 → 0.3.0-beta.13

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
@@ -50,15 +51,27 @@ class PdfPrinter {
       this.resolveUrls(docDefinition).then(() => {
         try {
           docDefinition.version = docDefinition.version || '1.3';
+          docDefinition.subset = docDefinition.subset || undefined;
+          docDefinition.tagged = typeof docDefinition.tagged === 'boolean' ? docDefinition.tagged : false;
+          docDefinition.displayTitle = typeof docDefinition.displayTitle === 'boolean' ? docDefinition.displayTitle : false;
           docDefinition.compress = typeof docDefinition.compress === 'boolean' ? docDefinition.compress : true;
           docDefinition.images = docDefinition.images || {};
           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],
             pdfVersion: docDefinition.version,
+            subset: docDefinition.subset,
+            tagged: docDefinition.tagged,
+            displayTitle: docDefinition.displayTitle,
             compress: docDefinition.compress,
             userPassword: docDefinition.userPassword,
             ownerPassword: docDefinition.ownerPassword,

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];
@@ -329,6 +328,23 @@ class Renderer {
       return fontFile;
     };
     (0, _svgToPdfkit.default)(this.pdfDocument, svg.svg, svg.x, svg.y, options);
+    if (svg.link) {
+      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.annotate(svg.x, svg.y, svg._width, svg._height, {
+        Subtype: 'Link',
+        Dest: [svg.linkToPage - 1, 'XYZ', null, null, null]
+      });
+    }
+    if (svg.linkToDestination) {
+      this.pdfDocument.goTo(svg.x, svg.y, svg._width, svg._height, svg.linkToDestination);
+    }
   }
   renderAttachment(attachment) {
     const file = this.pdfDocument.provideAttachment(attachment.attachment);
@@ -363,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.11",
+  "version": "0.3.0-beta.13",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "js/index.js",
   "esnext": "src/index.js",
@@ -10,33 +10,33 @@
   },
   "dependencies": {
     "@foliojs-fork/linebreak": "^1.1.2",
-    "@foliojs-fork/pdfkit": "^0.14.0",
+    "@foliojs-fork/pdfkit": "^0.15.2",
     "iconv-lite": "^0.6.3",
     "xmldoc": "^1.3.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.25.6",
-    "@babel/core": "^7.25.2",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.8",
-    "@babel/preset-env": "^7.25.4",
-    "@eslint/js": "^9.9.1",
+    "@babel/cli": "^7.25.9",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
+    "@eslint/js": "^9.14.0",
     "assert": "^2.1.0",
-    "babel-loader": "^9.1.3",
+    "babel-loader": "^9.2.1",
     "brfs": "^2.0.2",
     "browserify-zlib": "^0.2.0",
     "buffer": "6.0.3",
     "core-js": "3.19.0",
-    "eslint": "^9.9.1",
-    "eslint-plugin-jsdoc": "^50.2.2",
+    "eslint": "^9.14.0",
+    "eslint-plugin-jsdoc": "^50.4.3",
     "expose-loader": "^5.0.0",
     "file-saver": "^2.0.5",
-    "globals": "^15.9.0",
-    "mocha": "^10.7.3",
+    "globals": "^15.11.0",
+    "mocha": "^10.8.2",
     "npm-run-all": "^4.1.5",
     "process": "^0.11.10",
     "rewire": "^7.0.0",
     "shx": "^0.3.4",
-    "sinon": "^18.0.0",
+    "sinon": "^19.0.2",
     "source-map-loader": "^5.0.0",
     "stream-browserify": "^3.0.0",
     "string-replace-webpack-plugin": "^0.1.3",
@@ -44,7 +44,7 @@
     "terser-webpack-plugin": "^5.3.10",
     "transform-loader": "^0.2.4",
     "util": "^0.12.5",
-    "webpack": "^5.94.0",
+    "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4"
   },
   "engines": {

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,30 +6,27 @@ 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) {
+	beginColumnGroup(marginXTopParent, bottomByPage = {}) {
 		this.snapshots.push({
 			x: this.x,
 			y: this.y,
 			availableHeight: this.availableHeight,
 			availableWidth: this.availableWidth,
 			page: this.page,
+			bottomByPage: bottomByPage ? bottomByPage : {},
 			bottomMost: {
 				x: this.x,
 				y: this.y,
@@ -46,6 +43,16 @@ class DocumentContext extends EventEmitter {
 		}
 	}
 
+	updateBottomByPage() {
+		const lastSnapshot = this.snapshots[this.snapshots.length - 1];
+		const lastPage = this.page;
+		let previousBottom = -Number.MIN_VALUE;
+		if (lastSnapshot.bottomByPage[lastPage]) {
+			previousBottom = lastSnapshot.bottomByPage[lastPage];
+		}
+		lastSnapshot.bottomByPage[lastPage] = Math.max(previousBottom, this.y);
+	}
+
 	resetMarginXTopParent() {
 		this.marginXTopParent = null;
 	}
@@ -118,6 +125,7 @@ class DocumentContext extends EventEmitter {
 			this.availableHeight -= (y - saved.bottomMost.y);
 		}
 		this.lastColumnWidth = saved.lastColumnWidth;
+		return saved.bottomByPage;
 	}
 
 	addMargin(left, right) {
@@ -232,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());