@marimo-team/islands 0.23.16-dev23 → 0.23.16-dev24

package/dist/{reveal-component-BFiF5alf.js → reveal-component-W3BHYmGS.js}

@@ -9,7 +9,7 @@ import { t as require_compiler_runtime } from "./compiler-runtime-CEbnTgxf.js";
 import { ut as outputIsStale } from "./html-to-image-27MFfyOf.js";
 import "./chunk-5FQGJX7Z-B9WoXK1R.js";
 import { u as createLucideIcon } from "./dist-DIlxLFXG.js";
-import { a as DEFAULT_DECK_VERTICAL_ALIGN, c as SlideSidebar, cn as EyeOff, ct as Panel, fn as Code, i as DEFAULT_DECK_TRANSITION, l as Slide, ln as Expand, lt as PanelGroup, o as DEFAULT_SLIDE_TYPE, t as useNotebookCodeAvailable, ut as PanelResizeHandle } from "./code-visibility-Bi6qrSJV.js";
+import { a as DEFAULT_DECK_VERTICAL_ALIGN, c as SlideSidebar, dt as PanelResizeHandle, i as DEFAULT_DECK_TRANSITION, l as Slide, ln as EyeOff, lt as Panel, o as DEFAULT_SLIDE_TYPE, pn as Code, t as useNotebookCodeAvailable, un as Expand, ut as PanelGroup } from "./code-visibility-DsEGA9_b.js";
 import { R as ChevronDown } from "./strings-DIy9NAmg.js";
 import { X as useDebouncedCallback } from "./input-C5K4VBvB.js";
 import { v as kioskModeAtom } from "./toDate-CqhBWjvO.js";
@@ -7328,10 +7328,10 @@ function resolveSlideContentStyle(e5) {
 var SubslideView = (e5) => {
   let t = (0, import_compiler_runtime.c)(24), { subslide: n, resolveShowCode: r, isEditable: i, slideConfigs: a, contentStyle: o } = e5, s, l, u, f, go, _o;
   if (t[0] !== o || t[1] !== i || t[2] !== r || t[3] !== a || t[4] !== n) {
-    let { slideLevel: e6, cumulativeByBlock: p2 } = buildSubslideNotes(n, a);
+    let { slideLevel: e6, cumulativeByBlock: vo2 } = buildSubslideNotes(n, a);
     u = e6;
-    let vo2 = n.blocks.some((e7) => e7.cells.some((e8) => r(e8.id)));
-    l = w, s = SlideScrollContainer, f = vo2 ? "mo-slide-content flex flex-col gap-3" : "mo-slide-content", go = o, _o = n.blocks.map((e7, t2) => {
+    let yo2 = n.blocks.some((e7) => e7.cells.some((e8) => r(e8.id)));
+    l = w, s = SlideScrollContainer, f = yo2 ? "mo-slide-content flex flex-col gap-3" : "mo-slide-content", go = o, _o = n.blocks.map((e7, t2) => {
       let n2 = e7.cells.map((e8) => r(e8.id) ? i ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SlideCellView, { cell: e8 }, e8.id) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SlideCellReadOnlyView, { cell: e8 }, e8.id) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Slide, {
         cellId: e8.id,
         status: e8.status,
@@ -7339,7 +7339,7 @@ var SubslideView = (e5) => {
         stale: outputIsStale(e8, false)
       }, e8.id));
       if (e7.isFragment) {
-        let e8 = p2.get(t2);
+        let e8 = vo2.get(t2);
         return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Bt, {
           as: "div",
           children: [n2, e8 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(NotesAside, { text: e8 })]
@@ -7348,18 +7348,18 @@ var SubslideView = (e5) => {
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Fragment, { children: n2 }, t2);
     }), t[0] = o, t[1] = i, t[2] = r, t[3] = a, t[4] = n, t[5] = s, t[6] = l, t[7] = u, t[8] = f, t[9] = go, t[10] = _o;
   } else s = t[5], l = t[6], u = t[7], f = t[8], go = t[9], _o = t[10];
-  let p;
-  t[11] !== f || t[12] !== go || t[13] !== _o ? (p = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+  let vo;
+  t[11] !== f || t[12] !== go || t[13] !== _o ? (vo = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
     className: f,
     style: go,
     children: _o
-  }), t[11] = f, t[12] = go, t[13] = _o, t[14] = p) : p = t[14];
-  let vo;
-  t[15] !== s || t[16] !== p ? (vo = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(s, { children: p }), t[15] = s, t[16] = p, t[17] = vo) : vo = t[17];
+  }), t[11] = f, t[12] = go, t[13] = _o, t[14] = vo) : vo = t[14];
+  let yo;
+  t[15] !== s || t[16] !== vo ? (yo = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(s, { children: vo }), t[15] = s, t[16] = vo, t[17] = yo) : yo = t[17];
   let bo;
   t[18] === u ? bo = t[19] : (bo = u && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(NotesAside, { text: u }), t[18] = u, t[19] = bo);
   let xo;
