@carto/api-client 0.5.2-alpha.2 → 0.5.3

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.2",
+  "version": "0.5.3",
   "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.2.1",
+    "h3-js": "^4.1.0",
     "quadbin": "^0.4.1-alpha.0"
   },
   "devDependencies": {
@@ -128,6 +128,5 @@
   "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,
@@ -31,9 +35,8 @@ import type {
   VisualChannelField,
   VisualChannels,
 } from './types.js';
-import type {ProviderType} from '../types.js';
+import type {ProviderType, SchemaField} 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,
@@ -458,10 +461,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,
 };
 

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/index.ts

@@ -2,6 +2,7 @@ export * from './client.js';
 export * from './constants.js';
 export * from './deck/index.js';
 export * from './fetch-map/index.js';
+export type {LayerDescriptor, LayerType} from './fetch-map/index.js';
 export * from './filters.js';
 export * from './geo.js';
 export * from './sources/index.js';

package/src/sources/types.ts

@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import type {SchemaField} from '../types-internal.js';
-import type {Filters, QueryParameters} from '../types.js';
+import type {Filters, SchemaField, QueryParameters} from '../types.js';
 
 export type SourceRequiredOptions = {
   /** Carto platform access token. */

package/src/types-internal.ts

@@ -8,35 +8,6 @@ export type $TODO = any;
 /** @internal */
 export type $IntentionalAny = any;
 
-/******************************************************************************
- * MAP INSTANTIATION
- */
-
-/**
- * @privateRemarks Source: @deck.gl/carto
- * @internal
- */
-export enum SchemaFieldType {
-  Number = 'number',
-  Bigint = 'bigint',
-  String = 'string',
-  Geometry = 'geometry',
-  Timestamp = 'timestamp',
-  Object = 'object',
-  Boolean = 'boolean',
-  Variant = 'variant',
-  Unknown = 'unknown',
-}
-
-/**
- * @privateRemarks Source: @deck.gl/carto
- * @internal
- */
-export interface SchemaField {
-  name: string;
-  type: SchemaFieldType; // Field type in the CARTO stack, common for all providers
-}
-
 /******************************************************************************
  * LOCAL CALCULATIONS
  */

package/src/types.ts

@@ -2,6 +2,33 @@ import type {FilterType} from './constants.js';
 import type {Polygon, MultiPolygon, Feature} from 'geojson';
 import type {BinaryFeature, BinaryFeatureCollection} from '@loaders.gl/schema';
 
+/******************************************************************************
+ * MAP INSTANTIATION
+ */
+
+/**
+ * @privateRemarks Source: @deck.gl/carto
+ */
+export enum SchemaFieldType {
+  Number = 'number',
+  Bigint = 'bigint',
+  String = 'string',
+  Geometry = 'geometry',
+  Timestamp = 'timestamp',
+  Object = 'object',
+  Boolean = 'boolean',
+  Variant = 'variant',
+  Unknown = 'unknown',
+}
+
+/**
+ * @privateRemarks Source: @deck.gl/carto
+ */
+export interface SchemaField {
+  name: string;
+  type: SchemaFieldType; // Field type in the CARTO stack, common for all providers
+}
+
 /******************************************************************************
  * MAPS AND TILES
  */