Build fix

Signed-off-by: Daria Terekhova <daria.terekhova@actionengine.com>
keplergl · Aug 19, 2022 · 7ff2e55 · 7ff2e55
1 parent b423fc7
commit 7ff2e55
Show file tree

Hide file tree

Showing 22 changed files with 249 additions and 161 deletions.
diff --git a/src/actions/actions.ts b/src/actions/actions.ts
@@ -21,7 +21,13 @@
 import {default as ActionTypes} from './action-types';
 import {createAction} from '@reduxjs/toolkit';
 
-import {AddDataToMapOptions, AddDataToMapPayload, Bounds, UiState, ParsedConfig} from '@kepler.gl/types';
+import {
+  AddDataToMapOptions,
+  AddDataToMapPayload,
+  Bounds,
+  UiState,
+  ParsedConfig
+} from '@kepler.gl/types';
 
 export type ActionHandler<A extends (...args: any) => any> = (...args: Parameters<A>) => void;
 

diff --git a/src/actions/map-style-actions.ts b/src/actions/map-style-actions.ts
@@ -20,7 +20,14 @@
 
 import {createAction} from '@reduxjs/toolkit';
 import {default as ActionTypes} from './action-types';
-import {InputStyle, MapStyles, Merge, RGBColor, MapState, VisibleLayerGroups} from '@kepler.gl/types';
+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

diff --git a/src/components/map-container.tsx b/src/components/map-container.tsx
@@ -50,8 +50,10 @@ import {
   Filter,
   InteractionConfig,
   MapState,
-  SplitMapLayers
-, MapControls, Viewport} from '@kepler.gl/types';
+  SplitMapLayers,
+  MapControls,
+  Viewport
+} from '@kepler.gl/types';
 import {
   errorNotification,
   setLayerBlending,

diff --git a/src/processors/src/file-handler.ts b/src/processors/src/file-handler.ts
@@ -25,7 +25,6 @@ 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, AddDataToMapPayload} from '@kepler.gl/types';
 import {FeatureCollection} from '@turf/helpers';

diff --git a/src/reducers/combined-updaters.ts b/src/reducers/combined-updaters.ts
@@ -34,7 +34,7 @@ import {MapState, UiState, AddDataToMapPayload, ParsedConfig} from '@kepler.gl/t
 import {MapStyle} from './map-style-updaters';
 import {ProviderState} from './provider-state-updaters';
 import {loadFilesSuccessUpdaterAction} from 'actions/vis-state-actions';
-import {VisState} from '@kepler.gl/schemas';
+import {VisState} from 'schemas';
 import {Layer} from '@kepler.gl/layers';
 import {isPlainObject} from '@kepler.gl/utils';
 import {findMapBounds} from './data-utils';

diff --git a/src/reducers/core.ts b/src/reducers/core.ts
@@ -28,7 +28,7 @@ import {providerStateReducerFactory} from './provider-state';
 
 import composers from './composers';
 
-import {VisState} from '@kepler.gl/schemas';
+import {VisState} from 'schemas';
 import {MapState, UiState} from '@kepler.gl/types';
 import {MapStyle} from './map-style-updaters';
 import {ProviderState} from './provider-state-updaters';

diff --git a/src/reducers/filter-utils.ts b/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),

diff --git a/src/reducers/map-style-updaters.ts b/src/reducers/map-style-updaters.ts
@@ -47,11 +47,8 @@ import {RGBColor, LayerGroup, MapStyles, InputStyle, VisibleLayerGroups} from '@
 import {ReceiveMapConfigPayload, KeplerGlInitPayload} from '../actions/actions';
 import * as MapStyleActions from '../actions/map-style-actions';
 
-
 export type MapboxStyleUrl = string;
 
