From 9eaad6074a28627978e3896ead7f83e12f26c6af Mon Sep 17 00:00:00 2001 From: spalger Date: Fri, 22 Jul 2022 12:16:07 -0700 Subject: [PATCH 1/3] [expressions] remove root-level redirect, import from common --- packages/kbn-eslint-config/.eslintrc.js | 5 +++++ src/plugins/expressions/index.ts | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 src/plugins/expressions/index.ts diff --git a/packages/kbn-eslint-config/.eslintrc.js b/packages/kbn-eslint-config/.eslintrc.js index f8db0bf504cf8..25d166501ba55 100644 --- a/packages/kbn-eslint-config/.eslintrc.js +++ b/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, + }, ], ], diff --git a/src/plugins/expressions/index.ts b/src/plugins/expressions/index.ts deleted file mode 100644 index 16d45459af845..0000000000000 --- a/src/plugins/expressions/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* - * 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 * from './common'; From 475f75043071627492b1738897062440a854da6c Mon Sep 17 00:00:00 2001 From: spalger Date: Fri, 22 Jul 2022 12:31:33 -0700 Subject: [PATCH 2/3] autofix all imports --- examples/partial_results_example/public/app/app.tsx | 2 +- .../public/app/expressions_context.ts | 2 +- .../partial_results_example/public/functions/count_event.ts | 2 +- .../partial_results_example/public/functions/get_events.ts | 2 +- examples/partial_results_example/public/functions/pluck.ts | 2 +- examples/partial_results_example/public/plugin.tsx | 2 +- .../expression_gauge/common/types/expression_functions.ts | 2 +- .../expression_gauge/public/components/utils/accessors.ts | 2 +- .../expression_heatmap/common/types/expression_functions.ts | 2 +- .../expression_heatmap/common/types/expression_renderers.ts | 2 +- .../common/types/expression_functions.ts | 2 +- .../public/__stories__/metric_renderer.stories.tsx | 2 +- .../public/expression_renderers/metric_vis_renderer.tsx | 2 +- .../expression_metric/common/types/expression_functions.ts | 2 +- .../expression_metric/public/components/metric_vis.tsx | 2 +- .../public/utils/formatters.test.ts | 2 +- .../public/utils/get_split_dimension_accessor.test.ts | 2 +- .../public/utils/layers/get_color.test.ts | 2 +- .../public/utils/layers/sort_predicate.test.ts | 2 +- .../public/utils/layers/sort_predicate.ts | 2 +- .../expression_partition_vis/public/utils/legend.ts | 2 +- .../common/types/expression_functions.ts | 2 +- .../expression_xy/common/__mocks__/index.ts | 2 +- .../expression_xy/common/helpers/table.test.ts | 2 +- .../expression_xy/common/types/expression_functions.ts | 2 +- .../expression_xy/common/utils/log_datatables.ts | 2 +- .../public/expression_renderers/xy_chart_renderer.tsx | 2 +- .../expression_xy/public/helpers/color_assignment.test.ts | 2 +- .../expression_xy/public/helpers/color_assignment.ts | 2 +- .../expression_xy/public/helpers/data_layers.tsx | 2 +- .../expression_xy/public/helpers/format.ts | 2 +- src/plugins/data/common/exports/export_csv.test.ts | 2 +- src/plugins/data/common/exports/export_csv.tsx | 2 +- src/plugins/data/common/exports/formula_checks.ts | 2 +- src/plugins/data/common/search/aggs/agg_config.test.ts | 2 +- src/plugins/data/common/search/tabify/tabify.ts | 2 +- .../actions/filters/create_filters_from_range_select.ts | 2 +- .../table_inspector_view/components/download_options.tsx | 2 +- .../embeddable/public/lib/embeddables/i_embeddable.ts | 2 +- src/plugins/embeddable/public/lib/triggers/triggers.ts | 2 +- .../common/manual_event_annotation/types.ts | 2 +- .../expression_error/public/components/debug_component.tsx | 2 +- .../expression_error/public/components/error_component.tsx | 2 +- .../public/expression_renderers/error_renderer.tsx | 5 ++++- src/plugins/expression_image/__fixtures__/function_specs.ts | 2 +- .../common/expression_functions/image_function.test.ts | 2 +- .../expression_image/common/types/expression_functions.ts | 2 +- .../public/expression_renderers/image_renderer.tsx | 5 ++++- .../expression_metric/__fixtures__/function_specs.ts | 2 +- .../common/expression_functions/metric_function.test.ts | 2 +- .../expression_metric/common/types/expression_functions.ts | 2 +- .../__stories__/metric_renderer.stories.tsx | 2 +- .../public/expression_renderers/metric_renderer.tsx | 5 ++++- .../expression_functions/repeat_image_function.test.ts | 2 +- .../common/types/expression_functions.ts | 5 ++++- .../public/components/repeat_image_component.tsx | 2 +- .../public/expression_renderers/repeat_image_renderer.tsx | 5 ++++- .../common/expression_functions/reveal_image.test.ts | 2 +- .../common/types/expression_functions.ts | 5 ++++- .../public/components/reveal_image_component.tsx | 2 +- .../public/expression_renderers/reveal_image_renderer.tsx | 5 ++++- src/plugins/expression_shape/__fixtures__/function_specs.ts | 2 +- .../common/expression_functions/progress_function.test.ts | 2 +- .../expression_shape/common/types/expression_functions.ts | 2 +- .../public/components/progress/progress_component.tsx | 2 +- .../expression_shape/public/components/shape/types.ts | 2 +- .../public/expression_renderers/progress_renderer.tsx | 5 ++++- .../public/expression_renderers/shape_renderer.tsx | 5 ++++- .../input_control_vis/public/input_control_vis_renderer.tsx | 2 +- src/plugins/input_control_vis/public/vis_controller.tsx | 2 +- src/plugins/presentation_util/public/__stories__/render.tsx | 5 ++++- .../expression_input/expression_input.stories.tsx | 6 +++++- src/plugins/presentation_util/public/index.ts | 2 +- src/plugins/ui_actions/public/triggers/row_click_trigger.ts | 2 +- src/plugins/vis_types/gauge/public/utils/palette.ts | 2 +- src/plugins/vis_types/heatmap/public/utils/palette.test.ts | 2 +- src/plugins/vis_types/heatmap/public/utils/palette.ts | 2 +- src/plugins/vis_types/metric/public/utils/palette.ts | 2 +- .../table/public/components/table_vis_basic.test.tsx | 2 +- .../vis_types/table/public/components/table_vis_basic.tsx | 2 +- .../vis_types/table/public/components/table_vis_cell.tsx | 2 +- .../vis_types/table/public/components/table_vis_columns.tsx | 6 +++++- .../table/public/components/table_vis_controls.tsx | 2 +- .../vis_types/table/public/components/table_vis_split.tsx | 2 +- .../table/public/components/table_visualization.test.tsx | 2 +- .../table/public/components/table_visualization.tsx | 2 +- src/plugins/vis_types/table/public/types.ts | 2 +- .../vis_types/table/public/utils/add_percentage_column.ts | 2 +- .../table/public/utils/create_formatted_table.test.ts | 2 +- .../vis_types/table/public/utils/create_formatted_table.ts | 2 +- .../table/public/utils/table_vis_response_handler.test.ts | 2 +- .../table/public/utils/table_vis_response_handler.ts | 2 +- .../timelion/public/components/timelion_vis_component.tsx | 2 +- .../vis_types/timelion/public/timelion_vis_renderer.tsx | 2 +- .../application/components/timeseries_visualization.tsx | 2 +- .../vis_types/vega/public/components/vega_vis_component.tsx | 2 +- .../vis_types/vega/public/vega_view/vega_base_view.d.ts | 2 +- src/plugins/vis_types/vega/public/vega_vis_renderer.tsx | 2 +- src/plugins/vis_types/vega/public/vega_visualization.ts | 2 +- src/plugins/vis_types/vislib/public/pie_fn.test.ts | 2 +- .../components/visualization_missed_saved_object_error.tsx | 2 +- .../public/embeddable/visualize_embeddable.tsx | 2 +- .../test_suites/run_pipeline/esaggs_rareterms.ts | 2 +- .../test_suites/run_pipeline/esaggs_timeshift.ts | 2 +- .../test_suites/run_pipeline/helpers.ts | 2 +- .../public/self_changing_vis_renderer.tsx | 2 +- x-pack/plugins/canvas/__fixtures__/function_specs.ts | 2 +- .../canvas/canvas_plugin_src/expression_types/embeddable.ts | 2 +- .../canvas/canvas_plugin_src/functions/common/csv.test.ts | 2 +- .../functions/common/dropdown_control.test.ts | 2 +- .../canvas/canvas_plugin_src/functions/common/lte.ts | 2 +- .../functions/external/saved_visualization.ts | 2 +- .../canvas_plugin_src/functions/server/demodata/index.ts | 2 +- .../canvas/canvas_plugin_src/functions/server/filters.ts | 2 +- .../canvas_plugin_src/uis/arguments/palette/palette.tsx | 2 +- .../canvas/canvas_plugin_src/uis/arguments/palette/utils.ts | 2 +- .../canvas_plugin_src/uis/arguments/vis_dimension.tsx | 2 +- x-pack/plugins/canvas/i18n/functions/function_help.ts | 2 +- .../canvas/public/components/arg_form/arg_template_form.tsx | 2 +- .../public/components/element_content/element_content.tsx | 2 +- .../__stories__/expression_input.stories.tsx | 6 +++++- .../canvas/public/components/function_form/index.tsx | 2 +- .../function_reference_generator.tsx | 2 +- .../generate_function_reference.ts | 2 +- .../public/components/help_menu/help_menu.component.tsx | 2 +- .../canvas/public/components/help_menu/help_menu.tsx | 2 +- .../components/text_style_picker/text_style_picker.tsx | 2 +- x-pack/plugins/canvas/public/functions/plot/index.ts | 2 +- x-pack/plugins/canvas/public/services/kibana/expressions.ts | 2 +- x-pack/plugins/canvas/public/services/stubs/expressions.ts | 2 +- .../canvas/server/saved_objects/workpad_references.ts | 2 +- x-pack/plugins/canvas/server/workpad_route_context.ts | 2 +- .../shareable_runtime/components/rendered_element.tsx | 2 +- x-pack/plugins/canvas/types/elements.ts | 2 +- x-pack/plugins/canvas/types/renderers.ts | 5 ++++- x-pack/plugins/canvas/types/state.ts | 2 +- x-pack/plugins/lens/common/expressions/collapse/types.ts | 2 +- .../plugins/lens/common/expressions/counter_rate/types.ts | 2 +- .../lens/common/expressions/datatable/datatable_fn.ts | 6 +++++- .../lens/common/expressions/datatable/sorting.test.tsx | 2 +- .../lens/common/expressions/datatable/summary.test.ts | 2 +- .../common/expressions/datatable/transpose_helpers.test.ts | 2 +- .../lens/common/expressions/datatable/transpose_helpers.ts | 2 +- x-pack/plugins/lens/common/expressions/datatable/types.ts | 2 +- .../common/expressions/format_column/format_column_fn.ts | 2 +- .../plugins/lens/common/expressions/format_column/types.ts | 2 +- .../plugins/lens/common/expressions/map_to_columns/types.ts | 2 +- x-pack/plugins/lens/common/expressions/time_scale/types.ts | 2 +- .../public/datatable_visualization/components/columns.tsx | 6 +++++- .../components/table_actions.test.ts | 2 +- .../datatable_visualization/components/table_actions.ts | 2 +- .../datatable_visualization/components/table_basic.test.tsx | 2 +- .../lens/public/datatable_visualization/components/types.ts | 2 +- .../lens/public/datatable_visualization/expression.test.tsx | 2 +- .../lens/public/datatable_visualization/expression.tsx | 2 +- .../editor_frame_service/editor_frame/suggestion_helpers.ts | 2 +- x-pack/plugins/lens/public/editor_frame_service/types.ts | 2 +- x-pack/plugins/lens/public/embeddable/embeddable.tsx | 2 +- .../plugins/lens/public/embeddable/expression_wrapper.tsx | 2 +- x-pack/plugins/lens/public/heatmap_visualization/utils.ts | 2 +- .../public/indexpattern_datasource/indexpattern.test.ts | 2 +- .../definitions/terms/include_exclude_options.tsx | 2 +- .../public/indexpattern_datasource/time_shift_utils.tsx | 2 +- .../plugins/lens/public/indexpattern_datasource/utils.tsx | 2 +- .../lens/public/pie_visualization/partition_charts_meta.ts | 2 +- .../public/shared_components/axis_extent/helpers.test.ts | 2 +- .../lens/public/shared_components/axis_extent/helpers.ts | 2 +- .../plugins/lens/public/shared_components/coloring/utils.ts | 2 +- .../lens/public/visualizations/gauge/visualization.tsx | 2 +- .../lens/public/xy_visualization/color_assignment.test.ts | 2 +- .../lens/public/xy_visualization/color_assignment.ts | 2 +- .../lens/public/xy_visualization/visualization.test.ts | 2 +- x-pack/plugins/lens/server/expressions/utils.ts | 2 +- .../region_map/region_map_renderer.tsx | 2 +- .../legacy_visualizations/tile_map/tile_map_renderer.tsx | 2 +- x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts | 2 +- 176 files changed, 229 insertions(+), 176 deletions(-) diff --git a/examples/partial_results_example/public/app/app.tsx b/examples/partial_results_example/public/app/app.tsx index f6249ea2d33b4..1f71a398ddb7f 100644 --- a/examples/partial_results_example/public/app/app.tsx +++ b/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 diff --git a/examples/partial_results_example/public/app/expressions_context.ts b/examples/partial_results_example/public/app/expressions_context.ts index e282abdb382ca..fab897595a7cd 100644 --- a/examples/partial_results_example/public/app/expressions_context.ts +++ b/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(undefined); diff --git a/examples/partial_results_example/public/functions/count_event.ts b/examples/partial_results_example/public/functions/count_event.ts index 93b3856f56075..d0d3b562d3fa4 100644 --- a/examples/partial_results_example/public/functions/count_event.ts +++ b/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; diff --git a/examples/partial_results_example/public/functions/get_events.ts b/examples/partial_results_example/public/functions/get_events.ts index 1abf3cb984c58..57ac2f51d2425 100644 --- a/examples/partial_results_example/public/functions/get_events.ts +++ b/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 = [ 'mousedown', diff --git a/examples/partial_results_example/public/functions/pluck.ts b/examples/partial_results_example/public/functions/pluck.ts index 8b32298fc5ced..9de9f0a054bfe 100644 --- a/examples/partial_results_example/public/functions/pluck.ts +++ b/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; diff --git a/examples/partial_results_example/public/plugin.tsx b/examples/partial_results_example/public/plugin.tsx index fce4f72f28b52..38b85185b2979 100755 --- a/examples/partial_results_example/public/plugin.tsx +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts index 70f87b3402b46..edae3a0b62685 100644 --- a/src/plugins/chart_expressions/expression_gauge/common/types/expression_functions.ts +++ b/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 { diff --git a/src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts b/src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts index 686147ab055e0..ca73a1d6a21e1 100644 --- a/src/plugins/chart_expressions/expression_gauge/public/components/utils/accessors.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts index 19f63f9df9890..c36f6f959c88e 100644 --- a/src/plugins/chart_expressions/expression_heatmap/common/types/expression_functions.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_heatmap/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_heatmap/common/types/expression_renderers.ts index ae8f4e956d681..77387f6d55c40 100644 --- a/src/plugins/chart_expressions/expression_heatmap/common/types/expression_renderers.ts +++ b/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 { diff --git a/src/plugins/chart_expressions/expression_legacy_metric/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_legacy_metric/common/types/expression_functions.ts index 5ad540fc579f6..0c7c0331975e8 100644 --- a/src/plugins/chart_expressions/expression_legacy_metric/common/types/expression_functions.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_legacy_metric/public/__stories__/metric_renderer.stories.tsx b/src/plugins/chart_expressions/expression_legacy_metric/public/__stories__/metric_renderer.stories.tsx index 7a278d488bc68..bd500d2e230f2 100644 --- a/src/plugins/chart_expressions/expression_legacy_metric/public/__stories__/metric_renderer.stories.tsx +++ b/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 { getMetricVisRenderer } from '../expression_renderers'; diff --git a/src/plugins/chart_expressions/expression_legacy_metric/public/expression_renderers/metric_vis_renderer.tsx b/src/plugins/chart_expressions/expression_legacy_metric/public/expression_renderers/metric_vis_renderer.tsx index b8a51b49b714a..dfcc92a21340f 100644 --- a/src/plugins/chart_expressions/expression_legacy_metric/public/expression_renderers/metric_vis_renderer.tsx +++ b/src/plugins/chart_expressions/expression_legacy_metric/public/expression_renderers/metric_vis_renderer.tsx @@ -20,7 +20,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 { EXPRESSION_METRIC_NAME, MetricVisRenderConfig, VisParams } from '../../common'; // @ts-ignore diff --git a/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts index 428afc9426a3e..bc383569a1c01 100644 --- a/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_metric/public/components/metric_vis.tsx b/src/plugins/chart_expressions/expression_metric/public/components/metric_vis.tsx index 4f7c1b18d9d00..3f91061cba6c3 100644 --- a/src/plugins/chart_expressions/expression_metric/public/components/metric_vis.tsx +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts index d6bbf8e2410a8..14f1db95c0c1e 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/formatters.test.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts index 3609be601e1a5..2014af0be7f15 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/get_split_dimension_accessor.test.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts index e076cc65b5136..225f405bac2ca 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/get_color.test.ts +++ b/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', () => { diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts index 20f34c4884d70..d7abd0441025f 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.test.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts index 02c3874eb5a88..0e4564a9bcfe5 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/layers/sort_predicate.ts +++ b/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; diff --git a/src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts b/src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts index 55fca725a5431..453ca6b833bc9 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/public/utils/legend.ts +++ b/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; diff --git a/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts index d452783c3ca7b..5ec00ee6edb38 100644 --- a/src/plugins/chart_expressions/expression_tagcloud/common/types/expression_functions.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts b/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts index 300bb7f5de30e..ff3d89163c070 100644 --- a/src/plugins/chart_expressions/expression_xy/common/__mocks__/index.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_xy/common/helpers/table.test.ts b/src/plugins/chart_expressions/expression_xy/common/helpers/table.test.ts index 947dfcf86be7b..259ee3c0ef29a 100644 --- a/src/plugins/chart_expressions/expression_xy/common/helpers/table.test.ts +++ b/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__'; diff --git a/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts index 5d518c31513ae..068f49a7f1694 100644 --- a/src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_xy/common/utils/log_datatables.ts b/src/plugins/chart_expressions/expression_xy/common/utils/log_datatables.ts index f2a85241d1aec..d9bbd56f6f323 100644 --- a/src/plugins/chart_expressions/expression_xy/common/utils/log_datatables.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx b/src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx index c5ca004e3c38c..8f78151ec5265 100644 --- a/src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx +++ b/src/plugins/chart_expressions/expression_xy/public/expression_renderers/xy_chart_renderer.tsx @@ -15,7 +15,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 type { XYChartProps } from '../../common'; diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.test.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.test.ts index 4a4c0ac5b7af1..f1a11bbe06185 100644 --- a/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.test.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts index 150c27434e1be..c7139cf036fa2 100644 --- a/src/plugins/chart_expressions/expression_xy/public/helpers/color_assignment.ts +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/data_layers.tsx b/src/plugins/chart_expressions/expression_xy/public/helpers/data_layers.tsx index bb1bdbe113dbc..4f830c08b234d 100644 --- a/src/plugins/chart_expressions/expression_xy/public/helpers/data_layers.tsx +++ b/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'; diff --git a/src/plugins/chart_expressions/expression_xy/public/helpers/format.ts b/src/plugins/chart_expressions/expression_xy/public/helpers/format.ts index 3830f9cadead6..b73184986deb0 100644 --- a/src/plugins/chart_expressions/expression_xy/public/helpers/format.ts +++ b/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'; diff --git a/src/plugins/data/common/exports/export_csv.test.ts b/src/plugins/data/common/exports/export_csv.test.ts index 52f098948e2d8..7d4f1347c6cba 100644 --- a/src/plugins/data/common/exports/export_csv.test.ts +++ b/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'; diff --git a/src/plugins/data/common/exports/export_csv.tsx b/src/plugins/data/common/exports/export_csv.tsx index e5a408f6c10e4..94dd1b78d2737 100644 --- a/src/plugins/data/common/exports/export_csv.tsx +++ b/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'; diff --git a/src/plugins/data/common/exports/formula_checks.ts b/src/plugins/data/common/exports/formula_checks.ts index 606f62277e0da..71b2d3ae317f7 100644 --- a/src/plugins/data/common/exports/formula_checks.ts +++ b/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) => diff --git a/src/plugins/data/common/search/aggs/agg_config.test.ts b/src/plugins/data/common/search/aggs/agg_config.test.ts index 84882c4bf5c2a..bf6dfbd51b26a 100644 --- a/src/plugins/data/common/search/aggs/agg_config.test.ts +++ b/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'; diff --git a/src/plugins/data/common/search/tabify/tabify.ts b/src/plugins/data/common/search/tabify/tabify.ts index c8e609212fe43..ea26afd30129a 100644 --- a/src/plugins/data/common/search/tabify/tabify.ts +++ b/src/plugins/data/common/search/tabify/tabify.ts @@ -7,7 +7,7 @@ */ import { get } from 'lodash'; -import type { Datatable } from '@kbn/expressions-plugin'; +import type { Datatable } from '@kbn/expressions-plugin/common'; import { TabbedAggResponseWriter } from './response_writer'; import { TabifyBuckets } from './buckets'; import type { TabbedResponseWriterOptions } from './types'; diff --git a/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts b/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts index a3211867d94ba..c3acc8b2a5106 100644 --- a/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts +++ b/src/plugins/data/public/actions/filters/create_filters_from_range_select.ts @@ -8,7 +8,7 @@ import { last } from 'lodash'; import moment from 'moment'; -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { buildRangeFilter, DataViewFieldBase, RangeFilterParams } from '@kbn/es-query'; import { getIndexPatterns, getSearchService } from '../../services'; import { AggConfigSerialized } from '../../../common/search/aggs'; diff --git a/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx b/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx index 1be85a7c066d3..599de9e82c58c 100644 --- a/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx +++ b/src/plugins/data/public/utils/table_inspector_view/components/download_options.tsx @@ -19,7 +19,7 @@ import { EuiPopover, EuiToolTip, } from '@elastic/eui'; -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { downloadMultipleAs } from '@kbn/share-plugin/public'; import { FieldFormatsStart } from '@kbn/field-formats-plugin/public'; import { IUiSettingsClient } from '@kbn/core/public'; diff --git a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts index 2bd8757024b18..9037de1a10075 100644 --- a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts +++ b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts @@ -7,7 +7,7 @@ */ import { Observable } from 'rxjs'; -import { ErrorLike } from '@kbn/expressions-plugin'; +import { ErrorLike } from '@kbn/expressions-plugin/common'; import { Adapters } from '../types'; import { IContainer } from '../containers/i_container'; import { EmbeddableInput } from '../../../common/types'; diff --git a/src/plugins/embeddable/public/lib/triggers/triggers.ts b/src/plugins/embeddable/public/lib/triggers/triggers.ts index f00bf34596c2e..7db9c06687947 100644 --- a/src/plugins/embeddable/public/lib/triggers/triggers.ts +++ b/src/plugins/embeddable/public/lib/triggers/triggers.ts @@ -7,7 +7,7 @@ */ import { i18n } from '@kbn/i18n'; -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { Trigger, RowClickContext } from '@kbn/ui-actions-plugin/public'; import { IEmbeddable } from '..'; diff --git a/src/plugins/event_annotation/common/manual_event_annotation/types.ts b/src/plugins/event_annotation/common/manual_event_annotation/types.ts index 520addf8602c8..f720da61a4013 100644 --- a/src/plugins/event_annotation/common/manual_event_annotation/types.ts +++ b/src/plugins/event_annotation/common/manual_event_annotation/types.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { DatatableColumn } from '@kbn/expressions-plugin'; +import { DatatableColumn } from '@kbn/expressions-plugin/common'; import { PointStyleProps, RangeStyleProps } from '../types'; export type ManualPointEventAnnotationArgs = { diff --git a/src/plugins/expression_error/public/components/debug_component.tsx b/src/plugins/expression_error/public/components/debug_component.tsx index a9c1729d646e1..8ba5680e2a709 100644 --- a/src/plugins/expression_error/public/components/debug_component.tsx +++ b/src/plugins/expression_error/public/components/debug_component.tsx @@ -8,7 +8,7 @@ import React, { useState, useEffect, useCallback } from 'react'; import { useResizeObserver } from '@elastic/eui'; -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import { withSuspense } from '@kbn/presentation-util-plugin/public'; import { NodeDimensions } from '../../common/types'; import { LazyDebugComponent } from '.'; diff --git a/src/plugins/expression_error/public/components/error_component.tsx b/src/plugins/expression_error/public/components/error_component.tsx index fd84e298e93d3..8f13d70fe3540 100644 --- a/src/plugins/expression_error/public/components/error_component.tsx +++ b/src/plugins/expression_error/public/components/error_component.tsx @@ -8,7 +8,7 @@ import React, { useState, useEffect, useCallback } from 'react'; import { EuiIcon, useResizeObserver, EuiPopover } from '@elastic/eui'; -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import { withSuspense } from '@kbn/presentation-util-plugin/public'; import { ErrorRendererConfig } from '../../common/types'; import { LazyErrorComponent } from '.'; diff --git a/src/plugins/expression_error/public/expression_renderers/error_renderer.tsx b/src/plugins/expression_error/public/expression_renderers/error_renderer.tsx index 4b96881f081b5..8ec0b7e65df86 100644 --- a/src/plugins/expression_error/public/expression_renderers/error_renderer.tsx +++ b/src/plugins/expression_error/public/expression_renderers/error_renderer.tsx @@ -12,7 +12,10 @@ import { Observable } from 'rxjs'; import { CoreTheme } from '@kbn/core/public'; import { I18nProvider } from '@kbn/i18n-react'; import { i18n } from '@kbn/i18n'; -import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { + ExpressionRenderDefinition, + IInterpreterRenderHandlers, +} from '@kbn/expressions-plugin/common'; import { CoreSetup } from '@kbn/core/public'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; import { withSuspense, defaultTheme$ } from '@kbn/presentation-util-plugin/public'; diff --git a/src/plugins/expression_image/__fixtures__/function_specs.ts b/src/plugins/expression_image/__fixtures__/function_specs.ts index 1fe2563f3c274..1f9bf46cf6936 100644 --- a/src/plugins/expression_image/__fixtures__/function_specs.ts +++ b/src/plugins/expression_image/__fixtures__/function_specs.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { ExpressionFunction } from '@kbn/expressions-plugin'; +import { ExpressionFunction } from '@kbn/expressions-plugin/common'; import { imageFunction } from '../common/expression_functions'; export const functionSpecs = [imageFunction].map((fn) => new ExpressionFunction(fn())); diff --git a/src/plugins/expression_image/common/expression_functions/image_function.test.ts b/src/plugins/expression_image/common/expression_functions/image_function.test.ts index 389fe7ec4ac19..f1477b1952a53 100644 --- a/src/plugins/expression_image/common/expression_functions/image_function.test.ts +++ b/src/plugins/expression_image/common/expression_functions/image_function.test.ts @@ -7,7 +7,7 @@ */ import expect from '@kbn/expect'; -import { ExecutionContext } from '@kbn/expressions-plugin'; +import { ExecutionContext } from '@kbn/expressions-plugin/common'; import { functionWrapper, getElasticLogo, diff --git a/src/plugins/expression_image/common/types/expression_functions.ts b/src/plugins/expression_image/common/types/expression_functions.ts index 2b4b3a605df23..88514241894a0 100644 --- a/src/plugins/expression_image/common/types/expression_functions.ts +++ b/src/plugins/expression_image/common/types/expression_functions.ts @@ -5,7 +5,7 @@ * in compliance with, at your election, the Elastic License 2.0 or the Server * Side Public License, v 1. */ -import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin'; +import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common'; export enum ImageMode { CONTAIN = 'contain', diff --git a/src/plugins/expression_image/public/expression_renderers/image_renderer.tsx b/src/plugins/expression_image/public/expression_renderers/image_renderer.tsx index 2ee79c6dae1a0..c7d7863d22088 100644 --- a/src/plugins/expression_image/public/expression_renderers/image_renderer.tsx +++ b/src/plugins/expression_image/public/expression_renderers/image_renderer.tsx @@ -7,7 +7,10 @@ */ import React from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; -import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { + ExpressionRenderDefinition, + IInterpreterRenderHandlers, +} from '@kbn/expressions-plugin/common'; import { i18n } from '@kbn/i18n'; import { Observable } from 'rxjs'; import { CoreTheme } from '@kbn/core/public'; diff --git a/src/plugins/expression_metric/__fixtures__/function_specs.ts b/src/plugins/expression_metric/__fixtures__/function_specs.ts index 10a0c2ae31b3c..8afbc37e163ec 100644 --- a/src/plugins/expression_metric/__fixtures__/function_specs.ts +++ b/src/plugins/expression_metric/__fixtures__/function_specs.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { ExpressionFunction } from '@kbn/expressions-plugin'; +import { ExpressionFunction } from '@kbn/expressions-plugin/common'; import { metricFunction } from '../common/expression_functions'; export const functionSpecs = [metricFunction].map((fn) => new ExpressionFunction(fn())); diff --git a/src/plugins/expression_metric/common/expression_functions/metric_function.test.ts b/src/plugins/expression_metric/common/expression_functions/metric_function.test.ts index 825bcbe54b46a..a720c31d3accb 100644 --- a/src/plugins/expression_metric/common/expression_functions/metric_function.test.ts +++ b/src/plugins/expression_metric/common/expression_functions/metric_function.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { ExecutionContext } from '@kbn/expressions-plugin'; +import { ExecutionContext } from '@kbn/expressions-plugin/common'; import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib'; import { metricFunction } from './metric_function'; diff --git a/src/plugins/expression_metric/common/types/expression_functions.ts b/src/plugins/expression_metric/common/types/expression_functions.ts index c2fa2e7a718ce..7b2dbb72742ca 100644 --- a/src/plugins/expression_metric/common/types/expression_functions.ts +++ b/src/plugins/expression_metric/common/types/expression_functions.ts @@ -9,7 +9,7 @@ import { ExpressionFunctionDefinition, ExpressionValueRender, Style, -} from '@kbn/expressions-plugin'; +} from '@kbn/expressions-plugin/common'; export type Input = number | string | null; diff --git a/src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx b/src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx index eefb6656e7d42..3a7d9d5e45daf 100644 --- a/src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx +++ b/src/plugins/expression_metric/public/expression_renderers/__stories__/metric_renderer.stories.tsx @@ -8,7 +8,7 @@ import React, { CSSProperties } from 'react'; import { storiesOf } from '@storybook/react'; -import { Style } from '@kbn/expressions-plugin'; +import { Style } from '@kbn/expressions-plugin/common'; import { Render } from '@kbn/presentation-util-plugin/public/__stories__'; import { getMetricRenderer } from '../metric_renderer'; import { MetricRendererConfig } from '../../../common'; diff --git a/src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx b/src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx index f5a5452c1388f..82da4eb4d2637 100644 --- a/src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx +++ b/src/plugins/expression_metric/public/expression_renderers/metric_renderer.tsx @@ -9,7 +9,10 @@ import React, { CSSProperties, lazy } from 'react'; import { Observable } from 'rxjs'; import { CoreTheme } from '@kbn/core/public'; import { render, unmountComponentAtNode } from 'react-dom'; -import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { + ExpressionRenderDefinition, + IInterpreterRenderHandlers, +} from '@kbn/expressions-plugin/common'; import { i18n } from '@kbn/i18n'; import { CoreSetup } from '@kbn/core/public'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; diff --git a/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts b/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts index b01f67f41b608..4229598c9bbea 100644 --- a/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts +++ b/src/plugins/expression_repeat_image/common/expression_functions/repeat_image_function.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { ExecutionContext } from '@kbn/expressions-plugin'; +import { ExecutionContext } from '@kbn/expressions-plugin/common'; import { getElasticLogo, getElasticOutline, diff --git a/src/plugins/expression_repeat_image/common/types/expression_functions.ts b/src/plugins/expression_repeat_image/common/types/expression_functions.ts index 2be479bbaff3e..49683fcd50d51 100644 --- a/src/plugins/expression_repeat_image/common/types/expression_functions.ts +++ b/src/plugins/expression_repeat_image/common/types/expression_functions.ts @@ -5,7 +5,10 @@ * in compliance with, at your election, the Elastic License 2.0 or the Server * Side Public License, v 1. */ -import { ExpressionFunctionDefinition, ExpressionValueRender } from '@kbn/expressions-plugin'; +import { + ExpressionFunctionDefinition, + ExpressionValueRender, +} from '@kbn/expressions-plugin/common'; interface Arguments { image: string | null; diff --git a/src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx b/src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx index 297c91d98d0cd..430ef903e234f 100644 --- a/src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx +++ b/src/plugins/expression_repeat_image/public/components/repeat_image_component.tsx @@ -8,7 +8,7 @@ import React, { ReactElement, useEffect, useState } from 'react'; import { times } from 'lodash'; -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import { RepeatImageRendererConfig } from '../../common'; interface RepeatImageComponentProps extends RepeatImageRendererConfig { diff --git a/src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx b/src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx index ce3d8c7c666d2..0a14f19d24eec 100644 --- a/src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx +++ b/src/plugins/expression_repeat_image/public/expression_renderers/repeat_image_renderer.tsx @@ -9,7 +9,10 @@ import React, { lazy } from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; import { Observable } from 'rxjs'; import { CoreTheme } from '@kbn/core/public'; -import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { + ExpressionRenderDefinition, + IInterpreterRenderHandlers, +} from '@kbn/expressions-plugin/common'; import { i18n } from '@kbn/i18n'; import { I18nProvider } from '@kbn/i18n-react'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; diff --git a/src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts b/src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts index 73c851772d650..ae0cd7aaf28ac 100644 --- a/src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts +++ b/src/plugins/expression_reveal_image/common/expression_functions/reveal_image.test.ts @@ -13,7 +13,7 @@ import { } from '@kbn/presentation-util-plugin/common/lib'; import { revealImageFunction, errors } from './reveal_image_function'; import { Origin } from '../types'; -import { ExecutionContext } from '@kbn/expressions-plugin'; +import { ExecutionContext } from '@kbn/expressions-plugin/common'; describe('revealImageFunction', () => { const fn = functionWrapper(revealImageFunction); diff --git a/src/plugins/expression_reveal_image/common/types/expression_functions.ts b/src/plugins/expression_reveal_image/common/types/expression_functions.ts index e8dca801aa69a..7cfad8fceb9f7 100644 --- a/src/plugins/expression_reveal_image/common/types/expression_functions.ts +++ b/src/plugins/expression_reveal_image/common/types/expression_functions.ts @@ -5,7 +5,10 @@ * in compliance with, at your election, the Elastic License 2.0 or the Server * Side Public License, v 1. */ -import { ExpressionFunctionDefinition, ExpressionValueRender } from '@kbn/expressions-plugin'; +import { + ExpressionFunctionDefinition, + ExpressionValueRender, +} from '@kbn/expressions-plugin/common'; export enum Origin { TOP = 'top', diff --git a/src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx b/src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx index 3b89454c7213c..1c65d2efae8ee 100644 --- a/src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx +++ b/src/plugins/expression_reveal_image/public/components/reveal_image_component.tsx @@ -8,7 +8,7 @@ import React, { useRef, useState, useEffect, useCallback } from 'react'; import { useResizeObserver } from '@elastic/eui'; -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import { css, CSSObject } from '@emotion/react'; import { isValidUrl } from '@kbn/presentation-util-plugin/public'; import { NodeDimensions, RevealImageRendererConfig, OriginString } from '../../common/types'; diff --git a/src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx b/src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx index 77502502b9736..6bea77df0cdf6 100644 --- a/src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx +++ b/src/plugins/expression_reveal_image/public/expression_renderers/reveal_image_renderer.tsx @@ -10,7 +10,10 @@ import { render, unmountComponentAtNode } from 'react-dom'; import { Observable } from 'rxjs'; import { CoreTheme } from '@kbn/core/public'; import { I18nProvider } from '@kbn/i18n-react'; -import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { + ExpressionRenderDefinition, + IInterpreterRenderHandlers, +} from '@kbn/expressions-plugin/common'; import { i18n } from '@kbn/i18n'; import { CoreSetup } from '@kbn/core/public'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; diff --git a/src/plugins/expression_shape/__fixtures__/function_specs.ts b/src/plugins/expression_shape/__fixtures__/function_specs.ts index 8d18bb9f2afd6..62c60833bcc80 100644 --- a/src/plugins/expression_shape/__fixtures__/function_specs.ts +++ b/src/plugins/expression_shape/__fixtures__/function_specs.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { ExpressionFunction } from '@kbn/expressions-plugin'; +import { ExpressionFunction } from '@kbn/expressions-plugin/common'; import { shapeFunction } from '../common/expression_functions'; export const functionSpecs = [shapeFunction].map((fn) => new ExpressionFunction(fn())); diff --git a/src/plugins/expression_shape/common/expression_functions/progress_function.test.ts b/src/plugins/expression_shape/common/expression_functions/progress_function.test.ts index e30c093760c38..6033e65b81ad4 100644 --- a/src/plugins/expression_shape/common/expression_functions/progress_function.test.ts +++ b/src/plugins/expression_shape/common/expression_functions/progress_function.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { ExecutionContext } from '@kbn/expressions-plugin'; +import { ExecutionContext } from '@kbn/expressions-plugin/common'; import { functionWrapper, fontStyle } from '@kbn/presentation-util-plugin/common/lib'; import { progressFunction, errors } from './progress_function'; diff --git a/src/plugins/expression_shape/common/types/expression_functions.ts b/src/plugins/expression_shape/common/types/expression_functions.ts index 88f17298fcf47..9de07f0e13c2e 100644 --- a/src/plugins/expression_shape/common/types/expression_functions.ts +++ b/src/plugins/expression_shape/common/types/expression_functions.ts @@ -10,7 +10,7 @@ import { ExpressionFunctionDefinition, ExpressionValueRender, Style, -} from '@kbn/expressions-plugin'; +} from '@kbn/expressions-plugin/common'; export enum Shape { ARROW = 'arrow', diff --git a/src/plugins/expression_shape/public/components/progress/progress_component.tsx b/src/plugins/expression_shape/public/components/progress/progress_component.tsx index d7cd700ed82da..22ded93149e83 100644 --- a/src/plugins/expression_shape/public/components/progress/progress_component.tsx +++ b/src/plugins/expression_shape/public/components/progress/progress_component.tsx @@ -8,7 +8,7 @@ import React, { CSSProperties, RefCallback, useCallback, useEffect, useRef, useState } from 'react'; import { useResizeObserver } from '@elastic/eui'; -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import { withSuspense } from '@kbn/presentation-util-plugin/public'; import { NodeDimensions, ProgressRendererConfig } from '../../../common/types'; import { ShapeRef, SvgConfig, SvgTextAttributes } from '../reusable/types'; diff --git a/src/plugins/expression_shape/public/components/shape/types.ts b/src/plugins/expression_shape/public/components/shape/types.ts index 33531b3eb8571..218dd967b8035 100644 --- a/src/plugins/expression_shape/public/components/shape/types.ts +++ b/src/plugins/expression_shape/public/components/shape/types.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import { ShapeRendererConfig } from '../../../common/types'; export interface ShapeComponentProps extends ShapeRendererConfig { diff --git a/src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx b/src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx index 1ce90f02c9cab..a6f74edcb90b3 100644 --- a/src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx +++ b/src/plugins/expression_shape/public/expression_renderers/progress_renderer.tsx @@ -9,7 +9,10 @@ import React from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; import { Observable } from 'rxjs'; import { CoreTheme } from '@kbn/core/public'; -import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { + ExpressionRenderDefinition, + IInterpreterRenderHandlers, +} from '@kbn/expressions-plugin/common'; import { i18n } from '@kbn/i18n'; import { I18nProvider } from '@kbn/i18n-react'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; diff --git a/src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx b/src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx index 7cfe2bcf326ed..c44f15366e830 100644 --- a/src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx +++ b/src/plugins/expression_shape/public/expression_renderers/shape_renderer.tsx @@ -10,7 +10,10 @@ import { render, unmountComponentAtNode } from 'react-dom'; import { Observable } from 'rxjs'; import { CoreTheme } from '@kbn/core/public'; import { I18nProvider } from '@kbn/i18n-react'; -import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { + ExpressionRenderDefinition, + IInterpreterRenderHandlers, +} from '@kbn/expressions-plugin/common'; import { i18n } from '@kbn/i18n'; import { CoreSetup } from '@kbn/core/public'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; diff --git a/src/plugins/input_control_vis/public/input_control_vis_renderer.tsx b/src/plugins/input_control_vis/public/input_control_vis_renderer.tsx index 5e9710c0c63a7..4f0c5f1c2f4f4 100644 --- a/src/plugins/input_control_vis/public/input_control_vis_renderer.tsx +++ b/src/plugins/input_control_vis/public/input_control_vis_renderer.tsx @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { ExpressionRenderDefinition } from '@kbn/expressions-plugin'; +import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common'; import { InputControlVisDependencies } from './plugin'; import { InputControlRenderValue } from './input_control_fn'; import type { InputControlVisControllerType } from './vis_controller'; diff --git a/src/plugins/input_control_vis/public/vis_controller.tsx b/src/plugins/input_control_vis/public/vis_controller.tsx index 229a8741c2bfd..8916f311bf912 100644 --- a/src/plugins/input_control_vis/public/vis_controller.tsx +++ b/src/plugins/input_control_vis/public/vis_controller.tsx @@ -12,7 +12,7 @@ import { render, unmountComponentAtNode } from 'react-dom'; import { Subscription } from 'rxjs'; import { I18nStart } from '@kbn/core/public'; -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import { Filter } from '@kbn/es-query'; import { VisualizationContainer } from '@kbn/visualizations-plugin/public'; import { FilterManager } from '@kbn/data-plugin/public'; diff --git a/src/plugins/presentation_util/public/__stories__/render.tsx b/src/plugins/presentation_util/public/__stories__/render.tsx index 7e24606ca5331..d7192aa3d785e 100644 --- a/src/plugins/presentation_util/public/__stories__/render.tsx +++ b/src/plugins/presentation_util/public/__stories__/render.tsx @@ -8,7 +8,10 @@ import { action } from '@storybook/addon-actions'; import React, { useRef, useEffect } from 'react'; -import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { + ExpressionRenderDefinition, + IInterpreterRenderHandlers, +} from '@kbn/expressions-plugin/common'; export const defaultHandlers: IInterpreterRenderHandlers = { getRenderMode: () => 'view', diff --git a/src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx b/src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx index 063270cc87a1c..32327faacef1c 100644 --- a/src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx +++ b/src/plugins/presentation_util/public/components/expression_input/expression_input.stories.tsx @@ -10,7 +10,11 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import { Meta } from '@storybook/react'; -import { ExpressionFunction, ExpressionFunctionParameter, Style } from '@kbn/expressions-plugin'; +import { + ExpressionFunction, + ExpressionFunctionParameter, + Style, +} from '@kbn/expressions-plugin/common'; import { ExpressionInput } from '.'; import { registerExpressionsLanguage } from './language'; diff --git a/src/plugins/presentation_util/public/index.ts b/src/plugins/presentation_util/public/index.ts index cb1cbb60d4412..707924de6b7f6 100644 --- a/src/plugins/presentation_util/public/index.ts +++ b/src/plugins/presentation_util/public/index.ts @@ -9,7 +9,7 @@ // TODO: https://github.com/elastic/kibana/issues/110893 /* eslint-disable @kbn/eslint/no_export_all */ -import { ExpressionFunction } from '@kbn/expressions-plugin'; +import { ExpressionFunction } from '@kbn/expressions-plugin/common'; import { PresentationUtilPlugin } from './plugin'; import { pluginServices } from './services'; diff --git a/src/plugins/ui_actions/public/triggers/row_click_trigger.ts b/src/plugins/ui_actions/public/triggers/row_click_trigger.ts index 058366b765b55..f2b3527959ee8 100644 --- a/src/plugins/ui_actions/public/triggers/row_click_trigger.ts +++ b/src/plugins/ui_actions/public/triggers/row_click_trigger.ts @@ -7,7 +7,7 @@ */ import { i18n } from '@kbn/i18n'; -import type { Datatable } from '@kbn/expressions-plugin'; +import type { Datatable } from '@kbn/expressions-plugin/common'; import { Trigger } from '.'; export const ROW_CLICK_TRIGGER = 'ROW_CLICK_TRIGGER'; diff --git a/src/plugins/vis_types/gauge/public/utils/palette.ts b/src/plugins/vis_types/gauge/public/utils/palette.ts index 5c7322fa3ea99..c17e9ccbce0bb 100644 --- a/src/plugins/vis_types/gauge/public/utils/palette.ts +++ b/src/plugins/vis_types/gauge/public/utils/palette.ts @@ -7,7 +7,7 @@ */ import { ColorSchemas, getHeatmapColors } from '@kbn/charts-plugin/common'; -import { Range } from '@kbn/expressions-plugin'; +import { Range } from '@kbn/expressions-plugin/common'; export interface PaletteConfig { color: Array; diff --git a/src/plugins/vis_types/heatmap/public/utils/palette.test.ts b/src/plugins/vis_types/heatmap/public/utils/palette.test.ts index a0724249c61ee..61df554c4151f 100644 --- a/src/plugins/vis_types/heatmap/public/utils/palette.test.ts +++ b/src/plugins/vis_types/heatmap/public/utils/palette.test.ts @@ -5,7 +5,7 @@ * in compliance with, at your election, the Elastic License 2.0 or the Server * Side Public License, v 1. */ -import type { Range } from '@kbn/expressions-plugin'; +import type { Range } from '@kbn/expressions-plugin/common'; import type { ColorSchemas } from '@kbn/charts-plugin/common'; import { getStopsWithColorsFromRanges, getStopsWithColorsFromColorsNumber } from './palette'; diff --git a/src/plugins/vis_types/heatmap/public/utils/palette.ts b/src/plugins/vis_types/heatmap/public/utils/palette.ts index 4379aea2df6a8..aa978a2954e90 100644 --- a/src/plugins/vis_types/heatmap/public/utils/palette.ts +++ b/src/plugins/vis_types/heatmap/public/utils/palette.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ import { ColorSchemas, getHeatmapColors } from '@kbn/charts-plugin/common'; -import { Range } from '@kbn/expressions-plugin'; +import { Range } from '@kbn/expressions-plugin/common'; export interface PaletteConfig { color: Array; diff --git a/src/plugins/vis_types/metric/public/utils/palette.ts b/src/plugins/vis_types/metric/public/utils/palette.ts index 5c7322fa3ea99..c17e9ccbce0bb 100644 --- a/src/plugins/vis_types/metric/public/utils/palette.ts +++ b/src/plugins/vis_types/metric/public/utils/palette.ts @@ -7,7 +7,7 @@ */ import { ColorSchemas, getHeatmapColors } from '@kbn/charts-plugin/common'; -import { Range } from '@kbn/expressions-plugin'; +import { Range } from '@kbn/expressions-plugin/common'; export interface PaletteConfig { color: Array; diff --git a/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx b/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx index c90f8d93ac892..b49f868e6e4af 100644 --- a/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx +++ b/src/plugins/vis_types/table/public/components/table_vis_basic.test.tsx @@ -10,7 +10,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { TableVisBasic } from './table_vis_basic'; import { FormattedColumn, TableVisConfig, TableVisUiState } from '../types'; -import { DatatableColumn } from '@kbn/expressions-plugin'; +import { DatatableColumn } from '@kbn/expressions-plugin/common'; import { createTableVisCell } from './table_vis_cell'; import { createGridColumns } from './table_vis_columns'; diff --git a/src/plugins/vis_types/table/public/components/table_vis_basic.tsx b/src/plugins/vis_types/table/public/components/table_vis_basic.tsx index 991012684f17d..f787365dfcdae 100644 --- a/src/plugins/vis_types/table/public/components/table_vis_basic.tsx +++ b/src/plugins/vis_types/table/public/components/table_vis_basic.tsx @@ -17,7 +17,7 @@ import { import { i18n } from '@kbn/i18n'; import { orderBy } from 'lodash'; -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import { createTableVisCell } from './table_vis_cell'; import { TableContext, TableVisConfig, TableVisUseUiStateProps } from '../types'; import { usePagination } from '../utils'; diff --git a/src/plugins/vis_types/table/public/components/table_vis_cell.tsx b/src/plugins/vis_types/table/public/components/table_vis_cell.tsx index a0ebbbd062842..e11700330b334 100644 --- a/src/plugins/vis_types/table/public/components/table_vis_cell.tsx +++ b/src/plugins/vis_types/table/public/components/table_vis_cell.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { EuiDataGridCellValueElementProps } from '@elastic/eui'; -import { DatatableRow } from '@kbn/expressions-plugin'; +import { DatatableRow } from '@kbn/expressions-plugin/common'; import { FormattedColumns } from '../types'; export const createTableVisCell = diff --git a/src/plugins/vis_types/table/public/components/table_vis_columns.tsx b/src/plugins/vis_types/table/public/components/table_vis_columns.tsx index 25bd6b0b9031c..54ce7ed36e39a 100644 --- a/src/plugins/vis_types/table/public/components/table_vis_columns.tsx +++ b/src/plugins/vis_types/table/public/components/table_vis_columns.tsx @@ -10,7 +10,11 @@ import React from 'react'; import { EuiDataGridColumnCellActionProps, EuiDataGridColumn } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { DatatableColumn, DatatableRow, IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { + DatatableColumn, + DatatableRow, + IInterpreterRenderHandlers, +} from '@kbn/expressions-plugin/common'; import { FormattedColumns, TableVisUiState } from '../types'; interface FilterCellData { diff --git a/src/plugins/vis_types/table/public/components/table_vis_controls.tsx b/src/plugins/vis_types/table/public/components/table_vis_controls.tsx index 36894e306d0e3..3c97df7142143 100644 --- a/src/plugins/vis_types/table/public/components/table_vis_controls.tsx +++ b/src/plugins/vis_types/table/public/components/table_vis_controls.tsx @@ -17,7 +17,7 @@ import { import { FormattedMessage } from '@kbn/i18n-react'; import { i18n } from '@kbn/i18n'; -import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin'; +import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin/common'; import { CoreStart } from '@kbn/core/public'; import { useKibana } from '@kbn/kibana-react-plugin/public'; import { exporters } from '@kbn/data-plugin/public'; diff --git a/src/plugins/vis_types/table/public/components/table_vis_split.tsx b/src/plugins/vis_types/table/public/components/table_vis_split.tsx index 3e90000d309d7..ca5e7161c0b93 100644 --- a/src/plugins/vis_types/table/public/components/table_vis_split.tsx +++ b/src/plugins/vis_types/table/public/components/table_vis_split.tsx @@ -8,7 +8,7 @@ import React, { memo } from 'react'; -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import { TableGroup, TableVisConfig, TableVisUseUiStateProps } from '../types'; import { TableVisBasic } from './table_vis_basic'; diff --git a/src/plugins/vis_types/table/public/components/table_visualization.test.tsx b/src/plugins/vis_types/table/public/components/table_visualization.test.tsx index b3ce828e39bbb..1d877f17d7f47 100644 --- a/src/plugins/vis_types/table/public/components/table_visualization.test.tsx +++ b/src/plugins/vis_types/table/public/components/table_visualization.test.tsx @@ -12,7 +12,7 @@ jest.mock('../utils', () => ({ import React from 'react'; import { shallow } from 'enzyme'; -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import { coreMock } from '@kbn/core/public/mocks'; import { TableVisConfig, TableVisData } from '../types'; import TableVisualizationComponent from './table_visualization'; diff --git a/src/plugins/vis_types/table/public/components/table_visualization.tsx b/src/plugins/vis_types/table/public/components/table_visualization.tsx index 9330b690359fb..aba0905f34076 100644 --- a/src/plugins/vis_types/table/public/components/table_visualization.tsx +++ b/src/plugins/vis_types/table/public/components/table_visualization.tsx @@ -11,7 +11,7 @@ import React, { useLayoutEffect } from 'react'; import classNames from 'classnames'; import { CoreStart } from '@kbn/core/public'; -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import type { PersistedState } from '@kbn/visualizations-plugin/public'; import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public'; import { TableVisConfig, TableVisData } from '../types'; diff --git a/src/plugins/vis_types/table/public/types.ts b/src/plugins/vis_types/table/public/types.ts index b61de821d76cf..28488e091c2fa 100644 --- a/src/plugins/vis_types/table/public/types.ts +++ b/src/plugins/vis_types/table/public/types.ts @@ -7,7 +7,7 @@ */ import type { IFieldFormat } from '@kbn/field-formats-plugin/common'; -import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin'; +import { DatatableColumn, DatatableRow } from '@kbn/expressions-plugin/common'; import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public'; import { TableVisParams } from '../common'; diff --git a/src/plugins/vis_types/table/public/utils/add_percentage_column.ts b/src/plugins/vis_types/table/public/utils/add_percentage_column.ts index 519742a54203e..c4f4e1d805f63 100644 --- a/src/plugins/vis_types/table/public/utils/add_percentage_column.ts +++ b/src/plugins/vis_types/table/public/utils/add_percentage_column.ts @@ -8,7 +8,7 @@ import { findIndex } from 'lodash'; import { i18n } from '@kbn/i18n'; -import { DatatableColumn } from '@kbn/expressions-plugin'; +import { DatatableColumn } from '@kbn/expressions-plugin/common'; import { getFormatService } from '../services'; import { FormattedColumns, TableContext } from '../types'; diff --git a/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts b/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts index 4992d2abfc005..ecdabb6425541 100644 --- a/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts +++ b/src/plugins/vis_types/table/public/utils/create_formatted_table.test.ts @@ -14,7 +14,7 @@ jest.mock('../services', () => ({ })), })); -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { AggTypes } from '../../common'; import { TableVisConfig } from '../types'; import { createFormattedTable } from './create_formatted_table'; diff --git a/src/plugins/vis_types/table/public/utils/create_formatted_table.ts b/src/plugins/vis_types/table/public/utils/create_formatted_table.ts index ccbcb0cbec199..942376ddda072 100644 --- a/src/plugins/vis_types/table/public/utils/create_formatted_table.ts +++ b/src/plugins/vis_types/table/public/utils/create_formatted_table.ts @@ -7,7 +7,7 @@ */ import { chain } from 'lodash'; -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { getFormatService } from '../services'; import { FormattedColumn, FormattedColumns, TableVisConfig, TableContext } from '../types'; import { AggTypes } from '../../common'; diff --git a/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts index 72b482979b271..3bcc942e59239 100644 --- a/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts +++ b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.test.ts @@ -30,7 +30,7 @@ jest.mock('./add_percentage_column', () => ({ })), })); -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/public'; import { AggTypes } from '../../common'; import { TableGroup, TableVisConfig } from '../types'; diff --git a/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts index 6a6400b3125f4..be03295284c23 100644 --- a/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts +++ b/src/plugins/vis_types/table/public/utils/table_vis_response_handler.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { getFormatService } from '../services'; import { TableVisData, TableGroup, TableVisConfig, TableContext } from '../types'; import { addPercentageColumn } from './add_percentage_column'; diff --git a/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx b/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx index b31256dd4fbb7..9e99b2e96d78d 100644 --- a/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx +++ b/src/plugins/vis_types/timelion/public/components/timelion_vis_component.tsx @@ -24,7 +24,7 @@ import { RangeFilterParams } from '@kbn/es-query'; import { useKibana } from '@kbn/kibana-react-plugin/public'; import { useActiveCursor } from '@kbn/charts-plugin/public'; -import type { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import type { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import { AreaSeriesComponent, BarSeriesComponent } from './series'; import { diff --git a/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx b/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx index cb8a9bd50bfaa..dbae93401f2ba 100644 --- a/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx +++ b/src/plugins/vis_types/timelion/public/timelion_vis_renderer.tsx @@ -9,7 +9,7 @@ import React, { lazy } from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; -import { ExpressionRenderDefinition } from '@kbn/expressions-plugin'; +import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common'; import { RangeFilterParams } from '@kbn/es-query'; import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; import { VisualizationContainer } from '@kbn/visualizations-plugin/public'; diff --git a/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx b/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx index 60ffc95ee5c5a..ca374d667463d 100644 --- a/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx +++ b/src/plugins/vis_types/timeseries/public/application/components/timeseries_visualization.tsx @@ -12,7 +12,7 @@ import React, { Suspense, useCallback, useEffect, useState } from 'react'; import { EuiFlexGroup, EuiFlexItem, EuiLoadingChart } from '@elastic/eui'; import { XYChartSeriesIdentifier, GeometryValue } from '@elastic/charts'; import { IUiSettingsClient } from '@kbn/core/public'; -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import { PersistedState } from '@kbn/visualizations-plugin/public'; import type { PaletteRegistry } from '@kbn/coloring'; import { TimeseriesLoading } from './timeseries_loading'; diff --git a/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx b/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx index c74f02b730d3f..3328b27f3b0f4 100644 --- a/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx +++ b/src/plugins/vis_types/vega/public/components/vega_vis_component.tsx @@ -10,7 +10,7 @@ import React, { useEffect, useRef, useMemo, useCallback } from 'react'; import { EuiResizeObserver, EuiResizeObserverProps } from '@elastic/eui'; import { throttle } from 'lodash'; -import type { IInterpreterRenderHandlers, RenderMode } from '@kbn/expressions-plugin'; +import type { IInterpreterRenderHandlers, RenderMode } from '@kbn/expressions-plugin/common'; import { createVegaVisualization } from '../vega_visualization'; import { VegaVisualizationDependencies } from '../plugin'; import { VegaParser } from '../data_model/vega_parser'; diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts index 0f4f5574c5742..e7e27e0333653 100644 --- a/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts +++ b/src/plugins/vis_types/vega/public/vega_view/vega_base_view.d.ts @@ -8,7 +8,7 @@ import type { IExternalUrl } from '@kbn/core/public'; import { DataPublicPluginStart } from '@kbn/data-plugin/public'; -import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { IInterpreterRenderHandlers } from '@kbn/expressions-plugin/common'; import type { IServiceSettings } from './vega_map_view/service_settings/service_settings_types'; import { VegaParser } from '../data_model/vega_parser'; import { createVegaStateRestorer } from '../lib/vega_state_restorer'; diff --git a/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx b/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx index 1584755d84fea..0e88937c10555 100644 --- a/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx +++ b/src/plugins/vis_types/vega/public/vega_vis_renderer.tsx @@ -9,7 +9,7 @@ import React, { lazy } from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; -import { ExpressionRenderDefinition } from '@kbn/expressions-plugin'; +import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; import { VisualizationContainer } from '@kbn/visualizations-plugin/public'; import { VegaVisualizationDependencies } from './plugin'; diff --git a/src/plugins/vis_types/vega/public/vega_visualization.ts b/src/plugins/vis_types/vega/public/vega_visualization.ts index 6540abc5a99dc..1da3f93453913 100644 --- a/src/plugins/vis_types/vega/public/vega_visualization.ts +++ b/src/plugins/vis_types/vega/public/vega_visualization.ts @@ -7,7 +7,7 @@ */ import { i18n } from '@kbn/i18n'; -import type { IInterpreterRenderHandlers, RenderMode } from '@kbn/expressions-plugin'; +import type { IInterpreterRenderHandlers, RenderMode } from '@kbn/expressions-plugin/common'; import { VegaParser } from './data_model/vega_parser'; import { VegaVisualizationDependencies } from './plugin'; import { getNotifications, getData } from './services'; diff --git a/src/plugins/vis_types/vislib/public/pie_fn.test.ts b/src/plugins/vis_types/vislib/public/pie_fn.test.ts index 2112a32b4ff5d..55d3c8fb7e0c3 100644 --- a/src/plugins/vis_types/vislib/public/pie_fn.test.ts +++ b/src/plugins/vis_types/vislib/public/pie_fn.test.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import type { Datatable } from '@kbn/expressions-plugin'; +import type { Datatable } from '@kbn/expressions-plugin/common'; import { functionWrapper } from '@kbn/expressions-plugin/common/expression_functions/specs/tests/utils'; import { createPieVisFn } from './pie_fn'; // @ts-ignore diff --git a/src/plugins/visualizations/public/components/visualization_missed_saved_object_error.tsx b/src/plugins/visualizations/public/components/visualization_missed_saved_object_error.tsx index c6a1de24592ba..767a2d38f8581 100644 --- a/src/plugins/visualizations/public/components/visualization_missed_saved_object_error.tsx +++ b/src/plugins/visualizations/public/components/visualization_missed_saved_object_error.tsx @@ -13,7 +13,7 @@ import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app'; import type { ApplicationStart } from '@kbn/core/public'; import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-plugin/common'; import type { ViewMode } from '@kbn/embeddable-plugin/common'; -import type { RenderMode } from '@kbn/expressions-plugin'; +import type { RenderMode } from '@kbn/expressions-plugin/common'; interface VisualizationMissedSavedObjectErrorProps { savedObjectMeta: { diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx b/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx index 50dd624b11827..05e9b983cbb02 100644 --- a/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx +++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable.tsx @@ -35,7 +35,7 @@ import { ExpressionRenderError, IExpressionLoaderParams, } from '@kbn/expressions-plugin/public'; -import type { RenderMode } from '@kbn/expressions-plugin'; +import type { RenderMode } from '@kbn/expressions-plugin/common'; import { DATA_VIEW_SAVED_OBJECT_TYPE } from '@kbn/data-views-plugin/public'; import { isFallbackDataView } from '../visualize_app/utils'; import { VisualizationMissedSavedObjectError } from '../components/visualization_missed_saved_object_error'; diff --git a/test/interpreter_functional/test_suites/run_pipeline/esaggs_rareterms.ts b/test/interpreter_functional/test_suites/run_pipeline/esaggs_rareterms.ts index 843fee17d866c..072349e624ae0 100644 --- a/test/interpreter_functional/test_suites/run_pipeline/esaggs_rareterms.ts +++ b/test/interpreter_functional/test_suites/run_pipeline/esaggs_rareterms.ts @@ -7,7 +7,7 @@ */ import expect from '@kbn/expect'; -import { DatatableRow } from '@kbn/expressions-plugin'; +import { DatatableRow } from '@kbn/expressions-plugin/common'; import { ExpectExpression, expectExpressionProvider } from './helpers'; import { FtrProviderContext } from '../../../functional/ftr_provider_context'; diff --git a/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts b/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts index 6ab2d776fdcf9..268014bb73995 100644 --- a/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts +++ b/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts @@ -7,7 +7,7 @@ */ import expect from '@kbn/expect'; -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { ExpectExpression, expectExpressionProvider } from './helpers'; import { FtrProviderContext } from '../../../functional/ftr_provider_context'; diff --git a/test/interpreter_functional/test_suites/run_pipeline/helpers.ts b/test/interpreter_functional/test_suites/run_pipeline/helpers.ts index 94e32e7f0a10e..aa45319f1491e 100644 --- a/test/interpreter_functional/test_suites/run_pipeline/helpers.ts +++ b/test/interpreter_functional/test_suites/run_pipeline/helpers.ts @@ -7,7 +7,7 @@ */ import expect from '@kbn/expect'; -import { ExpressionValue } from '@kbn/expressions-plugin'; +import { ExpressionValue } from '@kbn/expressions-plugin/common'; import { FtrProviderContext } from '../../../functional/ftr_provider_context'; declare global { diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_renderer.tsx b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_renderer.tsx index 4dcae9672861c..99db3537e5d2d 100644 --- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_renderer.tsx +++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis_renderer.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; -import { ExpressionRenderDefinition } from '@kbn/expressions-plugin'; +import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common'; import { SelfChangingComponent } from './self_changing_vis/self_changing_components'; import { SelfChangingVisRenderValue } from './self_changing_vis_fn'; diff --git a/x-pack/plugins/canvas/__fixtures__/function_specs.ts b/x-pack/plugins/canvas/__fixtures__/function_specs.ts index 62f8445e74a0d..a20df19fd9eab 100644 --- a/x-pack/plugins/canvas/__fixtures__/function_specs.ts +++ b/x-pack/plugins/canvas/__fixtures__/function_specs.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ExpressionFunction } from '@kbn/expressions-plugin'; +import { ExpressionFunction } from '@kbn/expressions-plugin/common'; import { functionSpecs as shapeFunctionSpecs } from '@kbn/expression-shape-plugin/__fixtures__'; import { functionSpecs as imageFunctionSpecs } from '@kbn/expression-image-plugin/__fixtures__'; import { functionSpecs as metricFunctionSpecs } from '@kbn/expression-metric-plugin/__fixtures__'; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts index 6c7a14a2b070a..e1cdd16a6bad4 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ExpressionTypeDefinition } from '@kbn/expressions-plugin'; +import { ExpressionTypeDefinition } from '@kbn/expressions-plugin/common'; import { EmbeddableInput } from '../../types'; import { EmbeddableTypes } from './embeddable_types'; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts index 06de11353edaf..d776e0a14028e 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts @@ -9,7 +9,7 @@ import { SerializableRecord } from '@kbn/utility-types'; import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib'; import { getFunctionErrors } from '../../../i18n'; import { csv } from './csv'; -import { Datatable, ExecutionContext } from '@kbn/expressions-plugin'; +import { Datatable, ExecutionContext } from '@kbn/expressions-plugin/common'; import { Adapters } from '@kbn/inspector-plugin'; const errors = getFunctionErrors().csv; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts index 6c95160222016..ac72911b15c90 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.ts @@ -8,7 +8,7 @@ import { functionWrapper } from '@kbn/presentation-util-plugin/common/lib'; import { testTable, relationalTable } from './__fixtures__/test_tables'; import { dropdownControl } from './dropdownControl'; -import { ExecutionContext } from '@kbn/expressions-plugin'; +import { ExecutionContext } from '@kbn/expressions-plugin/common'; import { Adapters } from '@kbn/inspector-plugin'; import { SerializableRecord } from '@kbn/utility-types'; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts index 3e4cb0b35c90d..b24b140bf3bff 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin'; +import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common'; import { getFunctionHelp } from '../../../i18n'; type Input = number | string; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts index cb88c1b9c3b15..743dab0f8d744 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts @@ -6,7 +6,7 @@ */ import { omit } from 'lodash'; -import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin'; +import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common'; import { VisualizeInput } from '@kbn/visualizations-plugin/public'; import { SavedObjectReference } from '@kbn/core/types'; import { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts index 81e308f27e9ec..d16b04677cbd8 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts @@ -6,7 +6,7 @@ */ import { sortBy } from 'lodash'; -import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin'; +import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common'; import { queryDatatable } from '../../../../common/lib/datatable/query'; import { DemoRows } from './demo_rows_types'; import { getDemoRows } from './get_demo_rows'; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/filters.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/filters.ts index 2bf5925d2b02b..e4f76cb5e3c6e 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/filters.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/filters.ts @@ -9,7 +9,7 @@ import { ExpressionValueFilter, ExpressionAstExpression, ExpressionAstFunction, -} from '@kbn/expressions-plugin'; +} from '@kbn/expressions-plugin/common'; import { fromExpression } from '@kbn/interpreter'; import { buildFiltersFunction } from '../../../common/functions'; import type { FiltersFunction } from '../../../common/functions'; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/palette.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/palette.tsx index 609913a84ed3d..b7c4db08f982a 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/palette.tsx +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/palette.tsx @@ -7,7 +7,7 @@ import React, { FC } from 'react'; import PropTypes from 'prop-types'; -import { ExpressionAstExpression } from '@kbn/expressions-plugin'; +import { ExpressionAstExpression } from '@kbn/expressions-plugin/common'; import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component'; import { ArgumentStrings } from '../../../../i18n'; import { ColorPalette } from '../../../../common/lib'; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts index 94457fec0c92f..e88b4140ad650 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette/utils.ts @@ -6,7 +6,7 @@ */ import { getType } from '@kbn/interpreter'; -import { ExpressionAstArgument, ExpressionAstFunction } from '@kbn/expressions-plugin'; +import { ExpressionAstArgument, ExpressionAstFunction } from '@kbn/expressions-plugin/common'; import { identifyPalette, ColorPalette, identifyPartialPalette } from '../../../../common/lib'; import { ArgumentStrings } from '../../../../i18n'; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/vis_dimension.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/vis_dimension.tsx index 39c1b8bf39f21..89c3cf35a7c36 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/vis_dimension.tsx +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/vis_dimension.tsx @@ -7,7 +7,7 @@ import React, { useState, useEffect, useCallback } from 'react'; import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiSelect } from '@elastic/eui'; -import { DatatableColumn, ExpressionAstExpression } from '@kbn/expressions-plugin'; +import { DatatableColumn, ExpressionAstExpression } from '@kbn/expressions-plugin/common'; import { templateFromReactComponent } from '../../../public/lib/template_from_react_component'; import { ArgumentStrings } from '../../../i18n'; import { ResolvedArgProps, ResolvedColumns } from '../../../public/expression_types/arg'; diff --git a/x-pack/plugins/canvas/i18n/functions/function_help.ts b/x-pack/plugins/canvas/i18n/functions/function_help.ts index be22ddf69f96d..d51d584d5d145 100644 --- a/x-pack/plugins/canvas/i18n/functions/function_help.ts +++ b/x-pack/plugins/canvas/i18n/functions/function_help.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin'; +import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common'; import { UnionToIntersection } from '@kbn/utility-types'; import { CanvasFunction, FunctionFactory } from '../../types'; diff --git a/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.tsx b/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.tsx index 58e89af71b856..053cda9dd03f3 100644 --- a/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.tsx +++ b/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.tsx @@ -9,7 +9,7 @@ import React, { useState, useEffect, useCallback, useRef, memo, ReactPortal } fr import deepEqual from 'react-fast-compare'; import usePrevious from 'react-use/lib/usePrevious'; import useEffectOnce from 'react-use/lib/useEffectOnce'; -import { ExpressionAstExpression, ExpressionValue } from '@kbn/expressions-plugin'; +import { ExpressionAstExpression, ExpressionValue } from '@kbn/expressions-plugin/common'; import { ExpressionFormHandlers } from '../../../common/lib/expression_form_handlers'; import { UpdatePropsRef } from '../../../types/arguments'; diff --git a/x-pack/plugins/canvas/public/components/element_content/element_content.tsx b/x-pack/plugins/canvas/public/components/element_content/element_content.tsx index 147c7c05ecf12..1c65c8f9cfa4e 100644 --- a/x-pack/plugins/canvas/public/components/element_content/element_content.tsx +++ b/x-pack/plugins/canvas/public/components/element_content/element_content.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { omitBy, isNil } from 'lodash'; import { css } from '@emotion/react'; -import { ExpressionRenderer } from '@kbn/expressions-plugin'; +import { ExpressionRenderer } from '@kbn/expressions-plugin/common'; import { getType } from '@kbn/interpreter'; import { Loading } from '../loading'; import { RenderWithFn } from '../render_with_fn'; diff --git a/x-pack/plugins/canvas/public/components/expression_input/__stories__/expression_input.stories.tsx b/x-pack/plugins/canvas/public/components/expression_input/__stories__/expression_input.stories.tsx index 22b9fb19afa2c..96cdf6b966619 100644 --- a/x-pack/plugins/canvas/public/components/expression_input/__stories__/expression_input.stories.tsx +++ b/x-pack/plugins/canvas/public/components/expression_input/__stories__/expression_input.stories.tsx @@ -8,7 +8,11 @@ import { action } from '@storybook/addon-actions'; import { storiesOf } from '@storybook/react'; import React from 'react'; -import { ExpressionFunction, ExpressionFunctionParameter, Style } from '@kbn/expressions-plugin'; +import { + ExpressionFunction, + ExpressionFunctionParameter, + Style, +} from '@kbn/expressions-plugin/common'; import { registerExpressionsLanguage } from '@kbn/presentation-util-plugin/public'; import { ExpressionInput } from '../expression_input'; diff --git a/x-pack/plugins/canvas/public/components/function_form/index.tsx b/x-pack/plugins/canvas/public/components/function_form/index.tsx index cc6f9541eaa47..202bb4384d696 100644 --- a/x-pack/plugins/canvas/public/components/function_form/index.tsx +++ b/x-pack/plugins/canvas/public/components/function_form/index.tsx @@ -9,7 +9,7 @@ import React, { useCallback } from 'react'; import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import { Ast } from '@kbn/interpreter'; import deepEqual from 'react-fast-compare'; -import { ExpressionAstExpression, ExpressionValue } from '@kbn/expressions-plugin'; +import { ExpressionAstExpression, ExpressionValue } from '@kbn/expressions-plugin/common'; import { findExpressionType } from '../../lib/find_expression_type'; // @ts-expect-error unconverted action function diff --git a/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx b/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx index 4b54956bcbec1..c82186d9e7e47 100644 --- a/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx +++ b/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx @@ -6,7 +6,7 @@ */ import React, { FC } from 'react'; -import { ExpressionFunction } from '@kbn/expressions-plugin'; +import { ExpressionFunction } from '@kbn/expressions-plugin/common'; import { EuiButtonEmpty } from '@elastic/eui'; import copy from 'copy-to-clipboard'; import { CanvasPluginServices } from '../../services'; diff --git a/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts b/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts index 7c1f11db071b4..6845e52c8092e 100644 --- a/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts +++ b/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts @@ -7,7 +7,7 @@ // @ts-expect-error untyped lib import pluralize from 'pluralize'; -import { ExpressionFunction, ExpressionFunctionParameter } from '@kbn/expressions-plugin'; +import { ExpressionFunction, ExpressionFunctionParameter } from '@kbn/expressions-plugin/common'; import { isValidDataUrl } from '@kbn/presentation-util-plugin/public'; import { functions as browserFunctions } from '../../../canvas_plugin_src/functions/browser'; import { functions as serverFunctions } from '../../../canvas_plugin_src/functions/server'; diff --git a/x-pack/plugins/canvas/public/components/help_menu/help_menu.component.tsx b/x-pack/plugins/canvas/public/components/help_menu/help_menu.component.tsx index 020c2ff9d1279..cc44837e7eaea 100644 --- a/x-pack/plugins/canvas/public/components/help_menu/help_menu.component.tsx +++ b/x-pack/plugins/canvas/public/components/help_menu/help_menu.component.tsx @@ -9,7 +9,7 @@ import React, { FC, lazy, Suspense, useCallback } from 'react'; import { EuiButtonEmpty, EuiSpacer } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { ChromeHelpMenuActions } from '@kbn/core/public'; -import { ExpressionFunction } from '@kbn/expressions-plugin'; +import { ExpressionFunction } from '@kbn/expressions-plugin/common'; import { CanvasPluginServices } from '../../services'; let FunctionReferenceGenerator: null | React.LazyExoticComponent = null; diff --git a/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx b/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx index 7fb6824c0d573..1c9e0695791cb 100644 --- a/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx +++ b/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx @@ -6,7 +6,7 @@ */ import React, { FC, useCallback } from 'react'; -import { ExpressionFunction } from '@kbn/expressions-plugin'; +import { ExpressionFunction } from '@kbn/expressions-plugin/common'; import { ChromeHelpMenuActions } from '@kbn/core/public'; import { useDispatch } from 'react-redux'; import { HelpMenu as Component } from './help_menu.component'; diff --git a/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx b/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx index a51dcf79e11c9..6bbf9dd6f02f5 100644 --- a/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx +++ b/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.tsx @@ -9,7 +9,7 @@ import React, { FC, useState } from 'react'; import PropTypes from 'prop-types'; import { EuiFlexGroup, EuiFlexItem, EuiSelect, EuiSpacer, EuiButtonGroup } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { FontValue } from '@kbn/expressions-plugin'; +import { FontValue } from '@kbn/expressions-plugin/common'; import { FontPicker } from '../font_picker'; import { ColorPickerPopover } from '../color_picker_popover'; diff --git a/x-pack/plugins/canvas/public/functions/plot/index.ts b/x-pack/plugins/canvas/public/functions/plot/index.ts index 00542af70c8db..5880d833c5be1 100644 --- a/x-pack/plugins/canvas/public/functions/plot/index.ts +++ b/x-pack/plugins/canvas/public/functions/plot/index.ts @@ -7,7 +7,7 @@ import { set } from '@elastic/safer-lodash-set'; import { groupBy, get, keyBy, map, sortBy } from 'lodash'; -import { ExpressionFunctionDefinition, Style } from '@kbn/expressions-plugin'; +import { ExpressionFunctionDefinition, Style } from '@kbn/expressions-plugin/common'; import type { PaletteRegistry, PaletteOutput } from '@kbn/coloring'; import { getLegendConfig } from '../../../common/lib/get_legend_config'; import { getFlotAxisConfig } from './get_flot_axis_config'; diff --git a/x-pack/plugins/canvas/public/services/kibana/expressions.ts b/x-pack/plugins/canvas/public/services/kibana/expressions.ts index 614357a3e3867..74a8b28306af8 100644 --- a/x-pack/plugins/canvas/public/services/kibana/expressions.ts +++ b/x-pack/plugins/canvas/public/services/kibana/expressions.ts @@ -9,7 +9,7 @@ import { ExpressionAstExpression, ExpressionExecutionParams, ExpressionValue, -} from '@kbn/expressions-plugin'; +} from '@kbn/expressions-plugin/common'; import { pluck } from 'rxjs/operators'; import { ExpressionsServiceStart } from '@kbn/expressions-plugin/public'; import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public'; diff --git a/x-pack/plugins/canvas/public/services/stubs/expressions.ts b/x-pack/plugins/canvas/public/services/stubs/expressions.ts index aaec0bb9edf6a..177eb1e50d75f 100644 --- a/x-pack/plugins/canvas/public/services/stubs/expressions.ts +++ b/x-pack/plugins/canvas/public/services/stubs/expressions.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { AnyExpressionRenderDefinition } from '@kbn/expressions-plugin'; +import { AnyExpressionRenderDefinition } from '@kbn/expressions-plugin/common'; import { plugin } from '@kbn/expressions-plugin/public'; import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public'; import { functions as functionDefinitions } from '../../../canvas_plugin_src/functions/common'; diff --git a/x-pack/plugins/canvas/server/saved_objects/workpad_references.ts b/x-pack/plugins/canvas/server/saved_objects/workpad_references.ts index 917561559f380..717d3cdb93c75 100644 --- a/x-pack/plugins/canvas/server/saved_objects/workpad_references.ts +++ b/x-pack/plugins/canvas/server/saved_objects/workpad_references.ts @@ -8,7 +8,7 @@ import { fromExpression, toExpression } from '@kbn/interpreter'; import { PersistableStateService } from '@kbn/kibana-utils-plugin/common'; import { SavedObjectReference } from '@kbn/core/server'; -import type { ExpressionAstExpression } from '@kbn/expressions-plugin'; +import type { ExpressionAstExpression } from '@kbn/expressions-plugin/common'; import { WorkpadAttributes } from '../routes/workpad/workpad_attributes'; export const extractReferences = ( diff --git a/x-pack/plugins/canvas/server/workpad_route_context.ts b/x-pack/plugins/canvas/server/workpad_route_context.ts index b4c53f947893a..1361d6541743a 100644 --- a/x-pack/plugins/canvas/server/workpad_route_context.ts +++ b/x-pack/plugins/canvas/server/workpad_route_context.ts @@ -11,7 +11,7 @@ import { SavedObject, SavedObjectsResolveResponse, } from '@kbn/core/server'; -import { ExpressionsServiceStart } from '@kbn/expressions-plugin'; +import { ExpressionsServiceStart } from '@kbn/expressions-plugin/common'; import { WorkpadAttributes } from './routes/workpad/workpad_attributes'; import { CANVAS_TYPE } from '../common/lib/constants'; import { injectReferences, extractReferences } from './saved_objects/workpad_references'; diff --git a/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx b/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx index b7721636037cb..f0a52789b853e 100644 --- a/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx +++ b/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx @@ -7,7 +7,7 @@ import React, { FC, PureComponent } from 'react'; import { css as emotionCss } from '@emotion/css'; -import { AnyExpressionFunctionDefinition } from '@kbn/expressions-plugin'; +import { AnyExpressionFunctionDefinition } from '@kbn/expressions-plugin/common'; import { Positionable } from '../../public/components/positionable/positionable'; import { elementToShape } from '../../public/components/workpad_page/positioning_utils'; import { CanvasRenderedElement } from '../types'; diff --git a/x-pack/plugins/canvas/types/elements.ts b/x-pack/plugins/canvas/types/elements.ts index 81c869e230052..f590c7bf1ed4f 100644 --- a/x-pack/plugins/canvas/types/elements.ts +++ b/x-pack/plugins/canvas/types/elements.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ExpressionAstExpression } from '@kbn/expressions-plugin'; +import { ExpressionAstExpression } from '@kbn/expressions-plugin/common'; import { CanvasElement } from '.'; export interface ElementSpec { diff --git a/x-pack/plugins/canvas/types/renderers.ts b/x-pack/plugins/canvas/types/renderers.ts index f1457d3fc6f93..ee94f58e17586 100644 --- a/x-pack/plugins/canvas/types/renderers.ts +++ b/x-pack/plugins/canvas/types/renderers.ts @@ -5,7 +5,10 @@ * 2.0. */ -import { ExpressionRenderDefinition, IInterpreterRenderHandlers } from '@kbn/expressions-plugin'; +import { + ExpressionRenderDefinition, + IInterpreterRenderHandlers, +} from '@kbn/expressions-plugin/common'; type GenericRendererCallback = (callback: () => void) => void; diff --git a/x-pack/plugins/canvas/types/state.ts b/x-pack/plugins/canvas/types/state.ts index d919198fbecf5..3946e7388c836 100644 --- a/x-pack/plugins/canvas/types/state.ts +++ b/x-pack/plugins/canvas/types/state.ts @@ -15,7 +15,7 @@ import { Render, Style, Range, -} from '@kbn/expressions-plugin'; +} from '@kbn/expressions-plugin/common'; import { Datasource, Model, Transform, View } from '../public/expression_types'; import { AssetType } from './assets'; import { CanvasWorkpad, Sidebar, Flyouts } from './canvas'; diff --git a/x-pack/plugins/lens/common/expressions/collapse/types.ts b/x-pack/plugins/lens/common/expressions/collapse/types.ts index d08736bcfba81..af0c0072b62b3 100644 --- a/x-pack/plugins/lens/common/expressions/collapse/types.ts +++ b/x-pack/plugins/lens/common/expressions/collapse/types.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin'; +import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common'; import { CollapseArgs } from '.'; export type CollapseExpressionFunction = ExpressionFunctionDefinition< diff --git a/x-pack/plugins/lens/common/expressions/counter_rate/types.ts b/x-pack/plugins/lens/common/expressions/counter_rate/types.ts index 0bcb23a112238..c153baea20e56 100644 --- a/x-pack/plugins/lens/common/expressions/counter_rate/types.ts +++ b/x-pack/plugins/lens/common/expressions/counter_rate/types.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin'; +import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common'; import { CounterRateArgs } from '.'; export type CounterRateExpressionFunction = ExpressionFunctionDefinition< diff --git a/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts b/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts index a886c42a030fa..bdced2fd52745 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts +++ b/x-pack/plugins/lens/common/expressions/datatable/datatable_fn.ts @@ -8,7 +8,11 @@ import { cloneDeep } from 'lodash'; import { i18n } from '@kbn/i18n'; import { prepareLogTable } from '@kbn/visualizations-plugin/common/utils'; -import type { Datatable, DatatableColumnMeta, ExecutionContext } from '@kbn/expressions-plugin'; +import type { + Datatable, + DatatableColumnMeta, + ExecutionContext, +} from '@kbn/expressions-plugin/common'; import { FormatFactory } from '../../types'; import { transposeTable } from './transpose_helpers'; import { computeSummaryRowForColumn } from './summary'; diff --git a/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx b/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx index 99f41c6785ae2..10b37acd94117 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx +++ b/x-pack/plugins/lens/common/expressions/datatable/sorting.test.tsx @@ -7,7 +7,7 @@ import { getSortingCriteria } from './sorting'; import type { FieldFormat } from '@kbn/field-formats-plugin/common'; -import { DatatableColumnType } from '@kbn/expressions-plugin'; +import { DatatableColumnType } from '@kbn/expressions-plugin/common'; function getMockFormatter() { return { convert: (v: unknown) => `${v as string}` } as FieldFormat; diff --git a/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts b/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts index 3307007e7f0fc..207bf5779bbee 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts +++ b/x-pack/plugins/lens/common/expressions/datatable/summary.test.ts @@ -6,7 +6,7 @@ */ import type { IFieldFormat } from '@kbn/field-formats-plugin/common'; -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { computeSummaryRowForColumn, getFinalSummaryConfiguration } from './summary'; describe('Summary row helpers', () => { diff --git a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts index e99de0186222b..2a7461187c771 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts +++ b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.test.ts @@ -6,7 +6,7 @@ */ import type { FieldFormat } from '@kbn/field-formats-plugin/common'; -import type { Datatable } from '@kbn/expressions-plugin'; +import type { Datatable } from '@kbn/expressions-plugin/common'; import { DatatableArgs } from './datatable'; import { transposeTable } from './transpose_helpers'; diff --git a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts index 076ebdf08a7b2..f99977f747015 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts +++ b/x-pack/plugins/lens/common/expressions/datatable/transpose_helpers.ts @@ -5,7 +5,7 @@ * 2.0. */ -import type { Datatable, DatatableColumn, DatatableRow } from '@kbn/expressions-plugin'; +import type { Datatable, DatatableColumn, DatatableRow } from '@kbn/expressions-plugin/common'; import type { FieldFormat } from '@kbn/field-formats-plugin/common'; import type { DatatableArgs } from './datatable'; import type { ColumnConfig, ColumnConfigArg } from './datatable_column'; diff --git a/x-pack/plugins/lens/common/expressions/datatable/types.ts b/x-pack/plugins/lens/common/expressions/datatable/types.ts index a78018fca90f6..7de3bdde894dc 100644 --- a/x-pack/plugins/lens/common/expressions/datatable/types.ts +++ b/x-pack/plugins/lens/common/expressions/datatable/types.ts @@ -5,7 +5,7 @@ * 2.0. */ -import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin'; +import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common'; import type { DatatableArgs } from './datatable'; export interface DatatableProps { diff --git a/x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts b/x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts index d7032d320b720..d128cac8444c6 100644 --- a/x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts +++ b/x-pack/plugins/lens/common/expressions/format_column/format_column_fn.ts @@ -6,7 +6,7 @@ */ import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common'; -import type { DatatableColumn } from '@kbn/expressions-plugin'; +import type { DatatableColumn } from '@kbn/expressions-plugin/common'; import { supportedFormats } from './supported_formats'; import type { FormatColumnArgs } from '.'; import type { FormatColumnExpressionFunction } from './types'; diff --git a/x-pack/plugins/lens/common/expressions/format_column/types.ts b/x-pack/plugins/lens/common/expressions/format_column/types.ts index c91dcfd5a8f6e..7500bd18e1334 100644 --- a/x-pack/plugins/lens/common/expressions/format_column/types.ts +++ b/x-pack/plugins/lens/common/expressions/format_column/types.ts @@ -5,7 +5,7 @@ * 2.0. */ -import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin'; +import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common'; import type { FormatColumnArgs } from '.'; export type FormatColumnExpressionFunction = ExpressionFunctionDefinition< diff --git a/x-pack/plugins/lens/common/expressions/map_to_columns/types.ts b/x-pack/plugins/lens/common/expressions/map_to_columns/types.ts index 0c99260b704b1..4623f435e5a67 100644 --- a/x-pack/plugins/lens/common/expressions/map_to_columns/types.ts +++ b/x-pack/plugins/lens/common/expressions/map_to_columns/types.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin'; +import { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common'; export type OriginalColumn = { id: string; label: string } & ( | { operationType: 'date_histogram'; sourceField: string } diff --git a/x-pack/plugins/lens/common/expressions/time_scale/types.ts b/x-pack/plugins/lens/common/expressions/time_scale/types.ts index 407a8c101e177..b6644eea0cf0d 100644 --- a/x-pack/plugins/lens/common/expressions/time_scale/types.ts +++ b/x-pack/plugins/lens/common/expressions/time_scale/types.ts @@ -5,7 +5,7 @@ * 2.0. */ -import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin'; +import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common'; export type TimeScaleUnit = 's' | 'm' | 'h' | 'd'; diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx index 84395ac7dfdfc..fd3a0acb2b0fd 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/components/columns.tsx @@ -13,7 +13,11 @@ import { EuiDataGridColumnCellActionProps, EuiListGroupItemProps, } from '@elastic/eui'; -import type { Datatable, DatatableColumn, DatatableColumnMeta } from '@kbn/expressions-plugin'; +import type { + Datatable, + DatatableColumn, + DatatableColumnMeta, +} from '@kbn/expressions-plugin/common'; import type { FormatFactory } from '../../../common'; import type { ColumnConfig } from '../../../common/expressions'; diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts index f11fc098b50d9..3d3352309c102 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts +++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.test.ts @@ -8,7 +8,7 @@ import React from 'react'; import { EuiDataGridSorting } from '@elastic/eui'; -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { createGridFilterHandler, diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts index ba7e957de083a..5d06584003ae1 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts +++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_actions.ts @@ -6,7 +6,7 @@ */ import type { EuiDataGridSorting } from '@elastic/eui'; -import type { Datatable, DatatableColumn } from '@kbn/expressions-plugin'; +import type { Datatable, DatatableColumn } from '@kbn/expressions-plugin/common'; import { ClickTriggerEvent } from '@kbn/charts-plugin/public'; import type { LensResizeAction, LensSortAction, LensToggleAction } from './types'; import type { ColumnConfig, LensGridDirection } from '../../../common/expressions'; diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx index 1beed9a7889b8..44600b2c03b94 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/components/table_basic.test.tsx @@ -19,7 +19,7 @@ import { DataContext, DatatableComponent } from './table_basic'; import { DatatableProps } from '../../../common/expressions'; import { chartPluginMock } from '@kbn/charts-plugin/public/mocks'; import { IUiSettingsClient } from '@kbn/core/public'; -import { Datatable, RenderMode } from '@kbn/expressions-plugin'; +import { Datatable, RenderMode } from '@kbn/expressions-plugin/common'; import { LENS_EDIT_PAGESIZE_ACTION } from './constants'; diff --git a/x-pack/plugins/lens/public/datatable_visualization/components/types.ts b/x-pack/plugins/lens/public/datatable_visualization/components/types.ts index 62a0f336133f6..c6a1560ce4675 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/components/types.ts +++ b/x-pack/plugins/lens/public/datatable_visualization/components/types.ts @@ -9,7 +9,7 @@ import { IUiSettingsClient } from '@kbn/core/public'; import type { PaletteRegistry } from '@kbn/coloring'; import { CustomPaletteState } from '@kbn/charts-plugin/public'; import type { IAggType } from '@kbn/data-plugin/public'; -import type { Datatable, RenderMode } from '@kbn/expressions-plugin'; +import type { Datatable, RenderMode } from '@kbn/expressions-plugin/common'; import type { ILensInterpreterRenderHandlers, LensEditEvent } from '../../types'; import { LENS_EDIT_SORT_ACTION, diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx index 3e798c5813041..6bf6d27f35edd 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx @@ -9,7 +9,7 @@ import type { DatatableProps } from '../../common/expressions'; import { createMockExecutionContext } from '@kbn/expressions-plugin/common/mocks'; import type { FormatFactory } from '../../common'; import { getDatatable } from '../../common/expressions'; -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; function sampleArgs() { const indexPatternId = 'indexPatternId'; diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx index f9d22ff61e60c..deca33fda8b29 100644 --- a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx +++ b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx @@ -12,7 +12,7 @@ import { I18nProvider } from '@kbn/i18n-react'; import type { PaletteRegistry } from '@kbn/coloring'; import type { IAggType } from '@kbn/data-plugin/public'; import { IUiSettingsClient, ThemeServiceStart } from '@kbn/core/public'; -import { ExpressionRenderDefinition } from '@kbn/expressions-plugin'; +import { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common'; import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public'; import { DatatableComponent } from './components/table_basic'; diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.ts b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.ts index d21940d4ed561..d67dc2284062e 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.ts +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_helpers.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import type { PaletteOutput } from '@kbn/coloring'; import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public'; import { diff --git a/x-pack/plugins/lens/public/editor_frame_service/types.ts b/x-pack/plugins/lens/public/editor_frame_service/types.ts index 2d50e96ec280e..40b8328c92658 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/types.ts +++ b/x-pack/plugins/lens/public/editor_frame_service/types.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; export type TableInspectorAdapter = Record; diff --git a/x-pack/plugins/lens/public/embeddable/embeddable.tsx b/x-pack/plugins/lens/public/embeddable/embeddable.tsx index 29022a25a5673..655a09b09779a 100644 --- a/x-pack/plugins/lens/public/embeddable/embeddable.tsx +++ b/x-pack/plugins/lens/public/embeddable/embeddable.tsx @@ -22,7 +22,7 @@ import type { Start as InspectorStart } from '@kbn/inspector-plugin/public'; import { Subscription } from 'rxjs'; import { toExpression, Ast } from '@kbn/interpreter'; -import { ErrorLike, RenderMode } from '@kbn/expressions-plugin'; +import { ErrorLike, RenderMode } from '@kbn/expressions-plugin/common'; import { map, distinctUntilChanged, skip } from 'rxjs/operators'; import fastIsEqual from 'fast-deep-equal'; import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public'; diff --git a/x-pack/plugins/lens/public/embeddable/expression_wrapper.tsx b/x-pack/plugins/lens/public/embeddable/expression_wrapper.tsx index 27094d154efd2..e7debac3d7ce8 100644 --- a/x-pack/plugins/lens/public/embeddable/expression_wrapper.tsx +++ b/x-pack/plugins/lens/public/embeddable/expression_wrapper.tsx @@ -16,7 +16,7 @@ import { } from '@kbn/expressions-plugin/public'; import type { KibanaExecutionContext } from '@kbn/core/public'; import { ExecutionContextSearch } from '@kbn/data-plugin/public'; -import { DefaultInspectorAdapters, RenderMode } from '@kbn/expressions-plugin'; +import { DefaultInspectorAdapters, RenderMode } from '@kbn/expressions-plugin/common'; import classNames from 'classnames'; import { getOriginalRequestErrorMessages } from '../editor_frame_service/error_helper'; import { ErrorMessage } from '../editor_frame_service/types'; diff --git a/x-pack/plugins/lens/public/heatmap_visualization/utils.ts b/x-pack/plugins/lens/public/heatmap_visualization/utils.ts index 92030fd7b1369..66c70381a560d 100644 --- a/x-pack/plugins/lens/public/heatmap_visualization/utils.ts +++ b/x-pack/plugins/lens/public/heatmap_visualization/utils.ts @@ -6,7 +6,7 @@ */ import type { PaletteRegistry } from '@kbn/coloring'; -import type { Datatable } from '@kbn/expressions-plugin'; +import type { Datatable } from '@kbn/expressions-plugin/common'; import { applyPaletteParams, findMinMaxByColumnId } from '../shared_components'; import { DEFAULT_PALETTE_NAME } from './constants'; import type { HeatmapVisualizationState, Palette } from './types'; diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts index 3734d93b6071e..7010b175b8cef 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts +++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts @@ -37,7 +37,7 @@ import { } from './operations'; import { createMockedFullReference } from './operations/mocks'; import { cloneDeep } from 'lodash'; -import { DatatableColumn } from '@kbn/expressions-plugin'; +import { DatatableColumn } from '@kbn/expressions-plugin/common'; jest.mock('./loader'); jest.mock('../id_generator'); diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/include_exclude_options.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/include_exclude_options.tsx index 70d4bcf1bb4f0..212e213ff27eb 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/include_exclude_options.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/include_exclude_options.tsx @@ -9,7 +9,7 @@ import React, { useState, useEffect, useCallback } from 'react'; import { i18n } from '@kbn/i18n'; import { uniq } from 'lodash'; import { EuiComboBox, EuiFormRow, EuiSpacer, EuiSwitch, EuiFieldText, EuiText } from '@elastic/eui'; -import type { DatatableRow } from '@kbn/expressions-plugin'; +import type { DatatableRow } from '@kbn/expressions-plugin/common'; import { useDebouncedValue } from '../../../../shared_components'; export interface IncludeExcludeOptions { diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx index 2a672d2848c67..b5c6acccac543 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx @@ -10,7 +10,7 @@ import React from 'react'; import { uniq } from 'lodash'; import { FormattedMessage } from '@kbn/i18n-react'; import type { DatatableUtilitiesService } from '@kbn/data-plugin/common'; -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { search } from '@kbn/data-plugin/public'; import { parseTimeShift } from '@kbn/data-plugin/common'; import { diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx index dc95f06aa8ac6..85837b1010355 100644 --- a/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx +++ b/x-pack/plugins/lens/public/indexpattern_datasource/utils.tsx @@ -13,7 +13,7 @@ import type { DatatableUtilitiesService } from '@kbn/data-plugin/common'; import { TimeRange } from '@kbn/es-query'; import { EuiLink, EuiTextColor, EuiButton, EuiSpacer } from '@elastic/eui'; -import type { DatatableColumn } from '@kbn/expressions-plugin'; +import type { DatatableColumn } from '@kbn/expressions-plugin/common'; import { groupBy, escape } from 'lodash'; import type { Query } from '@kbn/data-plugin/common'; import type { FramePublicAPI, StateSetter } from '../types'; diff --git a/x-pack/plugins/lens/public/pie_visualization/partition_charts_meta.ts b/x-pack/plugins/lens/public/pie_visualization/partition_charts_meta.ts index 44aa3b3a92b12..be2ddda9372b9 100644 --- a/x-pack/plugins/lens/public/pie_visualization/partition_charts_meta.ts +++ b/x-pack/plugins/lens/public/pie_visualization/partition_charts_meta.ts @@ -8,7 +8,7 @@ import { i18n } from '@kbn/i18n'; import type { EuiIconProps } from '@elastic/eui'; -import type { DatatableColumn } from '@kbn/expressions-plugin'; +import type { DatatableColumn } from '@kbn/expressions-plugin/common'; import { LensIconChartDonut } from '../assets/chart_donut'; import { LensIconChartPie } from '../assets/chart_pie'; import { LensIconChartTreemap } from '../assets/chart_treemap'; diff --git a/x-pack/plugins/lens/public/shared_components/axis_extent/helpers.test.ts b/x-pack/plugins/lens/public/shared_components/axis_extent/helpers.test.ts index af36dc765cc82..c1eec0caebdbd 100644 --- a/x-pack/plugins/lens/public/shared_components/axis_extent/helpers.test.ts +++ b/x-pack/plugins/lens/public/shared_components/axis_extent/helpers.test.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { createMockDatasource } from '../../mocks'; import { FramePublicAPI, OperationDescriptor } from '../../types'; import { diff --git a/x-pack/plugins/lens/public/shared_components/axis_extent/helpers.ts b/x-pack/plugins/lens/public/shared_components/axis_extent/helpers.ts index 42fc313d6a8ef..46a6ace230b0c 100644 --- a/x-pack/plugins/lens/public/shared_components/axis_extent/helpers.ts +++ b/x-pack/plugins/lens/public/shared_components/axis_extent/helpers.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import type { DatasourcePublicAPI } from '../../types'; /** diff --git a/x-pack/plugins/lens/public/shared_components/coloring/utils.ts b/x-pack/plugins/lens/public/shared_components/coloring/utils.ts index abe22d82ceb93..5ccd144e74628 100644 --- a/x-pack/plugins/lens/public/shared_components/coloring/utils.ts +++ b/x-pack/plugins/lens/public/shared_components/coloring/utils.ts @@ -19,7 +19,7 @@ import { getPaletteStops, CUSTOM_PALETTE, } from '@kbn/coloring'; -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; export function getContrastColor( color: string, diff --git a/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx b/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx index e85ef81a5dd8c..1eab9607a650f 100644 --- a/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx +++ b/x-pack/plugins/lens/public/visualizations/gauge/visualization.tsx @@ -10,7 +10,7 @@ import { render } from 'react-dom'; import { i18n } from '@kbn/i18n'; import { FormattedMessage, I18nProvider } from '@kbn/i18n-react'; import { Ast } from '@kbn/interpreter'; -import { DatatableRow } from '@kbn/expressions-plugin'; +import { DatatableRow } from '@kbn/expressions-plugin/common'; import { PaletteRegistry, CustomPaletteParams, CUSTOM_PALETTE } from '@kbn/coloring'; import type { GaugeArguments } from '@kbn/expression-gauge-plugin/common'; import { GaugeShapes, EXPRESSION_GAUGE_NAME } from '@kbn/expression-gauge-plugin/common'; diff --git a/x-pack/plugins/lens/public/xy_visualization/color_assignment.test.ts b/x-pack/plugins/lens/public/xy_visualization/color_assignment.test.ts index 67febcd4b9d00..666f729ffb79c 100644 --- a/x-pack/plugins/lens/public/xy_visualization/color_assignment.test.ts +++ b/x-pack/plugins/lens/public/xy_visualization/color_assignment.test.ts @@ -9,7 +9,7 @@ import { getColorAssignments } from './color_assignment'; import type { FormatFactory } from '../../common'; import { layerTypes } from '../../common'; import { XYDataLayerConfig } from './types'; -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; describe('color_assignment', () => { const layers: XYDataLayerConfig[] = [ diff --git a/x-pack/plugins/lens/public/xy_visualization/color_assignment.ts b/x-pack/plugins/lens/public/xy_visualization/color_assignment.ts index f20c207955ad1..e7853384ec797 100644 --- a/x-pack/plugins/lens/public/xy_visualization/color_assignment.ts +++ b/x-pack/plugins/lens/public/xy_visualization/color_assignment.ts @@ -7,7 +7,7 @@ import { uniq, mapValues } from 'lodash'; import type { PaletteOutput, PaletteRegistry } from '@kbn/coloring'; -import type { Datatable } from '@kbn/expressions-plugin'; +import type { Datatable } from '@kbn/expressions-plugin/common'; import { euiLightVars } from '@kbn/ui-theme'; import { defaultAnnotationColor, diff --git a/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts b/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts index 1a4b944a9764c..d16cbd86df3cf 100644 --- a/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts +++ b/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts @@ -24,7 +24,7 @@ import { LensIconChartBar } from '../assets/chart_bar'; import type { VisualizeEditorLayersContext } from '@kbn/visualizations-plugin/public'; import { chartPluginMock } from '@kbn/charts-plugin/public/mocks'; import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks'; -import { Datatable } from '@kbn/expressions-plugin'; +import { Datatable } from '@kbn/expressions-plugin/common'; import { themeServiceMock } from '@kbn/core/public/mocks'; import { eventAnnotationServiceMock } from '@kbn/event-annotation-plugin/public/mocks'; import { EventAnnotationConfig } from '@kbn/event-annotation-plugin/common'; diff --git a/x-pack/plugins/lens/server/expressions/utils.ts b/x-pack/plugins/lens/server/expressions/utils.ts index 17e0508a8696c..87308545c3d7d 100644 --- a/x-pack/plugins/lens/server/expressions/utils.ts +++ b/x-pack/plugins/lens/server/expressions/utils.ts @@ -6,7 +6,7 @@ */ import { CoreSetup, CoreStart } from '@kbn/core/server'; -import { ExecutionContext } from '@kbn/expressions-plugin'; +import { ExecutionContext } from '@kbn/expressions-plugin/common'; import { PluginStartContract } from '../plugin'; const getUiSettings = (coreStart: CoreStart, context: ExecutionContext) => { diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx index 532353cea02d8..0baa70ead96e4 100644 --- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx +++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_renderer.tsx @@ -7,7 +7,7 @@ import React, { lazy } from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; -import type { ExpressionRenderDefinition } from '@kbn/expressions-plugin'; +import type { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common'; import type { RegionMapVisRenderValue } from './region_map_fn'; import { LazyWrapper } from '../../lazy_wrapper'; import { REGION_MAP_RENDER } from './types'; diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx index 90b0d0a66fa9d..233bd9350e2e7 100644 --- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx +++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_renderer.tsx @@ -7,7 +7,7 @@ import React, { lazy } from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; -import type { ExpressionRenderDefinition } from '@kbn/expressions-plugin'; +import type { ExpressionRenderDefinition } from '@kbn/expressions-plugin/common'; import type { TileMapVisRenderValue } from './tile_map_fn'; import { LazyWrapper } from '../../lazy_wrapper'; import { TILE_MAP_RENDER } from './types'; diff --git a/x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts b/x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts index 97d66ae5a6aa6..0f85a7b332e37 100644 --- a/x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts +++ b/x-pack/plugins/maps/public/trigger_actions/trigger_utils.ts @@ -6,7 +6,7 @@ */ import { Action } from '@kbn/ui-actions-plugin/public'; -import { DatatableColumnType } from '@kbn/expressions-plugin'; +import { DatatableColumnType } from '@kbn/expressions-plugin/common'; import { RawValue } from '../../common/constants'; export function isUrlDrilldown(action: Action) { From ce8bd8c5b969bc5cb63ac862dad484ed730b80f5 Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Mon, 25 Jul 2022 14:02:02 +0000 Subject: [PATCH 3/3] [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix' --- .../common/expression_functions/gauge_function.test.ts | 2 +- .../common/expression_functions/heatmap_function.test.ts | 2 +- .../common/expression_functions/metric_vis_function.test.ts | 2 +- .../common/expression_functions/mosaic_vis_function.test.ts | 2 +- .../common/expression_functions/pie_vis_function.test.ts | 2 +- .../common/expression_functions/treemap_vis_function.test.ts | 2 +- .../common/expression_functions/waffle_vis_function.test.ts | 2 +- .../common/expression_functions/tagcloud_function.test.ts | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.test.ts b/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.test.ts index bc9572c761584..078990d237dbf 100644 --- a/src/plugins/chart_expressions/expression_gauge/common/expression_functions/gauge_function.test.ts +++ b/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()); diff --git a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.test.ts b/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.test.ts index 95b677dff6846..b3506cfa3578f 100644 --- a/src/plugins/chart_expressions/expression_heatmap/common/expression_functions/heatmap_function.test.ts +++ b/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()); diff --git a/src/plugins/chart_expressions/expression_legacy_metric/common/expression_functions/metric_vis_function.test.ts b/src/plugins/chart_expressions/expression_legacy_metric/common/expression_functions/metric_vis_function.test.ts index 7f21d4fa33ef0..ed5096452405f 100644 --- a/src/plugins/chart_expressions/expression_legacy_metric/common/expression_functions/metric_vis_function.test.ts +++ b/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()); diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.test.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.test.ts index 671c1f3343717..46816ee1f34b8 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/mosaic_vis_function.test.ts +++ b/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()); diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.test.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.test.ts index 8b235a68c4c4f..9a18a348be16f 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/pie_vis_function.test.ts +++ b/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()); diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.test.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.test.ts index 94cb21f6b406b..14aaea3a0cf5e 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/treemap_vis_function.test.ts +++ b/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()); diff --git a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.test.ts b/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.test.ts index e0e8bb7c79d3b..608c40b501066 100644 --- a/src/plugins/chart_expressions/expression_partition_vis/common/expression_functions/waffle_vis_function.test.ts +++ b/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()); diff --git a/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.test.ts b/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.test.ts index 028f835db6f31..da24790050d25 100644 --- a/src/plugins/chart_expressions/expression_tagcloud/common/expression_functions/tagcloud_function.test.ts +++ b/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['fn']>[1];