pdfmake 0.1.69 → 0.2.0

package/build-vfs.js

@@ -0,0 +1,44 @@
+const fs = require('fs');
+
+const vfsBefore = "this.pdfMake = this.pdfMake || {}; this.pdfMake.vfs = ";
+const vfsAfter = ";";
+const sourcePath = process.argv[2];
+const vfsFilename = process.argv[3] ? process.argv[2] : './build/vfs_fonts.js';
+
+var vfs = {};
+
+if (sourcePath === undefined) {
+	console.error('Usage: node build-vfs.js path [filename]');
+	console.log('');
+	console.log('Parameters:');
+	console.log('  path      Source path with fonts.');
+	console.log('  filename  Optional. Output vfs file. Default: ./build/vfs_fonts.js');
+	console.log('');
+	console.log('Examples:');
+	console.log('  node build-vfs.js "examples/fonts"');
+	console.log('  node build-vfs.js "examples/fonts" "./build/vfs_fonts.js"');
+	return;
+}
+
+if (!fs.existsSync(sourcePath)) {
+	console.error('Source path "' + sourcePath + '" not found.');
+	return;
+}
+
+console.log('Source path:', sourcePath);
+console.log('');
+
+var files = fs.readdirSync(sourcePath);
+
+files.forEach(function (file) {
+	var fileBase64 = fs.readFileSync(sourcePath + '/' + file).toString('base64');
+	console.log('FILE:', file);
+
+	vfs[file] = fileBase64;
+});
+
+const vfsFileContent = vfsBefore + JSON.stringify(vfs, null, 2) + vfsAfter;
+fs.writeFileSync(vfsFilename, vfsFileContent);
+
+console.log('');
+console.log('Builded ' + files.length + ' files to ' + vfsFilename + '.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfmake",
-  "version": "0.1.69",
+  "version": "0.2.0",
   "description": "Client/server side PDF printing in pure JavaScript",
   "main": "src/printer.js",
   "browser": "build/pdfmake.js",
@@ -8,42 +8,52 @@
     "test": "tests"
   },
   "dependencies": {
-    "iconv-lite": "^0.6.2",
-    "linebreak": "^1.0.2",
-    "pdfkit": "^0.11.0",
+    "@foliojs-fork/linebreak": "^1.1.0",
+    "@foliojs-fork/pdfkit": "^0.12.1",
+    "iconv-lite": "^0.6.3",
     "svg-to-pdfkit": "^0.1.8",
     "xmldoc": "^1.1.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.10",
-    "@babel/plugin-transform-modules-commonjs": "^7.12.1",
-    "@babel/preset-env": "^7.12.11",
+    "@babel/cli": "^7.14.5",
+    "@babel/core": "^7.14.6",
+    "@babel/plugin-transform-modules-commonjs": "^7.14.5",
+    "@babel/preset-env": "^7.14.7",
+    "assert": "^2.0.0",
     "babel-loader": "^8.2.2",
     "brfs": "^2.0.2",
-    "core-js": "^3.8.1",
-    "eslint-plugin-jsdoc": "^30.7.9",
-    "expose-loader": "^1.0.3",
-    "fancy-log": "^1.3.3",
+    "browserify-zlib": "^0.2.0",
+    "buffer": "^6.0.3",
+    "core-js": "^3.15.2",
+    "eslint": "^7.29.0",
+    "eslint-plugin-jsdoc": "^35.4.1",
+    "expose-loader": "^3.0.0",
     "file-saver": "^2.0.5",
-    "gulp": "^4.0.2",
-    "gulp-each": "^0.5.0",
-    "gulp-eslint": "^6.0.0",
-    "gulp-file-contents-to-json": "^0.2.2",
-    "gulp-spawn-mocha": "^6.0.0",
-    "mocha": "7.2.0",
+    "mocha": "^9.0.1",
+    "npm-run-all": "^4.1.5",
+    "process": "^0.11.10",
     "rewire": "^5.0.0",
-    "sinon": "^9.2.2",
+    "sinon": "^11.1.1",
+    "stream-browserify": "^3.0.0",
     "string-replace-webpack-plugin": "^0.1.3",
-    "terser-webpack-plugin": "4.2.3",
+    "terser-webpack-plugin": "^5.1.4",
     "transform-loader": "^0.2.4",
-    "webpack": "^4.44.2"
+    "util": "^0.12.4",
+    "webpack": "^5.42.0",
+    "webpack-cli": "^4.7.2"
   },
   "engines": {
-    "node": ">=8"
+    "node": ">=12"
   },
   "scripts": {
-    "build": "gulp build",
-    "test": "gulp",
+    "test": "run-s build mocha",
+    "build": "run-s build:browser",
+    "build:browser": "webpack",
+    "build:browser-standard-fonts": "webpack --config webpack-standardfonts.config.js",
+    "build:vfs": "node build-vfs.js \"./examples/fonts\"",
+    "build:examples": "node build-examples.js",
+    "lint": "eslint \"./src/**/*.js\" \"./tests/**/*.js\" \"./examples/**/*.js\"",
+    "mocha": "mocha --reporter spec \"./tests/**/*.js\"",
     "playground": "node dev-playground/server.js"
   },
   "repository": {

package/src/browser-extensions/pdfMake.js

@@ -24,6 +24,16 @@ function Document(docDefinition, tableLayouts, fonts, vfs) {
 
 function canCreatePdf() {
 	// Ensure the browser provides the level of support needed
+  try {
+    var arr = new Uint8Array(1)
+    var proto = { foo: function () { return 42 } }
+    Object.setPrototypeOf(proto, Uint8Array.prototype)
+    Object.setPrototypeOf(arr, proto)
+    return arr.foo() === 42
+  } catch (e) {
+    return false
+  }
+
 	if (!Object.keys || typeof Uint16Array === 'undefined') {
 		return false;
 	}

package/src/layoutBuilder.js

@@ -81,11 +81,7 @@ LayoutBuilder.prototype.layoutDocument = function (docStructure, fontProvider, s
 				}
 			});
 			nodeInfo.startPosition = node.positions[0];
-			nodeInfo.pageNumbers = node.positions.map(function (node) {
-				return node.pageNumber;
-			}).filter(function (element, position, array) {
-				return array.indexOf(element) === position;
-			});
+			nodeInfo.pageNumbers = Array.from(new Set(node.positions.map(function (node) { return node.pageNumber; })));
 			nodeInfo.pages = pages.length;
 			nodeInfo.stack = isArray(node.stack);
 
@@ -100,17 +96,21 @@ LayoutBuilder.prototype.layoutDocument = function (docStructure, fontProvider, s
 				var followingNodesOnPage = [];
 				var nodesOnNextPage = [];
 				var previousNodesOnPage = [];
-				for (var ii = index + 1, l = linearNodeList.length; ii < l; ii++) {
-					if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber) > -1) {
-						followingNodesOnPage.push(linearNodeList[ii].nodeInfo);
-					}
-					if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber + 1) > -1) {
-						nodesOnNextPage.push(linearNodeList[ii].nodeInfo);
+				if (pageBreakBeforeFct.length > 1) {
+					for (var ii = index + 1, l = linearNodeList.length; ii < l; ii++) {
+						if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber) > -1) {
+							followingNodesOnPage.push(linearNodeList[ii].nodeInfo);
+						}
+						if (pageBreakBeforeFct.length > 2 && linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber + 1) > -1) {
+							nodesOnNextPage.push(linearNodeList[ii].nodeInfo);
+						}
 					}
 				}
