[Chore]: Technical: Isolate tasks

package.json

@@ -25,7 +25,8 @@
     "./src/deckgl-layers",
     "./src/layers",
     "./src/cloud-providers",
-    "./src/processors"
+    "./src/processors",
+    "./src/tasks"
   ],
   "repository": {
     "type": "git",

src/actions/actions.ts

@@ -21,55 +21,13 @@
 import {default as ActionTypes} from './action-types';
 import {createAction} from '@reduxjs/toolkit';
 
-import {ParsedConfig} from '../schemas';
-import {RGBColor, Bounds, MapInfo} from '@kepler.gl/types';
-import {UiState} from 'reducers/ui-state-updaters';
-
-/**
- * Input dataset parsed to addDataToMap
- */
-export type ProtoDataset = {
-  info: {
-    id?: string;
-    label?: string;
-    format?: string;
-    color?: RGBColor;
-    type?: string;
-  };
-  data: {
-    fields: {
-      name: string;
-      type?: string;
-      format?: string;
-      displayName?: string;
-      id?: string;
-    }[];
-    rows: any[][];
-  };
-
-  // table-injected metadata
-  metadata?: any;
-  supportedFilterTypes?: string[] | null;
-  disableDataOperation?: boolean;
-};
-
-export type AddDataToMapOptions = {
-  centerMap?: boolean;
-  readOnly?: boolean;
-  keepExistingConfig?: boolean;
-  autoCreateLayers?: boolean;
-};
-
-export type AddDataToMapPayload = {
-  // TODO/ib - internally the code calls `toArray` a couple of layers deep
-  // so this function can actually accept both an array and an object
-  // recommend dropping such "sloppy typing" and enforcing array type
-  // as the field is called `datasets`
-  datasets: ProtoDataset[] | ProtoDataset;
-  options?: AddDataToMapOptions;
-  config?: ParsedConfig;
-  info?: Partial<MapInfo>;
-};
+import {
+  AddDataToMapOptions,
+  AddDataToMapPayload,
+  Bounds,
+  UiState,
+  ParsedConfig
+} from '@kepler.gl/types';
 
 export type ActionHandler<A extends (...args: any) => any> = (...args: Parameters<A>) => void;
 

src/actions/identity-actions.ts

@@ -20,7 +20,7 @@
 
 import {createAction} from '@reduxjs/toolkit';
 import {default as ActionTypes} from './action-types';
-import {UiState} from 'reducers/ui-state-updaters';
+import {UiState} from '@kepler.gl/types';
 
 export type RegisterEntryUpdaterAction = {
   payload: {

src/actions/map-state-actions.ts

@@ -20,8 +20,7 @@
 
 import {createAction} from '@reduxjs/toolkit';
 import {default as ActionTypes} from './action-types';
-import {Bounds, Merge} from '@kepler.gl/types';
-import {Viewport} from 'reducers/map-state-updaters';
+import {Bounds, Merge, Viewport} from '@kepler.gl/types';
 
 export type TogglePerspectiveUpdaterAction = {};
 /**

src/actions/map-style-actions.ts

@@ -20,8 +20,14 @@
 
 import {createAction} from '@reduxjs/toolkit';
 import {default as ActionTypes} from './action-types';
-import {Merge, RGBColor, MapState} from '@kepler.gl/types';
-import {InputStyle, MapStyles, VisibleLayerGroups} from 'reducers/map-style-updaters';
+import {
+  InputStyle,
+  MapStyles,
+  Merge,
+  RGBColor,
+  MapState,
+  VisibleLayerGroups
+} from '@kepler.gl/types';
 
 /**
  * Add map style from user input to reducer and set it to current style

src/actions/vis-state-actions.ts

@@ -20,8 +20,8 @@
 
 // vis-state-reducer
 import {default as ActionTypes} from './action-types';
-import {AddDataToMapPayload} from '../actions/actions';
 import {FileCacheItem} from '@kepler.gl/processors';
+import {AddDataToMapPayload} from '@kepler.gl/types';
 import {Layer, LayerBaseConfig} from '@kepler.gl/layers';
 import {
   ValueOf,

src/components/geocoder-panel.tsx

@@ -33,8 +33,7 @@ import {
   GEOCODER_ICON_COLOR,
   GEOCODER_ICON_SIZE
 } from '@kepler.gl/constants';
-import {MapState} from '@kepler.gl/types';
-import {Viewport} from 'reducers';
+import {MapState, Viewport} from '@kepler.gl/types';
 
 const ICON_LAYER = {
   id: GEOCODER_LAYER_ID,

src/components/geocoder/geocoder.tsx

@@ -27,7 +27,7 @@ import {WebMercatorViewport} from 'viewport-mercator-project';
 import {KeyEvent} from '@kepler.gl/constants';
 import {Input} from 'components/common/styled-components';
 import {Search, Delete} from 'components/common/icons';
-import {Viewport} from 'reducers/map-state-updaters';
+import {Viewport} from '@kepler.gl/types';
 
 type StyledContainerProps = {
   width?: number;

src/components/map-container.tsx

@@ -50,7 +50,9 @@ import {
   Filter,
   InteractionConfig,
   MapState,
-  SplitMapLayers
+  SplitMapLayers,
+  MapControls,
+  Viewport
 } from '@kepler.gl/types';
 import {
   errorNotification,
@@ -67,7 +69,7 @@ import ErrorBoundary from 'components/common/error-boundary';
 import {LOCALE_CODES} from '@kepler.gl/localization';
 import {getMapLayersFromSplitMaps, onViewPortChange} from '@kepler.gl/utils';
 import {MapView} from '@deck.gl/core';
-import {MapControls, MapStyle, Viewport} from 'reducers';
+import {MapStyle} from 'reducers';
 import {Datasets} from 'reducers/table-utils';
 import {
   computeDeckLayers,

src/components/map/layer-selector-panel.tsx

@@ -27,7 +27,7 @@ import MapLayerSelector from '../common/map-layer-selector';
 import MapControlTooltipFactory from './map-control-tooltip';
 import MapControlPanelFactory from './map-control-panel';
 import {Layer} from '@kepler.gl/layers';
-import {MapControl, MapControls} from 'reducers';
+import {MapControl, MapControls} from '@kepler.gl/types';
 
 LayerSelectorPanelFactory.deps = [MapControlTooltipFactory, MapControlPanelFactory];
 

src/components/map/locale-panel.tsx

@@ -25,7 +25,7 @@ import ToolbarItem from 'components/common/toolbar-item';
 import {MapControlButton} from 'components/common/styled-components';
 import MapControlTooltipFactory from './map-control-tooltip';
 import MapControlToolbarFactory from './map-control-toolbar';
-import {MapControls} from 'reducers';
+import {MapControls} from '@kepler.gl/types';
 
 LocalePanelFactory.deps = [MapControlTooltipFactory, MapControlToolbarFactory];
 

src/components/map/map-control.tsx

@@ -29,9 +29,8 @@ import LayerSelectorPanelFactory from './layer-selector-panel';
 import MapLegendPanelFactory from './map-legend-panel';
 import MapDrawPanelFactory from './map-draw-panel';
 import LocalePanelFactory from './locale-panel';
-import {MapControls} from 'reducers';
 import {Layer} from '@kepler.gl/layers';
-import {Editor} from '@kepler.gl/types';
+import {Editor, MapControls} from '@kepler.gl/types';
 import {Datasets} from 'reducers/table-utils/kepler-table';
 
 interface StyledMapControlProps {

src/components/map/map-draw-panel.tsx

@@ -34,8 +34,7 @@ import {MapControlButton} from 'components/common/styled-components';
 import ToolbarItem from 'components/common/toolbar-item';
 import MapControlTooltipFactory from './map-control-tooltip';
 import MapControlToolbarFactory from './map-control-toolbar';
-import {MapControls} from 'reducers';
-import {Editor} from '@kepler.gl/types';
+import {Editor, MapControls} from '@kepler.gl/types';
 import {BaseProps} from 'components/common/icons/base';
 
 MapDrawPanelFactory.deps = [MapControlTooltipFactory, MapControlToolbarFactory];

src/components/map/map-legend-panel.tsx

@@ -29,7 +29,7 @@ import MapLegendFactory from './map-legend';
 import LazyTippy from './lazy-tippy';
 import {createPortal} from 'react-dom';
 import {DIMENSIONS} from '@kepler.gl/constants';
-import {MapControl, MapControls} from 'reducers';
+import {MapControl, MapControls} from '@kepler.gl/types';
 import {Layer} from '@kepler.gl/layers';
 
 MapLegendPanelFactory.deps = [MapControlTooltipFactory, MapControlPanelFactory, MapLegendFactory];

src/components/map/split-map-button.tsx

@@ -23,7 +23,7 @@ import classnames from 'classnames';
 import {MapControlButton} from 'components/common/styled-components';
 import {Delete, Split} from 'components/common/icons';
 import MapControlTooltipFactory from './map-control-tooltip';
-import {MapControl, MapControls} from 'reducers';
+import {MapControl, MapControls} from '@kepler.gl/types';
 
 SplitMapButtonFactory.deps = [MapControlTooltipFactory];
 

src/components/map/toggle-3d-button.tsx

@@ -23,7 +23,7 @@ import classnames from 'classnames';
 import {Cube3d} from 'components/common/icons';
 import {MapControlButton} from 'components/common/styled-components';
 import MapControlTooltipFactory from './map-control-tooltip';
-import {MapControls} from 'reducers';
+import {MapControls} from '@kepler.gl/types';
 
 Toggle3dButtonFactory.deps = [MapControlTooltipFactory];
 

src/components/modal-container.tsx

@@ -59,10 +59,9 @@ import {
   OVERWRITE_MAP_ID
 } from '@kepler.gl/constants';
 
-import {MapState} from '@kepler.gl/types';
 import {getFileFormatNames, getFileExtensions} from 'reducers/vis-state-selectors';
-import {MapStyle, UiState} from 'reducers';
-import {OnSuccessCallBack, OnErrorCallBack} from 'actions';
+import {MapStyle} from 'reducers';
+import {MapState, UiState, OnSuccessCallBack, OnErrorCallBack} from '@kepler.gl/types';
 import {ProviderState} from 'reducers/provider-state-updaters';
 
 import * as VisStateActions from 'actions/vis-state-actions';

src/components/modals/add-map-style-modal.tsx

@@ -36,9 +36,8 @@ import {media} from '@kepler.gl/styles';
 import {transformRequest} from '@kepler.gl/utils';
 import {injectIntl, IntlShape} from 'react-intl';
 import {FormattedMessage} from '@kepler.gl/localization';
-import {InputStyle} from 'reducers';
 import mapboxgl from 'mapbox-gl';
-import {MapState} from '@kepler.gl/types';
+import {InputStyle, MapState} from '@kepler.gl/types';
 
 const MapH = 190;
 const MapW = 264;

src/components/notification-panel.tsx

@@ -23,7 +23,7 @@ import styled from 'styled-components';
 
 import NotificationItemFactory from './notification-panel/notification-item';
 import {DEFAULT_NOTIFICATION_TOPICS} from '@kepler.gl/constants';
-import {Notifications} from 'reducers';
+import {Notifications} from '@kepler.gl/types';
 import {removeNotification} from 'actions/ui-state-actions';
 
 const NotificationPanelContent = styled.div`

src/components/side-panel/layer-manager.tsx

@@ -39,7 +39,7 @@ import {Layer, LayerClassesType} from '@kepler.gl/layers';
 import * as UiStateActions from 'actions/ui-state-actions';
 import * as VisStateActions from 'actions/vis-state-actions';
 import {SidePanelItem} from 'components/types';
-import {LayerPanelListView} from 'reducers/ui-state-updaters';
+import {LayerPanelListView} from '@kepler.gl/types';
 import {ActionHandler} from 'actions';
 import {Datasets} from 'reducers/table-utils/kepler-table';
 

src/components/side-panel/layer-panel/panel-view-list-toggle.tsx

@@ -24,7 +24,7 @@ import OrderByList from 'components/common/icons/order-by-list';
 import OrderByDataset from 'components/common/icons/order-by-dataset';
 import {Tooltip} from 'components/common/styled-components';
 import {FormattedMessage} from '@kepler.gl/localization';
-import {LayerPanelListView} from 'reducers/ui-state-updaters';
+import {LayerPanelListView} from '@kepler.gl/types';
 
 type ToggleOptionProps = {
   isActive: boolean;

src/components/side-panel/map-style-panel/map-layer-selector.tsx

@@ -32,7 +32,7 @@ import {
 } from 'components/common/styled-components';
 import {FormattedMessage} from '@kepler.gl/localization';
 import {camelize} from '@kepler.gl/utils';
-import {VisibleLayerGroups} from 'reducers';
+import {VisibleLayerGroups} from '@kepler.gl/types';
 import {BaseProps} from 'components/common/icons/base';
 
 const StyledInteractionPanel = styled.div`

src/components/side-panel/panel-header.tsx

@@ -29,7 +29,7 @@ import ClickOutsideCloseDropdown from 'components/side-panel/panel-dropdown';
 import Toolbar from 'components/common/toolbar';
 import ToolbarItem, {ToolbarItemProps} from 'components/common/toolbar-item';
 import {FormattedMessage} from '@kepler.gl/localization';
-import {UiState} from 'reducers';
+import {UiState} from '@kepler.gl/types';
 import {BaseProps} from 'components/common/icons/base';
 
 type StyledPanelActionProps = {

src/components/types.ts

@@ -1,8 +1,7 @@
 import {ComponentType} from 'react';
 import {MapStyle} from 'reducers';
 import {Layer, LayerClassesType} from '@kepler.gl/layers';
-import {Filter, InteractionConfig} from '@kepler.gl/types';
-import {UiState} from 'reducers/ui-state-updaters';
+import {Filter, InteractionConfig, UiState} from '@kepler.gl/types';
 
 import * as MapStyleActions from 'actions/map-style-actions';
 import * as VisStateActions from 'actions/vis-state-actions';

src/processors/src/file-handler.ts

@@ -25,9 +25,8 @@ import {processGeojson, processKeplerglJSON, processRowObject} from './data-proc
 import {generateHashId, isPlainObject} from '@kepler.gl/utils';
 import {DATASET_FORMATS} from '@kepler.gl/constants';
 import {Loader} from '@loaders.gl/loader-utils';
-import {AddDataToMapPayload} from '../../actions/actions';
 import {FileCacheItem, ValidKeplerGlMap} from './types';
-import {Feature} from '@kepler.gl/types';
+import {Feature, AddDataToMapPayload} from '@kepler.gl/types';
 import {FeatureCollection} from '@turf/helpers';
 
 const BATCH_TYPE = {

src/reducers/combined-updaters.ts

@@ -30,13 +30,11 @@ import {receiveMapConfigUpdater as stateMapConfigUpdater} from './map-state-upda
 import {receiveMapConfigUpdater as styleMapConfigUpdater} from './map-style-updaters';
 import {filesToDataPayload} from '@kepler.gl/processors';
 import {payload_, apply_, with_, if_, compose_, merge_, pick_} from './composer-helpers';
-import {MapState} from '@kepler.gl/types';
-import {UiState} from './ui-state-updaters';
+import {MapState, UiState, AddDataToMapPayload, ParsedConfig} from '@kepler.gl/types';
 import {MapStyle} from './map-style-updaters';
 import {ProviderState} from './provider-state-updaters';
-import {AddDataToMapPayload} from 'actions/actions';
 import {loadFilesSuccessUpdaterAction} from 'actions/vis-state-actions';
-import {ParsedConfig, VisState} from 'schemas';
+import {VisState} from 'schemas';
 import {Layer} from '@kepler.gl/layers';
 import {isPlainObject} from '@kepler.gl/utils';
 import {findMapBounds} from './data-utils';

src/reducers/core.ts

@@ -28,11 +28,10 @@ import {providerStateReducerFactory} from './provider-state';
 
 import composers from './composers';
 
-import {MapState} from '@kepler.gl/types';
+import {VisState} from 'schemas';
+import {MapState, UiState} from '@kepler.gl/types';
 import {MapStyle} from './map-style-updaters';
 import {ProviderState} from './provider-state-updaters';
-import {UiState} from './ui-state-updaters';
-import {VisState} from 'schemas';
 
 export type KeplerGlState = {
   visState: VisState;

src/reducers/filter-utils.ts

@@ -34,7 +34,7 @@ import * as ScaleUtils from './data-scale-utils';
 import {generateHashId, set, toArray} from '@kepler.gl/utils';
 import {h3IsValid} from 'h3-js';
 
-import {Millisecond, Entries, Field} from '@kepler.gl/types';
+import {Millisecond, Entries, Field, ParsedFilter} from '@kepler.gl/types';
 import {
   Filter,
   FilterBase,
@@ -49,7 +49,7 @@ import {
   RangeFieldDomain
 } from '@kepler.gl/types';
 
-import {ParsedFilter, VisState} from 'schemas';
+import {VisState} from 'schemas';
 import KeplerTable, {
   FilterRecord,
   Datasets,
@@ -249,7 +249,6 @@ export function validateFilter(
     return failed;
   }
 
-  // @ts-expect-error
   const initializeFilter: Filter = {
     // @ts-expect-error
     ...getDefaultFilter(filter.dataId),