@khanacademy/perseus 19.1.1 → 19.1.3

package/src/widgets/measurer.tsx

@@ -11,6 +11,8 @@ import {ApiOptions} from "../perseus-api";
 import GraphUtils from "../util/graph-utils";
 
 import type {WidgetExports} from "../types";
+import type {Interval} from "../util/interval";
+import type {Coord} from "@khanacademy/perseus";
 
 const defaultImage = {
     url: null,
@@ -121,10 +123,11 @@ const Measurer: any = createReactClass({
         const graphieDiv = ReactDOM.findDOMNode(this.refs.graphieDiv);
         // @ts-expect-error - TS2769 - No overload matches this call. | TS2339 - Property 'empty' does not exist on type 'JQueryStatic'.
         $(graphieDiv).empty();
+        // @ts-expect-error - Argument of type 'Element | Text | null' is not assignable to parameter of type 'HTMLElement'.
         const graphie = (this.graphie = GraphUtils.createGraphie(graphieDiv));
 
-        const scale = [40, 40];
-        const range = [
+        const scale: Coord = [40, 40];
+        const range: [Interval, Interval] = [
             [0, this.props.box[0] / scale[0]],
             [0, this.props.box[1] / scale[1]],
         ];
@@ -132,6 +135,7 @@ const Measurer: any = createReactClass({
             range: range,
             scale: scale,
         });
+        // @ts-expect-error - Property 'addMouseLayer' does not exist on type 'Graphie'.
         graphie.addMouseLayer({
             allowScratchpad: true,
             setDrawingAreaAvailable:
@@ -143,6 +147,7 @@ const Measurer: any = createReactClass({
         }
 
         if (this.props.showProtractor) {
+            // @ts-expect-error - Property 'protractor' does not exist on type 'Graphie'.
             this.protractor = graphie.protractor([
                 this.props.protractorX,
                 this.props.protractorY,
@@ -154,6 +159,7 @@ const Measurer: any = createReactClass({
         }
 
         if (this.props.showRuler) {
+            // @ts-expect-error - Property 'ruler' does not exist on type 'Graphie'.
             this.ruler = graphie.ruler({
                 center: [
                     (range[0][0] + range[0][1]) / 2,

package/src/widgets/plotter.tsx

@@ -145,6 +145,7 @@ export class Plotter extends React.Component<Props, State> {
         const graphieDiv = ReactDOM.findDOMNode(self.refs.graphieDiv);
         // @ts-expect-error - TS2769 - No overload matches this call. | TS2339 - Property 'empty' does not exist on type 'JQueryStatic'.
         $(graphieDiv).empty();
+        // @ts-expect-error - Argument of type 'Element | Text | null' is not assignable to parameter of type 'HTMLElement'.
         const graphie = GraphUtils.createGraphie(graphieDiv);
 
         // TODO(jakesandlund): It's not the react way to hang
@@ -278,6 +279,7 @@ export class Plotter extends React.Component<Props, State> {
             scale: c.scale,
             isMobile: this.props.apiOptions.isMobile,
         });
+        // @ts-expect-error - Property 'addMouseLayer' does not exist on type 'Graphie'.
         graphie.addMouseLayer({
             allowScratchpad: true,
             setDrawingAreaAvailable:

package/src/widgets.ts

@@ -54,10 +54,12 @@ export const registerWidgets = (widgets: ReadonlyArray<WidgetExports>) => {
 export const replaceWidget = (name: string, replacementName: string) => {
     const substituteWidget = widgets[replacementName];
 
-    if (!substituteWidget && Log) {
+    // If the replacement widget isn't found, we need to throw. Otherwise after
+    // removing the deprecated widget, we'll have data asking for a widget type
+    // that doesn't exist at all.
+    if (!substituteWidget) {
         const errorMsg = `Failed to replace ${name} with ${replacementName}`;
-        Log.error(errorMsg, Errors.Internal);
-        return;
+        throw new PerseusError(errorMsg, Errors.Internal);
     }
 
     registerWidget(name, substituteWidget);
@@ -168,7 +170,10 @@ export const upgradeWidgetInfoToLatestVersion = (
     oldWidgetInfo: PerseusWidget,
 ): PerseusWidget => {
     const type = oldWidgetInfo.type;
-    // TODO(LP-10707): Remove unnecessary type checking (`type` is a string)
+    // NOTE(jeremy): This looks like it could be replaced by fixing types so
+    // that `type` is non-optional. But we're seeing this in Sentry today so I
+    // suspect we have legacy data (potentially unpublished) and we should
+    // figure that out before depending solely on types.
     if (!_.isString(type)) {
         throw new PerseusError(
             "widget type must be a string, but was: " + type,