pdfmake 0.3.0-beta.9 → 0.3.0

package/js/DocMeasure.js

@@ -31,11 +31,16 @@ class DocMeasure {
   measureDocument(docStructure) {
     return this.measureNode(docStructure);
   }
+  measureBlock(node) {
+    return this.measureNode(node);
+  }
   measureNode(node) {
     return this.styleStack.auto(node, () => {
       // TODO: refactor + rethink whether this is the proper way to handle margins
       node._margin = (0, _node.getNodeMargin)(node, this.styleStack);
-      if (node.columns) {
+      if (node.section) {
+        return extendMargins(this.measureSection(node));
+      } else if (node.columns) {
         return extendMargins(this.measureColumns(node));
       } else if (node.stack) {
         return extendMargins(this.measureVerticalContainer(node));
@@ -117,6 +122,14 @@ class DocMeasure {
       width: image.width,
       height: image.height
     };
+
+    // 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;
   }
@@ -415,6 +428,12 @@ class DocMeasure {
     }
     return node;
   }
+  measureSection(node) {
+    // TODO: properties
+
+    node.section = this.measureNode(node.section);
+    return node;
+  }
   measureColumns(node) {
     let columns = node.columns;
     node._gap = this.styleStack.getProperty('columnGap') || 0;

package/js/DocPreprocessor.js

@@ -22,9 +22,15 @@ class DocPreprocessor {
     this.parentNode = null;
     this.tocs = [];
     this.nodeReferences = [];
-    return this.preprocessNode(docStructure);
+    return this.preprocessNode(docStructure, true);
   }
-  preprocessNode(node) {
+  preprocessBlock(node) {
+    this.parentNode = null;
+    this.tocs = [];
+    this.nodeReferences = [];
+    return this.preprocessNode(node);
+  }
+  preprocessNode(node, isSectionAllowed = false) {
     // expand shortcuts and casting values
     if (Array.isArray(node)) {
       node = {
@@ -39,10 +45,15 @@ class DocPreprocessor {
       // cast value in text property
       node.text = convertValueToString(node.text);
     }
-    if (node.columns) {
+    if (node.section) {
+      if (!isSectionAllowed) {
+        throw new Error(`Incorrect document structure, section node is only allowed at the root level of document structure: ${(0, _node.stringifyNode)(node)}`);
+      }
+      return this.preprocessSection(node);
+    } else if (node.columns) {
       return this.preprocessColumns(node);
     } else if (node.stack) {
-      return this.preprocessVerticalContainer(node);
+      return this.preprocessVerticalContainer(node, isSectionAllowed);
     } else if (node.ul) {
       return this.preprocessList(node);
     } else if (node.ol) {
@@ -69,6 +80,10 @@ class DocPreprocessor {
       throw new Error(`Unrecognized document structure: ${(0, _node.stringifyNode)(node)}`);
     }
   }
+  preprocessSection(node) {
+    node.section = this.preprocessNode(node.section);
+    return node;
+  }
   preprocessColumns(node) {
     let columns = node.columns;
     for (let i = 0, l = columns.length; i < l; i++) {
@@ -76,10 +91,10 @@ class DocPreprocessor {
     }
     return node;
   }
-  preprocessVerticalContainer(node) {
+  preprocessVerticalContainer(node, isSectionAllowed) {
     let items = node.stack;
     for (let i = 0, l = items.length; i < l; i++) {
-      items[i] = this.preprocessNode(items[i]);
+      items[i] = this.preprocessNode(items[i], isSectionAllowed);
     }
     return node;
   }

package/js/DocumentContext.js

@@ -9,25 +9,25 @@ 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() {
+  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,
@@ -38,6 +38,21 @@ class DocumentContext extends _events.EventEmitter {
       lastColumnWidth: this.lastColumnWidth
     });
     this.lastColumnWidth = 0;
+    if (marginXTopParent) {
+      this.marginXTopParent = marginXTopParent;
+    }
+  }
+  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;
   }
   beginColumn(width, offset, endingCell) {
     let saved = this.snapshots[this.snapshots.length - 1];
@@ -56,10 +71,10 @@ class DocumentContext extends _events.EventEmitter {
       destContext.bottomMost = bottomMostContext(this, destContext.bottomMost);
     }
   }
-  markEnding(endingCell) {
+  markEnding(endingCell, originalXOffset, discountY) {
     this.page = endingCell._columnEndingContext.page;
-    this.x = endingCell._columnEndingContext.x;
-    this.y = endingCell._columnEndingContext.y;
+    this.x = endingCell._columnEndingContext.x + originalXOffset;
+    this.y = endingCell._columnEndingContext.y - discountY;
     this.availableWidth = endingCell._columnEndingContext.availableWidth;
     this.availableHeight = endingCell._columnEndingContext.availableHeight;
     this.lastColumnWidth = endingCell._columnEndingContext.lastColumnWidth;
@@ -96,6 +111,7 @@ class DocumentContext extends _events.EventEmitter {
       this.availableHeight -= y - saved.bottomMost.y;
     }
     this.lastColumnWidth = saved.lastColumnWidth;
+    return saved.bottomByPage;
   }
   addMargin(left, right) {
     this.x += left;
@@ -109,13 +125,27 @@ class DocumentContext extends _events.EventEmitter {
   initializePage() {
     this.y = this.pageMargins.top;
     this.availableHeight = this.getCurrentPage().pageSize.height - this.pageMargins.top - this.pageMargins.bottom;
-    this.pageSnapshot().availableWidth = this.getCurrentPage().pageSize.width - this.pageMargins.left - this.pageMargins.right;
+    const {
+      pageCtx,
+      isSnapshot
+    } = this.pageSnapshot();
+    pageCtx.availableWidth = this.getCurrentPage().pageSize.width - this.pageMargins.left - this.pageMargins.right;
+    if (isSnapshot && this.marginXTopParent) {
+      pageCtx.availableWidth -= this.marginXTopParent[0];
+      pageCtx.availableWidth -= this.marginXTopParent[1];
+    }
   }
   pageSnapshot() {
     if (this.snapshots[0]) {
-      return this.snapshots[0];
+      return {
+        pageCtx: this.snapshots[0],
+        isSnapshot: true
+      };
     } else {
-      return this;
+      return {
+        pageCtx: this,
+        isSnapshot: false
+      };
     }
   }
   moveTo(x, y) {
@@ -159,12 +189,22 @@ class DocumentContext extends _events.EventEmitter {
     let nextPageIndex = this.page + 1;
     let prevPage = this.page;
     let prevY = this.y;
+
+    // If we are in a column group
+    if (this.snapshots.length > 0) {
+      let lastSnapshot = this.snapshots[this.snapshots.length - 1];
+      // We have to update prevY accordingly by also taking into consideration
+      // the 'y' of cells that don't break page
+      if (lastSnapshot.bottomMost && lastSnapshot.bottomMost.y) {
+        prevY = Math.max(this.y, lastSnapshot.bottomMost.y);
+      }
+    }
     let createNewPage = nextPageIndex >= this.pages.length;
     if (createNewPage) {
       let currentAvailableWidth = this.availableWidth;
       let currentPageOrientation = this.getCurrentPage().pageSize.orientation;
       let pageSize = getPageSize(this.getCurrentPage(), pageOrientation);
-      this.addPage(pageSize);
+      this.addPage(pageSize, null, this.getCurrentPage().customProperties);
       if (currentPageOrientation === pageSize.orientation) {
         this.availableWidth = currentAvailableWidth;
       }
@@ -179,16 +219,23 @@ class DocumentContext extends _events.EventEmitter {
       y: this.y
     };
   }
-  addPage(pageSize) {
+  addPage(pageSize, pageMargin = null, customProperties = {}) {
+    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,
+      customProperties: customProperties
     };
     this.pages.push(page);
     this.backgroundLength.push(0);
     this.page = this.pages.length - 1;
     this.initializePage();
-    this.emit('pageAdded');
+    this.emit('pageAdded', page);
     return page;
   }
   getCurrentPage() {

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;
   }
@@ -204,9 +211,12 @@ class ElementWriter extends _events.EventEmitter {
       });
     }
   }
-  addVector(vector, ignoreContextX, ignoreContextY, index) {
+  addVector(vector, ignoreContextX, ignoreContextY, index, forcePage) {
     let context = this.context();
     let page = context.getCurrentPage();
+    if ((0, _variableType.isNumber)(forcePage)) {
+      page = context.pages[forcePage];
+    }
     let position = this.getCurrentPositionOnPage();
     if (page) {
       (0, _tools.offsetVector)(vector, ignoreContextX ? 0 : context.x, ignoreContextY ? 0 : context.y);
@@ -262,10 +272,21 @@ class ElementWriter extends _events.EventEmitter {
         case 'vector':
           var v = (0, _tools.pack)(item.item);
           (0, _tools.offsetVector)(v, useBlockXOffset ? block.xOffset || 0 : ctx.x, useBlockYOffset ? block.yOffset || 0 : ctx.y);
-          page.items.push({
-            type: 'vector',
-            item: v
-          });
+          if (v._isFillColorFromUnbreakable) {
+            // If the item is a fillColor from an unbreakable block
+            // We have to add it at the beginning of the items body array of the page
+            delete v._isFillColorFromUnbreakable;
+            const endOfBackgroundItemsIndex = ctx.backgroundLength[ctx.page];
+            page.items.splice(endOfBackgroundItemsIndex, 0, {
+              type: 'vector',
+              item: v
+            });
+          } else {
+            page.items.push({
+              type: 'vector',
+              item: v
+            });
+          }
           break;
         case 'image':
         case 'svg':
@@ -292,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) {
@@ -301,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,