Update dist

dingosky · dingosky · commit 1a0b536bc7cc · 2018-04-23T10:23:39.000-07:00
diff --git a/dist/lib/charset.js b/dist/lib/charset.js
@@ -4,10 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _log = require('babel-runtime/core-js/math/log2');
-
-var _log2 = _interopRequireDefault(_log);
-
 var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
@@ -16,13 +12,21 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
+var _log = require('babel-runtime/core-js/math/log2');
+
+var _log2 = _interopRequireDefault(_log);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var WeakMap = require('weak-map');
 
 var propMap = new WeakMap();
-
 var BITS_PER_BYTE = 8;
+var abs = Math.abs,
+    ceil = Math.ceil,
+    floor = Math.floor,
+    log2 = _log2.default;
+
 
 var gcd = function gcd(a, b) {
   var la = a;
@@ -32,7 +36,7 @@ var gcd = function gcd(a, b) {
     la = _ref[0];
     lb = _ref[1];
   }
-  return Math.abs(la);
+  return abs(la);
 };
 var lcm = function lcm(a, b) {
   return a / gcd(a, b) * b;
@@ -48,16 +52,16 @@ var genNdxFn = function genNdxFn(bitsPerChar) {
       return (bytes[chunk] << lShift * slice & 0xff) >> rShift;
     };
   }
-  // Otherwise, while slicing off bits per char, we will possibly straddle a couple
-  // of bytes, so a bit more work is involved
 
+  // Otherwise, while slicing off bits per char, we can possibly straddle two
+  // of bytes, so a more work is involved
   var slicesPerChunk = lcm(bitsPerChar, BITS_PER_BYTE) / BITS_PER_BYTE;
   return function (chunk, slice, bytes) {
     var bNum = chunk * slicesPerChunk;
 
     var offset = slice * bitsPerChar / BITS_PER_BYTE;
-    var lOffset = Math.floor(offset);
-    var rOffset = Math.ceil(offset);
+    var lOffset = floor(offset);
+    var rOffset = ceil(offset);
 
     var rShift = BITS_PER_BYTE - bitsPerChar;
     var lShift = slice * bitsPerChar % BITS_PER_BYTE;
@@ -87,7 +91,7 @@ var CharSet = function () {
     if (![2, 4, 8, 16, 32, 64].includes(length)) {
       throw new Error('Invalid char count: must be one of 2,4,8,16,32,64');
     }
-    var bitsPerChar = Math.floor((0, _log2.default)(length));
+    var bitsPerChar = floor(log2(length));
     // Ensure no repeated characters
     for (var i = 0; i < length; i += 1) {
       var c = chars.charAt(i);
@@ -135,8 +139,8 @@ var CharSet = function () {
   }, {
     key: 'bytesNeeded',
     value: function bytesNeeded(bitLen) {
-      var count = Math.ceil(bitLen / this.bitsPerChar());
-      return Math.ceil(count * this.bitsPerChar() / BITS_PER_BYTE);
+      var count = ceil(bitLen / this.bitsPerChar());
+      return ceil(count * this.bitsPerChar() / BITS_PER_BYTE);
     }
 
     // Aliases
diff --git a/dist/lib/entropy.js b/dist/lib/entropy.js
@@ -33,8 +33,13 @@ var charset4 = exports.charset4 = new CharSet('ATCG');
 var charset2 = exports.charset2 = new CharSet('01');
 
 var propMap = new WeakMap();
-
 var BITS_PER_BYTE = 8;
+var ceil = Math.ceil,
+    floor = Math.floor,
+    log2 = _log2.default,
+    random = Math.random,
+    round = Math.round;
+
 
 var endianByteNum = function () {
   var buf32 = new Uint32Array(1);
@@ -48,10 +53,6 @@ var _stringWithBytes = function _stringWithBytes(bytes, bitLen, charset) {
     return '';
   }
 
-  var floor = Math.floor,
-      ceil = Math.ceil;
-
-
   var bitsPerChar = charset.getBitsPerChar();
   var count = ceil(bitLen / bitsPerChar);
   if (count <= 0) {
@@ -84,18 +85,18 @@ var _stringWithBytes = function _stringWithBytes(bytes, bitLen, charset) {
   return string;
 };
 
-var cryptoBytes = function cryptoBytes(count) {
+var csprngBytes = function csprngBytes(count) {
   return Buffer.from(Crypto.randomBytes(count));
 };
 
 var prngBytes = function prngBytes(count) {
   var BYTES_USED_PER_RANDOM_CALL = 6;
-  var randCount = Math.ceil(count / BYTES_USED_PER_RANDOM_CALL);
+  var randCount = ceil(count / BYTES_USED_PER_RANDOM_CALL);
 
   var buffer = Buffer.alloc(count);
   var dataView = new DataView(new ArrayBuffer(BITS_PER_BYTE));
   for (var rNum = 0; rNum < randCount; rNum += 1) {
-    dataView.setFloat64(0, Math.random());
+    dataView.setFloat64(0, random());
     for (var n = 0; n < BYTES_USED_PER_RANDOM_CALL; n += 1) {
       var fByteNum = endianByteNum[n];
       var bByteNum = rNum * BYTES_USED_PER_RANDOM_CALL + n;
@@ -111,8 +112,6 @@ var entropyBits = function entropyBits(total, risk) {
   if (total === 0) {
     return 0;
   }
-  var log2 = _log2.default;
-
   var N = void 0;
   if (total < 1000) {
     N = log2(total) + log2(total - 1);
@@ -177,8 +176,6 @@ var _class = function () {
     }
 
     var bitLen = void 0;
-    var round = Math.round;
-
     if (params.bits) {
       bitLen = round(params.bits);
     } else if (params.total && params.risk) {
@@ -245,7 +242,7 @@ var _class = function () {
       var charset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : propMap.get(this).charset;
 
       var bytesNeeded = charset.bytesNeeded(bitLen);
-      var bytes = propMap.get(this).prng ? prngBytes(bytesNeeded) : cryptoBytes(bytesNeeded);
+      var bytes = propMap.get(this).prng ? prngBytes(bytesNeeded) : csprngBytes(bytesNeeded);
       return this.stringWithBytes(bytes, bitLen, charset);
     }
   }, {
