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

package/dist/main.js

@@ -22,7 +22,7 @@ import { _ as Logger, c as Objects, g as cn, h as Events, i as NOT_SET, l as use
 import { t as require_react } from "./react-DA-nE2FX.js";
 import { t as require_compiler_runtime } from "./compiler-runtime-CEbnTgxf.js";
 import { n as Copy, r as toast, t as copyToClipboard } from "./copy-Bp6CK_Fg.js";
-import { $ as createActions, $t as isUninstantiated, A as MarimoIncomingMessageEvent, An as Trash2, At as PathBuilder, B as DotFilledIcon, Bn as Database, Ct as getValidName, D as AccordionContent, Dn as Root2$4, Dt as customPythonLanguageSupport, E as Accordion, En as Item$1, Et as Checkbox, F as BorderAllIcon, Fn as Layers, Ft as generateUUID, G as base64ToDataView, Gn as esm_default$1, Gt as require_client, H as PinRightIcon, Hn as CircleX, Ht as PluralWords, In as Info, It as useChromeActions, J as extractBase64FromDataURL, K as base64ToUint8Array, Kn as import_lib, L as CheckIcon, Ln as File, Lt as repl, M as MarimoValueReadyEvent, Mn as PaintRoller, N as MarimoValueUpdateEvent, Nn as NotebookPen, Nt as goToCellLine, O as AccordionItem, On as Trigger2, Ot as MarkdownLanguageAdapter, P as createInputEvent, Pn as LoaderCircle, Pt as DeferredRequestRegistry, Qt as useRequestClient, R as ChevronDownIcon, Rn as FileText, Rt as adaptForLocalStorage, Sn as selectAtom, St as displayCellName, Tn as Content2$1, Tt as normalizeName, U as deserializeBlob, Un as CircleAlert, Ut as DATA_TYPE_ICON, V as PinLeftIcon, Vn as Columns2, Vt as PluralWord, Wn as Braces, Wt as getDataTypeColor, X as safeExtractSetUIElementMessageBuffers, Xt as getRequestClient, Y as isDataURLString, Yt as convertStatsName, Z as renderHTML, Zt as requestClientAtom, _ as useExpandedConsoleOutput, _n as jsonParseWithSpecialChar, _t as isErrorMime, a as toPng, at as reducer, b as getDatasourceContext, bn as atomWithReducer, bt as DATA_CELL_ID, c as useCellFocusActions, cn as parseDataset, ct as useCellNames, d as Spinner, dn as HTMLCellId, dt as getInitialAppMode, et as getCellEditorView, f as Popover$1, fn as SCRATCH_CELL_ID, ft as initialModeAtom, g as isOutputEmpty, gn as RANDOM_ID_ATTR, gt as outputIsStale, h as PopoverTrigger, hn as OBJECT_ID_ATTR, ht as outputIsLoading, i as PythonIcon, in as NotebookScopedLocalStorage, it as numColumnsAtom, j as MarimoValueInputEvent, jn as Table2, jt as Paths, k as AccordionTrigger, kn as Wrench, l as useLastFocusedCellId, ln as parseInitialValue, lt as createCell, m as PopoverContent, mn as findCellId, mt as viewStateAtom, n as blobToString, nn as extractAllTracebackInfo, nt as notebookAtom, o as MarkdownRenderer, on as filenameAtom, ot as useCellActions, p as PopoverClose$1, pn as UIElementId, pt as kioskModeAtom, q as dataViewToBase64, r as filesToBase64, rn as getTracebackInfo, rt as notebookOutline, s as LazyAnyLanguageCodeMirror, sn as parseAttrValue, st as useCellIds, t as processOutput, tn as elementContainsMarimoCellFile, tt as getCellNames, u as maybeAddAltairImport, un as CellOutputId, ut as AnsiUp, v as useExpandedOutput, vn as jsonToMarkdown, vt as headingToIdentifier, wn as Close$1, wt as isInternalCellName, xn as atomWithStorage, xt as getCellDomProps, yn as jsonToTSV, yt as sanitizeHtml, z as ChevronRightIcon, zn as Eye, zt as jotaiJsonStorage, __tla as __tla_0 } from "./process-output-Bekznt_B.js";
+import { $ as createActions, $t as isUninstantiated, A as MarimoIncomingMessageEvent, An as Trash2, At as PathBuilder, B as DotFilledIcon, Bn as Database, Ct as getValidName, D as AccordionContent, Dn as Root2$4, Dt as customPythonLanguageSupport, E as Accordion, En as Item$1, Et as Checkbox, F as BorderAllIcon, Fn as Layers, Ft as generateUUID, G as base64ToDataView, Gn as esm_default$1, Gt as require_client, H as PinRightIcon, Hn as CircleX, Ht as PluralWords, In as Info, It as useChromeActions, J as extractBase64FromDataURL, K as base64ToUint8Array, Kn as import_lib, L as CheckIcon, Ln as File, Lt as repl, M as MarimoValueReadyEvent, Mn as PaintRoller, N as MarimoValueUpdateEvent, Nn as NotebookPen, Nt as goToCellLine, O as AccordionItem, On as Trigger2, Ot as MarkdownLanguageAdapter, P as createInputEvent, Pn as LoaderCircle, Pt as DeferredRequestRegistry, Qt as useRequestClient, R as ChevronDownIcon, Rn as FileText, Rt as adaptForLocalStorage, Sn as selectAtom, St as displayCellName, Tn as Content2$1, Tt as normalizeName, U as deserializeBlob, Un as CircleAlert, Ut as DATA_TYPE_ICON, V as PinLeftIcon, Vn as Columns2, Vt as PluralWord, Wn as Braces, Wt as getDataTypeColor, X as safeExtractSetUIElementMessageBuffers, Xt as getRequestClient, Y as isDataURLString, Yt as convertStatsName, Z as renderHTML, Zt as requestClientAtom, _ as useExpandedConsoleOutput, _n as jsonParseWithSpecialChar, _t as isErrorMime, a as toPng, at as reducer, b as getDatasourceContext, bn as atomWithReducer, bt as DATA_CELL_ID, c as useCellFocusActions, cn as parseDataset, ct as useCellNames, d as Spinner, dn as HTMLCellId, dt as getInitialAppMode, et as getCellEditorView, f as Popover$1, fn as SCRATCH_CELL_ID, ft as initialModeAtom, g as isOutputEmpty, gn as RANDOM_ID_ATTR, gt as outputIsStale, h as PopoverTrigger, hn as OBJECT_ID_ATTR, ht as outputIsLoading, i as PythonIcon, in as NotebookScopedLocalStorage, it as numColumnsAtom, j as MarimoValueInputEvent, jn as Table2, jt as Paths, k as AccordionTrigger, kn as Wrench, l as useLastFocusedCellId, ln as parseInitialValue, lt as createCell, m as PopoverContent, mn as findCellId, mt as viewStateAtom, n as blobToString, nn as extractAllTracebackInfo, nt as notebookAtom, o as MarkdownRenderer, on as filenameAtom, ot as useCellActions, p as PopoverClose$1, pn as UIElementId, pt as kioskModeAtom, q as dataViewToBase64, r as filesToBase64, rn as getTracebackInfo, rt as notebookOutline, s as LazyAnyLanguageCodeMirror, sn as parseAttrValue, st as useCellIds, t as processOutput, tn as elementContainsMarimoCellFile, tt as getCellNames, u as maybeAddAltairImport, un as CellOutputId, ut as AnsiUp, v as useExpandedOutput, vn as jsonToMarkdown, vt as headingToIdentifier, wn as Close$1, wt as isInternalCellName, xn as atomWithStorage, xt as getCellDomProps, yn as jsonToTSV, yt as sanitizeHtml, z as ChevronRightIcon, zn as Eye, zt as jotaiJsonStorage, __tla as __tla_0 } from "./process-output-H_7QTreh.js";
 import { __tla as __tla_1 } from "./chunk-5FQGJX7Z-VIref9gx.js";
 import { o as useSize, s as Root$4, u as createLucideIcon } from "./dist-CTtLBPLZ.js";
 import { A as $896ba0a80a8f4d36$export$85fd5fdf27bacc79, C as DEFAULT_COLOR_SCHEME, D as SCALE_TYPE_DESCRIPTIONS, E as EMPTY_VALUE$1, F as ListFilter, I as ChartPie, L as ChartColumn, M as $5a387cc49350e6db$export$722debc0e56fea39, N as Table$1, O as TIME_UNIT_DESCRIPTIONS, P as SquareFunction, S as DEFAULT_AGGREGATION, T as DEFAULT_TIME_UNIT, _ as AGGREGATION_TYPE_DESCRIPTIONS, a as AGGREGATION_FNS$1, b as COLOR_SCHEMES, c as COLOR_BY_FIELDS, d as NONE_VALUE, f as SELECTABLE_DATA_TYPES, g as TIME_UNITS, h as STRING_AGGREGATION_FNS, i as convertDataTypeToSelectable, j as $fb18d541ea1ad717$export$ad991b66133851cf, k as escapeFieldName, l as COMBINED_TIME_UNITS, m as SORT_TYPES, n as createSpecWithoutData, o as BIN_AGGREGATION, p as SINGLE_TIME_UNITS, r as isFieldSet, s as CHART_TYPES, t as augmentSpecWithData, u as ChartType, v as AGGREGATION_TYPE_ICON, w as DEFAULT_MAX_BINS_FACET, x as COUNT_FIELD, y as CHART_TYPE_ICON } from "./spec-3EPbPQZH.js";
@@ -35,13 +35,13 @@ import { a as Plus, i as Trash, n as ErrorBoundary, o as Pencil, r as require_pr
 import { n as clsx_default } from "./clsx-CwTY0BxM.js";
 import { t as require_react_dom } from "./react-dom-D5FDLRUB.js";
 import { t as require_jsx_runtime } from "./jsx-runtime-9hcJiI23.js";
-import { $ as StyleNamespace, A as looseObject, B as union, C as any, F as optional, G as parse$3, I as record, J as prettifyError, K as parseAsync, N as number, P as object, Q as isInVscodeExtension, R as string, S as _null, T as boolean, U as ZodError, V as unknown, X as withFullScreenAsRoot, Y as MAX_HEIGHT_OFFSET, Z as withSmartCollisionBoundary, _ as ZodString, _t as Primitive$1, a as ZodIssueCode, b as _enum, c as ZodBoolean, d as ZodDiscriminatedUnion, dt as Presence, f as ZodEnum, ft as useControllableState, g as ZodOptional, gt as createContextScope, h as ZodObject, i as string$1, j as nan, k as literal, l as ZodDate, lt as useCallbackRef, m as ZodNumber, mt as composeEventHandlers$1, n as date, nt as __awaiter, o as ZodAny, p as ZodLiteral, pt as useLayoutEffect2, q as $ZodError, r as number$1, s as ZodArray, st as DismissableLayer, t as zod_default, u as ZodDefault, ut as useId$12, v as ZodType, vt as dispatchDiscreteCustomEvent, w as array, x as _instanceof, y as ZodUnion, z as tuple } from "./zod-W5ZEjzaE.js";
+import { $ as StyleNamespace, A as looseObject, B as union, C as any, F as optional, G as parse$3, I as record, J as prettifyError, K as parseAsync, N as number, O as lazy$2, P as object, Q as isInVscodeExtension, R as string, S as _null, T as boolean, U as ZodError, V as unknown, X as withFullScreenAsRoot, Y as MAX_HEIGHT_OFFSET, Z as withSmartCollisionBoundary, _ as ZodString, _t as Primitive$1, a as ZodIssueCode, b as _enum, c as ZodBoolean, d as ZodDiscriminatedUnion, dt as Presence, f as ZodEnum, ft as useControllableState, g as ZodOptional, gt as createContextScope, h as ZodObject, i as string$1, j as nan, k as literal, l as ZodDate, lt as useCallbackRef, m as ZodNumber, mt as composeEventHandlers$1, n as date, nt as __awaiter, o as ZodAny, p as ZodLiteral, pt as useLayoutEffect2, q as $ZodError, r as number$1, s as ZodArray, st as DismissableLayer, t as zod_default, u as ZodDefault, ut as useId$12, v as ZodType, vt as dispatchDiscreteCustomEvent, w as array, x as _instanceof, y as ZodUnion, z as tuple } from "./zod-W5ZEjzaE.js";
 import { a as Content$2, c as Root$6, i as prettyError, n as ErrorBanner, o as Overlay, r as CellNotInitializedError, s as Portal$1, t as Banner } from "./error-banner-B_ioHva3.js";
 import { a as TooltipRoot, i as TooltipProvider, n as TooltipContent, o as TooltipTrigger, r as TooltipPortal, t as Tooltip } from "./tooltip-DwNnFsxZ.js";
 import { n as minimalSetup, r as _extends$5, t as esm_default, u as CopyClipboardIcon } from "./esm-CDHI9cuO.js";
-import { a as get_default } from "./hasIn-DnfJcYpY.js";
-import { n as _baseSet_default } from "./_basePickBy-Sow3pJjS.js";
-import { n as pick_default, t as range_default } from "./range-fJeId9Ri.js";
+import { a as get_default } from "./hasIn-BDDmuo1w.js";
+import { n as _baseSet_default } from "./_basePickBy-C-mod5Dp.js";
+import { t as pick_default } from "./pick-DfX21dj2.js";
 import { i as debounce_default, r as KnownQueryParams, t as CSSClasses } from "./constants-CvyfaCvs.js";
 import { C as dequal, S as getBuildingBlocks, _ as useSetAtom, c as AppConfigSchema, d as useJotaiEffect, g as useAtomValue, h as useAtom, i as autoInstantiateAtom, m as Provider, n as useTheme, o as localeAtom, p as isIslands, r as aiEnabledAtom, s as useResolvedMarimoConfig, u as store, v as useStore, w as useEvent_default, x as buildStore, y as atom } from "./useTheme-CzwDokKe.js";
 import { Z as EditorView } from "./dist-CxZvoNao.js";
@@ -23789,10 +23789,10 @@ Database schema: ${c}`), (_a4 = r2.aiFix) == null ? void 0 : _a4.setAiCompletion
     else if (c.some(_temp2$24)) _ = "An internal error occurred";
     else if (c.some(_temp3$16)) _ = "Ancestor prevented from running", y = "default", S = "text-secondary-foreground";
     else if (c.some(_temp4$9)) _ = "Ancestor stopped", y = "default", S = "text-secondary-foreground";
-    else if (c.some(_temp5$6)) _ = "SQL error";
+    else if (c.some(_temp5$5)) _ = "SQL error";
     else {
       let e2;
-      r[0] === c ? e2 = r[1] : (e2 = c.find(_temp6$6), r[0] = c, r[1] = e2);
+      r[0] === c ? e2 = r[1] : (e2 = c.find(_temp6$5), r[0] = c, r[1] = e2);
       let d2 = e2;
       d2 && "exception_type" in d2 && (_ = d2.exception_type);
     }
@@ -24164,10 +24164,10 @@ Database schema: ${c}`), (_a4 = r2.aiFix) == null ? void 0 : _a4.setAiCompletion
   function _temp4$9(e) {
     return e.type === "ancestor-stopped";
   }
-  function _temp5$6(e) {
+  function _temp5$5(e) {
     return e.type === "sql-error";
   }
-  function _temp6$6(e) {
+  function _temp6$5(e) {
     return e.type === "exception";
   }
   function _temp7$2(e) {
@@ -25715,40 +25715,56 @@ Database schema: ${c}`), (_a4 = r2.aiFix) == null ? void 0 : _a4.setAiCompletion
   function filterToFilterCondition(e, r) {
     if (!r) return [];
     let c = e;
-    if (r.operator === "is_null" || r.operator === "is_not_null") return {
-      column_id: c,
-      operator: r.operator,
-      value: void 0
-    };
+    if (r.operator === "is_null" || r.operator === "is_not_null") return [
+      {
+        column_id: c,
+        operator: r.operator,
+        value: void 0,
+        type: "condition",
+        negate: false
+      }
+    ];
     switch (r.type) {
       case "number": {
         let e2 = [];
         return r.min !== void 0 && e2.push({
           column_id: c,
           operator: ">=",
-          value: r.min
+          value: r.min,
+          type: "condition",
+          negate: false
         }), r.max !== void 0 && e2.push({
           column_id: c,
           operator: "<=",
-          value: r.max
+          value: r.max,
+          type: "condition",
+          negate: false
         }), e2;
       }
       case "text":
-        return {
-          column_id: c,
-          operator: r.operator,
-          value: r.text
-        };
+        return [
+          {
+            column_id: c,
+            operator: r.operator,
+            value: r.text,
+            type: "condition",
+            negate: false
+          }
+        ];
       case "datetime": {
         let e2 = [];
         return r.min !== void 0 && e2.push({
           column_id: c,
           operator: ">=",
-          value: r.min.toISOString()
+          value: r.min.toISOString(),
+          type: "condition",
+          negate: false
         }), r.max !== void 0 && e2.push({
           column_id: c,
           operator: "<=",
-          value: r.max.toISOString()
+          value: r.max.toISOString(),
+          type: "condition",
+          negate: false
         }), e2;
       }
       case "date": {
@@ -25756,11 +25772,15 @@ Database schema: ${c}`), (_a4 = r2.aiFix) == null ? void 0 : _a4.setAiCompletion
         return r.min !== void 0 && e2.push({
           column_id: c,
           operator: ">=",
-          value: r.min.toISOString()
+          value: r.min.toISOString(),
+          type: "condition",
+          negate: false
         }), r.max !== void 0 && e2.push({
           column_id: c,
           operator: "<=",
-          value: r.max.toISOString()
+          value: r.max.toISOString(),
+          type: "condition",
+          negate: false
         }), e2;
       }
       case "time": {
@@ -25768,37 +25788,61 @@ Database schema: ${c}`), (_a4 = r2.aiFix) == null ? void 0 : _a4.setAiCompletion
         return r.min !== void 0 && e2.push({
           column_id: c,
           operator: ">=",
-          value: r.min.toISOString()
+          value: r.min.toISOString(),
+          type: "condition",
+          negate: false
         }), r.max !== void 0 && e2.push({
           column_id: c,
           operator: "<=",
-          value: r.max.toISOString()
+          value: r.max.toISOString(),
+          type: "condition",
+          negate: false
         }), e2;
       }
       case "boolean":
-        return r.value ? {
-          column_id: c,
-          operator: "is_true",
-          value: void 0
-        } : r.value ? [] : {
-          column_id: c,
-          operator: "is_false",
-          value: void 0
-        };
+        return r.value ? [
+          {
+            column_id: c,
+            operator: "is_true",
+            value: void 0,
+            type: "condition",
+            negate: false
+          }
+        ] : r.value ? [] : [
+          {
+            column_id: c,
+            operator: "is_false",
+            value: void 0,
+            type: "condition",
+            negate: false
+          }
+        ];
       case "select": {
         let e2 = r.operator;
         return r.operator !== "in" && r.operator !== "not_in" && (Logger.warn("Invalid operator for select filter", {
           operator: r.operator
-        }), e2 = "in"), {
-          column_id: c,
-          operator: e2,
-          value: r.options
-        };
+        }), e2 = "in"), [
+          {
+            column_id: c,
+            operator: e2,
+            value: r.options,
+            type: "condition",
+            negate: false
+          }
+        ];
       }
       default:
         assertNever(r);
     }
   }
+  function filtersToFilterGroup(e) {
+    return {
+      type: "group",
+      operator: "and",
+      children: e.flatMap((e2) => filterToFilterCondition(e2.id, e2.value)),
+      negate: false
+    };
+  }
   function functionalUpdate(e, r) {
     return typeof e == "function" ? e(r) : e;
   }
@@ -34080,7 +34124,6 @@ Database schema: ${c}`), (_a4 = r2.aiFix) == null ? void 0 : _a4.setAiCompletion
       [r.id]: d
     }));
   }
