Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Chore]: Technical: Isolate table-utils (#1949)
dariaterekhovaaec2cb82137720
diff --git a/examples/demo-app/src/cloud-providers/carto/carto-provider.js b/examples/demo-app/src/cloud-providers/carto/carto-provider.jsindex 8d78b02f9..c414bf52c 100644--- a/examples/demo-app/src/cloud-providers/carto/carto-provider.js+++ b/examples/demo-app/src/cloud-providers/carto/carto-provider.js@@ -22,8 +22,8 @@ import {OAuthApp} from '@carto/toolkit';import Console from 'global/console';import CartoIcon from './carto-icon';import {Provider} from '@kepler.gl/cloud-providers';-import {createDataContainer} from 'kepler.gl/reducers/table-utils';-import {formatCsv} from 'kepler.gl/reducers';+import {createDataContainer} from '@kepler.gl/table';+import {formatCsv} from 'reducers';const NAME = 'carto';const DISPLAY_NAME = 'CARTO';diff --git a/package.json b/package.jsonindex 8fa9fe145..20a3bcf9f 100644--- a/package.json+++ b/package.json@@ -24,6 +24,7 @@"./src/middleware","./src/deckgl-layers","./src/layers",+ "./src/table","./src/cloud-providers","./src/processors","./src/tasks",@@ -248,7 +249,6 @@"@testing-library/react-hooks": "^3.4.2","@types/d3-array": "^2.0.0","@types/d3-scale": "^3.2.2",- "@types/lodash.debounce": "^4.0.6","@types/geojson": "^7946.0.7","@types/redux-actions": "^2.6.2","@types/supercluster": "^7.1.0",diff --git a/src/components/bottom-widget.tsx b/src/components/bottom-widget.tsxindex 40223801f..374faaae3 100644--- a/src/components/bottom-widget.tsx+++ b/src/components/bottom-widget.tsx@@ -24,7 +24,7 @@ import TimeWidgetFactory from './filters/time-widget';import AnimationControlFactory from './common/animation-control/animation-control';import AnimationControllerFactory from './common/animation-control/animation-controller';import {ANIMATION_WINDOW, DIMENSIONS, FILTER_TYPES} from '@kepler.gl/constants';-import {getIntervalBins} from 'reducers/filter-utils';+import {getIntervalBins} from '@kepler.gl/utils';import {media} from '@kepler.gl/styles';import {AnimationConfig, TimeRangeFilter} from '@kepler.gl/types';import {bottomWidgetSelector} from './kepler-gl';diff --git a/src/components/common/color-legend.tsx b/src/components/common/color-legend.tsxindex 9ce05b980..4cb47b2d0 100644--- a/src/components/common/color-legend.tsx+++ b/src/components/common/color-legend.tsx@@ -24,7 +24,7 @@ import {createSelector} from 'reselect';import {format} from 'd3-format';import moment from 'moment';import {SCALE_TYPES, SCALE_FUNC, ALL_FIELD_TYPES} from '@kepler.gl/constants';-import {getTimeWidgetHintFormatter} from 'reducers/filter-utils';+import {getTimeWidgetHintFormatter} from '@kepler.gl/utils';const ROW_H = 10;const GAP = 4;diff --git a/src/components/common/data-table/cell-size.ts b/src/components/common/data-table/cell-size.tsindex 24974842a..5a40ec73f 100644--- a/src/components/common/data-table/cell-size.ts+++ b/src/components/common/data-table/cell-size.ts@@ -19,7 +19,7 @@// THE SOFTWARE.import document from 'global/document';-import {DataContainerInterface} from 'reducers/table-utils';+import {DataContainerInterface} from '@kepler.gl/table';import {parseFieldValue} from '@kepler.gl/utils';const MIN_GHOST_CELL_SIZE: number = 200;diff --git a/src/components/common/data-table/index.tsx b/src/components/common/data-table/index.tsxindex 9d066a980..b6d4154c9 100644--- a/src/components/common/data-table/index.tsx+++ b/src/components/common/data-table/index.tsx@@ -38,7 +38,7 @@ import {adjustCellsToContainer} from './cell-size';import {ALL_FIELD_TYPES, SORT_ORDER} from '@kepler.gl/constants';import FieldTokenFactory from 'components/common/field-token';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';+import {DataContainerInterface} from '@kepler.gl/table';const defaultHeaderRowHeight = 55;const defaultRowHeight = 32;diff --git a/src/components/common/image-preview.tsx b/src/components/common/image-preview.tsxindex 9c4677b9a..00367fd17 100644--- a/src/components/common/image-preview.tsx+++ b/src/components/common/image-preview.tsx@@ -23,8 +23,6 @@ import styled from 'styled-components';import LoadingSpinner from 'components/common/loading-spinner';import {ExportImage} from '@kepler.gl/constants';-/** @typedef {import('reducers/ui-state-updaters').ExportImage} ExportImage */-const StyledImagePreview = styled.div.attrs({className: 'image-preview'})`diff --git a/src/components/container.tsx b/src/components/container.tsxindex 8c0981ee2..6e8626bd9 100644--- a/src/components/container.tsx+++ b/src/components/container.tsx@@ -27,7 +27,7 @@ import KeplerGlFactory from './kepler-gl';import {registerEntry, deleteEntry, renameEntry, forwardTo} from '@kepler.gl/actions';import {notNullorUndefined} from '@kepler.gl/utils';-import {KeplerGlState} from 'reducers/core';+import {KeplerGlState} from 'reducers';export const ERROR_MSG = {noState:diff --git a/src/components/editor/editor.tsx b/src/components/editor/editor.tsxindex e8ff1f165..975c1a5f7 100644--- a/src/components/editor/editor.tsx+++ b/src/components/editor/editor.tsx@@ -35,7 +35,7 @@ import {getStyle as getEditHandleStyle, getEditHandleShape} from './handle-styleimport {Filter} from '@kepler.gl/types';import {Feature} from '@nebula.gl/edit-modes';import {MjolnirEvent} from 'mjolnir.js';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';const StyledWrapper = styled.div`cursor: ${(props: {editor: {mode: string}}) =>diff --git a/src/components/editor/feature-action-panel.tsx b/src/components/editor/feature-action-panel.tsxindex 84f7332c8..6d7460d8f 100644--- a/src/components/editor/feature-action-panel.tsx+++ b/src/components/editor/feature-action-panel.tsx@@ -30,7 +30,7 @@ import copy from 'copy-to-clipboard';import {Layer} from '@kepler.gl/layers';import {Filter} from '@kepler.gl/types';import {Feature} from '@nebula.gl/edit-modes';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';const LAYOVER_OFFSET = 4;diff --git a/src/components/filters/filter-panels/filter-panel-with-field-select.tsx b/src/components/filters/filter-panels/filter-panel-with-field-select.tsxindex 80259bdf0..9e38e5f6e 100644--- a/src/components/filters/filter-panels/filter-panel-with-field-select.tsx+++ b/src/components/filters/filter-panels/filter-panel-with-field-select.tsx@@ -26,7 +26,7 @@ import SourceDataSelectorFactory from 'components/side-panel/common/source-data-import FieldSelectorFactory from '../../common/field-selector';import {getSupportedFilterFields} from './new-filter-panel';import {FilterPanelWithFieldSelectComponent} from './types';-import KeplerTable from 'reducers/table-utils/kepler-table';+import {KeplerTable} from '@kepler.gl/table';FieldPanelWithFieldSelectFactory.deps = [FilterPanelHeaderFactory,diff --git a/src/components/filters/filter-panels/new-filter-panel.tsx b/src/components/filters/filter-panels/new-filter-panel.tsxindex 18a75441a..8a69ba49b 100644--- a/src/components/filters/filter-panels/new-filter-panel.tsx+++ b/src/components/filters/filter-panels/new-filter-panel.tsx@@ -24,7 +24,7 @@ import FilterPanelHeaderFactory from 'components/side-panel/filter-panel/filter-import SourceDataSelectorFactory from 'components/side-panel/common/source-data-selector';import FieldSelectorFactory from '../../common/field-selector';import {FilterPanelComponent} from './types';-import KeplerTable from 'reducers/table-utils/kepler-table';+import {KeplerTable} from '@kepler.gl/table';import {Field, FilterBase, LineChart} from '@kepler.gl/types';NewFilterPanelFactory.deps = [diff --git a/src/components/filters/filter-panels/polygon-filter-panel.tsx b/src/components/filters/filter-panels/polygon-filter-panel.tsxindex 4858ac1bf..12e175f47 100644--- a/src/components/filters/filter-panels/polygon-filter-panel.tsx+++ b/src/components/filters/filter-panels/polygon-filter-panel.tsx@@ -29,7 +29,7 @@ import {StyledFilterPanel} from '../components';import get from 'lodash.get';import {PolygonFilterPanelComponent} from './types';-import KeplerTable from 'reducers/table-utils/kepler-table';+import {KeplerTable} from '@kepler.gl/table';PolygonFilterPanelFactory.deps = [FilterPanelHeaderFactory,diff --git a/src/components/filters/filter-panels/types.ts b/src/components/filters/filter-panels/types.tsindex 9e17af7bd..e180100fa 100644--- a/src/components/filters/filter-panels/types.ts+++ b/src/components/filters/filter-panels/types.ts@@ -1,7 +1,7 @@import {FunctionComponent, ComponentType} from 'react';import {Filter, PolygonFilter, TimeRangeFilter, Field} from '@kepler.gl/types';import {Layer} from '@kepler.gl/layers';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';interface PanelAction {id: string;diff --git a/src/components/filters/types.ts b/src/components/filters/types.tsindex 7e36e6dba..130028177 100644--- a/src/components/filters/types.ts+++ b/src/components/filters/types.ts@@ -15,7 +15,7 @@ import {toggleFilterAnimation,updateFilterAnimationSpeed} from '@kepler.gl/actions';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';export type PolygonFilterProps = {filter: Filter;diff --git a/src/components/kepler-gl.tsx b/src/components/kepler-gl.tsxindex d83081c6e..a01152f89 100644--- a/src/components/kepler-gl.tsx+++ b/src/components/kepler-gl.tsx@@ -74,7 +74,7 @@ import {} from '@kepler.gl/utils';import {theme as basicTheme, themeLT, themeBS} from '@kepler.gl/styles';-import {KeplerGlState} from 'reducers/core';+import {KeplerGlState} from 'reducers';import {Provider} from 'cloud-providers';// Maybe we should think about exporting this or creating a variablediff --git a/src/components/map-container.tsx b/src/components/map-container.tsxindex e923a038c..7be7a6784 100644--- a/src/components/map-container.tsx+++ b/src/components/map-container.tsx@@ -68,7 +68,7 @@ import {LOCALE_CODES} from '@kepler.gl/localization';import {getMapLayersFromSplitMaps, onViewPortChange} from '@kepler.gl/utils';import {MapView} from '@deck.gl/core';import {MapStyle} from 'reducers';-import {Datasets} from 'reducers/table-utils';+import {Datasets} from '@kepler.gl/table';import {computeDeckLayers,getLayerHoverProp,diff --git a/src/components/map/map-control.tsx b/src/components/map/map-control.tsxindex b360219eb..c03f83e66 100644--- a/src/components/map/map-control.tsx+++ b/src/components/map/map-control.tsx@@ -31,7 +31,7 @@ import MapDrawPanelFactory from './map-draw-panel';import LocalePanelFactory from './locale-panel';import {Layer} from '@kepler.gl/layers';import {Editor, MapControls} from '@kepler.gl/types';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';interface StyledMapControlProps {top?: number;diff --git a/src/components/modal-container.tsx b/src/components/modal-container.tsxindex d2bb9e5fd..122da5cfd 100644--- a/src/components/modal-container.tsx+++ b/src/components/modal-container.tsx@@ -27,7 +27,7 @@ import document from 'global/document';import {EXPORT_DATA_TYPE_OPTIONS, EXPORT_MAP_FORMATS} from '@kepler.gl/constants';import ModalDialogFactory from './modals/modal-dialog';import {exportHtml, isValidMapInfo, exportMap, exportJson} from '@kepler.gl/utils';-import {exportData} from 'reducers/export-utils';+import {exportData, getFileFormatNames, getFileExtensions, MapStyle, ProviderState} from 'reducers';// modalsimport DeleteDatasetModalFactory from './modals/delete-data-modal';@@ -59,10 +59,7 @@ import {OVERWRITE_MAP_ID} from '@kepler.gl/constants';-import {getFileFormatNames, getFileExtensions} from 'reducers/vis-state-selectors';-import {MapStyle} from 'reducers';-import {MapState, UiState, OnErrorCallBack, OnSuccessCallBack} from '@kepler.gl/types';-import {ProviderState} from 'reducers/provider-state-updaters';+import {MapState, UiState, OnSuccessCallBack, OnErrorCallBack} from '@kepler.gl/types';import {VisStateActions,diff --git a/src/components/modals/data-table-modal.tsx b/src/components/modals/data-table-modal.tsxindex 383c9ce38..32cf50f06 100644--- a/src/components/modals/data-table-modal.tsx+++ b/src/components/modals/data-table-modal.tsx@@ -25,7 +25,7 @@ import DataTableFactory from 'components/common/data-table';import {createSelector} from 'reselect';import {renderedSize} from 'components/common/data-table/cell-size';import CanvasHack from 'components/common/data-table/canvas';-import KeplerTable, {Datasets} from 'reducers/table-utils/kepler-table';+import KeplerTable, {Datasets} from '@kepler.gl/table';const dgSettings = {sidePadding: '38px',diff --git a/src/components/modals/delete-data-modal.tsx b/src/components/modals/delete-data-modal.tsxindex bbc44de5b..9ea55ff46 100644--- a/src/components/modals/delete-data-modal.tsx+++ b/src/components/modals/delete-data-modal.tsx@@ -23,7 +23,7 @@ import styled from 'styled-components';import DatasetLabel from 'components/common/dataset-label';import {FormattedMessage} from '@kepler.gl/localization';import {Layer} from '@kepler.gl/layers';-import {KeplerTable} from 'reducers/table-utils';+import {KeplerTable} from '@kepler.gl/table';const StyledMsg = styled.div`margin-top: 24px;diff --git a/src/components/modals/export-data-modal.tsx b/src/components/modals/export-data-modal.tsxindex 4f67fcf39..e83329642 100644--- a/src/components/modals/export-data-modal.tsx+++ b/src/components/modals/export-data-modal.tsx@@ -31,7 +31,7 @@ import {} from 'components/common/styled-components';import {injectIntl, IntlShape} from 'react-intl';import {FormattedMessage} from '@kepler.gl/localization';-import {Datasets} from 'reducers/table-utils';+import {Datasets} from '@kepler.gl/table';const getDataRowCount = (datasets: Datasets,diff --git a/src/components/plot-container.tsx b/src/components/plot-container.tsxindex 5e7200dab..6f8e2ab0a 100644--- a/src/components/plot-container.tsx+++ b/src/components/plot-container.tsx@@ -31,7 +31,7 @@ import {convertToPng,getScaleFromImageSize} from '@kepler.gl/utils';-import {findMapBounds} from 'reducers/data-utils';+import {findMapBounds} from 'reducers';import MapContainerFactory from './map-container';import MapsLayoutFactory from './maps-layout';diff --git a/src/components/side-panel/common/types.ts b/src/components/side-panel/common/types.tsindex b3b92ff3e..e41e8de5c 100644--- a/src/components/side-panel/common/types.ts+++ b/src/components/side-panel/common/types.ts@@ -3,7 +3,7 @@ import {openDeleteModal} from '@kepler.gl/actions';import {VisStateActions} from '@kepler.gl/actions';import {ActionHandler} from '@kepler.gl/actions';import {RGBColor} from '@kepler.gl/types';-import KeplerTable, {Datasets} from 'reducers/table-utils/kepler-table';+import KeplerTable, {Datasets} from '@kepler.gl/table';export type DatasetInfoProps = {dataset: KeplerTable;diff --git a/src/components/side-panel/filter-manager.tsx b/src/components/side-panel/filter-manager.tsxindex f6dc18750..d8e043517 100644--- a/src/components/side-panel/filter-manager.tsx+++ b/src/components/side-panel/filter-manager.tsx@@ -27,7 +27,7 @@ import FilterPanelFactory from './filter-panel/filter-panel';import {Filter} from '@kepler.gl/types';import {Layer} from '@kepler.gl/layers';import {VisStateActions, ActionHandler} from '@kepler.gl/actions';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';type FilterManagerProps = {filters: Filter[];diff --git a/src/components/side-panel/filter-panel/filter-panel-header.tsx b/src/components/side-panel/filter-panel/filter-panel-header.tsxindex a24d42b2b..2960cfb0b 100644--- a/src/components/side-panel/filter-panel/filter-panel-header.tsx+++ b/src/components/side-panel/filter-panel/filter-panel-header.tsx@@ -25,7 +25,7 @@ import {Trash} from 'components/common/icons';import {createLinearGradient} from '@kepler.gl/utils';import {StyledPanelHeader, StyledPanelHeaderProps} from 'components/common/styled-components';import {RGBColor, Filter} from '@kepler.gl/types';-import KeplerTable from 'reducers/table-utils/kepler-table';+import {KeplerTable} from '@kepler.gl/table';interface StyledFilterHeaderProps extends StyledPanelHeaderProps {$labelRCGColorValues: RGBColor[];diff --git a/src/components/side-panel/interaction-manager.tsx b/src/components/side-panel/interaction-manager.tsxindex ba0847dc0..9750b5b6f 100644--- a/src/components/side-panel/interaction-manager.tsx+++ b/src/components/side-panel/interaction-manager.tsx@@ -22,7 +22,7 @@ import React from 'react';import {InteractionConfig} from '@kepler.gl/types';import InteractionPanelFactory from './interaction-panel/interaction-panel';import {VisStateActions} from '@kepler.gl/actions';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';type InteractionManagerProps = {interactionConfig: InteractionConfig;diff --git a/src/components/side-panel/interaction-panel/brush-config.tsx b/src/components/side-panel/interaction-panel/brush-config.tsxindex 35caf6fb4..1618bc920 100644--- a/src/components/side-panel/interaction-panel/brush-config.tsx+++ b/src/components/side-panel/interaction-panel/brush-config.tsx@@ -22,7 +22,7 @@ import React from 'react';import RangeSliderFactory from 'components/common/range-slider';import {PanelLabel, SidePanelSection} from 'components/common/styled-components';-import {BRUSH_CONFIG} from 'reducers/interaction-utils';+import {BRUSH_CONFIG} from 'reducers';import {FormattedMessage} from '@kepler.gl/localization';BrushConfigFactory.deps = [RangeSliderFactory];diff --git a/src/components/side-panel/interaction-panel/tooltip-config.tsx b/src/components/side-panel/interaction-panel/tooltip-config.tsxindex 7a6356e51..5c3eb1612 100644--- a/src/components/side-panel/interaction-panel/tooltip-config.tsx+++ b/src/components/side-panel/interaction-panel/tooltip-config.tsx@@ -35,7 +35,7 @@ import Switch from 'components/common/switch';import ItemSelector from 'components/common/item-selector/item-selector';import {COMPARE_TYPES, GEOCODER_DATASET_NAME} from '@kepler.gl/constants';import FieldSelectorFactory from '../../common/field-selector';-import KeplerTable, {Datasets} from 'reducers/table-utils/kepler-table';+import KeplerTable, {Datasets} from '@kepler.gl/table';const TooltipConfigWrapper = styled.div`.item-selector > div > div {diff --git a/src/components/side-panel/layer-manager.tsx b/src/components/side-panel/layer-manager.tsxindex ba59342d6..040d93ced 100644--- a/src/components/side-panel/layer-manager.tsx+++ b/src/components/side-panel/layer-manager.tsx@@ -39,7 +39,7 @@ import {Layer, LayerClassesType} from '@kepler.gl/layers';import {UIStateActions, VisStateActions, ActionHandler} from '@kepler.gl/actions';import {SidePanelItem} from 'components/types';import {LayerPanelListView} from '@kepler.gl/types';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';type LayerBlendingSelectorProps = {layerBlending: string;diff --git a/src/components/side-panel/layer-panel/add-layer-button.tsx b/src/components/side-panel/layer-panel/add-layer-button.tsxindex 699961bbc..1e8b29ce4 100644--- a/src/components/side-panel/layer-panel/add-layer-button.tsx+++ b/src/components/side-panel/layer-panel/add-layer-button.tsx@@ -29,7 +29,7 @@ import {Button} from 'components/common/styled-components';import {DatasetSquare} from 'components';import Typeahead from 'components/common/item-selector/typeahead';import Accessor from 'components/common/item-selector/accessor';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';import {RGBColor} from '@kepler.gl/types';type AddLayerButtonProps = {diff --git a/src/components/side-panel/layer-panel/column-selector.tsx b/src/components/side-panel/layer-panel/column-selector.tsxindex 10fecda3c..14e1bcf3d 100644--- a/src/components/side-panel/layer-panel/column-selector.tsx+++ b/src/components/side-panel/layer-panel/column-selector.tsx@@ -23,7 +23,7 @@ import styled from 'styled-components';import {FormattedMessage} from '@kepler.gl/localization';import {PanelLabel} from 'components/common/styled-components';import FieldSelectorFactory from 'components/common/field-selector';-import {validateColumn} from 'reducers/vis-state-merger';+import {validateColumn} from 'reducers';import {LayerColumn, LayerColumns} from '@kepler.gl/layers';import {Field, FieldPair} from '@kepler.gl/types';diff --git a/src/components/side-panel/layer-panel/dataset-layer-group.tsx b/src/components/side-panel/layer-panel/dataset-layer-group.tsxindex 4ee251e73..fbddd05ca 100644--- a/src/components/side-panel/layer-panel/dataset-layer-group.tsx+++ b/src/components/side-panel/layer-panel/dataset-layer-group.tsx@@ -23,7 +23,7 @@ import React, {useMemo} from 'react';import DatasetLayerSectionFactory from './dataset-layer-section';import {Layer, LayerClassesType} from '@kepler.gl/layers';import {UIStateActions, VisStateActions, ActionHandler} from '@kepler.gl/actions';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';type DatasetLayerGroupProps = {datasets: Datasets;diff --git a/src/components/side-panel/layer-panel/dataset-layer-section.tsx b/src/components/side-panel/layer-panel/dataset-layer-section.tsxindex 3bd17cb7e..a9d9f7e59 100644--- a/src/components/side-panel/layer-panel/dataset-layer-section.tsx+++ b/src/components/side-panel/layer-panel/dataset-layer-section.tsx@@ -25,7 +25,7 @@ import SourceDataCatalogFactory from '../common/source-data-catalog';import LayerListFactory from './layer-list';import {Layer, LayerClassesType} from '@kepler.gl/layers';import {UIStateActions, ActionHandler, VisStateActions} from '@kepler.gl/actions';-import KeplerTable from 'reducers/table-utils/kepler-table';+import {KeplerTable} from '@kepler.gl/table';type DatasetLayerSectionProps = {dataset: KeplerTable;diff --git a/src/components/side-panel/layer-panel/dataset-section.tsx b/src/components/side-panel/layer-panel/dataset-section.tsxindex 4b9ebf86b..6e8dd4fef 100644--- a/src/components/side-panel/layer-panel/dataset-section.tsx+++ b/src/components/side-panel/layer-panel/dataset-section.tsx@@ -26,7 +26,7 @@ import {Button} from 'components/common/styled-components';import SourceDataCatalogFactory from '../common/source-data-catalog';import {UIStateActions, VisStateActions, ActionHandler} from '@kepler.gl/actions';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';type AddDataButtonProps = {onClick: () => void;diff --git a/src/components/side-panel/layer-panel/layer-configurator.tsx b/src/components/side-panel/layer-panel/layer-configurator.tsxindex 8faa43c70..0900e7970 100644--- a/src/components/side-panel/layer-panel/layer-configurator.tsx+++ b/src/components/side-panel/layer-panel/layer-configurator.tsx@@ -51,7 +51,7 @@ import {import {NestedPartial, RGBColor, LayerVisConfig, ColorUI, Field} from '@kepler.gl/types';import {toggleModal, ActionHandler} from '@kepler.gl/actions';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';type LayerConfiguratorProps = {layer: Layer;diff --git a/src/components/side-panel/layer-panel/layer-list.tsx b/src/components/side-panel/layer-panel/layer-list.tsxindex f2cce489e..ec853daac 100644--- a/src/components/side-panel/layer-panel/layer-list.tsx+++ b/src/components/side-panel/layer-panel/layer-list.tsx@@ -24,7 +24,7 @@ import classnames from 'classnames';import {SortableContainer, SortableElement} from 'react-sortable-hoc';import LayerPanelFactory from './layer-panel';import {Layer, LayerClassesType} from '@kepler.gl/layers';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';import {arrayMove} from '@kepler.gl/utils';import {UIStateActions, VisStateActions} from '@kepler.gl/actions';diff --git a/src/components/side-panel/layer-panel/layer-panel.tsx b/src/components/side-panel/layer-panel/layer-panel.tsxindex 9830d72bf..4eb3b4b79 100644--- a/src/components/side-panel/layer-panel/layer-panel.tsx+++ b/src/components/side-panel/layer-panel/layer-panel.tsx@@ -32,7 +32,7 @@ import LayerPanelHeaderFactory from './layer-panel-header';import {NestedPartial, LayerVisConfig, ColorUI} from '@kepler.gl/types';import {Layer, LayerBaseConfig} from '@kepler.gl/layers';import {toggleModal, VisStateActions, ActionHandler} from '@kepler.gl/actions';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';type LayerPanelProps = {className?: string;diff --git a/src/components/side-panel/layer-panel/vis-config-slider.tsx b/src/components/side-panel/layer-panel/vis-config-slider.tsxindex ae4b28dc9..eb2ede670 100644--- a/src/components/side-panel/layer-panel/vis-config-slider.tsx+++ b/src/components/side-panel/layer-panel/vis-config-slider.tsx@@ -27,7 +27,7 @@ import {FormattedMessage} from '@kepler.gl/localization';import {KeyEvent} from '@kepler.gl/constants';import {Checkbox} from 'components';import {Layer, LayerBaseConfig} from '@kepler.gl/layers';-import {isInRange} from 'reducers/filter-utils';+import {isInRange} from '@kepler.gl/table';import {clamp} from '@kepler.gl/utils';type LazyInputProps = {diff --git a/src/components/types.ts b/src/components/types.tsindex 61f71c99c..b9966c641 100644--- a/src/components/types.ts+++ b/src/components/types.ts@@ -9,7 +9,7 @@ import {MapStateActions,UIStateActions} from '@kepler.gl/actions';-import {Datasets} from 'reducers/table-utils/kepler-table';+import {Datasets} from '@kepler.gl/table';export type SidePanelItem = {id: string;diff --git a/src/connect/with-local-selector.tsx b/src/connect/with-local-selector.tsxindex 45b59e6b3..d674d7916 100644--- a/src/connect/with-local-selector.tsx+++ b/src/connect/with-local-selector.tsx@@ -21,7 +21,7 @@import React, {Component} from 'react';import {createSelector} from 'reselect';import KeplerGlContext from 'components/context';-import {KeplerGlState} from 'reducers/combined-updaters';+import {KeplerGlState} from 'reducers';const identity = state => state;diff --git a/src/layers/src/aggregation-layer.ts b/src/layers/src/aggregation-layer.tsindex 3981720bd..26621819b 100644--- a/src/layers/src/aggregation-layer.ts+++ b/src/layers/src/aggregation-layer.ts@@ -36,7 +36,7 @@ import {ColorRange} from '@kepler.gl/constants';import {Merge} from '@kepler.gl/types';-import KeplerTable, {Datasets} from 'reducers/table-utils/kepler-table';+import {KeplerTable, Datasets} from '@kepler.gl/table';type AggregationLayerColumns = {lat: LayerColumn;@@ -307,7 +307,9 @@ export default class AggregationLayer extends Layer {this.config.sizeField,this.config.visConfig.sizeAggregation);- const hasFilter = Object.values(gpuFilter.filterRange).some(arr => arr.some(v => v !== 0));+ const hasFilter = Object.values(gpuFilter.filterRange).some((arr: any) =>+ arr.some(v => v !== 0)+ );const getFilterValue = gpuFilter.filterValueAccessor(dataContainer)(this.gpuFilterGetIndex,diff --git a/src/layers/src/arc-layer/arc-layer.ts b/src/layers/src/arc-layer/arc-layer.tsindex e3185bd52..21bb9645b 100644--- a/src/layers/src/arc-layer/arc-layer.ts+++ b/src/layers/src/arc-layer/arc-layer.ts@@ -44,8 +44,7 @@ import {VisConfigNumber,VisConfigRange} from '@kepler.gl/types';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';-import KeplerTable from 'reducers/table-utils/kepler-table';+import {KeplerTable, DataContainerInterface} from '@kepler.gl/table';export type ArcLayerVisConfigSettings = {opacity: VisConfigNumber;diff --git a/src/layers/src/base-layer.ts b/src/layers/src/base-layer.tsindex 96d32bbca..f99fe6862 100644--- a/src/layers/src/base-layer.ts+++ b/src/layers/src/base-layer.ts@@ -64,10 +64,8 @@ import {MapState,Filter} from '@kepler.gl/types';-import KeplerTable, {Datasets, GpuFilter} from 'reducers/table-utils/kepler-table';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';-import {getSampleData} from 'reducers/table-utils/data-container-utils';-import {getLatLngBounds, isPlainObject, notNullorUndefined} from '@kepler.gl/utils';+import {KeplerTable, Datasets, GpuFilter, DataContainerInterface} from '@kepler.gl/table';+import {getLatLngBounds, getSampleData, isPlainObject, notNullorUndefined} from '@kepler.gl/utils';export type LayerColumn = {value: string | null; fieldIdx: number; optional?: boolean};diff --git a/src/layers/src/geojson-layer/geojson-layer.ts b/src/layers/src/geojson-layer/geojson-layer.tsindex d2e5fe769..8d8f5d465 100644--- a/src/layers/src/geojson-layer/geojson-layer.ts+++ b/src/layers/src/geojson-layer/geojson-layer.ts@@ -55,8 +55,7 @@ import {Merge,RGBColor} from '@kepler.gl/types';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';-import KeplerTable from 'reducers/table-utils/kepler-table';+import {KeplerTable, DataContainerInterface} from '@kepler.gl/table';const SUPPORTED_ANALYZER_TYPES = {[DATA_TYPES.GEOMETRY]: true,diff --git a/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts b/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.tsindex 2809f5e96..eb84b4c60 100644--- a/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts+++ b/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts@@ -39,10 +39,8 @@ import {VisConfigRange,Merge} from '@kepler.gl/types';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';+import {KeplerTable, DataContainerInterface, createDataContainer} from '@kepler.gl/table';import {findDefaultColorField} from '@kepler.gl/utils';-import KeplerTable from 'reducers/table-utils/kepler-table';-import {createDataContainer} from 'reducers/table-utils';export type HexagonIdLayerColumnsConfig = {hex_id: LayerColumn;diff --git a/src/layers/src/heatmap-layer/heatmap-layer.ts b/src/layers/src/heatmap-layer/heatmap-layer.tsindex 47fd97c61..1b46b747f 100644--- a/src/layers/src/heatmap-layer/heatmap-layer.ts+++ b/src/layers/src/heatmap-layer/heatmap-layer.ts@@ -27,7 +27,7 @@ import HeatmapLayerIcon from './heatmap-layer-icon';import {LayerColumn, LayerWeightConfig, VisualChannels} from '../base-layer';import {VisConfigColorRange, VisConfigNumber} from '@kepler.gl/types';import {HexColor, Merge} from '@kepler.gl/types';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';+import {DataContainerInterface} from '@kepler.gl/table';export type HeatmapLayerVisConfigSettings = {opacity: VisConfigNumber;diff --git a/src/layers/src/icon-layer/icon-layer.ts b/src/layers/src/icon-layer/icon-layer.tsindex 965dcb040..0d01af7f1 100644--- a/src/layers/src/icon-layer/icon-layer.ts+++ b/src/layers/src/icon-layer/icon-layer.ts@@ -28,8 +28,7 @@ import {ICON_FIELDS, CLOUDFRONT, ColorRange} from '@kepler.gl/constants';import IconInfoModalFactory from './icon-info-modal';import Layer, {LayerBaseConfig, LayerColumn} from '../base-layer';import {getTextOffsetByRadius, formatTextLabelData} from '../layer-text-label';-import {default as KeplerTable} from 'reducers/table-utils/kepler-table';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';+import {default as KeplerTable, DataContainerInterface} from '@kepler.gl/table';import {VisConfigBoolean,VisConfigColorRange,diff --git a/src/layers/src/index.ts b/src/layers/src/index.tsindex ec3b7ea71..3cf34e5bb 100644--- a/src/layers/src/index.ts+++ b/src/layers/src/index.ts@@ -18,6 +18,13 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.+export {+ default as Layer,+ OVERLAY_TYPE_CONST,+ LAYER_ID_LENGTH,+ colorMaker,+ layerColors+} from './base-layer';import {default as PointLayer} from './point-layer/point-layer';import {default as ArcLayer} from './arc-layer/arc-layer';import {default as LineLayer} from './line-layer/line-layer';@@ -44,13 +51,6 @@ export {default as AggregationLayer} from './aggregation-layer';import {LAYER_TYPES} from './types';export {LAYER_TYPES, EDITOR_AVAILABLE_LAYERS} from './types';// base layer-export {- default as Layer,- OVERLAY_TYPE_CONST,- LAYER_ID_LENGTH,- colorMaker,- layerColors-} from './base-layer';// eslint-disable-next-line prettier/prettierexport type {LayerBaseConfig,diff --git a/src/layers/src/line-layer/line-layer.ts b/src/layers/src/line-layer/line-layer.tsindex 1c78dd64a..f44dac061 100644--- a/src/layers/src/line-layer/line-layer.ts+++ b/src/layers/src/line-layer/line-layer.ts@@ -33,8 +33,7 @@ import {VisConfigNumber,VisConfigRange} from '@kepler.gl/types';-import {default as KeplerTable} from 'reducers/table-utils/kepler-table';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';+import {default as KeplerTable, DataContainerInterface} from '@kepler.gl/table';export type LineLayerVisConfigSettings = {opacity: VisConfigNumber;diff --git a/src/layers/src/mapboxgl-layer.ts b/src/layers/src/mapboxgl-layer.tsindex 76c380331..84a71b6ef 100644--- a/src/layers/src/mapboxgl-layer.ts+++ b/src/layers/src/mapboxgl-layer.ts@@ -27,7 +27,7 @@ import Layer, {import {createSelector} from 'reselect';import {geoJsonFromData, prefixGpuField, gpuFilterToMapboxFilter} from './mapbox-utils';-import {default as KeplerTable} from 'reducers/table-utils/kepler-table';+import {default as KeplerTable} from '@kepler.gl/table';import {Merge} from '@kepler.gl/types';type MapboxLayerGLColumns = {diff --git a/src/layers/src/point-layer/point-layer.ts b/src/layers/src/point-layer/point-layer.tsindex a0bc0af41..0f35598d7 100644--- a/src/layers/src/point-layer/point-layer.ts+++ b/src/layers/src/point-layer/point-layer.ts@@ -29,7 +29,7 @@ import Layer, {LayerStrokeColorConfig} from '../base-layer';import {hexToRgb} from '@kepler.gl/utils';-import {default as KeplerTable} from 'reducers/table-utils/kepler-table';+import {default as KeplerTable} from '@kepler.gl/table';import {findDefaultColorField} from '@kepler.gl/utils';import PointLayerIcon from './point-layer-icon';import {diff --git a/src/layers/src/s2-geometry-layer/s2-geometry-layer.ts b/src/layers/src/s2-geometry-layer/s2-geometry-layer.tsindex 67b349029..9057f26f1 100644--- a/src/layers/src/s2-geometry-layer/s2-geometry-layer.ts+++ b/src/layers/src/s2-geometry-layer/s2-geometry-layer.ts@@ -25,9 +25,11 @@ import {ColorRange,LAYER_VIS_CONFIGS} from '@kepler.gl/constants';-import {default as KeplerTable} from 'reducers/table-utils/kepler-table';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';-import {createDataContainer} from 'reducers/table-utils/data-container-utils';+import {+ default as KeplerTable,+ DataContainerInterface,+ createDataContainer+} from '@kepler.gl/table';import Layer, {LayerBaseConfig,LayerColorConfig,diff --git a/src/layers/src/scenegraph-layer/scenegraph-layer.ts b/src/layers/src/scenegraph-layer/scenegraph-layer.tsindex 450dae6ca..a861bed94 100644--- a/src/layers/src/scenegraph-layer/scenegraph-layer.ts+++ b/src/layers/src/scenegraph-layer/scenegraph-layer.ts@@ -27,8 +27,7 @@ import ScenegraphLayerIcon from './scenegraph-layer-icon';import ScenegraphInfoModalFactory from './scenegraph-info-modal';import {LAYER_VIS_CONFIGS, ColorRange} from '@kepler.gl/constants';import {Merge, VisConfigColorRange, VisConfigNumber} from '@kepler.gl/types';-import {default as KeplerTable} from 'reducers/table-utils/kepler-table';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';+import {default as KeplerTable, DataContainerInterface} from '@kepler.gl/table';export type ScenegraphLayerVisConfigSettings = {opacity: VisConfigNumber;diff --git a/src/layers/src/trip-layer/trip-layer.ts b/src/layers/src/trip-layer/trip-layer.tsindex ee4af9bfb..62870162b 100644--- a/src/layers/src/trip-layer/trip-layer.ts+++ b/src/layers/src/trip-layer/trip-layer.ts@@ -36,8 +36,7 @@ import {import {isTripGeoJsonField, parseTripGeoJsonTimestamp} from './trip-utils';import TripInfoModalFactory from './trip-info-modal';import {Merge, VisConfigColorRange, VisConfigNumber, VisConfigRange} from '@kepler.gl/types';-import {default as KeplerTable} from 'reducers/table-utils/kepler-table';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';+import {default as KeplerTable, DataContainerInterface} from '@kepler.gl/table';export type TripLayerVisConfigSettings = {opacity: VisConfigNumber;diff --git a/src/layers/src/trip-layer/trip-utils.ts b/src/layers/src/trip-layer/trip-utils.tsindex cd2e8d450..2fe798717 100644--- a/src/layers/src/trip-layer/trip-utils.ts+++ b/src/layers/src/trip-layer/trip-utils.ts@@ -23,9 +23,10 @@ import {Analyzer, DATA_TYPES} from 'type-analyzer';import {Field} from '@kepler.gl/types';import {parseGeoJsonRawFeature, getGeojsonFeatureTypes} from '../geojson-layer/geojson-utils';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';+import {DataContainerInterface, getSampleData} from '@kepler.gl/table';import {notNullorUndefined, timeToUnixMilli} from '@kepler.gl/utils';-import {getSampleData} from 'reducers/table-utils/data-container-utils';+import {Feature} from '@turf/helpers';+import {GeoJsonProperties, Geometry} from 'geojson';/*** Parse geojson from string@@ -81,7 +82,7 @@ export function isTripGeoJsonField(dataContainer: DataContainerInterface, field)const sampleRawFeatures =dataContainer.numRows() > maxCount ? getSampleData(dataContainer, maxCount) : dataContainer;- const features = sampleRawFeatures+ const features: Feature<Geometry, GeoJsonProperties>[] = sampleRawFeatures.mapIndex(field.valueAccessor).map(parseGeoJsonRawFeature).filter(notNullorUndefined);diff --git a/src/processors/src/data-processor.ts b/src/processors/src/data-processor.tsindex dbe6f42c2..12e9d3bb8 100644--- a/src/processors/src/data-processor.ts+++ b/src/processors/src/data-processor.ts@@ -34,7 +34,6 @@ import {import {KeplerGlSchema, ParsedDataset, SavedMap} from 'schemas';import {Feature} from '@nebula.gl/edit-modes';import {LoadedMap} from 'schemas/schema-manager';-import {formatCsv} from 'reducers/export-utils';// if any of these value occurs in csv, parse it to null;// const CSV_NULLS = ['', 'null', 'NULL', 'Null', 'NaN', '/N'];@@ -392,7 +391,6 @@ export const Processors: {analyzerTypeToFieldType: typeof analyzerTypeToFieldType;getFieldsFromData: typeof getFieldsFromData;parseCsvRowsByFieldType: typeof parseCsvRowsByFieldType;- formatCsv: typeof formatCsv;} = {processGeojson,processCsvData,@@ -401,6 +399,5 @@ export const Processors: {processKeplerglDataset,analyzerTypeToFieldType,getFieldsFromData,- parseCsvRowsByFieldType,- formatCsv+ parseCsvRowsByFieldType};diff --git a/src/reducers/export-utils.ts b/src/reducers/export-utils.tsindex 92e64b4f2..9f738730e 100644--- a/src/reducers/export-utils.ts+++ b/src/reducers/export-utils.ts@@ -24,10 +24,8 @@ import {csvFormatRows} from 'd3-dsv';import {EXPORT_DATA_TYPE} from '@kepler.gl/constants';import {Field} from '@kepler.gl/types';-import {createIndexedDataContainer} from 'reducers/table-utils/data-container-utils';+import {createIndexedDataContainer, DataContainerInterface, Datasets} from '@kepler.gl/table';import {parseFieldValue} from '@kepler.gl/utils';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';-import {Datasets} from 'reducers/table-utils/kepler-table';import {downloadFile, DEFAULT_DATA_NAME} from '@kepler.gl/utils';interface StateType {diff --git a/src/reducers/index.ts b/src/reducers/index.tsindex 37fd66a8f..aebfc1d48 100644--- a/src/reducers/index.ts+++ b/src/reducers/index.ts@@ -37,7 +37,9 @@ export {// Each individual reducerexport {default as visStateReducer} from './vis-state';export {default as mapStateReducer} from './map-state';+export {default as uiStateReducer} from './ui-state';export {default as mapStyleReducer} from './map-style';+export {default as providerReducer} from './provider-state';// reducer updaters@@ -49,24 +51,37 @@ export * as uiStateUpdaters from './ui-state-updaters';// This will be deprecatedexport * as combineUpdaters from './combined-updaters';export * as combinedUpdaters from './combined-updaters';+export type {KeplerGlState} from './combined-updaters';+export {addDataToMapUpdater} from './combined-updaters';// reducer mergesexport * as visStateMergers from './vis-state-merger';+export * from './vis-state-selectors';+export * from './vis-state-merger';+export * from './provider-state-updaters';+export * from './provider-state';+export * from './ui-state';+export * from './map-state';+export {getInitialInputStyle, loadMapStylesUpdater, INITIAL_MAP_STYLE} from './map-style-updaters';+export {INITIAL_MAP_STATE} from './map-state-updaters';// Helpersexport * from './composer-helpers';+// export types+export * from './vis-state-updaters';++export * from './layer-utils';++export {INITIAL_UI_STATE} from './ui-state-updaters';+export type {MapboxStyleUrl,MapStyle} from './map-style-updaters';-export * from './data-scale-utils';export * from './data-utils';-export * from './table-utils/dataset-utils';export * from './export-utils';-export * from './filter-utils';-export * from './table-utils/gpu-filter-utils';export * from './interaction-utils';export * from './layer-utils';export * as providerStateUpdaters from './provider-state-updaters';diff --git a/src/reducers/interaction-utils.ts b/src/reducers/interaction-utils.tsindex 20553bce6..c260e1157 100644--- a/src/reducers/interaction-utils.ts+++ b/src/reducers/interaction-utils.ts@@ -27,7 +27,7 @@ import {COMPARE_TYPES} from '@kepler.gl/constants';-import {DataRow} from 'reducers/table-utils/data-row';+import {DataRow} from '@kepler.gl/table';import {Field, TooltipField, CompareType} from '@kepler.gl/types';import {parseFieldValue,diff --git a/src/reducers/layer-utils.ts b/src/reducers/layer-utils.tsindex db156dde9..5597058c4 100644--- a/src/reducers/layer-utils.ts+++ b/src/reducers/layer-utils.ts@@ -33,7 +33,7 @@ import {OVERLAY_TYPE_CONST} from '@kepler.gl/layers';-import KeplerTable, {Datasets} from 'reducers/table-utils/kepler-table';+import KeplerTable, {DataRow, Datasets} from '@kepler.gl/table';import {VisState} from 'schemas';import {isFunction, getMapLayersFromSplitMaps} from '@kepler.gl/utils';import {ThreeDBuildingLayer} from '@kepler.gl/deckgl-layers';@@ -146,7 +146,7 @@ export function getLayerHoverProp({return null;}const {dataContainer, fields} = datasets[dataId];- const data = layer.getHoverData(object, dataContainer, fields);+ const data: DataRow | null = layer.getHoverData(object, dataContainer, fields);const fieldsToShow = interactionConfig.tooltip.config.fieldsToShow[dataId];return {diff --git a/src/reducers/vis-state-merger.ts b/src/reducers/vis-state-merger.tsindex 176f4680a..ebe22ab85 100644--- a/src/reducers/vis-state-merger.ts+++ b/src/reducers/vis-state-merger.ts@@ -29,9 +29,13 @@ import {CURRENT_VERSION, Merger, VisState, VisStateMergers, visStateSchema} fromimport {ParsedConfig} from 'schemas';import {ParsedLayer, SavedInteractionConfig, TooltipInfo} from '@kepler.gl/types';-import KeplerTable, {Datasets} from './table-utils/kepler-table';-import {applyFiltersToDatasets, validateFiltersUpdateDatasets} from './filter-utils';-import {assignGpuChannels, resetFilterGpuMode} from './table-utils/gpu-filter-utils';+import {KeplerTable, Datasets} from '@kepler.gl/table';+import {+ applyFiltersToDatasets,+ validateFiltersUpdateDatasets,+ assignGpuChannels,+ resetFilterGpuMode+} from '@kepler.gl/table';/*** Merge loaded filters with current state, if no fields or data are loadeddiff --git a/src/reducers/vis-state-updaters.ts b/src/reducers/vis-state-updaters.tsindex 095859adb..56a405108 100644--- a/src/reducers/vis-state-updaters.ts+++ b/src/reducers/vis-state-updaters.ts@@ -79,12 +79,7 @@ import {Filter, InteractionConfig, AnimationConfig, Editor} from '@kepler.gl/typimport {Loader} from '@loaders.gl/loader-utils';import {Messages, Crosshairs, CursorClick, Pin} from 'components/common/icons/index';-import {- copyTableAndUpdate,- Datasets,- pinTableColumns,- sortDatasetByColumn-} from './table-utils/kepler-table';+import {copyTableAndUpdate, Datasets, pinTableColumns, sortDatasetByColumn} from '@kepler.gl/table';import {calculateLayerData, findDefaultLayer} from './layer-utils';import {applyFilterFieldName,@@ -99,12 +94,15 @@ import {isInRange,LIMITED_FILTER_EFFECT_PROPS,updateFilterDataId-} from './filter-utils';-import {assignGpuChannel, setFilterGpuMode} from './table-utils/gpu-filter-utils';-import {createNewDataEntry} from './table-utils/dataset-utils';+} from '@kepler.gl/table/src/filter-utils';+import {+ assignGpuChannel,+ setFilterGpuMode,+ createNewDataEntry,+ getFilterPlot,+ getDefaultFilterPlotType+} from '@kepler.gl/table';import {findFieldsToShow} from './interaction-utils';-import {getFilterPlot} from './filter-utils';-import {getDefaultFilterPlotType} from './filter-utils';// react-palm// disable capture exception for react-palm call to withTaskdiff --git a/src/schemas/dataset-schema.ts b/src/schemas/dataset-schema.tsindex e1439de14..3ab95e8df 100644--- a/src/schemas/dataset-schema.ts+++ b/src/schemas/dataset-schema.ts@@ -22,7 +22,7 @@ import pick from 'lodash.pick';import {console as globalConsole} from 'global/window';import {ProtoDataset} from '@kepler.gl/types';-import {KeplerTable} from 'reducers/table-utils';+import {KeplerTable} from '@kepler.gl/table';import {RGBColor} from 'types';import {VERSIONS} from './versions';import Schema from './schema';diff --git a/src/schemas/schema-manager.ts b/src/schemas/schema-manager.tsindex 7b12cf19b..ca5a5c236 100644--- a/src/schemas/schema-manager.ts+++ b/src/schemas/schema-manager.ts@@ -20,7 +20,7 @@import {console as Console} from 'global/window';-import {Datasets} from 'reducers/table-utils';+import {Datasets} from '@kepler.gl/table';import datasetSchema from './dataset-schema';import mapStyleSchema from './map-style-schema';import mapStateSchema from './map-state-schema';diff --git a/src/schemas/vis-state-schema.ts b/src/schemas/vis-state-schema.tsindex f4d7afa18..9679edce4 100644--- a/src/schemas/vis-state-schema.ts+++ b/src/schemas/vis-state-schema.ts@@ -41,8 +41,7 @@ import {SavedVisState,SplitMap} from '@kepler.gl/types';-import {isFilterValidToSave} from 'reducers/filter-utils';-import {Datasets} from 'reducers/table-utils';+import {isFilterValidToSave, Datasets} from '@kepler.gl/table';import {Layer, LayerClassesType} from '@kepler.gl/layers';import {Loader} from '@loaders.gl/loader-utils';import KeplerGLSchema from './schema-manager';diff --git a/src/reducers/table-utils/UPGRADE-data-container.md b/src/table/UPGRADE-data-container.mdsimilarity index 100%rename from src/reducers/table-utils/UPGRADE-data-container.mdrename to src/table/UPGRADE-data-container.mddiff --git a/src/table/babel.config.js b/src/table/babel.config.jsnew file mode 100644index 000000000..8693d21ea--- /dev/null+++ b/src/table/babel.config.js@@ -0,0 +1,66 @@+// Copyright (c) 2022 Uber Technologies, Inc.+//+// Permission is hereby granted, free of charge, to any person obtaining a copy+// of this software and associated documentation files (the "Software"), to deal+// in the Software without restriction, including without limitation the rights+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+// copies of the Software, and to permit persons to whom the Software is+// furnished to do so, subject to the following conditions:+//+// The above copyright notice and this permission notice shall be included in+// all copies or substantial portions of the Software.+//+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN+// THE SOFTWARE.++const KeplerPackage = require('./package');++const PRESETS = ['@babel/preset-env', '@babel/preset-react', '@babel/preset-typescript'];+const PLUGINS = [+ ['@babel/plugin-transform-typescript', {isTSX: true, allowDeclareFields: true}],+ '@babel/plugin-transform-modules-commonjs',+ '@babel/plugin-proposal-class-properties',+ '@babel/plugin-proposal-export-namespace-from',+ '@babel/plugin-proposal-optional-chaining',+ [+ '@babel/transform-runtime',+ {+ regenerator: true+ }+ ],+ [+ 'search-and-replace',+ {+ rules: [+ {+ search: '__PACKAGE_VERSION__',+ replace: KeplerPackage.version+ }+ ]+ }+ ]+];+const ENV = {+ test: {+ plugins: ['istanbul']+ },+ debug: {+ sourceMaps: 'inline',+ retainLines: true+ }+};++module.exports = function babel(api) {+ api.cache(true);++ return {+ presets: PRESETS,+ plugins: PLUGINS,+ env: ENV+ };+};diff --git a/src/table/package.json b/src/table/package.jsonnew file mode 100644index 000000000..a569fff2b--- /dev/null+++ b/src/table/package.json@@ -0,0 +1,47 @@+{+ "name": "@kepler.gl/table",+ "author": "Shan He <[email protected]>",+ "version": "2.5.5",+ "description": "kepler.gl constants used by kepler.gl components, actions and reducers",+ "license": "MIT",+ "main": "dist/index.js",+ "types": "dist/index.d.ts",+ "keywords": [+ "babel",+ "es6",+ "react",+ "webgl",+ "visualization",+ "deck.gl"+ ],+ "repository": {+ "type": "git",+ "url": "https://github.com/keplergl/kepler.gl.git"+ },+ "scripts": {+ "build": "rm -fr dist && babel src --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",+ "build:umd": "webpack --config ./webpack/umd.js --progress --env.prod",+ "build:types": "tsc --project ./tsconfig.production.json",+ "prepublish": "uber-licence && yarn build && yarn build:types",+ "stab": "mkdir -p dist && touch dist/index.js"+ },+ "files": [+ "dist",+ "umd"+ ],+ "nyc": {+ "sourceMap": false,+ "instrument": false+ },+ "engines": {+ "node": ">=12.0.0"+ },+ "maintainers": [+ "Shan He <[email protected]>",+ "Giuseppe Macri <[email protected]>"+ ],+ "volta": {+ "node": "12.22.0",+ "yarn": "1.22.17"+ }+}diff --git a/src/reducers/table-utils/data-container-interface.ts b/src/table/src/data-container-interface.tssimilarity index 100%rename from src/reducers/table-utils/data-container-interface.tsrename to src/table/src/data-container-interface.tsdiff --git a/src/reducers/table-utils/data-container-utils.ts b/src/table/src/data-container-utils.tssimilarity index 100%rename from src/reducers/table-utils/data-container-utils.tsrename to src/table/src/data-container-utils.tsdiff --git a/src/reducers/table-utils/data-row.ts b/src/table/src/data-row.tssimilarity index 100%rename from src/reducers/table-utils/data-row.tsrename to src/table/src/data-row.tsdiff --git a/src/reducers/data-scale-utils.ts b/src/table/src/data-scale-utils.tssimilarity index 96%rename from src/reducers/data-scale-utils.tsrename to src/table/src/data-scale-utils.tsindex ee0afdf9f..c0d2ca1fb 100644--- a/src/reducers/data-scale-utils.ts+++ b/src/table/src/data-scale-utils.ts@@ -20,7 +20,7 @@import {notNullorUndefined, unique} from '@kepler.gl/utils';import {extent} from 'd3-array';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';+import {DataContainerInterface} from './data-container-interface';type dataValueAccessor = <T>(param: T) => T;type dataContainerValueAccessor = (d: {index: number}, dc: DataContainerInterface) => any;diff --git a/src/reducers/table-utils/dataset-utils.ts b/src/table/src/dataset-utils.tssimilarity index 97%rename from src/reducers/table-utils/dataset-utils.tsrename to src/table/src/dataset-utils.tsindex 9bcc477dd..b2d35fdd6 100644--- a/src/reducers/table-utils/dataset-utils.ts+++ b/src/table/src/dataset-utils.ts@@ -19,8 +19,7 @@// THE SOFTWARE.import uniq from 'lodash.uniq';-import KeplerTable, {Datasets} from 'reducers/table-utils/kepler-table';-+import KeplerTable, {Datasets} from './kepler-table';import {ProtoDataset, RGBColor} from '@kepler.gl/types';import {hexToRgb, validateInputData, datasetColorMaker} from '@kepler.gl/utils';diff --git a/src/reducers/filter-utils.ts b/src/table/src/filter-utils.tssimilarity index 95%rename from src/reducers/filter-utils.tsrename to src/table/src/filter-utils.tsindex 3a87676c2..70ab2b75f 100644--- a/src/reducers/filter-utils.ts+++ b/src/table/src/filter-utils.ts@@ -49,14 +49,10 @@ import {RangeFieldDomain} from '@kepler.gl/types';-import {VisState} from 'schemas';-import KeplerTable, {- FilterRecord,- Datasets,- FilterDatasetOpt-} from 'reducers/table-utils/kepler-table';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';import {LAYER_TYPES, getCentroid} from '@kepler.gl/layers';+import KeplerTable, {Datasets, FilterDatasetOpt, FilterRecord} from './kepler-table';+import {DataContainerInterface} from './data-container-interface';+import {isValidTimeDomain, durationYear, durationDay} from '@kepler.gl/utils';export type FilterResult = {filteredIndexForDomain?: number[];@@ -85,13 +81,6 @@ export const TimestampStepMap = [export const histogramBins = 30;export const enlargedHistogramBins = 100;-const durationSecond = 1000;-const durationMinute = durationSecond * 60;-const durationHour = durationMinute * 60;-const durationDay = durationHour * 24;-const durationWeek = durationDay * 7;-const durationYear = durationDay * 365;-export const FILTER_UPDATER_PROPS = keyMirror({dataId: null,name: null,@@ -452,7 +441,7 @@ type filterFunction = (data: {index: number}) => boolean;* @param dataContainer Data container* @return filterFunction*/-// eslint-disable-next-line complexity+/* eslint-disable complexity */export function getFilterFunction(field: Field | null,dataId: string,@@ -801,9 +790,6 @@ export function isInRange(val: any, domain: number[]): boolean {export function isInPolygon(point: number[], polygon: any): boolean {return booleanWithin(turfPoint(point), polygon);}-export function isValidTimeDomain(domain) {- return Array.isArray(domain) && domain.every(Number.isFinite);-}export function getTimeWidgetTitleFormatter(domain: [number, number]): string | null {if (!isValidTimeDomain(domain)) {return null;@@ -816,21 +802,6 @@ export function getTimeWidgetTitleFormatter(domain: [number, number]): string |return diff > durationYear ? 'L' : diff > durationDay ? 'L LT' : 'L LTS';}-export function getTimeWidgetHintFormatter(domain: [number, number]): string | undefined {- if (!isValidTimeDomain(domain)) {- return undefined;- }-- const diff = domain[1] - domain[0];- return diff > durationWeek- ? 'L'- : diff > durationDay- ? 'L LT'- : diff > durationHour- ? 'LT'- : 'LTS';-}-/*** Sanity check on filters to prepare for save* @type {typeof import('./filter-utils').isFilterValidToSave}@@ -1114,7 +1085,7 @@ export function filterDatasetCPU<T extends StateType>(state: T, dataId: string):/*** Validate parsed filters with datasets and add filterProps to field*/-export function validateFiltersUpdateDatasets<S extends VisState>(+export function validateFiltersUpdateDatasets<S extends {datasets: Datasets; layers: Layer[]}>(state: S,filtersToValidate: ParsedFilter[] = []): {@@ -1189,16 +1160,3 @@ export function validateFiltersUpdateDatasets<S extends VisState>(return {validated, failed, updatedDatasets};}--/**- * Retrieve interval bins for time filter- */-export function getIntervalBins(filter: TimeRangeFilter) {- const {bins} = filter;- const interval = filter.plotType?.interval;- if (!interval || !bins || Object.keys(bins).length === 0) {- return null;- }- const values = Object.values(bins);- return values[0] ? values[0][interval] : null;-}diff --git a/src/reducers/table-utils/gpu-filter-utils.ts b/src/table/src/gpu-filter-utils.tssimilarity index 98%rename from src/reducers/table-utils/gpu-filter-utils.tsrename to src/table/src/gpu-filter-utils.tsindex 44a2e6e0a..ab8e33704 100644--- a/src/reducers/table-utils/gpu-filter-utils.ts+++ b/src/table/src/gpu-filter-utils.ts@@ -23,8 +23,8 @@ import {MAX_GPU_FILTERS, FILTER_TYPES} from '@kepler.gl/constants';import {Field, Filter} from '@kepler.gl/types';import {set, toArray, notNullorUndefined} from '@kepler.gl/utils';-import {DataContainerInterface} from 'reducers/table-utils/data-container-interface';-import {GpuFilter} from 'reducers/table-utils/kepler-table';+import {DataContainerInterface} from './data-container-interface';+import {GpuFilter} from './kepler-table';/*** Set gpu mode based on current number of gpu filters existsdiff --git a/src/reducers/table-utils/index.ts b/src/table/src/index.tssimilarity index 83%rename from src/reducers/table-utils/index.tsrename to src/table/src/index.tsindex fd513e9f2..6870c9a04 100644--- a/src/reducers/table-utils/index.ts+++ b/src/table/src/index.ts@@ -29,6 +29,12 @@ export {maybeToDate} from './kepler-table';/* eslint-disable prettier/prettier */- export type {GpuFilter, Datasets} from './kepler-table';+ export type {GpuFilter, Datasets, FilterRecord, FilterDatasetOpt} from './kepler-table';export {createDataContainer, createIndexedDataContainer, getSampleData as getSampleContainerData} from './data-container-utils';export type {DataContainerInterface} from './data-container-interface';+ export * from './data-container-utils';+ export * from './data-row';+ export * from './gpu-filter-utils';+ export * from './dataset-utils';+ export * from './filter-utils';+ export * from './data-scale-utils';diff --git a/src/reducers/table-utils/indexed-data-container.ts b/src/table/src/indexed-data-container.tssimilarity index 100%rename from src/reducers/table-utils/indexed-data-container.tsrename to src/table/src/indexed-data-container.tsdiff --git a/src/reducers/table-utils/kepler-table.ts b/src/table/src/kepler-table.tssimilarity index 99%rename from src/reducers/table-utils/kepler-table.tsrename to src/table/src/kepler-table.tsindex d8efbe230..9cbb790c1 100644--- a/src/reducers/table-utils/kepler-table.ts+++ b/src/table/src/kepler-table.ts@@ -40,13 +40,13 @@ import {getFilterRecord,getNumericFieldDomain,getTimestampFieldDomain-} from '../filter-utils';+} from './filter-utils';import {getLinearDomain,getLogDomain,getOrdinalDomain,getQuantileDomain-} from '../data-scale-utils';+} from './data-scale-utils';import {DataContainerInterface} from './data-container-interface';export type GpuFilter = {diff --git a/src/reducers/table-utils/row-data-container.ts b/src/table/src/row-data-container.tssimilarity index 100%rename from src/reducers/table-utils/row-data-container.tsrename to src/table/src/row-data-container.tsdiff --git a/src/table/tsconfig.production.json b/src/table/tsconfig.production.jsonnew file mode 100644index 000000000..cddf14f7c--- /dev/null+++ b/src/table/tsconfig.production.json@@ -0,0 +1,33 @@+{+ "compilerOptions": {+ "target": "es2020",+ "allowJs": false,+ "checkJs": false,+ "jsx": "react",+ "module": "esnext",+ "moduleResolution": "node",+ "declaration":true,+ "emitDeclarationOnly":true,+ "noImplicitAny": false,+ "noImplicitReturns": true,+ "noImplicitThis": true,+ "noUnusedLocals": true,+ "outDir": "dist",+ "sourceMap": true,+ "strictNullChecks": true,+ "suppressImplicitAnyIndexErrors": false,+ "esModuleInterop": true,+ "allowSyntheticDefaultImports": true,+ "skipLibCheck": true,+ "strict": true,+ "resolveJsonModule": true,+ "isolatedModules": true,+ "baseUrl": "./src", //TODO change once all dependencies are isolated+ "paths": {+ "*": ["*"] //TODO change once all dependencies are isolated+ }+ },+ "include": [+ "src"+ ]+}diff --git a/src/utils/src/filter-utils.ts b/src/utils/src/filter-utils.tsindex 71b598485..0696195d0 100644--- a/src/utils/src/filter-utils.ts+++ b/src/utils/src/filter-utils.ts@@ -1,5 +1,13 @@import {FILTER_TYPES} from '@kepler.gl/constants';import get from 'lodash.get';+import {TimeRangeFilter} from '@kepler.gl/types';++export const durationSecond = 1000;+export const durationMinute = durationSecond * 60;+export const durationHour = durationMinute * 60;+export const durationDay = durationHour * 24;+export const durationWeek = durationDay * 7;+export const durationYear = durationDay * 365;/*** Sanity check on filters to prepare for save@@ -32,3 +40,35 @@ export function isValidFilterValue(type: string | null, value: any): boolean {return true;}}++/**+ * Retrieve interval bins for time filter+ */+export function getIntervalBins(filter: TimeRangeFilter) {+ const {bins} = filter;+ const interval = filter.plotType?.interval;+ if (!interval || !bins || Object.keys(bins).length === 0) {+ return null;+ }+ const values = Object.values(bins);+ return values[0] ? values[0][interval] : null;+}++export function isValidTimeDomain(domain) {+ return Array.isArray(domain) && domain.every(Number.isFinite);+}++export function getTimeWidgetHintFormatter(domain: [number, number]): string | undefined {+ if (!isValidTimeDomain(domain)) {+ return undefined;+ }++ const diff = domain[1] - domain[0];+ return diff > durationWeek+ ? 'L'+ : diff > durationDay+ ? 'L LT'+ : diff > durationHour+ ? 'LT'+ : 'LTS';+}diff --git a/src/utils/src/index.ts b/src/utils/src/index.tsindex 731dfc28b..730507197 100644--- a/src/utils/src/index.ts+++ b/src/utils/src/index.ts@@ -97,7 +97,18 @@ export {exportMap,default as exporters} from './export-utils';-export {isValidFilterValue} from './filter-utils';+export {+ isValidFilterValue,+ isValidTimeDomain,+ getIntervalBins,+ getTimeWidgetHintFormatter,+ durationSecond,+ durationMinute,+ durationHour,+ durationDay,+ durationWeek,+ durationYear+} from './filter-utils';export {setLayerBlending} from './gl-utils';export {flattenMessages, mergeMessages} from './locale-utils';export type {Dimensions} from './observe-dimensions';diff --git a/test/browser/components/common/animation-control-test.js b/test/browser/components/common/animation-control-test.jsindex 7df3345d3..0714de97d 100644--- a/test/browser/components/common/animation-control-test.js+++ b/test/browser/components/common/animation-control-test.js@@ -34,7 +34,7 @@ import {appInjector} from 'components/container';import {StateWTripGeojson} from 'test/helpers/mock-state';import IconButton from 'components/common/icon-button';-import reducer from 'reducers/vis-state';+import {visStateReducer as reducer} from 'reducers';const AnimationControl = appInjector.get(AnimationControlFactory);const PlaybackControls = appInjector.get(PlaybackControlsFactory);diff --git a/test/browser/components/container-test.js b/test/browser/components/container-test.jsindex 802e6ce14..9239101c1 100644--- a/test/browser/components/container-test.js+++ b/test/browser/components/container-test.js@@ -27,8 +27,7 @@ import configureStore from 'redux-mock-store';import {Provider} from 'react-redux';import sinon from 'sinon';import {console as Console} from 'global/window';-import rootReducer from 'reducers/root';-import coreReducer from 'reducers/core';+import {keplerGlReducer as rootReducer, keplerGlReducerCore as coreReducer} from 'reducers';import {keplerGlInit} from '@kepler.gl/actions';import Container, {ERROR_MSG} from 'components/container';diff --git a/test/browser/components/filters/time-widget-test.js b/test/browser/components/filters/time-widget-test.jsindex 67cdfcec6..3546735db 100644--- a/test/browser/components/filters/time-widget-test.js+++ b/test/browser/components/filters/time-widget-test.js@@ -26,7 +26,7 @@ import moment from 'moment';import {IntlWrapper, mountWithTheme, mockHTMLElementClientSize} from 'test/helpers/component-utils';import {setFilterAnimationTimeConfig} from '@kepler.gl/actions';-import reducer from 'reducers/vis-state';+import {visStateReducer as reducer} from 'reducers';import {TimeWidgetFactory,diff --git a/test/browser/components/injector-test.js b/test/browser/components/injector-test.jsindex c2433c406..1652b3e37 100644--- a/test/browser/components/injector-test.js+++ b/test/browser/components/injector-test.js@@ -28,7 +28,7 @@ import {console as Console} from 'global/window';import {withState, injectComponents, PanelHeaderFactory} from 'components';-import coreReducer from 'reducers/core';+import {keplerGlReducerCore as coreReducer} from 'reducers';import {keplerGlInit} from '@kepler.gl/actions';import {visStateLens, uiStateLens, mapStateLens, mapStyleLens} from 'reducers';diff --git a/test/browser/components/kepler-gl-test.js b/test/browser/components/kepler-gl-test.jsindex 48b40d503..a49184ae0 100644--- a/test/browser/components/kepler-gl-test.js+++ b/test/browser/components/kepler-gl-test.js@@ -26,7 +26,7 @@ import {drainTasksForTesting, succeedTaskWithValues} from 'react-palm/tasks';import configureStore from 'redux-mock-store';import {Provider} from 'react-redux';-import coreReducer from 'reducers/core';+import {keplerGlReducerCore as coreReducer} from 'reducers';import {keplerGlInit, ActionTypes} from '@kepler.gl/actions';import {appInjector,diff --git a/test/browser/components/modals/data-table-modal-test.js b/test/browser/components/modals/data-table-modal-test.jsindex a7dffaebc..0d5d7fd89 100644--- a/test/browser/components/modals/data-table-modal-test.js+++ b/test/browser/components/modals/data-table-modal-test.js@@ -26,7 +26,7 @@ import flatten from 'lodash.flattendeep';import {mountWithTheme} from 'test/helpers/component-utils';import CloneDeep from 'lodash.clonedeep';import {VisStateActions} from '@kepler.gl/actions';-import visStateReducer from 'reducers/vis-state';+import {visStateReducer} from 'reducers';import FieldTokenFactory from 'components/common/field-token';import {VertThreeDots, ArrowUp} from 'components/common/icons';@@ -41,7 +41,7 @@ import {geoStyleFields, geoStyleRows} from 'test/fixtures/geojson';import {StateWFiles, testCsvDataId, testGeoJsonDataId} from 'test/helpers/mock-state';import {appInjector} from 'components/container';-import {createDataContainer} from 'reducers/table-utils';+import {createDataContainer} from '@kepler.gl/table';const DataTableModal = appInjector.get(DataTableModalFactory);const DataTable = appInjector.get(DataTableFactory);diff --git a/test/browser/components/modals/export-image-modal-test.js b/test/browser/components/modals/export-image-modal-test.jsindex 10896df14..c3688336b 100644--- a/test/browser/components/modals/export-image-modal-test.js+++ b/test/browser/components/modals/export-image-modal-test.js@@ -28,7 +28,7 @@ import ImagePreview from 'components/common/image-preview';import {appInjector} from 'components/container';import {SelectionButton} from 'components/common/styled-components';-import {INITIAL_UI_STATE} from 'reducers/ui-state-updaters';+import {INITIAL_UI_STATE} from 'reducers';const ExportImageModal = appInjector.get(ExportImageModalFactory);diff --git a/test/browser/components/side-panel/filter-manager-test.js b/test/browser/components/side-panel/filter-manager-test.jsindex 8519a7b33..7ea3eb8c7 100644--- a/test/browser/components/side-panel/filter-manager-test.js+++ b/test/browser/components/side-panel/filter-manager-test.js@@ -34,7 +34,7 @@ import NewFilterPanelFactory from 'components/side-panel/filter-panel/filter-panimport {appInjector} from 'components/container';import {mountWithTheme, IntlWrapper} from 'test/helpers/component-utils';-import keplerGlReducer from 'reducers/core';+import {keplerGlReducerCore as keplerGlReducer} from 'reducers';import {VisStateActions} from '@kepler.gl/actions';import {testFields, testAllData} from 'test/fixtures/test-csv-data';import {ALL_FIELD_TYPES} from '@kepler.gl/constants';diff --git a/test/browser/layer-tests/arc-layer-specs.js b/test/browser/layer-tests/arc-layer-specs.jsindex b84c855c7..80e7c5bdc 100644--- a/test/browser/layer-tests/arc-layer-specs.js+++ b/test/browser/layer-tests/arc-layer-specs.js@@ -34,7 +34,7 @@ import {import {PROJECTED_PIXEL_SIZE_MULTIPLIER} from '@kepler.gl/constants';import {KeplerGlLayers} from '@kepler.gl/layers';-import {copyTableAndUpdate} from 'reducers/table-utils';+import {copyTableAndUpdate} from '@kepler.gl/table';const {ArcLayer} = KeplerGlLayers;const columns = {diff --git a/test/browser/layer-tests/cluster-layer-specs.js b/test/browser/layer-tests/cluster-layer-specs.jsindex d3383afea..6d42735bc 100644--- a/test/browser/layer-tests/cluster-layer-specs.js+++ b/test/browser/layer-tests/cluster-layer-specs.js@@ -32,7 +32,7 @@ import {} from 'test/helpers/layer-utils';import {KeplerGlLayers} from '@kepler.gl/layers';-import {INITIAL_MAP_STATE} from 'reducers/map-state-updaters';+import {INITIAL_MAP_STATE} from 'reducers';const {ClusterLayer} = KeplerGlLayers;diff --git a/test/browser/layer-tests/geojson-layer-specs.js b/test/browser/layer-tests/geojson-layer-specs.jsindex 24f47b7d8..40694a295 100644--- a/test/browser/layer-tests/geojson-layer-specs.js+++ b/test/browser/layer-tests/geojson-layer-specs.js@@ -20,7 +20,7 @@import test from 'tape';import {defaultElevation, defaultLineWidth, defaultRadius, KeplerGlLayers} from '@kepler.gl/layers';-import {copyTableAndUpdate} from 'reducers/table-utils';+import {copyTableAndUpdate} from '@kepler.gl/table';const {GeojsonLayer} = KeplerGlLayers;@@ -42,7 +42,7 @@ import {geoStyleMeta} from 'test/fixtures/geojson';import {processGeojson} from '@kepler.gl/processors';-import {createNewDataEntry} from 'reducers';+import {createNewDataEntry} from '@kepler.gl/table';test('#GeojsonLayer -> constructor', t => {const TEST_CASES = {diff --git a/test/browser/layer-tests/grid-layer-specs.js b/test/browser/layer-tests/grid-layer-specs.jsindex 6a6aca0ca..57fa8896b 100644--- a/test/browser/layer-tests/grid-layer-specs.js+++ b/test/browser/layer-tests/grid-layer-specs.js@@ -33,7 +33,7 @@ import {import {pointToPolygonGeo, KeplerGlLayers} from '@kepler.gl/layers';const {GridLayer} = KeplerGlLayers;-import {INITIAL_MAP_STATE} from 'reducers/map-state-updaters';+import {INITIAL_MAP_STATE} from 'reducers';const columns = {lat: 'lat',diff --git a/test/browser/layer-tests/h3-hexagon-layer-specs.js b/test/browser/layer-tests/h3-hexagon-layer-specs.jsindex f09e8b9cf..5ea8c7d92 100644--- a/test/browser/layer-tests/h3-hexagon-layer-specs.js+++ b/test/browser/layer-tests/h3-hexagon-layer-specs.js@@ -37,7 +37,7 @@ import {h3DefaultElevation as defaultElevation} from '@kepler.gl/layers';-import {copyTableAndUpdate} from 'reducers/table-utils';+import {copyTableAndUpdate} from '@kepler.gl/table';const {H3Layer} = KeplerGlLayers;const columns = {diff --git a/test/browser/layer-tests/heatmap-layer-specs.js b/test/browser/layer-tests/heatmap-layer-specs.jsindex adab1b0e7..e7d680aeb 100644--- a/test/browser/layer-tests/heatmap-layer-specs.js+++ b/test/browser/layer-tests/heatmap-layer-specs.js@@ -30,7 +30,7 @@ import {StateWFiles, testCsvDataId} from 'test/helpers/mock-state';import {gpsPointBounds} from 'test/fixtures/test-csv-data';import {MAX_ZOOM_LEVEL, KeplerGlLayers} from '@kepler.gl/layers';-import {copyTableAndUpdate} from 'reducers/table-utils';+import {copyTableAndUpdate} from '@kepler.gl/table';const {HeatmapLayer} = KeplerGlLayers;diff --git a/test/browser/layer-tests/icon-layer-specs.js b/test/browser/layer-tests/icon-layer-specs.jsindex aa1d805fe..05ac0d5bd 100644--- a/test/browser/layer-tests/icon-layer-specs.js+++ b/test/browser/layer-tests/icon-layer-specs.js@@ -24,7 +24,7 @@ import {mount} from 'enzyme';import sinon from 'sinon';import sinonStubPromise from 'sinon-stub-promise';import {getDistanceScales} from 'viewport-mercator-project';-import {copyTableAndUpdate} from 'reducers/table-utils';+import {copyTableAndUpdate} from '@kepler.gl/table';import {KeplerGlLayers} from '@kepler.gl/layers';import {DEFAULT_TEXT_LABEL, PROJECTED_PIXEL_SIZE_MULTIPLIER} from '@kepler.gl/constants';@@ -40,7 +40,7 @@ import {pointLayerMeta,iconGeometry} from 'test/helpers/layer-utils';-import {INITIAL_MAP_STATE} from 'reducers/map-state-updaters';+import {INITIAL_MAP_STATE} from 'reducers';import {IntlWrapper} from '../../helpers/component-utils';const {IconLayer} = KeplerGlLayers;diff --git a/test/browser/layer-tests/line-layer-specs.js b/test/browser/layer-tests/line-layer-specs.jsindex 894f3b54a..c69ce7d73 100644--- a/test/browser/layer-tests/line-layer-specs.js+++ b/test/browser/layer-tests/line-layer-specs.js@@ -33,7 +33,7 @@ import {import {PROJECTED_PIXEL_SIZE_MULTIPLIER} from '@kepler.gl/constants';import {KeplerGlLayers} from '@kepler.gl/layers';-import {copyTable, copyTableAndUpdate} from 'reducers/table-utils';+import {copyTable, copyTableAndUpdate} from '@kepler.gl/table';const {LineLayer} = KeplerGlLayers;const columns = {diff --git a/test/browser/layer-tests/point-layer-specs.js b/test/browser/layer-tests/point-layer-specs.jsindex 6e66eb23b..692b33ae6 100644--- a/test/browser/layer-tests/point-layer-specs.js+++ b/test/browser/layer-tests/point-layer-specs.js@@ -33,9 +33,9 @@ import {fieldDomain} from 'test/helpers/layer-utils';-import {copyTableAndUpdate} from 'reducers/table-utils';+import {copyTableAndUpdate} from '@kepler.gl/table';import {KeplerGlLayers} from '@kepler.gl/layers';-import {INITIAL_MAP_STATE} from 'reducers/map-state-updaters';+import {INITIAL_MAP_STATE} from 'reducers';import {DEFAULT_TEXT_LABEL, PROJECTED_PIXEL_SIZE_MULTIPLIER} from '@kepler.gl/constants';const {PointLayer} = KeplerGlLayers;diff --git a/test/browser/layer-tests/s2-geometry-layer-specs.js b/test/browser/layer-tests/s2-geometry-layer-specs.jsindex 634fcef7b..b22503739 100644--- a/test/browser/layer-tests/s2-geometry-layer-specs.js+++ b/test/browser/layer-tests/s2-geometry-layer-specs.js@@ -31,7 +31,7 @@ import {preparedFilterDomain0} from 'test/helpers/layer-utils';import {s2DefaultElevation as defaultElevation, KeplerGlLayers} from '@kepler.gl/layers';-import {copyTableAndUpdate} from 'reducers/table-utils';+import {copyTableAndUpdate} from '@kepler.gl/table';const {S2GeometryLayer} = KeplerGlLayers;diff --git a/test/browser/layer-tests/trip-layer-specs.js b/test/browser/layer-tests/trip-layer-specs.jsindex 081daa00d..65e25a9c8 100644--- a/test/browser/layer-tests/trip-layer-specs.js+++ b/test/browser/layer-tests/trip-layer-specs.js@@ -28,7 +28,7 @@ import {KeplerGlLayers} from '@kepler.gl/layers';-import {copyTableAndUpdate} from 'reducers/table-utils';+import {copyTableAndUpdate} from '@kepler.gl/table';const {TripLayer} = KeplerGlLayers;import {diff --git a/test/browser/reducers/index.js b/test/browser/reducers/index.jsindex fbe630be5..7f39daaca 100644--- a/test/browser/reducers/index.js+++ b/test/browser/reducers/index.js@@ -18,7 +18,7 @@// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN// THE SOFTWARE.-import reducer from 'reducers/vis-state';+import {visStateReducer as reducer} from 'reducers';import CloneDeep from 'lodash.clonedeep';import test from 'tape-catch';import {StateWFiles, testCsvDataId, testGeoJsonDataId} from 'test/helpers/mock-state';diff --git a/test/fixtures/state-saved-v0.js b/test/fixtures/state-saved-v0.jsindex b72fb1005..42dbf8217 100644--- a/test/fixtures/state-saved-v0.js+++ b/test/fixtures/state-saved-v0.js@@ -21,7 +21,7 @@import {KeplerGlLayers} from '@kepler.gl/layers';const {PointLayer, ArcLayer, HexagonLayer, GeojsonLayer} = KeplerGlLayers;import {DEFAULT_TEXT_LABEL, DEFAULT_COLOR_UI} from '@kepler.gl/constants';-import {defaultInteractionConfig} from 'reducers/vis-state-updaters';+import {defaultInteractionConfig} from 'reducers';export const savedStateV0 = {config: {diff --git a/test/fixtures/state-saved-v1-1.js b/test/fixtures/state-saved-v1-1.jsindex b01bb792c..450dcbb86 100644--- a/test/fixtures/state-saved-v1-1.js+++ b/test/fixtures/state-saved-v1-1.js@@ -22,7 +22,7 @@ import {KeplerGlLayers} from '@kepler.gl/layers';import {DEFAULT_TEXT_LABEL, DEFAULT_COLOR_UI} from '@kepler.gl/constants';const {GeojsonLayer} = KeplerGlLayers;-import {defaultInteractionConfig} from 'reducers/vis-state-updaters';+import {defaultInteractionConfig} from 'reducers';export const savedStateV1 = {datasets: [diff --git a/test/fixtures/test-hex-id-data.js b/test/fixtures/test-hex-id-data.jsindex 051802c22..527023c6f 100644--- a/test/fixtures/test-hex-id-data.js+++ b/test/fixtures/test-hex-id-data.js@@ -19,7 +19,7 @@// THE SOFTWARE.import {KeplerGlLayers} from '@kepler.gl/layers';-import {createDataContainer} from 'reducers/table-utils';+import {createDataContainer} from '@kepler.gl/table';import {DEFAULT_COLOR_UI} from '@kepler.gl/constants';const {H3Layer} = KeplerGlLayers;diff --git a/test/helpers/comparison-utils.js b/test/helpers/comparison-utils.jsindex 168f961a2..7848daf6d 100644--- a/test/helpers/comparison-utils.js+++ b/test/helpers/comparison-utils.js@@ -19,8 +19,8 @@// THE SOFTWARE.import {FILTER_TYPES} from '@kepler.gl/constants';-import {toArray} from '../../src/utils';-import {KeplerTable} from '../../src/reducers/table-utils';+import {toArray} from '@kepler.gl/utils';+import {KeplerTable} from '@kepler.gl/table';export function cmpObjectKeys(t, expectedObj, actualObj, name) {t.deepEqual(diff --git a/test/helpers/layer-utils.js b/test/helpers/layer-utils.jsindex a54aae638..b10f9655a 100644--- a/test/helpers/layer-utils.js+++ b/test/helpers/layer-utils.js@@ -26,13 +26,17 @@ import {mount} from 'enzyme';import {console as Console} from 'global/window';import cloneDeep from 'lodash.clonedeep';-import {INITIAL_MAP_STATE} from 'reducers/map-state-updaters';-import {INITIAL_VIS_STATE} from 'reducers/vis-state-updaters';+import {+ INITIAL_MAP_STATE,+ INITIAL_VIS_STATE,+ renderDeckGlLayer,+ validateLayerWithData,+ mapStateReducer as mapState+} from 'reducers';+import {getGpuFilterProps} from '@kepler.gl/table';import {VisStateActions, addDataToMap} from '@kepler.gl/actions';import {colorMaker, layerColors, LayerClasses} from '@kepler.gl/layers';-import {getGpuFilterProps, renderDeckGlLayer} from 'reducers';-import {validateLayerWithData} from 'reducers/vis-state-merger';import {processCsvData, processGeojson} from '@kepler.gl/processors';import {applyActions, InitialState} from 'test/helpers/mock-state';import {visStateReducer, keplerGlReducerCore} from 'reducers';@@ -44,7 +48,6 @@ import tripGeoJson from 'test/fixtures/trip-geojson';import {logStep} from '../../scripts/log';import {IntlWrapper} from './component-utils';-import mapState from 'reducers/map-state';export const dataId = '0dj3h';export const timeFilter = [{name: 'utc_timestamp', value: [1474071095000, 1474071608000]}];diff --git a/test/helpers/mock-state.js b/test/helpers/mock-state.jsindex 3eb5a7523..e8df26ea2 100644--- a/test/helpers/mock-state.js+++ b/test/helpers/mock-state.js@@ -22,9 +22,8 @@ import test from 'tape-catch';import cloneDeep from 'lodash.clonedeep';import {drainTasksForTesting} from 'react-palm/tasks';-import {getInitialInputStyle} from 'reducers/map-style-updaters';+import {getInitialInputStyle, keplerGlReducerCore as keplerGlReducer} from 'reducers';-import keplerGlReducer from 'reducers/core';import {VizColorPalette,COMPARE_TYPES,diff --git a/test/node/reducers/composer-state-test.js b/test/node/reducers/composer-state-test.jsindex 17213b976..f062746d7 100644--- a/test/node/reducers/composer-state-test.js+++ b/test/node/reducers/composer-state-test.js@@ -22,7 +22,7 @@import test from 'tape';import keplerGlReducer from 'reducers';-import {addDataToMapUpdater} from 'reducers/combined-updaters';+import {addDataToMapUpdater, INITIAL_UI_STATE} from 'reducers';import {processCsvData} from '@kepler.gl/processors';import {registerEntry} from '@kepler.gl/actions';@@ -34,8 +34,6 @@ import testHexIdData, {expectedMergedDataset} from 'test/fixtures/test-hex-id-data';import {cmpLayers, cmpFilters, cmpDataset, cmpInteraction} from 'test/helpers/comparison-utils';-import {INITIAL_UI_STATE} from 'reducers/ui-state-updaters';-const mockRawData = {fields: [{diff --git a/test/node/reducers/map-state-test.js b/test/node/reducers/map-state-test.jsindex 85bad3a00..20240be08 100644--- a/test/node/reducers/map-state-test.js+++ b/test/node/reducers/map-state-test.js@@ -28,8 +28,7 @@ import {receiveMapConfig} from '@kepler.gl/actions';-import reducer, {mapStateReducerFactory} from 'reducers/map-state';-import {INITIAL_MAP_STATE} from 'reducers/map-state-updaters';+import {mapStateReducer as reducer, mapStateReducerFactory, INITIAL_MAP_STATE} from 'reducers';const InitialMapState = reducer(undefined, {});test('#mapStateReducer', t => {diff --git a/test/node/reducers/map-style-test.js b/test/node/reducers/map-style-test.jsindex 0124c057e..5a2f2d7cb 100644--- a/test/node/reducers/map-style-test.js+++ b/test/node/reducers/map-style-test.js@@ -21,12 +21,12 @@import test from 'tape';import {drainTasksForTesting, succeedTaskWithValues} from 'react-palm/tasks';-import reducer from 'reducers/map-style';import {+ mapStyleReducer as reducer,INITIAL_MAP_STYLE,loadMapStylesUpdater,getInitialInputStyle-} from 'reducers/map-style-updaters';+} from 'reducers';import {keplerGlInit, receiveMapConfig} from '@kepler.gl/actions';import SchemaManager from 'schemas';import {DEFAULT_MAP_STYLES, DEFAULT_MAPBOX_API_URL} from '@kepler.gl/constants';diff --git a/test/node/reducers/provider-state-test.js b/test/node/reducers/provider-state-test.jsindex 51e3c92c4..35c1f34a6 100644--- a/test/node/reducers/provider-state-test.js+++ b/test/node/reducers/provider-state-test.js@@ -29,8 +29,11 @@ import {resetProviderStatus,setCloudProvider} from '@kepler.gl/actions';-import reducer, {providerStateReducerFactory} from 'reducers/provider-state';-import {INITIAL_PROVIDER_STATE} from 'reducers/provider-state-updaters';+import {+ providerReducer as reducer,+ providerStateReducerFactory,+ INITIAL_PROVIDER_STATE+} from 'reducers';import MockProvider from 'test/helpers/mock-provider';test('#providerStateReducer', t => {diff --git a/test/node/reducers/ui-state-test.js b/test/node/reducers/ui-state-test.jsindex 89d405f20..7ce864cd3 100644--- a/test/node/reducers/ui-state-test.js+++ b/test/node/reducers/ui-state-test.js@@ -37,8 +37,7 @@ import {loadFilesErr,keplerGlInit} from '@kepler.gl/actions';-import reducer, {uiStateReducerFactory} from 'reducers/ui-state';-import {INITIAL_UI_STATE} from 'reducers/ui-state-updaters';+import {uiStateReducer as reducer, uiStateReducerFactory, INITIAL_UI_STATE} from 'reducers';import {EXPORT_DATA_TYPE,RESOLUTIONS,diff --git a/test/node/reducers/vis-state-merger-test.js b/test/node/reducers/vis-state-merger-test.jsindex f137ec439..8dc4aafd8 100644--- a/test/node/reducers/vis-state-merger-test.js+++ b/test/node/reducers/vis-state-merger-test.js@@ -27,17 +27,17 @@ import {mergeInteractions,mergeLayerBlending,mergeSplitMaps,- insertLayerAtRightOrder-} from 'reducers/vis-state-merger';+ insertLayerAtRightOrder,+ visStateReducer,+ keplerGlReducerCore as coreReducer,+ defaultInteractionConfig+} from 'reducers';import SchemaManager from 'schemas';-import visStateReducer from 'reducers/vis-state';-import coreReducer from 'reducers/core';import {processKeplerglJSON} from '@kepler.gl/processors';import {updateVisData, receiveMapConfig, addDataToMap} from '@kepler.gl/actions';-import {defaultInteractionConfig} from 'reducers/vis-state-updaters';-import {createDataContainer} from 'reducers/table-utils';+import {createDataContainer} from '@kepler.gl/table';// fixturesimport {diff --git a/test/node/reducers/vis-state-test.js b/test/node/reducers/vis-state-test.jsindex ce13de909..fb9438756 100644--- a/test/node/reducers/vis-state-test.js+++ b/test/node/reducers/vis-state-test.js@@ -27,16 +27,23 @@ import {drainTasksForTesting, succeedTaskInTest, errorTaskInTest} from 'react-paimport CloneDeep from 'lodash.clonedeep';import {VisStateActions, MapStateActions} from '@kepler.gl/actions';-import reducer from 'reducers/vis-state';+import {+ visStateReducer as reducer,+ INITIAL_VIS_STATE,+ DEFAULT_ANIMATION_CONFIG,+ serializeLayer,+ defaultInteractionConfig+} from 'reducers';-import {INITIAL_VIS_STATE, DEFAULT_ANIMATION_CONFIG} from 'reducers/vis-state-updaters';-import {serializeLayer} from 'reducers/vis-state-merger';-import KeplerTable from 'reducers/table-utils';import {processCsvData, processGeojson} from '@kepler.gl/processors';-import {defaultInteractionConfig} from 'reducers/vis-state-updaters';import {Layer, KeplerGlLayers} from '@kepler.gl/layers';-import {getDefaultFilter, createNewDataEntry} from 'reducers';-import {createDataContainer, maybeToDate} from 'reducers/table-utils';+import {+ KeplerTable,+ createDataContainer,+ createNewDataEntry,+ maybeToDate,+ getDefaultFilter+} from '@kepler.gl/table';import {ALL_FIELD_TYPES,EDITOR_MODES,diff --git a/test/node/utils/data-container-test.js b/test/node/utils/data-container-test.jsindex da7106c1f..d2b7cc203 100644--- a/test/node/utils/data-container-test.js+++ b/test/node/utils/data-container-test.js@@ -20,7 +20,7 @@import test from 'tape';-import {createDataContainer, createIndexedDataContainer} from 'reducers/table-utils';+import {createDataContainer, createIndexedDataContainer} from '@kepler.gl/table';const data = [[10, 20], // 0diff --git a/test/node/utils/data-processor-test.js b/test/node/utils/data-processor-test.jsindex 15b5c0ea2..67e412ec3 100644--- a/test/node/utils/data-processor-test.js+++ b/test/node/utils/data-processor-test.js@@ -57,7 +57,7 @@ import {getFieldsFromData} from '@kepler.gl/utils';-import {createDataContainer} from 'reducers/table-utils';+import {createDataContainer} from '@kepler.gl/table';import {formatCsv} from 'reducers';import {ALL_FIELD_TYPES} from '@kepler.gl/constants';diff --git a/test/node/utils/data-scale-utils-test.js b/test/node/utils/data-scale-utils-test.jsindex 7b6d56b8b..25009936e 100644--- a/test/node/utils/data-scale-utils-test.js+++ b/test/node/utils/data-scale-utils-test.js@@ -19,9 +19,14 @@// THE SOFTWARE.import test from 'tape';-import {getOrdinalDomain, getQuantileDomain, getLinearDomain, getLogDomain} from 'reducers';-import {createDataContainer} from 'reducers/table-utils';+import {+ getOrdinalDomain,+ getQuantileDomain,+ getLinearDomain,+ getLogDomain,+ createDataContainer+} from '@kepler.gl/table';function numberSort(a, b) {return a - b;diff --git a/test/node/utils/filter-utils-test.js b/test/node/utils/filter-utils-test.jsindex 7a1b389b5..987cb1800 100644--- a/test/node/utils/filter-utils-test.js+++ b/test/node/utils/filter-utils-test.js@@ -33,10 +33,9 @@ import {diffFilters,getHistogram,getTimestampFieldDomain,+ createDataContainer,getDatasetFieldIndexForFilter-} from '../../../src/reducers';--import {createDataContainer} from 'reducers/table-utils';+} from '@kepler.gl/table';import {FILTER_TYPES} from '@kepler.gl/constants';import {mockPolygonFeature, mockPolygonData} from '../../fixtures/polygon';diff --git a/test/node/utils/gpu-filter-utils-test.js b/test/node/utils/gpu-filter-utils-test.jsindex 1515b20cf..a3ef1d05c 100644--- a/test/node/utils/gpu-filter-utils-test.js+++ b/test/node/utils/gpu-filter-utils-test.js@@ -24,7 +24,7 @@ import {assignGpuChannel,assignGpuChannels,getDatasetFieldIndexForFilter-} from 'reducers';+} from '@kepler.gl/table';test('gpuFilterUtils -> resetFilterGpuMode', t => {const testFilters = [diff --git a/test/node/utils/kepler-table-test.js b/test/node/utils/kepler-table-test.jsindex 37d0a8782..e20f2f582 100644--- a/test/node/utils/kepler-table-test.js+++ b/test/node/utils/kepler-table-test.js@@ -23,7 +23,7 @@ import moment from 'moment';import testData, {numericRangesCsv, testFields} from 'test/fixtures/test-csv-data';import {preciseRound} from '@kepler.gl/utils';-import {getFilterFunction, createNewDataEntry} from 'reducers';+import {createNewDataEntry, getFilterFunction} from '@kepler.gl/table';import {processCsvData} from '@kepler.gl/processors';import {cmpFields} from '../../helpers/comparison-utils';diff --git a/test/node/utils/layer-utils-test.js b/test/node/utils/layer-utils-test.jsindex 14bd019c8..ae9c74260 100644--- a/test/node/utils/layer-utils-test.js+++ b/test/node/utils/layer-utils-test.js@@ -23,7 +23,7 @@ import cloneDeep from 'lodash.clonedeep';import {processCsvData, processGeojson} from '@kepler.gl/processors';import {LayerClasses, KeplerGlLayers} from '@kepler.gl/layers';import {GEOJSON_FIELDS} from '@kepler.gl/constants';-import {findDefaultLayer, getLayerHoverProp, createNewDataEntry} from '../../../src/reducers';+import {findDefaultLayer, getLayerHoverProp} from 'reducers';import {StateWTripGeojson, StateWFiles} from 'test/helpers/mock-state';const {PointLayer, ArcLayer, GeojsonLayer, LineLayer} = KeplerGlLayers;@@ -36,8 +36,9 @@ import {geoJsonWithStyle} from 'test/fixtures/geojson';import {KeplerTable,findPointFieldPairs,- createDataContainer-} from '../../../src/reducers/table-utils';+ createDataContainer,+ createNewDataEntry+} from '@kepler.gl/table';test('layerUtils -> findDefaultLayer.1', t => {const inputFields = [