[Canvas] XY. Step 2. Move xDomain to the expression function and update types.

src/plugins/data/common/search/aggs/agg_config.ts

@@ -23,6 +23,7 @@ import { IAggType } from './agg_type';
 import { writeParams } from './agg_params';
 import { IAggConfigs } from './agg_configs';
 import { parseTimeShift } from './utils';
+import { TimeBuckets } from './buckets/lib/time_buckets';
 
 /** @public **/
 export type AggConfigSerialized = Ensure<
@@ -92,6 +93,7 @@ export class AggConfig {
   public parent?: IAggConfigs;
   public brandNew?: boolean;
   public schema?: string;
+  public buckets?: TimeBuckets;
 
   private __type: IAggType;
   private __typeDecorations: any;

src/plugins/vis_types/vislib/public/constants.ts

@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export enum AxisType {
+  Category = 'category',
+  Value = 'value',
+}
+
+export enum ScaleType {
+  Linear = 'linear',
+  Log = 'log',
+  SquareRoot = 'square root',
+}
+
+export enum AxisMode {
+  Normal = 'normal',
+  Percentage = 'percentage',
+  Wiggle = 'wiggle',
+  Silhouette = 'silhouette',
+}
+
+export enum InterpolationMode {
+  Linear = 'linear',
+  Cardinal = 'cardinal',
+  StepAfter = 'step-after',
+}
+
+export enum ChartMode {
+  Normal = 'normal',
+  Stacked = 'stacked',
+}
+
+export enum ChartType {
+  Line = 'line',
+  Area = 'area',
+  Histogram = 'histogram',
+}
+
+export enum ThresholdLineStyle {
+  Full = 'full',
+  Dashed = 'dashed',
+  DotDashed = 'dot-dashed',
+}

src/plugins/vis_types/vislib/public/editor/components/heatmap/index.tsx

@@ -13,7 +13,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { ValueAxis } from '../../../../../xy/public';
+import { ValueAxis } from '../../../types';
 import {
   BasicOptions,
   SelectOption,

src/plugins/vis_types/vislib/public/editor/components/heatmap/labels_panel.tsx

@@ -14,7 +14,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
 import { SwitchOption } from '../../../../../../vis_default_editor/public';
-import { ValueAxis } from '../../../../../xy/public';
+import { ValueAxis } from '../../../types';
 
 import { HeatmapVisParams } from '../../../heatmap';
 

src/plugins/vis_types/vislib/public/heatmap.ts

@@ -13,7 +13,8 @@ import { RangeValues } from '../../../vis_default_editor/public';
 import { AggGroupNames } from '../../../data/public';
 import { ColorSchemas, ColorSchemaParams } from '../../../charts/public';
 import { VIS_EVENT_TO_TRIGGER, VisTypeDefinition } from '../../../visualizations/public';
-import { ValueAxis, ScaleType, AxisType } from '../../xy/public';
+import { ScaleType, AxisType } from './constants';
+import { ValueAxis } from './types';
 
 import { HeatmapOptions } from './editor';
 import { TimeMarker } from './vislib/visualizations/time_marker';

src/plugins/vis_types/vislib/public/to_ast.ts

@@ -15,14 +15,15 @@ import {
   VisParams,
 } from '../../../visualizations/public';
 import { buildExpression, buildExpressionFunction } from '../../../expressions/public';
-import type { Dimensions } from '../../xy/public';
+import type { Dimensions } from './types';
 import type { DateHistogramParams, HistogramParams } from '../../../visualizations/public';
 
 import { BUCKET_TYPES } from '../../../data/public';
 
 import { vislibVisName, VisTypeVislibExpressionFunctionDefinition } from './vis_type_vislib_vis_fn';
 import { BasicVislibParams, VislibChartType } from './types';
 import { getEsaggsFn } from './to_ast_esaggs';
+import { getColumnByAccessor } from './vislib/helpers';
 
 export const toExpressionAst = async <TVisParams extends VisParams>(
   vis: Vis<TVisParams>,
@@ -42,7 +43,8 @@ export const toExpressionAst = async <TVisParams extends VisParams>(
   const responseAggs = vis.data.aggs?.getResponseAggs() ?? [];
 
   if (dimensions.x) {
-    const xAgg = responseAggs[dimensions.x.accessor] as any;
+    const xAgg = getColumnByAccessor(responseAggs, dimensions.x?.accessor) as any;
+
     if (xAgg.type.name === BUCKET_TYPES.DATE_HISTOGRAM) {
       (dimensions.x.params as DateHistogramParams).date = true;
       const { esUnit, esValue } = xAgg.buckets.getInterval();
@@ -67,7 +69,9 @@ export const toExpressionAst = async <TVisParams extends VisParams>(
   const visConfig = { ...vis.params };
 
   (dimensions.y || []).forEach((yDimension) => {
-    const yAgg = responseAggs.filter(({ enabled }) => enabled)[yDimension.accessor];
+    const enabledAggs = responseAggs.filter(({ enabled }) => enabled);
+    const yAgg = getColumnByAccessor(enabledAggs, yDimension.accessor);
+
     const seriesParam = ((visConfig.seriesParams as BasicVislibParams['seriesParams']) || []).find(
       (param) => param.data.id === yAgg.id
     );

src/plugins/vis_types/vislib/public/types.ts

@@ -9,16 +9,82 @@
 import { $Values } from '@kbn/utility-types';
 import { Position } from '@elastic/charts';
 
-import { Labels } from '../../../charts/public';
 import {
-  CategoryAxis,
-  Dimensions,
-  Grid,
-  SeriesParam,
-  ThresholdLine,
-  ValueAxis,
-} from '../../../vis_types/xy/public';
+  DateHistogramParams,
+  FakeParams,
+  HistogramParams,
+  SchemaConfig,
+} from '../../../visualizations/public';
+import { Labels, Style } from '../../../charts/public';
 import { TimeMarker } from './vislib/visualizations/time_marker';
+import {
+  AxisMode,
+  AxisType,
+  ChartMode,
+  ChartType,
+  InterpolationMode,
+  ScaleType,
+  ThresholdLineStyle,
+} from './constants';
+
+export interface ThresholdLine {
+  show: boolean;
+  value: number | null;
+  width: number | null;
+  style: ThresholdLineStyle;
+  color: string;
+}
+
+export interface SeriesParam {
+  data: { label: string; id: string };
+  drawLinesBetweenPoints?: boolean;
+  interpolate?: InterpolationMode;
+  lineWidth?: number;
+  mode: ChartMode;
+  show: boolean;
+  showCircles: boolean;
+  circlesRadius: number;
+  type: ChartType;
+  valueAxis: string;
+}
+
+export interface Grid {
+  categoryLines: boolean;
+  valueAxis?: string;
+}
+
+export interface Scale {
+  boundsMargin?: number | '';
+  defaultYExtents?: boolean;
+  max?: number | null;
+  min?: number | null;
+  mode?: AxisMode;
+  setYExtents?: boolean;
+  type: ScaleType;
+}
+
+export interface CategoryAxis {
+  id: string;
+  labels: Labels;
+  position: Position;
+  scale: Scale;
+  show: boolean;
+  title: {
+    text?: string;
+  };
+  type: AxisType;
+  /**
+   * Used only for heatmap, here for consistent types when used in vis_type_vislib
+   *
+   * remove with vis_type_vislib
+   * https://github.com/elastic/kibana/issues/56143
+   */
+  style?: Partial<Style>;
+}
+
+export interface ValueAxis extends CategoryAxis {
+  name: string;
+}
 
 /**
  * Gauge title alignment
@@ -69,3 +135,17 @@ export interface BasicVislibParams extends CommonVislibParams {
   times: TimeMarker[];
   radiusRatio: number;
 }
+
+export type Dimension = Omit<SchemaConfig, 'params'> & {
+  params: DateHistogramParams | HistogramParams | FakeParams | {};
+};
+
+export interface Dimensions {
+  x: Dimension | null;
+  y: Dimension[];
+  z?: Dimension[];
+  width?: Dimension[];
+  series?: Dimension[];
+  splitRow?: Dimension[];
+  splitColumn?: Dimension[];
+}