@doenet/v06-to-v07 0.7.26-dev.554 → 0.7.26-dev.556

package/{index-73JwkM8q.js → index-DIu-y05T.js}

@@ -47294,7 +47294,7 @@ async function cidFromArrayBuffer(data) {
       await crypto.subtle.digest("SHA-256", new Uint8Array());
       digest = (data2) => crypto.subtle.digest("SHA-256", data2);
     } catch (e22) {
-      const sha256 = (await import("./sha256-DT5xJ2Hv-DLZ_0KQR-CTejU37e.js").then((n2) => n2.s)).default;
+      const sha256 = (await import("./sha256-DT5xJ2Hv-DWG-Iovj-joZgNq7H.js").then((n2) => n2.s)).default;
       digest = (data2) => sha256(data2, {
         asBytes: true
       });
@@ -55048,9 +55048,8 @@ function createNewComponentIndicesSub(serializedComponents, nComponents, stateId
   return { components: newComponents, idxMap, nComponents };
 }
 function newComponentIndicesForExtending(extending, nComponents, idxMap, idxMapOverride, stateIdInfo) {
-  let newExtending = extending;
   const refResolution = unwrapSource(extending);
-  let originalPath = [];
+  const originalPath = [];
   for (const pathPath of refResolution.originalPath) {
     const newPathPart = { ...pathPath };
     const index2 = [];
@@ -55069,11 +55068,12 @@ function newComponentIndicesForExtending(extending, nComponents, idxMap, idxMapO
     }
     newPathPart.index = index2;
     originalPath.push(newPathPart);
-    const newRefResolution = { ...refResolution };
-    newRefResolution.originalPath = originalPath;
-    newExtending = addSource(newRefResolution, extending);
   }
-  return { extending: newExtending, nComponents };
+  const newRefResolution = { ...refResolution, originalPath };
+  return {
+    extending: addSource(newRefResolution, extending),
+    nComponents
+  };
 }
 function newComponentIndicesForAttributes(attributes, nComponents, idxMap, idxMapOverride, stateIdInfo) {
   const newAttributes = {};
@@ -61125,7 +61125,7 @@ const _Dependency = class _Dependency2 {
       if (this.propIndex !== void 0) {
         const referringComponent = this.dependencyHandler.core._components[this.upstreamComponentIdx];
         const referenceText = doenetMLStringForReference(
-          referringComponent?.refResolution?.originalPath,
+          this.definition.referenceOriginalPath ?? referringComponent?.refResolution?.originalPath,
           this.dependencyHandler.core.allDoenetMLs
         );
         mappedVarNames = await arrayEntryNamesFromPropIndex({
@@ -61135,9 +61135,13 @@ const _Dependency = class _Dependency2 {
           propIndex: this.propIndex,
           reference: referenceText ? {
             text: `$${referenceText}`,
-            // Marked where the index was written.
-            position: referringComponent.position,
-            sourceDoc: referringComponent.sourceDoc
+            // Marked where the index was written. Read
+            // with `?.`: a path carried on the dependency
+            // yields text whether or not the component
+            // that dependency hangs off is still there to
+            // be found.
+            position: referringComponent?.position,
+            sourceDoc: referringComponent?.sourceDoc
           } : void 0
         });
       }
@@ -151931,11 +151935,7 @@ class Answer extends InlineComponent {
 }
 function comparePathsIgnorePosition(path1, path2) {
   if (path1 === null) {
-    if (path2 == null) {
-      return true;
-    } else {
-      return false;
-    }
+    return path2 === null;
   } else if (path2 === null) {
     return false;
   }
@@ -151952,10 +151952,43 @@ function comparePathsIgnorePosition(path1, path2) {
       if (index1.value.length !== index2.value.length) {
         return false;
       }
-      return index1.value.every((v2, k2) => v2 == index2.value[k2]);
+      return index1.value.every(
+        (v2, k2) => compareIndexValues(v2, index2.value[k2])
+      );
     });
   });
 }
+function compareIndexValues(value1, value2) {
+  if (isSerializedComponent(value1) && isSerializedComponent(value2)) {
+    return compareIndexComponents(value1, value2);
+  }
+  return value1 == value2;
+}
+function compareIndexComponents(component1, component2) {
+  if (component1.componentType !== component2.componentType) {
+    return false;
+  }
+  const extending1 = component1.extending ? unwrapSource(component1.extending) : null;
+  const extending2 = component2.extending ? unwrapSource(component2.extending) : null;
+  if (extending1 || extending2) {
+    if (!extending1 || !extending2 || extending1.nodeIdx !== extending2.nodeIdx || !comparePathsIgnorePosition(
+      extending1.unresolvedPath,
+      extending2.unresolvedPath
+    )) {
+      return false;
+    }
+  }
+  if (component1.children.length !== component2.children.length) {
+    return false;
+  }
+  return component1.children.every((child1, i2) => {
+    const child2 = component2.children[i2];
+    if (isSerializedComponent(child1) && isSerializedComponent(child2)) {
+      return compareIndexComponents(child1, child2);
+    }
+    return child1 === child2;
+  });
+}
 class Award extends BaseComponent {
   static componentType = "award";
   static componentDocs = {
@@ -213403,7 +213436,14 @@ class AnimateFromSequence extends BaseComponent {
       }
     };
     stateVariableDefinitions.targetComponentIdx = {
-      additionalStateVariablesDefined: ["unresolvedPath"],
+      // `targetOriginalPath` is the `target` reference's path as the
+      // author wrote it — positions and all — kept so that a failure
+      // can quote the `$…` back to them. The component index alone is
+      // no use for that: it never appeared in the document.
+      additionalStateVariablesDefined: [
+        "unresolvedPath",
+        "targetOriginalPath"
+      ],
       returnDependencies: () => ({
         target: {
           dependencyType: "attributeRefResolutions",
@@ -213416,14 +213456,16 @@ class AnimateFromSequence extends BaseComponent {
           return {
             setValue: {
               targetComponentIdx: target.componentIdx,
-              unresolvedPath: target.unresolvedPath
+              unresolvedPath: target.unresolvedPath,
+              targetOriginalPath: target.originalPath
             }
           };
         } else {
           return {
             setValue: {
               targetComponentIdx: null,
-              unresolvedPath: null
+              unresolvedPath: null,
+              targetOriginalPath: null
             }
           };
         }
@@ -213506,7 +213548,8 @@ class AnimateFromSequence extends BaseComponent {
     stateVariableDefinitions.targets = {
       stateVariablesDeterminingDependencies: [
         "targetIdentities",
-        "unresolvedPath"
+        "unresolvedPath",
+        "targetOriginalPath"
       ],
       returnDependencies: function({ stateValues }) {
         let dependencies2 = {
@@ -213534,6 +213577,10 @@ class AnimateFromSequence extends BaseComponent {
                 dependencyType: "stateVariableFromUnresolvedPath",
                 componentIdx: target.componentIdx,
                 unresolvedPath: stateValues.unresolvedPath,
+                // So that an index in the path that cannot be
+                // applied is reported as the reference the
+                // author wrote in `target`.
+                referenceOriginalPath: stateValues.targetOriginalPath,
                 returnAsComponentObject: true,
                 variablesOptional: true,
                 caseInsensitiveVariableMatch: true,
@@ -225055,7 +225102,14 @@ class UpdateValue extends InlineComponent {
       definition: () => ({ setValue: { clickAction: "updateValue" } })
     };
     stateVariableDefinitions.targetComponentIdx = {
-      additionalStateVariablesDefined: ["unresolvedPath"],
+      // `targetOriginalPath` is the `target` reference's path as the
+      // author wrote it — positions and all — kept so that a failure
+      // can quote the `$…` back to them. The component index alone is
+      // no use for that: it never appeared in the document.
+      additionalStateVariablesDefined: [
+        "unresolvedPath",
+        "targetOriginalPath"
+      ],
       returnDependencies: () => ({
         target: {
           dependencyType: "attributeRefResolutions",
@@ -225068,14 +225122,16 @@ class UpdateValue extends InlineComponent {
           return {
             setValue: {
               targetComponentIdx: target.componentIdx,
-              unresolvedPath: target.unresolvedPath
+              unresolvedPath: target.unresolvedPath,
+              targetOriginalPath: target.originalPath
             }
           };
         } else {
           return {
             setValue: {
               targetComponentIdx: null,
-              unresolvedPath: null
+              unresolvedPath: null,
+              targetOriginalPath: null
             }
           };
         }
@@ -225158,7 +225214,8 @@ class UpdateValue extends InlineComponent {
     stateVariableDefinitions.targets = {
       stateVariablesDeterminingDependencies: [
         "targetIdentities",
-        "unresolvedPath"
+        "unresolvedPath",
+        "targetOriginalPath"
       ],
       returnDependencies: function({ stateValues }) {
         let dependencies2 = {
@@ -225186,6 +225243,10 @@ class UpdateValue extends InlineComponent {
                 dependencyType: "stateVariableFromUnresolvedPath",
                 componentIdx: target.componentIdx,
                 unresolvedPath: stateValues.unresolvedPath,
+                // So that an index in the path that cannot be
+                // applied is reported as the reference the
+                // author wrote in `target`.
+                referenceOriginalPath: stateValues.targetOriginalPath,
                 returnAsComponentObject: true,
                 variablesOptional: true,
                 caseInsensitiveVariableMatch: true,
@@ -243187,4 +243248,4 @@ export {
   getDefaultExportFromCjs$1 as g,
   updateSyntaxFromV06toV07 as u
 };
-//# sourceMappingURL=index-73JwkM8q.js.map
+//# sourceMappingURL=index-DIu-y05T.js.map