Fix TS!

src/legacy/core_plugins/data/public/actions/filters/brush_event.test.ts

@@ -21,10 +21,11 @@ import moment from 'moment';
 
 import { onBrushEvent, BrushEvent } from './brush_event';
 
-import { mockDataServices } from '../../search/aggs/test_helpers';
 import { IndexPatternsContract } from '../../../../../../plugins/data/public';
 import { dataPluginMock } from '../../../../../../plugins/data/public/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { mockDataServices } from '../../../../../../plugins/data/public/search/aggs/test_helpers';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { setIndexPatterns } from '../../../../../../plugins/data/public/services';
 
 describe('brushEvent', () => {

src/legacy/core_plugins/data/public/actions/filters/create_filters_from_event.test.ts

@@ -27,7 +27,8 @@ import {
 import { setIndexPatterns } from '../../../../../../plugins/data/public/services';
 import { dataPluginMock } from '../../../../../../plugins/data/public/mocks';
 import { createFiltersFromEvent, EventData } from './create_filters_from_event';
-import { mockDataServices } from '../../search/aggs/test_helpers';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { mockDataServices } from '../../../../../../plugins/data/public/search/aggs/test_helpers';
 
 jest.mock('ui/new_platform');
 

src/legacy/core_plugins/vis_default_editor/public/components/agg_common_props.ts

@@ -18,7 +18,7 @@
  */
 
 import { VisState, VisParams } from 'src/legacy/core_plugins/visualizations/public';
-import { IAggType, IAggConfig, AggGroupNames } from '../legacy_imports';
+import { IAggType, IAggConfig, IAggGroupNames } from '../legacy_imports';
 import { Schema } from '../schemas';
 
 type AggId = IAggConfig['id'];
@@ -29,7 +29,7 @@ export type ReorderAggs = (sourceAgg: IAggConfig, destinationAgg: IAggConfig) =>
 
 export interface DefaultEditorCommonProps {
   formIsTouched: boolean;
-  groupName: AggGroupNames;
+  groupName: IAggGroupNames;
   metricAggs: IAggConfig[];
   state: VisState;
   setAggParamValue: <T extends keyof AggParams>(

src/legacy/core_plugins/vis_default_editor/public/components/controls/raw_json.tsx

@@ -23,7 +23,7 @@ import { EuiFormRow, EuiIconTip, EuiTextArea } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { isValidJson } from '../../legacy_imports';
+import { isValidJson } from '../../utils';
 import { AggParamEditorProps } from '../agg_param_props';
 
 function RawJsonParamEditor({

src/legacy/core_plugins/vis_default_editor/public/legacy_imports.ts

@@ -19,31 +19,30 @@
 
 /* `ui/agg_types` dependencies */
 export {
-  AggType,
-  IAggType,
-  IAggConfig,
-  IAggConfigs,
-  AggParam,
   AggGroupNames,
   aggGroupNamesMap,
+  AggParam,
+  AggParamType,
+  AggType,
   aggTypes,
+  BUCKET_TYPES,
   createAggConfigs,
   FieldParamType,
+  IAggConfig,
+  IAggConfigs,
+  IAggGroupNames,
+  IAggType,
   IFieldParamType,
-  BUCKET_TYPES,
   METRIC_TYPES,
   termsAggFilter,
 } from 'ui/agg_types';
 export { aggTypeFilters, propFilter } from 'ui/agg_types';
 export { aggTypeFieldFilters } from 'ui/agg_types';
-export { AggParamType } from 'ui/agg_types';
 export { MetricAggType, IMetricAggType } from 'ui/agg_types';
 export { parentPipelineType } from 'ui/agg_types';
 export { siblingPipelineType } from 'ui/agg_types';
 export { isType, isStringType } from 'ui/agg_types';
 export { OptionedValueProp, OptionedParamEditorProps, OptionedParamType } from 'ui/agg_types';
-export { isValidJson, isValidInterval } from 'ui/agg_types';
+export { isValidInterval } from 'ui/agg_types';
 export { AggParamOption } from 'ui/agg_types';
 export { CidrMask } from 'ui/agg_types';
-
-export * from 'ui/vis/lib';

src/legacy/core_plugins/vis_default_editor/public/schemas.ts

@@ -22,8 +22,8 @@ import _ from 'lodash';
 import { Optional } from '@kbn/utility-types';
 
 import { IndexedArray } from 'ui/indexed_array';
-import { AggGroupNames } from '../../data/public/search/aggs/agg_groups';
-import { AggParam } from '../../data/public/search/aggs/agg_params';
+import { search, AggParam, IAggGroupNames } from '../../../../plugins/data/public';
+const { AggGroupNames } = search.aggs;
 
 export interface ISchemas {
   [AggGroupNames.Buckets]: Schema[];
@@ -34,7 +34,7 @@ export interface ISchemas {
 export interface Schema {
   aggFilter: string[];
   editor: boolean | string;
-  group: AggGroupNames;
+  group: IAggGroupNames;
   max: number;
   min: number;
   name: string;

src/legacy/core_plugins/vis_type_timelion/public/components/timelion_interval.tsx

@@ -21,7 +21,8 @@ import React, { useMemo, useCallback } from 'react';
 import { EuiFormRow, EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { isValidEsInterval } from '../../../../core_plugins/data/common';
+import { search } from '../../../../../plugins/data/public';
+const { isValidEsInterval } = search.aggs;
 import { useValidation } from '../../../vis_default_editor/public';
 
 const intervalOptions = [

src/legacy/core_plugins/vis_type_timeseries/public/components/lib/get_interval.js

@@ -19,7 +19,7 @@
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
-import { parseEsInterval } from '../../../../data/public';
+import { parseEsInterval } from '../../../../../../plugins/data/public';
 import { GTE_INTERVAL_RE } from '../../../../../../plugins/vis_type_timeseries/common/interval_regexp';
 
 export const AUTO_INTERVAL = 'auto';

src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx

@@ -22,8 +22,8 @@ import { compact, uniq, map, every, isUndefined } from 'lodash';
 
 import { i18n } from '@kbn/i18n';
 import { EuiPopoverProps, EuiIcon, keyCodes, htmlIdGenerator } from '@elastic/eui';
-import { IAggConfig } from '../../../../../data/public';
 
+import { IAggConfig } from '../../../../../../../plugins/data/public';
 import { createFiltersFromEvent } from '../../../../../data/public/actions/filters/create_filters_from_event';
 import { CUSTOM_LEGEND_VIS_TYPES, LegendItem } from './models';
 import { VisLegendItem } from './legend_item';

src/legacy/core_plugins/visualizations/public/np_ready/public/legacy.ts

@@ -17,21 +17,11 @@
  * under the License.
  */
 
-/* eslint-disable @kbn/eslint/no-restricted-paths */
 import { npSetup, npStart } from 'ui/new_platform';
-import { start as legacyDataStart } from '../../../../data/public/legacy';
-/* eslint-enable @kbn/eslint/no-restricted-paths */
-
 import { PluginInitializerContext } from '../../../../../../core/public';
-
 import { plugin } from '.';
 
 const pluginInstance = plugin({} as PluginInitializerContext);
 
 export const setup = pluginInstance.setup(npSetup.core, npSetup.plugins);
-export const start = pluginInstance.start(npStart.core, {
-  ...npStart.plugins,
-  __LEGACY: {
-    aggs: legacyDataStart.search.aggs,
-  },
-});
+export const start = pluginInstance.start(npStart.core, npStart.plugins);

src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.test.ts

@@ -28,7 +28,7 @@ import {
 } from './build_pipeline';
 import { Vis } from '..';
 import { searchSourceMock, dataPluginMock } from '../../../../../../../plugins/data/public/mocks';
-import { IAggConfig } from '../../../../../data/public';
+import { IAggConfig } from '../../../../../../../plugins/data/public';
 
 jest.mock('ui/new_platform');
 

src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts

@@ -22,11 +22,13 @@ import moment from 'moment';
 import { SerializedFieldFormat } from '../../../../../../../plugins/expressions/public';
 import {
   fieldFormats,
+  IAggConfig,
   ISearchSource,
+  search,
   TimefilterContract,
 } from '../../../../../../../plugins/data/public';
+const { isDateHistogramBucketAggConfig } = search.aggs;
 import { Vis, VisParams } from '../types';
-import { IAggConfig, isDateHistogramBucketAggConfig } from '../../../../../data/public';
 
 interface SchemaConfigParams {
   precision?: number;

src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts

@@ -57,11 +57,6 @@ const createInstance = async () => {
       data: dataPluginMock.createStartContract(),
       expressions: expressionsPluginMock.createStartContract(),
       uiActions: uiActionsPluginMock.createStartContract(),
-      __LEGACY: {
-        aggs: {
-          createAggConfigs: jest.fn(),
-        } as any,
-      },
     });
 
   return {

src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts

@@ -55,7 +55,6 @@ import { createSavedVisLoader, SavedVisualizationsLoader } from './saved_visuali
 import { VisImpl } from './vis_impl';
 import { showNewVisModal } from './wizard';
 import { UiActionsStart } from '../../../../../../plugins/ui_actions/public';
-import { DataStart as LegacyDataStart } from '../../../../data/public';
 import { VisState } from './types';
 
 /**
@@ -83,9 +82,6 @@ export interface VisualizationsStartDeps {
   data: DataPublicPluginStart;
   expressions: ExpressionsStart;
   uiActions: UiActionsStart;
-  __LEGACY: {
-    aggs: LegacyDataStart['search']['aggs'];
-  };
 }
 
 /**
@@ -128,7 +124,7 @@ export class VisualizationsPlugin
 
   public start(
     core: CoreStart,
-    { data, expressions, uiActions, __LEGACY: { aggs } }: VisualizationsStartDeps
+    { data, expressions, uiActions }: VisualizationsStartDeps
   ): VisualizationsStart {
     const types = this.types.start();
     setI18n(core.i18n);
@@ -141,7 +137,7 @@ export class VisualizationsPlugin
     setExpressions(expressions);
     setUiActions(uiActions);
     setTimeFilter(data.query.timefilter.timefilter);
-    setAggs(aggs);
+    setAggs(data.search.aggs);
     const savedVisualizationsLoader = createSavedVisLoader({
       savedObjectsClient: core.savedObjects.client,
       indexPatterns: data.indexPatterns,

src/legacy/core_plugins/visualizations/public/np_ready/public/services.ts

@@ -27,6 +27,7 @@ import {
 import { TypesStart } from './vis_types';
 import { createGetterSetter } from '../../../../../../plugins/kibana_utils/public';
 import {
+  DataPublicPluginStart,
   FilterManager,
   IndexPatternsContract,
   TimefilterContract,
@@ -35,7 +36,6 @@ import { UsageCollectionSetup } from '../../../../../../plugins/usage_collection
 import { ExpressionsStart } from '../../../../../../plugins/expressions/public';
 import { UiActionsStart } from '../../../../../../plugins/ui_actions/public';
 import { SavedVisualizationsLoader } from './saved_visualizations';
-import { DataStart as LegacyDataStart } from '../../../../data/public';
 
 export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
 
@@ -73,6 +73,6 @@ export const [getSavedVisualizationsLoader, setSavedVisualizationsLoader] = crea
   SavedVisualizationsLoader
 >('SavedVisualisationsLoader');
 
-export const [getAggs, setAggs] = createGetterSetter<LegacyDataStart['search']['aggs']>(
+export const [getAggs, setAggs] = createGetterSetter<DataPublicPluginStart['search']['aggs']>(
   'AggConfigs'
 );

src/legacy/core_plugins/visualizations/public/np_ready/public/vis.ts

@@ -19,7 +19,7 @@
 
 import { VisType } from './vis_types';
 import { Status } from './legacy/update_status';
-import { IAggConfigs } from '../../../../data/public';
+import { IAggConfigs } from '../../../../../../plugins/data/public';
 
 export interface Vis {
   type: VisType;

src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.d.ts

@@ -19,9 +19,8 @@
 
 import { Vis, VisState, VisParams } from './vis';
 import { VisType } from './vis_types';
-import { IIndexPattern } from '../../../../../../plugins/data/common';
+import { IAggConfig, IIndexPattern } from '../../../../../../plugins/data/public';
 import { Schema } from '../../../../vis_default_editor/public';
-import { IAggConfig } from '../../../../data/public/search/aggs';
 
 type InitVisStateType =
   | Partial<VisState>

src/legacy/ui/public/agg_types/index.ts

@@ -20,16 +20,16 @@
 /**
  * Nothing to see here!
  *
- * Agg Types have moved to the data plugin, and are being
+ * Agg Types have moved to the new platform, and are being
  * re-exported from ui/agg_types for backwards compatibility.
  */
 
-import { start as dataStart } from '../../../core_plugins/data/public/legacy';
+import { npStart } from 'ui/new_platform';
 
 // runtime contracts
-const { types } = dataStart.search.aggs;
+const { types } = npStart.plugins.data.search.aggs;
 export const aggTypes = types.getAll();
-export const { createAggConfigs } = dataStart.search.aggs;
+export const { createAggConfigs } = npStart.plugins.data.search.aggs;
 export const {
   AggConfig,
   AggType,
@@ -38,33 +38,35 @@ export const {
   MetricAggType,
   parentPipelineAggHelper,
   siblingPipelineAggHelper,
-} = dataStart.search.aggs.__LEGACY;
+} = npStart.plugins.data.search.__LEGACY;
 
 // types
 export {
+  AggParam,
+  AggParamOption,
+  AggParamType,
+  AggTypeFieldFilters,
+  AggTypeFilters,
+  DateRangeKey,
   IAggConfig,
   IAggConfigs,
+  IAggGroupNames,
   IAggType,
   IFieldParamType,
   IMetricAggType,
-  AggParam,
-  AggParamOption,
-  BUCKET_TYPES,
-  DateRangeKey,
   IpRangeKey,
-  METRIC_TYPES,
   OptionedParamEditorProps,
+  OptionedParamType,
   OptionedValueProp,
-} from '../../../core_plugins/data/public';
+} from '../../../../plugins/data/public';
 
 // static code
-export {
-  AggParamType,
-  AggTypeFilters,
-  aggTypeFilters,
-  AggTypeFieldFilters,
+import { search } from '../../../../plugins/data/public';
+export const {
   AggGroupNames,
   aggGroupNamesMap,
+  aggTypeFilters,
+  BUCKET_TYPES,
   CidrMask,
   convertDateRangeToString,
   convertIPRangeToString,
@@ -73,12 +75,11 @@ export {
   isStringType,
   isType,
   isValidInterval,
-  isValidJson,
-  OptionedParamType,
+  METRIC_TYPES,
   parentPipelineType,
   propFilter,
   siblingPipelineType,
   termsAggFilter,
-} from '../../../core_plugins/data/public';
+} = search.aggs;
 
 export { ISchemas, Schemas, Schema } from '../../../core_plugins/vis_default_editor/public/schemas';

src/plugins/data/public/field_formats/utils/deserialize.ts

@@ -19,14 +19,8 @@
 
 import { identity } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import {
-  convertDateRangeToString,
-  DateRangeKey,
-} from '../../../../../legacy/core_plugins/data/public/search/aggs/buckets/lib/date_range';
-import {
-  convertIPRangeToString,
-  IpRangeKey,
-} from '../../../../../legacy/core_plugins/data/public/search/aggs/buckets/lib/ip_range';
+import { convertDateRangeToString, DateRangeKey } from '../../search/aggs/buckets/lib/date_range';
+import { convertIPRangeToString, IpRangeKey } from '../../search/aggs/buckets/lib/ip_range';
 import { SerializedFieldFormat } from '../../../../expressions/common/types';
 import { FieldFormatId, FieldFormatsContentType, IFieldFormat } from '../..';
 import { FieldFormat } from '../../../common';