refactor: cleanup named exports mixed usage

Signed-off-by: Jérôme Benoit <[email protected]>

fibonacci-heap.js

@@ -317,6 +317,5 @@ MaxFibonacciHeap.from = function(iterable, comparator) {
  */
 FibonacciHeap.MinFibonacciHeap = FibonacciHeap;
 FibonacciHeap.MaxFibonacciHeap = MaxFibonacciHeap;
-exports.MinFibonacciHeap = FibonacciHeap;
-exports.MaxFibonacciHeap = MaxFibonacciHeap;
+
 module.exports = FibonacciHeap;

heap.js

@@ -573,6 +573,4 @@ Heap.nlargest = nlargest;
 Heap.MinHeap = Heap;
 Heap.MaxHeap = MaxHeap;
 
-exports.MinHeap = Heap;
-exports.MaxHeap = MaxHeap;
 module.exports = Heap;

index.js

@@ -5,6 +5,11 @@
  * Exporting every data structure through a unified endpoint. Consumers
  * of this library should prefer the modular access though.
  */
+var Heap = require('./heap.js'),
+  FibonacciHeap = require('./fibonacci-heap.js'),
+  SuffixArray = require('./suffix-array.js'),
+  Vector = require('./vector.js');
+
 module.exports = {
   BiMap: require('./bi-map.js'),
   BitSet: require('./bit-set.js'),
@@ -16,16 +21,16 @@ module.exports = {
   DefaultWeakMap: require('./default-weak-map.js'),
   FixedDeque: require('./fixed-deque.js'),
   StaticDisjointSet: require('./static-disjoint-set.js'),
-  FibonacciHeap: require('./fibonacci-heap.js'),
-  MinFibonacciHeap: require('./fibonacci-heap.js').MinFibonacciHeap,
-  MaxFibonacciHeap: require('./fibonacci-heap.js').MaxFibonacciHeap,
+  FibonacciHeap: FibonacciHeap,
+  MinFibonacciHeap: FibonacciHeap.MinFibonacciHeap,
+  MaxFibonacciHeap: FibonacciHeap.MaxFibonacciHeap,
   FixedReverseHeap: require('./fixed-reverse-heap.js'),
   FuzzyMap: require('./fuzzy-map.js'),
   FuzzyMultiMap: require('./fuzzy-multi-map.js'),
   HashedArrayTree: require('./hashed-array-tree.js'),
-  Heap: require('./heap.js'),
-  MinHeap: require('./heap.js').MinHeap,
-  MaxHeap: require('./heap.js').MaxHeap,
+  Heap: Heap,
+  MinHeap: Heap.MinHeap,
+  MaxHeap: Heap.MaxHeap,
   StaticIntervalTree: require('./static-interval-tree.js'),
   InvertedIndex: require('./inverted-index.js'),
   KDTree: require('./kd-tree.js'),
@@ -40,25 +45,25 @@ module.exports = {
   Queue: require('./queue.js'),
   FixedStack: require('./fixed-stack.js'),
   Stack: require('./stack.js'),
-  SuffixArray: require('./suffix-array.js'),
-  GeneralizedSuffixArray: require('./suffix-array.js').GeneralizedSuffixArray,
+  SuffixArray: SuffixArray,
+  GeneralizedSuffixArray: SuffixArray.GeneralizedSuffixArray,
   set: require('./set.js'),
   SparseQueueSet: require('./sparse-queue-set.js'),
   SparseMap: require('./sparse-map.js'),
   SparseSet: require('./sparse-set.js'),
   SymSpell: require('./symspell.js'),
   Trie: require('./trie.js'),
   TrieMap: require('./trie-map.js'),
-  Vector: require('./vector.js'),
-  Uint8Vector: require('./vector.js').Uint8Vector,
-  Uint8ClampedVector: require('./vector.js').Uint8ClampedVector,
-  Int8Vector: require('./vector.js').Int8Vector,
-  Uint16Vector: require('./vector.js').Uint16Vector,
-  Int16Vector: require('./vector.js').Int16Vector,
-  Uint32Vector: require('./vector.js').Uint32Vector,
-  Int32Vector: require('./vector.js').Int32Vector,
-  Float32Vector: require('./vector.js').Float32Vector,
-  Float64Vector: require('./vector.js').Float64Vector,
-  PointerVector: require('./vector.js').PointerVector,
+  Vector: Vector,
+  Uint8Vector: Vector.Uint8Vector,
+  Uint8ClampedVector: Vector.Uint8ClampedVector,
+  Int8Vector: Vector.Int8Vector,
+  Uint16Vector: Vector.Uint16Vector,
+  Int16Vector: Vector.Int16Vector,
+  Uint32Vector: Vector.Uint32Vector,
+  Int32Vector: Vector.Int32Vector,
+  Float32Vector: Vector.Float32Vector,
+  Float64Vector: Vector.Float64Vector,
+  PointerVector: Vector.PointerVector,
   VPTree: require('./vp-tree.js')
 };

index.mjs

@@ -5,6 +5,25 @@
  * Exporting every data structure through a unified endpoint.
  */
 import * as set from './set.js';
+import {default as FibonacciHeap} from './fibonacci-heap.js';
+const MinFibonacciHeap = FibonacciHeap.MinFibonacciHeap;
+const MaxFibonacciHeap = FibonacciHeap.MaxFibonacciHeap;
+import {default as Heap} from './heap.js';
+const MinHeap = Heap.MinHeap;
+const MaxHeap = Heap.MaxHeap;
+import {default as SuffixArray} from './suffix-array.js';
+const GeneralizedSuffixArray = SuffixArray.GeneralizedSuffixArray;
+import {default as Vector} from './vector.js';
+const Uint8Vector = Vector.Uint8Vector;
+const Uint8ClampedVector = Vector.Uint8ClampedVector;
+const Int8Vector = Vector.Int8Vector;
+const Uint16Vector = Vector.Uint16Vector;
+const Int16Vector = Vector.Int16Vector;
+const Uint32Vector = Vector.Uint32Vector;
+const Int32Vector = Vector.Int32Vector;
+const Float32Vector = Vector.Float32Vector;
+const Float64Vector = Vector.Float64Vector;
+const PointerVector = Vector.PointerVector;
 
 export {default as BiMap} from './bi-map.js';
 export {default as BitSet} from './bit-set.js';
@@ -16,12 +35,12 @@ export {default as DefaultMap} from './default-map.js';
 export {default as DefaultWeakMap} from './default-weak-map.js';
 export {default as FixedDeque} from './fixed-deque.js';
 export {default as StaticDisjointSet} from './static-disjoint-set.js';
-export {default as FibonacciHeap, MinFibonacciHeap, MaxFibonacciHeap} from './fibonacci-heap.js';
+export {FibonacciHeap, MinFibonacciHeap, MaxFibonacciHeap};
 export {default as FixedReverseHeap} from './fixed-reverse-heap.js';
 export {default as FuzzyMap} from './fuzzy-map.js';
 export {default as FuzzyMultiMap} from './fuzzy-multi-map.js';
 export {default as HashedArrayTree} from './hashed-array-tree.js';
-export {default as Heap, MinHeap, MaxHeap} from './heap.js';
+export {Heap, MinHeap, MaxHeap};
 export {default as StaticIntervalTree} from './static-interval-tree.js';
 export {default as InvertedIndex} from './inverted-index.js';
 export {default as KDTree} from './kd-tree.js';
@@ -36,13 +55,13 @@ export {default as PassjoinIndex} from './passjoin-index.js';
 export {default as Queue} from './queue.js';
 export {default as FixedStack} from './fixed-stack.js';
 export {default as Stack} from './stack.js';
-export {default as SuffixArray, GeneralizedSuffixArray} from './suffix-array.js';
+export {SuffixArray, GeneralizedSuffixArray};
 export {set};
 export {default as SparseQueueSet} from './sparse-queue-set.js';
 export {default as SparseMap} from './sparse-map.js';
 export {default as SparseSet} from './sparse-set.js';
 export {default as SymSpell} from './symspell.js';
 export {default as Trie} from './trie.js';
 export {default as TrieMap} from './trie-map.js';
-export {default as Vector, Uint8Vector, Uint8ClampedVector, Int8Vector, Uint16Vector, Int16Vector, Uint32Vector, Int32Vector, Float32Vector, Float64Vector, PointerVector} from './vector.js';
+export {Vector, Uint8Vector, Uint8ClampedVector, Int8Vector, Uint16Vector, Int16Vector, Uint32Vector, Int32Vector, Float32Vector, Float64Vector, PointerVector};
 export {default as VPTree} from './vp-tree.js';

suffix-array.js

@@ -349,5 +349,5 @@ if (typeof Symbol !== 'undefined')
  * Exporting.
  */
 SuffixArray.GeneralizedSuffixArray = GeneralizedSuffixArray;
-exports.GeneralizedSuffixArray = GeneralizedSuffixArray;
+
 module.exports = SuffixArray;

vector.js

@@ -370,14 +370,4 @@ Vector.Float32Vector = subClass(Float32Array);
 Vector.Float64Vector = subClass(Float64Array);
 Vector.PointerVector = subClass(pointerArrayFactory);
 
-exports.Int8Vector = Vector.Int8Vector;
-exports.Uint8Vector = Vector.Uint8Vector;
-exports.Uint8ClampedVector = Vector.Uint8ClampedVector;
-exports.Int16Vector = Vector.Int16Vector;
-exports.Uint16Vector = Vector.Uint16Vector;
-exports.Int32Vector = Vector.Int32Vector;
-exports.Uint32Vector = Vector.Uint32Vector;
-exports.Float32Vector = Vector.Float32Vector;
-exports.Float64Vector = Vector.Float64Vector;
-exports.PointerVector = Vector.PointerVector;
 module.exports = Vector;