explicitly export mock types. not to rely on global ones

src/core/public/apm_system.test.ts

@@ -19,6 +19,7 @@
 
 jest.mock('@elastic/apm-rum');
 import { init, apm } from '@elastic/apm-rum';
+import type { DeeplyMockedKeys } from '../types';
 import { ApmSystem } from './apm_system';
 
 const initMock = init as jest.Mocked<typeof init>;

src/core/public/chrome/chrome_service.mock.ts

@@ -18,6 +18,7 @@
  */
 import { BehaviorSubject } from 'rxjs';
 import type { PublicMethodsOf } from '@kbn/utility-types';
+import type { DeeplyMockedKeys } from '../../types';
 import { ChromeBadge, ChromeBrand, ChromeBreadcrumb, ChromeService, InternalChromeStart } from './';
 
 const createStartContractMock = () => {

src/core/public/index.ts

@@ -80,7 +80,7 @@ import {
 export { PackageInfo, EnvironmentMode } from '../server/types';
 export { CoreContext, CoreSystem } from './core_system';
 export { DEFAULT_APP_CATEGORIES } from '../utils';
-export {
+export type {
   AppCategory,
   UiSettingsParams,
   UserProvidedValues,
@@ -89,6 +89,8 @@ export {
   StringValidation,
   StringValidationRegex,
   StringValidationRegexString,
+  DeeplyMockedKeys,
+  MockedKeys,
 } from '../types';
 
 export {

src/core/public/notifications/notifications_service.mock.ts

@@ -17,6 +17,7 @@
  * under the License.
  */
 import type { PublicMethodsOf } from '@kbn/utility-types';
+import type { MockedKeys } from '../../types';
 import {
   NotificationsService,
   NotificationsSetup,

src/core/public/overlays/overlay_service.mock.ts

@@ -17,6 +17,7 @@
  * under the License.
  */
 import type { PublicMethodsOf } from '@kbn/utility-types';
+import type { DeeplyMockedKeys } from '../../types';
 import { OverlayService, OverlayStart } from './overlay_service';
 import { overlayBannersServiceMock } from './banners/banners_service.mock';
 import { overlayFlyoutServiceMock } from './flyout/flyout_service.mock';

src/core/server/core_context.mock.ts

@@ -18,6 +18,7 @@
  */
 
 import { REPO_ROOT } from '@kbn/dev-utils';
+import type { DeeplyMockedKeys } from '../types';
 import { CoreContext } from './core_context';
 import { Env, IConfigService } from './config';
 import { configServiceMock, getEnvOptions } from './config/mocks';

src/core/server/elasticsearch/client/mocks.ts

@@ -19,6 +19,7 @@
 import { Client, ApiResponse } from '@elastic/elasticsearch';
 import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
 import { ElasticsearchClient } from './types';
+import type { DeeplyMockedKeys } from '../../../types';
 import { ICustomClusterClient } from './cluster_client';
 
 const createInternalClientMock = (): DeeplyMockedKeys<Client> => {

src/core/server/index.ts

@@ -334,7 +334,7 @@ export {
   MetricsServiceStart,
 } from './metrics';
 
-export { AppCategory } from '../types';
+export type { AppCategory, DeeplyMockedKeys, MockedKeys } from '../types';
 export { DEFAULT_APP_CATEGORIES } from '../utils';
 
 export {

src/core/server/mocks.ts

@@ -19,7 +19,13 @@
 import { of } from 'rxjs';
 import { duration } from 'moment';
 import { ByteSizeValue } from '@kbn/config-schema';
-import { PluginInitializerContext, CoreSetup, CoreStart, StartServicesAccessor } from '.';
+import type {
+  PluginInitializerContext,
+  CoreSetup,
+  CoreStart,
+  StartServicesAccessor,
+  MockedKeys,
+} from '.';
 import { loggingSystemMock } from './logging/logging_system.mock';
 import { loggingServiceMock } from './logging/logging_service.mock';
 import { elasticsearchServiceMock } from './elasticsearch/elasticsearch_service.mock';

src/core/types/index.ts

@@ -27,3 +27,4 @@ export * from './app_category';
 export * from './ui_settings';
 export * from './saved_objects';
 export * from './serializable';
+export * from './mocks';

src/core/typings.ts → src/core/types/mocks.ts

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-type DeeplyMockedKeys<T> = {
+export type DeeplyMockedKeys<T> = {
   [P in keyof T]: T[P] extends (...args: any[]) => any
     ? jest.MockInstance<ReturnType<T[P]>, Parameters<T[P]>>
     : DeeplyMockedKeys<T[P]>;
 } &
   T;
 
-type MockedKeys<T> = { [P in keyof T]: jest.Mocked<T[P]> };
+export type MockedKeys<T> = { [P in keyof T]: jest.Mocked<T[P]> };