@marimo-team/islands 0.23.16-dev6 → 0.23.16-dev62

package/src/plugins/impl/data-frames/forms/__tests__/__snapshots__/form.test.tsx.snap

@@ -749,14 +749,8 @@ exports[`renderZodSchema > should render a form group_by 1`] = `
         class="flex flex-col gap-1"
       >
         <div
-          class="flex flex-row items-start space-x-2"
+          class="flex flex-row gap-2 items-center"
         >
-          <label
-            class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-            for="_r_1u_-form-item"
-          >
-            Drop N/A
-          </label>
           <button
             aria-checked="false"
             aria-describedby="_r_1u_-form-item-description"
@@ -769,6 +763,16 @@ exports[`renderZodSchema > should render a form group_by 1`] = `
             type="button"
             value="on"
           />
+          <div
+            class="flex flex-col gap-1"
+          >
+            <label
+              class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+              for="_r_1u_-form-item"
+            >
+              Drop N/A
+            </label>
+          </div>
         </div>
       </div>
     </div>
@@ -1252,14 +1256,8 @@ exports[`renderZodSchema > should render a form sample_rows 1`] = `
         class="flex flex-col gap-1"
       >
         <div
-          class="flex flex-row items-start space-x-2"
+          class="flex flex-row gap-2 items-center"
         >
-          <label
-            class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-            for="_r_2n_-form-item"
-          >
-            Sample with replacement
-          </label>
           <button
             aria-checked="false"
             aria-describedby="_r_2n_-form-item-description"
@@ -1272,6 +1270,16 @@ exports[`renderZodSchema > should render a form sample_rows 1`] = `
             type="button"
             value="on"
           />
+          <div
+            class="flex flex-col gap-1"
+          >
+            <label
+              class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+              for="_r_2n_-form-item"
+            >
+              Sample with replacement
+            </label>
+          </div>
         </div>
       </div>
     </div>
@@ -1468,14 +1476,8 @@ exports[`renderZodSchema > should render a form sort_column 1`] = `
         class="flex flex-col gap-1"
       >
         <div
-          class="flex flex-row items-start space-x-2"
+          class="flex flex-row gap-2 items-center"
         >
-          <label
-            class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-            for="_r_1f_-form-item"
-          >
-            Ascending
-          </label>
           <button
             aria-checked="false"
             aria-describedby="_r_1f_-form-item-description"
@@ -1488,6 +1490,16 @@ exports[`renderZodSchema > should render a form sort_column 1`] = `
             type="button"
             value="on"
           />
+          <div
+            class="flex flex-col gap-1"
+          >
+            <label
+              class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+              for="_r_1f_-form-item"
+            >
+              Ascending
+            </label>
+          </div>
         </div>
       </div>
     </div>

package/src/plugins/impl/data-frames/forms/renderers.tsx

