From 5f7b8e9cfe799c3b2a0b0392c1bfd64152cb2829 Mon Sep 17 00:00:00 2001 From: Rudolf Meijering Date: Thu, 4 Jul 2019 21:50:03 +0200 Subject: [PATCH] Introduce src/common for code/types shared between public/server --- src/core/common/index.ts | 27 +++++++++++++++++++ src/core/public/public.api.md | 12 ++++----- .../saved_objects/saved_objects_client.ts | 8 +++--- .../saved_objects/simple_saved_object.ts | 2 +- .../service/saved_objects_client.ts | 8 ------ src/core/server/server.api.md | 6 ----- src/dev/jest/config.js | 1 + 7 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 src/core/common/index.ts diff --git a/src/core/common/index.ts b/src/core/common/index.ts new file mode 100644 index 000000000000000..5e9639eb2d5e035 --- /dev/null +++ b/src/core/common/index.ts @@ -0,0 +1,27 @@ +/* + * 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. + */ + +export { + SavedObject, + SavedObjectAttributes, + SavedObjectReference, + SavedObjectsClientContract as SavedObjectsServerClientContract, + SavedObjectsFindOptions, + SavedObjectsMigrationVersion, +} from '../server/saved_objects'; diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md index 4dbe09c843fcae8..a604991996302fd 100644 --- a/src/core/public/public.api.md +++ b/src/core/public/public.api.md @@ -8,12 +8,12 @@ import { IconType } from '@elastic/eui'; import { Observable } from 'rxjs'; import React from 'react'; import * as Rx from 'rxjs'; -import { SavedObject } from 'src/core/server'; -import { SavedObjectAttributes } from 'src/core/server'; -import { SavedObjectReference } from 'src/core/server'; -import { SavedObjectsClientContract as SavedObjectsApi } from 'src/core/server'; -import { SavedObjectsFindOptions } from 'src/core/server'; -import { SavedObjectsMigrationVersion } from 'src/core/server'; +import { SavedObject } from 'src/core/common'; +import { SavedObjectAttributes } from 'src/core/common'; +import { SavedObjectReference } from 'src/core/common'; +import { SavedObjectsServerClientContract as SavedObjectsApi } from 'src/core/common'; +import { SavedObjectsFindOptions } from 'src/core/common'; +import { SavedObjectsMigrationVersion } from 'src/core/common'; import { EuiGlobalToastListToast as Toast } from '@elastic/eui'; // @public (undocumented) diff --git a/src/core/public/saved_objects/saved_objects_client.ts b/src/core/public/saved_objects/saved_objects_client.ts index d2e1000966a5e54..a8e417ea8e7b68c 100644 --- a/src/core/public/saved_objects/saved_objects_client.ts +++ b/src/core/public/saved_objects/saved_objects_client.ts @@ -24,10 +24,10 @@ import { SavedObject, SavedObjectAttributes, SavedObjectReference, - SavedObjectsClientContract as SavedObjectsApi, + SavedObjectsServerClientContract as SavedObjectsApi, SavedObjectsFindOptions, SavedObjectsMigrationVersion, -} from 'src/core/server'; +} from 'src/core/common'; // TODO: Migrate to an error modal powered by the NP? import { isAutoCreateIndexError, @@ -40,10 +40,10 @@ export { SavedObject, SavedObjectAttributes, SavedObjectReference, - SavedObjectsClientContract as SavedObjectsApi, + SavedObjectsServerClientContract as SavedObjectsApi, SavedObjectsFindOptions, SavedObjectsMigrationVersion, -} from 'src/core/server'; +} from 'src/core/common'; interface RequestParams { method: 'POST' | 'GET' | 'PUT' | 'DELETE'; diff --git a/src/core/public/saved_objects/simple_saved_object.ts b/src/core/public/saved_objects/simple_saved_object.ts index 8c4702792425e09..bd8079c5a105c9d 100644 --- a/src/core/public/saved_objects/simple_saved_object.ts +++ b/src/core/public/saved_objects/simple_saved_object.ts @@ -18,7 +18,7 @@ */ import { get, has, set } from 'lodash'; -import { SavedObject as SavedObjectType, SavedObjectAttributes } from 'src/core/server'; +import { SavedObject as SavedObjectType, SavedObjectAttributes } from 'src/core/common'; import { SavedObjectsClient } from './saved_objects_client'; /** diff --git a/src/core/server/saved_objects/service/saved_objects_client.ts b/src/core/server/saved_objects/service/saved_objects_client.ts index e9d6aa287f4bed6..acdaa45256d6659 100644 --- a/src/core/server/saved_objects/service/saved_objects_client.ts +++ b/src/core/server/saved_objects/service/saved_objects_client.ts @@ -115,14 +115,6 @@ export interface SavedObjectsBulkGetObject { fields?: string[]; } -/** - * - * @public - */ -export interface SavedObjectsBulkResponse { - saved_objects: Array>; -} - /** * * @public diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md index f2b8aa894f042a5..a60eaf219082f5e 100644 --- a/src/core/server/server.api.md +++ b/src/core/server/server.api.md @@ -469,12 +469,6 @@ export interface SavedObjectsBulkResponse saved_objects: Array>; } -// @public (undocumented) -export interface SavedObjectsBulkResponse { - // (undocumented) - saved_objects: Array>; -} - // @internal (undocumented) export class SavedObjectsClient { // Warning: (ae-forgotten-export) The symbol "SavedObjectsRepository" needs to be exported by the entry point index.d.ts diff --git a/src/dev/jest/config.js b/src/dev/jest/config.js index 582cad37b27914d..e376372e15e58d8 100644 --- a/src/dev/jest/config.js +++ b/src/dev/jest/config.js @@ -55,6 +55,7 @@ export default { moduleNameMapper: { '^plugins/([^\/.]*)(.*)': '/src/legacy/core_plugins/$1/public$2', '^ui/(.*)': '/src/legacy/ui/public/$1', + '^src/core/(.*)': '/src/core/$1', '^uiExports/(.*)': '/src/dev/jest/mocks/file_mock.js', '^test_utils/(.*)': '/src/test_utils/public/$1', '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/src/dev/jest/mocks/file_mock.js',