Merge branch '7.x' into backport/7.x/pr-81415

packages/kbn-optimizer/limits.yml

@@ -68,7 +68,7 @@ pageLoadAssetSize:
   searchprofiler: 67224
   security: 189428
   securityOss: 30806
-  securitySolution: 622387
+  securitySolution: 283440
   share: 99205
   snapshotRestore: 79176
   spaces: 389643

packages/kbn-storybook/lib/default_config.ts

@@ -20,12 +20,7 @@
 import { StorybookConfig } from '@storybook/core/types';
 
 export const defaultConfig: StorybookConfig = {
-  addons: [
-    '@kbn/storybook/preset',
-    '@storybook/addon-a11y',
-    '@storybook/addon-knobs',
-    '@storybook/addon-essentials',
-  ],
+  addons: ['@kbn/storybook/preset', '@storybook/addon-a11y', '@storybook/addon-essentials'],
   stories: ['../**/*.stories.tsx'],
   typescript: {
     reactDocgen: false,

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];
+};

src/core/typings.ts → packages/kbn-utility-types/jest/index.ts

@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * 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]> };

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,6 +18,7 @@
  */
 
 jest.mock('@elastic/apm-rum');
+import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { init, apm } from '@elastic/apm-rum';
 import { ApmSystem } from './apm_system';
 

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 '@kbn/utility-types/jest';
 import { ChromeBadge, ChromeBrand, ChromeBreadcrumb, ChromeService, InternalChromeStart } from './';
 
 const createStartContractMock = () => {

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 '@kbn/utility-types/jest';
 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 '@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,6 +18,7 @@
  */
 
 import { REPO_ROOT } from '@kbn/dev-utils';
+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,6 +18,7 @@
  */
 import { Client, ApiResponse } from '@elastic/elasticsearch';
 import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
+import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { ElasticsearchClient } from './types';
 import { ICustomClusterClient } from './cluster_client';
 

src/core/server/mocks.ts

@@ -19,6 +19,7 @@
 import { of } from 'rxjs';
 import { duration } from 'moment';
 import { ByteSizeValue } from '@kbn/config-schema';
+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/server/saved_objects/export/inject_nested_depdendencies.test.ts

@@ -78,7 +78,7 @@ describe('getObjectReferencesToFetch()', () => {
     `);
   });
 
-  test(`doesn't deal with circular dependencies`, () => {
+  test('does not fail on circular dependencies', () => {
     const map = new Map<string, SavedObject>();
     map.set('index-pattern:1', {
       id: '1',
@@ -527,7 +527,7 @@ describe('injectNestedDependencies', () => {
     `);
   });
 
-  test(`doesn't deal with circular dependencies`, async () => {
+  test('does not fail on circular dependencies', async () => {
     const savedObjects = [
       {
         id: '2',