@doenet/v06-to-v07 0.7.0-beta-18 → 0.7.0-beta-20

package/index.js

@@ -30700,29 +30700,31 @@ const f$2 = function(e4) {
   if (t2 && (i2 = remove_units(i2, r2)), "number" == typeof i2) return i2;
   if ("string" == typeof i2) return "pi" === i2 && math$1.define_pi ? Math.PI : "e" === i2 && math$1.define_e ? Math.E : "i" === i2 && math$1.define_i ? { re: 0, im: 1 } : n3 ? NaN : null;
   if (!Array.isArray(i2)) return n3 ? NaN : null;
-  var a2 = n3 ? NaN : null;
+  var a2 = [];
+  a2.push([["^", "x", ["/", "m", "n"]], ["^", ["apply", "nthRoot", ["tuple", "x", "n"]], "m"], { variables: { x: (e5) => e5 < 0, n: (e5) => Number.isInteger(e5) && Number.isInteger((e5 - 1) / 2), m: (e5) => Number.isInteger(e5) } }]), a2.push([["^", "x", ["-", ["/", "m", "n"]]], ["^", ["apply", "nthRoot", ["tuple", "x", "n"]], ["-", "m"]], { variables: { x: (e5) => e5 < 0, n: (e5) => Number.isInteger(e5) && Number.isInteger((e5 - 1) / 2), m: (e5) => Number.isInteger(e5) } }]), i2 = applyAllTransformations(i2, a2, 40);
+  var o2 = n3 ? NaN : null;
   try {
-    a2 = f$2(i2)();
+    o2 = f$2(i2)();
   } catch (e5) {
   }
-  if (!Number.isNaN(a2) && ("number" == typeof a2 || "number" == typeof a2?.re && "number" == typeof a2?.im)) {
-    if (a2.re === 1 / 0 || a2.re === -1 / 0 || a2.im === 1 / 0 || a2.im === -1 / 0) {
+  if (!Number.isNaN(o2) && ("number" == typeof o2 || "number" == typeof o2?.re && "number" == typeof o2?.im)) {
+    if (o2.re === 1 / 0 || o2.re === -1 / 0 || o2.im === 1 / 0 || o2.im === -1 / 0) {
       let e5;
-      if ("number" == typeof a2?.re && "number" == typeof a2?.im) if (0 === a2.im) e5 = a2.re;
+      if ("number" == typeof o2?.re && "number" == typeof o2?.im) if (0 === o2.im) e5 = o2.re;
       else {
         let t3;
-        t3 = 1 === a2.im ? "i" : -1 === a2.im ? ["-", "i"] : ["*", a2.im, "i"], e5 = 0 === a2.re ? t3 : ["+", a2.re, t3];
+        t3 = 1 === o2.im ? "i" : -1 === o2.im ? ["-", "i"] : ["*", o2.im, "i"], e5 = 0 === o2.re ? t3 : ["+", o2.re, t3];
       }
-      else e5 = a2;
-      a2 = n3 ? NaN : null;
+      else e5 = o2;
+      o2 = n3 ? NaN : null;
       try {
-        a2 = f$2(e5)();
+        o2 = f$2(e5)();
       } catch (e6) {
       }
-    } else 0 === a2.im && (a2 = a2.re);
-    return a2;
+    } else 0 === o2.im && (o2 = o2.re);
+    return o2;
   }
-  return "object" == typeof a2 && (a2 = n3 ? NaN : null), a2;
+  return "object" == typeof o2 && (o2 = n3 ? NaN : null), o2;
 };
 function factorial_to_gamma_function(e4) {
   return e4.transform((function(e5, t2, r2) {
@@ -39937,6 +39939,10 @@ let styleAttributes = {
   textColorWord: { componentType: "text" },
   textColorDarkMode: { componentType: "text" },
   textColorWordDarkMode: { componentType: "text" },
+  highContrastColor: { componentType: "text" },
+  highContrastColorWord: { componentType: "text" },
+  highContrastColorDarkMode: { componentType: "text" },
+  highContrastColorWordDarkMode: { componentType: "text" },
   backgroundColor: { componentType: "text" },
   backgroundColorWord: { componentType: "text" },
   backgroundColorDarkMode: { componentType: "text" },
@@ -39968,7 +39974,11 @@ let defaultStyle = {
   textColor: "black",
   textColorWord: "black",
   textColorDarkMode: "white",
-  textColorWordDarkMode: "white"
+  textColorWordDarkMode: "white",
+  highContrastColor: "#2963FF",
+  highContrastColorWord: "blue",
+  highContrastColorDarkMode: "#2963FF",
+  highContrastColorWordDarkMode: "blue"
 };
 function returnDefaultStyleDefinitions() {
   return {
@@ -39998,7 +40008,11 @@ function returnDefaultStyleDefinitions() {
       textColor: "black",
       textColorWord: "black",
       textColorDarkMode: "white",
-      textColorWordDarkMode: "white"
+      textColorWordDarkMode: "white",
+      highContrastColor: "#2963FF",
+      highContrastColorWord: "blue",
+      highContrastColorDarkMode: "#2963FF",
+      highContrastColorWordDarkMode: "blue"
     },
     2: {
       lineColor: "#D4042D",
@@ -40026,7 +40040,11 @@ function returnDefaultStyleDefinitions() {
       textColor: "#D4042D",
       textColorWord: "red",
       textColorDarkMode: "#D4042D",
-      textColorWordDarkMode: "red"
+      textColorWordDarkMode: "red",
+      highContrastColor: "#D4042D",
+      highContrastColorWord: "red",
+      highContrastColorDarkMode: "#D4042D",
+      highContrastColorWordDarkMode: "red"
     },
     3: {
       lineColor: "#F19143",
@@ -40051,10 +40069,14 @@ function returnDefaultStyleDefinitions() {
       fillColorDarkMode: "#F19143",
       fillColorWordDarkMode: "orange",
       fillOpacity: 0.3,
-      textColor: "#F19143",
+      textColor: "#BE5A0E",
       textColorWord: "orange",
-      textColorDarkMode: "#F19143",
-      textColorWordDarkMode: "orange"
+      textColorDarkMode: "#BE5A0E",
+      textColorWordDarkMode: "orange",
+      highContrastColor: "#BE5A0E",
+      highContrastColorWord: "orange",
+      highContrastColorDarkMode: "#BE5A0E",
+      highContrastColorWordDarkMode: "orange"
     },
     4: {
       lineColor: "#644CD6",
@@ -40082,7 +40104,11 @@ function returnDefaultStyleDefinitions() {
       textColor: "#644CD6",
       textColorWord: "purple",
       textColorDarkMode: "#644CD6",
-      textColorWordDarkMode: "purple"
+      textColorWordDarkMode: "purple",
+      highContrastColor: "#644CD6",
+      highContrastColorWord: "purple",
+      highContrastColorDarkMode: "#644CD6",
+      highContrastColorWordDarkMode: "purple"
     },
     5: {
       lineColor: "black",
@@ -40110,7 +40136,11 @@ function returnDefaultStyleDefinitions() {
       textColor: "black",
       textColorWord: "black",
       textColorDarkMode: "white",
-      textColorWordDarkMode: "white"
+      textColorWordDarkMode: "white",
+      highContrastColor: "black",
+      highContrastColorWord: "black",
+      highContrastColorDarkMode: "black",
+      highContrastColorWordDarkMode: "black"
     },
     6: {
       lineColor: "gray",
@@ -40135,10 +40165,14 @@ function returnDefaultStyleDefinitions() {
       fillColorDarkMode: "gray",
       fillColorWordDarkMode: "gray",
       fillOpacity: 0.3,
-      textColor: "gray",
+      textColor: "#757575",
       textColorWord: "gray",
-      textColorDarkMode: "gray",
-      textColorWordDarkMode: "gray"
+      textColorDarkMode: "#757575",
+      textColorWordDarkMode: "gray",
+      highContrastColor: "#757575",
+      highContrastColorWord: "gray",
+      highContrastColorDarkMode: "#757575",
+      highContrastColorWordDarkMode: "gray"
     }
   };
 }
@@ -42069,6 +42103,7 @@ function applySugar({
                 });
                 newComponent.children = expandResult.components;
                 errors.push(...expandResult.errors);
+                warnings.push(...expandResult.warnings);
                 nComponents = expandResult.nComponents;
               } else {
                 console.log(
@@ -42107,6 +42142,7 @@ function applySugar({
                   expandResult.attributes
                 );
                 errors.push(...expandResult.errors);
+                warnings.push(...expandResult.warnings);
                 nComponents = expandResult.nComponents;
               } else {
                 console.log(
@@ -42637,6 +42673,7 @@ async function normalizedDastToSerializedComponents(normalized_root, componentIn
   if (typeof documentIdx === "string" || normalized_root.children.length !== 1) {
     throw Error("Root of dast should be a single document");
   }
+  const errors = [];
   const warnings = [];
   const unflattenedDocument = unflattenDastNodes(
     [documentIdx],
@@ -42660,7 +42697,8 @@ async function normalizedDastToSerializedComponents(normalized_root, componentIn
   });
   let expandedRoot = expandResult.components;
   nComponents = expandResult.nComponents;
-  const errors = expandResult.errors;
+  errors.push(...expandResult.errors);
+  warnings.push(...expandResult.warnings);
   expandedRoot = removeBlankStringChildren(
     expandedRoot,
     componentInfoObjects2
@@ -42688,7 +42726,8 @@ function expandUnflattenedToSerializedComponents({
   ignoreErrors = false,
   init = true
 }) {
-  let errors = [];
+  const errors = [];
+  const warnings = [];
   let newComponents = [];
   for (let component of serializedComponents) {
     if (typeof component === "string") {
@@ -42711,6 +42750,7 @@ function expandUnflattenedToSerializedComponents({
       });
       let attributes = expandResult.attributes;
       errors.push(...expandResult.errors);
+      warnings.push(...expandResult.warnings);
       nComponents = expandResult.nComponents;
       const defaultPrimitiveResult = addDefaultPrimitiveAttributes({
         unflattenedAttributes: component.attributes,
@@ -42721,6 +42761,7 @@ function expandUnflattenedToSerializedComponents({
       });
       attributes = defaultPrimitiveResult.attributes;
       errors.push(...defaultPrimitiveResult.errors);
+      warnings.push(...defaultPrimitiveResult.warnings);
       nComponents = defaultPrimitiveResult.nComponents;
       let extending = void 0;
       if (component.extending) {
@@ -42736,6 +42777,7 @@ function expandUnflattenedToSerializedComponents({
         const refResolution = refResolutionResult.refResolution;
         extending = addSource(refResolution, component.extending);
         errors.push(...refResolutionResult.errors);
+        warnings.push(...refResolutionResult.warnings);
         nComponents = refResolutionResult.nComponents;
       }
       newComponent = {
@@ -42768,13 +42810,14 @@ function expandUnflattenedToSerializedComponents({
     });
     newComponent.children = res.components;
     errors.push(...res.errors);
+    warnings.push(...res.warnings);
     nComponents = res.nComponents;
     newComponents.push(newComponent);
   }
   if (init) {
     newComponents = decodeXMLEntities(newComponents);
   }
-  return { errors, components: newComponents, nComponents };
+  return { errors, warnings, components: newComponents, nComponents };
 }
 function expandUnflattenedRefResolution({
   unflattenedRefResolution,
@@ -42783,7 +42826,8 @@ function expandUnflattenedRefResolution({
   ignoreErrors
 }) {
   let unresolvedPath = null;
-  let errors = [];
+  const errors = [];
+  const warnings = [];
   if (unflattenedRefResolution.unresolvedPath) {
     const res2 = expandUnflattenedPath({
       unflattenedPath: unflattenedRefResolution.unresolvedPath,
@@ -42794,6 +42838,7 @@ function expandUnflattenedRefResolution({
     unresolvedPath = res2.expandedPath;
     nComponents = res2.nComponents;
     errors.push(...res2.errors);
+    warnings.push(...res2.warnings);
   }
   const res = expandUnflattenedPath({
     unflattenedPath: unflattenedRefResolution.originalPath,
@@ -42804,6 +42849,7 @@ function expandUnflattenedRefResolution({
   const originalPath = res.expandedPath;
   nComponents = res.nComponents;
   errors.push(...res.errors);
+  warnings.push(...res.warnings);
   const refResolution = {
     nodeIdx: unflattenedRefResolution.nodeIdx,
     unresolvedPath,
@@ -42813,6 +42859,7 @@ function expandUnflattenedRefResolution({
   return {
     refResolution,
     errors,
+    warnings,
     nComponents
   };
 }
@@ -42822,7 +42869,8 @@ function expandUnflattenedPath({
   nComponents,
   ignoreErrors
 }) {
-  let errors = [];
+  const errors = [];
+  const warnings = [];
   const expandedPath = unflattenedPath.map((path_part) => {
     let index2 = path_part.index.map((flat_index) => {
       let res = expandUnflattenedToSerializedComponents({
@@ -42833,6 +42881,7 @@ function expandUnflattenedPath({
       });
       let valueComponents = res.components;
       errors.push(...res.errors);
+      warnings.push(...res.warnings);
       nComponents = res.nComponents;
       if (valueComponents.length !== 1) {
         throw Error("Unresolved index should be a single component");
@@ -42850,7 +42899,7 @@ function expandUnflattenedPath({
       sourceDoc: path_part.sourceDoc
     };
   });
-  return { expandedPath, nComponents, errors };
+  return { expandedPath, nComponents, errors, warnings };
 }
 function expandAllUnflattenedAttributes({
   unflattenedAttributes,
@@ -42860,6 +42909,7 @@ function expandAllUnflattenedAttributes({
 }) {
   let classAttributes = componentClass.createAttributesObject();
   const errors = [];
+  const warnings = [];
   let attributeLowerCaseMapping = {};
   for (let attrName in classAttributes) {
     attributeLowerCaseMapping[attrName.toLowerCase()] = attrName;
@@ -42881,6 +42931,7 @@ function expandAllUnflattenedAttributes({
       });
       attributes[attrName] = res.attribute;
       errors.push(...res.errors);
+      warnings.push(...res.warnings);
       nComponents = res.nComponents;
     } else if (componentClass.acceptAnyAttribute || attr.includes(":")) {
       let res = expandAttribute({
@@ -42891,6 +42942,7 @@ function expandAllUnflattenedAttributes({
       });
       attributes[attr] = res.attribute;
       errors.push(...res.errors);
+      warnings.push(...res.warnings);
       nComponents = res.nComponents;
     } else {
       throw Error(
@@ -42898,7 +42950,7 @@ function expandAllUnflattenedAttributes({
       );
     }
   }
-  return { attributes, errors, nComponents };
+  return { attributes, errors, warnings, nComponents };
 }
 function addDefaultPrimitiveAttributes({
   unflattenedAttributes,
@@ -42908,6 +42960,7 @@ function addDefaultPrimitiveAttributes({
   nComponents
 }) {
   const errors = [];
+  const warnings = [];
   let classAttributes = componentClass.createAttributesObject();
   const newAttributes = { ...currentAttributes };
   for (let attrName in classAttributes) {
@@ -42925,10 +42978,11 @@ function addDefaultPrimitiveAttributes({
       });
       newAttributes[attrName] = res.attribute;
       errors.push(...res.errors);
+      warnings.push(...res.warnings);
       nComponents = res.nComponents;
     }
   }
-  return { attributes: newAttributes, errors, nComponents };
+  return { attributes: newAttributes, errors, warnings, nComponents };
 }
 function expandAttribute({
   attrDef,
@@ -42937,7 +42991,8 @@ function expandAttribute({
   componentInfoObjects: componentInfoObjects2,
   nComponents
 }) {
-  let errors = [];
+  const errors = [];
+  const warnings = [];
   if (attrDef?.createComponentOfType) {
     const initialResult = createInitialComponentFromAttribute({
       attrDef,
@@ -42986,6 +43041,7 @@ function expandAttribute({
       nComponents
     });
     errors.push(...res.errors);
+    warnings.push(...res.warnings);
     nComponents = res.nComponents;
     let attr = {
       type: "component",
@@ -42999,7 +43055,7 @@ function expandAttribute({
     if (attrDef.ignoreFixed) {
       attr.component.doenetAttributes.ignoreParentFixed = true;
     }
-    return { attribute: attr, errors, nComponents };
+    return { attribute: attr, errors, warnings, nComponents };
   } else if (attrDef?.createPrimitiveOfType) {
     let primitiveValue = createPrimitiveFromAttribute({ attrDef, attribute });
     if (attrDef.validatePrimitives) {
@@ -43013,6 +43069,7 @@ function expandAttribute({
         sourceDoc: attribute.sourceDoc
       },
       errors,
+      warnings,
       nComponents
     };
   } else if (attrDef?.createReferences) {
@@ -43022,19 +43079,38 @@ function expandAttribute({
       nComponents
     });
     errors.push(...res.errors);
+    warnings.push(...res.warnings);
     nComponents = res.nComponents;
+    const references = [];
+    const stringChildren = [];
+    for (const child of res.components) {
+      if (typeof child === "object") {
+        references.push(child);
+      } else if (typeof child === "string") {
+        if (child.trim() !== "") {
+          stringChildren.push(child);
+          if (!attrDef.allowStrings) {
+            warnings.push({
+              type: "warning",
+              message: `Invalid value "${child.trim()}" for attribute ${attribute.name}. Attribute must be composed of references that begin with a $.`,
+              position: attribute.position,
+              sourceDoc: attribute.sourceDoc
+            });
+          }
+        }
+      }
+    }
     return {
       attribute: {
         type: "references",
         name: attribute.name,
-        references: res.components.filter(
-          (child) => typeof child === "object"
-        ),
-        stringChildren: res.components.filter((child) => typeof child === "string").filter((child) => child.trim() !== ""),
+        references,
+        stringChildren,
         position: attribute.position,
         sourceDoc: attribute.sourceDoc
       },
       errors,
+      warnings,
       nComponents
     };
   } else {
@@ -43047,6 +43123,7 @@ function expandAttribute({
         sourceDoc: attribute.sourceDoc
       },
       errors,
+      warnings,
       nComponents
     };
   }
@@ -43218,6 +43295,7 @@ function convertUnresolvedAttributesForComponentType({
   nComponents
 }) {
   const errors = [];
+  const warnings = [];
   const newClass = componentInfoObjects2.allComponentClasses[componentType];
   const newAttributesObj = newClass.createAttributesObject();
   let attributeLowerCaseMapping = {};
@@ -43242,6 +43320,7 @@ function convertUnresolvedAttributesForComponentType({
         });
         newAttributes[attrName] = res.attribute;
         errors.push(...res.errors);
+        warnings.push(...res.warnings);
         nComponents = res.nComponents;
         if (newAttributes[attrName].type === "component") {
           for (const child of newAttributes[attrName].component.children) {
@@ -43262,6 +43341,7 @@ function convertUnresolvedAttributesForComponentType({
             nComponents
           });
           errors.push(...sugarResult.errors);
+          warnings.push(...sugarResult.warnings);
           nComponents = sugarResult.nComponents;
           newAttributes[attrName].component = sugarResult.components[0];
         }
@@ -52780,7 +52860,7 @@ class Core {
    * as that corresponds to the component that was authored.
    */
   getRendererId(component) {
-    return this.rootNames?.[component.componentOrAdaptedIdx] ?? component.componentOrAdaptedIdx.toString();
+    return this.rootNames?.[component.componentOrAdaptedIdx] ?? `_id_${component.componentOrAdaptedIdx.toString()}`;
   }
   deleteFromComponentsToRender({
     componentIdx,
@@ -81903,7 +81983,8 @@ class SectioningComponent extends BlockComponent {
             "anything",
             "variantControls",
             "titles",
-            "setups"
+            "setups",
+            "cascadeMessages"
           ]
         },
         asList: {
@@ -81917,9 +81998,14 @@ class SectioningComponent extends BlockComponent {
       }),
       definition({ dependencyValues }) {
         const childIndices = dependencyValues.childIndicesToRender;
-        const firstRenderedChild = dependencyValues.allChildren[childIndices[0]];
-        const startsWithIntroduction = firstRenderedChild?.componentType === "introduction";
-        const lastRenderedChild = dependencyValues.allChildren[childIndices[childIndices.length - 1]];
+        const renderedNonTitleBlankStringChildren = childIndices.map((idx) => dependencyValues.allChildren[idx]).filter((child) => {
+          if (typeof child === "string") {
+            return child.trim() !== "";
+          }
+          return child.componentType !== "title";
+        });
+        const startsWithIntroduction = renderedNonTitleBlankStringChildren[0]?.componentType === "introduction";
+        const lastRenderedChild = renderedNonTitleBlankStringChildren[renderedNonTitleBlankStringChildren.length - 1];
         const endsWithConclusion = lastRenderedChild?.componentType === "conclusion";
         return {
           setValue: { startsWithIntroduction, endsWithConclusion }
@@ -101282,13 +101368,14 @@ class PaginatorControls extends BlockComponent {
             paginatorPage: {
               dependencyType: "stateVariable",
               componentIdx: stateValues.paginatorComponentIdx,
-              variableName: "currentPage"
+              variableName: "currentPage",
+              variablesOptional: true
             }
           };
         }
       },
       definition({ dependencyValues }) {
-        if ("paginatorPage" in dependencyValues) {
+        if ("paginatorPage" in dependencyValues && Number.isInteger(dependencyValues.paginatorPage)) {
           return {
             setValue: {
               currentPage: dependencyValues.paginatorPage
@@ -101310,13 +101397,14 @@ class PaginatorControls extends BlockComponent {
             paginatorNPages: {
               dependencyType: "stateVariable",
               componentIdx: stateValues.paginatorComponentIdx,
-              variableName: "numPages"
+              variableName: "numPages",
+              variablesOptional: true
             }
           };
         }
       },
       definition({ dependencyValues }) {
-        if ("paginatorNPages" in dependencyValues) {
+        if ("paginatorNPages" in dependencyValues && Number.isInteger(dependencyValues.paginatorNPages)) {
           return {
             setValue: {
               numPages: dependencyValues.paginatorNPages
@@ -101399,10 +101487,18 @@ class Input extends InlineComponent {
       public: true,
       excludeFromSchema: true
     };
+    attributes.description = {
+      createComponentOfType: "text",
+      createStateVariable: "descriptionPreliminary",
+      defaultValue: ""
+    };
+    Object.assign(attributes, returnLabelAttributes());
     return attributes;
   }
   static returnStateVariableDefinitions() {
-    let stateVariableDefinitions = super.returnStateVariableDefinitions();
+    const stateVariableDefinitions = super.returnStateVariableDefinitions();
+    const labelDefinitions = returnLabelStateVariableDefinitions();
+    Object.assign(stateVariableDefinitions, labelDefinitions);
     stateVariableDefinitions.numValues = {
       returnDependencies: () => ({}),
       definition: () => ({ setValue: { numValues: 1 } })
@@ -101424,7 +101520,8 @@ class Input extends InlineComponent {
             "numIncorrectSubmissions",
             "numPreviousIncorrectSubmissions",
             "creditFactorUsed",
-            "nextCreditFactor"
+            "nextCreditFactor",
+            "description"
           ]
         }
       }),
@@ -101675,6 +101772,41 @@ class Input extends InlineComponent {
         return { setValue: { nextCreditFactor } };
       }
     };
+    stateVariableDefinitions.description = {
+      forRenderer: true,
+      public: true,
+      shadowingInstructions: {
+        createComponentOfType: "text"
+      },
+      returnDependencies: () => ({
+        answerAncestor: {
+          dependencyType: "stateVariable",
+          variableName: "answerAncestor"
+        },
+        descriptionPreliminary: {
+          dependencyType: "stateVariable",
+          variableName: "descriptionPreliminary"
+        },
+        label: {
+          dependencyType: "stateVariable",
+          variableName: "label"
+        }
+      }),
+      definition({ dependencyValues, usedDefault }) {
+        let description = dependencyValues.descriptionPreliminary;
+        if (usedDefault.descriptionPreliminary && dependencyValues.answerAncestor) {
+          description = dependencyValues.answerAncestor.stateValues.description;
+        }
+        const warnings = [];
+        if (!description && !dependencyValues.label) {
+          warnings.push({
+            message: "Input (or answer producing an input) must have a description or a label.",
+            level: 1
+          });
+        }
+        return { setValue: { description }, sendWarnings: warnings };
+      }
+    };
     return stateVariableDefinitions;
   }
 }
@@ -101815,6 +101947,10 @@ class MatrixInput extends Input {
   }
   static returnChildGroups() {
     return [
+      {
+        group: "labels",
+        componentTypes: ["label"]
+      },
       {
         group: "matrixComponentInputs",
         componentTypes: ["_matrixComponentInput"],
@@ -104977,7 +105113,6 @@ class Solution extends BlockComponent {
 }
 class GivenAnswer extends Solution {
   static componentType = "givenAnswer";
-  static excludeFromSchema = true;
   static returnStateVariableDefinitions() {
     let stateVariableDefinitions = super.returnStateVariableDefinitions();
     stateVariableDefinitions.sectionName.definition = () => ({
@@ -107743,7 +107878,10 @@ class Ref extends InlineComponent {
   static createAttributesObject() {
     let attributes = super.createAttributesObject();
     attributes.to = {
-      createReferences: true
+      createReferences: true,
+      // Since we allow more than just references in `to`,
+      // we specify `allowStrings` to suppress a warning for non-references.
+      allowStrings: true
     };
     attributes.textType = {
       createComponentOfType: "text",
@@ -124873,6 +125011,14 @@ class Answer extends InlineComponent {
       defaultValue: false,
       public: true
     };
+    attributes.description = {
+      createComponentOfType: "text",
+      createStateVariable: "description",
+      defaultValue: "",
+      public: true,
+      forRenderer: true
+    };
+    Object.assign(attributes, returnLabelAttributes());
     return attributes;
   }
   static returnSugarInstructions() {
@@ -124933,6 +125079,22 @@ class Answer extends InlineComponent {
       let definitelyDoNotAddInput = false, mayNeedInput = false;
       let foundResponse = false;
       let foundAward = false;
+      const labelChildren = matchedChildren.filter(
+        (child) => componentIsSpecifiedType(child, "label")
+      );
+      matchedChildren = matchedChildren.filter(
+        (child) => !componentIsSpecifiedType(child, "label")
+      );
+      const firstNonBlankInd = matchedChildren.findIndex(
+        (child) => typeof child !== "string" || child.trim() !== ""
+      );
+      const lastNonBlankInd = matchedChildren.findLastIndex(
+        (child) => typeof child !== "string" || child.trim() !== ""
+      );
+      matchedChildren = matchedChildren.slice(
+        firstNonBlankInd,
+        lastNonBlankInd + 1
+      );
       let childIsWrappable = [];
       for (let child of matchedChildren) {
         if (typeof child !== "object") {
@@ -125049,7 +125211,7 @@ class Answer extends InlineComponent {
             type: "serialized",
             componentType: "choiceInput",
             componentIdx: nComponents++,
-            children: matchedChildren,
+            children: [...labelChildren, ...matchedChildren],
             attributes: {},
             doenetAttributes: {},
             state: {}
@@ -125110,22 +125272,25 @@ class Answer extends InlineComponent {
         childrenToWrap = matchedChildren;
       } else {
         if (!childIsWrappable[0]) {
-          let firstNonLabelInd = childIsWrappable.indexOf(true);
-          if (firstNonLabelInd !== -1) {
+          let firstWrappableInd = childIsWrappable.indexOf(true);
+          if (firstWrappableInd !== -1) {
             childrenToNotWrapBegin = matchedChildren.slice(
               0,
-              firstNonLabelInd
+              firstWrappableInd
             );
-            matchedChildren = matchedChildren.slice(firstNonLabelInd);
-            childIsWrappable = childIsWrappable.slice(firstNonLabelInd);
+            matchedChildren = matchedChildren.slice(firstWrappableInd);
+            childIsWrappable = childIsWrappable.slice(firstWrappableInd);
           }
         }
-        let firstLabelInd = childIsWrappable.indexOf(false);
-        if (firstLabelInd === -1) {
+        let firstNonWrappableInd = childIsWrappable.indexOf(false);
+        if (firstNonWrappableInd === -1) {
           childrenToWrap = matchedChildren;
         } else {
-          childrenToWrap = matchedChildren.slice(0, firstLabelInd);
-          childrenToNotWrapEnd = matchedChildren.slice(firstLabelInd);
+          childrenToWrap = matchedChildren.slice(
+            0,
+            firstNonWrappableInd
+          );
+          childrenToNotWrapEnd = matchedChildren.slice(firstNonWrappableInd);
         }
       }
       while (typeof childrenToWrap[0] === "string" && childrenToWrap[0].trim() === "") {
@@ -125187,13 +125352,15 @@ class Answer extends InlineComponent {
             type: "serialized",
             componentType: inputType,
             componentIdx: nComponents++,
-            children: [],
+            children: labelChildren,
             attributes: {},
             doenetAttributes: {},
             state: {}
           },
           ...newChildren
         ];
+      } else {
+        newChildren = [...labelChildren, ...newChildren];
       }
       return {
         success: true,
@@ -125220,6 +125387,10 @@ class Answer extends InlineComponent {
       {
         group: "responses",
         componentTypes: ["considerAsResponses"]
+      },
+      {
+        group: "labels",
+        componentTypes: ["label"]
       }
     ];
   }
@@ -125234,6 +125405,8 @@ class Answer extends InlineComponent {
       stateVariableDefinitions,
       returnStandardAnswerStateVariableDefinition()
     );
+    const labelDefinitions = returnLabelStateVariableDefinitions();
+    Object.assign(stateVariableDefinitions, labelDefinitions);
     stateVariableDefinitions.haveAwardThatRequiresInput = {
       returnDependencies: () => ({
         awardChildren: {
@@ -127356,7 +127529,6 @@ class MathInput extends Input {
       public: true,
       forRenderer: true
     };
-    Object.assign(attributes, returnLabelAttributes());
     return attributes;
   }
   // Include children that can be added due to sugar
@@ -127392,8 +127564,6 @@ class MathInput extends Input {
         displaySmallAsZeroDefault: 0
       })
     );
-    let labelDefinitions = returnLabelStateVariableDefinitions();
-    Object.assign(stateVariableDefinitions, labelDefinitions);
     stateVariableDefinitions.valueChanged = {
       public: true,
       hasEssential: true,
@@ -128127,7 +128297,6 @@ class Textinput extends Input {
       forRenderer: true
     };
     Object.assign(attributes, returnAnchorAttributes());
-    Object.assign(attributes, returnLabelAttributes());
     return attributes;
   }
   // Include children that can be added due to sugar
@@ -128156,8 +128325,6 @@ class Textinput extends Input {
   }
   static returnStateVariableDefinitions() {
     let stateVariableDefinitions = super.returnStateVariableDefinitions();
-    let labelDefinitions = returnLabelStateVariableDefinitions();
-    Object.assign(stateVariableDefinitions, labelDefinitions);
     let anchorDefinition = returnAnchorStateVariableDefinition();
     Object.assign(stateVariableDefinitions, anchorDefinition);
     stateVariableDefinitions.width = {
@@ -128627,7 +128794,6 @@ class BooleanInput extends Input {
       public: true,
       forRenderer: true
     };
-    Object.assign(attributes, returnLabelAttributes());
     Object.assign(attributes, returnAnchorAttributes());
     return attributes;
   }
@@ -128656,8 +128822,6 @@ class BooleanInput extends Input {
   }
   static returnStateVariableDefinitions() {
     let stateVariableDefinitions = super.returnStateVariableDefinitions();
-    let labelDefinitions = returnLabelStateVariableDefinitions();
-    Object.assign(stateVariableDefinitions, labelDefinitions);
     let anchorDefinition = returnAnchorStateVariableDefinition();
     Object.assign(stateVariableDefinitions, anchorDefinition);
     stateVariableDefinitions.valueChanged = {
@@ -128953,7 +129117,6 @@ class Choiceinput extends Input {
       forRenderer: true,
       fallBackToParentStateVariable: "submitLabelNoCorrectness"
     };
-    Object.assign(attributes, returnLabelAttributes());
     return attributes;
   }
   static returnChildGroups() {
@@ -128970,8 +129133,6 @@ class Choiceinput extends Input {
   }
   static returnStateVariableDefinitions() {
     let stateVariableDefinitions = super.returnStateVariableDefinitions();
-    let labelDefinitions = returnLabelStateVariableDefinitions();
-    Object.assign(stateVariableDefinitions, labelDefinitions);
     stateVariableDefinitions.inline = {
       public: true,
       shadowingInstructions: {
@@ -130119,6 +130280,38 @@ class Choiceinput extends Input {
         return { setValue: { feedbacks } };
       }
     };
+    stateVariableDefinitions.childIndicesToRender = {
+      returnDependencies: () => ({
+        children: {
+          dependencyType: "child",
+          childGroups: ["labels", "choices"]
+        },
+        inline: {
+          dependencyType: "stateVariable",
+          variableName: "inline"
+        }
+      }),
+      definition: function({ dependencyValues }) {
+        if (dependencyValues.inline) {
+          return { setValue: { childIndicesToRender: [] } };
+        } else {
+          const childIndicesToRender = [];
+          for (const [
+            ind,
+            child
+          ] of dependencyValues.children.entries()) {
+            if (child.componentType === "choice") {
+              childIndicesToRender.push(ind);
+            }
+          }
+          return {
+            setValue: {
+              childIndicesToRender
+            }
+          };
+        }
+      }
+    };
     return stateVariableDefinitions;
   }
   async updateSelectedIndices({
@@ -136414,7 +136607,7 @@ class RepeatForSequence extends CompositeComponent {
       }
       numVariantsByDescendant.push(result2.numVariants);
     }
-    if (numVariantsByDescendant.length === 1 && numVariantsByDescendant[0] === 1) {
+    if (numVariantsByDescendant.every((x2) => x2 === 1)) {
       serializedComponent.variants.numVariants = 1;
       return {
         success: true,
@@ -192245,6 +192438,8 @@ class ModuleAttributes extends CompositeComponent {
         componentInfoObjects: componentInfoObjects2,
         nComponents
       });
+      errors.push(...expandResult.errors);
+      warnings.push(...expandResult.warnings);
       nComponents = expandResult.nComponents;
       child.children = expandResult.components;
       const sugarResult = applySugar({
@@ -200509,6 +200704,8 @@ class Pretzel extends BlockScoredComponent {
   static componentType = "pretzel";
   static renderChildren = true;
   static canDisplayChildErrors = true;
+  static additionalSchemaChildren = ["problem"];
+  static additionalSchemaChildrenDoNotInherit = true;
   static createAttributesObject() {
     const attributes = super.createAttributesObject();
     attributes.maxNumColumns = {
@@ -200525,15 +200722,18 @@ class Pretzel extends BlockScoredComponent {
     return [
       {
         group: "problems",
-        componentTypes: ["statement"]
+        componentTypes: ["statement"],
+        excludeFromSchema: true
       },
       {
         group: "textInputs",
-        componentTypes: ["textInput"]
+        componentTypes: ["textInput"],
+        excludeFromSchema: true
       },
       {
         group: "givenAnswers",
-        componentTypes: ["span"]
+        componentTypes: ["span"],
+        excludeFromSchema: true
       }
     ];
   }
@@ -201191,6 +201391,21 @@ class PretzelArranger extends CompositeComponent {
               attributes: {},
               doenetAttributes: {}
             }
+          },
+          description: {
+            type: "component",
+            name: "description",
+            component: {
+              type: "serialized",
+              componentType: "text",
+              componentIdx: nComponents++,
+              state: {
+                value: "Enter number in sequence for this answer"
+              },
+              children: [],
+              attributes: {},
+              doenetAttributes: {}
+            }
           }
         },
         doenetAttributes: {},