@doenet/doenetml 0.7.24-dev.495 → 0.7.24-dev.496

package/utils/handshakeCensus.d.ts

@@ -24,6 +24,39 @@
  * Everything here is best-effort. A census that cannot be joined or queried
  * reads as "no visible contention", which is the behavior that predates it.
  */
+/**
+ * Lock name held — in `shared` mode, so every holder is granted at once — for
+ * the duration of a core handshake.
+ *
+ * Exported so tests can drive the census the way other realms do: seats taken
+ * through the lock manager directly are visible to a query but leave this
+ * realm's cached count untouched, which is the state a first boot is really
+ * in (#1718).
+ */
+export declare const HANDSHAKE_CENSUS_LOCK = "doenet-handshake-census";
+/**
+ * A realm's place in the census, for as long as it holds the handle.
+ */
+export type HandshakeCensusSeat = {
+    /** Leave the census. */
+    release: () => void;
+    /**
+     * How many handshakes were in flight — this one included — when the seat
+     * was granted, or the neutral 1 wherever the census could not be joined
+     * or queried.
+     *
+     * Counted from inside the grant, which is what makes it usable on a first
+     * boot: `concurrentHandshakesSnapshot` answers with the reading before
+     * the caller's own refresh, and a realm's first handshake has no reading
+     * before it (#1718).
+     *
+     * A promise, because the count is deliberately NOT what the seat waits
+     * for: the handle resolves the moment the lock is granted, and the figure
+     * follows a query later. A caller that has already started its handshake
+     * consumes it where it lands.
+     */
+    count: Promise<number>;
+};
 /**
  * How many logical cores the browser admits to, or 0 where the hint is
  * unavailable (no `navigator`, or a browser that withholds it). Callers decide
@@ -43,12 +76,15 @@ export declare function reportedCores(): number;
  * handshake concludes; if they do not, the browser still drops it when the
  * realm goes away, so a crashed realm cannot inflate the count forever.
  *
+ * The handle carries the count the seat was granted against — see
+ * `HandshakeCensusSeat.count` for why a first handshake has nowhere else to
+ * get one (#1718). It is a promise, so taking a seat still resolves as soon as
+ * the lock is granted.
+ *
  * Resolves to a no-op handle wherever Web Locks are unavailable — the count
  * then reads as "no visible contention", which is the pre-#1711 behavior.
  */
-export declare function joinHandshakeCensus(): Promise<{
-    release: () => void;
-}>;
+export declare function joinHandshakeCensus(): Promise<HandshakeCensusSeat>;
 /**
  * How many core handshakes are in flight across every same-origin realm the
  * browser is running (see the origin-scope note in `webLocks`), including this
@@ -72,6 +108,11 @@ export declare function countConcurrentHandshakes(): Promise<number>;
  * at all — a `DocViewer/i18n` CI failure bisected to exactly that change. A
  * count one boot out of date is a perfectly good input to a timeout; a boot
  * that races itself is not.
+ *
+ * What a cache costs is a first reading, since a realm's first handshake has
+ * no refresh before it. `HandshakeCensusSeat.count` is where that one reading
+ * comes from instead (#1718), and it stays off the boot path the same way:
+ * arriving mid-handshake, it widens a budget in flight rather than gating one.
  */
 export declare function concurrentHandshakesSnapshot(): number;
 /**
@@ -81,13 +122,14 @@ export declare function concurrentHandshakesSnapshot(): number;
  *
  * Because the update lands a turn or more later, the reading a caller gets
  * from `concurrentHandshakesSnapshot` is always the one *before* its own
- * refresh. A boot refreshes once per handshake attempt, and every released
- * census seat refreshes as it drops, so each attempt's read is answered by
- * the previous attempt's refresh and a first attempt reads the count as of
- * the last attempt — or last drained seat — in this realm. A wave in
- * another tab's realm drains invisibly (its releases refresh its own cache,
- * not this one), so the first attempt after one can still read high; the
- * attempt's own refresh corrects the reading for every attempt after it.
+ * refresh. A boot refreshes once per handshake attempt, and a census seat
+ * refreshes both as it is taken and as it drops — so each attempt's read is
+ * answered by the previous attempt's refresh, and a first attempt reads the
+ * count as of the last attempt, or the last seat taken or dropped, in this
+ * realm. A wave in another tab's realm drains invisibly (its releases refresh
+ * its own cache, not this one), so the first attempt after one can still read
+ * high; the attempt's own refresh corrects the reading for every attempt
+ * after it.
  */
 export declare function refreshHandshakeCensusCount(): void;
 //# sourceMappingURL=handshakeCensus.d.ts.map

