Multi package lib refactor (#106)

package.json

@@ -26,6 +26,8 @@
     "react-dom": "^17.0.1",
     "react-redux": "^7.2.2",
     "redux": "^4.0.5",
+    "@turf/bbox-polygon": "^6.3.0",
+    "@turf/boolean-intersects": "^6.3.0",
     "webpack": "^5.24.2",
     "webpack-cli": "^4.5.0"
   },

packages/react-api/__tests__/filters/useCartoLayerFilterProps.test.js → packages/react-api/__tests__/hooks/useCartoLayerFilterProps.test.js

@@ -1,6 +1,6 @@
 import { DataFilterExtension } from '@deck.gl/extensions';
 import { renderHook } from '@testing-library/react-hooks';
-import useCartoLayerFilterProps from '../../src/filters/useCartoLayerFilterProps';
+import useCartoLayerFilterProps from '../../src/hooks/useCartoLayerFilterProps';
 import { mockClear, mockReduxHooks } from '../mockReduxHooks';
 
 describe('useCartoLayerFilterProps', () => {

packages/react-api/package.json

@@ -53,9 +53,7 @@
     "webpack-cli": "^4.5.0"
   },
   "dependencies": {
-    "@babel/runtime": "^7.13.9",
-    "@turf/bbox-polygon": "^6.3.0",
-    "@turf/boolean-intersects": "^6.3.0"
+    "@babel/runtime": "^7.13.9"
   },
   "peerDependencies": {
     "@carto/react-core": "^1.0.0-rc.1",

packages/react-api/src/filters/useCartoLayerFilterProps.js → packages/react-api/src/hooks/useCartoLayerFilterProps.js

@@ -1,7 +1,6 @@
 import { DataFilterExtension } from '@deck.gl/extensions';
-import { debounce } from '@carto/react-core';
-import useViewportFeatures from './viewportFeatures/useViewportFeatures';
-import { buildFeatureFilter } from './Filter';
+import { debounce, _buildFeatureFilter } from '@carto/react-core';
+import useViewportFeatures from './useViewportFeatures';
 
 export default function useCartoLayerFilterProps(
   source,
@@ -11,7 +10,7 @@ export default function useCartoLayerFilterProps(
 
   return {
     onViewportLoad: debounce(onViewportLoad),
-    getFilterValue: buildFeatureFilter({ filters: source?.filters, type: 'number' }),
+    getFilterValue: _buildFeatureFilter({ filters: source?.filters, type: 'number' }),
     filterRange: [1, 1],
     extensions: [new DataFilterExtension({ filterSize: 1 })],
     updateTriggers: {

packages/react-api/src/filters/viewportFeatures/useViewportFeatures.js → packages/react-api/src/hooks/useViewportFeatures.js

@@ -1,8 +1,7 @@
 import { useEffect, useCallback, useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { setViewportFeatures, setAllWidgetsLoadingState } from '@carto/react-redux';
-import { debounce } from '@carto/react-core';
-import { viewportFeatures } from './viewportFeatures';
+import { debounce, viewportFeatures } from '@carto/react-core';
 
 export default function useViewportFeatures(
   source,

packages/react-api/src/index.js

@@ -1,12 +1,5 @@
 export { executeSQL } from './api/SQL';
-export { default as useCartoLayerFilterProps } from './filters/useCartoLayerFilterProps';
-
 export { SourceTypes } from './api/SourceTypes';
 
-// internal packages
-export { 
-    FilterTypes as _FilterTypes,
-    filtersToSQL as _filtersToSQL,
-    getApplicableFilters as _getApplicableFilters
- } from './filters/FilterQueryBuilder';
-export { buildFeatureFilter as _buildFeatureFilter } from './filters/Filter';
+export { default as useCartoLayerFilterProps } from './hooks/useCartoLayerFilterProps';
+

packages/react-widgets/__tests__/operations/aggregation/values.test.js → packages/react-core/__tests__/operations/aggregation/values.test.js

@@ -1,5 +1,5 @@
 import { aggregationFunctions } from '../../../src/operations/aggregation/values';
-import { AggregationTypes } from '../../../src/widgets/AggregationTypes';
+import { AggregationTypes } from '../../../src/operations/aggregation/AggregationTypes';
 
 const VALUES = [1, 2, 3, 4, 5];
 

packages/react-widgets/__tests__/operations/groupby.test.js → packages/react-core/__tests__/operations/groupby.test.js

@@ -1,5 +1,5 @@
 import { groupValuesByColumn } from '../../src/operations/groupby';
-import { AggregationTypes } from '../../src/widgets/AggregationTypes';
+import { AggregationTypes } from '../../src/operations/aggregation/AggregationTypes';
 
 const VALUES = [1, 2, 3, 4, 5];
 

packages/react-widgets/__tests__/operations/histogram.test.js → packages/react-core/__tests__/operations/histogram.test.js

@@ -1,5 +1,5 @@
 import { histogram } from '../../src/operations/histogram';
-import { AggregationTypes } from '../../src/widgets/AggregationTypes';
+import { AggregationTypes } from '../../src/operations/aggregation/AggregationTypes';
 
 const VALUES = [1, 2, 2, 3, 3, 3, 4, 4, 5];
 

packages/react-core/package.json

@@ -54,5 +54,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.13.9"
+  },
+  "peerDependencies": {
+    "@turf/bbox-polygon": "^6.3.0",
+    "@turf/boolean-intersects": "^6.3.0"
   }
 }

packages/react-api/src/filters/Filter.js → packages/react-core/src/filters/Filter.js

@@ -1,4 +1,4 @@
-import { makeClosedInterval } from '@carto/react-core';
+import { makeClosedInterval } from '../utils/makeClosedInterval';
 import { FilterTypes } from './FilterQueryBuilder';
 
 const filterFunctions = {

packages/react-core/src/index.js

@@ -9,4 +9,17 @@ export { debounce } from './utils/debounce';
 export { throttle } from './utils/throttle';
 export { randomString } from './utils/randomString';
 
-export { makeClosedInterval } from './utils/makeClosedInterval';
+export { makeClosedInterval } from './utils/makeClosedInterval';
+
+export { AggregationTypes } from './operations/aggregation/AggregationTypes';
+export { aggregationFunctions } from './operations/aggregation/values';
+export { groupValuesByColumn } from './operations/groupby';
+export { histogram } from './operations/histogram';
+
+export { 
+  FilterTypes as _FilterTypes,
+  filtersToSQL as _filtersToSQL,
+  getApplicableFilters as _getApplicableFilters
+} from './filters/FilterQueryBuilder';
+export { buildFeatureFilter as _buildFeatureFilter } from './filters/Filter';
+export { viewportFeatures } from './filters/viewportFeatures';

packages/react-widgets/src/operations/aggregation/values.js → packages/react-core/src/operations/aggregation/values.js

@@ -1,4 +1,4 @@
-import { AggregationTypes } from '../../widgets/AggregationTypes';
+import { AggregationTypes } from './AggregationTypes';
 
 const sum = (values, key) => {
   const fn = key ? (a, b) => a + b[key] : (a, b) => a + b;

packages/react-core/webpack.config.js

@@ -6,6 +6,9 @@ const webpackBaseConfig = require('../../webpack.base');
 
 const webpackConfig = {
   ...webpackBaseConfig,
+  externals: [
+    /^@turf\/.+$/,
+  ],
   output: {
     path: path.resolve(__dirname, './dist'),
     filename: 'index.js',

packages/react-redux/package.json

@@ -56,7 +56,6 @@
     "@babel/runtime": "^7.13.9"
   },
   "peerDependencies": {
-    "@carto/react-basemaps": "^1.0.0-rc.1",
     "@carto/react-core": "^1.0.0-rc.1",
     "@deck.gl/core": "^8.4.10",
     "@reduxjs/toolkit": "^1.5.0"

packages/react-widgets/__tests__/models/CategoryModel.test.js

@@ -5,7 +5,7 @@ import {
   buildSqlQueryToGetCategories,
   filterViewportFeaturesToGetCategories
 } from '../../src/models/CategoryModel';
-import { AggregationTypes } from '../../src/widgets/AggregationTypes';
+import { AggregationTypes } from '@carto/react-core';
 import { SourceTypes } from '@carto/react-api';
 
 import { mockSqlApiRequest, mockClear } from '../mockSqlApiRequest';

packages/react-widgets/__tests__/models/FormulaModel.test.js

@@ -5,7 +5,7 @@ import {
   buildSqlQueryToGetFormula,
   filterViewportFeaturesToGetFormula
 } from '../../src/models/FormulaModel';
-import { AggregationTypes } from '../../src/widgets/AggregationTypes';
+import { AggregationTypes } from '@carto/react-core';
 import { SourceTypes } from '@carto/react-api';
 
 import { mockSqlApiRequest, mockClear } from '../mockSqlApiRequest';

packages/react-widgets/__tests__/models/HistogramModel.test.js

@@ -5,7 +5,7 @@ import {
   buildSqlQueryToGetHistogram,
   filterViewportFeaturesToGetHistogram
 } from '../../src/models/HistogramModel';
-import { AggregationTypes } from '../../src/widgets/AggregationTypes';
+import { AggregationTypes } from '@carto/react-core';
 import { SourceTypes } from '@carto/react-api';
 
 import { mockSqlApiRequest, mockClear } from '../mockSqlApiRequest';

packages/react-widgets/package.json

@@ -58,6 +58,7 @@
   },
   "peerDependencies": {
     "@carto/react-api": "^1.0.0-rc.1",
+    "@carto/react-core": "^1.0.0-rc.1",
     "@carto/react-redux": "^1.0.0-rc.1",
     "@carto/react-ui": "^1.0.0-rc.1",
     "@material-ui/core": "^4.11.3",

packages/react-widgets/src/index.js

@@ -31,4 +31,3 @@ export { default as GeocoderWidget } from './widgets/GeocoderWidget';
 export { default as HistogramWidget } from './widgets/HistogramWidget';
 export { default as PieWidget } from './widgets/PieWidget';
 export { getFormula, getHistogram, getCategories, geocodeStreetPoint } from './models';
-export { AggregationTypes } from './widgets/AggregationTypes';

packages/react-widgets/src/models/CategoryModel.js

@@ -2,10 +2,10 @@ import { minify } from 'pgsql-minify';
 import { 
   _buildFeatureFilter as buildFeatureFilter, 
   _filtersToSQL as filtersToSQL, 
-  executeSQL, 
-  SourceTypes 
-} from '@carto/react-api';
-import { groupValuesByColumn } from '../operations/groupby';
+  groupValuesByColumn
+} from '@carto/react-core';
+
+import { executeSQL, SourceTypes } from '@carto/react-api'
 
 export const getCategories = async (props) => {
   const {

packages/react-widgets/src/models/FormulaModel.js

@@ -2,10 +2,10 @@ import { minify } from 'pgsql-minify';
 import { 
   _buildFeatureFilter as buildFeatureFilter, 
   _filtersToSQL as filtersToSQL, 
-  executeSQL, 
-  SourceTypes 
-} from '@carto/react-api';
-import { aggregationFunctions } from '../operations/aggregation/values';
+  aggregationFunctions
+} from '@carto/react-core';
+
+import { executeSQL, SourceTypes } from '@carto/react-api'
 
 export const getFormula = async (props) => {
   const {

packages/react-widgets/src/models/HistogramModel.js

@@ -2,10 +2,10 @@ import { minify } from 'pgsql-minify';
 import { 
   _buildFeatureFilter as buildFeatureFilter, 
   _filtersToSQL as filtersToSQL, 
-  executeSQL, 
-  SourceTypes 
-} from '@carto/react-api';
-import { histogram } from '../operations/histogram';
+  histogram
+} from '@carto/react-core';
+
+import { executeSQL, SourceTypes } from '@carto/react-api'
 
 export const getHistogram = async (props) => {
   const {

packages/react-widgets/src/widgets/CategoryWidget.js

@@ -5,10 +5,10 @@ import { addFilter, removeFilter, selectSourceById } from '@carto/react-redux';
 import { WrapperWidgetUI, CategoryWidgetUI } from '@carto/react-ui';
 import {
   _FilterTypes as FilterTypes,
-  _getApplicableFilters as getApplicableFilters
-} from '@carto/react-api';
+  _getApplicableFilters as getApplicableFilters,
+  AggregationTypes
+} from '@carto/react-core';
 import { getCategories } from '../models';
-import { AggregationTypes } from './AggregationTypes';
 import useWidgetLoadingState from './useWidgetLoadingState';
 
 /**

packages/react-widgets/src/widgets/FormulaWidget.js

@@ -4,7 +4,7 @@ import { PropTypes } from 'prop-types';
 import { selectSourceById } from '@carto/react-redux';
 import { WrapperWidgetUI, FormulaWidgetUI } from '@carto/react-ui';
 import { getFormula } from '../models';
-import { AggregationTypes } from './AggregationTypes';
+import { AggregationTypes } from '@carto/react-core';
 import useWidgetLoadingState from './useWidgetLoadingState';
 
 /**

packages/react-widgets/src/widgets/HistogramWidget.js

@@ -5,10 +5,10 @@ import { addFilter, removeFilter, selectSourceById } from '@carto/react-redux';
 import { WrapperWidgetUI, HistogramWidgetUI } from '@carto/react-ui';
 import { 
   _FilterTypes as FilterTypes, 
-  _getApplicableFilters as getApplicableFilters
-} from '@carto/react-api';
+  _getApplicableFilters as getApplicableFilters,
+  AggregationTypes
+} from '@carto/react-core';
 import { getHistogram } from '../models';
-import { AggregationTypes } from './AggregationTypes';
 import useWidgetLoadingState from './useWidgetLoadingState';
 
 /**

packages/react-widgets/src/widgets/PieWidget.js

@@ -5,10 +5,10 @@ import { addFilter, removeFilter, selectSourceById } from '@carto/react-redux';
 import { WrapperWidgetUI, PieWidgetUI } from '@carto/react-ui';
 import { 
   _FilterTypes as FilterTypes, 
-  _getApplicableFilters as getApplicableFilters
-} from '@carto/react-api';
+  _getApplicableFilters as getApplicableFilters,
+  AggregationTypes
+} from '@carto/react-core';
 import { getCategories } from '../models';
-import { AggregationTypes } from './AggregationTypes';
 import useWidgetLoadingState from './useWidgetLoadingState';
 
 /**