Get rid of global types (#81739)

* move global typings to packages/kbn-utility-types

* update all imports

* add tests

* mute error

* update docs

* ok

* rename kbn-utility-types/test --> kbn-utility-types/jest

packages/kbn-utility-types/index.ts

@@ -110,3 +110,10 @@ export type MethodKeysOf<T> = {
  *  Returns an object with public methods only.
  */
 export type PublicMethodsOf<T> = Pick<T, MethodKeysOf<T>>;
+
+/**
+ *  Makes an object with readonly properties mutable.
+ */
+export type Writable<T> = {
+  -readonly [K in keyof T]: T[K];
+};

packages/kbn-utility-types/jest/index.ts

@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 export type DeeplyMockedKeys<T> = {
   [P in keyof T]: T[P] extends (...args: any[]) => any
     ? jest.MockInstance<ReturnType<T[P]>, Parameters<T[P]>>

packages/kbn-utility-types/jest/package.json

@@ -0,0 +1,3 @@
+{
+  "types": "../target/jest/index.d.ts"
+}

packages/kbn-utility-types/test-d/method_keys_of.ts

@@ -0,0 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { expectType } from 'tsd';
+import { MethodKeysOf } from '../index';
+
+class Test {
+  public name: string = '';
+  getName() {
+    return this.name;
+  }
+  // @ts-ignore
+  private getDoubleName() {
+    return this.name.repeat(2);
+  }
+}
+
+expectType<MethodKeysOf<Test>>('getName');

packages/kbn-utility-types/test-d/public_methods_of.ts

@@ -0,0 +1,50 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { expectAssignable, expectNotAssignable } from 'tsd';
+import { PublicMethodsOf } from '../index';
+
+class Test {
+  public name: string = '';
+  getName() {
+    return this.name;
+  }
+  // @ts-ignore
+  private getDoubleName() {
+    return this.name.repeat(2);
+  }
+}
+
+expectAssignable<PublicMethodsOf<Test>>({
+  getName() {
+    return '';
+  },
+});
+
+expectNotAssignable<PublicMethodsOf<Test>>({
+  getName() {
+    return 1;
+  },
+});
+
+expectNotAssignable<PublicMethodsOf<Test>>({
+  getDoubleName() {
+    return 1;
+  },
+});

packages/kbn-utility-types/test-d/writable.ts

@@ -0,0 +1,29 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { expectAssignable } from 'tsd';
+import { Writable } from '../index';
+
+type WritableArray = Writable<readonly string[]>;
+expectAssignable<WritableArray>(['1']);
+
+type WritableObject = Writable<{
+  readonly name: string;
+}>;
+expectAssignable<WritableObject>({ name: '1' });

packages/kbn-utility-types/tsconfig.json

@@ -7,10 +7,11 @@
     "stripInternal": true,
     "declarationMap": true,
     "types": [
-      "node"
+      "node",
+      "jest"
     ]
   },
-  "include": ["index.ts", "test-d/**/*"],
+  "include": ["index.ts", "jest/**/*", "test-d/**/*"],
   "exclude": [
     "target"
   ]

src/core/public/apm_system.test.ts

@@ -18,8 +18,8 @@
  */
 
 jest.mock('@elastic/apm-rum');
+import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { init, apm } from '@elastic/apm-rum';
-import { DeeplyMockedKeys } from '../typings';
 import { ApmSystem } from './apm_system';
 
 const initMock = init as jest.Mocked<typeof init>;

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

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

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

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

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

@@ -17,7 +17,7 @@
  * under the License.
  */
 import type { PublicMethodsOf } from '@kbn/utility-types';
-import { DeeplyMockedKeys } from '../../typings';
+import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 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,7 +18,7 @@
  */
 
 import { REPO_ROOT } from '@kbn/dev-utils';
-import { DeeplyMockedKeys } from '../typings';
+import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { CoreContext } from './core_context';
 import { Env, IConfigService } from './config';
 import { configServiceMock, getEnvOptions } from './config/mocks';

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

@@ -18,7 +18,7 @@
  */
 import { Client, ApiResponse } from '@elastic/elasticsearch';
 import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
-import { DeeplyMockedKeys } from '../../../typings';
+import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { ElasticsearchClient } from './types';
 import { ICustomClusterClient } from './cluster_client';
 

src/core/server/mocks.ts

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

src/core/tsconfig.json

@@ -13,8 +13,7 @@
     "types/**/*",
     "test_helpers/**/*",
     "utils/**/*",
-    "index.ts",
-    "typings.ts"
+    "index.ts"
   ],
   "references": [
     { "path": "../test_utils/" }

src/plugins/data/common/field_formats/index.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import { PublicMethodsOf } from '@kbn/utility-types';
 import { FieldFormatsRegistry } from './field_formats_registry';
 type IFieldFormatsRegistry = PublicMethodsOf<FieldFormatsRegistry>;
 

src/plugins/data/common/field_formats/types.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import { PublicMethodsOf } from '@kbn/utility-types';
 import { GetConfigFn } from '../types';
 import { FieldFormat } from './field_format';
 import { FieldFormatsRegistry } from './field_formats_registry';

src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts

@@ -18,6 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { PublicMethodsOf } from '@kbn/utility-types';
 import { SavedObjectsClientCommon } from '../..';
 
 import { createIndexPatternCache } from '.';

src/plugins/data/common/search/search_source/legacy/default_search_strategy.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { defaultSearchStrategy } from './default_search_strategy';
 import { LegacyFetchHandlers, SearchStrategySearchParams } from './types';
 import { BehaviorSubject } from 'rxjs';

src/plugins/data/common/search/search_source/mocks.ts

@@ -18,6 +18,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { uiSettingsServiceMock } from '../../../../../core/public/mocks';
 
 import { SearchSource } from './search_source';

src/plugins/data/public/field_formats/mocks.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { FieldFormatsStart, FieldFormatsSetup, FieldFormatsService } from '.';
 import { fieldFormatsMock } from '../../common/field_formats/mocks';
 

src/plugins/data/public/query/mocks.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { Observable } from 'rxjs';
 import { QueryService, QuerySetup, QueryStart } from '.';
 import { timefilterServiceMock } from './timefilter/timefilter_service.mock';

src/plugins/data/public/query/query_string/query_string_manager.ts

@@ -19,6 +19,7 @@
 
 import { BehaviorSubject } from 'rxjs';
 import { skip } from 'rxjs/operators';
+import { PublicMethodsOf } from '@kbn/utility-types';
 import { CoreStart } from 'kibana/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { Query, UI_SETTINGS } from '../../../common';

src/plugins/data/public/query/timefilter/time_history.ts

@@ -18,6 +18,7 @@
  */
 
 import moment from 'moment';
+import { PublicMethodsOf } from '@kbn/utility-types';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { PersistedLog } from '../persisted_log';
 import { TimeRange } from '../../../common';

src/plugins/data/public/query/timefilter/timefilter.ts

@@ -20,6 +20,7 @@
 import _ from 'lodash';
 import { Subject, BehaviorSubject } from 'rxjs';
 import moment from 'moment';
+import { PublicMethodsOf } from '@kbn/utility-types';
 import { areRefreshIntervalsDifferent, areTimeRangesDifferent } from './lib/diff_time_picker_vals';
 import { getForceNow } from './lib/get_force_now';
 import { TimefilterConfig, InputTimeRange, TimeRangeBounds } from './types';

src/plugins/data/public/query/timefilter/timefilter_service.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { TimefilterService, TimeHistoryContract, TimefilterContract } from '.';
 import { Observable } from 'rxjs';
 

src/plugins/data/public/search/collectors/create_usage_collector.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { CoreSetup, CoreStart } from '../../../../../core/public';
 import { coreMock } from '../../../../../core/public/mocks';
 import { usageCollectionPluginMock, Setup } from '../../../../usage_collection/public/mocks';

src/plugins/data/public/search/es_search/get_es_preference.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { getEsPreference } from './get_es_preference';
 import { CoreStart } from '../../../../../core/public';
 import { coreMock } from '../../../../../core/public/mocks';

src/plugins/data/public/search/search_interceptor.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { CoreSetup, CoreStart } from '../../../../core/public';
 import { coreMock } from '../../../../core/public/mocks';
 import { IEsSearchRequest } from '../../common/search';

src/plugins/data/public/search/search_interceptor.ts

@@ -20,6 +20,7 @@
 import { get, memoize, trimEnd } from 'lodash';
 import { BehaviorSubject, throwError, timer, defer, from, Observable, NEVER } from 'rxjs';
 import { catchError, finalize } from 'rxjs/operators';
+import { PublicMethodsOf } from '@kbn/utility-types';
 import { CoreStart, CoreSetup, ToastsSetup } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
 import {

src/plugins/data/public/search/search_service.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { coreMock } from '../../../../core/public/mocks';
 import { CoreSetup, CoreStart } from '../../../../core/public';
 

src/plugins/data/server/search/routes/call_msearch.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { Observable } from 'rxjs';
 import { IUiSettingsClient, IScopedClusterClient, SharedGlobalConfig } from 'src/core/server';
 

src/plugins/data/server/search/routes/msearch.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { Observable } from 'rxjs';
 
 import {

src/plugins/data/server/search/routes/search.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { Observable, from } from 'rxjs';
 
 import {

src/plugins/data/server/search/search_service.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { CoreSetup, CoreStart } from '../../../../core/server';
 import { coreMock } from '../../../../core/server/mocks';
 

src/plugins/data/server/search/search_source/mocks.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { KibanaRequest } from 'src/core/server';
 
 import { searchSourceCommonMock } from '../../../common/search/search_source/mocks';

src/plugins/data/server/server.api.md

@@ -37,6 +37,7 @@ import { PathConfigType } from '@kbn/utils';
 import { Plugin as Plugin_2 } from 'src/core/server';
 import { Plugin as Plugin_3 } from 'kibana/server';
 import { PluginInitializerContext as PluginInitializerContext_2 } from 'src/core/server';
+import { PublicMethodsOf } from '@kbn/utility-types';
 import { RecursiveReadonly } from '@kbn/utility-types';
 import { RequestAdapter } from 'src/plugins/inspector/common';
 import { RequestHandlerContext } from 'src/core/server';

src/plugins/home/public/services/environment/environment.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { EnvironmentService, EnvironmentServiceSetup } from './environment';
 
 const createSetupMock = (): jest.Mocked<EnvironmentServiceSetup> => {

src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import {
   FeatureCatalogueRegistrySetup,
   FeatureCatalogueRegistry,

src/plugins/home/public/services/tutorials/tutorial_service.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { TutorialService, TutorialServiceSetup } from './tutorial_service';
 
 const createSetupMock = (): jest.Mocked<TutorialServiceSetup> => {

src/plugins/home/server/services/sample_data/sample_data_registry.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import {
   SampleDataRegistrySetup,
   SampleDataRegistryStart,

src/plugins/home/server/services/tutorials/tutorials_registry.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import {
   TutorialsRegistrySetup,
   TutorialsRegistryStart,

src/plugins/home/server/services/tutorials/tutorials_registry.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { TutorialsRegistry } from './tutorials_registry';
 import { coreMock } from '../../../../../core/server/mocks';
 import { CoreSetup } from '../../../../../core/server';

src/plugins/index_pattern_management/public/service/environment/environment.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { EnvironmentService, EnvironmentServiceSetup } from './environment';
 import { MlCardState } from '../../types';
 

src/plugins/index_pattern_management/server/routes/preview_scripted_field.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { CoreSetup, RequestHandlerContext } from 'src/core/server';
 import { coreMock, httpServerMock } from '../../../../../src/core/server/mocks';
 import { registerPreviewScriptedFieldRoute } from './preview_scripted_field';

src/plugins/kibana_utils/public/storage/storage.test.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { Storage } from './storage';
 import { IStorage, IStorageWrapper } from './types';
 

src/plugins/saved_objects_management/public/services/action_service.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import {
   SavedObjectsManagementActionService,
   SavedObjectsManagementActionServiceSetup,

src/plugins/saved_objects_management/public/services/column_service.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import {
   SavedObjectsManagementColumnService,
   SavedObjectsManagementColumnServiceSetup,

src/plugins/saved_objects_management/public/services/service_registry.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { SavedObjectLoader } from '../../../saved_objects/public';
 
 export interface SavedObjectsManagementServiceRegistryEntry {

src/plugins/saved_objects_management/server/services/management.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { SavedObjectsManagement } from './management';
 
 type Management = PublicMethodsOf<SavedObjectsManagement>;

src/plugins/saved_objects_management/server/services/management.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { ISavedObjectTypeRegistry, SavedObject } from 'src/core/server';
 
 export type ISavedObjectsManagement = PublicMethodsOf<SavedObjectsManagement>;

src/plugins/security_oss/public/plugin.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { mockInsecureClusterService } from './insecure_cluster_service/insecure_cluster_service.mock';
 import { SecurityOssPluginSetup, SecurityOssPluginStart } from './plugin';
 

src/plugins/share/public/services/share_menu_manager.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { ShareMenuManager, ShareMenuManagerStart } from './share_menu_manager';
 
 const createStartMock = (): jest.Mocked<ShareMenuManagerStart> => {

src/plugins/share/public/services/share_menu_registry.mock.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import {
   ShareMenuRegistry,
   ShareMenuRegistrySetup,

src/plugins/ui_actions/public/plugin.ts

@@ -18,6 +18,7 @@
  */
 
 import { CoreStart, CoreSetup, Plugin, PluginInitializerContext } from 'src/core/public';
+import { PublicMethodsOf } from '@kbn/utility-types';
 import { UiActionsService } from './service';
 import {
   selectRangeTrigger,

src/plugins/ui_actions/public/public.api.md

@@ -12,6 +12,7 @@ import { Observable } from 'rxjs';
 import { PackageInfo } from '@kbn/config';
 import { Plugin } from 'src/core/public';
 import { PluginInitializerContext as PluginInitializerContext_2 } from 'src/core/public';
+import { PublicMethodsOf } from '@kbn/utility-types';
 import React from 'react';
 import * as Rx from 'rxjs';
 import { UiComponent } from 'src/plugins/kibana_utils/public';

typings/index.d.ts

@@ -34,22 +34,3 @@ declare module '*.svg' {
   // eslint-disable-next-line import/no-default-export
   export default content;
 }
-
-type MethodKeysOf<T> = {
-  [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never;
-}[keyof T];
-
-type PublicMethodsOf<T> = Pick<T, MethodKeysOf<T>>;
-
-type MockedKeys<T> = { [P in keyof T]: jest.Mocked<T[P]> };
-
-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 Writable<T> = {
-  -readonly [K in keyof T]: T[K];
-};

x-pack/plugins/actions/server/actions_client.mock.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { ActionsClient } from './actions_client';
 
 type ActionsClientContract = PublicMethodsOf<ActionsClient>;

x-pack/plugins/actions/server/authorization/actions_authorization.mock.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { ActionsAuthorization } from './actions_authorization';
 
 export type ActionsAuthorizationMock = jest.Mocked<PublicMethodsOf<ActionsAuthorization>>;

x-pack/plugins/actions/server/index.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { PluginInitializerContext, PluginConfigDescriptor } from '../../../../src/core/server';
 import { ActionsPlugin } from './plugin';
 import { configSchema } from './config';

x-pack/plugins/actions/server/lib/action_executor.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { Logger, KibanaRequest } from 'src/core/server';
 import { validateParams, validateConfig, validateSecrets } from './validate_with_schema';
 import {

x-pack/plugins/actions/server/lib/license_state.ts

@@ -5,6 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { Observable, Subscription } from 'rxjs';
 import { assertNever } from '@kbn/std';
 import { ILicense } from '../../../licensing/common/types';

x-pack/plugins/actions/server/plugin.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { first, map } from 'rxjs/operators';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import {

x-pack/plugins/actions/server/routes/_mock_handler_arguments.ts

@@ -6,6 +6,7 @@
 
 import { RequestHandlerContext, KibanaRequest, KibanaResponseFactory } from 'kibana/server';
 import { identity } from 'lodash';
+import type { MethodKeysOf } from '@kbn/utility-types';
 import { httpServerMock } from '../../../../../src/core/server/mocks';
 import { ActionType } from '../../common';
 import { ActionsClientMock, actionsClientMock } from '../actions_client.mock';

x-pack/plugins/actions/server/types.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { ActionTypeRegistry } from './action_type_registry';
 import { PluginSetupContract, PluginStartContract } from './plugin';
 import { ActionsClient } from './actions_client';

x-pack/plugins/alerts/public/alert_navigation_registry/alert_navigation_registry.mock.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { AlertNavigationRegistry } from './alert_navigation_registry';
 
 type Schema = PublicMethodsOf<AlertNavigationRegistry>;

x-pack/plugins/alerts/server/alert_type_registry.mock.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { AlertTypeRegistry } from './alert_type_registry';
 
 type Schema = PublicMethodsOf<AlertTypeRegistry>;

x-pack/plugins/alerts/server/alerts_client.mock.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { AlertsClient } from './alerts_client';
 
 type Schema = PublicMethodsOf<AlertsClient>;

x-pack/plugins/alerts/server/authorization/alerts_authorization.mock.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { AlertsAuthorization } from './alerts_authorization';
 
 type Schema = PublicMethodsOf<AlertsAuthorization>;

x-pack/plugins/alerts/server/index.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { AlertsClient as AlertsClientClass } from './alerts_client';
 import { PluginInitializerContext } from '../../../../src/core/server';
 import { AlertingPlugin } from './plugin';

x-pack/plugins/alerts/server/plugin.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { first, map } from 'rxjs/operators';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { SecurityPluginSetup } from '../../security/server';

x-pack/plugins/alerts/server/routes/_mock_handler_arguments.ts

@@ -11,6 +11,7 @@ import {
   ILegacyClusterClient,
 } from 'kibana/server';
 import { identity } from 'lodash';
+import type { MethodKeysOf } from '@kbn/utility-types';
 import { httpServerMock } from '../../../../../src/core/server/mocks';
 import { alertsClientMock, AlertsClientMock } from '../alerts_client.mock';
 import { AlertType } from '../../common';

x-pack/plugins/alerts/server/task_runner/task_runner.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { pickBy, mapValues, without } from 'lodash';
 import { Logger, KibanaRequest } from '../../../../../src/core/server';
 import { TaskRunnerContext } from './task_runner_factory';

x-pack/plugins/alerts/server/task_runner/task_runner_factory.ts

@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { Logger, KibanaRequest, ISavedObjectsRepository } from '../../../../../src/core/server';
 import { RunContext } from '../../../task_manager/server';
 import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server';

x-pack/plugins/alerts/server/types.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { AlertInstance } from './alert_instance';
 import { AlertTypeRegistry as OrigAlertTypeRegistry } from './alert_type_registry';
 import { PluginSetupContract, PluginStartContract } from './plugin';

x-pack/plugins/data_enhanced/public/search/search_interceptor.test.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { MockedKeys } from '@kbn/utility-types/jest';
 import { coreMock } from '../../../../../src/core/public/mocks';
 import { EnhancedSearchInterceptor } from './search_interceptor';
 import { CoreSetup, CoreStart } from 'kibana/public';

x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import {
   ISavedObjectTypeRegistry,
   KibanaRequest,

x-pack/plugins/encrypted_saved_objects/server/routes/index.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { IRouter, Logger } from '../../../../../src/core/server';
 import { ConfigType } from '../config';
 import { EncryptionKeyRotationService } from '../crypto';

x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import {
   StartServicesAccessor,
   SavedObject,

x-pack/plugins/event_log/server/es/cluster_client_adapter.ts

@@ -6,6 +6,7 @@
 
 import { reject, isUndefined } from 'lodash';
 import { SearchResponse, Client } from 'elasticsearch';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { Logger, LegacyClusterClient } from 'src/core/server';
 
 import { IValidatedEvent, SAVED_OBJECT_REL_PRIMARY } from '../types';

x-pack/plugins/event_log/server/routes/_mock_handler_arguments.ts

@@ -6,6 +6,7 @@
 
 import { identity, merge } from 'lodash';
 import { RequestHandlerContext, KibanaRequest, KibanaResponseFactory } from 'src/core/server';
+import type { MethodKeysOf } from '@kbn/utility-types';
 
 import { httpServerMock } from 'src/core/server/mocks';
 import { IEventLogClient } from '../types';

x-pack/plugins/features/server/ui_capabilities_for_features.ts

@@ -5,7 +5,7 @@
  */
 
 import _ from 'lodash';
-import { RecursiveReadonly } from '@kbn/utility-types';
+import type { RecursiveReadonly, Writable } from '@kbn/utility-types';
 import { Capabilities as UICapabilities } from '../../../../src/core/server';
 import { ElasticsearchFeature, KibanaFeature } from '../common';
 

x-pack/plugins/global_search/common/license_checker.ts

@@ -5,6 +5,7 @@
  */
 
 import { Observable, Subscription } from 'rxjs';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { ILicense } from '../../licensing/common/types';
 
 export type LicenseState = { valid: false; message: string } | { valid: true };

x-pack/plugins/index_management/public/services/extensions_service.mock.ts

@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { ExtensionsService, ExtensionsSetup } from './extensions_service';
 
 export type ExtensionsSetupMock = jest.Mocked<ExtensionsSetup>;

x-pack/plugins/licensing/public/services/feature_usage_service.mock.ts

@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import {
   FeatureUsageService,

x-pack/plugins/licensing/server/services/feature_usage_service.mock.ts

@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import {
   FeatureUsageService,

x-pack/plugins/security/public/account_management/account_management_page.tsx

@@ -6,6 +6,7 @@
 import React, { useEffect, useState } from 'react';
 import ReactDOM from 'react-dom';
 import { EuiPage, EuiPageBody, EuiPanel, EuiSpacer, EuiText } from '@elastic/eui';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { CoreStart, NotificationsStart } from 'src/core/public';
 import { getUserDisplayName, AuthenticatedUser } from '../../common/model';
 import { AuthenticationServiceSetup } from '../authentication';

x-pack/plugins/security/public/account_management/change_password/change_password.tsx

@@ -6,6 +6,7 @@
 import React, { Component } from 'react';
 import { EuiDescribedFormGroup } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { NotificationsSetup } from 'src/core/public';
 import { AuthenticatedUser, canUserChangePassword } from '../../../common/model';
 import { UserAPIClient } from '../../management/users';

x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.test.tsx

@@ -8,6 +8,7 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import React from 'react';
 import { ReactWrapper } from 'enzyme';
 import { EuiCallOut } from '@elastic/eui';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import { NotEnabled } from './not_enabled';
 import { PermissionDenied } from './permission_denied';

x-pack/plugins/security/public/management/api_keys/api_keys_grid/api_keys_grid_page.tsx

@@ -26,6 +26,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import moment from 'moment-timezone';
 import { ApplicationStart, NotificationsStart } from 'src/core/public';
 import { SectionLoading } from '../../../../../../../src/plugins/es_ui_shared/public';

x-pack/plugins/security/public/management/api_keys/api_keys_grid/invalidate_provider/invalidate_provider.tsx

@@ -6,6 +6,7 @@
 
 import React, { Fragment, useRef, useState } from 'react';
 import { EuiConfirmModal, EuiOverlayMask } from '@elastic/eui';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { i18n } from '@kbn/i18n';
 import { NotificationsStart } from 'src/core/public';
 import { ApiKeyToInvalidate } from '../../../../../common/model';

x-pack/plugins/security/public/management/role_mappings/components/delete_provider/delete_provider.tsx

@@ -7,6 +7,7 @@
 import React, { Fragment, useRef, useState, ReactElement } from 'react';
 import { EuiConfirmModal, EuiOverlayMask } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { NotificationsStart } from 'src/core/public';
 import { RoleMapping } from '../../../../../common/model';
 import { RoleMappingsAPIClient } from '../../role_mappings_api_client';

x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.test.tsx

@@ -5,6 +5,7 @@
  */
 
 import React from 'react';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
 import { findTestSubject } from 'test_utils/find_test_subject';
 

x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/edit_role_mapping_page.tsx

@@ -19,6 +19,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { NotificationsStart, ScopedHistory } from 'src/core/public';
 import { RoleMapping } from '../../../../common/model';
 import { RuleEditorPanel } from './rule_editor_panel';

x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.test.tsx

@@ -5,6 +5,7 @@
  */
 
 import React from 'react';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { findTestSubject } from 'test_utils/find_test_subject';
 import { Role, RoleMapping } from '../../../../../common/model';

x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/mapping_info_panel/mapping_info_panel.tsx

@@ -19,6 +19,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { RoleMapping } from '../../../../../common/model';
 import { RolesAPIClient } from '../../../roles';
 import {

x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_selector.test.tsx

@@ -8,6 +8,7 @@ import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { findTestSubject } from 'test_utils/find_test_subject';
 import { EuiComboBox } from '@elastic/eui';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { RoleSelector } from './role_selector';
 import { Role, RoleMapping } from '../../../../../common/model';
 import { RoleTemplateEditor } from './role_template_editor';

x-pack/plugins/security/public/management/role_mappings/edit_role_mapping/role_selector/role_selector.tsx

@@ -8,6 +8,7 @@ import React, { Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFormRow, EuiHorizontalRule } from '@elastic/eui';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { RoleMapping, Role, isRoleDeprecated } from '../../../../../common/model';
 import { RolesAPIClient } from '../../../roles';
 import { AddRoleTemplateButton } from './add_role_template_button';

x-pack/plugins/security/public/management/role_mappings/role_mappings_grid/role_mappings_grid_page.tsx

@@ -24,6 +24,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { NotificationsStart, ApplicationStart, ScopedHistory } from 'src/core/public';
 import { RoleMapping, Role } from '../../../../common/model';
 import { EmptyPrompt } from './empty_prompt';

x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx

@@ -30,6 +30,7 @@ import React, {
   useRef,
   useState,
 } from 'react';
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import {
   Capabilities,
   FatalErrorsSetup,