@carto/api-client 0.5.11 → 0.5.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/build/api-client.cjs +28 -14
- package/build/api-client.cjs.map +1 -1
- package/build/api-client.d.cts +15 -2
- package/build/api-client.d.ts +15 -2
- package/build/api-client.js +28 -14
- package/build/api-client.js.map +1 -1
- package/package.json +1 -1
- package/src/api/query.ts +19 -2
- package/src/api/request-with-parameters.ts +10 -5
- package/src/models/model.ts +3 -0
- package/src/sources/base-source.ts +1 -1
- package/src/sources/types.ts +3 -0
- package/src/widget-sources/widget-remote-source.ts +1 -0
package/build/api-client.d.cts
CHANGED
|
@@ -388,6 +388,8 @@ type SourceOptionalOptions = {
|
|
|
388
388
|
* By default, local in-memory caching is enabled.
|
|
389
389
|
*/
|
|
390
390
|
localCache?: LocalCacheOptions;
|
|
391
|
+
/** Additional tags appended to HTTP requests, available for analytics and audits. */
|
|
392
|
+
tags?: Record<string, string>;
|
|
391
393
|
};
|
|
392
394
|
type LocalCacheOptions = {
|
|
393
395
|
/**
|
|
@@ -693,16 +695,26 @@ type QueryResult = {
|
|
|
693
695
|
}[];
|
|
694
696
|
};
|
|
695
697
|
|
|
696
|
-
type QueryOptions = SourceOptions & QuerySourceOptions
|
|
698
|
+
type QueryOptions = SourceOptions & QuerySourceOptions & {
|
|
699
|
+
/**
|
|
700
|
+
* @internal
|
|
701
|
+
* @experimental
|
|
702
|
+
* Used to append additional parameters to the SQL API request for features specific to providers or integrations.
|
|
703
|
+
*/
|
|
704
|
+
internalParameters?: Record<string, string | boolean | number>;
|
|
705
|
+
/** Used to abort the request. */
|
|
706
|
+
signal?: AbortSignal;
|
|
707
|
+
};
|
|
697
708
|
declare const query: (options: QueryOptions) => Promise<QueryResult>;
|
|
698
709
|
|
|
699
|
-
declare function requestWithParameters<T = any>({ baseUrl, parameters, headers: customHeaders, errorContext, maxLengthURL, localCache, }: {
|
|
710
|
+
declare function requestWithParameters<T = any>({ baseUrl, parameters, headers: customHeaders, errorContext, maxLengthURL, localCache, signal, }: {
|
|
700
711
|
baseUrl: string;
|
|
701
712
|
parameters?: Record<string, unknown>;
|
|
702
713
|
headers?: Record<string, string>;
|
|
703
714
|
errorContext: APIErrorContext;
|
|
704
715
|
maxLengthURL?: number;
|
|
705
716
|
localCache?: LocalCacheOptions;
|
|
717
|
+
signal?: AbortSignal;
|
|
706
718
|
}): Promise<T>;
|
|
707
719
|
/**
|
|
708
720
|
* Clears the HTTP response cache for all requests using the default cache.
|
|
@@ -1463,6 +1475,7 @@ interface ModelSource {
|
|
|
1463
1475
|
spatialDataColumn?: string;
|
|
1464
1476
|
spatialDataType?: SpatialDataType;
|
|
1465
1477
|
spatialFiltersMode?: SpatialFilterPolyfillMode;
|
|
1478
|
+
tags?: Record<string, string>;
|
|
1466
1479
|
}
|
|
1467
1480
|
|
|
1468
1481
|
type WidgetRemoteSourceProps = WidgetSourceProps;
|
package/build/api-client.d.ts
CHANGED
|
@@ -388,6 +388,8 @@ type SourceOptionalOptions = {
|
|
|
388
388
|
* By default, local in-memory caching is enabled.
|
|
389
389
|
*/
|
|
390
390
|
localCache?: LocalCacheOptions;
|
|
391
|
+
/** Additional tags appended to HTTP requests, available for analytics and audits. */
|
|
392
|
+
tags?: Record<string, string>;
|
|
391
393
|
};
|
|
392
394
|
type LocalCacheOptions = {
|
|
393
395
|
/**
|
|
@@ -693,16 +695,26 @@ type QueryResult = {
|
|
|
693
695
|
}[];
|
|
694
696
|
};
|
|
695
697
|
|
|
696
|
-
type QueryOptions = SourceOptions & QuerySourceOptions
|
|
698
|
+
type QueryOptions = SourceOptions & QuerySourceOptions & {
|
|
699
|
+
/**
|
|
700
|
+
* @internal
|
|
701
|
+
* @experimental
|
|
702
|
+
* Used to append additional parameters to the SQL API request for features specific to providers or integrations.
|
|
703
|
+
*/
|
|
704
|
+
internalParameters?: Record<string, string | boolean | number>;
|
|
705
|
+
/** Used to abort the request. */
|
|
706
|
+
signal?: AbortSignal;
|
|
707
|
+
};
|
|
697
708
|
declare const query: (options: QueryOptions) => Promise<QueryResult>;
|
|
698
709
|
|
|
699
|
-
declare function requestWithParameters<T = any>({ baseUrl, parameters, headers: customHeaders, errorContext, maxLengthURL, localCache, }: {
|
|
710
|
+
declare function requestWithParameters<T = any>({ baseUrl, parameters, headers: customHeaders, errorContext, maxLengthURL, localCache, signal, }: {
|
|
700
711
|
baseUrl: string;
|
|
701
712
|
parameters?: Record<string, unknown>;
|
|
702
713
|
headers?: Record<string, string>;
|
|
703
714
|
errorContext: APIErrorContext;
|
|
704
715
|
maxLengthURL?: number;
|
|
705
716
|
localCache?: LocalCacheOptions;
|
|
717
|
+
signal?: AbortSignal;
|
|
706
718
|
}): Promise<T>;
|
|
707
719
|
/**
|
|
708
720
|
* Clears the HTTP response cache for all requests using the default cache.
|
|
@@ -1463,6 +1475,7 @@ interface ModelSource {
|
|
|
1463
1475
|
spatialDataColumn?: string;
|
|
1464
1476
|
spatialDataType?: SpatialDataType;
|
|
1465
1477
|
spatialFiltersMode?: SpatialFilterPolyfillMode;
|
|
1478
|
+
tags?: Record<string, string>;
|
|
1466
1479
|
}
|
|
1467
1480
|
|
|
1468
1481
|
type WidgetRemoteSourceProps = WidgetSourceProps;
|
package/build/api-client.js
CHANGED
|
@@ -5839,7 +5839,8 @@ async function requestWithParameters({
|
|
|
5839
5839
|
headers: customHeaders = {},
|
|
5840
5840
|
errorContext,
|
|
5841
5841
|
maxLengthURL = DEFAULT_MAX_LENGTH_URL,
|
|
5842
|
-
localCache
|
|
5842
|
+
localCache,
|
|
5843
|
+
signal
|
|
5843
5844
|
}) {
|
|
5844
5845
|
parameters = {
|
|
5845
5846
|
v: V3_MINOR_VERSION,
|
|
@@ -5862,8 +5863,9 @@ async function requestWithParameters({
|
|
|
5862
5863
|
const fetchPromise = url.length > maxLengthURL ? fetch(baseUrl, {
|
|
5863
5864
|
method: "POST",
|
|
5864
5865
|
body: JSON.stringify(parameters),
|
|
5865
|
-
headers
|
|
5866
|
-
|
|
5866
|
+
headers,
|
|
5867
|
+
signal
|
|
5868
|
+
}) : fetch(url, { headers, signal });
|
|
5867
5869
|
let response;
|
|
5868
5870
|
let responseJson;
|
|
5869
5871
|
const jsonPromise = fetchPromise.then((_response) => {
|
|
@@ -5915,10 +5917,12 @@ function createURLWithParameters(baseUrlString, parameters) {
|
|
|
5915
5917
|
if (isPureObject(value) || Array.isArray(value)) {
|
|
5916
5918
|
baseUrl.searchParams.set(key, JSON.stringify(value));
|
|
5917
5919
|
} else {
|
|
5918
|
-
|
|
5919
|
-
|
|
5920
|
-
|
|
5921
|
-
|
|
5920
|
+
if (value !== null && value !== void 0) {
|
|
5921
|
+
baseUrl.searchParams.set(
|
|
5922
|
+
key,
|
|
5923
|
+
value.toString()
|
|
5924
|
+
);
|
|
5925
|
+
}
|
|
5922
5926
|
}
|
|
5923
5927
|
}
|
|
5924
5928
|
return baseUrl.toString();
|
|
@@ -5962,7 +5966,7 @@ async function baseSource(endpoint, options, urlParameters) {
|
|
|
5962
5966
|
Authorization: `Bearer ${options.accessToken}`,
|
|
5963
5967
|
...options.headers
|
|
5964
5968
|
};
|
|
5965
|
-
const parameters = { client: clientId, ...urlParameters };
|
|
5969
|
+
const parameters = { client: clientId, ...options.tags, ...urlParameters };
|
|
5966
5970
|
const errorContext = {
|
|
5967
5971
|
requestType: "Map instantiation",
|
|
5968
5972
|
connection: options.connectionName,
|
|
@@ -6164,7 +6168,8 @@ function executeModel(props) {
|
|
|
6164
6168
|
filtersLogicalOperator = "and",
|
|
6165
6169
|
spatialDataType = "geo",
|
|
6166
6170
|
spatialDataColumn = DEFAULT_GEO_COLUMN,
|
|
6167
|
-
spatialFiltersMode = "intersects"
|
|
6171
|
+
spatialFiltersMode = "intersects",
|
|
6172
|
+
tags
|
|
6168
6173
|
} = source;
|
|
6169
6174
|
const queryParams = {
|
|
6170
6175
|
type,
|
|
@@ -6173,7 +6178,8 @@ function executeModel(props) {
|
|
|
6173
6178
|
params,
|
|
6174
6179
|
queryParameters: source.queryParameters || "",
|
|
6175
6180
|
filters,
|
|
6176
|
-
filtersLogicalOperator
|
|
6181
|
+
filtersLogicalOperator,
|
|
6182
|
+
...tags ?? {}
|
|
6177
6183
|
};
|
|
6178
6184
|
queryParams.spatialDataType = spatialDataType;
|
|
6179
6185
|
queryParams.spatialDataColumn = spatialDataColumn;
|
|
@@ -6306,7 +6312,8 @@ var WidgetRemoteSource = class extends WidgetSource {
|
|
|
6306
6312
|
filters: getApplicableFilters(filterOwner, filters || props.filters),
|
|
6307
6313
|
filtersLogicalOperator: props.filtersLogicalOperator,
|
|
6308
6314
|
spatialDataType: props.spatialDataType,
|
|
6309
|
-
spatialDataColumn: props.spatialDataColumn
|
|
6315
|
+
spatialDataColumn: props.spatialDataColumn,
|
|
6316
|
+
tags: props.tags
|
|
6310
6317
|
};
|
|
6311
6318
|
}
|
|
6312
6319
|
async getCategories(options) {
|
|
@@ -8112,7 +8119,8 @@ var query = async function(options) {
|
|
|
8112
8119
|
localCache,
|
|
8113
8120
|
connectionName,
|
|
8114
8121
|
sqlQuery,
|
|
8115
|
-
queryParameters
|
|
8122
|
+
queryParameters,
|
|
8123
|
+
internalParameters
|
|
8116
8124
|
} = options;
|
|
8117
8125
|
const urlParameters = { q: sqlQuery };
|
|
8118
8126
|
if (queryParameters) {
|
|
@@ -8123,7 +8131,12 @@ var query = async function(options) {
|
|
|
8123
8131
|
Authorization: `Bearer ${options.accessToken}`,
|
|
8124
8132
|
...options.headers
|
|
8125
8133
|
};
|
|
8126
|
-
const parameters = {
|
|
8134
|
+
const parameters = {
|
|
8135
|
+
client: clientId,
|
|
8136
|
+
...options.tags,
|
|
8137
|
+
...internalParameters,
|
|
8138
|
+
...urlParameters
|
|
8139
|
+
};
|
|
8127
8140
|
const errorContext = {
|
|
8128
8141
|
requestType: "SQL",
|
|
8129
8142
|
connection: options.connectionName,
|
|
@@ -8136,7 +8149,8 @@ var query = async function(options) {
|
|
|
8136
8149
|
headers,
|
|
8137
8150
|
errorContext,
|
|
8138
8151
|
maxLengthURL,
|
|
8139
|
-
localCache
|
|
8152
|
+
localCache,
|
|
8153
|
+
signal: options.signal
|
|
8140
8154
|
});
|
|
8141
8155
|
};
|
|
8142
8156
|
|