@marimo-team/frontend 0.23.13-dev0 → 0.23.13-dev2

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-BjsskD4V.js"></script>
+    <script type="module" crossorigin src="./assets/index-iAj2M3os.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/preload-helper-y72bE5iF.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-OiXznToA.js">
     <link rel="modulepreload" crossorigin href="./assets/database-zap-DIlSqcdp.js">
     <link rel="modulepreload" crossorigin href="./assets/main-DmhaVp6Y.js">
-    <link rel="modulepreload" crossorigin href="./assets/cells-06TDmJ8V.js">
+    <link rel="modulepreload" crossorigin href="./assets/cells-DQ5n6Zef.js">
     <link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-Bo313Z9X.js">
     <link rel="modulepreload" crossorigin href="./assets/kbd-BCXa3Ocm.js">
     <link rel="modulepreload" crossorigin href="./assets/useInstallPackage-DEHK-C20.js">
@@ -147,38 +147,38 @@
     <link rel="modulepreload" crossorigin href="./assets/usePress-mjvipKvz.js">
     <link rel="modulepreload" crossorigin href="./assets/input-b2KTOk0X.js">
     <link rel="modulepreload" crossorigin href="./assets/ImperativeModal-MQnbMIO2.js">
-    <link rel="modulepreload" crossorigin href="./assets/cell-link-DgWTiCtG.js">
+    <link rel="modulepreload" crossorigin href="./assets/cell-link-LArpBcY-.js">
     <link rel="modulepreload" crossorigin href="./assets/multi-map-9ogswH46.js">
     <link rel="modulepreload" crossorigin href="./assets/alert-Bjh7v4lb.js">
     <link rel="modulepreload" crossorigin href="./assets/chevron-right-C7RH0Nc7.js">
     <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-DfGLyCbP.js">
     <link rel="modulepreload" crossorigin href="./assets/links-DK7te6sJ.js">
-    <link rel="modulepreload" crossorigin href="./assets/useRunCells-DNaOKKqW.js">
+    <link rel="modulepreload" crossorigin href="./assets/useRunCells-bcK6jTD2.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-CyasABTK.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-IBNGDypD.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-icon-BCIGtBo0.js">
-    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-Cq4mwWYz.js">
-    <link rel="modulepreload" crossorigin href="./assets/datasource-mVfTJz3V.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-B3ypjIx-.js">
+    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-BLBwT24G.js">
+    <link rel="modulepreload" crossorigin href="./assets/datasource-BT-L2LDD.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-VxOqftwq.js">
     <link rel="modulepreload" crossorigin href="./assets/package-BoMcg6sy.js">
     <link rel="modulepreload" crossorigin href="./assets/sparkles-DctOjjEz.js">
-    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-BQt_FXJL.js">
+    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-DcImOp4r.js">
     <link rel="modulepreload" crossorigin href="./assets/eye-off-DI0EQXw0.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-cw-DcEasnos.js">
-    <link rel="modulepreload" crossorigin href="./assets/tree-actions-lVyJAYy7.js">
+    <link rel="modulepreload" crossorigin href="./assets/tree-actions-CjikjOBA.js">
     <link rel="modulepreload" crossorigin href="./assets/spinner-DTBVbtl-.js">
-    <link rel="modulepreload" crossorigin href="./assets/html-to-image-CbQeOjEJ.js">
-    <link rel="modulepreload" crossorigin href="./assets/focus-DqhVePQT.js">
+    <link rel="modulepreload" crossorigin href="./assets/html-to-image-CmK-WSPG.js">
+    <link rel="modulepreload" crossorigin href="./assets/focus-Dol5ybck.js">
     <link rel="modulepreload" crossorigin href="./assets/useAsyncData-CT1LpOBD.js">
     <link rel="modulepreload" crossorigin href="./assets/LazyAnyLanguageCodeMirror-CUQODgGJ.js">
     <link rel="modulepreload" crossorigin href="./assets/micromark-factory-space-P--XWZhg.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-5FQGJX7Z-C6VN0dQj.js">
-    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-C1yypOYF.js">
+    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-f3mfGw8u.js">
     <link rel="modulepreload" crossorigin href="./assets/command-CsbsBLBw.js">
     <link rel="modulepreload" crossorigin href="./assets/field-CA9HCE2Y.js">
     <link rel="modulepreload" crossorigin href="./assets/popover-DMNO6Poc.js">
     <link rel="modulepreload" crossorigin href="./assets/errors-48KFPvCp.js">
