pdfmake 0.3.2 → 0.3.4

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

@@ -1,27 +1,27 @@
-var fs = require('fs');
-
-var fontContainer = {
-	vfs: {
-		'data/Times-Roman.afm': { 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/pdfkit/js/data/Times-Bold.afm', 'utf8'), encoding: 'utf8' },
-		'data/Times-Italic.afm': { 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/pdfkit/js/data/Times-BoldItalic.afm', 'utf8'), encoding: 'utf8' }
-	},
-	fonts: {
-		Times: {
-			normal: 'Times-Roman',
-			bold: 'Times-Bold',
-			italics: 'Times-Italic',
-			bolditalics: 'Times-BoldItalic'
-		}
-	}
-};
-
-var _global = typeof window === 'object' ? window : typeof global === 'object' ? global : typeof self === 'object' ? self : this;
-if (typeof _global.pdfMake !== 'undefined' && typeof _global.pdfMake.addFontContainer !== 'undefined') {
-	_global.pdfMake.addFontContainer(fontContainer);
-}
-
-if (typeof module !== 'undefined') {
-	module.exports = fontContainer;
-}
+var fs = require('fs');
+
+var fontContainer = {
+	vfs: {
+		'data/Times-Roman.afm': { 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/pdfkit/js/data/Times-Bold.afm', 'utf8'), encoding: 'utf8' },
+		'data/Times-Italic.afm': { 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/pdfkit/js/data/Times-BoldItalic.afm', 'utf8'), encoding: 'utf8' }
+	},
+	fonts: {
+		Times: {
+			normal: 'Times-Roman',
+			bold: 'Times-Bold',
+			italics: 'Times-Italic',
+			bolditalics: 'Times-BoldItalic'
+		}
+	}
+};
+
+var _global = typeof window === 'object' ? window : typeof global === 'object' ? global : typeof self === 'object' ? self : this;
+if (typeof _global.pdfMake !== 'undefined' && typeof _global.pdfMake.addFontContainer !== 'undefined') {
+	_global.pdfMake.addFontContainer(fontContainer);
+}
+
+if (typeof module !== 'undefined') {
+	module.exports = fontContainer;
+}

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

@@ -1,21 +1,21 @@
-var fs = require('fs');
-
-var fontContainer = {
-	vfs: {
-		'data/ZapfDingbats.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/ZapfDingbats.afm', 'utf8'), encoding: 'utf8' }
-	},
-	fonts: {
-		ZapfDingbats: {
-			normal: 'ZapfDingbats'
-		}
-	}
-};
-
-var _global = typeof window === 'object' ? window : typeof global === 'object' ? global : typeof self === 'object' ? self : this;
-if (typeof _global.pdfMake !== 'undefined' && typeof _global.pdfMake.addFontContainer !== 'undefined') {
-	_global.pdfMake.addFontContainer(fontContainer);
-}
-
-if (typeof module !== 'undefined') {
-	module.exports = fontContainer;
-}
+var fs = require('fs');
+
+var fontContainer = {
+	vfs: {
+		'data/ZapfDingbats.afm': { data: fs.readFileSync(__dirname + '/../../../node_modules/pdfkit/js/data/ZapfDingbats.afm', 'utf8'), encoding: 'utf8' }
+	},
+	fonts: {
+		ZapfDingbats: {
+			normal: 'ZapfDingbats'
+		}
+	}
+};
+
+var _global = typeof window === 'object' ? window : typeof global === 'object' ? global : typeof self === 'object' ? self : this;
+if (typeof _global.pdfMake !== 'undefined' && typeof _global.pdfMake.addFontContainer !== 'undefined') {
+	_global.pdfMake.addFontContainer(fontContainer);
+}
+
+if (typeof module !== 'undefined') {
+	module.exports = fontContainer;
+}

package/src/browser-extensions/virtual-fs-cjs.js

@@ -1 +1 @@
-module.exports = require('../virtual-fs').default;
+module.exports = require('../virtual-fs').default;

package/src/columnCalculator.js

@@ -1,154 +1,154 @@
-import { isString } from './helpers/variableType';
-
-function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode) {
-	let autoColumns = [];
-	let autoMin = 0;
-	let autoMax = 0;
-	let starColumns = [];
-	let starMaxMin = 0;
-	let starMaxMax = 0;
-	let fixedColumns = [];
-	let initial_availableWidth = availableWidth;
-
-	columns.forEach(column => {
-		if (isAutoColumn(column)) {
-			autoColumns.push(column);
-			autoMin += column._minWidth;
-			autoMax += column._maxWidth;
-		} else if (isStarColumn(column)) {
-			starColumns.push(column);
-			starMaxMin = Math.max(starMaxMin, column._minWidth);
-			starMaxMax = Math.max(starMaxMax, column._maxWidth);
-		} else {
-			fixedColumns.push(column);
-		}
-	});
-
-	fixedColumns.forEach((col, colIndex) => {
-		// width specified as %
-		if (isString(col.width) && /\d+%/.test(col.width)) {
-			// 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.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
-		// no easy workaround (unless we decide, in the future, to split single words)
-		// currently we simply use minWidths for all columns
-		autoColumns.forEach(col => {
-			col._calcWidth = col._minWidth;
-		});
-
-		starColumns.forEach(col => {
-			col._calcWidth = starMaxMin; // starMaxMin already contains padding
-		});
-	} else {
-		if (maxW < availableWidth) {
-			// case 2 - we can fit rest of the table within available space
-			autoColumns.forEach(col => {
-				col._calcWidth = col._maxWidth;
-				availableWidth -= col._calcWidth;
-			});
-		} else {
-			// maxW is too large, but minW fits within available width
-			let W = availableWidth - minW;
-			let D = maxW - minW;
-
-			autoColumns.forEach(col => {
-				let d = col._maxWidth - col._minWidth;
-				col._calcWidth = col._minWidth + d * W / D;
-				availableWidth -= col._calcWidth;
-			});
-		}
-
-		if (starColumns.length > 0) {
-			let starSize = availableWidth / starColumns.length;
-
-			starColumns.forEach(col => {
-				col._calcWidth = starSize;
-			});
-		}
-	}
-}
-
-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
-function measureMinMax(columns) {
-	let result = { min: 0, max: 0 };
-	let maxStar = { min: 0, 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);
-			starCount++;
-		} else if (isAutoColumn(c)) {
-			result.min += c._minWidth;
-			result.max += c._maxWidth;
-		} else {
-			result.min += ((c.width !== undefined && c.width) || c._minWidth);
-			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
- */
-export default {
-	buildColumnWidths: buildColumnWidths,
-	measureMinMax: measureMinMax,
-	isAutoColumn: isAutoColumn,
-	isStarColumn: isStarColumn
-};
+import { isString } from './helpers/variableType';
+
+function buildColumnWidths(columns, availableWidth, offsetTotal = 0, tableNode) {
+	let autoColumns = [];
+	let autoMin = 0;
+	let autoMax = 0;
+	let starColumns = [];
+	let starMaxMin = 0;
+	let starMaxMax = 0;
+	let fixedColumns = [];
+	let initial_availableWidth = availableWidth;
+
+	columns.forEach(column => {
+		if (isAutoColumn(column)) {
+			autoColumns.push(column);
+			autoMin += column._minWidth;
+			autoMax += column._maxWidth;
+		} else if (isStarColumn(column)) {
+			starColumns.push(column);
+			starMaxMin = Math.max(starMaxMin, column._minWidth);
+			starMaxMax = Math.max(starMaxMax, column._maxWidth);
+		} else {
+			fixedColumns.push(column);
+		}
+	});
+
+	fixedColumns.forEach((col, colIndex) => {
+		// width specified as %
+		if (isString(col.width) && /\d+%/.test(col.width)) {
+			// 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.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
+		// no easy workaround (unless we decide, in the future, to split single words)
+		// currently we simply use minWidths for all columns
+		autoColumns.forEach(col => {
+			col._calcWidth = col._minWidth;
+		});
+
+		starColumns.forEach(col => {
+			col._calcWidth = starMaxMin; // starMaxMin already contains padding
+		});
+	} else {
+		if (maxW < availableWidth) {
+			// case 2 - we can fit rest of the table within available space
+			autoColumns.forEach(col => {
+				col._calcWidth = col._maxWidth;
+				availableWidth -= col._calcWidth;
+			});
+		} else {
+			// maxW is too large, but minW fits within available width
+			let W = availableWidth - minW;
+			let D = maxW - minW;
+
+			autoColumns.forEach(col => {
+				let d = col._maxWidth - col._minWidth;
+				col._calcWidth = col._minWidth + d * W / D;
+				availableWidth -= col._calcWidth;
+			});
+		}
+
+		if (starColumns.length > 0) {
+			let starSize = availableWidth / starColumns.length;
+
+			starColumns.forEach(col => {
+				col._calcWidth = starSize;
+			});
+		}
+	}
+}
+
+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
+function measureMinMax(columns) {
+	let result = { min: 0, max: 0 };
+	let maxStar = { min: 0, 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);
+			starCount++;
+		} else if (isAutoColumn(c)) {
+			result.min += c._minWidth;
+			result.max += c._maxWidth;
+		} else {
+			result.min += ((c.width !== undefined && c.width) || c._minWidth);
+			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
+ */
+export default {
+	buildColumnWidths: buildColumnWidths,
+	measureMinMax: measureMinMax,
+	isAutoColumn: isAutoColumn,
+	isStarColumn: isStarColumn
+};

package/src/helpers/node.js

@@ -1,110 +1,134 @@
-import { isNumber } from './variableType';
-
-function fontStringify(key, val) {
-	if (key === 'font') {
-		return 'font';
-	}
-	return val;
-}
-
-/**
- * Convert node to readable string
- *
- * @param {object} node
- * @returns {string}
- */
-export function stringifyNode(node) {
-	return JSON.stringify(node, fontStringify);
-}
-
-/**
- * @param {object} node
- * @returns {?string}
- */
-export function getNodeId(node) {
-	if (node.id) {
-		return node.id;
-	}
-
-	if (Array.isArray(node.text)) {
-		for (let n of node.text) {
-			let nodeId = getNodeId(n);
-			if (nodeId) {
-				return nodeId;
-			}
-		}
-	}
-
-	return null;
-}
-
-/**
- * @param {object} node
- * @param {object} styleStack object is instance of PDFDocument
- * @returns {?Array}
- */
-export function getNodeMargin(node, styleStack) {
-	function processSingleMargins(node, currentMargin) {
-		if (node.marginLeft || node.marginTop || node.marginRight || node.marginBottom) {
-			return [
-				node.marginLeft || currentMargin[0] || 0,
-				node.marginTop || currentMargin[1] || 0,
-				node.marginRight || currentMargin[2] || 0,
-				node.marginBottom || currentMargin[3] || 0
-			];
-		}
-		return currentMargin;
-	}
-
-	function flattenStyleArray(styleArray, styleStack) {
-		let flattenedStyles = {};
-		for (let i = styleArray.length - 1; i >= 0; i--) {
-			let styleName = styleArray[i];
-			let style = styleStack.styleDictionary[styleName];
-			for (let key in style) {
-				if (style.hasOwnProperty(key)) {
-					flattenedStyles[key] = style[key];
-				}
-			}
-		}
-		return flattenedStyles;
-	}
-
-	function convertMargin(margin) {
-		if (isNumber(margin)) {
-			margin = [margin, margin, margin, margin];
-		} else if (Array.isArray(margin)) {
-			if (margin.length === 2) {
-				margin = [margin[0], margin[1], margin[0], margin[1]];
-			}
-		}
-		return margin;
-	}
-
-	let margin = [undefined, undefined, undefined, undefined];
-
-	if (node.style) {
-		let styleArray = Array.isArray(node.style) ? node.style : [node.style];
-		let flattenedStyleArray = flattenStyleArray(styleArray, styleStack);
-
-		if (flattenedStyleArray) {
-			margin = processSingleMargins(flattenedStyleArray, margin);
-		}
-
-		if (flattenedStyleArray.margin) {
-			margin = convertMargin(flattenedStyleArray.margin);
-		}
-	}
-
-	margin = processSingleMargins(node, margin);
-
-	if (node.margin) {
-		margin = convertMargin(node.margin);
-	}
-
-	if (margin[0] === undefined && margin[1] === undefined && margin[2] === undefined && margin[3] === undefined) {
-		return null;
-	}
-
-	return margin;
-}
+import { isNumber, isString } from './variableType';
+
+function fontStringify(key, val) {
+	if (key === 'font') {
+		return 'font';
+	}
+	return val;
+}
+
+/**
+ * Convert node to readable string
+ *
+ * @param {object} node
+ * @returns {string}
+ */
+export function stringifyNode(node) {
+	return JSON.stringify(node, fontStringify);
+}
+
+/**
+ * @param {object} node
+ * @returns {?string}
+ */
+export function getNodeId(node) {
+	if (node.id) {
+		return node.id;
+	}
+
+	if (Array.isArray(node.text)) {
+		for (let n of node.text) {
+			let nodeId = getNodeId(n);
+			if (nodeId) {
+				return nodeId;
+			}
+		}
+	}
+
+	return null;
+}
+
+/**
+ * @param {object} node
+ * @param {object} styleStack object is instance of PDFDocument
+ * @returns {?Array}
+ */
+export function getNodeMargin(node, styleStack) {
+
+	function processSingleMargins(node, currentMargin, defaultMargin = 0) {
+		if (node.marginLeft !== undefined || node.marginTop !== undefined || node.marginRight !== undefined || node.marginBottom !== undefined) {
+			return [
+				node.marginLeft ?? currentMargin[0] ?? defaultMargin,
+				node.marginTop ?? currentMargin[1] ?? defaultMargin,
+				node.marginRight ?? currentMargin[2] ?? defaultMargin,
+				node.marginBottom ?? currentMargin[3] ?? defaultMargin
+			];
+		}
+		return currentMargin;
+	}
+
+	function flattenStyleArray(styleArray, styleStack, visited = new Set()) {
+		styleArray = Array.isArray(styleArray) ? styleArray : [styleArray];
+
+		// style is not valid array of strings
+		if (!styleArray.every(item => isString(item))) {
+			return {};
+		}
+
+		let flattenedStyles = {};
+		for (let index = 0; index < styleArray.length; index++) {
+			let styleName = styleArray[index];
+			let style = styleStack.styleDictionary[styleName];
+
+			// style not found
+			if (style === undefined) {
+				continue;
+			}
+
+			if (visited.has(styleName)) {
+				continue;
+			}
+
+			if (style.extends !== undefined) {
+				flattenedStyles = { ...flattenedStyles, ...flattenStyleArray(style.extends, styleStack, new Set([...visited, styleName])) };
+			}
+
+			if (style.margin !== undefined) {
+				flattenedStyles = { margin: convertMargin(style.margin) };
+				continue;
+			}
+
+			flattenedStyles = { margin: processSingleMargins(style, flattenedStyles.margin ?? {}, undefined) };
+		}
+
+		return flattenedStyles;
+	}
+
+	function convertMargin(margin) {
+		if (isNumber(margin)) {
+			margin = [margin, margin, margin, margin];
+		} else if (Array.isArray(margin)) {
+			if (margin.length === 2) {
+				margin = [margin[0], margin[1], margin[0], margin[1]];
+			}
+		}
+		return margin;
+	}
+
+	let margin = [undefined, undefined, undefined, undefined];
+
+	if (node.style) {
+		let styleArray = Array.isArray(node.style) ? node.style : [node.style];
+		let flattenedStyleArray = flattenStyleArray(styleArray, styleStack);
+
+		if (flattenedStyleArray) {
+			margin = processSingleMargins(flattenedStyleArray, margin);
+		}
+
+		if (flattenedStyleArray.margin) {
+			margin = convertMargin(flattenedStyleArray.margin);
+		}
+	}
+
+	margin = processSingleMargins(node, margin);
+
+	if (node.margin !== undefined) {
+		margin = convertMargin(node.margin);
+	}
+
+	if (margin[0] === undefined && margin[1] === undefined && margin[2] === undefined && margin[3] === undefined) {
+		return null;
+	}
+
+	return margin;
+}