@carto/api-client 0.5.2-alpha.1 → 0.5.2

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.2-alpha.1",
+  "version": "0.5.2",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -67,7 +67,7 @@
     "@types/geojson": "^7946.0.16",
     "d3-format": "^3.1.0",
     "d3-scale": "^4.0.2",
-    "h3-js": "4.1.0",
+    "h3-js": "4.2.1",
     "quadbin": "^0.4.1-alpha.0"
   },
   "devDependencies": {
@@ -123,11 +123,10 @@
     "typescript": "~5.8.2",
     "typescript-eslint": "^8.26.1",
     "vite": "^6.2.2",
-    "vitest": "3.1.1"
+    "vitest": "3.1.2"
   },
   "resolutions": {
     "@carto/api-client": "portal:./",
     "rollup": "^4.20.0"
-  },
-  "stableVersion": "0.5.1"
+  }
 }

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

@@ -11,7 +11,6 @@ import {
   scaleThreshold,
 } from 'd3-scale';
 import {format as d3Format} from 'd3-format';
-import moment from 'moment-timezone';
 
 export type LayerType =
   | 'clusterTile'
@@ -22,7 +21,12 @@ export type LayerType =
   | 'raster'
   | 'tileset';
 
-import {createBinaryProxy, scaleIdentity} from './utils.js';
+import {
+  createBinaryProxy,
+  formatDate,
+  formatTimestamp,
+  scaleIdentity,
+} from './utils.js';
 import type {
   CustomMarkersRange,
   Dataset,
@@ -33,6 +37,7 @@ import type {
 } from './types.js';
 import type {ProviderType} from '../types.js';
 import {DEFAULT_AGGREGATION_EXP_ALIAS} from '../constants-internal.js';
+import type {SchemaField} from '../types-internal.js';
 
 const SCALE_FUNCS: Record<string, () => any> = {
   linear: scaleLinear,
@@ -457,10 +462,10 @@ export function getSizeAccessor(
 }
 
 const FORMATS: Record<string, (value: any) => string> = {
-  date: (s) => moment.utc(s).format('MM/DD/YY HH:mm:ssa'),
+  date: formatDate,
   integer: d3Format('i'),
   float: d3Format('.5f'),
-  timestamp: (s) => moment.utc(s).format('X'),
+  timestamp: formatTimestamp,
   default: String,
 };
 
@@ -495,11 +500,11 @@ export function calculateClusterRadius(
 export function getDefaultAggregationExpColumnAliasForLayerType(
   layerType: LayerType,
   provider: ProviderType,
-  columns: string[]
+  schema: SchemaField[]
 ): string {
-  if (columns && layerType === 'clusterTile') {
+  if (schema && layerType === 'clusterTile') {
     return getColumnAliasForAggregationExp(
-      getDefaultColumnFromSchemaForAggregationExp(columns),
+      getDefaultColumnFromSchemaForAggregationExp(schema),
       'count',
       provider
     );
@@ -520,9 +525,9 @@ function getColumnAliasForAggregationExp(
 
 /** @privateRemarks Source: Builder */
 function getDefaultColumnFromSchemaForAggregationExp(
-  columns: string[]
+  schema: SchemaField[]
 ): string {
-  return columns ? columns[0] : '';
+  return schema ? schema[0].name : '';
 }
 
 /** @privateRemarks Source: Builder */

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

@@ -279,7 +279,7 @@ function createChannelProps(
     const aggregationExpAlias = getDefaultAggregationExpColumnAliasForLayerType(
       type,
       dataset.providerId,
-      dataset.columns
+      data.schema
     );
 
     result.pointType = visConfig.isTextVisible ? 'circle+text' : 'circle';

package/src/fetch-map/utils.ts

@@ -67,3 +67,21 @@ export function isRemoteCalculationSupported(dataset: Dataset) {
 
   return true;
 }
+
+const DATE_FORMATTER = new Intl.DateTimeFormat('en-US', {
+  year: '2-digit',
+  month: 'numeric',
+  day: 'numeric',
+  hour: 'numeric',
+  minute: 'numeric',
+  second: 'numeric',
+  timeZone: 'UTC',
+});
+
+export function formatDate(value: string | number | Date): string {
+  return DATE_FORMATTER.format(new Date(value));
+}
+
+export function formatTimestamp(value: string | number | Date): string {
+  return String(Math.floor(new Date(value).getTime() / 1000));
+}

package/src/sources/base-source.ts

@@ -55,7 +55,7 @@ export async function baseSource<UrlParameters extends Record<string, unknown>>(
     type: endpoint,
     source: JSON.stringify(parameters, undefined, 2),
   };
-  const mapInstantiation =
+  const {tilejson, schema} =
     await requestWithParameters<TilejsonMapInstantiation>({
       baseUrl,
       parameters,
@@ -65,7 +65,7 @@ export async function baseSource<UrlParameters extends Record<string, unknown>>(
       localCache,
     });
 
-  const dataUrl = mapInstantiation.tilejson.url[0];
+  const dataUrl = tilejson.url[0];
   if (cache) {
     cache.value = parseInt(
       new URL(dataUrl).searchParams.get('cache') || '',
@@ -85,5 +85,8 @@ export async function baseSource<UrlParameters extends Record<string, unknown>>(
   if (accessToken) {
     json.accessToken = accessToken;
   }
+  if (schema) {
+    json.schema = schema;
+  }
   return json;
 }

package/src/sources/types.ts

@@ -414,7 +414,11 @@ export type RasterMetadata = {
   pixel_resolution: number;
 };
 
-export type TilejsonResult = Tilejson & {accessToken: string};
+export type TilejsonResult = Tilejson & {
+  accessToken: string;
+  schema: SchemaField[];
+};
+
 export type QueryResult = {
   meta: {cacheHit: boolean; location: string; totalBytesProcessed: string};
   rows: Record<string, any>[];