-    <link rel="modulepreload" crossorigin href="./assets/download-VxqV5OSK.js">
+    <link rel="modulepreload" crossorigin href="./assets/download-rKGlekSQ.js">
     <link rel="modulepreload" crossorigin href="./assets/table-Fk_msRcD.js">
     <link rel="modulepreload" crossorigin href="./assets/useIframeCapabilities-DuGyzPVb.js">
     <link rel="modulepreload" crossorigin href="./assets/error-banner-C4DZksWV.js">
@@ -198,21 +198,21 @@
     <link rel="modulepreload" crossorigin href="./assets/plus-CExKUszm.js">
     <link rel="modulepreload" crossorigin href="./assets/trash-2-CjPoUZCP.js">
     <link rel="modulepreload" crossorigin href="./assets/react-resizable-panels.browser.esm-CgWOEYeG.js">
-    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-FFLZqPUK.js">
+    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-DTeVFctC.js">
     <link rel="modulepreload" crossorigin href="./assets/chart-no-axes-column-DVEV2j1H.js">
     <link rel="modulepreload" crossorigin href="./assets/square-function-CPbVtjKW.js">
     <link rel="modulepreload" crossorigin href="./assets/spec-BzxoPflZ.js">
-    <link rel="modulepreload" crossorigin href="./assets/column-preview-oHsVFerC.js">
+    <link rel="modulepreload" crossorigin href="./assets/column-preview-VcOeHtkt.js">
     <link rel="modulepreload" crossorigin href="./assets/icons-D3YFXNmD.js">
-    <link rel="modulepreload" crossorigin href="./assets/radio-group-BaOG2bSA.js">
-    <link rel="modulepreload" crossorigin href="./assets/floating-outline-3UBj62S1.js">
+    <link rel="modulepreload" crossorigin href="./assets/radio-group-D7RG9Px_.js">
+    <link rel="modulepreload" crossorigin href="./assets/floating-outline-CPTvLHMl.js">
     <link rel="modulepreload" crossorigin href="./assets/objectWithoutPropertiesLoose-Msf1n32r.js">
     <link rel="modulepreload" crossorigin href="./assets/esm-DSv-aO_T.js">
-    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-CNyK8G1T.js">
+    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-DHJTIc4H.js">
     <link rel="modulepreload" crossorigin href="./assets/file-headphone-CUN2DC78.js">
     <link rel="modulepreload" crossorigin href="./assets/file-BvoBtS_V.js">
     <link rel="modulepreload" crossorigin href="./assets/image-jhXeQEgs.js">
-    <link rel="modulepreload" crossorigin href="./assets/file-icons-BeJWUbBH.js">
+    <link rel="modulepreload" crossorigin href="./assets/file-icons-DBMviz_K.js">
     <link rel="modulepreload" crossorigin href="./assets/switch-DHhZkGEv.js">
     <link rel="modulepreload" crossorigin href="./assets/events-BRbNg7Li.js">
     <link rel="modulepreload" crossorigin href="./assets/globals-BDWM3c_z.js">
@@ -221,11 +221,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-CsW0tABf.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-DD6m9X2h.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-D7fu7IC3.js">
     <link rel="modulepreload" crossorigin href="./assets/label-CFvCMYuj.js">
-    <link rel="modulepreload" crossorigin href="./assets/textarea-BM7hAwR3.js">
+    <link rel="modulepreload" crossorigin href="./assets/textarea-DD5BwHTh.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-ccw-CUkO1Vlo.js">
-    <link rel="modulepreload" crossorigin href="./assets/form-pEJO4Mq_.js">
+    <link rel="modulepreload" crossorigin href="./assets/form-B9I9mpZy.js">
     <link rel="modulepreload" crossorigin href="./assets/renderShortcut-CKbqJyj4.js">
     <link rel="modulepreload" crossorigin href="./assets/useBoolean-48bgGoSa.js">
     <link rel="modulepreload" crossorigin href="./assets/useDeepCompareMemoize-zUHU--0D.js">

package/package.json

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

package/src/components/editor/cell/code/cell-editor.tsx

@@ -10,9 +10,11 @@ import { Button } from "@/components/ui/button";
 import { DelayMount } from "@/components/utils/delay-mount";
 import { aiCompletionCellAtom } from "@/core/ai/state";
 import { maybeAddMarimoImport } from "@/core/cells/add-missing-import";
