@marimo-team/islands 0.20.5-dev15 → 0.20.5-dev17

package/dist/main.js

@@ -58409,6 +58409,7 @@ ${r}
     toPNG: (e) => Filenames.replace(e, "png"),
     toPDF: (e) => Filenames.replace(e, "pdf"),
     toPY: (e) => Filenames.replace(e, "py"),
+    toIPYNB: (e) => Filenames.replace(e, "ipynb"),
     withoutExtension: (e) => {
       let r = e.split(".");
       return r.length === 1 ? e : r.slice(0, -1).join(".");
@@ -70403,7 +70404,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.20.5-dev15"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.20.5-dev17"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var import_compiler_runtime$88 = require_compiler_runtime();
   function useKeydownOnElement(e, r) {
@@ -101072,6 +101073,7 @@ ${r}
       __publicField(this, "sendFileDetails", throwNotImplemented);
       __publicField(this, "openTutorial", throwNotImplemented);
       __publicField(this, "exportAsHTML", throwNotImplemented);
+      __publicField(this, "exportAsIPYNB", throwNotImplemented);
       __publicField(this, "exportAsMarkdown", throwNotImplemented);
       __publicField(this, "exportAsPDF", throwNotImplemented);
       __publicField(this, "autoExportAsHTML", throwNotImplemented);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.20.5-dev15",
+  "version": "0.20.5-dev17",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/__mocks__/requests.ts

@@ -59,6 +59,7 @@ export const MockRequestClient = {
       getRunningNotebooks: vi.fn().mockResolvedValue({ files: [] }),
       shutdownSession: vi.fn().mockResolvedValue({}),
       exportAsHTML: vi.fn().mockResolvedValue({ html: "" }),
+      exportAsIPYNB: vi.fn().mockResolvedValue(""),
       exportAsMarkdown: vi.fn().mockResolvedValue({ markdown: "" }),
       exportAsPDF: vi.fn().mockResolvedValue(new Blob()),
       autoExportAsHTML: vi.fn().mockResolvedValue({}),

package/src/components/editor/actions/useNotebookActions.tsx

@@ -31,6 +31,7 @@ import {
   LayoutTemplateIcon,
   LinkIcon,
   MessagesSquareIcon,
+  NotebookIcon,
   PanelLeftIcon,
   PowerSquareIcon,
   PresentationIcon,
@@ -123,8 +124,13 @@ export function useNotebookActions() {
   const setCommandPaletteOpen = useSetAtom(commandPaletteAtom);
   const setSettingsDialogOpen = useSetAtom(settingDialogAtom);
   const setKeyboardShortcutsOpen = useSetAtom(keyboardShortcutsAtom);
-  const { exportAsMarkdown, readCode, saveCellConfig, updateCellOutputs } =
-    useRequestClient();
+  const {
+    exportAsIPYNB,
+    exportAsMarkdown,
+    readCode,
+    saveCellConfig,
+    updateCellOutputs,
+  } = useRequestClient();
   const takeScreenshots = useEnrichCellOutputs();
 
   const hasDisabledCells = useAtomValue(hasDisabledCellsAtom);
@@ -199,6 +205,27 @@ export function useNotebookActions() {
     setTimeout(() => window.dispatchEvent(afterprint), 0);
   };
 
+  const handleDownloadAsIPYNB = async () => {
+    if (!filename) {
+      toastNotebookMustBeNamed();
+      return;
+    }
+
+    const runDownload = async (progress: ProgressState) => {
+      await updateCellOutputsWithScreenshots({
+        takeScreenshots: () => takeScreenshots({ progress }),
+        updateCellOutputs,
+      });
+      const ipynb = await exportAsIPYNB({ download: false });
+      downloadBlob(
+        new Blob([ipynb], { type: "application/x-ipynb+json" }),
+        Filenames.toIPYNB(document.title),
+      );
+    };
+
+    await withLoadingToast("Downloading IPYNB...", runDownload);
+  };
+
   const actions: ActionButton[] = [
     {
       icon: <DownloadIcon size={14} strokeWidth={1.5} />,
@@ -240,6 +267,11 @@ export function useNotebookActions() {
             );
           },
         },
+        {
+          icon: <NotebookIcon size={14} strokeWidth={1.5} />,
+          label: "Download as ipynb",
+          handle: handleDownloadAsIPYNB,
+        },
         {
           icon: <CodeIcon size={14} strokeWidth={1.5} />,
           label: "Download Python code",

package/src/core/islands/bridge.ts

@@ -181,6 +181,7 @@ export class IslandsPyodideBridge implements RunRequests, EditRequests {
   sendFileDetails = throwNotImplemented;
   openTutorial = throwNotImplemented;
   exportAsHTML = throwNotImplemented;
+  exportAsIPYNB = throwNotImplemented;
   exportAsMarkdown = throwNotImplemented;
   exportAsPDF = throwNotImplemented;
   autoExportAsHTML = throwNotImplemented;

package/src/core/network/__tests__/requests-network.test.ts

@@ -113,5 +113,22 @@ describe("createNetworkRequests", () => {
         }),
       );
     });
+
+    it("exportAsIPYNB should call the new endpoint as text", async () => {
+      const requests = createNetworkRequests();
+      await requests.exportAsIPYNB({
+        download: false,
+      } as any);
+
+      expect(mockClient.POST).toHaveBeenCalledWith(
+        "/api/export/ipynb",
+        expect.objectContaining({
+          body: expect.objectContaining({
+            download: false,
+          }),
+          parseAs: "text",
+        }),
+      );
+    });
   });
 });

