@khanacademy/kmath 0.4.5 → 0.4.7

package/dist/index.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var perseusUtils = require('@khanacademy/perseus-utils');
 var _ = require('underscore');
 var perseusCore = require('@khanacademy/perseus-core');
-var kmath = require('@khanacademy/kmath');
 var $ = require('jquery');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -12,51 +12,10 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var $__default = /*#__PURE__*/_interopDefaultLegacy($);
 
-/**
- * Adds the given perseus library version information to the __perseus_debug__
- * object and ensures that the object is attached to `globalThis` (`window` in
- * browser environments).
- *
- * This allows each library to provide runtime version information to assist in
- * debugging in production environments.
- */
-const addLibraryVersionToPerseusDebug = (libraryName, libraryVersion) => {
-  // If the library version is the default value, then we don't want to
-  // prefix it with a "v" to indicate that it is a version number.
-  let prefix = "v";
-  if (libraryVersion === "__lib_version__") {
-    prefix = "";
-  }
-  const formattedVersion = `${prefix}${libraryVersion}`;
-  if (typeof globalThis !== "undefined") {
-    globalThis.__perseus_debug__ = globalThis.__perseus_debug__ ?? {};
-    const existingVersionEntry = globalThis.__perseus_debug__[libraryName];
-    if (existingVersionEntry) {
-      // If we already have an entry and it doesn't match the registered
-      // version, we morph the entry into an array and log a warning.
-      if (existingVersionEntry !== formattedVersion) {
-        // Existing entry might be an array already (oops, at least 2
-        // versions of the library already loaded!).
-        const allVersions = Array.isArray(existingVersionEntry) ? existingVersionEntry : [existingVersionEntry];
-        allVersions.push(formattedVersion);
-        globalThis.__perseus_debug__[libraryName] = allVersions;
-
-        // eslint-disable-next-line no-console
-        console.warn(`Multiple versions of ${libraryName} loaded on this page: ${allVersions.sort().join(", ")}`);
-      }
-    } else {
-      globalThis.__perseus_debug__[libraryName] = formattedVersion;
-    }
-  } else {
-    // eslint-disable-next-line no-console
-    console.warn(`globalThis not found found (${formattedVersion})`);
-  }
-};
-
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/kmath";
-const libVersion = "0.4.5";
-addLibraryVersionToPerseusDebug(libName, libVersion);
+const libVersion = "0.4.7";
+perseusUtils.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 /**
  * Number Utils
@@ -555,6 +514,240 @@ var ray = /*#__PURE__*/Object.freeze({
     equal: equal
 });
 
