@khanacademy/perseus-core 4.0.0 → 5.0.0

package/dist/index.js

@@ -3,11 +3,31 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('underscore');
+var KAS = require('@khanacademy/kas');
 var perseusCore = require('@khanacademy/perseus-core');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+function _interopNamespace(e) {
+    if (e && e.__esModule) return e;
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n["default"] = e;
+    return Object.freeze(n);
+}
+
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
+var KAS__namespace = /*#__PURE__*/_interopNamespace(KAS);
 
 function getMatrixSize(matrix) {
   const matrixSize = [1, 1];
@@ -1093,6 +1113,76 @@ const parseExplanationWidget = parseWidget(constant("explanation"), object({
   static: defaulted(boolean, () => false)
 }));
 
+const KeypadKeys = ["PLUS", "MINUS", "NEGATIVE", "TIMES", "DIVIDE", "DECIMAL", "PERIOD", "PERCENT", "CDOT", "EQUAL", "NEQ", "GT", "LT", "GEQ", "LEQ",
+// mobile native only
+"FRAC_INCLUSIVE",
+// mobile native only
+"FRAC_EXCLUSIVE",
+// mobile native only
+"FRAC", "EXP", "EXP_2", "EXP_3", "SQRT", "CUBE_ROOT", "RADICAL", "LEFT_PAREN", "RIGHT_PAREN", "LN", "LOG", "LOG_N", "SIN", "COS",
+// TODO(charlie): Add in additional Greek letters.,
+"TAN", "PI", "THETA", "UP", "RIGHT", "DOWN", "LEFT", "BACKSPACE", "DISMISS", "JUMP_OUT_PARENTHESES", "JUMP_OUT_EXPONENT", "JUMP_OUT_BASE", "JUMP_INTO_NUMERATOR", "JUMP_OUT_NUMERATOR", "JUMP_OUT_DENOMINATOR",
+// Multi-functional keys.
+"NUM_0", "NUM_1", "NUM_2", "NUM_3", "NUM_4", "NUM_5", "NUM_6", "NUM_7", "NUM_8", "NUM_9", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
+
+// Used by KeypadContext to pass around a renderer reference
+
+/**
+ * Scrape the answer forms for any variables or contants (like Pi)
+ * that need to be included as keys on the keypad.
+ */
+function deriveExtraKeys(widgetOptions) {
+  if (widgetOptions.extraKeys) {
+    return widgetOptions.extraKeys;
+  }
+
+  // If there are no extra symbols available, we include Pi anyway, so
+  // that the "extra symbols" button doesn't appear empty.
+  const defaultKeys = ["PI"];
+  if (widgetOptions.answerForms == null) {
+    return defaultKeys;
+  }
+
+  // Extract any and all variables and constants from the answer forms.
+  const uniqueExtraVariables = {};
+  const uniqueExtraConstants = {};
+  for (const answerForm of widgetOptions.answerForms) {
+    const maybeExpr = KAS__namespace.parse(answerForm.value, widgetOptions);
+    if (maybeExpr.parsed) {
+      const expr = maybeExpr.expr;
+
+      // The keypad expects Greek letters to be capitalized (e.g., it
+      // requires `PI` instead of `pi`). Right now, it only supports Pi
+      // and Theta, so we special-case.
+      const isGreek = symbol => symbol === "pi" || symbol === "theta";
+      const toKey = symbol => isGreek(symbol) ? symbol.toUpperCase() : symbol;
+      const isKey = key => KeypadKeys.includes(key);
+      for (const variable of expr.getVars()) {
+        const maybeKey = toKey(variable);
+        if (isKey(maybeKey)) {
+          uniqueExtraVariables[maybeKey] = true;
+        }
+      }
+      for (const constant of expr.getConsts()) {
+        const maybeKey = toKey(constant);
+        if (isKey(maybeKey)) {
+          uniqueExtraConstants[maybeKey] = true;
+        }
+      }
+    }
+  }
+
+  // TODO(charlie): Alert the keypad as to which of these symbols should be
+  // treated as functions.
+  const extraVariables = Object.keys(uniqueExtraVariables).sort();
+  const extraConstants = Object.keys(uniqueExtraConstants).sort();
+  const extraKeys = [...extraVariables, ...extraConstants];
+  if (!extraKeys.length) {
+    return defaultKeys;
+  }
+  return extraKeys;
+}
+
 // Given a function, creates a PartialParser that converts one type to another
 // using that function. The returned parser never fails.
 function convert(f) {
@@ -1195,11 +1285,25 @@ function removeInvalidAnswerForms(possiblyInvalid) {
   }
   return valid;
 }
-const version1 = object({
+const version2$1 = object({
+  major: constant(2),
+  minor: number
+});
+const parseExpressionWidgetV2 = parseWidgetWithVersion(version2$1, constant("expression"), object({
+  answerForms: pipeParsers(array(parsePossiblyInvalidAnswerForm)).then(convert(removeInvalidAnswerForms)).parser,
+  functions: array(string),
+  times: boolean,
+  visibleLabel: optional(string),
+  ariaLabel: optional(string),
+  buttonSets: parseLegacyButtonSets,
+  buttonsVisible: optional(enumeration("always", "never", "focused")),
+  extraKeys: array(enumeration(...KeypadKeys))
+}));
+const version1$1 = object({
   major: constant(1),
   minor: number
 });
-const parseExpressionWidgetV1 = parseWidgetWithVersion(version1, constant("expression"), object({
+const parseExpressionWidgetV1 = parseWidgetWithVersion(version1$1, constant("expression"), object({
   answerForms: pipeParsers(array(parsePossiblyInvalidAnswerForm)).then(convert(removeInvalidAnswerForms)).parser,
   functions: array(string),
   times: boolean,
@@ -1208,11 +1312,33 @@ const parseExpressionWidgetV1 = parseWidgetWithVersion(version1, constant("expre
   buttonSets: parseLegacyButtonSets,
   buttonsVisible: optional(enumeration("always", "never", "focused"))
 }));
-const version0 = optional(object({
+function migrateV1ToV2$1(widget) {
+  const {
+    options
+  } = widget;
+  return {
+    ...widget,
+    version: {
+      major: 2,
+      minor: 0
+    },
+    options: {
+      times: options.times,
+      buttonSets: options.buttonSets,
+      functions: options.functions,
+      buttonsVisible: options.buttonsVisible,
+      visibleLabel: options.visibleLabel,
+      ariaLabel: options.ariaLabel,
+      answerForms: options.answerForms,
+      extraKeys: deriveExtraKeys(options)
+    }
+  };
+}
+const version0$1 = optional(object({
   major: constant(0),
   minor: number
 }));
-const parseExpressionWidgetV0 = parseWidgetWithVersion(version0, constant("expression"), object({
+const parseExpressionWidgetV0 = parseWidgetWithVersion(version0$1, constant("expression"), object({
   functions: array(string),
   times: boolean,
   visibleLabel: optional(string),
@@ -1223,7 +1349,7 @@ const parseExpressionWidgetV0 = parseWidgetWithVersion(version0, constant("expre
   buttonSets: parseLegacyButtonSets,
   buttonsVisible: optional(enumeration("always", "never", "focused"))
 }));
-function migrateV0ToV1(widget) {
+function migrateV0ToV1$1(widget) {
   const {
     options
   } = widget;
@@ -1249,7 +1375,7 @@ function migrateV0ToV1(widget) {
     }
   };
 }
-const parseExpressionWidget = versionedWidgetOptions(1, parseExpressionWidgetV1).withMigrationFrom(0, parseExpressionWidgetV0, migrateV0ToV1).parser;
+const parseExpressionWidget = versionedWidgetOptions(2, parseExpressionWidgetV2).withMigrationFrom(1, parseExpressionWidgetV1, migrateV1ToV2$1).withMigrationFrom(0, parseExpressionWidgetV0, migrateV0ToV1$1).parser;
 
 const falseToNull = pipeParsers(constant(false)).then(convert(() => null)).parser;
 const parseGradedGroupWidgetOptions = object({
@@ -2253,7 +2379,84 @@ const parsePythonProgramWidget = parseWidget(constant("python-program"), object(
   height: number
 }));
 
-const parseRadioWidget = parseWidget(constant("radio"), object({
+const currentVersion$3 = {
+  major: 2,
+  minor: 0
+};
+function deriveNumCorrect(options) {
+  const {
+    choices,
+    numCorrect
+  } = options;
+  return numCorrect ?? choices.filter(c => c.correct).length;
+}
+const widgetOptionsUpgrades$2 = {
+  "2": v1props => {
+    const upgraded = {
+      ...v1props,
+      numCorrect: deriveNumCorrect(v1props)
+    };
+    return upgraded;
+  },
+  "1": v0props => {
+    const {
+      noneOfTheAbove,
+      ...rest
+    } = v0props;
+    if (noneOfTheAbove) {
+      throw new Error("radio widget v0 no longer supports auto noneOfTheAbove");
+    }
+    return {
+      ...rest,
+      hasNoneOfTheAbove: false
+    };
+  }
+};
+const defaultWidgetOptions$v = {
+  choices: [{}, {}, {}, {}],
+  displayCount: null,
+  randomize: false,
+  hasNoneOfTheAbove: false,
+  multipleSelect: false,
+  countChoices: false,
+  deselectEnabled: false
+};
+
+const version2 = optional(object({
+  major: constant(2),
+  minor: number
+}));
+const parseRadioWidgetV2 = parseWidgetWithVersion(version2, constant("radio"), object({
+  numCorrect: optional(number),
+  choices: array(object({
+    content: defaulted(string, () => ""),
+    clue: optional(string),
+    correct: optional(boolean),
+    isNoneOfTheAbove: optional(boolean),
+    // deprecated
+    // There is an import cycle between radio-widget.ts and
+    // widgets-map.ts. The anonymous function below ensures that we
+    // don't refer to parseWidgetsMap before it's defined.
+    widgets: optional((rawVal, ctx) => parseWidgetsMap(rawVal, ctx))
+  })),
+  hasNoneOfTheAbove: optional(boolean),
+  countChoices: optional(boolean),
+  randomize: optional(boolean),
+  multipleSelect: optional(boolean),
+  deselectEnabled: optional(boolean),
+  // deprecated
+  onePerLine: optional(boolean),
+  // deprecated
+  displayCount: optional(any),
+  // v0 props
+  // `noneOfTheAbove` is still in use (but only set to `false`).
+  noneOfTheAbove: optional(constant(false))
+}));
+const version1 = optional(object({
+  major: constant(1),
+  minor: number
+}));
+const parseRadioWidgetV1 = parseWidgetWithVersion(version1, constant("radio"), object({
   choices: array(object({
     content: defaulted(string, () => ""),
     clue: optional(string),
@@ -2278,6 +2481,72 @@ const parseRadioWidget = parseWidget(constant("radio"), object({
   // `noneOfTheAbove` is still in use (but only set to `false`).
   noneOfTheAbove: optional(constant(false))
 }));
+function migrateV1ToV2(widget) {
+  const {
+    options
+  } = widget;
+  return {
+    ...widget,
+    version: {
+      major: 2,
+      minor: 0
+    },
+    options: {
+      ...options,
+      numCorrect: deriveNumCorrect(options)
+    }
+  };
+}
+const version0 = optional(object({
+  major: constant(0),
+  minor: number
+}));
+const parseRadioWidgetV0 = parseWidgetWithVersion(version0, constant("radio"), object({
+  choices: array(object({
+    content: defaulted(string, () => ""),
+    clue: optional(string),
+    correct: optional(boolean),
+    isNoneOfTheAbove: optional(boolean),
+    // deprecated
+    // There is an import cycle between radio-widget.ts and
+    // widgets-map.ts. The anonymous function below ensures that we
+    // don't refer to parseWidgetsMap before it's defined.
+    widgets: optional((rawVal, ctx) => parseWidgetsMap(rawVal, ctx))
+  })),
+  hasNoneOfTheAbove: optional(boolean),
+  countChoices: optional(boolean),
+  randomize: optional(boolean),
+  multipleSelect: optional(boolean),
+  deselectEnabled: optional(boolean),
+  // deprecated
+  onePerLine: optional(boolean),
+  // deprecated
+  displayCount: optional(any),
+  // v0 props
+  // `noneOfTheAbove` is still in use (but only set to `false`).
+  noneOfTheAbove: optional(constant(false))
+}));
+function migrateV0ToV1(widget) {
+  const {
+    options
+  } = widget;
+  const {
+    noneOfTheAbove: _,
+    ...rest
+  } = options;
+  return {
+    ...widget,
+    version: {
+      major: 1,
+      minor: 0
+    },
+    options: {
+      ...rest,
+      hasNoneOfTheAbove: false
+    }
+  };
+}
+const parseRadioWidget = versionedWidgetOptions(2, parseRadioWidgetV2).withMigrationFrom(1, parseRadioWidgetV1, migrateV1ToV2).withMigrationFrom(0, parseRadioWidgetV0, migrateV0ToV1).parser;
 
 const parseSorterWidget = parseWidget(constant("sorter"), object({
   correct: array(string),
@@ -2616,7 +2885,7 @@ const addLibraryVersionToPerseusDebug = (libraryName, libraryVersion) => {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus-core";
-const libVersion = "4.0.0";
+const libVersion = "5.0.0";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 /**
@@ -2733,7 +3002,7 @@ function getCategorizerPublicWidgetOptions(options) {
   };
 }
 
-const defaultWidgetOptions$v = {
+const defaultWidgetOptions$u = {
   items: [],
   categories: [],
   values: [],
@@ -2741,7 +3010,7 @@ const defaultWidgetOptions$v = {
 };
 const categorizerWidgetLogic = {
   name: "categorizer",
-  defaultWidgetOptions: defaultWidgetOptions$v,
+  defaultWidgetOptions: defaultWidgetOptions$u,
   getPublicWidgetOptions: getCategorizerPublicWidgetOptions
 };
 
@@ -2750,7 +3019,7 @@ function getCSProgramPublicWidgetOptions(options) {
 }
 
 const DEFAULT_HEIGHT = 400;
-const defaultWidgetOptions$u = {
+const defaultWidgetOptions$t = {
   programID: "",
   programType: null,
   settings: [{
@@ -2763,18 +3032,18 @@ const defaultWidgetOptions$u = {
 };
 const csProgramWidgetLogic = {
   name: "cs-program",
-  defaultWidgetOptions: defaultWidgetOptions$u,
+  defaultWidgetOptions: defaultWidgetOptions$t,
   supportedAlignments: ["block", "full-width"],
   getPublicWidgetOptions: getCSProgramPublicWidgetOptions
 };
 
-const defaultWidgetOptions$t = {
+const defaultWidgetOptions$s = {
   togglePrompt: "",
   definition: ""
 };
 const definitionWidgetLogic = {
   name: "definition",
-  defaultWidgetOptions: defaultWidgetOptions$t,
+  defaultWidgetOptions: defaultWidgetOptions$s,
   defaultAlignment: "inline"
 };
 
@@ -2799,7 +3068,7 @@ function getDropdownPublicWidgetOptions(options) {
   };
 }
 
-const defaultWidgetOptions$s = {
+const defaultWidgetOptions$r = {
   placeholder: "",
   choices: [{
     content: "",
@@ -2808,12 +3077,12 @@ const defaultWidgetOptions$s = {
 };
 const dropdownWidgetLogic = {
   name: "definition",
-  defaultWidgetOptions: defaultWidgetOptions$s,
+  defaultWidgetOptions: defaultWidgetOptions$r,
   defaultAlignment: "inline-block",
   getPublicWidgetOptions: getDropdownPublicWidgetOptions
 };
 
-const defaultWidgetOptions$r = {
+const defaultWidgetOptions$q = {
   showPrompt: "Explain",
   hidePrompt: "Hide explanation",
   explanation: "explanation goes here\n\nmore explanation",
@@ -2821,31 +3090,46 @@ const defaultWidgetOptions$r = {
 };
 const explanationWidgetLogic = {
   name: "explanation",
-  defaultWidgetOptions: defaultWidgetOptions$r,
+  defaultWidgetOptions: defaultWidgetOptions$q,
   defaultAlignment: "inline"
 };
 
-const currentVersion$3 = {
-  major: 1,
+const currentVersion$2 = {
+  major: 2,
   minor: 0
 };
-const widgetOptionsUpgrades$2 = {
-  "1": v0options => ({
-    times: v0options.times,
-    buttonSets: v0options.buttonSets,
-    functions: v0options.functions,
-    buttonsVisible: v0options.buttonsVisible,
-    visibleLabel: v0options.visibleLabel,
-    ariaLabel: v0options.ariaLabel,
-    answerForms: [{
-      considered: "correct",
-      form: v0options.form,
-      simplify: v0options.simplify,
-      value: v0options.value
-    }]
-  })
+const widgetOptionsUpgrades$1 = {
+  "2": v1options => {
+    return {
+      times: v1options.times,
+      buttonSets: v1options.buttonSets,
+      functions: v1options.functions,
+      buttonsVisible: v1options.buttonsVisible,
+      visibleLabel: v1options.visibleLabel,
+      ariaLabel: v1options.ariaLabel,
+      answerForms: v1options.answerForms,
+      extraKeys: v1options.extraKeys || deriveExtraKeys(v1options)
+    };
+  },
+  "1": v0options => {
+    return {
+      times: v0options.times,
+      buttonSets: v0options.buttonSets,
+      functions: v0options.functions,
+      buttonsVisible: v0options.buttonsVisible,
+      visibleLabel: v0options.visibleLabel,
+      ariaLabel: v0options.ariaLabel,
+      extraKeys: v0options.extraKeys,
+      answerForms: [{
+        considered: "correct",
+        form: v0options.form,
+        simplify: v0options.simplify,
+        value: v0options.value
+      }]
+    };
+  }
 };
-const defaultWidgetOptions$q = {
+const defaultWidgetOptions$p = {
   answerForms: [],
   times: false,
   buttonSets: ["basic"],
@@ -2868,20 +3152,21 @@ function getExpressionPublicWidgetOptions(options) {
     times: options.times,
     visibleLabel: options.visibleLabel,
     ariaLabel: options.ariaLabel,
-    buttonsVisible: options.buttonsVisible
+    buttonsVisible: options.buttonsVisible,
+    extraKeys: options.extraKeys
   };
 }
 
 const expressionWidgetLogic = {
   name: "expression",
-  version: currentVersion$3,
-  widgetOptionsUpgrades: widgetOptionsUpgrades$2,
-  defaultWidgetOptions: defaultWidgetOptions$q,
+  version: currentVersion$2,
+  widgetOptionsUpgrades: widgetOptionsUpgrades$1,
+  defaultWidgetOptions: defaultWidgetOptions$p,
   defaultAlignment: "inline-block",
   getPublicWidgetOptions: getExpressionPublicWidgetOptions
 };
 
-const defaultWidgetOptions$p = {
+const defaultWidgetOptions$o = {
   title: "",
   content: "",
   widgets: {},
@@ -2890,15 +3175,15 @@ const defaultWidgetOptions$p = {
 };
 const gradedGroupWidgetLogic = {
   name: "graded-group",
-  defaultWidgetOptions: defaultWidgetOptions$p
+  defaultWidgetOptions: defaultWidgetOptions$o
 };
 
-const defaultWidgetOptions$o = {
+const defaultWidgetOptions$n = {
   gradedGroups: []
 };
 const gradedGroupSetWidgetLogic = {
   name: "graded-group-set",
-  defaultWidgetOptions: defaultWidgetOptions$o
+  defaultWidgetOptions: defaultWidgetOptions$n
 };
 
 function getGrapherPublicWidgetOptions(options) {
@@ -2909,7 +3194,7 @@ function getGrapherPublicWidgetOptions(options) {
   return publicOptions;
 }
 
-const defaultWidgetOptions$n = {
+const defaultWidgetOptions$m = {
   graph: {
     labels: ["x", "y"],
     range: [[-10, 10], [-10, 10]],
@@ -2931,25 +3216,25 @@ const defaultWidgetOptions$n = {
 };
 const grapherWidgetLogic = {
   name: "grapher",
-  defaultWidgetOptions: defaultWidgetOptions$n,
+  defaultWidgetOptions: defaultWidgetOptions$m,
   getPublicWidgetOptions: getGrapherPublicWidgetOptions
 };
 
-const defaultWidgetOptions$m = {
+const defaultWidgetOptions$l = {
   content: "",
   widgets: {},
   images: {}
 };
 const groupWidgetLogic = {
   name: "group",
-  defaultWidgetOptions: defaultWidgetOptions$m
+  defaultWidgetOptions: defaultWidgetOptions$l
 };
 
 function getIFramePublicWidgetOptions(options) {
   return options;
 }
 
-const defaultWidgetOptions$l = {
+const defaultWidgetOptions$k = {
   url: "",
   settings: [{
     name: "",
@@ -2962,11 +3247,11 @@ const defaultWidgetOptions$l = {
 };
 const iframeWidgetLogic = {
   name: "iframe",
-  defaultWidgetOptions: defaultWidgetOptions$l,
+  defaultWidgetOptions: defaultWidgetOptions$k,
   getPublicWidgetOptions: getIFramePublicWidgetOptions
 };
 
-const defaultWidgetOptions$k = {
+const defaultWidgetOptions$j = {
   title: "",
   range: [[0, 10], [0, 10]],
   box: [400, 400],
@@ -2981,12 +3266,12 @@ const defaultWidgetOptions$k = {
 };
 const imageWidgetLogic = {
   name: "image",
-  defaultWidgetOptions: defaultWidgetOptions$k,
+  defaultWidgetOptions: defaultWidgetOptions$j,
   supportedAlignments: ["block", "full-width"],
   defaultAlignment: "block"
 };
 
-const defaultWidgetOptions$j = {
+const defaultWidgetOptions$i = {
   value: 0,
   simplify: "required",
   size: "normal",
@@ -2997,11 +3282,11 @@ const defaultWidgetOptions$j = {
 };
 const inputNumberWidgetLogic = {
   name: "input-number",
-  defaultWidgetOptions: defaultWidgetOptions$j,
+  defaultWidgetOptions: defaultWidgetOptions$i,
   defaultAlignment: "inline-block"
 };
 
-const defaultWidgetOptions$i = {
+const defaultWidgetOptions$h = {
   graph: {
     box: [400, 400],
     labels: ["x", "y"],
@@ -3014,7 +3299,7 @@ const defaultWidgetOptions$i = {
 };
 const interactionWidgetLogic = {
   name: "interaction",
-  defaultWidgetOptions: defaultWidgetOptions$i
+  defaultWidgetOptions: defaultWidgetOptions$h
 };
 
 function getInteractiveGraphPublicWidgetOptions(options) {
@@ -3025,7 +3310,7 @@ function getInteractiveGraphPublicWidgetOptions(options) {
   return publicOptions;
 }
 
-const defaultWidgetOptions$h = {
+const defaultWidgetOptions$g = {
   labels: ["x", "y"],
   range: [[-10, 10], [-10, 10]],
   step: [1, 1],
@@ -3045,7 +3330,7 @@ const defaultWidgetOptions$h = {
 };
 const interactiveGraphWidgetLogic = {
   name: "interactive-graph",
-  defaultWidgetOptions: defaultWidgetOptions$h,
+  defaultWidgetOptions: defaultWidgetOptions$g,
   getPublicWidgetOptions: getInteractiveGraphPublicWidgetOptions
 };
 
@@ -3068,7 +3353,7 @@ function getLabelImageMarkerPublicData(marker) {
   return publicData;
 }
 
-const defaultWidgetOptions$g = {
+const defaultWidgetOptions$f = {
   choices: [],
   imageAlt: "",
   imageUrl: "",
@@ -3080,7 +3365,7 @@ const defaultWidgetOptions$g = {
 };
 const labelImageWidgetLogic = {
   name: "label-image",
-  defaultWidgetOptions: defaultWidgetOptions$g,
+  defaultWidgetOptions: defaultWidgetOptions$f,
   getPublicWidgetOptions: getLabelImagePublicWidgetOptions
 };
 
@@ -3142,7 +3427,7 @@ function getMatcherPublicWidgetOptions(options) {
   };
 }
 
-const defaultWidgetOptions$f = {
+const defaultWidgetOptions$e = {
   left: ["$x$", "$y$", "$z$"],
   right: ["$1$", "$2$", "$3$"],
   labels: ["test", "label"],
@@ -3151,7 +3436,7 @@ const defaultWidgetOptions$f = {
 };
 const matcherWidgetLogic = {
   name: "matcher",
-  defaultWidgetOptions: defaultWidgetOptions$f,
+  defaultWidgetOptions: defaultWidgetOptions$e,
   getPublicWidgetOptions: getMatcherPublicWidgetOptions
 };
 
@@ -3163,7 +3448,7 @@ function getMatrixPublicWidgetOptions(options) {
   return publicOptions;
 }
 
-const defaultWidgetOptions$e = {
+const defaultWidgetOptions$d = {
   matrixBoardSize: [3, 3],
   answers: [[]],
   prefix: "",
@@ -3172,15 +3457,15 @@ const defaultWidgetOptions$e = {
 };
 const matrixWidgetLogic = {
   name: "matrix",
-  defaultWidgetOptions: defaultWidgetOptions$e,
+  defaultWidgetOptions: defaultWidgetOptions$d,
   getPublicWidgetOptions: getMatrixPublicWidgetOptions
 };
 
-const currentVersion$2 = {
+const currentVersion$1 = {
   major: 1,
   minor: 0
 };
-const widgetOptionsUpgrades$1 = {
+const widgetOptionsUpgrades = {
   "1": v0options => {
     const {
       imageUrl,
@@ -3198,7 +3483,7 @@ const widgetOptionsUpgrades$1 = {
     };
   }
 };
-const defaultWidgetOptions$d = {
+const defaultWidgetOptions$c = {
   box: [480, 480],
   image: {},
   showProtractor: true,
@@ -3211,9 +3496,9 @@ const defaultWidgetOptions$d = {
 
 const measurerWidgetLogic = {
   name: "measurer",
-  version: currentVersion$2,
-  widgetOptionsUpgrades: widgetOptionsUpgrades$1,
-  defaultWidgetOptions: defaultWidgetOptions$d
+  version: currentVersion$1,
+  widgetOptionsUpgrades: widgetOptionsUpgrades,
+  defaultWidgetOptions: defaultWidgetOptions$c
 };
 
 function getNumberLinePublicWidgetOptions(options) {
@@ -3225,7 +3510,7 @@ function getNumberLinePublicWidgetOptions(options) {
   return publicOptions;
 }
 
-const defaultWidgetOptions$c = {
+const defaultWidgetOptions$b = {
   range: [0, 10],
   labelRange: [null, null],
   labelStyle: "decimal",
@@ -3241,7 +3526,7 @@ const defaultWidgetOptions$c = {
 };
 const numberLineWidgetLogic = {
   name: "number-line",
-  defaultWidgetOptions: defaultWidgetOptions$c,
+  defaultWidgetOptions: defaultWidgetOptions$b,
   getPublicWidgetOptions: getNumberLinePublicWidgetOptions
 };
 
@@ -3282,7 +3567,7 @@ function getNumericInputPublicWidgetOptions(options) {
   };
 }
 
-const defaultWidgetOptions$b = {
+const defaultWidgetOptions$a = {
   answers: [{
     value: null,
     status: "correct",
@@ -3299,7 +3584,7 @@ const defaultWidgetOptions$b = {
 };
 const numericInputWidgetLogic = {
   name: "numeric-input",
-  defaultWidgetOptions: defaultWidgetOptions$b,
+  defaultWidgetOptions: defaultWidgetOptions$a,
   defaultAlignment: "inline-block",
   getPublicWidgetOptions: getNumericInputPublicWidgetOptions
 };
@@ -3321,7 +3606,7 @@ function getOrdererPublicWidgetOptions(options) {
   };
 }
 
-const defaultWidgetOptions$a = {
+const defaultWidgetOptions$9 = {
   correctOptions: [{
     content: "$x$"
   }],
@@ -3333,11 +3618,11 @@ const defaultWidgetOptions$a = {
 };
 const ordererWidgetLogic = {
   name: "orderer",
-  defaultWidgetOptions: defaultWidgetOptions$a,
+  defaultWidgetOptions: defaultWidgetOptions$9,
   getPublicWidgetOptions: getOrdererPublicWidgetOptions
 };
 
-const defaultWidgetOptions$9 = {
+const defaultWidgetOptions$8 = {
   passageTitle: "",
   passageText: "",
   footnotes: "",
@@ -3345,14 +3630,14 @@ const defaultWidgetOptions$9 = {
 };
 const passageWidgetLogic = {
   name: "passage",
-  defaultWidgetOptions: defaultWidgetOptions$9
+  defaultWidgetOptions: defaultWidgetOptions$8
 };
 
-const currentVersion$1 = {
+const currentVersion = {
   major: 0,
   minor: 1
 };
-const defaultWidgetOptions$8 = {
+const defaultWidgetOptions$7 = {
   passageNumber: 1,
   referenceNumber: 1,
   summaryText: ""
@@ -3360,27 +3645,27 @@ const defaultWidgetOptions$8 = {
 
 const passageRefWidgetLogic = {
   name: "passageRef",
-  version: currentVersion$1,
-  defaultWidgetOptions: defaultWidgetOptions$8,
+  version: currentVersion,
+  defaultWidgetOptions: defaultWidgetOptions$7,
   defaultAlignment: "inline"
 };
 
-const defaultWidgetOptions$7 = {
+const defaultWidgetOptions$6 = {
   content: ""
 };
 const passageRefTargetWidgetLogic = {
   name: "passageRefTarget",
-  defaultWidgetOptions: defaultWidgetOptions$7,
+  defaultWidgetOptions: defaultWidgetOptions$6,
   defaultAlignment: "inline"
 };
 
-const defaultWidgetOptions$6 = {
+const defaultWidgetOptions$5 = {
   url: "",
   description: ""
 };
 const phetSimulationWidgetLogic = {
   name: "phet-simulation",
-  defaultWidgetOptions: defaultWidgetOptions$6
+  defaultWidgetOptions: defaultWidgetOptions$5
 };
 
 /**
@@ -3400,7 +3685,7 @@ function getPlotterPublicWidgetOptions(options) {
   return publicOptions;
 }
 
-const defaultWidgetOptions$5 = {
+const defaultWidgetOptions$4 = {
   scaleY: 1,
   maxY: 10,
   snapsPerLine: 2,
@@ -3417,46 +3702,17 @@ const defaultWidgetOptions$5 = {
 };
 const plotterWidgetLogic = {
   name: "plotter",
-  defaultWidgetOptions: defaultWidgetOptions$5,
+  defaultWidgetOptions: defaultWidgetOptions$4,
   getPublicWidgetOptions: getPlotterPublicWidgetOptions
 };
 
-const defaultWidgetOptions$4 = {
+const defaultWidgetOptions$3 = {
   programID: "",
   height: 400
 };
 const pythonProgramWidgetLogic = {
   name: "python-program",
-  defaultWidgetOptions: defaultWidgetOptions$4
-};
-
-const currentVersion = {
-  major: 1,
-  minor: 0
-};
-const widgetOptionsUpgrades = {
-  "1": v0props => {
-    const {
-      noneOfTheAbove,
-      ...rest
-    } = v0props;
-    if (noneOfTheAbove) {
-      throw new Error("radio widget v0 no longer supports auto noneOfTheAbove");
-    }
-    return {
-      ...rest,
-      hasNoneOfTheAbove: false
-    };
-  }
-};
-const defaultWidgetOptions$3 = {
-  choices: [{}, {}, {}, {}],
-  displayCount: null,
-  randomize: false,
-  hasNoneOfTheAbove: false,
-  multipleSelect: false,
-  countChoices: false,
-  deselectEnabled: false
+  defaultWidgetOptions: defaultWidgetOptions$3
 };
 
 /**
@@ -3485,22 +3741,41 @@ function getRadioChoicePublicData(choice) {
   };
 }
 
+/**
+ * Shared functionality to determine if numCorrect is used, because:
+ *
+ * 1. numCorrect is conditionally used for rendering pre-scoring
+ * 2. numCorrect also exposes information about answers
+ *
+ * So only include/use numCorrect when we know it's useful.
+ */
+function usesNumCorrect(multipleSelect, countChoices, numCorrect) {
+  return multipleSelect && countChoices && numCorrect;
+}
+
 /**
  * Given a PerseusRadioWidgetOptions object, return a new object with only
  * the public options that should be exposed to the client.
  */
 function getRadioPublicWidgetOptions(options) {
+  const {
+    numCorrect,
+    choices,
+    multipleSelect,
+    countChoices
+  } = options;
   return {
     ...options,
-    choices: options.choices.map(getRadioChoicePublicData)
+    numCorrect: usesNumCorrect(multipleSelect, countChoices, numCorrect) ? numCorrect : undefined,
+    choices: choices.map(getRadioChoicePublicData)
   };
 }
 
 const radioWidgetLogic = {
   name: "radio",
-  version: currentVersion,
-  widgetOptionsUpgrades: widgetOptionsUpgrades,
-  defaultWidgetOptions: defaultWidgetOptions$3,
+  version: currentVersion$3,
+  widgetOptionsUpgrades: widgetOptionsUpgrades$2,
+  defaultWidgetOptions: defaultWidgetOptions$v,
   getPublicWidgetOptions: getRadioPublicWidgetOptions
 };
 
@@ -3898,6 +4173,8 @@ exports.categorizerLogic = categorizerWidgetLogic;
 exports.csProgramLogic = csProgramWidgetLogic;
 exports.deepClone = deepClone;
 exports.definitionLogic = definitionWidgetLogic;
+exports.deriveExtraKeys = deriveExtraKeys;
+exports.deriveNumCorrect = deriveNumCorrect;
 exports.dropdownLogic = dropdownWidgetLogic;
 exports.explanationLogic = explanationWidgetLogic;
 exports.expressionLogic = expressionWidgetLogic;
@@ -3966,5 +4243,6 @@ exports.sorterLogic = sorterWidgetLogic;
 exports.splitPerseusItem = splitPerseusItem;
 exports.tableLogic = tableWidgetLogic;
 exports.upgradeWidgetInfoToLatestVersion = upgradeWidgetInfoToLatestVersion;
+exports.usesNumCorrect = usesNumCorrect;
 exports.videoLogic = videoWidgetLogic;
 //# sourceMappingURL=index.js.map