@carto/ps-react-maps 4.1.0 → 4.2.0

package/dist/types/index.d.ts

@@ -27,6 +27,7 @@ export { CustomEditableGeojsonLayer } from './editable/custom-editable-geojson-l
 export { getCursorDefault, getTooltipDefault } from './helpers';
 export { MapComponent } from './maps/map';
 export type { ModelProps } from './models/types';
+export { AggregationsModel, useAggregations } from './models/aggregations';
 export { CategoriesModel, useCategories } from './models/categories';
 export { FeaturesModel, useFeatures } from './models/features';
 export { FormulaModel, useFormula } from './models/formula';
@@ -35,7 +36,7 @@ export { RangeModel, useRange } from './models/range';
 export { ScatterModel, useScatter } from './models/scatter';
 export { TableModel, useTable } from './models/table';
 export { TimeSeriesModel, useTimeSeries } from './models/time-series';
-export { useWidgetModel } from './models/use-widget-model';
+export { useWidgetModel } from './models/utils/use-widget-model';
 export type { Layer, LayerStore, LayerLegend, LayerGroup, } from './providers/layers/types';
 export { useLayerStore } from './providers/layers/store';
 export type { MapProviderProps, MapStore, ViewportRect, } from './providers/map/types';

package/dist/types/models/aggregations.d.ts

