@marimo-team/islands 0.24.1-dev2 → 0.24.1-dev21

package/dist/{toDate-BGM7kFtQ.js → toDate-CjUYDkFI.js}

@@ -54,8 +54,8 @@ const viewStateAtom = atom({
   cellAnchor: null
 }), initialModeAtom = atom(void 0), kioskModeAtom = atom(false);
 function useInstallAllowed() {
-  let { mode: e } = useAtomValue(viewStateAtom);
-  return e !== "read";
+  let { mode: e } = useAtomValue(viewStateAtom), S = useAtomValue(kioskModeAtom), C = new URLSearchParams(window.location.search).get(KnownQueryParams.kiosk) === "true";
+  return e !== "read" && !S && !C;
 }
 const WebSocketState = {
   NOT_STARTED: "NOT_STARTED",

package/dist/{vega-component-CJug-VdR.js → vega-component-CTiCS_5w.js}

@@ -2,7 +2,7 @@ import { o as __toESM } from "./chunk-Bfp04NdC.js";
 import { g as Logger, h as cn, m as Events } from "./button-Dr2uAwhT.js";
 import { t as require_react } from "./react-DhGsCS90.js";
 import { t as require_compiler_runtime } from "./compiler-runtime-DsR6imPN.js";
-import { c as asRemoteURL, w as CircleQuestionMark } from "./toDate-BGM7kFtQ.js";
+import { c as asRemoteURL, w as CircleQuestionMark } from "./toDate-CjUYDkFI.js";
 import "./react-dom-CmENFV8Q.js";
 import { t as require_jsx_runtime } from "./jsx-runtime-Dp_oQwaf.js";
 import "./zod-BFY2SnzC.js";
@@ -12,10 +12,10 @@ import { t as debounce_default } from "./debounce-D784bpms.js";
 import { A as useEvent_default, n as useTheme } from "./useTheme-BzEXeAR5.js";
 import { s as uniq } from "./arrays-C56grfjL.js";
 import { t as Objects } from "./objects-UzwQd5gx.js";
-import { a as isValid, i as AlertTitle, n as Alert, t as arrow } from "./formats-HSfYlcA8.js";
-import { A as getContainerWidth, n as formats } from "./vega-loader.browser-CGb-2Kwi.js";
-import { a as tooltipHandler, n as vegaLoadData } from "./loader-DTnbNSVZ.js";
-import { t as j } from "./react-vega-zyfTF9SY.js";
+import { a as isValid, i as AlertTitle, n as Alert, t as arrow } from "./formats-BZtMpeQe.js";
+import { A as getContainerWidth, n as formats } from "./vega-loader.browser-VFQfHaoV.js";
+import { a as tooltipHandler, n as vegaLoadData } from "./loader-Chm6nOqy.js";
+import { t as j } from "./react-vega-BE2Uv1cq.js";
 import "./defaultLocale-CMezyvMc.js";
 import "./defaultLocale-DMZFeDB8.js";
 import { t as useAsyncData } from "./useAsyncData-CDcbh-Qv.js";

package/dist/{vega-embed-container-BRjjqRGz.js → vega-embed-container-B1tc-DoN.js}

@@ -2,8 +2,8 @@ import { o as __toESM } from "./chunk-Bfp04NdC.js";
 import { t as require_react } from "./react-DhGsCS90.js";
 import { t as require_compiler_runtime } from "./compiler-runtime-DsR6imPN.js";
 import { t as require_jsx_runtime } from "./jsx-runtime-Dp_oQwaf.js";
-import { A as getContainerWidth } from "./vega-loader.browser-CGb-2Kwi.js";
-import { n as q } from "./react-vega-zyfTF9SY.js";
+import { A as getContainerWidth } from "./vega-loader.browser-VFQfHaoV.js";
+import { n as q } from "./react-vega-BE2Uv1cq.js";
 import "./defaultLocale-CMezyvMc.js";
 import "./defaultLocale-DMZFeDB8.js";
 import { t as useVegaContainerRemeasure } from "./use-vega-container-remeasure-B7OD7yUY.js";

package/dist/{vega-loader.browser-CGb-2Kwi.js → vega-loader.browser-VFQfHaoV.js}

@@ -410,7 +410,7 @@ function getContainerWidth(o) {
   }
 }
 function getVegaFieldTypes(F) {
-  return !F || Object.keys(F).length === 0 ? "auto" : Objects.mapValues(F, (o) => o === "date" || o === "time" ? "string" : o === "datetime" ? "date" : o);
+  return !F || Object.keys(F).length === 0 ? "auto" : Objects.mapValues(F, (o) => o === "geometry" || o === "date" || o === "time" ? "string" : o === "datetime" ? "date" : o);
 }
 var EOL = {}, EOF = {}, QUOTE = 34, NEWLINE = 10, RETURN = 13;
 function objectConverter(o) {

package/package.json

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

package/src/__mocks__/requests.ts

@@ -100,6 +100,10 @@ export const MockRequestClient = {
           },
         ],
       }),
