Cleanup.

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

@@ -22,7 +22,7 @@ import { identity } from 'lodash';
 import { AggConfig, IAggConfig } from './agg_config';
 import { AggConfigs, CreateAggConfigParams } from './agg_configs';
 import { AggType } from './agg_type';
-import { AggTypesRegistryStart } from './types';
+import { AggTypesRegistryStart } from './agg_types_registry';
 import { mockAggTypesRegistry } from './test_helpers';
 import { MetricAggType } from './metrics/metric_agg_type';
 import { IndexPattern } from '../../index_patterns/index_patterns/index_pattern';

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

@@ -20,7 +20,7 @@
 import { keyBy } from 'lodash';
 import { AggConfig } from './agg_config';
 import { AggConfigs } from './agg_configs';
-import { AggTypesRegistryStart } from './types';
+import { AggTypesRegistryStart } from './agg_types_registry';
 import { mockAggTypesRegistry } from './test_helpers';
 import type { IndexPatternField } from '../../index_patterns';
 import { IndexPattern } from '../../index_patterns/index_patterns/index_pattern';

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

@@ -23,7 +23,7 @@ import { Assign } from '@kbn/utility-types';
 import { FetchOptions, ISearchSource } from 'src/plugins/data/public';
 import { AggConfig, AggConfigSerialized, IAggConfig } from './agg_config';
 import { IAggType } from './agg_type';
-import { AggTypesRegistryStart } from './types';
+import { AggTypesRegistryStart } from './agg_types_registry';
 import { AggGroupNames } from './agg_groups';
 import { IndexPattern } from '../../index_patterns/index_patterns/index_pattern';
 import { TimeRange } from '../../../common';

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

@@ -18,7 +18,6 @@
  */
 
 import { AggTypesRegistry, AggTypesRegistrySetup } from './agg_types_registry';
-import { AggTypesRegistryStart } from './types';
 import { BucketAggType } from './buckets/bucket_agg_type';
 import { MetricAggType } from './metrics/metric_agg_type';
 
@@ -28,7 +27,7 @@ const metricType = () => ({ name: 'count', type: 'metrics' } as MetricAggType<an
 describe('AggTypesRegistry', () => {
   let registry: AggTypesRegistry;
   let setup: AggTypesRegistrySetup;
-  let start: AggTypesRegistryStart;
+  let start: ReturnType<AggTypesRegistry['start']>;
 
   beforeEach(() => {
     registry = new AggTypesRegistry();

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

@@ -22,6 +22,18 @@ import { MetricAggType } from './metrics/metric_agg_type';
 import { AggTypesDependencies } from './agg_types';
 
 export type AggTypesRegistrySetup = ReturnType<AggTypesRegistry['setup']>;
+/**
+ * AggsCommonStart returns the _unitialized_ agg type providers, but in our
+ * real start contract we will need to return the initialized versions.
+ * So we need to provide the correct typings so they can be overwritten
+ * on client/server.
+ *
+ * @internal
+ */
+export interface AggTypesRegistryStart {
+  get: (id: string) => BucketAggType<any> | MetricAggType<any>;
+  getAll: () => { buckets: Array<BucketAggType<any>>; metrics: Array<MetricAggType<any>> };
+}
 
 export class AggTypesRegistry {
   private readonly bucketAggs = new Map();

src/plugins/data/common/search/aggs/test_helpers/mock_agg_types_registry.ts

@@ -19,10 +19,9 @@
 
 import { fieldFormatsMock } from '../../../field_formats/mocks';
 
-import { AggTypesRegistry } from '../agg_types_registry';
+import { AggTypesRegistry, AggTypesRegistryStart } from '../agg_types_registry';
 import { AggTypesDependencies, getAggTypes } from '../agg_types';
 import { TimeBucketsConfig } from '../buckets/lib/time_buckets/time_buckets';
-import { AggTypesRegistryStart } from '../types';
 
 // Mocked uiSettings shared among aggs unit tests
 const mockGetConfig = jest.fn().mockImplementation((key: string) => {

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

@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { Assign } from '@kbn/utility-types';
 import { IndexPattern } from '../../index_patterns/index_patterns/index_pattern';
 import {
   AggConfigSerialized,
@@ -54,10 +55,9 @@ import {
   AggParamsDateHistogram,
   AggTypesRegistry,
   AggTypesRegistrySetup,
-  BucketAggType,
+  AggTypesRegistryStart,
   CreateAggConfigParams,
   getCalculateAutoTimeExpression,
-  MetricAggType,
   METRIC_TYPES,
   BUCKET_TYPES,
 } from './';
@@ -89,17 +89,13 @@ export interface AggsCommonStart {
 }
 
 /**
- * AggsCommonStart returns the _unitialized_ agg type providers, but in our
- * real start contract we will need to return the initialized versions.
- * So we need to provide the correct typings so they can be overwritten
- * on client/server.
+ * AggsStart represents the actual external contract as AggsCommonStart
+ * is only used internally. The difference is that AggsStart includes the
+ * typings for the registry with initialized agg types.
  *
  * @internal
  */
-export interface AggTypesRegistryStart {
-  get: (id: string) => BucketAggType<any> | MetricAggType<any>;
-  getAll: () => { buckets: Array<BucketAggType<any>>; metrics: Array<MetricAggType<any>> };
-}
+export type AggsStart = Assign<AggsCommonStart, { types: AggTypesRegistryStart }>;
 
 /** @internal */
 export interface BaseAggParams {

src/plugins/data/public/search/aggs/types.ts

@@ -17,8 +17,7 @@
  * under the License.
  */
 
-import { Assign } from '@kbn/utility-types';
-import { AggsCommonSetup, AggsCommonStart, AggTypesRegistryStart } from '../../../common';
+import { AggsCommonSetup } from '../../../common';
 
 export type AggsSetup = AggsCommonSetup;
-export type AggsStart = Assign<AggsCommonStart, { types: AggTypesRegistryStart }>;
+export { AggsStart } from '../../../common';

src/plugins/data/server/search/aggs/types.ts

@@ -17,14 +17,11 @@
  * under the License.
  */
 
-import { Assign } from '@kbn/utility-types';
 import { SavedObjectsClientContract } from 'src/core/server';
-import { AggsCommonSetup, AggsCommonStart, AggTypesRegistryStart } from '../../../common';
+import { AggsCommonSetup, AggsStart as Start } from '../../../common';
 
 export type AggsSetup = AggsCommonSetup;
 
 export interface AggsStart {
-  asScopedToClient: (
-    savedObjectsClient: SavedObjectsClientContract
-  ) => Promise<Assign<AggsCommonStart, { types: AggTypesRegistryStart }>>;
+  asScopedToClient: (savedObjectsClient: SavedObjectsClientContract) => Promise<Start>;
 }