-  var MAX_PAGES_BEFORE_CLAMPING = 100;
   const DataTablePagination = ({ table: e, tableLoading: r, showPageSizeSelector: c }) => {
     let { locale: d } = $18f2051aff69b9bf$export$43bb16f9c6d9e3f7(), f = Math.min(e.getState().pagination.pageIndex + 1, e.getPageCount()), h = e.getPageCount(), _ = e.getState().pagination.pageSize, S = (e2) => {
       r || e2();
@@ -34226,16 +34269,62 @@ Database schema: ${c}`), (_a4 = r2.aiFix) == null ? void 0 : _a4.setAiCompletion
         })
       ]
     });
-  }, PageSelector = ({ currentPage: e, totalPages: r, onPageChange: c }) => {
-    let [d, f] = import_react.useState(false), h = import_react.useMemo(() => getPageRanges(e, r), [
-      e,
-      r
-    ]), _ = (e2) => {
-      c(e2 - 1), f(false);
+  };
+  var PAGE_ITEM_HEIGHT = 32;
+  function matchingPageRanges(e, r) {
+    let c = Number.parseInt(e, 10);
+    if (Number.isNaN(c) || c <= 0 || String(c) !== e) return [];
+    let d = [], f = 1;
+    for (; c * f <= r; ) {
+      let e2 = c * f, h = Math.min((c + 1) * f - 1, r);
+      d.push([
+        e2,
+        h
+      ]), f *= 10;
+    }
+    return d;
+  }
+  function createPageMapping(e, r) {
+    if (e === "") return {
+      count: r,
+      pageAtIndex: (e2) => e2 + 1,
+      indexOfPage: (e2) => e2 - 1
     };
+    let c = matchingPageRanges(e, r), d = 0;
+    for (let [e2, r2] of c) d += r2 - e2 + 1;
+    return {
+      count: d,
+      pageAtIndex: (e2) => {
+        let r2 = 0;
+        for (let [d2, f] of c) {
+          let c2 = f - d2 + 1;
+          if (e2 < r2 + c2) return d2 + (e2 - r2);
+          r2 += c2;
+        }
+        return -1;
+      },
+      indexOfPage: (e2) => {
+        let r2 = 0;
+        for (let [d2, f] of c) {
+          if (e2 >= d2 && e2 <= f) return r2 + (e2 - d2);
+          r2 += f - d2 + 1;
+        }
+        return -1;
+      }
+    };
+  }
+  const PageSelector = ({ currentPage: e, totalPages: r, onPageChange: c }) => {
+    let [d, f] = import_react.useState(false), [h, _] = import_react.useState(""), y = import_react.useMemo(() => createPageMapping(h, r), [
+      h,
+      r
+    ]), S = (e2) => {
+      c(e2 - 1), _(""), f(false);
+    }, w = Math.min(y.count * PAGE_ITEM_HEIGHT, 240);
     return (0, import_jsx_runtime.jsxs)(Popover$1, {
       open: r > 1 ? d : false,
-      onOpenChange: f,
+      onOpenChange: (e2) => {
+        f(e2), e2 || _("");
+      },
       children: [
         (0, import_jsx_runtime.jsx)(PopoverTrigger, {
           asChild: true,
@@ -34258,8 +34347,8 @@ Database schema: ${c}`), (_a4 = r2.aiFix) == null ? void 0 : _a4.setAiCompletion
           align: "center",
           sideOffset: 6,
           children: (0, import_jsx_runtime.jsxs)(Command, {
-            shouldFilter: true,
-            filter: (e2, r2) => e2.startsWith(r2) ? 1 : 0,
+            shouldFilter: false,
+            value: String(e),
             children: [
               (0, import_jsx_runtime.jsx)(CommandInput, {
                 placeholder: `Page (1\u2013${r})`,
@@ -34267,34 +34356,33 @@ Database schema: ${c}`), (_a4 = r2.aiFix) == null ? void 0 : _a4.setAiCompletion
                 className: "text-xs h-8",
                 autoFocus: true,
                 icon: null,
+                value: h,
+                onValueChange: _,
                 onKeyDown: (e2) => {
                   ![
                     "Backspace",
                     "Delete",
                     "ArrowLeft",
                     "ArrowRight",
+                    "ArrowUp",
+                    "ArrowDown",
                     "Tab",
                     "Enter",
                     "Escape"
                   ].includes(e2.key) && !/^\d$/.test(e2.key) && e2.preventDefault();
                 }
               }),
-              (0, import_jsx_runtime.jsxs)(CommandList, {
-                className: "max-h-60",
-                children: [
-                  h.map((r2) => r2.type === "ellipsis" ? null : (0, import_jsx_runtime.jsx)(CommandItem, {
-                    value: String(r2.page),
-                    "data-testid": "page-option",
-                    className: cn("text-xs cursor-pointer", r2.page === e && "font-semibold bg-accent"),
-                    onSelect: () => _(r2.page),
-                    onMouseDown: Events.preventFocus,
-                    children: r2.page
-                  }, r2.page)),
-                  (0, import_jsx_runtime.jsx)(CommandEmpty, {
-                    className: "py-2 text-center text-xs text-muted-foreground",
-                    children: "No matching page"
-                  })
-                ]
+              (0, import_jsx_runtime.jsx)(CommandList, {
+                className: "max-h-60 overflow-hidden",
+                children: y.count === 0 ? (0, import_jsx_runtime.jsx)(CommandEmpty, {
+                  className: "py-2 text-center text-xs text-muted-foreground",
+                  children: "No matching page"
+                }) : (0, import_jsx_runtime.jsx)(VirtualizedPageList, {
+                  mapping: y,
+                  currentPage: e,
+                  listHeight: w,
+                  onSelect: S
+                })
               })
             ]
           })
@@ -34302,41 +34390,58 @@ Database schema: ${c}`), (_a4 = r2.aiFix) == null ? void 0 : _a4.setAiCompletion
       ]
     });
   };
-  function getPageRanges(e, r) {
-    if (r <= MAX_PAGES_BEFORE_CLAMPING) return range_default(r).map((e2) => ({
-      type: "page",
-      page: e2 + 1
-    }));
-    let c = Math.floor(r / 2), d = [], f = (e2, r2) => {
-      for (let c2 = 0; c2 < r2; c2++) d.push({
-        type: "page",
-        page: e2 + c2
-      });
-    };
-    return f(1, 10), d.push({
-      type: "ellipsis",
-      key: "e1"
-    }), e > 10 && e <= c - 5 && d.push({
-      type: "page",
-      page: e
-    }, {
-      type: "ellipsis",
-      key: "e1b"
-    }), f(c - 4, 10), d.push({
-      type: "ellipsis",
-      key: "e2"
-    }), e > c + 5 && e <= r - 10 && d.push({
-      type: "page",
-      page: e
-    }, {
-      type: "ellipsis",
-      key: "e2b"
-    }), f(r - 9, 10), d;
-  }
+  var VirtualizedPageList = ({ mapping: e, currentPage: r, listHeight: c, onSelect: d }) => {
+    let f = import_react.useRef(null), h = e.indexOfPage(r), _ = useVirtualizer({
+      count: e.count,
+      getScrollElement: () => f.current,
+      estimateSize: () => PAGE_ITEM_HEIGHT,
+      overscan: 10,
+      initialOffset: h > 0 ? Math.max(0, h * PAGE_ITEM_HEIGHT - c / 2) : 0
+    }), S = import_react.useRef(e.count);
+    return import_react.useEffect(() => {
+      e.count !== S.current && (_.scrollToIndex(0), S.current = e.count);
+    }, [
+      e.count,
+      _
+    ]), (0, import_jsx_runtime.jsx)("div", {
+      ref: f,
+      style: {
+        height: c,
+        overflow: "auto"
+      },
+      children: (0, import_jsx_runtime.jsx)("div", {
+        style: {
+          height: _.getTotalSize(),
+          width: "100%",
+          position: "relative"
+        },
+        children: _.getVirtualItems().map((c2) => {
+          let f2 = e.pageAtIndex(c2.index);
+          return (0, import_jsx_runtime.jsx)(CommandItem, {
+            value: String(f2),
+            "data-testid": "page-option",
+            "aria-selected": f2 === r,
+            className: cn("text-xs cursor-pointer", f2 === r && "font-semibold bg-accent"),
+            style: {
+              position: "absolute",
+              top: 0,
+              left: 0,
+              width: "100%",
+              height: c2.size,
+              transform: `translateY(${c2.start}px)`
+            },
+            onSelect: () => d(f2),
+            onMouseDown: Events.preventFocus,
+            children: f2
+          }, f2);
+        })
+      })
+    });
+  };
   function prettifyRowCount(e, r) {
     return `${prettyNumber(e, r)} ${new PluralWord("row").pluralize(e)}`;
   }
-  const prettifyRowColumnCount = (e, r, c) => [
+  const prettifyRowColumnCount = ({ numRows: e, totalColumns: r, locale: c }) => [
     e === "too_many" ? "Unknown" : prettifyRowCount(e, c),
     `${prettyNumber(r, c)} ${new PluralWord("column").pluralize(r)}`
   ].join(", ");
@@ -34522,7 +34627,11 @@ Database schema: ${c}`), (_a4 = r2.aiFix) == null ? void 0 : _a4.setAiCompletion
                     })
                   ]
                 }) : (0, import_jsx_runtime.jsx)("span", {
-                  children: prettifyRowColumnCount(f.getRowCount(), r, O)
+                  children: prettifyRowColumnCount({
+                    numRows: f.getRowCount(),
+                    totalColumns: r,
+                    locale: O
+                  })
                 });
               })()
             }),
@@ -37143,7 +37252,7 @@ ${w}`,
       };
     }
   };