-				for (var ii = 0; ii < index; ii++) {
-					if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber) > -1) {
-						previousNodesOnPage.push(linearNodeList[ii].nodeInfo);
+				if (pageBreakBeforeFct.length > 3) {
+					for (var ii = 0; ii < index; ii++) {
+						if (linearNodeList[ii].nodeInfo.pageNumbers.indexOf(pageNumber) > -1) {
+							previousNodesOnPage.push(linearNodeList[ii].nodeInfo);
+						}
 					}
 				}
 				if (pageBreakBeforeFct(node.nodeInfo, followingNodesOnPage, nodesOnNextPage, previousNodesOnPage)) {

package/src/pdfKitEngine.js

@@ -4,7 +4,7 @@ function _interopDefault(ex) {
 	return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex;
 }
 
-var PdfKit = _interopDefault(require('pdfkit'));
+var PdfKit = _interopDefault(require('@foliojs-fork/pdfkit'));
 
 function getEngineInstance() {
 	return PdfKit;

package/src/printer.js

@@ -637,7 +637,7 @@ function renderImage(image, x, y, pdfKitDoc) {
 		var height = image.cover.height ? image.cover.height : image.height;
 		pdfKitDoc.save();
 		pdfKitDoc.rect(image.x, image.y, width, height).clip();
-		pdfKitDoc.image(image.image, image.x, image.y, { cover: [width, height], align, valign });
+		pdfKitDoc.image(image.image, image.x, image.y, { cover: [width, height], align: align, valign: valign });
 		pdfKitDoc.restore();
 	} else {
 		pdfKitDoc.image(image.image, image.x, image.y, { width: image._width, height: image._height });

package/src/textTools.js

@@ -5,7 +5,7 @@ var isNumber = require('./helpers').isNumber;
 var isObject = require('./helpers').isObject;
 var isArray = require('./helpers').isArray;
 var isUndefined = require('./helpers').isUndefined;
-var LineBreaker = require('linebreak');
+var LineBreaker = require('@foliojs-fork/linebreak');
 
 var LEADING = /^(\s)+/g;
 var TRAILING = /(\s)+$/g;

package/gulpfile.js

@@ -1,110 +0,0 @@
-var gulp = require('gulp');
-var webpack = require('webpack');
-var mocha = require('gulp-spawn-mocha');
-var eslint = require('gulp-eslint');
-var each = require('gulp-each');
-var fc2json = require('gulp-file-contents-to-json');
-var log = require('fancy-log');
-var exec = require('child_process').exec;
-const fs = require('fs');
-
-var DEBUG = process.env.NODE_ENV === 'debug';
-var CI = process.env.CI === 'true';
-
-var vfsBefore = "this.pdfMake = this.pdfMake || {}; this.pdfMake.vfs = ";
-var vfsAfter = ";";
-
-gulp.task('build', function (callback) {
-	webpack(require('./webpack.config.js'), function (err, stats) {
-		if (err) {
-			callback(err);
-			return;
-		}
-		log("[webpack]", stats.toString({}));
-		if (stats.compilation.errors && stats.compilation.errors.length) {
-			callback(stats.compilation.errors);
-			return;
-		}
-		callback();
-	});
-});
-
-gulp.task('buildWithStandardFonts', function (callback) {
-	webpack(require('./webpack-standardfonts.config.js'), function (err, stats) {
-		if (err) {
-			callback(err);
-			return;
-		}
-		log("[webpack]", stats.toString({}));
-		if (stats.compilation.errors && stats.compilation.errors.length) {
-			callback(stats.compilation.errors);
-			return;
-		}
-		callback();
-	});
-});
-
-gulp.task('test', function () {
-	return gulp.src(['./tests/**/*.js'])
-		.pipe(mocha({
-			debugBrk: DEBUG,
-			R: CI ? 'spec' : 'nyan'
-		}));
-});
-
-gulp.task('lint', function () {
-	return gulp.src(['./src/**/*.js'])
-		.pipe(eslint())
-		.pipe(eslint.format())
-		.pipe(eslint.failAfterError());
-});
-
-gulp.task('buildFonts', function () {
-	return gulp.src(['./examples/fonts/*.*'])
-		.pipe(each(function (content, file, callback) {
-			var newContent = Buffer.from(content).toString('base64');
-			callback(null, newContent);
-		}, 'buffer'))
-		.pipe(fc2json('vfs_fonts.js', { flat: true }))
-		.pipe(each(function (content, file, callback) {
-			var newContent = vfsBefore + content + vfsAfter;
-			callback(null, newContent);
-		}, 'buffer'))
-		.pipe(gulp.dest('build'));
-});
-
-gulp.task('watch', function () {
-	gulp.watch('./src/**', ['test', 'build']);
-	gulp.watch('./tests/**', ['test']);
-});
-
-gulp.task('generateExamples', function (cb) {
-	var errCount = 0;
-	var position = 0;
-	process.chdir('examples');
-
-	const items = fs.readdirSync('.');
-	const files = items.filter(file => file.substring(file.length - 3, file.length) === '.js');
-
-	files.forEach(function (file) {
-		exec(`node ${file}`, function (err, stdout, stderr) {
-			position++;
-			log('FILE: ', file, ` (${position}/${files.length})`);
-			log(stdout);
-
-			if (err) {
-				errCount++;
-				log(stderr);
-			}
-
-			if (position === files.length) {
-				if (errCount) {
-					log('Errors count: ', errCount);
-				}
-				cb();
-			}
-		});
-	});
-});
-
-gulp.task('default', gulp.series(/*'lint',*/ 'test', 'build', 'buildFonts'));

package/webpack-standardfonts.config.js

@@ -1,7 +0,0 @@
-var config = require("./webpack.config.js");
-
-var rule = {enforce: 'post', test: /pdfkit[/\\]js[/\\]/, loader: "transform-loader?brfs"};
-
-config.module.rules.push(rule);
-
-module.exports = config;

package/webpack.config.js

@@ -1,134 +0,0 @@
-var path = require('path');
-var TerserPlugin = require('terser-webpack-plugin');
-var StringReplacePlugin = require("string-replace-webpack-plugin");
-var webpack = require('webpack');
-var pkg = require('./package.json');
-
-var banner = '/*! ' + pkg.name + ' v' + pkg.version + ', @license ' + pkg.license + ', @link ' + pkg.homepage + ' */';
-
-module.exports = {
-	mode: 'production',
-	entry: {
-		'pdfmake': './src/browser-extensions/pdfMake.js',
-		'pdfmake.min': './src/browser-extensions/pdfMake.js'
-	},
-	output: {
-		path: path.join(__dirname, './build'),
-		filename: '[name].js',
-		libraryTarget: 'umd',
-		// Workaround https://github.com/webpack/webpack/issues/6642 until https://github.com/webpack/webpack/issues/6525 lands.
-		globalObject: `typeof self !== 'undefined' ? self : this`
-	},
-	resolve: {
-		alias: {
-			fs: path.join(__dirname, './src/browser-extensions/virtual-fs.js')
-		}
-	},
-	node: {
-		// Prevent webpack from injecting setImmediate polyfill, which includes a "new Function" through a global polyfill - which cannot be used in a CSP environment with sane defaults
-		setImmediate: false
-	},
-	module: {
-		rules: [
-			// for fs don't use babel _interopDefault command
-			{
-				enforce: 'pre',
-				test: /pdfkit[/\\]js[/\\]/,
-				loader: StringReplacePlugin.replace({
-					replacements: [
-						{
-							pattern: "import fs from 'fs';",
-							replacement: function () {
-								return "var fs = require('fs');";
-							}
-						}
-					]
-				})
-			},
-			{
-				test: /\.js$/,
-				include: /(pdfkit|saslprep|unicode-trie|unicode-properties|dfa|linebreak|png-js)/,
-				use: {
-					loader: 'babel-loader',
-					options: {
-						presets: [
-							[
-								"@babel/preset-env",
-								{
-									targets: {
-										"ie": "10"
-									},
-									modules: false,
-									useBuiltIns: 'usage',
-									// TODO: after fix in babel remove corejs version and remove core-js dependency in package.json
-									corejs: "3.0.0",
-									loose: true
-								}
-							]
-						],
-						plugins: ["@babel/plugin-transform-modules-commonjs"]
-					}
-				}
-			},
-			{
-				test: /pdfMake.js$/,
-				loader: 'expose-loader',
-				options: {
-					exposes: 'pdfMake',
-				},
-				include: [path.join(__dirname, './src/browser-extensions')]
-			},
-
-			/* temporary bugfix for FileSaver: added hack for mobile device support, see https://github.com/bpampuch/pdfmake/issues/1664 */
-			/* waiting to merge and release PR https://github.com/eligrey/FileSaver.js/pull/533 */
-			{
-				test: /FileSaver.min.js$/, loader: StringReplacePlugin.replace({
-					replacements: [
-						{
-							pattern: '"download"in HTMLAnchorElement.prototype',
-							replacement: function () {
-								return '(typeof HTMLAnchorElement !== "undefined" && "download" in HTMLAnchorElement.prototype)';
-							}
-						}
-					]
-				})
-			},
-
-			{ enforce: 'post', test: /fontkit[/\\]index.js$/, loader: "transform-loader?brfs" },
-			{ enforce: 'post', test: /unicode-properties[/\\]index.js$/, loader: "transform-loader?brfs" },
-			{ enforce: 'post', test: /linebreak[/\\]src[/\\]linebreaker.js/, loader: "transform-loader?brfs" }
-		]
-	},
-	optimization: {
-		minimizer: [
-			new TerserPlugin({
-				include: /\.min\.js$/,
-				sourceMap: true,
-				extractComments: false,
-				terserOptions: {
-					format: {
-						preamble: banner,
-						comments: false,
-					},
-					output: {
-						preamble: banner,
-						comments: false,
-					},
-					compress: {
-						drop_console: true
-					},
-					keep_classnames: true,
-					keep_fnames: true
-				}
-			})
-		]
-	},
-	plugins: [
-		new StringReplacePlugin(),
-		new webpack.BannerPlugin({
-			banner: banner,
-			raw: true
-		})
-	],
-	devtool: 'source-map'
-};