Move predefined CharSet declarations

dingosky · dingosky · commit 0eeec74c3c75 · 2018-03-28T13:05:32.000-07:00
diff --git a/entropy-string.js b/entropy-string.js
@@ -1,13 +1,11 @@
 const Random = require('./dist/lib/random').default
-const Entropy = require('./dist/lib/entropy').default
 const CharSet = require('./dist/lib/charset').default
 const {
   charset2, charset4, charset8, charset16, charset32, charset64
-} = require('./dist/lib/charset')
+} = require('./dist/lib/entropy')
 
 module.exports = {
   Random,
-  Entropy,
   CharSet,
   charset2,
   charset4,
diff --git a/examples/charSet.js b/examples/charSet.js
diff --git a/examples/charSet.js b/examples/charSet.js
@@ -0,0 +1 @@
+../lib/charset.js
diff --git a/examples/charSets.js b/examples/charSets.js
@@ -2,7 +2,7 @@
 
 const {
   charset64, charset32, charset16, charset8, charset4, charset2
-} = require('./entropy-string')
+} = require('./entropy')
 
 console.log(`\n  charset64: ${charset64.chars()}`)
 console.log(`\n  charset32: ${charset32.chars()}`)
diff --git a/examples/custom_chars_1.js b/examples/custom_chars_1.js
@@ -1,6 +1,7 @@
 // Custom characters: HT for coin flip
 
-const { Random, charset2 } = require('./entropy-string')
+const { Random } = require('./entropy-string')
+const { charset2 } = require('./entropy')
 
 const random = new Random(charset2)
 let flips = random.string(10)
diff --git a/examples/entropy-string.js b/examples/entropy-string.js
@@ -3,7 +3,7 @@ const Entropy = require('./entropy').default
 const CharSet = require('./charset').default
 const {
   charset2, charset4, charset8, charset16, charset32, charset64
-} = require('./charset')
+} = require('./entropy')
 
 module.exports = {
   Random,
diff --git a/examples/gen5.js b/examples/gen5.js
@@ -1,5 +1,5 @@
-const { Random, Entropy, charset16 } = require('./entropy-string')
-const { entropyBits } = require('./entropy')
+const { Random } = require('./entropy-string')
+const { entropyBits, charset16 } = require('./entropy')
 
 const random = new Random(charset16)
 const bits = entropyBits(10000, 1000000)
diff --git a/examples/tldr_2.js b/examples/tldr_2.js
@@ -1,8 +1,8 @@
 // Generate a potential of _1 million_ random strings with _1 in a billion_ chance of repeat using
 // hexadecimal strings.
 
-const { Random, charset16 } = require('./entropy-string')
-const { entropyBits } = require('./entropy')
+const { Random } = require('./entropy-string')
+const { entropyBits, charset16 } = require('./entropy')
 
 const random = new Random(charset16)
 const bits = entropyBits(1e6, 1e9)
diff --git a/examples/tldr_6.js b/examples/tldr_6.js
@@ -1,9 +1,9 @@
 // Base 64 character 256 bit token
 
-const { Random, charset64 } = require('./entropy-string')
+const { Random } = require('./entropy-string')
+const { charset64 } = require('./entropy')
 
 const random = new Random(charset64)
-
 const string = random.token()
 
 console.log(`\n  256 bit token using RFC 4648 URL and file system safe characters: ${string}\n`)
diff --git a/lib/charset.js b/lib/charset.js
@@ -102,10 +102,3 @@ export default class CharSet {
   ndxFn() { return this.getNdxFn() }
   bitsPerChar() { return this.getBitsPerChar() }
 }
-
-export const charset64 = new CharSet('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_')
-export const charset32 = new CharSet('2346789bdfghjmnpqrtBDFGHJLMNPQRT')
-export const charset16 = new CharSet('0123456789abcdef')
-export const charset8 = new CharSet('01234567')
-export const charset4 = new CharSet('ATCG')
-export const charset2 = new CharSet('01')
diff --git a/lib/entropy.js b/lib/entropy.js
@@ -1,3 +1,5 @@
+const CharSet = require('./charset').default
+
 export const entropyBits = (total, risk) => {
   if (total === 0) { return 0 }
 
@@ -11,3 +13,10 @@ export const entropyBits = (total, risk) => {
   }
   return (N + log2(risk)) - 1
 }
+
+export const charset64 = new CharSet('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_')
+export const charset32 = new CharSet('2346789bdfghjmnpqrtBDFGHJLMNPQRT')
+export const charset16 = new CharSet('0123456789abcdef')
+export const charset8 = new CharSet('01234567')
+export const charset4 = new CharSet('ATCG')
+export const charset2 = new CharSet('01')
diff --git a/lib/random.js b/lib/random.js
@@ -1,5 +1,5 @@
 const CharSet = require('./charset').default
-const { charset32 } = require('./charset')
+const { charset32 } = require('./entropy')
 
 const Crypto = require('crypto')
 const WeakMap = require('weak-map')
diff --git a/test/charSet.js b/test/charSet.js
@@ -1,7 +1,7 @@
 const CharSet = require('../lib/charset').default
 const {
   charset64, charset32, charset16, charset8, charset4, charset2
-} = require('../lib/charset')
+} = require('../lib/entropy')
 
 const test = require('ava')
 
diff --git a/test/random.js b/test/random.js
@@ -2,7 +2,7 @@ const Random = require('../lib/random').default
 const CharSet = require('../lib/charset').default
 const {
   charset64, charset32, charset16, charset8, charset4, charset2
-} = require('../lib/charset')
+} = require('../lib/entropy')
 
 const test = require('ava')
 