-  var LazyChatbot = import_react.lazy(() => import("./chat-ui-CNHw9Osh.js").then((e) => ({
+  var LazyChatbot = import_react.lazy(() => import("./chat-ui-DIVMRPO5.js").then((e) => ({
     default: e.Chatbot
   }))), messageSchema = array(object({
     id: string(),
@@ -43129,7 +43238,7 @@ ${c}
     r[0] !== c || r[1] !== f ? (h = () => {
       f.setValue(c, "");
     }, r[0] = c, r[1] = f, r[2] = h) : h = r[2];
-    let _ = h, v = _temp5$5, y;
+    let _ = h, v = _temp5$4, y;
     r[3] !== _ || r[4] !== d ? (y = (e2) => {
       let { field: r2 } = e2;
       return (0, import_jsx_runtime.jsxs)(FormItem, {
@@ -43250,7 +43359,7 @@ ${c}
       render: S
     }), r[5] = c, r[6] = y.control, r[7] = S, r[8] = w) : w = r[8], w;
   }, AggregationSelect = (e) => {
-    let r = (0, import_compiler_runtime$80.c)(12), { fieldName: c, selectedDataType: d, binFieldName: f, defaultAggregation: h } = e, _ = useFormContext(), v = d === "string" ? STRING_AGGREGATION_FNS : AGGREGATION_FNS$1, { chartType: y } = useChartFormContext(), S = y !== ChartType.HEATMAP, w = _temp6$5, E = _temp7$1, O;
+    let r = (0, import_compiler_runtime$80.c)(12), { fieldName: c, selectedDataType: d, binFieldName: f, defaultAggregation: h } = e, _ = useFormContext(), v = d === "string" ? STRING_AGGREGATION_FNS : AGGREGATION_FNS$1, { chartType: y } = useChartFormContext(), S = y !== ChartType.HEATMAP, w = _temp6$4, E = _temp7$1, O;
     r[0] !== f || r[1] !== _ ? (O = (e2) => {
       let { value: r2, previousValue: c2, onChange: d2 } = e2;
       r2 === "bin" ? _.setValue(f, true) : c2 === "bin" && _.setValue(f, false), d2(r2);
@@ -43404,7 +43513,7 @@ ${c}
   function _temp4$7(e) {
     return e;
   }
-  function _temp5$5(e) {
+  function _temp5$4(e) {
     let [r, c] = TIME_UNIT_DESCRIPTIONS[e];
     return (0, import_jsx_runtime.jsx)(SelectItem, {
       value: e,
@@ -43416,7 +43525,7 @@ ${c}
       children: r
     }, e);
   }
-  function _temp6$5(e) {
+  function _temp6$4(e) {
     return (0, import_jsx_runtime.jsx)("span", {
       className: "text-xs text-muted-foreground pr-10",
       children: e
@@ -44971,7 +45080,11 @@ ${c}
       });
       q = "mb-3";
       let Q72;
-      r[17] !== S || r[18] !== h || r[19] !== f ? (Q72 = prettifyRowColumnCount(f, h, S), r[17] = S, r[18] = h, r[19] = f, r[20] = Q72) : Q72 = r[20], X7 = (0, import_jsx_runtime.jsxs)("span", {
+      r[17] !== S || r[18] !== h || r[19] !== f ? (Q72 = prettifyRowColumnCount({
+        numRows: f,
+        totalColumns: h,
+        locale: S
+      }), r[17] = S, r[18] = h, r[19] = f, r[20] = Q72) : Q72 = r[20], X7 = (0, import_jsx_runtime.jsxs)("span", {
         className: "text-xs font-semibold ml-2 flex",
         children: [
           Q72,
@@ -45609,6 +45722,12 @@ ${c}
     "<=": [
       e
     ],
+    between: [
+      object({
+        min: e,
+        max: e
+      })
+    ],
     is_null: [],
     is_not_null: []
   });
@@ -45637,6 +45756,7 @@ ${c}
     not_in: [
       Schema.stringMultiColumnValues
     ],
+    is_empty: [],
     is_null: [],
     is_not_null: []
   }, ALL_OPERATORS = {
@@ -45753,17 +45873,30 @@ ${c}
       special: "radio_group"
     })).default("last")
   });
-  const ConditionSchema = object({
+  const FilterConditionSchema = object({
     column_id,
     operator: _enum(Object.keys(ALL_OPERATORS)).describe(FieldOptions.of({
       label: " "
     })),
+    type: literal("condition").default("condition"),
     value: any().describe(FieldOptions.of({
       label: "Value"
-    }))
+    })),
+    negate: boolean().default(false)
   }).describe(FieldOptions.of({
     direction: "row",
     special: "column_filter"
+  })), FilterGroupSchema = lazy$2(() => object({
+    type: literal("group").default("group"),
+    operator: _enum([
+      "and",
+      "or"
+    ]).default("and"),
+    children: array(union([
+      FilterConditionSchema,
+      FilterGroupSchema
+    ])).default([]),
+    negate: boolean().default(false)
   }));
   var FilterRowsTransformSchema = object({
     type: literal("filter_rows"),
@@ -45773,16 +45906,23 @@ ${c}
     ]).default("keep_rows").describe(FieldOptions.of({
       special: "radio_group"
     })),
-    where: array(ConditionSchema).min(1).describe(FieldOptions.of({
+    where: array(FilterConditionSchema).min(1).describe(FieldOptions.of({
       label: "Value",
       minLength: 1
-    })).transform((e) => e.filter((e2) => isConditionValueValid(e2.operator, e2.value))).default(() => [
+    })).default(() => [
       {
         column_id: "",
         operator: "==",
-        value: ""
-      }
-    ])
+        value: "",
+        type: "condition",
+        negate: false
+      }
+    ]).transform((e) => ({
+      type: "group",
+      operator: "and",
+      children: e.filter((e2) => isConditionValueValid(e2.operator, e2.value)),
+      negate: false
+    }))
   }), GroupByTransformSchema = object({
     type: literal("group_by"),
     column_ids: array(column_id.describe(FieldOptions.of({
@@ -46008,7 +46148,7 @@ ${c}
         descending: boolean()
       })).optional(),
       query: string().optional(),
-      filters: array(ConditionSchema).optional(),
+      filters: FilterGroupSchema.optional(),
       page_number: number(),
       page_size: number(),
       max_columns: number().nullable().optional()
@@ -46166,9 +46306,9 @@ ${c}
         query: M,
         page_number: E.pageIndex,
         page_size: E.pageSize,
-        filters: Y7.flatMap(_temp2$15)
+        filters: filtersToFilterGroup(Y7)
       });
-      if (S2) w2.catch(_temp3$10);
+      if (S2) w2.catch(_temp2$15);
       else {
         let e2 = await w2;
         r2 = e2.data, c2 = e2.raw_data, d2 = e2.total_rows, h = e2.cell_styles || {}, _2 = e2.cell_hover_texts || {};
@@ -46202,15 +46342,15 @@ ${c}
       rows: await loadTableData((await f({
         page_number: e2,
         page_size: 1,
-        sort: y.length > 0 ? y.map(_temp4$6) : void 0,
+        sort: y.length > 0 ? y.map(_temp3$10) : void 0,
         query: M,
-        filters: Y7.flatMap(_temp5$4),
+        filters: filtersToFilterGroup(Y7),
         max_columns: null
       })).data)
     }), r[48] = Y7, r[49] = f, r[50] = M, r[51] = y, r[52] = l9) : l9 = r[52];
     let u9 = l9, d9;
     r[53] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (d9 = () => {
-      O(_temp6$4);
+      O(_temp4$6);
     }, r[53] = d9) : d9 = r[53];
     let f9 = a9 == null ? void 0 : a9.totalRows, p9;
     r[54] === f9 ? p9 = r[55] : (p9 = [
@@ -46512,21 +46652,15 @@ ${c}
     };
   }
   function _temp2$15(e) {
-    return filterToFilterCondition(e.id, e.value);
-  }
-  function _temp3$10(e) {
     Logger.error(e);
   }
-  function _temp4$6(e) {
+  function _temp3$10(e) {
     return {
       by: e.id,
       descending: e.desc
     };
   }
-  function _temp5$4(e) {
-    return filterToFilterCondition(e.id, e.value);
-  }
-  function _temp6$4(e) {
+  function _temp4$6(e) {
     return e.pageIndex === 0 ? e : {
       ...e,
       pageIndex: 0
@@ -49109,7 +49243,7 @@ ${c}
         descending: boolean()
       })).optional(),
       query: string().optional(),
-      filters: array(ConditionSchema).optional(),
+      filters: FilterGroupSchema.optional(),
       page_number: number(),
       page_size: number()
     })).output(object({
@@ -58999,7 +59133,7 @@ ${c}
         diagram: e.data.diagram
       });
     }
-  }, LazyMermaid = (0, import_react.lazy)(() => import("./mermaid-BbhZNQeB.js").then(async (m2) => {
+  }, LazyMermaid = (0, import_react.lazy)(() => import("./mermaid-CcM8GHeT.js").then(async (m2) => {
     await m2.__tla;
     return m2;
   })), import_compiler_runtime$22 = require_compiler_runtime();
@@ -68770,7 +68904,7 @@ ${c}
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.23.2-dev2"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.23.2-dev21"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var VIRTUAL_FILE_REGEX = /\/@file\/([^\s"&'/]+)\.([\dA-Za-z]+)/g, VirtualFileTracker = class e {
     constructor() {