@adminforth/dashboard 1.6.0 → 1.8.0

package/dist/schema/widgets/charts.js

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { ChartFieldRefSchema, FunnelQueryConfigSchema, QueryConfigSchema, WidgetBaseSchema, } from './common.js';
+import { ChartFieldRefSchema, QueryConfigSchema, WidgetBaseSchema, } from './common.js';
 const ChartBaseSchema = z.object({
     title: z.string().optional(),
 }).strict();
@@ -80,7 +80,7 @@ export const HistogramChartWidgetConfigSchema = WidgetBaseSchema.extend({
 export const FunnelChartWidgetConfigSchema = WidgetBaseSchema.extend({
     target: z.literal('chart'),
     chart: FunnelChartSchema,
-    query: FunnelQueryConfigSchema,
+    query: QueryConfigSchema,
 });
 export const ChartWidgetTargetConfigSchema = z.union([
     LineChartWidgetConfigSchema,

package/dist/schema/widgets/common.d.ts

@@ -117,7 +117,8 @@ export declare const QueryCalcItemSchema: z.ZodObject<{
     calc: z.ZodString;
     as: z.ZodString;
 }, z.core.$strict>;
-export declare const QueryConfigSchema: z.ZodObject<{
+export declare const QueryConfigSchema: z.ZodUnion<readonly [z.ZodObject<{
+    source: z.ZodOptional<z.ZodLiteral<"resource">>;
     resource: z.ZodString;
     select: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
         field: z.ZodString;
@@ -190,9 +191,9 @@ export declare const QueryConfigSchema: z.ZodObject<{
         as: z.ZodString;
     }, z.core.$strict>>>;
     formatting: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
-}, z.core.$strict>;
-export declare const FunnelQueryConfigSchema: z.ZodObject<{
-    steps: z.ZodArray<z.ZodObject<{
+}, z.core.$strict>, z.ZodObject<{
+    source: z.ZodLiteral<"steps">;
+    steps: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
         name: z.ZodString;
         resource: z.ZodString;
         metric: z.ZodObject<{
@@ -210,12 +211,40 @@ export declare const FunnelQueryConfigSchema: z.ZodObject<{
             filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
         }, z.core.$strict>;
         filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
-    }, z.core.$strict>>;
+    }, z.core.$strict>, z.ZodObject<{
+        name: z.ZodString;
+        resource: z.ZodString;
+        select: z.ZodArray<z.ZodObject<{
+            agg: z.ZodEnum<{
+                sum: "sum";
+                count: "count";
+                count_distinct: "count_distinct";
+                avg: "avg";
+                min: "min";
+                max: "max";
+                median: "median";
+            }>;
+            field: z.ZodOptional<z.ZodString>;
+            as: z.ZodString;
+            filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+        }, z.core.$strict>>;
+        filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+    }, z.core.$strict>]>>;
     calcs: z.ZodOptional<z.ZodArray<z.ZodObject<{
         calc: z.ZodString;
         as: z.ZodString;
     }, z.core.$strict>>>;
-}, z.core.$strict>;
+    order_by: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        field: z.ZodString;
+        direction: z.ZodOptional<z.ZodEnum<{
+            asc: "asc";
+            desc: "desc";
+        }>>;
+    }, z.core.$strict>>>;
+    limit: z.ZodOptional<z.ZodNumber>;
+    offset: z.ZodOptional<z.ZodNumber>;
+    formatting: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+}, z.core.$strict>]>;
 export declare const WidgetPersistedFieldsSchema: z.ZodObject<{
     id: z.ZodString;
     group_id: z.ZodString;

package/dist/schema/widgets/common.js

@@ -123,7 +123,8 @@ export const QueryCalcItemSchema = z.object({
     calc: z.string(),
     as: z.string(),
 }).strict();
-export const QueryConfigSchema = z.object({
+const ResourceQueryConfigSchema = z.object({
+    source: z.literal('resource').optional(),
     resource: z.string(),
     select: z.array(QuerySelectItemSchema).optional(),
     sparkline: z.object({
@@ -141,16 +142,33 @@ export const QueryConfigSchema = z.object({
     calcs: z.array(QueryCalcItemSchema).optional(),
     formatting: z.record(z.string(), z.unknown()).optional(),
 }).strict();
-const FunnelQueryStepSchema = z.object({
+const StepsQueryMetricStepSchema = z.object({
     name: z.string(),
     resource: z.string(),
     metric: QueryAggregateSelectItemSchema,
     filters: FilterExpressionSchema.optional(),
 }).strict();
-export const FunnelQueryConfigSchema = z.object({
-    steps: z.array(FunnelQueryStepSchema).min(1),
-    calcs: z.array(QueryCalcItemSchema).optional(),
+const StepsQuerySelectStepSchema = z.object({
+    name: z.string(),
+    resource: z.string(),
+    select: z.array(QueryAggregateSelectItemSchema).min(1),
+    filters: FilterExpressionSchema.optional(),
 }).strict();
+export const QueryConfigSchema = z.union([
+    ResourceQueryConfigSchema,
+    z.object({
+        source: z.literal('steps'),
+        steps: z.array(z.union([
+            StepsQueryMetricStepSchema,
+            StepsQuerySelectStepSchema,
+        ])).min(1),
+        calcs: z.array(QueryCalcItemSchema).optional(),
+        order_by: z.array(QueryOrderByItemSchema).optional(),
+        limit: z.number().int().positive().optional(),
+        offset: z.number().int().nonnegative().optional(),
+        formatting: z.record(z.string(), z.unknown()).optional(),
+    }).strict(),
+]);
 export const WidgetPersistedFieldsSchema = z.object({
     id: z.string(),
     group_id: z.string(),

package/dist/schema/widgets/gauge-card.d.ts

@@ -95,7 +95,8 @@ export declare const GaugeCardWidgetConfigSchema: z.ZodObject<{
         }, z.core.$strict>>;
         color: z.ZodOptional<z.ZodString>;
     }, z.core.$strict>;
-    query: z.ZodObject<{
+    query: z.ZodUnion<readonly [z.ZodObject<{
+        source: z.ZodOptional<z.ZodLiteral<"resource">>;
         resource: z.ZodString;
         select: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
             field: z.ZodString;
@@ -168,5 +169,58 @@ export declare const GaugeCardWidgetConfigSchema: z.ZodObject<{
             as: z.ZodString;
         }, z.core.$strict>>>;
         formatting: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
-    }, z.core.$strict>;
+    }, z.core.$strict>, z.ZodObject<{
+        source: z.ZodLiteral<"steps">;
+        steps: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
+            name: z.ZodString;
+            resource: z.ZodString;
+            metric: z.ZodObject<{
+                agg: z.ZodEnum<{
+                    sum: "sum";
+                    count: "count";
+                    count_distinct: "count_distinct";
+                    avg: "avg";
+                    min: "min";
+                    max: "max";
+                    median: "median";
+                }>;
+                field: z.ZodOptional<z.ZodString>;
+                as: z.ZodString;
+                filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+            }, z.core.$strict>;
+            filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+        }, z.core.$strict>, z.ZodObject<{
+            name: z.ZodString;
+            resource: z.ZodString;
+            select: z.ZodArray<z.ZodObject<{
+                agg: z.ZodEnum<{
+                    sum: "sum";
+                    count: "count";
+                    count_distinct: "count_distinct";
+                    avg: "avg";
+                    min: "min";
+                    max: "max";
+                    median: "median";
+                }>;
+                field: z.ZodOptional<z.ZodString>;
+                as: z.ZodString;
+                filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+            }, z.core.$strict>>;
+            filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+        }, z.core.$strict>]>>;
+        calcs: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            calc: z.ZodString;
+            as: z.ZodString;
+        }, z.core.$strict>>>;
+        order_by: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            field: z.ZodString;
+            direction: z.ZodOptional<z.ZodEnum<{
+                asc: "asc";
+                desc: "desc";
+            }>>;
+        }, z.core.$strict>>>;
+        limit: z.ZodOptional<z.ZodNumber>;
+        offset: z.ZodOptional<z.ZodNumber>;
+        formatting: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    }, z.core.$strict>]>;
 }, z.core.$strict>;

package/dist/schema/widgets/kpi-card.d.ts

@@ -135,7 +135,8 @@ export declare const KpiCardWidgetConfigSchema: z.ZodObject<{
             }, z.core.$strict>>;
         }, z.core.$strict>>;
     }, z.core.$strict>;
-    query: z.ZodObject<{
+    query: z.ZodUnion<readonly [z.ZodObject<{
+        source: z.ZodOptional<z.ZodLiteral<"resource">>;
         resource: z.ZodString;
         select: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
             field: z.ZodString;
@@ -208,5 +209,58 @@ export declare const KpiCardWidgetConfigSchema: z.ZodObject<{
             as: z.ZodString;
         }, z.core.$strict>>>;
         formatting: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
-    }, z.core.$strict>;
+    }, z.core.$strict>, z.ZodObject<{
+        source: z.ZodLiteral<"steps">;
+        steps: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
+            name: z.ZodString;
+            resource: z.ZodString;
+            metric: z.ZodObject<{
+                agg: z.ZodEnum<{
+                    sum: "sum";
+                    count: "count";
+                    count_distinct: "count_distinct";
+                    avg: "avg";
+                    min: "min";
+                    max: "max";
+                    median: "median";
+                }>;
+                field: z.ZodOptional<z.ZodString>;
+                as: z.ZodString;
+                filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+            }, z.core.$strict>;
+            filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+        }, z.core.$strict>, z.ZodObject<{
+            name: z.ZodString;
+            resource: z.ZodString;
+            select: z.ZodArray<z.ZodObject<{
+                agg: z.ZodEnum<{
+                    sum: "sum";
+                    count: "count";
+                    count_distinct: "count_distinct";
+                    avg: "avg";
+                    min: "min";
+                    max: "max";
+                    median: "median";
+                }>;
+                field: z.ZodOptional<z.ZodString>;
+                as: z.ZodString;
+                filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+            }, z.core.$strict>>;
+            filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+        }, z.core.$strict>]>>;
+        calcs: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            calc: z.ZodString;
+            as: z.ZodString;
+        }, z.core.$strict>>>;
+        order_by: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            field: z.ZodString;
+            direction: z.ZodOptional<z.ZodEnum<{
+                asc: "asc";
+                desc: "desc";
+            }>>;
+        }, z.core.$strict>>>;
+        limit: z.ZodOptional<z.ZodNumber>;
+        offset: z.ZodOptional<z.ZodNumber>;
+        formatting: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    }, z.core.$strict>]>;
 }, z.core.$strict>;

package/dist/schema/widgets/pivot-table.d.ts

@@ -119,7 +119,8 @@ export declare const PivotTableWidgetConfigSchema: z.ZodObject<{
             }>>;
         }, z.core.$strict>>;
     }, z.core.$strict>;