+const KhanMath = {
+  // Simplify formulas before display
+  cleanMath: function (expr) {
+    return typeof expr === "string" ? expr.replace(/\+\s*-/g, "- ").replace(/-\s*-/g, "+ ").replace(/\^1/g, "") : expr;
+  },
+  // Bound a number by 1e-6 and 1e20 to avoid exponents after toString
+  bound: function (num) {
+    if (num === 0) {
+      return num;
+    }
+    if (num < 0) {
+      return -KhanMath.bound(-num);
+    }
+    return Math.max(1e-6, Math.min(num, 1e20));
+  },
+  factorial: function (x) {
+    if (x <= 1) {
+      return x;
+    }
+    return x * KhanMath.factorial(x - 1);
+  },
+  getGCD: function (a, b) {
+    if (arguments.length > 2) {
+      // TODO(kevinb): rewrite using rest args instead of arguments
+      // eslint-disable-next-line prefer-rest-params
+      const rest = [].slice.call(arguments, 1);
+      // @ts-expect-error - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
+      return KhanMath.getGCD(a, KhanMath.getGCD(...rest));
+    }
+    let mod;
+    a = Math.abs(a);
+    b = Math.abs(b);
+    while (b) {
+      mod = a % b;
+      a = b;
+      b = mod;
+    }
+    return a;
+  },
+  getLCM: function (a, b) {
+    if (arguments.length > 2) {
+      // TODO(kevinb): rewrite using rest args instead of arguments
+      // eslint-disable-next-line prefer-rest-params
+      const rest = [].slice.call(arguments, 1);
+      // @ts-expect-error - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
+      return KhanMath.getLCM(a, KhanMath.getLCM(...rest));
+    }
+    return Math.abs(a * b) / KhanMath.getGCD(a, b);
+  },
+  primes: [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97],
+  isPrime: function (n) {
+    if (n <= 1) {
+      return false;
+    }
+    if (n < 101) {
+      return !!$__default["default"].grep(KhanMath.primes, function (p, i) {
+        return Math.abs(p - n) <= 0.5;
+      }).length;
+    }
+    if (n <= 1 || n > 2 && n % 2 === 0) {
+      return false;
+    }
+    for (let i = 3, sqrt = Math.sqrt(n); i <= sqrt; i += 2) {
+      if (n % i === 0) {
+        return false;
+      }
+    }
+    return true;
+  },
+  // @ts-expect-error - TS2366 - Function lacks ending return statement and return type does not include 'undefined'.
+  getPrimeFactorization: function (number) {
+    if (number === 1) {
+      return [];
+    }
+    if (KhanMath.isPrime(number)) {
+      return [number];
+    }
+    const maxf = Math.sqrt(number);
+    for (let f = 2; f <= maxf; f++) {
+      if (number % f === 0) {
+        return $__default["default"].merge(KhanMath.getPrimeFactorization(f), KhanMath.getPrimeFactorization(number / f));
+      }
+    }
+  },
+  // Round a number to the nearest increment
+  // E.g., if increment = 30 and num = 40, return 30. if increment = 30 and
+  //     num = 45, return 60.
+  roundToNearest: function (increment, num) {
+    return Math.round(num / increment) * increment;
+  },
+  // Round a number to a certain number of decimal places
+  roundTo: function (precision, num) {
+    const factor = Math.pow(10, precision).toFixed(5);
+    // @ts-expect-error - TS2345 - Argument of type 'string' is not assignable to parameter of type 'number'. | TS2363 - The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type. | TS2363 - The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
+    return Math.round((num * factor).toFixed(5)) / factor;
+  },
+  /**
+   * Return a string of num rounded to a fixed precision decimal places,
+   * with an approx symbol if num had to be rounded, and trailing 0s
+   */
+  toFixedApprox: function (num, precision) {
+    // TODO(aria): Make this locale-dependent
+    const fixedStr = num.toFixed(precision);
+    if (equal$4(+fixedStr, num)) {
+      return fixedStr;
+    }
+    return "\\approx " + fixedStr;
+  },
+  /**
+   * Return a string of num rounded to precision decimal places, with an
+   * approx symbol if num had to be rounded, but no trailing 0s if it was
+   * not rounded.
+   */
+  roundToApprox: function (num, precision) {
+    const fixed = KhanMath.roundTo(precision, num);
+    if (equal$4(fixed, num)) {
+      return String(fixed);
+    }
+    return KhanMath.toFixedApprox(num, precision);
+  },
+  // toFraction(4/8) => [1, 2]
+  // toFraction(0.666) => [333, 500]
+  // toFraction(0.666, 0.001) => [2, 3]
+  //
+  // tolerance can't be bigger than 1, sorry
+  toFraction: function (decimal, tolerance) {
+    if (tolerance == null) {
+      tolerance = Math.pow(2, -46);
+    }
+    if (decimal < 0 || decimal > 1) {
+      let fract = decimal % 1;
+      fract += fract < 0 ? 1 : 0;
+      const nd = KhanMath.toFraction(fract, tolerance);
+      nd[0] += Math.round(decimal - fract) * nd[1];
+      return nd;
+    }
+    if (Math.abs(Math.round(Number(decimal)) - decimal) <= tolerance) {
+      return [Math.round(decimal), 1];
+    }
+    let loN = 0;
+    let loD = 1;
+    let hiN = 1;
+    let hiD = 1;
+    let midN = 1;
+    let midD = 2;
+
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      if (Math.abs(Number(midN / midD) - decimal) <= tolerance) {
+        return [midN, midD];
+      }
+      if (midN / midD < decimal) {
+        loN = midN;
+        loD = midD;
+      } else {
+        hiN = midN;
+        hiD = midD;
+      }
+      midN = loN + hiN;
+      midD = loD + hiD;
+    }
+  },
+  // Returns the format (string) of a given numeric string
+  // Note: purposively more inclusive than answer-types' predicate.forms
+  // That is, it is not necessarily true that interpreted input are numeric
+  getNumericFormat: function (text) {
+    text = $__default["default"].trim(text);
+    text = text.replace(/\u2212/, "-").replace(/([+-])\s+/g, "$1");
+    if (text.match(/^[+-]?\d+$/)) {
+      return "integer";
+    }
+    if (text.match(/^[+-]?\d+\s+\d+\s*\/\s*\d+$/)) {
+      return "mixed";
+    }
+    const fraction = text.match(/^[+-]?(\d+)\s*\/\s*(\d+)$/);
+    if (fraction) {
+      return parseFloat(fraction[1]) > parseFloat(fraction[2]) ? "improper" : "proper";
+    }
+    if (text.replace(/[,. ]/g, "").match(/^\d+$/)) {
+      return "decimal";
+    }
+    if (text.match(/(pi?|\u03c0|t(?:au)?|\u03c4|pau)/)) {
+      return "pi";
+    }
+    return null;
+  },
+  // Returns a string of the number in a specified format
+  toNumericString: function (number$1, format) {
+    if (number$1 == null) {
+      return "";
+    }
+    if (number$1 === 0) {
+      return "0"; // otherwise it might end up as 0% or 0pi
+    }
+    if (format === "percent") {
+      return number$1 * 100 + "%";
+    }
+    if (format === "pi") {
+      const fraction = toFraction(number$1 / Math.PI);
+      const numerator = Math.abs(fraction[0]);
+      const denominator = fraction[1];
+      if (isInteger(numerator)) {
+        const sign = number$1 < 0 ? "-" : "";
+        const pi = "\u03C0";
+        return sign + (numerator === 1 ? "" : numerator) + pi + (denominator === 1 ? "" : "/" + denominator);
+      }
+    }
+    if (___default["default"](["proper", "improper", "mixed", "fraction"]).contains(format)) {
+      const fraction = toFraction(number$1);
+      const numerator = Math.abs(fraction[0]);
+      const denominator = fraction[1];
+      const sign = number$1 < 0 ? "-" : "";
+      if (denominator === 1) {
+        return sign + numerator; // for integers, irrational, d > 1000
+      }
+      if (format === "mixed") {
+        const modulus = numerator % denominator;
+        const integer = (numerator - modulus) / denominator;
+        return sign + (integer ? integer + " " : "") + modulus + "/" + denominator;
+      } // otherwise proper, improper, or fraction
+      return sign + numerator + "/" + denominator;
+    }
+
+    // otherwise (decimal, float, long long)
+    return String(number$1);
+  }
+};
+function sum(array) {
+  return array.reduce(add, 0);
+}
+function add(a, b) {
+  return a + b;
+}
+
 /**
  * A collection of geomtry-related utility functions
  */
