@deck.gl/carto 9.0.13 → 9.0.14

package/package.json

@@ -3,7 +3,7 @@
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.13",
+  "version": "9.0.14",
   "publishConfig": {
     "access": "public"
   },
@@ -73,5 +73,5 @@
     "@deck.gl/layers": "^9.0.0",
     "@loaders.gl/core": "^4.2.0"
   },
-  "gitHead": "39b76f3cd7d6041dd36b93dc3e91b740ed2c57f9"
+  "gitHead": "c04824ba260eab253cf0fd5d743ce8c3dada0762"
 }

package/src/api/request-with-parameters.ts

@@ -1,3 +1,4 @@
+import {isPureObject} from '@loaders.gl/core';
 import {CartoAPIError} from './carto-api-error';
 import {DEFAULT_HEADERS, DEFAULT_PARAMETERS, MAX_GET_LENGTH} from './common';
 import type {APIErrorContext} from './types';
@@ -5,8 +6,11 @@ import type {APIErrorContext} from './types';
 /**
  * Simple encode parameter
  */
-function encodeParameter(name: string, value: string | boolean | number): string {
-  return `${name}=${encodeURIComponent(value)}`;
+function encodeParameter(name: string, value: unknown): string {
+  if (isPureObject(value) || Array.isArray(value)) {
+    return `${name}=${encodeURIComponent(JSON.stringify(value))}`;
+  }
+  return `${name}=${encodeURIComponent(value as string | boolean | number)}`;
 }
 
 const REQUEST_CACHE = new Map<string, Promise<unknown>>();
@@ -17,10 +21,11 @@ export async function requestWithParameters<T = any>({
   errorContext
 }: {
   baseUrl: string;
-  parameters?: Record<string, string>;
+  parameters?: Record<string, unknown>;
   headers: Record<string, string>;
   errorContext: APIErrorContext;
 }): Promise<T> {
+  parameters = {...DEFAULT_PARAMETERS, ...parameters};
   const key = createCacheKey(baseUrl, parameters || {}, customHeaders || {});
   if (REQUEST_CACHE.has(key)) {
     return REQUEST_CACHE.get(key) as Promise<T>;
@@ -58,7 +63,7 @@ export async function requestWithParameters<T = any>({
 
 function createCacheKey(
   baseUrl: string,
-  parameters: Record<string, string>,
+  parameters: Record<string, unknown>,
   headers: Record<string, string>
 ): string {
   const parameterEntries = Object.entries(parameters).sort(([a], [b]) => (a > b ? 1 : -1));
@@ -66,11 +71,9 @@ function createCacheKey(
   return JSON.stringify({baseUrl, parameters: parameterEntries, headers: headerEntries});
 }
 
-function createURLWithParameters(baseUrl: string, parameters: Record<string, string>): string {
-  const encodedParameters = Object.entries({...DEFAULT_PARAMETERS, ...parameters}).map(
-    ([key, value]) => {
-      return encodeParameter(key, value);
-    }
+function createURLWithParameters(baseUrl: string, parameters: Record<string, unknown>): string {
+  const encodedParameters = Object.entries(parameters).map(([key, value]) =>
+    encodeParameter(key, value)
   );
   return `${baseUrl}?${encodedParameters.join('&')}`;
 }

package/src/sources/base-source.ts

@@ -19,7 +19,7 @@ export const SOURCE_DEFAULTS: SourceOptionalOptions = {
   headers: {}
 };
 
-export async function baseSource<UrlParameters extends Record<string, string>>(
+export async function baseSource<UrlParameters extends Record<string, unknown>>(
   endpoint: MapType,
   options: Partial<SourceOptionalOptions> & SourceRequiredOptions,
   urlParameters: UrlParameters

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

@@ -12,11 +12,11 @@ export type BoundaryQuerySourceOptions = SourceOptions &
   };
 type UrlParameters = {
   columns?: string;
-  filters?: string;
+  filters?: Record<string, unknown>;
   tilesetTableName: string;
   matchingColumn: string;
   propertiesSqlQuery: string;
-  queryParameters?: string;
+  queryParameters?: Record<string, unknown> | unknown[];
 };
 
 export const boundaryQuerySource = async function (
@@ -40,10 +40,10 @@ export const boundaryQuerySource = async function (
     urlParameters.columns = columns.join(',');
   }
   if (filters) {
-    urlParameters.filters = JSON.stringify(filters);
+    urlParameters.filters = filters;
   }
   if (queryParameters) {
-    urlParameters.queryParameters = JSON.stringify(queryParameters);
+    urlParameters.queryParameters = queryParameters;
   }
   return baseSource<UrlParameters>('boundary', options, urlParameters) as Promise<TilejsonResult>;
 };

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

@@ -9,7 +9,7 @@ export type BoundaryTableSourceOptions = SourceOptions &
     propertiesTableName: string;
   };
 type UrlParameters = {
-  filters?: string;
+  filters?: Record<string, unknown>;
   tilesetTableName: string;
   columns?: string;
   matchingColumn: string;
@@ -30,7 +30,7 @@ export const boundaryTableSource = async function (
     urlParameters.columns = columns.join(',');
   }
   if (filters) {
-    urlParameters.filters = JSON.stringify(filters);
+    urlParameters.filters = filters;
   }
   return baseSource<UrlParameters>('boundary', options, urlParameters) as Promise<TilejsonResult>;
 };

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

@@ -16,7 +16,7 @@ type UrlParameters = {
   spatialDataType: SpatialDataType;
   spatialDataColumn?: string;
   q: string;
-  queryParameters?: string;
+  queryParameters?: Record<string, unknown> | unknown[];
 };
 
 export const h3QuerySource = async function (
@@ -40,7 +40,7 @@ export const h3QuerySource = async function (
     urlParameters.aggregationResLevel = String(aggregationResLevel);
   }
   if (queryParameters) {
-    urlParameters.queryParameters = JSON.stringify(queryParameters);
+    urlParameters.queryParameters = queryParameters;
   }
   return baseSource<UrlParameters>('query', options, urlParameters) as Promise<TilejsonResult>;
 };

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

@@ -17,7 +17,7 @@ type UrlParameters = {
   spatialDataType: SpatialDataType;
   spatialDataColumn?: string;
   q: string;
-  queryParameters?: string;
+  queryParameters?: Record<string, unknown> | unknown[];
 };
 
 export const quadbinQuerySource = async function (
@@ -41,7 +41,7 @@ export const quadbinQuerySource = async function (
     urlParameters.aggregationResLevel = String(aggregationResLevel);
   }
   if (queryParameters) {
-    urlParameters.queryParameters = JSON.stringify(queryParameters);
+    urlParameters.queryParameters = queryParameters;
   }
   return baseSource<UrlParameters>('query', options, urlParameters) as Promise<TilejsonResult>;
 };

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

@@ -17,12 +17,12 @@ export type VectorQuerySourceOptions = SourceOptions &
 
 type UrlParameters = {
   columns?: string;
-  filters?: string;
+  filters?: Record<string, unknown>;
   spatialDataType: SpatialDataType;
   spatialDataColumn?: string;
   tileResolution?: string;
   q: string;
-  queryParameters?: string;
+  queryParameters?: Record<string, unknown> | unknown[];
 };
 
 export const vectorQuerySource = async function (
@@ -48,10 +48,10 @@ export const vectorQuerySource = async function (
     urlParameters.columns = columns.join(',');
   }
   if (filters) {
-    urlParameters.filters = JSON.stringify(filters);
+    urlParameters.filters = filters;
   }
   if (queryParameters) {
-    urlParameters.queryParameters = JSON.stringify(queryParameters);
+    urlParameters.queryParameters = queryParameters;
   }
   return baseSource<UrlParameters>('query', options, urlParameters) as Promise<TilejsonResult>;
 };

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

@@ -16,7 +16,7 @@ export type VectorTableSourceOptions = SourceOptions &
   ColumnsOption;
 type UrlParameters = {
   columns?: string;
-  filters?: string;
+  filters?: Record<string, unknown>;
   spatialDataType: SpatialDataType;
   spatialDataColumn?: string;
   tileResolution?: string;
@@ -45,7 +45,7 @@ export const vectorTableSource = async function (
     urlParameters.columns = columns.join(',');
   }
   if (filters) {
-    urlParameters.filters = JSON.stringify(filters);
+    urlParameters.filters = filters;
   }
   return baseSource<UrlParameters>('table', options, urlParameters) as Promise<TilejsonResult>;
 };