@marimo-team/frontend 0.23.10 → 0.23.11-dev10

package/src/core/datasets/__tests__/data-source.test.ts

@@ -2,9 +2,12 @@
 import { beforeEach, describe, expect, it } from "vitest";
 import { variableName } from "@/__tests__/branded";
 import type { DatabaseSchema, DataTable } from "@/core/kernel/messages";
+import { store } from "@/core/state/jotai";
 import type { VariableName } from "@/core/variables/types";
 import {
+  allTablesAtom,
   type DataSourceConnection,
+  dataSourceConnectionsAtom,
   type DataSourceState,
   exportedForTesting,
   type SQLTableContext,
@@ -575,3 +578,226 @@ describe("add table", () => {
     expect(db1?.schemas.length).toBe(1);
   });
 });
+
+describe("nested namespaces", () => {
+  // Iceberg-style: database "top" with a schemaless schema and a nested
+  // namespace "nested" that has a deferred child namespace "deep".
+  const nestedConnections: DataSourceConnection[] = [
+    {
+      name: "ice" as ConnectionName,
+      source: "iceberg",
+      display_name: "Iceberg",
+      dialect: "iceberg",
+      databases: [
+        {
+          name: "top",
+          dialect: "iceberg",
+          schemas_resolved: true,
+          schemas: [
+            { name: "", tables: [], tables_resolved: true },
+            {
+              name: "nested",
+              tables: [],
+              tables_resolved: false,
+              child_schemas: [],
+              child_schemas_resolved: false,
+            },
+          ],
+        },
+      ],
+    },
+  ];
+
+  let baseState: DataSourceState;
+
+  beforeEach(() => {
+    baseState = addConnection(nestedConnections, initialState());
+  });
+
+  const findSchema = (
+    state: DataSourceState,
+    path: string[],
+  ): DatabaseSchema | undefined => {
+    const conn = state.connectionsMap.get("ice" as ConnectionName);
+    const db = conn?.databases.find((d) => d.name === "top");
+    let schemas = db?.schemas ?? [];
+    let found: DatabaseSchema | undefined;
+    for (const segment of path) {
+      found = schemas.find((s) => s.name === segment);
+      schemas = found?.child_schemas ?? [];
+    }
+    return found;
+  };
+
+  it("sets child namespaces at a nested path", () => {
+    const children: DatabaseSchema[] = [
+      { name: "deep", tables: [], tables_resolved: false },
+    ];
+    const newState = reducer(baseState, {
+      type: "addSchemaList",
+      payload: {
+        schemas: children,
+        sqlSchemaContext: {
+          engine: "ice",
+          database: "top",
+          schemaPath: ["nested"],
+        },
+      },
+    });
+
+    const nested = findSchema(newState, ["nested"]);
+    expect(nested?.child_schemas_resolved).toBe(true);
+    expect(nested?.child_schemas?.map((s) => s.name)).toEqual(["deep"]);
+    // The schemaless sibling is untouched.
+    expect(findSchema(newState, [""])?.name).toBe("");
+  });
+
+  it("sets tables at a nested path", () => {
+    const tables: DataTable[] = [
+      {
+        name: "table4",
+        columns: [],
+        num_columns: 0,
+        num_rows: 0,
+        variable_name: null,
+        source: "iceberg",
+        source_type: "catalog",
+        type: "table",
+      },
+    ];
+    const newState = reducer(baseState, {
+      type: "addTableList",
+      payload: {
+        tables,
+        sqlTableContext: {
+          engine: "ice",
+          database: "top",
+          schema: "nested",
+          dialect: "iceberg",
+          schemaPath: ["nested"],
+        },
+      },
+    });
+
+    const nested = findSchema(newState, ["nested"]);
+    expect(nested?.tables_resolved).toBe(true);
+    expect(nested?.tables.map((t) => t.name)).toEqual(["table4"]);
+  });
+
+  it("replaces a single table at a nested path", () => {
+    const makeTable = (numRows: number): DataTable => ({
+      name: "table4",
+      columns: [],
+      num_columns: 0,
+      num_rows: numRows,
+      variable_name: null,
+      source: "iceberg",
+      source_type: "catalog",
+      type: "table",
+    });
+    const context = {
+      engine: "ice",
+      database: "top",
+      schema: "nested",
+      dialect: "iceberg",
+      schemaPath: ["nested"],
+    };
+    let state = reducer(baseState, {
+      type: "addTableList",
+      payload: { tables: [makeTable(1)], sqlTableContext: context },
+    });
+    state = reducer(state, {
+      type: "addTable",
+      payload: { table: makeTable(42), sqlTableContext: context },
+    });
+
+    const nested = findSchema(state, ["nested"]);
+    expect(nested?.tables).toHaveLength(1);
+    expect(nested?.tables[0].num_rows).toBe(42);
+  });
+
+  it("does not change anything for a missing nested path", () => {
+    const newState = reducer(baseState, {
+      type: "addSchemaList",
+      payload: {
+        schemas: [{ name: "deep", tables: [] }],
+        sqlSchemaContext: {
+          engine: "ice",
+          database: "top",
+          schemaPath: ["does_not_exist"],
+        },
+      },
+    });
+    // The result is unchanged: nested namespace stays unresolved and the
+    // database keeps its two schemas (schemaless + nested).
+    const newDb = newState.connectionsMap
+      .get("ice" as ConnectionName)
+      ?.databases.find((d) => d.name === "top");
+    expect(findSchema(newState, ["nested"])?.child_schemas_resolved).toBe(
+      false,
+    );
+    expect(newDb?.schemas.length).toBe(2);
+  });
+});
+
+describe("allTablesAtom with nested namespaces", () => {
+  it("enumerates tables from nested namespaces", () => {
+    const table = (name: string): DataTable => ({
+      name,
+      columns: [],
+      num_columns: 0,
+      num_rows: 0,
+      variable_name: null,
+      source: "iceberg",
+      source_type: "catalog",
+      type: "table",
+    });
+
+    const state = addConnection(
+      [
+        {
+          name: "ice" as ConnectionName,
+          source: "iceberg",
+          display_name: "Iceberg",
+          dialect: "iceberg",
+          databases: [
+            {
+              name: "top",
+              dialect: "iceberg",
+              schemas_resolved: true,
+              schemas: [
+                {
+                  name: "",
+                  tables: [table("toptable")],
+                  tables_resolved: true,
+                },
+                {
+                  name: "nested",
+                  tables: [table("nestedtable")],
+                  tables_resolved: true,
+                  child_schemas_resolved: true,
+                  child_schemas: [
+                    {
+                      name: "deep",
+                      tables: [table("deeptable")],
+                      tables_resolved: true,
+                      child_schemas: [],
+                      child_schemas_resolved: true,
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+      initialState(),
+    );
+
+    store.set(dataSourceConnectionsAtom, state);
+    const names = [...store.get(allTablesAtom).values()].map((t) => t.name);
+    expect(names).toContain("toptable");
+    expect(names).toContain("nestedtable");
+    expect(names).toContain("deeptable");
+  });
+});

package/src/core/datasets/data-source-connections.ts

@@ -49,6 +49,9 @@ export interface DataSourceState {
 export interface SQLSchemaContext {
   engine: string;
   database: string;
+  // Parent schema path (relative to `database`) for nested schemas.
+  // Empty/undefined for the database's top level.
+  schemaPath?: string[];
 }
 
 export interface SQLTableContext {
@@ -58,6 +61,49 @@ export interface SQLTableContext {
   dialect: string;
   defaultSchema?: string | null;
   defaultDatabase?: string | null;
+  // Nested schema path (relative to `database`). Empty/undefined at top level.
+  schemaPath?: string[];
+}
+
+/**
+ * Immutably descend `path` (schema segment names) into a nested schema list
+ * and apply `update` to the matching schema. Unmatched branches are unchanged.
+ */
+function updateSchemaAtPath(
+  schemas: DatabaseSchema[],
+  path: string[],
+  update: (schema: DatabaseSchema) => DatabaseSchema,
+): DatabaseSchema[] {
+  if (path.length === 0) {
+    return schemas;
+  }
+  const [head, ...rest] = path;
+  return schemas.map((schema) => {
+    if (schema.name !== head) {
+      return schema;
+    }
+    if (rest.length === 0) {
+      return update(schema);
+    }
+    return {
+      ...schema,
+      child_schemas: updateSchemaAtPath(
+        schema.child_schemas ?? [],
+        rest,
+        update,
+      ),
+    };
+  });
+}
+
+/**
+ * The path (schema/namespace segment names within a database) that locates the
+ * schema holding a set of tables. For nested namespaces this is the
+ * `schemaPath`; otherwise it is the single (possibly schemaless) schema name.
+ */
+function tableSchemaPath(sqlTableContext: SQLTableContext): string[] {
+  const { schemaPath, schema } = sqlTableContext;
+  return schemaPath && schemaPath.length > 0 ? schemaPath : [schema];
 }
 
 function initialState(): DataSourceState {
@@ -159,6 +205,7 @@ const {
       return state;
     }
 
+    const schemaPath = sqlSchemaContext.schemaPath ?? [];
     const newMap = new Map(connectionsMap);
     const newConn: DataSourceConnection = {
       ...conn,
@@ -166,10 +213,22 @@ const {
         if (db.name !== sqlSchemaContext.database) {
           return db;
         }
+        // Top level: replace the database's schemas.
+        if (schemaPath.length === 0) {
+          return {
+            ...db,
+            schemas: schemas,
+            schemas_resolved: true,
+          };
+        }
+        // Nested namespace: replace the child schemas of the namespace at path.
         return {
           ...db,
-          schemas: schemas,
-          schemas_resolved: true,
+          schemas: updateSchemaAtPath(db.schemas, schemaPath, (schema) => ({
+            ...schema,
+            child_schemas: schemas,
+            child_schemas_resolved: true,
+          })),
         };
       }),
     };
@@ -198,6 +257,7 @@ const {
       return state;
     }
 
+    const path = tableSchemaPath(sqlTableContext);
     const newMap = new Map(connectionsMap);
     const newConn: DataSourceConnection = {
       ...conn,
@@ -207,16 +267,11 @@ const {
         }
         return {
           ...db,
-          schemas: db.schemas.map((schema) => {
-            if (schema.name !== sqlTableContext.schema) {
-              return schema;
-            }
-            return {
-              ...schema,
-              tables: tables,
-              tables_resolved: true,
-            };
-          }),
+          schemas: updateSchemaAtPath(db.schemas, path, (schema) => ({
+            ...schema,
+            tables: tables,
+            tables_resolved: true,
+          })),
         };
       }),
     };
@@ -246,6 +301,7 @@ const {
       return state;
     }
 
+    const path = tableSchemaPath(sqlTableContext);
     const newMap = new Map(connectionsMap);
     const newConn: DataSourceConnection = {
       ...conn,
@@ -253,21 +309,15 @@ const {
         if (db.name !== sqlTableContext.database) {
           return db;
         }
-
         return {
           ...db,
-          schemas: db.schemas.map((schema) => {
-            if (schema.name !== sqlTableContext.schema) {
-              return schema;
-            }
-
+          schemas: updateSchemaAtPath(db.schemas, path, (schema) => {
             // If tables array is empty, add the table
             // Otherwise, replace existing table or keep unchanged tables
             const tables =
               schema.tables.length === 0
                 ? [table]
                 : schema.tables.map((t) => (t.name === tableName ? table : t));
-
             return {
               ...schema,
               tables,
@@ -327,9 +377,14 @@ export const allTablesAtom = atom((get) => {
       const isDefaultDb =
         database.name === conn.default_database || conn.databases.length === 1;
 
-      for (const schema of database.schemas) {
-        const isDefaultSchema = schema.name === conn.default_schema;
-        const schemalessDb = isSchemaless(schema.name);
+      // Walk schemas recursively so nested namespaces (e.g. Iceberg
+      // `top.nested`) are enumerated. `segments` is the path of named
+      // (non-schemaless) namespace segments down to this schema.
+      const walkSchema = (schema: DatabaseSchema, segments: string[]): void => {
+        const schemalessDb = segments.length === 0;
+        const isDefaultSchema =
+          segments.length === 1 && segments[0] === conn.default_schema;
+        const schemaQualifier = segments.join(".");
 
         for (const table of schema.tables) {
           let nameToSave: string;
@@ -358,14 +413,14 @@ export const allTablesAtom = atom((get) => {
             continue;
           }
 
-          nameToSave = `${schema.name}.${table.name}`;
+          nameToSave = `${schemaQualifier}.${table.name}`;
 
           if (isDefaultDb && !tableNames.has(nameToSave)) {
             tableNames.set(nameToSave, table);
             continue;
           }
 
-          nameToSave = `${database.name}.${schema.name}.${table.name}`;
+          nameToSave = `${database.name}.${schemaQualifier}.${table.name}`;
 
           if (tableNames.has(nameToSave)) {
             Logger.warn(`Table name collision for ${nameToSave}. Skipping.`);
@@ -373,6 +428,15 @@ export const allTablesAtom = atom((get) => {
             tableNames.set(nameToSave, table);
           }
         }
+
+        // Recurse into nested child namespaces. Children are always named.
+        for (const child of schema.child_schemas ?? []) {
+          walkSchema(child, [...segments, child.name]);
+        }
+      };
+
+      for (const schema of database.schemas) {
+        walkSchema(schema, isSchemaless(schema.name) ? [] : [schema.name]);
       }
     }
   }

package/dist/assets/column-preview-nu3Qo2OW.js

@@ -1 +0,0 @@
-import{s as I}from"./chunk-LvLJmgfZ.js";import{u as F}from"./useEvent-D91BmmQi.js";import{t as H}from"./react-Bj1aDYRI.js";import{Br as J,D as R,Hr as M}from"./cells-DOA0Gew8.js";import{t as G}from"./compiler-runtime-B3qBwwSJ.js";import{c as K}from"./utils-CvI-39U6.js";import{t as U}from"./jsx-runtime-BqBOg78p.js";import{c as V,d as W,gt as X}from"./JsonOutput-DRNPZOvX.js";import{t as q}from"./tooltip-B_PkSKN3.js";import{r as D,t as A}from"./button-BbCh-29a.js";import{r as Y}from"./requests-DIwGYs0l.js";import{t as Z}from"./createLucideIcon-D5guW7EU.js";import{t as ee}from"./useLifecycle-DieWOfXE.js";import{t as te}from"./spinner-Bhir8k53.js";import{r as ae}from"./useTheme-CI2eq4XN.js";import{t as re}from"./copy-icon-BuRdHNPA.js";import{t as se}from"./context-QkTujrKn.js";import{i as oe}from"./numbers-DGxQfQ-A.js";import{n as ne}from"./html-to-image-CyAtzePO.js";import{o as ce}from"./focus-Ldqh99xE.js";var P=Z("square-plus",[["rect",{width:"18",height:"18",x:"3",y:"3",rx:"2",key:"afitv7"}],["path",{d:"M8 12h8",key:"1wcyev"}],["path",{d:"M12 8v8",key:"napkw2"}]]),L=G(),le=I(H(),1),s=I(U(),1);const ie=i=>{let e=(0,L.c)(53),{table:t,column:a,preview:r,onAddColumnChart:c,sqlTableContext:o}=i,{theme:u}=ae(),{previewDatasetColumn:l}=Y(),{locale:d}=se(),m;e[0]!==a.name||e[1]!==l||e[2]!==o||e[3]!==t.name||e[4]!==t.source||e[5]!==t.source_type?(m=()=>{l({source:t.source,tableName:t.name,columnName:a.name,sourceType:t.source_type,fullyQualifiedTableName:o?`${o.database}.${o.schema}.${t.name}`:t.name})},e[0]=a.name,e[1]=l,e[2]=o,e[3]=t.name,e[4]=t.source,e[5]=t.source_type,e[6]=m):m=e[6];let p=m,f;if(e[7]!==r||e[8]!==p||e[9]!==t.source_type?(f=()=>{r||t.source_type==="connection"||t.source_type==="catalog"||p()},e[7]=r,e[8]=p,e[9]=t.source_type,e[10]=f):f=e[10],ee(f),t.source_type==="connection"){let n=a.name,E=a.external_type,x;e[11]!==a.name||e[12]!==c||e[13]!==o||e[14]!==t?(x=D.stopPropagation(()=>{c(M({table:t,columnName:a.name,sqlTableContext:o}))}),e[11]=a.name,e[12]=c,e[13]=o,e[14]=t,e[15]=x):x=e[15];let C;e[16]===Symbol.for("react.memo_cache_sentinel")?(C=(0,s.jsx)(P,{className:"h-3 w-3 mr-1"}),e[16]=C):C=e[16];let h;e[17]===x?h=e[18]:(h=(0,s.jsxs)(A,{variant:"outline",size:"xs",onClick:x,children:[C," Add SQL cell"]}),e[17]=x,e[18]=h);let S;return e[19]!==a.external_type||e[20]!==a.name||e[21]!==h?(S=(0,s.jsxs)("span",{className:"text-xs text-muted-foreground gap-2 flex items-center justify-between pl-7",children:[n," (",E,")",h]}),e[19]=a.external_type,e[20]=a.name,e[21]=h,e[22]=S):S=e[22],S}if(t.source_type==="catalog"){let n;return e[23]!==a.external_type||e[24]!==a.name?(n=(0,s.jsxs)("span",{className:"text-xs text-muted-foreground gap-2 flex items-center justify-between pl-7",children:[a.name," (",a.external_type,")"]}),e[23]=a.external_type,e[24]=a.name,e[25]=n):n=e[25],n}if(!r){let n;return e[26]===Symbol.for("react.memo_cache_sentinel")?(n=(0,s.jsx)("span",{className:"text-xs text-muted-foreground",children:"Loading..."}),e[26]=n):n=e[26],n}let g;e[27]!==r.error||e[28]!==r.missing_packages||e[29]!==p?(g=r.error&&O({error:r.error,missingPackages:r.missing_packages,refetchPreview:p}),e[27]=r.error,e[28]=r.missing_packages,e[29]=p,e[30]=g):g=e[30];let y=g,_;e[31]!==a.type||e[32]!==d||e[33]!==r.stats?(_=r.stats&&Q({stats:r.stats,dataType:a.type,locale:d}),e[31]=a.type,e[32]=d,e[33]=r.stats,e[34]=_):_=e[34];let b=_,j;e[35]!==r.chart_spec||e[36]!==u?(j=r.chart_spec&&$(r.chart_spec,u),e[35]=r.chart_spec,e[36]=u,e[37]=j):j=e[37];let N=j,k;e[38]!==r.chart_code||e[39]!==t.source_type?(k=r.chart_code&&t.source_type==="local"&&(0,s.jsx)(B,{chartCode:r.chart_code}),e[38]=r.chart_code,e[39]=t.source_type,e[40]=k):k=e[40];let z=k,v;e[41]!==a.name||e[42]!==c||e[43]!==o||e[44]!==t?(v=t.source_type==="duckdb"&&(0,s.jsx)(q,{content:"Add SQL cell",delayDuration:400,children:(0,s.jsx)(A,{variant:"outline",size:"icon",className:"z-10 bg-background absolute right-1 -top-1",onClick:D.stopPropagation(()=>{c(M({table:t,columnName:a.name,sqlTableContext:o}))}),children:(0,s.jsx)(P,{className:"h-3 w-3"})})}),e[41]=a.name,e[42]=c,e[43]=o,e[44]=t,e[45]=v):v=e[45];let T=v;if(!y&&!b&&!N){let n;return e[46]===Symbol.for("react.memo_cache_sentinel")?(n=(0,s.jsx)("span",{className:"text-xs text-muted-foreground",children:"No data"}),e[46]=n):n=e[46],n}let w;return e[47]!==z||e[48]!==T||e[49]!==N||e[50]!==y||e[51]!==b?(w=(0,s.jsxs)(W,{children:[y,z,T,N,b]}),e[47]=z,e[48]=T,e[49]=N,e[50]=y,e[51]=b,e[52]=w):w=e[52],w};function O({error:i,missingPackages:e,refetchPreview:t}){return(0,s.jsxs)("div",{className:"text-xs text-muted-foreground p-2 border border-border rounded flex items-center justify-between",children:[(0,s.jsx)("span",{children:i}),e&&(0,s.jsx)(V,{packages:e,showMaxPackages:1,className:"w-32",onInstall:t})]})}function Q({stats:i,dataType:e,locale:t}){return(0,s.jsx)("div",{className:"gap-x-16 gap-y-1 grid grid-cols-2-fit border rounded p-2 empty:hidden",children:Object.entries(i).map(([a,r])=>r==null?null:(0,s.jsxs)("div",{className:"flex items-center gap-1 group",children:[(0,s.jsx)("span",{className:"text-xs min-w-[60px] capitalize",children:J(a,e)}),(0,s.jsx)("span",{className:"text-xs font-bold text-muted-foreground tracking-wide",children:oe(r,t)}),(0,s.jsx)(re,{className:"h-3 w-3 invisible group-hover:visible",value:String(r)})]},a))})}var me=(0,s.jsx)("div",{className:"flex justify-center",children:(0,s.jsx)(te,{className:"size-4"})});function $(i,e){let t=a=>({...a,background:"transparent",config:{...a.config,background:"transparent"}});return(0,s.jsx)(le.Suspense,{fallback:me,children:(0,s.jsx)(X,{"data-container-width":"container",spec:t(JSON.parse(i)),options:{theme:e==="dark"?"dark":"vox",height:100,width:"container",actions:!1,renderer:"canvas"}})})}const B=i=>{let e=(0,L.c)(10),{chartCode:t}=i,a=F(K),r=ce(),{createNewCell:c}=R(),o;e[0]!==a||e[1]!==c||e[2]!==r?(o=p=>{p.includes("alt")&&ne({autoInstantiate:a,createNewCell:c,fromCellId:r}),c({code:p,before:!1,cellId:r??"__end__"})},e[0]=a,e[1]=c,e[2]=r,e[3]=o):o=e[3];let u=o,l;e[4]!==t||e[5]!==u?(l=D.stopPropagation(()=>u(t)),e[4]=t,e[5]=u,e[6]=l):l=e[6];let d;e[7]===Symbol.for("react.memo_cache_sentinel")?(d=(0,s.jsx)(P,{className:"h-3 w-3"}),e[7]=d):d=e[7];let m;return e[8]===l?m=e[9]:(m=(0,s.jsx)(q,{content:"Add chart to notebook",delayDuration:400,children:(0,s.jsx)(A,{variant:"outline",size:"icon",className:"z-10 bg-background absolute right-1 -top-0.5",onClick:l,children:d})}),e[8]=l,e[9]=m),m};export{Q as a,O as i,ie as n,P as o,$ as r,B as t};