-    query: z.ZodObject<{
+    query: z.ZodUnion<readonly [z.ZodObject<{
+        source: z.ZodOptional<z.ZodLiteral<"resource">>;
         resource: z.ZodString;
         select: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
             field: z.ZodString;
@@ -192,5 +193,58 @@ export declare const PivotTableWidgetConfigSchema: z.ZodObject<{
             as: z.ZodString;
         }, z.core.$strict>>>;
         formatting: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
-    }, z.core.$strict>;
+    }, z.core.$strict>, z.ZodObject<{
+        source: z.ZodLiteral<"steps">;
+        steps: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
+            name: z.ZodString;
+            resource: z.ZodString;
+            metric: z.ZodObject<{
+                agg: z.ZodEnum<{
+                    sum: "sum";
+                    count: "count";
+                    count_distinct: "count_distinct";
+                    avg: "avg";
+                    min: "min";
+                    max: "max";
+                    median: "median";
+                }>;
+                field: z.ZodOptional<z.ZodString>;
+                as: z.ZodString;
+                filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+            }, z.core.$strict>;
+            filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+        }, z.core.$strict>, z.ZodObject<{
+            name: z.ZodString;
+            resource: z.ZodString;
+            select: z.ZodArray<z.ZodObject<{
+                agg: z.ZodEnum<{
+                    sum: "sum";
+                    count: "count";
+                    count_distinct: "count_distinct";
+                    avg: "avg";
+                    min: "min";
+                    max: "max";
+                    median: "median";
+                }>;
+                field: z.ZodOptional<z.ZodString>;
+                as: z.ZodString;
+                filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+            }, z.core.$strict>>;
+            filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+        }, z.core.$strict>]>>;
+        calcs: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            calc: z.ZodString;
+            as: z.ZodString;
+        }, z.core.$strict>>>;
+        order_by: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            field: z.ZodString;
+            direction: z.ZodOptional<z.ZodEnum<{
+                asc: "asc";
+                desc: "desc";
+            }>>;
+        }, z.core.$strict>>>;
+        limit: z.ZodOptional<z.ZodNumber>;
+        offset: z.ZodOptional<z.ZodNumber>;
+        formatting: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    }, z.core.$strict>]>;
 }, z.core.$strict>;

