pdfmake 0.3.0-beta.1 → 0.3.0-beta.10

package/js/base.js

@@ -2,27 +2,21 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-
 var _Printer = _interopRequireDefault(require("./Printer"));
-
 var _virtualFs = _interopRequireDefault(require("./virtual-fs"));
-
 var _tools = require("./helpers/tools");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class pdfmake {
   constructor() {
     this.virtualfs = _virtualFs.default;
     this.urlResolver = null;
   }
+
   /**
    * @param {object} docDefinition
    * @param {?object} options
    * @returns {object}
    */
-
-
   createPdf(docDefinition, options = {}) {
     options.progressCallback = this.progressCallback;
     options.tableLayouts = this.tableLayouts;
@@ -30,40 +24,29 @@ class pdfmake {
     const pdfDocumentPromise = printer.createPdfKitDocument(docDefinition, options);
     return this._transformToDocument(pdfDocumentPromise);
   }
-
   setProgressCallback(callback) {
     this.progressCallback = callback;
   }
-
   addTableLayouts(tableLayouts) {
     this.tableLayouts = (0, _tools.pack)(this.tableLayouts, tableLayouts);
   }
-
   setTableLayouts(tableLayouts) {
     this.tableLayouts = tableLayouts;
   }
-
   clearTableLayouts() {
     this.tableLayouts = {};
   }
-
   addFonts(fonts) {
     this.fonts = (0, _tools.pack)(this.fonts, fonts);
   }
-
   setFonts(fonts) {
     this.fonts = fonts;
   }
-
   clearFonts() {
     this.fonts = {};
   }
-
   _transformToDocument(doc) {
     return doc;
   }
-
 }
-
-var _default = pdfmake;
-exports.default = _default;
+var _default = exports.default = pdfmake;

package/js/browser-extensions/OutputDocumentBrowser.js

@@ -2,13 +2,9 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-
 var _OutputDocument = _interopRequireDefault(require("../OutputDocument"));
-
 var _fileSaver = require("file-saver");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * @returns {Window}
  */
@@ -16,14 +12,11 @@ const openWindow = () => {
   // we have to open the window immediately and store the reference
   // otherwise popup blockers will stop us
   let win = window.open('', '_blank');
-
   if (win === null) {
     throw new Error('Open PDF in new window blocked by browser');
   }
-
   return win;
 };
-
 class OutputDocumentBrowser extends _OutputDocument.default {
   /**
    * @returns {Promise<Blob>}
@@ -44,12 +37,11 @@ class OutputDocumentBrowser extends _OutputDocument.default {
       });
     });
   }
+
   /**
    * @param {string} filename
    * @returns {Promise}
    */
-
-
   download(filename = 'file.pdf') {
     return new Promise((resolve, reject) => {
       this.getBlob().then(blob => {
@@ -64,24 +56,23 @@ class OutputDocumentBrowser extends _OutputDocument.default {
       });
     });
   }
+
   /**
    * @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; //
+          win.location.href = pdfUrl;
 
+          //
           resolve();
           /* temporarily disabled
           if (win === window) {
@@ -104,12 +95,11 @@ class OutputDocumentBrowser extends _OutputDocument.default {
       });
     });
   }
+
   /**
    * @param {Window} win
    * @returns {Promise}
    */
-
-
   print(win = null) {
     return new Promise((resolve, reject) => {
       this.getStream().then(stream => {
@@ -124,8 +114,5 @@ class OutputDocumentBrowser extends _OutputDocument.default {
       });
     });
   }
-
 }
-
-var _default = OutputDocumentBrowser;
-exports.default = _default;
+var _default = exports.default = OutputDocumentBrowser;

package/js/browser-extensions/URLBrowserResolver.js

@@ -2,62 +2,54 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-
-const fetchUrl = url => {
+const fetchUrl = (url, headers = {}) => {
   return new Promise((resolve, reject) => {
     const xhr = new XMLHttpRequest();
     xhr.open('GET', url, true);
+    for (let headerName in headers) {
+      xhr.setRequestHeader(headerName, headers[headerName]);
+    }
     xhr.responseType = 'arraybuffer';
-
     xhr.onreadystatechange = () => {
       if (xhr.readyState !== 4) {
         return;
       }
-
       const ok = xhr.status >= 200 && xhr.status < 300;
-
       if (!ok) {
         setTimeout(() => {
           reject(new TypeError(`Failed to fetch (url: "${url}")`));
         }, 0);
       }
     };
-
     xhr.onload = () => {
       const ok = xhr.status >= 200 && xhr.status < 300;
-
       if (ok) {
         resolve(xhr.response);
       }
     };
-
     xhr.onerror = () => {
       setTimeout(() => {
         reject(new TypeError(`Network request failed (url: "${url}")`));
       }, 0);
     };
-
     xhr.ontimeout = () => {
       setTimeout(() => {
         reject(new TypeError(`Network request failed (url: "${url}")`));
       }, 0);
     };
-
     xhr.send();
   });
 };
-
 class URLBrowserResolver {
   constructor(fs) {
     this.fs = fs;
     this.resolving = {};
   }
-
-  resolve(url) {
+  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) {
-          fetchUrl(url).then(buffer => {
+          fetchUrl(url, headers).then(buffer => {
             this.fs.writeFileSync(url, buffer);
             resolve();
           }, result => {
@@ -69,10 +61,8 @@ class URLBrowserResolver {
         }
       });
     }
-
     return this.resolving[url];
   }
-
   resolved() {
     return new Promise((resolve, reject) => {
       Promise.all(Object.values(this.resolving)).then(() => {
@@ -82,8 +72,5 @@ class URLBrowserResolver {
       });
     });
   }
-
 }
-
-var _default = URLBrowserResolver;
-exports.default = _default;
+var _default = exports.default = URLBrowserResolver;

package/js/browser-extensions/fonts/Roboto.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var fs = require('fs');
-
 var fontContainer = {
   vfs: {
     'Roboto-Regular.ttf': {
@@ -30,13 +29,10 @@ var fontContainer = {
     }
   }
 };
-
 var _global = typeof window === 'object' ? window : typeof global === 'object' ? global : typeof self === 'object' ? self : void 0;
-
 if (typeof _global.pdfMake !== 'undefined' && typeof _global.pdfMake.addFontContainer !== 'undefined') {
   _global.pdfMake.addFontContainer(fontContainer);
 }
-
 if (typeof module !== 'undefined') {
   module.exports = fontContainer;
 }

package/js/browser-extensions/index.js

@@ -2,19 +2,12 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-
 var _base = _interopRequireDefault(require("../base"));
-
 var _OutputDocumentBrowser = _interopRequireDefault(require("./OutputDocumentBrowser"));
-
 var _URLBrowserResolver = _interopRequireDefault(require("./URLBrowserResolver"));
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _configurator = _interopRequireDefault(require("core-js/configurator"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // core-js: Polyfills will be used only if natives completely unavailable.
 (0, _configurator.default)({
   useNative: ['Promise']
@@ -27,25 +20,21 @@ let defaultClientFonts = {
     bolditalics: 'Roboto-MediumItalic.ttf'
   }
 };
-
 class pdfmake extends _base.default {
   constructor() {
     super();
     this.urlResolver = new _URLBrowserResolver.default(this.virtualfs);
     this.fonts = defaultClientFonts;
   }
-
   addFontContainer(fontContainer) {
     this.addVirtualFileSystem(fontContainer.vfs);
     this.addFonts(fontContainer.fonts);
   }
-
   addVirtualFileSystem(vfs) {
     for (let key in vfs) {
       if (vfs.hasOwnProperty(key)) {
         let data;
         let encoding;
-
         if (typeof vfs[key] === 'object') {
           data = vfs[key].data;
           encoding = vfs[key].encoding || 'base64';
@@ -53,18 +42,12 @@ class pdfmake extends _base.default {
           data = vfs[key];
           encoding = 'base64';
         }
-
         _fs.default.writeFileSync(key, data, encoding);
       }
     }
   }
-
   _transformToDocument(doc) {
     return new _OutputDocumentBrowser.default(doc);
   }
-
 }
-
-var _default = new pdfmake();
-
-exports.default = _default;
+var _default = exports.default = new pdfmake();

package/js/browser-extensions/pdfMake.js

@@ -1,17 +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

@@ -1,7 +1,6 @@
 "use strict";
 
 var fs = require('fs');
-
 var fontContainer = {
   vfs: {
     'data/Courier.afm': {
@@ -30,13 +29,10 @@ var fontContainer = {
     }
   }
 };
-
 var _global = typeof window === 'object' ? window : typeof global === 'object' ? global : typeof self === 'object' ? self : void 0;
-
 if (typeof _global.pdfMake !== 'undefined' && typeof _global.pdfMake.addFontContainer !== 'undefined') {
   _global.pdfMake.addFontContainer(fontContainer);
 }
-
 if (typeof module !== 'undefined') {
   module.exports = fontContainer;
 }

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

@@ -1,7 +1,6 @@
 "use strict";
 
 var fs = require('fs');
-
 var fontContainer = {
   vfs: {
     'data/Helvetica.afm': {
@@ -30,13 +29,10 @@ var fontContainer = {
     }
   }
 };
-
 var _global = typeof window === 'object' ? window : typeof global === 'object' ? global : typeof self === 'object' ? self : void 0;
-
 if (typeof _global.pdfMake !== 'undefined' && typeof _global.pdfMake.addFontContainer !== 'undefined') {
   _global.pdfMake.addFontContainer(fontContainer);
 }
-
 if (typeof module !== 'undefined') {
   module.exports = fontContainer;
 }

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

@@ -1,7 +1,6 @@
 "use strict";
 
 var fs = require('fs');
-
 var fontContainer = {
   vfs: {
     'data/Symbol.afm': {
@@ -15,13 +14,10 @@ var fontContainer = {
     }
   }
 };
-
 var _global = typeof window === 'object' ? window : typeof global === 'object' ? global : typeof self === 'object' ? self : void 0;
-
 if (typeof _global.pdfMake !== 'undefined' && typeof _global.pdfMake.addFontContainer !== 'undefined') {
   _global.pdfMake.addFontContainer(fontContainer);
 }
-
 if (typeof module !== 'undefined') {
   module.exports = fontContainer;
 }

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

@@ -1,7 +1,6 @@
 "use strict";
 
 var fs = require('fs');
-
 var fontContainer = {
   vfs: {
     'data/Times-Roman.afm': {
@@ -30,13 +29,10 @@ var fontContainer = {
     }
   }
 };
-
 var _global = typeof window === 'object' ? window : typeof global === 'object' ? global : typeof self === 'object' ? self : void 0;
-
 if (typeof _global.pdfMake !== 'undefined' && typeof _global.pdfMake.addFontContainer !== 'undefined') {
   _global.pdfMake.addFontContainer(fontContainer);
 }
-
 if (typeof module !== 'undefined') {
   module.exports = fontContainer;
 }

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

@@ -1,7 +1,6 @@
 "use strict";
 
 var fs = require('fs');
-
 var fontContainer = {
   vfs: {
     'data/ZapfDingbats.afm': {
@@ -15,13 +14,10 @@ var fontContainer = {
     }
   }
 };
-
 var _global = typeof window === 'object' ? window : typeof global === 'object' ? global : typeof self === 'object' ? self : void 0;
-
 if (typeof _global.pdfMake !== 'undefined' && typeof _global.pdfMake.addFontContainer !== 'undefined') {
   _global.pdfMake.addFontContainer(fontContainer);
 }
-
 if (typeof module !== 'undefined') {
   module.exports = fontContainer;
 }

package/js/columnCalculator.js

@@ -2,10 +2,8 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-
 var _variableType = require("./helpers/variableType");
-
-function buildColumnWidths(columns, availableWidth) {
+function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode) {
   let autoColumns = [];
   let autoMin = 0;
   let autoMax = 0;
@@ -27,26 +25,43 @@ function buildColumnWidths(columns, availableWidth) {
       fixedColumns.push(column);
     }
   });
-  fixedColumns.forEach(col => {
+  fixedColumns.forEach((col, colIndex) => {
     // width specified as %
     if ((0, _variableType.isString)(col.width) && /\d+%/.test(col.width)) {
-      col.width = parseFloat(col.width) * initial_availableWidth / 100;
+      // In tables we have to take into consideration the reserved width for paddings and borders
+      let reservedWidth = 0;
+      if (tableNode) {
+        const paddingLeft = tableNode._layout.paddingLeft(colIndex, tableNode);
+        const paddingRight = tableNode._layout.paddingRight(colIndex, tableNode);
+        const borderLeft = tableNode._layout.vLineWidth(colIndex, tableNode);
+        const borderRight = tableNode._layout.vLineWidth(colIndex + 1, tableNode);
+        if (colIndex === 0) {
+          // first column assumes whole borderLeft and half of border right
+          reservedWidth = paddingLeft + paddingRight + borderLeft + borderRight / 2;
+        } else if (colIndex === fixedColumns.length - 1) {
+          // last column assumes whole borderRight and half of border left
+          reservedWidth = paddingLeft + paddingRight + borderLeft / 2 + borderRight;
+        } else {
+          // Columns in the middle assume half of each border
+          reservedWidth = paddingLeft + paddingRight + borderLeft / 2 + borderRight / 2;
+        }
+      }
+      const totalAvailableWidth = initial_availableWidth + offsetTotal;
+      col.width = parseFloat(col.width) * totalAvailableWidth / 100 - reservedWidth;
     }
-
     if (col.width < col._minWidth && col.elasticWidth) {
       col._calcWidth = col._minWidth;
     } else {
       col._calcWidth = col.width;
     }
-
     availableWidth -= col._calcWidth;
-  }); // http://www.freesoft.org/CIE/RFC/1942/18.htm
+  });
+
+  // http://www.freesoft.org/CIE/RFC/1942/18.htm
   // http://www.w3.org/TR/CSS2/tables.html#width-layout
   // http://dev.w3.org/csswg/css3-tables-algorithms/Overview.src.htm
-
   let minW = autoMin + starMaxMin * starColumns.length;
   let maxW = autoMax + starMaxMax * starColumns.length;
-
   if (minW >= availableWidth) {
     // case 1 - there's no way to fit all columns within available width
     // that's actually pretty bad situation with PDF as we have no horizontal scroll
@@ -75,7 +90,6 @@ function buildColumnWidths(columns, availableWidth) {
         availableWidth -= col._calcWidth;
       });
     }
-
     if (starColumns.length > 0) {
       let starSize = availableWidth / starColumns.length;
       starColumns.forEach(col => {
@@ -84,16 +98,14 @@ function buildColumnWidths(columns, availableWidth) {
     }
   }
 }
-
 function isAutoColumn(column) {
   return column.width === 'auto';
 }
-
 function isStarColumn(column) {
   return column.width === null || column.width === undefined || column.width === '*' || column.width === 'star';
-} //TODO: refactor and reuse in measureTable
-
+}
 
+//TODO: refactor and reuse in measureTable
 function measureMinMax(columns) {
   let result = {
     min: 0,
@@ -104,10 +116,8 @@ function measureMinMax(columns) {
     max: 0
   };
   let starCount = 0;
-
   for (let i = 0, l = columns.length; i < l; i++) {
     let c = columns[i];
-
     if (isStarColumn(c)) {
       maxStar.min = Math.max(maxStar.min, c._minWidth);
       maxStar.max = Math.max(maxStar.max, c._maxWidth);
@@ -120,23 +130,19 @@ function measureMinMax(columns) {
       result.max += c.width !== undefined && c.width || c._maxWidth;
     }
   }
-
   if (starCount) {
     result.min += starCount * maxStar.min;
     result.max += starCount * maxStar.max;
   }
-
   return result;
 }
+
 /**
  * Calculates column widths
  */
-
-
-var _default = {
+var _default = exports.default = {
   buildColumnWidths: buildColumnWidths,
   measureMinMax: measureMinMax,
   isAutoColumn: isAutoColumn,
   isStarColumn: isStarColumn
-};
-exports.default = _default;
+};