@marimo-team/islands 0.23.9-dev4 → 0.23.9-dev41

package/src/utils/__tests__/json-parser.test.ts

@@ -1,10 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { expect, it } from "vitest";
-import {
-  jsonParseWithSpecialChar,
-  jsonToMarkdown,
-  jsonToTSV,
-} from "../json/json-parser";
+import { jsonParseWithSpecialChar, jsonToMarkdown } from "../json/json-parser";
 
 it("can jsonParseWithSpecialChar happy path", () => {
   expect(jsonParseWithSpecialChar('"hello"')).toEqual("hello");
@@ -72,70 +68,6 @@ it("can parse bigInts", () => {
   });
 });
 
-it("can convert json to tsv with en-US locale", () => {
-  const locale = "en-US";
-
-  expect(jsonToTSV([], locale)).toEqual("");
-
-  expect(jsonToTSV([{ a: 1, b: 2 }], locale)).toEqual("a\tb\n1\t2");
-
-  expect(
-    jsonToTSV(
-      [
-        { a: 1, b: 2 },
-        { a: 3, b: 4 },
-      ],
-      locale,
-    ),
-  ).toEqual("a\tb\n1\t2\n3\t4");
-
-  // Does not handle sparse arrays
-  expect(jsonToTSV([{ a: 1 }, { a: 2, b: 3 }], locale)).toMatchInlineSnapshot(
-    '"a\n1\n2"',
-  );
-
-  // Handles special characters
-  expect(
-    jsonToTSV([{ a: "hello\tworld", b: "new\nline" }], locale),
-  ).toMatchInlineSnapshot('"a\tb\nhello\tworld\tnew\nline"');
-
-  // Handles floats with en-US locale (uses . as decimal separator)
-  expect(jsonToTSV([{ a: 1.5, b: 2.7 }], locale)).toEqual("a\tb\n1.5\t2.7");
-});
-
-it("can convert json to tsv with de-DE locale", () => {
-  const locale = "de-DE";
-
-  // Handles floats with de-DE locale (uses , as decimal separator)
-  expect(jsonToTSV([{ a: 1.5, b: 2.7 }], locale)).toEqual("a\tb\n1,5\t2,7");
-
-  // Handles integers (no change)
-  expect(jsonToTSV([{ a: 1, b: 2 }], locale)).toEqual("a\tb\n1\t2");
-});
-
-it("can convert json to tsv with fr-FR locale", () => {
-  const locale = "fr-FR";
-
-  // Handles floats with fr-FR locale (uses , as decimal separator)
-  expect(jsonToTSV([{ a: 3.14, b: 2.123_45 }], locale)).toEqual(
-    "a\tb\n3,14\t2,12345",
-  );
-});
-
-it("handles null and undefined values in TSV", () => {
-  const locale = "en-US";
-
-  expect(jsonToTSV([{ a: null, b: undefined, c: 1 }], locale)).toEqual(
-    "a\tb\tc\n\t\t1",
-  );
-});
-
-it("handles NaN values in TSV", () => {
-  const locale = "en-US";
-
-  expect(jsonToTSV([{ a: Number.NaN, b: 1 }], locale)).toEqual("a\tb\nNaN\t1");
-});
-
 it("can convert json to markdown - basic table", () => {
   expect(jsonToMarkdown([])).toMatchInlineSnapshot(`""`);
 

package/src/utils/__tests__/local-variables.test.ts

@@ -0,0 +1,132 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+import { describe, expect, it } from "vitest";
+import {
+  containsMangledLocal,
+  splitMangledLocals,
+  unmangleLocal,
+} from "../local-variables";
+
+describe("unmangleLocal", () => {
+  it("extracts the cell id and original name", () => {
+    expect(unmangleLocal("_cell_Hbol_a")).toEqual({
+      cellId: "Hbol",
+      name: "_a",
+    });
+  });
+
+  it("handles names with multiple underscore segments", () => {
+    expect(unmangleLocal("_cell_Hbol_a_b")).toEqual({
+      cellId: "Hbol",
+      name: "_a_b",
+    });
+  });
+
+  it("returns null for non-mangled strings", () => {
+    expect(unmangleLocal("just_a_variable")).toBeNull();
+    expect(unmangleLocal("_private")).toBeNull();
+  });
+
+  it("handles the single-underscore local", () => {
+    // `_` is a valid local name (variables.py:62-63), mangling to
+    // `_cell_<id>_` with no trailing suffix.
+    expect(unmangleLocal("_cell_Hbol_")).toEqual({
+      cellId: "Hbol",
+      name: "_",
+    });
+  });
+
+  it("handles UUID-style cell ids", () => {
+    // External / VSCode notebooks use `external_prefix()` which is a
+    // `uuid4()` (hyphenated).
+    expect(
+      unmangleLocal("_cell_c9bf9e57-1685-4c89-bafb-ff5af830be8a_a"),
+    ).toEqual({
+      cellId: "c9bf9e57-1685-4c89-bafb-ff5af830be8a",
+      name: "_a",
+    });
+  });
+
+  it("does not match marimo cell file paths", () => {
+    // The compiled cell file is `__marimo__cell_<id>_.py` (two leading
+    // underscores, trailing `_` with no name); it must not be confused with a
+    // mangled local.
+    expect(unmangleLocal("__marimo__cell_Hbol_.py")).toBeNull();
+    expect(unmangleLocal("/tmp/marimo_42/__marimo__cell_Hbol_.py")).toBeNull();
+  });
+});
+
+describe("splitMangledLocals", () => {
+  it("returns a single text segment when nothing matches", () => {
+    expect(splitMangledLocals("plain text")).toEqual(["plain text"]);
+  });
+
+  it("splits a NameError message", () => {
+    expect(splitMangledLocals("name '_cell_Hbol_a' is not defined")).toEqual([
+      "name '",
+      { cellId: "Hbol", name: "_a" },
+      "' is not defined",
+    ]);
+  });
+
+  it("handles multiple mangled names in one string", () => {
+    expect(splitMangledLocals("_cell_AAAA_x and _cell_BBBB_y")).toEqual([
+      { cellId: "AAAA", name: "_x" },
+      " and ",
+      { cellId: "BBBB", name: "_y" },
+    ]);
+  });
+
+  it("leaves the cell file path alone", () => {
+    const path = "/tmp/marimo_42/__marimo__cell_Hbol_.py";
+    expect(splitMangledLocals(path)).toEqual([path]);
+  });
+
+  it("ignores `_cell_...` substrings preceded by `_`", () => {
+    // Mirrors `(?<!_)` in `variables.py`: a leading `_` (e.g. inside
+    // `__marimo__cell_<id>_<...>`) means this is not a mangle the compiler
+    // produced, so we must not demangle it.
+    const text = "see __marimo__cell_Hbol_a for details";
+    expect(splitMangledLocals(text)).toEqual([text]);
+  });
+
+  it("splits a UUID-style cell id", () => {
+    expect(
+      splitMangledLocals(
+        "name '_cell_c9bf9e57-1685-4c89-bafb-ff5af830be8a_a' is not defined",
+      ),
+    ).toEqual([
+      "name '",
+      {
+        cellId: "c9bf9e57-1685-4c89-bafb-ff5af830be8a",
+        name: "_a",
+      },
+      "' is not defined",
+    ]);
+  });
+
+  it("splits the single-underscore local", () => {
+    expect(splitMangledLocals("name '_cell_Hbol_' is not defined")).toEqual([
+      "name '",
+      { cellId: "Hbol", name: "_" },
+      "' is not defined",
+    ]);
+  });
+});
+
+describe("containsMangledLocal", () => {
+  it("detects mangled names", () => {
+    expect(containsMangledLocal("name '_cell_Hbol_a' is not defined")).toBe(
+      true,
+    );
+  });
+
+  it("ignores the cell file path", () => {
+    expect(containsMangledLocal("/tmp/marimo_42/__marimo__cell_Hbol_.py")).toBe(
+      false,
+    );
+  });
+
+  it("ignores `_cell_...` substrings preceded by `_`", () => {
+    expect(containsMangledLocal("see __marimo__cell_Hbol_a")).toBe(false);
+  });
+});

package/src/utils/json/json-parser.ts

@@ -66,36 +66,6 @@ export function jsonParseWithSpecialChar<T = unknown>(
   }
 }
 
-/**
- * Formats a value for TSV export, respecting user's locale for numbers
- */
-function formatValueForTSV(value: unknown, locale: string): string {
-  if (value === null || value === undefined) {
-    return "";
-  }
-  if (typeof value === "number" && !Number.isNaN(value)) {
-    // Use toLocaleString to format numbers according to user's locale
-    // This will use the appropriate decimal separator (e.g., "," in European locales)
-    return value.toLocaleString(locale, {
-      useGrouping: false,
-      maximumFractionDigits: 20,
-    });
-  }
-  return String(value);
-}
-
-export function jsonToTSV(json: Record<string, unknown>[], locale: string) {
-  if (json.length === 0) {
-    return "";
-  }
-
-  const keys = Object.keys(json[0]);
-  const values = json.map((row) =>
-    keys.map((key) => formatValueForTSV(row[key], locale)).join("\t"),
-  );
-  return `${keys.join("\t")}\n${values.join("\n")}`;
-}
-
 /**
  * Converts JSON data to a Markdown table format
  * Detects URLs and converts them to markdown links [url](url)

package/src/utils/local-variables.ts

@@ -0,0 +1,67 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+import type { CellId } from "@/core/cells/ids";
+
+/**
+ * The marimo compiler rewrites underscore-prefixed references inside a cell
+ * (which Python would treat as module-private) into `_cell_<cell_id>_<name>`
+ * so each cell gets its own private namespace. When such a reference fails at
+ * runtime (`NameError: name '_cell_Hbol_a' is not defined`), the mangled name
+ * leaks into the error UI. These helpers undo that mangling for display.
+ *
+ * Mirrors `marimo/_ast/variables.py`.
+ */
+
+// Matches `_cell_<cell_id><name>` for normal ids and UUIDs. The `[\w-]`
+// id class admits hyphens; the `_\w*` name group admits the bare `_`
+// local; the `(?<!_)` lookbehind skips `__marimo__cell_...` paths.
+// Mirrors `_MANGLED_LOCAL_IN_TEXT_RE` in `variables.py`.
+const MANGLED_LOCAL_BODY = String.raw`_cell_([^\W_][\w-]*?)(_\w*)`;
+const MANGLED_LOCAL_PATTERN = String.raw`(?<!_)${MANGLED_LOCAL_BODY}`;
+// Strict (whole-string) form for `unmangleLocal`; the leading `^` makes the
+// lookbehind trivially satisfied, so use the bare body.
+const ANCHORED_RE = new RegExp(`^${MANGLED_LOCAL_BODY}$`);
+const UNANCHORED_RE = new RegExp(MANGLED_LOCAL_PATTERN);
+const GLOBAL_RE = new RegExp(MANGLED_LOCAL_PATTERN, "g");
+
+export interface UnmangledLocal {
+  cellId: CellId;
+  /** The original underscore-prefixed name, e.g. "_a". */
+  name: string;
+}
+
+export function unmangleLocal(mangled: string): UnmangledLocal | null {
+  const match = ANCHORED_RE.exec(mangled);
+  if (!match) {
+    return null;
+  }
+  return { cellId: match[1] as CellId, name: match[2] };
+}
+
+export type MangledSegment = string | UnmangledLocal;
+
+/**
+ * Split a plain text string into alternating literal text and unmangled-local
+ * segments, so callers can render mixed React content.
+ */
+export function splitMangledLocals(text: string): MangledSegment[] {
+  const segments: MangledSegment[] = [];
+  GLOBAL_RE.lastIndex = 0;
+  let lastIndex = 0;
+  let match: RegExpExecArray | null = GLOBAL_RE.exec(text);
+  while (match !== null) {
+    if (match.index > lastIndex) {
+      segments.push(text.slice(lastIndex, match.index));
+    }
+    segments.push({ cellId: match[1] as CellId, name: match[2] });
+    lastIndex = match.index + match[0].length;
+    match = GLOBAL_RE.exec(text);
+  }
+  if (lastIndex < text.length) {
+    segments.push(text.slice(lastIndex));
+  }
+  return segments;
+}
+
+export function containsMangledLocal(text: string): boolean {
+  return UNANCHORED_RE.test(text);
+}

package/dist/assets/__vite-browser-external-CAdMKBac.js

@@ -1 +0,0 @@
-import{t as e}from"./worker-CpBbwbQo.js";var t=e(((e,t)=>{t.exports={}}));export default t();