-
-
 export type MapStyle = {
   styleType: string;
   visibleLayerGroups: VisibleLayerGroups;

diff --git a/src/reducers/ui-state-updaters.ts b/src/reducers/ui-state-updaters.ts
@@ -38,7 +38,15 @@ import {payload_, apply_, compose_} from './composer-helpers';
 
 import * as UiStateActions from 'actions/ui-state-actions';
 import {KeplerGlInitPayload, LoadFilesErrUpdaterAction} from '../actions';
-import { ExportData, ExportHtml, ExportJson, ExportMap, MapControl, MapControls, UiState } from '@kepler.gl/types';
+import {
+  ExportData,
+  ExportHtml,
+  ExportJson,
+  ExportMap,
+  MapControl,
+  MapControls,
+  UiState
+} from '@kepler.gl/types';
 
 export const DEFAULT_ACTIVE_SIDE_PANEL = 'layer';
 export const DEFAULT_MODAL = ADD_DATA_ID;

diff --git a/src/reducers/vis-state-merger.ts b/src/reducers/vis-state-merger.ts
@@ -27,9 +27,8 @@ import {LayerColumns, LayerColumn, Layer} from '@kepler.gl/layers';
 import {LAYER_BLENDINGS} from '@kepler.gl/constants';
 import {CURRENT_VERSION, Merger, VisState, VisStateMergers, visStateSchema} from 'schemas';
 
-import {ParsedConfig, ParsedLayer} from 'schemas';
-import {SavedInteractionConfig} from 'schemas';
-import {TooltipInfo} from '@kepler.gl/types';
+import {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';

diff --git a/src/schemas/dataset-schema.ts b/src/schemas/dataset-schema.ts
@@ -21,7 +21,7 @@
 import pick from 'lodash.pick';
 import {console as globalConsole} from 'global/window';
 
-import {ProtoDataset} from 'actions';
+import {ProtoDataset} from '@kepler.gl/types';
 import {KeplerTable} from 'reducers/table-utils';
 import {RGBColor} from 'types';
 import {VERSIONS} from './versions';

diff --git a/src/schemas/index.ts b/src/schemas/index.ts
@@ -33,10 +33,6 @@ export type {
   SavedMap
 } from './schema-manager';
 export {CURRENT_VERSION, VERSIONS} from './versions';
-export type {
-  ParsedLayer,
-  ParsedFilter
-} from './vis-state-schema';
 export {
   visStateSchemaV1,
   FilterSchemaV0,

diff --git a/src/schemas/schema-manager.ts b/src/schemas/schema-manager.ts
@@ -25,12 +25,12 @@ import datasetSchema from './dataset-schema';
 import mapStyleSchema from './map-style-schema';
 import mapStateSchema from './map-state-schema';
 import {SavedDatasetV1, ParsedDataset} from './dataset-schema';
-import {visStateSchema, ParsedVisState, SavedVisState} from './vis-state-schema';
+import {visStateSchema} from './vis-state-schema';
 
 import {CURRENT_VERSION, VERSIONS} from './versions';
 import {isPlainObject} from '@kepler.gl/utils';
 
-import {MapInfo, RGBColor} from '@kepler.gl/types';
+import {MapInfo, ParsedVisState, RGBColor, SavedVisState} from '@kepler.gl/types';
 
 export type SavedMapState = {
   bearing: number;

diff --git a/src/schemas/vis-state-schema.ts b/src/schemas/vis-state-schema.ts
@@ -31,111 +31,22 @@ import {
   FileLoadingProgress,
   Filter,
   InteractionConfig,
-  LayerTextLabel,
   MapInfo,
-  SplitMap,
-  TooltipInfo
+  ParsedFilter,
+  ParsedLayer,
+  ParsedVisState,
+  SavedFilter,
+  SavedInteractionConfig,
+  SavedLayer,
+  SavedVisState,
+  SplitMap
 } from '@kepler.gl/types';
 import {isFilterValidToSave} from 'reducers/filter-utils';
 import {Datasets} from 'reducers/table-utils';
-import {RGBColor, Merge} from 'types';
 import {Layer, LayerClassesType} from '@kepler.gl/layers';
 import {Loader} from '@loaders.gl/loader-utils';
 import KeplerGLSchema from './schema-manager';
 
-export type SavedFilter = {
-  dataId: Filter['dataId'];
-  id: Filter['id'];
-  name: Filter['name'];
-  type: Filter['type'];
-  value: Filter['value'];
-  enlarged: Filter['enlarged'];
-  plotType: Filter['plotType'];
-  yAxis: {
-    name: string;
-    type: string;
-  } | null;
-  speed: Filter['speed'];
-  layerId: Filter['layerId'];
-};
-
-export type ParsedFilter = Partial<SavedFilter>;
-
-export type SavedInteractionConfig = {
-  tooltip: TooltipInfo['config'] & {
-    enabled: boolean;
-  };
-  // @ts-expect-error
-  geocoder: TooltipInfo['geocoder'] & {
-    enabled: boolean;
-  };
-  // @ts-expect-error
-  brush: TooltipInfo['brush'] & {
-    enabled: boolean;
-  };
-  // @ts-expect-error
-  coordinate: TooltipInfo['coordinate'] & {
-    enabled: boolean;
-  };
-};
-
-export type SavedField = {
-  name: string;
-  type: string;
-} | null;
-export type SavedScale = string;
-export type SavedVisualChannels = {
-  [key: string]: SavedField | SavedScale;
-};
-
-export type SavedLayer = {
-  id: string;
-  type: string;
-  config: {
-    dataId: string;
-    label: string;
-    color: RGBColor;
-    columns: {
-      [key: string]: string;
-    };
-    isVisible: boolean;
-    visConfig: object;
-    hidden: boolean;
-    textLabel: Merge<LayerTextLabel, {field: {name: string; type: string} | null}>;
-    highlightColor?: RGBColor;
-  };
-  visualChannels: SavedVisualChannels;
-};
-
-export type ParsedLayer = {
-  id?: string;
-  type?: string;
-  config?: Partial<SavedLayer['config']>;
-};
-
-export type SavedAnimationConfig = {
-  currentTime: AnimationConfig['currentTime'];
-  speed: AnimationConfig['speed'];
-};
-
-export type SavedVisState = {
-  filters: SavedFilter[];
-  layers: SavedLayer[];
-  interactionConfig: SavedInteractionConfig;
-  layerBlending: string;
-  splitMaps: SplitMap[];
-  animationConfig: SavedAnimationConfig;
-};
-
-export type ParsedVisState = {
-  layers?: ParsedLayer[];
-  filters?: ParsedFilter[];
-  interactionConfig?: Partial<SavedInteractionConfig>;
-  layerBlending?: string;
-  splitMaps?: SplitMap[];
-  animationConfig?: Partial<SavedAnimationConfig>;
-};
-
 /**
  * V0 Schema
  */

diff --git a/src/tasks/package.json b/src/tasks/package.json
@@ -29,32 +29,6 @@
     "dist",
     "umd"
   ],
-  "dependencies": {
-    "@deck.gl/geo-layers": "^8.4.11",
-    "@deck.gl/core": "^8.4.11",
-    "@deck.gl/extensions": "^8.4.11",
-    "@deck.gl/layers": "^8.4.11",
-    "@deck.gl/mesh-layers": "^8.4.11",
-    "@kepler.gl/constants": "^2.5.5",
-    "@kepler.gl/types": "^2.5.5",
-    "@loaders.gl/core": "^2.3.12",
-    "@loaders.gl/gltf": "^2.3.12",
-    "@mapbox/geojson-normalize": "0.0.1",
-    "@turf/bbox": "^6.0.1",
-    "@types/geojson": "^7946.0.7",
-    "global": "^4.3.0",
-    "h3-js": "^3.1.0",
-    "keymirror": "^0.1.1",
-    "lodash.memoize": "^4.1.2",
-    "lodash.uniq": "^4.0.1",
-    "long": "^4.0.0",
-    "react": "^16.8.4",
-    "s2-geometry": "^1.2.10",
-    "styled-components": "^4.1.3",
-    "type-analyzer": "0.3.0",
-    "viewport-mercator-project": "^6.0.0",
-    "wellknown": "^0.5.0"
-  },
   "nyc": {
     "sourceMap": false,
     "instrument": false

diff --git a/src/tasks/tsconfig.production.json b/src/tasks/tsconfig.production.json
@@ -11,7 +11,7 @@
     "noImplicitAny": false,
     "noImplicitReturns": true,
     "noImplicitThis": true,
-    "noUnusedLocals": true,
+    "noUnusedLocals": false, //TODO change once all dependencies are isolated
     "outDir": "dist",
     "sourceMap": true,
     "strictNullChecks": true,

diff --git a/src/types/actions.d.ts b/src/types/actions.d.ts
@@ -28,7 +28,7 @@ export type ExportFileToCloudPayload = {
 /**
  * Input dataset parsed to addDataToMap
  */
- export type ProtoDataset = {
+export type ProtoDataset = {
   info: {
     id?: string;
     label?: string;

diff --git a/src/types/index.d.ts b/src/types/index.d.ts
@@ -0,0 +1,5 @@
+export * from './layers';
+export * from './reducers';
+export * from './actions';
+export * from './schemas';
+export * from './types';
diff --git a/src/types/package.json b/src/types/package.json
@@ -4,7 +4,7 @@
     "version": "2.5.5",
     "description": "kepler.gl types used by kepler.gl components, actions and reducers",
     "license": "MIT",
-    "types": "types.d.ts",
+    "types": "index.d.ts",
     "keywords": [
         "babel",
         "es6",

diff --git a/src/types/reducers.d.ts b/src/types/reducers.d.ts
@@ -262,16 +262,16 @@ export type BaseMapStyle = {
 };
 
 export declare type ExportImage = {
-  ratio: "SCREEN" | "FOUR_BY_THREE" | "SIXTEEN_BY_NINE" | "CUSTOM";
-  resolution: "ONE_X" | "TWO_X";
+  ratio: 'SCREEN' | 'FOUR_BY_THREE' | 'SIXTEEN_BY_NINE' | 'CUSTOM';
+  resolution: 'ONE_X' | 'TWO_X';
   legend: boolean;
   mapH: number;
   mapW: number;
   imageSize: {
-      zoomOffset: number;
-      scale: number;
-      imageW: number;
-      imageH: number;
+    zoomOffset: number;
+    scale: number;
+    imageW: number;
+    imageH: number;
   };
   imageDataUri: string;
   exporting: boolean;
@@ -392,4 +392,4 @@ export type InputStyle = {
   url: string | null;
   icon: string | null;
   custom: boolean;
-};
+};