package/dist/schema/widgets/table.d.ts

@@ -53,7 +53,8 @@ export declare const TableWidgetConfigSchema: z.ZodObject<{
         pagination: z.ZodOptional<z.ZodBoolean>;
         page_size: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strict>>;
-    query: z.ZodObject<{
+    query: z.ZodUnion<readonly [z.ZodObject<{
+        source: z.ZodOptional<z.ZodLiteral<"resource">>;
         resource: z.ZodString;
         select: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
             field: z.ZodString;
@@ -126,5 +127,58 @@ export declare const TableWidgetConfigSchema: z.ZodObject<{
             as: z.ZodString;
         }, z.core.$strict>>>;
         formatting: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
-    }, z.core.$strict>;
+    }, z.core.$strict>, z.ZodObject<{
+        source: z.ZodLiteral<"steps">;
+        steps: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
+            name: z.ZodString;
+            resource: z.ZodString;
+            metric: z.ZodObject<{
+                agg: z.ZodEnum<{
+                    sum: "sum";
+                    count: "count";
+                    count_distinct: "count_distinct";
+                    avg: "avg";
+                    min: "min";
+                    max: "max";
+                    median: "median";
+                }>;
+                field: z.ZodOptional<z.ZodString>;
+                as: z.ZodString;
+                filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+            }, z.core.$strict>;
+            filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+        }, z.core.$strict>, z.ZodObject<{
+            name: z.ZodString;
+            resource: z.ZodString;
+            select: z.ZodArray<z.ZodObject<{
+                agg: z.ZodEnum<{
+                    sum: "sum";
+                    count: "count";
+                    count_distinct: "count_distinct";
+                    avg: "avg";
+                    min: "min";
+                    max: "max";
+                    median: "median";
+                }>;
+                field: z.ZodOptional<z.ZodString>;
+                as: z.ZodString;
+                filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+            }, z.core.$strict>>;
+            filters: z.ZodOptional<z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>>;
+        }, z.core.$strict>]>>;
+        calcs: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            calc: z.ZodString;
+            as: z.ZodString;
+        }, z.core.$strict>>>;
+        order_by: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            field: z.ZodString;
+            direction: z.ZodOptional<z.ZodEnum<{
+                asc: "asc";
+                desc: "desc";
+            }>>;
+        }, z.core.$strict>>>;
+        limit: z.ZodOptional<z.ZodNumber>;
+        offset: z.ZodOptional<z.ZodNumber>;
+        formatting: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    }, z.core.$strict>]>;
 }, z.core.$strict>;

