String with bytes signature

dingosky · dingosky · commit 62c03f603bc2 · 2018-04-20T10:11:03.000-07:00
Switch to allow default bitLen
diff --git a/dist/lib/entropy.js b/dist/lib/entropy.js
@@ -43,7 +43,7 @@ var endianByteNum = function () {
   return buf8[0] === 0xff ? [2, 3, 4, 5, 6, 7] : [0, 1, 2, 3, 6, 7];
 }();
 
-var _stringWithBytes = function _stringWithBytes(bitLen, bytes, charset) {
+var _stringWithBytes = function _stringWithBytes(bytes, bitLen, charset) {
   if (bitLen <= 0) {
     return '';
   }
@@ -207,7 +207,7 @@ var _class = function () {
       var charset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : propMap.get(this).charset;
 
       var bytesNeeded = charset.bytesNeeded(bitLen);
-      return this.stringWithBytes(bitLen, cryptoBytes(bytesNeeded), charset);
+      return this.stringWithBytes(cryptoBytes(bytesNeeded), bitLen, charset);
     }
   }, {
     key: 'stringPRNG',
@@ -216,7 +216,7 @@ var _class = function () {
       var charset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : propMap.get(this).charset;
 
       var bytesNeeded = charset.bytesNeeded(bitLen);
-      return this.stringWithBytes(bitLen, randomBytes(bytesNeeded), charset);
+      return this.stringWithBytes(randomBytes(bytesNeeded), bitLen, charset);
     }
 
     /**
@@ -233,10 +233,10 @@ var _class = function () {
     }
   }, {
     key: 'stringWithBytes',
-    value: function stringWithBytes(bitLen, bytes) {
+    value: function stringWithBytes(bytes, bitLen) {
       var charset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : propMap.get(this).charset;
 
-      return _stringWithBytes(bitLen, bytes, charset);
+      return _stringWithBytes(bytes, bitLen, charset);
     }
   }, {
     key: 'bytesNeeded',
diff --git a/examples/custom_bytes.js b/examples/custom_bytes.js
@@ -1,14 +1,13 @@
 // Custom bytes
-
 const { default: Entropy } = require('./entropy')
 
-const entropy = new Entropy()
+const entropy = new Entropy({ bits: 30 })
 const bytes = Buffer.from([250, 200, 150, 100])
-let string = entropy.stringWithBytes(30, bytes)
+let string = entropy.stringWithBytes(bytes)
 console.log(`\n  Custom bytes string : ${string}\n`)
 
 try {
-  string = entropy.stringWithBytes(32, bytes)
+  string = entropy.stringWithBytes(bytes, 32)
 } catch (error) {
   console.log(`  Error: ${error.message}\n`)
 }
diff --git a/lib/entropy.js b/lib/entropy.js
@@ -21,7 +21,7 @@ const endianByteNum = (() => {
   return (buf8[0] === 0xff) ? [2, 3, 4, 5, 6, 7] : [0, 1, 2, 3, 6, 7]
 })()
 
-const stringWithBytes = (bitLen, bytes, charset) => {
+const stringWithBytes = (bytes, bitLen, charset) => {
   if (bitLen <= 0) { return '' }
 
   const bitsPerChar = charset.getBitsPerChar()
@@ -154,12 +154,12 @@ export default class {
 
   string(bitLen = propMap.get(this).bitLen, charset = propMap.get(this).charset) {
     const bytesNeeded = charset.bytesNeeded(bitLen)
-    return this.stringWithBytes(bitLen, cryptoBytes(bytesNeeded), charset)
+    return this.stringWithBytes(cryptoBytes(bytesNeeded), bitLen, charset)
   }
 
   stringPRNG(bitLen = propMap.get(this).bitLen, charset = propMap.get(this).charset) {
     const bytesNeeded = charset.bytesNeeded(bitLen)
-    return this.stringWithBytes(bitLen, randomBytes(bytesNeeded), charset)
+    return this.stringWithBytes(randomBytes(bytesNeeded), bitLen, charset)
   }
 
   /**
@@ -169,8 +169,8 @@ export default class {
     return this.stringPRNG(bitLen, charset)
   }
 
-  stringWithBytes(bitLen, bytes, charset = propMap.get(this).charset) {
-    return stringWithBytes(bitLen, bytes, charset)
+  stringWithBytes(bytes, bitLen, charset = propMap.get(this).charset) {
+    return stringWithBytes(bytes, bitLen, charset)
   }
 
   bytesNeeded(bitLen = propMap.get(this).bitLen, charset = propMap.get(this).charset) {
diff --git a/test/entropy.js b/test/entropy.js
