WIP: Move agg_types into data shim plugin

src/legacy/core_plugins/data/public/index.ts

@@ -31,6 +31,20 @@ export { DataStart };
 
 export { Field, FieldType, IFieldList, IndexPattern } from './index_patterns';
 export { SearchBar, SearchBarProps } from './search';
+export {
+  // agg_types
+  AggParam,
+  AggParamOption,
+  DateRangeKey,
+  IpRangeKey,
+  OptionedParamEditorProps,
+  OptionedValueProp,
+  // search_source
+  EsQuerySortValue,
+  FetchOptions,
+  ISearchSource,
+  SortDirection,
+} from './search/types';
 export {
   SavedQueryAttributes,
   SavedQuery,
@@ -41,3 +55,22 @@ export {
 export * from '../common';
 export { FilterStateManager } from './filter/filter_manager';
 export { getFromSavedObject, getRoutes, flattenHitWrapper } from './index_patterns';
+export {
+  // agg_types
+  AggParamType,
+  aggTypeFilters,
+  CidrMask,
+  convertDateRangeToString,
+  convertIPRangeToString,
+  intervalOptions, // only used in Discover
+  isDateHistogramBucketAggConfig,
+  isStringType,
+  isType,
+  isValidInterval,
+  isValidJson,
+  OptionedParamType,
+  propFilter,
+  // search_source
+  getRequestInspectorStats,
+  getResponseInspectorStats,
+} from './search';

src/legacy/core_plugins/data/public/plugin.ts

@@ -18,7 +18,7 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { createSearchBar, StatetfulSearchBarProps } from './search';
+import { createSearchBar, StatetfulSearchBarProps, SearchService, SearchStart } from './search';
 import { Storage, IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
 import { DataPublicPluginStart } from '../../../../plugins/data/public';
 import { initLegacyModule } from './shim/legacy_module';
@@ -36,6 +36,7 @@ export interface DataPluginStartDependencies {
  * @public
  */
 export interface DataStart {
+  search: SearchStart;
   ui: {
     SearchBar: React.ComponentType<StatetfulSearchBarProps>;
   };
@@ -54,6 +55,7 @@ export interface DataStart {
  */
 
 export class DataPlugin implements Plugin<void, DataStart, {}, DataPluginStartDependencies> {
+  private readonly search: SearchService = new SearchService();
   private storage!: IStorageWrapper;
 
   public setup(core: CoreSetup) {
@@ -72,11 +74,14 @@ export class DataPlugin implements Plugin<void, DataStart, {}, DataPluginStartDe
     });
 
     return {
+      search: this.search.start(core),
       ui: {
         SearchBar,
       },
     };
   }
 
-  public stop() {}
+  public stop() {
+    this.search.stop();
+  }
 }

src/legacy/ui/public/agg_types/__tests__/buckets/_terms_other_bucket_helper.js → src/legacy/core_plugins/data/public/search/agg_types/__tests__/buckets/_terms_other_bucket_helper.js

@@ -20,7 +20,7 @@
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import { buildOtherBucketAgg, mergeOtherBucketAggResponse, updateMissingBucket } from '../../buckets/_terms_other_bucket_helper';
-import { Vis } from '../../../vis';
+import { Vis } from 'ui/vis';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 const visConfigSingleTerm = {