@carto/api-client 0.5.1-alpha.1 → 0.5.1-alpha.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.1-alpha.1",
+  "version": "0.5.1-alpha.2",
   "license": "MIT",
   "publishConfig": {
     "access": "public"

package/src/filters/tileFeatures.ts

@@ -23,6 +23,8 @@ export type TileFeatures = {
 /** @privateRemarks Source: @carto/react-core */
 export type TileFeatureExtractOptions = {
   storeGeometry?: boolean;
+  spatialDataType?: SpatialDataType;
+  spatialDataColumn?: string;
   uniqueIdProperty?: string;
 };
 

package/src/utils.ts

@@ -100,3 +100,30 @@ export const isObject: (x: unknown) => boolean = (x) =>
 /** @internal */
 export const isPureObject: (x: any) => boolean = (x) =>
   isObject(x) && x.constructor === {}.constructor;
+
+/**
+ * Merges one or more source objects into a target object. Unlike `Object.assign`, does not
+ * assign properties with undefined values. Null values will overwrite existing properties.
+ */
+export function assignOptional<T extends object, U, V>(
+  target: T,
+  source1: U,
+  source2: V
+): T & U & V;
+export function assignOptional<T extends object, U>(
+  target: T,
+  source: U
+): T & U;
+export function assignOptional<T extends object, U>(
+  target: T,
+  ...sources: any[]
+): any {
+  for (const source of sources) {
+    for (const key in source) {
+      if (source[key] !== undefined) {
+        (target as Record<string, unknown>)[key] = source[key];
+      }
+    }
+  }
+  return target as T & U;
+}

package/src/widget-sources/widget-tileset-source-impl.ts

@@ -16,7 +16,12 @@ import {
   TimeSeriesRequestOptions,
   TimeSeriesResponse,
 } from './types.js';
-import {InvalidColumnError, assert, getApplicableFilters} from '../utils.js';
+import {
+  InvalidColumnError,
+  assert,
+  assignOptional,
+  getApplicableFilters,
+} from '../utils.js';
 import {Filter, SpatialFilter, Tile} from '../types.js';
 import {
   TileFeatureExtractOptions,
@@ -84,8 +89,7 @@ export class WidgetTilesetSourceImpl extends WidgetSource<WidgetTilesetSourcePro
     }
 
     this._features = tileFeatures({
-      ...this.props,
-      ...this._tileFeatureExtractOptions,
+      ...assignOptional({}, this.props, this._tileFeatureExtractOptions),
       tiles: this._tiles,
       spatialFilter,
     });