package/dist/services/widgetDataService.js

@@ -27,13 +27,11 @@ const FILTER_OPERATORS = {
 };
 export function getWidgetData(adminforth_1, widget_1) {
     return __awaiter(this, arguments, void 0, function* (adminforth, widget, options = {}) {
-        var _a, _b;
+        var _a;
         if (!('query' in widget)) {
             return null;
         }
-        const data = 'steps' in widget.query
-            ? yield getFunnelWidgetData(adminforth, widget.query, (_a = options.variables) !== null && _a !== void 0 ? _a : {})
-            : yield getQueryWidgetData(adminforth, widget.query, (_b = options.variables) !== null && _b !== void 0 ? _b : {});
+        const data = yield getQueryWidgetData(adminforth, widget.query, (_a = options.variables) !== null && _a !== void 0 ? _a : {});
         if (widget.target !== 'table' || !options.pagination) {
             return data;
         }
@@ -48,37 +46,12 @@ export function getWidgetData(adminforth_1, widget_1) {
             } });
     });
 }
-function getFunnelWidgetData(adminforth, query, variables) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const rows = yield Promise.all(query.steps.map((step) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const valueField = step.metric.as;
-            const [values = {}] = yield getAggregateRows(adminforth, step.resource, step.filters, [step.metric], []);
-            const row = {
-                name: step.name,
-                resource: step.resource,
-                [valueField]: (_a = values[valueField]) !== null && _a !== void 0 ? _a : 0,
-            };
-            for (const calc of (_b = query.calcs) !== null && _b !== void 0 ? _b : []) {
-                row[calc.as] = evaluateCalc(calc.calc, row, variables);
-            }
-            return row;
-        })));
-        return {
-            kind: 'aggregate',
-            columns: [
-                'name',
-                ...Array.from(new Set(query.steps.map((step) => step.metric.as))),
-                ...Array.from(new Set(((_a = query.calcs) !== null && _a !== void 0 ? _a : []).map((calc) => calc.as))),
-            ],
-            rows,
-        };
-    });
-}
 function getQueryWidgetData(adminforth, query, variables) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
