@deck.gl/carto 8.6.0-beta.1 → 8.6.3

package/dist/es5/layers/carto-layer.js

@@ -1,30 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _core = require("@deck.gl/core");
 
 var _geoLayers = require("@deck.gl/geo-layers");
@@ -37,20 +17,12 @@ var _mapsApiCommon = require("../api/maps-api-common");
 
 var _config = require("../config");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
-
-var defaultProps = {
+const defaultProps = {
   data: null,
   type: null,
   onDataLoad: {
     type: 'function',
-    value: function value(data) {},
+    value: data => {},
     compare: false
   },
   onDataError: {
@@ -68,212 +40,161 @@ var defaultProps = {
   }
 };
 
-var CartoLayer = function (_CompositeLayer) {
-  (0, _inherits2.default)(CartoLayer, _CompositeLayer);
-
-  var _super = _createSuper(CartoLayer);
-
-  function CartoLayer() {
-    (0, _classCallCheck2.default)(this, CartoLayer);
-    return _super.apply(this, arguments);
+class CartoLayer extends _core.CompositeLayer {
+  initializeState() {
+    this.state = {
+      data: null,
+      apiVersion: null
+    };
   }
 
-  (0, _createClass2.default)(CartoLayer, [{
-    key: "initializeState",
-    value: function initializeState() {
-      this.state = {
-        data: null,
-        apiVersion: null
-      };
-    }
-  }, {
-    key: "_checkProps",
-    value: function _checkProps(props) {
-      var type = props.type,
-          credentials = props.credentials,
-          connection = props.connection,
-          geoColumn = props.geoColumn,
-          columns = props.columns;
-
-      var localCreds = _objectSpread(_objectSpread({}, (0, _config.getDefaultCredentials)()), credentials);
+  get isLoaded() {
+    return this.getSubLayers().length > 0 && super.isLoaded;
+  }
 
-      var apiVersion = localCreds.apiVersion;
+  _checkProps(props) {
+    const {
+      type,
+      credentials,
+      connection,
+      geoColumn,
+      columns
+    } = props;
+    const localCreds = { ...(0, _config.getDefaultCredentials)(),
+      ...credentials
+    };
+    const {
+      apiVersion
+    } = localCreds;
 
-      _core.log.assert(Object.values(_api.API_VERSIONS).includes(apiVersion), "Invalid apiVersion ".concat(apiVersion, ". Use API_VERSIONS enum."));
+    _core.log.assert(Object.values(_api.API_VERSIONS).includes(apiVersion), "Invalid apiVersion ".concat(apiVersion, ". Use API_VERSIONS enum."));
 
-      if (apiVersion === _api.API_VERSIONS.V1 || apiVersion === _api.API_VERSIONS.V2) {
-        _core.log.assert(type === _mapsApiCommon.MAP_TYPES.QUERY || type === _mapsApiCommon.MAP_TYPES.TILESET, "Invalid type ".concat(type, ". Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ").concat(apiVersion));
+    if (apiVersion === _api.API_VERSIONS.V1 || apiVersion === _api.API_VERSIONS.V2) {
+      _core.log.assert(type === _mapsApiCommon.MAP_TYPES.QUERY || type === _mapsApiCommon.MAP_TYPES.TILESET, "Invalid type ".concat(type, ". Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ").concat(apiVersion));
 
-        _core.log.assert(!connection, "Connection prop is not supported for apiVersion ".concat(apiVersion));
+      _core.log.assert(!connection, "Connection prop is not supported for apiVersion ".concat(apiVersion));
 
-        _core.log.assert(!geoColumn, "geoColumn prop is not supported for apiVersion ".concat(apiVersion));
+      _core.log.assert(!geoColumn, "geoColumn prop is not supported for apiVersion ".concat(apiVersion));
 
-        _core.log.assert(!columns, "columns prop is not supported for apiVersion ".concat(apiVersion));
-      } else if (apiVersion === _api.API_VERSIONS.V3) {
-        _core.log.assert(connection, 'Missing mandatory connection parameter');
+      _core.log.assert(!columns, "columns prop is not supported for apiVersion ".concat(apiVersion));
+    } else if (apiVersion === _api.API_VERSIONS.V3) {
+      _core.log.assert(connection, 'Missing mandatory connection parameter');
 
-        _core.log.assert(Object.values(_mapsApiCommon.MAP_TYPES).includes(type), "Invalid type ".concat(type, ". Use MAP_TYPES enum."));
+      _core.log.assert(Object.values(_mapsApiCommon.MAP_TYPES).includes(type), "Invalid type ".concat(type, ". Use MAP_TYPES enum."));
 
-        if (type !== _mapsApiCommon.MAP_TYPES.TABLE) {
-          _core.log.assert(!geoColumn, "geoColumn prop is only supported for type ".concat(_mapsApiCommon.MAP_TYPES.TABLE));
+      if (type !== _mapsApiCommon.MAP_TYPES.TABLE) {
+        _core.log.assert(!geoColumn, "geoColumn prop is only supported for type ".concat(_mapsApiCommon.MAP_TYPES.TABLE));
 
-          _core.log.assert(!columns, "columns prop is only supported for type ".concat(_mapsApiCommon.MAP_TYPES.TABLE));
-        }
+        _core.log.assert(!columns, "columns prop is only supported for type ".concat(_mapsApiCommon.MAP_TYPES.TABLE));
+      }
 
-        if (columns) {
-          _core.log.assert(Array.isArray(columns), 'columns prop must be an Array');
-        }
+      if (columns) {
+        _core.log.assert(Array.isArray(columns), 'columns prop must be an Array');
       }
     }
-  }, {
-    key: "updateState",
-    value: function updateState(_ref) {
-      var props = _ref.props,
-          oldProps = _ref.oldProps,
-          changeFlags = _ref.changeFlags;
+  }
 
-      this._checkProps(props);
+  updateState({
+    props,
+    oldProps,
+    changeFlags
+  }) {
+    this._checkProps(props);
 
-      var shouldUpdateData = changeFlags.dataChanged || props.connection !== oldProps.connection || props.geoColumn !== oldProps.geoColumn || JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) || props.type !== oldProps.type || JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);
+    const shouldUpdateData = changeFlags.dataChanged || props.connection !== oldProps.connection || props.geoColumn !== oldProps.geoColumn || JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) || props.type !== oldProps.type || JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);
 
-      if (shouldUpdateData) {
-        this.setState({
-          data: null,
-          apiVersion: null
-        });
+    if (shouldUpdateData) {
+      this.setState({
+        data: null,
+        apiVersion: null
+      });
 
-        this._updateData();
-      }
+      this._updateData();
     }
-  }, {
-    key: "_updateData",
-    value: function () {
-      var _updateData2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
-        var _this$props, type, source, connection, credentials, geoColumn, columns, localConfig, apiVersion, data;
-
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.prev = 0;
-                _this$props = this.props, type = _this$props.type, source = _this$props.data, connection = _this$props.connection, credentials = _this$props.credentials, geoColumn = _this$props.geoColumn, columns = _this$props.columns;
-                localConfig = _objectSpread(_objectSpread({}, (0, _config.getDefaultCredentials)()), credentials);
-                apiVersion = localConfig.apiVersion;
-
-                if (!(apiVersion === _api.API_VERSIONS.V3)) {
-                  _context.next = 10;
-                  break;
-                }
-
-                _context.next = 7;
-                return (0, _api.getData)({
-                  type: type,
-                  source: source,
-                  connection: connection,
-                  credentials: credentials,
-                  geoColumn: geoColumn,
-                  columns: columns
-                });
-
-              case 7:
-                data = _context.sent;
-                _context.next = 17;
-                break;
-
-              case 10:
-                if (!(apiVersion === _api.API_VERSIONS.V1 || apiVersion === _api.API_VERSIONS.V2)) {
-                  _context.next = 16;
-                  break;
-                }
-
-                _context.next = 13;
-                return (0, _api.getDataV2)({
-                  type: type,
-                  source: source,
-                  credentials: credentials
-                });
-
-              case 13:
-                data = _context.sent;
-                _context.next = 17;
-                break;
-
-              case 16:
-                _core.log.assert("Unknow apiVersion ".concat(apiVersion, ". Use API_VERSIONS enum."));
-
-              case 17:
-                this.setState({
-                  data: data,
-                  apiVersion: apiVersion
-                });
-                this.props.onDataLoad(data);
-                _context.next = 28;
-                break;
-
-              case 21:
-                _context.prev = 21;
-                _context.t0 = _context["catch"](0);
-
-                if (!this.props.onDataError) {
-                  _context.next = 27;
-                  break;
-                }
-
-                this.props.onDataError(_context.t0);
-                _context.next = 28;
-                break;
-
-              case 27:
-                throw _context.t0;
-
-              case 28:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this, [[0, 21]]);
-      }));
-
-      function _updateData() {
-        return _updateData2.apply(this, arguments);
-      }
+  }
 
-      return _updateData;
-    }()
-  }, {
-    key: "renderLayers",
-    value: function renderLayers() {
-      var _this$state = this.state,
-          data = _this$state.data,
-          apiVersion = _this$state.apiVersion;
-      var type = this.props.type;
-      if (!data) return null;
-      var updateTriggers = this.props.updateTriggers;
-      var layer;
-
-      if (apiVersion === _api.API_VERSIONS.V1 || apiVersion === _api.API_VERSIONS.V2 || type === _mapsApiCommon.MAP_TYPES.TILESET) {
-        layer = _geoLayers.MVTLayer;
+  async _updateData() {
+    try {
+      const {
+        type,
+        data: source,
+        connection,
+        credentials,
+        geoColumn,
+        columns
+      } = this.props;
+      const localConfig = { ...(0, _config.getDefaultCredentials)(),
+        ...credentials
+      };
+      const {
+        apiVersion
+      } = localConfig;
+      let data;
+
+      if (apiVersion === _api.API_VERSIONS.V3) {
+        data = await (0, _api.getData)({
+          type,
+          source,
+          connection,
+          credentials,
+          geoColumn,
+          columns
+        });
+      } else if (apiVersion === _api.API_VERSIONS.V1 || apiVersion === _api.API_VERSIONS.V2) {
+        data = await (0, _api.getDataV2)({
+          type,
+          source,
+          credentials
+        });
       } else {
-        layer = _layers.GeoJsonLayer;
+        _core.log.assert("Unknow apiVersion ".concat(apiVersion, ". Use API_VERSIONS enum."));
       }
 
-      var props = _objectSpread({}, this.props);
-
-      delete props.data;
-      return new layer(props, this.getSubLayerProps({
-        id: "carto-".concat(layer.layerName),
-        data: data,
-        updateTriggers: updateTriggers
-      }));
+      this.setState({
+        data,
+        apiVersion
+      });
+      this.props.onDataLoad(data);
+    } catch (err) {
+      if (this.props.onDataError) {
+        this.props.onDataError(err);
+      } else {
+        throw err;
+      }
     }
-  }, {
-    key: "isLoaded",
-    get: function get() {
-      return this.getSubLayers().length > 0 && (0, _get2.default)((0, _getPrototypeOf2.default)(CartoLayer.prototype), "isLoaded", this);
+  }
+
+  renderLayers() {
+    const {
+      data,
+      apiVersion
+    } = this.state;
+    const {
+      type
+    } = this.props;
+    if (!data) return null;
+    const {
+      updateTriggers
+    } = this.props;
+    let layer;
+
+    if (apiVersion === _api.API_VERSIONS.V1 || apiVersion === _api.API_VERSIONS.V2 || type === _mapsApiCommon.MAP_TYPES.TILESET) {
+      layer = _geoLayers.MVTLayer;
+    } else {
+      layer = _layers.GeoJsonLayer;
     }
-  }]);
-  return CartoLayer;
-}(_core.CompositeLayer);
+
+    const props = { ...this.props
+    };
+    delete props.data;
+    return new layer(props, this.getSubLayerProps({
+      id: "carto-".concat(layer.layerName),
+      data,
+      updateTriggers
+    }));
+  }
+
+}
 
 exports.default = CartoLayer;
 CartoLayer.layerName = 'CartoLayer';

package/dist/es5/layers/carto-layer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/carto-layer.js"],"names":["defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","credentials","connection","geoColumn","columns","CartoLayer","state","apiVersion","props","localCreds","log","assert","Object","values","API_VERSIONS","includes","V1","V2","MAP_TYPES","QUERY","TILESET","V3","TABLE","Array","isArray","oldProps","changeFlags","_checkProps","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","localConfig","updateTriggers","layer","MVTLayer","GeoJsonLayer","getSubLayerProps","id","layerName","getSubLayers","length","CompositeLayer"],"mappings":"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","sourcesContent":["import {CompositeLayer, log} from '@deck.gl/core';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {getData, getDataV2, API_VERSIONS} from '../api';\nimport {MAP_TYPES} from '../api/maps-api-common';\nimport {getDefaultCredentials} from '../config';\n\nconst defaultProps = {\n  // (String, required): data resource to load. table name, sql query or tileset name.\n  data: null,\n  // (Enum (MAP_TYPES), required)\n  type: null,\n  onDataLoad: {type: 'function', value: data => {}, compare: false},\n  onDataError: {type: 'function', value: null, compare: false, optional: true},\n\n  // override carto credentials for the layer, set to null to read from default\n  credentials: null,\n\n  /*********************/\n  /* API v3 PARAMETERS */\n  /**********************/\n  // (String, required): connection name at CARTO platform\n  connection: null,\n\n  // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.\n  geoColumn: null,\n\n  // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.\n  columns: {type: 'array', value: null}\n};\n\nexport default class CartoLayer extends CompositeLayer {\n  initializeState() {\n    this.state = {\n      data: null,\n      apiVersion: null\n    };\n  }\n\n  get isLoaded() {\n    return this.getSubLayers().length > 0 && super.isLoaded;\n  }\n\n  _checkProps(props) {\n    const {type, credentials, connection, geoColumn, columns} = props;\n    const localCreds = {...getDefaultCredentials(), ...credentials};\n    const {apiVersion} = localCreds;\n\n    log.assert(\n      Object.values(API_VERSIONS).includes(apiVersion),\n      `Invalid apiVersion ${apiVersion}. Use API_VERSIONS enum.`\n    );\n\n    if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n      log.assert(\n        type === MAP_TYPES.QUERY || type === MAP_TYPES.TILESET,\n        `Invalid type ${type}. Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ${apiVersion}`\n      );\n      log.assert(!connection, `Connection prop is not supported for apiVersion ${apiVersion}`);\n      log.assert(!geoColumn, `geoColumn prop is not supported for apiVersion ${apiVersion}`);\n      log.assert(!columns, `columns prop is not supported for apiVersion ${apiVersion}`);\n    } else if (apiVersion === API_VERSIONS.V3) {\n      log.assert(connection, 'Missing mandatory connection parameter');\n      log.assert(\n        Object.values(MAP_TYPES).includes(type),\n        `Invalid type ${type}. Use MAP_TYPES enum.`\n      );\n      if (type !== MAP_TYPES.TABLE) {\n        log.assert(!geoColumn, `geoColumn prop is only supported for type ${MAP_TYPES.TABLE}`);\n        log.assert(!columns, `columns prop is only supported for type ${MAP_TYPES.TABLE}`);\n      }\n      if (columns) {\n        log.assert(Array.isArray(columns), 'columns prop must be an Array');\n      }\n    }\n  }\n\n  updateState({props, oldProps, changeFlags}) {\n    this._checkProps(props);\n    const shouldUpdateData =\n      changeFlags.dataChanged ||\n      props.connection !== oldProps.connection ||\n      props.geoColumn !== oldProps.geoColumn ||\n      JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||\n      props.type !== oldProps.type ||\n      JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);\n\n    if (shouldUpdateData) {\n      this.setState({data: null, apiVersion: null});\n      this._updateData();\n    }\n  }\n\n  async _updateData() {\n    try {\n      const {type, data: source, connection, credentials, geoColumn, columns} = this.props;\n      const localConfig = {...getDefaultCredentials(), ...credentials};\n      const {apiVersion} = localConfig;\n\n      let data;\n\n      if (apiVersion === API_VERSIONS.V3) {\n        data = await getData({\n          type,\n          source,\n          connection,\n          credentials,\n          geoColumn,\n          columns\n        });\n      } else if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n        data = await getDataV2({type, source, credentials});\n      } else {\n        log.assert(`Unknow apiVersion ${apiVersion}. Use API_VERSIONS enum.`);\n      }\n\n      this.setState({data, apiVersion});\n      this.props.onDataLoad(data);\n    } catch (err) {\n      if (this.props.onDataError) {\n        this.props.onDataError(err);\n      } else {\n        throw err;\n      }\n    }\n  }\n\n  renderLayers() {\n    const {data, apiVersion} = this.state;\n    const {type} = this.props;\n\n    if (!data) return null;\n\n    const {updateTriggers} = this.props;\n\n    let layer;\n\n    if (\n      apiVersion === API_VERSIONS.V1 ||\n      apiVersion === API_VERSIONS.V2 ||\n      type === MAP_TYPES.TILESET\n    ) {\n      layer = MVTLayer;\n    } else {\n      layer = GeoJsonLayer;\n    }\n\n    const props = {...this.props};\n    delete props.data;\n\n    // eslint-disable-next-line new-cap\n    return new layer(\n      props,\n      this.getSubLayerProps({\n        id: `carto-${layer.layerName}`,\n        data,\n        updateTriggers\n      })\n    );\n  }\n}\n\nCartoLayer.layerName = 'CartoLayer';\nCartoLayer.defaultProps = defaultProps;\n"],"file":"carto-layer.js"}
+{"version":3,"sources":["../../../src/layers/carto-layer.js"],"names":["defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","credentials","connection","geoColumn","columns","CartoLayer","CompositeLayer","initializeState","state","apiVersion","isLoaded","getSubLayers","length","_checkProps","props","localCreds","log","assert","Object","values","API_VERSIONS","includes","V1","V2","MAP_TYPES","QUERY","TILESET","V3","TABLE","Array","isArray","updateState","oldProps","changeFlags","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","localConfig","err","renderLayers","updateTriggers","layer","MVTLayer","GeoJsonLayer","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {CompositeLayer, log} from '@deck.gl/core';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {getData, getDataV2, API_VERSIONS} from '../api';\nimport {MAP_TYPES} from '../api/maps-api-common';\nimport {getDefaultCredentials} from '../config';\n\nconst defaultProps = {\n  // (String, required): data resource to load. table name, sql query or tileset name.\n  data: null,\n  // (Enum (MAP_TYPES), required)\n  type: null,\n  onDataLoad: {type: 'function', value: data => {}, compare: false},\n  onDataError: {type: 'function', value: null, compare: false, optional: true},\n\n  // override carto credentials for the layer, set to null to read from default\n  credentials: null,\n\n  /*********************/\n  /* API v3 PARAMETERS */\n  /**********************/\n  // (String, required): connection name at CARTO platform\n  connection: null,\n\n  // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.\n  geoColumn: null,\n\n  // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.\n  columns: {type: 'array', value: null}\n};\n\nexport default class CartoLayer extends CompositeLayer {\n  initializeState() {\n    this.state = {\n      data: null,\n      apiVersion: null\n    };\n  }\n\n  get isLoaded() {\n    return this.getSubLayers().length > 0 && super.isLoaded;\n  }\n\n  _checkProps(props) {\n    const {type, credentials, connection, geoColumn, columns} = props;\n    const localCreds = {...getDefaultCredentials(), ...credentials};\n    const {apiVersion} = localCreds;\n\n    log.assert(\n      Object.values(API_VERSIONS).includes(apiVersion),\n      `Invalid apiVersion ${apiVersion}. Use API_VERSIONS enum.`\n    );\n\n    if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n      log.assert(\n        type === MAP_TYPES.QUERY || type === MAP_TYPES.TILESET,\n        `Invalid type ${type}. Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ${apiVersion}`\n      );\n      log.assert(!connection, `Connection prop is not supported for apiVersion ${apiVersion}`);\n      log.assert(!geoColumn, `geoColumn prop is not supported for apiVersion ${apiVersion}`);\n      log.assert(!columns, `columns prop is not supported for apiVersion ${apiVersion}`);\n    } else if (apiVersion === API_VERSIONS.V3) {\n      log.assert(connection, 'Missing mandatory connection parameter');\n      log.assert(\n        Object.values(MAP_TYPES).includes(type),\n        `Invalid type ${type}. Use MAP_TYPES enum.`\n      );\n      if (type !== MAP_TYPES.TABLE) {\n        log.assert(!geoColumn, `geoColumn prop is only supported for type ${MAP_TYPES.TABLE}`);\n        log.assert(!columns, `columns prop is only supported for type ${MAP_TYPES.TABLE}`);\n      }\n      if (columns) {\n        log.assert(Array.isArray(columns), 'columns prop must be an Array');\n      }\n    }\n  }\n\n  updateState({props, oldProps, changeFlags}) {\n    this._checkProps(props);\n    const shouldUpdateData =\n      changeFlags.dataChanged ||\n      props.connection !== oldProps.connection ||\n      props.geoColumn !== oldProps.geoColumn ||\n      JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||\n      props.type !== oldProps.type ||\n      JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);\n\n    if (shouldUpdateData) {\n      this.setState({data: null, apiVersion: null});\n      this._updateData();\n    }\n  }\n\n  async _updateData() {\n    try {\n      const {type, data: source, connection, credentials, geoColumn, columns} = this.props;\n      const localConfig = {...getDefaultCredentials(), ...credentials};\n      const {apiVersion} = localConfig;\n\n      let data;\n\n      if (apiVersion === API_VERSIONS.V3) {\n        data = await getData({\n          type,\n          source,\n          connection,\n          credentials,\n          geoColumn,\n          columns\n        });\n      } else if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n        data = await getDataV2({type, source, credentials});\n      } else {\n        log.assert(`Unknow apiVersion ${apiVersion}. Use API_VERSIONS enum.`);\n      }\n\n      this.setState({data, apiVersion});\n      this.props.onDataLoad(data);\n    } catch (err) {\n      if (this.props.onDataError) {\n        this.props.onDataError(err);\n      } else {\n        throw err;\n      }\n    }\n  }\n\n  renderLayers() {\n    const {data, apiVersion} = this.state;\n    const {type} = this.props;\n\n    if (!data) return null;\n\n    const {updateTriggers} = this.props;\n\n    let layer;\n\n    if (\n      apiVersion === API_VERSIONS.V1 ||\n      apiVersion === API_VERSIONS.V2 ||\n      type === MAP_TYPES.TILESET\n    ) {\n      layer = MVTLayer;\n    } else {\n      layer = GeoJsonLayer;\n    }\n\n    const props = {...this.props};\n    delete props.data;\n\n    // eslint-disable-next-line new-cap\n    return new layer(\n      props,\n      this.getSubLayerProps({\n        id: `carto-${layer.layerName}`,\n        data,\n        updateTriggers\n      })\n    );\n  }\n}\n\nCartoLayer.layerName = 'CartoLayer';\nCartoLayer.defaultProps = defaultProps;\n"],"file":"carto-layer.js"}

package/dist/es5/layers/carto-sql-layer.js

@@ -7,58 +7,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _core = require("@deck.gl/core");
 
 var _cartoLayer = _interopRequireDefault(require("./carto-layer"));
 
 var _api = require("../api");
 
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-var defaultProps = _objectSpread(_objectSpread({}, _cartoLayer.default.defaultProps), {}, {
+const defaultProps = { ..._cartoLayer.default.defaultProps,
   type: _api.MAP_TYPES.QUERY,
   uniqueIdProperty: 'cartodb_id'
-});
-
-var CartoSQLLayer = function (_CartoLayer) {
-  (0, _inherits2.default)(CartoSQLLayer, _CartoLayer);
-
-  var _super = _createSuper(CartoSQLLayer);
+};
 
-  function CartoSQLLayer() {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, CartoSQLLayer);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
+class CartoSQLLayer extends _cartoLayer.default {
+  constructor(...args) {
+    super(...args);
 
     _core.log.warn('CartoSQLLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.QUERY and apiVersion=API_VERSIONS.V2')();
-
-    return _this;
   }
 
-  return CartoSQLLayer;
-}(_cartoLayer.default);
+}
 
 exports.default = CartoSQLLayer;
 CartoSQLLayer.layerName = 'CartoSQLLayer';

package/dist/es5/layers/carto-sql-layer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/carto-sql-layer.js"],"names":["defaultProps","CartoLayer","type","MAP_TYPES","QUERY","uniqueIdProperty","CartoSQLLayer","args","log","warn","layerName"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;;;;;;;AAEA,IAAMA,YAAY,mCACbC,oBAAWD,YADE;AAEhBE,EAAAA,IAAI,EAAEC,eAAUC,KAFA;AAGhBC,EAAAA,gBAAgB,EAAE;AAHF,EAAlB;;IAMqBC,a;;;;;AACnB,2BAAqB;AAAA;;AAAA;;AAAA,sCAANC,IAAM;AAANA,MAAAA,IAAM;AAAA;;AACnB,oDAASA,IAAT;;AAEAC,cAAIC,IAAJ,CACE,2HADF;;AAHmB;AAMpB;;;EAPwCR,mB;;;AAU3CK,aAAa,CAACI,SAAd,GAA0B,eAA1B;AACAJ,aAAa,CAACN,YAAd,GAA6BA,YAA7B","sourcesContent":["import {log} from '@deck.gl/core';\nimport CartoLayer from './carto-layer';\nimport {MAP_TYPES} from '../api';\n\nconst defaultProps = {\n  ...CartoLayer.defaultProps,\n  type: MAP_TYPES.QUERY,\n  uniqueIdProperty: 'cartodb_id'\n};\n\nexport default class CartoSQLLayer extends CartoLayer {\n  constructor(...args) {\n    super(...args);\n\n    log.warn(\n      'CartoSQLLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.QUERY and apiVersion=API_VERSIONS.V2'\n    )();\n  }\n}\n\nCartoSQLLayer.layerName = 'CartoSQLLayer';\nCartoSQLLayer.defaultProps = defaultProps;\n"],"file":"carto-sql-layer.js"}
+{"version":3,"sources":["../../../src/layers/carto-sql-layer.js"],"names":["defaultProps","CartoLayer","type","MAP_TYPES","QUERY","uniqueIdProperty","CartoSQLLayer","constructor","args","log","warn","layerName"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AAEA,MAAMA,YAAY,GAAG,EACnB,GAAGC,oBAAWD,YADK;AAEnBE,EAAAA,IAAI,EAAEC,eAAUC,KAFG;AAGnBC,EAAAA,gBAAgB,EAAE;AAHC,CAArB;;AAMe,MAAMC,aAAN,SAA4BL,mBAA5B,CAAuC;AACpDM,EAAAA,WAAW,CAAC,GAAGC,IAAJ,EAAU;AACnB,UAAM,GAAGA,IAAT;;AAEAC,cAAIC,IAAJ,CACE,2HADF;AAGD;;AAPmD;;;AAUtDJ,aAAa,CAACK,SAAd,GAA0B,eAA1B;AACAL,aAAa,CAACN,YAAd,GAA6BA,YAA7B","sourcesContent":["import {log} from '@deck.gl/core';\nimport CartoLayer from './carto-layer';\nimport {MAP_TYPES} from '../api';\n\nconst defaultProps = {\n  ...CartoLayer.defaultProps,\n  type: MAP_TYPES.QUERY,\n  uniqueIdProperty: 'cartodb_id'\n};\n\nexport default class CartoSQLLayer extends CartoLayer {\n  constructor(...args) {\n    super(...args);\n\n    log.warn(\n      'CartoSQLLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.QUERY and apiVersion=API_VERSIONS.V2'\n    )();\n  }\n}\n\nCartoSQLLayer.layerName = 'CartoSQLLayer';\nCartoSQLLayer.defaultProps = defaultProps;\n"],"file":"carto-sql-layer.js"}

package/dist/es5/style/color-bins-style.js

@@ -13,18 +13,17 @@ var _palette = _interopRequireWildcard(require("./palette"));
 
 var _utils = require("./utils");
 
-function colorBins(_ref) {
-  var attr = _ref.attr,
-      domain = _ref.domain,
-      _ref$colors = _ref.colors,
-      colors = _ref$colors === void 0 ? _palette.DEFAULT_PALETTE : _ref$colors,
-      _ref$nullColor = _ref.nullColor,
-      nullColor = _ref$nullColor === void 0 ? _palette.NULL_COLOR : _ref$nullColor;
+function colorBins({
+  attr,
+  domain,
+  colors = _palette.DEFAULT_PALETTE,
+  nullColor = _palette.NULL_COLOR
+}) {
   (0, _utils.assert)(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
-  var palette = typeof colors === 'string' ? (0, _palette.default)(colors, domain.length) : colors;
-  var color = (0, _d3Scale.scaleThreshold)().domain(domain).range(palette);
-  return function (d) {
-    var value = (0, _utils.getAttrValue)(attr, d);
+  const palette = typeof colors === 'string' ? (0, _palette.default)(colors, domain.length) : colors;
+  const color = (0, _d3Scale.scaleThreshold)().domain(domain).range(palette);
+  return d => {
+    const value = (0, _utils.getAttrValue)(attr, d);
     return Number.isFinite(value) ? color(value) : nullColor;
   };
 }

package/dist/es5/style/color-bins-style.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/style/color-bins-style.js"],"names":["colorBins","attr","domain","colors","DEFAULT_PALETTE","nullColor","NULL_COLOR","Array","isArray","palette","length","color","range","d","value","Number","isFinite"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AAEe,SAASA,SAAT,OAKZ;AAAA,MAJDC,IAIC,QAJDA,IAIC;AAAA,MAHDC,MAGC,QAHDA,MAGC;AAAA,yBAFDC,MAEC;AAAA,MAFDA,MAEC,4BAFQC,wBAER;AAAA,4BADDC,SACC;AAAA,MADDA,SACC,+BADWC,mBACX;AACD,qBAAOC,KAAK,CAACC,OAAN,CAAcN,MAAd,CAAP,EAA8B,6CAA9B;AAEA,MAAMO,OAAO,GAAG,OAAON,MAAP,KAAkB,QAAlB,GAA6B,sBAAWA,MAAX,EAAmBD,MAAM,CAACQ,MAA1B,CAA7B,GAAiEP,MAAjF;AAEA,MAAMQ,KAAK,GAAG,+BACXT,MADW,CACJA,MADI,EAEXU,KAFW,CAELH,OAFK,CAAd;AAIA,SAAO,UAAAI,CAAC,EAAI;AACV,QAAMC,KAAK,GAAG,yBAAab,IAAb,EAAmBY,CAAnB,CAAd;AACA,WAAOE,MAAM,CAACC,QAAP,CAAgBF,KAAhB,IAAyBH,KAAK,CAACG,KAAD,CAA9B,GAAwCT,SAA/C;AACD,GAHD;AAID","sourcesContent":["import {scaleThreshold} from 'd3-scale';\nimport getPalette, {DEFAULT_PALETTE, NULL_COLOR} from './palette';\nimport {assert, getAttrValue} from './utils';\n\nexport default function colorBins({\n  attr,\n  domain,\n  colors = DEFAULT_PALETTE,\n  nullColor = NULL_COLOR\n}) {\n  assert(Array.isArray(domain), 'Expected \"domain\" to be an array of numbers');\n\n  const palette = typeof colors === 'string' ? getPalette(colors, domain.length) : colors;\n\n  const color = scaleThreshold()\n    .domain(domain)\n    .range(palette);\n\n  return d => {\n    const value = getAttrValue(attr, d);\n    return Number.isFinite(value) ? color(value) : nullColor;\n  };\n}\n"],"file":"color-bins-style.js"}
+{"version":3,"sources":["../../../src/style/color-bins-style.js"],"names":["colorBins","attr","domain","colors","DEFAULT_PALETTE","nullColor","NULL_COLOR","Array","isArray","palette","length","color","range","d","value","Number","isFinite"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AAEe,SAASA,SAAT,CAAmB;AAChCC,EAAAA,IADgC;AAEhCC,EAAAA,MAFgC;AAGhCC,EAAAA,MAAM,GAAGC,wBAHuB;AAIhCC,EAAAA,SAAS,GAAGC;AAJoB,CAAnB,EAKZ;AACD,qBAAOC,KAAK,CAACC,OAAN,CAAcN,MAAd,CAAP,EAA8B,6CAA9B;AAEA,QAAMO,OAAO,GAAG,OAAON,MAAP,KAAkB,QAAlB,GAA6B,sBAAWA,MAAX,EAAmBD,MAAM,CAACQ,MAA1B,CAA7B,GAAiEP,MAAjF;AAEA,QAAMQ,KAAK,GAAG,+BACXT,MADW,CACJA,MADI,EAEXU,KAFW,CAELH,OAFK,CAAd;AAIA,SAAOI,CAAC,IAAI;AACV,UAAMC,KAAK,GAAG,yBAAab,IAAb,EAAmBY,CAAnB,CAAd;AACA,WAAOE,MAAM,CAACC,QAAP,CAAgBF,KAAhB,IAAyBH,KAAK,CAACG,KAAD,CAA9B,GAAwCT,SAA/C;AACD,GAHD;AAID","sourcesContent":["import {scaleThreshold} from 'd3-scale';\nimport getPalette, {DEFAULT_PALETTE, NULL_COLOR} from './palette';\nimport {assert, getAttrValue} from './utils';\n\nexport default function colorBins({\n  attr,\n  domain,\n  colors = DEFAULT_PALETTE,\n  nullColor = NULL_COLOR\n}) {\n  assert(Array.isArray(domain), 'Expected \"domain\" to be an array of numbers');\n\n  const palette = typeof colors === 'string' ? getPalette(colors, domain.length) : colors;\n\n  const color = scaleThreshold()\n    .domain(domain)\n    .range(palette);\n\n  return d => {\n    const value = getAttrValue(attr, d);\n    return Number.isFinite(value) ? color(value) : nullColor;\n  };\n}\n"],"file":"color-bins-style.js"}

package/dist/es5/style/color-categories-style.js

@@ -2,57 +2,32 @@
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = colorCategories;
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _palette = _interopRequireWildcard(require("./palette"));
 
 var _utils = require("./utils");
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function colorCategories(_ref) {
-  var attr = _ref.attr,
-      domain = _ref.domain,
-      _ref$colors = _ref.colors,
-      colors = _ref$colors === void 0 ? _palette.DEFAULT_PALETTE : _ref$colors,
-      _ref$nullColor = _ref.nullColor,
-      nullColor = _ref$nullColor === void 0 ? _palette.NULL_COLOR : _ref$nullColor,
-      _ref$othersColor = _ref.othersColor,
-      othersColor = _ref$othersColor === void 0 ? _palette.OTHERS_COLOR : _ref$othersColor;
+function colorCategories({
+  attr,
+  domain,
+  colors = _palette.DEFAULT_PALETTE,
+  nullColor = _palette.NULL_COLOR,
+  othersColor = _palette.OTHERS_COLOR
+}) {
   (0, _utils.assert)(Array.isArray(domain), 'Expected "domain" to be an array of numbers or strings');
-  var colorsByCategory = {};
-  var palette = typeof colors === 'string' ? (0, _palette.default)(colors, domain.length) : colors;
-
-  var _iterator = _createForOfIteratorHelper(domain.entries()),
-      _step;
-
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _step$value = (0, _slicedToArray2.default)(_step.value, 2),
-          i = _step$value[0],
-          c = _step$value[1];
+  const colorsByCategory = {};
+  const palette = typeof colors === 'string' ? (0, _palette.default)(colors, domain.length) : colors;
 
-      colorsByCategory[c] = palette[i];
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+  for (const [i, c] of domain.entries()) {
+    colorsByCategory[c] = palette[i];
   }
 
-  return function (d) {
-    var value = (0, _utils.getAttrValue)(attr, d);
+  return d => {
+    const value = (0, _utils.getAttrValue)(attr, d);
     return Number.isFinite(value) || typeof value === 'string' ? colorsByCategory[value] || othersColor : nullColor;
   };
 }