@marimo-team/frontend 0.23.6-dev2 → 0.23.6-dev5

package/dist/index.html

@@ -66,7 +66,7 @@
     <marimo-server-token data-token="{{ server_token }}" hidden></marimo-server-token>
     <!-- /TODO -->
     <title>{{ title }}</title>
-    <script type="module" crossorigin src="./assets/index-CL4WR8q8.js"></script>
+    <script type="module" crossorigin src="./assets/index-Bi946suj.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/preload-helper-DItdS47A.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-LvLJmgfZ.js">
     <link rel="modulepreload" crossorigin href="./assets/react-Bj1aDYRI.js">
@@ -133,7 +133,7 @@
     <link rel="modulepreload" crossorigin href="./assets/debounce-DhnxH9Rh.js">
     <link rel="modulepreload" crossorigin href="./assets/database-zap-kIkTfzTX.js">
     <link rel="modulepreload" crossorigin href="./assets/main-B0OX4z33.js">
-    <link rel="modulepreload" crossorigin href="./assets/cells-CcBfzJ1Z.js">
+    <link rel="modulepreload" crossorigin href="./assets/cells-CLOYqHxK.js">
     <link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-DzYV_VeY.js">
     <link rel="modulepreload" crossorigin href="./assets/kbd-B3Breaz2.js">
     <link rel="modulepreload" crossorigin href="./assets/useInstallPackage-D0NLybAx.js">
@@ -147,33 +147,33 @@
     <link rel="modulepreload" crossorigin href="./assets/usePress-CfcdTqJM.js">
     <link rel="modulepreload" crossorigin href="./assets/input-BX98vgAu.js">
     <link rel="modulepreload" crossorigin href="./assets/ImperativeModal-D7lQ0Q7_.js">
-    <link rel="modulepreload" crossorigin href="./assets/cell-link-BRdZl0OJ.js">
+    <link rel="modulepreload" crossorigin href="./assets/cell-link-DVZ95RkH.js">
     <link rel="modulepreload" crossorigin href="./assets/multi-map-rafH3cg3.js">
     <link rel="modulepreload" crossorigin href="./assets/alert-DvqcBMUv.js">
     <link rel="modulepreload" crossorigin href="./assets/chevron-right-CG5QYXYk.js">
     <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-D1A3cFC8.js">
     <link rel="modulepreload" crossorigin href="./assets/links-Dpap8NI2.js">
-    <link rel="modulepreload" crossorigin href="./assets/useRunCells-CgXnbA14.js">
+    <link rel="modulepreload" crossorigin href="./assets/useRunCells-CaQshiHD.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-BCF-tANo.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-BwrPA9zQ.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-icon-BYNydU7b.js">
-    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-8cI8zL5y.js">
-    <link rel="modulepreload" crossorigin href="./assets/datasource-Czm_KBfK.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-DCT6JLba.js">
+    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-bITn6XSR.js">
+    <link rel="modulepreload" crossorigin href="./assets/datasource-DuoPm5lj.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-BLtQJBam.js">
     <link rel="modulepreload" crossorigin href="./assets/sparkles-CZ5WmLPA.js">
-    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-Dbk0HqOA.js">
+    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-B-GOeJYT.js">
     <link rel="modulepreload" crossorigin href="./assets/spinner-Bhir8k53.js">
-    <link rel="modulepreload" crossorigin href="./assets/html-to-image-BHdf1t5J.js">
-    <link rel="modulepreload" crossorigin href="./assets/focus-CXQpR65O.js">
+    <link rel="modulepreload" crossorigin href="./assets/html-to-image-UTuaZ3Zz.js">
+    <link rel="modulepreload" crossorigin href="./assets/focus-Db3BXXYF.js">
     <link rel="modulepreload" crossorigin href="./assets/useAsyncData-BFC6lWG9.js">
     <link rel="modulepreload" crossorigin href="./assets/LazyAnyLanguageCodeMirror-BF3xpDgO.js">
     <link rel="modulepreload" crossorigin href="./assets/micromark-factory-space-DzSMahmM.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-5FQGJX7Z-e_arGD4o.js">
-    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-DmnGXdCp.js">
+    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-B99Mg_Az.js">
     <link rel="modulepreload" crossorigin href="./assets/command-CBCkexpx.js">
     <link rel="modulepreload" crossorigin href="./assets/popover-UExmgBsf.js">
     <link rel="modulepreload" crossorigin href="./assets/errors-TZBmrJmc.js">
-    <link rel="modulepreload" crossorigin href="./assets/download-YUQiaxS9.js">
+    <link rel="modulepreload" crossorigin href="./assets/download-Dxwqy2bA.js">
     <link rel="modulepreload" crossorigin href="./assets/table-DPyRV1LT.js">
     <link rel="modulepreload" crossorigin href="./assets/useIframeCapabilities-BvE4n6hj.js">
     <link rel="modulepreload" crossorigin href="./assets/error-banner-C6aBa98y.js">