-  return t[20] !== l || t[21] !== vo || t[22] !== bo ? (xo = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(l, { children: [vo, bo] }), t[20] = l, t[21] = vo, t[22] = bo, t[23] = xo) : xo = t[23], xo;
+  return t[20] !== l || t[21] !== yo || t[22] !== bo ? (xo = /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(l, { children: [yo, bo] }), t[20] = l, t[21] = yo, t[22] = bo, t[23] = xo) : xo = t[23], xo;
 };
 function parkedRendersSource(e5) {
   let { isNoOutputPreview: t, isEditable: n, showCode: r } = e5;
@@ -7384,7 +7384,7 @@ var ParkedPreviewContent = (e5) => {
     output: l,
     stale: u
   }), t[5] = n.id, t[6] = n.output, t[7] = n.status, t[8] = u, t[9] = f) : f = t[9], f;
-}, reveal_component_default = ({ slideCells: e5, layout: o, setLayout: s, noOutputIds: c, activeIndex: l, onSlideChange: u, mode: vo, configWidth: yo, isEditable: So = false }) => {
+}, reveal_component_default = ({ slideCells: e5, layout: o, setLayout: s, noOutputIds: c, activeIndex: l, onSlideChange: u, mode: _o, configWidth: p, isEditable: bo = false }) => {
   var _a2, _b2, _c;
   let To = (0, import_react.useRef)(null), Eo = (0, import_react.useRef)(null), { width: Oo, height: Po } = useSlideDimensions(To), Fo = useFullScreenElement() != null, Lo = useAtomValue(kioskModeAtom), Ro = (0, import_react.useMemo)(() => Lo ? [] : [ce], [Lo]), [zo, Bo] = (0, import_react.useState)(() => /* @__PURE__ */ new Set()), Vo = useNotebookCodeAvailable(e5), Ho = !isIslands() && Vo, Uo = l == null ? void 0 : e5[l], Wo = Uo ?? e5.at(0), { parkedPreviewCell: Go, isHeldEdit: Ko, isNoOutputPreview: qo, heldEditCellId: Jo, heldShowsCode: Yo, toggleHeldShowsCode: Xo } = useParkedPreview({
     activeCell: Uo,
@@ -7488,7 +7488,7 @@ var ParkedPreviewContent = (e5) => {
   useEventListener(document, "keydown", ms, { capture: true });
   let gs = Ko ? null : qo ? "Hidden as there is no output" : "Skipped in presentation", _s = Ko ? Yo : Zo(Go == null ? void 0 : Go.id), vs = parkedRendersSource({
     isNoOutputPreview: qo,
-    isEditable: So,
+    isEditable: bo,
     showCode: _s
   }), ys = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
     ref: To,
@@ -7512,13 +7512,13 @@ var ParkedPreviewContent = (e5) => {
           children: rs.stacks.map((e6, t) => e6.subslides.length === 1 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SubslideView, {
             subslide: e6.subslides[0],
             resolveShowCode: Zo,
-            isEditable: So,
+            isEditable: bo,
             slideConfigs: o.cells,
             contentStyle: ss
           }, t) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ne, { children: e6.subslides.map((e7, t2) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SubslideView, {
             subslide: e7,
             resolveShowCode: Zo,
-            isEditable: So,
+            isEditable: bo,
             slideConfigs: o.cells,
             contentStyle: ss
           }, t2)) }, t))
@@ -7537,7 +7537,7 @@ var ParkedPreviewContent = (e5) => {
               children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ParkedPreviewContent, {
                 cell: Go,
                 isNoOutputPreview: qo,
-                isEditable: So,
+                isEditable: bo,
                 showCode: _s
               })
             })
