[lens] Fix usage of expressions plugin

src/plugins/expressions/common/expressions/index.ts

@@ -18,6 +18,7 @@
  */
 
 export * from './types';
+export * from './expression_types';
 export { Type } from './interpreter';
 export { interpreterProvider } from './interpreter_provider';
 export { serializeProvider, getType } from './serialize_provider';

x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/expression.tsx

@@ -8,9 +8,12 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { i18n } from '@kbn/i18n';
 import { EuiBasicTable } from '@elastic/eui';
-import { ExpressionFunction, KibanaDatatable } from 'src/legacy/core_plugins/interpreter/types';
+import {
+  ExpressionFunction,
+  KibanaDatatable,
+} from '../../../../../../src/plugins/expressions/common';
 import { LensMultiTable } from '../types';
-import { IInterpreterRenderFunction } from '../../../../../../src/legacy/core_plugins/data/public/expressions/lib/_types';
+import { IInterpreterRenderFunction } from '../../../../../../src/legacy/core_plugins/expressions/public';
 import { FormatFactory } from '../../../../../../src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities';
 
 export interface DatatableColumns {

x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/plugin.tsx

@@ -4,12 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// import { Registry } from '@kbn/interpreter/target/common';
 import { CoreSetup } from 'src/core/public';
 import { getFormat, FormatFactory } from 'ui/visualize/loader/pipeline_helpers/utilities';
 import { datatableVisualization } from './visualization';
-import { ExpressionsSetup } from '../../../../../../src/legacy/core_plugins/data/public/expressions';
-import { setup as dataSetup } from '../../../../../../src/legacy/core_plugins/data/public/legacy';
+import { ExpressionsSetup } from '../../../../../../src/legacy/core_plugins/expressions/public';
+import { setup as expressionsSetup } from '../../../../../../src/legacy/core_plugins/expressions/public/legacy';
 import { datatable, datatableColumns, getDatatableRenderer } from './expression';
 
 export interface DatatableVisualizationPluginSetupPlugins {
@@ -42,7 +41,7 @@ const plugin = new DatatableVisualizationPlugin();
 
 export const datatableVisualizationSetup = () =>
   plugin.setup(null, {
-    expressions: dataSetup.expressions,
+    expressions: expressionsSetup,
     fieldFormat: {
       formatFactory: getFormat,
     },

x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.test.tsx

@@ -16,7 +16,7 @@ import {
   createExpressionRendererMock,
   DatasourceMock,
 } from '../mocks';
-import { ExpressionRenderer } from 'src/legacy/core_plugins/data/public';
+import { ExpressionRenderer } from 'src/legacy/core_plugins/expressions/public';
 import { DragDrop } from '../../drag_drop';
 import { EuiPanel, EuiToolTip } from '@elastic/eui';
 

x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/editor_frame.tsx

@@ -5,10 +5,8 @@
  */
 
 import React, { useEffect, useReducer } from 'react';
-import {
-  ExpressionRenderer,
-  Query,
-} from '../../../../../../../src/legacy/core_plugins/data/public';
+import { Query } from '../../../../../../../src/legacy/core_plugins/data/public';
+import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/expressions/public';
 import { Datasource, DatasourcePublicAPI, FramePublicAPI, Visualization } from '../../types';
 import { reducer, getInitialState } from './state_management';
 import { DataPanelWrapper } from './data_panel_wrapper';

x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.test.tsx

@@ -14,7 +14,7 @@ import {
   DatasourceMock,
   createMockFramePublicAPI,
 } from '../mocks';
-import { ExpressionRenderer } from 'src/legacy/core_plugins/data/public';
+import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/expressions/public';
 import { SuggestionPanel, SuggestionPanelProps } from './suggestion_panel';
 import { getSuggestions, Suggestion } from './suggestion_helpers';
 import { fromExpression } from '@kbn/interpreter/target/common';

x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/suggestion_panel.tsx

@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 import { Action } from './state_management';
 import { Datasource, Visualization, FramePublicAPI } from '../../types';
 import { getSuggestions, Suggestion, switchToSuggestion } from './suggestion_helpers';
-import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/data/public';
+import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/expressions/public';
 import { prependDatasourceExpression, prependKibanaContext } from './expression_helpers';
 import { debouncedComponent } from '../../debounced_component';
 

x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.test.tsx

@@ -6,7 +6,7 @@
 
 import React from 'react';
 
-import { ExpressionRendererProps } from '../../../../../../../src/legacy/core_plugins/data/public';
+import { ExpressionRendererProps } from '../../../../../../../src/legacy/core_plugins/expressions/public';
 import { Visualization, FramePublicAPI, TableSuggestion } from '../../types';
 import {
   createMockVisualization,

x-pack/legacy/plugins/lens/public/editor_frame_plugin/editor_frame/workspace_panel.tsx

@@ -8,7 +8,7 @@ import React, { useState, useEffect, useMemo, useContext } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiCodeBlock, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { toExpression } from '@kbn/interpreter/common';
-import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/data/public';
+import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/expressions/public';
 import { Action } from './state_management';
 import { Datasource, Visualization, FramePublicAPI } from '../../types';
 import { DragDrop, DragContext } from '../../drag_drop';

x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable.test.tsx

@@ -6,7 +6,8 @@
 
 import { Embeddable } from './embeddable';
 import { TimeRange } from 'src/plugins/data/public';
-import { Query, ExpressionRendererProps } from 'src/legacy/core_plugins/data/public';
+import { Query } from 'src/legacy/core_plugins/data/public';
+import { ExpressionRendererProps } from 'src/legacy/core_plugins/expressions/public';
 import { Filter } from '@kbn/es-query';
 import { Document } from '../../persistence';
 import { act } from 'react-dom/test-utils';

x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable.tsx

@@ -9,7 +9,8 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
 import { TimeRange } from 'src/plugins/data/public';
-import { Query, StaticIndexPattern, ExpressionRenderer } from 'src/legacy/core_plugins/data/public';
+import { Query, StaticIndexPattern } from 'src/legacy/core_plugins/data/public';
+import { ExpressionRenderer } from 'src/legacy/core_plugins/expressions/public';
 import { Filter } from '@kbn/es-query';
 import { Subscription } from 'rxjs';
 import {

x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable_factory.ts

@@ -9,11 +9,8 @@ import { Chrome } from 'ui/chrome';
 
 import { capabilities } from 'ui/capabilities';
 import { i18n } from '@kbn/i18n';
-import {
-  IndexPatterns,
-  ExpressionRenderer,
-  IndexPattern,
-} from 'src/legacy/core_plugins/data/public';
+import { IndexPatterns, IndexPattern } from 'src/legacy/core_plugins/data/public';
+import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/expressions/public';
 import {
   EmbeddableFactory as AbstractEmbeddableFactory,
   ErrorEmbeddable,

x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/expression_wrapper.tsx

@@ -13,7 +13,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiText, EuiIcon } from '@elastic/eui';
 import { TimeRange } from 'src/plugins/data/public';
 import { Query } from 'src/legacy/core_plugins/data/public';
 import { Filter } from '@kbn/es-query';
-import { ExpressionRenderer } from '../../../../../../../src/legacy/core_plugins/data/public';
+import { ExpressionRenderer } from 'src/legacy/core_plugins/expressions/public';
 
 export interface ExpressionWrapperProps {
   ExpressionRenderer: ExpressionRenderer;

x-pack/legacy/plugins/lens/public/editor_frame_plugin/mocks.tsx

@@ -5,16 +5,16 @@
  */
 
 import React from 'react';
-import { ExpressionRendererProps } from 'src/legacy/core_plugins/data/public';
+import { ExpressionRendererProps } from 'src/legacy/core_plugins/expressions/public';
+import { setup as dataSetup } from '../../../../../../src/legacy/core_plugins/data/public/legacy';
 import {
-  setup as dataSetup,
-  start as dataStart,
-} from '../../../../../../src/legacy/core_plugins/data/public/legacy';
+  ExpressionsSetup,
+  ExpressionsStart,
+} from '../../../../../../src/legacy/core_plugins/expressions/public';
 import { DatasourcePublicAPI, FramePublicAPI, Visualization, Datasource } from '../types';
 import { EditorFrameSetupPlugins, EditorFrameStartPlugins } from './plugin';
 
 type DataSetup = typeof dataSetup;
-type DataStart = typeof dataStart;
 
 export function createMockVisualization(): jest.Mocked<Visualization> {
   return {
@@ -85,11 +85,15 @@ export function createMockFramePublicAPI(): FrameMock {
 type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
 
 export type MockedSetupDependencies = Omit<EditorFrameSetupPlugins, 'data'> & {
-  data: Omit<DataSetup, 'expressions'> & { expressions: jest.Mocked<DataSetup['expressions']> };
+  data: Omit<DataSetup, 'expressions'> & {
+    expressions: jest.Mocked<ExpressionsSetup>;
+  };
 };
 
 export type MockedStartDependencies = Omit<EditorFrameStartPlugins, 'data'> & {
-  data: Omit<DataSetup, 'expressions'> & { expressions: jest.Mocked<DataStart['expressions']> };
+  data: Omit<DataSetup, 'expressions'> & {
+    expressions: jest.Mocked<ExpressionsStart>;
+  };
 };
 
 export function createExpressionRendererMock(): jest.Mock<
@@ -101,11 +105,10 @@ export function createExpressionRendererMock(): jest.Mock<
 
 export function createMockSetupDependencies() {
   return ({
-    data: {
-      expressions: {
-        registerFunction: jest.fn(),
-        registerRenderer: jest.fn(),
-      },
+    data: {},
+    expressions: {
+      registerFunction: jest.fn(),
+      registerRenderer: jest.fn(),
     },
     chrome: {
       getSavedObjectsClient: () => {},
@@ -116,13 +119,13 @@ export function createMockSetupDependencies() {
 export function createMockStartDependencies() {
   return ({
     data: {
-      expressions: {
-        ExpressionRenderer: jest.fn(() => null),
-      },
       indexPatterns: {
         indexPatterns: {},
       },
     },
+    expressions: {
+      ExpressionRenderer: jest.fn(() => null),
+    },
     embeddables: {
       registerEmbeddableFactory: jest.fn(),
     },

x-pack/legacy/plugins/lens/public/editor_frame_plugin/plugin.test.tsx

@@ -22,6 +22,10 @@ jest.mock('../../../../../../src/legacy/core_plugins/data/public/legacy', () =>
   start: {},
   setup: {},
 }));
+jest.mock('../../../../../../src/legacy/core_plugins/expressions/public/legacy', () => ({
+  start: {},
+  setup: {},
+}));
 jest.mock('./embeddable/embeddable_factory', () => ({
   EmbeddableFactory: class Mock {},
 }));

x-pack/legacy/plugins/lens/public/editor_frame_plugin/plugin.tsx

@@ -15,6 +15,10 @@ import {
   setup as dataSetup,
   start as dataStart,
 } from '../../../../../../src/legacy/core_plugins/data/public/legacy';
+import {
+  setup as expressionsSetup,
+  start as expressionsStart,
+} from '../../../../../../src/legacy/core_plugins/expressions/public/legacy';
 import {
   Datasource,
   Visualization,
@@ -29,10 +33,12 @@ import { getActiveDatasourceIdFromDoc } from './editor_frame/state_management';
 
 export interface EditorFrameSetupPlugins {
   data: typeof dataSetup;
+  expressions: typeof expressionsSetup;
 }
 
 export interface EditorFrameStartPlugins {
   data: typeof dataStart;
+  expressions: typeof expressionsStart;
   embeddables: ReturnType<EmbeddablePlugin['start']>;
   chrome: Chrome;
 }
@@ -44,7 +50,7 @@ export class EditorFramePlugin {
   private readonly visualizations: Record<string, Visualization> = {};
 
   public setup(_core: CoreSetup | null, plugins: EditorFrameSetupPlugins): EditorFrameSetup {
-    plugins.data.expressions.registerFunction(() => mergeTables);
+    plugins.expressions.registerFunction(() => mergeTables);
 
     return {
       registerDatasource: (name, datasource) => {
@@ -61,7 +67,7 @@ export class EditorFramePlugin {
       'lens',
       new EmbeddableFactory(
         plugins.chrome,
-        plugins.data.expressions.ExpressionRenderer,
+        plugins.expressions.ExpressionRenderer,
         plugins.data.indexPatterns.indexPatterns
       )
     );
@@ -85,7 +91,7 @@ export class EditorFramePlugin {
                 initialVisualizationId={
                   (doc && doc.visualizationType) || firstVisualizationId || null
                 }
-                ExpressionRenderer={plugins.data.expressions.ExpressionRenderer}
+                ExpressionRenderer={plugins.expressions.ExpressionRenderer}
                 doc={doc}
                 dateRange={dateRange}
                 query={query}
@@ -118,11 +124,13 @@ const editorFrame = new EditorFramePlugin();
 export const editorFrameSetup = () =>
   editorFrame.setup(null, {
     data: dataSetup,
+    expressions: expressionsSetup,
   });
 
 export const editorFrameStart = () =>
   editorFrame.start(null, {
     data: dataStart,
+    expressions: expressionsStart,
     chrome,
     embeddables: embeddablePlugin,
   });

x-pack/legacy/plugins/lens/public/metric_visualization_plugin/metric_expression.tsx

@@ -8,7 +8,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { ExpressionFunction } from 'src/legacy/core_plugins/interpreter/types';
 import { FormatFactory } from 'ui/visualize/loader/pipeline_helpers/utilities';
-import { IInterpreterRenderFunction } from '../../../../../../src/legacy/core_plugins/data/public/expressions/lib/_types';
+import { IInterpreterRenderFunction } from '../../../../../../src/legacy/core_plugins/expressions/public/expressions';
 import { MetricConfig } from './types';
 import { LensMultiTable } from '../types';
 import { AutoScale } from './auto_scale';

x-pack/legacy/plugins/lens/public/metric_visualization_plugin/plugin.tsx

@@ -7,8 +7,8 @@
 import { CoreSetup } from 'src/core/public';
 import { FormatFactory, getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 import { metricVisualization } from './metric_visualization';
-import { ExpressionsSetup } from '../../../../../../src/legacy/core_plugins/data/public/expressions';
-import { setup as dataSetup } from '../../../../../../src/legacy/core_plugins/data/public/legacy';
+import { ExpressionsSetup } from '../../../../../../src/legacy/core_plugins/expressions/public';
+import { setup as expressionsSetup } from '../../../../../../src/legacy/core_plugins/expressions/public/legacy';
 import { metricChart, getMetricChartRenderer } from './metric_expression';
 
 export interface MetricVisualizationPluginSetupPlugins {
@@ -41,7 +41,7 @@ const plugin = new MetricVisualizationPlugin();
 
 export const metricVisualizationSetup = () =>
   plugin.setup(null, {
-    expressions: dataSetup.expressions,
+    expressions: expressionsSetup,
     fieldFormat: {
       formatFactory: getFormat,
     },

x-pack/legacy/plugins/lens/public/types.ts

@@ -6,7 +6,8 @@
 
 import { Ast } from '@kbn/interpreter/common';
 import { EuiIconType } from '@elastic/eui/src/components/icon/icon';
-import { Query, KibanaDatatable } from 'src/plugins/data/common';
+import { Query } from 'src/plugins/data/common';
+import { KibanaDatatable } from '../../../../../src/plugins/expressions/common';
 import { DragContextState } from './drag_drop';
 import { Document } from './persistence';
 

x-pack/legacy/plugins/lens/public/xy_visualization_plugin/plugin.tsx

@@ -8,8 +8,8 @@ import { CoreSetup, UiSettingsClientContract } from 'src/core/public';
 import chrome, { Chrome } from 'ui/chrome';
 import moment from 'moment-timezone';
 import { getFormat, FormatFactory } from 'ui/visualize/loader/pipeline_helpers/utilities';
-import { ExpressionsSetup } from '../../../../../../src/legacy/core_plugins/data/public/expressions';
-import { setup as dataSetup } from '../../../../../../src/legacy/core_plugins/data/public/legacy';
+import { ExpressionsSetup } from '../../../../../../src/legacy/core_plugins/expressions/public';
+import { setup as expressionsSetup } from '../../../../../../src/legacy/core_plugins/expressions/public/legacy';
 import { xyVisualization } from './xy_visualization';
 import { xyChart, getXyChartRenderer } from './xy_expression';
 import { legendConfig, xConfig, layerConfig } from './types';
@@ -66,7 +66,7 @@ const plugin = new XyVisualizationPlugin();
 
 export const xyVisualizationSetup = () =>
   plugin.setup(null, {
-    expressions: dataSetup.expressions,
+    expressions: expressionsSetup,
     fieldFormat: {
       formatFactory: getFormat,
     },

x-pack/legacy/plugins/lens/public/xy_visualization_plugin/xy_expression.tsx

@@ -23,7 +23,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText, IconType } from '@elastic/
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import { FormatFactory } from '../../../../../../src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities';
-import { IInterpreterRenderFunction } from '../../../../../../src/legacy/core_plugins/data/public/expressions/lib/_types';
+import { IInterpreterRenderFunction } from '../../../../../../src/legacy/core_plugins/expressions/public';
 import { LensMultiTable } from '../types';
 import { XYArgs, SeriesType, visualizationTypes } from './types';