Enhanced dontdraw option to have global effect so it works with composite symbols

Author: metafloor

README.md

@@ -24,7 +24,7 @@ found at the end of this document.
 
 ## Status 
 
-* Current bwip-js version is 2.0.7 (2020-06-03)
+* Current bwip-js version is 2.0.8 (2020-06-25)
 * Current BWIPP version is 2019-11-08
 * Node.js compatibility: 0.12+
 * Browser compatibility: Edge, Firefox, Chrome

dist/bwip-js-min.js

@@ -33631,7 +33631,10 @@ BWIPJS.prototype.bbox = function(x0, y0, x1, y1) {
 };
 BWIPJS.prototype.render = function() {
 	if (this.minx === Infinity) {
-		return callback(new Error('--empty-drawing-surface--'));
+        // Most likely, `dontdraw` was set in the options
+        return new Promise(function (resolve, reject) {
+            resolve(null);
+        });
 	}
 	// Draw the image
 	this.drawing.init(this.maxx - this.minx + 1, this.maxy - this.miny + 1,
@@ -36227,7 +36230,7 @@ return {
         toCanvas:ToCanvas, render:Render, raw:Raw,
         fixupOptions:FixupOptions,
         loadFont:FontLib.loadFont,
-        VERSION:'2.0.7 (2020-06-03)',
+        VERSION:'2.0.8 (2020-06-25)',
 
         // Internals
         BWIPJS:BWIPJS, BWIPP:BWIPP, STBTT:STBTT, FontLib:FontLib,

dist/bwip-js.js

@@ -33665,7 +33665,10 @@ BWIPJS.prototype.bbox = function(x0, y0, x1, y1) {
 };
 BWIPJS.prototype.render = function() {
 	if (this.minx === Infinity) {
-		return callback(new Error('--empty-drawing-surface--'));
+        // Most likely, `dontdraw` was set in the options
+        return new Promise(function (resolve, reject) {
+            resolve(null);
+        });
 	}
 	// Draw the image
 	this.drawing.init(this.maxx - this.minx + 1, this.maxy - this.miny + 1,
@@ -36401,7 +36404,7 @@ return {
         request:Request, toBuffer:ToBuffer, render:Render, raw:Raw,
         fixupOptions:FixupOptions,
         loadFont:FontLib.loadFont,
-        VERSION:'2.0.7 (2020-06-03)',
+        VERSION:'2.0.8 (2020-06-25)',
 
         // Internals
         BWIPJS:BWIPJS, BWIPP:BWIPP, STBTT:STBTT, FontLib:FontLib,

dist/node-bwipjs.js

@@ -1,6 +1,6 @@
 {
   "name": "bwip-js",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "JavaScript barcode generator supporting over 100 types and standards.",
   "main": "./dist/node-bwipjs.js",
   "browser": "./dist/bwip-js.js",

package.json

@@ -636,7 +636,10 @@ BWIPJS.prototype.bbox = function(x0, y0, x1, y1) {
 };
 BWIPJS.prototype.render = function() {
 	if (this.minx === Infinity) {
-		return callback(new Error('--empty-drawing-surface--'));
+        // Most likely, `dontdraw` was set in the options
+        return new Promise(function (resolve, reject) {
+            resolve(null);
+        });
 	}
 	// Draw the image
 	this.drawing.init(this.maxx - this.minx + 1, this.maxy - this.miny + 1,

src/bwipjs.js

@@ -32724,7 +32724,7 @@ function BWIPP() {
 		}
 
 		// Don't draw? (See file runtest)
-		$0.bwipjs_dontdraw = dontdraw || false;
+		$0.bwipjs_dontdraw = opts.dontdraw || dontdraw || false;
 
 		// Convert opts to a Map
 		var map = new Map;
@@ -32741,7 +32741,7 @@ function BWIPP() {
 		$0[encoder]();
 
 		// Return what is left on the stack.  This branch should only be taken
-		// when running tests with the dontdraw option.
+		// when running with the dontdraw option.
 		if ($j) {
 			return $k.splice(0, $j);
 		}