package/utils/handshakeCensus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handshakeCensus.d.ts","sourceRoot":"","sources":["../../src/utils/handshakeCensus.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAuBH;;;;;;;;GAQG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAWtC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CAAC,CAgFtE;AAED;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,MAAM,CAAC,CAcjE;AAQD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,4BAA4B,IAAI,MAAM,CAErD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,2BAA2B,IAAI,IAAI,CAUlD"}
+{"version":3,"file":"handshakeCensus.d.ts","sourceRoot":"","sources":["../../src/utils/handshakeCensus.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAIH;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAS/D;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAC9B,wBAAwB;IACxB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB;;;;;;;;;;;;;;OAcG;IACH,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1B,CAAC;AAYF;;;;;;;;GAQG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAWtC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAsGlE;AAED;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,MAAM,CAAC,CAcjE;AAQD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,4BAA4B,IAAI,MAAM,CAErD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,2BAA2B,IAAI,IAAI,CAUlD"}

package/{vector-QaINZf3K.js → vector-BWEByhmm.js}

@@ -1,11 +1,11 @@
-import { A as DocContext, q as jsxRuntimeExports, B as textRendererStyle } from "./doenetml-BuSy6I1w.js";
+import { A as DocContext, q as jsxRuntimeExports, B as textRendererStyle } from "./doenetml-CJXENjwD.js";
 import React__default, { useContext, useRef } from "react";
-import { j as jxg, s as syncLayer, g as syncVisPropValues, e as syncLineStrokeStyle, a as syncWithLabelToggle, f as syncLabelStrokeColor, b as syncLabelMaskCssStyle, i as applyLineFamilyLabelPlacement, k as buildLineFamilyLabelAttributes, d as attachLabelHoverHighlight, c as computeLabelMaskCssStyle, l as stabilizeInitialLineFamilyLabelPlacement, r as removeJXGEventHandlers } from "./JSXGraphRenderer-CyYe0d3K.js";
-import { u as useDoenetRenderer } from "./useDoenetRenderer-BqmSXVL0.js";
-import { BoardContext, VERTEX_LAYER_OFFSET, LINE_LAYER_OFFSET } from "./graph-9LOjGTCa.js";
-import { D as DynamicMath } from "./DynamicMath-D1wKrLlg.js";
-import { u as useSourceNavigation, a as attachLineFamilyDragHandlers } from "./lineFamilyDragHandlers-B-CET7lf.js";
-import { ChoiceInputInlineContext } from "./choiceInput-BrWYbJql.js";
+import { j as jxg, s as syncLayer, g as syncVisPropValues, e as syncLineStrokeStyle, a as syncWithLabelToggle, f as syncLabelStrokeColor, b as syncLabelMaskCssStyle, i as applyLineFamilyLabelPlacement, k as buildLineFamilyLabelAttributes, d as attachLabelHoverHighlight, c as computeLabelMaskCssStyle, l as stabilizeInitialLineFamilyLabelPlacement, r as removeJXGEventHandlers } from "./JSXGraphRenderer-xuqNYEMe.js";
+import { u as useDoenetRenderer } from "./useDoenetRenderer-BAtxQcWU.js";
+import { BoardContext, VERTEX_LAYER_OFFSET, LINE_LAYER_OFFSET } from "./graph-CJH3fb_9.js";
+import { D as DynamicMath } from "./DynamicMath-DNJy5-OC.js";
+import { u as useSourceNavigation, a as attachLineFamilyDragHandlers } from "./lineFamilyDragHandlers-Df7osYz-.js";
+import { ChoiceInputInlineContext } from "./choiceInput-BhxWosVq.js";
 import { a as buildLineLikeAttributes, c as buildDragHandleAttributes } from "./buildGraphicalAttributes-0RNcbd2S.js";
 import { u as usePointerDragState, a as useBoardPointerTracking } from "./useBoardPointerTracking-DV6a8Wvg.js";
 import { p as pointerEventToUserCoords } from "./dragThreshold-DuSSFrIU.js";

package/{vectorField-PPj_aZIR.js → vectorField-De1Z4iOl.js}

@@ -1,6 +1,6 @@
 import React__default from "react";
-import { u as useDoenetRenderer } from "./useDoenetRenderer-BqmSXVL0.js";
-import { u as useFieldFunction, a as useFieldCurve, c as buildVectorFieldData } from "./useFieldCurve-DJVrRZ6y.js";
+import { u as useDoenetRenderer } from "./useDoenetRenderer-BAtxQcWU.js";
+import { u as useFieldFunction, a as useFieldCurve, c as buildVectorFieldData } from "./useFieldCurve-DTQt88CG.js";
 const vectorField = React__default.memo(function VectorField(props) {
   let { SVs } = useDoenetRenderer(props);
   VectorField.ignoreActionsWithoutCore = () => true;

package/{video-CYCSnFH1.js → video-BQM_T1_i.js}

@@ -1,10 +1,10 @@
-import { G as useRecordVisibilityChanges, q as jsxRuntimeExports } from "./doenetml-BuSy6I1w.js";
+import { G as useRecordVisibilityChanges, q as jsxRuntimeExports } from "./doenetml-CJXENjwD.js";
 import React__default, { useState, useEffect, useRef } from "react";
-import { u as useDoenetRenderer } from "./useDoenetRenderer-BqmSXVL0.js";
+import { u as useDoenetRenderer } from "./useDoenetRenderer-BAtxQcWU.js";
 import { s as sizeToCSS } from "./css-BJLDLYRJ.js";
-import { D as DescriptionPopover, a as DescriptionAsDetails } from "./Description-C784Vv21.js";
+import { D as DescriptionPopover, a as DescriptionAsDetails } from "./Description-BZ8oeOL9.js";
 import { g as getNonInlineMediaLayoutStyles } from "./nonInlineMediaLayout-CkXHaqzo.js";
-import { N as NonInlineMediaWrapper } from "./NonInlineMediaWrapper-C6IeqhUk.js";
+import { N as NonInlineMediaWrapper } from "./NonInlineMediaWrapper-CcmkTJmz.js";
 const YT_API_SRC = "https://www.youtube.com/iframe_api";
 const listeners = /* @__PURE__ */ new Set();
 let installed = false;

package/useDoenetRenderer-BqmSXVL0.js

@@ -1,114 +0,0 @@
-import { x as useAppSelector, y as mainSlice, z as renderersLoadComponent, _ as __variableDynamicImportRuntimeHelper } from "./doenetml-BuSy6I1w.js";
-import React__default, { useState, useEffect } from "react";
-function useDoenetRenderer(props, initializeChildrenOnConstruction = true) {
-  const actions = props.componentInstructions.actions;
-  const componentIdx = props.componentInstructions.componentIdx;
-  const effectiveIdx = props.componentInstructions.effectiveIdx;
-  const id = props.componentInstructions.id;
-  const rendererName = props.coreId + componentIdx;
-  const [renderersToLoad, setRenderersToLoad] = useState({});
-  const componentInfo = useAppSelector(
-    (state) => mainSlice.selectors.componentInfo(state)[rendererName]
-  );
-  const {
-    stateValues,
-    sourceOfUpdate = {},
-    ignoreUpdate,
-    childrenInstructions,
-    prefixForIds
-  } = componentInfo || {
-    stateValues: {},
-    sourceOfUpdate: {},
-    ignoreUpdate: false,
-    childrenInstructions: [],
-    prefixForIds: ""
-  };
-  let children = [];
-  const loadMoreRenderers = Object.keys(renderersToLoad).length === 0;
-  for (let childInstructions of childrenInstructions) {
-    let child = createChildFromInstructions(
-      childInstructions,
-      loadMoreRenderers
-    );
-    children.push(child);
-  }
-  useEffect(() => {
-    const entries = Object.entries(renderersToLoad);
-    if (entries.length > 0) {
-      const names = entries.map(([name]) => name);
-      const loaders = entries.map(([, loader]) => loader);
-      renderersLoadComponent(loaders, names).then(
-        ({ rendererClasses: newRendererClasses }) => {
-          Object.assign(props.rendererClasses, newRendererClasses);
-          setRenderersToLoad({});
-        }
-      );
-    }
-  }, [renderersToLoad, props.rendererClasses]);
-  function createChildFromInstructions(childInstructions, loadMoreRenderers2) {
-    if (typeof childInstructions === "string" || childInstructions === null) {
-      return childInstructions;
-    }
-    let propsForChild = {
-      key: props.coreId + childInstructions.componentIdx,
-      componentInstructions: childInstructions,
-      rendererClasses: props.rendererClasses,
-      coreId: props.coreId,
-      docId: props.docId,
-      activityId: props.activityId,
-      callAction: props.callAction,
-      fetchExternalDoenetML: props.fetchExternalDoenetML,
-      requestScrollTo: props.requestScrollTo,
-      flags: props.flags
-    };
-    let rendererClass = props.rendererClasses[childInstructions.rendererType];
-    if (!rendererClass) {
-      if (loadMoreRenderers2) {
-        setRenderersToLoad((old) => {
-          let rendererLoaders = { ...old };
-          if (!(childInstructions.rendererType in rendererLoaders)) {
-            rendererLoaders[childInstructions.rendererType] = () => __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./renderers/GraphFrame.tsx": () => import("./GraphFrame-zEBOQLV2.js"), "./renderers/JSXGraphRenderer.tsx": () => import("./JSXGraphRenderer-CyYe0d3K.js").then((n) => n.m), "./renderers/_error.tsx": () => import("./_error-hqesHzVC.js"), "./renderers/alert.tsx": () => import("./alert-axYiV_tJ.js"), "./renderers/angle.tsx": () => import("./angle-BKq_hmKc.js"), "./renderers/answer.tsx": () => import("./answer-BMMoGAJn.js"), "./renderers/asList.tsx": () => import("./asList-CC2BVoI_.js"), "./renderers/blockQuote.tsx": () => import("./blockQuote-kj3Ck-pZ.js"), "./renderers/boolean.tsx": () => import("./boolean-BuBdYx-N.js"), "./renderers/booleanInput.tsx": () => import("./booleanInput-BcvmUpXs.js"), "./renderers/br.tsx": () => import("./br-BRIBO7bD.js"), "./renderers/button.tsx": () => import("./button-CMX4IneM.js"), "./renderers/c.tsx": () => import("./c-sY8VwhFg.js"), "./renderers/cell.tsx": () => import("./cell-L0R7RpcY.js"), "./renderers/choiceInput.tsx": () => import("./choiceInput-BrWYbJql.js"), "./renderers/circle.tsx": () => import("./circle-C7ZgorN7.js"), "./renderers/cobwebPolyline.tsx": () => import("./cobwebPolyline-DH3cUzkl.js"), "./renderers/codeEditor.tsx": () => import("./codeEditor-D12aWsev.js"), "./renderers/containerBlock.tsx": () => import("./containerBlock-Cc3gEQrI.js"), "./renderers/containerInline.tsx": () => import("./containerInline-CPpPik-D.js"), "./renderers/curve.tsx": () => import("./curve-C4GzvlkI.js"), "./renderers/ellipsis.tsx": () => import("./ellipsis-DnFVuA9d.js"), "./renderers/em.tsx": () => import("./em-DdD05o3x.js"), "./renderers/embed.tsx": () => import("./embed-B62WIgaH.js"), "./renderers/feedback.tsx": () => import("./feedback-BcxDOMuZ.js"), "./renderers/figure.tsx": () => import("./figure-CcLohmH5.js"), "./renderers/footnote.tsx": () => import("./footnote-CPEytkdo.js"), "./renderers/fractionInput.tsx": () => import("./fractionInput-CiL7mOX5.js"), "./renderers/graph.tsx": () => import("./graph-9LOjGTCa.js"), "./renderers/hint.tsx": () => import("./hint-C41Ch5XB.js"), "./renderers/hr.tsx": () => import("./hr-C84KrkaF.js"), "./renderers/image.tsx": () => import("./image-DsR4O6yd.js"), "./renderers/label.tsx": () => import("./label-CodBWl3q.js"), "./renderers/legend.tsx": () => import("./legend-D5qk1cn9.js"), "./renderers/line.tsx": () => import("./line-LKhHK3ao.js"), "./renderers/lineSegment.tsx": () => import("./lineSegment-CMe7p4B8.js"), "./renderers/list.tsx": () => import("./list-aDqq9E8_.js"), "./renderers/lq.tsx": () => import("./lq-sk_kpM4g.js"), "./renderers/lsq.tsx": () => import("./lsq-udYhMiy-.js"), "./renderers/math.tsx": () => import("./math-D5bR8goy.js"), "./renderers/mathInput.tsx": () => import("./mathInput-CqA8QGlC.js"), "./renderers/matrixInput.tsx": () => import("./matrixInput-DZ5rWbAH.js"), "./renderers/mdash.tsx": () => import("./mdash-ByqoX5jk.js"), "./renderers/nbsp.tsx": () => import("./nbsp-DJyyMGnV.js"), "./renderers/ndash.tsx": () => import("./ndash-Cm01kWl7.js"), "./renderers/number.tsx": () => import("./number-C22PBQNy.js"), "./renderers/orbitalDiagram.tsx": () => import("./orbitalDiagram-CTmuEgi-.js"), "./renderers/orbitalDiagramInput.tsx": () => import("./orbitalDiagramInput-ByYETH5z.js"), "./renderers/p.tsx": () => import("./p-TtFLz_x5.js"), "./renderers/paginatorControls.tsx": () => import("./paginatorControls-D0_5xOvO.js"), "./renderers/pegboard.tsx": () => import("./pegboard-pPTxf8sE.js"), "./renderers/point.tsx": () => import("./point-D4b8U4lC.js"), "./renderers/polygon.tsx": () => import("./polygon-iydeAeAK.js"), "./renderers/polyline.tsx": () => import("./polyline-D1Wqv7hE.js"), "./renderers/pre.tsx": () => import("./pre-CQ9y4D0C.js"), "./renderers/prefigure.tsx": () => import("./prefigure-CJkNxksY.js"), "./renderers/pretzel.tsx": () => import("./pretzel-CPkDoQpu.js"), "./renderers/q.tsx": () => import("./q-CZXq0YKe.js"), "./renderers/ray.tsx": () => import("./ray-BXcVKK2Z.js"), "./renderers/ref.tsx": () => import("./ref-DU5u7LFH.js"), "./renderers/regionBetweenCurveXAxis.tsx": () => import("./regionBetweenCurveXAxis-D8UXPU8g.js"), "./renderers/regionBetweenCurves.tsx": () => import("./regionBetweenCurves-DvRmJcwN.js"), "./renderers/row.tsx": () => import("./row-DvC8EdBh.js"), "./renderers/rq.tsx": () => import("./rq-JzDMJ0ZL.js"), "./renderers/rsq.tsx": () => import("./rsq-GgFYOjN0.js"), "./renderers/section.tsx": () => import("./section-BrgbvDNu.js"), "./renderers/sideBySide.tsx": () => import("./sideBySide-DE2uxJzi.js"), "./renderers/slider.tsx": () => import("./slider-CkjyPDPg.js"), "./renderers/slopeField.tsx": () => import("./slopeField-DzoDI_VI.js"), "./renderers/solution.tsx": () => import("./solution-D61ajFGy.js"), "./renderers/spreadsheet.tsx": () => import("./spreadsheet-DG_DFrQv.js"), "./renderers/sq.tsx": () => import("./sq-Crt8B5Q9.js"), "./renderers/subsetOfRealsInput.tsx": () => import("./subsetOfRealsInput-Cpy9vBVy.js"), "./renderers/summaryStatistics.tsx": () => import("./summaryStatistics-DW_aR-Nj.js"), "./renderers/table.tsx": () => import("./table-CbJlvUVx.js"), "./renderers/tabular.tsx": () => import("./tabular-CrEPPxUm.js"), "./renderers/tag.tsx": () => import("./tag-sTOkSoGF.js"), "./renderers/text.tsx": () => import("./text-BOFBX0YD.js"), "./renderers/textInput.tsx": () => import("./textInput-TRboDv3U.js"), "./renderers/vector.tsx": () => import("./vector-QaINZf3K.js"), "./renderers/vectorField.tsx": () => import("./vectorField-PPj_aZIR.js"), "./renderers/video.tsx": () => import("./video-CYCSnFH1.js") }), `./renderers/${childInstructions.rendererType}.tsx`, 3);
-          }
-          return rendererLoaders;
-        });
-      }
-      return null;
-    }
-    let child = React__default.createElement(rendererClass, propsForChild);
-    return child;
-  }
-  let rendererType = props.componentInstructions.rendererType;
-  const callAction = (argObj) => {
-    if (!argObj.componentIdx) {
-      argObj = { ...argObj };
-      argObj.componentIdx = componentIdx;
-    }
-    if (!argObj.rendererType) {
-      argObj = { ...argObj };
-      argObj.rendererType = rendererType;
-    }
-    return props.callAction(argObj);
-  };
-  return {
-    componentIdx: effectiveIdx,
-    id: prefixForIds + id,
-    SVs: stateValues,
-    docId: props.docId,
-    activityId: props.activityId,
-    actions,
-    children,
-    sourceOfUpdate,
-    ignoreUpdate,
-    rendererName,
-    initializeChildren: () => {
-    },
-    callAction,
-    doenetViewerUrl: props.doenetViewerUrl,
-    fetchExternalDoenetML: props.fetchExternalDoenetML,
-    requestScrollTo: props.requestScrollTo,
-    flags: props.flags
-  };
-}
-export {
-  useDoenetRenderer as u
-};