@carto/api-client 0.5.5-alpha.0 → 0.5.6-alpha.0

package/src/widget-sources/widget-remote-source.ts

@@ -17,7 +17,7 @@ import type {
   TimeSeriesRequestOptions,
   TimeSeriesResponse,
 } from './types.js';
-import {normalizeObjectKeys} from '../utils.js';
+import {assert, normalizeObjectKeys} from '../utils.js';
 import {DEFAULT_TILE_RESOLUTION} from '../constants-internal.js';
 import {WidgetSource, type WidgetSourceProps} from './widget-source.js';
 import type {Filters} from '../types.js';
@@ -74,7 +74,11 @@ export abstract class WidgetRemoteSource<
       spatialFiltersMode,
       ...params
     } = options;
-    const {column, operation, operationColumn} = params;
+    const {column, operation, operationColumn, operationExp} = params;
+
+    if (operation === 'custom') {
+      assert(operationExp, 'operationExp is required for custom operation');
+    }
 
     type CategoriesModelResponse = {rows: {name: string; value: number}[]};
 
@@ -88,6 +92,7 @@ export abstract class WidgetRemoteSource<
       params: {
         column,
         operation,
+        operationExp,
         operationColumn: operationColumn || column,
       },
       opts: {signal, headers: this.props.headers},
@@ -143,6 +148,10 @@ export abstract class WidgetRemoteSource<
 
     type FormulaModelResponse = {rows: {value: number}[]};
 
+    if (operation === 'custom') {
+      assert(operationExp, 'operationExp is required for custom operation');
+    }
+
     return executeModel({
       model: 'formula',
       source: {
@@ -314,6 +323,7 @@ export abstract class WidgetRemoteSource<
       operationColumn,
       joinOperation,
       operation,
+      operationExp,
       stepSize,
       stepMultiplier,
       splitByCategory,
@@ -321,6 +331,10 @@ export abstract class WidgetRemoteSource<
       splitByCategoryValues,
     } = params;
 
+    if (operation === 'custom') {
+      assert(operationExp, 'operationExp is required for custom operation');
+    }
+
     type TimeSeriesModelResponse = {
       rows: {name: string; value: number}[];
       metadata: {categories: string[]};
@@ -340,6 +354,7 @@ export abstract class WidgetRemoteSource<
         operationColumn: operationColumn || column,
         joinOperation,
         operation,
+        operationExp,
         splitByCategory,
         splitByCategoryLimit,
         splitByCategoryValues,

package/src/widget-sources/widget-tileset-source-impl.ts

@@ -329,6 +329,10 @@ export class WidgetTilesetSourceImpl extends WidgetSource<WidgetTilesetSourcePro
     }
 
     assertColumn(this._features, column, operationColumn as string);
+    assert(
+      operation !== 'custom',
+      'Custom operation not supported for tilesets'
+    );
 
     const rows =
       groupValuesByDateColumn({