[expressions] remove root-level redirect, import from common

examples/partial_results_example/public/app/app.tsx

@@ -22,7 +22,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import type { Datatable } from '@kbn/expressions-plugin';
+import type { Datatable } from '@kbn/expressions-plugin/common';
 import { ExpressionsContext } from './expressions_context';
 
 const expression = `getEvents

examples/partial_results_example/public/app/expressions_context.ts

@@ -7,6 +7,6 @@
  */
 
 import { createContext } from 'react';
-import type { ExpressionsServiceStart } from '@kbn/expressions-plugin';
+import type { ExpressionsServiceStart } from '@kbn/expressions-plugin/common';
 
 export const ExpressionsContext = createContext<ExpressionsServiceStart | undefined>(undefined);

examples/partial_results_example/public/functions/count_event.ts

@@ -8,7 +8,7 @@
 
 import { Observable, fromEvent } from 'rxjs';
 import { scan, startWith } from 'rxjs/operators';
-import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 export interface CountEventArguments {
   event: string;

examples/partial_results_example/public/functions/get_events.ts

@@ -8,7 +8,7 @@
 
 import { Observable, fromEvent, merge } from 'rxjs';
 import { distinct, map, pluck, scan, take } from 'rxjs/operators';
-import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 const EVENTS: Array<keyof WindowEventMap> = [
   'mousedown',

examples/partial_results_example/public/functions/pluck.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 export interface PluckArguments {
   key: string;

examples/partial_results_example/public/plugin.tsx

@@ -7,7 +7,7 @@
  */
 import React from 'react';
 import ReactDOM from 'react-dom';
-import type { ExpressionsServiceSetup } from '@kbn/expressions-plugin';
+import type { ExpressionsServiceSetup } from '@kbn/expressions-plugin/common';
 import { ExpressionsServiceFork } from '@kbn/expressions-plugin/common/service/expressions_fork';
 import { AppMountParameters, AppNavLinkStatus, CoreSetup, Plugin } from '@kbn/core/public';
 import type { DeveloperExamplesSetup } from '@kbn/developer-examples-plugin/public';

packages/kbn-eslint-config/.eslintrc.js

@@ -108,6 +108,11 @@ module.exports = {
           to: '@kbn/utility-types-jest',
           disallowedMessage: `import from @kbn/utility-types-jest instead`
         },
+        {
+          from: '@kbn/expressions-plugin',
+          to: '@kbn/expressions-plugin/common',
+          exact: true,
+        },
         {
           from: '@kbn/kibana-utils-plugin',
           to: '@kbn/kibana-utils-plugin/common',

src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.test.ts

@@ -16,7 +16,7 @@ import {
   GaugeLabelMajorModes,
   GaugeTicksPositions,
 } from '../constants';
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 
 describe('interpreter/functions#gauge', () => {
   const fn = functionWrapper(gaugeFunction());

src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts

@@ -12,7 +12,7 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '@kbn/expressions-plugin';
+} from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
 import { CustomPaletteState } from '@kbn/charts-plugin/common';
 import {

src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts

@@ -7,7 +7,7 @@
  */
 
 import type { CustomPaletteParams } from '@kbn/coloring';
-import type { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin';
+import type { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin/common';
 import { getAccessorByDimension } from '@kbn/visualizations-plugin/common/utils';
 import { Accessors, GaugeArguments } from '../../../common';
 

src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.test.ts

@@ -11,7 +11,7 @@ import type { HeatmapArguments } from '..';
 import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { EXPRESSION_HEATMAP_GRID_NAME, EXPRESSION_HEATMAP_LEGEND_NAME } from '../constants';
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 
 describe('interpreter/functions#heatmap', () => {
   const fn = functionWrapper(heatmapFunction());

src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts

@@ -11,7 +11,7 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '@kbn/expressions-plugin';
+} from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 
 import { CustomPaletteState } from '@kbn/charts-plugin/common';

src/plugins/chart_expressions/expression_heatmap/common/types/expression_renderers.ts

@@ -12,7 +12,7 @@ import type { DatatableUtilitiesService } from '@kbn/data-plugin/common';
 import type { IFieldFormat, SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 import type { RangeSelectContext, ValueClickContext } from '@kbn/embeddable-plugin/public';
 import type { PersistedState } from '@kbn/visualizations-plugin/public';
-import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin';
+import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common';
 import type { HeatmapExpressionProps } from './expression_functions';
 
 export interface FilterEvent {

src/plugins/chart_expressions/expression_legacy_metric/common/expression_functions/metric_vis_function.test.ts

@@ -11,7 +11,7 @@ import type { MetricArguments } from '..';
 import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils';
 import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { LabelPosition } from '../constants';
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 
 describe('interpreter/functions#metric', () => {
   const fn = functionWrapper(metricVisFunction());

src/plugins/chart_expressions/expression_legacy_metric/common/types/expression_functions.ts

@@ -12,7 +12,7 @@ import {
   ExpressionFunctionDefinition,
   ExpressionValueRender,
   Style,
-} from '@kbn/expressions-plugin';
+} from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { ColorMode, CustomPaletteState } from '@kbn/charts-plugin/common';
 import { VisParams, visType, LabelPositionType } from './expression_renderers';

src/plugins/chart_expressions/expression_legacy_metric/public/__stories__/metric_renderer.stories.tsx

@@ -10,7 +10,7 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { from } from 'rxjs';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
-import { Datatable, DatatableColumn } from '@kbn/expressions-plugin';
+import { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common';
 import { Render } from '@kbn/presentation-util-plugin/public/__stories__';
 import { ColorMode, CustomPaletteState } from '@kbn/charts-plugin/common';
 import { getFormatService } from '../__mocks__/format_service';

src/plugins/chart_expressions/expression_legacy_metric/public/expression_renderers/metric_vis_renderer.tsx

@@ -19,7 +19,7 @@ import {
   IInterpreterRenderHandlers,
 } from '@kbn/expressions-plugin/common/expression_renderers';
 import { getColumnByAccessor } from '@kbn/visualizations-plugin/common/utils';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { StartServicesGetter } from '@kbn/kibana-utils-plugin/public';
 import { ExpressionLegacyMetricPluginStart } from '../plugin';
 import { EXPRESSION_METRIC_NAME, MetricVisRenderConfig, VisParams } from '../../common';

src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts

@@ -12,7 +12,7 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '@kbn/expressions-plugin';
+} from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { CustomPaletteState } from '@kbn/charts-plugin/common';
 import { VisParams, visType } from './expression_renderers';

src/plugins/chart_expressions/expression_metric/public/components/metric_vis.tsx

@@ -25,7 +25,7 @@ import {
   DatatableColumn,
   DatatableRow,
   IInterpreterRenderHandlers,
-} from '@kbn/expressions-plugin';
+} from '@kbn/expressions-plugin/common';
 import { CustomPaletteState } from '@kbn/charts-plugin/public';
 import { euiLightVars } from '@kbn/ui-theme';
 import { FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';

src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.test.ts

@@ -17,7 +17,7 @@ import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { mosaicVisFunction } from './mosaic_vis_function';
 import { PARTITION_LABELS_VALUE } from '../constants';
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 
 describe('interpreter/functions#mosaicVis', () => {
   const fn = functionWrapper(mosaicVisFunction());

src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.test.ts

@@ -18,7 +18,7 @@ import { ExpressionValueVisDimension, LegendSize } from '@kbn/visualizations-plu
 import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { pieVisFunction } from './pie_vis_function';
 import { PARTITION_LABELS_VALUE } from '../constants';
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 
 describe('interpreter/functions#pieVis', () => {
   const fn = functionWrapper(pieVisFunction());

src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.test.ts

@@ -17,7 +17,7 @@ import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { treemapVisFunction } from './treemap_vis_function';
 import { PARTITION_LABELS_VALUE } from '../constants';
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 
 describe('interpreter/functions#treemapVis', () => {
   const fn = functionWrapper(treemapVisFunction());

src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.test.ts

@@ -17,7 +17,7 @@ import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { waffleVisFunction } from './waffle_vis_function';
 import { PARTITION_LABELS_VALUE } from '../constants';
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 
 describe('interpreter/functions#waffleVis', () => {
   const fn = functionWrapper(waffleVisFunction());

src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts

@@ -7,7 +7,7 @@
  */
 
 import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { createMockVisData } from '../mocks';
 import { generateFormatters, getAvailableFormatter, getFormatter } from './formatters';
 import { BucketColumns } from '../../common/types';

src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts

@@ -7,7 +7,7 @@
  */
 
 import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
-import { DatatableColumn } from '@kbn/expressions-plugin';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { createMockVisData } from '../mocks';
 import { getSplitDimensionAccessor } from './get_split_dimension_accessor';
 import { BucketColumns } from '../../common/types';

src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts

@@ -8,7 +8,7 @@
 
 import type { PaletteOutput, PaletteDefinition } from '@kbn/coloring';
 import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { byDataColorPaletteMap } from './get_color';
 
 describe('#byDataColorPaletteMap', () => {

src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { extractUniqTermsMap, sortPredicateByType } from './sort_predicate';
 import { ChartTypes, PartitionVisParams } from '../../../common/types';
 import { ArrayEntry } from '@elastic/charts';

src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts

@@ -7,7 +7,7 @@
  */
 
 import { ArrayEntry } from '@elastic/charts';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { BucketColumns, ChartTypes, PartitionVisParams } from '../../../common/types';
 
 type SortFn = (([name1, node1]: ArrayEntry, [name2, node2]: ArrayEntry) => number) | undefined;

src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DatatableColumn } from '@kbn/expressions-plugin';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { BucketColumns, ChartTypes, LegendDisplay } from '../../common/types';
 
 type GetLegendIsFlatFn = (splitChartDimension: DatatableColumn | undefined) => boolean;

src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.test.ts

@@ -12,7 +12,7 @@ import { functionWrapper } from '@kbn/expressions-plugin/common/expression_funct
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public';
 import { Datatable } from '@kbn/expressions-plugin/common/expression_types/specs';
 import { ScaleOptions, Orientation } from '../constants';
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 
 type Arguments = Parameters<ReturnType<typeof tagcloudFunction>['fn']>[1];
 

src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts

@@ -12,7 +12,7 @@ import {
   Datatable,
   ExpressionFunctionDefinition,
   ExpressionValueRender,
-} from '@kbn/expressions-plugin';
+} from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { EXPRESSION_NAME, ScaleOptions, Orientation } from '../constants';
 

src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts

@@ -8,7 +8,7 @@
 
 import { Position } from '@elastic/charts';
 import type { PaletteOutput } from '@kbn/coloring';
-import { Datatable, DatatableRow } from '@kbn/expressions-plugin';
+import { Datatable, DatatableRow } from '@kbn/expressions-plugin/common';
 import { LayerTypes } from '../constants';
 import { DataLayerConfig, ExtendedDataLayerConfig, XYProps } from '../types';
 

src/plugins/chart_expressions/expression_xy/common/helpers/table.test.ts

@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { normalizeTable } from './table';
 import { createSampleDatatableWithRows } from '../__mocks__';
 

src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts

@@ -9,7 +9,7 @@
 import { HorizontalAlignment, Position, VerticalAlignment } from '@elastic/charts';
 import { $Values } from '@kbn/utility-types';
 import type { PaletteOutput } from '@kbn/coloring';
-import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin';
+import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { LegendSize } from '@kbn/visualizations-plugin/public';
 import { EventAnnotationOutput } from '@kbn/event-annotation-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';

src/plugins/chart_expressions/expression_xy/common/utils/log_datatables.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { ExecutionContext } from '@kbn/expressions-plugin';
+import { ExecutionContext } from '@kbn/expressions-plugin/common';
 import { Dimension, prepareLogTable } from '@kbn/visualizations-plugin/common/utils';
 import { LayerTypes, REFERENCE_LINE } from '../constants';
 import { strings } from '../i18n';

src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx

@@ -16,7 +16,7 @@ import type { PaletteRegistry } from '@kbn/coloring';
 import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { EventAnnotationServiceType } from '@kbn/event-annotation-plugin/public';
-import { ExpressionRenderDefinition } from '@kbn/expressions-plugin';
+import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common';
 import { FormatFactory } from '@kbn/field-formats-plugin/common';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';

src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.test.ts

@@ -9,7 +9,7 @@
 import { getColorAssignments } from './color_assignment';
 import type { DataLayerConfig } from '../../common';
 import { LayerTypes } from '../../common/constants';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { LayersFieldFormats } from './layers';
 

src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts

@@ -7,7 +7,7 @@
  */
 
 import { mapValues } from 'lodash';
-import { DatatableRow } from '@kbn/expressions-plugin';
+import { DatatableRow } from '@kbn/expressions-plugin/common';
 import { euiLightVars } from '@kbn/ui-theme';
 import { getAccessorByDimension } from '@kbn/visualizations-plugin/common/utils';
 import type { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';

src/plugins/chart_expressions/expression_xy/public/helpers/data_layers.tsx

@@ -19,7 +19,7 @@ import {
 } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
 import { IFieldFormat } from '@kbn/field-formats-plugin/common';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { getAccessorByDimension } from '@kbn/visualizations-plugin/common/utils';
 import type { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common/expression_functions';
 import { PaletteRegistry, SeriesLayer } from '@kbn/coloring';

src/plugins/chart_expressions/expression_xy/public/helpers/format.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { DatatableColumn } from '@kbn/expressions-plugin';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common/expression_functions';
 import { getFormatByAccessor, getColumnByAccessor } from '@kbn/visualizations-plugin/common/utils';
 

src/plugins/data/common/exports/export_csv.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { FieldFormat } from '@kbn/field-formats-plugin/common';
 import { datatableToCSV } from './export_csv';
 

src/plugins/data/common/exports/export_csv.tsx

@@ -8,7 +8,7 @@
 
 // Inspired by the inspector CSV exporter
 
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { FormatFactory } from '@kbn/field-formats-plugin/common';
 import { createEscapeValue } from './escape_value';
 

src/plugins/data/common/exports/formula_checks.ts

@@ -7,7 +7,7 @@
  */
 
 import { startsWith } from 'lodash';
-import { Datatable } from '@kbn/expressions-plugin';
+import { Datatable } from '@kbn/expressions-plugin/common';
 import { CSV_FORMULA_CHARS } from './constants';
 
 export const cellHasFormulas = (val: string) =>

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

@@ -7,7 +7,7 @@
  */
 
 import { identity } from 'lodash';
-import type { ExpressionAstExpression } from '@kbn/expressions-plugin';
+import type { ExpressionAstExpression } from '@kbn/expressions-plugin/common';
 
 import { AggConfig, IAggConfig } from './agg_config';
 import { AggConfigs, CreateAggConfigParams } from './agg_configs';