@@ -0,0 +1,5 @@
+import { AggregationsRequestOptions, AggregationsResponse } from '@carto/api-client';
+declare const useAggregations: ({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: import('./types').ModelProps<AggregationsRequestOptions, AggregationsResponse>) => import('@tanstack/react-query').UseQueryResult<AggregationsResponse, Error>, AggregationsModel: ({ children, ...modelProps }: import('./types').ModelProps<AggregationsRequestOptions, AggregationsResponse> & {
+    children: (props: import('@tanstack/react-query').UseQueryResult<AggregationsResponse, Error>) => React.ReactNode;
+}) => import('react').ReactNode;
+export { useAggregations, AggregationsModel };

package/dist/types/models/categories.d.ts

@@ -1,7 +1,5 @@
-import { UseQueryResult } from '@tanstack/react-query';
 import { CategoryRequestOptions, CategoryResponse } from '@carto/api-client';
-import { ModelProps } from './types';
-export declare function useCategories({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: ModelProps<CategoryRequestOptions, CategoryResponse>): UseQueryResult<CategoryResponse, Error>;
-export declare function CategoriesModel({ children, ...modelProps }: ModelProps<CategoryRequestOptions, CategoryResponse> & {
-    children: (props: UseQueryResult<CategoryResponse, Error>) => React.ReactNode;
-}): import('react').ReactNode;
+declare const useCategories: ({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: import('./types').ModelProps<CategoryRequestOptions, CategoryResponse>) => import('@tanstack/react-query').UseQueryResult<CategoryResponse, Error>, CategoriesModel: ({ children, ...modelProps }: import('./types').ModelProps<CategoryRequestOptions, CategoryResponse> & {
+    children: (props: import('@tanstack/react-query').UseQueryResult<CategoryResponse, Error>) => React.ReactNode;
+}) => import('react').ReactNode;
+export { useCategories, CategoriesModel };

package/dist/types/models/features.d.ts

@@ -1,7 +1,5 @@
-import { UseQueryResult } from '@tanstack/react-query';
 import { FeaturesRequestOptions, FeaturesResponse } from '@carto/api-client';
-import { ModelProps } from './types';
-export declare function useFeatures({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: ModelProps<FeaturesRequestOptions, FeaturesResponse>): UseQueryResult<FeaturesResponse, Error>;
-export declare function FeaturesModel({ children, ...modelProps }: ModelProps<FeaturesRequestOptions, FeaturesResponse> & {
-    children: (props: UseQueryResult<FeaturesResponse, Error>) => React.ReactNode;
-}): import('react').ReactNode;
+declare const useFeatures: ({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: import('./types').ModelProps<FeaturesRequestOptions, FeaturesResponse>) => import('@tanstack/react-query').UseQueryResult<FeaturesResponse, Error>, FeaturesModel: ({ children, ...modelProps }: import('./types').ModelProps<FeaturesRequestOptions, FeaturesResponse> & {
+    children: (props: import('@tanstack/react-query').UseQueryResult<FeaturesResponse, Error>) => React.ReactNode;
+}) => import('react').ReactNode;
+export { useFeatures, FeaturesModel };

package/dist/types/models/formula.d.ts

@@ -1,7 +1,5 @@
-import { UseQueryResult } from '@tanstack/react-query';
 import { FormulaRequestOptions, FormulaResponse } from '@carto/api-client';
-import { ModelProps } from './types';
-export declare function useFormula({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: ModelProps<FormulaRequestOptions, FormulaResponse>): UseQueryResult<FormulaResponse, Error>;
-export declare function FormulaModel({ children, ...modelProps }: ModelProps<FormulaRequestOptions, FormulaResponse> & {
-    children: (props: UseQueryResult<FormulaResponse, Error>) => React.ReactNode;
-}): import('react').ReactNode;
+declare const useFormula: ({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: import('./types').ModelProps<FormulaRequestOptions, FormulaResponse>) => import('@tanstack/react-query').UseQueryResult<FormulaResponse, Error>, FormulaModel: ({ children, ...modelProps }: import('./types').ModelProps<FormulaRequestOptions, FormulaResponse> & {
+    children: (props: import('@tanstack/react-query').UseQueryResult<FormulaResponse, Error>) => React.ReactNode;
+}) => import('react').ReactNode;
+export { useFormula, FormulaModel };

package/dist/types/models/histogram.d.ts

@@ -1,7 +1,5 @@
-import { UseQueryResult } from '@tanstack/react-query';
 import { HistogramRequestOptions, HistogramResponse } from '@carto/api-client';
-import { ModelProps } from './types';
-export declare function useHistogram({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: ModelProps<HistogramRequestOptions, HistogramResponse>): UseQueryResult<HistogramResponse, Error>;
-export declare function HistogramModel({ children, ...modelProps }: ModelProps<HistogramRequestOptions, HistogramResponse> & {
-    children: (props: UseQueryResult<HistogramResponse, Error>) => React.ReactNode;
-}): import('react').ReactNode;
+declare const useHistogram: ({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: import('./types').ModelProps<HistogramRequestOptions, HistogramResponse>) => import('@tanstack/react-query').UseQueryResult<HistogramResponse, Error>, HistogramModel: ({ children, ...modelProps }: import('./types').ModelProps<HistogramRequestOptions, HistogramResponse> & {
+    children: (props: import('@tanstack/react-query').UseQueryResult<HistogramResponse, Error>) => React.ReactNode;
+}) => import('react').ReactNode;
+export { useHistogram, HistogramModel };

package/dist/types/models/range.d.ts

@@ -1,7 +1,5 @@
-import { UseQueryResult } from '@tanstack/react-query';
 import { RangeRequestOptions, RangeResponse } from '@carto/api-client';
-import { ModelProps } from './types';
-export declare function useRange({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: ModelProps<RangeRequestOptions, RangeResponse>): UseQueryResult<RangeResponse, Error>;
-export declare function RangeModel({ children, ...modelProps }: ModelProps<RangeRequestOptions, RangeResponse> & {
-    children: (props: UseQueryResult<RangeResponse, Error>) => React.ReactNode;
-}): import('react').ReactNode;
+declare const useRange: ({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: import('./types').ModelProps<RangeRequestOptions, RangeResponse>) => import('@tanstack/react-query').UseQueryResult<RangeResponse, Error>, RangeModel: ({ children, ...modelProps }: import('./types').ModelProps<RangeRequestOptions, RangeResponse> & {
+    children: (props: import('@tanstack/react-query').UseQueryResult<RangeResponse, Error>) => React.ReactNode;
+}) => import('react').ReactNode;
+export { useRange, RangeModel };

package/dist/types/models/scatter.d.ts

@@ -1,7 +1,5 @@
-import { UseQueryResult } from '@tanstack/react-query';
 import { ScatterRequestOptions, ScatterResponse } from '@carto/api-client';
-import { ModelProps } from './types';
-export declare function useScatter({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: ModelProps<ScatterRequestOptions, ScatterResponse>): UseQueryResult<ScatterResponse, Error>;
-export declare function ScatterModel({ children, ...modelProps }: ModelProps<ScatterRequestOptions, ScatterResponse> & {
-    children: (props: UseQueryResult<ScatterResponse, Error>) => React.ReactNode;
-}): import('react').ReactNode;
+declare const useScatter: ({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: import('./types').ModelProps<ScatterRequestOptions, ScatterResponse>) => import('@tanstack/react-query').UseQueryResult<ScatterResponse, Error>, ScatterModel: ({ children, ...modelProps }: import('./types').ModelProps<ScatterRequestOptions, ScatterResponse> & {
+    children: (props: import('@tanstack/react-query').UseQueryResult<ScatterResponse, Error>) => React.ReactNode;
+}) => import('react').ReactNode;
+export { useScatter, ScatterModel };

package/dist/types/models/table.d.ts

@@ -1,7 +1,5 @@
-import { UseQueryResult } from '@tanstack/react-query';
 import { TableRequestOptions, TableResponse } from '@carto/api-client';
-import { ModelProps } from './types';
-export declare function useTable({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: ModelProps<TableRequestOptions, TableResponse>): UseQueryResult<TableResponse, Error>;
-export declare function TableModel({ children, ...modelProps }: ModelProps<TableRequestOptions, TableResponse> & {
-    children: (props: UseQueryResult<TableResponse, Error>) => React.ReactNode;
-}): import('react').ReactNode;
+declare const useTable: ({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: import('./types').ModelProps<TableRequestOptions, TableResponse>) => import('@tanstack/react-query').UseQueryResult<TableResponse, Error>, TableModel: ({ children, ...modelProps }: import('./types').ModelProps<TableRequestOptions, TableResponse> & {
+    children: (props: import('@tanstack/react-query').UseQueryResult<TableResponse, Error>) => React.ReactNode;
+}) => import('react').ReactNode;
+export { useTable, TableModel };

package/dist/types/models/time-series.d.ts

@@ -1,7 +1,5 @@
-import { UseQueryResult } from '@tanstack/react-query';
 import { TimeSeriesRequestOptions, TimeSeriesResponse } from '@carto/api-client';
-import { ModelProps } from './types';
-export declare function useTimeSeries({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: ModelProps<TimeSeriesRequestOptions, TimeSeriesResponse>): UseQueryResult<TimeSeriesResponse, Error>;
-export declare function TimeSeriesModel({ children, ...modelProps }: ModelProps<TimeSeriesRequestOptions, TimeSeriesResponse> & {
-    children: (props: UseQueryResult<TimeSeriesResponse, Error>) => React.ReactNode;
-}): import('react').ReactNode;
+declare const useTimeSeries: ({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: import('./types').ModelProps<TimeSeriesRequestOptions, TimeSeriesResponse>) => import('@tanstack/react-query').UseQueryResult<TimeSeriesResponse, Error>, TimeSeriesModel: ({ children, ...modelProps }: import('./types').ModelProps<TimeSeriesRequestOptions, TimeSeriesResponse> & {
+    children: (props: import('@tanstack/react-query').UseQueryResult<TimeSeriesResponse, Error>) => React.ReactNode;
+}) => import('react').ReactNode;
+export { useTimeSeries, TimeSeriesModel };

package/dist/types/models/utils/create-model.d.ts

@@ -0,0 +1,17 @@
+import { UseQueryResult } from '@tanstack/react-query';
+import { ModelProps } from '../types';
+import { useCommonModel } from './use-common-model';
+interface ModelConfig<TRequestOptions, TResponse> {
+    queryKeyPrefix: string[];
+    getWidgetMethod: (widgetModel: NonNullable<ReturnType<typeof useCommonModel>['widgetModel']>) => (params: TRequestOptions & {
+        filters?: unknown;
+        signal?: AbortSignal;
+    }) => Promise<TResponse>;
+}
+export declare function createModel<TRequestOptions, TResponse>({ queryKeyPrefix, getWidgetMethod, }: ModelConfig<TRequestOptions, TResponse>): {
+    useModelHook: ({ accessToken, sourceId, widgetProps, additionalFilter, useQueryProps: { enabled, ...useQueryProps }, }: ModelProps<TRequestOptions, TResponse>) => UseQueryResult<import('@tanstack/react-query').NoInfer<TResponse>, Error>;
+    ModelComponent: ({ children, ...modelProps }: ModelProps<TRequestOptions, TResponse> & {
+        children: (props: UseQueryResult<TResponse, Error>) => React.ReactNode;
+    }) => import('react').ReactNode;
+};
+export {};

package/dist/types/models/{use-common-model.d.ts → utils/use-common-model.d.ts}

@@ -1,6 +1,6 @@
-import { ModelProps } from './types';
+import { ModelProps } from '../types';
 export declare function useCommonModel<TRequestOptions, TResponse>({ accessToken, sourceId, widgetProps, additionalFilter, }: Pick<ModelProps<TRequestOptions, TResponse>, 'accessToken' | 'sourceId' | 'additionalFilter' | 'widgetProps'>): {
-    mergedFilters: import('@carto/api-client').Filters | undefined;
-    widgetModel: import('@carto/api-client').WidgetSource<import('@carto/api-client').WidgetSourceProps & (import('..').QuerySource | import('..').TilesetSource | import('..').TableSource | import('../providers/sources/types').RasterQuadbinTilesetSource)> | null;
+    mergedFilters: {} | undefined;
+    widgetModel: import('@carto/api-client').WidgetSource<import('@carto/api-client').WidgetSourceProps & (import('../..').QuerySource | import('../..').TilesetSource | import('../..').TableSource | import('../../providers/sources/types').RasterQuadbinTilesetSource)> | null;
     queryKey: unknown[];
 };

package/dist/types/models/{use-filters-merged.d.ts → utils/use-filters-merged.d.ts}

@@ -1,2 +1,2 @@
 import { AddFilterOptions } from '@carto/api-client';
-export declare function useFiltersMerged(sourceId: string, additionalFilter?: AddFilterOptions[]): import('@carto/api-client').Filters | undefined;
+export declare function useFiltersMerged(sourceId: string, additionalFilter?: AddFilterOptions[]): {} | undefined;

package/dist/types/models/utils/use-widget-model.d.ts

@@ -0,0 +1 @@
+export declare function useWidgetModel(accessToken: string, sourceId: string): import('@carto/api-client').WidgetSource<import('@carto/api-client').WidgetSourceProps & (import('../..').QuerySource | import('../..').TilesetSource | import('../..').TableSource | import('../../providers/sources/types').RasterQuadbinTilesetSource)> | null;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@carto/ps-react-maps",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "CARTO's Professional Service React DeckGL library",
   "type": "module",
   "dependencies": {},
   "devDependencies": {
-    "@tanstack/react-query": "5.87.1",
-    "@carto/api-client": "0.5.15",
+    "@tanstack/react-query": "5.89.0",
+    "@carto/api-client": "0.5.17",
     "@deck.gl-community/editable-layers": "9.1.1",
     "@deck.gl/aggregation-layers": "9.1.14",
     "@deck.gl/carto": "9.1.14",
@@ -22,7 +22,7 @@
     "@vis.gl/react-google-maps": "1.5.5",
     "convert-units": "3.0.0-beta.8",
     "html2canvas": "1.4.1",
-    "maplibre-gl": "5.7.1",
+    "maplibre-gl": "5.7.2",
     "mjolnir.js": "3.0.0",
     "react-map-gl": "8.0.4",
     "zustand": "5.0.8",
@@ -31,7 +31,7 @@
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.0.0",
-    "@carto/api-client": "^0.5.15",
+    "@carto/api-client": "^0.5.16",
     "@deck.gl-community/editable-layers": "^9.1.0",
     "@deck.gl/aggregation-layers": "^9.1.0",
     "@deck.gl/carto": "^9.1.0",

package/dist/types/models/use-widget-model.d.ts

@@ -1 +0,0 @@
-export declare function useWidgetModel(accessToken: string, sourceId: string): import('@carto/api-client').WidgetSource<import('@carto/api-client').WidgetSourceProps & (import('..').QuerySource | import('..').TilesetSource | import('..').TableSource | import('../providers/sources/types').RasterQuadbinTilesetSource)> | null;