@@ -606,7 +799,7 @@ function polygonSidesIntersect(vertices) {
   for (let i = 0; i < vertices.length; i++) {
     for (let k = i + 1; k < vertices.length; k++) {
       // If any two vertices are the same point, sides overlap
-      if (kmath.point.equal(vertices[i], vertices[k])) {
+      if (equal$2(vertices[i], vertices[k])) {
         return true;
       }
 
@@ -646,7 +839,7 @@ function clockwise(points) {
     const p2 = segment[1];
     return (p2[0] - p1[0]) * (p2[1] + p1[1]);
   });
-  return kmath.sum(areas) > 0;
+  return sum(areas) > 0;
 }
 function magnitude(v) {
   return Math.sqrt(___default["default"].reduce(v, function (memo, el) {
@@ -723,7 +916,7 @@ function similar(coords1, coords2, tolerance) {
         return perseusCore.approximateEqual(factors[0], factor);
       });
       const congruentEnough = ___default["default"].all(sidePairs, function (pair) {
-        return kmath.number.equal(pair[0], pair[1], tolerance);
+        return equal$4(pair[0], pair[1], tolerance);
       });
       if (same && congruentEnough) {
         return true;
@@ -942,240 +1135,6 @@ var coefficients = /*#__PURE__*/Object.freeze({
     getQuadraticCoefficients: getQuadraticCoefficients
 });
 
-const KhanMath = {
-  // Simplify formulas before display
-  cleanMath: function (expr) {
-    return typeof expr === "string" ? expr.replace(/\+\s*-/g, "- ").replace(/-\s*-/g, "+ ").replace(/\^1/g, "") : expr;
-  },
-  // Bound a number by 1e-6 and 1e20 to avoid exponents after toString
-  bound: function (num) {
-    if (num === 0) {
-      return num;
-    }
-    if (num < 0) {
-      return -KhanMath.bound(-num);
-    }
-    return Math.max(1e-6, Math.min(num, 1e20));
-  },
-  factorial: function (x) {
-    if (x <= 1) {
-      return x;
-    }
-    return x * KhanMath.factorial(x - 1);
-  },
-  getGCD: function (a, b) {
-    if (arguments.length > 2) {
-      // TODO(kevinb): rewrite using rest args instead of arguments
-      // eslint-disable-next-line prefer-rest-params
-      const rest = [].slice.call(arguments, 1);
-      // @ts-expect-error - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
-      return KhanMath.getGCD(a, KhanMath.getGCD(...rest));
-    }
-    let mod;
-    a = Math.abs(a);
-    b = Math.abs(b);
-    while (b) {
-      mod = a % b;
-      a = b;
-      b = mod;
-    }
-    return a;
-  },
-  getLCM: function (a, b) {
-    if (arguments.length > 2) {
-      // TODO(kevinb): rewrite using rest args instead of arguments
-      // eslint-disable-next-line prefer-rest-params
-      const rest = [].slice.call(arguments, 1);
-      // @ts-expect-error - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
-      return KhanMath.getLCM(a, KhanMath.getLCM(...rest));
-    }
-    return Math.abs(a * b) / KhanMath.getGCD(a, b);
-  },
-  primes: [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97],
-  isPrime: function (n) {
-    if (n <= 1) {
-      return false;
-    }
-    if (n < 101) {
-      return !!$__default["default"].grep(KhanMath.primes, function (p, i) {
-        return Math.abs(p - n) <= 0.5;
-      }).length;
-    }
-    if (n <= 1 || n > 2 && n % 2 === 0) {
-      return false;
-    }
-    for (let i = 3, sqrt = Math.sqrt(n); i <= sqrt; i += 2) {
-      if (n % i === 0) {
-        return false;
-      }
-    }
-    return true;
-  },
-  // @ts-expect-error - TS2366 - Function lacks ending return statement and return type does not include 'undefined'.
-  getPrimeFactorization: function (number) {
-    if (number === 1) {
-      return [];
-    }
-    if (KhanMath.isPrime(number)) {
-      return [number];
-    }
-    const maxf = Math.sqrt(number);
-    for (let f = 2; f <= maxf; f++) {
-      if (number % f === 0) {
-        return $__default["default"].merge(KhanMath.getPrimeFactorization(f), KhanMath.getPrimeFactorization(number / f));
-      }
-    }
-  },
-  // Round a number to the nearest increment
-  // E.g., if increment = 30 and num = 40, return 30. if increment = 30 and
-  //     num = 45, return 60.
-  roundToNearest: function (increment, num) {
-    return Math.round(num / increment) * increment;
-  },
-  // Round a number to a certain number of decimal places
-  roundTo: function (precision, num) {
-    const factor = Math.pow(10, precision).toFixed(5);
-    // @ts-expect-error - TS2345 - Argument of type 'string' is not assignable to parameter of type 'number'. | TS2363 - The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type. | TS2363 - The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-    return Math.round((num * factor).toFixed(5)) / factor;
-  },
-  /**
-   * Return a string of num rounded to a fixed precision decimal places,
-   * with an approx symbol if num had to be rounded, and trailing 0s
-   */
-  toFixedApprox: function (num, precision) {
-    // TODO(aria): Make this locale-dependent
-    const fixedStr = num.toFixed(precision);
-    if (kmath.number.equal(+fixedStr, num)) {
-      return fixedStr;
-    }
-    return "\\approx " + fixedStr;
-  },
-  /**
-   * Return a string of num rounded to precision decimal places, with an
-   * approx symbol if num had to be rounded, but no trailing 0s if it was
-   * not rounded.
-   */
-  roundToApprox: function (num, precision) {
-    const fixed = KhanMath.roundTo(precision, num);
-    if (kmath.number.equal(fixed, num)) {
-      return String(fixed);
-    }
-    return KhanMath.toFixedApprox(num, precision);
-  },
-  // toFraction(4/8) => [1, 2]
-  // toFraction(0.666) => [333, 500]
-  // toFraction(0.666, 0.001) => [2, 3]
-  //
-  // tolerance can't be bigger than 1, sorry
-  toFraction: function (decimal, tolerance) {
-    if (tolerance == null) {
-      tolerance = Math.pow(2, -46);
-    }
-    if (decimal < 0 || decimal > 1) {
-      let fract = decimal % 1;
-      fract += fract < 0 ? 1 : 0;
-      const nd = KhanMath.toFraction(fract, tolerance);
-      nd[0] += Math.round(decimal - fract) * nd[1];
-      return nd;
-    }
-    if (Math.abs(Math.round(Number(decimal)) - decimal) <= tolerance) {
-      return [Math.round(decimal), 1];
-    }
-    let loN = 0;
-    let loD = 1;
-    let hiN = 1;
-    let hiD = 1;
-    let midN = 1;
-    let midD = 2;
-
-    // eslint-disable-next-line no-constant-condition
-    while (true) {
-      if (Math.abs(Number(midN / midD) - decimal) <= tolerance) {
-        return [midN, midD];
-      }
-      if (midN / midD < decimal) {
-        loN = midN;
-        loD = midD;
-      } else {
-        hiN = midN;
-        hiD = midD;
-      }
-      midN = loN + hiN;
-      midD = loD + hiD;
-    }
-  },
-  // Returns the format (string) of a given numeric string
-  // Note: purposively more inclusive than answer-types' predicate.forms
-  // That is, it is not necessarily true that interpreted input are numeric
-  getNumericFormat: function (text) {
-    text = $__default["default"].trim(text);
-    text = text.replace(/\u2212/, "-").replace(/([+-])\s+/g, "$1");
-    if (text.match(/^[+-]?\d+$/)) {
-      return "integer";
-    }
-    if (text.match(/^[+-]?\d+\s+\d+\s*\/\s*\d+$/)) {
-      return "mixed";
-    }
-    const fraction = text.match(/^[+-]?(\d+)\s*\/\s*(\d+)$/);
-    if (fraction) {
-      return parseFloat(fraction[1]) > parseFloat(fraction[2]) ? "improper" : "proper";
-    }
-    if (text.replace(/[,. ]/g, "").match(/^\d+$/)) {
-      return "decimal";
-    }
-    if (text.match(/(pi?|\u03c0|t(?:au)?|\u03c4|pau)/)) {
-      return "pi";
-    }
-    return null;
-  },
-  // Returns a string of the number in a specified format
-  toNumericString: function (number, format) {
-    if (number == null) {
-      return "";
-    }
-    if (number === 0) {
-      return "0"; // otherwise it might end up as 0% or 0pi
-    }
-    if (format === "percent") {
-      return number * 100 + "%";
-    }
-    if (format === "pi") {
-      const fraction = kmath.number.toFraction(number / Math.PI);
-      const numerator = Math.abs(fraction[0]);
-      const denominator = fraction[1];
-      if (kmath.number.isInteger(numerator)) {
-        const sign = number < 0 ? "-" : "";
-        const pi = "\u03C0";
-        return sign + (numerator === 1 ? "" : numerator) + pi + (denominator === 1 ? "" : "/" + denominator);
-      }
-    }
-    if (___default["default"](["proper", "improper", "mixed", "fraction"]).contains(format)) {
-      const fraction = kmath.number.toFraction(number);
-      const numerator = Math.abs(fraction[0]);
-      const denominator = fraction[1];
-      const sign = number < 0 ? "-" : "";
-      if (denominator === 1) {
-        return sign + numerator; // for integers, irrational, d > 1000
-      }
-      if (format === "mixed") {
-        const modulus = numerator % denominator;
-        const integer = (numerator - modulus) / denominator;
-        return sign + (integer ? integer + " " : "") + modulus + "/" + denominator;
-      } // otherwise proper, improper, or fraction
-      return sign + numerator + "/" + denominator;
-    }
-
-    // otherwise (decimal, float, long long)
-    return String(number);
-  }
-};
-function sum(array) {
-  return array.reduce(add, 0);
-}
-function add(a, b) {
-  return a + b;
-}
-
 exports.KhanMath = KhanMath;
 exports.angles = angles;
 exports.coefficients = coefficients;