@carto/api-client 0.5.0-alpha.8 → 0.5.0-alpha.9

package/build/api-client.cjs

@@ -3294,7 +3294,9 @@ var WidgetTilesetSource = class extends WidgetSource {
     __publicField(this, "_workerEnabled");
     __publicField(this, "_workerNextRequestId", 1);
     this._workerEnabled = (props.widgetSourceWorker ?? true) && false;
-    this._localImpl = this._workerEnabled ? null : new WidgetTilesetSourceImpl(this.props);
+    if (!this._workerEnabled) {
+      this._localImpl = new WidgetTilesetSourceImpl(this.props);
+    }
   }
   destroy() {
     this._localImpl?.destroy();
@@ -3310,31 +3312,28 @@ var WidgetTilesetSource = class extends WidgetSource {
    * source instance.
    */
   _getWorker() {
-    if (this._workerImpl || this._localImpl) {
+    if (this._workerImpl) {
       return this._workerImpl;
     }
-    try {
-      this._workerImpl = new Worker(new URL("worker.js", importMetaUrl), {
+    this._workerImpl = new Worker(
+      new URL("@carto/api-client/worker", importMetaUrl),
+      {
         type: "module",
         name: "cartowidgettileset"
-      });
-      this._workerImpl.postMessage({
-        method: "init" /* INIT */,
-        params: [this.props]
-      });
-      return this._workerImpl;
-    } catch {
-      this._workerEnabled = false;
-      this._localImpl = new WidgetTilesetSourceImpl(this.props);
-      return null;
-    }
+      }
+    );
+    this._workerImpl.postMessage({
+      method: "init" /* INIT */,
+      params: [this.props]
+    });
+    return this._workerImpl;
   }
   /** Executes a given method on the worker. */
   _executeWorkerMethod(method, params, signal) {
-    const worker = this._getWorker();
-    if (!worker) {
+    if (!this._workerEnabled) {
       return this._localImpl[method](...params);
     }
+    const worker = this._getWorker();
     const requestId = this._workerNextRequestId++;
     const options = params[0];
     if (options?.spatialIndexReferenceViewState) {
@@ -3382,10 +3381,10 @@ var WidgetTilesetSource = class extends WidgetSource {
    * before computing statistics on the tiles.
    */
   loadTiles(tiles2) {
-    const worker = this._getWorker();
-    if (!worker) {
+    if (!this._workerEnabled) {
       return this._localImpl.loadTiles(tiles2);
     }
+    const worker = this._getWorker();
     tiles2 = tiles2.map(({ id, bbox, data }) => ({
       id,
       bbox,
@@ -3398,10 +3397,10 @@ var WidgetTilesetSource = class extends WidgetSource {
   }
   /** Configures options used to extract features from tiles. */
   setTileFeatureExtractOptions(options) {
-    const worker = this._getWorker();
-    if (!worker) {
+    if (!this._workerEnabled) {
       return this._localImpl?.setTileFeatureExtractOptions(options);
     }
+    const worker = this._getWorker();
     worker.postMessage({
       type: "setTileFeatureExtractOptions" /* SET_TILE_FEATURE_EXTRACT_OPTIONS */,
       params: [options]
@@ -3416,10 +3415,10 @@ var WidgetTilesetSource = class extends WidgetSource {
     geojson,
     spatialFilter
   }) {
-    const worker = this._getWorker();
-    if (!worker) {
+    if (!this._workerEnabled) {
       return this._localImpl.loadGeoJSON({ geojson, spatialFilter });
     }
+    const worker = this._getWorker();
     worker.postMessage({
       method: "loadGeoJSON" /* LOAD_GEOJSON */,
       params: [{ geojson, spatialFilter }]

package/build/api-client.d.cts

@@ -1170,7 +1170,7 @@ declare class WidgetTilesetSource extends WidgetSource<WidgetTilesetSourceProps>
      * Returns an initialized Worker, to be reused for the lifecycle of this
      * source instance.
      */
-    protected _getWorker(): Worker | null;
+    protected _getWorker(): Worker;
     /** Executes a given method on the worker. */
     protected _executeWorkerMethod<T>(method: Method, params: unknown[], signal?: AbortSignal): Promise<T>;
     /**

package/build/api-client.d.ts

@@ -1170,7 +1170,7 @@ declare class WidgetTilesetSource extends WidgetSource<WidgetTilesetSourceProps>
      * Returns an initialized Worker, to be reused for the lifecycle of this
      * source instance.
      */
-    protected _getWorker(): Worker | null;
+    protected _getWorker(): Worker;
     /** Executes a given method on the worker. */
     protected _executeWorkerMethod<T>(method: Method, params: unknown[], signal?: AbortSignal): Promise<T>;
     /**

package/build/api-client.js

@@ -3099,8 +3099,10 @@ var WidgetTilesetSource = class extends WidgetSource {
     __publicField(this, "_workerImpl", null);
     __publicField(this, "_workerEnabled");
     __publicField(this, "_workerNextRequestId", 1);
-    this._workerEnabled = (props.widgetSourceWorker ?? true) && true;
-    this._localImpl = this._workerEnabled ? null : new WidgetTilesetSourceImpl(this.props);
+    this._workerEnabled = (props.widgetSourceWorker ?? true) && true && typeof Worker !== "undefined";
+    if (!this._workerEnabled) {
+      this._localImpl = new WidgetTilesetSourceImpl(this.props);
+    }
   }
   destroy() {
     this._localImpl?.destroy();
@@ -3116,31 +3118,28 @@ var WidgetTilesetSource = class extends WidgetSource {
    * source instance.
    */
   _getWorker() {
-    if (this._workerImpl || this._localImpl) {
+    if (this._workerImpl) {
       return this._workerImpl;
     }
-    try {
-      this._workerImpl = new Worker(new URL("worker.js", import.meta.url), {
+    this._workerImpl = new Worker(
+      new URL("@carto/api-client/worker", import.meta.url),
+      {
         type: "module",
         name: "cartowidgettileset"
-      });
-      this._workerImpl.postMessage({
-        method: "init" /* INIT */,
-        params: [this.props]
-      });
-      return this._workerImpl;
-    } catch {
-      this._workerEnabled = false;
-      this._localImpl = new WidgetTilesetSourceImpl(this.props);
-      return null;
-    }
+      }
+    );
+    this._workerImpl.postMessage({
+      method: "init" /* INIT */,
+      params: [this.props]
+    });
+    return this._workerImpl;
   }
   /** Executes a given method on the worker. */
   _executeWorkerMethod(method, params, signal) {
-    const worker = this._getWorker();
-    if (!worker) {
+    if (!this._workerEnabled) {
       return this._localImpl[method](...params);
     }
+    const worker = this._getWorker();
     const requestId = this._workerNextRequestId++;
     const options = params[0];
     if (options?.spatialIndexReferenceViewState) {
@@ -3188,10 +3187,10 @@ var WidgetTilesetSource = class extends WidgetSource {
    * before computing statistics on the tiles.
    */
   loadTiles(tiles2) {
-    const worker = this._getWorker();
-    if (!worker) {
+    if (!this._workerEnabled) {
       return this._localImpl.loadTiles(tiles2);
     }
+    const worker = this._getWorker();
     tiles2 = tiles2.map(({ id, bbox, data }) => ({
       id,
       bbox,
@@ -3204,10 +3203,10 @@ var WidgetTilesetSource = class extends WidgetSource {
   }
   /** Configures options used to extract features from tiles. */
   setTileFeatureExtractOptions(options) {
-    const worker = this._getWorker();
-    if (!worker) {
+    if (!this._workerEnabled) {
       return this._localImpl?.setTileFeatureExtractOptions(options);
     }
+    const worker = this._getWorker();
     worker.postMessage({
       type: "setTileFeatureExtractOptions" /* SET_TILE_FEATURE_EXTRACT_OPTIONS */,
       params: [options]
@@ -3222,10 +3221,10 @@ var WidgetTilesetSource = class extends WidgetSource {
     geojson,
     spatialFilter
   }) {
-    const worker = this._getWorker();
-    if (!worker) {
+    if (!this._workerEnabled) {
       return this._localImpl.loadGeoJSON({ geojson, spatialFilter });
     }
+    const worker = this._getWorker();
     worker.postMessage({
       method: "loadGeoJSON" /* LOAD_GEOJSON */,
       params: [{ geojson, spatialFilter }]

package/build/worker.js

@@ -394,12 +394,6 @@ var require_thenBy_module = __commonJS({
   }
 });
 
-// src/client.ts
-var client = "deck-gl-carto";
-function getClient() {
-  return client;
-}
-
 // src/constants.ts
 var FilterType = /* @__PURE__ */ ((FilterType2) => {
   FilterType2["IN"] = "in";
@@ -411,113 +405,6 @@ var FilterType = /* @__PURE__ */ ((FilterType2) => {
 })(FilterType || {});
 var DEFAULT_API_BASE_URL = "https://gcp-us-east1.api.carto.com";
 
-// src/constants-internal.ts
-var DEFAULT_GEO_COLUMN = "geom";
-var DEFAULT_AGGREGATION_RES_LEVEL_H3 = 4;
-var DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN = 6;
-
-// src/spatial-index.ts
-var DEFAULT_TILE_SIZE = 512;
-var QUADBIN_ZOOM_MAX_OFFSET = 4;
-function getSpatialFiltersResolution(source2, viewState) {
-  const dataResolution = source2.dataResolution ?? Number.MAX_VALUE;
-  const aggregationResLevel = source2.aggregationResLevel ?? (source2.spatialDataType === "h3" ? DEFAULT_AGGREGATION_RES_LEVEL_H3 : DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN);
-  const aggregationResLevelOffset = Math.max(
-    0,
-    Math.floor(aggregationResLevel)
-  );
-  const currentZoomInt = Math.ceil(viewState.zoom);
-  if (source2.spatialDataType === "h3") {
-    const tileSize = DEFAULT_TILE_SIZE;
-    const maxResolutionForZoom = maxH3SpatialFiltersResolutions.find(
-      ([zoom]) => zoom === currentZoomInt
-    )?.[1] ?? Math.max(0, currentZoomInt - 3);
-    const maxSpatialFiltersResolution = maxResolutionForZoom ? Math.min(dataResolution, maxResolutionForZoom) : dataResolution;
-    const hexagonResolution = _getHexagonResolution(viewState, tileSize) + aggregationResLevelOffset;
-    return Math.min(hexagonResolution, maxSpatialFiltersResolution);
-  }
-  if (source2.spatialDataType === "quadbin") {
-    const maxResolutionForZoom = currentZoomInt + QUADBIN_ZOOM_MAX_OFFSET;
-    const maxSpatialFiltersResolution = Math.min(
-      dataResolution,
-      maxResolutionForZoom
-    );
-    const quadsResolution = Math.floor(viewState.zoom) + aggregationResLevelOffset;
-    return Math.min(quadsResolution, maxSpatialFiltersResolution);
-  }
-  return void 0;
-}
-var maxH3SpatialFiltersResolutions = [
-  [20, 14],
-  [19, 13],
-  [18, 12],
-  [17, 11],
-  [16, 10],
-  [15, 9],
-  [14, 8],
-  [13, 7],
-  [12, 7],
-  [11, 7],
-  [10, 6],
-  [9, 6],
-  [8, 5],
-  [7, 4],
-  [6, 4],
-  [5, 3],
-  [4, 2],
-  [3, 1],
-  [2, 1],
-  [1, 0]
-];
-var BIAS = 2;
-function _getHexagonResolution(viewport, tileSize) {
-  const zoomOffset = Math.log2(tileSize / DEFAULT_TILE_SIZE);
-  const hexagonScaleFactor = 2 / 3 * (viewport.zoom - zoomOffset);
-  const latitudeScaleFactor = Math.log(
-    1 / Math.cos(Math.PI * viewport.latitude / 180)
-  );
-  return Math.max(
-    0,
-    Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS)
-  );
-}
-
-// src/widget-sources/widget-source.ts
-var _WidgetSource = class _WidgetSource {
-  constructor(props) {
-    __publicField(this, "props");
-    this.props = { ..._WidgetSource.defaultProps, ...props };
-  }
-  /**
-   * Destroys the widget source and releases allocated resources.
-   *
-   * For remote sources (tables, queries) this has no effect, but for local
-   * sources (tilesets, rasters) these resources will affect performance
-   * and stability if many (10+) sources are created and not released.
-   */
-  destroy() {
-  }
-  _getSpatialFiltersResolution(source2, spatialFilter, referenceViewState) {
-    if (!spatialFilter || source2.spatialDataType === "geo") {
-      return;
-    }
-    if (!referenceViewState) {
-      throw new Error(
-        'Missing required option, "spatialIndexReferenceViewState".'
-      );
-    }
-    return getSpatialFiltersResolution(source2, referenceViewState);
-  }
-};
-__publicField(_WidgetSource, "defaultProps", {
-  apiVersion: "v3" /* V3 */,
-  apiBaseUrl: DEFAULT_API_BASE_URL,
-  clientId: getClient(),
-  filters: {},
-  filtersLogicalOperator: "and"
-});
-var WidgetSource = _WidgetSource;
-
 // src/utils.ts
 var FILTER_TYPES = new Set(Object.values(FilterType));
 var isFilterType = (type) => FILTER_TYPES.has(type);
@@ -1271,6 +1158,11 @@ function getSpatialIndex(spatialDataType) {
   }
 }
 
+// src/constants-internal.ts
+var DEFAULT_GEO_COLUMN = "geom";
+var DEFAULT_AGGREGATION_RES_LEVEL_H3 = 4;
+var DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN = 6;
+
 // src/filters/tileFeatures.ts
 function tileFeatures({
   tiles: tiles2,
@@ -1637,6 +1529,114 @@ function scatterPlot({
   );
 }
 
+// src/client.ts
+var client = "deck-gl-carto";
+function getClient() {
+  return client;
+}
+
+// src/spatial-index.ts
+var DEFAULT_TILE_SIZE = 512;
+var QUADBIN_ZOOM_MAX_OFFSET = 4;
+function getSpatialFiltersResolution(source2, viewState) {
+  const dataResolution = source2.dataResolution ?? Number.MAX_VALUE;
+  const aggregationResLevel = source2.aggregationResLevel ?? (source2.spatialDataType === "h3" ? DEFAULT_AGGREGATION_RES_LEVEL_H3 : DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN);
+  const aggregationResLevelOffset = Math.max(
+    0,
+    Math.floor(aggregationResLevel)
+  );
+  const currentZoomInt = Math.ceil(viewState.zoom);
+  if (source2.spatialDataType === "h3") {
+    const tileSize = DEFAULT_TILE_SIZE;
+    const maxResolutionForZoom = maxH3SpatialFiltersResolutions.find(
+      ([zoom]) => zoom === currentZoomInt
+    )?.[1] ?? Math.max(0, currentZoomInt - 3);
+    const maxSpatialFiltersResolution = maxResolutionForZoom ? Math.min(dataResolution, maxResolutionForZoom) : dataResolution;
+    const hexagonResolution = _getHexagonResolution(viewState, tileSize) + aggregationResLevelOffset;
+    return Math.min(hexagonResolution, maxSpatialFiltersResolution);
+  }
+  if (source2.spatialDataType === "quadbin") {
+    const maxResolutionForZoom = currentZoomInt + QUADBIN_ZOOM_MAX_OFFSET;
+    const maxSpatialFiltersResolution = Math.min(
+      dataResolution,
+      maxResolutionForZoom
+    );
+    const quadsResolution = Math.floor(viewState.zoom) + aggregationResLevelOffset;
+    return Math.min(quadsResolution, maxSpatialFiltersResolution);
+  }
+  return void 0;
+}
+var maxH3SpatialFiltersResolutions = [
+  [20, 14],
+  [19, 13],
+  [18, 12],
+  [17, 11],
+  [16, 10],
+  [15, 9],
+  [14, 8],
+  [13, 7],
+  [12, 7],
+  [11, 7],
+  [10, 6],
+  [9, 6],
+  [8, 5],
+  [7, 4],
+  [6, 4],
+  [5, 3],
+  [4, 2],
+  [3, 1],
+  [2, 1],
+  [1, 0]
+];
+var BIAS = 2;
+function _getHexagonResolution(viewport, tileSize) {
+  const zoomOffset = Math.log2(tileSize / DEFAULT_TILE_SIZE);
+  const hexagonScaleFactor = 2 / 3 * (viewport.zoom - zoomOffset);
+  const latitudeScaleFactor = Math.log(
+    1 / Math.cos(Math.PI * viewport.latitude / 180)
+  );
+  return Math.max(
+    0,
+    Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS)
+  );
+}
+
+// src/widget-sources/widget-source.ts
+var _WidgetSource = class _WidgetSource {
+  constructor(props) {
+    __publicField(this, "props");
+    this.props = { ..._WidgetSource.defaultProps, ...props };
+  }
+  /**
+   * Destroys the widget source and releases allocated resources.
+   *
+   * For remote sources (tables, queries) this has no effect, but for local
+   * sources (tilesets, rasters) these resources will affect performance
+   * and stability if many (10+) sources are created and not released.
+   */
+  destroy() {
+  }
+  _getSpatialFiltersResolution(source2, spatialFilter, referenceViewState) {
+    if (!spatialFilter || source2.spatialDataType === "geo") {
+      return;
+    }
+    if (!referenceViewState) {
+      throw new Error(
+        'Missing required option, "spatialIndexReferenceViewState".'
+      );
+    }
+    return getSpatialFiltersResolution(source2, referenceViewState);
+  }
+};
+__publicField(_WidgetSource, "defaultProps", {
+  apiVersion: "v3" /* V3 */,
+  apiBaseUrl: DEFAULT_API_BASE_URL,
+  clientId: getClient(),
+  filters: {},
+  filtersLogicalOperator: "and"
+});
+var WidgetSource = _WidgetSource;
+
 // src/widget-sources/widget-tileset-source-impl.ts
 import { booleanEqual } from "@turf/boolean-equal";
 var WidgetTilesetSourceImpl = class extends WidgetSource {
@@ -1924,202 +1924,12 @@ function normalizeColumns(columns) {
   return Array.isArray(columns) ? columns : typeof columns === "string" ? [columns] : [];
 }
 
-// src/widget-sources/widget-tileset-source.ts
-var WidgetTilesetSource = class extends WidgetSource {
-  constructor(props) {
-    super(props);
-    __publicField(this, "_localImpl", null);
-    __publicField(this, "_workerImpl", null);
-    __publicField(this, "_workerEnabled");
-    __publicField(this, "_workerNextRequestId", 1);
-    this._workerEnabled = (props.widgetSourceWorker ?? true) && true;
-    this._localImpl = this._workerEnabled ? null : new WidgetTilesetSourceImpl(this.props);
-  }
-  destroy() {
-    this._localImpl?.destroy();
-    this._localImpl = null;
-    this._workerImpl?.terminate();
-    this._workerImpl = null;
-    super.destroy();
-  }
-  /////////////////////////////////////////////////////////////////////////////
-  // WEB WORKER MANAGEMENT
-  /**
-   * Returns an initialized Worker, to be reused for the lifecycle of this
-   * source instance.
-   */
-  _getWorker() {
-    if (this._workerImpl || this._localImpl) {
-      return this._workerImpl;
-    }
-    try {
-      this._workerImpl = new Worker(new URL("worker.js", import.meta.url), {
-        type: "module",
-        name: "cartowidgettileset"
-      });
-      this._workerImpl.postMessage({
-        method: "init" /* INIT */,
-        params: [this.props]
-      });
-      return this._workerImpl;
-    } catch {
-      this._workerEnabled = false;
-      this._localImpl = new WidgetTilesetSourceImpl(this.props);
-      return null;
-    }
-  }
-  /** Executes a given method on the worker. */
-  _executeWorkerMethod(method, params, signal) {
-    const worker = this._getWorker();
-    if (!worker) {
-      return this._localImpl[method](...params);
-    }
-    const requestId = this._workerNextRequestId++;
-    const options = params[0];
-    if (options?.spatialIndexReferenceViewState) {
-      const { zoom, latitude, longitude } = options.spatialIndexReferenceViewState;
-      options.spatialIndexReferenceViewState = { zoom, latitude, longitude };
-    }
-    let resolve = null;
-    let reject = null;
-    function onMessage(e) {
-      const response = e.data;
-      if (response.requestId !== requestId) return;
-      if (signal?.aborted) {
-        reject(new Error(signal.reason));
-      } else if (response.ok) {
-        resolve(response.result);
-      } else {
-        reject(new Error(response.error));
-      }
-    }
-    function onAbort() {
-      reject(new Error(signal.reason));
-    }
-    worker.addEventListener("message", onMessage);
-    signal?.addEventListener("abort", onAbort);
-    const promise = new Promise((_resolve, _reject) => {
-      resolve = _resolve;
-      reject = _reject;
-      worker.postMessage({
-        requestId,
-        method,
-        params
-      });
-    });
-    void promise.finally(() => {
-      worker.removeEventListener("message", onMessage);
-      signal?.removeEventListener("abort", onAbort);
-    });
-    return promise;
-  }
-  /////////////////////////////////////////////////////////////////////////////
-  // DATA LOADING
-  /**
-   * Loads features as a list of tiles (typically provided by deck.gl).
-   * After tiles are loaded, {@link extractTileFeatures} must be called
-   * before computing statistics on the tiles.
-   */
-  loadTiles(tiles2) {
-    const worker = this._getWorker();
-    if (!worker) {
-      return this._localImpl.loadTiles(tiles2);
-    }
-    tiles2 = tiles2.map(({ id, bbox, data }) => ({
-      id,
-      bbox,
-      data
-    }));
-    worker.postMessage({
-      method: "loadTiles" /* LOAD_TILES */,
-      params: [tiles2]
-    });
-  }
-  /** Configures options used to extract features from tiles. */
-  setTileFeatureExtractOptions(options) {
-    const worker = this._getWorker();
-    if (!worker) {
-      return this._localImpl?.setTileFeatureExtractOptions(options);
-    }
-    worker.postMessage({
-      type: "setTileFeatureExtractOptions" /* SET_TILE_FEATURE_EXTRACT_OPTIONS */,
-      params: [options]
-    });
-  }
-  /**
-   * Loads features as GeoJSON (used for testing).
-   * @experimental
-   * @internal Not for public use. Spatial filters in other method calls will be ignored.
-   */
-  loadGeoJSON({
-    geojson,
-    spatialFilter
-  }) {
-    const worker = this._getWorker();
-    if (!worker) {
-      return this._localImpl.loadGeoJSON({ geojson, spatialFilter });
-    }
-    worker.postMessage({
-      method: "loadGeoJSON" /* LOAD_GEOJSON */,
-      params: [{ geojson, spatialFilter }]
-    });
-  }
-  /////////////////////////////////////////////////////////////////////////////
-  // WIDGETS API
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async getFeatures() {
-    throw new Error("getFeatures not supported for tilesets");
-  }
-  async getFormula({
-    signal,
-    ...options
-  }) {
-    return this._executeWorkerMethod("getFormula" /* GET_FORMULA */, [options], signal);
-  }
-  async getHistogram({
-    signal,
-    ...options
-  }) {
-    return this._executeWorkerMethod("getHistogram" /* GET_HISTOGRAM */, [options], signal);
-  }
-  async getCategories({
-    signal,
-    ...options
-  }) {
-    return this._executeWorkerMethod("getCategories" /* GET_CATEGORIES */, [options], signal);
-  }
-  async getScatter({
-    signal,
-    ...options
-  }) {
-    return this._executeWorkerMethod("getScatter" /* GET_SCATTER */, [options], signal);
-  }
-  async getTable({
-    signal,
-    ...options
-  }) {
-    return this._executeWorkerMethod("getTable" /* GET_TABLE */, [options], signal);
-  }
-  async getTimeSeries({
-    signal,
-    ...options
-  }) {
-    return this._executeWorkerMethod("getTimeSeries" /* GET_TIME_SERIES */, [options], signal);
-  }
-  async getRange({
-    signal,
-    ...options
-  }) {
-    return this._executeWorkerMethod("getRange" /* GET_RANGE */, [options], signal);
-  }
-};
-
 // src/workers/widget-tileset-worker.ts
 var source;
 addEventListener("message", (e) => {
   const { method, params, requestId } = e.data;
   if (method === "init" /* INIT */) {
-    source = new WidgetTilesetSource({
+    source = new WidgetTilesetSourceImpl({
       ...params[0],
       widgetSourceWorker: false
     });

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.0-alpha.8",
+  "version": "0.5.0-alpha.9",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,

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

@@ -66,10 +66,13 @@ export class WidgetTilesetSource extends WidgetSource<WidgetTilesetSourceProps>
     super(props);
 
     this._workerEnabled =
-      (props.widgetSourceWorker ?? true) && TSUP_FORMAT !== 'cjs';
-    this._localImpl = this._workerEnabled
-      ? null
-      : new WidgetTilesetSourceImpl(this.props);
+      (props.widgetSourceWorker ?? true) &&
+      TSUP_FORMAT !== 'cjs' &&
+      typeof Worker !== 'undefined';
+
+    if (!this._workerEnabled) {
+      this._localImpl = new WidgetTilesetSourceImpl(this.props);
+    }
   }
 
   destroy() {
@@ -89,28 +92,25 @@ export class WidgetTilesetSource extends WidgetSource<WidgetTilesetSourceProps>
    * Returns an initialized Worker, to be reused for the lifecycle of this
    * source instance.
    */
-  protected _getWorker(): Worker | null {
-    if (this._workerImpl || this._localImpl) {
+  protected _getWorker(): Worker {
+    if (this._workerImpl) {
       return this._workerImpl;
     }
 
-    try {
-      this._workerImpl = new Worker(new URL('worker.js', import.meta.url), {
+    this._workerImpl = new Worker(
+      new URL('@carto/api-client/worker', import.meta.url),
+      {
         type: 'module',
         name: 'cartowidgettileset',
-      });
+      }
+    );
 
-      this._workerImpl.postMessage({
-        method: Method.INIT,
-        params: [this.props],
-      } as WorkerRequest);
+    this._workerImpl.postMessage({
+      method: Method.INIT,
+      params: [this.props],
+    } as WorkerRequest);
 
-      return this._workerImpl;
-    } catch {
-      this._workerEnabled = false;
-      this._localImpl = new WidgetTilesetSourceImpl(this.props);
-      return null;
-    }
+    return this._workerImpl;
   }
 
   /** Executes a given method on the worker. */
@@ -119,12 +119,12 @@ export class WidgetTilesetSource extends WidgetSource<WidgetTilesetSourceProps>
     params: unknown[],
     signal?: AbortSignal
   ): Promise<T> {
-    const worker = this._getWorker();
-    if (!worker) {
+    if (!this._workerEnabled) {
       // @ts-expect-error No type-checking dynamic method name.
       return this._localImpl[method](...params);
     }
 
+    const worker = this._getWorker();
     const requestId = this._workerNextRequestId++;
 
     // TODO: ViewState may contain non-serializable data, which we do not need.
@@ -193,11 +193,12 @@ export class WidgetTilesetSource extends WidgetSource<WidgetTilesetSourceProps>
    * before computing statistics on the tiles.
    */
   loadTiles(tiles: unknown[]) {
-    const worker = this._getWorker();
-    if (!worker) {
+    if (!this._workerEnabled) {
       return this._localImpl!.loadTiles(tiles);
     }
 
+    const worker = this._getWorker();
+
     tiles = (tiles as Tile[]).map(({id, bbox, data}) => ({
       id,
       bbox,
@@ -212,11 +213,12 @@ export class WidgetTilesetSource extends WidgetSource<WidgetTilesetSourceProps>
 
   /** Configures options used to extract features from tiles. */
   setTileFeatureExtractOptions(options: TileFeatureExtractOptions) {
-    const worker = this._getWorker();
-    if (!worker) {
+    if (!this._workerEnabled) {
       return this._localImpl?.setTileFeatureExtractOptions(options);
     }
 
+    const worker = this._getWorker();
+
     worker.postMessage({
       type: Method.SET_TILE_FEATURE_EXTRACT_OPTIONS,
       params: [options],
@@ -235,11 +237,12 @@ export class WidgetTilesetSource extends WidgetSource<WidgetTilesetSourceProps>
     geojson: FeatureCollection;
     spatialFilter: SpatialFilter;
   }) {
-    const worker = this._getWorker();
-    if (!worker) {
+    if (!this._workerEnabled) {
       return this._localImpl!.loadGeoJSON({geojson, spatialFilter});
     }
 
+    const worker = this._getWorker();
+
     worker.postMessage({
       method: Method.LOAD_GEOJSON,
       params: [{geojson, spatialFilter}],

package/src/workers/widget-tileset-worker.ts

@@ -1,7 +1,5 @@
-import {
-  WidgetTilesetSource,
-  type WidgetTilesetSourceProps,
-} from '../widget-sources/widget-tileset-source.js';
+import {WidgetTilesetSourceImpl} from '../widget-sources/widget-tileset-source-impl.js';
+import {type WidgetTilesetSourceProps} from '../widget-sources/widget-tileset-source.js';
 import {Method} from './constants.js';
 import type {WorkerRequest, WorkerResponse} from './types.js';
 
@@ -12,13 +10,13 @@ import type {WorkerRequest, WorkerResponse} from './types.js';
  * representing and executing calculations on a single datasource.
  */
 
-let source: WidgetTilesetSource;
+let source: WidgetTilesetSourceImpl;
 
 addEventListener('message', (e) => {
   const {method, params, requestId} = e.data as WorkerRequest;
 
   if (method === Method.INIT) {
-    source = new WidgetTilesetSource({
+    source = new WidgetTilesetSourceImpl({
       ...(params[0] as WidgetTilesetSourceProps),
       widgetSourceWorker: false,
     });