pdfmake 0.3.0-beta.9 → 0.3.0

package/js/TableProcessor.js

@@ -113,13 +113,18 @@ class TableProcessor {
       }
     }
     this.dontBreakRows = tableNode.table.dontBreakRows || false;
-    if (this.rowsWithoutPageBreak) {
+    if (this.rowsWithoutPageBreak || this.dontBreakRows) {
       writer.beginUnbreakableBlock();
+      // Draw the top border of the table
+      this.drawHorizontalLine(0, writer);
+      if (this.rowsWithoutPageBreak && this.dontBreakRows) {
+        // We just increase the value of transactionLevel
+        writer.beginUnbreakableBlock();
+      }
     }
 
     // update the border properties of all cells before drawing any lines
     prepareCellBorders(this.tableNode.table.body);
-    this.drawHorizontalLine(0, writer);
   }
   onRowBreak(rowIndex, writer) {
     return () => {
@@ -135,7 +140,12 @@ class TableProcessor {
     this.rowPaddingBottom = this.layout.paddingBottom(rowIndex, this.tableNode);
     this.rowCallback = this.onRowBreak(rowIndex, writer);
     writer.addListener('pageChanged', this.rowCallback);
-    if (this.dontBreakRows) {
+    if (rowIndex == 0 && !this.dontBreakRows && !this.rowsWithoutPageBreak) {
+      // We store the 'y' to draw later and if necessary the top border of the table
+      this._tableTopBorderY = writer.context().y;
+      writer.context().moveDown(this.topLineWidth);
+    }
+    if (this.dontBreakRows && rowIndex > 0) {
       writer.beginUnbreakableBlock();
     }
     this.rowTopY = writer.context().y;
@@ -143,7 +153,7 @@ class TableProcessor {
     writer.context().availableHeight -= this.reservedAtBottom;
     writer.context().moveDown(this.rowPaddingTop);
   }
-  drawHorizontalLine(lineIndex, writer, overrideY) {
+  drawHorizontalLine(lineIndex, writer, overrideY, moveDown = true, forcePage) {
     let lineWidth = this.layout.hLineWidth(lineIndex, this.tableNode);
     if (lineWidth) {
       let style = this.layout.hLineStyle(lineIndex, this.tableNode);
@@ -237,7 +247,7 @@ class TableProcessor {
               lineWidth: lineWidth,
               dash: dash,
               lineColor: borderColor
-            }, false, overrideY);
+            }, false, (0, _variableType.isNumber)(overrideY), null, forcePage);
             currentLine = null;
             borderColor = null;
             cellAbove = null;
@@ -246,7 +256,9 @@ class TableProcessor {
           }
         }
       }
-      writer.context().moveDown(lineWidth);
+      if (moveDown) {
+        writer.context().moveDown(lineWidth);
+      }
     }
   }
   drawVerticalLine(x, y0, y1, vLineColIndex, writer, vLineRowIndex, beforeVLineColIndex) {
@@ -369,6 +381,15 @@ class TableProcessor {
     }
     ys[ys.length - 1].y1 = endingY;
     let skipOrphanePadding = ys[0].y1 - ys[0].y0 === this.rowPaddingTop;
+    if (rowIndex === 0 && !skipOrphanePadding && !this.rowsWithoutPageBreak && !this.dontBreakRows) {
+      // Draw the top border of the table
+      let pageTableStartedAt = null;
+      if (pageBreaks && pageBreaks.length > 0) {
+        // Get the page where table started at
+        pageTableStartedAt = pageBreaks[0].prevPage;
+      }
+      this.drawHorizontalLine(0, writer, this._tableTopBorderY, false, pageTableStartedAt);
+    }
     for (let yi = skipOrphanePadding ? 1 : 0, yl = ys.length; yi < yl; yi++) {
       let willBreak = yi < ys.length - 1;
       let rowBreakWithoutHeader = yi > 0 && !this.headerRows;
@@ -385,6 +406,14 @@ class TableProcessor {
         // TableProcessor should be pageChanged listener, instead of processRow
         this.reservedAtBottom = 0;
       }
+
+      // Draw horizontal lines before the vertical lines so they are not overridden
+      if (willBreak && this.layout.hLineWhenBroken !== false) {
+        this.drawHorizontalLine(rowIndex + 1, writer, y2);
+      }
+      if (rowBreakWithoutHeader && this.layout.hLineWhenBroken !== false) {
+        this.drawHorizontalLine(rowIndex, writer, y1);
+      }
       for (let i = 0, l = xs.length; i < l; i++) {
         let leftCellBorder = false;
         let rightCellBorder = false;
@@ -447,7 +476,9 @@ class TableProcessor {
                 h: bgHeight,
                 lineWidth: 0,
                 color: fillColor,
-                fillOpacity: fillOpacity
+                fillOpacity: fillOpacity,
+                // mark if we are in an unbreakable block
+                _isFillColorFromUnbreakable: !!writer.transactionLevel
               }, false, true, writer.context().backgroundLength[writer.context().page]);
             }
             if (overlayPattern) {
@@ -465,12 +496,6 @@ class TableProcessor {
           }
         }
       }
