@carto/api-client 0.5.23-alpha.fill-data.0 → 0.5.24

package/package.json

@@ -8,7 +8,7 @@
   "homepage": "https://github.com/CartoDB/carto-api-client#readme",
   "author": "Don McCurdy <donmccurdy@carto.com>",
   "packageManager": "yarn@4.3.1",
-  "version": "0.5.23-alpha.fill-data.0",
+  "version": "0.5.24",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -110,12 +110,10 @@
     "@types/react": "^18.3.18",
     "@types/semver": "^7.5.8",
     "@vitest/coverage-istanbul": "^3.0.9",
-    "@webcomponents/webcomponentsjs": "^2.8.0",
     "concurrently": "^9.1.2",
     "echarts": "^6.0.0",
     "eslint": "^9.22.0",
     "lit": "^3.2.1",
-    "lit-analyzer": "^2.0.3",
     "maplibre-gl": "^5.2.0",
     "prettier": "^3.5.3",
     "resolve-package-path": "^4.0.3",
@@ -132,6 +130,5 @@
   "resolutions": {
     "@carto/api-client": "portal:./",
     "rollup": "^4.20.0"
-  },
-  "stableVersion": "0.5.22"
+  }
 }

package/src/constants.ts

@@ -32,6 +32,10 @@ export enum ApiVersion {
 /** @privateRemarks Source: @carto/constants, @deck.gl/carto */
 export const DEFAULT_API_BASE_URL = 'https://gcp-us-east1.api.carto.com';
 
+export const AUDIT_TAGS = {
+  mapId: 'tag-mapId',
+};
+
 /** @privateRemarks Source: @carto/react-core */
 export enum TileFormat {
   MVT = 'mvt',

package/src/fetch-map/fetch-map.ts

@@ -1,4 +1,4 @@
-import {DEFAULT_API_BASE_URL} from '../constants.js';
+import {AUDIT_TAGS, DEFAULT_API_BASE_URL} from '../constants.js';
 
 import {
   type APIErrorContext,
@@ -9,7 +9,7 @@ import {
 } from '../api/index.js';
 
 import {type ParseMapResult, parseMap} from './parse-map.js';
-import {assert} from '../utils.js';
+import {assert, isEmptyObject} from '../utils.js';
 import type {Basemap, Dataset, KeplerMapConfig} from './types.js';
 import {fetchBasemapProps} from './basemap.js';
 import {configureSource} from './source.js';
@@ -26,7 +26,10 @@ async function _fetchMapDataset(
   const cache: {value?: number} = {};
   const configuredSource = configureSource({
     dataset,
-    filters: isRemoteCalculationSupported(dataset) ? filters : undefined,
+    filters:
+      !isEmptyObject(filters) && isRemoteCalculationSupported(dataset)
+        ? filters
+        : undefined,
     options: {
       ...context,
       connection: connectionName,
@@ -34,6 +37,11 @@ async function _fetchMapDataset(
       accessToken: context.accessToken!,
       apiBaseUrl: context.apiBaseUrl,
       maxLengthURL: context.maxLengthURL,
+      ...(context.mapId && {
+        tags: {
+          [AUDIT_TAGS.mapId]: context.mapId,
+        },
+      }),
     },
   });
   dataset.data = await configuredSource;
@@ -74,6 +82,9 @@ async function _fetchTilestats(
   if (client) {
     parameters.client = client;
   }
+  if (context.mapId) {
+    parameters[AUDIT_TAGS.mapId] = context.mapId;
+  }
   if (type === 'query') {
     parameters.q = source;
     if (queryParameters) {
@@ -190,7 +201,7 @@ export type FetchMapOptions = {
 /**
  * Context reused while fetching and updating a map with fetchMap().
  */
-type _FetchMapContext = {apiBaseUrl: string} & Pick<
+type _FetchMapContext = {apiBaseUrl: string; mapId?: string} & Pick<
   FetchMapOptions,
   'accessToken' | 'clientId' | 'headers' | 'maxLengthURL'
 >;
@@ -243,6 +254,7 @@ export async function fetchMap({
     maxLengthURL,
   });
   const context: _FetchMapContext = {
+    mapId: cartoMapId,
     accessToken: map.token || accessToken,
     apiBaseUrl,
     clientId,
@@ -310,7 +322,10 @@ export async function fetchMap({
   /* global FontFace, window, document */
   if (
     textLayers.length &&
+    typeof window !== 'undefined' &&
+    typeof document !== 'undefined' &&
     window.FontFace &&
+    document.fonts &&
     !document.fonts.check('12px Inter')
   ) {
     // Fetch font needed for labels

package/src/fetch-map/source.ts

@@ -41,6 +41,7 @@ type FetchDatasetOptions = {
     cacheControl: 'no-cache'[];
   };
   maxLengthURL?: number;
+  tags?: Record<string, string>;
 };
 
 type FetchDataset = {
@@ -169,6 +170,7 @@ function getSourceOptions({
   connection,
   headers,
   maxLengthURL,
+  tags,
 }: FetchDatasetOptions) {
   return {
     accessToken,
@@ -181,6 +183,7 @@ function getSourceOptions({
         cacheControl: ['no-cache'] as 'no-cache'[],
       },
     }),
+    tags,
   };
 }