+        if (isStepsQuery(query)) {
+            return getStepsQueryData(adminforth, query, variables);
+        }
         const metricSelect = getSingleAggregateMetricSelect(query);
         if (metricSelect) {
             return getMetricWidgetData(adminforth, query, metricSelect);
@@ -102,6 +75,32 @@ function getQueryWidgetData(adminforth, query, variables) {
         };
     });
 }
+function getStepsQueryData(adminforth, query, variables) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        const rows = yield Promise.all(query.steps.map((step) => __awaiter(this, void 0, void 0, function* () {
+            const select = getStepSelect(step);
+            const [values = {}] = yield getAggregateRows(adminforth, step.resource, step.filters, select, []);
+            const row = buildCalculatedRow(Object.assign({ name: step.name, resource: step.resource }, values), select, query.calcs, variables);
+            return row;
+        })));
+        const orderedRows = sortRows(rows, query.order_by);
+        const slicedRows = typeof query.limit === 'number'
+            ? orderedRows.slice((_a = query.offset) !== null && _a !== void 0 ? _a : 0, ((_b = query.offset) !== null && _b !== void 0 ? _b : 0) + query.limit)
+            : orderedRows.slice((_c = query.offset) !== null && _c !== void 0 ? _c : 0);
+        const columns = Array.from(new Set([
+            'name',
+            'resource',
+            ...query.steps.flatMap((step) => getStepSelect(step).map((item) => item.as)),
+            ...((_d = query.calcs) !== null && _d !== void 0 ? _d : []).map((item) => item.as),
+        ]));
+        return {
+            kind: 'aggregate',
+            columns,
+            rows: slicedRows,
+        };
+    });
+}
 function getMetricWidgetData(adminforth, query, metric) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -292,6 +291,12 @@ function getSingleAggregateMetricSelect(query) {
     }
     return aggregateItems[0];
 }
