@myst-theme/jupyter 0.3.3 → 0.3.4

package/dist/cjs/execute/utils.d.ts

@@ -0,0 +1,23 @@
+import type { GenericParent } from 'myst-common';
+import type { Config, IRenderMimeRegistry, ThebeCore } from 'thebe-core';
+import type { IdKeyMap } from './types';
+/**
+ * Use the mdast to create a ThebeNotebook from the mdast tree of a notebook.
+ * This is intended to be used to create an independent ThebeNotebook instance
+ * for each notebook in a rendering context.
+ *
+ * NOTE: there is no need to scope the keys at this point, as the ThebeNotebook
+ * instance will be scoped to the render context. All underlying cells will be
+ * identified by keys from the mdast - so there may be duplicate ids between different
+ * notebook instances, but that is ok as they came from the same mdast which is readonly.
+ *
+ * @param core
+ * @param config
+ * @param pageSlug - slug identifying the render context used for key decoration
+ * @param mdast - the notebook mdast
+ * @param idkmap - map of scoped block keys to keys for code and output cells
+ * @param rendermime
+ * @returns
+ */
+export declare function notebookFromMdast(core: ThebeCore, config: Config, pageSlug: string, notebookSlug: string, mdast: GenericParent, idkmap: IdKeyMap, rendermime: IRenderMimeRegistry): import("thebe-core/dist/types/notebook").default;
+//# sourceMappingURL=utils.d.ts.map

package/dist/cjs/execute/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/execute/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,SAAS,CAAC;AAExD;;;;;;;;;;;;;;;;;GAiBG;AAEH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,QAAQ,EAChB,UAAU,EAAE,mBAAmB,oDAoDhC"}

package/dist/cjs/execute/utils.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.notebookFromMdast = void 0;
+/**
+ * Use the mdast to create a ThebeNotebook from the mdast tree of a notebook.
+ * This is intended to be used to create an independent ThebeNotebook instance
+ * for each notebook in a rendering context.
+ *
+ * NOTE: there is no need to scope the keys at this point, as the ThebeNotebook
+ * instance will be scoped to the render context. All underlying cells will be
+ * identified by keys from the mdast - so there may be duplicate ids between different
+ * notebook instances, but that is ok as they came from the same mdast which is readonly.
+ *
+ * @param core
+ * @param config
+ * @param pageSlug - slug identifying the render context used for key decoration
+ * @param mdast - the notebook mdast
+ * @param idkmap - map of scoped block keys to keys for code and output cells
+ * @param rendermime
+ * @returns
+ */
+function notebookFromMdast(core, config, pageSlug, notebookSlug, mdast, idkmap, rendermime) {
+    // note the notebooks slug is used as the notebook id, this means accross pages
+    // mulitple notebooks with the same slug will be present but scoped to different pages
+    // the busyScope mecahnism relies on the notebookSlug as id
+    const notebook = new core.ThebeNotebook(notebookSlug, config, rendermime);
+    // no metadata included in mdast yet
+    //Object.assign(notebook.metadata, ipynb.metadata);
+    notebook.cells = mdast.children.map((block) => {
+        var _a, _b, _c;
+        if (block.type !== 'block')
+            console.warn(`Unexpected block type ${block.type}`);
+        if (block.children.length == 2 && block.children[0].type === 'code') {
+            const [codeCell, output] = block.children;
+            // use the block.key to identify the cell but maintain a mapping
+            // to allow code or output keys to look up cells and refs and idenifity
+            // the cell in the correct notebook
+            const target = {
+                pageSlug,
+                notebookSlug,
+                cellId: block.key,
+            };
+            idkmap[block.key] = target;
+            idkmap[codeCell.key] = target;
+            idkmap[output.key] = target;
+            // include block labels to enable lookup by from embedded blocks
+            if (block.label)
+                idkmap[block.label] = target;
+            if (block.identifier)
+                idkmap[block.identifier] = target;
+            return new core.ThebeCell(target.cellId, notebook.id, (_a = codeCell.value) !== null && _a !== void 0 ? _a : '', config, (_b = block.data) !== null && _b !== void 0 ? _b : {}, notebook.rendermime);
+        }
+        else {
+            // assume content - concatenate it
+            // TODO inject cell metadata
+            const cell = new core.ThebeNonExecutableCell(block.key, notebook.id, block.children.reduce((acc, child) => { var _a; return acc + '\n' + ((_a = child.value) !== null && _a !== void 0 ? _a : ''); }, ''), (_c = block.data) !== null && _c !== void 0 ? _c : {}, notebook.rendermime);
+            return cell;
+        }
+    });
+    return notebook;
+}
+exports.notebookFromMdast = notebookFromMdast;