@@ -191,27 +191,27 @@
     <link rel="modulepreload" crossorigin href="./assets/message-circle-CWm2KnSx.js">
     <link rel="modulepreload" crossorigin href="./assets/trash-2-CKlZA04n.js">
     <link rel="modulepreload" crossorigin href="./assets/react-resizable-panels.browser.esm-BUNcfKXO.js">
-    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-02ehjjSC.js">
+    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-BPSeOpTI.js">
     <link rel="modulepreload" crossorigin href="./assets/chart-no-axes-column-nqk474t8.js">
     <link rel="modulepreload" crossorigin href="./assets/square-function-D1dlJvD8.js">
     <link rel="modulepreload" crossorigin href="./assets/spec-Cq8FVoTf.js">
     <link rel="modulepreload" crossorigin href="./assets/ellipsis-vertical-CkwWkOQL.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-cw-DHwG4Mac.js">
     <link rel="modulepreload" crossorigin href="./assets/tree-actions-Ci3CV3hN.js">
-    <link rel="modulepreload" crossorigin href="./assets/components-DVKf_7RU.js">
-    <link rel="modulepreload" crossorigin href="./assets/column-preview-rDM8Q-wn.js">
+    <link rel="modulepreload" crossorigin href="./assets/components-CJRF32CP.js">
+    <link rel="modulepreload" crossorigin href="./assets/column-preview-BIefID4K.js">
     <link rel="modulepreload" crossorigin href="./assets/icons-D9TuFTJG.js">
-    <link rel="modulepreload" crossorigin href="./assets/radio-group-6t7ozlnG.js">
-    <link rel="modulepreload" crossorigin href="./assets/floating-outline-BtNnv2IX.js">
+    <link rel="modulepreload" crossorigin href="./assets/radio-group-LGyqSUAb.js">
+    <link rel="modulepreload" crossorigin href="./assets/floating-outline-CZmP89Pg.js">
     <link rel="modulepreload" crossorigin href="./assets/objectWithoutPropertiesLoose-DaPAPabU.js">
     <link rel="modulepreload" crossorigin href="./assets/esm-BmrwxxCo.js">
     <link rel="modulepreload" crossorigin href="./assets/eye-off-n1Li95bE.js">
     <link rel="modulepreload" crossorigin href="./assets/plus-BgB18UzY.js">
-    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-JBCsN3-9.js">
+    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-CRxldrYi.js">
     <link rel="modulepreload" crossorigin href="./assets/file-headphone-BrQspHac.js">
     <link rel="modulepreload" crossorigin href="./assets/file-BrdxGLRX.js">
     <link rel="modulepreload" crossorigin href="./assets/image-DQHXdEQn.js">
-    <link rel="modulepreload" crossorigin href="./assets/file-icons-CMxkj_kV.js">
+    <link rel="modulepreload" crossorigin href="./assets/file-icons-DKgisbPy.js">
     <link rel="modulepreload" crossorigin href="./assets/switch-ecwOrzz3.js">
     <link rel="modulepreload" crossorigin href="./assets/events-BRAWQiYK.js">
     <link rel="modulepreload" crossorigin href="./assets/globals-B-ZMi0ZU.js">
@@ -220,11 +220,11 @@
     <link rel="modulepreload" crossorigin href="./assets/memoize-Tp7rARFe.js">
     <link rel="modulepreload" crossorigin href="./assets/get-C-qh_et5.js">
     <link rel="modulepreload" crossorigin href="./assets/_baseSet-CxV9N1bc.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-DGoUR-mM.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-iwsjHbTq.js">
     <link rel="modulepreload" crossorigin href="./assets/label-DTR8T0AE.js">
-    <link rel="modulepreload" crossorigin href="./assets/textarea-BI_mXP9w.js">
+    <link rel="modulepreload" crossorigin href="./assets/textarea-D-NByOwX.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-ccw-C-n2VFP5.js">
-    <link rel="modulepreload" crossorigin href="./assets/form-EgPmt17c.js">
+    <link rel="modulepreload" crossorigin href="./assets/form-B9WdYAmJ.js">
     <link rel="modulepreload" crossorigin href="./assets/renderShortcut-DZpkrZaP.js">
     <link rel="modulepreload" crossorigin href="./assets/field-BrLPDxsA.js">
     <link rel="modulepreload" crossorigin href="./assets/RSPContexts-CINae4Gg.js">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/frontend",
-  "version": "0.23.6-dev2",
+  "version": "0.23.6-dev5",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/core/cells/__tests__/cells.test.ts

@@ -46,6 +46,9 @@ vi.mock("@/core/codemirror/editing/commands", () => ({
   foldAllBulk: vi.fn(),
   unfoldAllBulk: vi.fn(),
 }));