+function isStepsQuery(query) {
+    return query.source === 'steps';
+}
+function getStepSelect(step) {
+    return 'select' in step ? step.select : [step.metric];
+}
 function isFieldSelectItem(item) {
     return 'field' in item && !('agg' in item);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/dashboard",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/schema/api.ts

@@ -2,7 +2,6 @@ import { toJSONSchema, z } from 'zod'
 import {
   BarChartSchema,
   FunnelChartSchema,
-  FunnelQueryConfigSchema,
   GaugeCardViewConfigSchema,
   HistogramChartSchema,
   KpiCardViewConfigSchema,
@@ -153,7 +152,7 @@ const ConfigurableHistogramChartWidgetConfigSchema = WidgetEditableBaseSchema.ex
 const ConfigurableFunnelChartWidgetConfigSchema = WidgetEditableBaseSchema.extend({
   target: z.literal('chart'),
   chart: FunnelChartSchema,
-  query: FunnelQueryConfigSchema,
+  query: QueryConfigSchema,
 })
 
 const ConfigurablePivotTableWidgetConfigSchema = WidgetEditableBaseSchema.extend({

package/schema/widget.ts

@@ -33,7 +33,6 @@ export {
 } from './widgets/table.js'
 export {
   EmptyWidgetConfigSchema,
-  FunnelQueryConfigSchema,
   QueryConfigSchema,
   WidgetEditableBaseSchema,
 } from './widgets/common.js'

package/schema/widgets/charts.ts

@@ -1,7 +1,6 @@
 import { z } from 'zod'
 import {
   ChartFieldRefSchema,
-  FunnelQueryConfigSchema,
   QueryConfigSchema,
   WidgetBaseSchema,
 } from './common.js'
@@ -100,7 +99,7 @@ export const HistogramChartWidgetConfigSchema = WidgetBaseSchema.extend({
 export const FunnelChartWidgetConfigSchema = WidgetBaseSchema.extend({
   target: z.literal('chart'),
   chart: FunnelChartSchema,
-  query: FunnelQueryConfigSchema,
+  query: QueryConfigSchema,
 })
 
 export const ChartWidgetTargetConfigSchema = z.union([

package/schema/widgets/common.ts

@@ -140,7 +140,8 @@ export const QueryCalcItemSchema = z.object({
   as: z.string(),
 }).strict()
 
-export const QueryConfigSchema = z.object({
+const ResourceQueryConfigSchema = z.object({
+  source: z.literal('resource').optional(),
   resource: z.string(),
   select: z.array(QuerySelectItemSchema).optional(),
   sparkline: z.object({
@@ -159,18 +160,36 @@ export const QueryConfigSchema = z.object({
   formatting: z.record(z.string(), z.unknown()).optional(),
 }).strict()
 
-const FunnelQueryStepSchema = z.object({
+const StepsQueryMetricStepSchema = z.object({
   name: z.string(),
   resource: z.string(),
   metric: QueryAggregateSelectItemSchema,
   filters: FilterExpressionSchema.optional(),
 }).strict()
 
-export const FunnelQueryConfigSchema = z.object({
-  steps: z.array(FunnelQueryStepSchema).min(1),
-  calcs: z.array(QueryCalcItemSchema).optional(),
+const StepsQuerySelectStepSchema = z.object({
+  name: z.string(),
+  resource: z.string(),
+  select: z.array(QueryAggregateSelectItemSchema).min(1),
+  filters: FilterExpressionSchema.optional(),
 }).strict()
 
+export const QueryConfigSchema = z.union([
+  ResourceQueryConfigSchema,
+  z.object({
+    source: z.literal('steps'),
+    steps: z.array(z.union([
+      StepsQueryMetricStepSchema,
+      StepsQuerySelectStepSchema,
+    ])).min(1),
+    calcs: z.array(QueryCalcItemSchema).optional(),
+    order_by: z.array(QueryOrderByItemSchema).optional(),
+    limit: z.number().int().positive().optional(),
+    offset: z.number().int().nonnegative().optional(),
+    formatting: z.record(z.string(), z.unknown()).optional(),
+  }).strict(),
+])
+
 export const WidgetPersistedFieldsSchema = z.object({
   id: z.string(),
   group_id: z.string(),