Fix imports from restricted paths

DianaDerevyankina · DianaDerevyankina · commit 22bc4b9ff4b7 · 2022-04-13T14:06:22.000+03:00
diff --git a/src/plugins/controls/server/control_group/control_group_container_factory.ts b/src/plugins/controls/server/control_group/control_group_container_factory.ts
@@ -6,8 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddablePersistableStateService } from '../../../embeddable/common';
-import { EmbeddableRegistryDefinition } from '../../../embeddable/server';
+import type {
+  EmbeddablePersistableStateService,
+  EmbeddableRegistryDefinition,
+} from '../../../embeddable/common';
 import { CONTROL_GROUP_TYPE } from '../../common';
 import {
   createControlGroupExtract,
diff --git a/src/plugins/controls/server/control_types/options_list/options_list_embeddable_factory.ts b/src/plugins/controls/server/control_types/options_list/options_list_embeddable_factory.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableRegistryDefinition } from '../../../../embeddable/server';
+import type { EmbeddableRegistryDefinition } from '../../../../embeddable/common';
 import { OPTIONS_LIST_CONTROL } from '../../../common';
 import {
   createOptionsListExtract,
diff --git a/src/plugins/controls/server/control_types/time_slider/time_slider_embeddable_factory.ts b/src/plugins/controls/server/control_types/time_slider/time_slider_embeddable_factory.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableRegistryDefinition } from '../../../../embeddable/server';
+import type { EmbeddableRegistryDefinition } from '../../../../embeddable/common';
 import { TIME_SLIDER_CONTROL } from '../../../common';
 import {
   createTimeSliderExtract,
diff --git a/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts b/src/plugins/dashboard/server/embeddable/dashboard_container_embeddable_factory.ts
@@ -6,8 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddablePersistableStateService } from 'src/plugins/embeddable/common';
-import { EmbeddableRegistryDefinition } from '../../../embeddable/server';
+import type {
+  EmbeddablePersistableStateService,
+  EmbeddableRegistryDefinition,
+} from 'src/plugins/embeddable/common';
 import {
   createExtract,
   createInject,
diff --git a/src/plugins/embeddable/common/index.ts b/src/plugins/embeddable/common/index.ts
@@ -12,6 +12,7 @@ export type {
   EmbeddableStateWithType,
   PanelState,
   EmbeddablePersistableStateService,
+  EmbeddableRegistryDefinition,
 } from './types';
 export { ViewMode } from './types';
 export type { SavedObjectEmbeddableInput } from './lib';
diff --git a/src/plugins/embeddable/common/types.ts b/src/plugins/embeddable/common/types.ts
@@ -8,7 +8,11 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 import type { KibanaExecutionContext } from 'src/core/public';
-import { PersistableStateService, PersistableState } from '../../kibana_utils/common';
+import type {
+  PersistableStateService,
+  PersistableState,
+  PersistableStateDefinition,
+} from '../../kibana_utils/common';
 
 export enum ViewMode {
   EDIT = 'edit',
@@ -69,6 +73,12 @@ export interface PanelState<E extends EmbeddableInput & { id: string } = { id: s
 
 export type EmbeddableStateWithType = EmbeddableInput & { type: string };
 
+export interface EmbeddableRegistryDefinition<
+  P extends EmbeddableStateWithType = EmbeddableStateWithType
+> extends PersistableStateDefinition<P> {
+  id: string;
+}
+
 export type EmbeddablePersistableStateService = PersistableStateService<EmbeddableStateWithType>;
 
 export interface CommonEmbeddableStartContract {
diff --git a/src/plugins/embeddable/server/index.ts b/src/plugins/embeddable/server/index.ts
@@ -10,6 +10,6 @@ import { EmbeddableServerPlugin, EmbeddableSetup, EmbeddableStart } from './plug
 
 export type { EmbeddableSetup, EmbeddableStart };
 
-export type { EnhancementRegistryDefinition, EmbeddableRegistryDefinition } from './types';
+export type { EnhancementRegistryDefinition } from './types';
 
 export const plugin = () => new EmbeddableServerPlugin();
diff --git a/src/plugins/embeddable/server/plugin.ts b/src/plugins/embeddable/server/plugin.ts
@@ -14,7 +14,6 @@ import {
   EnhancementsRegistry,
   EnhancementRegistryDefinition,
   EnhancementRegistryItem,
-  EmbeddableRegistryDefinition,
 } from './types';
 import {
   getExtractFunction,
@@ -27,7 +26,11 @@ import {
   PersistableStateMigrateFn,
   MigrateFunctionsObject,
 } from '../../kibana_utils/common';
-import { EmbeddableStateWithType, CommonEmbeddableStartContract } from '../common/types';
+import type {
+  EmbeddableStateWithType,
+  CommonEmbeddableStartContract,
+  EmbeddableRegistryDefinition,
+} from '../common/types';
 import { getAllMigrations } from '../common/lib/get_all_migrations';
 
 export interface EmbeddableSetup extends PersistableStateService<EmbeddableStateWithType> {
diff --git a/src/plugins/embeddable/server/types.ts b/src/plugins/embeddable/server/types.ts
@@ -23,12 +23,6 @@ export interface EnhancementRegistryItem<P extends SerializableRecord = Serializ
   id: string;
 }
 
-export interface EmbeddableRegistryDefinition<
-  P extends EmbeddableStateWithType = EmbeddableStateWithType
-> extends PersistableStateDefinition<P> {
-  id: string;
-}
-
 export interface EmbeddableRegistryItem<P extends EmbeddableStateWithType = EmbeddableStateWithType>
   extends PersistableState<P> {
   id: string;
diff --git a/src/plugins/visualizations/common/types.ts b/src/plugins/visualizations/common/types.ts
@@ -6,10 +6,9 @@
  * Side Public License, v 1.
  */
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectAttributes } from 'kibana/server';
 import type { SerializableRecord } from '@kbn/utility-types';
-import { AggConfigSerialized, SerializedSearchSourceFields } from 'src/plugins/data/common';
+import type { AggConfigSerialized, SerializedSearchSourceFields } from 'src/plugins/data/common';
+import type { SavedObjectAttributes } from '../../../core/types';
 
 export interface VisParams {
   [key: string]: any;
diff --git a/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.test.ts b/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.test.ts
@@ -9,9 +9,8 @@
 import semverGte from 'semver/functions/gte';
 import { makeVisualizeEmbeddableFactory } from './make_visualize_embeddable_factory';
 import { getAllMigrations } from '../migrations/visualization_saved_object_migrations';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SerializedSearchSourceFields } from 'src/plugins/data/public';
-import { GetMigrationFunctionObjectFn } from 'src/plugins/kibana_utils/common';
+import type { SerializedSearchSourceFields } from 'src/plugins/data/common';
+import type { GetMigrationFunctionObjectFn } from 'src/plugins/kibana_utils/common';
 
 describe('embeddable migrations', () => {
   test('should have same versions registered as saved object migrations versions (>7.13.0)', () => {
diff --git a/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.ts b/src/plugins/visualizations/server/embeddable/make_visualize_embeddable_factory.ts
@@ -7,10 +7,9 @@
  */
 
 import { flow, mapValues } from 'lodash';
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import type { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/common';
 import type { SerializableRecord } from '@kbn/utility-types';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SerializedSearchSourceFields } from 'src/plugins/data/public';
+import type { SerializedSearchSourceFields } from 'src/plugins/data/common';
 import {
   mergeMigrationFunctionMaps,
   MigrateFunctionsObject,
diff --git a/x-pack/plugins/lens/common/embeddable_factory/index.ts b/x-pack/plugins/lens/common/embeddable_factory/index.ts
@@ -7,9 +7,10 @@
 
 import { SerializableRecord, Serializable } from '@kbn/utility-types';
 import { SavedObjectReference } from 'src/core/types';
-import { EmbeddableStateWithType } from 'src/plugins/embeddable/common';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import type {
+  EmbeddableStateWithType,
+  EmbeddableRegistryDefinition,
+} from 'src/plugins/embeddable/common';
 
 export type LensEmbeddablePersistableState = EmbeddableStateWithType & {
   attributes: SerializableRecord;
diff --git a/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate.test.ts b/x-pack/plugins/lens/common/expressions/counter_rate/counter_rate.test.ts
@@ -7,8 +7,7 @@
 
 import { counterRate, CounterRateArgs } from './index';
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Datatable } from 'src/plugins/expressions/public';
+import type { Datatable } from 'src/plugins/expressions/common';
 import { functionWrapper } from 'src/plugins/expressions/common/expression_functions/specs/tests/utils';
 
 describe('lens_counter_rate', () => {
diff --git a/x-pack/plugins/lens/common/expressions/format_column/format_column.test.ts b/x-pack/plugins/lens/common/expressions/format_column/format_column.test.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Datatable, DatatableColumn } from 'src/plugins/expressions/public';
+import type { Datatable, DatatableColumn } from 'src/plugins/expressions/common';
 import { functionWrapper } from 'src/plugins/expressions/common/expression_functions/specs/tests/utils';
 import { formatColumn } from './index';
 
diff --git a/x-pack/plugins/lens/common/expressions/merge_tables/merge_tables.test.ts b/x-pack/plugins/lens/common/expressions/merge_tables/merge_tables.test.ts
@@ -7,8 +7,7 @@
 
 import moment from 'moment';
 import { mergeTables } from './index';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExpressionValueSearchContext } from 'src/plugins/data/public';
+import type { ExpressionValueSearchContext } from 'src/plugins/data/common';
 import {
   Datatable,
   ExecutionContext,
diff --git a/x-pack/plugins/lens/common/expressions/time_scale/time_scale.test.ts b/x-pack/plugins/lens/common/expressions/time_scale/time_scale.test.ts
@@ -6,10 +6,8 @@
  */
 
 import moment from 'moment';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { Datatable } from 'src/plugins/expressions/public';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import type { TimeRange } from 'src/plugins/data/public';
+import type { Datatable } from 'src/plugins/expressions/common';
+import type { TimeRange } from 'src/plugins/data/common';
 import { functionWrapper } from 'src/plugins/expressions/common/expression_functions/specs/tests/utils';
 
 // mock the specific inner variable:
diff --git a/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.ts b/x-pack/plugins/lens/server/embeddable/make_lens_embeddable_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
+import type { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/common';
 import type { SerializableRecord } from '@kbn/utility-types';
 import {
   mergeMigrationFunctionMaps,
diff --git a/x-pack/plugins/lens/server/migrations/saved_object_migrations.ts b/x-pack/plugins/lens/server/migrations/saved_object_migrations.ts
@@ -13,9 +13,7 @@ import {
   SavedObjectReference,
   SavedObjectUnsanitizedDoc,
 } from 'src/core/server';
-import { Filter } from '@kbn/es-query';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Query } from 'src/plugins/data/public';
+import type { Query, Filter } from '@kbn/es-query';
 import { mergeSavedObjectMigrationMaps } from '../../../../../src/core/server';
 import { MigrateFunctionsObject } from '../../../../../src/plugins/kibana_utils/common';
 import { PersistableFilter } from '../../common';
diff --git a/x-pack/plugins/lens/server/migrations/types.ts b/x-pack/plugins/lens/server/migrations/types.ts
@@ -6,9 +6,7 @@
  */
 
 import type { PaletteOutput, CustomPaletteParams } from '@kbn/coloring';
-import { Filter } from '@kbn/es-query';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { Query } from 'src/plugins/data/public';
+import type { Query, Filter } from '@kbn/es-query';
 import type { MigrateFunctionsObject } from 'src/plugins/kibana_utils/common';
 import type { LayerType, PersistableFilter } from '../../common';
 
diff --git a/x-pack/plugins/maps/common/embeddable/extract.ts b/x-pack/plugins/maps/common/embeddable/extract.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
-import { MapEmbeddablePersistableState } from './types';
-import { MapSavedObjectAttributes } from '../map_saved_object_type';
+import type { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/common';
+import type { MapEmbeddablePersistableState } from './types';
+import type { MapSavedObjectAttributes } from '../map_saved_object_type';
 import { extractReferences } from '../migrations/references';
 
 export const extract: EmbeddableRegistryDefinition['extract'] = (state) => {
diff --git a/x-pack/plugins/maps/common/embeddable/inject.ts b/x-pack/plugins/maps/common/embeddable/inject.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/server';
-import { MapEmbeddablePersistableState } from './types';
-import { MapSavedObjectAttributes } from '../map_saved_object_type';
+import type { EmbeddableRegistryDefinition } from 'src/plugins/embeddable/common';
+import type { MapEmbeddablePersistableState } from './types';
+import type { MapSavedObjectAttributes } from '../map_saved_object_type';
 import { extractReferences, injectReferences } from '../migrations/references';
 
 export const inject: EmbeddableRegistryDefinition['inject'] = (state, references) => {
