From 090a4073cf083d986a98b6d6882b0dbfad7d2da8 Mon Sep 17 00:00:00 2001
From: Liza Katz <liza.katz@elastic.co>
Date: Thu, 12 Sep 2019 20:50:00 +0300
Subject: [PATCH] Improved exports of expressions plugin (#45538)

* Improved exports of expressions plugin

* typo

* Remove unused interfaces
---
 .../expressions/public/expressions/index.ts   |  1 +
 .../core_plugins/expressions/public/index.ts  | 11 ++-----
 .../core_plugins/expressions/public/mocks.ts  | 10 +++---
 .../core_plugins/expressions/public/plugin.ts | 31 ++++++++-----------
 4 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/src/legacy/core_plugins/expressions/public/expressions/index.ts b/src/legacy/core_plugins/expressions/public/expressions/index.ts
index ae51804a85fb..707bcd3cd883 100644
--- a/src/legacy/core_plugins/expressions/public/expressions/index.ts
+++ b/src/legacy/core_plugins/expressions/public/expressions/index.ts
@@ -19,3 +19,4 @@
 
 export { ExpressionsService, ExpressionsSetup, ExpressionsStart } from './expressions_service';
 export { ExpressionRenderer, ExpressionRendererProps } from './expression_renderer';
+export { IInterpreterRenderFunction } from './lib/_types';
diff --git a/src/legacy/core_plugins/expressions/public/index.ts b/src/legacy/core_plugins/expressions/public/index.ts
index c567b082d03f..6c6e72fb2aa5 100644
--- a/src/legacy/core_plugins/expressions/public/index.ts
+++ b/src/legacy/core_plugins/expressions/public/index.ts
@@ -18,11 +18,7 @@
  */
 
 // /// Define plugin function
-import {
-  DataExpressionsPlugin as Plugin,
-  DataExpressionsSetup,
-  DataExpressionsStart,
-} from './plugin';
+import { ExpressionsPlugin as Plugin } from './plugin';
 
 export function plugin() {
   return new Plugin();
@@ -31,7 +27,4 @@ export function plugin() {
 // /// Export types & static code
 
 /** @public types */
-export type DataExpressionsSetup = DataExpressionsSetup;
-export type DataExpressionsStart = DataExpressionsStart;
-
-export { ExpressionRenderer, ExpressionRendererProps } from './expressions';
+export * from './expressions';
diff --git a/src/legacy/core_plugins/expressions/public/mocks.ts b/src/legacy/core_plugins/expressions/public/mocks.ts
index c6c0c9d63d05..42ec5bfb5ba6 100644
--- a/src/legacy/core_plugins/expressions/public/mocks.ts
+++ b/src/legacy/core_plugins/expressions/public/mocks.ts
@@ -17,19 +17,21 @@
  * under the License.
  */
 
-import { DataExpressionsSetup } from '.';
+import { ExpressionsSetup, ExpressionsStart } from '.';
 
 function createExpressionsSetupMock() {
-  const mock: MockedKeys<Partial<DataExpressionsSetup>> = {};
+  const mock: MockedKeys<Partial<ExpressionsSetup>> = {};
 
   return mock;
 }
 
 function createExpressionsStartMock() {
-  return {};
+  const mock: MockedKeys<Partial<ExpressionsStart>> = {};
+
+  return mock;
 }
 
-export const dataPluginMock = {
+export const expressionsPluginMock = {
   createSetup: createExpressionsSetupMock,
   createStart: createExpressionsStartMock,
 };
diff --git a/src/legacy/core_plugins/expressions/public/plugin.ts b/src/legacy/core_plugins/expressions/public/plugin.ts
index ea40928daf09..b954238c05e5 100644
--- a/src/legacy/core_plugins/expressions/public/plugin.ts
+++ b/src/legacy/core_plugins/expressions/public/plugin.ts
@@ -29,11 +29,11 @@ import {
  *
  * @internal
  */
-export interface DataExpressionsPluginSetupDependencies {
+export interface ExpressionsPluginSetupDependencies {
   inspector: InspectorSetup;
 }
 
-export interface DataExpressionsPluginStartDependencies {
+export interface ExpressionsPluginStartDependencies {
   inspector: InspectorStart;
 }
 
@@ -42,32 +42,27 @@ export interface DataExpressionsPluginStartDependencies {
  *
  * @public
  */
-export interface DataExpressionsSetup {
-  expressions: ExpressionsSetup;
-}
 
-export interface DataExpressionsStart {
-  expressions: ExpressionsStart;
-}
-
-export class DataExpressionsPlugin
+export class ExpressionsPlugin
   implements
-    Plugin<DataExpressionsSetup, DataExpressionsStart, DataExpressionsPluginSetupDependencies> {
+    Plugin<
+      ExpressionsSetup,
+      ExpressionsStart,
+      ExpressionsPluginSetupDependencies,
+      ExpressionsPluginStartDependencies
+    > {
   // Exposed services, sorted alphabetically
   private readonly expressions: ExpressionsService = new ExpressionsService();
 
-  public setup(core: CoreSetup): DataExpressionsSetup {
+  public setup(core: CoreSetup): ExpressionsSetup {
     return {
-      expressions: this.expressions.setup(),
+      ...this.expressions.setup(),
     };
   }
 
-  public start(
-    core: CoreStart,
-    plugins: DataExpressionsPluginStartDependencies
-  ): DataExpressionsStart {
+  public start(core: CoreStart, plugins: ExpressionsPluginStartDependencies): ExpressionsStart {
     return {
-      expressions: this.expressions.start({ inspector: plugins.inspector }),
+      ...this.expressions.start({ inspector: plugins.inspector }),
     };
   }