@@ -7579,7 +7579,7 @@ var ParkedPreviewContent = (e5) => {
       ]
     })
   });
-  return vo === "read" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
+  return _o === "read" ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
     className: "flex-1 min-w-0 flex flex-row gap-3",
     children: ys
   }) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
@@ -7615,7 +7615,7 @@ var ParkedPreviewContent = (e5) => {
         })
       ]
     }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SlideSidebar, {
-      configWidth: yo,
+      configWidth: p,
       layout: o,
       setLayout: s,
       activeConfigCell: Wo

package/package.json

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

package/src/__mocks__/requests.ts

@@ -64,10 +64,26 @@ export const MockRequestClient = {
       getWorkspaceFiles: vi.fn().mockResolvedValue({ files: [] }),
       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()),
+      exportAsHTML: vi.fn().mockResolvedValue({
+        contents: "",
+        filename: "notebook.html",
+        mediaType: "text/html; charset=utf-8",
+      }),
+      exportAsIPYNB: vi.fn().mockResolvedValue({
+        contents: "",
+        filename: "notebook.ipynb",
+        mediaType: "text/plain; charset=utf-8",
+      }),
+      exportAsMarkdown: vi.fn().mockResolvedValue({
+        contents: "",
+        filename: "notebook.md",
+        mediaType: "text/plain; charset=utf-8",
+      }),
+      exportAsPDF: vi.fn().mockResolvedValue({
+        contents: new Blob(),
+        filename: "notebook.pdf",
+        mediaType: "application/pdf",
+      }),
       autoExportAsHTML: vi.fn().mockResolvedValue({}),
       autoExportAsMarkdown: vi.fn().mockResolvedValue({}),
       autoExportAsIPYNB: vi.fn().mockResolvedValue({}),

package/src/components/editor/actions/__tests__/pdf-export.test.ts

@@ -8,13 +8,11 @@ describe("runServerSidePDFDownload", () => {
     const downloadPDF = vi.fn().mockResolvedValue(undefined);
 
     await runServerSidePDFDownload({
-      filename: "slides.py",
       preset: "document",
       downloadPDF,
     });
 
     expect(downloadPDF).toHaveBeenCalledWith({
-      filename: "slides.py",
       webpdf: false,
       preset: "document",
       includeInputs: true,
@@ -26,13 +24,11 @@ describe("runServerSidePDFDownload", () => {
     const downloadPDF = vi.fn().mockResolvedValue(undefined);
 
     await runServerSidePDFDownload({
-      filename: "slides.py",
       preset: "slides",
       downloadPDF,
     });
 
     expect(downloadPDF).toHaveBeenCalledWith({
-      filename: "slides.py",
       webpdf: false,
       preset: "slides",
       includeInputs: true,

package/src/components/editor/actions/pdf-export.ts

@@ -2,7 +2,6 @@
 
 type Preset = "document" | "slides";
 type DownloadPDF = (opts: {
-  filename: string;
   webpdf: boolean;
   preset: Preset;
   includeInputs: boolean;
@@ -10,14 +9,12 @@ type DownloadPDF = (opts: {
 }) => Promise<void>;
 
 export async function runServerSidePDFDownload(opts: {
-  filename: string;
   preset: Preset;
   downloadPDF: DownloadPDF;
 }): Promise<void> {
-  const { filename, preset, downloadPDF } = opts;
+  const { preset, downloadPDF } = opts;
 
   await downloadPDF({
-    filename,
     webpdf: false,
     preset,
     includeInputs: true,

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

@@ -83,6 +83,7 @@ import {
   ADD_PRINTING_CLASS,
   downloadAsPDF,
   downloadBlob,
+  downloadExportedFile,
   downloadHTMLAsImage,
   withLoadingToast,
 } from "@/utils/download";
@@ -197,7 +198,6 @@ export function useNotebookActions() {
         updateCellOutputs,
       });
       await runServerSidePDFDownload({
-        filename,
         preset,
         downloadPDF: downloadAsPDF,
       });
@@ -231,11 +231,8 @@ export function useNotebookActions() {
         takeScreenshots: () => takeScreenshots({ progress }),
         updateCellOutputs,
       });
-      const ipynb = await exportAsIPYNB({ download: false });
-      downloadBlob(
-        new Blob([ipynb], { type: "application/x-ipynb+json" }),
-        Filenames.toIPYNB(document.title),
-      );
+      const exportedFile = await exportAsIPYNB({ download: false });
+      downloadExportedFile(exportedFile);
     };
 
     await withLoadingToast("Downloading IPYNB...", runDownload);
@@ -255,7 +252,7 @@ export function useNotebookActions() {
               toastNotebookMustBeNamed();
               return;
             }
-            await downloadAsHTML({ filename, includeCode: true });
+            await downloadAsHTML({ includeCode: true });
           },
         },
         {
@@ -266,7 +263,7 @@ export function useNotebookActions() {
               toastNotebookMustBeNamed();
               return;
             }
-            await downloadAsHTML({ filename, includeCode: false });
+            await downloadAsHTML({ includeCode: false });
           },
         },
         {
@@ -275,11 +272,8 @@ export function useNotebookActions() {
           ),
           label: "Download as Markdown",
           handle: async () => {
-            const md = await exportAsMarkdown({ download: false });
-            downloadBlob(
-              new Blob([md], { type: "text/plain" }),
-              Filenames.toMarkdown(document.title),
-            );
+            const exportedFile = await exportAsMarkdown({ download: false });
+            downloadExportedFile(exportedFile);
           },
         },
         {

package/src/components/editor/renderers/vertical-layout/vertical-layout.tsx

@@ -202,7 +202,7 @@ const ActionButtons: React.FC<{
     if (!app) {
       return;
     }
-    await downloadAsHTML({ filename: document.title, includeCode: true });
+    await downloadAsHTML({ includeCode: true });
   };
 
   const handleDownloadAsPython = async () => {

package/src/components/static-html/share-modal.tsx

@@ -40,7 +40,7 @@ export const ShareStaticNotebookModal: React.FC<{
           e.preventDefault();
 
           onClose();
-          const html = await exportAsHTML({
+          const { contents: html } = await exportAsHTML({
             download: false,
             includeCode: true,
             files: VirtualFileTracker.INSTANCE.filenames(),

package/src/core/network/__tests__/api.test.ts

@@ -94,4 +94,46 @@ describe("API", () => {
       }),
     ).rejects.toBeInstanceOf(HTTPError);
   });
+
+  it("preserves export metadata from response headers", async () => {
+    const response = new Response("markdown", {
+      headers: {
+        "Content-Disposition":
+          "attachment; filename*=UTF-8''r%C3%A9sum%C3%A9.qmd",
+        "Content-Type": "text/plain; charset=utf-8",
+      },
+    });
+
+    await expect(
+      API.handleExportResponse({ data: "markdown", response }),
+    ).resolves.toEqual({
+      contents: "markdown",
+      filename: "résumé.qmd",
+      mediaType: "text/plain; charset=utf-8",
+    });
+  });
+
+  it("rejects export responses without a filename", async () => {
+    await expect(
+      API.handleExportResponse({
+        data: "markdown",
+        response: new Response(null, {
+          headers: { "Content-Type": "text/plain" },
+        }),
+      }),
+    ).rejects.toThrow("Export response is missing a filename");
+  });
+
+  it("rejects export responses without a media type", async () => {
+    await expect(
+      API.handleExportResponse({
+        data: "markdown",
+        response: new Response(null, {
+          headers: {
+            "Content-Disposition": "attachment; filename*=UTF-8''notebook.md",
+          },
+        }),
+      }),
+    ).rejects.toThrow("Export response is missing a media type");
+  });
 });

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

@@ -22,6 +22,7 @@ vi.mock("../api", async () => {
   return {
     ...actual,
     API: {
+      handleExportResponse: vi.fn((response) => response.data),
       handleResponse: vi.fn((response) => response.data),
       handleResponseReturnNull: vi.fn(() => null),
     },

package/src/core/network/api.ts

@@ -6,6 +6,7 @@ import { Logger } from "../../utils/Logger";
 import { Strings } from "../../utils/strings";
 import { getRuntimeManager } from "../runtime/config";
 import type { RuntimeManager } from "../runtime/runtime";
+import type { ExportedFile } from "./types";
 
 function getBaseUriWithoutQueryParams(): string {
   // Remove query params and hash
@@ -15,6 +16,15 @@ function getBaseUriWithoutQueryParams(): string {
   return url.toString();
 }
 
+function getExportFilename(response: Response): string {
+  const contentDisposition = response.headers.get("Content-Disposition");
+  const match = contentDisposition?.match(/filename\*=UTF-8''([^;]+)/i);
+  if (!match) {
+    throw new Error("Export response is missing a filename");
+  }
+  return decodeURIComponent(match[1]);
+}
+
 /**
  * Wrapper around fetch that adds XSRF token and session ID to the request and
  * strong types.
@@ -119,6 +129,23 @@ export const API = {
     }
     return Promise.resolve(response.data as T);
   },
+  handleExportResponse: async <T extends BlobPart>(response: {
+    data?: T | undefined;
+    error?: Record<string, unknown>;
+    response: Response;
+  }): Promise<ExportedFile<T>> => {
+    const contents = await API.handleResponse<T>(response);
+    const mediaType = response.response.headers.get("Content-Type");
+    if (!mediaType) {
+      throw new Error("Export response is missing a media type");
+    }
+
+    return {
+      contents,
+      filename: getExportFilename(response.response),
+      mediaType,
+    };
+  },
   handleResponseReturnNull: (response: {
     error?: Record<string, unknown>;
     response: Response;

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

@@ -22,7 +22,7 @@ function multipartInit(formData: FormData) {
   };
 }
 
-const { handleResponse, handleResponseReturnNull } = API;
+const { handleExportResponse, handleResponse, handleResponseReturnNull } = API;
 
 export function createNetworkRequests(): EditRequests & RunRequests {
   const getClient = once(() => {
@@ -415,7 +415,7 @@ export function createNetworkRequests(): EditRequests & RunRequests {
           parseAs: "text",
           params: getParams(),
         })
-        .then(handleResponse);
+        .then(handleExportResponse);
     },
     exportAsMarkdown: async (request) => {
       return getClient()
@@ -424,7 +424,7 @@ export function createNetworkRequests(): EditRequests & RunRequests {
           parseAs: "text",
           params: getParams(),
         })
-        .then(handleResponse);
+        .then(handleExportResponse);
     },
     exportAsIPYNB: async (request) => {
       return getClient()
@@ -433,7 +433,7 @@ export function createNetworkRequests(): EditRequests & RunRequests {
           parseAs: "text",
           params: getParams(),
         })
-        .then(handleResponse);
+        .then(handleExportResponse);
     },
     exportAsPDF: async (request) => {
       return getClient()
@@ -442,7 +442,7 @@ export function createNetworkRequests(): EditRequests & RunRequests {
           parseAs: "blob",
           params: getParams(),
         })
-        .then(handleResponse);
+        .then(handleExportResponse);
     },
     autoExportAsHTML: async (request) => {
       return getClient()

package/src/core/network/types.ts

@@ -23,6 +23,13 @@ export type ExportAsIPYNBRequest = schemas["ExportAsIPYNBRequest"];
 export type ExportAsScriptRequest = schemas["ExportAsScriptRequest"];
 export type ExportAsPDFRequest = schemas["ExportAsPDFRequest"];
 export type UpdateCellOutputsRequest = schemas["UpdateCellOutputsRequest"];
+
+export interface ExportedFile<T extends BlobPart = BlobPart> {
+  contents: T;
+  filename: string;
+  mediaType: string;
+}
+
 export type FileCopyRequest = schemas["FileCopyRequest"];
 export type FileCopyResponse = schemas["FileCopyResponse"];
 export type FileCreateRequest = schemas["FileCreateRequest"];
@@ -205,10 +212,14 @@ export interface EditRequests {
     request: ShutdownSessionRequest,
   ) => Promise<RunningNotebooksResponse>;
   // Export requests
-  exportAsHTML: (request: ExportAsHTMLRequest) => Promise<string>;
-  exportAsIPYNB: (request: ExportAsIPYNBRequest) => Promise<string>;
-  exportAsMarkdown: (request: ExportAsMarkdownRequest) => Promise<string>;
-  exportAsPDF: (request: ExportAsPDFRequest) => Promise<Blob>;
+  exportAsHTML: (request: ExportAsHTMLRequest) => Promise<ExportedFile<string>>;
+  exportAsIPYNB: (
+    request: ExportAsIPYNBRequest,
+  ) => Promise<ExportedFile<string>>;
+  exportAsMarkdown: (
+    request: ExportAsMarkdownRequest,
+  ) => Promise<ExportedFile<string>>;
+  exportAsPDF: (request: ExportAsPDFRequest) => Promise<ExportedFile<Blob>>;
   autoExportAsHTML: (request: ExportAsHTMLRequest) => Promise<null>;
   autoExportAsMarkdown: (request: ExportAsMarkdownRequest) => Promise<null>;
   autoExportAsIPYNB: (request: ExportAsIPYNBRequest) => Promise<null>;

package/src/core/static/download-html.ts

@@ -1,31 +1,22 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { downloadBlob } from "@/utils/download";
-import { Filenames } from "@/utils/filenames";
-import { Paths } from "@/utils/paths";
+import { downloadExportedFile } from "@/utils/download";
 import { getRequestClient } from "../network/requests";
 import { VirtualFileTracker } from "./virtual-file-tracker";
 
 /**
  * Downloads the current notebook as an HTML file.
  */
-export async function downloadAsHTML(opts: {
-  filename: string;
-  includeCode: boolean;
-}) {
+export async function downloadAsHTML(opts: { includeCode: boolean }) {
   const client = getRequestClient();
-  const { filename, includeCode } = opts;
-  const html = await client.exportAsHTML({
+  const { includeCode } = opts;
+  const exportedFile = await client.exportAsHTML({
     download: true,
     includeCode: includeCode,
     files: VirtualFileTracker.INSTANCE.filenames(),
   });
-  const filenameWithoutPath = Paths.basename(filename) ?? "notebook.py";
 
-  downloadBlob(
-    new Blob([html], { type: "text/html" }),
-    Filenames.toHTML(filenameWithoutPath),
-  );
+  downloadExportedFile(exportedFile);
 }
 
 function updateAssetUrl(existingUrl: string, assetBaseUrl: string) {

package/src/core/wasm/bridge.ts

@@ -19,6 +19,7 @@ import type {
   EnvironmentInfo,
   ExportAsHTMLRequest,
   ExportAsMarkdownRequest,
+  ExportedFile,
   FileCopyResponse,
   FileCreateResponse,
   FileDeleteResponse,
@@ -520,7 +521,7 @@ export class PyodideBridge implements RunRequests, EditRequests {
       functionName: "export_html",
       payload: request,
     });
-    return response as string;
+    return response as ExportedFile<string>;
   };
 
   exportAsMarkdown: EditRequests["exportAsMarkdown"] = async (
@@ -530,7 +531,7 @@ export class PyodideBridge implements RunRequests, EditRequests {
       functionName: "export_markdown",
       payload: request,
     });
-    return response as string;
+    return response as ExportedFile<string>;
   };
 
   previewDatasetColumn: EditRequests["previewDatasetColumn"] = async (

package/src/core/wasm/worker/types.ts

@@ -12,6 +12,7 @@ import type {
   EnvironmentInfo,
   ExportAsHTMLRequest,
   ExportAsMarkdownRequest,
+  ExportedFile,
   FileCopyRequest,
   FileCopyResponse,
   FileCreateRequest,
@@ -96,8 +97,10 @@ export interface RawBridge {
   load_packages(request: string): Promise<string>;
   read_file(request: string): Promise<string>;
   set_interrupt_buffer(request: Uint8Array): Promise<string>;
-  export_html(request: ExportAsHTMLRequest): Promise<string>;
-  export_markdown(request: ExportAsMarkdownRequest): Promise<string>;
+  export_html(request: ExportAsHTMLRequest): Promise<ExportedFile<string>>;
+  export_markdown(
+    request: ExportAsMarkdownRequest,
+  ): Promise<ExportedFile<string>>;
 }
 
 export type BridgePayload<T extends keyof RawBridge> = T extends keyof RawBridge

package/src/utils/__tests__/download.test.tsx

@@ -8,6 +8,7 @@ import {
   downloadAsPDF,
   downloadByURL,
   downloadCellOutputAsImage,
+  downloadExportedFile,
   downloadHTMLAsImage,
   getImageDataUrlForCell,
   withLoadingToast,
@@ -195,7 +196,6 @@ describe("downloadAsPDF", () => {
 
     await expect(
       downloadAsPDF({
-        filename: "path/to/notebook.py",
         webpdf: false,
         preset: "slides",
       }),
@@ -572,6 +572,7 @@ describe("downloadByURL", () => {
 
   afterEach(() => {
     vi.restoreAllMocks();
+    vi.unstubAllGlobals();
   });
 
   it("should create anchor, set attributes, click, and remove", () => {
@@ -583,4 +584,26 @@ describe("downloadByURL", () => {
     expect(mockAnchor.click).toHaveBeenCalled();
     expect(mockAnchor.remove).toHaveBeenCalled();
   });
+
+  it("downloads an exported file with its returned metadata", async () => {
+    let downloadedBlob: Blob | undefined;
+    vi.stubGlobal("URL", {
+      createObjectURL: vi.fn((blob: Blob) => {
+        downloadedBlob = blob;
+        return "blob:export";
+      }),
+      revokeObjectURL: vi.fn(),
+    });
+
+    downloadExportedFile({
+      contents: "notebook",
+      filename: "résumé.qmd",
+      mediaType: "text/plain; charset=utf-8",
+    });
+
+    expect(downloadedBlob?.type).toBe("text/plain; charset=utf-8");
+    expect(await downloadedBlob?.text()).toBe("notebook");
+    expect(mockAnchor.download).toBe("résumé.qmd");
+    expect(URL.revokeObjectURL).toHaveBeenCalledWith("blob:export");
+  });
 });

package/src/utils/download.ts

@@ -4,8 +4,8 @@ import React from "react";
 import { toast } from "@/components/ui/use-toast";
 import { type CellId, CellOutputId } from "@/core/cells/ids";
 import { getRequestClient } from "@/core/network/requests";
+import type { ExportedFile } from "@/core/network/types";
 import { Filenames } from "@/utils/filenames";
-import { Paths } from "@/utils/paths";
 import { prettyError } from "./errors";
 import { toPng } from "./html-to-image";
 import { captureExternalIframes } from "./iframe";
@@ -191,6 +191,14 @@ export function downloadBlob(blob: Blob, filename: string) {
   URL.revokeObjectURL(url);
 }
 
+export function downloadExportedFile({
+  contents,
+  filename,
+  mediaType,
+}: ExportedFile) {
+  downloadBlob(new Blob([contents], { type: mediaType }), filename);
+}
+
 export type PDFExportPreset = "document" | "slides";
 
 /**
@@ -200,7 +208,6 @@ export type PDFExportPreset = "document" | "slides";
  * Standard PDF requires Pandoc & TeX (~few GBs) but is of higher quality.
  */
 export async function downloadAsPDF(opts: {
-  filename: string;
   webpdf: boolean;
   preset?: PDFExportPreset;
   includeInputs?: boolean;
@@ -210,7 +217,6 @@ export async function downloadAsPDF(opts: {
 }) {
   const client = getRequestClient();
   const {
-    filename,
     webpdf,
     preset = "document",
     includeInputs = true,
@@ -220,7 +226,7 @@ export async function downloadAsPDF(opts: {
   } = opts;
 
   try {
-    const pdfBlob = await client.exportAsPDF({
+    const exportedFile = await client.exportAsPDF({
       webpdf,
       preset,
       includeInputs,
@@ -229,8 +235,7 @@ export async function downloadAsPDF(opts: {
       rasterServer,
     });
 
-    const filenameWithoutPath = Paths.basename(filename);
-    downloadBlob(pdfBlob, Filenames.toPDF(filenameWithoutPath));
+    downloadExportedFile(exportedFile);
   } catch (error) {
     toast({
       title: "Failed to download",