Skip to content

Commit 1a0b536

Browse files
dingoskydingosky
committed
Update dist
1 parent 2c99b57 commit 1a0b536

File tree

2 files changed

+27
-26
lines changed

2 files changed

+27
-26
lines changed

‎dist/lib/charset.js

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
66

7-
var _log = require('babel-runtime/core-js/math/log2');
8-
9-
var _log2 = _interopRequireDefault(_log);
10-
117
var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
128

139
var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
@@ -16,13 +12,21 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
1612

1713
var _createClass3 = _interopRequireDefault(_createClass2);
1814

15+
var _log = require('babel-runtime/core-js/math/log2');
16+
17+
var _log2 = _interopRequireDefault(_log);
18+
1919
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
2020

2121
var WeakMap = require('weak-map');
2222

2323
var propMap = new WeakMap();
24-
2524
var BITS_PER_BYTE = 8;
25+
var abs = Math.abs,
26+
ceil = Math.ceil,
27+
floor = Math.floor,
28+
log2 = _log2.default;
29+
2630

2731
var gcd = function gcd(a, b) {
2832
var la = a;
@@ -32,7 +36,7 @@ var gcd = function gcd(a, b) {
3236
la = _ref[0];
3337
lb = _ref[1];
3438
}
35-
return Math.abs(la);
39+
return abs(la);
3640
};
3741
var lcm = function lcm(a, b) {
3842
return a / gcd(a, b) * b;
@@ -48,16 +52,16 @@ var genNdxFn = function genNdxFn(bitsPerChar) {
4852
return (bytes[chunk] << lShift * slice & 0xff) >> rShift;
4953
};
5054
}
51-
// Otherwise, while slicing off bits per char, we will possibly straddle a couple
52-
// of bytes, so a bit more work is involved
5355

56+
// Otherwise, while slicing off bits per char, we can possibly straddle two
57+
// of bytes, so a more work is involved
5458
var slicesPerChunk = lcm(bitsPerChar, BITS_PER_BYTE) / BITS_PER_BYTE;
5559
return function (chunk, slice, bytes) {
5660
var bNum = chunk * slicesPerChunk;
5761

5862
var offset = slice * bitsPerChar / BITS_PER_BYTE;
59-
var lOffset = Math.floor(offset);
60-
var rOffset = Math.ceil(offset);
63+
var lOffset = floor(offset);
64+
var rOffset = ceil(offset);
6165

6266
var rShift = BITS_PER_BYTE - bitsPerChar;
6367
var lShift = slice * bitsPerChar % BITS_PER_BYTE;
@@ -87,7 +91,7 @@ var CharSet = function () {
8791
if (![2, 4, 8, 16, 32, 64].includes(length)) {
8892
throw new Error('Invalid char count: must be one of 2,4,8,16,32,64');
8993
}
90-
var bitsPerChar = Math.floor((0, _log2.default)(length));
94+
var bitsPerChar = floor(log2(length));
9195
// Ensure no repeated characters
9296
for (var i = 0; i < length; i += 1) {
9397
var c = chars.charAt(i);
@@ -135,8 +139,8 @@ var CharSet = function () {
135139
}, {
136140
key: 'bytesNeeded',
137141
value: function bytesNeeded(bitLen) {
138-
var count = Math.ceil(bitLen / this.bitsPerChar());
139-
return Math.ceil(count * this.bitsPerChar() / BITS_PER_BYTE);
142+
var count = ceil(bitLen / this.bitsPerChar());
143+
return ceil(count * this.bitsPerChar() / BITS_PER_BYTE);
140144
}
141145

142146
// Aliases

‎dist/lib/entropy.js

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,13 @@ var charset4 = exports.charset4 = new CharSet('ATCG');
3333
var charset2 = exports.charset2 = new CharSet('01');
3434

3535
var propMap = new WeakMap();
36-
3736
var BITS_PER_BYTE = 8;
37+
var ceil = Math.ceil,
38+
floor = Math.floor,
39+
log2 = _log2.default,
40+
random = Math.random,
41+
round = Math.round;
42+
3843

3944
var endianByteNum = function () {
4045
var buf32 = new Uint32Array(1);
@@ -48,10 +53,6 @@ var _stringWithBytes = function _stringWithBytes(bytes, bitLen, charset) {
4853
return '';
4954
}
5055

51-
var floor = Math.floor,
52-
ceil = Math.ceil;
53-
54-
5556
var bitsPerChar = charset.getBitsPerChar();
5657
var count = ceil(bitLen / bitsPerChar);
5758
if (count <= 0) {
@@ -84,18 +85,18 @@ var _stringWithBytes = function _stringWithBytes(bytes, bitLen, charset) {
8485
return string;
8586
};
8687

87-
var cryptoBytes = function cryptoBytes(count) {
88+
var csprngBytes = function csprngBytes(count) {
8889
return Buffer.from(Crypto.randomBytes(count));
8990
};
9091

9192
var prngBytes = function prngBytes(count) {
9293
var BYTES_USED_PER_RANDOM_CALL = 6;
93-
var randCount = Math.ceil(count / BYTES_USED_PER_RANDOM_CALL);
94+
var randCount = ceil(count / BYTES_USED_PER_RANDOM_CALL);
9495

9596
var buffer = Buffer.alloc(count);
9697
var dataView = new DataView(new ArrayBuffer(BITS_PER_BYTE));
9798
for (var rNum = 0; rNum < randCount; rNum += 1) {
98-
dataView.setFloat64(0, Math.random());
99+
dataView.setFloat64(0, random());
99100
for (var n = 0; n < BYTES_USED_PER_RANDOM_CALL; n += 1) {
100101
var fByteNum = endianByteNum[n];
101102
var bByteNum = rNum * BYTES_USED_PER_RANDOM_CALL + n;
@@ -111,8 +112,6 @@ var entropyBits = function entropyBits(total, risk) {
111112
if (total === 0) {
112113
return 0;
113114
}
114-
var log2 = _log2.default;
115-
116115
var N = void 0;
117116
if (total < 1000) {
118117
N = log2(total) + log2(total - 1);
@@ -177,8 +176,6 @@ var _class = function () {
177176
}
178177

179178
var bitLen = void 0;
180-
var round = Math.round;
181-
182179
if (params.bits) {
183180
bitLen = round(params.bits);
184181
} else if (params.total && params.risk) {
@@ -245,7 +242,7 @@ var _class = function () {
245242
var charset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : propMap.get(this).charset;
246243

247244
var bytesNeeded = charset.bytesNeeded(bitLen);
248-
var bytes = propMap.get(this).prng ? prngBytes(bytesNeeded) : cryptoBytes(bytesNeeded);
245+
var bytes = propMap.get(this).prng ? prngBytes(bytesNeeded) : csprngBytes(bytesNeeded);
249246
return this.stringWithBytes(bytes, bitLen, charset);
250247
}
251248
}, {

0 commit comments

Comments
 (0)