+vi.mock("@/core/wasm/utils", () => ({
+  isWasm: vi.fn(() => false),
+}));
 vi.mock("../scrollCellIntoView", async (importOriginal) => {
   const actual = await importOriginal();
   return {
@@ -3428,3 +3431,99 @@ describe("createTracebackInfoAtom", () => {
     expect(traceback).toBeUndefined();
   });
 });
+
+describe("setCells snapshot preservation", () => {
+  const CELL_A = cellId("A");
+  const CELL_B = cellId("B");
+  const newCells: CellData[] = [
+    {
+      id: CELL_A,
+      name: "a",
+      code: "1",
+      edited: false,
+      lastCodeRun: null,
+      lastExecutionTime: null,
+      config: { hide_code: false, disabled: false, column: null },
+      serializedEditorState: null,
+    },
+    {
+      id: CELL_B,
+      name: "b",
+      code: "2",
+      edited: false,
+      lastCodeRun: null,
+      lastExecutionTime: null,
+      config: { hide_code: false, disabled: false, column: null },
+      serializedEditorState: null,
+    },
+  ];
+
+  const hydratedState = () =>
+    MockNotebook.notebookState({
+      cellData: {
+        [CELL_A]: { id: CELL_A, code: "1" },
+        [CELL_B]: { id: CELL_B, code: "2" },
+      },
+      cellRuntime: {
+        [CELL_A]: {
+          output: {
+            channel: "output",
+            mimetype: "text/plain",
+            data: "hydrated-A",
+            timestamp: 0,
+          },
+        },
+        [CELL_B]: {
+          consoleOutputs: [
+            {
+              channel: "stdout",
+              mimetype: "text/plain",
+              data: "hydrated-B-stdout",
+              timestamp: 0,
+            },
+          ],
+        },
+      },
+    });
+
+  beforeEach(async () => {
+    const { isWasm } = await import("@/core/wasm/utils");
+    vi.mocked(isWasm).mockReturnValue(true);
+  });
+
+  it("preserves hydrated output in WASM", () => {
+    const next = exportedForTesting.reducer(hydratedState(), {
+      type: "setCells",
+      payload: newCells,
+    });
+
+    expect(next.cellRuntime[CELL_A].output).toMatchObject({
+      data: "hydrated-A",
+    });
+  });
+
+  it("preserves console-only hydration in WASM", () => {
+    const next = exportedForTesting.reducer(hydratedState(), {
+      type: "setCells",
+      payload: newCells,
+    });
+
+    expect(next.cellRuntime[CELL_B].consoleOutputs).toHaveLength(1);
+    expect(next.cellRuntime[CELL_B].consoleOutputs[0]).toMatchObject({
+      data: "hydrated-B-stdout",
+    });
+  });
+
+  it("resets cells with no prior runtime even in WASM", () => {
+    const empty = MockNotebook.notebookState({ cellData: {} });
+    const next = exportedForTesting.reducer(empty, {
+      type: "setCells",
+      payload: newCells,
+    });
+
+    expect(next.cellRuntime[CELL_A].output).toBeNull();
+    expect(next.cellRuntime[CELL_A].consoleOutputs).toEqual([]);
+    expect(next.cellRuntime[CELL_B].output).toBeNull();
+    expect(next.cellRuntime[CELL_B].consoleOutputs).toEqual([]);
+  });
+});

package/src/core/cells/cells.ts

@@ -29,6 +29,7 @@ import { isErrorMime } from "../mime";
 import type { CellConfig } from "../network/types";
 import { isRtcEnabled } from "../rtc/state";
 import { createDeepEqualAtom, store } from "../state/jotai";
+import { isWasm } from "../wasm/utils";
 import { prepareCellForExecution, transitionCell } from "./cell";
 import { documentTransactionMiddleware } from "./document-changes";
 import { CellId, SCRATCH_CELL_ID, SETUP_CELL_ID } from "./ids";
@@ -1032,8 +1033,20 @@ const {
   setCells: (state, cells: CellData[]) => {
     const cellData = Object.fromEntries(cells.map((cell) => [cell.id, cell]));
 
+    // WASM has no server-side SessionView to replay outputs, so the
+    // snapshot hydrated by notebookStateFromSession is the only source.
+    const preserveSnapshot = isWasm();
+    const runtimeFor = (cellId: CellId): CellRuntimeState => {
+      if (!preserveSnapshot) {
+        return createCellRuntimeState();
+      }
+      const prev = state.cellRuntime[cellId];
+      const hasSnapshot =
+        prev && (prev.output != null || prev.consoleOutputs.length > 0);
+      return hasSnapshot ? prev : createCellRuntimeState();
+    };
     const cellRuntime = Object.fromEntries(
-      cells.map((cell) => [cell.id, createCellRuntimeState()]),
+      cells.map((cell) => [cell.id, runtimeFor(cell.id)]),
     );
 
     return withScratchCell({