-      if (willBreak && this.layout.hLineWhenBroken !== false) {
-        this.drawHorizontalLine(rowIndex + 1, writer, y2);
-      }
-      if (rowBreakWithoutHeader && this.layout.hLineWhenBroken !== false) {
-        this.drawHorizontalLine(rowIndex, writer, y1);
-      }
     }
     writer.context().page = endingPage;
     writer.context().y = endingY;
@@ -503,7 +528,8 @@ class TableProcessor {
     }
     if (this.dontBreakRows) {
       const pageChangedCallback = () => {
-        if (!this.headerRows && this.layout.hLineWhenBroken !== false) {
+        if (rowIndex > 0 && !this.headerRows && this.layout.hLineWhenBroken !== false) {
+          // Draw the top border of the row after a page break
           this.drawHorizontalLine(rowIndex, writer);
         }
       };

package/js/TextBreaker.js

@@ -2,23 +2,49 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _linebreak = _interopRequireDefault(require("@foliojs-fork/linebreak"));
+var _linebreak = _interopRequireDefault(require("linebreak"));
 var _variableType = require("./helpers/variableType");
 var _StyleContextStack = _interopRequireDefault(require("./StyleContextStack"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * @param {string} text
  * @param {boolean} noWrap
+ * @param {boolean} breakAll
  * @returns {Array}
  */
-const splitWords = (text, noWrap) => {
+const splitWords = (text, noWrap, breakAll = false) => {
   let words = [];
+  if (text === undefined || text === null) {
+    text = '';
+  } else {
+    text = String(text);
+  }
   if (noWrap) {
     words.push({
       text: text
     });
     return words;
   }
+  if (breakAll) {
+    return text.split('').map(c => {
+      if (c.match(/^\n$|^\r$/)) {
+        // new line
+        return {
+          text: '',
+          lineEnd: true
+        };
+      }
+      return {
+        text: c
+      };
+    });
+  }
+  if (text.length === 0) {
+    words.push({
+      text: ''
+    });
+    return words;
+  }
   let breaker = new _linebreak.default(text);
   let last = 0;
   let bk;
@@ -101,15 +127,16 @@ class TextBreaker {
       let item = texts[i];
       let style = null;
       let words;
+      let breakAll = _StyleContextStack.default.getStyleProperty(item || {}, styleContextStack, 'wordBreak', 'normal') === 'break-all';
       let noWrap = _StyleContextStack.default.getStyleProperty(item || {}, styleContextStack, 'noWrap', false);
       if ((0, _variableType.isObject)(item)) {
         if (item._textRef && item._textRef._textNodeRef.text) {
           item.text = item._textRef._textNodeRef.text;
         }
-        words = splitWords(item.text, noWrap);
+        words = splitWords(item.text, noWrap, breakAll);
         style = _StyleContextStack.default.copyStyle(item);
       } else {
-        words = splitWords(item, noWrap);
+        words = splitWords(item, noWrap, breakAll);
       }
       if (lastWord && words.length) {
         let firstWord = getFirstWord(words, noWrap);

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

@@ -2,72 +2,42 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _http = _interopRequireDefault(require("http"));
-var _https = _interopRequireDefault(require("https"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const fetchUrl = (url, headers = {}) => {
-  return new Promise((resolve, reject) => {
-    const parsedUrl = new URL(url);
-    const h = parsedUrl.protocol === 'https:' ? _https.default : _http.default;
-    let options = {
-      headers: headers
-    };
-    h.get(url, options, res => {
-      if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
-        // redirect url
-        fetchUrl(res.headers.location).then(buffer => {
-          resolve(buffer);
-        }, result => {
-          reject(result);
-        });
-        return;
-      }
-      const ok = res.statusCode >= 200 && res.statusCode < 300;
-      if (!ok) {
-        reject(new TypeError(`Failed to fetch (status code: ${res.statusCode}, url: "${url}")`));
-      }
-      const chunks = [];
-      res.on('end', () => resolve(Buffer.concat(chunks)));
-      res.on('data', d => chunks.push(d));
-    }).on('error', reject);
-  });
-};
+async function fetchUrl(url, headers = {}) {
+  try {
+    const response = await fetch(url, {
+      headers
+    });
+    if (!response.ok) {
+      throw new Error(`Failed to fetch (status code: ${response.status}, url: "${url}")`);
+    }
+    return await response.arrayBuffer();
+  } catch (error) {
+    throw new Error(`Network request failed (url: "${url}", error: ${error.message})`);
+  }
+}
 class URLResolver {
   constructor(fs) {
     this.fs = fs;
     this.resolving = {};
   }
   resolve(url, headers = {}) {
-    if (!this.resolving[url]) {
-      this.resolving[url] = new Promise((resolve, reject) => {
-        if (url.toLowerCase().indexOf('https://') === 0 || url.toLowerCase().indexOf('http://') === 0) {
-          if (this.fs.existsSync(url)) {
-            // url was downloaded earlier
-            resolve();
-          } else {
-            fetchUrl(url, headers).then(buffer => {
-              this.fs.writeFileSync(url, buffer);
-              resolve();
-            }, result => {
-              reject(result);
-            });
-          }
-        } else {
-          // cannot be resolved
-          resolve();
+    const resolveUrlInternal = async () => {
+      if (url.toLowerCase().startsWith('https://') || url.toLowerCase().startsWith('http://')) {
+        if (this.fs.existsSync(url)) {
+          return; // url was downloaded earlier
         }
-      });
+        const buffer = await fetchUrl(url, headers);
+        this.fs.writeFileSync(url, buffer);
+      }
+      // else cannot be resolved
+    };
+    if (!this.resolving[url]) {
+      this.resolving[url] = resolveUrlInternal();
     }
     return this.resolving[url];
   }
   resolved() {
-    return new Promise((resolve, reject) => {
-      Promise.all(Object.values(this.resolving)).then(() => {
-        resolve();
-      }, result => {
-        reject(result);
-      });
-    });
+    return Promise.all(Object.values(this.resolving));
   }
 }
 var _default = exports.default = URLResolver;

package/js/base.js

@@ -20,7 +20,7 @@ class pdfmake {
   createPdf(docDefinition, options = {}) {
     options.progressCallback = this.progressCallback;
     options.tableLayouts = this.tableLayouts;
-    let printer = new _Printer.default(this.fonts, this.virtualfs, this.urlResolver);
+    let printer = new _Printer.default(this.fonts, this.virtualfs, this.urlResolver());
     const pdfDocumentPromise = printer.createPdfKitDocument(docDefinition, options);
     return this._transformToDocument(pdfDocumentPromise);
   }

package/js/browser-extensions/OutputDocumentBrowser.js

@@ -21,20 +21,10 @@ class OutputDocumentBrowser extends _OutputDocument.default {
   /**
    * @returns {Promise<Blob>}
    */
-  getBlob() {
-    return new Promise((resolve, reject) => {
-      this.getBuffer().then(buffer => {
-        try {
-          let blob = new Blob([buffer], {
-            type: 'application/pdf'
-          });
-          resolve(blob);
-        } catch (e) {
-          reject(e);
-        }
-      }, result => {
-        reject(result);
-      });
+  async getBlob() {
+    const buffer = await this.getBuffer();
+    return new Blob([buffer], {
+      type: 'application/pdf'
     });
   }
 
@@ -42,77 +32,50 @@ class OutputDocumentBrowser extends _OutputDocument.default {
    * @param {string} filename
    * @returns {Promise}
    */
-  download(filename = 'file.pdf') {
-    return new Promise((resolve, reject) => {
-      this.getBlob().then(blob => {
-        try {
-          (0, _fileSaver.saveAs)(blob, filename);
-          resolve();
-        } catch (e) {
-          reject(e);
-        }
-      }, result => {
-        reject(result);
-      });
-    });
+  async download(filename = 'file.pdf') {
+    const blob = await this.getBlob();
+    (0, _fileSaver.saveAs)(blob, filename);
   }
 
   /**
    * @param {Window} win
    * @returns {Promise}
    */
-  open(win = null) {
-    return new Promise((resolve, reject) => {
-      if (!win) {
-        win = openWindow();
-      }
-      this.getBlob().then(blob => {
-        try {
-          let urlCreator = window.URL || window.webkitURL;
-          let pdfUrl = urlCreator.createObjectURL(blob);
-          win.location.href = pdfUrl;
+  async open(win = null) {
+    if (!win) {
+      win = openWindow();
+    }
+    const blob = await this.getBlob();
+    try {
+      let urlCreator = window.URL || window.webkitURL;
+      let pdfUrl = urlCreator.createObjectURL(blob);
+      win.location.href = pdfUrl;
 
-          //
-          resolve();
-          /* temporarily disabled
-          if (win === window) {
-          	resolve();
-          } else {
-          	setTimeout(() => {
-          		if (win.window === null) { // is closed by AdBlock
-          			window.location.href = pdfUrl; // open in actual window
-          		}
-          		resolve();
-          	}, 500);
-          }
-          */
-        } catch (e) {
-          win.close();
-          reject(e);
-        }
-      }, result => {
-        reject(result);
-      });
-    });
+      /* temporarily disabled
+      if (win === window) {
+      	return;
+      } else {
+      	setTimeout(() => {
+      		if (win.window === null) { // is closed by AdBlock
+      			window.location.href = pdfUrl; // open in actual window
+      		}
+      		return;
+      	}, 500);
+      }
+      */
+    } finally {
+      win.close();
+    }
   }
 
   /**
    * @param {Window} win
    * @returns {Promise}
    */
-  print(win = null) {
-    return new Promise((resolve, reject) => {
-      this.getStream().then(stream => {
-        stream.setOpenActionAsPrint();
-        return this.open(win).then(() => {
-          resolve();
-        }, result => {
-          reject(result);
-        });
-      }, result => {
-        reject(result);
-      });
-    });
+  async print(win = null) {
+    const stream = await this.getStream();
+    stream.setOpenActionAsPrint();
+    await this.open(win);
   }
 }
 var _default = exports.default = OutputDocumentBrowser;

package/js/browser-extensions/index.js

@@ -4,7 +4,7 @@ exports.__esModule = true;
 exports.default = void 0;
 var _base = _interopRequireDefault(require("../base"));
 var _OutputDocumentBrowser = _interopRequireDefault(require("./OutputDocumentBrowser"));
-var _URLBrowserResolver = _interopRequireDefault(require("./URLBrowserResolver"));
+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 +23,7 @@ let defaultClientFonts = {
 class pdfmake extends _base.default {
   constructor() {
     super();
-    this.urlResolver = new _URLBrowserResolver.default(this.virtualfs);
+    this.urlResolver = () => new _URLResolver.default(this.virtualfs);
     this.fonts = defaultClientFonts;
   }
   addFontContainer(fontContainer) {

package/js/browser-extensions/pdfMake.js

@@ -1,15 +1,3 @@
 "use strict";
 
-const isBrowserSupported = () => {
-  if (typeof window === 'undefined' || typeof window.navigator === 'undefined') {
-    // Enviroment is not browser.
-    return true;
-  }
-
-  // Internet Explorer 10 and older is not supported.
-  return window.navigator.userAgent.indexOf("MSIE") === -1;
-};
-if (!isBrowserSupported()) {
-  throw new Error('pdfmake: Internet Explorer 10 and older is not supported. Upgrade to version 11 or use modern browser.');
-}
 module.exports = require('./index').default;

package/js/browser-extensions/standard-fonts/Courier.js

@@ -4,19 +4,19 @@ var fs = require('fs');
 var fontContainer = {
   vfs: {
     'data/Courier.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Courier.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Courier.afm', 'utf8'),
       encoding: 'utf8'
     },
     'data/Courier-Bold.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Courier-Bold.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Courier-Bold.afm', 'utf8'),
       encoding: 'utf8'
     },
     'data/Courier-Oblique.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Courier-Oblique.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Courier-Oblique.afm', 'utf8'),
       encoding: 'utf8'
     },
     'data/Courier-BoldOblique.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Courier-BoldOblique.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Courier-BoldOblique.afm', 'utf8'),
       encoding: 'utf8'
     }
   },

package/js/browser-extensions/standard-fonts/Helvetica.js

@@ -4,19 +4,19 @@ var fs = require('fs');
 var fontContainer = {
   vfs: {
     'data/Helvetica.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Helvetica.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Helvetica.afm', 'utf8'),
       encoding: 'utf8'
     },
     'data/Helvetica-Bold.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Helvetica-Bold.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Helvetica-Bold.afm', 'utf8'),
       encoding: 'utf8'
     },
     'data/Helvetica-Oblique.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Helvetica-Oblique.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Helvetica-Oblique.afm', 'utf8'),
       encoding: 'utf8'
     },
     'data/Helvetica-BoldOblique.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Helvetica-BoldOblique.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Helvetica-BoldOblique.afm', 'utf8'),
       encoding: 'utf8'
     }
   },

package/js/browser-extensions/standard-fonts/Symbol.js

@@ -4,7 +4,7 @@ var fs = require('fs');
 var fontContainer = {
   vfs: {
     'data/Symbol.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Symbol.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Symbol.afm', 'utf8'),
       encoding: 'utf8'
     }
   },

package/js/browser-extensions/standard-fonts/Times.js

@@ -4,19 +4,19 @@ var fs = require('fs');
 var fontContainer = {
   vfs: {
     'data/Times-Roman.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Times-Roman.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Times-Roman.afm', 'utf8'),
       encoding: 'utf8'
     },
     'data/Times-Bold.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Times-Bold.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Times-Bold.afm', 'utf8'),
       encoding: 'utf8'
     },
     'data/Times-Italic.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Times-Italic.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Times-Italic.afm', 'utf8'),
       encoding: 'utf8'
     },
     'data/Times-BoldItalic.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/Times-BoldItalic.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/Times-BoldItalic.afm', 'utf8'),
       encoding: 'utf8'
     }
   },

package/js/browser-extensions/standard-fonts/ZapfDingbats.js

@@ -4,7 +4,7 @@ var fs = require('fs');
 var fontContainer = {
   vfs: {
     'data/ZapfDingbats.afm': {
-      data: fs.readFileSync(__dirname + '/../../../node_modules/@foliojs-fork/pdfkit/js/data/ZapfDingbats.afm', 'utf8'),
+      data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/ZapfDingbats.afm', 'utf8'),
       encoding: 'utf8'
     }
   },

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

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