+      installExportRequirements: vi.fn().mockResolvedValue({
+        source: "server",
+        formats: [],
+      }),
       exportAsHTML: vi.fn().mockResolvedValue({
         contents: "",
         filename: "notebook.html",

package/src/components/app-config/optional-features.test.ts

@@ -0,0 +1,78 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { describe, expect, it } from "vitest";
+import { isPackageRequirementInstalled } from "./optional-features";
+
+describe("isPackageRequirementInstalled", () => {
+  const installedPackages = [
+    { name: "mcp", version: "2.0.0" },
+    { name: "polars", version: "1.8.2" },
+  ];
+
+  it("requires the package to be installed", () => {
+    expect(
+      isPackageRequirementInstalled({ name: "missing" }, installedPackages),
+    ).toBe(false);
+  });
+
+  it("accepts an installed package without a minimum version", () => {
+    expect(
+      isPackageRequirementInstalled({ name: "polars" }, installedPackages),
+    ).toBe(true);
+  });
+
+  it("rejects an installed package below the minimum version", () => {
+    expect(
+      isPackageRequirementInstalled(
+        { name: "mcp", minVersion: "2.1.0" },
+        installedPackages,
+      ),
+    ).toBe(false);
+  });
+
+  it.each(["2.0.0rc1", "2.0.0.dev1", "2.0.0-beta1"])(
+    "rejects the prerelease version %s",
+    (version) => {
+      expect(
+        isPackageRequirementInstalled({ name: "mcp", minVersion: "2.0.0" }, [
+          { name: "mcp", version },
+        ]),
+      ).toBe(false);
+    },
+  );
+
+  it.each(["2.1.0rc1", "3.0.0rc1"])(
+    "accepts the later prerelease version %s",
+    (version) => {
+      expect(
+        isPackageRequirementInstalled({ name: "mcp", minVersion: "2.0.0" }, [
+          { name: "mcp", version },
+        ]),
+      ).toBe(true);
+    },
+  );
+
+  it("accepts an installed package at or above the minimum version", () => {
+    expect(
+      isPackageRequirementInstalled(
+        { name: "mcp", minVersion: "2.0.0" },
+        installedPackages,
+      ),
+    ).toBe(true);
+    expect(
+      isPackageRequirementInstalled(
+        { name: "mcp", minVersion: "1.9.0" },
+        installedPackages,
+      ),
+    ).toBe(true);
+  });
+
+  it("normalizes extras in the requirement name", () => {
+    expect(
+      isPackageRequirementInstalled(
+        { name: "polars[pyarrow]" },
+        installedPackages,
+      ),
+    ).toBe(true);
+  });
+});

package/src/components/app-config/optional-features.tsx

@@ -20,6 +20,7 @@ import { isWasm } from "@/core/wasm/utils";
 import { useAsyncData } from "@/hooks/useAsyncData";
 import { ErrorBanner } from "@/plugins/impl/common/error-banner";
 import { cn } from "@/utils/cn";
+import { semverSort } from "@/utils/versions";
 import { SettingSubtitle } from "./common";
 
 interface Package {
@@ -27,6 +28,35 @@ interface Package {
   minVersion?: string;
 }
 
+interface InstalledPackage {
+  name: string;
+  version: string;
+}
+
+const PEP_440_PRERELEASE =
+  /^((?:\d+!)?\d+(?:\.\d+)*)(?:[-_.]?(?:a|b|c|rc|alpha|beta|pre|preview|dev)\d*)/i;
+
+export function isPackageRequirementInstalled(
+  requirement: Package,
+  installedPackages: InstalledPackage[],
+): boolean {
+  const packageName = requirement.name.split("[")[0];
+  const installedPackage = installedPackages.find(
+    (pkg) => pkg.name === packageName,
+  );
+  if (!installedPackage) {
+    return false;
+  }
+  if (!requirement.minVersion) {
+    return true;
+  }
+  const prerelease = installedPackage.version.match(PEP_440_PRERELEASE);
+  if (prerelease) {
+    return semverSort(prerelease[1], requirement.minVersion) > 0;
+  }
+  return semverSort(installedPackage.version, requirement.minVersion) >= 0;
+}
+
 interface OptionalFeature {
   id: string;
   /**
@@ -77,8 +107,8 @@ const OPTIONAL_DEPENDENCIES: OptionalFeature[] = [
   },
   {
     id: "mcp",
-    packagesRequired: [{ name: "mcp", minVersion: "1" }],
-    additionalPackageInstalls: [{ name: "pydantic", minVersion: "2" }],
+    packagesRequired: [{ name: "mcp", minVersion: "2.0.0" }],
+    additionalPackageInstalls: [],
     description: "Connect to MCP servers",
   },
   {
@@ -123,9 +153,6 @@ export const OptionalFeatures: React.FC = () => {
   }
 
   const installedPackages = data?.packages || [];
-  const installedPackageNames = new Set(
-    installedPackages.map((pkg) => pkg.name),
-  );
 
   return (
     <div className="flex-1 flex flex-col overflow-hidden gap-2">
@@ -149,7 +176,7 @@ export const OptionalFeatures: React.FC = () => {
         <TableBody>
           {OPTIONAL_DEPENDENCIES.map((dep) => {
             const isInstalled = dep.packagesRequired.every((pkg) =>
-              installedPackageNames.has(pkg.name.split("[")[0]),
+              isPackageRequirementInstalled(pkg, installedPackages),
             );
             const packageSpec = dep.packagesRequired
               .map((pkg) => pkg.name)

package/src/components/data-table/__tests__/column_formatting.test.ts

@@ -5,6 +5,7 @@ import {
   prettyScientificNumber,
 } from "@/utils/numbers";
 import { applyFormat } from "../column-formatting/feature";
+import { formatOptions } from "../column-formatting/types";
 
 const locale = "en-US";
 
@@ -128,3 +129,9 @@ describe("applyFormat", () => {
     ).toBe(123);
   });
 });
+
+describe("formatOptions", () => {
+  it("has no geometry format options", () => {
+    expect(formatOptions.geometry).toEqual([]);
+  });
+});

package/src/components/data-table/charts/__tests__/schemas.test.ts

@@ -14,7 +14,7 @@ describe("ChartSchema", () => {
 
   it("normalizes an unrecognized axis column type", () => {
     const result = ChartSchema.parse({
-      general: { xColumn: { field: "geom", type: "geometry" } },
+      general: { xColumn: { field: "geom", type: "bogus_type" } },
     });
 
     expect(result.general?.xColumn?.type).toBe("unknown");
@@ -24,7 +24,7 @@ describe("ChartSchema", () => {
     const result = ChartSchema.parse({
       tooltips: {
         auto: false,
-        fields: [{ field: "geom", type: "geometry" }],
+        fields: [{ field: "geom", type: "bogus_type" }],
       },
     });
 
@@ -32,4 +32,19 @@ describe("ChartSchema", () => {
       { field: "geom", type: "unknown" },
     ]);
   });
+
+  it("keeps geometry axis and tooltip field types", () => {
+    const result = ChartSchema.parse({
+      general: { xColumn: { field: "geom", type: "geometry" } },
+      tooltips: {
+        auto: false,
+        fields: [{ field: "geom", type: "geometry" }],
+      },
+    });
+
+    expect(result.general?.xColumn?.type).toBe("geometry");
+    expect(result.tooltips?.fields).toEqual([
+      { field: "geom", type: "geometry" },
+    ]);
+  });
 });

package/src/components/data-table/charts/chart-spec/types.ts

@@ -29,6 +29,7 @@ export function convertDataTypeToVega(
       return "quantitative";
     case "string":
     case "boolean":
+    case "geometry":
     case "unknown":
       return "nominal";
     case "date":
@@ -51,6 +52,7 @@ export function convertDataTypeToSelectable(
       return "number";
     case "string":
     case "boolean":
+    case "geometry":
     case "unknown":
       return "string";
     case "date":

package/src/components/data-table/column-formatting/feature.ts

@@ -214,6 +214,7 @@ export const applyFormat = (
           return value;
       }
     case undefined:
+    case "geometry":
     case "unknown":
       return value;
     default:

package/src/components/data-table/column-formatting/types.ts

@@ -13,6 +13,7 @@ export const formatOptions = {
   number: ["Auto", "Percent", "Scientific", "Engineering", "Integer"],
   string: ["Uppercase", "Lowercase", "Capitalize", "Title"],
   boolean: ["Yes/No", "On/Off"],
+  geometry: [],
   unknown: [],
 } as const satisfies Record<DataType, string[]>;
 

package/src/components/data-table/column-summary/chart-spec-model.tsx

@@ -836,6 +836,7 @@ export class ColumnChartSpecModel<T> {
           transform: transforms,
         };
       }
+      case "geometry":
       case "unknown":
         return null;
       default:

package/src/components/data-table/column-summary/column-summary.tsx

@@ -155,6 +155,7 @@ export const TableColumnSummary = <TData, TValue>({
           );
         }
         return null;
+      case "geometry":
       case "unknown":
         return (
           <div className="flex flex-col whitespace-pre">

package/src/components/data-table/columns.tsx

@@ -320,9 +320,8 @@ export function generateColumns<T>({
       },
       // Remove any default filtering
       filterFn: undefined,
-      // Can only sort if key is defined
-      // For example, unnamed index columns, won't be sortable
-      enableSorting: !!key,
+      // Unnamed index columns and geometry columns are not sortable
+      enableSorting: !!key && getMeta(key).dataType !== "geometry",
       meta: {
         ...getMeta(key),
         width: columnWidths?.[key],
@@ -485,6 +484,8 @@ function getFilterTypeForFieldType(
       return "time";
     case "boolean":
       return "boolean";
+    case "geometry":
+      return undefined;
     default:
       return undefined;
   }

package/src/components/datasets/__tests__/icons.test.ts

@@ -2,7 +2,7 @@
 
 import { describe, expect, it } from "vitest";
 import type { DataType } from "@/core/kernel/messages";
-import { DATA_TYPE_ICON, resolveDataType } from "../icons";
+import { DATA_TYPE_ICON, getDataTypeColor, resolveDataType } from "../icons";
 
 describe("resolveDataType", () => {
   it("passes through every mapped data type", () => {
@@ -12,7 +12,15 @@ describe("resolveDataType", () => {
   });
 
   it("resolves unmapped data types to unknown", () => {
-    expect(resolveDataType("geometry" as DataType)).toBe("unknown");
+    expect(resolveDataType("bogus_type" as DataType)).toBe("unknown");
+  });
+
+  it("resolves geometry with its icon and color", () => {
+    expect(resolveDataType("geometry")).toBe("geometry");
+    expect(DATA_TYPE_ICON.geometry).toBeDefined();
+    expect(getDataTypeColor("geometry")).toBe(
+      "bg-(--cyan-4) dark:bg-(--cyan-5)",
+    );
   });
 
   it("resolves data types shadowing Object.prototype keys to unknown", () => {

package/src/components/datasets/icons.tsx

@@ -7,6 +7,7 @@ import {
   CurlyBracesIcon,
   HashIcon,
   type LucideIcon,
+  MapPinIcon,
   ToggleLeftIcon,
   TypeIcon,
 } from "lucide-react";
@@ -27,6 +28,7 @@ export const DATA_TYPE_ICON: Record<DataType | SelectableDataType, LucideIcon> =
     number: HashIcon,
     string: TypeIcon,
     integer: HashIcon,
+    geometry: MapPinIcon,
     unknown: CurlyBracesIcon,
   };
 
@@ -56,6 +58,8 @@ export function getDataTypeColor(
       return "bg-(--purple-4)";
     case "string":
       return "bg-(--blue-4)";
+    case "geometry":
+      return "bg-(--cyan-4) dark:bg-(--cyan-5)";
     case "unknown":
       return "bg-(--slate-4) dark:bg-(--slate-6)";
     default:

package/src/components/datasources/__tests__/components.test.tsx

@@ -12,7 +12,7 @@ describe("ColumnName", () => {
 
     try {
       const unrecognized = render(
-        <ColumnName columnName="geom" dataType={"geometry" as DataType} />,
+        <ColumnName columnName="geom" dataType={"bogus_type" as DataType} />,
       );
       const unknown = render(
         <ColumnName columnName="geom" dataType="unknown" />,
@@ -26,4 +26,17 @@ describe("ColumnName", () => {
       warn.mockRestore();
     }
   });
+
+  it("renders geometry with a distinct icon", () => {
+    const geometry = render(
+      <ColumnName columnName="geom" dataType="geometry" />,
+    );
+    const unknown = render(<ColumnName columnName="geom" dataType="unknown" />);
+
+    expect(geometry.container.querySelector(".lucide-map-pin")).not.toBeNull();
+    expect(unknown.container.querySelector(".lucide-braces")).not.toBeNull();
+    expect(geometry.container.innerHTML).not.toEqual(
+      unknown.container.innerHTML,
+    );
+  });
 });