🐛 simplify re-exports

nodef · Nov 3, 2022 · f0097db · f0097db
1 parent 1a52c22
commit f0097db
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 110 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "extra-math",
-  "version": "1.3.16",
+  "version": "1.3.17",
   "description": "A collection of common mathematical functions.",
   "main": "index.js",
   "module": "index.mjs",

diff --git a/src/index.ts b/src/index.ts
@@ -1,92 +1,74 @@
 // METHODS
 // =======
 
-// ROUND
-// -----
-
-export {floor} from "extra-number";
-export {ceil}  from "extra-number";
-export {round} from "extra-number";
-
-
-
-
-// ROUNDED DIVISION
-// ----------------
-
-export {floorDiv} from "extra-number";
-export {ceilDiv}  from "extra-number";
-export {roundDiv} from "extra-number";
-
-
-
-
-// MODULO
-// ------
-
-export {rem}  from "extra-number";
-export {mod}  from "extra-number";
-export {modp} from "extra-number";
-
-
-
-
-// RANGE CONTROL
-// -------------
-
-export {constrain} from "extra-number";
-export {normalize} from "extra-number";
-export {remap}     from "extra-number";
-export {lerp}      from "extra-number";
-export {constrain as clamp} from "extra-number";
-export {normalize as norm}  from "extra-number";
-export {remap as map}       from "extra-number";
-
-
-
-
-// ARITHMETIC
+// RE-EXPORTS
 // ----------
 
-export {isPow}   from "extra-number";
-export {prevPow} from "extra-number";
-export {nextPow} from "extra-number";
-export {root}    from "extra-number";
-export {log}     from "extra-number";
-
-
-
-
-// DIVISORS
-// --------
-
-export {properDivisors} from "extra-number";
-export {aliquotSum}     from "extra-number";
-export {isPrime}        from "extra-number";
-export {gcd}            from "extra-number";
-export {lcm}            from "extra-number";
-export {gcd as hcf}     from "extra-number";
-
-
-
-
-// ARRANGEMENTS
-// ------------
-
-export {factorial}   from "extra-number";
-export {binomial}    from "extra-number";
-export {multinomial} from "extra-number";
+export {
+  // Round
+  floor,
+  ceil,
+  round,
+  // Rounded division
+  floorDiv,
+  ceilDiv,
+  roundDiv,
+  // Modulo
+  rem,
+  mod,
+  modp,
+  // Range control
+  constrain,
+  constrain as clamp,
+  normalize,
+  normalize as norm,
+  lerp,
+  remap,
+  remap as map,
+  // Arithmetic
+  isPow,
+  prevPow,
+  nextPow,
+  root,
+  log,
+  // Divisors
+  properDivisors,
+  properDivisors as aliquotParts,
+  aliquotSum,
+  isPrime,
+  gcd,
+  gcd as hcf,
+  lcm,
+  // Arrangements
+  factorial,
+  binomial,
+  multinomial,
+  // Geometry
+  degrees,
+  radians,
+  // Statistics
+  sum,
+  product,
+  median,
+  modes,
+  range,
+  variance,
+  // Mean (statistics)
+  arithmeticMean,
+  arithmeticMean as mean,
+  geometricMean,
+  harmonicMean,
+  quadriaticMean,
+  quadriaticMean as rootMeanSquare,
+  cubicMean,
+} from "extra-number";
 
 
 
 
 // GEOMETRY
 // --------
 
-export {degrees} from "extra-number";
-export {radians} from "extra-number";
-
-
 /**
  * Calculate the magnitude (length) of a vector.
  * @param xs vector ([x, y, z, ...])
@@ -114,30 +96,3 @@ export function distance(xs: number[], ys: number[]): number {
   return Math.sqrt(a);
 }
 // https://processing.org/reference/dist_.html
-
-
-
-
-// STATISTICS
-// ----------
-
-export {sum}      from "extra-number";
-export {product}  from "extra-number";
-export {median}   from "extra-number";
-export {modes}    from "extra-number";
-export {range}    from "extra-number";
-export {variance} from "extra-number";
-
-
-
-
-// MEAN (STATISTICS)
-// -----------------
-
-export {arithmeticMean} from "extra-number";
-export {geometricMean}  from "extra-number";
-export {harmonicMean}   from "extra-number";
-export {quadriaticMean} from "extra-number";
-export {cubicMean}      from "extra-number";
-export {arithmeticMean as mean}           from "extra-number";
-export {quadriaticMean as rootMeanSquare} from "extra-number";
diff --git a/tests/index.test.ts b/tests/index.test.ts
@@ -1,6 +1,8 @@
-import * as math   from "../src";
-import {magnitude} from "../src";
-import {distance}  from "../src";
+import * as math from "../src";
+import {
+  magnitude,
+  distance,
+} from "../src";
 // import {gamma}     from "../src";
 // import {lgamma}    from "../src";
 // import {erf}       from "../src";