@khanacademy/perseus 41.0.0 → 41.1.1

package/dist/es/index.js

@@ -35924,11 +35924,7 @@ function interactiveGraphValidator(userInput, rubric) {
 
       // If both of the guess points are on the correct line, it's
       // correct.
-      if (
-      // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
-      collinear(correct[0], correct[1], guess[0]) &&
-      // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
-      collinear(correct[0], correct[1], guess[1])) {
+      if (collinear(correct[0], correct[1], guess[0]) && collinear(correct[0], correct[1], guess[1])) {
         return {
           type: "points",
           earned: 1,
@@ -35950,9 +35946,7 @@ function interactiveGraphValidator(userInput, rubric) {
     } else if (userInput.type === "quadratic" && rubric.correct.type === "quadratic" && userInput.coords != null) {
       // If the parabola coefficients match, it's correct.
       const guessCoeffs = getQuadraticCoefficients(userInput.coords);
-      const correctCoeffs = getQuadraticCoefficients(
-      // @ts-expect-error - TS2345 - Argument of type 'readonly Coord[] | undefined' is not assignable to parameter of type 'readonly Coord[]'.
-      rubric.correct.coords);
+      const correctCoeffs = getQuadraticCoefficients(rubric.correct.coords);
       if (deepEq$2(guessCoeffs, correctCoeffs)) {
         return {
           type: "points",
@@ -35963,9 +35957,7 @@ function interactiveGraphValidator(userInput, rubric) {
       }
     } else if (userInput.type === "sinusoid" && rubric.correct.type === "sinusoid" && userInput.coords != null) {
       const guessCoeffs = getSinusoidCoefficients(userInput.coords);
-      const correctCoeffs = getSinusoidCoefficients(
-      // @ts-expect-error - TS2345 - Argument of type 'readonly Coord[] | undefined' is not assignable to parameter of type 'readonly Coord[]'.
-      rubric.correct.coords);
+      const correctCoeffs = getSinusoidCoefficients(rubric.correct.coords);
       const canonicalGuessCoeffs = canonicalSineCoefficients$1(guessCoeffs);
       const canonicalCorrectCoeffs = canonicalSineCoefficients$1(correctCoeffs);
       // If the canonical coefficients match, it's correct.
@@ -36009,10 +36001,8 @@ function interactiveGraphValidator(userInput, rubric) {
         };
       }
     } else if (userInput.type === "polygon" && rubric.correct.type === "polygon" && userInput.coords != null) {
-      var _userInput$coords, _rubric$correct$coord;
-      const guess = (_userInput$coords = userInput.coords) == null ? void 0 : _userInput$coords.slice();
-      // @ts-expect-error - TS2322 - Type 'Coord[] | undefined' is not assignable to type 'Coord[]'.
-      const correct = (_rubric$correct$coord = rubric.correct.coords) == null ? void 0 : _rubric$correct$coord.slice();
+      const guess = userInput.coords.slice();
+      const correct = rubric.correct.coords.slice();
       let match;
       if (rubric.correct.match === "similar") {
         match = similar(guess, correct, Number.POSITIVE_INFINITY);
@@ -36035,11 +36025,9 @@ function interactiveGraphValidator(userInput, rubric) {
         };
       }
     } else if (userInput.type === "segment" && rubric.correct.type === "segment" && userInput.coords != null) {
-      var _rubric$correct;
       let guess = Util.deepClone(userInput.coords);
-      let correct = Util.deepClone((_rubric$correct = rubric.correct) == null ? void 0 : _rubric$correct.coords);
+      let correct = Util.deepClone(rubric.correct.coords);
       guess = _.invoke(guess, "sort").sort();
-      // @ts-expect-error - TS2345 - Argument of type '(readonly Coord[])[] | undefined' is not assignable to parameter of type 'Collection<any>'.
       correct = _.invoke(correct, "sort").sort();
       if (deepEq$2(guess, correct)) {
         return {
@@ -36052,11 +36040,7 @@ function interactiveGraphValidator(userInput, rubric) {
     } else if (userInput.type === "ray" && rubric.correct.type === "ray" && userInput.coords != null) {
       const guess = userInput.coords;
       const correct = rubric.correct.coords;
-      if (
-      // @ts-expect-error - TS2532 - Object is possibly 'undefined'.
-      deepEq$2(guess[0], correct[0]) &&
-      // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
-      collinear(correct[0], correct[1], guess[1])) {
+      if (deepEq$2(guess[0], correct[0]) && collinear(correct[0], correct[1], guess[1])) {
         return {
           type: "points",
           earned: 1,
@@ -44046,7 +44030,7 @@ const init = function init(options) {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "41.0.0";
+const libVersion = "41.1.1";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {
@@ -47301,16 +47285,7 @@ const getValidWidgetIds = perseusItem => {
 };
 
 const deepEq = Util.deepEq;
-
-/**
- * Helper to parse PerseusItem JSON
- * Why not just use JSON.parse? We want:
- * - To make sure types are correct
- * - To give us a central place to validate/transform output if needed
- * @param {string} json - the stringified PerseusItem JSON
- * @returns {PerseusItem} the parsed PerseusItem object
- */
-function parsePerseusItem(json) {
+function isRealJSONParse(jsonParse) {
   const randomPhrase = buildRandomPhrase();
   const randomHintPhrase = buildRandomPhrase();
   const randomString = buildRandomString();
@@ -47363,15 +47338,10 @@ function parsePerseusItem(json) {
       }
     }
   });
-  // @ts-expect-error TS2550: Property 'replaceAll' does not exist on type 'string'.
-  const testJSON = buildTestData(testingObject.replaceAll('"', '\\"'));
-  const parsedJSON = JSON.parse(testJSON);
-  const parsedItemData = parsedJSON.data.assessmentItem.item.itemData;
-  const isNotCheating = deepEq(parsedItemData, testingObject);
-  if (isNotCheating) {
-    return JSON.parse(json);
-  }
-  throw new Error("Something went wrong.");
+  const testJSON = buildTestData(testingObject.replace(/"/g, '\\"'));
+  const parsedTestJSON = jsonParse(testJSON);
+  const parsedTestItemData = parsedTestJSON.data.assessmentItem.item.itemData;
+  return deepEq(parsedTestItemData, testingObject);
 }
 function buildRandomString(capitalize = false) {
   let randomString = "";
@@ -47397,6 +47367,23 @@ function buildTestData(testObject) {
   return `{"data":{"assessmentItem":{"__typename":"AssessmentItemOrError","error":null,"item":{"__typename":"AssessmentItem","id":"x890b3c70f3e8f4a6","itemData":"${testObject}","problemType":"Type 1","sha":"c7284a3ad65214b4e62bccce236d92f7f5d35941"}}}}`;
 }
 
+/**
+ * Helper to parse PerseusItem JSON
+ * Why not just use JSON.parse? We want:
+ * - To make sure types are correct
+ * - To give us a central place to validate/transform output if needed
+ * @param {string} json - the stringified PerseusItem JSON
+ * @returns {PerseusItem} the parsed PerseusItem object
+ */
+function parsePerseusItem(json) {
+  // Try to block a cheating vector which relies on monkey-patching
+  // JSON.parse
+  if (isRealJSONParse(JSON.parse)) {
+    return JSON.parse(json);
+  }
+  throw new Error("Something went wrong.");
+}
+
 const genericPerseusItemData = {
   question: {
     content: "",