@carto/api-client 0.4.6-0 → 0.4.6

package/src/sources/quadbin-tileset-source.ts

@@ -2,11 +2,6 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {getTileFormat} from '../utils/getTileFormat';
-import {
-  WidgetTilesetSource,
-  WidgetTilesetSourceResult,
-} from '../widget-sources';
 import {baseSource} from './base-source';
 import type {
   SourceOptions,
@@ -17,24 +12,17 @@ import type {
 export type QuadbinTilesetSourceOptions = SourceOptions & TilesetSourceOptions;
 type UrlParameters = {name: string};
 
-export type QuadbinTilesetSourceResponse = TilejsonResult &
-  WidgetTilesetSourceResult;
+export type QuadbinTilesetSourceResponse = TilejsonResult;
 
 export const quadbinTilesetSource = async function (
   options: QuadbinTilesetSourceOptions
 ): Promise<QuadbinTilesetSourceResponse> {
-  const {tableName, spatialDataColumn = 'quadbin'} = options;
+  const {tableName} = options;
   const urlParameters: UrlParameters = {name: tableName};
 
-  return baseSource<UrlParameters>('tileset', options, urlParameters).then(
-    (result) => ({
-      ...(result as TilejsonResult),
-      widgetSource: new WidgetTilesetSource({
-        ...options,
-        tileFormat: getTileFormat(result as TilejsonResult),
-        spatialDataColumn,
-        spatialDataType: 'quadbin',
-      }),
-    })
+  return baseSource<UrlParameters>(
+    'tileset',
+    options,
+    urlParameters
   ) as Promise<QuadbinTilesetSourceResponse>;
 };

package/src/sources/raster-source.ts

@@ -28,7 +28,6 @@ export const rasterSource = async function (
   if (filters) {
     urlParameters.filters = filters;
   }
-
   return baseSource<UrlParameters>(
     'raster',
     options,

package/src/sources/vector-query-source.ts

@@ -3,10 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 /* eslint-disable camelcase */
-import {
-  DEFAULT_GEO_COLUMN,
-  DEFAULT_TILE_RESOLUTION,
-} from '../constants-internal.js';
+import {DEFAULT_TILE_RESOLUTION} from '../constants-internal.js';
 import {
   WidgetQuerySource,
   WidgetQuerySourceResult,
@@ -46,7 +43,7 @@ export const vectorQuerySource = async function (
   const {
     columns,
     filters,
-    spatialDataColumn = DEFAULT_GEO_COLUMN,
+    spatialDataColumn = 'geom',
     sqlQuery,
     tileResolution = DEFAULT_TILE_RESOLUTION,
     queryParameters,

package/src/sources/vector-table-source.ts

@@ -3,10 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 /* eslint-disable camelcase */
-import {
-  DEFAULT_GEO_COLUMN,
-  DEFAULT_TILE_RESOLUTION,
-} from '../constants-internal.js';
+import {DEFAULT_TILE_RESOLUTION} from '../constants-internal.js';
 import {
   WidgetTableSource,
   WidgetTableSourceResult,
@@ -45,7 +42,7 @@ export const vectorTableSource = async function (
   const {
     columns,
     filters,
-    spatialDataColumn = DEFAULT_GEO_COLUMN,
+    spatialDataColumn = 'geom',
     tableName,
     tileResolution = DEFAULT_TILE_RESOLUTION,
     aggregationExp,

package/src/sources/vector-tileset-source.ts

@@ -2,12 +2,6 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {DEFAULT_GEO_COLUMN} from '../constants-internal';
-import {getTileFormat} from '../utils/getTileFormat';
-import {
-  WidgetTilesetSource,
-  WidgetTilesetSourceResult,
-} from '../widget-sources';
 import {baseSource} from './base-source';
 import type {
   SourceOptions,
@@ -18,24 +12,17 @@ import type {
 export type VectorTilesetSourceOptions = SourceOptions & TilesetSourceOptions;
 type UrlParameters = {name: string};
 
-export type VectorTilesetSourceResponse = TilejsonResult &
-  WidgetTilesetSourceResult;
+export type VectorTilesetSourceResponse = TilejsonResult;
 
 export const vectorTilesetSource = async function (
   options: VectorTilesetSourceOptions
 ): Promise<VectorTilesetSourceResponse> {
-  const {tableName, spatialDataColumn = DEFAULT_GEO_COLUMN} = options;
+  const {tableName} = options;
   const urlParameters: UrlParameters = {name: tableName};
 
-  return baseSource<UrlParameters>('tileset', options, urlParameters).then(
-    (result) => ({
-      ...(result as TilejsonResult),
-      widgetSource: new WidgetTilesetSource({
-        ...options,
-        tileFormat: getTileFormat(result as TilejsonResult),
-        spatialDataColumn,
-        spatialDataType: 'geo',
-      }),
-    })
+  return baseSource<UrlParameters>(
+    'tileset',
+    options,
+    urlParameters
   ) as Promise<VectorTilesetSourceResponse>;
 };

package/src/spatial-index.ts

@@ -40,7 +40,7 @@ export function getSpatialFiltersResolution(
       : dataResolution;
 
     const hexagonResolution =
-      getHexagonResolution(viewState, tileSize) + aggregationResLevelOffset;
+      _getHexagonResolution(viewState, tileSize) + aggregationResLevelOffset;
 
     return Math.min(hexagonResolution, maxSpatialFiltersResolution);
   }
@@ -88,10 +88,13 @@ const maxH3SpatialFiltersResolutions = [
 // Relative scale factor (0 = no biasing, 2 = a few hexagons cover view)
 const BIAS = 2;
 
-// Resolution conversion function. Takes a WebMercatorViewport and returns
-// a H3 resolution such that the screen space size of the hexagons is
-// similar
-export function getHexagonResolution(
+/**
+ * Resolution conversion function. Takes a WebMercatorViewport and returns
+ * a H3 resolution such that the screen space size of the hexagons is
+ * "similar" to the given tileSize on screen. Intended for use with deck.gl.
+ * @internal
+ */
+export function _getHexagonResolution(
   viewport: {zoom: number; latitude: number},
   tileSize: number
 ): number {

package/src/types-internal.ts

@@ -60,9 +60,3 @@ type MapInstantiationFormats = Record<
     error?: any;
   }
 >;
-
-/******************************************************************************
- * LOCAL CALCULATIONS
- */
-
-export type FeatureData = Record<string, unknown>;

package/src/types.ts

@@ -1,6 +1,5 @@
 import type {FilterType} from './constants.js';
-import type {Polygon, MultiPolygon, Feature} from 'geojson';
-import type {BinaryFeature, BinaryFeatureCollection} from '@loaders.gl/schema';
+import type {Polygon, MultiPolygon} from 'geojson';
 
 /******************************************************************************
  * MAPS AND TILES
@@ -12,43 +11,6 @@ export type Format = 'json' | 'geojson' | 'tilejson';
 /** @internalRemarks Source: @carto/constants, @deck.gl/carto */
 export type MapType = 'boundary' | 'query' | 'table' | 'tileset' | 'raster';
 
-/**
- * Alias for GeoJSON 'BBox' type, semantically representing a viewport.
- * Order of values is "west", "south", "east", "north".
- */
-export type Viewport = [number, number, number, number];
-
-/**
- * Subset of deck.gl's Tile2DHeader type, containing only the properties
- * required for local widget calculations. Deeper dependencies on deck.gl
- * APIs should be minimized within this library: @deck.gl/carto depends
- * on the API client, not the other way around.
- * @internalRemarks Source: @deck.gl/geo-layers
- */
-export type Tile = {
-  index: {x: number; y: number; z: number};
-  id: string;
-  content: unknown;
-  zoom: number;
-  bbox: {west: number; east: number; north: number; south: number};
-  isVisible: boolean;
-  data?: BinaryFeatureCollection;
-};
-
-/** Subset of deck.gl's Tile2DHeader type, for spatial indexes. */
-export type SpatialIndexTile = Tile & {
-  data?: (Feature & {id: bigint})[];
-};
-
-/** @internalRemarks Source: @deck.gl/carto */
-export type Raster = {
-  blockSize: number;
-  cells: {
-    numericProps: BinaryFeature['numericProps'];
-    properties: BinaryFeature['properties'];
-  };
-};
-
 /******************************************************************************
  * AGGREGATION
  */
@@ -87,32 +49,12 @@ export interface Filter {
   /** [a, b) a is included, b is not. */
   [FilterType.CLOSED_OPEN]?: {owner?: string; values: number[][]};
   [FilterType.TIME]?: {owner?: string; values: number[][]};
-  [FilterType.STRING_SEARCH]?: {
-    owner?: string;
-    values: string[];
-    params?: StringSearchOptions;
-  };
+  [FilterType.STRING_SEARCH]?: {owner?: string; values: string[]};
 }
 
 /** @internalRemarks Source: @carto/react-core */
 export type FilterLogicalOperator = 'and' | 'or';
 
-/**
- * Type for minimum or maximum value of an interval. Values 'null' and
- * 'undefined' are intentionally allowed, and represent an unbounded value.
- */
-export type FilterIntervalExtremum = number | null | undefined;
-export type FilterInterval = [FilterIntervalExtremum, FilterIntervalExtremum];
-export type FilterIntervalComplete = [number, number];
-
-export type StringSearchOptions = {
-  useRegExp?: boolean;
-  mustStart?: boolean;
-  mustEnd?: boolean;
-  caseSensitive?: boolean;
-  keepSpecialCharacters?: boolean;
-};
-
 /******************************************************************************
  * GROUPING
  */

package/src/widget-sources/index.ts

@@ -1,6 +1,4 @@
-export * from './widget-source.js';
+export * from './widget-base-source.js';
 export * from './widget-query-source.js';
-export * from './widget-remote-source.js';
 export * from './widget-table-source.js';
-export * from './widget-tileset-source.js';
 export * from './types.js';

package/src/widget-sources/types.ts

@@ -5,7 +5,6 @@ import {
   SortDirection,
   SpatialFilter,
 } from '../types';
-import type {WidgetRemoteSource} from './widget-remote-source';
 
 /******************************************************************************
  * WIDGET API REQUESTS
@@ -17,7 +16,7 @@ export interface ViewState {
   longitude: number;
 }
 
-/** Common options for {@link WidgetRemoteSource} requests. */
+/** Common options for {@link WidgetBaseSource} requests. */
 interface BaseRequestOptions {
   spatialFilter?: SpatialFilter;
   spatialFiltersMode?: SpatialFilterPolyfillMode;
@@ -27,17 +26,15 @@ interface BaseRequestOptions {
   filterOwner?: string;
 }
 
-/** Options for {@link WidgetRemoteSource#getCategories}. */
+/** Options for {@link WidgetBaseSource#getCategories}. */
 export interface CategoryRequestOptions extends BaseRequestOptions {
   column: string;
   operation?: 'count' | 'avg' | 'min' | 'max' | 'sum';
   operationColumn?: string;
-  /** Local only. */
-  joinOperation?: 'count' | 'avg' | 'min' | 'max' | 'sum';
 }
 
 /**
- * Options for {@link WidgetRemoteSource#getFeatures}.
+ * Options for {@link WidgetBaseSource#getFeatures}.
  * @experimental
  * @internal
  */
@@ -79,29 +76,26 @@ export interface FeaturesRequestOptions extends BaseRequestOptions {
   tileResolution?: TileResolution;
 }
 
-/** Options for {@link WidgetRemoteSource#getFormula}. */
+/** Options for {@link WidgetBaseSource#getFormula}. */
 export interface FormulaRequestOptions extends BaseRequestOptions {
   column: string;
-  operation?: 'count' | 'avg' | 'min' | 'max' | 'sum' | 'custom';
+  operation?: 'count' | 'avg' | 'min' | 'max' | 'sum';
   operationExp?: string;
-  joinOperation?: 'count' | 'avg' | 'min' | 'max' | 'sum';
 }
 
-/** Options for {@link WidgetRemoteSource#getHistogram}. */
+/** Options for {@link WidgetBaseSource#getHistogram}. */
 export interface HistogramRequestOptions extends BaseRequestOptions {
   column: string;
   ticks: number[];
   operation?: 'count' | 'avg' | 'min' | 'max' | 'sum';
-  /** Local only. */
-  joinOperation?: 'count' | 'avg' | 'min' | 'max' | 'sum';
 }
 
-/** Options for {@link WidgetRemoteSource#getRange}. */
+/** Options for {@link WidgetBaseSource#getRange}. */
 export interface RangeRequestOptions extends BaseRequestOptions {
   column: string;
 }
 
-/** Options for {@link WidgetRemoteSource#getScatter}. */
+/** Options for {@link WidgetBaseSource#getScatter}. */
 export interface ScatterRequestOptions extends BaseRequestOptions {
   xAxisColumn: string;
   xAxisJoinOperation?: 'count' | 'avg' | 'min' | 'max' | 'sum';
@@ -109,7 +103,7 @@ export interface ScatterRequestOptions extends BaseRequestOptions {
   yAxisJoinOperation?: 'count' | 'avg' | 'min' | 'max' | 'sum';
 }
 
-/** Options for {@link WidgetRemoteSource#getTable}. */
+/** Options for {@link WidgetBaseSource#getTable}. */
 export interface TableRequestOptions extends BaseRequestOptions {
   columns: string[];
   sortBy?: string;
@@ -117,16 +111,12 @@ export interface TableRequestOptions extends BaseRequestOptions {
   sortByColumnType?: SortColumnType;
   offset?: number;
   limit?: number;
-  /** Local only. */
-  searchFilterColumn?: string;
-  /** Local only. */
-  searchFilterText?: string;
 }
 
-/** Options for {@link WidgetRemoteSource#getTimeSeries}. */
+/** Options for {@link WidgetBaseSource#getTimeSeries}. */
 export interface TimeSeriesRequestOptions extends BaseRequestOptions {
   column: string;
-  stepSize: GroupDateType;
+  stepSize?: GroupDateType;
   stepMultiplier?: number;
   operation?: 'count' | 'avg' | 'min' | 'max' | 'sum';
   operationColumn?: string;
@@ -141,35 +131,35 @@ export interface TimeSeriesRequestOptions extends BaseRequestOptions {
  */
 
 /**
- * Response from {@link WidgetRemoteSource#getFeatures}.
+ * Response from {@link WidgetBaseSource#getFeatures}.
  * @experimental
  * @internal
  */
 export type FeaturesResponse = {rows: Record<string, unknown>[]};
 
-/** Response from {@link WidgetRemoteSource#getFormula}. */
-export type FormulaResponse = {value: number | null};
+/** Response from {@link WidgetBaseSource#getFormula}. */
+export type FormulaResponse = {value: number};
 
-/** Response from {@link WidgetRemoteSource#getCategories}. */
+/** Response from {@link WidgetBaseSource#getCategories}. */
 export type CategoryResponse = {name: string; value: number}[];
 
-/** Response from {@link WidgetRemoteSource#getRange}. */
-export type RangeResponse = {min: number; max: number} | null;
+/** Response from {@link WidgetBaseSource#getRange}. */
+export type RangeResponse = {min: number; max: number};
 
-/** Response from {@link WidgetRemoteSource#getTable}. */
+/** Response from {@link WidgetBaseSource#getTable}. */
 export type TableResponse = {
   totalCount: number;
   rows: Record<string, number | string>[];
 };
 
-/** Response from {@link WidgetRemoteSource#getScatter}. */
+/** Response from {@link WidgetBaseSource#getScatter}. */
 export type ScatterResponse = [number, number][];
 
-/** Response from {@link WidgetRemoteSource#getTimeSeries}. */
+/** Response from {@link WidgetBaseSource#getTimeSeries}. */
 export type TimeSeriesResponse = {
   rows: {name: string; value: number}[];
-  categories?: string[];
+  categories: string[];
 };
 
-/** Response from {@link WidgetRemoteSource#getHistogram}. */
+/** Response from {@link WidgetBaseSource#getHistogram}. */
 export type HistogramResponse = number[];

package/src/widget-sources/{widget-remote-source.ts → widget-base-source.ts}

@@ -16,21 +16,99 @@ import {
   TableResponse,
   TimeSeriesRequestOptions,
   TimeSeriesResponse,
+  ViewState,
 } from './types.js';
-import {normalizeObjectKeys} from '../utils.js';
+import {FilterLogicalOperator, Filter, SpatialFilter} from '../types.js';
+import {getApplicableFilters, normalizeObjectKeys} from '../utils.js';
+import {getClient} from '../client.js';
+import {ModelSource} from '../models/model.js';
+import {SourceOptions} from '../sources/index.js';
+import {ApiVersion, DEFAULT_API_BASE_URL} from '../constants.js';
 import {DEFAULT_TILE_RESOLUTION} from '../constants-internal.js';
-import {WidgetSource, WidgetSourceProps} from './widget-source.js';
+import {getSpatialFiltersResolution} from '../spatial-index.js';
+import {AggregationOptions} from '../sources/types.js';
 
-export type WidgetRemoteSourceProps = WidgetSourceProps;
+export interface WidgetBaseSourceProps extends Omit<SourceOptions, 'filters'> {
+  apiVersion?: ApiVersion;
+  filters?: Record<string, Filter>;
+  filtersLogicalOperator?: FilterLogicalOperator;
+}
+
+export type WidgetSource = WidgetBaseSource<WidgetBaseSourceProps>;
 
 /**
- * Source for Widget API requests.
+ * Source for Widget API requests on a data source defined by a SQL query.
  *
  * Abstract class. Use {@link WidgetQuerySource} or {@link WidgetTableSource}.
  */
-export abstract class WidgetRemoteSource<
-  Props extends WidgetRemoteSourceProps,
-> extends WidgetSource<Props> {
+export abstract class WidgetBaseSource<Props extends WidgetBaseSourceProps> {
+  readonly props: Props;
+
+  static defaultProps: Partial<WidgetBaseSourceProps> = {
+    apiVersion: ApiVersion.V3,
+    apiBaseUrl: DEFAULT_API_BASE_URL,
+    clientId: getClient(),
+    filters: {},
+    filtersLogicalOperator: 'and',
+  };
+
+  constructor(props: Props) {
+    this.props = {...WidgetBaseSource.defaultProps, ...props};
+  }
+
+  /**
+   * Subclasses of {@link WidgetBaseSource} must implement this method, calling
+   * {@link WidgetBaseSource.prototype._getModelSource} for common source
+   * properties, and adding additional required properties including 'type' and
+   * 'data'.
+   */
+  protected abstract getModelSource(owner: string | undefined): ModelSource;
+
+  protected _getModelSource(
+    owner?: string
+  ): Omit<ModelSource, 'type' | 'data'> {
+    const props = this.props;
+    return {
+      apiVersion: props.apiVersion as ApiVersion,
+      apiBaseUrl: props.apiBaseUrl as string,
+      clientId: props.clientId as string,
+      accessToken: props.accessToken,
+      connectionName: props.connectionName,
+      filters: getApplicableFilters(owner, props.filters),
+      filtersLogicalOperator: props.filtersLogicalOperator,
+      spatialDataType: props.spatialDataType,
+      spatialDataColumn: props.spatialDataColumn,
+      dataResolution: (props as Partial<AggregationOptions>).dataResolution,
+    };
+  }
+
+  protected _getSpatialFiltersResolution(
+    source: Omit<ModelSource, 'type' | 'data'>,
+    spatialFilter?: SpatialFilter,
+    referenceViewState?: ViewState
+  ): number | undefined {
+    // spatialFiltersResolution applies only to spatial index sources.
+    if (!spatialFilter || source.spatialDataType === 'geo') {
+      return;
+    }
+
+    if (!referenceViewState) {
+      throw new Error(
+        'Missing required option, "spatialIndexReferenceViewState".'
+      );
+    }
+
+    return getSpatialFiltersResolution(source, referenceViewState);
+  }
+
+  /****************************************************************************
+   * CATEGORIES
+   */
+
+  /**
+   * Returns a list of labeled datapoints for categorical data. Suitable for
+   * charts including grouped bar charts, pie charts, and tree charts.
+   */
   async getCategories(
     options: CategoryRequestOptions
   ): Promise<CategoryResponse> {
@@ -69,6 +147,18 @@ export abstract class WidgetRemoteSource<
     }).then((res: CategoriesModelResponse) => normalizeObjectKeys(res.rows));
   }
 
+  /****************************************************************************
+   * FEATURES
+   */
+
+  /**
+   * Given a list of feature IDs (as found in `_carto_feature_id`) returns all
+   * matching features. In datasets containing features with duplicate geometries,
+   * feature IDs may be duplicated (IDs are a hash of geometry) and so more
+   * results may be returned than IDs in the request.
+   * @internal
+   * @experimental
+   */
   async getFeatures(
     options: FeaturesRequestOptions
   ): Promise<FeaturesResponse> {
@@ -111,6 +201,14 @@ export abstract class WidgetRemoteSource<
     }).then(({rows}: FeaturesModelResponse) => ({rows}));
   }
 
+  /****************************************************************************
+   * FORMULA
+   */
+
+  /**
+   * Returns a scalar numerical statistic over all matching data. Suitable
+   * for 'headline' or 'scorecard' figures such as counts and sums.
+   */
   async getFormula(options: FormulaRequestOptions): Promise<FormulaResponse> {
     const {
       filterOwner,
@@ -139,15 +237,19 @@ export abstract class WidgetRemoteSource<
         spatialFiltersMode,
         spatialFilter,
       },
-      params: {
-        column: column ?? '*',
-        operation: operation ?? 'count',
-        operationExp,
-      },
+      params: {column: column ?? '*', operation, operationExp},
       opts: {abortController},
     }).then((res: FormulaModelResponse) => normalizeObjectKeys(res.rows[0]));
   }
 
+  /****************************************************************************
+   * HISTOGRAM
+   */
+
+  /**
+   * Returns a list of labeled datapoints for 'bins' of data defined as ticks
+   * over a numerical range. Suitable for histogram charts.
+   */
   async getHistogram(
     options: HistogramRequestOptions
   ): Promise<HistogramResponse> {
@@ -194,6 +296,15 @@ export abstract class WidgetRemoteSource<
     return [];
   }
 
+  /****************************************************************************
+   * RANGE
+   */
+
+  /**
+   * Returns a range (min and max) for a numerical column of matching rows.
+   * Suitable for displaying certain 'headline' or 'scorecard' statistics,
+   * or rendering a range slider UI for filtering.
+   */
   async getRange(options: RangeRequestOptions): Promise<RangeResponse> {
     const {
       filterOwner,
@@ -226,6 +337,14 @@ export abstract class WidgetRemoteSource<
     }).then((res: RangeModelResponse) => normalizeObjectKeys(res.rows[0]));
   }
 
+  /****************************************************************************
+   * SCATTER
+   */
+
+  /**
+   * Returns a list of bivariate datapoints defined as numerical 'x' and 'y'
+   * values. Suitable for rendering scatter plots.
+   */
   async getScatter(options: ScatterRequestOptions): Promise<ScatterResponse> {
     const {
       filterOwner,
@@ -271,6 +390,14 @@ export abstract class WidgetRemoteSource<
       .then((res) => res.map(({x, y}: {x: number; y: number}) => [x, y]));
   }
 
+  /****************************************************************************
+   * TABLE
+   */
+
+  /**
+   * Returns a list of arbitrary data rows, with support for pagination and
+   * sorting. Suitable for displaying tables and lists.
+   */
   async getTable(options: TableRequestOptions): Promise<TableResponse> {
     const {
       filterOwner,
@@ -316,6 +443,14 @@ export abstract class WidgetRemoteSource<
     }));
   }
 
+  /****************************************************************************
+   * TIME SERIES
+   */
+
+  /**
+   * Returns a series of labeled numerical values, grouped into equally-sized
+   * time intervals. Suitable for rendering time series charts.
+   */
   async getTimeSeries(
     options: TimeSeriesRequestOptions
   ): Promise<TimeSeriesResponse> {

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

@@ -3,10 +3,7 @@ import {
   QuadbinQuerySourceOptions,
   VectorQuerySourceOptions,
 } from '../sources/index.js';
-import {
-  WidgetRemoteSource,
-  WidgetRemoteSourceProps,
-} from './widget-remote-source.js';
+import {WidgetBaseSource, WidgetBaseSourceProps} from './widget-base-source.js';
 import {ModelSource} from '../models/model.js';
 
 type LayerQuerySourceOptions =
@@ -38,8 +35,8 @@ export type WidgetQuerySourceResult = {widgetSource: WidgetQuerySource};
  * const { widgetSource } = await data;
  * ```
  */
-export class WidgetQuerySource extends WidgetRemoteSource<
-  LayerQuerySourceOptions & WidgetRemoteSourceProps
+export class WidgetQuerySource extends WidgetBaseSource<
+  LayerQuerySourceOptions & WidgetBaseSourceProps
 > {
   protected override getModelSource(owner: string): ModelSource {
     return {