@svgrid/enterprise 2.6.0 → 2.6.2

package/dist/studio/ui-components.generated.js

@@ -509,6 +509,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -633,6 +640,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -770,6 +784,14 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "default": false,
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -1003,6 +1025,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -1178,6 +1207,14 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "default": false,
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -1404,6 +1441,14 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "default": false,
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -1580,6 +1625,14 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "default": false,
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -1733,6 +1786,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -1870,6 +1930,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -2023,6 +2090,14 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "default": false,
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -2767,6 +2842,14 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "default": false,
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -2943,6 +3026,14 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "default": false,
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -3104,6 +3195,14 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "default": false,
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -3255,6 +3354,14 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "default": false,
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -3440,6 +3547,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -3579,6 +3693,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -3738,6 +3859,14 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "default": false,
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -3922,6 +4051,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -4105,6 +4241,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -4294,6 +4437,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -4864,6 +5014,14 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "default": false,
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -5555,6 +5713,14 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "default": false,
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -5964,6 +6130,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -6267,6 +6440,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "Marks the control invalid (`aria-invalid` + error styling).",
                 "group": "behavior"
             },
+            {
+                "key": "block",
+                "label": "Block",
+                "type": "boolean",
+                "description": "Fill the container instead of the control's own default width. A default width is right for a control sitting on its own; in a form grid a row of inputs each stopping at a different width reads as broken.",
+                "group": "appearance"
+            },
             {
                 "key": "error",
                 "label": "Error",
@@ -6487,6 +6667,20 @@ export const GENERATED_UI_SURFACE = {
                 "type": "boolean",
                 "group": "common"
             },
+            {
+                "key": "groupBy",
+                "label": "Group By",
+                "type": "json",
+                "description": "Group the rows by these column ids, outermost first - `['region', 'country']` rolls country up inside region. ```svelte <SvGrid {data} {columns} {features} groupBy={['department']} /> ``` The prop seeds the group-by list and re-applies whenever it changes, so it works both as initial state and as a controlled value. The column menu and `api.setGroupBy()` write the same state; a change from either survives until this prop's own value changes. Ignored when `treeData` is set - a row cannot be both a hierarchy node and bucketed under a group banner.",
+                "group": "common"
+            },
+            {
+                "key": "expanded",
+                "label": "Expanded",
+                "type": "json",
+                "description": "Which group / tree rows are expanded, keyed by row id. Expansion is owned by the engine by default; pass this prop to hoist it (saved views, \"expand everything on load\", persisted UI state). Like `groupBy` it seeds the state and re-applies whenever it changes. Group row ids are built from the grouping path, not the display label: `group_department_Engineering`, and one level deeper `group_department_Engineering_role_Senior`. Tree rows key off the engine's row id instead (set `getRowId` to make that your own id). Prefer capturing the map from `onExpandedChange` over hand-building these keys.",
+                "group": "common"
+            },
             {
                 "key": "groupFooters",
                 "label": "Group Footers",
@@ -6889,6 +7083,13 @@ export const GENERATED_UI_SURFACE = {
                 "description": "The sort state to start in - `{ id, desc }` entries. Use with `externalSort` when the initial ordering is decided server-side (e.g. a URL `?sort=` param read in a SvelteKit `load`), so the header sort indicators match the already- sorted data on first render. Applied once at mount; user sorting takes over.",
                 "group": "common"
             },
+            {
+                "key": "initialAdvancedFilter",
+                "label": "Initial Advanced Filter",
+                "type": "json",
+                "description": "The advanced-filter expression to start in (Pro). Applied once at mount; change it afterwards through `api.setAdvancedFilter()`. Filtering only happens once `@svgrid/enterprise`'s `enableAdvancedFilter()` has registered a compiler - without it the expression is stored and reported but no rows are removed, so the free grid degrades to a no-op rather than to a wrong row set.",
+                "group": "common"
+            },
             {
                 "key": "externalFilter",
                 "label": "External Filter",
@@ -7039,6 +7240,12 @@ export const GENERATED_UI_SURFACE = {
                 "prop": "onPivotModeChange",
                 "description": "Fired when the in-grid Pivot toggle flips `pivotMode`."
             },
+            {
+                "key": "expandedChange",
+                "label": "Expanded Change",
+                "prop": "onExpandedChange",
+                "description": "Fired whenever the expanded set changes - chevron clicks, `api.setRowExpanded()`, `expandAllGroups()` / `collapseAllGroups()`. Receives the full next map, so it can be written straight back into `expanded` for a controlled setup."
+            },
             {
                 "key": "paginationChange",
                 "label": "Pagination Change",
@@ -7069,6 +7276,12 @@ export const GENERATED_UI_SURFACE = {
                 "prop": "onSortingChange",
                 "description": "Fires whenever the sort clauses change. Receives the new array of `{ id, desc }` entries. Pair with `externalSort={true}` when the consumer wants to own the row ordering."
             },
+            {
+                "key": "advancedFilterChange",
+                "label": "Advanced Filter Change",
+                "prop": "onAdvancedFilterChange",
+                "description": "Fires whenever the advanced-filter expression changes, whatever changed it: `api.setAdvancedFilter()`, `clearAllFilters()`, or the toolbar's clear control. The panel that authors the expression is mounted by you, outside the grid, so it cannot see a change the grid made on its own. Without this, clearing from the toolbar leaves that panel showing a filter the grid is no longer applying. Feed this back into the panel's `expression` prop to keep them agreeing."
+            },
             {
                 "key": "filtersChange",
                 "label": "Filters Change",

package/dist/sveltekit/in-memory.js

@@ -1,5 +1,6 @@
 import { resolveIdField } from '../schema';
 import { planQuery } from './query-plan';
+import { compilePredicate } from '../expressions/compile';
 import { aggregateRows } from '../sources/aggregate';
 function asString(v) {
     return v == null ? '' : String(v);
@@ -43,6 +44,39 @@ function matches(row, plan) {
     }
     return plan.where.every((p) => matchesPredicate(row, p));
 }
+/**
+ * Reduce one already-bucketed group to a single aggregate value.
+ *
+ * Semantics deliberately mirror the SQL `planToSql` emits, so the in-memory
+ * source and a real database agree:
+ *   - `count` is COUNT(*): rows in the group, including null-valued ones.
+ *   - the rest ignore non-numeric / null values, and yield null for an empty
+ *     numeric set (SQL returns NULL for SUM/AVG/MIN/MAX over no rows).
+ */
+function aggregate(rows, field, fn) {
+    if (fn === 'count')
+        return rows.length;
+    const nums = [];
+    for (const row of rows) {
+        const n = Number(row[field]);
+        if (Number.isFinite(n))
+            nums.push(n);
+    }
+    if (nums.length === 0)
+        return null;
+    switch (fn) {
+        case 'sum':
+            return nums.reduce((s, n) => s + n, 0);
+        case 'avg':
+            return nums.reduce((s, n) => s + n, 0) / nums.length;
+        case 'min':
+            return Math.min(...nums);
+        case 'max':
+            return Math.max(...nums);
+        default:
+            return null;
+    }
+}
 function sortRows(rows, orderBy) {
     if (orderBy.length === 0)
         return rows;
@@ -71,10 +105,69 @@ export function createInMemoryDataSource(initial, schema) {
     return {
         async getRows(request) {
             const plan = planQuery(schema, request);
-            const filtered = sortRows(store.filter((r) => matches(r, plan)), plan.orderBy);
+            let filtered = store.filter((r) => matches(r, plan));
+            // Advanced filter. `planQuery` only admits an expression whose columns
+            // are all on the schema, so reaching here means it is safe to run. If it
+            // was rejected, or fails to compile, we must NOT acknowledge it - the
+            // grid then tells the user the filter did not run rather than showing a
+            // superset that looks filtered.
+            let appliedExpression = false;
+            if (plan.expression) {
+                const predicate = compilePredicate(plan.expression, {
+                    getValue: (row, columnId) => row[columnId],
+                    rows: filtered,
+                });
+                if (predicate) {
+                    filtered = filtered.filter(predicate);
+                    appliedExpression = true;
+                }
+            }
+            // Grouped request: return one row per distinct key at this level, each
+            // carrying the requested aggregates. The chosen path is already in
+            // `plan.where`, so `filtered` is exactly this group's slice of the data.
+            // Reference behaviour for what a SQL backend does with `planToSql`'s
+            // `select` / `groupByText` / `countText`.
+            if (plan.groupBy) {
+                const groupField = plan.groupBy;
+                const buckets = new Map();
+                for (const row of filtered) {
+                    const key = asString(row[groupField]);
+                    const bucket = buckets.get(key);
+                    if (bucket)
+                        bucket.push(row);
+                    else
+                        buckets.set(key, [row]);
+                }
+                const groups = [...buckets.entries()].map(([key, rows]) => {
+                    const out = { [groupField]: key };
+                    for (const agg of plan.aggregations ?? []) {
+                        out[agg.field] = aggregate(rows, agg.field, agg.fn);
+                    }
+                    return out;
+                });
+                // Sort by the group key unless the request sorted on a column we
+                // actually produced (the key or an aggregate).
+                const produced = new Set([
+                    groupField,
+                    ...(plan.aggregations ?? []).map((a) => a.field),
+                ]);
+                const groupOrder = plan.orderBy.filter((o) => produced.has(o.field));
+                const sorted = groupOrder.length
+                    ? sortRows(groups, groupOrder)
+                    : sortRows(groups, [{ field: groupField, desc: false }]);
+                return {
+                    rows: sorted.slice(plan.offset, plan.offset + plan.limit),
+                    // The count is DISTINCT GROUPS, not underlying rows - the grid sizes
+                    // its scrollbar and paging from this.
+                    rowCount: sorted.length,
+                    appliedExpression,
+                };
+            }
+            const sortedLeaves = sortRows(filtered, plan.orderBy);
             return {
-                rows: filtered.slice(plan.offset, plan.offset + plan.limit),
-                rowCount: filtered.length,
+                rows: sortedLeaves.slice(plan.offset, plan.offset + plan.limit),
+                rowCount: sortedLeaves.length,
+                appliedExpression,
             };
         },
         async createRow(input) {

package/dist/sveltekit/query-plan.d.ts

@@ -10,7 +10,7 @@
  * Unknown column names in the request are dropped, so a client cannot smuggle
  * arbitrary identifiers through to SQL.
  */
-import type { RowData, ServerRequest } from '@svgrid/grid';
+import type { GridPredicateExpr, RowData, ServerRequest } from '@svgrid/grid';
 import type { EntityFieldType, EntitySchema } from '../schema';
 /** Normalized predicate operators (a stable superset of the grid's filter operators). */
 export type PlanOp = 'eq' | 'contains' | 'startsWith' | 'gt' | 'lt' | 'between' | 'isBlank' | 'in';
@@ -24,6 +24,11 @@ export type PlanPredicate = {
     /** Operands for `in` (set / facet filter). */
     values?: unknown[];
 };
+/** An aggregate to compute per group. */
+export type PlanAggregate = {
+    field: string;
+    fn: 'sum' | 'avg' | 'min' | 'max' | 'count';
+};
 export type QueryPlan = {
     /** AND-combined column predicates. */
     where: PlanPredicate[];
@@ -38,6 +43,32 @@ export type QueryPlan = {
     }>;
     limit: number;
     offset: number;
+    /**
+     * The column to GROUP BY for this request, or null for a flat / leaf query.
+     *
+     * Server-side grouping is one level at a time: the grid asks for the distinct
+     * keys at the current level, and expanding a group is another request with
+     * that key appended to `groupKeys`. The path already chosen arrives as
+     * ordinary equality predicates in `where`, so a backend only ever has to
+     * handle "filter, then group by one column".
+     *
+     * Optional so a hand-built plan (and every plan written before server-side
+     * grouping existed) stays valid; `planQuery` always sets it.
+     */
+    groupBy?: string | null;
+    /** Aggregates to compute alongside `groupBy`. Empty/absent for a leaf query. */
+    aggregations?: PlanAggregate[];
+    /**
+     * The advanced-filter expression, present ONLY when every column it
+     * references is on the schema.
+     *
+     * Rejected whole rather than in part. Dropping one clause of an AND makes the
+     * result broader, which for a filter means showing rows the user excluded -
+     * so a half-understood expression is worse than an ignored one. When this is
+     * absent but the request carried an expression, the backend must not
+     * acknowledge it (see `ServerResult.appliedExpression`).
+     */
+    expression?: GridPredicateExpr;
 };
 /** Coerce a raw string request value to the field's runtime type for correct comparisons. */
 export declare function coerce(type: EntityFieldType, raw: unknown): unknown;

package/dist/sveltekit/query-plan.js

@@ -72,5 +72,92 @@ export function planQuery(schema, request) {
     const orderBy = (request.sortModel ?? [])
         .filter((s) => fields.has(s.id))
         .map((s) => ({ field: s.id, desc: !!s.desc }));
-    return { where, search, orderBy, limit: request.pageSize, offset: request.startRow };
+    // ---- Server-side grouping ---------------------------------------------
+    // Same whitelist rule as the filters above: only schema fields reach the
+    // plan, so a client cannot group by or aggregate an arbitrary identifier.
+    const groupCols = (request.groupBy ?? []).filter((f) => fields.has(f));
+    const groupKeys = request.groupKeys ?? [];
+    // The already-chosen path becomes plain equality predicates, so the backend
+    // only ever sees "filter, then group by one column".
+    for (let i = 0; i < groupKeys.length && i < groupCols.length; i += 1) {
+        const field = groupCols[i];
+        const def = fields.get(field);
+        where.push({ field, op: 'eq', value: coerce(def.type, groupKeys[i]) });
+    }
+    // Above the innermost level the grid wants GROUP rows; at or below it, leaves.
+    const groupBy = groupKeys.length < groupCols.length ? (groupCols[groupKeys.length] ?? null) : null;
+    const aggregations = groupBy
+        ? (request.aggregations ?? [])
+            .filter((a) => fields.has(a.col))
+            .map((a) => ({ field: a.col, fn: a.fn }))
+        : [];
+    // ---- Advanced filter ---------------------------------------------------
+    // Same whitelist, stricter consequence: if ANY referenced column is off the
+    // schema the whole expression is dropped. Keeping the understood parts would
+    // silently widen the result set.
+    const expression = admitExpression(request.filterModel?.expression, fields);
+    return {
+        where,
+        search,
+        orderBy,
+        limit: request.pageSize,
+        offset: request.startRow,
+        groupBy,
+        aggregations,
+        ...(expression ? { expression } : {}),
+    };
+}
+/** Every column id an expression reads, so it can be whitelisted as a unit. */
+function expressionColumns(expr, out = new Set()) {
+    const scalar = (s) => {
+        switch (s.kind) {
+            case 'col':
+                out.add(s.id);
+                break;
+            case 'agg':
+                out.add(s.column);
+                break;
+            case 'neg':
+                scalar(s.expr);
+                break;
+            case 'bin':
+                scalar(s.left);
+                scalar(s.right);
+                break;
+            case 'func':
+                s.args.forEach(scalar);
+                break;
+            default:
+                break;
+        }
+    };
+    switch (expr.kind) {
+        case 'and':
+        case 'or':
+            expr.parts.forEach((p) => expressionColumns(p, out));
+            break;
+        case 'not':
+            expressionColumns(expr.expr, out);
+            break;
+        case 'cmp':
+            out.add(expr.column);
+            break;
+        case 'scalarCmp':
+            scalar(expr.left);
+            scalar(expr.right);
+            break;
+        default:
+            break;
+    }
+    return out;
+}
+/** Return the expression only when every column it touches is on the schema. */
+function admitExpression(expr, fields) {
+    if (!expr)
+        return undefined;
+    for (const col of expressionColumns(expr)) {
+        if (!fields.has(col))
+            return undefined;
+    }
+    return expr;
 }