modify barcode

Author: lsongdev

barcode.js

@@ -6,7 +6,7 @@ const getPixels    = require('get-pixels');
 const Buffer       = require('mutable-buffer');
 const EventEmitter = require('events');
 const Image        = require('./image');
-const Barcode      = require('./barcode');
+const utils        = require('./utils');
 const _            = require('./commands');
 
 /**
@@ -278,8 +278,17 @@ Printer.prototype.hardware = function(hw){
  * @return printer instance
  */
 Printer.prototype.barcode = function(code, type, width, height, position, font){
-  var convertCode = String(code);
-  var parityBit = ''
+	type = type || 'EAN13'; // default type is EAN13, may a good choice ?
+  var convertCode = String(code), parityBit = '';
+  if(typeof type === 'undefined' || type === null){
+    throw new TypeError('barcode type is required');
+  }
+  if (type === 'EAN13' && convertCode.length != 12) {
+    throw new Error('EAN13 Barcode type requires code length 12');
+  }
+  if (type === 'EAN8' && convertCode.length != 7) {
+    throw new Error('EAN8 Barcode type requires code length 7');
+  }
   if(width >= 2 || width <= 6){
     this.buffer.write(_.BARCODE_FORMAT.BARCODE_WIDTH[width]);
   }else{
@@ -299,14 +308,8 @@ Printer.prototype.barcode = function(code, type, width, height, position, font){
   this.buffer.write(_.BARCODE_FORMAT[
     'BARCODE_' + ((type || 'EAN13').replace('-', '_').toUpperCase())
   ]);
-  if ((!type || type === 'EAN13') && convertCode.length != 12) {
-    throw Error('EAN13 Barcode type requires code length 12');
-  }
-  if (type === 'EAN8' && convertCode.length != 7) {
-    throw Error('EAN8 Barcode type requires code length 7');
-  }
-  if (!type || type === 'EAN13' || type === 'EAN8') {
-    parityBit = Barcode.getParityBit(code, type || 'EAN13');
+  if (type === 'EAN13' || type === 'EAN8') {
+    parityBit = utils.getParityBit(code);
   }
   this.buffer.write(code + parityBit);
   return this;
@@ -364,7 +367,7 @@ Printer.prototype.qrimage = function(content, options, callback){
  * @return {[type]}         [description]
  */
 Printer.prototype.image = function(image, density){
-  if(!(image instanceof Image)) 
+  if(!(image instanceof Image))
     throw new TypeError('Only escpos.Image supported');
   density = density || 'd24';
   var n = !!~[ 'd8', 's8' ].indexOf(density) ? 1 : 3;
@@ -389,11 +392,11 @@ Printer.prototype.image = function(image, density){
  * @return {[type]}       [description]
  */
 Printer.prototype.raster = function (image, mode) {
-  if(!(image instanceof Image)) 
+  if(!(image instanceof Image))
     throw new TypeError('Only escpos.Image supported');
   mode = mode || 'normal';
-  if (mode === 'dhdw' || 
-      mode === 'dwh'  || 
+  if (mode === 'dhdw' ||
+      mode === 'dwh'  ||
       mode === 'dhw') mode = 'dwdh';
   var raster = image.toRaster();
   var header = _.GSV0_FORMAT['GSV0_' + mode.toUpperCase()];

printer.js

@@ -0,0 +1,11 @@
+/**
+ * [getParityBit description]
+ * @return {[type]} [description]
+ */
+exports.getParityBit = function (str){
+  var parity = 0, reversedCode = str.split('').reverse().join('');
+  for (var counter = 0; counter < reversedCode.length; counter += 1) {
+    parity += parseInt(reversedCode.charAt(counter), 10) * Math.pow(3, ((counter + 1) % 2));
+  }
+  return String((10 - (parity % 10)) % 10);
+};

utils.js

@@ -151,18 +151,12 @@ [email protected]:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz#18ae979a6a0ca994b0625853916d2662bbae0b1a"
 
-[email protected]:
+[email protected], debug@^2.2.0, debug@^2.3.2:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
   dependencies:
     ms "0.7.2"
 
-debug@^2.2.0, debug@^2.3.2:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.6.tgz#a9fa6fbe9ca43cf1e79f73b75c0189cbb7d6db5a"
-  dependencies:
-    ms "0.7.3"
-
 deep-extend@~0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.1.tgz#efe4113d08085f4e6f9687759810f807469e2253"
@@ -540,10 +534,6 @@ [email protected]:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
 
-[email protected]:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
-
 mutable-buffer@*:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/mutable-buffer/-/mutable-buffer-2.0.3.tgz#67bca5568bf15d3f6035fb716e3899dc44901c8c"