reverts type change in mocks

elastic · Jul 9, 2022 · e17a1d8 · e17a1d8
1 parent 1c695c6
commit e17a1d8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/packages/core/preboot/core-preboot-server-internal/src/preboot_service.ts b/packages/core/preboot/core-preboot-server-internal/src/preboot_service.ts
@@ -8,7 +8,7 @@
 
 import type { Logger } from '@kbn/logging';
 import type { CoreContext } from '@kbn/core-base-server-internal';
-import type { KibanaPrebootServicePreboot } from '@kbn/core-preboot-server';
+import type { InternalPrebootServicePreboot } from './types';
 
 /** @internal */
 export class PrebootService {
@@ -21,7 +21,7 @@ export class PrebootService {
     this.log = this.core.logger.get('preboot');
   }
 
-  public preboot(): KibanaPrebootServicePreboot {
+  public preboot(): InternalPrebootServicePreboot {
     return {
       isSetupOnHold: () => this.isSetupOnHold,
       holdSetupUntilResolved: (pluginName, reason, promise) => {

diff --git a/packages/core/preboot/core-preboot-server-mocks/src/index.ts b/packages/core/preboot/core-preboot-server-mocks/src/index.ts
@@ -10,5 +10,4 @@ export { prebootServiceMock } from './preboot_service.mock';
 export type {
   InternalPrebootServicePrebootMock,
   PrebootServicePrebootMock,
-  PrebootServiceContract,
 } from './preboot_service.mock';
diff --git a/packages/core/preboot/core-preboot-server-mocks/src/preboot_service.mock.ts b/packages/core/preboot/core-preboot-server-mocks/src/preboot_service.mock.ts
@@ -6,12 +6,16 @@
  * Side Public License, v 1.
  */
 
-import type { InternalPrebootServicePreboot } from '@kbn/core-preboot-server-internal';
-import type { PrebootServicePreboot, KibanaPrebootServiceContract } from '@kbn/core-preboot-server';
+import type {
+  InternalPrebootServicePreboot,
+  PrebootService,
+} from '@kbn/core-preboot-server-internal';
+import type { PrebootServicePreboot } from '@kbn/core-preboot-server';
+import { PublicMethodsOf } from '@kbn/utility-types';
 
 export type InternalPrebootServicePrebootMock = jest.Mocked<InternalPrebootServicePreboot>;
 export type PrebootServicePrebootMock = jest.Mocked<PrebootServicePreboot>;
-export type PrebootServiceContract = jest.Mocked<KibanaPrebootServiceContract>;
+
 const createInternalPrebootContractMock = () => {
   const mock: InternalPrebootServicePrebootMock = {
     isSetupOnHold: jest.fn(),
@@ -30,6 +34,8 @@ const createPrebootContractMock = () => {
   return mock;
 };
 
+type PrebootServiceContract = PublicMethodsOf<PrebootService>;
+
 const createPrebootServiceMock = () => {
   const mocked: jest.Mocked<PrebootServiceContract> = {
     preboot: jest.fn(),

diff --git a/packages/core/preboot/core-preboot-server/src/contracts.ts b/packages/core/preboot/core-preboot-server/src/contracts.ts
@@ -52,6 +52,7 @@ export interface PrebootServicePreboot {
 }
 
 /**
+ * public version of InternalPrebootServicePreboot that is exposed in the public service contract
  * @public
  */
 export interface KibanaPrebootServicePreboot
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,7 @@ export interface PrebootServicePreboot { @@
     }
     /**
+     * public version of InternalPrebootServicePreboot that is exposed in the public service contract
      * @public
      */
     export interface KibanaPrebootServicePreboot
@@ Expand Down @@