@khanacademy/kas 0.3.16 → 0.4.1

package/dist/compare.d.ts

@@ -1,2 +1,7 @@
 import type { CompareOptions, CompareResult, Expression } from "./types";
-export declare const compare: (expr1: Expression, expr2: Expression, options: CompareOptions) => CompareResult;
+/**
+ * Compares two expressions for equality.
+ *
+ * Assumes that both expressions have already been parsed.
+ */
+export declare const compare: (expr1: Expression, expr2: Expression, options?: Partial<CompareOptions>) => CompareResult;

package/dist/es/index.js

@@ -3,7 +3,7 @@ import _ from 'underscore';
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/kas";
-const libVersion = "0.3.16";
+const libVersion = "0.4.1";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -2733,8 +2733,8 @@ class Expr {
   // NOTE(kevinb): This method is highly dynamic.  It's possible that it
   // could be made more type-safe using overload signatures.
   recurse(method, ...passed) {
-    var args = _.map(this.args(), function (arg) {
-      return _.isString(arg) || _.isNumber(arg) ? arg : arg[method].apply(arg, passed);
+    var args = this.args().map(function (arg) {
+      return _.isString(arg) || _.isNumber(arg) ? arg : arg == null ? void 0 : arg[method].apply(arg, passed);
     });
     return this.construct(args);
   }
@@ -2802,8 +2802,8 @@ class Expr {
 
   // returns a string representing current node structure
   repr() {
-    return this.name() + "(" + _.map(this.args(), function (arg) {
-      return _.isString(arg) || _.isNumber(arg) ? arg : arg.repr();
+    return this.name() + "(" + this.args().map(function (arg) {
+      return _.isString(arg) || _.isNumber(arg) ? arg : arg == null ? void 0 : arg.repr();
     }).join(",") + ")";
   }
 
@@ -2877,6 +2877,7 @@ class Expr {
 
   // return the child nodes of this node
   exprArgs() {
+    // @ts-expect-error: Type 'string | number | Expr | undefined' is not assignable to type 'string | Expr'.
     return this.args().filter(isExpr);
   }
 
@@ -3303,7 +3304,9 @@ class Add extends Seq {
     return Mul.createOrAppend(left, right).flatten();
   }
   reduce(options) {
-    return _.reduce(this.terms, (memo, term) => {
+    return _.reduce(this.terms,
+    // @ts-expect-error: Type 'Expr' is not assignable to type 'Num'.
+    (memo, term) => {
       return memo.add(term, options);
     }, this.identity);
   }
@@ -3684,7 +3687,9 @@ class Mul extends Seq {
     }
   }
   reduce(options) {
-    return _.reduce(this.terms, (memo, term) => {
+    return _.reduce(this.terms,
+    // @ts-expect-error: Type 'Expr' is not assignable to type 'Num'.
+    (memo, term) => {
       return memo.mul(term, options);
     }, this.identity);
   }
@@ -3885,9 +3890,14 @@ class Mul extends Seq {
       var posOrNeg = function posOrNeg(num) {
         return pos(num) || neg(num);
       };
+
+      // @ts-expect-error: Type 'Expr' is not assignable to type 'Num'.
       const posNum = numbers.find(pos);
+      // @ts-expect-error: Type 'Expr' is not assignable to type 'Num'.
       const negNum = numbers.find(neg);
-      if (numbers.length > 1 && negNum && posNum && _.every(numbers, posOrNeg)) {
+      if (numbers.length > 1 && negNum && posNum &&
+      // @ts-expect-error: Type 'Expr' is not assignable to type 'Num'.
+      _.every(numbers, posOrNeg)) {
         var firstNeg = _.indexOf(expr.terms, negNum);
         var firstNum = _.indexOf(expr.terms, posNum);
 
@@ -5875,9 +5885,12 @@ var derivedUnits = {
 const Zero = NumZero;
 const One = NumOne;
 
-// Assumes that both expressions have already been parsed
-// TODO(alex): be able to pass a random() function to compare()
-const compare = function compare(expr1, expr2, options) {
+/**
+ * Compares two expressions for equality.
+ *
+ * Assumes that both expressions have already been parsed.
+ */ // TODO(alex): be able to pass a random() function to compare()
+const compare = function compare(expr1, expr2, options = {}) {
   const defaults = {
     form: false,
     simplify: false
@@ -5888,7 +5901,7 @@ const compare = function compare(expr1, expr2, options) {
    *   like slope
    * - Allow student to choose their own variable names
    */
-  options = _extends({}, defaults, options);
+  const optionsWithDefaults = _extends({}, defaults, options);
 
   // TODO(CP-1614): Figure out how to make these messages translatable
 
@@ -5918,7 +5931,7 @@ const compare = function compare(expr1, expr2, options) {
   }
 
   // Syntactic check
-  if (options.form && !expr1.sameForm(expr2)) {
+  if (optionsWithDefaults.form && !expr1.sameForm(expr2)) {
     return {
       equal: false,
       message: "Your answer is not in the correct form."
@@ -5926,7 +5939,7 @@ const compare = function compare(expr1, expr2, options) {
   }
 
   // Syntactic check
-  if (options.simplify && !expr1.isSimplified()) {
+  if (optionsWithDefaults.simplify && !expr1.isSimplified()) {
     return {
       equal: false,
       message: "Your answer is not fully expanded and simplified."