@doenet/v06-to-v07 0.7.26-dev.549 → 0.7.26-dev.551

package/{index-8ukpKAbm.js → index-D5mqYa1b.js}

@@ -47291,7 +47291,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-CEjYUY-P-xyGL0MuB.js").then((n2) => n2.s)).default;
+      const sha256 = (await import("./sha256-DT5xJ2Hv-BKf1gPKZ-BIVxkAku.js").then((n2) => n2.s)).default;
       digest = (data2) => sha256(data2, {
         asBytes: true
       });
@@ -54453,13 +54453,9 @@ function postProcessCopy({
       }
     }
   }
-  for (let ind in serializedComponents) {
-    let component = serializedComponents[ind];
-    if (typeof component !== "object") {
-      continue;
-    }
-    postProcessCopy({
-      serializedComponents: component.children,
+  function recurse(nestedComponents) {
+    return postProcessCopy({
+      serializedComponents: nestedComponents,
       componentIdx,
       addShadowDependencies,
       markAsPrimaryShadow,
@@ -54469,34 +54465,28 @@ function postProcessCopy({
       componentIndicesFound,
       init: false
     });
+  }
+  for (let ind in serializedComponents) {
+    let component = serializedComponents[ind];
+    if (typeof component !== "object") {
+      continue;
+    }
+    recurse(component.children);
     for (let attrName in component.attributes) {
       let attribute = component.attributes[attrName];
       if (attribute.component) {
-        attribute.component = postProcessCopy({
-          serializedComponents: [attribute.component],
-          componentIdx,
-          addShadowDependencies,
-          markAsPrimaryShadow,
-          identifierPrefix,
-          unlinkExternalCopies,
-          copiesByRefIdx,
-          componentIndicesFound,
-          init: false
-        })[0];
+        attribute.component = recurse([attribute.component])[0];
       }
     }
     if (component.replacements) {
-      postProcessCopy({
-        serializedComponents: component.replacements,
-        componentIdx,
-        addShadowDependencies,
-        markAsPrimaryShadow,
-        identifierPrefix,
-        unlinkExternalCopies,
-        copiesByRefIdx,
-        componentIndicesFound,
-        init: false
-      });
+      recurse(component.replacements);
+    }
+    if (component.extending) {
+      for (const pathPart of unwrapSource(component.extending).originalPath ?? []) {
+        for (const index2 of pathPart.index) {
+          recurse(index2.value);
+        }
+      }
     }
   }
   if (init && unlinkExternalCopies) {
@@ -64234,6 +64224,23 @@ const _RefResolutionDependency = class _RefResolutionDependency2 extends Depende
       source = this.dependencyHandler._components[source.shadows?.componentIdx];
     }
   }
+  /**
+   * Whether `resolution` landed on the reference itself or on a component containing it.
+   *
+   * A reference can legitimately point at its own container — `$P` inside `P`'s label
+   * is how a label says "my own value" — so such a resolution is used when it is the
+   * only one on offer. It is not what a *copy* wants, though. A composite that names
+   * the item it creates, as `<repeat valueName="i">` does, hands that name to the copy
+   * itself, so a `$i` that the copied content already carried now finds the copy rather
+   * than what it named in the original. Preferring a candidate origin that resolves
+   * outside the reference keeps the copied `$i` pointing where the original one did.
+   */
+  resolvesIntoOwnAncestry(composite, resolution) {
+    const nodeIdx = resolution.nodeIdx;
+    return nodeIdx === composite.componentIdx || (composite.ancestors?.some(
+      (ancestor) => ancestor.componentIdx === nodeIdx
+    ) ?? false);
+  }
   async determineDownstreamComponents({ force = false } = {}) {
     this.compositeReplacementDependencies = [];
     let composite = this.dependencyHandler._components[this.compositeIdx];
@@ -64328,14 +64335,20 @@ const _RefResolutionDependency = class _RefResolutionDependency2 extends Depende
     );
     const skip_parent_search = resolveComponentResult.path[0].name === "";
     let refResolution;
+    let selfReferentialResolution;
     let firstResolutionError;
     for (const origin of this.originsToResolveFrom(composite)) {
       try {
-        refResolution = this.dependencyHandler.core.resolvePath(
+        const candidateResolution = this.dependencyHandler.core.resolvePath(
           { path: resolveComponentResult.path },
           origin,
           skip_parent_search
         );
+        if (this.resolvesIntoOwnAncestry(composite, candidateResolution)) {
+          selfReferentialResolution ??= candidateResolution;
+          continue;
+        }
+        refResolution = candidateResolution;
         break;
       } catch (e32) {
         if (e32 === "NonUniqueReferent" || e32 === "NoReferent") {
@@ -64345,6 +64358,7 @@ const _RefResolutionDependency = class _RefResolutionDependency2 extends Depende
         }
       }
     }
+    refResolution ??= selfReferentialResolution;
     if (refResolution === void 0) {
       const referenceText = getDoenetMLStringForReference();
       this.dependencyHandler.core.addDiagnostic(
@@ -242436,4 +242450,4 @@ export {
   getDefaultExportFromCjs$1 as g,
   updateSyntaxFromV06toV07 as u
 };
-//# sourceMappingURL=index-8ukpKAbm.js.map
+//# sourceMappingURL=index-D5mqYa1b.js.map