package/src/core/network/requests-lazy.ts

@@ -49,6 +49,7 @@ const ACTIONS: Record<keyof AllRequests, Action> = {
 
   // Export operations start a connection
   exportAsHTML: "startConnection",
+  exportAsIPYNB: "startConnection",
   exportAsMarkdown: "startConnection",
   exportAsPDF: "startConnection",
   readCode: "startConnection",

package/src/core/network/requests-network.ts

@@ -381,6 +381,15 @@ export function createNetworkRequests(): EditRequests & RunRequests {
         })
         .then(handleResponse);
     },
+    exportAsIPYNB: async (request) => {
+      return getClient()
+        .POST("/api/export/ipynb", {
+          body: request,
+          parseAs: "text",
+          params: getParams(),
+        })
+        .then(handleResponse);
+    },
     exportAsPDF: async (request) => {
       return getClient()
         .POST("/api/export/pdf", {

package/src/core/network/requests-static.ts

@@ -75,6 +75,7 @@ export function createStaticRequests(): EditRequests & RunRequests {
     getRunningNotebooks: throwNotInEditMode,
     shutdownSession: throwNotInEditMode,
     exportAsHTML: throwNotInEditMode,
+    exportAsIPYNB: throwNotInEditMode,
     exportAsMarkdown: throwNotInEditMode,
     exportAsPDF: throwNotInEditMode,
     autoExportAsHTML: throwNotInEditMode,

package/src/core/network/requests-toasting.tsx

@@ -60,6 +60,7 @@ export function createErrorToastingRequests(
     getRunningNotebooks: "Failed to get running notebooks",
     shutdownSession: "Failed to shutdown session",
     exportAsHTML: "Failed to export HTML",
+    exportAsIPYNB: "Failed to export ipynb",
     exportAsMarkdown: "Failed to export Markdown",
     exportAsPDF: "Failed to export PDF",
     autoExportAsHTML: "", // No toast

package/src/core/network/types.ts

@@ -180,6 +180,7 @@ export interface EditRequests {
   ) => Promise<RunningNotebooksResponse>;
   // Export requests
   exportAsHTML: (request: ExportAsHTMLRequest) => Promise<string>;
+  exportAsIPYNB: (request: ExportAsIPYNBRequest) => Promise<string>;
   exportAsMarkdown: (request: ExportAsMarkdownRequest) => Promise<string>;
   exportAsPDF: (request: ExportAsPDFRequest) => Promise<Blob>;
   autoExportAsHTML: (request: ExportAsHTMLRequest) => Promise<null>;

package/src/core/wasm/bridge.ts

@@ -587,6 +587,7 @@ export class PyodideBridge implements RunRequests, EditRequests {
   getWorkspaceFiles = throwNotImplemented;
   getRunningNotebooks = throwNotImplemented;
   shutdownSession = throwNotImplemented;
+  exportAsIPYNB = throwNotImplemented;
   exportAsPDF = throwNotImplemented;
   autoExportAsHTML = throwNotImplemented;
   autoExportAsMarkdown = throwNotImplemented;

package/src/utils/__tests__/filenames.test.ts

@@ -23,6 +23,12 @@ describe("Filenames", () => {
     expect(Filenames.toPNG("test.foo.py")).toEqual("test.foo.png");
   });
 
+  it("should convert filename to ipynb", () => {
+    expect(Filenames.toIPYNB("test")).toEqual("test.ipynb");
+    expect(Filenames.toIPYNB("test.txt")).toEqual("test.ipynb");
+    expect(Filenames.toIPYNB("test.foo.py")).toEqual("test.foo.ipynb");
+  });
+
   it("should remove extension from filename", () => {
     expect(Filenames.withoutExtension("test")).toEqual("test");
     expect(Filenames.withoutExtension("test.txt")).toEqual("test");
@@ -39,6 +45,7 @@ describe("Filenames", () => {
     expect(Filenames.toHTML(filename)).toEqual(`${withoutExt}.html`);
     expect(Filenames.toPNG(filename)).toEqual(`${withoutExt}.png`);
     expect(Filenames.toPY(filename)).toEqual(`${withoutExt}.py`);
+    expect(Filenames.toIPYNB(filename)).toEqual(`${withoutExt}.ipynb`);
 
     // Ensure operations preserve unicode and special characters in base name
     expect(withoutExt).not.toEqual("");

package/src/utils/filenames.ts

@@ -15,6 +15,9 @@ export const Filenames = {
   toPY: (filename: string): string => {
     return Filenames.replace(filename, "py");
   },
+  toIPYNB: (filename: string): string => {
+    return Filenames.replace(filename, "ipynb");
+  },
   withoutExtension: (filename: string): string => {
     // Just remove the last extension
     const parts = filename.split(".");