-import { useCellActions } from "@/core/cells/cells";
+import { getNotebook, useCellActions } from "@/core/cells/cells";
+import { SETUP_CELL_ID } from "@/core/cells/ids";
 import { usePendingDeleteService } from "@/core/cells/pending-delete-service";
 import type { CellData, CellRuntimeState } from "@/core/cells/types";
+import { notebookCellEditorViews } from "@/core/cells/utils";
 import { setupCodeMirror } from "@/core/codemirror/cm";
 import { acceptCompletionOnEnterAtom } from "@/core/codemirror/completion/accept-on-enter-atom";
 import { editorMountScheduler } from "@/core/codemirror/editor-mount-scheduler";
@@ -22,6 +24,10 @@ import {
   reconfigureLanguageEffect,
   switchLanguage,
 } from "@/core/codemirror/language/extension";
+import {
+  getEditorCodeAsPython,
+  updateEditorCodeFromPython,
+} from "@/core/codemirror/language/utils";
 import { MARKDOWN_INITIAL_HIDE_CODE } from "@/core/codemirror/language/languages/markdown";
 import type { LanguageAdapterType } from "@/core/codemirror/language/types";
 import {
@@ -214,6 +220,32 @@ const CellEditorInternal = ({
             });
           }
         },
+        addOrAppendSetupCell: (code) => {
+          const notebook = getNotebook();
+          // No setup cell yet: create one with this code at the top.
+          if (!notebook.cellIds.setupCellExists()) {
+            cellActions.addSetupCellIfDoesntExist({ code });
+            return;
+          }
+          // Setup cell exists: append the pasted code to it. Prefer updating
+          // the mounted editor (keeps the view and state in sync, like
+          // formatting does); fall back to a plain state update otherwise.
+          const view = notebookCellEditorViews(notebook)[SETUP_CELL_ID];
+          const existing = view
+            ? getEditorCodeAsPython(view)
+            : notebook.cellData[SETUP_CELL_ID].code;
+          const merged = existing.trim()
+            ? `${existing.trimEnd()}\n\n${code}`
+            : code;
+          if (view) {
+            updateEditorCodeFromPython(view, merged);
+          }
+          cellActions.updateCellCode({
+            cellId: SETUP_CELL_ID,
+            code: merged,
+            formattingChange: false,
+          });
+        },
         splitCell,
         toggleHideCode,
         aiCellCompletion: () => {

package/src/core/codemirror/cells/state.ts

@@ -8,6 +8,11 @@ export interface CodemirrorCellActions extends CellActions {
   toggleHideCode: () => boolean;
   aiCellCompletion: () => boolean;
   createManyBelow: (content: string[]) => void;
+  /**
+   * Create the setup cell with the given code, or append the code to the
+   * existing setup cell if one already exists.
+   */
+  addOrAppendSetupCell: (code: string) => void;
   onRun: () => void;
   deleteCell: () => void;
   afterToggleMarkdown: () => void;

package/src/core/codemirror/misc/__tests__/paste.test.ts

@@ -7,7 +7,7 @@ import {
   type CodemirrorCellActions,
   cellActionsState,
 } from "../../cells/state";
-import { extractCells, pasteBundle } from "../paste";
+import { extractCells, extractMarimoApp, pasteBundle } from "../paste";
 
 describe("extractCells", () => {
   it("returns empty array for non-marimo text", () => {
@@ -158,6 +158,154 @@ def _(mo, px):
     ]);
   });
 
+  it("preserves decorators on nested functions", () => {
+    const input = `
+@app.cell
+def _():
+    @functools.cache
+    def fib(n):
+        return n
+    return fib
+`;
+    expect(extractCells(input)).toEqual([
+      "@functools.cache\ndef fib(n):\n    return n",
+    ]);
+  });
+
+  it("preserves decorated methods inside a class", () => {
+    const input = `
+@app.cell
+def _():
+    class A:
+        @property
+        def x(self):
+            return self._x
+    return A
+`;
+    expect(extractCells(input)).toEqual([
+      "class A:\n    @property\n    def x(self):\n        return self._x",
+    ]);
+  });
+
+  it("handles async cells with multi-line args", () => {
+    const input = `
+@app.cell
+async def _(
+    a,
+    b,
+):
+    x = await foo(a, b)
+    return x
+`;
+    expect(extractCells(input)).toEqual(["x = await foo(a, b)"]);
+  });
+
+  it("strips multi-line returns using brackets", () => {
+    const input = `
+@app.cell
+def _():
+    a = 1
+    b = 2
+    return [
+        a,
+        b,
+    ]
+`;
+    expect(extractCells(input)).toEqual(["a = 1\nb = 2"]);
+  });
+
+  it("strips multi-line returns using braces", () => {
+    const input = `
+@app.cell
+def _():
+    a = 1
+    return {
+        "a": a,
+    }
+`;
+    expect(extractCells(input)).toEqual(["a = 1"]);
+  });
+
+  it("does not corrupt the following cell after a bracketed return", () => {
+    const input = `
+@app.cell
+def _():
+    a = 1
+    return [
+        a,
+    ]
+
+@app.cell
+def _():
+    b = 2
+    return b
+`;
+    expect(extractCells(input)).toEqual(["a = 1", "b = 2"]);
+  });
+
+  it("preserves comments in the cell body", () => {
+    const input = `
+@app.cell
+def _():
+    # leading comment
+    x = 1
+    return x
+`;
+    expect(extractCells(input)).toEqual(["# leading comment\nx = 1"]);
+  });
+
+  it("extracts the setup block separately from cells", () => {
+    const input = `
+import marimo
+app = marimo.App()
+
+with app.setup(hide_code=True):
+    import marimo as mo
+    import numpy as np
+    from numpy.linalg import eigh
+`;
+    expect(extractMarimoApp(input)).toEqual({
+      setup:
+        "import marimo as mo\nimport numpy as np\nfrom numpy.linalg import eigh",
+      cells: [],
+    });
+    // The convenience wrapper excludes the setup block.
+    expect(extractCells(input)).toEqual([]);
+  });
+
+  it("extracts @app.function definitions, keeping their return", () => {
+    const input = `
+@app.function
+def laplacian_matrix(adjacency_matrix):
+    degree_matrix = np.diag(np.sum(adjacency_matrix, axis=1))
+    L = degree_matrix - adjacency_matrix
+    return L
+`;
+    expect(extractCells(input)).toEqual([
+      "def laplacian_matrix(adjacency_matrix):\n    degree_matrix = np.diag(np.sum(adjacency_matrix, axis=1))\n    L = degree_matrix - adjacency_matrix\n    return L",
+    ]);
+  });
+
+  it("extracts setup separately while keeping cells and functions in order", () => {
+    const input = `
+with app.setup:
+    import numpy as np
+
+@app.cell
+def _():
+    a = 1
+    return (a,)
+
+@app.function
+def double(x):
+    return x * 2
+`;
+    expect(extractMarimoApp(input)).toEqual({
+      setup: "import numpy as np",
+      cells: ["a = 1", "def double(x):\n    return x * 2"],
+    });
+  });
+
   it("handles cells with config", () => {
     const input = `
 @app.cell(hide_code=True, column=2)
@@ -254,4 +402,45 @@ def _():
 
     expect(createManyBelow).not.toHaveBeenCalled();
   });
+
+  it("routes the setup block to the setup cell, not a normal cell", () => {
+    const createManyBelow = vi.fn();
+    const addOrAppendSetupCell = vi.fn();
+    const extension = pasteBundle();
+    const view = new EditorView({
+      state: EditorState.create({
+        doc: "",
+        extensions: [
+          extension,
+          cellActionsState.of({
+            createManyBelow,
+            addOrAppendSetupCell,
+          } as never as CodemirrorCellActions),
+        ],
+      }),
+    });
+
+    const clipboardData = new MockDataTransfer();
+    clipboardData.setData(
+      "text/plain",
+      `
+with app.setup:
+    import numpy as np
+
+@app.cell
+def _():
+    x = 1
+    return x
+`,
+    );
+    const event = new MockClipboardEvent("paste", { clipboardData });
+
+    // HACK: manually add the paste event listener
+    // @ts-expect-error extension not typed
+    view.dom.onpaste = (evt) => extension[0].domEventHandlers.paste(evt, view);
+    view.dom.dispatchEvent(event);
+
+    expect(addOrAppendSetupCell).toHaveBeenCalledWith("import numpy as np");
+    expect(createManyBelow).toHaveBeenCalledWith(["x = 1"]);
+  });
 });