@marimo-team/islands 0.25.3-dev134 → 0.25.3-dev136

package/dist/{number-overlay-editor-Br0lPnFE.js → number-overlay-editor-DAYzjL3A.js}

@@ -1,6 +1,6 @@
 import { a as e } from "./rolldown-runtime-Cb76FRpK.js";
 import { t } from "./react-sHtZdjeP.js";
-import { a as n } from "./glide-data-editor-D72zmCan.js";
+import { a as n } from "./glide-data-editor-CWLd9Tfd.js";
 //#region ../node_modules/.pnpm/@glideapps+glide-data-grid@6.0.4-alpha24_lodash@4.17.21_marked@15.0.12_react-dom@19.3.0_27cffe7f1bc30287d59ac27db3240c5b/node_modules/@glideapps/glide-data-grid/dist/esm/internal/data-grid-overlay-editor/private/number-overlay-editor-style.js
 var r = /* @__PURE__ */ e(t()), i = /*#__PURE__*/ n("div")({
 	name: "NumberOverlayEditorStyle",

package/dist/{process-output-B64ZYWuI.js → process-output-Bw-vzyoy.js}

@@ -1,4 +1,4 @@
-import { O as e } from "./html-to-image-CfgsWObF.js";
+import { O as e } from "./html-to-image-BrC8OJcj.js";
 import { m as t } from "./tooltip-CJ4Rqasp.js";
 import { T as n, w as r } from "./error-entries-CmFDQ9CA.js";
 import { b as i } from "./select-CkF_GBxO.js";

package/dist/{reveal-component-DnbPU885.js → reveal-component-De2-S3OE.js}

@@ -4,14 +4,14 @@ import { t as o } from "./react-sHtZdjeP.js";
 import { t as s } from "./compiler-runtime-CldRdSsv.js";
 import { m as c, t as l } from "./tooltip-CJ4Rqasp.js";
 import { k as u } from "./error-entries-CmFDQ9CA.js";
-import { $ as d, Q as f, Z as p, an as m, i as h, l as g, ln as _, n as v, on as y, r as b, t as x, u as S } from "./common-CGmIoGK3.js";
+import { $ as d, Q as f, Z as p, an as m, i as h, l as g, ln as _, n as v, on as y, r as b, t as x, u as S } from "./common-lvg18mZi.js";
 import { M as C } from "./select-CkF_GBxO.js";
-import { q as ee } from "./dropdown-menu-CgL3fm8P.js";
+import { J as ee } from "./dropdown-menu-GWcGCcxE.js";
 import { _ as w } from "./toDate-DGvRHwTk.js";
 import { t as T } from "./jsx-runtime-3BD1kT0s.js";
 import { q as E } from "./use-restore-focus-CmGwRNId.js";
 import { A as D, C as O, b as k } from "./useTheme-Bq9pi_vz.js";
-import { a as A, n as te, t as ne } from "./code-visibility-BZoWT5f1.js";
+import { a as A, n as te, t as ne } from "./code-visibility-CwJEaaN5.js";
 /* empty css                */
 var j = c("sticky-note", [["path", {
 	d: "M21 9a2.4 2.4 0 0 0-.706-1.706l-3.588-3.588A2.4 2.4 0 0 0 15 3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2z",

package/package.json

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

package/src/components/datasources/__tests__/column-preview.test.tsx

@@ -79,7 +79,9 @@ describe("DatasetColumnPreview fullyQualifiedTableName", () => {
   it("qualifies with database and schema for flat engines", () => {
     const client = renderPreview(ctx({ database: "db", schema: "public" }));
     expect(client.previewDatasetColumn).toHaveBeenCalledWith(
-      expect.objectContaining({ fullyQualifiedTableName: "db.public.users" }),
+      expect.objectContaining({
+        fullyQualifiedTableName: '"db"."public"."users"',
+      }),
     );
   });
 
@@ -87,7 +89,7 @@ describe("DatasetColumnPreview fullyQualifiedTableName", () => {
     // Regression: previously produced "db..users".
     const client = renderPreview(ctx({ database: "db", schema: "" }));
     expect(client.previewDatasetColumn).toHaveBeenCalledWith(
-      expect.objectContaining({ fullyQualifiedTableName: "db.users" }),
+      expect.objectContaining({ fullyQualifiedTableName: '"db"."users"' }),
     );
   });
 
@@ -98,7 +100,37 @@ describe("DatasetColumnPreview fullyQualifiedTableName", () => {
     );
     expect(client.previewDatasetColumn).toHaveBeenCalledWith(
       expect.objectContaining({
-        fullyQualifiedTableName: "top.nested.deep.users",
+        fullyQualifiedTableName: '"top"."nested"."deep"."users"',
+      }),
+    );
+  });
+
+  it("quotes a literal dot as one schema segment", () => {
+    const client = renderPreview(
+      ctx({
+        database: "memory",
+        schema: "finance.reports",
+        schemaPath: ["finance.reports"],
+      }),
+    );
+    expect(client.previewDatasetColumn).toHaveBeenCalledWith(
+      expect.objectContaining({
+        fullyQualifiedTableName: '"memory"."finance.reports"."users"',
+      }),
+    );
+  });
+
+  it("escapes quotes inside schema identifiers", () => {
+    const client = renderPreview(
+      ctx({
+        database: "memory",
+        schema: 'fi"nance',
+        schemaPath: ['fi"nance', "reports"],
+      }),
+    );
+    expect(client.previewDatasetColumn).toHaveBeenCalledWith(
+      expect.objectContaining({
+        fullyQualifiedTableName: '"memory"."fi""nance"."reports"."users"',
       }),
     );
   });

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

@@ -0,0 +1,181 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import {
+  act,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from "@testing-library/react";
+import { createStore, Provider } from "jotai";
+import { beforeAll, describe, expect, it, vi } from "vitest";
+import { MockRequestClient } from "@/__mocks__/requests";
+import { Command, CommandList } from "@/components/ui/command";
+import { TooltipProvider } from "@/components/ui/tooltip";
+import {
+  dataSourceConnectionsAtom,
+  type SQLTableContext,
+} from "@/core/datasets/data-source-connections";
+import { DUCKDB_ENGINE } from "@/core/datasets/engines";
+import { datasetsAtom, exportedForTesting } from "@/core/datasets/state";
+import type { DataTable } from "@/core/kernel/messages";
+import { requestClientAtom } from "@/core/network/requests";
+import {
+  DataSources,
+  hideEmptyDatasourcesAtom,
+  TableList,
+} from "../datasources";
+
+beforeAll(() => {
+  HTMLElement.prototype.scrollIntoView = vi.fn();
+});
+
+const table: DataTable = {
+  name: "reports",
+  columns: [
+    {
+      name: "amount",
+      type: "integer",
+      external_type: "INTEGER",
+      sample_values: [],
+    },
+  ],
+  source: "memory",
+  source_type: "duckdb",
+  type: "table",
+  engine: null,
+  indexes: null,
+  num_columns: 1,
+  num_rows: null,
+  variable_name: null,
+  primary_keys: null,
+};
+
+describe("Datasource column preview responses", () => {
+  it.each([
+    { path: ["main"], qualifiedName: '"memory"."main"."reports"' },
+    {
+      path: ["finance", "reports"],
+      qualifiedName: '"memory"."finance"."reports"."reports"',
+    },
+    {
+      path: ["finance.reports"],
+      qualifiedName: '"memory"."finance.reports"."reports"',
+    },
+    {
+      path: ['fi"nance', "reports"],
+      qualifiedName: '"memory"."fi""nance"."reports"."reports"',
+    },
+  ])(
+    "renders the returned preview for $path",
+    async ({ path, qualifiedName }) => {
+      const store = createStore();
+      const client = MockRequestClient.create();
+      store.set(requestClientAtom, client);
+      const context: SQLTableContext = {
+        engine: DUCKDB_ENGINE,
+        database: "memory",
+        schema: path.at(-1) ?? "",
+        schemaPath: path,
+        dialect: "duckdb",
+      };
+      render(
+        <Provider store={store}>
+          <TooltipProvider>
+            <Command shouldFilter={false}>
+              <CommandList>
+                <TableList tables={[table]} sqlTableContext={context} />
+              </CommandList>
+            </Command>
+          </TooltipProvider>
+        </Provider>,
+      );
+
+      fireEvent.click(await screen.findByText("reports"));
+      fireEvent.click(await screen.findByText("amount"));
+      await waitFor(() => {
+        expect(client.previewDatasetColumn).toHaveBeenCalledWith(
+          expect.objectContaining({ fullyQualifiedTableName: qualifiedName }),
+        );
+      });
+      expect(screen.getByText("Loading...")).toBeInTheDocument();
+
+      const actions = exportedForTesting.createActions((action) => {
+        store.set(datasetsAtom, (state) =>
+          exportedForTesting.reducer(state, action),
+        );
+      });
+      act(() => {
+        actions.addColumnPreview({
+          table_name: qualifiedName,
+          column_name: "amount",
+          stats: { min: 42 },
+          error: null,
+          missing_packages: null,
+          chart_spec: null,
+          chart_code: null,
+        });
+      });
+
+      expect(await screen.findByText("42")).toBeInTheDocument();
+      expect(screen.queryByText("Loading...")).not.toBeInTheDocument();
+    },
+  );
+});
+
+it("activates a schema and a table with the same path independently using the keyboard", async () => {
+  const store = createStore();
+  store.set(requestClientAtom, MockRequestClient.create());
+  store.set(hideEmptyDatasourcesAtom, false);
+  store.set(dataSourceConnectionsAtom, {
+    latestEngineSelected: DUCKDB_ENGINE,
+    connectionsMap: new Map([
+      [
+        DUCKDB_ENGINE,
+        {
+          name: DUCKDB_ENGINE,
+          dialect: "duckdb",
+          source: "duckdb",
+          display_name: "DuckDB (In-Memory)",
+          databases: [
+            {
+              name: "memory",
+              dialect: "duckdb",
+              schemas: [
+                {
+                  name: "finance",
+                  tables: [table],
+                  child_schemas: [{ name: "reports", tables: [] }],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    ]),
+  });
+  render(
+    <Provider store={store}>
+      <TooltipProvider>
+        <DataSources />
+      </TooltipProvider>
+    </Provider>,
+  );
+  fireEvent.click(await screen.findByText("memory"));
+  fireEvent.click(await screen.findByText("finance"));
+  await waitFor(() => {
+    expect(screen.getAllByText("reports")).toHaveLength(2);
+  });
+
+  const input = screen.getByRole("combobox");
+  input.focus();
+  fireEvent.keyDown(input, { key: "ArrowDown" });
+  fireEvent.keyDown(input, { key: "Enter" });
+  expect(await screen.findByText("No tables found")).toBeInTheDocument();
+  expect(screen.queryByText("amount")).not.toBeInTheDocument();
+
+  fireEvent.keyDown(input, { key: "ArrowDown" });
+  fireEvent.keyDown(input, { key: "Enter" });
+  expect(await screen.findByText("amount")).toBeInTheDocument();
+  expect(screen.getByText("No tables found")).toBeInTheDocument();
+});

package/src/components/datasources/__tests__/utils.test.ts

@@ -34,6 +34,37 @@ describe("sqlCode", () => {
     name: "email" as const,
   } as DataTableColumn;
 
+  it.each([
+    {
+      path: ["finance", "reports"],
+      expected: '"memory"."finance"."reports"."users"',
+    },
+    { path: ["finance.reports"], expected: '"finance.reports"."users"' },
+    {
+      path: ['fi"nance', "reports"],
+      expected: '"memory"."fi""nance"."reports"."users"',
+    },
+    {
+      path: ["main", "reports"],
+      expected: '"memory"."main"."reports"."users"',
+    },
+  ])("preserves schema path $path in generated SQL", ({ path, expected }) => {
+    const result = sqlCode({
+      table: mockTable,
+      columnName: "*",
+      sqlTableContext: {
+        engine: DUCKDB_ENGINE,
+        dialect: "duckdb",
+        database: "memory",
+        defaultDatabase: "memory",
+        defaultSchema: "main",
+        schema: path.at(-1)!,
+        schemaPath: path,
+      },
+    });
+    expect(result).toContain(`FROM ${expected}`);
+  });
+
   describe("basic SQL generation", () => {
     it("should generate basic SQL without sqlTableContext", () => {
       const result = sqlCode({ table: mockTable, columnName: mockColumn.name });
@@ -484,7 +515,7 @@ describe("tableUniqueId", () => {
 
   it("uses database + schema for flat engines", () => {
     expect(tableUniqueId(ctx({ database: "db", schema: "public" }), "t")).toBe(
-      "db.public.t",
+      '["db","public","t"]',
     );
   });
 
@@ -495,7 +526,7 @@ describe("tableUniqueId", () => {
         ctx({ database: "top", schema: "nested", schemaPath: ["nested"] }),
         "t",
       ),
-    ).toBe("top.nested.t");
+    ).toBe('["top","nested","t"]');
   });
 
   it("includes the full schema path for deeply nested namespaces", () => {
@@ -508,7 +539,7 @@ describe("tableUniqueId", () => {
         }),
         "t",
       ),
-    ).toBe("top.nested.deep.t");
+    ).toBe('["top","nested","deep","t"]');
   });
 
   it("falls back to the flat schema when schemaPath is empty", () => {
@@ -517,16 +548,36 @@ describe("tableUniqueId", () => {
         ctx({ database: "db", schema: "public", schemaPath: [] }),
         "t",
       ),
-    ).toBe("db.public.t");
+    ).toBe('["db","public","t"]');
   });
 
   it("does not emit a double dot for schemaless tables", () => {
     expect(
       tableUniqueId(ctx({ database: "db", schema: "", schemaPath: [] }), "t"),
-    ).toBe("db.t");
+    ).toBe('["db","t"]');
     expect(tableUniqueId(ctx({ database: "db", schema: "" }), "t")).toBe(
-      "db.t",
+      '["db","t"]',
+    );
+  });
+
+  it("keeps literal-dot and nested schemas distinct", () => {
+    const nested = tableUniqueId(
+      ctx({
+        database: "memory",
+        schema: "reports",
+        schemaPath: ["finance", "reports"],
+      }),
+      "sales",
+    );
+    const literal = tableUniqueId(
+      ctx({
+        database: "memory",
+        schema: "finance.reports",
+        schemaPath: ["finance.reports"],
+      }),
+      "sales",
     );
+    expect(nested).not.toBe(literal);
   });
 });
 

package/src/components/datasources/column-preview.tsx

@@ -29,7 +29,7 @@ import { Button } from "../ui/button";
 import { Tooltip } from "../ui/tooltip";
 import { ColumnPreviewContainer } from "./components";
 import { InstallPackageButton } from "./install-package-button";
-import { convertStatsName, sqlCode, tableUniqueId } from "./utils";
+import { convertStatsName, fullyQualifiedTableName, sqlCode } from "./utils";
 
 export const DatasetColumnPreview: React.FC<{
   table: DataTable;
@@ -48,7 +48,10 @@ export const DatasetColumnPreview: React.FC<{
       tableName: table.name,
       columnName: column.name,
       sourceType: table.source_type,
-      fullyQualifiedTableName: tableUniqueId(sqlTableContext, table.name),
+      fullyQualifiedTableName: fullyQualifiedTableName(
+        sqlTableContext,
+        table.name,
+      ),
     });
   };
 

package/src/components/datasources/datasources.tsx

@@ -78,6 +78,7 @@ import {
   areChildSchemasResolved,
   areSchemasResolved,
   areTablesResolved,
+  fullyQualifiedTableName,
   isSchemaless,
   schemaSubtreeMatchesSearch,
   shouldExpandDatabaseForSearch,
@@ -637,7 +638,7 @@ const SchemaNode: React.FC<SchemaNodeProps> = (props) => {
   const [prevSearchValue, setPrevSearchValue] = React.useState(searchValue);
   const [prevExpandForSearch, setPrevExpandForSearch] =
     React.useState(expandForSearch);
-  const uniqueValue = `${databaseName}:${schemaPath.join(".")}`;
+  const uniqueValue = JSON.stringify(["schema", databaseName, ...schemaPath]);
   const childSchemas = schema.child_schemas ?? [];
 
   // Re-sync when the query changes or when newly resolved data turns this
@@ -1095,9 +1096,7 @@ const DatasetColumnItem: React.FC<{
               column={column}
               onAddColumnChart={handleAddColumn}
               preview={columnsPreviews.get(
-                sqlTableContext
-                  ? `${sqlTableContext.database}.${sqlTableContext.schema}.${table.name}:${column.name}`
-                  : `${table.name}:${column.name}`,
+                `${fullyQualifiedTableName(sqlTableContext, table.name)}:${column.name}`,
               )}
               sqlTableContext={sqlTableContext}
             />

package/src/components/datasources/utils.ts

@@ -13,26 +13,29 @@ import type {
 import { logNever } from "@/utils/assertNever";
 import type { ColumnHeaderStatsKey } from "../data-table/types";
 
-/**
- * Stable id for a table node in the datasources tree.
- *
- * schemaPath already includes the leaf schema for nested namespaces, so use it
- * when present and fall back to the flat schema name otherwise (avoids
- * duplicating the leaf, e.g. `top.nested.nested.table`).
- */
+function tablePath(context: SQLTableContext, tableName: string): string[] {
+  const segments = context.schemaPath?.length
+    ? context.schemaPath
+    : [context.schema];
+  return [context.database, ...segments.filter(Boolean), tableName];
+}
+
 export function tableUniqueId(
-  sqlTableContext: SQLTableContext | undefined,
+  context: SQLTableContext | undefined,
   tableName: string,
 ): string {
-  if (!sqlTableContext) {
-    return tableName;
-  }
-  const segments = (
-    sqlTableContext.schemaPath?.length
-      ? sqlTableContext.schemaPath
-      : [sqlTableContext.schema]
-  ).filter(Boolean);
-  return [sqlTableContext.database, ...segments, tableName].join(".");
+  return context ? JSON.stringify(tablePath(context, tableName)) : tableName;
+}
+
+export function fullyQualifiedTableName(
+  context: SQLTableContext | undefined,
+  tableName: string,
+): string {
+  return context
+    ? getFormatter(context.dialect).formatTablePath(
+        tablePath(context, tableName),
+      )
+    : tableName;
 }
 
 // Some databases have no schemas, so we don't show it (eg. Clickhouse)
@@ -114,6 +117,10 @@ const defaultFormatter: SqlCodeFormatter = {
     `SELECT ${columnName} FROM ${tableName} LIMIT 100`,
 };
 
+function quoteIdentifier(identifier: string): string {
+  return `"${identifier.replaceAll('"', '""')}"`;
+}
+
 function getFormatter(dialect: string): SqlCodeFormatter {
   dialect = dialect.toLowerCase();
   if (!isKnownDialect(dialect)) {
@@ -146,9 +153,9 @@ function getFormatter(dialect: string): SqlCodeFormatter {
       // Quote column and table names to avoid raising errors on weird characters
       return {
         formatTablePath: (tablePath: string[]) =>
-          tablePath.map((part) => `"${part}"`).join("."),
+          tablePath.map(quoteIdentifier).join("."),
         formatSelectClause: (columnName: string, tableName: string) =>
-          `SELECT ${columnName === "*" ? "*" : `"${columnName}"`} FROM ${tableName} LIMIT 100`,
+          `SELECT ${columnName === "*" ? "*" : quoteIdentifier(columnName)} FROM ${tableName} LIMIT 100`,
       };
     case "db2":
     case "db2i":
@@ -194,6 +201,7 @@ export function sqlCode({
       engine,
       schema,
       defaultSchema,
+      schemaPath,
       defaultDatabase,
       database,
       dialect,
@@ -207,12 +215,13 @@ export function sqlCode({
       }
     } else {
       // Include schema if it's not the default schema
-      if (schema !== defaultSchema) {
-        tablePath.unshift(schema);
+      const path = schemaPath?.length ? schemaPath : [schema];
+      if (path.length > 1 || path[0] !== defaultSchema) {
+        tablePath.unshift(...path);
       }
 
-      // Include database if it's not the default database
-      if (database !== defaultDatabase) {
+      // Nested schema names can also be attached catalog names.
+      if (path.length > 1 || database !== defaultDatabase) {
         tablePath.unshift(database);
       }
     }