package/dist/cjs/index.d.ts

@@ -3,7 +3,10 @@ declare const OUTPUT_RENDERERS: {
     output: typeof Output;
 };
 export * from './BinderBadge';
-export * from './providers';
+export * from './ErrorTray';
 export * from './ConnectionStatusTray';
+export * from './providers';
+export * from './execute';
+export * from './controls';
 export default OUTPUT_RENDERERS;
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,QAAA,MAAM,gBAAgB;;CAErB,CAAC;AAEF,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AAEvC,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,QAAA,MAAM,gBAAgB;;CAErB,CAAC;AAEF,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAE3B,eAAe,gBAAgB,CAAC"}

package/dist/cjs/index.js

@@ -19,6 +19,9 @@ const OUTPUT_RENDERERS = {
     output: output_1.Output,
 };
 __exportStar(require("./BinderBadge"), exports);
-__exportStar(require("./providers"), exports);
+__exportStar(require("./ErrorTray"), exports);
 __exportStar(require("./ConnectionStatusTray"), exports);
+__exportStar(require("./providers"), exports);
+__exportStar(require("./execute"), exports);
+__exportStar(require("./controls"), exports);
 exports.default = OUTPUT_RENDERERS;

package/dist/cjs/jupyter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jupyter.d.ts","sourceRoot":"","sources":["../../src/jupyter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAG3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAyD3C,eAAO,MAAM,cAAc;QACD,MAAM;aAAW,cAAc,EAAE;8CAiD1D,CAAC"}
+{"version":3,"file":"jupyter.d.ts","sourceRoot":"","sources":["../../src/jupyter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAG3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AA6D3C,eAAO,MAAM,cAAc;QACD,MAAM;aAAW,cAAc,EAAE;8CAkD1D,CAAC"}

package/dist/cjs/jupyter.js

@@ -29,30 +29,32 @@ const react_1 = __importStar(require("react"));
 const hooks_1 = require("./hooks");
 const nbtx_1 = require("nbtx");
 const convertImages_1 = require("./convertImages");
-const providers_1 = require("./providers");
 const myst_common_1 = require("myst-common");
-const providers_2 = require("@myst-theme/providers");
+const providers_1 = require("@myst-theme/providers");
 const thebe_react_1 = require("thebe-react");
-function ActiveOutputRenderer({ id, data }) {
-    const exec = (0, providers_1.useNotebookCellExecution)(id);
+const execute_1 = require("./execute");
+function ActiveOutputRenderer({ id, initialData }) {
+    const exec = (0, execute_1.useCellExecution)(id);
     const ref = (0, react_1.useRef)(null);
     (0, react_1.useEffect)(() => {
         var _a;
         if (!ref.current || !(exec === null || exec === void 0 ? void 0 : exec.cell)) {
-            console.debug(`No cell ref available for cell ${(_a = exec === null || exec === void 0 ? void 0 : exec.cell) === null || _a === void 0 ? void 0 : _a.id}`);
+            console.debug(`Jupyter: No cell ref available for cell ${(_a = exec === null || exec === void 0 ? void 0 : exec.cell) === null || _a === void 0 ? void 0 : _a.id}`);
             return;
         }
-        if (exec.cell.isAttachedToDOM) {
-            console.debug(`Cell ${exec.cell.id} already attached to DOM`);
-            return;
-        }
-        console.debug(`Attaching cell ${exec.cell.id} to DOM at:`, {
+        const verb = exec.cell.isAttachedToDOM ? 'reattaching' : 'attaching';
+        console.debug(`${verb} cell ${exec.cell.id} to DOM at:`, {
             el: ref.current,
             connected: ref.current.isConnected,
-            data,
+            data: initialData,
         });
         exec.cell.attachToDOM(ref.current);
-        exec.cell.render(data);
+        if (exec.cell.executionCount == null) {
+            exec.cell.initOutputs(initialData);
+        }
+        else {
+            exec.cell.refresh();
+        }
     }, [ref === null || ref === void 0 ? void 0 : ref.current, exec === null || exec === void 0 ? void 0 : exec.cell]);
     return (0, jsx_runtime_1.jsx)("div", { ref: ref, "data-thebe-active-ref": "true", className: "relative" });
 }
@@ -68,12 +70,12 @@ function PassiveOutputRenderer({ id, data, core, kind, }) {
     return (0, jsx_runtime_1.jsx)("div", { ref: ref, "data-thebe-passive-ref": "true" });
 }
 exports.JupyterOutputs = react_1.default.memo(({ id, outputs }) => {
-    var _a;
     const { core, load } = (0, thebe_react_1.useThebeLoader)();
-    const { inCrossRef } = (0, providers_2.useXRefState)();
+    const { inCrossRef } = (0, providers_1.useXRefState)();
     const { data, error } = (0, hooks_1.useFetchAnyTruncatedContent)(outputs);
     const [fullOutputs, setFullOutputs] = (0, react_1.useState)(null);
-    const exec = (0, providers_1.useNotebookCellExecution)(id);
+    // const exec = useNotebookCellExecution(id);
+    const exec = (0, execute_1.useCellExecution)(id);
     (0, react_1.useEffect)(() => {
         if (core)
             return;
@@ -92,7 +94,7 @@ exports.JupyterOutputs = react_1.default.memo(({ id, outputs }) => {
         return (0, jsx_runtime_1.jsxs)("div", { className: "text-red-500", children: ["Error rendering output: ", error.message] });
     }
     if (!inCrossRef && (exec === null || exec === void 0 ? void 0 : exec.ready)) {
-        return ((0, jsx_runtime_1.jsxs)("div", { children: [!fullOutputs && (0, jsx_runtime_1.jsx)("div", { className: "p-2.5", children: "Loading..." }), fullOutputs && (0, jsx_runtime_1.jsx)(ActiveOutputRenderer, { id: id, data: fullOutputs })] }));
+        return ((0, jsx_runtime_1.jsxs)("div", { children: [!fullOutputs && (0, jsx_runtime_1.jsx)("div", { className: "p-2.5", children: "Loading..." }), fullOutputs && (0, jsx_runtime_1.jsx)(ActiveOutputRenderer, { id: id, initialData: fullOutputs }, id)] }));
     }
-    return ((0, jsx_runtime_1.jsxs)("div", { children: [!fullOutputs && (0, jsx_runtime_1.jsx)("div", { className: "p-2.5", children: "Loading..." }), fullOutputs && core && ((0, jsx_runtime_1.jsx)(PassiveOutputRenderer, { id: id, data: fullOutputs, core: core, kind: (_a = exec === null || exec === void 0 ? void 0 : exec.kind) !== null && _a !== void 0 ? _a : myst_common_1.SourceFileKind.Notebook }))] }));
+    return ((0, jsx_runtime_1.jsxs)("div", { children: [!fullOutputs && (0, jsx_runtime_1.jsx)("div", { className: "p-2.5", children: "Loading..." }), fullOutputs && core && ((0, jsx_runtime_1.jsx)(PassiveOutputRenderer, { id: id, data: fullOutputs, core: core, kind: myst_common_1.SourceFileKind.Notebook }))] }));
 });

package/dist/cjs/output.d.ts

@@ -1,4 +1,4 @@
-import type { GenericNode } from 'myst-common';
+import { type GenericNode } from 'myst-common';
 import type { MinifiedOutput } from 'nbtx';
 export declare const DIRECT_OUTPUT_TYPES: Set<string>;
 export declare const DIRECT_MIME_TYPES: Set<string>;

package/dist/cjs/output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/output.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,KAAK,EAAsB,cAAc,EAAE,MAAM,MAAM,CAAC;AAO/D,eAAO,MAAM,mBAAmB,aAA+B,CAAC;AAEhE,eAAO,MAAM,iBAAiB,aAMb,CAAC;AAElB,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,cAAc,EAAE,EACzB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,WAY7B;AA6CD,wBAAgB,MAAM,CAAC,IAAI,EAAE,WAAW,2CAYvC"}
+{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/output.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAsB,cAAc,EAAE,MAAM,MAAM,CAAC;AAY/D,eAAO,MAAM,mBAAmB,aAA+B,CAAC;AAEhE,eAAO,MAAM,iBAAiB,aAMb,CAAC;AAElB,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,cAAc,EAAE,EACzB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,WAY7B;AAwDD,wBAAgB,MAAM,CAAC,IAAI,EAAE,WAAW,2CAYvC"}

package/dist/cjs/output.js

@@ -5,12 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Output = exports.allOutputsAreSafe = exports.DIRECT_MIME_TYPES = exports.DIRECT_OUTPUT_TYPES = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const myst_common_1 = require("myst-common");
 const nbtx_1 = require("nbtx");
 const classnames_1 = __importDefault(require("classnames"));
 const safe_1 = require("./safe");
 const jupyter_1 = require("./jupyter");
-const providers_1 = require("./providers");
 const react_1 = require("react");
+const execute_1 = require("./execute");
+const ArticleCellControls_1 = require("./controls/ArticleCellControls");
 exports.DIRECT_OUTPUT_TYPES = new Set(['stream', 'error']);
 exports.DIRECT_MIME_TYPES = new Set([
     nbtx_1.KnownCellOutputMimeTypes.TextPlain,
@@ -33,7 +35,7 @@ function allOutputsAreSafe(outputs, directOutputTypes, directMimeTypes) {
 }
 exports.allOutputsAreSafe = allOutputsAreSafe;
 function JupyterOutput({ nodeKey, nodeType, identifier, data, align, }) {
-    const ready = (0, providers_1.useReadyToExecute)();
+    const { kind, ready } = (0, execute_1.useCellExecution)(nodeKey);
     const outputs = data;
     const allSafe = (0, react_1.useMemo)(() => allOutputsAreSafe(outputs, exports.DIRECT_OUTPUT_TYPES, exports.DIRECT_MIME_TYPES), [outputs]);
     let component;
@@ -43,11 +45,12 @@ function JupyterOutput({ nodeKey, nodeType, identifier, data, align, }) {
     else {
         component = (0, jsx_runtime_1.jsx)(jupyter_1.JupyterOutputs, { id: nodeKey, outputs: outputs });
     }
-    return ((0, jsx_runtime_1.jsx)("figure", { id: identifier || undefined, "data-mdast-node-type": nodeType, "data-mdast-node-id": nodeKey, className: (0, classnames_1.default)('max-w-full overflow-visible m-0 group not-prose relative', {
+    const showControls = kind === myst_common_1.SourceFileKind.Article;
+    return ((0, jsx_runtime_1.jsxs)("figure", { id: identifier || undefined, "data-mdast-node-type": nodeType, "data-mdast-node-id": nodeKey, className: (0, classnames_1.default)('max-w-full overflow-visible m-0 group not-prose relative', {
             'text-left': !align || align === 'left',
             'text-center': align === 'center',
             'text-right': align === 'right',
-        }), children: component }));
+        }), children: [showControls && ((0, jsx_runtime_1.jsx)("div", { className: "sticky top-[60px]", children: (0, jsx_runtime_1.jsxs)("div", { className: "absolute -top-[28px] md:top-[30px] right-0 md:-right-[28px]", children: [(0, jsx_runtime_1.jsx)(ArticleCellControls_1.ArticleStatusBadge, { id: nodeKey }), (0, jsx_runtime_1.jsx)(ArticleCellControls_1.ArticleRunNotebook, { id: nodeKey }), (0, jsx_runtime_1.jsx)(ArticleCellControls_1.ArticleResetNotebook, { id: nodeKey })] }) })), component] }));
 }
 function Output(node) {
     // Note, NodeRenderer's can't have hooks in it directly!

package/dist/cjs/providers.d.ts

@@ -1,8 +1,5 @@
-import type { GenericParent } from 'myst-common';
-import { SourceFileKind } from 'myst-common';
+import type { SourceFileKind } from 'myst-common';
 import React from 'react';
-import type { Config, IRenderMimeRegistry, IThebeCell, IThebeCellExecuteReturn, ThebeCore, ThebeNotebook } from 'thebe-core';
-import type { IThebeNotebookError, NotebookExecuteOptions } from 'thebe-react';
 import type { Root } from 'mdast';
 export declare function useComputeOptions(): {
     canCompute: boolean;
@@ -23,48 +20,4 @@ export type PartialPage = {
     slug: string;
     mdast: Root;
 };
-export declare function notebookFromMdast(core: ThebeCore, config: Config, mdast: GenericParent, idkMap: Record<string, string>, rendermime: IRenderMimeRegistry): ThebeNotebook;
-type IdKeyMap = Record<string, string>;
-interface NotebookContextType {
-    kind: SourceFileKind;
-    ready: boolean;
-    attached: boolean;
-    executing: boolean;
-    executed: boolean;
-    errors: IThebeNotebookError[] | null;
-    executeAll: (options?: NotebookExecuteOptions | undefined) => Promise<(IThebeCellExecuteReturn | null)[]>;
-    executeSome: (predicate: (cell: IThebeCell) => boolean, options?: NotebookExecuteOptions | undefined) => Promise<(IThebeCellExecuteReturn | null)[]>;
-    notebook: ThebeNotebook | undefined;
-    idkMap: IdKeyMap;
-    restart: () => Promise<void>;
-    clear: () => void;
-}
-export declare function NotebookProvider({ siteConfig, page, children, }: React.PropsWithChildren<{
-    siteConfig: boolean;
-    page: PartialPage;
-}>): import("react/jsx-runtime").JSX.Element;
-export declare function useHasNotebookProvider(): boolean;
-export declare function useMDASTNotebook(): NotebookContextType | undefined;
-export declare function useNotebookExecution(): {
-    ready: boolean;
-    attached: boolean;
-    executing: boolean;
-    executed: boolean;
-    errors: IThebeNotebookError[] | null;
-    execute: (options?: NotebookExecuteOptions | undefined) => Promise<(IThebeCellExecuteReturn | null)[]>;
-    notebook: ThebeNotebook | undefined;
-    clear: () => void;
-} | undefined;
-export declare function useReadyToExecute(): boolean;
-export declare function useNotebookCellExecution(id: string): {
-    kind: SourceFileKind;
-    ready: boolean;
-    cell: IThebeCell | undefined;
-    executing: boolean;
-    notebookIsExecuting: boolean;
-    execute: (options?: NotebookExecuteOptions) => Promise<(IThebeCellExecuteReturn | null)[]>;
-    clear: () => void | undefined;
-    notebook: ThebeNotebook;
-} | undefined;
-export {};
 //# sourceMappingURL=providers.d.ts.map

package/dist/cjs/providers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/providers.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,KAAK,EACV,MAAM,EACN,mBAAmB,EACnB,UAAU,EACV,uBAAuB,EACvB,SAAS,EACT,aAAa,EACd,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAQ/E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAIlC,wBAAgB,iBAAiB;;;;;;;;;;EAwBhC;AAED,wBAAgB,6BAA6B,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,iBAAiB,2CAalF;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,IAAI,CAAC;CACb,CAAC;AAEF,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,UAAU,EAAE,mBAAmB,iBAuChC;AAED,KAAK,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEvC,UAAU,mBAAmB;IAC3B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC;IACrC,UAAU,EAAE,CACV,OAAO,CAAC,EAAE,sBAAsB,GAAG,SAAS,KACzC,OAAO,CAAC,CAAC,uBAAuB,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IACjD,WAAW,EAAE,CACX,SAAS,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,OAAO,EACxC,OAAO,CAAC,EAAE,sBAAsB,GAAG,SAAS,KACzC,OAAO,CAAC,CAAC,uBAAuB,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IACjD,QAAQ,EAAE,aAAa,GAAG,SAAS,CAAC;IACpC,MAAM,EAAE,QAAQ,CAAC;IACjB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAID,wBAAgB,gBAAgB,CAAC,EAC/B,UAAU,EACV,IAAI,EACJ,QAAQ,GACT,EAAE,KAAK,CAAC,iBAAiB,CAAC;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC,2CA8DrE;AAED,wBAAgB,sBAAsB,YAGrC;AAED,wBAAgB,gBAAgB,oCAG/B;AAED,wBAAgB,oBAAoB;;;;;;;;;cAQnC;AAED,wBAAgB,iBAAiB,YAGhC;AAED,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,MAAM;;;;;;wBAiBhB,sBAAsB;;;cAmBxD"}
+{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/providers.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAIlC,wBAAgB,iBAAiB;;;;;;;;;;EAwBhC;AAED,wBAAgB,6BAA6B,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,iBAAiB,2CAalF;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,IAAI,CAAC;CACb,CAAC"}

package/dist/cjs/providers.js

@@ -1,41 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useNotebookCellExecution = exports.useReadyToExecute = exports.useNotebookExecution = exports.useMDASTNotebook = exports.useHasNotebookProvider = exports.NotebookProvider = exports.notebookFromMdast = exports.ConfiguredThebeServerProvider = exports.useComputeOptions = void 0;
+exports.ConfiguredThebeServerProvider = exports.useComputeOptions = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const myst_common_1 = require("myst-common");
-const react_1 = __importStar(require("react"));
+const react_1 = __importDefault(require("react"));
 const thebe_react_1 = require("thebe-react");
 const providers_1 = require("@myst-theme/providers");
 const utils_1 = require("./utils");
@@ -67,124 +37,3 @@ function ConfiguredThebeServerProvider({ children }) {
     return ((0, jsx_runtime_1.jsx)(thebe_react_1.ThebeServerProvider, { connect: false, options: thebe, useBinder: thebe === null || thebe === void 0 ? void 0 : thebe.useBinder, useJupyterLite: thebe === null || thebe === void 0 ? void 0 : thebe.useJupyterLite, children: children }));
 }
 exports.ConfiguredThebeServerProvider = ConfiguredThebeServerProvider;
-function notebookFromMdast(core, config, mdast, idkMap, rendermime) {
-    const notebook = new core.ThebeNotebook(mdast.key, config, rendermime);
-    // no metadata included in mdast yet
-    // Object.assign(notebook.metadata, ipynb.metadata);
-    notebook.cells = mdast.children.map((block) => {
-        var _a, _b, _c, _d, _e;
-        if (block.type !== 'block')
-            console.warn(`Unexpected block type ${block.type}`);
-        if (block.children && block.children.length == 2 && block.children[0].type === 'code') {
-            const [codeCell, output] = block.children;
-            // use the block.key to identify the cell but maintain a mapping
-            // to allow code or output keys to look up cells and refs
-            idkMap[block.key] = block.key;
-            idkMap[codeCell.key] = block.key;
-            idkMap[output.key] = block.key;
-            return new core.ThebeCell(block.key, notebook.id, (_a = codeCell.value) !== null && _a !== void 0 ? _a : '', config, (_b = block.data) !== null && _b !== void 0 ? _b : {}, notebook.rendermime);
-        }
-        else {
-            // assume content - concatenate it
-            // TODO inject cell metadata
-            const cell = new core.ThebeNonExecutableCell(block.key, notebook.id, (_d = (_c = block.children) === null || _c === void 0 ? void 0 : _c.reduce((acc, child) => { var _a; return acc + '\n' + ((_a = child.value) !== null && _a !== void 0 ? _a : ''); }, '')) !== null && _d !== void 0 ? _d : '', (_e = block.data) !== null && _e !== void 0 ? _e : {}, notebook.rendermime);
-            return cell;
-        }
-    });
-    return notebook;
-}
-exports.notebookFromMdast = notebookFromMdast;
-const NotebookContext = react_1.default.createContext(undefined);
-function NotebookProvider({ siteConfig, page, children, }) {
-    // so at some point this gets the whole site config and can
-    // be use to lookup notebooks and recover ThebeNotebooks that
-    // can be used to execute notebook pages or blocks in articles
-    const { core } = (0, thebe_react_1.useThebeLoader)();
-    const { config } = (0, thebe_react_1.useThebeConfig)();
-    const rendermime = (0, thebe_react_1.useRenderMimeRegistry)();
-    const { ready, attached, executing, executed, errors, executeAll, executeSome, clear, session, notebook, setNotebook, } = (0, thebe_react_1.useNotebookBase)();
-    const idkMap = (0, react_1.useRef)({});
-    (0, react_1.useEffect)(() => {
-        if (!core || !config)
-            return;
-        idkMap.current = {};
-        if (page.kind === myst_common_1.SourceFileKind.Notebook) {
-            const nb = notebookFromMdast(core, config, page.mdast, idkMap.current, rendermime);
-            setNotebook(nb);
-        }
-        else {
-            // TODO will need do article relative notebook loading as appropriate once that is supported
-            setNotebook(undefined);
-        }
-    }, [core, config, page]);
-    return ((0, jsx_runtime_1.jsx)(NotebookContext.Provider, { value: {
-            kind: page.kind,
-            ready,
-            attached,
-            executing,
-            executed,
-            errors,
-            executeAll,
-            executeSome,
-            notebook,
-            idkMap: idkMap.current,
-            restart: () => { var _a; return (_a = session === null || session === void 0 ? void 0 : session.restart()) !== null && _a !== void 0 ? _a : Promise.resolve(); },
-            clear,
-        }, children: children }));
-}
-exports.NotebookProvider = NotebookProvider;
-function useHasNotebookProvider() {
-    const notebookState = (0, react_1.useContext)(NotebookContext);
-    return notebookState !== undefined;
-}
-exports.useHasNotebookProvider = useHasNotebookProvider;
-function useMDASTNotebook() {
-    const notebookState = (0, react_1.useContext)(NotebookContext);
-    return notebookState;
-}
-exports.useMDASTNotebook = useMDASTNotebook;
-function useNotebookExecution() {
-    const notebookState = (0, react_1.useContext)(NotebookContext);
-    if (!notebookState)
-        return undefined;
-    const { ready, attached, executing, executed, errors, executeAll, notebook, clear } = notebookState;
-    return { ready, attached, executing, executed, errors, execute: executeAll, notebook, clear };
-}
-exports.useNotebookExecution = useNotebookExecution;
-function useReadyToExecute() {
-    var _a;
-    const notebookState = (0, react_1.useContext)(NotebookContext);
-    return (_a = notebookState === null || notebookState === void 0 ? void 0 : notebookState.ready) !== null && _a !== void 0 ? _a : false;
-}
-exports.useReadyToExecute = useReadyToExecute;
-function useNotebookCellExecution(id) {
-    // setup a cell only executing state
-    const [executing, setExecuting] = (0, react_1.useState)(false);
-    const notebookState = (0, react_1.useContext)(NotebookContext);
-    if (!notebookState)
-        return undefined;
-    const { kind, ready, notebook, executing: notebookIsExecuting, executeSome, idkMap, } = notebookState;
-    const cellId = idkMap[id];
-    function execute(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            setExecuting(true);
-            const execReturn = yield executeSome((cell) => cell.id === cellId, options);
-            setExecuting(false);
-            return execReturn;
-        });
-    }
-    const cell = notebook === null || notebook === void 0 ? void 0 : notebook.getCellById(cellId);
-    return notebook
-        ? {
-            kind,
-            ready,
-            cell,
-            executing,
-            notebookIsExecuting,
-            execute,
-            clear: () => cell === null || cell === void 0 ? void 0 : cell.clear(),
-            notebook,
-        }
-        : undefined;
-}
-exports.useNotebookCellExecution = useNotebookCellExecution;

package/dist/esm/ConnectionStatusTray.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionStatusTray.d.ts","sourceRoot":"","sources":["../../src/ConnectionStatusTray.tsx"],"names":[],"mappings":"AAKA,wBAAgB,oBAAoB,mDAmFnC"}
+{"version":3,"file":"ConnectionStatusTray.d.ts","sourceRoot":"","sources":["../../src/ConnectionStatusTray.tsx"],"names":[],"mappings":"AAMA,wBAAgB,oBAAoB,mDAoFnC"}

package/dist/esm/ConnectionStatusTray.js

@@ -1,17 +1,18 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
-import { useThebeServer, useThebeSession } from 'thebe-react';
+import { useThebeServer } from 'thebe-react';
 import { useComputeOptions } from './providers';
+import { selectAreExecutionScopesBuilding, useExecutionScope } from './execute';
 export function ConnectionStatusTray() {
     const { thebe } = useComputeOptions();
     const { connecting, ready: serverReady, error: serverError, events } = useThebeServer();
-    const { starting, ready: sessionReady, error: sessionError } = useThebeSession();
+    const { slug, ready: scopeReady, state } = useExecutionScope();
     const [show, setShow] = useState(false);
     const [unsub, setUnsub] = useState();
     const [status, setStatus] = useState('[client] Connecting...');
-    const error = serverError || sessionError;
-    const ready = serverReady && sessionReady;
-    const busy = connecting || starting;
+    const error = serverError; // TODO scope bulding error handling || sessionError;
+    const ready = serverReady && scopeReady;
+    const busy = connecting || selectAreExecutionScopesBuilding(state, slug);
     const handleStatus = (event, data) => {
         setStatus(`[${data.subject}]: ${data.message}`);
     };
@@ -37,6 +38,7 @@ export function ConnectionStatusTray() {
         }
     }, [thebe, busy, ready, error]);
     const host = (thebe === null || thebe === void 0 ? void 0 : thebe.useBinder) ? 'Binder' : (thebe === null || thebe === void 0 ? void 0 : thebe.useJupyterLite) ? 'JupyterLite' : 'Local Server';
+    // TODO radix ui toast!
     if (show && error) {
         return (_jsxs("div", { className: "fixed p-3 text-sm text-gray-700 bg-white border rounded shadow-lg bottom-2 sm:right-2 max-w-[90%] md:max-w-[300px] min-w-0", children: [_jsxs("div", { className: "mb-2 font-semibold text-center", children: ["\u26D4\uFE0F Error connecting to ", host, " \u26D4\uFE0F"] }), _jsx("div", { className: "my-1 max-h-[15rem] mono overflow-hidden text-ellipsis", children: error }), _jsx("div", { className: "flex justify-end", children: _jsx("div", { className: "text-xs cursor-pointer hover:underline", role: "button", onClick: () => setShow(false), children: "dismiss" }) })] }));
     }

package/dist/esm/ErrorTray.d.ts

@@ -0,0 +1,5 @@
+import type { IThebeNotebookError } from 'thebe-react';
+export declare function ErrorTray({ errors }: {
+    errors: IThebeNotebookError[];
+}): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=ErrorTray.d.ts.map

package/dist/esm/ErrorTray.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ErrorTray.d.ts","sourceRoot":"","sources":["../../src/ErrorTray.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAgDvD,wBAAgB,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,mBAAmB,EAAE,CAAA;CAAE,2CAStE"}

package/dist/esm/ErrorTray.js

@@ -0,0 +1,30 @@
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
+import { useThebeLoader } from 'thebe-react';
+function ErrorDecoration({ children, idx }) {
+    return (_jsxs("div", { className: "relative py-3 mx-2 my-8 border rounded", children: [_jsx("div", { className: "absolute z-10 flex items-center bg-white -top-3 -left-2", children: idx && _jsxs("div", { className: "ml-1 text-sm text-gray-500", children: ["cell #: ", idx] }) }), _jsx("div", { className: "mx-3", children: children })] }));
+}
+function ErrorTrayMessage({ errors }) {
+    const { core } = useThebeLoader();
+    const [cells, setCells] = useState([]);
+    const [refs, setRefs] = useState([]);
+    useEffect(() => {
+        if (!core)
+            return;
+        const cs = errors.map(() => new core.PassiveCellRenderer('any'));
+        setRefs(errors.map((_, idx) => (node) => {
+            var _a;
+            if (node) {
+                cs[idx].attachToDOM(node);
+                cs[idx].render((_a = errors[idx].error) !== null && _a !== void 0 ? _a : []);
+            }
+        }));
+        setCells(cells);
+    }, [core, errors]);
+    if (!core)
+        return null;
+    return (_jsx("div", { children: errors.map((error, idx) => (_jsx("div", { className: "min-w-[400px]", children: _jsx(ErrorDecoration, { idx: error.index, children: _jsx("div", { className: "z-100", ref: refs[idx] }, error.id) }) }))) }));
+}
+export function ErrorTray({ errors }) {
+    return (_jsxs("div", { className: "relative px-4 pt-3 mt-8 text-sm text-red-600 border border-red-400 rounded border-1", children: [_jsxs("div", { children: [_jsx("span", { className: "font-bold", children: "Error" }), " - a page refresh may resolve this."] }), _jsx(ErrorTrayMessage, { errors: errors })] }));
+}

package/dist/esm/controls/ArticleCellControls.d.ts

@@ -0,0 +1,10 @@
+export declare function ArticleStatusBadge({ id }: {
+    id: string;
+}): import("react/jsx-runtime").JSX.Element;
+export declare function ArticleRunNotebook({ id }: {
+    id: string;
+}): import("react/jsx-runtime").JSX.Element | null;
+export declare function ArticleResetNotebook({ id }: {
+    id: string;
+}): import("react/jsx-runtime").JSX.Element | null;
+//# sourceMappingURL=ArticleCellControls.d.ts.map

package/dist/esm/controls/ArticleCellControls.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ArticleCellControls.d.ts","sourceRoot":"","sources":["../../../src/controls/ArticleCellControls.tsx"],"names":[],"mappings":"AAMA,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,EAAE,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,2CAmBxD;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,EAAE,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,kDAYxD;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,EAAE,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,kDAY1D"}

package/dist/esm/controls/ArticleCellControls.js

@@ -0,0 +1,27 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useThebeServer } from 'thebe-react';
+import { useNotebookExecution } from '../execute/hooks';
+import { Reset, Run, SpinnerStatusButton } from './Buttons';
+import { selectAreExecutionScopesBuilding } from '../execute';
+export function ArticleStatusBadge({ id }) {
+    const { connect, connecting } = useThebeServer();
+    const { slug, state, start, ready, executionCount } = useNotebookExecution(id);
+    const building = selectAreExecutionScopesBuilding(state, slug);
+    const handleStart = () => {
+        connect();
+        start();
+    };
+    return (_jsx(SpinnerStatusButton, { ready: ready, busy: building || connecting, modified: executionCount != null, onClick: handleStart }));
+}
+export function ArticleRunNotebook({ id }) {
+    const { ready, cellIsExecuting, notebookIsBusy, execute } = useNotebookExecution(id);
+    if (!ready)
+        return null;
+    return (_jsx(Run, { ready: ready, executing: cellIsExecuting, disabled: notebookIsBusy, onClick: execute, title: "Run the notebook that creates this figure" }));
+}
+export function ArticleResetNotebook({ id }) {
+    const { ready, notebookIsResetting, notebookIsBusy, reset } = useNotebookExecution(id);
+    if (!ready)
+        return null;
+    return (_jsx(Reset, { ready: ready, resetting: notebookIsResetting, disabled: notebookIsBusy, onClick: reset, title: "Reset the figure to its original state and restart the kernel" }));
+}