[core] Update charts folder structure

Author: alexfauquette

packages/x-charts/src/BarChart/BarPlot.tsx

@@ -6,7 +6,7 @@ import { styled } from '@mui/material/styles';
 import { BarElement, barElementClasses, BarElementSlotProps, BarElementSlots } from './BarElement';
 import { AxisDefaultized } from '../models/axis';
 import { BarItemIdentifier } from '../models';
-import getColor from './getColor';
+import getColor from './seriesConfig/getColor';
 import { useChartId, useDrawingArea, useXAxes, useYAxes } from '../hooks';
 import { AnimationData, CompletedBarData, MaskData } from './types';
 import { BarClipPath } from './BarClipPath';

packages/x-charts/src/BarChart/extremums.test.ts

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { getExtremumX } from './extremums';
+import { getExtremumX } from './seriesConfig/extremums';
 import { CartesianExtremumGetter } from '../internals/plugins/models';
 
 const buildData = (

packages/x-charts/src/BarChart/extremums.ts renamed to packages/x-charts/src/BarChart/seriesConfig/extremums.ts

@@ -1,4 +1,4 @@
-import { CartesianExtremumGetter } from '../internals/plugins/models/seriesConfig/extremumGetter.types';
+import { CartesianExtremumGetter } from '../../internals/plugins/models/seriesConfig/extremumGetter.types';
 
 const createResult = (data: any, direction: 'x' | 'y') => {
   if (direction === 'x') {

packages/x-charts/src/BarChart/getColor.ts renamed to packages/x-charts/src/BarChart/seriesConfig/getColor.ts

@@ -1,4 +1,4 @@
-import { ColorProcessor } from '../internals/plugins/models';
+import { ColorProcessor } from '../../internals/plugins/models';
 
 const getColor: ColorProcessor<'bar'> = (series, xAxis, yAxis) => {
   const verticalLayout = series.layout === 'vertical';

packages/x-charts/src/BarChart/plugin.ts renamed to packages/x-charts/src/BarChart/seriesConfig/index.ts

@@ -1,12 +1,12 @@
-import { ChartSeriesTypeConfig } from '../internals/plugins/models/seriesConfig';
+import { ChartSeriesTypeConfig } from '../../internals/plugins/models/seriesConfig';
 import { getExtremumX, getExtremumY } from './extremums';
-import formatter from './formatter';
+import seriesProcessor from './seriesProcessor';
 import legendGetter from './legend';
 import getColor from './getColor';
 import tooltipGetter from './tooltip';
 
-export const plugin: ChartSeriesTypeConfig<'bar'> = {
-  seriesProcessor: formatter,
+export const seriesConfig: ChartSeriesTypeConfig<'bar'> = {
+  seriesProcessor,
   colorProcessor: getColor,
   legendGetter,
   tooltipGetter,

packages/x-charts/src/BarChart/legend.ts renamed to packages/x-charts/src/BarChart/seriesConfig/legend.ts

@@ -1,6 +1,6 @@
-import type { LegendItemParams } from '../ChartsLegend';
-import { getLabel } from '../internals/getLabel';
-import { LegendGetter } from '../internals/plugins/models';
+import type { LegendItemParams } from '../../ChartsLegend';
+import { getLabel } from '../../internals/getLabel';
+import { LegendGetter } from '../../internals/plugins/models';
 
 const legendGetter: LegendGetter<'bar'> = (params) => {
   const { seriesOrder, series } = params;

packages/x-charts/src/BarChart/formatter.ts renamed to packages/x-charts/src/BarChart/seriesConfig/seriesProcessor.ts

@@ -1,15 +1,15 @@
 import { stack as d3Stack } from '@mui/x-charts-vendor/d3-shape';
 import { warnOnce } from '@mui/x-internals/warning';
 import { DefaultizedProps } from '@mui/x-internals/types';
-import { getStackingGroups } from '../internals/stackSeries';
-import { ChartSeries, DatasetElementType, DatasetType } from '../models/seriesType/config';
-import { defaultizeValueFormatter } from '../internals/defaultizeValueFormatter';
-import { SeriesId } from '../models/seriesType/common';
-import { SeriesProcessor } from '../internals/plugins/models';
+import { getStackingGroups } from '../../internals/stackSeries';
+import { ChartSeries, DatasetElementType, DatasetType } from '../../models/seriesType/config';
+import { defaultizeValueFormatter } from '../../internals/defaultizeValueFormatter';
+import { SeriesId } from '../../models/seriesType/common';
+import { SeriesProcessor } from '../../internals/plugins/models';
 
 type BarDataset = DatasetType<number | null>;
 
-const formatter: SeriesProcessor<'bar'> = (params, dataset) => {
+const seriesProcessor: SeriesProcessor<'bar'> = (params, dataset) => {
   const { seriesOrder, series } = params;
   const stackingGroups = getStackingGroups(params);
 
@@ -88,4 +88,4 @@ const formatter: SeriesProcessor<'bar'> = (params, dataset) => {
   };
 };
 
-export default formatter;
+export default seriesProcessor;

packages/x-charts/src/BarChart/tooltip.ts renamed to packages/x-charts/src/BarChart/seriesConfig/tooltip.ts

@@ -1,5 +1,5 @@
-import { getLabel } from '../internals/getLabel';
-import type { TooltipGetter } from '../internals/plugins/models';
+import { getLabel } from '../../internals/getLabel';
+import type { TooltipGetter } from '../../internals/plugins/models';
 
 const tooltipGetter: TooltipGetter<'bar'> = (params) => {
   const { series, getColor, identifier } = params;

packages/x-charts/src/LineChart/LineHighlightPlot.tsx

@@ -7,7 +7,7 @@ import { useSelector } from '../internals/store/useSelector';
 import { LineHighlightElement, LineHighlightElementProps } from './LineHighlightElement';
 import { getValueToPositionMapper } from '../hooks/useScale';
 import { DEFAULT_X_AXIS_KEY } from '../constants';
-import getColor from './getColor';
+import getColor from './seriesConfig/getColor';
 import { useLineSeries } from '../hooks/useSeries';
 import { useChartContext } from '../context/ChartProvider';
 import { selectorChartsInteractionXAxis } from '../internals/plugins/featurePlugins/useChartInteraction';

packages/x-charts/src/LineChart/MarkPlot.tsx

@@ -9,7 +9,7 @@ import { useLineSeries } from '../hooks/useSeries';
 import { cleanId } from '../internals/cleanId';
 import { LineItemIdentifier } from '../models/seriesType/line';
 import { CircleMarkElement } from './CircleMarkElement';
-import getColor from './getColor';
+import getColor from './seriesConfig/getColor';
 import { MarkElement, MarkElementProps } from './MarkElement';
 import { useChartContext } from '../context/ChartProvider';
 import { useXAxes, useYAxes } from '../hooks';

packages/x-charts/src/LineChart/extremums.ts renamed to packages/x-charts/src/LineChart/seriesConfig/extremums.ts

@@ -1,7 +1,7 @@
 import {
   CartesianExtremumFilter,
   CartesianExtremumGetter,
-} from '../internals/plugins/models/seriesConfig/extremumGetter.types';
+} from '../../internals/plugins/models/seriesConfig/extremumGetter.types';
 
 export const getExtremumX: CartesianExtremumGetter<'line'> = (params) => {
   const { axis } = params;

packages/x-charts/src/LineChart/getColor.ts renamed to packages/x-charts/src/LineChart/seriesConfig/getColor.ts

@@ -1,4 +1,4 @@
-import { ColorProcessor } from '../internals/plugins/models';
+import { ColorProcessor } from '../../internals/plugins/models';
 
 const getColor: ColorProcessor<'line'> = (series, xAxis, yAxis) => {
   const yColorScale = yAxis?.colorScale;

packages/x-charts/src/ScatterChart/plugin.ts renamed to packages/x-charts/src/LineChart/seriesConfig/index.ts

@@ -1,13 +1,13 @@
-import { ChartSeriesTypeConfig } from '../internals/plugins/models/seriesConfig';
+import { ChartSeriesTypeConfig } from '../../internals/plugins/models/seriesConfig';
 import { getExtremumX, getExtremumY } from './extremums';
-import formatter from './formatter';
+import seriesProcessor from './seriesProcessor';
 import getColor from './getColor';
 import legendGetter from './legend';
 import tooltipGetter from './tooltip';
 
-export const plugin: ChartSeriesTypeConfig<'scatter'> = {
-  seriesProcessor: formatter,
+export const seriesConfig: ChartSeriesTypeConfig<'line'> = {
   colorProcessor: getColor,
+  seriesProcessor,
   legendGetter,
   tooltipGetter,
   xExtremumGetter: getExtremumX,

packages/x-charts/src/LineChart/legend.ts renamed to packages/x-charts/src/LineChart/seriesConfig/legend.ts

@@ -1,6 +1,6 @@
-import type { LegendItemParams } from '../ChartsLegend';
-import { getLabel } from '../internals/getLabel';
-import { LegendGetter } from '../internals/plugins/models';
+import type { LegendItemParams } from '../../ChartsLegend';
+import { getLabel } from '../../internals/getLabel';
+import { LegendGetter } from '../../internals/plugins/models';
 
 const legendGetter: LegendGetter<'line'> = (params) => {
   const { seriesOrder, series } = params;

packages/x-charts/src/LineChart/formatter.test.ts renamed to packages/x-charts/src/LineChart/seriesConfig/seriesProcessor.test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
-import lineFormatter from './formatter';
-import { SeriesProcessorParams } from '../internals/plugins/models';
+import lineProcessor from './seriesProcessor';
+import { SeriesProcessorParams } from '../../internals/plugins/models';
 
 const seriesOrder = ['id1'];
 const seriesDataset: SeriesProcessorParams<'line'>['series'] = {
@@ -19,12 +19,12 @@ const dataSet = [{ k: 1 }, { k: 2 }, { k: 3 }];
 describe('LineChart - formatter', () => {
   describe('data from dataset', () => {
     it('should get data from the dataset', () => {
-      const { series } = lineFormatter({ seriesOrder, series: seriesDataset }, dataSet);
+      const { series } = lineProcessor({ seriesOrder, series: seriesDataset }, dataSet);
       expect(series.id1.data).to.deep.equal([1, 2, 3]);
     });
 
     it('should support missing values', () => {
-      const { series } = lineFormatter({ seriesOrder, series: seriesDataset }, [
+      const { series } = lineProcessor({ seriesOrder, series: seriesDataset }, [
         { k: 1 },
         { k: null },
         { k: 2 },

packages/x-charts/src/LineChart/formatter.ts renamed to packages/x-charts/src/LineChart/seriesConfig/seriesProcessor.ts

@@ -1,14 +1,14 @@
 import { stack as d3Stack } from '@mui/x-charts-vendor/d3-shape';
 import { warnOnce } from '@mui/x-internals/warning';
 import { DefaultizedProps } from '@mui/x-internals/types';
-import { getStackingGroups } from '../internals/stackSeries';
-import { ChartSeries, DatasetElementType, DatasetType } from '../models/seriesType/config';
-import { defaultizeValueFormatter } from '../internals/defaultizeValueFormatter';
-import { SeriesId } from '../models/seriesType/common';
-import { SeriesProcessor } from '../internals/plugins/models';
+import { getStackingGroups } from '../../internals/stackSeries';
+import { ChartSeries, DatasetElementType, DatasetType } from '../../models/seriesType/config';
+import { defaultizeValueFormatter } from '../../internals/defaultizeValueFormatter';
+import { SeriesId } from '../../models/seriesType/common';
+import { SeriesProcessor } from '../../internals/plugins/models';
 
 // For now it's a copy past of bar charts formatter, but maybe will diverge later
-const formatter: SeriesProcessor<'line'> = (params, dataset) => {
+const seriesProcessor: SeriesProcessor<'line'> = (params, dataset) => {
   const { seriesOrder, series } = params;
   const stackingGroups = getStackingGroups({ ...params, defaultStrategy: { stackOffset: 'none' } });
 
@@ -85,4 +85,4 @@ const formatter: SeriesProcessor<'line'> = (params, dataset) => {
   };
 };
 
-export default formatter;
+export default seriesProcessor;

packages/x-charts/src/LineChart/tooltip.ts renamed to packages/x-charts/src/LineChart/seriesConfig/tooltip.ts

@@ -1,5 +1,5 @@
-import { getLabel } from '../internals/getLabel';
-import type { TooltipGetter } from '../internals/plugins/models';
+import { getLabel } from '../../internals/getLabel';
+import type { TooltipGetter } from '../../internals/plugins/models';
 
 const tooltipGetter: TooltipGetter<'line'> = (params) => {
   const { series, getColor, identifier } = params;

packages/x-charts/src/PieChart/plugin.ts

@@ -1,4 +1,4 @@
-import { ColorProcessor } from '../internals/plugins/models';
+import { ColorProcessor } from '../../internals/plugins/models';
 
 const getColor: ColorProcessor<'pie'> = (series) => {
   return (dataIndex: number) => {

packages/x-charts/src/PieChart/getColor.ts renamed to packages/x-charts/src/PieChart/seriesConfig/getColor.ts

@@ -0,0 +1,12 @@
+import { ChartSeriesTypeConfig } from '../../internals/plugins/models/seriesConfig';
+import seriesProcessor from './seriesProcessor';
+import getColor from './getColor';
+import legendGetter from './legend';
+import tooltipGetter from './tooltip';
+
+export const seriesConfig: ChartSeriesTypeConfig<'pie'> = {
+  colorProcessor: getColor,
+  seriesProcessor,
+  legendGetter,
+  tooltipGetter,
+};

packages/x-charts/src/PieChart/seriesConfig/index.ts

@@ -1,6 +1,6 @@
-import type { LegendItemParams } from '../ChartsLegend';
-import { getLabel } from '../internals/getLabel';
-import { LegendGetter } from '../internals/plugins/models';
+import type { LegendItemParams } from '../../ChartsLegend';
+import { getLabel } from '../../internals/getLabel';
+import { LegendGetter } from '../../internals/plugins/models';
 
 const legendGetter: LegendGetter<'pie'> = (params) => {
   const { seriesOrder, series } = params;

packages/x-charts/src/PieChart/legend.ts renamed to packages/x-charts/src/PieChart/seriesConfig/legend.ts

@@ -1,9 +1,9 @@
 import { pie as d3Pie } from '@mui/x-charts-vendor/d3-shape';
-import { ChartSeriesDefaultized } from '../models/seriesType/config';
-import { ChartsPieSorting, PieValueType } from '../models/seriesType/pie';
-import { SeriesId } from '../models/seriesType/common';
-import { getLabel } from '../internals/getLabel';
-import { SeriesProcessor } from '../internals/plugins/models';
+import { ChartSeriesDefaultized } from '../../models/seriesType/config';
+import { ChartsPieSorting, PieValueType } from '../../models/seriesType/pie';
+import { SeriesId } from '../../models/seriesType/common';
+import { getLabel } from '../../internals/getLabel';
+import { SeriesProcessor } from '../../internals/plugins/models';
 
 const getSortingComparator = (comparator: ChartsPieSorting = 'none') => {
   if (typeof comparator === 'function') {
@@ -21,7 +21,7 @@ const getSortingComparator = (comparator: ChartsPieSorting = 'none') => {
   }
 };
 
-const formatter: SeriesProcessor<'pie'> = (params) => {
+const seriesProcessor: SeriesProcessor<'pie'> = (params) => {
   const { seriesOrder, series } = params;
 
   const defaultizedSeries: Record<SeriesId, ChartSeriesDefaultized<'pie'>> = {};
@@ -61,4 +61,4 @@ const formatter: SeriesProcessor<'pie'> = (params) => {
   };
 };
 
-export default formatter;
+export default seriesProcessor;

packages/x-charts/src/PieChart/formatter.ts renamed to packages/x-charts/src/PieChart/seriesConfig/seriesProcessor.ts

@@ -1,5 +1,5 @@
-import { getLabel } from '../internals/getLabel';
-import type { TooltipGetter } from '../internals/plugins/models';
+import { getLabel } from '../../internals/getLabel';
+import type { TooltipGetter } from '../../internals/plugins/models';
 
 const tooltipGetter: TooltipGetter<'pie'> = (params) => {
   const { series, getColor, identifier } = params;

packages/x-charts/src/PieChart/tooltip.ts renamed to packages/x-charts/src/PieChart/seriesConfig/tooltip.ts

@@ -2,7 +2,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { Scatter, ScatterProps } from './Scatter';
-import getColor from './getColor';
+import getColor from './seriesConfig/getColor';
 import { useScatterSeries } from '../hooks/useSeries';
 import { useXAxes, useYAxes } from '../hooks';
 import { useZAxes } from '../hooks/useZAxis';

packages/x-charts/src/ScatterChart/ScatterPlot.tsx

@@ -1,7 +1,7 @@
 import {
   CartesianExtremumGetter,
   CartesianExtremumGetterResult,
-} from '../internals/plugins/models/seriesConfig/extremumGetter.types';
+} from '../../internals/plugins/models/seriesConfig/extremumGetter.types';
 
 const mergeMinMax = (
   acc: CartesianExtremumGetterResult,

packages/x-charts/src/ScatterChart/extremums.ts renamed to packages/x-charts/src/ScatterChart/seriesConfig/extremums.ts

@@ -1,4 +1,4 @@
-import { ColorProcessor } from '../internals/plugins/models';
+import { ColorProcessor } from '../../internals/plugins/models';
 
 const getColor: ColorProcessor<'scatter'> = (series, xAxis, yAxis, zAxis) => {
   const zColorScale = zAxis?.colorScale;

packages/x-charts/src/ScatterChart/getColor.ts renamed to packages/x-charts/src/ScatterChart/seriesConfig/getColor.ts

@@ -1,13 +1,13 @@
-import { ChartSeriesTypeConfig } from '../internals/plugins/models/seriesConfig';
+import { ChartSeriesTypeConfig } from '../../internals/plugins/models/seriesConfig';
 import { getExtremumX, getExtremumY } from './extremums';
-import formatter from './formatter';
+import seriesProcessor from './seriesProcessor';
 import getColor from './getColor';
 import legendGetter from './legend';
 import tooltipGetter from './tooltip';
 
-export const plugin: ChartSeriesTypeConfig<'line'> = {
+export const seriesConfig: ChartSeriesTypeConfig<'scatter'> = {
+  seriesProcessor,
   colorProcessor: getColor,
-  seriesProcessor: formatter,
   legendGetter,
   tooltipGetter,
   xExtremumGetter: getExtremumX,

packages/x-charts/src/LineChart/plugin.ts renamed to packages/x-charts/src/ScatterChart/seriesConfig/index.ts

@@ -1,6 +1,6 @@
-import type { LegendItemParams } from '../ChartsLegend';
-import { getLabel } from '../internals/getLabel';
-import { LegendGetter } from '../internals/plugins/models';
+import type { LegendItemParams } from '../../ChartsLegend';
+import { getLabel } from '../../internals/getLabel';
+import { LegendGetter } from '../../internals/plugins/models';
 
 const legendGetter: LegendGetter<'scatter'> = (params) => {
   const { seriesOrder, series } = params;

packages/x-charts/src/ScatterChart/legend.ts renamed to packages/x-charts/src/ScatterChart/seriesConfig/legend.ts

@@ -1,7 +1,7 @@
-import { ScatterValueType } from '../models';
-import { SeriesProcessor } from '../internals/plugins/models';
+import { ScatterValueType } from '../../models';
+import { SeriesProcessor } from '../../internals/plugins/models';
 
-const formatter: SeriesProcessor<'scatter'> = ({ series, seriesOrder }, dataset) => {
+const seriesProcessor: SeriesProcessor<'scatter'> = ({ series, seriesOrder }, dataset) => {
   const completeSeries = Object.fromEntries(
     Object.entries(series).map(([seriesId, seriesData]) => {
       const datasetKeys = seriesData?.datasetKeys;
@@ -48,4 +48,4 @@ const formatter: SeriesProcessor<'scatter'> = ({ series, seriesOrder }, dataset)
   };
 };
 
-export default formatter;
+export default seriesProcessor;

packages/x-charts/src/ScatterChart/formatter.ts renamed to packages/x-charts/src/ScatterChart/seriesConfig/seriesProcessor.ts

@@ -1,5 +1,5 @@
-import { getLabel } from '../internals/getLabel';
-import type { TooltipGetter } from '../internals/plugins/models';
+import { getLabel } from '../../internals/getLabel';
+import type { TooltipGetter } from '../../internals/plugins/models';
 
 const tooltipGetter: TooltipGetter<'scatter'> = (params) => {
   const { series, getColor, identifier } = params;

packages/x-charts/src/ScatterChart/tooltip.ts renamed to packages/x-charts/src/ScatterChart/seriesConfig/tooltip.ts

@@ -12,17 +12,17 @@ import { useChartCartesianAxis } from '../../internals/plugins/featurePlugins/us
 import { useChartInteraction } from '../../internals/plugins/featurePlugins/useChartInteraction';
 import { useChartZAxis } from '../../internals/plugins/featurePlugins/useChartZAxis';
 import { useChartHighlight } from '../../internals/plugins/featurePlugins/useChartHighlight/useChartHighlight';
-import { plugin as barPlugin } from '../../BarChart/plugin';
-import { plugin as scatterPlugin } from '../../ScatterChart/plugin';
-import { plugin as linePlugin } from '../../LineChart/plugin';
-import { plugin as piePlugin } from '../../PieChart/plugin';
+import { seriesConfig as barSeriesConfig } from '../../BarChart/seriesConfig';
+import { seriesConfig as scatterSeriesConfig } from '../../ScatterChart/seriesConfig';
+import { seriesConfig as lineSeriesConfig } from '../../LineChart/seriesConfig';
+import { seriesConfig as pieSeriesConfig } from '../../PieChart/seriesConfig';
 import { ChartSeriesType } from '../../models/seriesType/config';
 
 export const defaultSeriesConfig: ChartSeriesConfig<'bar' | 'scatter' | 'line' | 'pie'> = {
-  bar: barPlugin,
-  scatter: scatterPlugin,
-  line: linePlugin,
-  pie: piePlugin,
+  bar: barSeriesConfig,
+  scatter: scatterSeriesConfig,
+  line: lineSeriesConfig,
+  pie: pieSeriesConfig,
 };
 
 // For consistency with the v7, the cartesian axes are set by default.