@@ -411,9 +411,12 @@ const ColumnFilterForm = <T extends FieldValues>({
 
   const columnRenderer = columnIdRenderer<T>();
   const children = [
-    renderZodSchema(columnIdSchema, form, `${path}.column_id` as Path<T>, [
-      columnRenderer,
-    ]),
+    renderZodSchema({
+      schema: columnIdSchema,
+      form,
+      path: `${path}.column_id` as Path<T>,
+      renderers: [columnRenderer],
+    }),
   ];
 
   // When column ID changes, get the new dtype and reset the operator
@@ -486,12 +489,12 @@ const ColumnFilterForm = <T extends FieldValues>({
     if (operandSchemas.length === 1) {
       children.push(
         <React.Fragment key="value">
-          {renderZodSchema(
-            operandSchemas[0],
+          {renderZodSchema({
+            schema: operandSchemas[0],
             form,
-            `${path}.value` as Path<T>,
-            [],
-          )}
+            path: `${path}.value` as Path<T>,
+            renderers: [],
+          })}
         </React.Fragment>,
       );
     }

package/src/stories/log-viewer.stories.tsx

@@ -23,37 +23,43 @@ export const Primary: Story = {
             {
               timestamp: Date.now(),
               level: "stdout",
-              cellId: cellId("cell1"),
+              source: { type: "cell", cellId: cellId("cell1") },
               message: "Hello world!",
             },
             {
               timestamp: Date.now(),
               level: "stdout",
-              cellId: cellId("cell1"),
+              source: { type: "cell", cellId: cellId("cell1") },
               message: "Running cell...",
             },
             {
               timestamp: Date.now(),
               level: "stdout",
-              cellId: cellId("cell1"),
+              source: { type: "cell", cellId: cellId("cell1") },
               message: "Done!",
             },
             {
               timestamp: Date.now(),
               level: "stderr",
-              cellId: cellId("cell2"),
+              source: { type: "cell", cellId: cellId("cell2") },
               message: "Output is too large!",
             },
             {
               timestamp: Date.now(),
               level: "stderr",
-              cellId: cellId("cell2"),
+              source: { type: "cell", cellId: cellId("cell2") },
               message: "String length is too short.".repeat(100),
             },
+            {
+              timestamp: Date.now(),
+              level: "stderr",
+              source: { type: "lsp", name: "pylsp" },
+              message: "Failed to load plugin 'ruff': not installed",
+            },
             ...Array.from({ length: 100 }).map(() => ({
               timestamp: Date.now(),
               level: "stdout" as const,
-              cellId: cellId("cell1"),
+              source: { type: "cell", cellId: cellId("cell1") } as const,
               message: "Running cell...",
             })),
           ]}

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

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { beforeEach, describe, expect, test } from "vitest";
-import { deserializeBlob, serializeBlob } from "../blob";
+import { deserializeBlob, fileDetailsToBlob, serializeBlob } from "../blob";
 import { blobToString } from "../fileToBase64";
 
 describe("Blob serialization and deserialization", () => {
@@ -52,6 +52,32 @@ describe("Blob serialization and deserialization", () => {
   });
 });
 
+describe("fileDetailsToBlob", () => {
+  test("decodes base64 contents into a binary blob", async () => {
+    const bytes = new Uint8Array([0, 1, 2, 3, 255]);
+    const base64 = btoa(String.fromCharCode(...bytes));
+    const blob = fileDetailsToBlob({
+      contents: base64,
+      mimeType: "image/png",
+      isBase64: true,
+    });
+    expect(blob.type).toBe("image/png");
+    const roundTripped = new Uint8Array(await blob.arrayBuffer());
+    expect(roundTripped).toEqual(bytes);
+  });
+
+  test("treats non-base64 contents as UTF-8 text", async () => {
+    const svg = '<svg xmlns="http://www.w3.org/2000/svg"></svg>';
+    const blob = fileDetailsToBlob({
+      contents: svg,
+      mimeType: "image/svg+xml",
+      isBase64: false,
+    });
+    expect(blob.type).toBe("image/svg+xml");
+    expect(await blob.text()).toBe(svg);
+  });
+});
+
 describe("blobToString", () => {
   const testString = "Hello, world!";
   const mimeType = "text/plain";

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",
       }),
@@ -205,9 +205,26 @@ describe("downloadAsPDF", () => {
       webpdf: false,
       preset: "slides",
       includeInputs: true,
-      rasterizeOutputs: true,
-      rasterScale: 4,
-      rasterServer: "static",
+      includeOutputs: true,
+    });
+  });
+
+  it("should send input and output selections", async () => {
+    mockExportAsPDF.mockRejectedValue(new Error("network"));
+
+    await expect(
+      downloadAsPDF({
+        webpdf: true,
+        includeInputs: false,
+        includeOutputs: false,
+      }),
+    ).rejects.toThrow("network");
+
+    expect(mockExportAsPDF).toHaveBeenCalledWith({
+      webpdf: true,
+      preset: "document",
+      includeInputs: false,
+      includeOutputs: false,
     });
   });
 });
@@ -572,6 +589,7 @@ describe("downloadByURL", () => {
 
   afterEach(() => {
     vi.restoreAllMocks();
+    vi.unstubAllGlobals();
   });
 
   it("should create anchor, set attributes, click, and remove", () => {
@@ -583,4 +601,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/blob.ts

@@ -1,5 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
-import type { DataURLString } from "./json/base64";
+import {
+  type Base64String,
+  base64ToDataURL,
+  type DataURLString,
+} from "./json/base64";
 
 export function serializeBlob<T>(blob: Blob): Promise<DataURLString> {
   return new Promise<DataURLString>((resolve, reject) => {
@@ -30,3 +34,22 @@ export function deserializeBlob(serializedBlob: DataURLString): Blob {
   const blob = new Blob([bytes], { type: mimeType });
   return blob;
 }
+
+/**
+ * Convert file details into a `Blob`, using the authoritative `isBase64` flag
+ * to decide between decoding base64 bytes and treating contents as UTF-8 text.
+ */
+export function fileDetailsToBlob({
+  contents,
+  mimeType,
+  isBase64,
+}: {
+  contents: string;
+  mimeType: string;
+  isBase64: boolean;
+}): Blob {
+  if (isBase64) {
+    return deserializeBlob(base64ToDataURL(contents as Base64String, mimeType));
+  }
+  return new Blob([contents], { type: mimeType });
+}

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,37 +208,28 @@ 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;
-  rasterizeOutputs?: boolean;
-  rasterScale?: number;
-  rasterServer?: "static" | "live";
+  includeOutputs?: boolean;
 }) {
   const client = getRequestClient();
   const {
-    filename,
     webpdf,
     preset = "document",
     includeInputs = true,
-    rasterizeOutputs = true,
-    rasterScale = 4,
-    rasterServer = "static",
+    includeOutputs = true,
   } = opts;
 
   try {
-    const pdfBlob = await client.exportAsPDF({
+    const exportedFile = await client.exportAsPDF({
       webpdf,
       preset,
       includeInputs,
-      rasterizeOutputs,
-      rasterScale,
-      rasterServer,
+      includeOutputs,
     });
 
-    const filenameWithoutPath = Paths.basename(filename);
-    downloadBlob(pdfBlob, Filenames.toPDF(filenameWithoutPath));
+    downloadExportedFile(exportedFile);
   } catch (error) {
     toast({
       title: "Failed to download",