pdfmake 0.3.0-beta.9 → 0.3.0

package/js/OutputDocument.js

@@ -23,26 +23,24 @@ class OutputDocument {
    * @returns {Promise<Buffer>}
    */
   getBuffer() {
-    if (this.bufferPromise === null) {
-      this.bufferPromise = new Promise((resolve, reject) => {
-        this.getStream().then(stream => {
-          let chunks = [];
-          let result;
-          stream.on('readable', () => {
-            let chunk;
-            while ((chunk = stream.read(this.bufferSize)) !== null) {
-              chunks.push(chunk);
-            }
-          });
-          stream.on('end', () => {
-            result = Buffer.concat(chunks);
-            resolve(result);
-          });
-          stream.end();
-        }, result => {
-          reject(result);
+    const getBufferInternal = async () => {
+      const stream = await this.getStream();
+      return new Promise(resolve => {
+        let chunks = [];
+        stream.on('readable', () => {
+          let chunk;
+          while ((chunk = stream.read(this.bufferSize)) !== null) {
+            chunks.push(chunk);
+          }
+        });
+        stream.on('end', () => {
+          resolve(Buffer.concat(chunks));
         });
+        stream.end();
       });
+    };
+    if (this.bufferPromise === null) {
+      this.bufferPromise = getBufferInternal();
     }
     return this.bufferPromise;
   }
@@ -50,27 +48,17 @@ class OutputDocument {
   /**
    * @returns {Promise<string>}
    */
-  getBase64() {
-    return new Promise((resolve, reject) => {
-      this.getBuffer().then(buffer => {
-        resolve(buffer.toString('base64'));
-      }, result => {
-        reject(result);
-      });
-    });
+  async getBase64() {
+    const buffer = await this.getBuffer();
+    return buffer.toString('base64');
   }
 
   /**
    * @returns {Promise<string>}
    */
-  getDataUrl() {
-    return new Promise((resolve, reject) => {
-      this.getBase64().then(data => {
-        resolve('data:application/pdf;base64,' + data);
-      }, result => {
-        reject(result);
-      });
-    });
+  async getDataUrl() {
+    const data = await this.getBase64();
+    return 'data:application/pdf;base64,' + data;
   }
 }
 var _default = exports.default = OutputDocument;

package/js/OutputDocumentServer.js

@@ -10,17 +10,12 @@ class OutputDocumentServer extends _OutputDocument.default {
    * @param {string} filename
    * @returns {Promise}
    */
-  write(filename) {
-    return new Promise((resolve, reject) => {
-      this.getStream().then(stream => {
-        stream.pipe(_fs.default.createWriteStream(filename));
-        stream.on('end', () => {
-          resolve();
-        });
-        stream.end();
-      }, result => {
-        reject(result);
-      });
+  async write(filename) {
+    const stream = await this.getStream();
+    return new Promise(resolve => {
+      stream.pipe(_fs.default.createWriteStream(filename));
+      stream.on('end', resolve);
+      stream.end();
     });
   }
 }

package/js/PDFDocument.js

@@ -2,7 +2,7 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _pdfkit = _interopRequireDefault(require("@foliojs-fork/pdfkit"));
+var _pdfkit = _interopRequireDefault(require("pdfkit"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const typeName = (bold, italics) => {
   let type = 'normal';

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;
@@ -36,8 +41,8 @@ class PageElementWriter extends _ElementWriter.default {
   addAttachment(attachment, index) {
     return this._fitOnPage(() => super.addAttachment(attachment, index));
   }
-  addVector(vector, ignoreContextX, ignoreContextY, index) {
-    return super.addVector(vector, ignoreContextX, ignoreContextY, index);
+  addVector(vector, ignoreContextX, ignoreContextY, index, forcePage) {
+    return super.addVector(vector, ignoreContextX, ignoreContextY, index, forcePage);
   }
   beginClip(width, height) {
     return super.beginClip(width, height);
@@ -68,6 +73,16 @@ class PageElementWriter extends _ElementWriter.default {
       y: this.context().y
     });
   }
+  addPage(pageSize, pageOrientation, pageMargin, customProperties = {}) {
+    let prevPage = this.page;
+    let prevY = this.y;
+    this.context().addPage((0, _PageSize.normalizePageSize)(pageSize, pageOrientation), (0, _PageSize.normalizePageMargin)(pageMargin), customProperties);
+    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
@@ -45,70 +46,75 @@ class PdfPrinter {
    * @param {object} options
    * @returns {Promise<PDFDocument>} resolved promise return a pdfkit document
    */
-  createPdfKitDocument(docDefinition, options = {}) {
-    return new Promise((resolve, reject) => {
-      this.resolveUrls(docDefinition).then(() => {
-        try {
-          docDefinition.version = docDefinition.version || '1.3';
-          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 || {};
-          let pageSize = (0, _PageSize.normalizePageSize)(docDefinition.pageSize, docDefinition.pageOrientation);
-          let pdfOptions = {
-            size: [pageSize.width, pageSize.height],
-            pdfVersion: docDefinition.version,
-            compress: docDefinition.compress,
-            userPassword: docDefinition.userPassword,
-            ownerPassword: docDefinition.ownerPassword,
-            permissions: docDefinition.permissions,
-            lang: docDefinition.language,
-            fontLayoutCache: typeof options.fontLayoutCache === 'boolean' ? options.fontLayoutCache : true,
-            bufferPages: options.bufferPages || false,
-            autoFirstPage: false,
-            info: createMetadata(docDefinition),
-            font: null
-          };
-          this.pdfKitDoc = new _PDFDocument.default(this.fontDescriptors, docDefinition.images, docDefinition.patterns, docDefinition.attachments, pdfOptions, this.virtualfs);
-          embedFiles(docDefinition, this.pdfKitDoc);
-          const builder = new _LayoutBuilder.default(pageSize, (0, _PageSize.normalizePageMargin)(docDefinition.pageMargins), new _SVGMeasure.default());
-          builder.registerTableLayouts(_tableLayouts.tableLayouts);
-          if (options.tableLayouts) {
-            builder.registerTableLayouts(options.tableLayouts);
-          }
-          let pages = builder.layoutDocument(docDefinition.content, this.pdfKitDoc, docDefinition.styles || {}, docDefinition.defaultStyle || {
-            fontSize: 12,
-            font: 'Roboto'
-          }, docDefinition.background, docDefinition.header, docDefinition.footer, docDefinition.watermark, docDefinition.pageBreakBefore);
-          let maxNumberPages = docDefinition.maxPagesNumber || -1;
-          if ((0, _variableType.isNumber)(maxNumberPages) && maxNumberPages > -1) {
-            pages = pages.slice(0, maxNumberPages);
-          }
+  async createPdfKitDocument(docDefinition, options = {}) {
+    await this.resolveUrls(docDefinition);
+    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,
+      permissions: docDefinition.permissions,
+      lang: docDefinition.language,
+      fontLayoutCache: typeof options.fontLayoutCache === 'boolean' ? options.fontLayoutCache : true,
+      bufferPages: options.bufferPages || false,
+      autoFirstPage: false,
+      info: createMetadata(docDefinition),
+      font: null
+    };
+    this.pdfKitDoc = new _PDFDocument.default(this.fontDescriptors, docDefinition.images, docDefinition.patterns, docDefinition.attachments, pdfOptions, this.virtualfs);
+    embedFiles(docDefinition, this.pdfKitDoc);
+    const builder = new _LayoutBuilder.default(pageSize, (0, _PageSize.normalizePageMargin)(docDefinition.pageMargins), new _SVGMeasure.default());
+    builder.registerTableLayouts(_tableLayouts.tableLayouts);
+    if (options.tableLayouts) {
+      builder.registerTableLayouts(options.tableLayouts);
+    }
+    let pages = builder.layoutDocument(docDefinition.content, this.pdfKitDoc, docDefinition.styles || {}, docDefinition.defaultStyle || {
+      fontSize: 12,
+      font: 'Roboto'
+    }, docDefinition.background, docDefinition.header, docDefinition.footer, docDefinition.watermark, docDefinition.pageBreakBefore);
+    let maxNumberPages = docDefinition.maxPagesNumber || -1;
+    if ((0, _variableType.isNumber)(maxNumberPages) && maxNumberPages > -1) {
+      pages = pages.slice(0, maxNumberPages);
+    }
 
-          // if pageSize.height is set to Infinity, calculate the actual height of the page that
-          // was laid out using the height of each of the items in the page.
-          if (pageSize.height === Infinity) {
-            let pageHeight = calculatePageHeight(pages, docDefinition.pageMargins);
-            this.pdfKitDoc.options.size = [pageSize.width, pageHeight];
-          }
-          const renderer = new _Renderer.default(this.pdfKitDoc, options.progressCallback);
-          renderer.renderPages(pages);
-          resolve(this.pdfKitDoc);
-        } catch (e) {
-          reject(e);
-        }
-      }, result => {
-        reject(result);
+    // if pageSize.height is set to Infinity, calculate the actual height of the page that
+    // was laid out using the height of each of the items in the page.
+    if (pageSize.height === Infinity) {
+      let pageHeight = calculatePageHeight(pages, docDefinition.pageMargins);
+      pages.forEach(page => {
+        page.pageSize.height = pageHeight;
       });
-    });
+    }
+    const renderer = new _Renderer.default(this.pdfKitDoc, options.progressCallback);
+    renderer.renderPages(pages);
+    return this.pdfKitDoc;
   }
 
   /**
    * @param {object} docDefinition
    * @returns {Promise}
    */
-  resolveUrls(docDefinition) {
+  async resolveUrls(docDefinition) {
     const getExtendedUrl = url => {
       if (typeof url === 'object') {
         return {
@@ -121,95 +127,89 @@ class PdfPrinter {
         headers: {}
       };
     };
-    return new Promise((resolve, reject) => {
-      if (this.urlResolver === null) {
-        resolve();
-      }
-      for (let font in this.fontDescriptors) {
-        if (this.fontDescriptors.hasOwnProperty(font)) {
-          if (this.fontDescriptors[font].normal) {
-            if (Array.isArray(this.fontDescriptors[font].normal)) {
-              // TrueType Collection
-              let url = getExtendedUrl(this.fontDescriptors[font].normal[0]);
-              this.urlResolver.resolve(url.url, url.headers);
-              this.fontDescriptors[font].normal[0] = url.url;
-            } else {
-              let url = getExtendedUrl(this.fontDescriptors[font].normal);
-              this.urlResolver.resolve(url.url, url.headers);
-              this.fontDescriptors[font].normal = url.url;
-            }
-          }
-          if (this.fontDescriptors[font].bold) {
-            if (Array.isArray(this.fontDescriptors[font].bold)) {
-              // TrueType Collection
-              let url = getExtendedUrl(this.fontDescriptors[font].bold[0]);
-              this.urlResolver.resolve(url.url, url.headers);
-              this.fontDescriptors[font].bold[0] = url.url;
-            } else {
-              let url = getExtendedUrl(this.fontDescriptors[font].bold);
-              this.urlResolver.resolve(url.url, url.headers);
-              this.fontDescriptors[font].bold = url.url;
-            }
-          }
-          if (this.fontDescriptors[font].italics) {
-            if (Array.isArray(this.fontDescriptors[font].italics)) {
-              // TrueType Collection
-              let url = getExtendedUrl(this.fontDescriptors[font].italics[0]);
-              this.urlResolver.resolve(url.url, url.headers);
-              this.fontDescriptors[font].italics[0] = url.url;
-            } else {
-              let url = getExtendedUrl(this.fontDescriptors[font].italics);
-              this.urlResolver.resolve(url.url, url.headers);
-              this.fontDescriptors[font].italics = url.url;
-            }
-          }
-          if (this.fontDescriptors[font].bolditalics) {
-            if (Array.isArray(this.fontDescriptors[font].bolditalics)) {
-              // TrueType Collection
-              let url = getExtendedUrl(this.fontDescriptors[font].bolditalics[0]);
-              this.urlResolver.resolve(url.url, url.headers);
-              this.fontDescriptors[font].bolditalics[0] = url.url;
-            } else {
-              let url = getExtendedUrl(this.fontDescriptors[font].bolditalics);
-              this.urlResolver.resolve(url.url, url.headers);
-              this.fontDescriptors[font].bolditalics = url.url;
-            }
+    if (this.urlResolver === null) {
+      return;
+    }
+    for (let font in this.fontDescriptors) {
+      if (this.fontDescriptors.hasOwnProperty(font)) {
+        if (this.fontDescriptors[font].normal) {
+          if (Array.isArray(this.fontDescriptors[font].normal)) {
+            // TrueType Collection
+            let url = getExtendedUrl(this.fontDescriptors[font].normal[0]);
+            this.urlResolver.resolve(url.url, url.headers);
+            this.fontDescriptors[font].normal[0] = url.url;
+          } else {
+            let url = getExtendedUrl(this.fontDescriptors[font].normal);
+            this.urlResolver.resolve(url.url, url.headers);
+            this.fontDescriptors[font].normal = url.url;
           }
         }
-      }
-      if (docDefinition.images) {
-        for (let image in docDefinition.images) {
-          if (docDefinition.images.hasOwnProperty(image)) {
-            let url = getExtendedUrl(docDefinition.images[image]);
+        if (this.fontDescriptors[font].bold) {
+          if (Array.isArray(this.fontDescriptors[font].bold)) {
+            // TrueType Collection
+            let url = getExtendedUrl(this.fontDescriptors[font].bold[0]);
+            this.urlResolver.resolve(url.url, url.headers);
+            this.fontDescriptors[font].bold[0] = url.url;
+          } else {
+            let url = getExtendedUrl(this.fontDescriptors[font].bold);
             this.urlResolver.resolve(url.url, url.headers);
-            docDefinition.images[image] = url.url;
+            this.fontDescriptors[font].bold = url.url;
           }
         }
-      }
-      if (docDefinition.attachments) {
-        for (let attachment in docDefinition.attachments) {
-          if (docDefinition.attachments.hasOwnProperty(attachment) && docDefinition.attachments[attachment].src) {
-            let url = getExtendedUrl(docDefinition.attachments[attachment].src);
+        if (this.fontDescriptors[font].italics) {
+          if (Array.isArray(this.fontDescriptors[font].italics)) {
+            // TrueType Collection
+            let url = getExtendedUrl(this.fontDescriptors[font].italics[0]);
             this.urlResolver.resolve(url.url, url.headers);
-            docDefinition.attachments[attachment].src = url.url;
+            this.fontDescriptors[font].italics[0] = url.url;
+          } else {
+            let url = getExtendedUrl(this.fontDescriptors[font].italics);
+            this.urlResolver.resolve(url.url, url.headers);
+            this.fontDescriptors[font].italics = url.url;
           }
         }
-      }
-      if (docDefinition.files) {
-        for (let file in docDefinition.files) {
-          if (docDefinition.files.hasOwnProperty(file) && docDefinition.files[file].src) {
-            let url = getExtendedUrl(docDefinition.files[file].src);
+        if (this.fontDescriptors[font].bolditalics) {
+          if (Array.isArray(this.fontDescriptors[font].bolditalics)) {
+            // TrueType Collection
+            let url = getExtendedUrl(this.fontDescriptors[font].bolditalics[0]);
             this.urlResolver.resolve(url.url, url.headers);
-            docDefinition.files[file].src = url.url;
+            this.fontDescriptors[font].bolditalics[0] = url.url;
+          } else {
+            let url = getExtendedUrl(this.fontDescriptors[font].bolditalics);
+            this.urlResolver.resolve(url.url, url.headers);
+            this.fontDescriptors[font].bolditalics = url.url;
           }
         }
       }
-      this.urlResolver.resolved().then(() => {
-        resolve();
-      }, result => {
-        reject(result);
-      });
-    });
+    }
+    if (docDefinition.images) {
+      for (let image in docDefinition.images) {
+        if (docDefinition.images.hasOwnProperty(image)) {
+          let url = getExtendedUrl(docDefinition.images[image]);
+          this.urlResolver.resolve(url.url, url.headers);
+          docDefinition.images[image] = url.url;
+        }
+      }
+    }
+    if (docDefinition.attachments) {
+      for (let attachment in docDefinition.attachments) {
+        if (docDefinition.attachments.hasOwnProperty(attachment) && docDefinition.attachments[attachment].src) {
+          let url = getExtendedUrl(docDefinition.attachments[attachment].src);
+          this.urlResolver.resolve(url.url, url.headers);
+          docDefinition.attachments[attachment].src = url.url;
+        }
+      }
+    }
+    if (docDefinition.files) {
+      for (let file in docDefinition.files) {
+        if (docDefinition.files.hasOwnProperty(file) && docDefinition.files[file].src) {
+          let url = getExtendedUrl(docDefinition.files[file].src);
+          this.urlResolver.resolve(url.url, url.headers);
+          docDefinition.files[file].src = url.url;
+        }
+      }
+    }
+    await this.urlResolver.resolved();
   }
 }
 function createMetadata(docDefinition) {

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/StyleContextStack.js

@@ -64,6 +64,10 @@ class StyleContextStack {
     if ((0, _variableType.isString)(item)) {
       return 0;
     }
+    if (typeof item.section !== 'undefined') {
+      // section node not support style overrides
+      return 0;
+    }
     let styleNames = [];
     if (item.style) {
       if (Array.isArray(item.style)) {